From 615fd41f7b6674c4b42e3f9f70b92c7088d0ad7d Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sun, 29 Nov 2009 20:57:40 +0100
Subject: build should use gluegen.root property where possible.

---
 make/build-jogl.xml         | 10 +++++-----
 make/build-nativewindow.xml | 10 +++++-----
 make/build-newt.xml         |  6 +++---
 make/build.xml              | 14 +++++++-------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 23ad51a9e..6f97a336e 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -274,20 +274,20 @@
         <property name="rootrel.obj.jogl" value="${rootrel.obj}/jogl" />
         <property name="rootrel.obj.cg" value="${rootrel.obj}/jogl_cg" />
 
-        <property name="javac.bootclasspath-cdc.jar" value="../../gluegen/make/lib/cdc_fp.jar"/>
+        <property name="javac.bootclasspath-cdc.jar" value="${gluegen.root}/make/lib/cdc_fp.jar"/>
 
         <!-- GlueGen properties. -->
         <!-- NOTE that these require a checked-out GlueGen workspace as a -->
         <!-- sibling of the JOGL workspace. -->
-        <property name="gluegen.make.dir" value="../../gluegen/make" />
+        <property name="gluegen.make.dir" value="${gluegen.root}/make" />
         <property name="gluegen.build.xml" value="${gluegen.make.dir}/build.xml" />
-        <property name="gluegen.jar" value="../../gluegen/${rootrel.build}/gluegen.jar" />
-        <property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" />
+        <property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" />
+        <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
         <property name="nativewindow.core.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.jar" />
         <property name="nativewindow.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.jar" />
         <property name="nativewindow.awt.jar" value="../${rootrel.build}/nativewindow/nativewindow.awt.jar" />
 
-        <property name="gluegen-rt-cdc.jar" value="../../gluegen/${rootrel.build}/gluegen-rt-cdc.jar" />
+        <property name="gluegen-rt-cdc.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt-cdc.jar" />
         <property name="nativewindow.core.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.cdc.jar" />
         <property name="nativewindow.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.cdc.jar" />
                                                 
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 2e3c431ec..c0930cb42 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -84,7 +84,7 @@
             <isset property="setup.noAWT"/> 
         </condition>
 
-        <property name="javac.bootclasspath-cdc.jar" value="../../gluegen/make/lib/cdc_fp.jar" />
+        <property name="javac.bootclasspath-cdc.jar" value="${gluegen.root}/make/lib/cdc_fp.jar" />
 
         <echo message="setup.nodesktop: ${setup.nodesktop}" />
         <echo message="setup.noall: ${setup.noall}" />
@@ -180,11 +180,11 @@
         <!-- GlueGen properties. -->
         <!-- NOTE that these require a checked-out GlueGen workspace as a -->
         <!-- sibling of the NativeWindow workspace. -->
-        <property name="gluegen.make.dir" value="../../gluegen/make" />
+        <property name="gluegen.make.dir" value="${gluegen.root}/make" />
         <property name="gluegen.build.xml" value="${gluegen.make.dir}/build.xml" />
-        <property name="gluegen.jar" value="../../gluegen/${rootrel.build}/gluegen.jar" />
-        <property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" />
-        <property name="gluegen-rt-cdc.jar" value="../../gluegen/${rootrel.build}/gluegen-rt-cdc.jar" />
+        <property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" />
+        <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
+        <property name="gluegen-rt-cdc.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt-cdc.jar" />
                                                 
         <!-- The source directories. -->
         <property name="src.java" value="${project.root}/${rootrel.src.java}" />
diff --git a/make/build-newt.xml b/make/build-newt.xml
index ad04973e4..e74a036bb 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -68,7 +68,7 @@
       -->
     <target name="base.init" depends="gluegen.cpptasks.detect.os">
 
-        <property name="javac.bootclasspath-cdc.jar" value="../../gluegen/make/lib/cdc_fp.jar"/>
+        <property name="javac.bootclasspath-cdc.jar" value="${gluegen.root}/make/lib/cdc_fp.jar"/>
 
         <condition property="setup.nodesktop">
             <and>
@@ -209,14 +209,14 @@
         <property name="rootrel.src.c" value="${rootrel.src}/native" />
         <property name="rootrel.obj" value="${rootrel.build.newt}/obj" />
 
-        <property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" />
+        <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
         <property name="nativewindow.core.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.jar" />
         <property name="nativewindow.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.jar" />
         <property name="nativewindow.awt.jar" value="../${rootrel.build}/nativewindow/nativewindow.awt.jar" />
         <property name="jogl.core.jar" value="../${rootrel.build}/jogl/jogl.core.jar" />
         <property name="jogl.egl.jar" value="../${rootrel.build}/jogl/jogl.egl.jar" />
 
-        <property name="gluegen-rt-cdc.jar" value="../../gluegen/${rootrel.build}/gluegen-rt-cdc.jar" />
+        <property name="gluegen-rt-cdc.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt-cdc.jar" />
         <property name="nativewindow.core.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.cdc.jar" />
         <property name="nativewindow.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.cdc.jar" />
         <property name="jogl.core.cdc.jar" value="../${rootrel.build}/jogl/jogl.core.cdc.jar" />
diff --git a/make/build.xml b/make/build.xml
index 28936ef52..32024e3e1 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -51,8 +51,8 @@
         <property name="java.excludes.javadoc.packagenames" value="com.sun.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
         <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
 
-        <property name="gluegen.jar" value="../../gluegen/${rootrel.build}/gluegen.jar" />
-        <property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" />
+        <property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" />
+        <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
         <property name="nativewindow.all.jar" value="../${rootrel.build}/nativewindow/nativewindow.all.jar" />
         <property name="jogl.all.jar" value="../${rootrel.build}/jogl/jogl.all.jar" />
         <property name="newt.all.jar" value="../${rootrel.build}/newt/newt.all.jar" />
@@ -83,7 +83,7 @@
         <delete includeEmptyDirs="true" quiet="true" dir="${lib.dir}" failonerror="false" />
         <mkdir dir="${lib.dir}" />
         <copy todir="${lib.dir}">
-            <fileset dir="${project.root}/../gluegen/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
+            <fileset dir="${gluegen.root}/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
             <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
             <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
             <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
@@ -126,8 +126,8 @@
         </copy>
         <mkdir dir="${archive.dir}/lib" />
         <copy todir="${archive.dir}/lib">
-            <fileset dir="${project.root}/../gluegen/${rootrel.build}" includes="gluegen-rt.jar gluegen-rt-cdc.jar" />
-            <fileset dir="${project.root}/../gluegen/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
+            <fileset dir="${gluegen.root}/${rootrel.build}" includes="gluegen-rt.jar gluegen-rt-cdc.jar" />
+            <fileset dir="${gluegen.root}/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
             <fileset dir="${build}/jogl" includes="*.jar" excludes="*natives*.jar" />
             <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
             <fileset dir="${build}/nativewindow" includes="*.jar" excludes="*natives*.jar" />
@@ -162,8 +162,8 @@
         <delete quiet="true" file="${build}/jogl-${tmp.version}-src.zip"/>
         <zip destfile="${build}/jogl-${tmp.version}-src.zip"
              basedir="${project.root}/.."
-             excludes="gluegen/${rootrel.build}/**,gluegen/build/**gluegen/build-temp/**,jogl/${rootrel.build}/**,jogl/build/**,jogl/build-temp/**,jogl/www/**"
-             includes="gluegen/**, jogl/**" />
+             excludes="${gluegen.root}/${rootrel.build}/**,${gluegen.root}/build/**${gluegen.root}/build-temp/**,jogl/${rootrel.build}/**,jogl/build/**,jogl/build-temp/**,jogl/www/**"
+             includes="${gluegen.root}/**, jogl/**" />
         <!-- Now add in certain portions of the generated source code for developers -->
         <zip update="true"
              destfile="${build}/jogl-${tmp.version}-src.zip"
-- 
cgit v1.2.3


From 9c72fdaddb54e5c39b0f1ff8af02c7e813496e11 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Mon, 30 Nov 2009 22:53:11 +0100
Subject: fixed "native taglet" javadoc build configuration.

---
 make/build.xml | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/make/build.xml b/make/build.xml
index 32024e3e1..b3a77945c 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -196,10 +196,11 @@
                  overview="${javadoc.overview}" 
                  source="1.4"
                  maxmemory="512m"
-         bottom="${javadoc.bottom}" >
-         <classpath refid="all.classpath"/>
-         <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
-          <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
+                 bottom="${javadoc.bottom}" >
+            <classpath refid="all.classpath"/>
+            <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
+            <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
+            <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
         </javadoc>
     </target>
 
@@ -213,10 +214,11 @@
                  source="1.4"
                  maxmemory="512m"
                  bottom="${javadoc.bottom}" >
-         <classpath refid="all.classpath"/>
-         <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
-         <link offline="false" href="${javadoc.nw.spec}" />
-          <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
+            <classpath refid="all.classpath"/>
+            <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
+            <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
+            <link offline="false" href="${javadoc.nw.spec}" />
+            <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
         </javadoc>
     </target>
                                                                                                                                    
@@ -229,10 +231,11 @@
                  overview="${javadoc.overview}" 
                  source="1.4"
                  maxmemory="512m"
-         bottom="${javadoc.bottom}" >
-         <classpath refid="all.classpath"/>
-         <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
-          <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
+                 bottom="${javadoc.bottom}" >
+            <classpath refid="all.classpath"/>
+            <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
+            <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
+            <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
         </javadoc>
     </target>
 
@@ -246,9 +249,10 @@
                  source="1.4"
                  maxmemory="512m"
                  bottom="${javadoc.bottom}" >
-         <classpath refid="all.classpath"/>
-         <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
-         <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
+            <classpath refid="all.classpath"/>
+            <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
+            <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
+            <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
         </javadoc>
     </target>
                                                                                                                                    
-- 
cgit v1.2.3


From 760d1d63e8a04a6c636863e5668f45bd71e80d70 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Wed, 3 Feb 2010 02:29:27 +0100
Subject: variable renaming in config files due to changes in gluegen.

---
 make/config/jogl/gl-desktop.cfg  | 2 +-
 make/config/jogl/gl3-desktop.cfg | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/config/jogl/gl-desktop.cfg b/make/config/jogl/gl-desktop.cfg
index 7e500a4f0..f35ed254b 100755
--- a/make/config/jogl/gl-desktop.cfg
+++ b/make/config/jogl/gl-desktop.cfg
@@ -65,6 +65,6 @@ TemporaryCVariableDeclaration glXChooseFBConfigSGIX int count;
 TemporaryCVariableAssignment  glXChooseFBConfigSGIX count = _ptr3[0];
 ReturnValueCapacity           glXChooseFBConfigSGIX count * sizeof(GLXFBConfig)
 TemporaryCVariableDeclaration glXGetFBConfigs       int count;
-TemporaryCVariableAssignment  glXGetFBConfigs       count = _ptr2[0];
+TemporaryCVariableAssignment  glXGetFBConfigs       count = _nelements_ptr[0];
 ReturnValueCapacity           glXGetFBConfigs       count * sizeof(GLXFBConfig)
 
diff --git a/make/config/jogl/gl3-desktop.cfg b/make/config/jogl/gl3-desktop.cfg
index c3dd180bb..ee741089e 100755
--- a/make/config/jogl/gl3-desktop.cfg
+++ b/make/config/jogl/gl3-desktop.cfg
@@ -61,6 +61,6 @@ TemporaryCVariableDeclaration glXChooseFBConfigSGIX int count;
 TemporaryCVariableAssignment  glXChooseFBConfigSGIX count = _ptr3[0];
 ReturnValueCapacity           glXChooseFBConfigSGIX count * sizeof(GLXFBConfig)
 TemporaryCVariableDeclaration glXGetFBConfigs       int count;
-TemporaryCVariableAssignment  glXGetFBConfigs       count = _ptr2[0];
+TemporaryCVariableAssignment  glXGetFBConfigs       count = _nelements_ptr[0];
 ReturnValueCapacity           glXGetFBConfigs       count * sizeof(GLXFBConfig)
 
-- 
cgit v1.2.3


From 3f72f644aa7fd5e5756aea56c8d35d0acbe6ee6c Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 19 Mar 2010 05:13:20 +0100
Subject: Drop PointerBuffer.wrapNative2Java(..) in favor of a simple
 PointerBuffer.wrap(..), due to the new semantics, ie internal integer/long
 presentation. Fixed the javame code in this regard.

---
 make/config/jogl/glx-CustomJavaCode.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/config/jogl/glx-CustomJavaCode.java b/make/config/jogl/glx-CustomJavaCode.java
index 25a6156b7..3cb1d3619 100644
--- a/make/config/jogl/glx-CustomJavaCode.java
+++ b/make/config/jogl/glx-CustomJavaCode.java
@@ -23,7 +23,7 @@
     _res = glXChooseFBConfigCopied1(dpy, screen, attribList, BufferFactory.SIZEOF_INT * attribList_offset, nitems, BufferFactory.SIZEOF_INT * nitems_offset);
 
     if (_res == null) return null;
-    return PointerBuffer.wrapNative2Java(_res, false);
+    return PointerBuffer.wrap(_res);
   }
 
   /** Entry point to C language function: - Alias for: <br> <code> GLXFBConfig *  glXChooseFBConfigSGIX, glXChooseFBConfig(Display *  dpy, int screen, const int *  attribList, int *  nitems); </code>    */
-- 
cgit v1.2.3


From 7a087b9181b94c3d38f9480ba3ccd3b9e8062200 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 24 Mar 2010 13:51:00 +0100
Subject: http://www.jogamp.org/bugzilla/show_bug.cgi?id=363

Upgrade SGI FreeB license headers
---
 src/jogl/classes/com/sun/opengl/impl/ProjectFloat.java                  | 2 +-
 src/jogl/classes/com/sun/opengl/impl/gl2/ProjectDouble.java             | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/GLUquadricImpl.java            | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/Glue.java                      | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/error/Error.java               | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java      | 2 +-
 .../classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java    | 2 +-
 .../classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java  | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/BuildMipmap.java        | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract.java            | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1010102.java     | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1555rev.java     | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract2101010rev.java  | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract233rev.java      | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract332.java         | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444.java        | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444rev.java     | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract5551.java        | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565.java         | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565rev.java      | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888.java        | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888rev.java     | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractFloat.java       | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractPrimitive.java   | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSByte.java       | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSInt.java        | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSShort.java      | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUByte.java       | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUInt.java        | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUShort.java      | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/HalveImage.java         | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Image.java              | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java             | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/PixelStorageModes.java  | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ScaleInternal.java      | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Type_Widget.java        | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Arc.java                 | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcSdirSorter.java       | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTdirSorter.java       | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTesselator.java       | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Backend.java             | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/BezierArc.java           | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Bin.java                 | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Breakpt.java             | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curve.java               | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CurveEvaluator.java      | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curvelist.java           | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/DisplayList.java         | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Flist.java               | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotspec.java            | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotvector.java          | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Mapdesc.java             | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Maplist.java             | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/NurbsConsts.java         | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_curve.java             | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbscurve.java        | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbssurface.java      | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java          | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_surface.java           | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_trim.java              | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patch.java               | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patchlist.java           | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Property.java            | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Pspec.java               | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/PwlArc.java              | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quilt.java               | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quiltspec.java           | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Renderhints.java         | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Splinespec.java          | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Subdivider.java          | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/SurfaceEvaluator.java    | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/TrimVertex.java          | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/registry/Registry.java         | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/ActiveRegion.java  | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/CachedVertex.java  | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Dict.java          | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/DictNode.java      | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUface.java       | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUhalfEdge.java   | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUmesh.java       | 2 +-
 .../classes/com/sun/opengl/impl/glu/tessellator/GLUtessellatorImpl.java | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUvertex.java     | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Geom.java          | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Mesh.java          | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Normal.java        | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQ.java     | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQHeap.java | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQSort.java | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Render.java        | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Sweep.java         | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessMono.java      | 2 +-
 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessState.java     | 2 +-
 src/jogl/classes/javax/media/opengl/glu/GLUtessellator.java             | 2 +-
 src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java     | 2 +-
 .../classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java   | 2 +-
 96 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/src/jogl/classes/com/sun/opengl/impl/ProjectFloat.java b/src/jogl/classes/com/sun/opengl/impl/ProjectFloat.java
index cc8ba639f..f9f38166d 100755
--- a/src/jogl/classes/com/sun/opengl/impl/ProjectFloat.java
+++ b/src/jogl/classes/com/sun/opengl/impl/ProjectFloat.java
@@ -1,7 +1,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/gl2/ProjectDouble.java b/src/jogl/classes/com/sun/opengl/impl/gl2/ProjectDouble.java
index 5b7b679ad..54a029046 100755
--- a/src/jogl/classes/com/sun/opengl/impl/gl2/ProjectDouble.java
+++ b/src/jogl/classes/com/sun/opengl/impl/gl2/ProjectDouble.java
@@ -1,7 +1,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/GLUquadricImpl.java b/src/jogl/classes/com/sun/opengl/impl/glu/GLUquadricImpl.java
index 34b5ced6b..cc0784199 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/GLUquadricImpl.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/GLUquadricImpl.java
@@ -1,7 +1,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/Glue.java b/src/jogl/classes/com/sun/opengl/impl/glu/Glue.java
index ada5ab684..4613ae555 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/Glue.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/Glue.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/error/Error.java b/src/jogl/classes/com/sun/opengl/impl/glu/error/Error.java
index d24a41f10..cdf28701c 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/error/Error.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/error/Error.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java b/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java
index d54f1c56f..4b78498c9 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java
@@ -4,7 +4,7 @@ import com.sun.opengl.impl.glu.nurbs.*;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java b/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
index 5be4f9049..107ec9229 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
@@ -4,7 +4,7 @@ import com.sun.opengl.impl.glu.nurbs.*;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java b/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
index c226b7db9..51fb83e6c 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
@@ -4,7 +4,7 @@ import com.sun.opengl.impl.glu.nurbs.*;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java b/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
index d6c653a73..8e24ed4f0 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
@@ -4,7 +4,7 @@ import com.sun.opengl.impl.glu.nurbs.*;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/BuildMipmap.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/BuildMipmap.java
index f77f76fc8..41eb84bdb 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/BuildMipmap.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/BuildMipmap.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract.java
index d5224af74..3f0fab51c 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1010102.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1010102.java
index fc29b299b..38ca2e526 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1010102.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1010102.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1555rev.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1555rev.java
index e1c59041a..5810b1ef6 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1555rev.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1555rev.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract2101010rev.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract2101010rev.java
index e04d948d8..493f403e8 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract2101010rev.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract2101010rev.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract233rev.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract233rev.java
index a3d8ce2a8..b0a975307 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract233rev.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract233rev.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract332.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract332.java
index 008911364..3c9594e9a 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract332.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract332.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444.java
index b7414b184..03f74586d 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444rev.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444rev.java
index 30a2fa1ac..bf623e647 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444rev.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444rev.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract5551.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract5551.java
index f9e692e98..81480f7ba 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract5551.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract5551.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565.java
index 5eff68d7e..cf5e79969 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565rev.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565rev.java
index 099f80be5..a810d8708 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565rev.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565rev.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888.java
index f3da73952..0ae18ef13 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888rev.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888rev.java
index 58dbe81f8..3b2286020 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888rev.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888rev.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractFloat.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractFloat.java
index 7d06dfa82..3776b48b2 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractFloat.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractFloat.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractPrimitive.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractPrimitive.java
index 4cea1aa39..35b2e513b 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractPrimitive.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractPrimitive.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSByte.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSByte.java
index a2cfeca94..08d966c0c 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSByte.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSByte.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSInt.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSInt.java
index 48becdc18..f7642f5dd 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSInt.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSInt.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSShort.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSShort.java
index 00ff15119..a20784c48 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSShort.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSShort.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUByte.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUByte.java
index 4767d93c0..ed55ab1b6 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUByte.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUByte.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUInt.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUInt.java
index e6cd6e183..38c156f9c 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUInt.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUInt.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUShort.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUShort.java
index 89b42e41b..5aba2763f 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUShort.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUShort.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/HalveImage.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/HalveImage.java
index 7f2e87a63..40625ee07 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/HalveImage.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/HalveImage.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Image.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Image.java
index 605d5547b..192544205 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Image.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Image.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java
index aa33550ca..c9850639d 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/PixelStorageModes.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/PixelStorageModes.java
index 82324f1b0..c66d138a2 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/PixelStorageModes.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/PixelStorageModes.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ScaleInternal.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ScaleInternal.java
index f51c72ea6..d998e4bf0 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ScaleInternal.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ScaleInternal.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Type_Widget.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Type_Widget.java
index d5c6768b3..fd2eabb65 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Type_Widget.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Type_Widget.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Arc.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Arc.java
index e96aa83f8..ed629d1da 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Arc.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Arc.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcSdirSorter.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcSdirSorter.java
index f8fbe2930..9a7063886 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcSdirSorter.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcSdirSorter.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTdirSorter.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTdirSorter.java
index 9e9a10b42..2fbb5181f 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTdirSorter.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTdirSorter.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTesselator.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTesselator.java
index 496e8b7d6..c40780e76 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTesselator.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTesselator.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Backend.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Backend.java
index 9467104f5..caa17a74d 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Backend.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Backend.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/BezierArc.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/BezierArc.java
index ef4cf0684..e249787f6 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/BezierArc.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/BezierArc.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Bin.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Bin.java
index 0f0806d96..4a1ac1401 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Bin.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Bin.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Breakpt.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Breakpt.java
index 9cccc5102..d088de87f 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Breakpt.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Breakpt.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curve.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curve.java
index 318c8416c..752d7ac2e 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curve.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curve.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CurveEvaluator.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CurveEvaluator.java
index a6393ddf4..ddfe30ad8 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CurveEvaluator.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CurveEvaluator.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curvelist.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curvelist.java
index fdce39b46..2de7e8208 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curvelist.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curvelist.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/DisplayList.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/DisplayList.java
index 735c36edf..d0090d7f6 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/DisplayList.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/DisplayList.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Flist.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Flist.java
index d9e798854..c329a5cf7 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Flist.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Flist.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotspec.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotspec.java
index bcb55388d..a6b3c458c 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotspec.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotspec.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotvector.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotvector.java
index c7c3d4578..9af8a7d15 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotvector.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotvector.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Mapdesc.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Mapdesc.java
index 8b52a4a8a..9a1d434ff 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Mapdesc.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Mapdesc.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Maplist.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Maplist.java
index 3b6e22ea5..66d9b7805 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Maplist.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Maplist.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/NurbsConsts.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/NurbsConsts.java
index c98e74b7c..d6fb1b685 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/NurbsConsts.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/NurbsConsts.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_curve.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_curve.java
index b130226c4..285c444df 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_curve.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_curve.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbscurve.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbscurve.java
index 68bf60b27..f1c3ffef7 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbscurve.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbscurve.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbssurface.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbssurface.java
index 1cbaa6ccc..4a4c6753a 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbssurface.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbssurface.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java
index 4dec066d6..53c0060a0 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_surface.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_surface.java
index 4ef680c2f..f135026db 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_surface.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_surface.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_trim.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_trim.java
index c1f61ebab..0f59ccec8 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_trim.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_trim.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patch.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patch.java
index f15ad1f92..d9a79c45c 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patch.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patch.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patchlist.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patchlist.java
index b2b9033ec..8755ad60e 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patchlist.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patchlist.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Property.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Property.java
index e0ad1dd32..8640b1d79 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Property.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Property.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Pspec.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Pspec.java
index 5fc66fa82..1e0a091d2 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Pspec.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Pspec.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/PwlArc.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/PwlArc.java
index 6b8255d85..9f6c77774 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/PwlArc.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/PwlArc.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quilt.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quilt.java
index bc058b093..640eb2e83 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quilt.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quilt.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quiltspec.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quiltspec.java
index d94986a03..ee2924918 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quiltspec.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quiltspec.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Renderhints.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Renderhints.java
index c571d9d88..8470a64a1 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Renderhints.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Renderhints.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Splinespec.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Splinespec.java
index 35288c67d..7f01435fd 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Splinespec.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Splinespec.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Subdivider.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Subdivider.java
index b1506d6a1..b8da3e1dd 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Subdivider.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Subdivider.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/SurfaceEvaluator.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/SurfaceEvaluator.java
index feb3bc9a7..99209b744 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/SurfaceEvaluator.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/SurfaceEvaluator.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/TrimVertex.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/TrimVertex.java
index ec3f6fc10..2c4b94ba3 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/TrimVertex.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/TrimVertex.java
@@ -3,7 +3,7 @@ package com.sun.opengl.impl.glu.nurbs;
 /*
  ** License Applicability. Except to the extent portions of this file are
  ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 1.1 (the "License"), the contents of this
+ ** Software License B, Version 2.0 (the "License"), the contents of this
  ** file are subject only to the provisions of the License. You may not use
  ** this file except in compliance with the License. You may obtain a copy
  ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/registry/Registry.java b/src/jogl/classes/com/sun/opengl/impl/glu/registry/Registry.java
index 488a3c0f2..5c6b03c20 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/registry/Registry.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/registry/Registry.java
@@ -1,7 +1,7 @@
 /*
  * License Applicability. Except to the extent portions of this file are
  * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 1.1 (the "License"), the contents of this
+ * Software License B, Version 2.0 (the "License"), the contents of this
  * file are subject only to the provisions of the License. You may not use
  * this file except in compliance with the License. You may obtain a copy
  * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/ActiveRegion.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/ActiveRegion.java
index a04c5c74b..a875fb92e 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/ActiveRegion.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/ActiveRegion.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/CachedVertex.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/CachedVertex.java
index 993671c0d..85c9d5007 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/CachedVertex.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/CachedVertex.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Dict.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Dict.java
index d2f6e3790..9b7fb65a1 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Dict.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Dict.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/DictNode.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/DictNode.java
index 1222bd948..3c6342776 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/DictNode.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/DictNode.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUface.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUface.java
index f0589dbea..1bcd12b0b 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUface.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUface.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUhalfEdge.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUhalfEdge.java
index 1b6e81cc5..3747bcf25 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUhalfEdge.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUhalfEdge.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUmesh.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUmesh.java
index 73fbe815e..4f753a28c 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUmesh.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUmesh.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUtessellatorImpl.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
index f4efb116a..5155272f6 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUvertex.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUvertex.java
index e97767a12..9c01148e8 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUvertex.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUvertex.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Geom.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Geom.java
index 1287a60e0..818dc663d 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Geom.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Geom.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Mesh.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Mesh.java
index 290fb1037..a1e36e815 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Mesh.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Mesh.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Normal.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Normal.java
index feb13dfd4..cf6239de1 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Normal.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Normal.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQ.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQ.java
index 18f2cf32c..83914c193 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQ.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQ.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQHeap.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQHeap.java
index 2f856517a..7eec10699 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQHeap.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQHeap.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQSort.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQSort.java
index 67924524d..0b22e55d9 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQSort.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQSort.java
@@ -1,7 +1,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Render.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Render.java
index cd6e02255..a5e0ae84c 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Render.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Render.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Sweep.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Sweep.java
index 105328d87..140cdcf93 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Sweep.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Sweep.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessMono.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessMono.java
index fe0f7946c..f4c9545a9 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessMono.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessMono.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessState.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessState.java
index 9cf192529..73ac7ebe3 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessState.java
+++ b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessState.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellator.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellator.java
index cb7bd9d76..f98bbe158 100755
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellator.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellator.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
index 4b5ec63b7..971991519 100755
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
index bf6f2d29a..7845ac254 100755
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
@@ -6,7 +6,7 @@
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
+** Software License B, Version 2.0 (the "License"), the contents of this
 ** file are subject only to the provisions of the License. You may not use
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-- 
cgit v1.2.3


From 8b8e270788b50636e48ee17cc9e5fc8f29d44f5c Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 25 Mar 2010 03:28:23 +0100
Subject: http://www.jogamp.org/bugzilla/show_bug.cgi?id=378

Test:
    Added JUNIT Test Environment:
        - tests: jogl.test.jar
        - run: 'ant junit.run'
            Currently only runs 1 test regarding this bug id.
            Adding PATH (windows) or LD_LIBRARY_PATH (unix).

    Test initialized AWTTextureData without a current GLContext
    and then uses it to render ..

Solution:
    Pending initialization of GL depending data,
    offered in TextureData.glPostInit(),
    specialized in AWTTextureData.
---
 make/build-jogl.xml                                | 75 +++++++++++++++++++++-
 make/build.xml                                     |  6 ++
 make/lib/gluegen.compiler.linux-32bit.xml          | 31 +++++++++
 make/make.jogl.all.linux-x86.sh                    |  1 +
 make/make.jogl.cdcfp.linux-x86.sh                  |  1 +
 .../com/sun/opengl/util/texture/TextureData.java   | 64 +++++++++++++++---
 .../opengl/util/texture/awt/AWTTextureData.java    | 45 +++++++++----
 7 files changed, 200 insertions(+), 23 deletions(-)
 create mode 100644 make/lib/gluegen.compiler.linux-32bit.xml

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 6f97a336e..ba92540b8 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -215,6 +215,7 @@
 
     <target name="base.init.sourcelevel.1">
         <property name="jogl.sourcelevel" value="1.4" />
+        <property name="junit.sourcelevel" value="1.5" />
     </target>
 
     <!--target name="base.init.sourcelevel.2" if="gluegen.nsig">
@@ -264,6 +265,7 @@
         </condition>
         <property name="rootrel.build.jogl" value="${rootrel.build}/jogl" />
         <property name="rootrel.src.java" value="src/jogl/classes" />
+        <property name="rootrel.src.junit" value="src/jogl/junit" />
         <property name="rootrel.src.c" value="src/jogl/native" />
         <property name="rootrel.src.c.openmax" value="src/jogl/native/openmax" />
 
@@ -283,16 +285,22 @@
         <property name="gluegen.build.xml" value="${gluegen.make.dir}/build.xml" />
         <property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" />
         <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
+        <property name="gluegen.so.dir" value="${gluegen.root}/${rootrel.build}/obj" />
+        <property name="junit.jar" value="${gluegen.make.dir}/lib/junit-4.5.jar" />
         <property name="nativewindow.core.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.jar" />
         <property name="nativewindow.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.jar" />
         <property name="nativewindow.awt.jar" value="../${rootrel.build}/nativewindow/nativewindow.awt.jar" />
+        <property name="nativewindow.so.dir" value="../${rootrel.build}/nativewindow/obj" />
 
         <property name="gluegen-rt-cdc.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt-cdc.jar" />
         <property name="nativewindow.core.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.cdc.jar" />
         <property name="nativewindow.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.cdc.jar" />
                                                 
+        <property name="newt.so.dir" value="../${rootrel.build}/newt/obj" />
+
         <!-- The source directories. -->
         <property name="src.java" value="${project.root}/${rootrel.src.java}" />
+        <property name="src.junit" value="${project.root}/${rootrel.src.junit}" />
         <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
         <property name="build"    value="${project.root}/${rootrel.build.jogl}" />
         <property name="tempdir"  value="${project.root}/build-temp" />
@@ -313,6 +321,8 @@
         <property name="obj.jogl" value="${project.root}/${rootrel.obj.jogl}" />
         <property name="obj.cg"   value="${project.root}/${rootrel.obj.cg}" />
 
+        <property name="all.so.dir" value="${gluegen.so.dir}:${nativewindow.so.dir}:${obj}:${newt.so.dir}" />
+
         <!-- The GL headers from which Java files are generated -->
         <property name="config" value="${make}/config/jogl" />
         <property name="stub.includes" value="${make}/stub_includes" />
@@ -411,6 +421,7 @@
         <property name="jogl.sdk.jar" value="${build}/jogl.sdk.jar" />
         <property name="jogl.all.jar" value="${build}/jogl.all.jar"/>
         <property name="jogl.all-noawt.jar" value="${build}/jogl.all-noawt.jar"/>
+        <property name="jogl.test.jar" value="${build}/jogl.test.jar"/>
 
         <!-- The resulting CDC jogl.jar. -->
         <property name="jogl.core.cdc.jar" value="${build}/jogl.core.cdc.jar" />
@@ -428,6 +439,25 @@
         <property name="jogl.util.fixedfuncemu.cdc.jar" value="${build}/jogl.util.fixedfuncemu.cdc.jar" />
         <property name="jogl.all.cdc.jar" value="${build}/jogl.all.cdc.jar"/>
 
+        <path id="jogl_junit.compile.classpath">
+            <pathelement location="${junit.jar}" />
+            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${nativewindow.core.jar}" />
+            <pathelement location="${nativewindow.x11.jar}" />
+            <pathelement location="${nativewindow.awt.jar}" />
+            <pathelement location="${jogl.all.jar}" />
+        </path>
+
+        <path id="jogl_junit.run.classpath">
+            <pathelement location="${junit.jar}" />
+            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${nativewindow.core.jar}" />
+            <pathelement location="${nativewindow.x11.jar}" />
+            <pathelement location="${nativewindow.awt.jar}" />
+            <pathelement location="${jogl.all.jar}" />
+            <pathelement location="${jogl.test.jar}" />
+        </path>
+
         <!-- The javadoc dirs. -->
         <property name="javadoc" value="${project.root}/javadoc_jogl_public" />
         <property name="javadoc.spec" value="${project.root}/javadoc_jogl_spec" />
@@ -2039,11 +2069,54 @@
         </delete>
     </target>
 
+    <!-- ================================================================== -->
+    <!--
+       - Build/run junit.
+      -->
+    <target name="junit.compile">
+        <!-- Perform the junit pass Java compile -->
+        <javac destdir="${classes}"
+               source="${junit.sourcelevel}"
+               fork="yes"
+               memoryMaximumSize="${javac.memorymax}"
+               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+            <classpath refid="jogl_junit.compile.classpath"/>
+            <src path="${src.junit}" />
+        </javac>
+        <jar destfile="${jogl.test.jar}" filesonly="true">
+            <fileset dir="${classes}">
+                <include name="com/jogamp/opengl/test/**" />
+            </fileset>
+        </jar>
+    </target>
+
+    <target name="junit.run" depends="declare.common">
+        <condition property="system.env.library.path"
+                   value="LD_LIBRARY_PATH">
+          <not>
+           <isset property="isWindows"/> 
+          </not>
+        </condition>
+        <condition property="system.env.library.path"
+                   value="PATH">
+          <isset property="isWindows"/> 
+        </condition>
+
+        <!-- Perform the junit pass Java compile -->
+        <java fork="true"
+              classname="org.junit.runner.JUnitCore"
+              failonerror="true">
+            <env key="${system.env.library.path}" path="${all.so.dir}"/>
+            <arg value="com.jogamp.opengl.test.junit.texture.awt.Texture1"/>
+            <classpath refid="jogl_junit.run.classpath"/>
+        </java>
+    </target>
+
     <!-- ================================================================== -->
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.jogl,generate.version.txt" />
+    <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.jogl,generate.version.txt,junit.compile" />
 
     <target name="setup-version-RI" if="jogl.ri">
         <property name="tmp.version" value="${jogl_base_version}" />
diff --git a/make/build.xml b/make/build.xml
index b3a77945c..b8b3872ca 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -74,6 +74,10 @@
         <ant antfile="${jogl.build.xml}" dir="${jogl.make.dir}" target="all" inheritAll="false"/>
     </target>
 
+    <target name="junit.run.jogl" depends="init">
+        <ant antfile="${jogl.build.xml}" dir="${jogl.make.dir}" target="junit.run" inheritAll="false"/>
+    </target>
+
     <target name="build.newt" depends="init">
         <ant antfile="${newt.build.xml}" dir="${newt.make.dir}" target="all" inheritAll="false"/>
     </target>
@@ -178,6 +182,8 @@
 
     <target name="all" description="Build nativewindow, jogl and newt projects" depends="init,build.nativewindow,build.jogl,build.newt,one-lib-dir,developer-zip-archive,source-archive" />
 
+    <target name="junit.run" description="Run JUNIT tests in nativewindow, jogl and newt projects" depends="init,junit.run.jogl" />
+
     <target name="clean" depends="init">
         <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make.dir}" target="clean" inheritAll="false"/>
         <ant antfile="${jogl.build.xml}" dir="${jogl.make.dir}" target="clean" inheritAll="false"/>
diff --git a/make/lib/gluegen.compiler.linux-32bit.xml b/make/lib/gluegen.compiler.linux-32bit.xml
new file mode 100644
index 000000000..344d9da27
--- /dev/null
+++ b/make/lib/gluegen.compiler.linux-32bit.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    This is an example of how to add custom compiler/linker 
+    arguments for a crosscompiler.
+
+    You can use such files with setting the property 'gluegen.user.compiler.file', ie:
+
+        -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.xml
+
+    or by having such file in your home directory, ie:
+
+        ~/gluegen.compiler.xml
+  -->
+
+<project name="GlueGen-cpptasks" basedir="." >
+
+<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir">
+    <compiler id="compiler.cfg.linux" name="gcc">
+      <compilerarg value="-m32" />
+      <compilerarg value="-Wall" />
+      <defineset>
+        <define name="LINUX" />
+      </defineset>
+    </compiler>
+
+    <linker id="linker.cfg.linux" name="gcc">
+      <linkerarg value="-m32" />
+    </linker>
+</target>
+</project>
diff --git a/make/make.jogl.all.linux-x86.sh b/make/make.jogl.all.linux-x86.sh
index 081d8328b..5387cf97a 100644
--- a/make/make.jogl.all.linux-x86.sh
+++ b/make/make.jogl.all.linux-x86.sh
@@ -17,6 +17,7 @@ fi
 #    -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \
 
 ant \
+    -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.linux-32bit.xml \
     -Dbuild.noarchives=true \
     -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \
     -Drootrel.build=build-x86 \
diff --git a/make/make.jogl.cdcfp.linux-x86.sh b/make/make.jogl.cdcfp.linux-x86.sh
index 4a2241669..d212bd81d 100644
--- a/make/make.jogl.cdcfp.linux-x86.sh
+++ b/make/make.jogl.cdcfp.linux-x86.sh
@@ -15,6 +15,7 @@ fi
 BUILD_SUBDIR=build-cdcfp-x86
 
 ant -v \
+    -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.linux-32bit.xml \
     -Dbuild.noarchives=true \
     -Drootrel.build=$BUILD_SUBDIR \
     -Dsetup.cdcfp=true \
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java b/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java
index 8ac4b9b84..81124b060 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java
+++ b/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java
@@ -71,6 +71,10 @@ public class TextureData {
     protected int alignment; // 1, 2, or 4 bytes
     protected int estimatedMemorySize;
 
+    // specialization of this class might need GL dependent post initialization 
+    protected Object glPostInitSync = new Object(); 
+    protected volatile boolean glPostInitDone = false;
+
     // These booleans are a concession to the AWTTextureData subclass
     protected boolean haveEXTABGR;
     protected boolean haveGL12;
@@ -207,45 +211,71 @@ public class TextureData {
     }
 
     /** Used only by subclasses */
-    protected TextureData() {
-    }
+    protected TextureData() { }
 
     /** Returns the width in pixels of the texture data. */
     public int getWidth() { return width; }
     /** Returns the height in pixels of the texture data. */
     public int getHeight() { return height; }
     /** Returns the border in pixels of the texture data. */
-    public int getBorder() { return border; }
+    public int getBorder() { 
+        glPostInitInt();
+        return border; 
+    }
     /** Returns the intended OpenGL pixel format of the texture data. */
     public int getPixelFormat() {
+        glPostInitInt();
         return pixelFormat;
     }
     /** Returns the intended OpenGL pixel type of the texture data. */
     public int getPixelType() {
+        glPostInitInt();
         return pixelType;
     }
     /** Returns the intended OpenGL internal format of the texture data. */
-    public int getInternalFormat() { return internalFormat; }
+    public int getInternalFormat() { 
+        glPostInitInt();
+        return internalFormat; 
+    }
     /** Returns whether mipmaps should be generated for the texture data. */
-    public boolean getMipmap() { return mipmap; }
+    public boolean getMipmap() { 
+        glPostInitInt();
+        return mipmap; 
+    }
     /** Indicates whether the texture data is in compressed form. */
-    public boolean isDataCompressed() { return dataIsCompressed; }
+    public boolean isDataCompressed() { 
+        glPostInitInt();
+        return dataIsCompressed; 
+    }
     /** Indicates whether the texture coordinates must be flipped
         vertically for proper display. */
-    public boolean getMustFlipVertically() { return mustFlipVertically; }
+    public boolean getMustFlipVertically() { 
+        glPostInitInt();
+        return mustFlipVertically; 
+    }
     /** Returns the texture data, or null if it is specified as a set of mipmaps. */
     public Buffer getBuffer() {
+        glPostInitInt();
         return buffer;
     }
     /** Returns all mipmap levels for the texture data, or null if it is
         specified as a single image. */
-    public Buffer[] getMipmapData() { return mipmapData; }
+    public Buffer[] getMipmapData() { 
+        glPostInitInt();
+        return mipmapData; 
+    }
     /** Returns the required byte alignment for the texture data. */
-    public int getAlignment() { return alignment; }
+    public int getAlignment() { 
+        glPostInitInt();
+        return alignment; 
+    }
     /** Returns the row length needed for correct GL_UNPACK_ROW_LENGTH
         specification. This is currently only supported for
         non-mipmapped, non-compressed textures. */
-    public int getRowLength() { return rowLength; }
+    public int getRowLength() { 
+        glPostInitInt();
+        return rowLength; 
+    }
 
     /** Sets the width in pixels of the texture data. */
     public void setWidth(int width) { this.width = width; }
@@ -303,6 +333,7 @@ public class TextureData {
     /** Flushes resources associated with this TextureData by calling
         Flusher.flush(). */
     public void flush() {
+        glPostInitInt();
         if (flusher != null) {
             flusher.flush();
             flusher = null;
@@ -333,6 +364,19 @@ public class TextureData {
     // Internals only below this point
     //
 
+    protected void glPostInit() { }
+
+    protected final void glPostInitInt() {
+        if(glPostInitDone) return;
+        synchronized(glPostInitSync) {
+            if(!glPostInitDone) {
+                glPostInit();
+                glPostInitDone = true;
+            }
+            glPostInitSync.notifyAll();
+        }
+    }
+
     protected static int estimatedMemorySize(Buffer buffer) {
         if (buffer == null) {
             return 0;
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java b/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java
index b3cf537f6..e949883ed 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java
+++ b/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java
@@ -56,6 +56,9 @@ public class AWTTextureData extends TextureData {
     private boolean expectingEXTABGR;
     private boolean expectingGL12;
 
+    private int scanlineStride;
+    private BufferedImage glDependingImage; // indicator wheather GL depening initialization has been passed
+
     private static final ColorModel rgbaColorModel =
         new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
                                 new int[] {8, 8, 8, 8}, true, true, 
@@ -99,20 +102,14 @@ public class AWTTextureData extends TextureData {
         } else {
             this.internalFormat = internalFormat;
         }
-        createFromImage(image);
+        createFromImagePre(image);
+
         this.mipmap = mipmap;
-        if (buffer != null) {
-            estimatedMemorySize = estimatedMemorySize(buffer);
-        } else {
-            // In the lazy custom conversion case we don't yet have a buffer
-            if (imageForLazyCustomConversion != null) {
-                estimatedMemorySize = estimatedMemorySize(wrapImageDataBuffer(imageForLazyCustomConversion));
-            }
-        }
     }
 
     /** Returns the intended OpenGL pixel format of the texture data. */
     public int getPixelFormat() {
+        glPostInitInt();
         if (imageForLazyCustomConversion != null) {
             if (!((expectingEXTABGR && haveEXTABGR) ||
                   (expectingGL12    && haveGL12))) {
@@ -123,6 +120,7 @@ public class AWTTextureData extends TextureData {
     }
     /** Returns the intended OpenGL pixel type of the texture data. */
     public int getPixelType() {
+        glPostInitInt();
         if (imageForLazyCustomConversion != null) {
             if (!((expectingEXTABGR && haveEXTABGR) ||
                   (expectingGL12    && haveGL12))) {
@@ -134,6 +132,7 @@ public class AWTTextureData extends TextureData {
 
     /** Returns the texture data, or null if it is specified as a set of mipmaps. */
     public Buffer getBuffer() {
+        glPostInitInt();
         if (imageForLazyCustomConversion != null) {
             if (!((expectingEXTABGR && haveEXTABGR) ||
                   (expectingGL12    && haveGL12))) {
@@ -146,14 +145,13 @@ public class AWTTextureData extends TextureData {
         return buffer;
     }
 
-    private void createFromImage(BufferedImage image) {
+    private void createFromImagePre(BufferedImage image) {
         pixelType = 0; // Determine from image
         mustFlipVertically = true;
 
         width = image.getWidth();
         height = image.getHeight();
 
-        int scanlineStride;
         SampleModel sm = image.getRaster().getSampleModel();
         if (sm instanceof SinglePixelPackedSampleModel) {
             scanlineStride =
@@ -169,8 +167,22 @@ public class AWTTextureData extends TextureData {
             setupLazyCustomConversion(image);
             return;
         }
+        glDependingImage = image; // earmark for post init
+    }
+
+    protected void glPostInit() {
+        if(null == glDependingImage) return; 
+
+        GLContext current = GLContext.getCurrent();
+        if(null == current) return;
 
-        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        BufferedImage image = glDependingImage;
+        glDependingImage = null;
+
+        GLProfile glp = current.getGL().getGLProfile();
+
+        width = image.getWidth();
+        height = image.getHeight();
 
         if (glp.isGL2()) {
             switch (image.getType()) {
@@ -365,6 +377,15 @@ public class AWTTextureData extends TextureData {
         }
 
         createNIOBufferFromImage(image);
+
+        if (buffer != null) {
+            estimatedMemorySize = estimatedMemorySize(buffer);
+        } else {
+            // In the lazy custom conversion case we don't yet have a buffer
+            if (imageForLazyCustomConversion != null) {
+                estimatedMemorySize = estimatedMemorySize(wrapImageDataBuffer(imageForLazyCustomConversion));
+            }
+        }
     }
 
     private void setupLazyCustomConversion(BufferedImage image) {
-- 
cgit v1.2.3


From def4bf0d2f6ff9bf77418d26807bdcb187a3b033 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 25 Mar 2010 03:37:39 +0100
Subject: http://www.jogamp.org/bugzilla/show_bug.cgi?id=378

Test:
    Added JUNIT Test Environment:
        - tests: jogl.test.jar
        - run: 'ant junit.run'
            Currently only runs 1 test regarding this bug id.
            Adding PATH (windows) or LD_LIBRARY_PATH (unix).

    Test initialized AWTTextureData without a current GLContext
    and then uses it to render ..

Solution:
    Pending initialization of GL depending data,
    offered in TextureData.glPostInit(),
    specialized in AWTTextureData.
---
 .../opengl/test/junit/texture/awt/Texture1.java    | 118 +++++++++++++++++++++
 .../texture/util/gl2/TextureGL2ListenerDraw1.java  | 109 +++++++++++++++++++
 2 files changed, 227 insertions(+)
 create mode 100755 src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
 create mode 100755 src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java

diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
new file mode 100755
index 000000000..3157388e9
--- /dev/null
+++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.test.junit.texture.awt;
+
+import com.jogamp.opengl.test.junit.texture.util.gl2.TextureGL2ListenerDraw1;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2ES1;
+import javax.media.opengl.GL2;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.awt.GLCanvas;
+import com.sun.opengl.util.texture.Texture;
+import com.sun.opengl.util.texture.TextureCoords;
+import com.sun.opengl.util.texture.TextureData;
+import com.sun.opengl.util.texture.TextureIO;
+import com.sun.opengl.util.texture.awt.AWTTextureIO;
+import com.sun.opengl.util.Animator;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Frame;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class Texture1 {
+    Frame frame;
+    BufferedImage textureImage;
+
+    @Before
+    public void init() {
+        // create base image
+        BufferedImage baseImage = new BufferedImage(256, 256, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g = baseImage.createGraphics();
+        g.setPaint(new GradientPaint(0, 0, Color.CYAN,
+                                 baseImage.getWidth(), baseImage.getHeight(), Color.BLUE));
+        g.fillRect(0, 0, baseImage.getWidth(), baseImage.getHeight());
+        g.dispose();
+
+        // create texture image
+        int imageType = BufferedImage.TYPE_INT_RGB;
+        textureImage = new BufferedImage(baseImage.getWidth(),
+                                         baseImage.getHeight(),
+                                         imageType);
+        g = textureImage.createGraphics();
+        g.setComposite(AlphaComposite.Src);
+        g.drawImage(baseImage, 0, 0, null);
+        g.dispose();
+
+        frame = new Frame("Texture Test");
+    }
+
+    @Test
+    public void test1() {
+        GLCanvas glCanvas = new GLCanvas();
+        frame.add(glCanvas);
+        frame.setSize(512, 512);
+
+        // create texture    
+        TextureData textureData = AWTTextureIO.newTextureData(textureImage, false);
+        glCanvas.addGLEventListener(new TextureGL2ListenerDraw1(textureData));
+
+        Animator animator = new Animator(glCanvas);
+        frame.setVisible(true);
+        animator.start();
+
+        try {
+            Thread.sleep(100); // 100 ms
+        } catch (Exception e) {}
+
+        animator.stop();
+        frame.setVisible(false);
+
+        frame.remove(glCanvas);
+        frame.dispose();
+        frame=null;
+    }
+}
diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
new file mode 100755
index 000000000..cd02d5d25
--- /dev/null
+++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.test.junit.texture.util.gl2;
+
+import com.sun.opengl.util.texture.Texture;
+import com.sun.opengl.util.texture.TextureCoords;
+import com.sun.opengl.util.texture.TextureData;
+import com.sun.opengl.util.texture.TextureIO;
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2ES1;
+import javax.media.opengl.GL2;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.glu.GLU;
+
+public class TextureGL2ListenerDraw1 implements GLEventListener {
+    private GLU      glu = new GLU();
+    private TextureData textureData;
+    private Texture  texture;
+    
+    public TextureGL2ListenerDraw1(TextureData td) {
+        this.textureData = td;
+    }
+
+    public void init(GLAutoDrawable drawable) {
+        this.texture = TextureIO.newTexture(textureData);
+    }
+
+    public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
+        GL2 gl = drawable.getGL().getGL2();
+        gl.glMatrixMode(GL2ES1.GL_PROJECTION);
+        gl.glLoadIdentity();
+        glu.gluOrtho2D(0, 1, 0, 1);
+        gl.glMatrixMode(GL2ES1.GL_MODELVIEW);
+        gl.glLoadIdentity();
+    }
+
+    public void dispose(GLAutoDrawable drawable) {
+        GL2 gl = drawable.getGL().getGL2();
+        if(null!=texture) {
+            texture.disable();
+            texture.destroy(gl);
+        }
+        if(null!=textureData) {
+            textureData.destroy();
+        }
+    }
+
+    public void display(GLAutoDrawable drawable) {
+        GL2 gl = drawable.getGL().getGL2();
+
+        // need a valid GL context for this ..
+
+        /** OpenGL ..
+        texture.updateSubImage(textureData, 0,
+                               20, 20, 
+                               20, 20,
+                               100, 100); */
+
+    
+        // Now draw one quad with the texture
+        texture.enable();
+        texture.bind();
+        gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_REPLACE);
+        TextureCoords coords = texture.getImageTexCoords();
+        gl.glBegin(GL2.GL_QUADS);
+        gl.glTexCoord2f(coords.left(), coords.bottom());
+        gl.glVertex3f(0, 0, 0);
+        gl.glTexCoord2f(coords.right(), coords.bottom());
+        gl.glVertex3f(1, 0, 0);
+        gl.glTexCoord2f(coords.right(), coords.top());
+        gl.glVertex3f(1, 1, 0);
+        gl.glTexCoord2f(coords.left(), coords.top());
+        gl.glVertex3f(0, 1, 0);
+        gl.glEnd();
+        texture.disable();
+    }
+}
+
-- 
cgit v1.2.3


From 11d516d6be0fff6ac68e0fa7ce30a85d6820a283 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Thu, 25 Mar 2010 04:41:27 +0100
Subject: modified junit.run target to write junit test results to file
 (->ready for hudson).

---
 make/build-jogl.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index ba92540b8..57f9d1e26 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -2102,14 +2102,17 @@
           <isset property="isWindows"/> 
         </condition>
 
-        <!-- Perform the junit pass Java compile -->
-        <java fork="true"
-              classname="org.junit.runner.JUnitCore"
-              failonerror="true">
+        <!-- Perform the junit tests-->
+        <mkdir dir="${build}/results"/>
+        <junit forkmode="once" showoutput="true" fork="true" haltonerror="true">
             <env key="${system.env.library.path}" path="${all.so.dir}"/>
-            <arg value="com.jogamp.opengl.test.junit.texture.awt.Texture1"/>
+            <formatter usefile="false" type="plain"/>
+            <formatter usefile="true" type="xml"/>
             <classpath refid="jogl_junit.run.classpath"/>
-        </java>
+
+            <test name="com.jogamp.opengl.test.junit.texture.awt.Texture1" todir="${build}/results"/>
+
+        </junit>
     </target>
 
     <!-- ================================================================== -->
-- 
cgit v1.2.3


From ffd4f4b39f0600a0432728ab00d20c9127200196 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 25 Mar 2010 13:15:04 +0100
Subject: relocated lib/gluegen.compiler.linux-32bit.xml to gluegen

---
 make/lib/gluegen.compiler.linux-32bit.xml | 31 -------------------------------
 make/make.jogl.all.linux-x86.sh           |  2 +-
 make/make.jogl.cdcfp.linux-x86.sh         |  2 +-
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 make/lib/gluegen.compiler.linux-32bit.xml

diff --git a/make/lib/gluegen.compiler.linux-32bit.xml b/make/lib/gluegen.compiler.linux-32bit.xml
deleted file mode 100644
index 344d9da27..000000000
--- a/make/lib/gluegen.compiler.linux-32bit.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    This is an example of how to add custom compiler/linker 
-    arguments for a crosscompiler.
-
-    You can use such files with setting the property 'gluegen.user.compiler.file', ie:
-
-        -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.xml
-
-    or by having such file in your home directory, ie:
-
-        ~/gluegen.compiler.xml
-  -->
-
-<project name="GlueGen-cpptasks" basedir="." >
-
-<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir">
-    <compiler id="compiler.cfg.linux" name="gcc">
-      <compilerarg value="-m32" />
-      <compilerarg value="-Wall" />
-      <defineset>
-        <define name="LINUX" />
-      </defineset>
-    </compiler>
-
-    <linker id="linker.cfg.linux" name="gcc">
-      <linkerarg value="-m32" />
-    </linker>
-</target>
-</project>
diff --git a/make/make.jogl.all.linux-x86.sh b/make/make.jogl.all.linux-x86.sh
index 5387cf97a..ef12088ff 100644
--- a/make/make.jogl.all.linux-x86.sh
+++ b/make/make.jogl.all.linux-x86.sh
@@ -17,7 +17,7 @@ fi
 #    -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \
 
 ant \
-    -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.linux-32bit.xml \
+    -Dgluegen.user.compiler.file=`pwd`/../../gluegen/make/lib/gluegen.compiler.linux-32bit.xml \
     -Dbuild.noarchives=true \
     -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \
     -Drootrel.build=build-x86 \
diff --git a/make/make.jogl.cdcfp.linux-x86.sh b/make/make.jogl.cdcfp.linux-x86.sh
index d212bd81d..4f51136fb 100644
--- a/make/make.jogl.cdcfp.linux-x86.sh
+++ b/make/make.jogl.cdcfp.linux-x86.sh
@@ -15,7 +15,7 @@ fi
 BUILD_SUBDIR=build-cdcfp-x86
 
 ant -v \
-    -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.linux-32bit.xml \
+    -Dgluegen.user.compiler.file=`pwd`/../../gluegen/make/lib/gluegen.compiler.linux-32bit.xml \
     -Dbuild.noarchives=true \
     -Drootrel.build=$BUILD_SUBDIR \
     -Dsetup.cdcfp=true \
-- 
cgit v1.2.3


From 138a5b057e39a4738a2e82f370424a9a21aceea9 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 26 Mar 2010 15:12:51 +0100
Subject: http://www.jogamp.org/bugzilla/show_bug.cgi?id=378

Changed solution with a necessary API change of TextureData etc.

Adding required GLProfile element to the factories etc,
so it is clear for which GLProfile data is being created
without the need of a current GLContext.

TextureData/AWTTextureData: Removed the glPostInit* effort ..

IMPACT: Texture util's API change - minor user code change necessary.

+++
---
 make/build-jogl.xml                                |  3 +-
 make/lib/gluegen.compiler.intelgdl.xml             | 11 +--
 make/make.jogl.all.linux-x86.sh                    |  2 +-
 make/make.jogl.cdcfp.linux-x86.sh                  |  2 +-
 .../com/sun/opengl/util/texture/TextureData.java   | 48 ++++-------
 .../util/texture/TextureIO.java.javame_cdc_fp      | 95 +++++++++++++---------
 .../sun/opengl/util/texture/TextureIO.java.javase  | 95 +++++++++++++---------
 .../opengl/util/texture/awt/AWTTextureData.java    | 72 +++++++---------
 .../sun/opengl/util/texture/awt/AWTTextureIO.java  | 26 ++++--
 .../opengl/util/texture/spi/TextureProvider.java   | 13 ++-
 .../util/texture/spi/awt/IIOTextureProvider.java   | 13 +--
 .../opengl/test/junit/texture/awt/Texture1.java    |  7 +-
 12 files changed, 204 insertions(+), 183 deletions(-)

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 57f9d1e26..c7a8a1853 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -59,6 +59,7 @@
        setup.noAWT
        setup.noCDC
 
+   - Skip gluegen: java.generate.skip
    -->
 <project name="JOGL" basedir="." default="all">
 
@@ -2073,7 +2074,7 @@
     <!--
        - Build/run junit.
       -->
-    <target name="junit.compile">
+    <target name="junit.compile" depends="init">
         <!-- Perform the junit pass Java compile -->
         <javac destdir="${classes}"
                source="${junit.sourcelevel}"
diff --git a/make/lib/gluegen.compiler.intelgdl.xml b/make/lib/gluegen.compiler.intelgdl.xml
index d0a1c50e2..9691a39d5 100644
--- a/make/lib/gluegen.compiler.intelgdl.xml
+++ b/make/lib/gluegen.compiler.intelgdl.xml
@@ -4,17 +4,18 @@
     This is an example of how to add custom compiler/linker arguments
     for a crosscompiler and a custom NEWT windowing implementation.
 
-    You can use such files with setting the property 'gluegen.user.compiler.file', ie:
+    You can use such files with setting the property 'gluegen-cpptasks.file', ie:
 
-        -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.intelgdl.xml
+        -Dgluegen-cpptasks.file=`pwd`/lib/gluegen.compiler.intelgdl.xml
 
-    or by having such file in your home directory, ie:
-
-            ~/gluegen.compiler.xml
   -->
       
 <project name="GlueGen-cpptasks" basedir=".">
+
+    <import file="../gluegen-cpptasks-base.xml" optional="false" />
+
     <target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir">
+        <echo message="Custom forced linker.cfg.linux, linker.cfg.linux.amd64" />
         <linker id="linker.cfg.linux" name="gcc">
             <linkerarg value="-m32" />
             <linkerarg value="-L/usr/lib" />
diff --git a/make/make.jogl.all.linux-x86.sh b/make/make.jogl.all.linux-x86.sh
index ef12088ff..32f48a80f 100644
--- a/make/make.jogl.all.linux-x86.sh
+++ b/make/make.jogl.all.linux-x86.sh
@@ -17,7 +17,7 @@ fi
 #    -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \
 
 ant \
-    -Dgluegen.user.compiler.file=`pwd`/../../gluegen/make/lib/gluegen.compiler.linux-32bit.xml \
+    -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \
     -Dbuild.noarchives=true \
     -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \
     -Drootrel.build=build-x86 \
diff --git a/make/make.jogl.cdcfp.linux-x86.sh b/make/make.jogl.cdcfp.linux-x86.sh
index 4f51136fb..ad80f194d 100644
--- a/make/make.jogl.cdcfp.linux-x86.sh
+++ b/make/make.jogl.cdcfp.linux-x86.sh
@@ -15,7 +15,7 @@ fi
 BUILD_SUBDIR=build-cdcfp-x86
 
 ant -v \
-    -Dgluegen.user.compiler.file=`pwd`/../../gluegen/make/lib/gluegen.compiler.linux-32bit.xml \
+    -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \
     -Dbuild.noarchives=true \
     -Drootrel.build=$BUILD_SUBDIR \
     -Dsetup.cdcfp=true \
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java b/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java
index 81124b060..7899a2395 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java
+++ b/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java
@@ -49,6 +49,7 @@ import com.sun.opengl.util.*;
  *
  * @author Chris Campbell
  * @author Kenneth Russell
+ * @author Sven Gothel
  */
 
 public class TextureData {
@@ -71,13 +72,10 @@ public class TextureData {
     protected int alignment; // 1, 2, or 4 bytes
     protected int estimatedMemorySize;
 
-    // specialization of this class might need GL dependent post initialization 
-    protected Object glPostInitSync = new Object(); 
-    protected volatile boolean glPostInitDone = false;
-
     // These booleans are a concession to the AWTTextureData subclass
     protected boolean haveEXTABGR;
     protected boolean haveGL12;
+    protected GLProfile glProfile;
 
     /** 
      * Constructs a new TextureData object with the specified parameters
@@ -87,6 +85,8 @@ public class TextureData {
      * memory-mapped files that might otherwise require a garbage
      * collection to reclaim and close.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param internalFormat the OpenGL internal format for the
      *                       resulting texture; must be specified, may
      *                       not be 0
@@ -117,7 +117,8 @@ public class TextureData {
      *   data were invalid, such as requesting mipmap generation for a
      *   compressed texture
      */
-    public TextureData(int internalFormat,
+    public TextureData(GLProfile glp, 
+                       int internalFormat,
                        int width,
                        int height,
                        int border,
@@ -132,6 +133,7 @@ public class TextureData {
             throw new IllegalArgumentException("Can not generate mipmaps for compressed textures");
         }
 
+        this.glProfile = glp;
         this.width = width;
         this.height = height;
         this.border = border;
@@ -155,6 +157,8 @@ public class TextureData {
      * complete; for example, closing of memory-mapped files that might
      * otherwise require a garbage collection to reclaim and close.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param internalFormat the OpenGL internal format for the
      *                       resulting texture; must be specified, may
      *                       not be 0
@@ -184,7 +188,8 @@ public class TextureData {
      *   data were invalid, such as requesting mipmap generation for a
      *   compressed texture
      */
-    public TextureData(int internalFormat,
+    public TextureData(GLProfile glp,
+                       int internalFormat,
                        int width,
                        int height,
                        int border,
@@ -194,6 +199,7 @@ public class TextureData {
                        boolean mustFlipVertically,
                        Buffer[] mipmapData,
                        Flusher flusher) throws IllegalArgumentException {
+        this.glProfile = glp;
         this.width = width;
         this.height = height;
         this.border = border;
@@ -211,7 +217,7 @@ public class TextureData {
     }
 
     /** Used only by subclasses */
-    protected TextureData() { }
+    protected TextureData(GLProfile glp) { this.glProfile = glp; }
 
     /** Returns the width in pixels of the texture data. */
     public int getWidth() { return width; }
@@ -219,61 +225,50 @@ public class TextureData {
     public int getHeight() { return height; }
     /** Returns the border in pixels of the texture data. */
     public int getBorder() { 
-        glPostInitInt();
         return border; 
     }
     /** Returns the intended OpenGL pixel format of the texture data. */
     public int getPixelFormat() {
-        glPostInitInt();
         return pixelFormat;
     }
     /** Returns the intended OpenGL pixel type of the texture data. */
     public int getPixelType() {
-        glPostInitInt();
         return pixelType;
     }
     /** Returns the intended OpenGL internal format of the texture data. */
     public int getInternalFormat() { 
-        glPostInitInt();
         return internalFormat; 
     }
     /** Returns whether mipmaps should be generated for the texture data. */
     public boolean getMipmap() { 
-        glPostInitInt();
         return mipmap; 
     }
     /** Indicates whether the texture data is in compressed form. */
     public boolean isDataCompressed() { 
-        glPostInitInt();
         return dataIsCompressed; 
     }
     /** Indicates whether the texture coordinates must be flipped
         vertically for proper display. */
     public boolean getMustFlipVertically() { 
-        glPostInitInt();
         return mustFlipVertically; 
     }
     /** Returns the texture data, or null if it is specified as a set of mipmaps. */
     public Buffer getBuffer() {
-        glPostInitInt();
         return buffer;
     }
     /** Returns all mipmap levels for the texture data, or null if it is
         specified as a single image. */
     public Buffer[] getMipmapData() { 
-        glPostInitInt();
         return mipmapData; 
     }
     /** Returns the required byte alignment for the texture data. */
     public int getAlignment() { 
-        glPostInitInt();
         return alignment; 
     }
     /** Returns the row length needed for correct GL_UNPACK_ROW_LENGTH
         specification. This is currently only supported for
         non-mipmapped, non-compressed textures. */
     public int getRowLength() { 
-        glPostInitInt();
         return rowLength; 
     }
 
@@ -321,6 +316,9 @@ public class TextureData {
         this.haveGL12 = haveGL12;
     }
 
+    /** Returns the GLProfile this texture data is intended and created for. */
+    public GLProfile getGLProfile() { return glProfile; }
+
     /** Returns an estimate of the amount of memory in bytes this
         TextureData will consume once uploaded to the graphics card. It
         should only be treated as an estimate; most applications should
@@ -333,7 +331,6 @@ public class TextureData {
     /** Flushes resources associated with this TextureData by calling
         Flusher.flush(). */
     public void flush() {
-        glPostInitInt();
         if (flusher != null) {
             flusher.flush();
             flusher = null;
@@ -364,19 +361,6 @@ public class TextureData {
     // Internals only below this point
     //
 
-    protected void glPostInit() { }
-
-    protected final void glPostInitInt() {
-        if(glPostInitDone) return;
-        synchronized(glPostInitSync) {
-            if(!glPostInitDone) {
-                glPostInit();
-                glPostInitDone = true;
-            }
-            glPostInitSync.notifyAll();
-        }
-    }
-
     protected static int estimatedMemorySize(Buffer buffer) {
         if (buffer == null) {
             return 0;
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp b/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp
index e7c80678f..5c64806fc 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp
+++ b/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp
@@ -155,6 +155,8 @@ public class TextureIO {
     /**
      * Creates a TextureData from the given file. Does no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param file the file from which to read the texture data
      * @param mipmap     whether mipmaps should be produced for this
      *                   texture either by autogenerating them or
@@ -171,18 +173,20 @@ public class TextureIO {
      *         registered texture providers could read the file
      * @throws IOException if an error occurred while reading the file
      */
-    public static TextureData newTextureData(File file,
+    public static TextureData newTextureData(GLProfile glp, File file,
                                              boolean mipmap,
                                              String fileSuffix) throws IOException {
         if (fileSuffix == null) {
             fileSuffix = FileUtil.getFileSuffix(file);
         }
-        return newTextureDataImpl(file, 0, 0, mipmap, fileSuffix);
+        return newTextureDataImpl(glp, file, 0, 0, mipmap, fileSuffix);
     }
 
     /**
      * Creates a TextureData from the given stream. Does no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param stream the stream from which to read the texture data
      * @param mipmap     whether mipmaps should be produced for this
      *                   texture either by autogenerating them or
@@ -199,15 +203,17 @@ public class TextureIO {
      *         registered texture providers could read the stream
      * @throws IOException if an error occurred while reading the stream
      */
-    public static TextureData newTextureData(InputStream stream,
+    public static TextureData newTextureData(GLProfile glp, InputStream stream,
                                              boolean mipmap,
                                              String fileSuffix) throws IOException {
-        return newTextureDataImpl(stream, 0, 0, mipmap, fileSuffix);
+        return newTextureDataImpl(glp, stream, 0, 0, mipmap, fileSuffix);
     }
 
     /**
      * Creates a TextureData from the given URL. Does no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param url the URL from which to read the texture data
      * @param mipmap     whether mipmaps should be produced for this
      *                   texture either by autogenerating them or
@@ -224,13 +230,13 @@ public class TextureIO {
      *         registered texture providers could read the URL
      * @throws IOException if an error occurred while reading the URL
      */
-    public static TextureData newTextureData(URL url,
+    public static TextureData newTextureData(GLProfile glp, URL url,
                                              boolean mipmap,
                                              String fileSuffix) throws IOException {
         if (fileSuffix == null) {
             fileSuffix = FileUtil.getFileSuffix(url.getPath());
         }
-        return newTextureDataImpl(url, 0, 0, mipmap, fileSuffix);
+        return newTextureDataImpl(glp, url, 0, 0, mipmap, fileSuffix);
     }
 
     //----------------------------------------------------------------------
@@ -248,6 +254,8 @@ public class TextureIO {
      * variant of this method which does not take these arguments. Does
      * no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param file the file from which to read the texture data
      * @param internalFormat the OpenGL internal format of the texture
      *                   which will eventually result from the TextureData
@@ -270,7 +278,7 @@ public class TextureIO {
      *                                  pixelFormat was 0
      * @throws IOException if an error occurred while reading the file
      */
-    public static TextureData newTextureData(File file,
+    public static TextureData newTextureData(GLProfile glp, File file,
                                              int internalFormat,
                                              int pixelFormat,
                                              boolean mipmap,
@@ -283,7 +291,7 @@ public class TextureIO {
             fileSuffix = FileUtil.getFileSuffix(file);
         }
 
-        return newTextureDataImpl(file, internalFormat, pixelFormat, mipmap, fileSuffix);
+        return newTextureDataImpl(glp, file, internalFormat, pixelFormat, mipmap, fileSuffix);
     }
 
     /**
@@ -294,6 +302,8 @@ public class TextureIO {
      * variant of this method which does not take these arguments. Does
      * no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param stream the stream from which to read the texture data
      * @param internalFormat the OpenGL internal format of the texture
      *                   which will eventually result from the TextureData
@@ -316,7 +326,7 @@ public class TextureIO {
      *                                  pixelFormat was 0
      * @throws IOException if an error occurred while reading the stream
      */
-    public static TextureData newTextureData(InputStream stream,
+    public static TextureData newTextureData(GLProfile glp, InputStream stream,
                                              int internalFormat,
                                              int pixelFormat,
                                              boolean mipmap,
@@ -325,7 +335,7 @@ public class TextureIO {
             throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
         }
 
-        return newTextureDataImpl(stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+        return newTextureDataImpl(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
     }
 
     /**
@@ -336,6 +346,8 @@ public class TextureIO {
      * variant of this method which does not take these arguments. Does
      * no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param url the URL from which to read the texture data
      * @param internalFormat the OpenGL internal format of the texture
      *                   which will eventually result from the TextureData
@@ -358,7 +370,7 @@ public class TextureIO {
      *                                  pixelFormat was 0
      * @throws IOException if an error occurred while reading the URL
      */
-    public static TextureData newTextureData(URL url,
+    public static TextureData newTextureData(GLProfile glp, URL url,
                                              int internalFormat,
                                              int pixelFormat,
                                              boolean mipmap,
@@ -371,7 +383,7 @@ public class TextureIO {
             fileSuffix = FileUtil.getFileSuffix(url.getPath());
         }
 
-        return newTextureDataImpl(url, internalFormat, pixelFormat, mipmap, fileSuffix);
+        return newTextureDataImpl(glp, url, internalFormat, pixelFormat, mipmap, fileSuffix);
     }
 
     //----------------------------------------------------------------------
@@ -410,7 +422,8 @@ public class TextureIO {
      *                     OpenGL error occurred
      */
     public static Texture newTexture(File file, boolean mipmap) throws IOException, GLException {
-        TextureData data = newTextureData(file, mipmap, FileUtil.getFileSuffix(file));
+        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        TextureData data = newTextureData(glp, file, mipmap, FileUtil.getFileSuffix(file));
         Texture texture = newTexture(data);
         data.flush();
         return texture;
@@ -437,7 +450,8 @@ public class TextureIO {
      *                     OpenGL error occurred
      */
     public static Texture newTexture(InputStream stream, boolean mipmap, String fileSuffix) throws IOException, GLException {
-        TextureData data = newTextureData(stream, mipmap, fileSuffix);
+        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        TextureData data = newTextureData(glp, stream, mipmap, fileSuffix);
         Texture texture = newTexture(data);
         data.flush();
         return texture;
@@ -467,7 +481,8 @@ public class TextureIO {
         if (fileSuffix == null) {
             fileSuffix = FileUtil.getFileSuffix(url.getPath());
         }
-        TextureData data = newTextureData(url, mipmap, fileSuffix);
+        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        TextureData data = newTextureData(glp, url, mipmap, fileSuffix);
         Texture texture = newTexture(data);
         data.flush();
         return texture;
@@ -580,7 +595,7 @@ public class TextureIO {
             int size   = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_COMPRESSED_IMAGE_SIZE);
             ByteBuffer res = ByteBuffer.wrap(new byte[size]);
             gl.glGetCompressedTexImage(GL.GL_TEXTURE_2D, 0, res);
-            data = new TextureData(internalFormat, width, height, border, internalFormat, GL.GL_UNSIGNED_BYTE,
+            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, internalFormat, GL.GL_UNSIGNED_BYTE,
                                    false, true, true, res, null);
         } else {
             int bytesPerPixel = 0;
@@ -631,7 +646,7 @@ public class TextureIO {
             gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, packSkipPixels);
             gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, packSwapBytes);
       
-            data = new TextureData(internalFormat, width, height, border, fetchedFormat, GL.GL_UNSIGNED_BYTE,
+            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, fetchedFormat, GL.GL_UNSIGNED_BYTE,
                                    false, false, false, res, null);
 
             if (DEBUG) {
@@ -758,7 +773,7 @@ public class TextureIO {
     }
 
     // Implementation methods
-    private static TextureData newTextureDataImpl(File file,
+    private static TextureData newTextureDataImpl(GLProfile glp, File file,
                                                   int internalFormat,
                                                   int pixelFormat,
                                                   boolean mipmap,
@@ -771,7 +786,7 @@ public class TextureIO {
 
         for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
             TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(file,
+            TextureData data = provider.newTextureData(glp, file,
                                                        internalFormat,
                                                        pixelFormat,
                                                        mipmap,
@@ -784,7 +799,7 @@ public class TextureIO {
         throw new IOException("No suitable reader for given file "+file.getAbsolutePath());
     }
 
-    private static TextureData newTextureDataImpl(InputStream stream,
+    private static TextureData newTextureDataImpl(GLProfile glp, InputStream stream,
                                                   int internalFormat,
                                                   int pixelFormat,
                                                   boolean mipmap,
@@ -802,7 +817,7 @@ public class TextureIO {
 
         for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
             TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(stream,
+            TextureData data = provider.newTextureData(glp, stream,
                                                        internalFormat,
                                                        pixelFormat,
                                                        mipmap,
@@ -815,7 +830,7 @@ public class TextureIO {
         throw new IOException("No suitable reader for given stream");
     }
 
-    private static TextureData newTextureDataImpl(URL url,
+    private static TextureData newTextureDataImpl(GLProfile glp, URL url,
                                                   int internalFormat,
                                                   int pixelFormat,
                                                   boolean mipmap,
@@ -828,7 +843,7 @@ public class TextureIO {
 
         for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
             TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(url,
+            TextureData data = provider.newTextureData(glp, url,
                                                        internalFormat,
                                                        pixelFormat,
                                                        mipmap,
@@ -844,7 +859,7 @@ public class TextureIO {
     //----------------------------------------------------------------------
     // DDS provider -- supports files only for now
     static class DDSTextureProvider implements TextureProvider {
-        public TextureData newTextureData(File file,
+        public TextureData newTextureData(GLProfile glp, File file,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
@@ -852,13 +867,13 @@ public class TextureIO {
             if (DDS.equals(fileSuffix) ||
                 DDS.equals(FileUtil.getFileSuffix(file))) {
                 DDSImage image = DDSImage.read(file);
-                return newTextureData(image, internalFormat, pixelFormat, mipmap);
+                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
             }
 
             return null;
         }
 
-        public TextureData newTextureData(InputStream stream,
+        public TextureData newTextureData(GLProfile glp, InputStream stream,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
@@ -866,26 +881,26 @@ public class TextureIO {
             if (DDS.equals(fileSuffix) ||
                 DDSImage.isDDSImage(stream)) {
                 DDSImage image = DDSImage.read(stream);
-                return newTextureData(image, internalFormat, pixelFormat, mipmap);
+                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
             }
 
             return null;
         }
 
-        public TextureData newTextureData(URL url,
+        public TextureData newTextureData(GLProfile glp, URL url,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
                                           String fileSuffix) throws IOException {
             InputStream stream = new BufferedInputStream(url.openStream());
             try {
-                return newTextureData(stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
             } finally {
                 stream.close();
             }
         }
 
-        private TextureData newTextureData(final DDSImage image,
+        private TextureData newTextureData(GLProfile glp, final DDSImage image,
                                            int internalFormat,
                                            int pixelFormat,
                                            boolean mipmap) {
@@ -937,7 +952,7 @@ public class TextureIO {
                 for (int i = 0; i < image.getNumMipMaps(); i++) {
                     mipmapData[i] = image.getMipMap(i).getData();
                 }
-                data = new TextureData(internalFormat,
+                data = new TextureData(glp, internalFormat,
                                        info.getWidth(),
                                        info.getHeight(),
                                        0,
@@ -951,7 +966,7 @@ public class TextureIO {
                 // Fix this up for the end user because we can't generate
                 // mipmaps for compressed textures
                 mipmap = false;
-                data = new TextureData(internalFormat,
+                data = new TextureData(glp, internalFormat,
                                        info.getWidth(),
                                        info.getHeight(),
                                        0,
@@ -970,7 +985,7 @@ public class TextureIO {
     //----------------------------------------------------------------------
     // Base class for SGI RGB and TGA image providers
     static abstract class StreamBasedTextureProvider implements TextureProvider {
-        public TextureData newTextureData(File file,
+        public TextureData newTextureData(GLProfile glp, File file,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
@@ -980,7 +995,7 @@ public class TextureIO {
                 // The SGIImage and TGAImage implementations use InputStreams
                 // anyway so there isn't much point in having a separate code
                 // path for files
-                return newTextureData(inStream,
+                return newTextureData(glp, inStream,
                                       internalFormat,
                                       pixelFormat,
                                       mipmap,
@@ -990,14 +1005,14 @@ public class TextureIO {
             }
         }
 
-        public TextureData newTextureData(URL url,
+        public TextureData newTextureData(GLProfile glp, URL url,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
                                           String fileSuffix) throws IOException {
             InputStream stream = new BufferedInputStream(url.openStream());
             try {
-                return newTextureData(stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
             } finally {
                 stream.close();
             }
@@ -1007,7 +1022,7 @@ public class TextureIO {
     //----------------------------------------------------------------------
     // SGI RGB image provider
     static class SGITextureProvider extends StreamBasedTextureProvider {
-        public TextureData newTextureData(InputStream stream,
+        public TextureData newTextureData(GLProfile glp, InputStream stream,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
@@ -1022,7 +1037,7 @@ public class TextureIO {
                 if (internalFormat == 0) {
                     internalFormat = image.getFormat();
                 }
-                return new TextureData(internalFormat,
+                return new TextureData(glp, internalFormat,
                                        image.getWidth(),
                                        image.getHeight(),
                                        0,
@@ -1042,7 +1057,7 @@ public class TextureIO {
     //----------------------------------------------------------------------
     // TGA (Targa) image provider
     static class TGATextureProvider extends StreamBasedTextureProvider {
-        public TextureData newTextureData(InputStream stream,
+        public TextureData newTextureData(GLProfile glp, InputStream stream,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
@@ -1060,7 +1075,7 @@ public class TextureIO {
                         internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB;
                     }
                 }
-                return new TextureData(internalFormat,
+                return new TextureData(glp, internalFormat,
                                        image.getWidth(),
                                        image.getHeight(),
                                        0,
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase b/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase
index 556d51343..034a850bd 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase
+++ b/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase
@@ -155,6 +155,8 @@ public class TextureIO {
     /**
      * Creates a TextureData from the given file. Does no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param file the file from which to read the texture data
      * @param mipmap     whether mipmaps should be produced for this
      *                   texture either by autogenerating them or
@@ -171,18 +173,20 @@ public class TextureIO {
      *         registered texture providers could read the file
      * @throws IOException if an error occurred while reading the file
      */
-    public static TextureData newTextureData(File file,
+    public static TextureData newTextureData(GLProfile glp, File file,
                                              boolean mipmap,
                                              String fileSuffix) throws IOException {
         if (fileSuffix == null) {
             fileSuffix = FileUtil.getFileSuffix(file);
         }
-        return newTextureDataImpl(file, 0, 0, mipmap, fileSuffix);
+        return newTextureDataImpl(glp, file, 0, 0, mipmap, fileSuffix);
     }
 
     /**
      * Creates a TextureData from the given stream. Does no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param stream the stream from which to read the texture data
      * @param mipmap     whether mipmaps should be produced for this
      *                   texture either by autogenerating them or
@@ -199,15 +203,17 @@ public class TextureIO {
      *         registered texture providers could read the stream
      * @throws IOException if an error occurred while reading the stream
      */
-    public static TextureData newTextureData(InputStream stream,
+    public static TextureData newTextureData(GLProfile glp, InputStream stream,
                                              boolean mipmap,
                                              String fileSuffix) throws IOException {
-        return newTextureDataImpl(stream, 0, 0, mipmap, fileSuffix);
+        return newTextureDataImpl(glp, stream, 0, 0, mipmap, fileSuffix);
     }
 
     /**
      * Creates a TextureData from the given URL. Does no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param url the URL from which to read the texture data
      * @param mipmap     whether mipmaps should be produced for this
      *                   texture either by autogenerating them or
@@ -224,13 +230,13 @@ public class TextureIO {
      *         registered texture providers could read the URL
      * @throws IOException if an error occurred while reading the URL
      */
-    public static TextureData newTextureData(URL url,
+    public static TextureData newTextureData(GLProfile glp, URL url,
                                              boolean mipmap,
                                              String fileSuffix) throws IOException {
         if (fileSuffix == null) {
             fileSuffix = FileUtil.getFileSuffix(url.getPath());
         }
-        return newTextureDataImpl(url, 0, 0, mipmap, fileSuffix);
+        return newTextureDataImpl(glp, url, 0, 0, mipmap, fileSuffix);
     }
 
     //----------------------------------------------------------------------
@@ -248,6 +254,8 @@ public class TextureIO {
      * variant of this method which does not take these arguments. Does
      * no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param file the file from which to read the texture data
      * @param internalFormat the OpenGL internal format of the texture
      *                   which will eventually result from the TextureData
@@ -270,7 +278,7 @@ public class TextureIO {
      *                                  pixelFormat was 0
      * @throws IOException if an error occurred while reading the file
      */
-    public static TextureData newTextureData(File file,
+    public static TextureData newTextureData(GLProfile glp, File file,
                                              int internalFormat,
                                              int pixelFormat,
                                              boolean mipmap,
@@ -283,7 +291,7 @@ public class TextureIO {
             fileSuffix = FileUtil.getFileSuffix(file);
         }
 
-        return newTextureDataImpl(file, internalFormat, pixelFormat, mipmap, fileSuffix);
+        return newTextureDataImpl(glp, file, internalFormat, pixelFormat, mipmap, fileSuffix);
     }
 
     /**
@@ -294,6 +302,8 @@ public class TextureIO {
      * variant of this method which does not take these arguments. Does
      * no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param stream the stream from which to read the texture data
      * @param internalFormat the OpenGL internal format of the texture
      *                   which will eventually result from the TextureData
@@ -316,7 +326,7 @@ public class TextureIO {
      *                                  pixelFormat was 0
      * @throws IOException if an error occurred while reading the stream
      */
-    public static TextureData newTextureData(InputStream stream,
+    public static TextureData newTextureData(GLProfile glp, InputStream stream,
                                              int internalFormat,
                                              int pixelFormat,
                                              boolean mipmap,
@@ -325,7 +335,7 @@ public class TextureIO {
             throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
         }
 
-        return newTextureDataImpl(stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+        return newTextureDataImpl(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
     }
 
     /**
@@ -336,6 +346,8 @@ public class TextureIO {
      * variant of this method which does not take these arguments. Does
      * no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param url the URL from which to read the texture data
      * @param internalFormat the OpenGL internal format of the texture
      *                   which will eventually result from the TextureData
@@ -358,7 +370,7 @@ public class TextureIO {
      *                                  pixelFormat was 0
      * @throws IOException if an error occurred while reading the URL
      */
-    public static TextureData newTextureData(URL url,
+    public static TextureData newTextureData(GLProfile glp, URL url,
                                              int internalFormat,
                                              int pixelFormat,
                                              boolean mipmap,
@@ -371,7 +383,7 @@ public class TextureIO {
             fileSuffix = FileUtil.getFileSuffix(url.getPath());
         }
 
-        return newTextureDataImpl(url, internalFormat, pixelFormat, mipmap, fileSuffix);
+        return newTextureDataImpl(glp, url, internalFormat, pixelFormat, mipmap, fileSuffix);
     }
 
     //----------------------------------------------------------------------
@@ -410,7 +422,8 @@ public class TextureIO {
      *                     OpenGL error occurred
      */
     public static Texture newTexture(File file, boolean mipmap) throws IOException, GLException {
-        TextureData data = newTextureData(file, mipmap, FileUtil.getFileSuffix(file));
+        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        TextureData data = newTextureData(glp, file, mipmap, FileUtil.getFileSuffix(file));
         Texture texture = newTexture(data);
         data.flush();
         return texture;
@@ -437,7 +450,8 @@ public class TextureIO {
      *                     OpenGL error occurred
      */
     public static Texture newTexture(InputStream stream, boolean mipmap, String fileSuffix) throws IOException, GLException {
-        TextureData data = newTextureData(stream, mipmap, fileSuffix);
+        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        TextureData data = newTextureData(glp, stream, mipmap, fileSuffix);
         Texture texture = newTexture(data);
         data.flush();
         return texture;
@@ -467,7 +481,8 @@ public class TextureIO {
         if (fileSuffix == null) {
             fileSuffix = FileUtil.getFileSuffix(url.getPath());
         }
-        TextureData data = newTextureData(url, mipmap, fileSuffix);
+        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        TextureData data = newTextureData(glp, url, mipmap, fileSuffix);
         Texture texture = newTexture(data);
         data.flush();
         return texture;
@@ -580,7 +595,7 @@ public class TextureIO {
             int size   = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_COMPRESSED_IMAGE_SIZE);
             ByteBuffer res = ByteBuffer.allocate(size);
             gl.glGetCompressedTexImage(GL.GL_TEXTURE_2D, 0, res);
-            data = new TextureData(internalFormat, width, height, border, internalFormat, GL.GL_UNSIGNED_BYTE,
+            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, internalFormat, GL.GL_UNSIGNED_BYTE,
                                    false, true, true, res, null);
         } else {
             int bytesPerPixel = 0;
@@ -631,7 +646,7 @@ public class TextureIO {
             gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, packSkipPixels);
             gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, packSwapBytes);
       
-            data = new TextureData(internalFormat, width, height, border, fetchedFormat, GL.GL_UNSIGNED_BYTE,
+            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, fetchedFormat, GL.GL_UNSIGNED_BYTE,
                                    false, false, false, res, null);
 
             if (DEBUG) {
@@ -758,7 +773,7 @@ public class TextureIO {
     }
 
     // Implementation methods
-    private static TextureData newTextureDataImpl(File file,
+    private static TextureData newTextureDataImpl(GLProfile glp, File file,
                                                   int internalFormat,
                                                   int pixelFormat,
                                                   boolean mipmap,
@@ -771,7 +786,7 @@ public class TextureIO {
 
         for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
             TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(file,
+            TextureData data = provider.newTextureData(glp, file,
                                                        internalFormat,
                                                        pixelFormat,
                                                        mipmap,
@@ -784,7 +799,7 @@ public class TextureIO {
         throw new IOException("No suitable reader for given file "+file.getAbsolutePath());
     }
 
-    private static TextureData newTextureDataImpl(InputStream stream,
+    private static TextureData newTextureDataImpl(GLProfile glp, InputStream stream,
                                                   int internalFormat,
                                                   int pixelFormat,
                                                   boolean mipmap,
@@ -802,7 +817,7 @@ public class TextureIO {
 
         for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
             TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(stream,
+            TextureData data = provider.newTextureData(glp, stream,
                                                        internalFormat,
                                                        pixelFormat,
                                                        mipmap,
@@ -815,7 +830,7 @@ public class TextureIO {
         throw new IOException("No suitable reader for given stream");
     }
 
-    private static TextureData newTextureDataImpl(URL url,
+    private static TextureData newTextureDataImpl(GLProfile glp, URL url,
                                                   int internalFormat,
                                                   int pixelFormat,
                                                   boolean mipmap,
@@ -828,7 +843,7 @@ public class TextureIO {
 
         for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
             TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(url,
+            TextureData data = provider.newTextureData(glp, url,
                                                        internalFormat,
                                                        pixelFormat,
                                                        mipmap,
@@ -844,7 +859,7 @@ public class TextureIO {
     //----------------------------------------------------------------------
     // DDS provider -- supports files only for now
     static class DDSTextureProvider implements TextureProvider {
-        public TextureData newTextureData(File file,
+        public TextureData newTextureData(GLProfile glp, File file,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
@@ -852,13 +867,13 @@ public class TextureIO {
             if (DDS.equals(fileSuffix) ||
                 DDS.equals(FileUtil.getFileSuffix(file))) {
                 DDSImage image = DDSImage.read(file);
-                return newTextureData(image, internalFormat, pixelFormat, mipmap);
+                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
             }
 
             return null;
         }
 
-        public TextureData newTextureData(InputStream stream,
+        public TextureData newTextureData(GLProfile glp, InputStream stream,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
@@ -868,26 +883,26 @@ public class TextureIO {
                 byte[] data = StreamUtil.readAll2Array(stream);
                 ByteBuffer buf = ByteBuffer.wrap(data);
                 DDSImage image = DDSImage.read(buf);
-                return newTextureData(image, internalFormat, pixelFormat, mipmap);
+                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
             }
 
             return null;
         }
 
-        public TextureData newTextureData(URL url,
+        public TextureData newTextureData(GLProfile glp, URL url,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
                                           String fileSuffix) throws IOException {
             InputStream stream = new BufferedInputStream(url.openStream());
             try {
-                return newTextureData(stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
             } finally {
                 stream.close();
             }
         }
 
-        private TextureData newTextureData(final DDSImage image,
+        private TextureData newTextureData(GLProfile glp, final DDSImage image,
                                            int internalFormat,
                                            int pixelFormat,
                                            boolean mipmap) {
@@ -939,7 +954,7 @@ public class TextureIO {
                 for (int i = 0; i < image.getNumMipMaps(); i++) {
                     mipmapData[i] = image.getMipMap(i).getData();
                 }
-                data = new TextureData(internalFormat,
+                data = new TextureData(glp, internalFormat,
                                        info.getWidth(),
                                        info.getHeight(),
                                        0,
@@ -953,7 +968,7 @@ public class TextureIO {
                 // Fix this up for the end user because we can't generate
                 // mipmaps for compressed textures
                 mipmap = false;
-                data = new TextureData(internalFormat,
+                data = new TextureData(glp, internalFormat,
                                        info.getWidth(),
                                        info.getHeight(),
                                        0,
@@ -972,7 +987,7 @@ public class TextureIO {
     //----------------------------------------------------------------------
     // Base class for SGI RGB and TGA image providers
     static abstract class StreamBasedTextureProvider implements TextureProvider {
-        public TextureData newTextureData(File file,
+        public TextureData newTextureData(GLProfile glp, File file,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
@@ -982,7 +997,7 @@ public class TextureIO {
                 // The SGIImage and TGAImage implementations use InputStreams
                 // anyway so there isn't much point in having a separate code
                 // path for files
-                return newTextureData(inStream,
+                return newTextureData(glp, inStream,
                                       internalFormat,
                                       pixelFormat,
                                       mipmap,
@@ -992,14 +1007,14 @@ public class TextureIO {
             }
         }
 
-        public TextureData newTextureData(URL url,
+        public TextureData newTextureData(GLProfile glp, URL url,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
                                           String fileSuffix) throws IOException {
             InputStream stream = new BufferedInputStream(url.openStream());
             try {
-                return newTextureData(stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
             } finally {
                 stream.close();
             }
@@ -1009,7 +1024,7 @@ public class TextureIO {
     //----------------------------------------------------------------------
     // SGI RGB image provider
     static class SGITextureProvider extends StreamBasedTextureProvider {
-        public TextureData newTextureData(InputStream stream,
+        public TextureData newTextureData(GLProfile glp, InputStream stream,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
@@ -1024,7 +1039,7 @@ public class TextureIO {
                 if (internalFormat == 0) {
                     internalFormat = image.getFormat();
                 }
-                return new TextureData(internalFormat,
+                return new TextureData(glp, internalFormat,
                                        image.getWidth(),
                                        image.getHeight(),
                                        0,
@@ -1044,7 +1059,7 @@ public class TextureIO {
     //----------------------------------------------------------------------
     // TGA (Targa) image provider
     static class TGATextureProvider extends StreamBasedTextureProvider {
-        public TextureData newTextureData(InputStream stream,
+        public TextureData newTextureData(GLProfile glp, InputStream stream,
                                           int internalFormat,
                                           int pixelFormat,
                                           boolean mipmap,
@@ -1062,7 +1077,7 @@ public class TextureIO {
                         internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB;
                     }
                 }
-                return new TextureData(internalFormat,
+                return new TextureData(glp, internalFormat,
                                        image.getWidth(),
                                        image.getHeight(),
                                        0,
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java b/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java
index e949883ed..f98feb8e9 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java
+++ b/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java
@@ -56,9 +56,6 @@ public class AWTTextureData extends TextureData {
     private boolean expectingEXTABGR;
     private boolean expectingGL12;
 
-    private int scanlineStride;
-    private BufferedImage glDependingImage; // indicator wheather GL depening initialization has been passed
-
     private static final ColorModel rgbaColorModel =
         new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
                                 new int[] {8, 8, 8, 8}, true, true, 
@@ -80,6 +77,8 @@ public class AWTTextureData extends TextureData {
      * TextureData, that modification will be visible in the resulting
      * Texture.
      *
+     * @param glp      the OpenGL Profile this texture data should be
+     *                       created for.
      * @param internalFormat the OpenGL internal format for the
      *                       resulting texture; may be 0, in which case
      *                       it is inferred from the image's type
@@ -92,24 +91,31 @@ public class AWTTextureData extends TextureData {
      *                       texture
      * @param image          the image containing the texture data
      */
-    public AWTTextureData(int internalFormat,
+    public AWTTextureData(GLProfile glp, 
+                          int internalFormat,
                           int pixelFormat,
                           boolean mipmap,
                           BufferedImage image) {
-        super();
+        super(glp);
         if (internalFormat == 0) {
             this.internalFormat = image.getColorModel().hasAlpha() ? GL.GL_RGBA : GL.GL_RGB;
         } else {
             this.internalFormat = internalFormat;
         }
-        createFromImagePre(image);
-
+        createFromImage(glp, image);
         this.mipmap = mipmap;
+        if (buffer != null) {
+            estimatedMemorySize = estimatedMemorySize(buffer);
+        } else {
+            // In the lazy custom conversion case we don't yet have a buffer
+            if (imageForLazyCustomConversion != null) {
+                estimatedMemorySize = estimatedMemorySize(wrapImageDataBuffer(imageForLazyCustomConversion));
+            }
+        }
     }
 
     /** Returns the intended OpenGL pixel format of the texture data. */
     public int getPixelFormat() {
-        glPostInitInt();
         if (imageForLazyCustomConversion != null) {
             if (!((expectingEXTABGR && haveEXTABGR) ||
                   (expectingGL12    && haveGL12))) {
@@ -120,7 +126,6 @@ public class AWTTextureData extends TextureData {
     }
     /** Returns the intended OpenGL pixel type of the texture data. */
     public int getPixelType() {
-        glPostInitInt();
         if (imageForLazyCustomConversion != null) {
             if (!((expectingEXTABGR && haveEXTABGR) ||
                   (expectingGL12    && haveGL12))) {
@@ -132,7 +137,6 @@ public class AWTTextureData extends TextureData {
 
     /** Returns the texture data, or null if it is specified as a set of mipmaps. */
     public Buffer getBuffer() {
-        glPostInitInt();
         if (imageForLazyCustomConversion != null) {
             if (!((expectingEXTABGR && haveEXTABGR) ||
                   (expectingGL12    && haveGL12))) {
@@ -145,13 +149,15 @@ public class AWTTextureData extends TextureData {
         return buffer;
     }
 
-    private void createFromImagePre(BufferedImage image) {
+    private void createFromImage(GLProfile glp, BufferedImage image) {
         pixelType = 0; // Determine from image
         mustFlipVertically = true;
 
         width = image.getWidth();
         height = image.getHeight();
 
+        int scanlineStride;
+
         SampleModel sm = image.getRaster().getSampleModel();
         if (sm instanceof SinglePixelPackedSampleModel) {
             scanlineStride =
@@ -167,36 +173,23 @@ public class AWTTextureData extends TextureData {
             setupLazyCustomConversion(image);
             return;
         }
-        glDependingImage = image; // earmark for post init
-    }
-
-    protected void glPostInit() {
-        if(null == glDependingImage) return; 
-
-        GLContext current = GLContext.getCurrent();
-        if(null == current) return;
-
-        BufferedImage image = glDependingImage;
-        glDependingImage = null;
-
-        GLProfile glp = current.getGL().getGLProfile();
 
         width = image.getWidth();
         height = image.getHeight();
 
-        if (glp.isGL2()) {
+        if (glp.isGL2GL3()) {
             switch (image.getType()) {
                 case BufferedImage.TYPE_INT_RGB:
-                    pixelFormat = GL2.GL_BGRA;
-                    pixelType = GL2.GL_UNSIGNED_INT_8_8_8_8_REV;
+                    pixelFormat = GL2GL3.GL_BGRA;
+                    pixelType = GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV;
                     rowLength = scanlineStride;
                     alignment = 4;
                     expectingGL12 = true;
                     setupLazyCustomConversion(image);
                     break;
                 case BufferedImage.TYPE_INT_ARGB_PRE:
-                    pixelFormat = GL2.GL_BGRA;
-                    pixelType = GL2.GL_UNSIGNED_INT_8_8_8_8_REV;
+                    pixelFormat = GL2GL3.GL_BGRA;
+                    pixelType = GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV;
                     rowLength = scanlineStride;
                     alignment = 4;
                     expectingGL12 = true;
@@ -204,7 +197,7 @@ public class AWTTextureData extends TextureData {
                     break;
                 case BufferedImage.TYPE_INT_BGR:
                     pixelFormat = GL.GL_RGBA;
-                    pixelType = GL2.GL_UNSIGNED_INT_8_8_8_8_REV;
+                    pixelType = GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV;
                     rowLength = scanlineStride;
                     alignment = 4;
                     expectingGL12 = true;
@@ -215,7 +208,7 @@ public class AWTTextureData extends TextureData {
                         // we can pass the image data directly to OpenGL only if
                         // we have an integral number of pixels in each scanline
                         if ((scanlineStride % 3) == 0) {
-                            pixelFormat = GL2.GL_BGR;
+                            pixelFormat = GL2GL3.GL_BGR;
                             pixelType = GL.GL_UNSIGNED_BYTE;
                             rowLength = scanlineStride / 3;
                             alignment = 1;
@@ -235,7 +228,7 @@ public class AWTTextureData extends TextureData {
                         // buggy at least on some NVidia drivers and doesn't perform
                         // the necessary byte swapping (FIXME: needs more
                         // investigation)
-                        if ((scanlineStride % 4) == 0 && false) {
+                        if ((scanlineStride % 4) == 0 && glp.isGL2() && false) {
                             pixelFormat = GL2.GL_ABGR_EXT;
                             pixelType = GL.GL_UNSIGNED_BYTE;
                             rowLength = scanlineStride / 4;
@@ -261,8 +254,8 @@ public class AWTTextureData extends TextureData {
                     setupLazyCustomConversion(image);
                     break;
                 case BufferedImage.TYPE_USHORT_555_RGB:
-                    pixelFormat = GL2.GL_BGRA;
-                    pixelType = GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV;
+                    pixelFormat = GL2GL3.GL_BGRA;
+                    pixelType = GL2GL3.GL_UNSIGNED_SHORT_1_5_5_5_REV;
                     rowLength = scanlineStride;
                     alignment = 2;
                     expectingGL12 = true;
@@ -377,15 +370,6 @@ public class AWTTextureData extends TextureData {
         }
 
         createNIOBufferFromImage(image);
-
-        if (buffer != null) {
-            estimatedMemorySize = estimatedMemorySize(buffer);
-        } else {
-            // In the lazy custom conversion case we don't yet have a buffer
-            if (imageForLazyCustomConversion != null) {
-                estimatedMemorySize = estimatedMemorySize(wrapImageDataBuffer(imageForLazyCustomConversion));
-            }
-        }
     }
 
     private void setupLazyCustomConversion(BufferedImage image) {
@@ -409,7 +393,7 @@ public class AWTTextureData extends TextureData {
             if (pixelType == 0) pixelType = GL.GL_FLOAT;
         } else if (data instanceof DataBufferInt) {
             // FIXME: should we support signed ints?
-            if (pixelType == 0) pixelType = GL2.GL_UNSIGNED_INT;
+            if (pixelType == 0) pixelType = GL2GL3.GL_UNSIGNED_INT;
         } else if (data instanceof DataBufferShort) {
             if (pixelType == 0) pixelType = GL.GL_SHORT;
         } else if (data instanceof DataBufferUShort) {
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureIO.java b/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureIO.java
index 490d150cc..182810174 100644
--- a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureIO.java
+++ b/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureIO.java
@@ -48,15 +48,20 @@ public class AWTTextureIO extends TextureIO {
     /**
      * Creates a TextureData from the given BufferedImage. Does no
      * OpenGL work.
+     * We assume a desktop GLProfile GL2GL3, otherwise use the other factory.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param image the BufferedImage containing the texture data
      * @param mipmap     whether mipmaps should be produced for this
      *                   texture by autogenerating them
      * @return the texture data from the image
+     *
+     * @see #newTextureData(GLProfile, BufferedImage, boolean)
      */
-    public static TextureData newTextureData(BufferedImage image,
+    public static TextureData newTextureData(GLProfile glp, BufferedImage image,
                                              boolean mipmap) {
-        return newTextureDataImpl(image, 0, 0, mipmap);
+        return newTextureDataImpl(glp, image, 0, 0, mipmap);
     }
 
     /**
@@ -67,6 +72,8 @@ public class AWTTextureIO extends TextureIO {
      * the variant of this method which does not take these
      * arguments. Does no OpenGL work.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param image the BufferedImage containing the texture data
      * @param internalFormat the OpenGL internal format of the texture
      *                   which will eventually result from the TextureData
@@ -82,7 +89,7 @@ public class AWTTextureIO extends TextureIO {
      * @throws IllegalArgumentException if either internalFormat or
      *                                  pixelFormat was 0
      */
-    public static TextureData newTextureData(BufferedImage image,
+    public static TextureData newTextureData(GLProfile glp, BufferedImage image,
                                              int internalFormat,
                                              int pixelFormat,
                                              boolean mipmap) throws IllegalArgumentException {
@@ -90,30 +97,33 @@ public class AWTTextureIO extends TextureIO {
             throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
         }
 
-        return newTextureDataImpl(image, internalFormat, pixelFormat, mipmap);
+        return newTextureDataImpl(glp, image, internalFormat, pixelFormat, mipmap);
     }
 
     /** 
      * Creates an OpenGL texture object from the specified BufferedImage
      * using the current OpenGL context.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param image the BufferedImage from which to read the texture data
      * @param mipmap     whether mipmaps should be produced for this
      *                   texture by autogenerating them
      * @throws GLException if no OpenGL context is current or if an
      *                     OpenGL error occurred
      */
-    public static Texture newTexture(BufferedImage image, boolean mipmap) throws GLException {
-        TextureData data = newTextureData(image, mipmap);
+    public static Texture newTexture(GLProfile glp, BufferedImage image, boolean mipmap) throws GLException {
+        TextureData data = newTextureData(glp, image, mipmap);
         Texture texture = newTexture(data);
         data.flush();
         return texture;
     }
 
-    private static TextureData newTextureDataImpl(BufferedImage image,
+    private static TextureData newTextureDataImpl(GLProfile glp, 
+                                                  BufferedImage image,
                                                   int internalFormat,
                                                   int pixelFormat,
                                                   boolean mipmap) {
-        return new AWTTextureData(internalFormat, pixelFormat, mipmap, image);
+        return new AWTTextureData(glp, internalFormat, pixelFormat, mipmap, image);
     }
 }
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureProvider.java b/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureProvider.java
index baa087289..afc6a998e 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureProvider.java
+++ b/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureProvider.java
@@ -41,6 +41,7 @@ package com.sun.opengl.util.texture.spi;
 
 import java.io.*;
 import java.net.*;
+import javax.media.opengl.GLProfile;
 
 import com.sun.opengl.util.texture.*;
 
@@ -58,6 +59,8 @@ public interface TextureProvider {
      * do any OpenGL-related work. The resulting TextureData can be
      * converted into an OpenGL texture in a later step.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param file         the file from which to read the texture data
      *
      * @param internalFormat the OpenGL internal format to be used for
@@ -83,7 +86,7 @@ public interface TextureProvider {
      *
      * @throws IOException if an error occurred while reading the file
      */
-    public TextureData newTextureData(File file,
+    public TextureData newTextureData(GLProfile glp, File file,
                                       int internalFormat,
                                       int pixelFormat,
                                       boolean mipmap,
@@ -95,6 +98,8 @@ public interface TextureProvider {
      * not do any OpenGL-related work. The resulting TextureData can be
      * converted into an OpenGL texture in a later step.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param stream       the stream from which to read the texture data
      *
      * @param internalFormat the OpenGL internal format to be used for
@@ -120,7 +125,7 @@ public interface TextureProvider {
      *
      * @throws IOException if an error occurred while reading the stream
      */
-    public TextureData newTextureData(InputStream stream,
+    public TextureData newTextureData(GLProfile glp, InputStream stream,
                                       int internalFormat,
                                       int pixelFormat,
                                       boolean mipmap,
@@ -132,6 +137,8 @@ public interface TextureProvider {
      * do any OpenGL-related work. The resulting TextureData can be
      * converted into an OpenGL texture in a later step.
      *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
      * @param url          the URL from which to read the texture data
      *
      * @param internalFormat the OpenGL internal format to be used for
@@ -157,7 +164,7 @@ public interface TextureProvider {
      *
      * @throws IOException if an error occurred while reading the URL
      */
-    public TextureData newTextureData(URL url,
+    public TextureData newTextureData(GLProfile glp, URL url,
                                       int internalFormat,
                                       int pixelFormat,
                                       boolean mipmap,
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureProvider.java b/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureProvider.java
index 0244db285..f025ba591 100644
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureProvider.java
+++ b/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureProvider.java
@@ -44,6 +44,7 @@ import java.awt.image.*;
 import java.io.*;
 import java.net.*;
 import javax.imageio.*;
+import javax.media.opengl.GLProfile;
 
 import com.sun.opengl.impl.Debug;
 import com.sun.opengl.util.texture.*;
@@ -53,7 +54,7 @@ import com.sun.opengl.util.texture.spi.*;
 public class IIOTextureProvider implements TextureProvider {
     private static final boolean DEBUG = Debug.debug("TextureIO");
 
-    public TextureData newTextureData(File file,
+    public TextureData newTextureData(GLProfile glp, File file,
                                       int internalFormat,
                                       int pixelFormat,
                                       boolean mipmap,
@@ -66,10 +67,10 @@ public class IIOTextureProvider implements TextureProvider {
             System.out.println("TextureIO.newTextureData(): BufferedImage type for " + file + " = " +
                                img.getType());
         }
-        return new AWTTextureData(internalFormat, pixelFormat, mipmap, img);
+        return new AWTTextureData(glp, internalFormat, pixelFormat, mipmap, img);
     }
 
-    public TextureData newTextureData(InputStream stream,
+    public TextureData newTextureData(GLProfile glp, InputStream stream,
                                       int internalFormat,
                                       int pixelFormat,
                                       boolean mipmap,
@@ -82,17 +83,17 @@ public class IIOTextureProvider implements TextureProvider {
             System.out.println("TextureIO.newTextureData(): BufferedImage type for stream = " +
                                img.getType());
         }
-        return new AWTTextureData(internalFormat, pixelFormat, mipmap, img);
+        return new AWTTextureData(glp, internalFormat, pixelFormat, mipmap, img);
     }
 
-    public TextureData newTextureData(URL url,
+    public TextureData newTextureData(GLProfile glp, URL url,
                                       int internalFormat,
                                       int pixelFormat,
                                       boolean mipmap,
                                       String fileSuffix) throws IOException {
         InputStream stream = url.openStream();
         try {
-            return newTextureData(stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+            return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
         } finally {
             stream.close();
         }
diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
index 3157388e9..9772d1a99 100755
--- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
+++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
@@ -34,6 +34,8 @@ package com.jogamp.opengl.test.junit.texture.awt;
 
 import com.jogamp.opengl.test.junit.texture.util.gl2.TextureGL2ListenerDraw1;
 
+import javax.media.opengl.GLProfile;
+import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2ES1;
 import javax.media.opengl.GL2;
@@ -92,12 +94,13 @@ public class Texture1 {
 
     @Test
     public void test1() {
-        GLCanvas glCanvas = new GLCanvas();
+        GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2GL3));
+        GLCanvas glCanvas = new GLCanvas(caps);
         frame.add(glCanvas);
         frame.setSize(512, 512);
 
         // create texture    
-        TextureData textureData = AWTTextureIO.newTextureData(textureImage, false);
+        TextureData textureData = AWTTextureIO.newTextureData(caps.getGLProfile(), textureImage, false);
         glCanvas.addGLEventListener(new TextureGL2ListenerDraw1(textureData));
 
         Animator animator = new Animator(glCanvas);
-- 
cgit v1.2.3


From 4a457c98983b4f58c2a639f49ef9e79beaecd5c0 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Fri, 26 Mar 2010 19:24:35 +0100
Subject: fixed compiler error in TextureRenderer.

---
 src/jogl/classes/com/sun/opengl/util/awt/TextureRenderer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jogl/classes/com/sun/opengl/util/awt/TextureRenderer.java b/src/jogl/classes/com/sun/opengl/util/awt/TextureRenderer.java
index 1f6393d39..86ea1dbc7 100755
--- a/src/jogl/classes/com/sun/opengl/util/awt/TextureRenderer.java
+++ b/src/jogl/classes/com/sun/opengl/util/awt/TextureRenderer.java
@@ -631,7 +631,7 @@ public class TextureRenderer {
     // BufferedImage; it's just a reference to the contents but we
     // need it in order to update sub-regions of the underlying
     // texture
-    textureData = new AWTTextureData(internalFormat, 0, mipmap, image);
+    textureData = new AWTTextureData(gl.getGLProfile(), internalFormat, 0, mipmap, image);
     // For now, always reallocate the underlying OpenGL texture when
     // the backing store size changes
     mustReallocateTexture = true;
-- 
cgit v1.2.3


From cf95674e16d34a85191d3af0a35d1357e011fcac Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 26 Mar 2010 22:24:34 +0100
Subject: http://www.jogamp.org/bugzilla/show_bug.cgi?id=391

As shown below, the concurrent access of GLStateTracker
while being cleared by GLContext.destroy() causes a NPE.

GLContext.destroy() shall disable it first, then clear it.

The state stack pop method shall also swap the mapping
with a most atomic action.

Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException
        at com.sun.opengl.impl.GLStateTracker.getInt(GLStateTracker.java:94)
        at com.sun.opengl.impl.gl2.GL2Impl.glGetIntegerv(GL2Impl.java:6102)
        at com.sun.opengl.impl.gl2.GL2Impl.imageSizeInBytes(GL2Impl.java:26000)
        at com.sun.opengl.impl.gl2.GL2Impl.imageSizeInBytes(GL2Impl.java:25713)
        at com.sun.opengl.impl.gl2.GL2Impl.glTexImage2D(GL2Impl.java:18692)
        at glredbook1314.combiner.init(combiner.java:104)
        at com.sun.opengl.impl.GLDrawableHelper.init(GLDrawableHelper.java:88)
        at javax.media.opengl.awt.GLJPanel$Updater.init(GLJPanel.java:557)
        at com.sun.opengl.impl.GLDrawableHelper.init(GLDrawableHelper.java:88)
        at
com.sun.opengl.impl.GLPbufferImpl$InitAction.run(GLPbufferImpl.java:274)
        at
com.sun.opengl.impl.GLDrawableHelper.invokeGL(GLDrawableHelper.java:149)
        at
com.sun.opengl.impl.GLPbufferImpl.maybeDoSingleThreadedWorkaround(GLPbufferImpl.java:267)
        at
com.sun.opengl.impl.GLPbufferImpl.swapBuffers(GLPbufferImpl.java:157)
        at
com.sun.opengl.impl.GLDrawableHelper.invokeGL(GLDrawableHelper.java:159)
        at javax.media.opengl.awt.GLJPanel.dispose(GLJPanel.java:238)

+++
---
 .../classes/com/sun/opengl/impl/GLContextImpl.java |  2 +-
 .../com/sun/opengl/impl/GLStateTracker.java        | 27 ++++++++++++++++------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java
index 97100208d..1d500bb17 100644
--- a/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java
+++ b/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java
@@ -240,7 +240,7 @@ public abstract class GLContextImpl extends GLContext {
       }
   
       if (glStateTracker != null) {
-          glStateTracker.clearStates();
+          glStateTracker.clearStates(false);
       }
   
       destroyImpl();
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLStateTracker.java b/src/jogl/classes/com/sun/opengl/impl/GLStateTracker.java
index 698d20c47..d28d39f7f 100755
--- a/src/jogl/classes/com/sun/opengl/impl/GLStateTracker.java
+++ b/src/jogl/classes/com/sun/opengl/impl/GLStateTracker.java
@@ -52,7 +52,7 @@ import javax.media.opengl.*;
 public class GLStateTracker {
   private static final boolean DEBUG = Debug.debug("GLStateTracker");
 
-  private boolean enabled = true;
+  private volatile boolean enabled = true;
 
   private Map/*<Integer,Integer>*/ pixelStateMap = new HashMap/*<Integer,Integer>*/();
 
@@ -75,7 +75,8 @@ public class GLStateTracker {
     resetStates();
   }
 
-  public void clearStates() {
+  public void clearStates(boolean enable) {
+    enabled = enable;    
     pixelStateMap.clear();
   }
 
@@ -91,7 +92,13 @@ public class GLStateTracker {
     if(enabled) {
         Integer key = boxKey(pname);
         if(null!=key) {
-            params[params_offset] = ((Integer) pixelStateMap.get(key)).intValue();
+            Integer value = (Integer) pixelStateMap.get(key);
+            if(null!=value) {
+                params[params_offset] = value.intValue();
+            } else {
+                GLException re = new GLException("Key (0x"+Integer.toHexString(key.intValue())+") is not mapped");
+                throw re;
+            }
             return true;
         }
     }
@@ -102,7 +109,13 @@ public class GLStateTracker {
     if(enabled) {
         Integer key = boxKey(pname);
         if(null!=key) {
-            params.put(params.position(), ((Integer) pixelStateMap.get(key)).intValue());
+            Integer value = (Integer) pixelStateMap.get(key);
+            if(null!=value) {
+                params.put(params.position(), value.intValue());
+            } else {
+                GLException re = new GLException("Key (0x"+Integer.toHexString(key.intValue())+") is not mapped");
+                throw re;
+            }
             return true;
         }
     }
@@ -138,11 +151,11 @@ public class GLStateTracker {
             throw new GLException("null stack element (remaining stack size "+stack.size()+")");
         }
 
-        clearStates();
-
+        Map/*<Integer,Integer>*/ pixelStateMapNew = new HashMap/*<Integer,Integer>*/();
         if ( null != state.getPixelStateMap() ) {
-            pixelStateMap.putAll(state.getPixelStateMap());
+            pixelStateMapNew.putAll(state.getPixelStateMap());
         }
+        pixelStateMap = pixelStateMapNew;
     }
   }
 
-- 
cgit v1.2.3


From 992b456d64e6128af021067e10e485d25977bf24 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sat, 27 Mar 2010 02:57:46 +0100
Subject: refactoring due to gluegen changes. - renamed com.sun.gluegen.runtime
 -> com.jogamp.gluegen.runtime.

---
 make/build-jogl.xml                                |     2 +-
 make/build-nativewindow.xml                        |     2 +-
 make/build.xml                                     |     2 +-
 make/config/jogl/egl.cfg                           |     2 +-
 make/config/jogl/gl-common.cfg                     |     5 +
 make/config/jogl/gl-gl3bc.cfg                      |     2 +-
 make/config/jogl/gl-if-CustomJavaCode-gl3.java     |     2 +-
 make/config/jogl/glu-gl2.cfg                       |     2 +-
 make/config/jogl/glx-CustomJavaCode.java           |     2 +-
 make/stub_includes/opengl/GL3/gl3.h.orig           |  2742 +++++
 make/stub_includes/opengl/GL3/gl3ext.h.orig        | 10073 +++++++++++++++++++
 make/stub_includes/opengl/GL3_/gl3.h               |  1659 +++
 make/stub_includes/opengl/GL3_/gl3ext.h            |   579 ++
 make/stub_includes/opengl/gl4.c                    |    11 +
 src/jogl/classes/com/sun/opengl/impl/DRIHack.java  |     2 +-
 .../classes/com/sun/opengl/impl/GLContextImpl.java |     4 +-
 .../com/sun/opengl/impl/GLDrawableFactoryImpl.java |     2 +-
 .../com/sun/opengl/impl/GLDrawableImpl.java        |     2 +-
 .../com/sun/opengl/impl/egl/EGLContext.java        |     2 +-
 .../com/sun/opengl/impl/egl/EGLDrawable.java       |     2 +-
 .../sun/opengl/impl/egl/EGLDrawableFactory.java    |     2 +-
 .../opengl/impl/egl/EGLDynamicLookupHelper.java    |     4 +-
 .../opengl/impl/egl/EGLES1DynamicLookupHelper.java |     2 +-
 .../opengl/impl/egl/EGLES2DynamicLookupHelper.java |     2 +-
 .../opengl/impl/egl/EGLGraphicsConfiguration.java  |     2 +-
 .../sun/opengl/impl/egl/EGLOnscreenContext.java    |     2 +-
 .../com/sun/opengl/impl/egl/EGLPbufferContext.java |     2 +-
 .../opengl/impl/macosx/cgl/MacOSXCGLContext.java   |     2 +-
 .../opengl/impl/macosx/cgl/MacOSXCGLDrawable.java  |     2 +-
 .../impl/macosx/cgl/MacOSXCGLDrawableFactory.java  |     2 +-
 .../macosx/cgl/MacOSXCGLGraphicsConfiguration.java |     3 -
 .../windows/wgl/WindowsExternalWGLContext.java     |     4 +-
 .../opengl/impl/windows/wgl/WindowsWGLContext.java |     2 +-
 .../impl/windows/wgl/WindowsWGLDrawable.java       |     2 +-
 .../windows/wgl/WindowsWGLDrawableFactory.java     |     2 +-
 .../wgl/WindowsWGLGraphicsConfiguration.java       |     2 +-
 .../impl/x11/glx/X11ExternalGLXDrawable.java       |     2 +-
 .../com/sun/opengl/impl/x11/glx/X11GLXContext.java |     2 +-
 .../sun/opengl/impl/x11/glx/X11GLXDrawable.java    |     2 +-
 .../opengl/impl/x11/glx/X11GLXDrawableFactory.java |     4 +-
 .../impl/x11/glx/X11GLXGraphicsConfiguration.java  |     4 +-
 .../glx/X11GLXGraphicsConfigurationFactory.java    |     2 +-
 .../util/glsl/fixedfunc/impl/FixedFuncHook.java    |     2 +-
 src/jogl/classes/javax/media/opengl/GLContext.java |     3 +-
 44 files changed, 15111 insertions(+), 46 deletions(-)
 create mode 100755 make/stub_includes/opengl/GL3/gl3.h.orig
 create mode 100644 make/stub_includes/opengl/GL3/gl3ext.h.orig
 create mode 100755 make/stub_includes/opengl/GL3_/gl3.h
 create mode 100644 make/stub_includes/opengl/GL3_/gl3ext.h
 create mode 100644 make/stub_includes/opengl/gl4.c

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index c7a8a1853..a98de0b4a 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -470,7 +470,7 @@
 
         <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.sun.opengl.util.*" />
 
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.opengl.impl.*,com.sun.gluegen,com.sun.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.opengl.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
     <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
     </target>
     
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index c0930cb42..776341981 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -257,7 +257,7 @@
 
         <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
 
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.nativewindow.impl.*,com.sun.gluegen,com.sun.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.nativewindow.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
     <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
     </target>
     
diff --git a/make/build.xml b/make/build.xml
index b8b3872ca..758017639 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -46,7 +46,7 @@
         <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames},${javadoc.spec.packagenames},com.sun.opengl.util.*,com.sun.javafx.newt, com.sun.javafx.newt.opengl" />
 
         <property name="javadoc.dev" value="${project.root}/javadoc_dev" />
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.opengl.impl.*,com.sun.nativewindow.impl.*,com.sun.javafx.newt.*,com.sun.gluegen,com.sun.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.opengl.impl.*,com.sun.nativewindow.impl.*,com.sun.javafx.newt.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
 
         <property name="java.excludes.javadoc.packagenames" value="com.sun.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
         <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg
index 26979fb6d..713f74ef2 100755
--- a/make/config/jogl/egl.cfg
+++ b/make/config/jogl/egl.cfg
@@ -47,4 +47,4 @@ CustomJavaCode EGL    return dispatch_eglGetProcAddress0(procname, eglGetProcAdd
 CustomJavaCode EGL  }
 
 
-Import com.sun.gluegen.runtime.opengl.GLProcAddressHelper
+Import com.jogamp.gluegen.runtime.opengl.GLProcAddressHelper
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index d9d66323a..36d156727 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -22,6 +22,11 @@ Import com.sun.opengl.impl.*
 # because we don't need them java-side. 
 Ignore GL_VERSION_.+
 
+Ignore glWaitSync
+Ignore glVertexP[2-4].+
+Ignore glVertexAttribP[1-4].+
+Ignore glUniformSubroutines.+
+
 # Ignore GL functions that deal with explicit pointer values in such a
 # way that we cannot implement the functionality in Java
 Ignore glGetBufferPointerv
diff --git a/make/config/jogl/gl-gl3bc.cfg b/make/config/jogl/gl-gl3bc.cfg
index d2525735e..28a4b6cde 100644
--- a/make/config/jogl/gl-gl3bc.cfg
+++ b/make/config/jogl/gl-gl3bc.cfg
@@ -82,7 +82,7 @@ CustomJavaCode GL3bcImpl   glClearDepth((double)depth); }
 CustomJavaCode GL3bcImpl public void glDepthRangef(float zNear, float zFar) {
 CustomJavaCode GL3bcImpl    glDepthRange((double)zNear, (double)zFar); }
 
-Include gl-headers.cfg
+Include gl3-headers.cfg
 Include ../intptr.cfg
 
 IncludeAs CustomJavaCode GL3bcImpl gl-impl-CustomJavaCode-common.java
diff --git a/make/config/jogl/gl-if-CustomJavaCode-gl3.java b/make/config/jogl/gl-if-CustomJavaCode-gl3.java
index 1777c1557..b295e7f8f 100644
--- a/make/config/jogl/gl-if-CustomJavaCode-gl3.java
+++ b/make/config/jogl/gl-if-CustomJavaCode-gl3.java
@@ -1,4 +1,4 @@
-
+//foobar
 /** Part of <code>GL_ARB_uniform_buffer_object</code> */
 public static final int GL_INVALID_INDEX = 0xFFFFFFFF ;
 
diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg
index 712f9a305..8b77178f4 100755
--- a/make/config/jogl/glu-gl2.cfg
+++ b/make/config/jogl/glu-gl2.cfg
@@ -40,7 +40,7 @@ IncludeAs CustomJavaCode GLUgl2 glu-CustomJavaCode-gl2.java
 # and to the nurbs.* package for the NURBS functionality
 Import com.sun.opengl.impl.glu.nurbs.*
 Import java.security.*
-Import com.sun.gluegen.runtime.opengl.GLProcAddressHelper
+Import com.jogamp.gluegen.runtime.opengl.GLProcAddressHelper
 Import com.sun.opengl.impl.glu.gl2.nurbs.*
 Import com.sun.opengl.impl.glu.mipmap.Mipmap
 Import com.sun.opengl.impl.glu.gl2.*
diff --git a/make/config/jogl/glx-CustomJavaCode.java b/make/config/jogl/glx-CustomJavaCode.java
index 3cb1d3619..56057377a 100644
--- a/make/config/jogl/glx-CustomJavaCode.java
+++ b/make/config/jogl/glx-CustomJavaCode.java
@@ -13,7 +13,7 @@
 
 
   /** Interface to C language function: <br> - Alias for: <br> <code> GLXFBConfig *  glXChooseFBConfigSGIX, glXChooseFBConfig(Display *  dpy, int screen, const int *  attribList, int *  nitems); </code>    */
-  public static com.sun.gluegen.runtime.PointerBuffer glXChooseFBConfigCopied(long dpy, int screen, int[] attribList, int attribList_offset, int[] nitems, int nitems_offset)
+  public static com.jogamp.gluegen.runtime.PointerBuffer glXChooseFBConfigCopied(long dpy, int screen, int[] attribList, int attribList_offset, int[] nitems, int nitems_offset)
   {
     if(attribList != null && attribList.length <= attribList_offset)
       throw new GLException("array offset argument \"attribList_offset\" (" + attribList_offset + ") equals or exceeds array length (" + attribList.length + ")");
diff --git a/make/stub_includes/opengl/GL3/gl3.h.orig b/make/stub_includes/opengl/GL3/gl3.h.orig
new file mode 100755
index 000000000..1f4867169
--- /dev/null
+++ b/make/stub_includes/opengl/GL3/gl3.h.orig
@@ -0,0 +1,2742 @@
+#ifndef __gl3_h_
+#define __gl3_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007-2010 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* This is a draft release of gl3.h, a header for use with OpenGL 3.1, and
+ * OpenGL 3.2/3.3/4.0 core profile implementations. The current version is
+ * available at http://www.opengl.org/registry/ . Please don't package
+ * gl3.h for release with other software until it's out of draft status.
+ * The structure of the file may change significantly, and the details
+ * will probably change slightly as we make sure exactly the right set
+ * of interfaces is included.
+ *
+ * gl3.h last updated on $Date: 2010-03-11 11:19:31 -0800 (Thu, 11 Mar 2010) $
+ *
+ * RELEASE NOTES - 2010/03/11
+ *
+ * gl3.h should be placed under a directory 'GL3' and included as
+ * '<GL3/gl3.h>'.
+ *
+ * gl3.h only includes interfaces supported in a core OpenGL 3.1, 3.2,
+ * 3.3, or 3.4 core profile implementation implementation, as well as
+ * interfaces for a few ARB extensions which have identical enums and
+ * entry points. It does not, and never will include functionality
+ * removed from core OpenGL 3.1, such as fixed-function vertex and
+ * fragment processing.
+ *
+ * Implementations of OpenGL 3.1 supporting the optional
+ * GL_ARB_compatibility extension continue to provide that functionality,
+ * as do implementations of the OpenGL 3.2+ compatibility profiles, and
+ * source code requiring it should use the traditional <GL/gl.h> and
+ * <GL/glext.h> headers instead of <GL3/gl3.h>.
+ *
+ * It is not possible to #include both <GL3/gl3.h> and either of
+ * <GL/gl.h> or <GL/glext.h> in the same source file.
+ *
+ * We welcome feedback on gl3.h. Please register for the Khronos Bugzilla
+ * (www.khronos.org/bugzilla) and file issues there under product
+ * "OpenGL", category "Registry". Feedback on the opengl.org forums
+ * may not be responded to in a timely fashion.
+ */
+
+/* Function declaration macros - to move into glplatform.h */
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/* Base GL types */
+
+typedef unsigned int GLenum;
+typedef unsigned char GLboolean;
+typedef unsigned int GLbitfield;
+typedef signed char GLbyte;
+typedef short GLshort;
+typedef int GLint;
+typedef int GLsizei;
+typedef unsigned char GLubyte;
+typedef unsigned short GLushort;
+typedef unsigned int GLuint;
+typedef float GLfloat;
+typedef float GLclampf;
+typedef double GLdouble;
+typedef double GLclampd;
+typedef void GLvoid;
+
+/*************************************************************/
+
+#ifndef GL_VERSION_1_1
+/* AttribMask */
+#define GL_DEPTH_BUFFER_BIT               0x00000100
+#define GL_STENCIL_BUFFER_BIT             0x00000400
+#define GL_COLOR_BUFFER_BIT               0x00004000
+/* Boolean */
+#define GL_FALSE                          0
+#define GL_TRUE                           1
+/* BeginMode */
+#define GL_POINTS                         0x0000
+#define GL_LINES                          0x0001
+#define GL_LINE_LOOP                      0x0002
+#define GL_LINE_STRIP                     0x0003
+#define GL_TRIANGLES                      0x0004
+#define GL_TRIANGLE_STRIP                 0x0005
+#define GL_TRIANGLE_FAN                   0x0006
+/* AlphaFunction */
+#define GL_NEVER                          0x0200
+#define GL_LESS                           0x0201
+#define GL_EQUAL                          0x0202
+#define GL_LEQUAL                         0x0203
+#define GL_GREATER                        0x0204
+#define GL_NOTEQUAL                       0x0205
+#define GL_GEQUAL                         0x0206
+#define GL_ALWAYS                         0x0207
+/* BlendingFactorDest */
+#define GL_ZERO                           0
+#define GL_ONE                            1
+#define GL_SRC_COLOR                      0x0300
+#define GL_ONE_MINUS_SRC_COLOR            0x0301
+#define GL_SRC_ALPHA                      0x0302
+#define GL_ONE_MINUS_SRC_ALPHA            0x0303
+#define GL_DST_ALPHA                      0x0304
+#define GL_ONE_MINUS_DST_ALPHA            0x0305
+/* BlendingFactorSrc */
+#define GL_DST_COLOR                      0x0306
+#define GL_ONE_MINUS_DST_COLOR            0x0307
+#define GL_SRC_ALPHA_SATURATE             0x0308
+/* DrawBufferMode */
+#define GL_NONE                           0
+#define GL_FRONT_LEFT                     0x0400
+#define GL_FRONT_RIGHT                    0x0401
+#define GL_BACK_LEFT                      0x0402
+#define GL_BACK_RIGHT                     0x0403
+#define GL_FRONT                          0x0404
+#define GL_BACK                           0x0405
+#define GL_LEFT                           0x0406
+#define GL_RIGHT                          0x0407
+#define GL_FRONT_AND_BACK                 0x0408
+/* ErrorCode */
+#define GL_NO_ERROR                       0
+#define GL_INVALID_ENUM                   0x0500
+#define GL_INVALID_VALUE                  0x0501
+#define GL_INVALID_OPERATION              0x0502
+#define GL_OUT_OF_MEMORY                  0x0505
+/* FrontFaceDirection */
+#define GL_CW                             0x0900
+#define GL_CCW                            0x0901
+/* GetPName */
+#define GL_POINT_SIZE                     0x0B11
+#define GL_POINT_SIZE_RANGE               0x0B12
+#define GL_POINT_SIZE_GRANULARITY         0x0B13
+#define GL_LINE_SMOOTH                    0x0B20
+#define GL_LINE_WIDTH                     0x0B21
+#define GL_LINE_WIDTH_RANGE               0x0B22
+#define GL_LINE_WIDTH_GRANULARITY         0x0B23
+#define GL_POLYGON_SMOOTH                 0x0B41
+#define GL_CULL_FACE                      0x0B44
+#define GL_CULL_FACE_MODE                 0x0B45
+#define GL_FRONT_FACE                     0x0B46
+#define GL_DEPTH_RANGE                    0x0B70
+#define GL_DEPTH_TEST                     0x0B71
+#define GL_DEPTH_WRITEMASK                0x0B72
+#define GL_DEPTH_CLEAR_VALUE              0x0B73
+#define GL_DEPTH_FUNC                     0x0B74
+#define GL_STENCIL_TEST                   0x0B90
+#define GL_STENCIL_CLEAR_VALUE            0x0B91
+#define GL_STENCIL_FUNC                   0x0B92
+#define GL_STENCIL_VALUE_MASK             0x0B93
+#define GL_STENCIL_FAIL                   0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
+#define GL_STENCIL_REF                    0x0B97
+#define GL_STENCIL_WRITEMASK              0x0B98
+#define GL_VIEWPORT                       0x0BA2
+#define GL_DITHER                         0x0BD0
+#define GL_BLEND_DST                      0x0BE0
+#define GL_BLEND_SRC                      0x0BE1
+#define GL_BLEND                          0x0BE2
+#define GL_LOGIC_OP_MODE                  0x0BF0
+#define GL_COLOR_LOGIC_OP                 0x0BF2
+#define GL_DRAW_BUFFER                    0x0C01
+#define GL_READ_BUFFER                    0x0C02
+#define GL_SCISSOR_BOX                    0x0C10
+#define GL_SCISSOR_TEST                   0x0C11
+#define GL_COLOR_CLEAR_VALUE              0x0C22
+#define GL_COLOR_WRITEMASK                0x0C23
+#define GL_DOUBLEBUFFER                   0x0C32
+#define GL_STEREO                         0x0C33
+#define GL_LINE_SMOOTH_HINT               0x0C52
+#define GL_POLYGON_SMOOTH_HINT            0x0C53
+#define GL_UNPACK_SWAP_BYTES              0x0CF0
+#define GL_UNPACK_LSB_FIRST               0x0CF1
+#define GL_UNPACK_ROW_LENGTH              0x0CF2
+#define GL_UNPACK_SKIP_ROWS               0x0CF3
+#define GL_UNPACK_SKIP_PIXELS             0x0CF4
+#define GL_UNPACK_ALIGNMENT               0x0CF5
+#define GL_PACK_SWAP_BYTES                0x0D00
+#define GL_PACK_LSB_FIRST                 0x0D01
+#define GL_PACK_ROW_LENGTH                0x0D02
+#define GL_PACK_SKIP_ROWS                 0x0D03
+#define GL_PACK_SKIP_PIXELS               0x0D04
+#define GL_PACK_ALIGNMENT                 0x0D05
+#define GL_MAX_TEXTURE_SIZE               0x0D33
+#define GL_MAX_VIEWPORT_DIMS              0x0D3A
+#define GL_SUBPIXEL_BITS                  0x0D50
+#define GL_TEXTURE_1D                     0x0DE0
+#define GL_TEXTURE_2D                     0x0DE1
+#define GL_POLYGON_OFFSET_UNITS           0x2A00
+#define GL_POLYGON_OFFSET_POINT           0x2A01
+#define GL_POLYGON_OFFSET_LINE            0x2A02
+#define GL_POLYGON_OFFSET_FILL            0x8037
+#define GL_POLYGON_OFFSET_FACTOR          0x8038
+#define GL_TEXTURE_BINDING_1D             0x8068
+#define GL_TEXTURE_BINDING_2D             0x8069
+/* GetTextureParameter */
+#define GL_TEXTURE_WIDTH                  0x1000
+#define GL_TEXTURE_HEIGHT                 0x1001
+#define GL_TEXTURE_INTERNAL_FORMAT        0x1003
+#define GL_TEXTURE_BORDER_COLOR           0x1004
+#define GL_TEXTURE_RED_SIZE               0x805C
+#define GL_TEXTURE_GREEN_SIZE             0x805D
+#define GL_TEXTURE_BLUE_SIZE              0x805E
+#define GL_TEXTURE_ALPHA_SIZE             0x805F
+/* HintMode */
+#define GL_DONT_CARE                      0x1100
+#define GL_FASTEST                        0x1101
+#define GL_NICEST                         0x1102
+/* DataType */
+#define GL_BYTE                           0x1400
+#define GL_UNSIGNED_BYTE                  0x1401
+#define GL_SHORT                          0x1402
+#define GL_UNSIGNED_SHORT                 0x1403
+#define GL_INT                            0x1404
+#define GL_UNSIGNED_INT                   0x1405
+#define GL_FLOAT                          0x1406
+#define GL_DOUBLE                         0x140A
+/* LogicOp */
+#define GL_CLEAR                          0x1500
+#define GL_AND                            0x1501
+#define GL_AND_REVERSE                    0x1502
+#define GL_COPY                           0x1503
+#define GL_AND_INVERTED                   0x1504
+#define GL_NOOP                           0x1505
+#define GL_XOR                            0x1506
+#define GL_OR                             0x1507
+#define GL_NOR                            0x1508
+#define GL_EQUIV                          0x1509
+#define GL_INVERT                         0x150A
+#define GL_OR_REVERSE                     0x150B
+#define GL_COPY_INVERTED                  0x150C
+#define GL_OR_INVERTED                    0x150D
+#define GL_NAND                           0x150E
+#define GL_SET                            0x150F
+/* MatrixMode (for gl3.h, FBO attachment type) */
+#define GL_TEXTURE                        0x1702
+/* PixelCopyType */
+#define GL_COLOR                          0x1800
+#define GL_DEPTH                          0x1801
+#define GL_STENCIL                        0x1802
+/* PixelFormat */
+#define GL_STENCIL_INDEX                  0x1901
+#define GL_DEPTH_COMPONENT                0x1902
+#define GL_RED                            0x1903
+#define GL_GREEN                          0x1904
+#define GL_BLUE                           0x1905
+#define GL_ALPHA                          0x1906
+#define GL_RGB                            0x1907
+#define GL_RGBA                           0x1908
+/* PolygonMode */
+#define GL_POINT                          0x1B00
+#define GL_LINE                           0x1B01
+#define GL_FILL                           0x1B02
+/* StencilOp */
+#define GL_KEEP                           0x1E00
+#define GL_REPLACE                        0x1E01
+#define GL_INCR                           0x1E02
+#define GL_DECR                           0x1E03
+/* StringName */
+#define GL_VENDOR                         0x1F00
+#define GL_RENDERER                       0x1F01
+#define GL_VERSION                        0x1F02
+#define GL_EXTENSIONS                     0x1F03
+/* TextureMagFilter */
+#define GL_NEAREST                        0x2600
+#define GL_LINEAR                         0x2601
+/* TextureMinFilter */
+#define GL_NEAREST_MIPMAP_NEAREST         0x2700
+#define GL_LINEAR_MIPMAP_NEAREST          0x2701
+#define GL_NEAREST_MIPMAP_LINEAR          0x2702
+#define GL_LINEAR_MIPMAP_LINEAR           0x2703
+/* TextureParameterName */
+#define GL_TEXTURE_MAG_FILTER             0x2800
+#define GL_TEXTURE_MIN_FILTER             0x2801
+#define GL_TEXTURE_WRAP_S                 0x2802
+#define GL_TEXTURE_WRAP_T                 0x2803
+/* TextureTarget */
+#define GL_PROXY_TEXTURE_1D               0x8063
+#define GL_PROXY_TEXTURE_2D               0x8064
+/* TextureWrapMode */
+#define GL_REPEAT                         0x2901
+/* PixelInternalFormat */
+#define GL_R3_G3_B2                       0x2A10
+#define GL_RGB4                           0x804F
+#define GL_RGB5                           0x8050
+#define GL_RGB8                           0x8051
+#define GL_RGB10                          0x8052
+#define GL_RGB12                          0x8053
+#define GL_RGB16                          0x8054
+#define GL_RGBA2                          0x8055
+#define GL_RGBA4                          0x8056
+#define GL_RGB5_A1                        0x8057
+#define GL_RGBA8                          0x8058
+#define GL_RGB10_A2                       0x8059
+#define GL_RGBA12                         0x805A
+#define GL_RGBA16                         0x805B
+#endif
+
+#ifndef GL_VERSION_1_2
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_TEXTURE_BINDING_3D             0x806A
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_BGR                            0x80E0
+#define GL_BGRA                           0x80E1
+#define GL_MAX_ELEMENTS_VERTICES          0x80E8
+#define GL_MAX_ELEMENTS_INDICES           0x80E9
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#endif
+
+#ifndef GL_ARB_imaging
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_BLEND_COLOR                    0x8005
+#define GL_FUNC_ADD                       0x8006
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+#define GL_MULTISAMPLE                    0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+#define GL_COMPRESSED_RGB                 0x84ED
+#define GL_COMPRESSED_RGBA                0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
+#define GL_TEXTURE_COMPRESSED             0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_CLAMP_TO_BORDER                0x812D
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_MIRRORED_REPEAT                0x8370
+#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
+#define GL_TEXTURE_LOD_BIAS               0x8501
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+#define GL_QUERY_COUNTER_BITS             0x8864
+#define GL_CURRENT_QUERY                  0x8865
+#define GL_QUERY_RESULT                   0x8866
+#define GL_QUERY_RESULT_AVAILABLE         0x8867
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_BUFFER_ACCESS                  0x88BB
+#define GL_BUFFER_MAPPED                  0x88BC
+#define GL_BUFFER_MAP_POINTER             0x88BD
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_STREAM_COPY                    0x88E2
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_STATIC_READ                    0x88E5
+#define GL_STATIC_COPY                    0x88E6
+#define GL_DYNAMIC_DRAW                   0x88E8
+#define GL_DYNAMIC_READ                   0x88E9
+#define GL_DYNAMIC_COPY                   0x88EA
+#define GL_SAMPLES_PASSED                 0x8914
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_BLEND_EQUATION_RGB             0x8009
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_MAX_DRAW_BUFFERS               0x8824
+#define GL_DRAW_BUFFER0                   0x8825
+#define GL_DRAW_BUFFER1                   0x8826
+#define GL_DRAW_BUFFER2                   0x8827
+#define GL_DRAW_BUFFER3                   0x8828
+#define GL_DRAW_BUFFER4                   0x8829
+#define GL_DRAW_BUFFER5                   0x882A
+#define GL_DRAW_BUFFER6                   0x882B
+#define GL_DRAW_BUFFER7                   0x882C
+#define GL_DRAW_BUFFER8                   0x882D
+#define GL_DRAW_BUFFER9                   0x882E
+#define GL_DRAW_BUFFER10                  0x882F
+#define GL_DRAW_BUFFER11                  0x8830
+#define GL_DRAW_BUFFER12                  0x8831
+#define GL_DRAW_BUFFER13                  0x8832
+#define GL_DRAW_BUFFER14                  0x8833
+#define GL_DRAW_BUFFER15                  0x8834
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+#define GL_MAX_VERTEX_ATTRIBS             0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
+#define GL_FRAGMENT_SHADER                0x8B30
+#define GL_VERTEX_SHADER                  0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
+#define GL_MAX_VARYING_FLOATS             0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE                    0x8B4F
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_1D                     0x8B5D
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_3D                     0x8B5F
+#define GL_SAMPLER_CUBE                   0x8B60
+#define GL_SAMPLER_1D_SHADOW              0x8B61
+#define GL_SAMPLER_2D_SHADOW              0x8B62
+#define GL_DELETE_STATUS                  0x8B80
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_LINK_STATUS                    0x8B82
+#define GL_VALIDATE_STATUS                0x8B83
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_ATTACHED_SHADERS               0x8B85
+#define GL_ACTIVE_UNIFORMS                0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_ACTIVE_ATTRIBUTES              0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
+#define GL_CURRENT_PROGRAM                0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
+#define GL_LOWER_LEFT                     0x8CA1
+#define GL_UPPER_LEFT                     0x8CA2
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_PIXEL_PACK_BUFFER              0x88EB
+#define GL_PIXEL_UNPACK_BUFFER            0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
+#define GL_FLOAT_MAT2x3                   0x8B65
+#define GL_FLOAT_MAT2x4                   0x8B66
+#define GL_FLOAT_MAT3x2                   0x8B67
+#define GL_FLOAT_MAT3x4                   0x8B68
+#define GL_FLOAT_MAT4x2                   0x8B69
+#define GL_FLOAT_MAT4x3                   0x8B6A
+#define GL_SRGB                           0x8C40
+#define GL_SRGB8                          0x8C41
+#define GL_SRGB_ALPHA                     0x8C42
+#define GL_SRGB8_ALPHA8                   0x8C43
+#define GL_COMPRESSED_SRGB                0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_COMPARE_REF_TO_TEXTURE         0x884E
+#define GL_CLIP_DISTANCE0                 0x3000
+#define GL_CLIP_DISTANCE1                 0x3001
+#define GL_CLIP_DISTANCE2                 0x3002
+#define GL_CLIP_DISTANCE3                 0x3003
+#define GL_CLIP_DISTANCE4                 0x3004
+#define GL_CLIP_DISTANCE5                 0x3005
+#define GL_CLIP_DISTANCE6                 0x3006
+#define GL_CLIP_DISTANCE7                 0x3007
+#define GL_MAX_CLIP_DISTANCES             0x0D32
+#define GL_MAJOR_VERSION                  0x821B
+#define GL_MINOR_VERSION                  0x821C
+#define GL_NUM_EXTENSIONS                 0x821D
+#define GL_CONTEXT_FLAGS                  0x821E
+#define GL_DEPTH_BUFFER                   0x8223
+#define GL_STENCIL_BUFFER                 0x8224
+#define GL_COMPRESSED_RED                 0x8225
+#define GL_COMPRESSED_RG                  0x8226
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
+#define GL_RGBA32F                        0x8814
+#define GL_RGB32F                         0x8815
+#define GL_RGBA16F                        0x881A
+#define GL_RGB16F                         0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
+#define GL_CLAMP_READ_COLOR               0x891C
+#define GL_FIXED_ONLY                     0x891D
+#define GL_MAX_VARYING_COMPONENTS         0x8B4B
+#define GL_TEXTURE_1D_ARRAY               0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
+#define GL_TEXTURE_2D_ARRAY               0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
+#define GL_R11F_G11F_B10F                 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
+#define GL_RGB9_E5                        0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
+#define GL_TEXTURE_SHARED_SIZE            0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED           0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD             0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS            0x8C8C
+#define GL_SEPARATE_ATTRIBS               0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI                       0x8D70
+#define GL_RGB32UI                        0x8D71
+#define GL_RGBA16UI                       0x8D76
+#define GL_RGB16UI                        0x8D77
+#define GL_RGBA8UI                        0x8D7C
+#define GL_RGB8UI                         0x8D7D
+#define GL_RGBA32I                        0x8D82
+#define GL_RGB32I                         0x8D83
+#define GL_RGBA16I                        0x8D88
+#define GL_RGB16I                         0x8D89
+#define GL_RGBA8I                         0x8D8E
+#define GL_RGB8I                          0x8D8F
+#define GL_RED_INTEGER                    0x8D94
+#define GL_GREEN_INTEGER                  0x8D95
+#define GL_BLUE_INTEGER                   0x8D96
+#define GL_RGB_INTEGER                    0x8D98
+#define GL_RGBA_INTEGER                   0x8D99
+#define GL_BGR_INTEGER                    0x8D9A
+#define GL_BGRA_INTEGER                   0x8D9B
+#define GL_SAMPLER_1D_ARRAY               0x8DC0
+#define GL_SAMPLER_2D_ARRAY               0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
+#define GL_UNSIGNED_INT_VEC2              0x8DC6
+#define GL_UNSIGNED_INT_VEC3              0x8DC7
+#define GL_UNSIGNED_INT_VEC4              0x8DC8
+#define GL_INT_SAMPLER_1D                 0x8DC9
+#define GL_INT_SAMPLER_2D                 0x8DCA
+#define GL_INT_SAMPLER_3D                 0x8DCB
+#define GL_INT_SAMPLER_CUBE               0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
+#define GL_QUERY_WAIT                     0x8E13
+#define GL_QUERY_NO_WAIT                  0x8E14
+#define GL_QUERY_BY_REGION_WAIT           0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
+#define GL_BUFFER_ACCESS_FLAGS            0x911F
+#define GL_BUFFER_MAP_LENGTH              0x9120
+#define GL_BUFFER_MAP_OFFSET              0x9121
+/* Reuse tokens from ARB_depth_buffer_float */
+/* reuse GL_DEPTH_COMPONENT32F */
+/* reuse GL_DEPTH32F_STENCIL8 */
+/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
+/* Reuse tokens from ARB_framebuffer_object */
+/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_DEFAULT */
+/* reuse GL_FRAMEBUFFER_UNDEFINED */
+/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
+/* reuse GL_INDEX */
+/* reuse GL_MAX_RENDERBUFFER_SIZE */
+/* reuse GL_DEPTH_STENCIL */
+/* reuse GL_UNSIGNED_INT_24_8 */
+/* reuse GL_DEPTH24_STENCIL8 */
+/* reuse GL_TEXTURE_STENCIL_SIZE */
+/* reuse GL_TEXTURE_RED_TYPE */
+/* reuse GL_TEXTURE_GREEN_TYPE */
+/* reuse GL_TEXTURE_BLUE_TYPE */
+/* reuse GL_TEXTURE_ALPHA_TYPE */
+/* reuse GL_TEXTURE_DEPTH_TYPE */
+/* reuse GL_UNSIGNED_NORMALIZED */
+/* reuse GL_FRAMEBUFFER_BINDING */
+/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_BINDING */
+/* reuse GL_READ_FRAMEBUFFER */
+/* reuse GL_DRAW_FRAMEBUFFER */
+/* reuse GL_READ_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_SAMPLES */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+/* reuse GL_FRAMEBUFFER_COMPLETE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
+/* reuse GL_MAX_COLOR_ATTACHMENTS */
+/* reuse GL_COLOR_ATTACHMENT0 */
+/* reuse GL_COLOR_ATTACHMENT1 */
+/* reuse GL_COLOR_ATTACHMENT2 */
+/* reuse GL_COLOR_ATTACHMENT3 */
+/* reuse GL_COLOR_ATTACHMENT4 */
+/* reuse GL_COLOR_ATTACHMENT5 */
+/* reuse GL_COLOR_ATTACHMENT6 */
+/* reuse GL_COLOR_ATTACHMENT7 */
+/* reuse GL_COLOR_ATTACHMENT8 */
+/* reuse GL_COLOR_ATTACHMENT9 */
+/* reuse GL_COLOR_ATTACHMENT10 */
+/* reuse GL_COLOR_ATTACHMENT11 */
+/* reuse GL_COLOR_ATTACHMENT12 */
+/* reuse GL_COLOR_ATTACHMENT13 */
+/* reuse GL_COLOR_ATTACHMENT14 */
+/* reuse GL_COLOR_ATTACHMENT15 */
+/* reuse GL_DEPTH_ATTACHMENT */
+/* reuse GL_STENCIL_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER */
+/* reuse GL_RENDERBUFFER */
+/* reuse GL_RENDERBUFFER_WIDTH */
+/* reuse GL_RENDERBUFFER_HEIGHT */
+/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
+/* reuse GL_STENCIL_INDEX1 */
+/* reuse GL_STENCIL_INDEX4 */
+/* reuse GL_STENCIL_INDEX8 */
+/* reuse GL_STENCIL_INDEX16 */
+/* reuse GL_RENDERBUFFER_RED_SIZE */
+/* reuse GL_RENDERBUFFER_GREEN_SIZE */
+/* reuse GL_RENDERBUFFER_BLUE_SIZE */
+/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
+/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
+/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+/* reuse GL_MAX_SAMPLES */
+/* Reuse tokens from ARB_framebuffer_sRGB */
+/* reuse GL_FRAMEBUFFER_SRGB */
+/* Reuse tokens from ARB_half_float_vertex */
+/* reuse GL_HALF_FLOAT */
+/* Reuse tokens from ARB_map_buffer_range */
+/* reuse GL_MAP_READ_BIT */
+/* reuse GL_MAP_WRITE_BIT */
+/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
+/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
+/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
+/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
+/* Reuse tokens from ARB_texture_compression_rgtc */
+/* reuse GL_COMPRESSED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_RG_RGTC2 */
+/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
+/* Reuse tokens from ARB_texture_rg */
+/* reuse GL_RG */
+/* reuse GL_RG_INTEGER */
+/* reuse GL_R8 */
+/* reuse GL_R16 */
+/* reuse GL_RG8 */
+/* reuse GL_RG16 */
+/* reuse GL_R16F */
+/* reuse GL_R32F */
+/* reuse GL_RG16F */
+/* reuse GL_RG32F */
+/* reuse GL_R8I */
+/* reuse GL_R8UI */
+/* reuse GL_R16I */
+/* reuse GL_R16UI */
+/* reuse GL_R32I */
+/* reuse GL_R32UI */
+/* reuse GL_RG8I */
+/* reuse GL_RG8UI */
+/* reuse GL_RG16I */
+/* reuse GL_RG16UI */
+/* reuse GL_RG32I */
+/* reuse GL_RG32UI */
+/* Reuse tokens from ARB_vertex_array_object */
+/* reuse GL_VERTEX_ARRAY_BINDING */
+#endif
+
+#ifndef GL_VERSION_3_1
+#define GL_SAMPLER_2D_RECT                0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW         0x8B64
+#define GL_SAMPLER_BUFFER                 0x8DC2
+#define GL_INT_SAMPLER_2D_RECT            0x8DCD
+#define GL_INT_SAMPLER_BUFFER             0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT   0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER    0x8DD8
+#define GL_TEXTURE_BUFFER                 0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE        0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER         0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT          0x8C2E
+#define GL_TEXTURE_RECTANGLE              0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
+#define GL_RED_SNORM                      0x8F90
+#define GL_RG_SNORM                       0x8F91
+#define GL_RGB_SNORM                      0x8F92
+#define GL_RGBA_SNORM                     0x8F93
+#define GL_R8_SNORM                       0x8F94
+#define GL_RG8_SNORM                      0x8F95
+#define GL_RGB8_SNORM                     0x8F96
+#define GL_RGBA8_SNORM                    0x8F97
+#define GL_R16_SNORM                      0x8F98
+#define GL_RG16_SNORM                     0x8F99
+#define GL_RGB16_SNORM                    0x8F9A
+#define GL_RGBA16_SNORM                   0x8F9B
+#define GL_SIGNED_NORMALIZED              0x8F9C
+#define GL_PRIMITIVE_RESTART              0x8F9D
+#define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
+/* Reuse tokens from ARB_copy_buffer */
+/* reuse GL_COPY_READ_BUFFER */
+/* reuse GL_COPY_WRITE_BUFFER */
+/* Would reuse tokens from ARB_draw_instanced, but it has none */
+/* Reuse tokens from ARB_uniform_buffer_object */
+/* reuse GL_UNIFORM_BUFFER */
+/* reuse GL_UNIFORM_BUFFER_BINDING */
+/* reuse GL_UNIFORM_BUFFER_START */
+/* reuse GL_UNIFORM_BUFFER_SIZE */
+/* reuse GL_MAX_VERTEX_UNIFORM_BLOCKS */
+/* reuse GL_MAX_FRAGMENT_UNIFORM_BLOCKS */
+/* reuse GL_MAX_COMBINED_UNIFORM_BLOCKS */
+/* reuse GL_MAX_UNIFORM_BUFFER_BINDINGS */
+/* reuse GL_MAX_UNIFORM_BLOCK_SIZE */
+/* reuse GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS */
+/* reuse GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT */
+/* reuse GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH */
+/* reuse GL_ACTIVE_UNIFORM_BLOCKS */
+/* reuse GL_UNIFORM_TYPE */
+/* reuse GL_UNIFORM_SIZE */
+/* reuse GL_UNIFORM_NAME_LENGTH */
+/* reuse GL_UNIFORM_BLOCK_INDEX */
+/* reuse GL_UNIFORM_OFFSET */
+/* reuse GL_UNIFORM_ARRAY_STRIDE */
+/* reuse GL_UNIFORM_MATRIX_STRIDE */
+/* reuse GL_UNIFORM_IS_ROW_MAJOR */
+/* reuse GL_UNIFORM_BLOCK_BINDING */
+/* reuse GL_UNIFORM_BLOCK_DATA_SIZE */
+/* reuse GL_UNIFORM_BLOCK_NAME_LENGTH */
+/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS */
+/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER */
+/* reuse GL_INVALID_INDEX */
+#endif
+
+#ifndef GL_VERSION_3_2
+#define GL_CONTEXT_CORE_PROFILE_BIT       0x00000001
+#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
+#define GL_LINES_ADJACENCY                0x000A
+#define GL_LINE_STRIP_ADJACENCY           0x000B
+#define GL_TRIANGLES_ADJACENCY            0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY       0x000D
+#define GL_PROGRAM_POINT_SIZE             0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
+#define GL_GEOMETRY_SHADER                0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT          0x8916
+#define GL_GEOMETRY_INPUT_TYPE            0x8917
+#define GL_GEOMETRY_OUTPUT_TYPE           0x8918
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES   0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
+#define GL_MAX_VERTEX_OUTPUT_COMPONENTS   0x9122
+#define GL_MAX_GEOMETRY_INPUT_COMPONENTS  0x9123
+#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
+#define GL_MAX_FRAGMENT_INPUT_COMPONENTS  0x9125
+#define GL_CONTEXT_PROFILE_MASK           0x9126
+/* reuse GL_MAX_VARYING_COMPONENTS */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+/* Reuse tokens from ARB_depth_clamp */
+/* reuse GL_DEPTH_CLAMP */
+/* Would reuse tokens from ARB_draw_elements_base_vertex, but it has none */
+/* Would reuse tokens from ARB_fragment_coord_conventions, but it has none */
+/* Reuse tokens from ARB_provoking_vertex */
+/* reuse GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+/* reuse GL_FIRST_VERTEX_CONVENTION */
+/* reuse GL_LAST_VERTEX_CONVENTION */
+/* reuse GL_PROVOKING_VERTEX */
+/* Reuse tokens from ARB_seamless_cube_map */
+/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS */
+/* Reuse tokens from ARB_sync */
+/* reuse GL_MAX_SERVER_WAIT_TIMEOUT */
+/* reuse GL_OBJECT_TYPE */
+/* reuse GL_SYNC_CONDITION */
+/* reuse GL_SYNC_STATUS */
+/* reuse GL_SYNC_FLAGS */
+/* reuse GL_SYNC_FENCE */
+/* reuse GL_SYNC_GPU_COMMANDS_COMPLETE */
+/* reuse GL_UNSIGNALED */
+/* reuse GL_SIGNALED */
+/* reuse GL_ALREADY_SIGNALED */
+/* reuse GL_TIMEOUT_EXPIRED */
+/* reuse GL_CONDITION_SATISFIED */
+/* reuse GL_WAIT_FAILED */
+/* reuse GL_TIMEOUT_IGNORED */
+/* reuse GL_SYNC_FLUSH_COMMANDS_BIT */
+/* reuse GL_TIMEOUT_IGNORED */
+/* Reuse tokens from ARB_texture_multisample */
+/* reuse GL_SAMPLE_POSITION */
+/* reuse GL_SAMPLE_MASK */
+/* reuse GL_SAMPLE_MASK_VALUE */
+/* reuse GL_MAX_SAMPLE_MASK_WORDS */
+/* reuse GL_TEXTURE_2D_MULTISAMPLE */
+/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE */
+/* reuse GL_TEXTURE_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE */
+/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_TEXTURE_SAMPLES */
+/* reuse GL_TEXTURE_FIXED_SAMPLE_LOCATIONS */
+/* reuse GL_SAMPLER_2D_MULTISAMPLE */
+/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE */
+/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE */
+/* reuse GL_SAMPLER_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_MAX_COLOR_TEXTURE_SAMPLES */
+/* reuse GL_MAX_DEPTH_TEXTURE_SAMPLES */
+/* reuse GL_MAX_INTEGER_SAMPLES */
+/* Don't need to reuse tokens from ARB_vertex_array_bgra since they're already in 1.2 core */
+#endif
+
+#ifndef GL_VERSION_3_3
+/* Reuse tokens from ARB_blend_func_extended */
+/* reuse GL_SRC1_COLOR */
+/* reuse GL_ONE_MINUS_SRC1_COLOR */
+/* reuse GL_ONE_MINUS_SRC1_ALPHA */
+/* reuse GL_MAX_DUAL_SOURCE_DRAW_BUFFERS */
+/* Would reuse tokens from ARB_explicit_attrib_location, but it has none */
+/* Reuse tokens from ARB_occlusion_query2 */
+/* reuse GL_ANY_SAMPLES_PASSED */
+/* Reuse tokens from ARB_sampler_objects */
+/* reuse GL_SAMPLER_BINDING */
+/* Would reuse tokens from ARB_shader_bit_encoding, but it has none */
+/* Reuse tokens from ARB_texture_rgb10_a2ui */
+/* reuse GL_RGB10_A2UI */
+/* Reuse tokens from ARB_texture_swizzle */
+/* reuse GL_TEXTURE_SWIZZLE_R */
+/* reuse GL_TEXTURE_SWIZZLE_G */
+/* reuse GL_TEXTURE_SWIZZLE_B */
+/* reuse GL_TEXTURE_SWIZZLE_A */
+/* reuse GL_TEXTURE_SWIZZLE_RGBA */
+/* Reuse tokens from ARB_timer_query */
+/* reuse GL_TIME_ELAPSED */
+/* reuse GL_TIMESTAMP */
+/* Reuse tokens from ARB_vertex_type_2_10_10_10_rev */
+/* reuse GL_INT_2_10_10_10_REV */
+#endif
+
+#ifndef GL_VERSION_4_0
+/* Reuse tokens from ARB_draw_indirect */
+/* reuse GL_DRAW_INDIRECT_BUFFER */
+/* reuse GL_DRAW_INDIRECT_BUFFER_BINDING */
+/* Reuse tokens from ARB_gpu_shader5 */
+/* reuse GL_GEOMETRY_SHADER_INVOCATIONS */
+/* reuse GL_MAX_GEOMETRY_SHADER_INVOCATIONS */
+/* reuse GL_MIN_FRAGMENT_INTERPOLATION_OFFSET */
+/* reuse GL_MAX_FRAGMENT_INTERPOLATION_OFFSET */
+/* reuse GL_FRAGMENT_INTERPOLATION_OFFSET_BITS */
+/* reuse GL_MAX_VERTEX_STREAMS */
+/* Reuse tokens from ARB_gpu_shader_fp64 */
+/* reuse GL_DOUBLE_VEC2 */
+/* reuse GL_DOUBLE_VEC3 */
+/* reuse GL_DOUBLE_VEC4 */
+/* reuse GL_DOUBLE_MAT2 */
+/* reuse GL_DOUBLE_MAT3 */
+/* reuse GL_DOUBLE_MAT4 */
+/* reuse GL_DOUBLE_MAT2x3 */
+/* reuse GL_DOUBLE_MAT2x4 */
+/* reuse GL_DOUBLE_MAT3x2 */
+/* reuse GL_DOUBLE_MAT3x4 */
+/* reuse GL_DOUBLE_MAT4x2 */
+/* reuse GL_DOUBLE_MAT4x3 */
+/* Reuse tokens from ARB_shader_subroutine */
+/* reuse GL_ACTIVE_SUBROUTINES */
+/* reuse GL_ACTIVE_SUBROUTINE_UNIFORMS */
+/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS */
+/* reuse GL_ACTIVE_SUBROUTINE_MAX_LENGTH */
+/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH */
+/* reuse GL_MAX_SUBROUTINES */
+/* reuse GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS */
+/* reuse GL_NUM_COMPATIBLE_SUBROUTINES */
+/* reuse GL_COMPATIBLE_SUBROUTINES */
+/* Reuse tokens from ARB_tessellation_shader */
+/* reuse GL_PATCHES */
+/* reuse GL_PATCH_VERTICES */
+/* reuse GL_PATCH_DEFAULT_INNER_LEVEL */
+/* reuse GL_PATCH_DEFAULT_OUTER_LEVEL */
+/* reuse GL_TESS_CONTROL_OUTPUT_VERTICES */
+/* reuse GL_TESS_GEN_MODE */
+/* reuse GL_TESS_GEN_SPACING */
+/* reuse GL_TESS_GEN_VERTEX_ORDER */
+/* reuse GL_TESS_GEN_POINT_MODE */
+/* reuse GL_ISOLINES */
+/* reuse GL_FRACTIONAL_ODD */
+/* reuse GL_FRACTIONAL_EVEN */
+/* reuse GL_MAX_PATCH_VERTICES */
+/* reuse GL_MAX_TESS_GEN_LEVEL */
+/* reuse GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS */
+/* reuse GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS */
+/* reuse GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS */
+/* reuse GL_MAX_TESS_PATCH_COMPONENTS */
+/* reuse GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS */
+/* reuse GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS */
+/* reuse GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS */
+/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS */
+/* reuse GL_MAX_TESS_CONTROL_INPUT_COMPONENTS */
+/* reuse GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS */
+/* reuse GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER */
+/* reuse GL_TESS_EVALUATION_SHADER */
+/* reuse GL_TESS_CONTROL_SHADER */
+/* Would reuse tokens from ARB_texture_buffer_object_rgb32, but it has none */
+/* Reuse tokens from ARB_transform_feedback2 */
+/* reuse GL_TRANSFORM_FEEDBACK */
+/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+/* reuse GL_TRANSFORM_FEEDBACK_BINDING */
+/* Reuse tokens from ARB_transform_feedback3 */
+/* reuse GL_MAX_TRANSFORM_FEEDBACK_BUFFERS */
+/* reuse GL_MAX_VERTEX_STREAMS */
+#endif
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_DEPTH_COMPONENT32F             0x8CAC
+#define GL_DEPTH32F_STENCIL8              0x8CAD
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
+#endif
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
+#define GL_FRAMEBUFFER_DEFAULT            0x8218
+#define GL_FRAMEBUFFER_UNDEFINED          0x8219
+#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
+#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
+#define GL_DEPTH_STENCIL                  0x84F9
+#define GL_UNSIGNED_INT_24_8              0x84FA
+#define GL_DEPTH24_STENCIL8               0x88F0
+#define GL_TEXTURE_STENCIL_SIZE           0x88F1
+#define GL_TEXTURE_RED_TYPE               0x8C10
+#define GL_TEXTURE_GREEN_TYPE             0x8C11
+#define GL_TEXTURE_BLUE_TYPE              0x8C12
+#define GL_TEXTURE_ALPHA_TYPE             0x8C13
+#define GL_TEXTURE_DEPTH_TYPE             0x8C16
+#define GL_UNSIGNED_NORMALIZED            0x8C17
+#define GL_FRAMEBUFFER_BINDING            0x8CA6
+#define GL_DRAW_FRAMEBUFFER_BINDING       GL_FRAMEBUFFER_BINDING
+#define GL_RENDERBUFFER_BINDING           0x8CA7
+#define GL_READ_FRAMEBUFFER               0x8CA8
+#define GL_DRAW_FRAMEBUFFER               0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
+#define GL_RENDERBUFFER_SAMPLES           0x8CAB
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
+#define GL_COLOR_ATTACHMENT0              0x8CE0
+#define GL_COLOR_ATTACHMENT1              0x8CE1
+#define GL_COLOR_ATTACHMENT2              0x8CE2
+#define GL_COLOR_ATTACHMENT3              0x8CE3
+#define GL_COLOR_ATTACHMENT4              0x8CE4
+#define GL_COLOR_ATTACHMENT5              0x8CE5
+#define GL_COLOR_ATTACHMENT6              0x8CE6
+#define GL_COLOR_ATTACHMENT7              0x8CE7
+#define GL_COLOR_ATTACHMENT8              0x8CE8
+#define GL_COLOR_ATTACHMENT9              0x8CE9
+#define GL_COLOR_ATTACHMENT10             0x8CEA
+#define GL_COLOR_ATTACHMENT11             0x8CEB
+#define GL_COLOR_ATTACHMENT12             0x8CEC
+#define GL_COLOR_ATTACHMENT13             0x8CED
+#define GL_COLOR_ATTACHMENT14             0x8CEE
+#define GL_COLOR_ATTACHMENT15             0x8CEF
+#define GL_DEPTH_ATTACHMENT               0x8D00
+#define GL_STENCIL_ATTACHMENT             0x8D20
+#define GL_FRAMEBUFFER                    0x8D40
+#define GL_RENDERBUFFER                   0x8D41
+#define GL_RENDERBUFFER_WIDTH             0x8D42
+#define GL_RENDERBUFFER_HEIGHT            0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
+#define GL_STENCIL_INDEX1                 0x8D46
+#define GL_STENCIL_INDEX4                 0x8D47
+#define GL_STENCIL_INDEX8                 0x8D48
+#define GL_STENCIL_INDEX16                0x8D49
+#define GL_RENDERBUFFER_RED_SIZE          0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
+#define GL_MAX_SAMPLES                    0x8D57
+#endif
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_FRAMEBUFFER_SRGB               0x8DB9
+#endif
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_HALF_FLOAT                     0x140B
+#endif
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_MAP_READ_BIT                   0x0001
+#define GL_MAP_WRITE_BIT                  0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
+#endif
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_COMPRESSED_RED_RGTC1           0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
+#define GL_COMPRESSED_RG_RGTC2            0x8DBD
+#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
+#endif
+
+#ifndef GL_ARB_texture_rg
+#define GL_RG                             0x8227
+#define GL_RG_INTEGER                     0x8228
+#define GL_R8                             0x8229
+#define GL_R16                            0x822A
+#define GL_RG8                            0x822B
+#define GL_RG16                           0x822C
+#define GL_R16F                           0x822D
+#define GL_R32F                           0x822E
+#define GL_RG16F                          0x822F
+#define GL_RG32F                          0x8230
+#define GL_R8I                            0x8231
+#define GL_R8UI                           0x8232
+#define GL_R16I                           0x8233
+#define GL_R16UI                          0x8234
+#define GL_R32I                           0x8235
+#define GL_R32UI                          0x8236
+#define GL_RG8I                           0x8237
+#define GL_RG8UI                          0x8238
+#define GL_RG16I                          0x8239
+#define GL_RG16UI                         0x823A
+#define GL_RG32I                          0x823B
+#define GL_RG32UI                         0x823C
+#endif
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING           0x85B5
+#endif
+
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_UNIFORM_BUFFER                 0x8A11
+#define GL_UNIFORM_BUFFER_BINDING         0x8A28
+#define GL_UNIFORM_BUFFER_START           0x8A29
+#define GL_UNIFORM_BUFFER_SIZE            0x8A2A
+#define GL_MAX_VERTEX_UNIFORM_BLOCKS      0x8A2B
+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS    0x8A2C
+#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS    0x8A2D
+#define GL_MAX_COMBINED_UNIFORM_BLOCKS    0x8A2E
+#define GL_MAX_UNIFORM_BUFFER_BINDINGS    0x8A2F
+#define GL_MAX_UNIFORM_BLOCK_SIZE         0x8A30
+#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
+#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
+#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
+#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
+#define GL_ACTIVE_UNIFORM_BLOCKS          0x8A36
+#define GL_UNIFORM_TYPE                   0x8A37
+#define GL_UNIFORM_SIZE                   0x8A38
+#define GL_UNIFORM_NAME_LENGTH            0x8A39
+#define GL_UNIFORM_BLOCK_INDEX            0x8A3A
+#define GL_UNIFORM_OFFSET                 0x8A3B
+#define GL_UNIFORM_ARRAY_STRIDE           0x8A3C
+#define GL_UNIFORM_MATRIX_STRIDE          0x8A3D
+#define GL_UNIFORM_IS_ROW_MAJOR           0x8A3E
+#define GL_UNIFORM_BLOCK_BINDING          0x8A3F
+#define GL_UNIFORM_BLOCK_DATA_SIZE        0x8A40
+#define GL_UNIFORM_BLOCK_NAME_LENGTH      0x8A41
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS  0x8A42
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
+#define GL_INVALID_INDEX                  0xFFFFFFFFu
+#endif
+
+#ifndef GL_ARB_copy_buffer
+#define GL_COPY_READ_BUFFER               0x8F36
+#define GL_COPY_WRITE_BUFFER              0x8F37
+#endif
+
+#ifndef GL_ARB_depth_clamp
+#define GL_DEPTH_CLAMP                    0x864F
+#endif
+
+#ifndef GL_ARB_draw_elements_base_vertex
+#endif
+
+#ifndef GL_ARB_fragment_coord_conventions
+#endif
+
+#ifndef GL_ARB_provoking_vertex
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION        0x8E4D
+#define GL_LAST_VERTEX_CONVENTION         0x8E4E
+#define GL_PROVOKING_VERTEX               0x8E4F
+#endif
+
+#ifndef GL_ARB_seamless_cube_map
+#define GL_TEXTURE_CUBE_MAP_SEAMLESS      0x884F
+#endif
+
+#ifndef GL_ARB_sync
+#define GL_MAX_SERVER_WAIT_TIMEOUT        0x9111
+#define GL_OBJECT_TYPE                    0x9112
+#define GL_SYNC_CONDITION                 0x9113
+#define GL_SYNC_STATUS                    0x9114
+#define GL_SYNC_FLAGS                     0x9115
+#define GL_SYNC_FENCE                     0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
+#define GL_UNSIGNALED                     0x9118
+#define GL_SIGNALED                       0x9119
+#define GL_ALREADY_SIGNALED               0x911A
+#define GL_TIMEOUT_EXPIRED                0x911B
+#define GL_CONDITION_SATISFIED            0x911C
+#define GL_WAIT_FAILED                    0x911D
+#define GL_SYNC_FLUSH_COMMANDS_BIT        0x00000001
+#define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
+#endif
+
+#ifndef GL_ARB_texture_multisample
+#define GL_SAMPLE_POSITION                0x8E50
+#define GL_SAMPLE_MASK                    0x8E51
+#define GL_SAMPLE_MASK_VALUE              0x8E52
+#define GL_MAX_SAMPLE_MASK_WORDS          0x8E59
+#define GL_TEXTURE_2D_MULTISAMPLE         0x9100
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE   0x9101
+#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY   0x9102
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
+#define GL_TEXTURE_SAMPLES                0x9106
+#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
+#define GL_SAMPLER_2D_MULTISAMPLE         0x9108
+#define GL_INT_SAMPLER_2D_MULTISAMPLE     0x9109
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
+#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910B
+#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
+#define GL_MAX_COLOR_TEXTURE_SAMPLES      0x910E
+#define GL_MAX_DEPTH_TEXTURE_SAMPLES      0x910F
+#define GL_MAX_INTEGER_SAMPLES            0x9110
+#endif
+
+#ifndef GL_ARB_vertex_array_bgra
+/* reuse GL_BGRA */
+#endif
+
+#ifndef GL_ARB_draw_buffers_blend
+#endif
+
+#ifndef GL_ARB_sample_shading
+#define GL_SAMPLE_SHADING                 0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE       0x8C37
+#endif
+
+#ifndef GL_ARB_texture_cube_map_array
+#define GL_TEXTURE_CUBE_MAP_ARRAY         0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY   0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY         0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW  0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY     0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
+#endif
+
+#ifndef GL_ARB_texture_gather
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F
+#endif
+
+#ifndef GL_ARB_texture_query_lod
+#endif
+
+#ifndef GL_ARB_blend_func_extended
+#define GL_SRC1_COLOR                     0x88F9
+/* reuse GL_SRC1_ALPHA */
+#define GL_ONE_MINUS_SRC1_COLOR           0x88FA
+#define GL_ONE_MINUS_SRC1_ALPHA           0x88FB
+#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS   0x88FC
+#endif
+
+#ifndef GL_ARB_explicit_attrib_location
+#endif
+
+#ifndef GL_ARB_occlusion_query2
+#define GL_ANY_SAMPLES_PASSED             0x8C2F
+#endif
+
+#ifndef GL_ARB_sampler_objects
+#define GL_SAMPLER_BINDING                0x8919
+#endif
+
+#ifndef GL_ARB_shader_bit_encoding
+#endif
+
+#ifndef GL_ARB_texture_rgb10_a2ui
+#define GL_RGB10_A2UI                     0x906F
+#endif
+
+#ifndef GL_ARB_texture_swizzle
+#define GL_TEXTURE_SWIZZLE_R              0x8E42
+#define GL_TEXTURE_SWIZZLE_G              0x8E43
+#define GL_TEXTURE_SWIZZLE_B              0x8E44
+#define GL_TEXTURE_SWIZZLE_A              0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA           0x8E46
+#endif
+
+#ifndef GL_ARB_timer_query
+#define GL_TIME_ELAPSED                   0x88BF
+#define GL_TIMESTAMP                      0x8E28
+#endif
+
+#ifndef GL_ARB_vertex_type_2_10_10_10_rev
+/* reuse GL_UNSIGNED_INT_2_10_10_10_REV */
+#define GL_INT_2_10_10_10_REV             0x8D9F
+#endif
+
+#ifndef GL_ARB_draw_indirect
+#define GL_DRAW_INDIRECT_BUFFER           0x8F3F
+#define GL_DRAW_INDIRECT_BUFFER_BINDING   0x8F43
+#endif
+
+#ifndef GL_ARB_gpu_shader5
+#define GL_GEOMETRY_SHADER_INVOCATIONS    0x887F
+#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
+#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
+#define GL_MAX_VERTEX_STREAMS             0x8E71
+#endif
+
+#ifndef GL_ARB_gpu_shader_fp64
+/* reuse GL_DOUBLE */
+#define GL_DOUBLE_VEC2                    0x8FFC
+#define GL_DOUBLE_VEC3                    0x8FFD
+#define GL_DOUBLE_VEC4                    0x8FFE
+#define GL_DOUBLE_MAT2                    0x8F46
+#define GL_DOUBLE_MAT3                    0x8F47
+#define GL_DOUBLE_MAT4                    0x8F48
+#define GL_DOUBLE_MAT2x3                  0x8F49
+#define GL_DOUBLE_MAT2x4                  0x8F4A
+#define GL_DOUBLE_MAT3x2                  0x8F4B
+#define GL_DOUBLE_MAT3x4                  0x8F4C
+#define GL_DOUBLE_MAT4x2                  0x8F4D
+#define GL_DOUBLE_MAT4x3                  0x8F4E
+#endif
+
+#ifndef GL_ARB_shader_subroutine
+#define GL_ACTIVE_SUBROUTINES             0x8DE5
+#define GL_ACTIVE_SUBROUTINE_UNIFORMS     0x8DE6
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
+#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH   0x8E48
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
+#define GL_MAX_SUBROUTINES                0x8DE7
+#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
+#define GL_NUM_COMPATIBLE_SUBROUTINES     0x8E4A
+#define GL_COMPATIBLE_SUBROUTINES         0x8E4B
+/* reuse GL_UNIFORM_SIZE */
+/* reuse GL_UNIFORM_NAME_LENGTH */
+#endif
+
+#ifndef GL_ARB_tessellation_shader
+#define GL_PATCHES                        0x000E
+#define GL_PATCH_VERTICES                 0x8E72
+#define GL_PATCH_DEFAULT_INNER_LEVEL      0x8E73
+#define GL_PATCH_DEFAULT_OUTER_LEVEL      0x8E74
+#define GL_TESS_CONTROL_OUTPUT_VERTICES   0x8E75
+#define GL_TESS_GEN_MODE                  0x8E76
+#define GL_TESS_GEN_SPACING               0x8E77
+#define GL_TESS_GEN_VERTEX_ORDER          0x8E78
+#define GL_TESS_GEN_POINT_MODE            0x8E79
+/* reuse GL_TRIANGLES */
+/* reuse GL_QUADS */
+#define GL_ISOLINES                       0x8E7A
+/* reuse GL_EQUAL */
+#define GL_FRACTIONAL_ODD                 0x8E7B
+#define GL_FRACTIONAL_EVEN                0x8E7C
+/* reuse GL_CCW */
+/* reuse GL_CW */
+#define GL_MAX_PATCH_VERTICES             0x8E7D
+#define GL_MAX_TESS_GEN_LEVEL             0x8E7E
+#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
+#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
+#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
+#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
+#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
+#define GL_MAX_TESS_PATCH_COMPONENTS      0x8E84
+#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
+#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
+#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
+#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
+#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
+#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
+#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
+#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
+#define GL_TESS_EVALUATION_SHADER         0x8E87
+#define GL_TESS_CONTROL_SHADER            0x8E88
+#endif
+
+#ifndef GL_ARB_texture_buffer_object_rgb32
+/* reuse GL_RGB32F */
+/* reuse GL_RGB32UI */
+/* reuse GL_RGB32I */
+#endif
+
+#ifndef GL_ARB_transform_feedback2
+#define GL_TRANSFORM_FEEDBACK             0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING     0x8E25
+#endif
+
+#ifndef GL_ARB_transform_feedback3
+#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
+#endif
+
+
+/*************************************************************/
+
+#include <stddef.h>
+#ifndef GL_VERSION_2_0
+/* GL type for program/shader text */
+typedef char GLchar;
+#endif
+
+#ifndef GL_VERSION_1_5
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptrARB;
+typedef ptrdiff_t GLsizeiptrARB;
+#endif
+
+#ifndef GL_ARB_shader_objects
+/* GL types for program/shader text and shader object handles */
+typedef char GLcharARB;
+typedef unsigned int GLhandleARB;
+#endif
+
+/* GL type for "half" precision (s10e5) float data in host memory */
+#ifndef GL_ARB_half_float_pixel
+typedef unsigned short GLhalfARB;
+#endif
+
+#ifndef GL_NV_half_float
+typedef unsigned short GLhalfNV;
+#endif
+
+#ifndef GLEXT_64_TYPES_DEFINED
+/* This code block is duplicated in glxext.h, so must be protected */
+#define GLEXT_64_TYPES_DEFINED
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GL_EXT_timer_query extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__) || defined(__digital__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__) || defined(_LP64)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS ) || defined(__sgi)
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+/* Fallback if nothing above works */
+#include <inttypes.h>
+#endif
+#endif
+
+#ifndef GL_EXT_timer_query
+typedef int64_t GLint64EXT;
+typedef uint64_t GLuint64EXT;
+#endif
+
+#ifndef ARB_sync
+typedef int64_t GLint64;
+typedef uint64_t GLuint64;
+typedef struct __GLsync *GLsync;
+#endif
+
+#ifndef GL_VERSION_1_0
+#define GL_VERSION_1_0 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glCullFace (GLenum mode);
+GLAPI void APIENTRY glFrontFace (GLenum mode);
+GLAPI void APIENTRY glHint (GLenum target, GLenum mode);
+GLAPI void APIENTRY glLineWidth (GLfloat width);
+GLAPI void APIENTRY glPointSize (GLfloat size);
+GLAPI void APIENTRY glPolygonMode (GLenum face, GLenum mode);
+GLAPI void APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glDrawBuffer (GLenum mode);
+GLAPI void APIENTRY glClear (GLbitfield mask);
+GLAPI void APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+GLAPI void APIENTRY glClearStencil (GLint s);
+GLAPI void APIENTRY glClearDepth (GLclampd depth);
+GLAPI void APIENTRY glStencilMask (GLuint mask);
+GLAPI void APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+GLAPI void APIENTRY glDepthMask (GLboolean flag);
+GLAPI void APIENTRY glDisable (GLenum cap);
+GLAPI void APIENTRY glEnable (GLenum cap);
+GLAPI void APIENTRY glFinish (void);
+GLAPI void APIENTRY glFlush (void);
+GLAPI void APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
+GLAPI void APIENTRY glLogicOp (GLenum opcode);
+GLAPI void APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
+GLAPI void APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
+GLAPI void APIENTRY glDepthFunc (GLenum func);
+GLAPI void APIENTRY glPixelStoref (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelStorei (GLenum pname, GLint param);
+GLAPI void APIENTRY glReadBuffer (GLenum mode);
+GLAPI void APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
+GLAPI void APIENTRY glGetBooleanv (GLenum pname, GLboolean *params);
+GLAPI void APIENTRY glGetDoublev (GLenum pname, GLdouble *params);
+GLAPI GLenum APIENTRY glGetError (void);
+GLAPI void APIENTRY glGetFloatv (GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetIntegerv (GLenum pname, GLint *params);
+GLAPI const GLubyte * APIENTRY glGetString (GLenum name);
+GLAPI void APIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+GLAPI void APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsEnabled (GLenum cap);
+GLAPI void APIENTRY glDepthRange (GLclampd near, GLclampd far);
+GLAPI void APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCULLFACEPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLFRONTFACEPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLHINTPROC) (GLenum target, GLenum mode);
+typedef void (APIENTRYP PFNGLLINEWIDTHPROC) (GLfloat width);
+typedef void (APIENTRYP PFNGLPOINTSIZEPROC) (GLfloat size);
+typedef void (APIENTRYP PFNGLPOLYGONMODEPROC) (GLenum face, GLenum mode);
+typedef void (APIENTRYP PFNGLSCISSORPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXIMAGE1DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLDRAWBUFFERPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLCLEARPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLCLEARCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRYP PFNGLCLEARSTENCILPROC) (GLint s);
+typedef void (APIENTRYP PFNGLCLEARDEPTHPROC) (GLclampd depth);
+typedef void (APIENTRYP PFNGLSTENCILMASKPROC) (GLuint mask);
+typedef void (APIENTRYP PFNGLCOLORMASKPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+typedef void (APIENTRYP PFNGLDEPTHMASKPROC) (GLboolean flag);
+typedef void (APIENTRYP PFNGLDISABLEPROC) (GLenum cap);
+typedef void (APIENTRYP PFNGLENABLEPROC) (GLenum cap);
+typedef void (APIENTRYP PFNGLFINISHPROC) (void);
+typedef void (APIENTRYP PFNGLFLUSHPROC) (void);
+typedef void (APIENTRYP PFNGLBLENDFUNCPROC) (GLenum sfactor, GLenum dfactor);
+typedef void (APIENTRYP PFNGLLOGICOPPROC) (GLenum opcode);
+typedef void (APIENTRYP PFNGLSTENCILFUNCPROC) (GLenum func, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILOPPROC) (GLenum fail, GLenum zfail, GLenum zpass);
+typedef void (APIENTRYP PFNGLDEPTHFUNCPROC) (GLenum func);
+typedef void (APIENTRYP PFNGLPIXELSTOREFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELSTOREIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLREADBUFFERPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
+typedef void (APIENTRYP PFNGLGETBOOLEANVPROC) (GLenum pname, GLboolean *params);
+typedef void (APIENTRYP PFNGLGETDOUBLEVPROC) (GLenum pname, GLdouble *params);
+typedef GLenum (APIENTRYP PFNGLGETERRORPROC) (void);
+typedef void (APIENTRYP PFNGLGETFLOATVPROC) (GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETINTEGERVPROC) (GLenum pname, GLint *params);
+typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGPROC) (GLenum name);
+typedef void (APIENTRYP PFNGLGETTEXIMAGEPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC) (GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC) (GLenum target, GLint level, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC) (GLenum cap);
+typedef void (APIENTRYP PFNGLDEPTHRANGEPROC) (GLclampd near, GLclampd far);
+typedef void (APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_VERSION_1_1
+#define GL_VERSION_1_1 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
+GLAPI void APIENTRY glGetPointerv (GLenum pname, GLvoid* *params);
+GLAPI void APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
+GLAPI void APIENTRY glCopyTexImage1D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glBindTexture (GLenum target, GLuint texture);
+GLAPI void APIENTRY glDeleteTextures (GLsizei n, const GLuint *textures);
+GLAPI void APIENTRY glGenTextures (GLsizei n, GLuint *textures);
+GLAPI GLboolean APIENTRY glIsTexture (GLuint texture);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, GLvoid* *params);
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETPROC) (GLfloat factor, GLfloat units);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLBINDTEXTUREPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLDELETETEXTURESPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRYP PFNGLGENTEXTURESPROC) (GLsizei n, GLuint *textures);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREPROC) (GLuint texture);
+#endif
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+GLAPI void APIENTRY glBlendEquation (GLenum mode);
+GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glActiveTexture (GLenum texture);
+GLAPI void APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, GLvoid *img);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQuery (GLuint id);
+GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQuery (GLenum target);
+GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer);
+GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
+GLAPI GLvoid* APIENTRY glMapBuffer (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target);
+GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, GLvoid* *params);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparate (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
+GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
+GLAPI void APIENTRY glCompileShader (GLuint shader);
+GLAPI GLuint APIENTRY glCreateProgram (void);
+GLAPI GLuint APIENTRY glCreateShader (GLenum type);
+GLAPI void APIENTRY glDeleteProgram (GLuint program);
+GLAPI void APIENTRY glDeleteShader (GLuint shader);
+GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
+GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid* *pointer);
+GLAPI GLboolean APIENTRY glIsProgram (GLuint program);
+GLAPI GLboolean APIENTRY glIsShader (GLuint shader);
+GLAPI void APIENTRY glLinkProgram (GLuint program);
+GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+GLAPI void APIENTRY glUseProgram (GLuint program);
+GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1i (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glValidateProgram (GLuint program);
+GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_VERSION_3_0 1
+/* OpenGL 3.0 also reuses entry points from these extensions: */
+/* ARB_framebuffer_object */
+/* ARB_map_buffer_range */
+/* ARB_vertex_array_object */
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glEnablei (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisablei (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index);
+GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedback (void);
+GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp);
+GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRender (void);
+GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value);
+GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value);
+GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+GLAPI const GLubyte * APIENTRY glGetStringi (GLenum name, GLuint index);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
+#endif
+
+#ifndef GL_VERSION_3_1
+#define GL_VERSION_3_1 1
+/* OpenGL 3.1 also reuses entry points from these extensions: */
+/* ARB_copy_buffer */
+/* ARB_uniform_buffer_object */
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
+#endif
+
+#ifndef GL_VERSION_3_2
+#define GL_VERSION_3_2 1
+/* OpenGL 3.2 also reuses entry points from these extensions: */
+/* ARB_draw_elements_base_vertex */
+/* ARB_provoking_vertex */
+/* ARB_sync */
+/* ARB_texture_multisample */
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data);
+GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value);
+GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+#endif
+
+#ifndef GL_VERSION_3_3
+#define GL_VERSION_3_3 1
+/* OpenGL 3.3 also reuses entry points from these extensions: */
+/* ARB_blend_func_extended */
+/* ARB_sampler_objects */
+/* ARB_explicit_attrib_location, but it has none */
+/* ARB_occlusion_query2 (no entry points) */
+/* ARB_shader_bit_encoding (no entry points) */
+/* ARB_texture_rgb10_a2ui (no entry points) */
+/* ARB_texture_swizzle (no entry points) */
+/* ARB_timer_query */
+/* ARB_vertex_type_2_10_10_10_rev */
+#endif
+
+#ifndef GL_VERSION_4_0
+#define GL_VERSION_4_0 1
+/* OpenGL 4.0 also reuses entry points from these extensions: */
+/* ARB_gpu_shader5 (no entry points) */
+/* ARB_gpu_shader_fp64 */
+/* ARB_shader_subroutine */
+/* ARB_tessellation_shader */
+/* ARB_texture_buffer_object_rgb32 (no entry points) */
+/* ARB_transform_feedback2 */
+/* ARB_transform_feedback3 */
+#endif
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_ARB_depth_buffer_float 1
+#endif
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_ARB_framebuffer_object 1
+#ifdef GL3_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmap (GLenum target);
+GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif /* GL3_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_ARB_framebuffer_sRGB 1
+#endif
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_ARB_half_float_vertex 1
+#endif
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_ARB_map_buffer_range 1
+#ifdef GL3_PROTOTYPES
+GLAPI GLvoid* APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length);
+#endif /* GL3_PROTOTYPES */
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+#endif
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_ARB_texture_compression_rgtc 1
+#endif
+
+#ifndef GL_ARB_texture_rg
+#define GL_ARB_texture_rg 1
+#endif
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_ARB_vertex_array_object 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArray (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
+#endif
+
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_ARB_uniform_buffer_object 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
+GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName);
+GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#endif
+
+#ifndef GL_ARB_copy_buffer
+#define GL_ARB_copy_buffer 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+#endif
+
+#ifndef GL_ARB_depth_clamp
+#define GL_ARB_depth_clamp 1
+#endif
+
+#ifndef GL_ARB_draw_elements_base_vertex
+#define GL_ARB_draw_elements_base_vertex 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
+GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
+#endif
+
+#ifndef GL_ARB_fragment_coord_conventions
+#define GL_ARB_fragment_coord_conventions 1
+#endif
+
+#ifndef GL_ARB_provoking_vertex
+#define GL_ARB_provoking_vertex 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glProvokingVertex (GLenum mode);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode);
+#endif
+
+#ifndef GL_ARB_seamless_cube_map
+#define GL_ARB_seamless_cube_map 1
+#endif
+
+#ifndef GL_ARB_sync
+#define GL_ARB_sync 1
+#ifdef GL3_PROTOTYPES
+GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags);
+GLAPI GLboolean APIENTRY glIsSync (GLsync sync);
+GLAPI void APIENTRY glDeleteSync (GLsync sync);
+GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+#endif /* GL3_PROTOTYPES */
+typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
+typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync);
+typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync);
+typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+#endif
+
+#ifndef GL_ARB_texture_multisample
+#define GL_ARB_texture_multisample 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaski (GLuint index, GLbitfield mask);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask);
+#endif
+
+#ifndef GL_ARB_vertex_array_bgra
+#define GL_ARB_vertex_array_bgra 1
+#endif
+
+#ifndef GL_ARB_draw_buffers_blend
+#define GL_ARB_draw_buffers_blend 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#endif
+
+#ifndef GL_ARB_sample_shading
+#define GL_ARB_sample_shading 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glMinSampleShading (GLclampf value);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLclampf value);
+#endif
+
+#ifndef GL_ARB_texture_cube_map_array
+#define GL_ARB_texture_cube_map_array 1
+#endif
+
+#ifndef GL_ARB_texture_gather
+#define GL_ARB_texture_gather 1
+#endif
+
+#ifndef GL_ARB_texture_query_lod
+#define GL_ARB_texture_query_lod 1
+#endif
+
+#ifndef GL_ARB_blend_func_extended
+#define GL_ARB_blend_func_extended 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name);
+#endif
+
+#ifndef GL_ARB_sampler_objects
+#define GL_ARB_sampler_objects 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers);
+GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers);
+GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler);
+GLAPI void APIENTRY glBindSampler (GLenum unit, GLuint sampler);
+GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param);
+GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param);
+GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetSamplerParameterIfv (GLuint sampler, GLenum pname, GLfloat *params);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
+typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers);
+typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler);
+typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLenum unit, GLuint sampler);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_ARB_timer_query
+#define GL_ARB_timer_query 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target);
+GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params);
+#endif
+
+#ifndef GL_ARB_vertex_type_2_10_10_10_rev
+#define GL_ARB_vertex_type_2_10_10_10_rev 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+#endif
+
+#ifndef GL_ARB_draw_indirect
+#define GL_ARB_draw_indirect 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const GLvoid *indirect);
+GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const GLvoid *indirect);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const GLvoid *indirect);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const GLvoid *indirect);
+#endif
+
+#ifndef GL_ARB_gpu_shader_fp64
+#define GL_ARB_gpu_shader_fp64 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x);
+GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params);
+GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x);
+GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+#endif
+
+#ifndef GL_ARB_shader_subroutine
+#define GL_ARB_shader_subroutine 1
+#ifdef GL3_PROTOTYPES
+GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices);
+GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params);
+GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+#endif /* GL3_PROTOTYPES */
+typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices);
+typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+#endif
+
+#ifndef GL_ARB_tessellation_shader
+#define GL_ARB_tessellation_shader 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value);
+GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values);
+#endif
+
+#ifndef GL_ARB_transform_feedback2
+#define GL_ARB_transform_feedback2 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedback (void);
+GLAPI void APIENTRY glResumeTransformFeedback (void);
+GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
+#endif
+
+#ifndef GL_ARB_transform_feedback3
+#define GL_ARB_transform_feedback3 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream);
+GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id);
+GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index);
+GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
+typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/make/stub_includes/opengl/GL3/gl3ext.h.orig b/make/stub_includes/opengl/GL3/gl3ext.h.orig
new file mode 100644
index 000000000..a2991cc77
--- /dev/null
+++ b/make/stub_includes/opengl/GL3/gl3ext.h.orig
@@ -0,0 +1,10073 @@
+#ifndef __glext_h_
+#define __glext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007-2010 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glext.h last updated $Date: 2010-03-11 11:19:31 -0800 (Thu, 11 Mar 2010) $ */
+/* Current version at http://www.opengl.org/registry/ */
+#define GL_GLEXT_VERSION 60
+/* Function declaration macros - to move into glplatform.h */
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+#ifndef GL_VERSION_1_2
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_TEXTURE_BINDING_3D             0x806A
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_BGR                            0x80E0
+#define GL_BGRA                           0x80E1
+#define GL_MAX_ELEMENTS_VERTICES          0x80E8
+#define GL_MAX_ELEMENTS_INDICES           0x80E9
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#endif
+
+#ifndef GL_VERSION_1_2_DEPRECATED
+#define GL_RESCALE_NORMAL                 0x803A
+#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
+#define GL_SINGLE_COLOR                   0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+#endif
+
+#ifndef GL_ARB_imaging
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_BLEND_COLOR                    0x8005
+#define GL_FUNC_ADD                       0x8006
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#endif
+
+#ifndef GL_ARB_imaging_DEPRECATED
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_CONVOLUTION_BORDER_MODE        0x8013
+#define GL_CONVOLUTION_FILTER_SCALE       0x8014
+#define GL_CONVOLUTION_FILTER_BIAS        0x8015
+#define GL_REDUCE                         0x8016
+#define GL_CONVOLUTION_FORMAT             0x8017
+#define GL_CONVOLUTION_WIDTH              0x8018
+#define GL_CONVOLUTION_HEIGHT             0x8019
+#define GL_MAX_CONVOLUTION_WIDTH          0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_HISTOGRAM_WIDTH                0x8026
+#define GL_HISTOGRAM_FORMAT               0x8027
+#define GL_HISTOGRAM_RED_SIZE             0x8028
+#define GL_HISTOGRAM_GREEN_SIZE           0x8029
+#define GL_HISTOGRAM_BLUE_SIZE            0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
+#define GL_HISTOGRAM_SINK                 0x802D
+#define GL_MINMAX                         0x802E
+#define GL_MINMAX_FORMAT                  0x802F
+#define GL_MINMAX_SINK                    0x8030
+#define GL_TABLE_TOO_LARGE                0x8031
+#define GL_COLOR_MATRIX                   0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE              0x80D6
+#define GL_COLOR_TABLE_BIAS               0x80D7
+#define GL_COLOR_TABLE_FORMAT             0x80D8
+#define GL_COLOR_TABLE_WIDTH              0x80D9
+#define GL_COLOR_TABLE_RED_SIZE           0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
+#define GL_CONSTANT_BORDER                0x8151
+#define GL_REPLICATE_BORDER               0x8153
+#define GL_CONVOLUTION_BORDER_COLOR       0x8154
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+#define GL_MULTISAMPLE                    0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+#define GL_COMPRESSED_RGB                 0x84ED
+#define GL_COMPRESSED_RGBA                0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
+#define GL_TEXTURE_COMPRESSED             0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_CLAMP_TO_BORDER                0x812D
+#endif
+
+#ifndef GL_VERSION_1_3_DEPRECATED
+#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
+#define GL_MAX_TEXTURE_UNITS              0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
+#define GL_MULTISAMPLE_BIT                0x20000000
+#define GL_NORMAL_MAP                     0x8511
+#define GL_REFLECTION_MAP                 0x8512
+#define GL_COMPRESSED_ALPHA               0x84E9
+#define GL_COMPRESSED_LUMINANCE           0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
+#define GL_COMPRESSED_INTENSITY           0x84EC
+#define GL_COMBINE                        0x8570
+#define GL_COMBINE_RGB                    0x8571
+#define GL_COMBINE_ALPHA                  0x8572
+#define GL_SOURCE0_RGB                    0x8580
+#define GL_SOURCE1_RGB                    0x8581
+#define GL_SOURCE2_RGB                    0x8582
+#define GL_SOURCE0_ALPHA                  0x8588
+#define GL_SOURCE1_ALPHA                  0x8589
+#define GL_SOURCE2_ALPHA                  0x858A
+#define GL_OPERAND0_RGB                   0x8590
+#define GL_OPERAND1_RGB                   0x8591
+#define GL_OPERAND2_RGB                   0x8592
+#define GL_OPERAND0_ALPHA                 0x8598
+#define GL_OPERAND1_ALPHA                 0x8599
+#define GL_OPERAND2_ALPHA                 0x859A
+#define GL_RGB_SCALE                      0x8573
+#define GL_ADD_SIGNED                     0x8574
+#define GL_INTERPOLATE                    0x8575
+#define GL_SUBTRACT                       0x84E7
+#define GL_CONSTANT                       0x8576
+#define GL_PRIMARY_COLOR                  0x8577
+#define GL_PREVIOUS                       0x8578
+#define GL_DOT3_RGB                       0x86AE
+#define GL_DOT3_RGBA                      0x86AF
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_MIRRORED_REPEAT                0x8370
+#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
+#define GL_TEXTURE_LOD_BIAS               0x8501
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#endif
+
+#ifndef GL_VERSION_1_4_DEPRECATED
+#define GL_POINT_SIZE_MIN                 0x8126
+#define GL_POINT_SIZE_MAX                 0x8127
+#define GL_POINT_DISTANCE_ATTENUATION     0x8129
+#define GL_GENERATE_MIPMAP                0x8191
+#define GL_GENERATE_MIPMAP_HINT           0x8192
+#define GL_FOG_COORDINATE_SOURCE          0x8450
+#define GL_FOG_COORDINATE                 0x8451
+#define GL_FRAGMENT_DEPTH                 0x8452
+#define GL_CURRENT_FOG_COORDINATE         0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
+#define GL_FOG_COORDINATE_ARRAY           0x8457
+#define GL_COLOR_SUM                      0x8458
+#define GL_CURRENT_SECONDARY_COLOR        0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
+#define GL_SECONDARY_COLOR_ARRAY          0x845E
+#define GL_TEXTURE_FILTER_CONTROL         0x8500
+#define GL_DEPTH_TEXTURE_MODE             0x884B
+#define GL_COMPARE_R_TO_TEXTURE           0x884E
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+#define GL_QUERY_COUNTER_BITS             0x8864
+#define GL_CURRENT_QUERY                  0x8865
+#define GL_QUERY_RESULT                   0x8866
+#define GL_QUERY_RESULT_AVAILABLE         0x8867
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_BUFFER_ACCESS                  0x88BB
+#define GL_BUFFER_MAPPED                  0x88BC
+#define GL_BUFFER_MAP_POINTER             0x88BD
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_STREAM_COPY                    0x88E2
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_STATIC_READ                    0x88E5
+#define GL_STATIC_COPY                    0x88E6
+#define GL_DYNAMIC_DRAW                   0x88E8
+#define GL_DYNAMIC_READ                   0x88E9
+#define GL_DYNAMIC_COPY                   0x88EA
+#define GL_SAMPLES_PASSED                 0x8914
+#endif
+
+#ifndef GL_VERSION_1_5_DEPRECATED
+#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
+#define GL_FOG_COORD_SRC                  0x8450
+#define GL_FOG_COORD                      0x8451
+#define GL_CURRENT_FOG_COORD              0x8453
+#define GL_FOG_COORD_ARRAY_TYPE           0x8454
+#define GL_FOG_COORD_ARRAY_STRIDE         0x8455
+#define GL_FOG_COORD_ARRAY_POINTER        0x8456
+#define GL_FOG_COORD_ARRAY                0x8457
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D
+#define GL_SRC0_RGB                       0x8580
+#define GL_SRC1_RGB                       0x8581
+#define GL_SRC2_RGB                       0x8582
+#define GL_SRC0_ALPHA                     0x8588
+#define GL_SRC1_ALPHA                     0x8589
+#define GL_SRC2_ALPHA                     0x858A
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_BLEND_EQUATION_RGB             0x8009
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_MAX_DRAW_BUFFERS               0x8824
+#define GL_DRAW_BUFFER0                   0x8825
+#define GL_DRAW_BUFFER1                   0x8826
+#define GL_DRAW_BUFFER2                   0x8827
+#define GL_DRAW_BUFFER3                   0x8828
+#define GL_DRAW_BUFFER4                   0x8829
+#define GL_DRAW_BUFFER5                   0x882A
+#define GL_DRAW_BUFFER6                   0x882B
+#define GL_DRAW_BUFFER7                   0x882C
+#define GL_DRAW_BUFFER8                   0x882D
+#define GL_DRAW_BUFFER9                   0x882E
+#define GL_DRAW_BUFFER10                  0x882F
+#define GL_DRAW_BUFFER11                  0x8830
+#define GL_DRAW_BUFFER12                  0x8831
+#define GL_DRAW_BUFFER13                  0x8832
+#define GL_DRAW_BUFFER14                  0x8833
+#define GL_DRAW_BUFFER15                  0x8834
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+#define GL_MAX_VERTEX_ATTRIBS             0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
+#define GL_FRAGMENT_SHADER                0x8B30
+#define GL_VERTEX_SHADER                  0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
+#define GL_MAX_VARYING_FLOATS             0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE                    0x8B4F
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_1D                     0x8B5D
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_3D                     0x8B5F
+#define GL_SAMPLER_CUBE                   0x8B60
+#define GL_SAMPLER_1D_SHADOW              0x8B61
+#define GL_SAMPLER_2D_SHADOW              0x8B62
+#define GL_DELETE_STATUS                  0x8B80
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_LINK_STATUS                    0x8B82
+#define GL_VALIDATE_STATUS                0x8B83
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_ATTACHED_SHADERS               0x8B85
+#define GL_ACTIVE_UNIFORMS                0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_ACTIVE_ATTRIBUTES              0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
+#define GL_CURRENT_PROGRAM                0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
+#define GL_LOWER_LEFT                     0x8CA1
+#define GL_UPPER_LEFT                     0x8CA2
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#endif
+
+#ifndef GL_VERSION_2_0_DEPRECATED
+#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
+#define GL_POINT_SPRITE                   0x8861
+#define GL_COORD_REPLACE                  0x8862
+#define GL_MAX_TEXTURE_COORDS             0x8871
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_PIXEL_PACK_BUFFER              0x88EB
+#define GL_PIXEL_UNPACK_BUFFER            0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
+#define GL_FLOAT_MAT2x3                   0x8B65
+#define GL_FLOAT_MAT2x4                   0x8B66
+#define GL_FLOAT_MAT3x2                   0x8B67
+#define GL_FLOAT_MAT3x4                   0x8B68
+#define GL_FLOAT_MAT4x2                   0x8B69
+#define GL_FLOAT_MAT4x3                   0x8B6A
+#define GL_SRGB                           0x8C40
+#define GL_SRGB8                          0x8C41
+#define GL_SRGB_ALPHA                     0x8C42
+#define GL_SRGB8_ALPHA8                   0x8C43
+#define GL_COMPRESSED_SRGB                0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
+#endif
+
+#ifndef GL_VERSION_2_1_DEPRECATED
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_SLUMINANCE_ALPHA               0x8C44
+#define GL_SLUMINANCE8_ALPHA8             0x8C45
+#define GL_SLUMINANCE                     0x8C46
+#define GL_SLUMINANCE8                    0x8C47
+#define GL_COMPRESSED_SLUMINANCE          0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_COMPARE_REF_TO_TEXTURE         0x884E
+#define GL_CLIP_DISTANCE0                 0x3000
+#define GL_CLIP_DISTANCE1                 0x3001
+#define GL_CLIP_DISTANCE2                 0x3002
+#define GL_CLIP_DISTANCE3                 0x3003
+#define GL_CLIP_DISTANCE4                 0x3004
+#define GL_CLIP_DISTANCE5                 0x3005
+#define GL_CLIP_DISTANCE6                 0x3006
+#define GL_CLIP_DISTANCE7                 0x3007
+#define GL_MAX_CLIP_DISTANCES             0x0D32
+#define GL_MAJOR_VERSION                  0x821B
+#define GL_MINOR_VERSION                  0x821C
+#define GL_NUM_EXTENSIONS                 0x821D
+#define GL_CONTEXT_FLAGS                  0x821E
+#define GL_DEPTH_BUFFER                   0x8223
+#define GL_STENCIL_BUFFER                 0x8224
+#define GL_COMPRESSED_RED                 0x8225
+#define GL_COMPRESSED_RG                  0x8226
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
+#define GL_RGBA32F                        0x8814
+#define GL_RGB32F                         0x8815
+#define GL_RGBA16F                        0x881A
+#define GL_RGB16F                         0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
+#define GL_CLAMP_READ_COLOR               0x891C
+#define GL_FIXED_ONLY                     0x891D
+#define GL_MAX_VARYING_COMPONENTS         0x8B4B
+#define GL_TEXTURE_1D_ARRAY               0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
+#define GL_TEXTURE_2D_ARRAY               0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
+#define GL_R11F_G11F_B10F                 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
+#define GL_RGB9_E5                        0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
+#define GL_TEXTURE_SHARED_SIZE            0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED           0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD             0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS            0x8C8C
+#define GL_SEPARATE_ATTRIBS               0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI                       0x8D70
+#define GL_RGB32UI                        0x8D71
+#define GL_RGBA16UI                       0x8D76
+#define GL_RGB16UI                        0x8D77
+#define GL_RGBA8UI                        0x8D7C
+#define GL_RGB8UI                         0x8D7D
+#define GL_RGBA32I                        0x8D82
+#define GL_RGB32I                         0x8D83
+#define GL_RGBA16I                        0x8D88
+#define GL_RGB16I                         0x8D89
+#define GL_RGBA8I                         0x8D8E
+#define GL_RGB8I                          0x8D8F
+#define GL_RED_INTEGER                    0x8D94
+#define GL_GREEN_INTEGER                  0x8D95
+#define GL_BLUE_INTEGER                   0x8D96
+#define GL_RGB_INTEGER                    0x8D98
+#define GL_RGBA_INTEGER                   0x8D99
+#define GL_BGR_INTEGER                    0x8D9A
+#define GL_BGRA_INTEGER                   0x8D9B
+#define GL_SAMPLER_1D_ARRAY               0x8DC0
+#define GL_SAMPLER_2D_ARRAY               0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
+#define GL_UNSIGNED_INT_VEC2              0x8DC6
+#define GL_UNSIGNED_INT_VEC3              0x8DC7
+#define GL_UNSIGNED_INT_VEC4              0x8DC8
+#define GL_INT_SAMPLER_1D                 0x8DC9
+#define GL_INT_SAMPLER_2D                 0x8DCA
+#define GL_INT_SAMPLER_3D                 0x8DCB
+#define GL_INT_SAMPLER_CUBE               0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
+#define GL_QUERY_WAIT                     0x8E13
+#define GL_QUERY_NO_WAIT                  0x8E14
+#define GL_QUERY_BY_REGION_WAIT           0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
+#define GL_BUFFER_ACCESS_FLAGS            0x911F
+#define GL_BUFFER_MAP_LENGTH              0x9120
+#define GL_BUFFER_MAP_OFFSET              0x9121
+/* Reuse tokens from ARB_depth_buffer_float */
+/* reuse GL_DEPTH_COMPONENT32F */
+/* reuse GL_DEPTH32F_STENCIL8 */
+/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
+/* Reuse tokens from ARB_framebuffer_object */
+/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_DEFAULT */
+/* reuse GL_FRAMEBUFFER_UNDEFINED */
+/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
+/* reuse GL_INDEX */
+/* reuse GL_MAX_RENDERBUFFER_SIZE */
+/* reuse GL_DEPTH_STENCIL */
+/* reuse GL_UNSIGNED_INT_24_8 */
+/* reuse GL_DEPTH24_STENCIL8 */
+/* reuse GL_TEXTURE_STENCIL_SIZE */
+/* reuse GL_TEXTURE_RED_TYPE */
+/* reuse GL_TEXTURE_GREEN_TYPE */
+/* reuse GL_TEXTURE_BLUE_TYPE */
+/* reuse GL_TEXTURE_ALPHA_TYPE */
+/* reuse GL_TEXTURE_DEPTH_TYPE */
+/* reuse GL_UNSIGNED_NORMALIZED */
+/* reuse GL_FRAMEBUFFER_BINDING */
+/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_BINDING */
+/* reuse GL_READ_FRAMEBUFFER */
+/* reuse GL_DRAW_FRAMEBUFFER */
+/* reuse GL_READ_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_SAMPLES */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+/* reuse GL_FRAMEBUFFER_COMPLETE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
+/* reuse GL_MAX_COLOR_ATTACHMENTS */
+/* reuse GL_COLOR_ATTACHMENT0 */
+/* reuse GL_COLOR_ATTACHMENT1 */
+/* reuse GL_COLOR_ATTACHMENT2 */
+/* reuse GL_COLOR_ATTACHMENT3 */
+/* reuse GL_COLOR_ATTACHMENT4 */
+/* reuse GL_COLOR_ATTACHMENT5 */
+/* reuse GL_COLOR_ATTACHMENT6 */
+/* reuse GL_COLOR_ATTACHMENT7 */
+/* reuse GL_COLOR_ATTACHMENT8 */
+/* reuse GL_COLOR_ATTACHMENT9 */
+/* reuse GL_COLOR_ATTACHMENT10 */
+/* reuse GL_COLOR_ATTACHMENT11 */
+/* reuse GL_COLOR_ATTACHMENT12 */
+/* reuse GL_COLOR_ATTACHMENT13 */
+/* reuse GL_COLOR_ATTACHMENT14 */
+/* reuse GL_COLOR_ATTACHMENT15 */
+/* reuse GL_DEPTH_ATTACHMENT */
+/* reuse GL_STENCIL_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER */
+/* reuse GL_RENDERBUFFER */
+/* reuse GL_RENDERBUFFER_WIDTH */
+/* reuse GL_RENDERBUFFER_HEIGHT */
+/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
+/* reuse GL_STENCIL_INDEX1 */
+/* reuse GL_STENCIL_INDEX4 */
+/* reuse GL_STENCIL_INDEX8 */
+/* reuse GL_STENCIL_INDEX16 */
+/* reuse GL_RENDERBUFFER_RED_SIZE */
+/* reuse GL_RENDERBUFFER_GREEN_SIZE */
+/* reuse GL_RENDERBUFFER_BLUE_SIZE */
+/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
+/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
+/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+/* reuse GL_MAX_SAMPLES */
+/* Reuse tokens from ARB_framebuffer_sRGB */
+/* reuse GL_FRAMEBUFFER_SRGB */
+/* Reuse tokens from ARB_half_float_vertex */
+/* reuse GL_HALF_FLOAT */
+/* Reuse tokens from ARB_map_buffer_range */
+/* reuse GL_MAP_READ_BIT */
+/* reuse GL_MAP_WRITE_BIT */
+/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
+/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
+/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
+/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
+/* Reuse tokens from ARB_texture_compression_rgtc */
+/* reuse GL_COMPRESSED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_RG_RGTC2 */
+/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
+/* Reuse tokens from ARB_texture_rg */
+/* reuse GL_RG */
+/* reuse GL_RG_INTEGER */
+/* reuse GL_R8 */
+/* reuse GL_R16 */
+/* reuse GL_RG8 */
+/* reuse GL_RG16 */
+/* reuse GL_R16F */
+/* reuse GL_R32F */
+/* reuse GL_RG16F */
+/* reuse GL_RG32F */
+/* reuse GL_R8I */
+/* reuse GL_R8UI */
+/* reuse GL_R16I */
+/* reuse GL_R16UI */
+/* reuse GL_R32I */
+/* reuse GL_R32UI */
+/* reuse GL_RG8I */
+/* reuse GL_RG8UI */
+/* reuse GL_RG16I */
+/* reuse GL_RG16UI */
+/* reuse GL_RG32I */
+/* reuse GL_RG32UI */
+/* Reuse tokens from ARB_vertex_array_object */
+/* reuse GL_VERTEX_ARRAY_BINDING */
+#endif
+
+#ifndef GL_VERSION_3_0_DEPRECATED
+#define GL_CLAMP_VERTEX_COLOR             0x891A
+#define GL_CLAMP_FRAGMENT_COLOR           0x891B
+#define GL_ALPHA_INTEGER                  0x8D97
+/* Reuse tokens from ARB_framebuffer_object */
+/* reuse GL_TEXTURE_LUMINANCE_TYPE */
+/* reuse GL_TEXTURE_INTENSITY_TYPE */
+#endif
+
+#ifndef GL_VERSION_3_1
+#define GL_SAMPLER_2D_RECT                0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW         0x8B64
+#define GL_SAMPLER_BUFFER                 0x8DC2
+#define GL_INT_SAMPLER_2D_RECT            0x8DCD
+#define GL_INT_SAMPLER_BUFFER             0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT   0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER    0x8DD8
+#define GL_TEXTURE_BUFFER                 0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE        0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER         0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT          0x8C2E
+#define GL_TEXTURE_RECTANGLE              0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
+#define GL_RED_SNORM                      0x8F90
+#define GL_RG_SNORM                       0x8F91
+#define GL_RGB_SNORM                      0x8F92
+#define GL_RGBA_SNORM                     0x8F93
+#define GL_R8_SNORM                       0x8F94
+#define GL_RG8_SNORM                      0x8F95
+#define GL_RGB8_SNORM                     0x8F96
+#define GL_RGBA8_SNORM                    0x8F97
+#define GL_R16_SNORM                      0x8F98
+#define GL_RG16_SNORM                     0x8F99
+#define GL_RGB16_SNORM                    0x8F9A
+#define GL_RGBA16_SNORM                   0x8F9B
+#define GL_SIGNED_NORMALIZED              0x8F9C
+#define GL_PRIMITIVE_RESTART              0x8F9D
+#define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
+/* Reuse tokens from ARB_copy_buffer */
+/* reuse GL_COPY_READ_BUFFER */
+/* reuse GL_COPY_WRITE_BUFFER */
+/* Would reuse tokens from ARB_draw_instanced, but it has none */
+/* Reuse tokens from ARB_uniform_buffer_object */
+/* reuse GL_UNIFORM_BUFFER */
+/* reuse GL_UNIFORM_BUFFER_BINDING */
+/* reuse GL_UNIFORM_BUFFER_START */
+/* reuse GL_UNIFORM_BUFFER_SIZE */
+/* reuse GL_MAX_VERTEX_UNIFORM_BLOCKS */
+/* reuse GL_MAX_FRAGMENT_UNIFORM_BLOCKS */
+/* reuse GL_MAX_COMBINED_UNIFORM_BLOCKS */
+/* reuse GL_MAX_UNIFORM_BUFFER_BINDINGS */
+/* reuse GL_MAX_UNIFORM_BLOCK_SIZE */
+/* reuse GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS */
+/* reuse GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT */
+/* reuse GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH */
+/* reuse GL_ACTIVE_UNIFORM_BLOCKS */
+/* reuse GL_UNIFORM_TYPE */
+/* reuse GL_UNIFORM_SIZE */
+/* reuse GL_UNIFORM_NAME_LENGTH */
+/* reuse GL_UNIFORM_BLOCK_INDEX */
+/* reuse GL_UNIFORM_OFFSET */
+/* reuse GL_UNIFORM_ARRAY_STRIDE */
+/* reuse GL_UNIFORM_MATRIX_STRIDE */
+/* reuse GL_UNIFORM_IS_ROW_MAJOR */
+/* reuse GL_UNIFORM_BLOCK_BINDING */
+/* reuse GL_UNIFORM_BLOCK_DATA_SIZE */
+/* reuse GL_UNIFORM_BLOCK_NAME_LENGTH */
+/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS */
+/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER */
+/* reuse GL_INVALID_INDEX */
+#endif
+
+#ifndef GL_VERSION_3_2
+#define GL_CONTEXT_CORE_PROFILE_BIT       0x00000001
+#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
+#define GL_LINES_ADJACENCY                0x000A
+#define GL_LINE_STRIP_ADJACENCY           0x000B
+#define GL_TRIANGLES_ADJACENCY            0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY       0x000D
+#define GL_PROGRAM_POINT_SIZE             0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
+#define GL_GEOMETRY_SHADER                0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT          0x8916
+#define GL_GEOMETRY_INPUT_TYPE            0x8917
+#define GL_GEOMETRY_OUTPUT_TYPE           0x8918
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES   0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
+#define GL_MAX_VERTEX_OUTPUT_COMPONENTS   0x9122
+#define GL_MAX_GEOMETRY_INPUT_COMPONENTS  0x9123
+#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
+#define GL_MAX_FRAGMENT_INPUT_COMPONENTS  0x9125
+#define GL_CONTEXT_PROFILE_MASK           0x9126
+/* reuse GL_MAX_VARYING_COMPONENTS */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+/* Reuse tokens from ARB_depth_clamp */
+/* reuse GL_DEPTH_CLAMP */
+/* Would reuse tokens from ARB_draw_elements_base_vertex, but it has none */
+/* Would reuse tokens from ARB_fragment_coord_conventions, but it has none */
+/* Reuse tokens from ARB_provoking_vertex */
+/* reuse GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+/* reuse GL_FIRST_VERTEX_CONVENTION */
+/* reuse GL_LAST_VERTEX_CONVENTION */
+/* reuse GL_PROVOKING_VERTEX */
+/* Reuse tokens from ARB_seamless_cube_map */
+/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS */
+/* Reuse tokens from ARB_sync */
+/* reuse GL_MAX_SERVER_WAIT_TIMEOUT */
+/* reuse GL_OBJECT_TYPE */
+/* reuse GL_SYNC_CONDITION */
+/* reuse GL_SYNC_STATUS */
+/* reuse GL_SYNC_FLAGS */
+/* reuse GL_SYNC_FENCE */
+/* reuse GL_SYNC_GPU_COMMANDS_COMPLETE */
+/* reuse GL_UNSIGNALED */
+/* reuse GL_SIGNALED */
+/* reuse GL_ALREADY_SIGNALED */
+/* reuse GL_TIMEOUT_EXPIRED */
+/* reuse GL_CONDITION_SATISFIED */
+/* reuse GL_WAIT_FAILED */
+/* reuse GL_TIMEOUT_IGNORED */
+/* reuse GL_SYNC_FLUSH_COMMANDS_BIT */
+/* reuse GL_TIMEOUT_IGNORED */
+/* Reuse tokens from ARB_texture_multisample */
+/* reuse GL_SAMPLE_POSITION */
+/* reuse GL_SAMPLE_MASK */
+/* reuse GL_SAMPLE_MASK_VALUE */
+/* reuse GL_MAX_SAMPLE_MASK_WORDS */
+/* reuse GL_TEXTURE_2D_MULTISAMPLE */
+/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE */
+/* reuse GL_TEXTURE_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE */
+/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_TEXTURE_SAMPLES */
+/* reuse GL_TEXTURE_FIXED_SAMPLE_LOCATIONS */
+/* reuse GL_SAMPLER_2D_MULTISAMPLE */
+/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE */
+/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE */
+/* reuse GL_SAMPLER_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_MAX_COLOR_TEXTURE_SAMPLES */
+/* reuse GL_MAX_DEPTH_TEXTURE_SAMPLES */
+/* reuse GL_MAX_INTEGER_SAMPLES */
+/* Don't need to reuse tokens from ARB_vertex_array_bgra since they're already in 1.2 core */
+#endif
+
+#ifndef GL_VERSION_3_3
+/* Reuse tokens from ARB_blend_func_extended */
+/* reuse GL_SRC1_COLOR */
+/* reuse GL_ONE_MINUS_SRC1_COLOR */
+/* reuse GL_ONE_MINUS_SRC1_ALPHA */
+/* reuse GL_MAX_DUAL_SOURCE_DRAW_BUFFERS */
+/* Would reuse tokens from ARB_explicit_attrib_location, but it has none */
+/* Reuse tokens from ARB_occlusion_query2 */
+/* reuse GL_ANY_SAMPLES_PASSED */
+/* Reuse tokens from ARB_sampler_objects */
+/* reuse GL_SAMPLER_BINDING */
+/* Would reuse tokens from ARB_shader_bit_encoding, but it has none */
+/* Reuse tokens from ARB_texture_rgb10_a2ui */
+/* reuse GL_RGB10_A2UI */
+/* Reuse tokens from ARB_texture_swizzle */
+/* reuse GL_TEXTURE_SWIZZLE_R */
+/* reuse GL_TEXTURE_SWIZZLE_G */
+/* reuse GL_TEXTURE_SWIZZLE_B */
+/* reuse GL_TEXTURE_SWIZZLE_A */
+/* reuse GL_TEXTURE_SWIZZLE_RGBA */
+/* Reuse tokens from ARB_timer_query */
+/* reuse GL_TIME_ELAPSED */
+/* reuse GL_TIMESTAMP */
+/* Reuse tokens from ARB_vertex_type_2_10_10_10_rev */
+/* reuse GL_INT_2_10_10_10_REV */
+#endif
+
+#ifndef GL_VERSION_4_0
+/* Reuse tokens from ARB_draw_indirect */
+/* reuse GL_DRAW_INDIRECT_BUFFER */
+/* reuse GL_DRAW_INDIRECT_BUFFER_BINDING */
+/* Reuse tokens from ARB_gpu_shader5 */
+/* reuse GL_GEOMETRY_SHADER_INVOCATIONS */
+/* reuse GL_MAX_GEOMETRY_SHADER_INVOCATIONS */
+/* reuse GL_MIN_FRAGMENT_INTERPOLATION_OFFSET */
+/* reuse GL_MAX_FRAGMENT_INTERPOLATION_OFFSET */
+/* reuse GL_FRAGMENT_INTERPOLATION_OFFSET_BITS */
+/* reuse GL_MAX_VERTEX_STREAMS */
+/* Reuse tokens from ARB_gpu_shader_fp64 */
+/* reuse GL_DOUBLE_VEC2 */
+/* reuse GL_DOUBLE_VEC3 */
+/* reuse GL_DOUBLE_VEC4 */
+/* reuse GL_DOUBLE_MAT2 */
+/* reuse GL_DOUBLE_MAT3 */
+/* reuse GL_DOUBLE_MAT4 */
+/* reuse GL_DOUBLE_MAT2x3 */
+/* reuse GL_DOUBLE_MAT2x4 */
+/* reuse GL_DOUBLE_MAT3x2 */
+/* reuse GL_DOUBLE_MAT3x4 */
+/* reuse GL_DOUBLE_MAT4x2 */
+/* reuse GL_DOUBLE_MAT4x3 */
+/* Reuse tokens from ARB_shader_subroutine */
+/* reuse GL_ACTIVE_SUBROUTINES */
+/* reuse GL_ACTIVE_SUBROUTINE_UNIFORMS */
+/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS */
+/* reuse GL_ACTIVE_SUBROUTINE_MAX_LENGTH */
+/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH */
+/* reuse GL_MAX_SUBROUTINES */
+/* reuse GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS */
+/* reuse GL_NUM_COMPATIBLE_SUBROUTINES */
+/* reuse GL_COMPATIBLE_SUBROUTINES */
+/* Reuse tokens from ARB_tessellation_shader */
+/* reuse GL_PATCHES */
+/* reuse GL_PATCH_VERTICES */
+/* reuse GL_PATCH_DEFAULT_INNER_LEVEL */
+/* reuse GL_PATCH_DEFAULT_OUTER_LEVEL */
+/* reuse GL_TESS_CONTROL_OUTPUT_VERTICES */
+/* reuse GL_TESS_GEN_MODE */
+/* reuse GL_TESS_GEN_SPACING */
+/* reuse GL_TESS_GEN_VERTEX_ORDER */
+/* reuse GL_TESS_GEN_POINT_MODE */
+/* reuse GL_ISOLINES */
+/* reuse GL_FRACTIONAL_ODD */
+/* reuse GL_FRACTIONAL_EVEN */
+/* reuse GL_MAX_PATCH_VERTICES */
+/* reuse GL_MAX_TESS_GEN_LEVEL */
+/* reuse GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS */
+/* reuse GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS */
+/* reuse GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS */
+/* reuse GL_MAX_TESS_PATCH_COMPONENTS */
+/* reuse GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS */
+/* reuse GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS */
+/* reuse GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS */
+/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS */
+/* reuse GL_MAX_TESS_CONTROL_INPUT_COMPONENTS */
+/* reuse GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS */
+/* reuse GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER */
+/* reuse GL_TESS_EVALUATION_SHADER */
+/* reuse GL_TESS_CONTROL_SHADER */
+/* Would reuse tokens from ARB_texture_buffer_object_rgb32, but it has none */
+/* Reuse tokens from ARB_transform_feedback2 */
+/* reuse GL_TRANSFORM_FEEDBACK */
+/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+/* reuse GL_TRANSFORM_FEEDBACK_BINDING */
+/* Reuse tokens from ARB_transform_feedback3 */
+/* reuse GL_MAX_TRANSFORM_FEEDBACK_BUFFERS */
+/* reuse GL_MAX_VERTEX_STREAMS */
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_TEXTURE0_ARB                   0x84C0
+#define GL_TEXTURE1_ARB                   0x84C1
+#define GL_TEXTURE2_ARB                   0x84C2
+#define GL_TEXTURE3_ARB                   0x84C3
+#define GL_TEXTURE4_ARB                   0x84C4
+#define GL_TEXTURE5_ARB                   0x84C5
+#define GL_TEXTURE6_ARB                   0x84C6
+#define GL_TEXTURE7_ARB                   0x84C7
+#define GL_TEXTURE8_ARB                   0x84C8
+#define GL_TEXTURE9_ARB                   0x84C9
+#define GL_TEXTURE10_ARB                  0x84CA
+#define GL_TEXTURE11_ARB                  0x84CB
+#define GL_TEXTURE12_ARB                  0x84CC
+#define GL_TEXTURE13_ARB                  0x84CD
+#define GL_TEXTURE14_ARB                  0x84CE
+#define GL_TEXTURE15_ARB                  0x84CF
+#define GL_TEXTURE16_ARB                  0x84D0
+#define GL_TEXTURE17_ARB                  0x84D1
+#define GL_TEXTURE18_ARB                  0x84D2
+#define GL_TEXTURE19_ARB                  0x84D3
+#define GL_TEXTURE20_ARB                  0x84D4
+#define GL_TEXTURE21_ARB                  0x84D5
+#define GL_TEXTURE22_ARB                  0x84D6
+#define GL_TEXTURE23_ARB                  0x84D7
+#define GL_TEXTURE24_ARB                  0x84D8
+#define GL_TEXTURE25_ARB                  0x84D9
+#define GL_TEXTURE26_ARB                  0x84DA
+#define GL_TEXTURE27_ARB                  0x84DB
+#define GL_TEXTURE28_ARB                  0x84DC
+#define GL_TEXTURE29_ARB                  0x84DD
+#define GL_TEXTURE30_ARB                  0x84DE
+#define GL_TEXTURE31_ARB                  0x84DF
+#define GL_ACTIVE_TEXTURE_ARB             0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_NORMAL_MAP_ARB                 0x8511
+#define GL_REFLECTION_MAP_ARB             0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_COMPRESSED_ALPHA_ARB           0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
+#define GL_COMPRESSED_RGB_ARB             0x84ED
+#define GL_COMPRESSED_RGBA_ARB            0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_ARB            0x812D
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_POINT_SIZE_MIN_ARB             0x8126
+#define GL_POINT_SIZE_MAX_ARB             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
+#define GL_VERTEX_BLEND_ARB               0x86A7
+#define GL_CURRENT_WEIGHT_ARB             0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
+#define GL_WEIGHT_ARRAY_ARB               0x86AD
+#define GL_MODELVIEW0_ARB                 0x1700
+#define GL_MODELVIEW1_ARB                 0x850A
+#define GL_MODELVIEW2_ARB                 0x8722
+#define GL_MODELVIEW3_ARB                 0x8723
+#define GL_MODELVIEW4_ARB                 0x8724
+#define GL_MODELVIEW5_ARB                 0x8725
+#define GL_MODELVIEW6_ARB                 0x8726
+#define GL_MODELVIEW7_ARB                 0x8727
+#define GL_MODELVIEW8_ARB                 0x8728
+#define GL_MODELVIEW9_ARB                 0x8729
+#define GL_MODELVIEW10_ARB                0x872A
+#define GL_MODELVIEW11_ARB                0x872B
+#define GL_MODELVIEW12_ARB                0x872C
+#define GL_MODELVIEW13_ARB                0x872D
+#define GL_MODELVIEW14_ARB                0x872E
+#define GL_MODELVIEW15_ARB                0x872F
+#define GL_MODELVIEW16_ARB                0x8730
+#define GL_MODELVIEW17_ARB                0x8731
+#define GL_MODELVIEW18_ARB                0x8732
+#define GL_MODELVIEW19_ARB                0x8733
+#define GL_MODELVIEW20_ARB                0x8734
+#define GL_MODELVIEW21_ARB                0x8735
+#define GL_MODELVIEW22_ARB                0x8736
+#define GL_MODELVIEW23_ARB                0x8737
+#define GL_MODELVIEW24_ARB                0x8738
+#define GL_MODELVIEW25_ARB                0x8739
+#define GL_MODELVIEW26_ARB                0x873A
+#define GL_MODELVIEW27_ARB                0x873B
+#define GL_MODELVIEW28_ARB                0x873C
+#define GL_MODELVIEW29_ARB                0x873D
+#define GL_MODELVIEW30_ARB                0x873E
+#define GL_MODELVIEW31_ARB                0x873F
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_MATRIX_PALETTE_ARB             0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_COMBINE_ARB                    0x8570
+#define GL_COMBINE_RGB_ARB                0x8571
+#define GL_COMBINE_ALPHA_ARB              0x8572
+#define GL_SOURCE0_RGB_ARB                0x8580
+#define GL_SOURCE1_RGB_ARB                0x8581
+#define GL_SOURCE2_RGB_ARB                0x8582
+#define GL_SOURCE0_ALPHA_ARB              0x8588
+#define GL_SOURCE1_ALPHA_ARB              0x8589
+#define GL_SOURCE2_ALPHA_ARB              0x858A
+#define GL_OPERAND0_RGB_ARB               0x8590
+#define GL_OPERAND1_RGB_ARB               0x8591
+#define GL_OPERAND2_RGB_ARB               0x8592
+#define GL_OPERAND0_ALPHA_ARB             0x8598
+#define GL_OPERAND1_ALPHA_ARB             0x8599
+#define GL_OPERAND2_ALPHA_ARB             0x859A
+#define GL_RGB_SCALE_ARB                  0x8573
+#define GL_ADD_SIGNED_ARB                 0x8574
+#define GL_INTERPOLATE_ARB                0x8575
+#define GL_SUBTRACT_ARB                   0x84E7
+#define GL_CONSTANT_ARB                   0x8576
+#define GL_PRIMARY_COLOR_ARB              0x8577
+#define GL_PREVIOUS_ARB                   0x8578
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_DOT3_RGB_ARB                   0x86AE
+#define GL_DOT3_RGBA_ARB                  0x86AF
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_ARB            0x8370
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_DEPTH_COMPONENT16_ARB          0x81A5
+#define GL_DEPTH_COMPONENT24_ARB          0x81A6
+#define GL_DEPTH_COMPONENT32_ARB          0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
+#endif
+
+#ifndef GL_ARB_shadow
+#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
+#endif
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+#endif
+
+#ifndef GL_ARB_window_pos
+#endif
+
+#ifndef GL_ARB_vertex_program
+#define GL_COLOR_SUM_ARB                  0x8458
+#define GL_VERTEX_PROGRAM_ARB             0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
+#define GL_PROGRAM_LENGTH_ARB             0x8627
+#define GL_PROGRAM_STRING_ARB             0x8628
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_CURRENT_MATRIX_ARB             0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
+#define GL_PROGRAM_BINDING_ARB            0x8677
+#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
+#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
+#define GL_PROGRAM_FORMAT_ARB             0x8876
+#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
+#define GL_MATRIX0_ARB                    0x88C0
+#define GL_MATRIX1_ARB                    0x88C1
+#define GL_MATRIX2_ARB                    0x88C2
+#define GL_MATRIX3_ARB                    0x88C3
+#define GL_MATRIX4_ARB                    0x88C4
+#define GL_MATRIX5_ARB                    0x88C5
+#define GL_MATRIX6_ARB                    0x88C6
+#define GL_MATRIX7_ARB                    0x88C7
+#define GL_MATRIX8_ARB                    0x88C8
+#define GL_MATRIX9_ARB                    0x88C9
+#define GL_MATRIX10_ARB                   0x88CA
+#define GL_MATRIX11_ARB                   0x88CB
+#define GL_MATRIX12_ARB                   0x88CC
+#define GL_MATRIX13_ARB                   0x88CD
+#define GL_MATRIX14_ARB                   0x88CE
+#define GL_MATRIX15_ARB                   0x88CF
+#define GL_MATRIX16_ARB                   0x88D0
+#define GL_MATRIX17_ARB                   0x88D1
+#define GL_MATRIX18_ARB                   0x88D2
+#define GL_MATRIX19_ARB                   0x88D3
+#define GL_MATRIX20_ARB                   0x88D4
+#define GL_MATRIX21_ARB                   0x88D5
+#define GL_MATRIX22_ARB                   0x88D6
+#define GL_MATRIX23_ARB                   0x88D7
+#define GL_MATRIX24_ARB                   0x88D8
+#define GL_MATRIX25_ARB                   0x88D9
+#define GL_MATRIX26_ARB                   0x88DA
+#define GL_MATRIX27_ARB                   0x88DB
+#define GL_MATRIX28_ARB                   0x88DC
+#define GL_MATRIX29_ARB                   0x88DD
+#define GL_MATRIX30_ARB                   0x88DE
+#define GL_MATRIX31_ARB                   0x88DF
+#endif
+
+#ifndef GL_ARB_fragment_program
+#define GL_FRAGMENT_PROGRAM_ARB           0x8804
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_BUFFER_SIZE_ARB                0x8764
+#define GL_BUFFER_USAGE_ARB               0x8765
+#define GL_ARRAY_BUFFER_ARB               0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB                  0x88B8
+#define GL_WRITE_ONLY_ARB                 0x88B9
+#define GL_READ_WRITE_ARB                 0x88BA
+#define GL_BUFFER_ACCESS_ARB              0x88BB
+#define GL_BUFFER_MAPPED_ARB              0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
+#define GL_STREAM_DRAW_ARB                0x88E0
+#define GL_STREAM_READ_ARB                0x88E1
+#define GL_STREAM_COPY_ARB                0x88E2
+#define GL_STATIC_DRAW_ARB                0x88E4
+#define GL_STATIC_READ_ARB                0x88E5
+#define GL_STATIC_COPY_ARB                0x88E6
+#define GL_DYNAMIC_DRAW_ARB               0x88E8
+#define GL_DYNAMIC_READ_ARB               0x88E9
+#define GL_DYNAMIC_COPY_ARB               0x88EA
+#endif
+
+#ifndef GL_ARB_occlusion_query
+#define GL_QUERY_COUNTER_BITS_ARB         0x8864
+#define GL_CURRENT_QUERY_ARB              0x8865
+#define GL_QUERY_RESULT_ARB               0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
+#define GL_SAMPLES_PASSED_ARB             0x8914
+#endif
+
+#ifndef GL_ARB_shader_objects
+#define GL_PROGRAM_OBJECT_ARB             0x8B40
+#define GL_SHADER_OBJECT_ARB              0x8B48
+#define GL_OBJECT_TYPE_ARB                0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
+#define GL_FLOAT_VEC2_ARB                 0x8B50
+#define GL_FLOAT_VEC3_ARB                 0x8B51
+#define GL_FLOAT_VEC4_ARB                 0x8B52
+#define GL_INT_VEC2_ARB                   0x8B53
+#define GL_INT_VEC3_ARB                   0x8B54
+#define GL_INT_VEC4_ARB                   0x8B55
+#define GL_BOOL_ARB                       0x8B56
+#define GL_BOOL_VEC2_ARB                  0x8B57
+#define GL_BOOL_VEC3_ARB                  0x8B58
+#define GL_BOOL_VEC4_ARB                  0x8B59
+#define GL_FLOAT_MAT2_ARB                 0x8B5A
+#define GL_FLOAT_MAT3_ARB                 0x8B5B
+#define GL_FLOAT_MAT4_ARB                 0x8B5C
+#define GL_SAMPLER_1D_ARB                 0x8B5D
+#define GL_SAMPLER_2D_ARB                 0x8B5E
+#define GL_SAMPLER_3D_ARB                 0x8B5F
+#define GL_SAMPLER_CUBE_ARB               0x8B60
+#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
+#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
+#define GL_SAMPLER_2D_RECT_ARB            0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
+#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_VERTEX_SHADER_ARB              0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_FRAGMENT_SHADER_ARB            0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
+#endif
+
+#ifndef GL_ARB_shading_language_100
+#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
+#endif
+
+#ifndef GL_ARB_texture_non_power_of_two
+#endif
+
+#ifndef GL_ARB_point_sprite
+#define GL_POINT_SPRITE_ARB               0x8861
+#define GL_COORD_REPLACE_ARB              0x8862
+#endif
+
+#ifndef GL_ARB_fragment_program_shadow
+#endif
+
+#ifndef GL_ARB_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
+#define GL_DRAW_BUFFER0_ARB               0x8825
+#define GL_DRAW_BUFFER1_ARB               0x8826
+#define GL_DRAW_BUFFER2_ARB               0x8827
+#define GL_DRAW_BUFFER3_ARB               0x8828
+#define GL_DRAW_BUFFER4_ARB               0x8829
+#define GL_DRAW_BUFFER5_ARB               0x882A
+#define GL_DRAW_BUFFER6_ARB               0x882B
+#define GL_DRAW_BUFFER7_ARB               0x882C
+#define GL_DRAW_BUFFER8_ARB               0x882D
+#define GL_DRAW_BUFFER9_ARB               0x882E
+#define GL_DRAW_BUFFER10_ARB              0x882F
+#define GL_DRAW_BUFFER11_ARB              0x8830
+#define GL_DRAW_BUFFER12_ARB              0x8831
+#define GL_DRAW_BUFFER13_ARB              0x8832
+#define GL_DRAW_BUFFER14_ARB              0x8833
+#define GL_DRAW_BUFFER15_ARB              0x8834
+#endif
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#endif
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_RGBA_FLOAT_MODE_ARB            0x8820
+#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
+#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
+#define GL_CLAMP_READ_COLOR_ARB           0x891C
+#define GL_FIXED_ONLY_ARB                 0x891D
+#endif
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_HALF_FLOAT_ARB                 0x140B
+#endif
+
+#ifndef GL_ARB_texture_float
+#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
+#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
+#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
+#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
+#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
+#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
+#define GL_RGBA32F_ARB                    0x8814
+#define GL_RGB32F_ARB                     0x8815
+#define GL_ALPHA32F_ARB                   0x8816
+#define GL_INTENSITY32F_ARB               0x8817
+#define GL_LUMINANCE32F_ARB               0x8818
+#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
+#define GL_RGBA16F_ARB                    0x881A
+#define GL_RGB16F_ARB                     0x881B
+#define GL_ALPHA16F_ARB                   0x881C
+#define GL_INTENSITY16F_ARB               0x881D
+#define GL_LUMINANCE16F_ARB               0x881E
+#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
+#endif
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
+#endif
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_DEPTH_COMPONENT32F             0x8CAC
+#define GL_DEPTH32F_STENCIL8              0x8CAD
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
+#endif
+
+#ifndef GL_ARB_draw_instanced
+#endif
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
+#define GL_FRAMEBUFFER_DEFAULT            0x8218
+#define GL_FRAMEBUFFER_UNDEFINED          0x8219
+#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
+#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
+#define GL_DEPTH_STENCIL                  0x84F9
+#define GL_UNSIGNED_INT_24_8              0x84FA
+#define GL_DEPTH24_STENCIL8               0x88F0
+#define GL_TEXTURE_STENCIL_SIZE           0x88F1
+#define GL_TEXTURE_RED_TYPE               0x8C10
+#define GL_TEXTURE_GREEN_TYPE             0x8C11
+#define GL_TEXTURE_BLUE_TYPE              0x8C12
+#define GL_TEXTURE_ALPHA_TYPE             0x8C13
+#define GL_TEXTURE_DEPTH_TYPE             0x8C16
+#define GL_UNSIGNED_NORMALIZED            0x8C17
+#define GL_FRAMEBUFFER_BINDING            0x8CA6
+#define GL_DRAW_FRAMEBUFFER_BINDING       GL_FRAMEBUFFER_BINDING
+#define GL_RENDERBUFFER_BINDING           0x8CA7
+#define GL_READ_FRAMEBUFFER               0x8CA8
+#define GL_DRAW_FRAMEBUFFER               0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
+#define GL_RENDERBUFFER_SAMPLES           0x8CAB
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
+#define GL_COLOR_ATTACHMENT0              0x8CE0
+#define GL_COLOR_ATTACHMENT1              0x8CE1
+#define GL_COLOR_ATTACHMENT2              0x8CE2
+#define GL_COLOR_ATTACHMENT3              0x8CE3
+#define GL_COLOR_ATTACHMENT4              0x8CE4
+#define GL_COLOR_ATTACHMENT5              0x8CE5
+#define GL_COLOR_ATTACHMENT6              0x8CE6
+#define GL_COLOR_ATTACHMENT7              0x8CE7
+#define GL_COLOR_ATTACHMENT8              0x8CE8
+#define GL_COLOR_ATTACHMENT9              0x8CE9
+#define GL_COLOR_ATTACHMENT10             0x8CEA
+#define GL_COLOR_ATTACHMENT11             0x8CEB
+#define GL_COLOR_ATTACHMENT12             0x8CEC
+#define GL_COLOR_ATTACHMENT13             0x8CED
+#define GL_COLOR_ATTACHMENT14             0x8CEE
+#define GL_COLOR_ATTACHMENT15             0x8CEF
+#define GL_DEPTH_ATTACHMENT               0x8D00
+#define GL_STENCIL_ATTACHMENT             0x8D20
+#define GL_FRAMEBUFFER                    0x8D40
+#define GL_RENDERBUFFER                   0x8D41
+#define GL_RENDERBUFFER_WIDTH             0x8D42
+#define GL_RENDERBUFFER_HEIGHT            0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
+#define GL_STENCIL_INDEX1                 0x8D46
+#define GL_STENCIL_INDEX4                 0x8D47
+#define GL_STENCIL_INDEX8                 0x8D48
+#define GL_STENCIL_INDEX16                0x8D49
+#define GL_RENDERBUFFER_RED_SIZE          0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
+#define GL_MAX_SAMPLES                    0x8D57
+#endif
+
+#ifndef GL_ARB_framebuffer_object_DEPRECATED
+#define GL_INDEX                          0x8222
+#define GL_TEXTURE_LUMINANCE_TYPE         0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE         0x8C15
+#endif
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_FRAMEBUFFER_SRGB               0x8DB9
+#endif
+
+#ifndef GL_ARB_geometry_shader4
+#define GL_LINES_ADJACENCY_ARB            0x000A
+#define GL_LINE_STRIP_ADJACENCY_ARB       0x000B
+#define GL_TRIANGLES_ADJACENCY_ARB        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_ARB   0x000D
+#define GL_PROGRAM_POINT_SIZE_ARB         0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
+#define GL_GEOMETRY_SHADER_ARB            0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_ARB      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_ARB        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_ARB       0x8DDC
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
+/* reuse GL_MAX_VARYING_COMPONENTS */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+#endif
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_HALF_FLOAT                     0x140B
+#endif
+
+#ifndef GL_ARB_instanced_arrays
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE
+#endif
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_MAP_READ_BIT                   0x0001
+#define GL_MAP_WRITE_BIT                  0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
+#endif
+
+#ifndef GL_ARB_texture_buffer_object
+#define GL_TEXTURE_BUFFER_ARB             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_ARB     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_ARB      0x8C2E
+#endif
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_COMPRESSED_RED_RGTC1           0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
+#define GL_COMPRESSED_RG_RGTC2            0x8DBD
+#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
+#endif
+
+#ifndef GL_ARB_texture_rg
+#define GL_RG                             0x8227
+#define GL_RG_INTEGER                     0x8228
+#define GL_R8                             0x8229
+#define GL_R16                            0x822A
+#define GL_RG8                            0x822B
+#define GL_RG16                           0x822C
+#define GL_R16F                           0x822D
+#define GL_R32F                           0x822E
+#define GL_RG16F                          0x822F
+#define GL_RG32F                          0x8230
+#define GL_R8I                            0x8231
+#define GL_R8UI                           0x8232
+#define GL_R16I                           0x8233
+#define GL_R16UI                          0x8234
+#define GL_R32I                           0x8235
+#define GL_R32UI                          0x8236
+#define GL_RG8I                           0x8237
+#define GL_RG8UI                          0x8238
+#define GL_RG16I                          0x8239
+#define GL_RG16UI                         0x823A
+#define GL_RG32I                          0x823B
+#define GL_RG32UI                         0x823C
+#endif
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING           0x85B5
+#endif
+
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_UNIFORM_BUFFER                 0x8A11
+#define GL_UNIFORM_BUFFER_BINDING         0x8A28
+#define GL_UNIFORM_BUFFER_START           0x8A29
+#define GL_UNIFORM_BUFFER_SIZE            0x8A2A
+#define GL_MAX_VERTEX_UNIFORM_BLOCKS      0x8A2B
+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS    0x8A2C
+#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS    0x8A2D
+#define GL_MAX_COMBINED_UNIFORM_BLOCKS    0x8A2E
+#define GL_MAX_UNIFORM_BUFFER_BINDINGS    0x8A2F
+#define GL_MAX_UNIFORM_BLOCK_SIZE         0x8A30
+#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
+#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
+#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
+#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
+#define GL_ACTIVE_UNIFORM_BLOCKS          0x8A36
+#define GL_UNIFORM_TYPE                   0x8A37
+#define GL_UNIFORM_SIZE                   0x8A38
+#define GL_UNIFORM_NAME_LENGTH            0x8A39
+#define GL_UNIFORM_BLOCK_INDEX            0x8A3A
+#define GL_UNIFORM_OFFSET                 0x8A3B
+#define GL_UNIFORM_ARRAY_STRIDE           0x8A3C
+#define GL_UNIFORM_MATRIX_STRIDE          0x8A3D
+#define GL_UNIFORM_IS_ROW_MAJOR           0x8A3E
+#define GL_UNIFORM_BLOCK_BINDING          0x8A3F
+#define GL_UNIFORM_BLOCK_DATA_SIZE        0x8A40
+#define GL_UNIFORM_BLOCK_NAME_LENGTH      0x8A41
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS  0x8A42
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
+#define GL_INVALID_INDEX                  0xFFFFFFFFu
+#endif
+
+#ifndef GL_ARB_compatibility
+/* ARB_compatibility just defines tokens from core 3.0 */
+#endif
+
+#ifndef GL_ARB_copy_buffer
+#define GL_COPY_READ_BUFFER               0x8F36
+#define GL_COPY_WRITE_BUFFER              0x8F37
+#endif
+
+#ifndef GL_ARB_shader_texture_lod
+#endif
+
+#ifndef GL_ARB_depth_clamp
+#define GL_DEPTH_CLAMP                    0x864F
+#endif
+
+#ifndef GL_ARB_draw_elements_base_vertex
+#endif
+
+#ifndef GL_ARB_fragment_coord_conventions
+#endif
+
+#ifndef GL_ARB_provoking_vertex
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION        0x8E4D
+#define GL_LAST_VERTEX_CONVENTION         0x8E4E
+#define GL_PROVOKING_VERTEX               0x8E4F
+#endif
+
+#ifndef GL_ARB_seamless_cube_map
+#define GL_TEXTURE_CUBE_MAP_SEAMLESS      0x884F
+#endif
+
+#ifndef GL_ARB_sync
+#define GL_MAX_SERVER_WAIT_TIMEOUT        0x9111
+#define GL_OBJECT_TYPE                    0x9112
+#define GL_SYNC_CONDITION                 0x9113
+#define GL_SYNC_STATUS                    0x9114
+#define GL_SYNC_FLAGS                     0x9115
+#define GL_SYNC_FENCE                     0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
+#define GL_UNSIGNALED                     0x9118
+#define GL_SIGNALED                       0x9119
+#define GL_ALREADY_SIGNALED               0x911A
+#define GL_TIMEOUT_EXPIRED                0x911B
+#define GL_CONDITION_SATISFIED            0x911C
+#define GL_WAIT_FAILED                    0x911D
+#define GL_SYNC_FLUSH_COMMANDS_BIT        0x00000001
+#define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
+#endif
+
+#ifndef GL_ARB_texture_multisample
+#define GL_SAMPLE_POSITION                0x8E50
+#define GL_SAMPLE_MASK                    0x8E51
+#define GL_SAMPLE_MASK_VALUE              0x8E52
+#define GL_MAX_SAMPLE_MASK_WORDS          0x8E59
+#define GL_TEXTURE_2D_MULTISAMPLE         0x9100
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE   0x9101
+#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY   0x9102
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
+#define GL_TEXTURE_SAMPLES                0x9106
+#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
+#define GL_SAMPLER_2D_MULTISAMPLE         0x9108
+#define GL_INT_SAMPLER_2D_MULTISAMPLE     0x9109
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
+#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910B
+#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
+#define GL_MAX_COLOR_TEXTURE_SAMPLES      0x910E
+#define GL_MAX_DEPTH_TEXTURE_SAMPLES      0x910F
+#define GL_MAX_INTEGER_SAMPLES            0x9110
+#endif
+
+#ifndef GL_ARB_vertex_array_bgra
+/* reuse GL_BGRA */
+#endif
+
+#ifndef GL_ARB_draw_buffers_blend
+#endif
+
+#ifndef GL_ARB_sample_shading
+#define GL_SAMPLE_SHADING                 0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE       0x8C37
+#endif
+
+#ifndef GL_ARB_texture_cube_map_array
+#define GL_TEXTURE_CUBE_MAP_ARRAY         0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY   0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY         0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW  0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY     0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
+#endif
+
+#ifndef GL_ARB_texture_gather
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F
+#endif
+
+#ifndef GL_ARB_texture_query_lod
+#endif
+
+#ifndef GL_ARB_shading_language_include
+#define GL_SHADER_INCLUDE_ARB             0x8DAE
+#define GL_NAMED_STRING_LENGTH_ARB        0x8DE9
+#define GL_NAMED_STRING_TYPE_ARB          0x8DEA
+#endif
+
+#ifndef GL_ARB_texture_compression_bptc
+#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F
+#endif
+
+#ifndef GL_ARB_blend_func_extended
+#define GL_SRC1_COLOR                     0x88F9
+/* reuse GL_SRC1_ALPHA */
+#define GL_ONE_MINUS_SRC1_COLOR           0x88FA
+#define GL_ONE_MINUS_SRC1_ALPHA           0x88FB
+#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS   0x88FC
+#endif
+
+#ifndef GL_ARB_explicit_attrib_location
+#endif
+
+#ifndef GL_ARB_occlusion_query2
+#define GL_ANY_SAMPLES_PASSED             0x8C2F
+#endif
+
+#ifndef GL_ARB_sampler_objects
+#define GL_SAMPLER_BINDING                0x8919
+#endif
+
+#ifndef GL_ARB_shader_bit_encoding
+#endif
+
+#ifndef GL_ARB_texture_rgb10_a2ui
+#define GL_RGB10_A2UI                     0x906F
+#endif
+
+#ifndef GL_ARB_texture_swizzle
+#define GL_TEXTURE_SWIZZLE_R              0x8E42
+#define GL_TEXTURE_SWIZZLE_G              0x8E43
+#define GL_TEXTURE_SWIZZLE_B              0x8E44
+#define GL_TEXTURE_SWIZZLE_A              0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA           0x8E46
+#endif
+
+#ifndef GL_ARB_timer_query
+#define GL_TIME_ELAPSED                   0x88BF
+#define GL_TIMESTAMP                      0x8E28
+#endif
+
+#ifndef GL_ARB_vertex_type_2_10_10_10_rev
+/* reuse GL_UNSIGNED_INT_2_10_10_10_REV */
+#define GL_INT_2_10_10_10_REV             0x8D9F
+#endif
+
+#ifndef GL_ARB_draw_indirect
+#define GL_DRAW_INDIRECT_BUFFER           0x8F3F
+#define GL_DRAW_INDIRECT_BUFFER_BINDING   0x8F43
+#endif
+
+#ifndef GL_ARB_gpu_shader5
+#define GL_GEOMETRY_SHADER_INVOCATIONS    0x887F
+#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
+#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
+#define GL_MAX_VERTEX_STREAMS             0x8E71
+#endif
+
+#ifndef GL_ARB_gpu_shader_fp64
+/* reuse GL_DOUBLE */
+#define GL_DOUBLE_VEC2                    0x8FFC
+#define GL_DOUBLE_VEC3                    0x8FFD
+#define GL_DOUBLE_VEC4                    0x8FFE
+#define GL_DOUBLE_MAT2                    0x8F46
+#define GL_DOUBLE_MAT3                    0x8F47
+#define GL_DOUBLE_MAT4                    0x8F48
+#define GL_DOUBLE_MAT2x3                  0x8F49
+#define GL_DOUBLE_MAT2x4                  0x8F4A
+#define GL_DOUBLE_MAT3x2                  0x8F4B
+#define GL_DOUBLE_MAT3x4                  0x8F4C
+#define GL_DOUBLE_MAT4x2                  0x8F4D
+#define GL_DOUBLE_MAT4x3                  0x8F4E
+#endif
+
+#ifndef GL_ARB_shader_subroutine
+#define GL_ACTIVE_SUBROUTINES             0x8DE5
+#define GL_ACTIVE_SUBROUTINE_UNIFORMS     0x8DE6
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
+#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH   0x8E48
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
+#define GL_MAX_SUBROUTINES                0x8DE7
+#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
+#define GL_NUM_COMPATIBLE_SUBROUTINES     0x8E4A
+#define GL_COMPATIBLE_SUBROUTINES         0x8E4B
+/* reuse GL_UNIFORM_SIZE */
+/* reuse GL_UNIFORM_NAME_LENGTH */
+#endif
+
+#ifndef GL_ARB_tessellation_shader
+#define GL_PATCHES                        0x000E
+#define GL_PATCH_VERTICES                 0x8E72
+#define GL_PATCH_DEFAULT_INNER_LEVEL      0x8E73
+#define GL_PATCH_DEFAULT_OUTER_LEVEL      0x8E74
+#define GL_TESS_CONTROL_OUTPUT_VERTICES   0x8E75
+#define GL_TESS_GEN_MODE                  0x8E76
+#define GL_TESS_GEN_SPACING               0x8E77
+#define GL_TESS_GEN_VERTEX_ORDER          0x8E78
+#define GL_TESS_GEN_POINT_MODE            0x8E79
+/* reuse GL_TRIANGLES */
+/* reuse GL_QUADS */
+#define GL_ISOLINES                       0x8E7A
+/* reuse GL_EQUAL */
+#define GL_FRACTIONAL_ODD                 0x8E7B
+#define GL_FRACTIONAL_EVEN                0x8E7C
+/* reuse GL_CCW */
+/* reuse GL_CW */
+#define GL_MAX_PATCH_VERTICES             0x8E7D
+#define GL_MAX_TESS_GEN_LEVEL             0x8E7E
+#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
+#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
+#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
+#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
+#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
+#define GL_MAX_TESS_PATCH_COMPONENTS      0x8E84
+#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
+#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
+#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
+#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
+#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
+#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
+#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
+#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
+#define GL_TESS_EVALUATION_SHADER         0x8E87
+#define GL_TESS_CONTROL_SHADER            0x8E88
+#endif
+
+#ifndef GL_ARB_texture_buffer_object_rgb32
+/* reuse GL_RGB32F */
+/* reuse GL_RGB32UI */
+/* reuse GL_RGB32I */
+#endif
+
+#ifndef GL_ARB_transform_feedback2
+#define GL_TRANSFORM_FEEDBACK             0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING     0x8E25
+#endif
+
+#ifndef GL_ARB_transform_feedback3
+#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
+#endif
+
+#ifndef GL_EXT_abgr
+#define GL_ABGR_EXT                       0x8000
+#endif
+
+#ifndef GL_EXT_blend_color
+#define GL_CONSTANT_COLOR_EXT             0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
+#define GL_CONSTANT_ALPHA_EXT             0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
+#define GL_BLEND_COLOR_EXT                0x8005
+#endif
+
+#ifndef GL_EXT_polygon_offset
+#define GL_POLYGON_OFFSET_EXT             0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
+#endif
+
+#ifndef GL_EXT_texture
+#define GL_ALPHA4_EXT                     0x803B
+#define GL_ALPHA8_EXT                     0x803C
+#define GL_ALPHA12_EXT                    0x803D
+#define GL_ALPHA16_EXT                    0x803E
+#define GL_LUMINANCE4_EXT                 0x803F
+#define GL_LUMINANCE8_EXT                 0x8040
+#define GL_LUMINANCE12_EXT                0x8041
+#define GL_LUMINANCE16_EXT                0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
+#define GL_INTENSITY_EXT                  0x8049
+#define GL_INTENSITY4_EXT                 0x804A
+#define GL_INTENSITY8_EXT                 0x804B
+#define GL_INTENSITY12_EXT                0x804C
+#define GL_INTENSITY16_EXT                0x804D
+#define GL_RGB2_EXT                       0x804E
+#define GL_RGB4_EXT                       0x804F
+#define GL_RGB5_EXT                       0x8050
+#define GL_RGB8_EXT                       0x8051
+#define GL_RGB10_EXT                      0x8052
+#define GL_RGB12_EXT                      0x8053
+#define GL_RGB16_EXT                      0x8054
+#define GL_RGBA2_EXT                      0x8055
+#define GL_RGBA4_EXT                      0x8056
+#define GL_RGB5_A1_EXT                    0x8057
+#define GL_RGBA8_EXT                      0x8058
+#define GL_RGB10_A2_EXT                   0x8059
+#define GL_RGBA12_EXT                     0x805A
+#define GL_RGBA16_EXT                     0x805B
+#define GL_TEXTURE_RED_SIZE_EXT           0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
+#define GL_REPLACE_EXT                    0x8062
+#define GL_PROXY_TEXTURE_1D_EXT           0x8063
+#define GL_PROXY_TEXTURE_2D_EXT           0x8064
+#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
+#endif
+
+#ifndef GL_EXT_texture3D
+#define GL_PACK_SKIP_IMAGES_EXT           0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
+#define GL_TEXTURE_3D_EXT                 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT           0x8070
+#define GL_TEXTURE_DEPTH_EXT              0x8071
+#define GL_TEXTURE_WRAP_R_EXT             0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
+#endif
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_FILTER4_SGIS                   0x8146
+#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
+#endif
+
+#ifndef GL_EXT_subtexture
+#endif
+
+#ifndef GL_EXT_copy_texture
+#endif
+
+#ifndef GL_EXT_histogram
+#define GL_HISTOGRAM_EXT                  0x8024
+#define GL_PROXY_HISTOGRAM_EXT            0x8025
+#define GL_HISTOGRAM_WIDTH_EXT            0x8026
+#define GL_HISTOGRAM_FORMAT_EXT           0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
+#define GL_HISTOGRAM_SINK_EXT             0x802D
+#define GL_MINMAX_EXT                     0x802E
+#define GL_MINMAX_FORMAT_EXT              0x802F
+#define GL_MINMAX_SINK_EXT                0x8030
+#define GL_TABLE_TOO_LARGE_EXT            0x8031
+#endif
+
+#ifndef GL_EXT_convolution
+#define GL_CONVOLUTION_1D_EXT             0x8010
+#define GL_CONVOLUTION_2D_EXT             0x8011
+#define GL_SEPARABLE_2D_EXT               0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
+#define GL_REDUCE_EXT                     0x8016
+#define GL_CONVOLUTION_FORMAT_EXT         0x8017
+#define GL_CONVOLUTION_WIDTH_EXT          0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+#endif
+
+#ifndef GL_SGI_color_matrix
+#define GL_COLOR_MATRIX_SGI               0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+#endif
+
+#ifndef GL_SGI_color_table
+#define GL_COLOR_TABLE_SGI                0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+#endif
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_PIXEL_TEXTURE_SGIS             0x8353
+#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
+#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
+#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
+#endif
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_PIXEL_TEX_GEN_SGIX             0x8139
+#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
+#endif
+
+#ifndef GL_SGIS_texture4D
+#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
+#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
+#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
+#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
+#define GL_TEXTURE_4D_SGIS                0x8134
+#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
+#define GL_TEXTURE_4DSIZE_SGIS            0x8136
+#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
+#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
+#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
+#endif
+
+#ifndef GL_SGI_texture_color_table
+#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
+#endif
+
+#ifndef GL_EXT_cmyka
+#define GL_CMYK_EXT                       0x800C
+#define GL_CMYKA_EXT                      0x800D
+#define GL_PACK_CMYK_HINT_EXT             0x800E
+#define GL_UNPACK_CMYK_HINT_EXT           0x800F
+#endif
+
+#ifndef GL_EXT_texture_object
+#define GL_TEXTURE_PRIORITY_EXT           0x8066
+#define GL_TEXTURE_RESIDENT_EXT           0x8067
+#define GL_TEXTURE_1D_BINDING_EXT         0x8068
+#define GL_TEXTURE_2D_BINDING_EXT         0x8069
+#define GL_TEXTURE_3D_BINDING_EXT         0x806A
+#endif
+
+#ifndef GL_SGIS_detail_texture
+#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
+#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
+#define GL_LINEAR_DETAIL_SGIS             0x8097
+#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
+#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
+#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
+#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
+#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
+#endif
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_LINEAR_SHARPEN_SGIS            0x80AD
+#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
+#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
+#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
+#endif
+
+#ifndef GL_EXT_packed_pixels
+#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
+#endif
+
+#ifndef GL_SGIS_texture_lod
+#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
+#endif
+
+#ifndef GL_SGIS_multisample
+#define GL_MULTISAMPLE_SGIS               0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
+#define GL_SAMPLE_MASK_SGIS               0x80A0
+#define GL_1PASS_SGIS                     0x80A1
+#define GL_2PASS_0_SGIS                   0x80A2
+#define GL_2PASS_1_SGIS                   0x80A3
+#define GL_4PASS_0_SGIS                   0x80A4
+#define GL_4PASS_1_SGIS                   0x80A5
+#define GL_4PASS_2_SGIS                   0x80A6
+#define GL_4PASS_3_SGIS                   0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
+#define GL_SAMPLES_SGIS                   0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
+#define GL_SAMPLE_PATTERN_SGIS            0x80AC
+#endif
+
+#ifndef GL_EXT_rescale_normal
+#define GL_RESCALE_NORMAL_EXT             0x803A
+#endif
+
+#ifndef GL_EXT_vertex_array
+#define GL_VERTEX_ARRAY_EXT               0x8074
+#define GL_NORMAL_ARRAY_EXT               0x8075
+#define GL_COLOR_ARRAY_EXT                0x8076
+#define GL_INDEX_ARRAY_EXT                0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
+#endif
+
+#ifndef GL_EXT_misc_attribute
+#endif
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_GENERATE_MIPMAP_SGIS           0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
+#endif
+
+#ifndef GL_SGIX_clipmap
+#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
+#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
+#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
+#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
+#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
+#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
+#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
+#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
+#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
+#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
+#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
+#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
+#endif
+
+#ifndef GL_SGIX_shadow
+#define GL_TEXTURE_COMPARE_SGIX           0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
+#endif
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_CLAMP_TO_EDGE_SGIS             0x812F
+#endif
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_SGIS           0x812D
+#endif
+
+#ifndef GL_EXT_blend_minmax
+#define GL_FUNC_ADD_EXT                   0x8006
+#define GL_MIN_EXT                        0x8007
+#define GL_MAX_EXT                        0x8008
+#define GL_BLEND_EQUATION_EXT             0x8009
+#endif
+
+#ifndef GL_EXT_blend_subtract
+#define GL_FUNC_SUBTRACT_EXT              0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
+#endif
+
+#ifndef GL_EXT_blend_logic_op
+#endif
+
+#ifndef GL_SGIX_interlace
+#define GL_INTERLACE_SGIX                 0x8094
+#endif
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
+#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
+#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
+#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
+#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
+#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
+#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
+#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
+#endif
+
+#ifndef GL_SGIS_texture_select
+#define GL_DUAL_ALPHA4_SGIS               0x8110
+#define GL_DUAL_ALPHA8_SGIS               0x8111
+#define GL_DUAL_ALPHA12_SGIS              0x8112
+#define GL_DUAL_ALPHA16_SGIS              0x8113
+#define GL_DUAL_LUMINANCE4_SGIS           0x8114
+#define GL_DUAL_LUMINANCE8_SGIS           0x8115
+#define GL_DUAL_LUMINANCE12_SGIS          0x8116
+#define GL_DUAL_LUMINANCE16_SGIS          0x8117
+#define GL_DUAL_INTENSITY4_SGIS           0x8118
+#define GL_DUAL_INTENSITY8_SGIS           0x8119
+#define GL_DUAL_INTENSITY12_SGIS          0x811A
+#define GL_DUAL_INTENSITY16_SGIS          0x811B
+#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
+#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
+#define GL_QUAD_ALPHA4_SGIS               0x811E
+#define GL_QUAD_ALPHA8_SGIS               0x811F
+#define GL_QUAD_LUMINANCE4_SGIS           0x8120
+#define GL_QUAD_LUMINANCE8_SGIS           0x8121
+#define GL_QUAD_INTENSITY4_SGIS           0x8122
+#define GL_QUAD_INTENSITY8_SGIS           0x8123
+#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
+#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
+#endif
+
+#ifndef GL_SGIX_sprite
+#define GL_SPRITE_SGIX                    0x8148
+#define GL_SPRITE_MODE_SGIX               0x8149
+#define GL_SPRITE_AXIS_SGIX               0x814A
+#define GL_SPRITE_TRANSLATION_SGIX        0x814B
+#define GL_SPRITE_AXIAL_SGIX              0x814C
+#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
+#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
+#endif
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+#endif
+
+#ifndef GL_EXT_point_parameters
+#define GL_POINT_SIZE_MIN_EXT             0x8126
+#define GL_POINT_SIZE_MAX_EXT             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
+#define GL_DISTANCE_ATTENUATION_EXT       0x8129
+#endif
+
+#ifndef GL_SGIS_point_parameters
+#define GL_POINT_SIZE_MIN_SGIS            0x8126
+#define GL_POINT_SIZE_MAX_SGIS            0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
+#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
+#endif
+
+#ifndef GL_SGIX_instruments
+#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
+#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
+#endif
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+#endif
+
+#ifndef GL_SGIX_framezoom
+#define GL_FRAMEZOOM_SGIX                 0x818B
+#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
+#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
+#endif
+
+#ifndef GL_SGIX_tag_sample_buffer
+#endif
+
+#ifndef GL_FfdMaskSGIX
+#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
+#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
+#endif
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
+#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
+#define GL_DEFORMATIONS_MASK_SGIX         0x8196
+#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
+#endif
+
+#ifndef GL_SGIX_reference_plane
+#define GL_REFERENCE_PLANE_SGIX           0x817D
+#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
+#endif
+
+#ifndef GL_SGIX_flush_raster
+#endif
+
+#ifndef GL_SGIX_depth_texture
+#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
+#endif
+
+#ifndef GL_SGIS_fog_function
+#define GL_FOG_FUNC_SGIS                  0x812A
+#define GL_FOG_FUNC_POINTS_SGIS           0x812B
+#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
+#endif
+
+#ifndef GL_SGIX_fog_offset
+#define GL_FOG_OFFSET_SGIX                0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
+#endif
+
+#ifndef GL_HP_image_transform
+#define GL_IMAGE_SCALE_X_HP               0x8155
+#define GL_IMAGE_SCALE_Y_HP               0x8156
+#define GL_IMAGE_TRANSLATE_X_HP           0x8157
+#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
+#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
+#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
+#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
+#define GL_IMAGE_MAG_FILTER_HP            0x815C
+#define GL_IMAGE_MIN_FILTER_HP            0x815D
+#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
+#define GL_CUBIC_HP                       0x815F
+#define GL_AVERAGE_HP                     0x8160
+#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
+#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
+#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
+#endif
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_IGNORE_BORDER_HP               0x8150
+#define GL_CONSTANT_BORDER_HP             0x8151
+#define GL_REPLICATE_BORDER_HP            0x8153
+#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
+#endif
+
+#ifndef GL_INGR_palette_buffer
+#endif
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
+#endif
+
+#ifndef GL_EXT_color_subtable
+#endif
+
+#ifndef GL_PGI_vertex_hints
+#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
+#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
+#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
+#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
+#define GL_COLOR3_BIT_PGI                 0x00010000
+#define GL_COLOR4_BIT_PGI                 0x00020000
+#define GL_EDGEFLAG_BIT_PGI               0x00040000
+#define GL_INDEX_BIT_PGI                  0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
+#define GL_MAT_EMISSION_BIT_PGI           0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
+#define GL_MAT_SHININESS_BIT_PGI          0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
+#define GL_NORMAL_BIT_PGI                 0x08000000
+#define GL_TEXCOORD1_BIT_PGI              0x10000000
+#define GL_TEXCOORD2_BIT_PGI              0x20000000
+#define GL_TEXCOORD3_BIT_PGI              0x40000000
+#define GL_TEXCOORD4_BIT_PGI              0x80000000
+#define GL_VERTEX23_BIT_PGI               0x00000004
+#define GL_VERTEX4_BIT_PGI                0x00000008
+#endif
+
+#ifndef GL_PGI_misc_hints
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
+#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
+#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
+#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
+#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
+#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
+#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
+#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
+#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
+#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
+#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
+#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
+#define GL_CLIP_NEAR_HINT_PGI             0x1A220
+#define GL_CLIP_FAR_HINT_PGI              0x1A221
+#define GL_WIDE_LINE_HINT_PGI             0x1A222
+#define GL_BACK_NORMALS_HINT_PGI          0x1A223
+#endif
+
+#ifndef GL_EXT_paletted_texture
+#define GL_COLOR_INDEX1_EXT               0x80E2
+#define GL_COLOR_INDEX2_EXT               0x80E3
+#define GL_COLOR_INDEX4_EXT               0x80E4
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#define GL_COLOR_INDEX12_EXT              0x80E6
+#define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+#endif
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
+#endif
+
+#ifndef GL_SGIX_list_priority
+#define GL_LIST_PRIORITY_SGIX             0x8182
+#endif
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_IR_INSTRUMENT1_SGIX            0x817F
+#endif
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
+#endif
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
+#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
+#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
+#endif
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SHADOW_AMBIENT_SGIX            0x80BF
+#endif
+
+#ifndef GL_EXT_index_texture
+#endif
+
+#ifndef GL_EXT_index_material
+#define GL_INDEX_MATERIAL_EXT             0x81B8
+#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
+#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
+#endif
+
+#ifndef GL_EXT_index_func
+#define GL_INDEX_TEST_EXT                 0x81B5
+#define GL_INDEX_TEST_FUNC_EXT            0x81B6
+#define GL_INDEX_TEST_REF_EXT             0x81B7
+#endif
+
+#ifndef GL_EXT_index_array_formats
+#define GL_IUI_V2F_EXT                    0x81AD
+#define GL_IUI_V3F_EXT                    0x81AE
+#define GL_IUI_N3F_V2F_EXT                0x81AF
+#define GL_IUI_N3F_V3F_EXT                0x81B0
+#define GL_T2F_IUI_V2F_EXT                0x81B1
+#define GL_T2F_IUI_V3F_EXT                0x81B2
+#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
+#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
+#endif
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
+#endif
+
+#ifndef GL_EXT_cull_vertex
+#define GL_CULL_VERTEX_EXT                0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+#endif
+
+#ifndef GL_SGIX_ycrcb
+#define GL_YCRCB_422_SGIX                 0x81BB
+#define GL_YCRCB_444_SGIX                 0x81BC
+#endif
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
+#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
+#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
+#define GL_LIGHT_ENV_MODE_SGIX            0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
+#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
+#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
+#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
+#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
+#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
+#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
+#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
+#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
+#endif
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
+#endif
+
+#ifndef GL_HP_texture_lighting
+#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
+#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
+#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
+#endif
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
+#endif
+
+#ifndef GL_WIN_phong_shading
+#define GL_PHONG_WIN                      0x80EA
+#define GL_PHONG_HINT_WIN                 0x80EB
+#endif
+
+#ifndef GL_WIN_specular_fog
+#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
+#endif
+
+#ifndef GL_EXT_light_texture
+#define GL_FRAGMENT_MATERIAL_EXT          0x8349
+#define GL_FRAGMENT_NORMAL_EXT            0x834A
+#define GL_FRAGMENT_COLOR_EXT             0x834C
+#define GL_ATTENUATION_EXT                0x834D
+#define GL_SHADOW_ATTENUATION_EXT         0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
+#define GL_TEXTURE_LIGHT_EXT              0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+/* reuse GL_FRAGMENT_DEPTH_EXT */
+#endif
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_ALPHA_MIN_SGIX                 0x8320
+#define GL_ALPHA_MAX_SGIX                 0x8321
+#endif
+
+#ifndef GL_SGIX_impact_pixel_texture
+#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
+#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
+#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
+#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
+#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
+#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
+#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
+#endif
+
+#ifndef GL_EXT_bgra
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#endif
+
+#ifndef GL_SGIX_async
+#define GL_ASYNC_MARKER_SGIX              0x8329
+#endif
+
+#ifndef GL_SGIX_async_pixel
+#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
+#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
+#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
+#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
+#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
+#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
+#endif
+
+#ifndef GL_SGIX_async_histogram
+#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
+#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
+#endif
+
+#ifndef GL_INTEL_texture_scissor
+#endif
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+#endif
+
+#ifndef GL_HP_occlusion_test
+#define GL_OCCLUSION_TEST_HP              0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
+#endif
+
+#ifndef GL_EXT_pixel_transform
+#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
+#define GL_PIXEL_MAG_FILTER_EXT           0x8331
+#define GL_PIXEL_MIN_FILTER_EXT           0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
+#define GL_CUBIC_EXT                      0x8334
+#define GL_AVERAGE_EXT                    0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
+#endif
+
+#ifndef GL_EXT_pixel_transform_color_table
+#endif
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
+#endif
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
+#define GL_SINGLE_COLOR_EXT               0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
+#endif
+
+#ifndef GL_EXT_secondary_color
+#define GL_COLOR_SUM_EXT                  0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
+#endif
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_PERTURB_EXT                    0x85AE
+#define GL_TEXTURE_NORMAL_EXT             0x85AF
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#endif
+
+#ifndef GL_EXT_fog_coord
+#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
+#define GL_FOG_COORDINATE_EXT             0x8451
+#define GL_FRAGMENT_DEPTH_EXT             0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
+#endif
+
+#ifndef GL_REND_screen_coordinates
+#define GL_SCREEN_COORDINATES_REND        0x8490
+#define GL_INVERTED_SCREEN_W_REND         0x8491
+#endif
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_TANGENT_ARRAY_EXT              0x8439
+#define GL_BINORMAL_ARRAY_EXT             0x843A
+#define GL_CURRENT_TANGENT_EXT            0x843B
+#define GL_CURRENT_BINORMAL_EXT           0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
+#define GL_MAP1_TANGENT_EXT               0x8444
+#define GL_MAP2_TANGENT_EXT               0x8445
+#define GL_MAP1_BINORMAL_EXT              0x8446
+#define GL_MAP2_BINORMAL_EXT              0x8447
+#endif
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_COMBINE_EXT                    0x8570
+#define GL_COMBINE_RGB_EXT                0x8571
+#define GL_COMBINE_ALPHA_EXT              0x8572
+#define GL_RGB_SCALE_EXT                  0x8573
+#define GL_ADD_SIGNED_EXT                 0x8574
+#define GL_INTERPOLATE_EXT                0x8575
+#define GL_CONSTANT_EXT                   0x8576
+#define GL_PRIMARY_COLOR_EXT              0x8577
+#define GL_PREVIOUS_EXT                   0x8578
+#define GL_SOURCE0_RGB_EXT                0x8580
+#define GL_SOURCE1_RGB_EXT                0x8581
+#define GL_SOURCE2_RGB_EXT                0x8582
+#define GL_SOURCE0_ALPHA_EXT              0x8588
+#define GL_SOURCE1_ALPHA_EXT              0x8589
+#define GL_SOURCE2_ALPHA_EXT              0x858A
+#define GL_OPERAND0_RGB_EXT               0x8590
+#define GL_OPERAND1_RGB_EXT               0x8591
+#define GL_OPERAND2_RGB_EXT               0x8592
+#define GL_OPERAND0_ALPHA_EXT             0x8598
+#define GL_OPERAND1_ALPHA_EXT             0x8599
+#define GL_OPERAND2_ALPHA_EXT             0x859A
+#endif
+
+#ifndef GL_APPLE_specular_vector
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+#endif
+
+#ifndef GL_APPLE_transform_hint
+#define GL_TRANSFORM_HINT_APPLE           0x85B1
+#endif
+
+#ifndef GL_SGIX_fog_scale
+#define GL_FOG_SCALE_SGIX                 0x81FC
+#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
+#endif
+
+#ifndef GL_SUNX_constant_data
+#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
+#endif
+
+#ifndef GL_SUN_global_alpha
+#define GL_GLOBAL_ALPHA_SUN               0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
+#endif
+
+#ifndef GL_SUN_triangle_list
+#define GL_RESTART_SUN                    0x0001
+#define GL_REPLACE_MIDDLE_SUN             0x0002
+#define GL_REPLACE_OLDEST_SUN             0x0003
+#define GL_TRIANGLE_LIST_SUN              0x81D7
+#define GL_REPLACEMENT_CODE_SUN           0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN                   0x85C4
+#define GL_R1UI_C4UB_V3F_SUN              0x85C5
+#define GL_R1UI_C3F_V3F_SUN               0x85C6
+#define GL_R1UI_N3F_V3F_SUN               0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
+#define GL_R1UI_T2F_V3F_SUN               0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
+#endif
+
+#ifndef GL_SUN_vertex
+#endif
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_BLEND_DST_RGB_EXT              0x80C8
+#define GL_BLEND_SRC_RGB_EXT              0x80C9
+#define GL_BLEND_DST_ALPHA_EXT            0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
+#endif
+
+#ifndef GL_INGR_color_clamp
+#define GL_RED_MIN_CLAMP_INGR             0x8560
+#define GL_GREEN_MIN_CLAMP_INGR           0x8561
+#define GL_BLUE_MIN_CLAMP_INGR            0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
+#define GL_RED_MAX_CLAMP_INGR             0x8564
+#define GL_GREEN_MAX_CLAMP_INGR           0x8565
+#define GL_BLUE_MAX_CLAMP_INGR            0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
+#endif
+
+#ifndef GL_INGR_interlace_read
+#define GL_INTERLACE_READ_INGR            0x8568
+#endif
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_INCR_WRAP_EXT                  0x8507
+#define GL_DECR_WRAP_EXT                  0x8508
+#endif
+
+#ifndef GL_EXT_422_pixels
+#define GL_422_EXT                        0x80CC
+#define GL_422_REV_EXT                    0x80CD
+#define GL_422_AVERAGE_EXT                0x80CE
+#define GL_422_REV_AVERAGE_EXT            0x80CF
+#endif
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NORMAL_MAP_NV                  0x8511
+#define GL_REFLECTION_MAP_NV              0x8512
+#endif
+
+#ifndef GL_EXT_texture_cube_map
+#define GL_NORMAL_MAP_EXT                 0x8511
+#define GL_REFLECTION_MAP_EXT             0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
+#endif
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_WRAP_BORDER_SUN                0x81D4
+#endif
+
+#ifndef GL_EXT_texture_env_add
+#endif
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
+#endif
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+#endif
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
+#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
+#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
+#define GL_MODELVIEW1_MATRIX_EXT          0x8506
+#define GL_VERTEX_WEIGHTING_EXT           0x8509
+#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
+#define GL_MODELVIEW1_EXT                 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+#endif
+
+#ifndef GL_NV_light_max_exponent
+#define GL_MAX_SHININESS_NV               0x8504
+#define GL_MAX_SPOT_EXPONENT_NV           0x8505
+#endif
+
+#ifndef GL_NV_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+#endif
+
+#ifndef GL_NV_register_combiners
+#define GL_REGISTER_COMBINERS_NV          0x8522
+#define GL_VARIABLE_A_NV                  0x8523
+#define GL_VARIABLE_B_NV                  0x8524
+#define GL_VARIABLE_C_NV                  0x8525
+#define GL_VARIABLE_D_NV                  0x8526
+#define GL_VARIABLE_E_NV                  0x8527
+#define GL_VARIABLE_F_NV                  0x8528
+#define GL_VARIABLE_G_NV                  0x8529
+#define GL_CONSTANT_COLOR0_NV             0x852A
+#define GL_CONSTANT_COLOR1_NV             0x852B
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+#define GL_SPARE0_NV                      0x852E
+#define GL_SPARE1_NV                      0x852F
+#define GL_DISCARD_NV                     0x8530
+#define GL_E_TIMES_F_NV                   0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV           0x8536
+#define GL_UNSIGNED_INVERT_NV             0x8537
+#define GL_EXPAND_NORMAL_NV               0x8538
+#define GL_EXPAND_NEGATE_NV               0x8539
+#define GL_HALF_BIAS_NORMAL_NV            0x853A
+#define GL_HALF_BIAS_NEGATE_NV            0x853B
+#define GL_SIGNED_IDENTITY_NV             0x853C
+#define GL_SIGNED_NEGATE_NV               0x853D
+#define GL_SCALE_BY_TWO_NV                0x853E
+#define GL_SCALE_BY_FOUR_NV               0x853F
+#define GL_SCALE_BY_ONE_HALF_NV           0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
+#define GL_COMBINER_INPUT_NV              0x8542
+#define GL_COMBINER_MAPPING_NV            0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
+#define GL_COMBINER_MUX_SUM_NV            0x8547
+#define GL_COMBINER_SCALE_NV              0x8548
+#define GL_COMBINER_BIAS_NV               0x8549
+#define GL_COMBINER_AB_OUTPUT_NV          0x854A
+#define GL_COMBINER_CD_OUTPUT_NV          0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
+#define GL_COLOR_SUM_CLAMP_NV             0x854F
+#define GL_COMBINER0_NV                   0x8550
+#define GL_COMBINER1_NV                   0x8551
+#define GL_COMBINER2_NV                   0x8552
+#define GL_COMBINER3_NV                   0x8553
+#define GL_COMBINER4_NV                   0x8554
+#define GL_COMBINER5_NV                   0x8555
+#define GL_COMBINER6_NV                   0x8556
+#define GL_COMBINER7_NV                   0x8557
+/* reuse GL_TEXTURE0_ARB */
+/* reuse GL_TEXTURE1_ARB */
+/* reuse GL_ZERO */
+/* reuse GL_NONE */
+/* reuse GL_FOG */
+#endif
+
+#ifndef GL_NV_fog_distance
+#define GL_FOG_DISTANCE_MODE_NV           0x855A
+#define GL_EYE_RADIAL_NV                  0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
+/* reuse GL_EYE_PLANE */
+#endif
+
+#ifndef GL_NV_texgen_emboss
+#define GL_EMBOSS_LIGHT_NV                0x855D
+#define GL_EMBOSS_CONSTANT_NV             0x855E
+#define GL_EMBOSS_MAP_NV                  0x855F
+#endif
+
+#ifndef GL_NV_blend_square
+#endif
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_COMBINE4_NV                    0x8503
+#define GL_SOURCE3_RGB_NV                 0x8583
+#define GL_SOURCE3_ALPHA_NV               0x858B
+#define GL_OPERAND3_RGB_NV                0x8593
+#define GL_OPERAND3_ALPHA_NV              0x859B
+#endif
+
+#ifndef GL_MESA_resize_buffers
+#endif
+
+#ifndef GL_MESA_window_pos
+#endif
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#endif
+
+#ifndef GL_IBM_cull_vertex
+#define GL_CULL_VERTEX_IBM                103050
+#endif
+
+#ifndef GL_IBM_multimode_draw_arrays
+#endif
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_VERTEX_ARRAY_LIST_IBM          103070
+#define GL_NORMAL_ARRAY_LIST_IBM          103071
+#define GL_COLOR_ARRAY_LIST_IBM           103072
+#define GL_INDEX_ARRAY_LIST_IBM           103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+#endif
+
+#ifndef GL_SGIX_subsample
+#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
+#endif
+
+#ifndef GL_SGIX_ycrcb_subsample
+#endif
+
+#ifndef GL_SGIX_ycrcba
+#define GL_YCRCB_SGIX                     0x8318
+#define GL_YCRCBA_SGIX                    0x8319
+#endif
+
+#ifndef GL_SGI_depth_pass_instrument
+#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
+#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
+#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
+#endif
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
+#endif
+
+#ifndef GL_3DFX_multisample
+#define GL_MULTISAMPLE_3DFX               0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
+#define GL_SAMPLES_3DFX                   0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
+#endif
+
+#ifndef GL_3DFX_tbuffer
+#endif
+
+#ifndef GL_EXT_multisample
+#define GL_MULTISAMPLE_EXT                0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
+#define GL_SAMPLE_MASK_EXT                0x80A0
+#define GL_1PASS_EXT                      0x80A1
+#define GL_2PASS_0_EXT                    0x80A2
+#define GL_2PASS_1_EXT                    0x80A3
+#define GL_4PASS_0_EXT                    0x80A4
+#define GL_4PASS_1_EXT                    0x80A5
+#define GL_4PASS_2_EXT                    0x80A6
+#define GL_4PASS_3_EXT                    0x80A7
+#define GL_SAMPLE_BUFFERS_EXT             0x80A8
+#define GL_SAMPLES_EXT                    0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
+#define GL_SAMPLE_PATTERN_EXT             0x80AC
+#define GL_MULTISAMPLE_BIT_EXT            0x20000000
+#endif
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_VERTEX_PRECLIP_SGIX            0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
+#endif
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_CONVOLUTION_HINT_SGIX          0x8316
+#endif
+
+#ifndef GL_SGIX_resample
+#define GL_PACK_RESAMPLE_SGIX             0x842C
+#define GL_UNPACK_RESAMPLE_SGIX           0x842D
+#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
+#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
+#endif
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
+#define GL_EYE_POINT_SGIS                 0x81F4
+#define GL_OBJECT_POINT_SGIS              0x81F5
+#define GL_EYE_LINE_SGIS                  0x81F6
+#define GL_OBJECT_LINE_SGIS               0x81F7
+#endif
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
+#endif
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_DOT3_RGB_EXT                   0x8740
+#define GL_DOT3_RGBA_EXT                  0x8741
+#endif
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_MIRROR_CLAMP_ATI               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
+#endif
+
+#ifndef GL_NV_fence
+#define GL_ALL_COMPLETED_NV               0x84F2
+#define GL_FENCE_STATUS_NV                0x84F3
+#define GL_FENCE_CONDITION_NV             0x84F4
+#endif
+
+#ifndef GL_IBM_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_IBM            0x8370
+#endif
+
+#ifndef GL_NV_evaluators
+#define GL_EVAL_2D_NV                     0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
+#define GL_MAP_TESSELLATION_NV            0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
+#endif
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_DEPTH_STENCIL_NV               0x84F9
+#define GL_UNSIGNED_INT_24_8_NV           0x84FA
+#endif
+
+#ifndef GL_NV_register_combiners2
+#define GL_PER_STAGE_CONSTANTS_NV         0x8535
+#endif
+
+#ifndef GL_NV_texture_compression_vtc
+#endif
+
+#ifndef GL_NV_texture_rectangle
+#define GL_TEXTURE_RECTANGLE_NV           0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
+#endif
+
+#ifndef GL_NV_texture_shader
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
+#define GL_SHADER_CONSISTENT_NV           0x86DD
+#define GL_TEXTURE_SHADER_NV              0x86DE
+#define GL_SHADER_OPERATION_NV            0x86DF
+#define GL_CULL_MODES_NV                  0x86E0
+#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
+#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
+#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
+#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
+#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
+#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
+#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
+#define GL_CONST_EYE_NV                   0x86E5
+#define GL_PASS_THROUGH_NV                0x86E6
+#define GL_CULL_FRAGMENT_NV               0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
+#define GL_DOT_PRODUCT_NV                 0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
+#define GL_HILO_NV                        0x86F4
+#define GL_DSDT_NV                        0x86F5
+#define GL_DSDT_MAG_NV                    0x86F6
+#define GL_DSDT_MAG_VIB_NV                0x86F7
+#define GL_HILO16_NV                      0x86F8
+#define GL_SIGNED_HILO_NV                 0x86F9
+#define GL_SIGNED_HILO16_NV               0x86FA
+#define GL_SIGNED_RGBA_NV                 0x86FB
+#define GL_SIGNED_RGBA8_NV                0x86FC
+#define GL_SIGNED_RGB_NV                  0x86FE
+#define GL_SIGNED_RGB8_NV                 0x86FF
+#define GL_SIGNED_LUMINANCE_NV            0x8701
+#define GL_SIGNED_LUMINANCE8_NV           0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
+#define GL_SIGNED_ALPHA_NV                0x8705
+#define GL_SIGNED_ALPHA8_NV               0x8706
+#define GL_SIGNED_INTENSITY_NV            0x8707
+#define GL_SIGNED_INTENSITY8_NV           0x8708
+#define GL_DSDT8_NV                       0x8709
+#define GL_DSDT8_MAG8_NV                  0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+#define GL_HI_SCALE_NV                    0x870E
+#define GL_LO_SCALE_NV                    0x870F
+#define GL_DS_SCALE_NV                    0x8710
+#define GL_DT_SCALE_NV                    0x8711
+#define GL_MAGNITUDE_SCALE_NV             0x8712
+#define GL_VIBRANCE_SCALE_NV              0x8713
+#define GL_HI_BIAS_NV                     0x8714
+#define GL_LO_BIAS_NV                     0x8715
+#define GL_DS_BIAS_NV                     0x8716
+#define GL_DT_BIAS_NV                     0x8717
+#define GL_MAGNITUDE_BIAS_NV              0x8718
+#define GL_VIBRANCE_BIAS_NV               0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
+#define GL_TEXTURE_HI_SIZE_NV             0x871B
+#define GL_TEXTURE_LO_SIZE_NV             0x871C
+#define GL_TEXTURE_DS_SIZE_NV             0x871D
+#define GL_TEXTURE_DT_SIZE_NV             0x871E
+#define GL_TEXTURE_MAG_SIZE_NV            0x871F
+#endif
+
+#ifndef GL_NV_texture_shader2
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
+#endif
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
+#endif
+
+#ifndef GL_NV_vertex_program
+#define GL_VERTEX_PROGRAM_NV              0x8620
+#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
+#define GL_CURRENT_ATTRIB_NV              0x8626
+#define GL_PROGRAM_LENGTH_NV              0x8627
+#define GL_PROGRAM_STRING_NV              0x8628
+#define GL_MODELVIEW_PROJECTION_NV        0x8629
+#define GL_IDENTITY_NV                    0x862A
+#define GL_INVERSE_NV                     0x862B
+#define GL_TRANSPOSE_NV                   0x862C
+#define GL_INVERSE_TRANSPOSE_NV           0x862D
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
+#define GL_MAX_TRACK_MATRICES_NV          0x862F
+#define GL_MATRIX0_NV                     0x8630
+#define GL_MATRIX1_NV                     0x8631
+#define GL_MATRIX2_NV                     0x8632
+#define GL_MATRIX3_NV                     0x8633
+#define GL_MATRIX4_NV                     0x8634
+#define GL_MATRIX5_NV                     0x8635
+#define GL_MATRIX6_NV                     0x8636
+#define GL_MATRIX7_NV                     0x8637
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
+#define GL_CURRENT_MATRIX_NV              0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
+#define GL_PROGRAM_PARAMETER_NV           0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
+#define GL_PROGRAM_TARGET_NV              0x8646
+#define GL_PROGRAM_RESIDENT_NV            0x8647
+#define GL_TRACK_MATRIX_NV                0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
+#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
+#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
+#endif
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
+#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
+#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
+#endif
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SCALEBIAS_HINT_SGIX            0x8322
+#endif
+
+#ifndef GL_OML_interlace
+#define GL_INTERLACE_OML                  0x8980
+#define GL_INTERLACE_READ_OML             0x8981
+#endif
+
+#ifndef GL_OML_subsample
+#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
+#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
+#endif
+
+#ifndef GL_OML_resample
+#define GL_PACK_RESAMPLE_OML              0x8984
+#define GL_UNPACK_RESAMPLE_OML            0x8985
+#define GL_RESAMPLE_REPLICATE_OML         0x8986
+#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
+#define GL_RESAMPLE_AVERAGE_OML           0x8988
+#define GL_RESAMPLE_DECIMATE_OML          0x8989
+#endif
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
+#endif
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_BUMP_ROT_MATRIX_ATI            0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
+#define GL_BUMP_TEX_UNITS_ATI             0x8778
+#define GL_DUDV_ATI                       0x8779
+#define GL_DU8DV8_ATI                     0x877A
+#define GL_BUMP_ENVMAP_ATI                0x877B
+#define GL_BUMP_TARGET_ATI                0x877C
+#endif
+
+#ifndef GL_ATI_fragment_shader
+#define GL_FRAGMENT_SHADER_ATI            0x8920
+#define GL_REG_0_ATI                      0x8921
+#define GL_REG_1_ATI                      0x8922
+#define GL_REG_2_ATI                      0x8923
+#define GL_REG_3_ATI                      0x8924
+#define GL_REG_4_ATI                      0x8925
+#define GL_REG_5_ATI                      0x8926
+#define GL_REG_6_ATI                      0x8927
+#define GL_REG_7_ATI                      0x8928
+#define GL_REG_8_ATI                      0x8929
+#define GL_REG_9_ATI                      0x892A
+#define GL_REG_10_ATI                     0x892B
+#define GL_REG_11_ATI                     0x892C
+#define GL_REG_12_ATI                     0x892D
+#define GL_REG_13_ATI                     0x892E
+#define GL_REG_14_ATI                     0x892F
+#define GL_REG_15_ATI                     0x8930
+#define GL_REG_16_ATI                     0x8931
+#define GL_REG_17_ATI                     0x8932
+#define GL_REG_18_ATI                     0x8933
+#define GL_REG_19_ATI                     0x8934
+#define GL_REG_20_ATI                     0x8935
+#define GL_REG_21_ATI                     0x8936
+#define GL_REG_22_ATI                     0x8937
+#define GL_REG_23_ATI                     0x8938
+#define GL_REG_24_ATI                     0x8939
+#define GL_REG_25_ATI                     0x893A
+#define GL_REG_26_ATI                     0x893B
+#define GL_REG_27_ATI                     0x893C
+#define GL_REG_28_ATI                     0x893D
+#define GL_REG_29_ATI                     0x893E
+#define GL_REG_30_ATI                     0x893F
+#define GL_REG_31_ATI                     0x8940
+#define GL_CON_0_ATI                      0x8941
+#define GL_CON_1_ATI                      0x8942
+#define GL_CON_2_ATI                      0x8943
+#define GL_CON_3_ATI                      0x8944
+#define GL_CON_4_ATI                      0x8945
+#define GL_CON_5_ATI                      0x8946
+#define GL_CON_6_ATI                      0x8947
+#define GL_CON_7_ATI                      0x8948
+#define GL_CON_8_ATI                      0x8949
+#define GL_CON_9_ATI                      0x894A
+#define GL_CON_10_ATI                     0x894B
+#define GL_CON_11_ATI                     0x894C
+#define GL_CON_12_ATI                     0x894D
+#define GL_CON_13_ATI                     0x894E
+#define GL_CON_14_ATI                     0x894F
+#define GL_CON_15_ATI                     0x8950
+#define GL_CON_16_ATI                     0x8951
+#define GL_CON_17_ATI                     0x8952
+#define GL_CON_18_ATI                     0x8953
+#define GL_CON_19_ATI                     0x8954
+#define GL_CON_20_ATI                     0x8955
+#define GL_CON_21_ATI                     0x8956
+#define GL_CON_22_ATI                     0x8957
+#define GL_CON_23_ATI                     0x8958
+#define GL_CON_24_ATI                     0x8959
+#define GL_CON_25_ATI                     0x895A
+#define GL_CON_26_ATI                     0x895B
+#define GL_CON_27_ATI                     0x895C
+#define GL_CON_28_ATI                     0x895D
+#define GL_CON_29_ATI                     0x895E
+#define GL_CON_30_ATI                     0x895F
+#define GL_CON_31_ATI                     0x8960
+#define GL_MOV_ATI                        0x8961
+#define GL_ADD_ATI                        0x8963
+#define GL_MUL_ATI                        0x8964
+#define GL_SUB_ATI                        0x8965
+#define GL_DOT3_ATI                       0x8966
+#define GL_DOT4_ATI                       0x8967
+#define GL_MAD_ATI                        0x8968
+#define GL_LERP_ATI                       0x8969
+#define GL_CND_ATI                        0x896A
+#define GL_CND0_ATI                       0x896B
+#define GL_DOT2_ADD_ATI                   0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
+#define GL_NUM_PASSES_ATI                 0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
+#define GL_SWIZZLE_STR_ATI                0x8976
+#define GL_SWIZZLE_STQ_ATI                0x8977
+#define GL_SWIZZLE_STR_DR_ATI             0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
+#define GL_SWIZZLE_STRQ_ATI               0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
+#define GL_RED_BIT_ATI                    0x00000001
+#define GL_GREEN_BIT_ATI                  0x00000002
+#define GL_BLUE_BIT_ATI                   0x00000004
+#define GL_2X_BIT_ATI                     0x00000001
+#define GL_4X_BIT_ATI                     0x00000002
+#define GL_8X_BIT_ATI                     0x00000004
+#define GL_HALF_BIT_ATI                   0x00000008
+#define GL_QUARTER_BIT_ATI                0x00000010
+#define GL_EIGHTH_BIT_ATI                 0x00000020
+#define GL_SATURATE_BIT_ATI               0x00000040
+#define GL_COMP_BIT_ATI                   0x00000002
+#define GL_NEGATE_BIT_ATI                 0x00000004
+#define GL_BIAS_BIT_ATI                   0x00000008
+#endif
+
+#ifndef GL_ATI_pn_triangles
+#define GL_PN_TRIANGLES_ATI               0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
+#endif
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_STATIC_ATI                     0x8760
+#define GL_DYNAMIC_ATI                    0x8761
+#define GL_PRESERVE_ATI                   0x8762
+#define GL_DISCARD_ATI                    0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
+#endif
+
+#ifndef GL_EXT_vertex_shader
+#define GL_VERTEX_SHADER_EXT              0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
+#define GL_OP_INDEX_EXT                   0x8782
+#define GL_OP_NEGATE_EXT                  0x8783
+#define GL_OP_DOT3_EXT                    0x8784
+#define GL_OP_DOT4_EXT                    0x8785
+#define GL_OP_MUL_EXT                     0x8786
+#define GL_OP_ADD_EXT                     0x8787
+#define GL_OP_MADD_EXT                    0x8788
+#define GL_OP_FRAC_EXT                    0x8789
+#define GL_OP_MAX_EXT                     0x878A
+#define GL_OP_MIN_EXT                     0x878B
+#define GL_OP_SET_GE_EXT                  0x878C
+#define GL_OP_SET_LT_EXT                  0x878D
+#define GL_OP_CLAMP_EXT                   0x878E
+#define GL_OP_FLOOR_EXT                   0x878F
+#define GL_OP_ROUND_EXT                   0x8790
+#define GL_OP_EXP_BASE_2_EXT              0x8791
+#define GL_OP_LOG_BASE_2_EXT              0x8792
+#define GL_OP_POWER_EXT                   0x8793
+#define GL_OP_RECIP_EXT                   0x8794
+#define GL_OP_RECIP_SQRT_EXT              0x8795
+#define GL_OP_SUB_EXT                     0x8796
+#define GL_OP_CROSS_PRODUCT_EXT           0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
+#define GL_OP_MOV_EXT                     0x8799
+#define GL_OUTPUT_VERTEX_EXT              0x879A
+#define GL_OUTPUT_COLOR0_EXT              0x879B
+#define GL_OUTPUT_COLOR1_EXT              0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
+#define GL_OUTPUT_FOG_EXT                 0x87BD
+#define GL_SCALAR_EXT                     0x87BE
+#define GL_VECTOR_EXT                     0x87BF
+#define GL_MATRIX_EXT                     0x87C0
+#define GL_VARIANT_EXT                    0x87C1
+#define GL_INVARIANT_EXT                  0x87C2
+#define GL_LOCAL_CONSTANT_EXT             0x87C3
+#define GL_LOCAL_EXT                      0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
+#define GL_X_EXT                          0x87D5
+#define GL_Y_EXT                          0x87D6
+#define GL_Z_EXT                          0x87D7
+#define GL_W_EXT                          0x87D8
+#define GL_NEGATIVE_X_EXT                 0x87D9
+#define GL_NEGATIVE_Y_EXT                 0x87DA
+#define GL_NEGATIVE_Z_EXT                 0x87DB
+#define GL_NEGATIVE_W_EXT                 0x87DC
+#define GL_ZERO_EXT                       0x87DD
+#define GL_ONE_EXT                        0x87DE
+#define GL_NEGATIVE_ONE_EXT               0x87DF
+#define GL_NORMALIZED_RANGE_EXT           0x87E0
+#define GL_FULL_RANGE_EXT                 0x87E1
+#define GL_CURRENT_VERTEX_EXT             0x87E2
+#define GL_MVP_MATRIX_EXT                 0x87E3
+#define GL_VARIANT_VALUE_EXT              0x87E4
+#define GL_VARIANT_DATATYPE_EXT           0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
+#define GL_VARIANT_ARRAY_EXT              0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
+#define GL_INVARIANT_VALUE_EXT            0x87EA
+#define GL_INVARIANT_DATATYPE_EXT         0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
+#endif
+
+#ifndef GL_ATI_vertex_streams
+#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
+#define GL_VERTEX_STREAM0_ATI             0x876C
+#define GL_VERTEX_STREAM1_ATI             0x876D
+#define GL_VERTEX_STREAM2_ATI             0x876E
+#define GL_VERTEX_STREAM3_ATI             0x876F
+#define GL_VERTEX_STREAM4_ATI             0x8770
+#define GL_VERTEX_STREAM5_ATI             0x8771
+#define GL_VERTEX_STREAM6_ATI             0x8772
+#define GL_VERTEX_STREAM7_ATI             0x8773
+#define GL_VERTEX_SOURCE_ATI              0x8774
+#endif
+
+#ifndef GL_ATI_element_array
+#define GL_ELEMENT_ARRAY_ATI              0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
+#endif
+
+#ifndef GL_SUN_mesh_array
+#define GL_QUAD_MESH_SUN                  0x8614
+#define GL_TRIANGLE_MESH_SUN              0x8615
+#endif
+
+#ifndef GL_SUN_slice_accum
+#define GL_SLICE_ACCUM_SUN                0x85CC
+#endif
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
+#endif
+
+#ifndef GL_NV_depth_clamp
+#define GL_DEPTH_CLAMP_NV                 0x864F
+#endif
+
+#ifndef GL_NV_occlusion_query
+#define GL_PIXEL_COUNTER_BITS_NV          0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
+#define GL_PIXEL_COUNT_NV                 0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
+#endif
+
+#ifndef GL_NV_point_sprite
+#define GL_POINT_SPRITE_NV                0x8861
+#define GL_COORD_REPLACE_NV               0x8862
+#define GL_POINT_SPRITE_R_MODE_NV         0x8863
+#endif
+
+#ifndef GL_NV_texture_shader3
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
+#define GL_HILO8_NV                       0x885E
+#define GL_SIGNED_HILO8_NV                0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
+#endif
+
+#ifndef GL_NV_vertex_program1_1
+#endif
+
+#ifndef GL_EXT_shadow_funcs
+#endif
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
+#endif
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
+#endif
+
+#ifndef GL_APPLE_client_storage
+#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
+#endif
+
+#ifndef GL_APPLE_element_array
+#define GL_ELEMENT_ARRAY_APPLE            0x8768
+#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
+#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
+#endif
+
+#ifndef GL_APPLE_fence
+#define GL_DRAW_PIXELS_APPLE              0x8A0A
+#define GL_FENCE_APPLE                    0x8A0B
+#endif
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
+#endif
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
+#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
+#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
+#define GL_STORAGE_CACHED_APPLE           0x85BE
+#define GL_STORAGE_SHARED_APPLE           0x85BF
+#endif
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_YCBCR_422_APPLE                0x85B9
+#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
+#endif
+
+#ifndef GL_S3_s3tc
+#define GL_RGB_S3TC                       0x83A0
+#define GL_RGB4_S3TC                      0x83A1
+#define GL_RGBA_S3TC                      0x83A2
+#define GL_RGBA4_S3TC                     0x83A3
+#endif
+
+#ifndef GL_ATI_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
+#define GL_DRAW_BUFFER0_ATI               0x8825
+#define GL_DRAW_BUFFER1_ATI               0x8826
+#define GL_DRAW_BUFFER2_ATI               0x8827
+#define GL_DRAW_BUFFER3_ATI               0x8828
+#define GL_DRAW_BUFFER4_ATI               0x8829
+#define GL_DRAW_BUFFER5_ATI               0x882A
+#define GL_DRAW_BUFFER6_ATI               0x882B
+#define GL_DRAW_BUFFER7_ATI               0x882C
+#define GL_DRAW_BUFFER8_ATI               0x882D
+#define GL_DRAW_BUFFER9_ATI               0x882E
+#define GL_DRAW_BUFFER10_ATI              0x882F
+#define GL_DRAW_BUFFER11_ATI              0x8830
+#define GL_DRAW_BUFFER12_ATI              0x8831
+#define GL_DRAW_BUFFER13_ATI              0x8832
+#define GL_DRAW_BUFFER14_ATI              0x8833
+#define GL_DRAW_BUFFER15_ATI              0x8834
+#endif
+
+#ifndef GL_ATI_pixel_format_float
+#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
+#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
+#endif
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_MODULATE_ADD_ATI               0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
+#define GL_MODULATE_SUBTRACT_ATI          0x8746
+#endif
+
+#ifndef GL_ATI_texture_float
+#define GL_RGBA_FLOAT32_ATI               0x8814
+#define GL_RGB_FLOAT32_ATI                0x8815
+#define GL_ALPHA_FLOAT32_ATI              0x8816
+#define GL_INTENSITY_FLOAT32_ATI          0x8817
+#define GL_LUMINANCE_FLOAT32_ATI          0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
+#define GL_RGBA_FLOAT16_ATI               0x881A
+#define GL_RGB_FLOAT16_ATI                0x881B
+#define GL_ALPHA_FLOAT16_ATI              0x881C
+#define GL_INTENSITY_FLOAT16_ATI          0x881D
+#define GL_LUMINANCE_FLOAT16_ATI          0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
+#endif
+
+#ifndef GL_NV_float_buffer
+#define GL_FLOAT_R_NV                     0x8880
+#define GL_FLOAT_RG_NV                    0x8881
+#define GL_FLOAT_RGB_NV                   0x8882
+#define GL_FLOAT_RGBA_NV                  0x8883
+#define GL_FLOAT_R16_NV                   0x8884
+#define GL_FLOAT_R32_NV                   0x8885
+#define GL_FLOAT_RG16_NV                  0x8886
+#define GL_FLOAT_RG32_NV                  0x8887
+#define GL_FLOAT_RGB16_NV                 0x8888
+#define GL_FLOAT_RGB32_NV                 0x8889
+#define GL_FLOAT_RGBA16_NV                0x888A
+#define GL_FLOAT_RGBA32_NV                0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
+#define GL_FLOAT_RGBA_MODE_NV             0x888E
+#endif
+
+#ifndef GL_NV_fragment_program
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
+#define GL_FRAGMENT_PROGRAM_NV            0x8870
+#define GL_MAX_TEXTURE_COORDS_NV          0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
+#define GL_PROGRAM_ERROR_STRING_NV        0x8874
+#endif
+
+#ifndef GL_NV_half_float
+#define GL_HALF_FLOAT_NV                  0x140B
+#endif
+
+#ifndef GL_NV_pixel_data_range
+#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
+#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
+#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
+#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
+#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
+#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
+#endif
+
+#ifndef GL_NV_primitive_restart
+#define GL_PRIMITIVE_RESTART_NV           0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
+#endif
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
+#endif
+
+#ifndef GL_NV_vertex_program2
+#endif
+
+#ifndef GL_ATI_map_object_buffer
+#endif
+
+#ifndef GL_ATI_separate_stencil
+#define GL_STENCIL_BACK_FUNC_ATI          0x8800
+#define GL_STENCIL_BACK_FAIL_ATI          0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
+#endif
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#endif
+
+#ifndef GL_OES_read_format
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
+#endif
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
+#define GL_DEPTH_BOUNDS_EXT               0x8891
+#endif
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_MIRROR_CLAMP_EXT               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
+#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
+#endif
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_BLEND_EQUATION_RGB_EXT         0x8009
+#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
+#endif
+
+#ifndef GL_MESA_pack_invert
+#define GL_PACK_INVERT_MESA               0x8758
+#endif
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
+#define GL_YCBCR_MESA                     0x8757
+#endif
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
+#endif
+
+#ifndef GL_NV_fragment_program_option
+#endif
+
+#ifndef GL_NV_fragment_program2
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
+#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
+#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
+#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
+#endif
+
+#ifndef GL_NV_vertex_program2_option
+/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
+#endif
+
+#ifndef GL_NV_vertex_program3
+/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+#endif
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
+#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
+#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
+#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
+#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
+#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
+#define GL_FRAMEBUFFER_EXT                0x8D40
+#define GL_RENDERBUFFER_EXT               0x8D41
+#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
+#define GL_STENCIL_INDEX1_EXT             0x8D46
+#define GL_STENCIL_INDEX4_EXT             0x8D47
+#define GL_STENCIL_INDEX8_EXT             0x8D48
+#define GL_STENCIL_INDEX16_EXT            0x8D49
+#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
+#endif
+
+#ifndef GL_GREMEDY_string_marker
+#endif
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_DEPTH_STENCIL_EXT              0x84F9
+#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
+#define GL_DEPTH24_STENCIL8_EXT           0x88F0
+#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
+#endif
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_STENCIL_TAG_BITS_EXT           0x88F2
+#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
+#endif
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_SRGB_EXT                       0x8C40
+#define GL_SRGB8_EXT                      0x8C41
+#define GL_SRGB_ALPHA_EXT                 0x8C42
+#define GL_SRGB8_ALPHA8_EXT               0x8C43
+#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
+#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
+#define GL_SLUMINANCE_EXT                 0x8C46
+#define GL_SLUMINANCE8_EXT                0x8C47
+#define GL_COMPRESSED_SRGB_EXT            0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
+#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+#endif
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
+#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
+#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
+#endif
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
+#define GL_MAX_SAMPLES_EXT                0x8D57
+#endif
+
+#ifndef GL_MESAX_texture_stack
+#define GL_TEXTURE_1D_STACK_MESAX         0x8759
+#define GL_TEXTURE_2D_STACK_MESAX         0x875A
+#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
+#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
+#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
+#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
+#endif
+
+#ifndef GL_EXT_timer_query
+#define GL_TIME_ELAPSED_EXT               0x88BF
+#endif
+
+#ifndef GL_EXT_gpu_program_parameters
+#endif
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
+#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
+#endif
+
+#ifndef GL_NV_gpu_program4
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
+#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
+#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
+#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
+#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
+#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
+#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
+#endif
+
+#ifndef GL_NV_geometry_program4
+#define GL_LINES_ADJACENCY_EXT            0x000A
+#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
+#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
+#define GL_GEOMETRY_PROGRAM_NV            0x8C26
+#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
+#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
+#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
+#endif
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_GEOMETRY_SHADER_EXT            0x8DD9
+/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */
+/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */
+/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */
+/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
+#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
+/* reuse GL_LINES_ADJACENCY_EXT */
+/* reuse GL_LINE_STRIP_ADJACENCY_EXT */
+/* reuse GL_TRIANGLES_ADJACENCY_EXT */
+/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+/* reuse GL_PROGRAM_POINT_SIZE_EXT */
+#endif
+
+#ifndef GL_NV_vertex_program4
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
+#endif
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
+#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
+#define GL_SAMPLER_BUFFER_EXT             0x8DC2
+#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
+#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
+#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
+#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
+#define GL_INT_SAMPLER_1D_EXT             0x8DC9
+#define GL_INT_SAMPLER_2D_EXT             0x8DCA
+#define GL_INT_SAMPLER_3D_EXT             0x8DCB
+#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
+#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
+#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
+#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
+#endif
+
+#ifndef GL_EXT_draw_instanced
+#endif
+
+#ifndef GL_EXT_packed_float
+#define GL_R11F_G11F_B10F_EXT             0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
+#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
+#endif
+
+#ifndef GL_EXT_texture_array
+#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
+#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
+#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+#endif
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_TEXTURE_BUFFER_EXT             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
+#endif
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
+#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
+#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
+#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
+#endif
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
+#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
+#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
+#endif
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_RGB9_E5_EXT                    0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
+#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
+#endif
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
+#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
+#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
+#endif
+
+#ifndef GL_NV_fragment_program4
+#endif
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
+#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
+#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
+#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
+#endif
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
+#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
+#endif
+
+#ifndef GL_NV_geometry_shader4
+#endif
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
+#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
+#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
+#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
+#endif
+
+#ifndef GL_EXT_draw_buffers2
+#endif
+
+#ifndef GL_NV_transform_feedback
+#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
+#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
+#define GL_TEXTURE_COORD_NV               0x8C79
+#define GL_CLIP_DISTANCE_NV               0x8C7A
+#define GL_VERTEX_ID_NV                   0x8C7B
+#define GL_PRIMITIVE_ID_NV                0x8C7C
+#define GL_GENERIC_ATTRIB_NV              0x8C7D
+#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
+#define GL_ACTIVE_VARYINGS_NV             0x8C81
+#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
+#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
+#define GL_PRIMITIVES_GENERATED_NV        0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
+#define GL_RASTERIZER_DISCARD_NV          0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
+#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
+#endif
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
+#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
+#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
+#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
+#define GL_UNIFORM_BUFFER_EXT             0x8DEE
+#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
+#endif
+
+#ifndef GL_EXT_texture_integer
+#define GL_RGBA32UI_EXT                   0x8D70
+#define GL_RGB32UI_EXT                    0x8D71
+#define GL_ALPHA32UI_EXT                  0x8D72
+#define GL_INTENSITY32UI_EXT              0x8D73
+#define GL_LUMINANCE32UI_EXT              0x8D74
+#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
+#define GL_RGBA16UI_EXT                   0x8D76
+#define GL_RGB16UI_EXT                    0x8D77
+#define GL_ALPHA16UI_EXT                  0x8D78
+#define GL_INTENSITY16UI_EXT              0x8D79
+#define GL_LUMINANCE16UI_EXT              0x8D7A
+#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
+#define GL_RGBA8UI_EXT                    0x8D7C
+#define GL_RGB8UI_EXT                     0x8D7D
+#define GL_ALPHA8UI_EXT                   0x8D7E
+#define GL_INTENSITY8UI_EXT               0x8D7F
+#define GL_LUMINANCE8UI_EXT               0x8D80
+#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
+#define GL_RGBA32I_EXT                    0x8D82
+#define GL_RGB32I_EXT                     0x8D83
+#define GL_ALPHA32I_EXT                   0x8D84
+#define GL_INTENSITY32I_EXT               0x8D85
+#define GL_LUMINANCE32I_EXT               0x8D86
+#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
+#define GL_RGBA16I_EXT                    0x8D88
+#define GL_RGB16I_EXT                     0x8D89
+#define GL_ALPHA16I_EXT                   0x8D8A
+#define GL_INTENSITY16I_EXT               0x8D8B
+#define GL_LUMINANCE16I_EXT               0x8D8C
+#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
+#define GL_RGBA8I_EXT                     0x8D8E
+#define GL_RGB8I_EXT                      0x8D8F
+#define GL_ALPHA8I_EXT                    0x8D90
+#define GL_INTENSITY8I_EXT                0x8D91
+#define GL_LUMINANCE8I_EXT                0x8D92
+#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
+#define GL_RED_INTEGER_EXT                0x8D94
+#define GL_GREEN_INTEGER_EXT              0x8D95
+#define GL_BLUE_INTEGER_EXT               0x8D96
+#define GL_ALPHA_INTEGER_EXT              0x8D97
+#define GL_RGB_INTEGER_EXT                0x8D98
+#define GL_RGBA_INTEGER_EXT               0x8D99
+#define GL_BGR_INTEGER_EXT                0x8D9A
+#define GL_BGRA_INTEGER_EXT               0x8D9B
+#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
+#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
+#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
+#endif
+
+#ifndef GL_GREMEDY_frame_terminator
+#endif
+
+#ifndef GL_NV_conditional_render
+#define GL_QUERY_WAIT_NV                  0x8E13
+#define GL_QUERY_NO_WAIT_NV               0x8E14
+#define GL_QUERY_BY_REGION_WAIT_NV        0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT_NV     0x8E16
+#endif
+
+#ifndef GL_NV_present_video
+#define GL_FRAME_NV                       0x8E26
+#define GL_FIELDS_NV                      0x8E27
+#define GL_CURRENT_TIME_NV                0x8E28
+#define GL_NUM_FILL_STREAMS_NV            0x8E29
+#define GL_PRESENT_TIME_NV                0x8E2A
+#define GL_PRESENT_DURATION_NV            0x8E2B
+#endif
+
+#ifndef GL_EXT_transform_feedback
+#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT  0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F
+#define GL_INTERLEAVED_ATTRIBS_EXT        0x8C8C
+#define GL_SEPARATE_ATTRIBS_EXT           0x8C8D
+#define GL_PRIMITIVES_GENERATED_EXT       0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88
+#define GL_RASTERIZER_DISCARD_EXT         0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
+#endif
+
+#ifndef GL_EXT_direct_state_access
+#define GL_PROGRAM_MATRIX_EXT             0x8E2D
+#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT   0x8E2E
+#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
+#endif
+
+#ifndef GL_EXT_vertex_array_bgra
+/* reuse GL_BGRA */
+#endif
+
+#ifndef GL_EXT_texture_swizzle
+#define GL_TEXTURE_SWIZZLE_R_EXT          0x8E42
+#define GL_TEXTURE_SWIZZLE_G_EXT          0x8E43
+#define GL_TEXTURE_SWIZZLE_B_EXT          0x8E44
+#define GL_TEXTURE_SWIZZLE_A_EXT          0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA_EXT       0x8E46
+#endif
+
+#ifndef GL_NV_explicit_multisample
+#define GL_SAMPLE_POSITION_NV             0x8E50
+#define GL_SAMPLE_MASK_NV                 0x8E51
+#define GL_SAMPLE_MASK_VALUE_NV           0x8E52
+#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53
+#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54
+#define GL_TEXTURE_RENDERBUFFER_NV        0x8E55
+#define GL_SAMPLER_RENDERBUFFER_NV        0x8E56
+#define GL_INT_SAMPLER_RENDERBUFFER_NV    0x8E57
+#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58
+#define GL_MAX_SAMPLE_MASK_WORDS_NV       0x8E59
+#endif
+
+#ifndef GL_NV_transform_feedback2
+#define GL_TRANSFORM_FEEDBACK_NV          0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING_NV  0x8E25
+#endif
+
+#ifndef GL_ATI_meminfo
+#define GL_VBO_FREE_MEMORY_ATI            0x87FB
+#define GL_TEXTURE_FREE_MEMORY_ATI        0x87FC
+#define GL_RENDERBUFFER_FREE_MEMORY_ATI   0x87FD
+#endif
+
+#ifndef GL_AMD_performance_monitor
+#define GL_COUNTER_TYPE_AMD               0x8BC0
+#define GL_COUNTER_RANGE_AMD              0x8BC1
+#define GL_UNSIGNED_INT64_AMD             0x8BC2
+#define GL_PERCENTAGE_AMD                 0x8BC3
+#define GL_PERFMON_RESULT_AVAILABLE_AMD   0x8BC4
+#define GL_PERFMON_RESULT_SIZE_AMD        0x8BC5
+#define GL_PERFMON_RESULT_AMD             0x8BC6
+#endif
+
+#ifndef GL_AMD_texture_texture4
+#endif
+
+#ifndef GL_AMD_vertex_shader_tesselator
+#define GL_SAMPLER_BUFFER_AMD             0x9001
+#define GL_INT_SAMPLER_BUFFER_AMD         0x9002
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003
+#define GL_TESSELLATION_MODE_AMD          0x9004
+#define GL_TESSELLATION_FACTOR_AMD        0x9005
+#define GL_DISCRETE_AMD                   0x9006
+#define GL_CONTINUOUS_AMD                 0x9007
+#endif
+
+#ifndef GL_EXT_provoking_vertex
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION_EXT    0x8E4D
+#define GL_LAST_VERTEX_CONVENTION_EXT     0x8E4E
+#define GL_PROVOKING_VERTEX_EXT           0x8E4F
+#endif
+
+#ifndef GL_EXT_texture_snorm
+#define GL_ALPHA_SNORM                    0x9010
+#define GL_LUMINANCE_SNORM                0x9011
+#define GL_LUMINANCE_ALPHA_SNORM          0x9012
+#define GL_INTENSITY_SNORM                0x9013
+#define GL_ALPHA8_SNORM                   0x9014
+#define GL_LUMINANCE8_SNORM               0x9015
+#define GL_LUMINANCE8_ALPHA8_SNORM        0x9016
+#define GL_INTENSITY8_SNORM               0x9017
+#define GL_ALPHA16_SNORM                  0x9018
+#define GL_LUMINANCE16_SNORM              0x9019
+#define GL_LUMINANCE16_ALPHA16_SNORM      0x901A
+#define GL_INTENSITY16_SNORM              0x901B
+/* reuse GL_RED_SNORM */
+/* reuse GL_RG_SNORM */
+/* reuse GL_RGB_SNORM */
+/* reuse GL_RGBA_SNORM */
+/* reuse GL_R8_SNORM */
+/* reuse GL_RG8_SNORM */
+/* reuse GL_RGB8_SNORM */
+/* reuse GL_RGBA8_SNORM */
+/* reuse GL_R16_SNORM */
+/* reuse GL_RG16_SNORM */
+/* reuse GL_RGB16_SNORM */
+/* reuse GL_RGBA16_SNORM */
+/* reuse GL_SIGNED_NORMALIZED */
+#endif
+
+#ifndef GL_AMD_draw_buffers_blend
+#endif
+
+#ifndef GL_APPLE_texture_range
+#define GL_TEXTURE_RANGE_LENGTH_APPLE     0x85B7
+#define GL_TEXTURE_RANGE_POINTER_APPLE    0x85B8
+#define GL_TEXTURE_STORAGE_HINT_APPLE     0x85BC
+#define GL_STORAGE_PRIVATE_APPLE          0x85BD
+/* reuse GL_STORAGE_CACHED_APPLE */
+/* reuse GL_STORAGE_SHARED_APPLE */
+#endif
+
+#ifndef GL_APPLE_float_pixels
+#define GL_HALF_APPLE                     0x140B
+#define GL_RGBA_FLOAT32_APPLE             0x8814
+#define GL_RGB_FLOAT32_APPLE              0x8815
+#define GL_ALPHA_FLOAT32_APPLE            0x8816
+#define GL_INTENSITY_FLOAT32_APPLE        0x8817
+#define GL_LUMINANCE_FLOAT32_APPLE        0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE  0x8819
+#define GL_RGBA_FLOAT16_APPLE             0x881A
+#define GL_RGB_FLOAT16_APPLE              0x881B
+#define GL_ALPHA_FLOAT16_APPLE            0x881C
+#define GL_INTENSITY_FLOAT16_APPLE        0x881D
+#define GL_LUMINANCE_FLOAT16_APPLE        0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE  0x881F
+#define GL_COLOR_FLOAT_APPLE              0x8A0F
+#endif
+
+#ifndef GL_APPLE_vertex_program_evaluators
+#define GL_VERTEX_ATTRIB_MAP1_APPLE       0x8A00
+#define GL_VERTEX_ATTRIB_MAP2_APPLE       0x8A01
+#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE  0x8A02
+#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03
+#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04
+#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05
+#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE  0x8A06
+#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07
+#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08
+#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09
+#endif
+
+#ifndef GL_APPLE_aux_depth_stencil
+#define GL_AUX_DEPTH_STENCIL_APPLE        0x8A14
+#endif
+
+#ifndef GL_APPLE_object_purgeable
+#define GL_BUFFER_OBJECT_APPLE            0x85B3
+#define GL_RELEASED_APPLE                 0x8A19
+#define GL_VOLATILE_APPLE                 0x8A1A
+#define GL_RETAINED_APPLE                 0x8A1B
+#define GL_UNDEFINED_APPLE                0x8A1C
+#define GL_PURGEABLE_APPLE                0x8A1D
+#endif
+
+#ifndef GL_APPLE_row_bytes
+#define GL_PACK_ROW_BYTES_APPLE           0x8A15
+#define GL_UNPACK_ROW_BYTES_APPLE         0x8A16
+#endif
+
+#ifndef GL_APPLE_rgb_422
+#define GL_RGB_422_APPLE                  0x8A1F
+/* reuse GL_UNSIGNED_SHORT_8_8_APPLE */
+/* reuse GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+#endif
+
+#ifndef GL_NV_video_capture
+#define GL_VIDEO_BUFFER_NV                0x9020
+#define GL_VIDEO_BUFFER_BINDING_NV        0x9021
+#define GL_FIELD_UPPER_NV                 0x9022
+#define GL_FIELD_LOWER_NV                 0x9023
+#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV   0x9024
+#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025
+#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026
+#define GL_LAST_VIDEO_CAPTURE_STATUS_NV   0x9027
+#define GL_VIDEO_BUFFER_PITCH_NV          0x9028
+#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029
+#define GL_VIDEO_COLOR_CONVERSION_MAX_NV  0x902A
+#define GL_VIDEO_COLOR_CONVERSION_MIN_NV  0x902B
+#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C
+#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D
+#define GL_PARTIAL_SUCCESS_NV             0x902E
+#define GL_SUCCESS_NV                     0x902F
+#define GL_FAILURE_NV                     0x9030
+#define GL_YCBYCR8_422_NV                 0x9031
+#define GL_YCBAYCR8A_4224_NV              0x9032
+#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV  0x9033
+#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034
+#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV  0x9035
+#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036
+#define GL_Z4Y12Z4CB12Z4CR12_444_NV       0x9037
+#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV   0x9038
+#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV  0x9039
+#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A
+#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B
+#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C
+#endif
+
+#ifndef GL_NV_copy_image
+#endif
+
+#ifndef GL_EXT_separate_shader_objects
+#define GL_ACTIVE_PROGRAM_EXT             0x8B8D
+#endif
+
+#ifndef GL_NV_parameter_buffer_object2
+#endif
+
+#ifndef GL_NV_shader_buffer_load
+#define GL_BUFFER_GPU_ADDRESS_NV          0x8F1D
+#define GL_GPU_ADDRESS_NV                 0x8F34
+#define GL_MAX_SHADER_BUFFER_ADDRESS_NV   0x8F35
+#endif
+
+#ifndef GL_NV_vertex_buffer_unified_memory
+#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E
+#define GL_ELEMENT_ARRAY_UNIFIED_NV       0x8F1F
+#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20
+#define GL_VERTEX_ARRAY_ADDRESS_NV        0x8F21
+#define GL_NORMAL_ARRAY_ADDRESS_NV        0x8F22
+#define GL_COLOR_ARRAY_ADDRESS_NV         0x8F23
+#define GL_INDEX_ARRAY_ADDRESS_NV         0x8F24
+#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25
+#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV     0x8F26
+#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
+#define GL_FOG_COORD_ARRAY_ADDRESS_NV     0x8F28
+#define GL_ELEMENT_ARRAY_ADDRESS_NV       0x8F29
+#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV  0x8F2A
+#define GL_VERTEX_ARRAY_LENGTH_NV         0x8F2B
+#define GL_NORMAL_ARRAY_LENGTH_NV         0x8F2C
+#define GL_COLOR_ARRAY_LENGTH_NV          0x8F2D
+#define GL_INDEX_ARRAY_LENGTH_NV          0x8F2E
+#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV  0x8F2F
+#define GL_EDGE_FLAG_ARRAY_LENGTH_NV      0x8F30
+#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31
+#define GL_FOG_COORD_ARRAY_LENGTH_NV      0x8F32
+#define GL_ELEMENT_ARRAY_LENGTH_NV        0x8F33
+#endif
+
+#ifndef GL_NV_texture_barrier
+#endif
+
+#ifndef GL_AMD_shader_stencil_export
+#endif
+
+#ifndef GL_AMD_seamless_cubemap_per_texture
+/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS_ARB */
+#endif
+
+
+/*************************************************************/
+
+#include <stddef.h>
+#ifndef GL_VERSION_2_0
+/* GL type for program/shader text */
+typedef char GLchar;
+#endif
+
+#ifndef GL_VERSION_1_5
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptrARB;
+typedef ptrdiff_t GLsizeiptrARB;
+#endif
+
+#ifndef GL_ARB_shader_objects
+/* GL types for program/shader text and shader object handles */
+typedef char GLcharARB;
+typedef unsigned int GLhandleARB;
+#endif
+
+/* GL type for "half" precision (s10e5) float data in host memory */
+#ifndef GL_ARB_half_float_pixel
+typedef unsigned short GLhalfARB;
+#endif
+
+#ifndef GL_NV_half_float
+typedef unsigned short GLhalfNV;
+#endif
+
+#ifndef GLEXT_64_TYPES_DEFINED
+/* This code block is duplicated in glxext.h, so must be protected */
+#define GLEXT_64_TYPES_DEFINED
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GL_EXT_timer_query extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__) || defined(__digital__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__) || defined(_LP64)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS ) || defined(__sgi)
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+/* Fallback if nothing above works */
+#include <inttypes.h>
+#endif
+#endif
+
+#ifndef GL_EXT_timer_query
+typedef int64_t GLint64EXT;
+typedef uint64_t GLuint64EXT;
+#endif
+
+#ifndef ARB_sync
+typedef int64_t GLint64;
+typedef uint64_t GLuint64;
+typedef struct __GLsync *GLsync;
+#endif
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+GLAPI void APIENTRY glBlendEquation (GLenum mode);
+GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_VERSION_1_2_DEPRECATED
+#define GL_VERSION_1_2_DEPRECATED 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+GLAPI void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glGetColorTable (GLenum target, GLenum format, GLenum type, GLvoid *table);
+GLAPI void APIENTRY glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+GLAPI void APIENTRY glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+GLAPI void APIENTRY glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+GLAPI void APIENTRY glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params);
+GLAPI void APIENTRY glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glConvolutionParameteri (GLenum target, GLenum pname, GLint params);
+GLAPI void APIENTRY glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, GLvoid *image);
+GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSeparableFilter (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+GLAPI void APIENTRY glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+GLAPI void APIENTRY glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+GLAPI void APIENTRY glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glResetHistogram (GLenum target);
+GLAPI void APIENTRY glResetMinmax (GLenum target);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTexture (GLenum texture);
+GLAPI void APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, GLvoid *img);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+
+#ifndef GL_VERSION_1_3_DEPRECATED
+#define GL_VERSION_1_3_DEPRECATED 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClientActiveTexture (GLenum texture);
+GLAPI void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s);
+GLAPI void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord1f (GLenum target, GLfloat s);
+GLAPI void APIENTRY glMultiTexCoord1fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord1i (GLenum target, GLint s);
+GLAPI void APIENTRY glMultiTexCoord1iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord1s (GLenum target, GLshort s);
+GLAPI void APIENTRY glMultiTexCoord1sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t);
+GLAPI void APIENTRY glMultiTexCoord2dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t);
+GLAPI void APIENTRY glMultiTexCoord2fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord2i (GLenum target, GLint s, GLint t);
+GLAPI void APIENTRY glMultiTexCoord2iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord2s (GLenum target, GLshort s, GLshort t);
+GLAPI void APIENTRY glMultiTexCoord2sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void APIENTRY glMultiTexCoord3dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void APIENTRY glMultiTexCoord3fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r);
+GLAPI void APIENTRY glMultiTexCoord3iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void APIENTRY glMultiTexCoord3sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void APIENTRY glMultiTexCoord4dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void APIENTRY glMultiTexCoord4fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void APIENTRY glMultiTexCoord4iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void APIENTRY glMultiTexCoord4sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *m);
+GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *m);
+GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *m);
+GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_VERSION_1_4_DEPRECATED
+#define GL_VERSION_1_4_DEPRECATED 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogCoordf (GLfloat coord);
+GLAPI void APIENTRY glFogCoordfv (const GLfloat *coord);
+GLAPI void APIENTRY glFogCoordd (GLdouble coord);
+GLAPI void APIENTRY glFogCoorddv (const GLdouble *coord);
+GLAPI void APIENTRY glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *v);
+GLAPI void APIENTRY glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *v);
+GLAPI void APIENTRY glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *v);
+GLAPI void APIENTRY glSecondaryColor3i (GLint red, GLint green, GLint blue);
+GLAPI void APIENTRY glSecondaryColor3iv (const GLint *v);
+GLAPI void APIENTRY glSecondaryColor3s (GLshort red, GLshort green, GLshort blue);
+GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *v);
+GLAPI void APIENTRY glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *v);
+GLAPI void APIENTRY glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue);
+GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *v);
+GLAPI void APIENTRY glSecondaryColor3us (GLushort red, GLushort green, GLushort blue);
+GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *v);
+GLAPI void APIENTRY glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glWindowPos2d (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dv (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2f (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fv (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2i (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2iv (const GLint *v);
+GLAPI void APIENTRY glWindowPos2s (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2sv (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3d (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dv (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3f (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fv (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3iv (const GLint *v);
+GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3sv (const GLshort *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQuery (GLuint id);
+GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQuery (GLenum target);
+GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer);
+GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
+GLAPI GLvoid* APIENTRY glMapBuffer (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target);
+GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, GLvoid* *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparate (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
+GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
+GLAPI void APIENTRY glCompileShader (GLuint shader);
+GLAPI GLuint APIENTRY glCreateProgram (void);
+GLAPI GLuint APIENTRY glCreateShader (GLenum type);
+GLAPI void APIENTRY glDeleteProgram (GLuint program);
+GLAPI void APIENTRY glDeleteShader (GLuint shader);
+GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
+GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid* *pointer);
+GLAPI GLboolean APIENTRY glIsProgram (GLuint program);
+GLAPI GLboolean APIENTRY glIsShader (GLuint shader);
+GLAPI void APIENTRY glLinkProgram (GLuint program);
+GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+GLAPI void APIENTRY glUseProgram (GLuint program);
+GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1i (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glValidateProgram (GLuint program);
+GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_VERSION_3_0 1
+/* OpenGL 3.0 also reuses entry points from these extensions: */
+/* ARB_framebuffer_object */
+/* ARB_map_buffer_range */
+/* ARB_vertex_array_object */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glEnablei (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisablei (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index);
+GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedback (void);
+GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp);
+GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRender (void);
+GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value);
+GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value);
+GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+GLAPI const GLubyte * APIENTRY glGetStringi (GLenum name, GLuint index);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
+#endif
+
+#ifndef GL_VERSION_3_1
+#define GL_VERSION_3_1 1
+/* OpenGL 3.1 also reuses entry points from these extensions: */
+/* ARB_copy_buffer */
+/* ARB_uniform_buffer_object */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
+#endif
+
+#ifndef GL_VERSION_3_2
+#define GL_VERSION_3_2 1
+/* OpenGL 3.2 also reuses entry points from these extensions: */
+/* ARB_draw_elements_base_vertex */
+/* ARB_provoking_vertex */
+/* ARB_sync */
+/* ARB_texture_multisample */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data);
+GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value);
+GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+#endif
+
+#ifndef GL_VERSION_3_3
+#define GL_VERSION_3_3 1
+/* OpenGL 3.3 also reuses entry points from these extensions: */
+/* ARB_blend_func_extended */
+/* ARB_sampler_objects */
+/* ARB_explicit_attrib_location, but it has none */
+/* ARB_occlusion_query2 (no entry points) */
+/* ARB_shader_bit_encoding (no entry points) */
+/* ARB_texture_rgb10_a2ui (no entry points) */
+/* ARB_texture_swizzle (no entry points) */
+/* ARB_timer_query */
+/* ARB_vertex_type_2_10_10_10_rev */
+#endif
+
+#ifndef GL_VERSION_4_0
+#define GL_VERSION_4_0 1
+/* OpenGL 4.0 also reuses entry points from these extensions: */
+/* ARB_gpu_shader5 (no entry points) */
+/* ARB_gpu_shader_fp64 */
+/* ARB_shader_subroutine */
+/* ARB_tessellation_shader */
+/* ARB_texture_buffer_object_rgb32 (no entry points) */
+/* ARB_transform_feedback2 */
+/* ARB_transform_feedback3 */
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTextureARB (GLenum texture);
+GLAPI void APIENTRY glClientActiveTextureARB (GLenum texture);
+GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum target, GLdouble s);
+GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum target, GLfloat s);
+GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum target, GLint s);
+GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum target, GLshort s);
+GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum target, GLdouble s, GLdouble t);
+GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum target, GLfloat s, GLfloat t);
+GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum target, GLint s, GLint t);
+GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum target, GLshort s, GLshort t);
+GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum target, GLint s, GLint t, GLint r);
+GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum target, const GLshort *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *m);
+GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *m);
+GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *m);
+GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *m);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleCoverageARB (GLclampf value, GLboolean invert);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, GLvoid *img);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfARB (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWeightbvARB (GLint size, const GLbyte *weights);
+GLAPI void APIENTRY glWeightsvARB (GLint size, const GLshort *weights);
+GLAPI void APIENTRY glWeightivARB (GLint size, const GLint *weights);
+GLAPI void APIENTRY glWeightfvARB (GLint size, const GLfloat *weights);
+GLAPI void APIENTRY glWeightdvARB (GLint size, const GLdouble *weights);
+GLAPI void APIENTRY glWeightubvARB (GLint size, const GLubyte *weights);
+GLAPI void APIENTRY glWeightusvARB (GLint size, const GLushort *weights);
+GLAPI void APIENTRY glWeightuivARB (GLint size, const GLuint *weights);
+GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glVertexBlendARB (GLint count);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint index);
+GLAPI void APIENTRY glMatrixIndexubvARB (GLint size, const GLubyte *indices);
+GLAPI void APIENTRY glMatrixIndexusvARB (GLint size, const GLushort *indices);
+GLAPI void APIENTRY glMatrixIndexuivARB (GLint size, const GLuint *indices);
+GLAPI void APIENTRY glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+#endif
+
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+#endif
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+#endif
+
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dARB (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2fARB (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2iARB (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2ivARB (const GLint *v);
+GLAPI void APIENTRY glWindowPos2sARB (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2svARB (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3dARB (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3fARB (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3iARB (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3ivARB (const GLint *v);
+GLAPI void APIENTRY glWindowPos3sARB (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3svARB (const GLshort *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttrib1dARB (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1fARB (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1sARB (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2dARB (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2fARB (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2sARB (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3sARB (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4sARB (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointerARB (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint index);
+GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint index);
+GLAPI void APIENTRY glProgramStringARB (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+GLAPI void APIENTRY glBindProgramARB (GLenum target, GLuint program);
+GLAPI void APIENTRY glDeleteProgramsARB (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glGenProgramsARB (GLsizei n, GLuint *programs);
+GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetProgramivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramStringARB (GLenum target, GLenum pname, GLvoid *string);
+GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribivARB (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint index, GLenum pname, GLvoid* *pointer);
+GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
+#endif
+
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program 1
+/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindBufferARB (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffersARB (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffersARB (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBufferARB (GLuint buffer);
+GLAPI void APIENTRY glBufferDataARB (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
+GLAPI void APIENTRY glGetBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
+GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum target);
+GLAPI void APIENTRY glGetBufferParameterivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointervARB (GLenum target, GLenum pname, GLvoid* *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_ARB_occlusion_query
+#define GL_ARB_occlusion_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueriesARB (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueriesARB (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQueryARB (GLuint id);
+GLAPI void APIENTRY glBeginQueryARB (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQueryARB (GLenum target);
+GLAPI void APIENTRY glGetQueryivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectivARB (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB obj);
+GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum pname);
+GLAPI void APIENTRY glDetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj);
+GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum shaderType);
+GLAPI void APIENTRY glShaderSourceARB (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
+GLAPI void APIENTRY glCompileShaderARB (GLhandleARB shaderObj);
+GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
+GLAPI void APIENTRY glAttachObjectARB (GLhandleARB containerObj, GLhandleARB obj);
+GLAPI void APIENTRY glLinkProgramARB (GLhandleARB programObj);
+GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB programObj);
+GLAPI void APIENTRY glValidateProgramARB (GLhandleARB programObj);
+GLAPI void APIENTRY glUniform1fARB (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2fARB (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1iARB (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2iARB (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3iARB (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4iARB (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB obj, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB obj, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB programObj, const GLcharARB *name);
+GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB programObj, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformivARB (GLhandleARB programObj, GLint location, GLint *params);
+GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
+typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB programObj, const GLcharARB *name);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+#endif
+
+#ifndef GL_ARB_shading_language_100
+#define GL_ARB_shading_language_100 1
+#endif
+
+#ifndef GL_ARB_texture_non_power_of_two
+#define GL_ARB_texture_non_power_of_two 1
+#endif
+
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+#endif
+
+#ifndef GL_ARB_fragment_program_shadow
+#define GL_ARB_fragment_program_shadow 1
+#endif
+
+#ifndef GL_ARB_draw_buffers
+#define GL_ARB_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersARB (GLsizei n, const GLenum *bufs);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
+#endif
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_ARB_texture_rectangle 1
+#endif
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_ARB_color_buffer_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClampColorARB (GLenum target, GLenum clamp);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
+#endif
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_ARB_half_float_pixel 1
+#endif
+
+#ifndef GL_ARB_texture_float
+#define GL_ARB_texture_float 1
+#endif
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_ARB_pixel_buffer_object 1
+#endif
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_ARB_depth_buffer_float 1
+#endif
+
+#ifndef GL_ARB_draw_instanced
+#define GL_ARB_draw_instanced 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_ARB_framebuffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmap (GLenum target);
+GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_ARB_framebuffer_sRGB 1
+#endif
+
+#ifndef GL_ARB_geometry_shader4
+#define GL_ARB_geometry_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value);
+GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_ARB_half_float_vertex 1
+#endif
+
+#ifndef GL_ARB_instanced_arrays
+#define GL_ARB_instanced_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor);
+#endif
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_ARB_map_buffer_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLvoid* APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+#endif
+
+#ifndef GL_ARB_texture_buffer_object
+#define GL_ARB_texture_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_ARB_texture_compression_rgtc 1
+#endif
+
+#ifndef GL_ARB_texture_rg
+#define GL_ARB_texture_rg 1
+#endif
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_ARB_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArray (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
+#endif
+
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_ARB_uniform_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
+GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName);
+GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#endif
+
+#ifndef GL_ARB_compatibility
+#define GL_ARB_compatibility 1
+#endif
+
+#ifndef GL_ARB_copy_buffer
+#define GL_ARB_copy_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+#endif
+
+#ifndef GL_ARB_shader_texture_lod
+#define GL_ARB_shader_texture_lod 1
+#endif
+
+#ifndef GL_ARB_depth_clamp
+#define GL_ARB_depth_clamp 1
+#endif
+
+#ifndef GL_ARB_draw_elements_base_vertex
+#define GL_ARB_draw_elements_base_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
+GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
+#endif
+
+#ifndef GL_ARB_fragment_coord_conventions
+#define GL_ARB_fragment_coord_conventions 1
+#endif
+
+#ifndef GL_ARB_provoking_vertex
+#define GL_ARB_provoking_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProvokingVertex (GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode);
+#endif
+
+#ifndef GL_ARB_seamless_cube_map
+#define GL_ARB_seamless_cube_map 1
+#endif
+
+#ifndef GL_ARB_sync
+#define GL_ARB_sync 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags);
+GLAPI GLboolean APIENTRY glIsSync (GLsync sync);
+GLAPI void APIENTRY glDeleteSync (GLsync sync);
+GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
+typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync);
+typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync);
+typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+#endif
+
+#ifndef GL_ARB_texture_multisample
+#define GL_ARB_texture_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaski (GLuint index, GLbitfield mask);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask);
+#endif
+
+#ifndef GL_ARB_vertex_array_bgra
+#define GL_ARB_vertex_array_bgra 1
+#endif
+
+#ifndef GL_ARB_draw_buffers_blend
+#define GL_ARB_draw_buffers_blend 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#endif
+
+#ifndef GL_ARB_sample_shading
+#define GL_ARB_sample_shading 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMinSampleShading (GLclampf value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLclampf value);
+#endif
+
+#ifndef GL_ARB_texture_cube_map_array
+#define GL_ARB_texture_cube_map_array 1
+#endif
+
+#ifndef GL_ARB_texture_gather
+#define GL_ARB_texture_gather 1
+#endif
+
+#ifndef GL_ARB_texture_query_lod
+#define GL_ARB_texture_query_lod 1
+#endif
+
+#ifndef GL_ARB_shading_language_include
+#define GL_ARB_shading_language_include 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glNamedStringARB (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
+GLAPI void APIENTRY glDeleteNamedStringARB (GLint namelen, const GLchar *name);
+GLAPI void APIENTRY glCompileShaderIncludeARB (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length);
+GLAPI GLboolean APIENTRY glIsNamedStringARB (GLint namelen, const GLchar *name);
+GLAPI void APIENTRY glGetNamedStringARB (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+GLAPI void APIENTRY glGetNamedStringivARB (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
+typedef void (APIENTRYP PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length);
+typedef GLboolean (APIENTRYP PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+typedef void (APIENTRYP PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_ARB_blend_func_extended
+#define GL_ARB_blend_func_extended 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name);
+#endif
+
+#ifndef GL_ARB_sampler_objects
+#define GL_ARB_sampler_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers);
+GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers);
+GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler);
+GLAPI void APIENTRY glBindSampler (GLenum unit, GLuint sampler);
+GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param);
+GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param);
+GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetSamplerParameterIfv (GLuint sampler, GLenum pname, GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
+typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers);
+typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler);
+typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLenum unit, GLuint sampler);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_ARB_timer_query
+#define GL_ARB_timer_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target);
+GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params);
+#endif
+
+#ifndef GL_ARB_vertex_type_2_10_10_10_rev
+#define GL_ARB_vertex_type_2_10_10_10_rev 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+#endif
+
+#ifndef GL_ARB_draw_indirect
+#define GL_ARB_draw_indirect 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const GLvoid *indirect);
+GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const GLvoid *indirect);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const GLvoid *indirect);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const GLvoid *indirect);
+#endif
+
+#ifndef GL_ARB_gpu_shader_fp64
+#define GL_ARB_gpu_shader_fp64 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x);
+GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params);
+GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x);
+GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+#endif
+
+#ifndef GL_ARB_shader_subroutine
+#define GL_ARB_shader_subroutine 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices);
+GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params);
+GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices);
+typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+#endif
+
+#ifndef GL_ARB_tessellation_shader
+#define GL_ARB_tessellation_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value);
+GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values);
+#endif
+
+#ifndef GL_ARB_transform_feedback2
+#define GL_ARB_transform_feedback2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedback (void);
+GLAPI void APIENTRY glResumeTransformFeedback (void);
+GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
+#endif
+
+#ifndef GL_ARB_transform_feedback3
+#define GL_ARB_transform_feedback3 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream);
+GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id);
+GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index);
+GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
+typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+#endif
+
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColorEXT (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+#endif
+
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat factor, GLfloat bias);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+#endif
+
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+#endif
+
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage3DEXT (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum target, GLenum filter, GLfloat *weights);
+GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
+typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif
+
+#ifndef GL_EXT_subtexture
+#define GL_EXT_subtexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_EXT_copy_texture
+#define GL_EXT_copy_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_EXT_histogram
+#define GL_EXT_histogram 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetHistogramEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMinmaxEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glHistogramEXT (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glMinmaxEXT (GLenum target, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glResetHistogramEXT (GLenum target);
+GLAPI void APIENTRY glResetMinmaxEXT (GLenum target);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
+#endif
+
+#ifndef GL_EXT_convolution
+#define GL_EXT_convolution 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum target, GLenum pname, GLfloat params);
+GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum target, GLenum pname, GLint params);
+GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *image);
+GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+#endif
+
+#ifndef GL_SGI_color_matrix
+#define GL_SGI_color_matrix 1
+#endif
+
+#ifndef GL_SGI_color_table
+#define GL_SGI_color_table 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableSGI (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glColorTableParameterivSGI (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyColorTableSGI (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glGetColorTableSGI (GLenum target, GLenum format, GLenum type, GLvoid *table);
+GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum target, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_SGIX_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenSGIX (GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+#endif
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_SGIS_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum pname, GLint param);
+GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum pname, GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_SGIS_texture4D
+#define GL_SGIS_texture4D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage4DSGIS (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+#endif
+
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+#endif
+
+#ifndef GL_EXT_texture_object
+#define GL_EXT_texture_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei n, const GLuint *textures, GLboolean *residences);
+GLAPI void APIENTRY glBindTextureEXT (GLenum target, GLuint texture);
+GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei n, const GLuint *textures);
+GLAPI void APIENTRY glGenTexturesEXT (GLsizei n, GLuint *textures);
+GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint texture);
+GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif
+
+#ifndef GL_SGIS_detail_texture
+#define GL_SGIS_detail_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum target, GLfloat *points);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_SGIS_sharpen_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum target, GLfloat *points);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
+
+#ifndef GL_EXT_packed_pixels
+#define GL_EXT_packed_pixels 1
+#endif
+
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+#endif
+
+#ifndef GL_SGIS_multisample
+#define GL_SGIS_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskSGIS (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glSamplePatternSGIS (GLenum pattern);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+#endif
+
+#ifndef GL_EXT_rescale_normal
+#define GL_EXT_rescale_normal 1
+#endif
+
+#ifndef GL_EXT_vertex_array
+#define GL_EXT_vertex_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glArrayElementEXT (GLint i);
+GLAPI void APIENTRY glColorPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+GLAPI void APIENTRY glDrawArraysEXT (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei stride, GLsizei count, const GLboolean *pointer);
+GLAPI void APIENTRY glGetPointervEXT (GLenum pname, GLvoid* *params);
+GLAPI void APIENTRY glIndexPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+GLAPI void APIENTRY glNormalPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+GLAPI void APIENTRY glTexCoordPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+GLAPI void APIENTRY glVertexPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
+typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
+typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
+typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+#endif
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+#endif
+
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+#endif
+
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+#endif
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_SGIS_texture_edge_clamp 1
+#endif
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+#endif
+
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationEXT (GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_blend_subtract
+#define GL_EXT_blend_subtract 1
+#endif
+
+#ifndef GL_EXT_blend_logic_op
+#define GL_EXT_blend_logic_op 1
+#endif
+
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+#endif
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_SGIX_pixel_tiles 1
+#endif
+
+#ifndef GL_SGIX_texture_select
+#define GL_SGIX_texture_select 1
+#endif
+
+#ifndef GL_SGIX_sprite
+#define GL_SGIX_sprite 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum pname, GLint param);
+GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum pname, const GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+#endif
+
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfEXT (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvEXT (GLenum pname, const GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_SGIS_point_parameters
+#define GL_SGIS_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfSGIS (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvSGIS (GLenum pname, const GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_SGIX_instruments
+#define GL_SGIX_instruments 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
+GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei size, GLint *buffer);
+GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *marker_p);
+GLAPI void APIENTRY glReadInstrumentsSGIX (GLint marker);
+GLAPI void APIENTRY glStartInstrumentsSGIX (void);
+GLAPI void APIENTRY glStopInstrumentsSGIX (GLint marker);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
+typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
+typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
+typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
+#endif
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+#endif
+
+#ifndef GL_SGIX_framezoom
+#define GL_SGIX_framezoom 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameZoomSGIX (GLint factor);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+#endif
+
+#ifndef GL_SGIX_tag_sample_buffer
+#define GL_SGIX_tag_sample_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTagSampleBufferSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+#endif
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_SGIX_polynomial_ffd 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+GLAPI void APIENTRY glDeformSGIX (GLbitfield mask);
+GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield mask);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
+#endif
+
+#ifndef GL_SGIX_reference_plane
+#define GL_SGIX_reference_plane 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
+#endif
+
+#ifndef GL_SGIX_flush_raster
+#define GL_SGIX_flush_raster 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushRasterSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
+#endif
+
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+#endif
+
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogFuncSGIS (GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *points);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
+#endif
+
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+#endif
+
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImageTransformParameteriHP (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glImageTransformParameterfHP (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glImageTransformParameterivHP (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum target, GLenum pname, GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+#endif
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+#endif
+
+#ifndef GL_EXT_color_subtable
+#define GL_EXT_color_subtable 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorSubTableEXT (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#endif
+
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+#endif
+
+#ifndef GL_PGI_misc_hints
+#define GL_PGI_misc_hints 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glHintPGI (GLenum target, GLint mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
+#endif
+
+#ifndef GL_EXT_paletted_texture
+#define GL_EXT_paletted_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableEXT (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+GLAPI void APIENTRY glGetColorTableEXT (GLenum target, GLenum format, GLenum type, GLvoid *data);
+GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_EXT_clip_volume_hint 1
+#endif
+
+#ifndef GL_SGIX_list_priority
+#define GL_SGIX_list_priority 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint list, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetListParameterivSGIX (GLuint list, GLenum pname, GLint *params);
+GLAPI void APIENTRY glListParameterfSGIX (GLuint list, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glListParameterfvSGIX (GLuint list, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glListParameteriSGIX (GLuint list, GLenum pname, GLint param);
+GLAPI void APIENTRY glListParameterivSGIX (GLuint list, GLenum pname, const GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+#endif
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_SGIX_calligraphic_fragment 1
+#endif
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+#endif
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+#endif
+
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+#endif
+
+#ifndef GL_EXT_index_material
+#define GL_EXT_index_material 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexMaterialEXT (GLenum face, GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+
+#ifndef GL_EXT_index_func
+#define GL_EXT_index_func 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexFuncEXT (GLenum func, GLclampf ref);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
+#endif
+
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+#endif
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLockArraysEXT (GLint first, GLsizei count);
+GLAPI void APIENTRY glUnlockArraysEXT (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
+#endif
+
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCullParameterdvEXT (GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+#endif
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_SGIX_fragment_lighting 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum face, GLenum mode);
+GLAPI void APIENTRY glFragmentLightfSGIX (GLenum light, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum light, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentLightiSGIX (GLenum light, GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentLightivSGIX (GLenum light, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum face, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum face, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum face, GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum face, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum light, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum light, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum face, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum face, GLenum pname, GLint *params);
+GLAPI void APIENTRY glLightEnviSGIX (GLenum pname, GLint param);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
+#endif
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+#endif
+
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+#endif
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+#endif
+
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+#endif
+
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+#endif
+
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glApplyTextureEXT (GLenum mode);
+GLAPI void APIENTRY glTextureLightEXT (GLenum pname);
+GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+#endif
+
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+#endif
+
+#ifndef GL_SGIX_async
+#define GL_SGIX_async 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint marker);
+GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *markerp);
+GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *markerp);
+GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei range);
+GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint marker, GLsizei range);
+GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint marker);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
+typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
+typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
+typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
+#endif
+
+#ifndef GL_SGIX_async_pixel
+#define GL_SGIX_async_pixel 1
+#endif
+
+#ifndef GL_SGIX_async_histogram
+#define GL_SGIX_async_histogram 1
+#endif
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer);
+GLAPI void APIENTRY glNormalPointervINTEL (GLenum type, const GLvoid* *pointer);
+GLAPI void APIENTRY glColorPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer);
+GLAPI void APIENTRY glTexCoordPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+#endif
+
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+#endif
+
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+#endif
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_EXT_shared_texture_palette 1
+#endif
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+#endif
+
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glSecondaryColor3iEXT (GLint red, GLint green, GLint blue);
+GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *v);
+GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort red, GLshort green, GLshort blue);
+GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *v);
+GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *v);
+GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint red, GLuint green, GLuint blue);
+GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *v);
+GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue);
+GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *v);
+GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureNormalEXT (GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+#endif
+
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogCoordfEXT (GLfloat coord);
+GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *coord);
+GLAPI void APIENTRY glFogCoorddEXT (GLdouble coord);
+GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *coord);
+GLAPI void APIENTRY glFogCoordPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+#endif
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTangent3bEXT (GLbyte tx, GLbyte ty, GLbyte tz);
+GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glTangent3dEXT (GLdouble tx, GLdouble ty, GLdouble tz);
+GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glTangent3fEXT (GLfloat tx, GLfloat ty, GLfloat tz);
+GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glTangent3iEXT (GLint tx, GLint ty, GLint tz);
+GLAPI void APIENTRY glTangent3ivEXT (const GLint *v);
+GLAPI void APIENTRY glTangent3sEXT (GLshort tx, GLshort ty, GLshort tz);
+GLAPI void APIENTRY glTangent3svEXT (const GLshort *v);
+GLAPI void APIENTRY glBinormal3bEXT (GLbyte bx, GLbyte by, GLbyte bz);
+GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glBinormal3dEXT (GLdouble bx, GLdouble by, GLdouble bz);
+GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glBinormal3fEXT (GLfloat bx, GLfloat by, GLfloat bz);
+GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glBinormal3iEXT (GLint bx, GLint by, GLint bz);
+GLAPI void APIENTRY glBinormal3ivEXT (const GLint *v);
+GLAPI void APIENTRY glBinormal3sEXT (GLshort bx, GLshort by, GLshort bz);
+GLAPI void APIENTRY glBinormal3svEXT (const GLshort *v);
+GLAPI void APIENTRY glTangentPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glBinormalPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
+typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
+typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
+typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
+typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
+typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
+typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
+typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
+typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
+typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
+typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+#endif
+
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+#endif
+
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+#endif
+
+#ifndef GL_SGIX_fog_scale
+#define GL_SGIX_fog_scale 1
+#endif
+
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFinishTextureSUNX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
+#endif
+
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte factor);
+GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort factor);
+GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint factor);
+GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat factor);
+GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble factor);
+GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte factor);
+GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort factor);
+GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint factor);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+#endif
+
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint code);
+GLAPI void APIENTRY glReplacementCodeusSUN (GLushort code);
+GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte code);
+GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *code);
+GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *code);
+GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *code);
+GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum type, GLsizei stride, const GLvoid* *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
+#endif
+
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *rc, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+
+#ifndef GL_INGR_blend_func_separate
+#define GL_INGR_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+#endif
+
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+#endif
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+#endif
+
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+#endif
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+#endif
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+#endif
+
+#ifndef GL_EXT_texture_env_add
+#define GL_EXT_texture_env_add 1
+#endif
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+#endif
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#endif
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexWeightfEXT (GLfloat weight);
+GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *weight);
+GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+#endif
+
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
+GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei length, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
+#endif
+
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerParameterfvNV (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glCombinerParameterfNV (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glCombinerParameterivNV (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCombinerParameteriNV (GLenum pname, GLint param);
+GLAPI void APIENTRY glCombinerInputNV (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+GLAPI void APIENTRY glCombinerOutputNV (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+GLAPI void APIENTRY glFinalCombinerInputNV (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum variable, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum variable, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+#endif
+
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+#endif
+
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+#endif
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+#endif
+
+#ifndef GL_MESA_resize_buffers
+#define GL_MESA_resize_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glResizeBuffersMESA (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
+#endif
+
+#ifndef GL_MESA_window_pos
+#define GL_MESA_window_pos 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dMESA (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2fMESA (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2iMESA (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos2sMESA (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3dMESA (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3fMESA (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3iMESA (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos3sMESA (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *v);
+GLAPI void APIENTRY glWindowPos4dMESA (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos4fMESA (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos4iMESA (GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos4sMESA (GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+#endif
+
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
+#endif
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint stride, const GLboolean* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glIndexPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glNormalPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glTexCoordPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glVertexPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+#endif
+
+#ifndef GL_SGIX_subsample
+#define GL_SGIX_subsample 1
+#endif
+
+#ifndef GL_SGIX_ycrcba
+#define GL_SGIX_ycrcba 1
+#endif
+
+#ifndef GL_SGIX_ycrcb_subsample
+#define GL_SGIX_ycrcb_subsample 1
+#endif
+
+#ifndef GL_SGIX_depth_pass_instrument
+#define GL_SGIX_depth_pass_instrument 1
+#endif
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+#endif
+
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+#endif
+
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTbufferMask3DFX (GLuint mask);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+#endif
+
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskEXT (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glSamplePatternEXT (GLenum pattern);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+#endif
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_SGIX_vertex_preclip 1
+#endif
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_SGIX_convolution_accuracy 1
+#endif
+
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+#endif
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_SGIS_point_line_texgen 1
+#endif
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_SGIS_texture_color_mask 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif
+
+#ifndef GL_SGIX_igloo_interface
+#define GL_SGIX_igloo_interface 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum pname, const GLvoid *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
+#endif
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
+#endif
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+#endif
+
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);
+GLAPI void APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);
+GLAPI GLboolean APIENTRY glIsFenceNV (GLuint fence);
+GLAPI GLboolean APIENTRY glTestFenceNV (GLuint fence);
+GLAPI void APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);
+GLAPI void APIENTRY glFinishFenceNV (GLuint fence);
+GLAPI void APIENTRY glSetFenceNV (GLuint fence, GLenum condition);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
+typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+#endif
+
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
+GLAPI void APIENTRY glMapParameterivNV (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMapParameterfvNV (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
+GLAPI void APIENTRY glGetMapParameterivNV (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMapParameterfvNV (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum target, GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glEvalMapsNV (GLenum target, GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
+typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
+#endif
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+#endif
+
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum stage, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname, GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_NV_texture_compression_vtc
+#define GL_NV_texture_compression_vtc 1
+#endif
+
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+#endif
+
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+#endif
+
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2 1
+#endif
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+#endif
+
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei n, const GLuint *programs, GLboolean *residences);
+GLAPI void APIENTRY glBindProgramNV (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteProgramsNV (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glExecuteProgramNV (GLenum target, GLuint id, const GLfloat *params);
+GLAPI void APIENTRY glGenProgramsNV (GLsizei n, GLuint *programs);
+GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetProgramivNV (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramStringNV (GLuint id, GLenum pname, GLubyte *program);
+GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum target, GLuint address, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribivNV (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint index, GLenum pname, GLvoid* *pointer);
+GLAPI GLboolean APIENTRY glIsProgramNV (GLuint id);
+GLAPI void APIENTRY glLoadProgramNV (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+GLAPI void APIENTRY glProgramParameter4dNV (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramParameter4dvNV (GLenum target, GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glProgramParameter4fNV (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramParameter4fvNV (GLenum target, GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glProgramParameters4dvNV (GLenum target, GLuint index, GLuint count, const GLdouble *v);
+GLAPI void APIENTRY glProgramParameters4fvNV (GLenum target, GLuint index, GLuint count, const GLfloat *v);
+GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glTrackMatrixNV (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+GLAPI void APIENTRY glVertexAttribPointerNV (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glVertexAttrib1dNV (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1fNV (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1sNV (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2dNV (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2fNV (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2sNV (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3sNV (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4sNV (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs1svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs2svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs3svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs4svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint index, GLsizei count, const GLubyte *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
+typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
+#endif
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_SGIX_texture_coordinate_clamp 1
+#endif
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SGIX_scalebias_hint 1
+#endif
+
+#ifndef GL_OML_interlace
+#define GL_OML_interlace 1
+#endif
+
+#ifndef GL_OML_subsample
+#define GL_OML_subsample 1
+#endif
+
+#ifndef GL_OML_resample
+#define GL_OML_resample 1
+#endif
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+#endif
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBumpParameterivATI (GLenum pname, const GLint *param);
+GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum pname, GLfloat *param);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+#endif
+
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint range);
+GLAPI void APIENTRY glBindFragmentShaderATI (GLuint id);
+GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint id);
+GLAPI void APIENTRY glBeginFragmentShaderATI (void);
+GLAPI void APIENTRY glEndFragmentShaderATI (void);
+GLAPI void APIENTRY glPassTexCoordATI (GLuint dst, GLuint coord, GLenum swizzle);
+GLAPI void APIENTRY glSampleMapATI (GLuint dst, GLuint interp, GLenum swizzle);
+GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint dst, const GLfloat *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
+#endif
+
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPNTrianglesiATI (GLenum pname, GLint param);
+GLAPI void APIENTRY glPNTrianglesfATI (GLenum pname, GLfloat param);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
+#endif
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei size, const GLvoid *pointer, GLenum usage);
+GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
+GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint buffer, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetObjectBufferivATI (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glFreeObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glArrayObjectATI (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum array, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetArrayObjectivATI (GLenum array, GLenum pname, GLint *params);
+GLAPI void APIENTRY glVariantArrayObjectATI (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint id, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint id, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
+typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVertexShaderEXT (void);
+GLAPI void APIENTRY glEndVertexShaderEXT (void);
+GLAPI void APIENTRY glBindVertexShaderEXT (GLuint id);
+GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint range);
+GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint id);
+GLAPI void APIENTRY glShaderOp1EXT (GLenum op, GLuint res, GLuint arg1);
+GLAPI void APIENTRY glShaderOp2EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+GLAPI void APIENTRY glShaderOp3EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+GLAPI void APIENTRY glSwizzleEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+GLAPI void APIENTRY glWriteMaskEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+GLAPI void APIENTRY glInsertComponentEXT (GLuint res, GLuint src, GLuint num);
+GLAPI void APIENTRY glExtractComponentEXT (GLuint res, GLuint src, GLuint num);
+GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+GLAPI void APIENTRY glSetInvariantEXT (GLuint id, GLenum type, const GLvoid *addr);
+GLAPI void APIENTRY glSetLocalConstantEXT (GLuint id, GLenum type, const GLvoid *addr);
+GLAPI void APIENTRY glVariantbvEXT (GLuint id, const GLbyte *addr);
+GLAPI void APIENTRY glVariantsvEXT (GLuint id, const GLshort *addr);
+GLAPI void APIENTRY glVariantivEXT (GLuint id, const GLint *addr);
+GLAPI void APIENTRY glVariantfvEXT (GLuint id, const GLfloat *addr);
+GLAPI void APIENTRY glVariantdvEXT (GLuint id, const GLdouble *addr);
+GLAPI void APIENTRY glVariantubvEXT (GLuint id, const GLubyte *addr);
+GLAPI void APIENTRY glVariantusvEXT (GLuint id, const GLushort *addr);
+GLAPI void APIENTRY glVariantuivEXT (GLuint id, const GLuint *addr);
+GLAPI void APIENTRY glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
+GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint id);
+GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint id);
+GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum light, GLenum value);
+GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum face, GLenum value);
+GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum unit, GLenum coord, GLenum value);
+GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum unit, GLenum value);
+GLAPI GLuint APIENTRY glBindParameterEXT (GLenum value);
+GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint id, GLenum cap);
+GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+GLAPI void APIENTRY glGetVariantPointervEXT (GLuint id, GLenum value, GLvoid* *data);
+GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
+typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
+typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
+typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
+typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
+typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
+typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
+typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
+typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+#endif
+
+#ifndef GL_ATI_vertex_streams
+#define GL_ATI_vertex_streams 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexStream1sATI (GLenum stream, GLshort x);
+GLAPI void APIENTRY glVertexStream1svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream1iATI (GLenum stream, GLint x);
+GLAPI void APIENTRY glVertexStream1ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream1fATI (GLenum stream, GLfloat x);
+GLAPI void APIENTRY glVertexStream1fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream1dATI (GLenum stream, GLdouble x);
+GLAPI void APIENTRY glVertexStream1dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream2sATI (GLenum stream, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexStream2svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream2iATI (GLenum stream, GLint x, GLint y);
+GLAPI void APIENTRY glVertexStream2ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream2fATI (GLenum stream, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexStream2fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream2dATI (GLenum stream, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexStream2dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream3sATI (GLenum stream, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexStream3svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream3iATI (GLenum stream, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexStream3ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream3fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexStream3fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream3dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexStream3dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream4sATI (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexStream4svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream4iATI (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexStream4ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream4fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexStream4fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream4dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexStream4dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glNormalStream3bATI (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+GLAPI void APIENTRY glNormalStream3bvATI (GLenum stream, const GLbyte *coords);
+GLAPI void APIENTRY glNormalStream3sATI (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+GLAPI void APIENTRY glNormalStream3svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glNormalStream3iATI (GLenum stream, GLint nx, GLint ny, GLint nz);
+GLAPI void APIENTRY glNormalStream3ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glNormalStream3fATI (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+GLAPI void APIENTRY glNormalStream3fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glNormalStream3dATI (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+GLAPI void APIENTRY glNormalStream3dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum stream);
+GLAPI void APIENTRY glVertexBlendEnviATI (GLenum pname, GLint param);
+GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
+#endif
+
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerATI (GLenum type, const GLvoid *pointer);
+GLAPI void APIENTRY glDrawElementArrayATI (GLenum mode, GLsizei count);
+GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#endif
+
+#ifndef GL_SUN_mesh_array
+#define GL_SUN_mesh_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#endif
+
+#ifndef GL_SUN_slice_accum
+#define GL_SUN_slice_accum 1
+#endif
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_NV_multisample_filter_hint 1
+#endif
+
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+#endif
+
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint id);
+GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint id);
+GLAPI void APIENTRY glEndOcclusionQueryNV (void);
+GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint id, GLenum pname, GLuint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameteriNV (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameterivNV (GLenum pname, const GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+#endif
+
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1 1
+#endif
+
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+#endif
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum face);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+#endif
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+#endif
+
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+#endif
+
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerAPPLE (GLenum type, const GLvoid *pointer);
+GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#endif
+
+#ifndef GL_APPLE_fence
+#define GL_APPLE_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenFencesAPPLE (GLsizei n, GLuint *fences);
+GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei n, const GLuint *fences);
+GLAPI void APIENTRY glSetFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint fence);
+GLAPI void APIENTRY glFinishFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum object, GLuint name);
+GLAPI void APIENTRY glFinishObjectAPPLE (GLenum object, GLint name);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
+typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
+typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
+#endif
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_APPLE_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint array);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
+#endif
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_APPLE_vertex_array_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer);
+GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer);
+GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum pname, GLint param);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
+#endif
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_APPLE_ycbcr_422 1
+#endif
+
+#ifndef GL_S3_s3tc
+#define GL_S3_s3tc 1
+#endif
+
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersATI (GLsizei n, const GLenum *bufs);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
+#endif
+
+#ifndef GL_ATI_pixel_format_float
+#define GL_ATI_pixel_format_float 1
+/* This is really a WGL extension, but defines some associated GL enums.
+ * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
+ */
+#endif
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+#endif
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+#endif
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+#endif
+
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#endif
+
+#ifndef GL_NV_half_float
+#define GL_NV_half_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y);
+GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertex3hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertex4hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glNormal3hNV (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glColor4hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV s);
+GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV s, GLhalfNV t);
+GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum target, GLhalfNV s);
+GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum target, GLhalfNV s, GLhalfNV t);
+GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
+GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x);
+GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y);
+GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib3hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib4hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
+typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+#endif
+
+#ifndef GL_NV_pixel_data_range
+#define GL_NV_pixel_data_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, GLvoid *pointer);
+GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum target);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
+#endif
+
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPrimitiveRestartNV (void);
+GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+#endif
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_NV_texture_expand_normal 1
+#endif
+
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+#endif
+
+#ifndef GL_ATI_map_object_buffer
+#define GL_ATI_map_object_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint buffer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+#endif
+
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpSeparateATI (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#endif
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#define GL_ATI_vertex_attrib_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint index, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_OES_read_format
+#define GL_OES_read_format 1
+#endif
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_EXT_depth_bounds_test 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthBoundsEXT (GLclampd zmin, GLclampd zmax);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
+#endif
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_EXT_texture_mirror_clamp 1
+#endif
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_EXT_blend_equation_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum modeRGB, GLenum modeAlpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
+#endif
+
+#ifndef GL_MESA_pack_invert
+#define GL_MESA_pack_invert 1
+#endif
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_MESA_ycbcr_texture 1
+#endif
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_EXT_pixel_buffer_object 1
+#endif
+
+#ifndef GL_NV_fragment_program_option
+#define GL_NV_fragment_program_option 1
+#endif
+
+#ifndef GL_NV_fragment_program2
+#define GL_NV_fragment_program2 1
+#endif
+
+#ifndef GL_NV_vertex_program2_option
+#define GL_NV_vertex_program2_option 1
+#endif
+
+#ifndef GL_NV_vertex_program3
+#define GL_NV_vertex_program3 1
+#endif
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbufferEXT (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebufferEXT (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmapEXT (GLenum target);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
+#endif
+
+#ifndef GL_GREMEDY_string_marker
+#define GL_GREMEDY_string_marker 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei len, const GLvoid *string);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
+#endif
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_EXT_packed_depth_stencil 1
+#endif
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_EXT_stencil_clear_tag 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilClearTagEXT (GLsizei stencilTagBits, GLuint stencilClearTag);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
+#endif
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_EXT_texture_sRGB 1
+#endif
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_EXT_framebuffer_blit 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_EXT_framebuffer_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_MESAX_texture_stack
+#define GL_MESAX_texture_stack 1
+#endif
+
+#ifndef GL_EXT_timer_query
+#define GL_EXT_timer_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64EXT *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
+#endif
+
+#ifndef GL_EXT_gpu_program_parameters
+#define GL_EXT_gpu_program_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#endif
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_APPLE_flush_buffer_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum target, GLintptr offset, GLsizeiptr size);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
+#endif
+
+#ifndef GL_NV_gpu_program4
+#define GL_NV_gpu_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum target, GLuint index, GLuint *params);
+GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum target, GLuint index, GLuint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+#endif
+
+#ifndef GL_NV_geometry_program4
+#define GL_NV_geometry_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramVertexLimitNV (GLenum target, GLint limit);
+GLAPI void APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_EXT_geometry_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
+#endif
+
+#ifndef GL_NV_vertex_program4
+#define GL_NV_vertex_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_EXT_gpu_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUniformuivEXT (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1uiEXT (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2uiEXT (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uivEXT (GLint location, GLsizei count, const GLuint *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+#endif
+
+#ifndef GL_EXT_draw_instanced
+#define GL_EXT_draw_instanced 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif
+
+#ifndef GL_EXT_packed_float
+#define GL_EXT_packed_float 1
+#endif
+
+#ifndef GL_EXT_texture_array
+#define GL_EXT_texture_array 1
+#endif
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_EXT_texture_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_EXT_texture_compression_latc 1
+#endif
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_EXT_texture_compression_rgtc 1
+#endif
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_EXT_texture_shared_exponent 1
+#endif
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_NV_depth_buffer_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthRangedNV (GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glClearDepthdNV (GLdouble depth);
+GLAPI void APIENTRY glDepthBoundsdNV (GLdouble zmin, GLdouble zmax);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
+#endif
+
+#ifndef GL_NV_fragment_program4
+#define GL_NV_fragment_program4 1
+#endif
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_NV_framebuffer_multisample_coverage 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_EXT_framebuffer_sRGB 1
+#endif
+
+#ifndef GL_NV_geometry_shader4
+#define GL_NV_geometry_shader4 1
+#endif
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_NV_parameter_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
+#endif
+
+#ifndef GL_EXT_draw_buffers2
+#define GL_EXT_draw_buffers2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glEnableIndexedEXT (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisableIndexedEXT (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum target, GLuint index);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
+#endif
+
+#ifndef GL_NV_transform_feedback
+#define GL_NV_transform_feedback 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedbackNV (void);
+GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint count, const GLint *attribs, GLenum bufferMode);
+GLAPI void APIENTRY glBindBufferRangeNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferOffsetNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+GLAPI void APIENTRY glBindBufferBaseNV (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+GLAPI void APIENTRY glActiveVaryingNV (GLuint program, const GLchar *name);
+GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetActiveVaryingNV (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint program, GLuint index, GLint *location);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
+#endif
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_EXT_bindable_uniform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformBufferEXT (GLuint program, GLint location, GLuint buffer);
+GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint program, GLint location);
+GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint program, GLint location);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
+typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
+#endif
+
+#ifndef GL_EXT_texture_integer
+#define GL_EXT_texture_integer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearColorIiEXT (GLint red, GLint green, GLint blue, GLint alpha);
+GLAPI void APIENTRY glClearColorIuiEXT (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
+typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#endif
+
+#ifndef GL_GREMEDY_frame_terminator
+#define GL_GREMEDY_frame_terminator 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
+#endif
+
+#ifndef GL_NV_conditional_render
+#define GL_NV_conditional_render 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRenderNV (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void);
+#endif
+
+#ifndef GL_NV_present_video
+#define GL_NV_present_video 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPresentFrameKeyedNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+GLAPI void APIENTRY glPresentFrameDualFillNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+GLAPI void APIENTRY glGetVideoivNV (GLuint video_slot, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideouivNV (GLuint video_slot, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glGetVideoi64vNV (GLuint video_slot, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetVideoui64vNV (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+typedef void (APIENTRYP PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+typedef void (APIENTRYP PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+#endif
+
+#ifndef GL_EXT_transform_feedback
+#define GL_EXT_transform_feedback 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedbackEXT (void);
+GLAPI void APIENTRY glBindBufferRangeEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+GLAPI void APIENTRY glBindBufferBaseEXT (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+#endif
+
+#ifndef GL_EXT_direct_state_access
+#define GL_EXT_direct_state_access 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield mask);
+GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield mask);
+GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glMatrixPopEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixPushEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetTextureImageEXT (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture);
+GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexEnviEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexGendEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+GLAPI void APIENTRY glMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+GLAPI void APIENTRY glMultiTexGenfEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexGeniEXT (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum target, GLuint index, GLfloat *data);
+GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum target, GLuint index, GLdouble *data);
+GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum target, GLuint index, GLvoid* *data);
+GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint texture, GLenum target, GLint lod, GLvoid *img);
+GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum texunit, GLenum target, GLint lod, GLvoid *img);
+GLAPI void APIENTRY glNamedProgramStringEXT (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint program, GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint program, GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint program, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint program, GLenum target, GLenum pname, GLvoid *string);
+GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint program, GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint program, GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint program, GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint program, GLenum target, GLuint index, GLuint *params);
+GLAPI void APIENTRY glTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0);
+GLAPI void APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0);
+GLAPI void APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0);
+GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glNamedBufferDataEXT (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage);
+GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+GLAPI GLvoid* APIENTRY glMapNamedBufferEXT (GLuint buffer, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint buffer);
+GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint buffer, GLenum pname, GLvoid* *params);
+GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data);
+GLAPI void APIENTRY glTextureBufferEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glMultiTexBufferEXT (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint renderbuffer, GLenum pname, GLint *params);
+GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint framebuffer, GLenum target);
+GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint texture, GLenum target);
+GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum texunit, GLenum target);
+GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint framebuffer, GLenum mode);
+GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint framebuffer, GLenum mode);
+GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint texture, GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum texunit, GLenum target, GLuint renderbuffer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data);
+typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLvoid* *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, GLvoid *img);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, GLvoid *img);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, GLvoid *string);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, GLvoid* *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
+typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
+typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
+#endif
+
+#ifndef GL_EXT_vertex_array_bgra
+#define GL_EXT_vertex_array_bgra 1
+#endif
+
+#ifndef GL_EXT_texture_swizzle
+#define GL_EXT_texture_swizzle 1
+#endif
+
+#ifndef GL_NV_explicit_multisample
+#define GL_NV_explicit_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetMultisamplefvNV (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint index, GLbitfield mask);
+GLAPI void APIENTRY glTexRenderbufferNV (GLenum target, GLuint renderbuffer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask);
+typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer);
+#endif
+
+#ifndef GL_NV_transform_feedback2
+#define GL_NV_transform_feedback2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedbackNV (void);
+GLAPI void APIENTRY glResumeTransformFeedbackNV (void);
+GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id);
+#endif
+
+#ifndef GL_ATI_meminfo
+#define GL_ATI_meminfo 1
+#endif
+
+#ifndef GL_AMD_performance_monitor
+#define GL_AMD_performance_monitor 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, void *data);
+GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
+GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint monitor);
+GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint monitor);
+GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data);
+typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
+typedef void (APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#endif
+
+#ifndef GL_AMD_texture_texture4
+#define GL_AMD_texture_texture4 1
+#endif
+
+#ifndef GL_AMD_vertex_shader_tesselator
+#define GL_AMD_vertex_shader_tesselator 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTessellationFactorAMD (GLfloat factor);
+GLAPI void APIENTRY glTessellationModeAMD (GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_provoking_vertex
+#define GL_EXT_provoking_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProvokingVertexEXT (GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_texture_snorm
+#define GL_EXT_texture_snorm 1
+#endif
+
+#ifndef GL_AMD_draw_buffers_blend
+#define GL_AMD_draw_buffers_blend 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncIndexedAMD (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparateIndexedAMD (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GLAPI void APIENTRY glBlendEquationIndexedAMD (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+#endif
+
+#ifndef GL_APPLE_texture_range
+#define GL_APPLE_texture_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureRangeAPPLE (GLenum target, GLsizei length, const GLvoid *pointer);
+GLAPI void APIENTRY glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, GLvoid* *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_APPLE_float_pixels
+#define GL_APPLE_float_pixels 1
+#endif
+
+#ifndef GL_APPLE_vertex_program_evaluators
+#define GL_APPLE_vertex_program_evaluators 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glEnableVertexAttribAPPLE (GLuint index, GLenum pname);
+GLAPI void APIENTRY glDisableVertexAttribAPPLE (GLuint index, GLenum pname);
+GLAPI GLboolean APIENTRY glIsVertexAttribEnabledAPPLE (GLuint index, GLenum pname);
+GLAPI void APIENTRY glMapVertexAttrib1dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+GLAPI void APIENTRY glMapVertexAttrib1fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+GLAPI void APIENTRY glMapVertexAttrib2dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+GLAPI void APIENTRY glMapVertexAttrib2fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+#endif
+
+#ifndef GL_APPLE_aux_depth_stencil
+#define GL_APPLE_aux_depth_stencil 1
+#endif
+
+#ifndef GL_APPLE_object_purgeable
+#define GL_APPLE_object_purgeable 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLenum APIENTRY glObjectPurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
+GLAPI GLenum APIENTRY glObjectUnpurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
+GLAPI void APIENTRY glGetObjectParameterivAPPLE (GLenum objectType, GLuint name, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLenum (APIENTRYP PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef GLenum (APIENTRYP PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_APPLE_row_bytes
+#define GL_APPLE_row_bytes 1
+#endif
+
+#ifndef GL_APPLE_rgb_422
+#define GL_APPLE_rgb_422 1
+#endif
+
+#ifndef GL_NV_video_capture
+#define GL_NV_video_capture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVideoCaptureNV (GLuint video_capture_slot);
+GLAPI void APIENTRY glBindVideoCaptureStreamBufferNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+GLAPI void APIENTRY glBindVideoCaptureStreamTextureNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+GLAPI void APIENTRY glEndVideoCaptureNV (GLuint video_capture_slot);
+GLAPI void APIENTRY glGetVideoCaptureivNV (GLuint video_capture_slot, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
+GLAPI GLenum APIENTRY glVideoCaptureNV (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
+GLAPI void APIENTRY glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
+typedef GLenum (APIENTRYP PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
+#endif
+
+#ifndef GL_NV_copy_image
+#define GL_NV_copy_image 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyImageSubDataNV (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+
+#ifndef GL_EXT_separate_shader_objects
+#define GL_EXT_separate_shader_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUseShaderProgramEXT (GLenum type, GLuint program);
+GLAPI void APIENTRY glActiveProgramEXT (GLuint program);
+GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *string);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program);
+typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string);
+#endif
+
+#ifndef GL_NV_parameter_buffer_object2
+#define GL_NV_parameter_buffer_object2 1
+#endif
+
+#ifndef GL_NV_shader_buffer_load
+#define GL_NV_shader_buffer_load 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMakeBufferResidentNV (GLenum target, GLenum access);
+GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum target);
+GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum target);
+GLAPI void APIENTRY glMakeNamedBufferResidentNV (GLuint buffer, GLenum access);
+GLAPI void APIENTRY glMakeNamedBufferNonResidentNV (GLuint buffer);
+GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint buffer);
+GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum target, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result);
+GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value);
+GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params);
+GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value);
+GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access);
+typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer);
+typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result);
+typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value);
+typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif
+
+#ifndef GL_NV_vertex_buffer_unified_memory
+#define GL_NV_vertex_buffer_unified_memory 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferAddressRangeNV (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+GLAPI void APIENTRY glVertexFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glNormalFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glColorFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glIndexFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glTexCoordFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei stride);
+GLAPI void APIENTRY glSecondaryColorFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glFogCoordFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribFormatNV (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum value, GLuint index, GLuint64EXT *result);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result);
+#endif
+
+#ifndef GL_NV_texture_barrier
+#define GL_NV_texture_barrier 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureBarrierNV (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void);
+#endif
+
+#ifndef GL_AMD_shader_stencil_export
+#define GL_AMD_shader_stencil_export 1
+#endif
+
+#ifndef GL_AMD_seamless_cubemap_per_texture
+#define GL_AMD_seamless_cubemap_per_texture 1
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/make/stub_includes/opengl/GL3_/gl3.h b/make/stub_includes/opengl/GL3_/gl3.h
new file mode 100755
index 000000000..8bdff4644
--- /dev/null
+++ b/make/stub_includes/opengl/GL3_/gl3.h
@@ -0,0 +1,1659 @@
+#ifndef __gl3_h_
+#define __gl3_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007-2009 The Khronos Group Inc.
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+** 
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* This is a draft release of gl3.h, a new header intended for use with
+ * core OpenGL 3.1 implementations. The current version is always
+ * available at http://www.opengl.org/registry/ . Please don't package
+ * gl3.h for release with other software until it's out of draft status.
+ * The structure of the file may change significantly, and the details
+ * will probably change slightly as we make sure exactly the right set
+ * of interfaces is included.
+ *
+ * gl3.h last updated on $Date: 2009-05-05 15:53:39 -0700 (Tue, 05 May 2009) $
+ *
+ * RELEASE NOTES
+ *
+ * gl3.h should be placed under a directory 'GL3' and included as
+ * '<GL3/gl3.h>'.
+ *
+ * gl3.h only includes interfaces supported in a core OpenGL 3.1
+ * implementation, as well as interfaces for a few ARB extensions which
+ * have identical enums and entry points. It does not, and never will
+ * include functionality removed from core OpenGL 3.1, such as
+ * fixed-function vertex and fragment processing.
+ *
+ * Implementations of OpenGL 3.1 supporting the optional
+ * GL_ARB_compatibility extension continue to provide that functionality,
+ * and source code requiring it should use the traditional <GL/gl.h> and
+ * <GL/glext.h> headers instead of <GL3/gl3.h>.
+ *
+ * It is not possible to #include both <GL3/gl3.h> and either of
+ * <GL/gl.h> or <GL/glext.h> in the same source file.
+ *
+ * We welcome feedback on gl3.h. Please register for the Khronos Bugzilla
+ * (www.khronos.org/bugzilla) and file issues there under product
+ * "OpenGL", category "Registry". Feedback on the opengl.org forums
+ * may not be responded to in a timely fashion.
+ */
+
+/* Function declaration macros - to move into glplatform.h */
+
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
+#define __WIN32__
+#endif
+
+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
+#  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
+#    define GLAPI __declspec(dllexport)
+#  elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#    define GLAPI __declspec(dllimport)
+#  else /* for use with static link lib build of Win32 edition only */
+#    define GLAPI extern
+#  endif /* _STATIC_MESA support */
+#  define APIENTRY __stdcall
+#else
+/* non-Windows compilation */
+#  define GLAPI extern
+#  define APIENTRY
+#endif /* WIN32 / CYGWIN bracket */
+
+#ifndef APIENTRYP
+#   define APIENTRYP APIENTRY*
+#endif
+
+#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
+#  define PRAGMA_EXPORT_SUPPORTED               1
+#endif
+
+/*
+ * WINDOWS: Include windows.h here to define APIENTRY.
+ * It is also useful when applications include this file by
+ * including only glut.h, since glut.h depends on windows.h.
+ * Applications needing to include windows.h with parms other
+ * than "WIN32_LEAN_AND_MEAN" may include windows.h before
+ * glut.h or gl.h.
+ */
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(__CYGWIN__)
+#include <gl/mesa_wgl.h>
+#endif
+
+#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
+#pragma import on
+#endif
+
+#ifdef CENTERLINE_CLPP
+#define signed
+#endif
+
+#if defined(PRAGMA_EXPORT_SUPPORTED)
+#pragma export on
+#endif
+
+/*
+ * End system-specific stuff.
+ **********************************************************************/
+
+/* Base GL types */
+
+typedef unsigned int GLenum;
+typedef unsigned char GLboolean;
+typedef unsigned int GLbitfield;
+typedef signed char GLbyte;
+typedef short GLshort;
+typedef int GLint;
+typedef int GLsizei;
+typedef unsigned char GLubyte;
+typedef unsigned short GLushort;
+typedef unsigned int GLuint;
+typedef float GLfloat;
+typedef float GLclampf;
+typedef double GLdouble;
+typedef double GLclampd;
+typedef void GLvoid;
+
+/*************************************************************/
+
+#ifndef GL_VERSION_1_1
+/* AttribMask */
+#define GL_DEPTH_BUFFER_BIT               0x00000100
+#define GL_STENCIL_BUFFER_BIT             0x00000400
+#define GL_COLOR_BUFFER_BIT               0x00004000
+/* Boolean */
+#define GL_FALSE                          0
+#define GL_TRUE                           1
+/* BeginMode */
+#define GL_POINTS                         0x0000
+#define GL_LINES                          0x0001
+#define GL_LINE_LOOP                      0x0002
+#define GL_LINE_STRIP                     0x0003
+#define GL_TRIANGLES                      0x0004
+#define GL_TRIANGLE_STRIP                 0x0005
+#define GL_TRIANGLE_FAN                   0x0006
+/* AlphaFunction */
+#define GL_NEVER                          0x0200
+#define GL_LESS                           0x0201
+#define GL_EQUAL                          0x0202
+#define GL_LEQUAL                         0x0203
+#define GL_GREATER                        0x0204
+#define GL_NOTEQUAL                       0x0205
+#define GL_GEQUAL                         0x0206
+#define GL_ALWAYS                         0x0207
+/* BlendingFactorDest */
+#define GL_ZERO                           0
+#define GL_ONE                            1
+#define GL_SRC_COLOR                      0x0300
+#define GL_ONE_MINUS_SRC_COLOR            0x0301
+#define GL_SRC_ALPHA                      0x0302
+#define GL_ONE_MINUS_SRC_ALPHA            0x0303
+#define GL_DST_ALPHA                      0x0304
+#define GL_ONE_MINUS_DST_ALPHA            0x0305
+/* BlendingFactorSrc */
+#define GL_DST_COLOR                      0x0306
+#define GL_ONE_MINUS_DST_COLOR            0x0307
+#define GL_SRC_ALPHA_SATURATE             0x0308
+/* DrawBufferMode */
+#define GL_NONE                           0
+#define GL_FRONT_LEFT                     0x0400
+#define GL_FRONT_RIGHT                    0x0401
+#define GL_BACK_LEFT                      0x0402
+#define GL_BACK_RIGHT                     0x0403
+#define GL_FRONT                          0x0404
+#define GL_BACK                           0x0405
+#define GL_LEFT                           0x0406
+#define GL_RIGHT                          0x0407
+#define GL_FRONT_AND_BACK                 0x0408
+/* ErrorCode */
+#define GL_NO_ERROR                       0
+#define GL_INVALID_ENUM                   0x0500
+#define GL_INVALID_VALUE                  0x0501
+#define GL_INVALID_OPERATION              0x0502
+#define GL_OUT_OF_MEMORY                  0x0505
+/* FrontFaceDirection */
+#define GL_CW                             0x0900
+#define GL_CCW                            0x0901
+/* GetPName */
+#define GL_POINT_SIZE                     0x0B11
+#define GL_POINT_SIZE_RANGE               0x0B12
+#define GL_POINT_SIZE_GRANULARITY         0x0B13
+#define GL_LINE_SMOOTH                    0x0B20
+#define GL_LINE_WIDTH                     0x0B21
+#define GL_LINE_WIDTH_RANGE               0x0B22
+#define GL_LINE_WIDTH_GRANULARITY         0x0B23
+#define GL_POLYGON_SMOOTH                 0x0B41
+#define GL_CULL_FACE                      0x0B44
+#define GL_CULL_FACE_MODE                 0x0B45
+#define GL_FRONT_FACE                     0x0B46
+#define GL_DEPTH_RANGE                    0x0B70
+#define GL_DEPTH_TEST                     0x0B71
+#define GL_DEPTH_WRITEMASK                0x0B72
+#define GL_DEPTH_CLEAR_VALUE              0x0B73
+#define GL_DEPTH_FUNC                     0x0B74
+#define GL_STENCIL_TEST                   0x0B90
+#define GL_STENCIL_CLEAR_VALUE            0x0B91
+#define GL_STENCIL_FUNC                   0x0B92
+#define GL_STENCIL_VALUE_MASK             0x0B93
+#define GL_STENCIL_FAIL                   0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
+#define GL_STENCIL_REF                    0x0B97
+#define GL_STENCIL_WRITEMASK              0x0B98
+#define GL_VIEWPORT                       0x0BA2
+#define GL_DITHER                         0x0BD0
+#define GL_BLEND_DST                      0x0BE0
+#define GL_BLEND_SRC                      0x0BE1
+#define GL_BLEND                          0x0BE2
+#define GL_LOGIC_OP_MODE                  0x0BF0
+#define GL_COLOR_LOGIC_OP                 0x0BF2
+#define GL_DRAW_BUFFER                    0x0C01
+#define GL_READ_BUFFER                    0x0C02
+#define GL_SCISSOR_BOX                    0x0C10
+#define GL_SCISSOR_TEST                   0x0C11
+#define GL_COLOR_CLEAR_VALUE              0x0C22
+#define GL_COLOR_WRITEMASK                0x0C23
+#define GL_DOUBLEBUFFER                   0x0C32
+#define GL_STEREO                         0x0C33
+#define GL_LINE_SMOOTH_HINT               0x0C52
+#define GL_POLYGON_SMOOTH_HINT            0x0C53
+#define GL_UNPACK_SWAP_BYTES              0x0CF0
+#define GL_UNPACK_LSB_FIRST               0x0CF1
+#define GL_UNPACK_ROW_LENGTH              0x0CF2
+#define GL_UNPACK_SKIP_ROWS               0x0CF3
+#define GL_UNPACK_SKIP_PIXELS             0x0CF4
+#define GL_UNPACK_ALIGNMENT               0x0CF5
+#define GL_PACK_SWAP_BYTES                0x0D00
+#define GL_PACK_LSB_FIRST                 0x0D01
+#define GL_PACK_ROW_LENGTH                0x0D02
+#define GL_PACK_SKIP_ROWS                 0x0D03
+#define GL_PACK_SKIP_PIXELS               0x0D04
+#define GL_PACK_ALIGNMENT                 0x0D05
+#define GL_MAX_TEXTURE_SIZE               0x0D33
+#define GL_MAX_VIEWPORT_DIMS              0x0D3A
+#define GL_SUBPIXEL_BITS                  0x0D50
+#define GL_TEXTURE_1D                     0x0DE0
+#define GL_TEXTURE_2D                     0x0DE1
+#define GL_POLYGON_OFFSET_UNITS           0x2A00
+#define GL_POLYGON_OFFSET_POINT           0x2A01
+#define GL_POLYGON_OFFSET_LINE            0x2A02
+#define GL_POLYGON_OFFSET_FILL            0x8037
+#define GL_POLYGON_OFFSET_FACTOR          0x8038
+#define GL_TEXTURE_BINDING_1D             0x8068
+#define GL_TEXTURE_BINDING_2D             0x8069
+/* GetTextureParameter */
+#define GL_TEXTURE_WIDTH                  0x1000
+#define GL_TEXTURE_HEIGHT                 0x1001
+#define GL_TEXTURE_INTERNAL_FORMAT        0x1003
+#define GL_TEXTURE_BORDER_COLOR           0x1004
+#define GL_TEXTURE_BORDER                 0x1005
+#define GL_TEXTURE_RED_SIZE               0x805C
+#define GL_TEXTURE_GREEN_SIZE             0x805D
+#define GL_TEXTURE_BLUE_SIZE              0x805E
+#define GL_TEXTURE_ALPHA_SIZE             0x805F
+/* HintMode */
+#define GL_DONT_CARE                      0x1100
+#define GL_FASTEST                        0x1101
+#define GL_NICEST                         0x1102
+/* DataType */
+#define GL_BYTE                           0x1400
+#define GL_UNSIGNED_BYTE                  0x1401
+#define GL_SHORT                          0x1402
+#define GL_UNSIGNED_SHORT                 0x1403
+#define GL_INT                            0x1404
+#define GL_UNSIGNED_INT                   0x1405
+#define GL_FLOAT                          0x1406
+#define GL_DOUBLE                         0x140A
+/* LogicOp */
+#define GL_CLEAR                          0x1500
+#define GL_AND                            0x1501
+#define GL_AND_REVERSE                    0x1502
+#define GL_COPY                           0x1503
+#define GL_AND_INVERTED                   0x1504
+#define GL_NOOP                           0x1505
+#define GL_XOR                            0x1506
+#define GL_OR                             0x1507
+#define GL_NOR                            0x1508
+#define GL_EQUIV                          0x1509
+#define GL_INVERT                         0x150A
+#define GL_OR_REVERSE                     0x150B
+#define GL_COPY_INVERTED                  0x150C
+#define GL_OR_INVERTED                    0x150D
+#define GL_NAND                           0x150E
+#define GL_SET                            0x150F
+/* MatrixMode (for gl3.h, FBO attachment type) */
+#define GL_TEXTURE                        0x1702
+/* PixelCopyType */
+#define GL_COLOR                          0x1800
+#define GL_DEPTH                          0x1801
+#define GL_STENCIL                        0x1802
+/* PixelFormat */
+#define GL_STENCIL_INDEX                  0x1901
+#define GL_DEPTH_COMPONENT                0x1902
+#define GL_RED                            0x1903
+#define GL_GREEN                          0x1904
+#define GL_BLUE                           0x1905
+#define GL_ALPHA                          0x1906
+#define GL_RGB                            0x1907
+#define GL_RGBA                           0x1908
+/* PolygonMode */
+#define GL_POINT                          0x1B00
+#define GL_LINE                           0x1B01
+#define GL_FILL                           0x1B02
+/* StencilOp */
+#define GL_KEEP                           0x1E00
+#define GL_REPLACE                        0x1E01
+#define GL_INCR                           0x1E02
+#define GL_DECR                           0x1E03
+/* StringName */
+#define GL_VENDOR                         0x1F00
+#define GL_RENDERER                       0x1F01
+#define GL_VERSION                        0x1F02
+#define GL_EXTENSIONS                     0x1F03
+/* TextureMagFilter */
+#define GL_NEAREST                        0x2600
+#define GL_LINEAR                         0x2601
+/* TextureMinFilter */
+#define GL_NEAREST_MIPMAP_NEAREST         0x2700
+#define GL_LINEAR_MIPMAP_NEAREST          0x2701
+#define GL_NEAREST_MIPMAP_LINEAR          0x2702
+#define GL_LINEAR_MIPMAP_LINEAR           0x2703
+/* TextureParameterName */
+#define GL_TEXTURE_MAG_FILTER             0x2800
+#define GL_TEXTURE_MIN_FILTER             0x2801
+#define GL_TEXTURE_WRAP_S                 0x2802
+#define GL_TEXTURE_WRAP_T                 0x2803
+/* TextureTarget */
+#define GL_PROXY_TEXTURE_1D               0x8063
+#define GL_PROXY_TEXTURE_2D               0x8064
+/* TextureWrapMode */
+#define GL_REPEAT                         0x2901
+/* PixelInternalFormat */
+#define GL_R3_G3_B2                       0x2A10
+#define GL_RGB4                           0x804F
+#define GL_RGB5                           0x8050
+#define GL_RGB8                           0x8051
+#define GL_RGB10                          0x8052
+#define GL_RGB12                          0x8053
+#define GL_RGB16                          0x8054
+#define GL_RGBA2                          0x8055
+#define GL_RGBA4                          0x8056
+#define GL_RGB5_A1                        0x8057
+#define GL_RGBA8                          0x8058
+#define GL_RGB10_A2                       0x8059
+#define GL_RGBA12                         0x805A
+#define GL_RGBA16                         0x805B
+#endif
+
+#ifndef GL_VERSION_1_2
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_TEXTURE_BINDING_3D             0x806A
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_BGR                            0x80E0
+#define GL_BGRA                           0x80E1
+#define GL_MAX_ELEMENTS_VERTICES          0x80E8
+#define GL_MAX_ELEMENTS_INDICES           0x80E9
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#endif
+
+#ifndef GL_ARB_imaging
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_BLEND_COLOR                    0x8005
+#define GL_FUNC_ADD                       0x8006
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+#define GL_MULTISAMPLE                    0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+#define GL_COMPRESSED_RGB                 0x84ED
+#define GL_COMPRESSED_RGBA                0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
+#define GL_TEXTURE_COMPRESSED             0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_CLAMP_TO_BORDER                0x812D
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_MIRRORED_REPEAT                0x8370
+#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
+#define GL_TEXTURE_LOD_BIAS               0x8501
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+#define GL_QUERY_COUNTER_BITS             0x8864
+#define GL_CURRENT_QUERY                  0x8865
+#define GL_QUERY_RESULT                   0x8866
+#define GL_QUERY_RESULT_AVAILABLE         0x8867
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_BUFFER_ACCESS                  0x88BB
+#define GL_BUFFER_MAPPED                  0x88BC
+#define GL_BUFFER_MAP_POINTER             0x88BD
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_STREAM_COPY                    0x88E2
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_STATIC_READ                    0x88E5
+#define GL_STATIC_COPY                    0x88E6
+#define GL_DYNAMIC_DRAW                   0x88E8
+#define GL_DYNAMIC_READ                   0x88E9
+#define GL_DYNAMIC_COPY                   0x88EA
+#define GL_SAMPLES_PASSED                 0x8914
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_BLEND_EQUATION_RGB             0x8009
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_MAX_DRAW_BUFFERS               0x8824
+#define GL_DRAW_BUFFER0                   0x8825
+#define GL_DRAW_BUFFER1                   0x8826
+#define GL_DRAW_BUFFER2                   0x8827
+#define GL_DRAW_BUFFER3                   0x8828
+#define GL_DRAW_BUFFER4                   0x8829
+#define GL_DRAW_BUFFER5                   0x882A
+#define GL_DRAW_BUFFER6                   0x882B
+#define GL_DRAW_BUFFER7                   0x882C
+#define GL_DRAW_BUFFER8                   0x882D
+#define GL_DRAW_BUFFER9                   0x882E
+#define GL_DRAW_BUFFER10                  0x882F
+#define GL_DRAW_BUFFER11                  0x8830
+#define GL_DRAW_BUFFER12                  0x8831
+#define GL_DRAW_BUFFER13                  0x8832
+#define GL_DRAW_BUFFER14                  0x8833
+#define GL_DRAW_BUFFER15                  0x8834
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+#define GL_MAX_VERTEX_ATTRIBS             0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
+#define GL_FRAGMENT_SHADER                0x8B30
+#define GL_VERTEX_SHADER                  0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
+#define GL_MAX_VARYING_FLOATS             0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE                    0x8B4F
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_1D                     0x8B5D
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_3D                     0x8B5F
+#define GL_SAMPLER_CUBE                   0x8B60
+#define GL_SAMPLER_1D_SHADOW              0x8B61
+#define GL_SAMPLER_2D_SHADOW              0x8B62
+#define GL_DELETE_STATUS                  0x8B80
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_LINK_STATUS                    0x8B82
+#define GL_VALIDATE_STATUS                0x8B83
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_ATTACHED_SHADERS               0x8B85
+#define GL_ACTIVE_UNIFORMS                0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_ACTIVE_ATTRIBUTES              0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
+#define GL_CURRENT_PROGRAM                0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
+#define GL_LOWER_LEFT                     0x8CA1
+#define GL_UPPER_LEFT                     0x8CA2
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_PIXEL_PACK_BUFFER              0x88EB
+#define GL_PIXEL_UNPACK_BUFFER            0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
+#define GL_FLOAT_MAT2x3                   0x8B65
+#define GL_FLOAT_MAT2x4                   0x8B66
+#define GL_FLOAT_MAT3x2                   0x8B67
+#define GL_FLOAT_MAT3x4                   0x8B68
+#define GL_FLOAT_MAT4x2                   0x8B69
+#define GL_FLOAT_MAT4x3                   0x8B6A
+#define GL_SRGB                           0x8C40
+#define GL_SRGB8                          0x8C41
+#define GL_SRGB_ALPHA                     0x8C42
+#define GL_SRGB8_ALPHA8                   0x8C43
+#define GL_COMPRESSED_SRGB                0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_COMPARE_REF_TO_TEXTURE         0x884E
+#define GL_CLIP_DISTANCE0                 0x3000
+#define GL_CLIP_DISTANCE1                 0x3001
+#define GL_CLIP_DISTANCE2                 0x3002
+#define GL_CLIP_DISTANCE3                 0x3003
+#define GL_CLIP_DISTANCE4                 0x3004
+#define GL_CLIP_DISTANCE5                 0x3005
+#define GL_MAX_CLIP_DISTANCES             0x0D32
+#define GL_MAJOR_VERSION                  0x821B
+#define GL_MINOR_VERSION                  0x821C
+#define GL_NUM_EXTENSIONS                 0x821D
+#define GL_CONTEXT_FLAGS                  0x821E
+#define GL_DEPTH_BUFFER                   0x8223
+#define GL_STENCIL_BUFFER                 0x8224
+#define GL_COMPRESSED_RED                 0x8225
+#define GL_COMPRESSED_RG                  0x8226
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
+#define GL_RGBA32F                        0x8814
+#define GL_RGB32F                         0x8815
+#define GL_RGBA16F                        0x881A
+#define GL_RGB16F                         0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
+#define GL_CLAMP_READ_COLOR               0x891C
+#define GL_FIXED_ONLY                     0x891D
+#define GL_MAX_VARYING_COMPONENTS         0x8B4B
+#define GL_TEXTURE_1D_ARRAY               0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
+#define GL_TEXTURE_2D_ARRAY               0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
+#define GL_R11F_G11F_B10F                 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
+#define GL_RGB9_E5                        0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
+#define GL_TEXTURE_SHARED_SIZE            0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED           0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD             0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS            0x8C8C
+#define GL_SEPARATE_ATTRIBS               0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI                       0x8D70
+#define GL_RGB32UI                        0x8D71
+#define GL_RGBA16UI                       0x8D76
+#define GL_RGB16UI                        0x8D77
+#define GL_RGBA8UI                        0x8D7C
+#define GL_RGB8UI                         0x8D7D
+#define GL_RGBA32I                        0x8D82
+#define GL_RGB32I                         0x8D83
+#define GL_RGBA16I                        0x8D88
+#define GL_RGB16I                         0x8D89
+#define GL_RGBA8I                         0x8D8E
+#define GL_RGB8I                          0x8D8F
+#define GL_RED_INTEGER                    0x8D94
+#define GL_GREEN_INTEGER                  0x8D95
+#define GL_BLUE_INTEGER                   0x8D96
+#define GL_RGB_INTEGER                    0x8D98
+#define GL_RGBA_INTEGER                   0x8D99
+#define GL_BGR_INTEGER                    0x8D9A
+#define GL_BGRA_INTEGER                   0x8D9B
+#define GL_SAMPLER_1D_ARRAY               0x8DC0
+#define GL_SAMPLER_2D_ARRAY               0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
+#define GL_UNSIGNED_INT_VEC2              0x8DC6
+#define GL_UNSIGNED_INT_VEC3              0x8DC7
+#define GL_UNSIGNED_INT_VEC4              0x8DC8
+#define GL_INT_SAMPLER_1D                 0x8DC9
+#define GL_INT_SAMPLER_2D                 0x8DCA
+#define GL_INT_SAMPLER_3D                 0x8DCB
+#define GL_INT_SAMPLER_CUBE               0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
+#define GL_QUERY_WAIT                     0x8E13
+#define GL_QUERY_NO_WAIT                  0x8E14
+#define GL_QUERY_BY_REGION_WAIT           0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
+/* Reuse tokens from ARB_depth_buffer_float */
+/* reuse GL_DEPTH_COMPONENT32F */
+/* reuse GL_DEPTH32F_STENCIL8 */
+/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
+/* Reuse tokens from ARB_framebuffer_object */
+/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_DEFAULT */
+/* reuse GL_FRAMEBUFFER_UNDEFINED */
+/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
+/* reuse GL_INDEX */
+/* reuse GL_MAX_RENDERBUFFER_SIZE */
+/* reuse GL_DEPTH_STENCIL */
+/* reuse GL_UNSIGNED_INT_24_8 */
+/* reuse GL_DEPTH24_STENCIL8 */
+/* reuse GL_TEXTURE_STENCIL_SIZE */
+/* reuse GL_TEXTURE_RED_TYPE */
+/* reuse GL_TEXTURE_GREEN_TYPE */
+/* reuse GL_TEXTURE_BLUE_TYPE */
+/* reuse GL_TEXTURE_ALPHA_TYPE */
+/* reuse GL_TEXTURE_DEPTH_TYPE */
+/* reuse GL_UNSIGNED_NORMALIZED */
+/* reuse GL_FRAMEBUFFER_BINDING */
+/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_BINDING */
+/* reuse GL_READ_FRAMEBUFFER */
+/* reuse GL_DRAW_FRAMEBUFFER */
+/* reuse GL_READ_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_SAMPLES */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+/* reuse GL_FRAMEBUFFER_COMPLETE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
+/* reuse GL_MAX_COLOR_ATTACHMENTS */
+/* reuse GL_COLOR_ATTACHMENT0 */
+/* reuse GL_COLOR_ATTACHMENT1 */
+/* reuse GL_COLOR_ATTACHMENT2 */
+/* reuse GL_COLOR_ATTACHMENT3 */
+/* reuse GL_COLOR_ATTACHMENT4 */
+/* reuse GL_COLOR_ATTACHMENT5 */
+/* reuse GL_COLOR_ATTACHMENT6 */
+/* reuse GL_COLOR_ATTACHMENT7 */
+/* reuse GL_COLOR_ATTACHMENT8 */
+/* reuse GL_COLOR_ATTACHMENT9 */
+/* reuse GL_COLOR_ATTACHMENT10 */
+/* reuse GL_COLOR_ATTACHMENT11 */
+/* reuse GL_COLOR_ATTACHMENT12 */
+/* reuse GL_COLOR_ATTACHMENT13 */
+/* reuse GL_COLOR_ATTACHMENT14 */
+/* reuse GL_COLOR_ATTACHMENT15 */
+/* reuse GL_DEPTH_ATTACHMENT */
+/* reuse GL_STENCIL_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER */
+/* reuse GL_RENDERBUFFER */
+/* reuse GL_RENDERBUFFER_WIDTH */
+/* reuse GL_RENDERBUFFER_HEIGHT */
+/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
+/* reuse GL_STENCIL_INDEX1 */
+/* reuse GL_STENCIL_INDEX4 */
+/* reuse GL_STENCIL_INDEX8 */
+/* reuse GL_STENCIL_INDEX16 */
+/* reuse GL_RENDERBUFFER_RED_SIZE */
+/* reuse GL_RENDERBUFFER_GREEN_SIZE */
+/* reuse GL_RENDERBUFFER_BLUE_SIZE */
+/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
+/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
+/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+/* reuse GL_MAX_SAMPLES */
+/* Reuse tokens from ARB_framebuffer_sRGB */
+/* reuse GL_FRAMEBUFFER_SRGB */
+/* Reuse tokens from ARB_half_float_vertex */
+/* reuse GL_HALF_FLOAT */
+/* Reuse tokens from ARB_map_buffer_range */
+/* reuse GL_MAP_READ_BIT */
+/* reuse GL_MAP_WRITE_BIT */
+/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
+/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
+/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
+/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
+/* Reuse tokens from ARB_texture_compression_rgtc */
+/* reuse GL_COMPRESSED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_RG_RGTC2 */
+/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
+/* Reuse tokens from ARB_texture_rg */
+/* reuse GL_RG */
+/* reuse GL_RG_INTEGER */
+/* reuse GL_R8 */
+/* reuse GL_R16 */
+/* reuse GL_RG8 */
+/* reuse GL_RG16 */
+/* reuse GL_R16F */
+/* reuse GL_R32F */
+/* reuse GL_RG16F */
+/* reuse GL_RG32F */
+/* reuse GL_R8I */
+/* reuse GL_R8UI */
+/* reuse GL_R16I */
+/* reuse GL_R16UI */
+/* reuse GL_R32I */
+/* reuse GL_R32UI */
+/* reuse GL_RG8I */
+/* reuse GL_RG8UI */
+/* reuse GL_RG16I */
+/* reuse GL_RG16UI */
+/* reuse GL_RG32I */
+/* reuse GL_RG32UI */
+/* Reuse tokens from ARB_vertex_array_object */
+/* reuse GL_VERTEX_ARRAY_BINDING */
+#endif
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
+#define GL_FRAMEBUFFER_DEFAULT            0x8218
+#define GL_FRAMEBUFFER_UNDEFINED          0x8219
+#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
+#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
+#define GL_DEPTH_STENCIL                  0x84F9
+#define GL_UNSIGNED_INT_24_8              0x84FA
+#define GL_DEPTH24_STENCIL8               0x88F0
+#define GL_TEXTURE_STENCIL_SIZE           0x88F1
+#define GL_TEXTURE_RED_TYPE               0x8C10
+#define GL_TEXTURE_GREEN_TYPE             0x8C11
+#define GL_TEXTURE_BLUE_TYPE              0x8C12
+#define GL_TEXTURE_ALPHA_TYPE             0x8C13
+#define GL_TEXTURE_DEPTH_TYPE             0x8C16
+#define GL_UNSIGNED_NORMALIZED            0x8C17
+#define GL_FRAMEBUFFER_BINDING            0x8CA6
+#define GL_DRAW_FRAMEBUFFER_BINDING       GL_FRAMEBUFFER_BINDING
+#define GL_RENDERBUFFER_BINDING           0x8CA7
+#define GL_READ_FRAMEBUFFER               0x8CA8
+#define GL_DRAW_FRAMEBUFFER               0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
+#define GL_RENDERBUFFER_SAMPLES           0x8CAB
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
+#define GL_COLOR_ATTACHMENT0              0x8CE0
+#define GL_COLOR_ATTACHMENT1              0x8CE1
+#define GL_COLOR_ATTACHMENT2              0x8CE2
+#define GL_COLOR_ATTACHMENT3              0x8CE3
+#define GL_COLOR_ATTACHMENT4              0x8CE4
+#define GL_COLOR_ATTACHMENT5              0x8CE5
+#define GL_COLOR_ATTACHMENT6              0x8CE6
+#define GL_COLOR_ATTACHMENT7              0x8CE7
+#define GL_COLOR_ATTACHMENT8              0x8CE8
+#define GL_COLOR_ATTACHMENT9              0x8CE9
+#define GL_COLOR_ATTACHMENT10             0x8CEA
+#define GL_COLOR_ATTACHMENT11             0x8CEB
+#define GL_COLOR_ATTACHMENT12             0x8CEC
+#define GL_COLOR_ATTACHMENT13             0x8CED
+#define GL_COLOR_ATTACHMENT14             0x8CEE
+#define GL_COLOR_ATTACHMENT15             0x8CEF
+#define GL_DEPTH_ATTACHMENT               0x8D00
+#define GL_STENCIL_ATTACHMENT             0x8D20
+#define GL_FRAMEBUFFER                    0x8D40
+#define GL_RENDERBUFFER                   0x8D41
+#define GL_RENDERBUFFER_WIDTH             0x8D42
+#define GL_RENDERBUFFER_HEIGHT            0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
+#define GL_STENCIL_INDEX1                 0x8D46
+#define GL_STENCIL_INDEX4                 0x8D47
+#define GL_STENCIL_INDEX8                 0x8D48
+#define GL_STENCIL_INDEX16                0x8D49
+#define GL_RENDERBUFFER_RED_SIZE          0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
+#define GL_MAX_SAMPLES                    0x8D57
+#endif
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_MAP_READ_BIT                   0x0001
+#define GL_MAP_WRITE_BIT                  0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
+#endif
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING           0x85B5
+#endif
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_DEPTH_COMPONENT32F             0x8CAC
+#define GL_DEPTH32F_STENCIL8              0x8CAD
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
+#endif
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_FRAMEBUFFER_SRGB               0x8DB9
+#endif
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_HALF_FLOAT_ARB                 0x140B
+#endif
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_COMPRESSED_RED_RGTC1           0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
+#define GL_COMPRESSED_RG_RGTC2            0x8DBD
+#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
+#endif
+
+#ifndef GL_ARB_texture_rg
+#define GL_RG                             0x8227
+#define GL_RG_INTEGER                     0x8228
+#define GL_R8                             0x8229
+#define GL_R16                            0x822A
+#define GL_RG8                            0x822B
+#define GL_RG16                           0x822C
+#define GL_R16F                           0x822D
+#define GL_R32F                           0x822E
+#define GL_RG16F                          0x822F
+#define GL_RG32F                          0x8230
+#define GL_R8I                            0x8231
+#define GL_R8UI                           0x8232
+#define GL_R16I                           0x8233
+#define GL_R16UI                          0x8234
+#define GL_R32I                           0x8235
+#define GL_R32UI                          0x8236
+#define GL_RG8I                           0x8237
+#define GL_RG8UI                          0x8238
+#define GL_RG16I                          0x8239
+#define GL_RG16UI                         0x823A
+#define GL_RG32I                          0x823B
+#define GL_RG32UI                         0x823C
+#endif
+
+
+/*************************************************************/
+
+#include <stddef.h>
+#ifndef GL_VERSION_2_0
+/* GL type for program/shader text */
+typedef char GLchar;
+#endif
+
+#ifndef GL_VERSION_1_5
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptrARB;
+typedef ptrdiff_t GLsizeiptrARB;
+#endif
+
+#ifndef GL_ARB_shader_objects
+/* GL types for program/shader text and shader object handles */
+typedef char GLcharARB;
+typedef unsigned int GLhandleARB;
+#endif
+
+/* GL type for "half" precision (s10e5) float data in host memory */
+#ifndef GL_ARB_half_float_pixel
+typedef unsigned short GLhalfARB;
+#endif
+
+#ifndef GL_NV_half_float
+typedef unsigned short GLhalfNV;
+#endif
+
+#ifndef GL_VERSION_1_0
+#define GL_VERSION_1_0 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glCullFace (GLenum);
+GLAPI void APIENTRY glFrontFace (GLenum);
+GLAPI void APIENTRY glHint (GLenum, GLenum);
+GLAPI void APIENTRY glLineWidth (GLfloat);
+GLAPI void APIENTRY glPointSize (GLfloat);
+GLAPI void APIENTRY glPolygonMode (GLenum, GLenum);
+GLAPI void APIENTRY glScissor (GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glTexParameterf (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glTexParameterfv (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glTexParameteri (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glTexParameteriv (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glTexImage1D (GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexImage2D (GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glDrawBuffer (GLenum);
+GLAPI void APIENTRY glClear (GLbitfield);
+GLAPI void APIENTRY glClearColor (GLclampf, GLclampf, GLclampf, GLclampf);
+GLAPI void APIENTRY glClearStencil (GLint);
+GLAPI void APIENTRY glClearDepth (GLclampd);
+GLAPI void APIENTRY glStencilMask (GLuint);
+GLAPI void APIENTRY glColorMask (GLboolean, GLboolean, GLboolean, GLboolean);
+GLAPI void APIENTRY glDepthMask (GLboolean);
+GLAPI void APIENTRY glDisable (GLenum);
+GLAPI void APIENTRY glEnable (GLenum);
+GLAPI void APIENTRY glFinish (void);
+GLAPI void APIENTRY glFlush (void);
+GLAPI void APIENTRY glBlendFunc (GLenum, GLenum);
+GLAPI void APIENTRY glLogicOp (GLenum);
+GLAPI void APIENTRY glStencilFunc (GLenum, GLint, GLuint);
+GLAPI void APIENTRY glStencilOp (GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glDepthFunc (GLenum);
+GLAPI void APIENTRY glPixelStoref (GLenum, GLfloat);
+GLAPI void APIENTRY glPixelStorei (GLenum, GLint);
+GLAPI void APIENTRY glReadBuffer (GLenum);
+GLAPI void APIENTRY glReadPixels (GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetBooleanv (GLenum, GLboolean *);
+GLAPI void APIENTRY glGetDoublev (GLenum, GLdouble *);
+GLAPI GLenum APIENTRY glGetError (void);
+GLAPI void APIENTRY glGetFloatv (GLenum, GLfloat *);
+GLAPI void APIENTRY glGetIntegerv (GLenum, GLint *);
+GLAPI const GLubyte * APIENTRY glGetString (GLenum);
+GLAPI void APIENTRY glGetTexImage (GLenum, GLint, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetTexParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetTexParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetTexLevelParameterfv (GLenum, GLint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetTexLevelParameteriv (GLenum, GLint, GLenum, GLint *);
+GLAPI GLboolean APIENTRY glIsEnabled (GLenum);
+GLAPI void APIENTRY glDepthRange (GLclampd, GLclampd);
+GLAPI void APIENTRY glViewport (GLint, GLint, GLsizei, GLsizei);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCULLFACEPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLFRONTFACEPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLHINTPROC) (GLenum target, GLenum mode);
+typedef void (APIENTRYP PFNGLLINEWIDTHPROC) (GLfloat width);
+typedef void (APIENTRYP PFNGLPOINTSIZEPROC) (GLfloat size);
+typedef void (APIENTRYP PFNGLPOLYGONMODEPROC) (GLenum face, GLenum mode);
+typedef void (APIENTRYP PFNGLSCISSORPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXIMAGE1DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLDRAWBUFFERPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLCLEARPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLCLEARCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRYP PFNGLCLEARSTENCILPROC) (GLint s);
+typedef void (APIENTRYP PFNGLCLEARDEPTHPROC) (GLclampd depth);
+typedef void (APIENTRYP PFNGLSTENCILMASKPROC) (GLuint mask);
+typedef void (APIENTRYP PFNGLCOLORMASKPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+typedef void (APIENTRYP PFNGLDEPTHMASKPROC) (GLboolean flag);
+typedef void (APIENTRYP PFNGLDISABLEPROC) (GLenum cap);
+typedef void (APIENTRYP PFNGLENABLEPROC) (GLenum cap);
+typedef void (APIENTRYP PFNGLFINISHPROC) (void);
+typedef void (APIENTRYP PFNGLFLUSHPROC) (void);
+typedef void (APIENTRYP PFNGLBLENDFUNCPROC) (GLenum sfactor, GLenum dfactor);
+typedef void (APIENTRYP PFNGLLOGICOPPROC) (GLenum opcode);
+typedef void (APIENTRYP PFNGLSTENCILFUNCPROC) (GLenum func, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILOPPROC) (GLenum fail, GLenum zfail, GLenum zpass);
+typedef void (APIENTRYP PFNGLDEPTHFUNCPROC) (GLenum func);
+typedef void (APIENTRYP PFNGLPIXELSTOREFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELSTOREIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLREADBUFFERPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
+typedef void (APIENTRYP PFNGLGETBOOLEANVPROC) (GLenum pname, GLboolean *params);
+typedef void (APIENTRYP PFNGLGETDOUBLEVPROC) (GLenum pname, GLdouble *params);
+typedef GLenum (APIENTRYP PFNGLGETERRORPROC) (void);
+typedef void (APIENTRYP PFNGLGETFLOATVPROC) (GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETINTEGERVPROC) (GLenum pname, GLint *params);
+typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGPROC) (GLenum name);
+typedef void (APIENTRYP PFNGLGETTEXIMAGEPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC) (GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC) (GLenum target, GLint level, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC) (GLenum cap);
+typedef void (APIENTRYP PFNGLDEPTHRANGEPROC) (GLclampd near_val, GLclampd far_val); /* MSVC can't handle near or far var names */
+typedef void (APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_VERSION_1_1
+#define GL_VERSION_1_1 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glDrawArrays (GLenum, GLint, GLsizei);
+GLAPI void APIENTRY glDrawElements (GLenum, GLsizei, GLenum, const GLvoid *);
+GLAPI void APIENTRY glGetPointerv (GLenum, GLvoid* *);
+GLAPI void APIENTRY glPolygonOffset (GLfloat, GLfloat);
+GLAPI void APIENTRY glCopyTexImage1D (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTexImage2D (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTexSubImage1D (GLenum, GLint, GLint, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyTexSubImage2D (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glBindTexture (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteTextures (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenTextures (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsTexture (GLuint);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, GLvoid* *params);
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETPROC) (GLfloat factor, GLfloat units);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLBINDTEXTUREPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLDELETETEXTURESPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRYP PFNGLGENTEXTURESPROC) (GLsizei n, GLuint *textures);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREPROC) (GLuint texture);
+#endif
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
+GLAPI void APIENTRY glBlendEquation (GLenum);
+GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glActiveTexture (GLenum);
+GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
+GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
+GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
+GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsQuery (GLuint);
+GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
+GLAPI void APIENTRY glEndQuery (GLenum);
+GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
+GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
+GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
+GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
+GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
+GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
+GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
+GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
+GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
+GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
+GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
+GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
+GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
+GLAPI void APIENTRY glCompileShader (GLuint);
+GLAPI GLuint APIENTRY glCreateProgram (void);
+GLAPI GLuint APIENTRY glCreateShader (GLenum);
+GLAPI void APIENTRY glDeleteProgram (GLuint);
+GLAPI void APIENTRY glDeleteShader (GLuint);
+GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
+GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
+GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
+GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
+GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
+GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
+GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
+GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
+GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
+GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
+GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
+GLAPI GLboolean APIENTRY glIsProgram (GLuint);
+GLAPI GLboolean APIENTRY glIsShader (GLuint);
+GLAPI void APIENTRY glLinkProgram (GLuint);
+GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
+GLAPI void APIENTRY glUseProgram (GLuint);
+GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
+GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform1i (GLint, GLint);
+GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glValidateProgram (GLuint);
+GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
+GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
+GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
+GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glUniformMatrix2x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix2x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_VERSION_3_0 1
+/* OpenGL 3.0 also reuses entry points from these extensions: */
+/* ARB_framebuffer_object */
+/* ARB_map_buffer_range */
+/* ARB_vertex_array_object */
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glColorMaski (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
+GLAPI void APIENTRY glGetBooleani_v (GLenum, GLuint, GLboolean *);
+GLAPI void APIENTRY glGetIntegeri_v (GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glEnablei (GLenum, GLuint);
+GLAPI void APIENTRY glDisablei (GLenum, GLuint);
+GLAPI GLboolean APIENTRY glIsEnabledi (GLenum, GLuint);
+GLAPI void APIENTRY glBeginTransformFeedback (GLenum);
+GLAPI void APIENTRY glEndTransformFeedback (void);
+GLAPI void APIENTRY glBindBufferRange (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
+GLAPI void APIENTRY glBindBufferBase (GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint, GLsizei, const GLchar* *, GLenum);
+GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
+GLAPI void APIENTRY glClampColor (GLenum, GLenum);
+GLAPI void APIENTRY glBeginConditionalRender (GLuint, GLenum);
+GLAPI void APIENTRY glEndConditionalRender (void);
+GLAPI void APIENTRY glVertexAttribIPointer (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetVertexAttribIiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint, GLenum, GLuint *);
+GLAPI void APIENTRY glGetUniformuiv (GLuint, GLint, GLuint *);
+GLAPI void APIENTRY glBindFragDataLocation (GLuint, GLuint, const GLchar *);
+GLAPI GLint APIENTRY glGetFragDataLocation (GLuint, const GLchar *);
+GLAPI void APIENTRY glUniform1ui (GLint, GLuint);
+GLAPI void APIENTRY glUniform2ui (GLint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform3ui (GLint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform4ui (GLint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform1uiv (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform2uiv (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform3uiv (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform4uiv (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glTexParameterIiv (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glTexParameterIuiv (GLenum, GLenum, const GLuint *);
+GLAPI void APIENTRY glGetTexParameterIiv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetTexParameterIuiv (GLenum, GLenum, GLuint *);
+GLAPI void APIENTRY glClearBufferiv (GLenum, GLint, const GLint *);
+GLAPI void APIENTRY glClearBufferuiv (GLenum, GLint, const GLuint *);
+GLAPI void APIENTRY glClearBufferfv (GLenum, GLint, const GLfloat *);
+GLAPI void APIENTRY glClearBufferfi (GLenum, GLint, GLfloat, GLint);
+GLAPI const GLubyte * APIENTRY glGetStringi (GLenum, GLuint);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
+#endif
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_ARB_framebuffer_object 1
+#ifdef GL3_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint);
+GLAPI void APIENTRY glBindRenderbuffer (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenRenderbuffers (GLsizei, GLuint *);
+GLAPI void APIENTRY glRenderbufferStorage (GLenum, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum, GLenum, GLint *);
+GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint);
+GLAPI void APIENTRY glBindFramebuffer (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteFramebuffers (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenFramebuffers (GLsizei, GLuint *);
+GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum);
+GLAPI void APIENTRY glFramebufferTexture1D (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture2D (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture3D (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGenerateMipmap (GLenum);
+GLAPI void APIENTRY glBlitFramebuffer (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
+GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glFramebufferTextureLayer (GLenum, GLenum, GLuint, GLint, GLint);
+#endif /* GL3_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_ARB_map_buffer_range 1
+#ifdef GL3_PROTOTYPES
+GLAPI GLvoid* APIENTRY glMapBufferRange (GLenum, GLintptr, GLsizeiptr, GLbitfield);
+GLAPI void APIENTRY glFlushMappedBufferRange (GLenum, GLintptr, GLsizeiptr);
+#endif /* GL3_PROTOTYPES */
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+#endif
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_ARB_vertex_array_object 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArray (GLuint);
+GLAPI void APIENTRY glDeleteVertexArrays (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenVertexArrays (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsVertexArray (GLuint);
+#endif /* GL3_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
+#endif
+
+/* Include Post-GL 3.0 changes and extensions */
+#include <GL3/gl3ext.h>
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/make/stub_includes/opengl/GL3_/gl3ext.h b/make/stub_includes/opengl/GL3_/gl3ext.h
new file mode 100644
index 000000000..aa1ecb542
--- /dev/null
+++ b/make/stub_includes/opengl/GL3_/gl3ext.h
@@ -0,0 +1,579 @@
+#ifndef __gl3ext_h_
+#define __gl3ext_h_
+
+#include "gl3-64bit-types.h"
+
+/*
+ * ------------------------------------------------
+ * Everything here and below was added manually
+ * to the version of glext.h obtained from:
+ * http://oss.sgi.com/projects/ogl-sample/registry/index.html
+ * ------------------------------------------------
+ *
+ * Structure is:
+ *    #ifndef GL_EXTENSION_NAME
+ *    Add DEFINES here
+ *    #endif
+ *    #ifndef GL_EXTENSION_NAME
+ *    Add TYPEDEFS here
+ *    #endif
+ *    #ifndef GL_EXTENSION_NAME
+ *    #define GL_EXTENSION_NAME 1
+ *    #ifdef GL_GL3EXT_PROTOTYPES
+ *    Add FUNCTION DECLARATIONS here
+ *    #endif
+ *    FUNCTION POINTER DECLARATIONS NOT NEEDED
+ *    #endif
+ */
+  
+
+#ifndef GL_VERSION_3_1
+#define GL_SAMPLER_2D_RECT                0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW         0x8B64
+#define GL_SAMPLER_BUFFER                 0x8DC2
+#define GL_INT_SAMPLER_2D_RECT            0x8DCD
+#define GL_INT_SAMPLER_BUFFER             0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT   0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER    0x8DD8
+#define GL_TEXTURE_BUFFER                 0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE        0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER         0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT          0x8C2E
+#define GL_TEXTURE_RECTANGLE              0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
+#define GL_RED_SNORM                      0x8F90
+#define GL_RG_SNORM                       0x8F91
+#define GL_RGB_SNORM                      0x8F92
+#define GL_RGBA_SNORM                     0x8F93
+#define GL_R8_SNORM                       0x8F94
+#define GL_RG8_SNORM                      0x8F95
+#define GL_RGB8_SNORM                     0x8F96
+#define GL_RGBA8_SNORM                    0x8F97
+#define GL_R16_SNORM                      0x8F98
+#define GL_RG16_SNORM                     0x8F99
+#define GL_RGB16_SNORM                    0x8F9A
+#define GL_RGBA16_SNORM                   0x8F9B
+#define GL_SIGNED_NORMALIZED              0x8F9C
+#define GL_PRIMITIVE_RESTART              0x8F9D
+#define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
+/* Reuse tokens from ARB_copy_buffer */
+/* reuse GL_COPY_READ_BUFFER */
+/* reuse GL_COPY_WRITE_BUFFER */
+/* Would reuse tokens from ARB_draw_instanced, but it has none */
+/* Reuse tokens from ARB_uniform_buffer_object */
+/* reuse GL_UNIFORM_BUFFER */
+/* reuse GL_UNIFORM_BUFFER_BINDING */
+/* reuse GL_UNIFORM_BUFFER_START */
+/* reuse GL_UNIFORM_BUFFER_SIZE */
+/* reuse GL_MAX_VERTEX_UNIFORM_BLOCKS */
+/* reuse GL_MAX_FRAGMENT_UNIFORM_BLOCKS */
+/* reuse GL_MAX_COMBINED_UNIFORM_BLOCKS */
+/* reuse GL_MAX_UNIFORM_BUFFER_BINDINGS */
+/* reuse GL_MAX_UNIFORM_BLOCK_SIZE */
+/* reuse GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS */
+/* reuse GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT */
+/* reuse GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH */
+/* reuse GL_ACTIVE_UNIFORM_BLOCKS */
+/* reuse GL_UNIFORM_TYPE */
+/* reuse GL_UNIFORM_SIZE */
+/* reuse GL_UNIFORM_NAME_LENGTH */
+/* reuse GL_UNIFORM_BLOCK_INDEX */
+/* reuse GL_UNIFORM_OFFSET */
+/* reuse GL_UNIFORM_ARRAY_STRIDE */
+/* reuse GL_UNIFORM_MATRIX_STRIDE */
+/* reuse GL_UNIFORM_IS_ROW_MAJOR */
+/* reuse GL_UNIFORM_BLOCK_BINDING */
+/* reuse GL_UNIFORM_BLOCK_DATA_SIZE */
+/* reuse GL_UNIFORM_BLOCK_NAME_LENGTH */
+/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS */
+/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER */
+/* reuse GL_INVALID_INDEX */
+#endif
+#ifndef GL_VERSION_3_1
+#define GL_VERSION_3_1 1
+/* OpenGL 3.1 also reuses entry points from these extensions: */
+/* ARB_copy_buffer */
+/* ARB_uniform_buffer_object */
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstanced (GLenum, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glDrawElementsInstanced (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
+GLAPI void APIENTRY glTexBuffer (GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint);
+#endif /* GL3_PROTOTYPES */
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+
+#ifndef GL_ARB_copy_buffer
+#define GL_COPY_READ_BUFFER               0x8F36
+#define GL_COPY_WRITE_BUFFER              0x8F37
+#endif
+#ifndef GL_ARB_copy_buffer
+#define GL_ARB_copy_buffer 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glCopyBufferSubData (GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr);
+#endif /* GL3_PROTOTYPES */
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_UNIFORM_BUFFER                 0x8A11
+#define GL_UNIFORM_BUFFER_BINDING         0x8A28
+#define GL_UNIFORM_BUFFER_START           0x8A29
+#define GL_UNIFORM_BUFFER_SIZE            0x8A2A
+#define GL_MAX_VERTEX_UNIFORM_BLOCKS      0x8A2B
+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS    0x8A2C
+#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS    0x8A2D
+#define GL_MAX_COMBINED_UNIFORM_BLOCKS    0x8A2E
+#define GL_MAX_UNIFORM_BUFFER_BINDINGS    0x8A2F
+#define GL_MAX_UNIFORM_BLOCK_SIZE         0x8A30
+#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
+#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
+#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
+#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
+#define GL_ACTIVE_UNIFORM_BLOCKS          0x8A36
+#define GL_UNIFORM_TYPE                   0x8A37
+#define GL_UNIFORM_SIZE                   0x8A38
+#define GL_UNIFORM_NAME_LENGTH            0x8A39
+#define GL_UNIFORM_BLOCK_INDEX            0x8A3A
+#define GL_UNIFORM_OFFSET                 0x8A3B
+#define GL_UNIFORM_ARRAY_STRIDE           0x8A3C
+#define GL_UNIFORM_MATRIX_STRIDE          0x8A3D
+#define GL_UNIFORM_IS_ROW_MAJOR           0x8A3E
+#define GL_UNIFORM_BLOCK_BINDING          0x8A3F
+#define GL_UNIFORM_BLOCK_DATA_SIZE        0x8A40
+#define GL_UNIFORM_BLOCK_NAME_LENGTH      0x8A41
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS  0x8A42
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
+/** Manual: #define GL_INVALID_INDEX                  -1 == (int) 0xFFFFFFFFu */
+#endif
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_ARB_uniform_buffer_object 1
+#ifdef GL3_PROTOTYPES
+GLAPI void APIENTRY glGetUniformIndices (GLuint, GLsizei, const GLchar* *, GLuint *);
+GLAPI void APIENTRY glGetActiveUniformsiv (GLuint, GLsizei, const GLuint *, GLenum, GLint *);
+GLAPI void APIENTRY glGetActiveUniformName (GLuint, GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint, const GLchar *);
+GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint, GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint, GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI void APIENTRY glUniformBlockBinding (GLuint, GLuint, GLuint);
+#endif /* GL3_PROTOTYPES */
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+
+#ifndef GL_VERSION_3_2
+#define GL_VERSION_3_2 1
+/* OpenGL 3.2 also reuses entry points from these extensions: */
+/* ARB_vertex_array_bgra */
+/* ARB_draw_elements_base_vertex */
+/* ARB_fragment_coord_conventions */
+/* ARB_provoking_vertex */
+/* ARB_seamless_cube_map */
+/* ARB_texture_multisample */
+/* ARB_depth_clamp */
+/* ARB_geometry_shader4 */
+/* ARB_sync */
+#ifdef GL_GL3EXT_PROTOTYPES
+#endif /* GL3_PROTOTYPES */
+#endif
+
+/**
+ * http://www.opengl.org/registry/specs/ARB/vertex_array_bgra.txt
+ */
+#ifndef GL_ARB_vertex_array_bgra
+#define GL_BGRA 0x80E1
+#endif
+#ifndef GL_ARB_vertex_array_bgra
+#define GL_ARB_vertex_array_bgra 1
+#ifdef GL_GL3EXT_PROTOTYPES
+/* No FUNCTIONS */
+#endif
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+/**
+ * http://www.opengl.org/registry/specs/ARB/draw_elements_base_vertex.txt
+ */
+#ifndef GL_ARB_draw_elements_base_vertex
+/* No TOKENS */
+#endif
+#ifndef GL_ARB_draw_elements_base_vertex
+#define GL_ARB_draw_elements_base_vertex 1
+#ifdef GL_GL3EXT_PROTOTYPES
+GLAPI void APIENTRY glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
+         GLvoid *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
+         GLsizei count, GLenum type, GLvoid *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count,
+         GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
+GLAPI void APIENTRY glMultiDrawElementsBaseVertex(GLenum mode, GLsizei *count, GLenum type,
+         GLvoid **indices, GLsizei primcount, GLint *basevertex);
+#endif
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+/**
+ * http://www.opengl.org/registry/specs/ARB/fragment_coord_conventions.txt
+ */
+#ifndef GL_ARB_fragment_coord_conventions
+/* No Tokens */
+#endif
+#ifndef GL_ARB_fragment_coord_conventions
+#define GL_ARB_fragment_coord_conventions 1
+#ifdef GL_GL3EXT_PROTOTYPES
+/* No Functions */
+#endif
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+/**
+ * http://www.opengl.org/registry/specs/ARB/provoking_vertex.txt
+ */
+#ifndef GL_ARB_provoking_vertex
+#define GL_FIRST_VERTEX_CONVENTION                   0x8E4D
+#define GL_LAST_VERTEX_CONVENTION                    0x8E4E
+#define GL_PROVOKING_VERTEX                          0x8E4F
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION  0x8E4C
+#endif
+#ifndef GL_ARB_provoking_vertex
+#define GL_ARB_provoking_vertex 1
+#ifdef GL_GL3EXT_PROTOTYPES
+GLAPI void APIENTRY glProvokingVertex(GLenum mode);
+#endif
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+/**
+ * http://www.opengl.org/registry/specs/ARB/seamless_cube_map.txt
+ */
+#ifndef GL_ARB_seamless_cube_map
+#define GL_TEXTURE_CUBE_MAP_SEAMLESS                   0x884F
+#endif
+#ifndef GL_ARB_seamless_cube_map
+#define GL_ARB_seamless_cube_map 1
+#ifdef GL_GL3EXT_PROTOTYPES
+/* No Functions */
+#endif
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+/**
+ * http://www.opengl.org/registry/specs/ARB/texture_multisample.txt
+ */
+#ifndef GL_ARB_texture_multisample
+#define GL_SAMPLE_POSITION                             0x8E50
+#define GL_SAMPLE_MASK                                 0x8E51
+#define GL_SAMPLE_MASK_VALUE                           0x8E52
+#define GL_TEXTURE_2D_MULTISAMPLE                      0x9100
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE                0x9101
+#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY                0x9102
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY          0x9103
+#define GL_MAX_SAMPLE_MASK_WORDS                       0x8E59
+#define GL_MAX_COLOR_TEXTURE_SAMPLES                   0x910E
+#define GL_MAX_DEPTH_TEXTURE_SAMPLES                   0x910F
+#define GL_MAX_INTEGER_SAMPLES                         0x9110
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE              0x9104
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY        0x9105
+#define GL_TEXTURE_SAMPLES                             0x9106
+#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS              0x9107
+#define GL_SAMPLER_2D_MULTISAMPLE                      0x9108
+#define GL_INT_SAMPLER_2D_MULTISAMPLE                  0x9109
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE         0x910A
+#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY                0x910B
+#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY            0x910C
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910D
+#endif
+#ifndef GL_ARB_texture_multisample
+#define GL_ARB_texture_multisample 1
+#ifdef GL_GL3EXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat,
+                               GLsizei width, GLsizei height,
+                               GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat,
+                               GLsizei width, GLsizei height, GLsizei depth,
+                               GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaski(GLuint index, GLbitfield mask);
+#endif
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+/**
+ * http://www.opengl.org/registry/specs/ARB/depth_clamp.txt
+ */
+#ifndef GL_ARB_depth_clamp
+#define GL_DEPTH_CLAMP 0x864F
+#endif
+#ifndef GL_ARB_depth_clamp
+#define GL_ARB_depth_clamp 1
+#ifdef GL_GL3EXT_PROTOTYPES
+/* No FUNCTIONS */
+#endif
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+/**
+ * http://www.opengl.org/registry/specs/ARB/geometry_shader4.txt
+ */
+#ifndef GL_ARB_geometry_shader4
+#define GL_LINES_ADJACENCY_ARB            0x000A
+#define GL_LINE_STRIP_ADJACENCY_ARB       0x000B
+#define GL_TRIANGLES_ADJACENCY_ARB        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_ARB   0x000D
+#define GL_PROGRAM_POINT_SIZE_ARB         0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
+#define GL_GEOMETRY_SHADER_ARB            0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_ARB      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_ARB        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_ARB       0x8DDC
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
+/* reuse GL_MAX_VARYING_COMPONENTS */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+#endif
+#ifndef GL_ARB_geometry_shader4
+#define GL_ARB_geometry_shader4 1
+#ifdef GL_GL3EXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriARB (GLuint, GLenum, GLint);
+GLAPI void APIENTRY glFramebufferTextureARB (GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum, GLenum, GLuint, GLint, GLenum);
+#endif
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+/**
+ * http://www.opengl.org/registry/specs/ARB/sync.txt
+ */
+#ifndef GL_ARB_sync
+#define GL_MAX_SERVER_WAIT_TIMEOUT    0x9111
+#define GL_OBJECT_TYPE                0x9112
+#define GL_SYNC_CONDITION             0x9113
+#define GL_SYNC_STATUS                0x9114
+#define GL_SYNC_FLAGS                 0x9115
+#define GL_SYNC_FENCE                 0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117
+#define GL_UNSIGNALED                 0x9118
+#define GL_SIGNALED                   0x9119
+#define GL_SYNC_FLUSH_COMMANDS_BIT    0x00000001
+/* Manual: #define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFul */
+#define GL_ALREADY_SIGNALED           0x911A
+#define GL_TIMEOUT_EXPIRED            0x911B
+#define GL_CONDITION_SATISFIED        0x911C
+#define GL_WAIT_FAILED                0x911D
+#endif
+#ifndef GL_ARB_sync
+typedef int64_t GLint64;
+typedef uint64_t GLuint64;
+typedef struct __GLsync *GLsync;
+#endif
+#ifndef GL_ARB_sync
+#define GL_ARB_sync 1
+#ifdef GL_GL3EXT_PROTOTYPES
+GLAPI GLsync    APIENTRY glFenceSync(GLenum condition, GLbitfield flags);
+GLAPI GLboolean APIENTRY glIsSync(GLsync sync);
+GLAPI void      APIENTRY glDeleteSync(GLsync sync);
+GLAPI GLenum    APIENTRY glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void      APIENTRY glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void      APIENTRY glGetInteger64v(GLenum pname, GLint64 *params);
+GLAPI void      APIENTRY glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+#endif
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+/**
+ * Convenient names only .. actually subsumed into core
+ */
+#ifndef GL_ARB_texture_rectangle
+#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#endif
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_ARB_texture_rectangle 1
+#endif
+
+/**
+ * http://www.opengl.org/registry/specs/AMD/vertex_shader_tessellator.txt
+ */
+#ifndef GL_AMD_vertex_shader_tessellator
+#define GL_SAMPLER_BUFFER_AMD                0x9001
+#define GL_INT_SAMPLER_BUFFER_AMD            0x9002
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD   0x9003
+#define GL_DISCRETE_AMD                      0x9006
+#define GL_CONTINUOUS_AMD                    0x9007
+#define GL_TESSELLATION_MODE_AMD             0x9004
+#define GL_TESSELLATION_FACTOR_AMD           0x9005
+#endif
+#ifndef GL_AMD_vertex_shader_tessellator
+#define GL_AMD_vertex_shader_tessellator 1
+#ifdef GL_GL3EXT_PROTOTYPES
+GLAPI void APIENTRY glTessellationFactorAMD(GLfloat factor);
+GLAPI void APIENTRY glTessellationModeAMD(GLenum mode);
+#endif
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+/**
+ * http://www.opengl.org/registry/specs/NV/shader_buffer_load.txt
+ */
+#ifndef GL_NV_shader_buffer_load
+#define GL_BUFFER_GPU_ADDRESS_NV          0x8F1D
+#define GL_GPU_ADDRESS_NV                 0x8F34
+#define GL_MAX_SHADER_BUFFER_ADDRESS_NV   0x8F35
+#endif
+#ifndef GL_NV_shader_buffer_load
+#define GL_NV_shader_buffer_load 1
+#ifdef GL_GL3EXT_PROTOTYPES
+GLAPI void APIENTRY glMakeBufferResidentNV(GLenum target, GLenum access);
+GLAPI void APIENTRY glMakeBufferNonResidentNV(GLenum target);
+GLAPI GLboolean APIENTRY glIsBufferResidentNV(GLenum target);
+GLAPI void APIENTRY glNamedMakeBufferResidentNV(GLuint buffer, GLenum access);
+GLAPI void APIENTRY glNamedMakeBufferNonResidentNV(GLuint buffer);
+GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV(GLuint buffer);
+GLAPI void APIENTRY glGetBufferParameterui64vNV(GLenum target, GLenum pname, GLuint64 *params);
+GLAPI void APIENTRY glGetNamedBufferParameterui64vNV(GLuint buffer, GLenum pname, GLuint64 *params);
+GLAPI void APIENTRY glGetIntegerui64vNV(GLenum value, GLuint64 *result);
+GLAPI void APIENTRY glUniformui64NV(GLint location, GLuint64 value);
+GLAPI void APIENTRY glUniformui64vNV(GLint location, GLsizei count, GLuint64 *value);
+GLAPI void APIENTRY glGetUniformui64vNV(GLuint program, GLint location, GLuint64 *params);
+GLAPI void APIENTRY glProgramUniformui64NV(GLuint program, GLint location, GLuint64 value);
+GLAPI void APIENTRY glProgramUniformui64vNV(GLuint program, GLint location, GLsizei count, GLuint64 *value);
+#endif /* GL_GL3EXT_PROTOTYPES */
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+/**
+ * http://www.opengl.org/registry/specs/NV/vertex_buffer_unified_memory.txt
+ */
+#ifndef GL_NV_vertex_buffer_unified_memory
+#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV   0x8F1E
+#define GL_ELEMENT_ARRAY_UNIFIED_NV         0x8F1F
+#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV   0x8F20
+#define GL_VERTEX_ARRAY_ADDRESS_NV          0x8F21
+#define GL_NORMAL_ARRAY_ADDRESS_NV          0x8F22
+#define GL_COLOR_ARRAY_ADDRESS_NV           0x8F23
+#define GL_INDEX_ARRAY_ADDRESS_NV           0x8F24
+#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV   0x8F25
+#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV       0x8F26
+#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
+#define GL_FOG_COORD_ARRAY_ADDRESS_NV       0x8F28
+#define GL_ELEMENT_ARRAY_ADDRESS_NV         0x8F29
+#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV    0x8F2A
+#define GL_VERTEX_ARRAY_LENGTH_NV           0x8F2B
+#define GL_NORMAL_ARRAY_LENGTH_NV           0x8F2C
+#define GL_COLOR_ARRAY_LENGTH_NV            0x8F2D
+#define GL_INDEX_ARRAY_LENGTH_NV            0x8F2E
+#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV    0x8F2F
+#define GL_EDGE_FLAG_ARRAY_LENGTH_NV        0x8F30
+#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV  0x8F31
+#define GL_FOG_COORD_ARRAY_LENGTH_NV        0x8F32
+#define GL_ELEMENT_ARRAY_LENGTH_NV          0x8F33
+#endif
+#ifndef GL_NV_vertex_buffer_unified_memory
+#define GL_NV_vertex_buffer_unified_memory 1
+#ifdef GL_GL3EXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsEnabled( GLenum cap );     // extra requirement in core GL3
+GLAPI void APIENTRY glEnableClientState( GLenum cap );  // extra requirement in core GL3
+GLAPI void APIENTRY glDisableClientState( GLenum cap ); // extra requirement in core GL3
+GLAPI void APIENTRY glBufferAddressRangeNV(GLenum pname, GLuint index, GLuint64 address, GLsizeiptr length);
+GLAPI void APIENTRY glVertexFormatNV(GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glNormalFormatNV(GLenum type, GLsizei stride);
+GLAPI void APIENTRY glColorFormatNV(GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glIndexFormatNV(GLenum type, GLsizei stride);
+GLAPI void APIENTRY glTexCoordFormatNV(GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glEdgeFlagFormatNV(GLsizei stride);
+GLAPI void APIENTRY glSecondaryColorFormatNV(GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glFogCoordFormatNV(GLenum type, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribFormatNV(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribIFormatNV(GLuint index, GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glGetIntegerui64i_vNV(GLenum value, GLuint index, GLuint64 *result);
+#endif /* GL_GL3EXT_PROTOTYPES */
+/* No need for explicit function pointer: we force generation of ProcAddress .. */
+#endif
+
+
+#ifndef GL_APPLE_float_pixels
+#define GL_HALF_APPLE                      0x140B
+#define GL_COLOR_FLOAT_APPLE               0x8A0F
+#define GL_RGBA_FLOAT32_APPLE              0x8814
+#define GL_RGB_FLOAT32_APPLE               0x8815
+#define GL_ALPHA_FLOAT32_APPLE             0x8816
+#define GL_INTENSITY_FLOAT32_APPLE         0x8817
+#define GL_LUMINANCE_FLOAT32_APPLE         0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE   0x8819
+#define GL_RGBA_FLOAT16_APPLE              0x881A
+#define GL_RGB_FLOAT16_APPLE               0x881B
+#define GL_ALPHA_FLOAT16_APPLE             0x881C
+#define GL_INTENSITY_FLOAT16_APPLE         0x881D
+#define GL_LUMINANCE_FLOAT16_APPLE         0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE   0x881F
+#endif
+
+#ifndef GL_APPLE_float_pixels
+#define GL_APPLE_float_pixels 1
+#endif
+
+#ifndef GL_ATI_texture_float
+#define GL_RGBA_FLOAT32_ATI               0x8814
+#define GL_RGB_FLOAT32_ATI                0x8815
+#define GL_ALPHA_FLOAT32_ATI              0x8816
+#define GL_INTENSITY_FLOAT32_ATI          0x8817
+#define GL_LUMINANCE_FLOAT32_ATI          0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
+#define GL_RGBA_FLOAT16_ATI               0x881A
+#define GL_RGB_FLOAT16_ATI                0x881B
+#define GL_ALPHA_FLOAT16_ATI              0x881C
+#define GL_INTENSITY_FLOAT16_ATI          0x881D
+#define GL_LUMINANCE_FLOAT16_ATI          0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
+#endif
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+#endif
+
+#ifndef GL_NV_float_buffer
+#define GL_FLOAT_R_NV                     0x8880
+#define GL_FLOAT_RG_NV                    0x8881
+#define GL_FLOAT_RGB_NV                   0x8882
+#define GL_FLOAT_RGBA_NV                  0x8883
+#define GL_FLOAT_R16_NV                   0x8884
+#define GL_FLOAT_R32_NV                   0x8885
+#define GL_FLOAT_RG16_NV                  0x8886
+#define GL_FLOAT_RG32_NV                  0x8887
+#define GL_FLOAT_RGB16_NV                 0x8888
+#define GL_FLOAT_RGB32_NV                 0x8889
+#define GL_FLOAT_RGBA16_NV                0x888A
+#define GL_FLOAT_RGBA32_NV                0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
+#define GL_FLOAT_RGBA_MODE_NV             0x888E
+#endif
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+#endif
+
+#endif /* __gl3ext_h_ */
+
diff --git a/make/stub_includes/opengl/gl4.c b/make/stub_includes/opengl/gl4.c
new file mode 100644
index 000000000..cf8a709f7
--- /dev/null
+++ b/make/stub_includes/opengl/gl4.c
@@ -0,0 +1,11 @@
+#define GLAPI
+
+// Define GL4_PROTOTYPES so that the OpenGL prototypes in
+// "gl3.h" are parsed.
+#define GL4_PROTOTYPES
+
+// Define GL_GL4EXT_PROTOTYPES so that the OpenGL extension prototypes in
+// "gl3ext.h" are parsed.
+#define GL_GL4EXT_PROTOTYPES
+
+#include <GL4/gl3.h>
diff --git a/src/jogl/classes/com/sun/opengl/impl/DRIHack.java b/src/jogl/classes/com/sun/opengl/impl/DRIHack.java
index 63a2f7ecd..c55e9ec3e 100755
--- a/src/jogl/classes/com/sun/opengl/impl/DRIHack.java
+++ b/src/jogl/classes/com/sun/opengl/impl/DRIHack.java
@@ -41,7 +41,7 @@ package com.sun.opengl.impl;
 
 import java.io.*;
 import java.security.*;
-import com.sun.gluegen.runtime.*;
+import com.jogamp.gluegen.runtime.*;
 
 /**
  * Helper class for working around problems with open-source DRI
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java
index 1d500bb17..70de5b8ba 100644
--- a/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java
+++ b/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java
@@ -44,8 +44,8 @@ import java.lang.reflect.*;
 
 import javax.media.opengl.*;
 import com.sun.nativewindow.impl.NWReflection;
-import com.sun.gluegen.runtime.*;
-import com.sun.gluegen.runtime.opengl.*;
+import com.jogamp.gluegen.runtime.*;
+import com.jogamp.gluegen.runtime.opengl.*;
 
 public abstract class GLContextImpl extends GLContext {
   protected GLContextLock lock = new GLContextLock();
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java
index ceef07727..9f39c67cb 100644
--- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java
@@ -42,7 +42,7 @@ package com.sun.opengl.impl;
 import java.nio.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.sun.gluegen.runtime.*;
+import com.jogamp.gluegen.runtime.*;
 import com.sun.nativewindow.impl.NWReflection;
 import java.lang.reflect.*;
 
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java
index befee170f..d29018116 100644
--- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java
+++ b/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java
@@ -41,7 +41,7 @@ package com.sun.opengl.impl;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 public abstract class GLDrawableImpl implements GLDrawable {
   protected static final boolean DEBUG = Debug.debug("GLDrawable");
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java
index 756f6afd4..3e67469b4 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java
@@ -38,7 +38,7 @@ package com.sun.opengl.impl.egl;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.ProcAddressTable;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
 import java.nio.*;
 import java.util.*;
 
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java
index dd801e4e2..b0a5a93d6 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java
@@ -37,7 +37,7 @@ package com.sun.opengl.impl.egl;
 
 import com.sun.opengl.impl.GLDrawableImpl;
 import com.sun.nativewindow.impl.NWReflection;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
index e9a622cc5..6b508c716 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
@@ -40,7 +40,7 @@ import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
 import com.sun.nativewindow.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.NativeLibrary;
 
 public class EGLDrawableFactory extends GLDrawableFactoryImpl {
   
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
index 00973de89..93c4b665f 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
@@ -40,8 +40,8 @@ import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
 import com.sun.nativewindow.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 import java.security.*;
 
 /**
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
index 7e60e25c0..4968d0f88 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
@@ -40,7 +40,7 @@ import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
 import com.sun.nativewindow.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.NativeLibrary;
 
 /**
  * Implementation of the EGLDynamicLookupHelper for ES1.
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java
index cfd0558c9..ce0edef6a 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java
@@ -40,7 +40,7 @@ import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
 import com.sun.nativewindow.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.NativeLibrary;
 
 /**
  * Implementation of the EGLDynamicLookupHelper for ES2.
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java
index 5ab3c3ed5..84e4ab19d 100644
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java
@@ -40,7 +40,7 @@ import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.NativeLibrary;
 
 public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
     protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java
index c1a5bd583..957b7b7fe 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java
@@ -38,7 +38,7 @@ package com.sun.opengl.impl.egl;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.ProcAddressTable;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
 import java.nio.*;
 import java.util.*;
 
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java
index 2a7a7705c..085f9c4b9 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java
@@ -38,7 +38,7 @@ package com.sun.opengl.impl.egl;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.ProcAddressTable;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
 import java.nio.*;
 import java.util.*;
 
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java
index ef3e9f930..bd2162efc 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java
@@ -44,7 +44,7 @@ import java.util.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.ProcAddressTable;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
 
 public abstract class MacOSXCGLContext extends GLContextImpl
 {	
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
index b417668da..14df40ef1 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
+++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
@@ -42,7 +42,7 @@ package com.sun.opengl.impl.macosx.cgl;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 public abstract class MacOSXCGLDrawable extends GLDrawableImpl {
   // The Java2D/OpenGL pipeline on OS X uses low-level CGLContextObjs
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
index be18ee2da..928bc8151 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
+++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
@@ -46,7 +46,7 @@ import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
 import com.sun.nativewindow.impl.*;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
   public MacOSXCGLDrawableFactory() {
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
index c94efc92b..6bfa41167 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
@@ -35,11 +35,8 @@
 
 package com.sun.opengl.impl.macosx.cgl;
 
-import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
 
 public class MacOSXCGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
     long pixelformat;
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
index b433b6b38..abb7ba11e 100755
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
+++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
@@ -39,8 +39,6 @@
 
 package com.sun.opengl.impl.windows.wgl;
 
-import java.nio.*;
-import java.util.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.sun.opengl.impl.*;
@@ -53,7 +51,7 @@ public class WindowsExternalWGLContext extends WindowsWGLContext {
 
   private WindowsExternalWGLContext(Drawable drawable, long hglrc, WindowsWGLGraphicsConfiguration cfg) {
     super(drawable, null);
-    this.hglrc = hglrc;
+    this.context = hglrc;
     if (DEBUG) {
       System.err.println(getThreadName() + ": !!! Created external OpenGL context " + toHexString(hglrc) + " for " + this);
     }
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java
index 497e9f03b..eb860a3e3 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java
+++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java
@@ -44,7 +44,7 @@ import java.util.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.ProcAddressTable;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
 
 public class WindowsWGLContext extends GLContextImpl {
   protected long hglrc;
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java
index 91604d18e..4bd5e47b2 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java
+++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java
@@ -42,7 +42,7 @@ package com.sun.opengl.impl.windows.wgl;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 public abstract class WindowsWGLDrawable extends GLDrawableImpl {
   private static final int MAX_SET_PIXEL_FORMAT_FAIL_COUNT = 5;
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
index e37179191..2a222c693 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
+++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
@@ -45,7 +45,7 @@ import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
 import com.sun.nativewindow.impl.NWReflection;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 import com.sun.nativewindow.impl.NullWindow;
 
 public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
index d6ea21b15..158be9df6 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
@@ -36,7 +36,7 @@ import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.NativeLibrary;
 
 public class WindowsWGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
     // Keep this under the same debug flag as the drawable factory for convenience
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
index 75a6b221a..101d9fa42 100755
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
+++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
@@ -46,7 +46,7 @@ import com.sun.opengl.impl.*;
 import com.sun.nativewindow.impl.NullWindow;
 import com.sun.nativewindow.impl.x11.*;
 
-import com.sun.gluegen.runtime.PointerBuffer;
+import com.jogamp.gluegen.runtime.PointerBuffer;
 
 public class X11ExternalGLXDrawable extends X11GLXDrawable {
   private int fbConfigID;
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java
index 330d0a473..e37d27d1a 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java
@@ -47,7 +47,7 @@ import javax.media.nativewindow.x11.*;
 import com.sun.opengl.impl.*;
 import com.sun.opengl.impl.x11.glx.*;
 import com.sun.nativewindow.impl.x11.*;
-import com.sun.gluegen.runtime.ProcAddressTable;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
 
 public abstract class X11GLXContext extends GLContextImpl {
   protected long context;
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java
index c2a1987cc..5440685aa 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java
+++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java
@@ -43,7 +43,7 @@ import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
 import com.sun.nativewindow.impl.x11.*;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 public abstract class X11GLXDrawable extends GLDrawableImpl {
   protected X11GLXDrawable(GLDrawableFactory factory, NativeWindow comp, boolean realized) {
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java
index 09bea723f..eafd68070 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java
@@ -42,8 +42,8 @@ import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
-import com.sun.gluegen.runtime.*;
-import com.sun.gluegen.runtime.opengl.*;
+import com.jogamp.gluegen.runtime.*;
+import com.jogamp.gluegen.runtime.opengl.*;
 import com.sun.opengl.impl.*;
 import com.sun.opengl.impl.x11.glx.*;
 import com.sun.nativewindow.impl.NullWindow;
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
index e1dca3af0..2d2f7ad33 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
+++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
@@ -37,8 +37,8 @@ import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
-import com.sun.gluegen.runtime.PointerBuffer;
+import com.jogamp.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.PointerBuffer;
 import com.sun.nativewindow.impl.x11.*;
 
 public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implements Cloneable {
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
index 808f2ab7d..8a151a074 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
@@ -41,7 +41,7 @@ import javax.media.opengl.*;
 import com.sun.opengl.impl.*;
 import com.sun.opengl.impl.x11.glx.*;
 
-import com.sun.gluegen.runtime.PointerBuffer;
+import com.jogamp.gluegen.runtime.PointerBuffer;
 
 /** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
     are used on X11 platforms. Toolkits will likely need to delegate
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
index 6f44f10b7..a702332cd 100755
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
+++ b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
@@ -7,7 +7,7 @@ package com.sun.opengl.util.glsl.fixedfunc.impl;
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
 import javax.media.opengl.glu.*;
-import com.sun.gluegen.runtime.BufferFactory;
+import com.jogamp.gluegen.runtime.BufferFactory;
 import com.sun.opengl.util.*;
 import com.sun.opengl.util.glsl.*;
 import java.nio.*;
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index 840de4764..3ca1cd317 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -39,7 +39,6 @@
 
 package javax.media.opengl;
 
-import com.sun.opengl.impl.Debug;
 import java.util.HashMap;
 
 /** Abstraction for an OpenGL rendering context. In order to perform
@@ -67,6 +66,8 @@ public abstract class GLContext {
 
   private HashMap/*<int, Object>*/ attachedObjects = new HashMap();
 
+  protected long context;
+
   /**
    * Returns the GLDrawable to which this context may be used to
    * draw.
-- 
cgit v1.2.3


From b5bc1819925148adfdb1f2baccdfe9ecd3dc4dbf Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sat, 27 Mar 2010 15:13:30 +0100
Subject: added idea project files

---
 .gitignore                            |   5 ++
 .idea/compiler.xml                    |  24 +++++++
 .idea/copyright/profiles_settings.xml |   5 ++
 .idea/encodings.xml                   |   5 ++
 .idea/misc.xml                        |  33 +++++++++
 .idea/modules.xml                     |  11 +++
 .idea/uiDesigner.xml                  | 125 ++++++++++++++++++++++++++++++++++
 .idea/vcs.xml                         |   7 ++
 src/jogl/Jogl.iml                     |  13 ++++
 src/nativewindow/Nativewindow.iml     |  12 ++++
 src/newt/Newt.iml                     |  13 ++++
 11 files changed, 253 insertions(+)
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/copyright/profiles_settings.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/uiDesigner.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 src/jogl/Jogl.iml
 create mode 100644 src/nativewindow/Nativewindow.iml
 create mode 100644 src/newt/Newt.iml

diff --git a/.gitignore b/.gitignore
index 378eac25d..6e3af642b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
 build
+javadoc_public
+build-temp
+make/temp*
+.idea/workspace.xml
+**~
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 000000000..97c9ca5c8
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <resourceExtensions>
+      <entry name=".+\.(properties|xml|html|dtd|tld)" />
+      <entry name=".+\.(gif|png|jpeg|jpg)" />
+    </resourceExtensions>
+    <wildcardResourcePatterns>
+      <entry name="?*.properties" />
+      <entry name="?*.xml" />
+      <entry name="?*.gif" />
+      <entry name="?*.png" />
+      <entry name="?*.jpeg" />
+      <entry name="?*.jpg" />
+      <entry name="?*.html" />
+      <entry name="?*.dtd" />
+      <entry name="?*.tld" />
+      <entry name="?*.ftl" />
+    </wildcardResourcePatterns>
+    <annotationProcessing enabled="false" useClasspath="true" />
+  </component>
+</project>
+
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 000000000..3572571ad
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,5 @@
+<component name="CopyrightManager">
+  <settings default="">
+    <module2copyright />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 000000000..e206d70d8
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 000000000..ef58a04bc
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DependencyValidationManager">
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </component>
+  <component name="JavadocGenerationManager">
+    <option name="OUTPUT_DIRECTORY" />
+    <option name="OPTION_SCOPE" value="protected" />
+    <option name="OPTION_HIERARCHY" value="true" />
+    <option name="OPTION_NAVIGATOR" value="true" />
+    <option name="OPTION_INDEX" value="true" />
+    <option name="OPTION_SEPARATE_INDEX" value="true" />
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+    <option name="OPTION_DEPRECATED_LIST" value="true" />
+    <option name="OTHER_OPTIONS" value="" />
+    <option name="HEAP_SIZE" />
+    <option name="LOCALE" />
+    <option name="OPEN_IN_BROWSER" value="true" />
+  </component>
+  <component name="ProjectDetails">
+    <option name="projectName" value="jogl" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+  <component name="SvnBranchConfigurationManager">
+    <option name="mySupportsUserInfoFilter" value="true" />
+  </component>
+</project>
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 000000000..61474230d
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/src/jogl/Jogl.iml" filepath="$PROJECT_DIR$/src/jogl/Jogl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/nativewindow/Nativewindow.iml" filepath="$PROJECT_DIR$/src/nativewindow/Nativewindow.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/newt/Newt.iml" filepath="$PROJECT_DIR$/src/newt/Newt.iml" />
+    </modules>
+  </component>
+</project>
+
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 000000000..3b0002030
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..275077f82
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
+
diff --git a/src/jogl/Jogl.iml b/src/jogl/Jogl.iml
new file mode 100644
index 000000000..7811f4280
--- /dev/null
+++ b/src/jogl/Jogl.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/junit" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/classes" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/src/nativewindow/Nativewindow.iml b/src/nativewindow/Nativewindow.iml
new file mode 100644
index 000000000..673f8d17c
--- /dev/null
+++ b/src/nativewindow/Nativewindow.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/classes" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/src/newt/Newt.iml b/src/newt/Newt.iml
new file mode 100644
index 000000000..ab8359299
--- /dev/null
+++ b/src/newt/Newt.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/classes" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Nativewindow" />
+  </component>
+</module>
+
-- 
cgit v1.2.3


From 2b954ff1fe88f35b59da6c6f6b82fde70274a6ef Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sat, 27 Mar 2010 23:24:13 +0100
Subject: refactoring: renamed com.sun.opengl -> com.jogamp.opengl.

---
 CHANGELOG.txt                                      |     3 +
 doc/userguide/index.html                           |     2 +-
 doc/wiki/FAQ.xml                                   |     2 +-
 make/build-jogl.xml                                |   114 +-
 make/build-newt.xml                                |   108 +-
 make/build.xml                                     |     6 +-
 make/config/jogl/cg-common-CustomJavaCode.java     |     2 +-
 make/config/jogl/cg-common.cfg                     |     4 +-
 make/config/jogl/cgl-macosx.cfg                    |     2 +-
 make/config/jogl/cglext.cfg                        |     4 +-
 make/config/jogl/egl-common.cfg                    |     2 +-
 make/config/jogl/egl.cfg                           |     2 +-
 make/config/jogl/eglext.cfg                        |     6 +-
 make/config/jogl/gl-common.cfg                     |     7 +-
 make/config/jogl/gl-es1.cfg                        |     4 +-
 make/config/jogl/gl-es2.cfg                        |     4 +-
 make/config/jogl/gl-gl2.cfg                        |     4 +-
 make/config/jogl/gl-gl2es12.cfg                    |     4 +-
 make/config/jogl/gl-gl3.cfg                        |     4 +-
 make/config/jogl/gl-gl3bc.cfg                      |     6 +-
 make/config/jogl/gl-if-CustomJavaCode-gl3.java     |     2 +-
 make/config/jogl/gl-impl-CustomCCode-gl2.c         |     4 +-
 make/config/jogl/gl-impl-CustomCCode-gl2es12.c     |     4 +-
 make/config/jogl/gl-impl-CustomCCode-gl3.c         |     4 +-
 make/config/jogl/gl-impl-CustomCCode-gl3bc.c       |     4 +-
 make/config/jogl/gl-impl-CustomCCode-gles1.c       |     4 +-
 make/config/jogl/gl-impl-CustomCCode-gles2.c       |     4 +-
 make/config/jogl/glu-CustomJavaCode-base.java      |     4 +-
 make/config/jogl/glu-CustomJavaCode-gl2es1.java    |     2 +-
 make/config/jogl/glu-base.cfg                      |     4 +-
 make/config/jogl/glu-common.cfg                    |     6 +-
 make/config/jogl/glu-gl2.cfg                       |    12 +-
 make/config/jogl/glu-gl2es1.cfg                    |     2 +-
 make/config/jogl/glx-CustomCCode.c                 |     8 +-
 make/config/jogl/glx-x11.cfg                       |     2 +-
 make/config/jogl/glxext.cfg                        |     6 +-
 make/config/jogl/wgl-win32.cfg                     |     2 +-
 make/config/jogl/wglext.cfg                        |     4 +-
 make/stub_includes/opengl/GL3/gl3.h.orig           |  2742 -----
 make/stub_includes/opengl/GL3/gl3ext.h.orig        | 10073 -------------------
 make/stub_includes/opengl/GL3_/gl3.h               |  1659 ---
 make/stub_includes/opengl/GL3_/gl3ext.h            |   579 --
 .../com/jogamp/opengl/util/AWTAnimatorImpl.java    |   163 +
 .../classes/com/jogamp/opengl/util/Animator.java   |   241 +
 .../com/jogamp/opengl/util/AnimatorImpl.java       |    66 +
 .../opengl/util/BufferUtil.java.javame_cdc_fp      |   449 +
 .../com/jogamp/opengl/util/BufferUtil.java.javase  |   499 +
 .../classes/com/jogamp/opengl/util/FBObject.java   |   263 +
 .../com/jogamp/opengl/util/FPSAnimator.java        |   123 +
 .../classes/com/jogamp/opengl/util/FileUtil.java   |    89 +
 .../classes/com/jogamp/opengl/util/FixedPoint.java |    61 +
 .../com/jogamp/opengl/util/GLArrayDataClient.java  |   353 +
 .../jogamp/opengl/util/GLArrayDataEditable.java    |   110 +
 .../com/jogamp/opengl/util/GLArrayDataServer.java  |   209 +
 .../com/jogamp/opengl/util/GLArrayDataWrapper.java |   215 +
 .../com/jogamp/opengl/util/GLArrayHandler.java     |    11 +
 .../jogamp/opengl/util/GLFixedArrayHandler.java    |    65 +
 src/jogl/classes/com/jogamp/opengl/util/Gamma.java |   107 +
 .../com/jogamp/opengl/util/ImmModeSink.java        |   974 ++
 .../classes/com/jogamp/opengl/util/Locator.java    |   137 +
 .../classes/com/jogamp/opengl/util/PMVMatrix.java  |   685 ++
 .../classes/com/jogamp/opengl/util/StreamUtil.java |    98 +
 .../classes/com/jogamp/opengl/util/TGAWriter.java  |   118 +
 .../com/jogamp/opengl/util/awt/ImageUtil.java      |   127 +
 .../com/jogamp/opengl/util/awt/Overlay.java        |   214 +
 .../com/jogamp/opengl/util/awt/Screenshot.java     |   432 +
 .../com/jogamp/opengl/util/awt/TextRenderer.java   |  1951 ++++
 .../jogamp/opengl/util/awt/TextureRenderer.java    |   699 ++
 .../com/jogamp/opengl/util/gl2/BitmapCharRec.java  |    69 +
 .../com/jogamp/opengl/util/gl2/BitmapFontRec.java  |    63 +
 .../com/jogamp/opengl/util/gl2/CoordRec.java       |    56 +
 .../classes/com/jogamp/opengl/util/gl2/GLUT.java   |  1342 +++
 .../com/jogamp/opengl/util/gl2/GLUTBitmap8x13.java |  2078 ++++
 .../com/jogamp/opengl/util/gl2/GLUTBitmap9x15.java |  2079 ++++
 .../opengl/util/gl2/GLUTBitmapHelvetica10.java     |  1798 ++++
 .../opengl/util/gl2/GLUTBitmapHelvetica12.java     |  1808 ++++
 .../opengl/util/gl2/GLUTBitmapHelvetica18.java     |  1917 ++++
 .../opengl/util/gl2/GLUTBitmapTimesRoman10.java    |  1797 ++++
 .../opengl/util/gl2/GLUTBitmapTimesRoman24.java    |  2080 ++++
 .../opengl/util/gl2/GLUTStrokeMonoRoman.java       |  2491 +++++
 .../jogamp/opengl/util/gl2/GLUTStrokeRoman.java    |  2491 +++++
 .../com/jogamp/opengl/util/gl2/StrokeCharRec.java  |    63 +
 .../com/jogamp/opengl/util/gl2/StrokeFontRec.java  |    66 +
 .../com/jogamp/opengl/util/gl2/StrokeRec.java      |    57 +
 .../com/jogamp/opengl/util/gl2/TileRenderer.java   |   601 ++
 .../jogamp/opengl/util/glsl/GLSLArrayHandler.java  |    60 +
 .../com/jogamp/opengl/util/glsl/ShaderCode.java    |   347 +
 .../com/jogamp/opengl/util/glsl/ShaderProgram.java |   212 +
 .../com/jogamp/opengl/util/glsl/ShaderState.java   |   652 ++
 .../com/jogamp/opengl/util/glsl/ShaderUtil.java    |   476 +
 .../opengl/util/glsl/fixedfunc/FixedFuncUtil.java  |    90 +
 .../util/glsl/fixedfunc/impl/FixedFuncHook.java    |   331 +
 .../glsl/fixedfunc/impl/FixedFuncPipeline.java     |   554 +
 .../glsl/fixedfunc/impl/shaders/FixedFuncColor.fp  |    16 +
 .../glsl/fixedfunc/impl/shaders/FixedFuncColor.vp  |    22 +
 .../fixedfunc/impl/shaders/FixedFuncColorLight.vp  |    70 +
 .../impl/shaders/FixedFuncColorTexture.fp          |    47 +
 .../impl/shaders/bin/nvidia/FixedFuncColor.bfp     |   Bin 0 -> 1108 bytes
 .../impl/shaders/bin/nvidia/FixedFuncColor.bvp     |   Bin 0 -> 2344 bytes
 .../shaders/bin/nvidia/FixedFuncColorLight.bvp     |   Bin 0 -> 8787 bytes
 .../shaders/bin/nvidia/FixedFuncColorTexture.bfp   |   Bin 0 -> 2392 bytes
 .../glsl/fixedfunc/impl/shaders/es_precision.glsl  |    14 +
 .../glsl/fixedfunc/impl/shaders/mgl_attribute.glsl |    19 +
 .../glsl/fixedfunc/impl/shaders/mgl_const.glsl     |    10 +
 .../glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl  |    26 +
 .../glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp |    35 +
 .../glsl/fixedfunc/impl/shaders/mgl_uniform.glsl   |    18 +
 .../fixedfunc/impl/shaders/mgl_uniform_light.glsl  |    15 +
 .../glsl/fixedfunc/impl/shaders/mgl_varying.glsl   |    12 +
 .../impl/shaders/scripts/nvidia-apx/glslc-ff.bat   |     9 +
 .../impl/shaders/scripts/nvidia-apx/glslc.bat      |     9 +
 .../jogamp/opengl/util/glsl/sdk/CompileShader.java |   184 +
 .../opengl/util/glsl/sdk/CompileShaderNVidia.java  |    53 +
 .../opengl/util/packrect/BackingStoreManager.java  |    99 +
 .../com/jogamp/opengl/util/packrect/Level.java     |   275 +
 .../com/jogamp/opengl/util/packrect/LevelSet.java  |   213 +
 .../com/jogamp/opengl/util/packrect/Rect.java      |   170 +
 .../jogamp/opengl/util/packrect/RectVisitor.java   |    47 +
 .../opengl/util/packrect/RectanglePacker.java      |   306 +
 .../com/jogamp/opengl/util/packrect/package.html   |     9 +
 .../com/jogamp/opengl/util/texture/Texture.java    |  1120 +++
 .../jogamp/opengl/util/texture/TextureCoords.java  |    79 +
 .../jogamp/opengl/util/texture/TextureData.java    |   370 +
 .../util/texture/TextureIO.java.javame_cdc_fp      |  1256 +++
 .../opengl/util/texture/TextureIO.java.javase      |  1258 +++
 .../opengl/util/texture/awt/AWTTextureData.java    |   498 +
 .../opengl/util/texture/awt/AWTTextureIO.java      |   129 +
 .../util/texture/spi/DDSImage.java.javame_cdc_fp   |   889 ++
 .../opengl/util/texture/spi/DDSImage.java.javase   |   919 ++
 .../opengl/util/texture/spi/LEDataInputStream.java |   223 +
 .../util/texture/spi/LEDataOutputStream.java       |   165 +
 .../util/texture/spi/NetPbmTextureWriter.java      |   169 +
 .../jogamp/opengl/util/texture/spi/SGIImage.java   |   670 ++
 .../util/texture/spi/TGAImage.java.javame_cdc_fp   |   417 +
 .../opengl/util/texture/spi/TGAImage.java.javase   |   420 +
 .../opengl/util/texture/spi/TextureProvider.java   |   172 +
 .../opengl/util/texture/spi/TextureWriter.java     |    57 +
 .../util/texture/spi/awt/IIOTextureProvider.java   |   101 +
 .../util/texture/spi/awt/IIOTextureWriter.java     |   119 +
 .../com/sun/opengl/util/AWTAnimatorImpl.java       |   163 -
 src/jogl/classes/com/sun/opengl/util/Animator.java |   241 -
 .../classes/com/sun/opengl/util/AnimatorImpl.java  |    66 -
 .../sun/opengl/util/BufferUtil.java.javame_cdc_fp  |   449 -
 .../com/sun/opengl/util/BufferUtil.java.javase     |   499 -
 src/jogl/classes/com/sun/opengl/util/FBObject.java |   263 -
 .../classes/com/sun/opengl/util/FPSAnimator.java   |   123 -
 src/jogl/classes/com/sun/opengl/util/FileUtil.java |    89 -
 .../classes/com/sun/opengl/util/FixedPoint.java    |    61 -
 .../com/sun/opengl/util/GLArrayDataClient.java     |   353 -
 .../com/sun/opengl/util/GLArrayDataEditable.java   |   110 -
 .../com/sun/opengl/util/GLArrayDataServer.java     |   209 -
 .../com/sun/opengl/util/GLArrayDataWrapper.java    |   215 -
 .../com/sun/opengl/util/GLArrayHandler.java        |    11 -
 .../com/sun/opengl/util/GLFixedArrayHandler.java   |    65 -
 src/jogl/classes/com/sun/opengl/util/Gamma.java    |   107 -
 .../classes/com/sun/opengl/util/ImmModeSink.java   |   974 --
 src/jogl/classes/com/sun/opengl/util/Locator.java  |   137 -
 .../classes/com/sun/opengl/util/PMVMatrix.java     |   685 --
 .../classes/com/sun/opengl/util/StreamUtil.java    |    98 -
 .../classes/com/sun/opengl/util/TGAWriter.java     |   118 -
 .../classes/com/sun/opengl/util/awt/ImageUtil.java |   127 -
 .../classes/com/sun/opengl/util/awt/Overlay.java   |   214 -
 .../com/sun/opengl/util/awt/Screenshot.java        |   432 -
 .../com/sun/opengl/util/awt/TextRenderer.java      |  1951 ----
 .../com/sun/opengl/util/awt/TextureRenderer.java   |   699 --
 .../com/sun/opengl/util/gl2/BitmapCharRec.java     |    69 -
 .../com/sun/opengl/util/gl2/BitmapFontRec.java     |    63 -
 .../classes/com/sun/opengl/util/gl2/CoordRec.java  |    56 -
 src/jogl/classes/com/sun/opengl/util/gl2/GLUT.java |  1342 ---
 .../com/sun/opengl/util/gl2/GLUTBitmap8x13.java    |  2078 ----
 .../com/sun/opengl/util/gl2/GLUTBitmap9x15.java    |  2079 ----
 .../sun/opengl/util/gl2/GLUTBitmapHelvetica10.java |  1798 ----
 .../sun/opengl/util/gl2/GLUTBitmapHelvetica12.java |  1808 ----
 .../sun/opengl/util/gl2/GLUTBitmapHelvetica18.java |  1917 ----
 .../opengl/util/gl2/GLUTBitmapTimesRoman10.java    |  1797 ----
 .../opengl/util/gl2/GLUTBitmapTimesRoman24.java    |  2080 ----
 .../sun/opengl/util/gl2/GLUTStrokeMonoRoman.java   |  2491 -----
 .../com/sun/opengl/util/gl2/GLUTStrokeRoman.java   |  2491 -----
 .../com/sun/opengl/util/gl2/StrokeCharRec.java     |    63 -
 .../com/sun/opengl/util/gl2/StrokeFontRec.java     |    66 -
 .../classes/com/sun/opengl/util/gl2/StrokeRec.java |    57 -
 .../com/sun/opengl/util/gl2/TileRenderer.java      |   601 --
 .../com/sun/opengl/util/glsl/GLSLArrayHandler.java |    60 -
 .../com/sun/opengl/util/glsl/ShaderCode.java       |   347 -
 .../com/sun/opengl/util/glsl/ShaderProgram.java    |   212 -
 .../com/sun/opengl/util/glsl/ShaderState.java      |   652 --
 .../com/sun/opengl/util/glsl/ShaderUtil.java       |   476 -
 .../opengl/util/glsl/fixedfunc/FixedFuncUtil.java  |    90 -
 .../util/glsl/fixedfunc/impl/FixedFuncHook.java    |   331 -
 .../glsl/fixedfunc/impl/FixedFuncPipeline.java     |   554 -
 .../glsl/fixedfunc/impl/shaders/FixedFuncColor.fp  |    16 -
 .../glsl/fixedfunc/impl/shaders/FixedFuncColor.vp  |    22 -
 .../fixedfunc/impl/shaders/FixedFuncColorLight.vp  |    70 -
 .../impl/shaders/FixedFuncColorTexture.fp          |    47 -
 .../impl/shaders/bin/nvidia/FixedFuncColor.bfp     |   Bin 1108 -> 0 bytes
 .../impl/shaders/bin/nvidia/FixedFuncColor.bvp     |   Bin 2344 -> 0 bytes
 .../shaders/bin/nvidia/FixedFuncColorLight.bvp     |   Bin 8787 -> 0 bytes
 .../shaders/bin/nvidia/FixedFuncColorTexture.bfp   |   Bin 2392 -> 0 bytes
 .../glsl/fixedfunc/impl/shaders/es_precision.glsl  |    14 -
 .../glsl/fixedfunc/impl/shaders/mgl_attribute.glsl |    19 -
 .../glsl/fixedfunc/impl/shaders/mgl_const.glsl     |    10 -
 .../glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl  |    26 -
 .../glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp |    35 -
 .../glsl/fixedfunc/impl/shaders/mgl_uniform.glsl   |    18 -
 .../fixedfunc/impl/shaders/mgl_uniform_light.glsl  |    15 -
 .../glsl/fixedfunc/impl/shaders/mgl_varying.glsl   |    12 -
 .../impl/shaders/scripts/nvidia-apx/glslc-ff.bat   |     9 -
 .../impl/shaders/scripts/nvidia-apx/glslc.bat      |     9 -
 .../sun/opengl/util/glsl/sdk/CompileShader.java    |   184 -
 .../opengl/util/glsl/sdk/CompileShaderNVidia.java  |    53 -
 .../opengl/util/packrect/BackingStoreManager.java  |    99 -
 .../com/sun/opengl/util/packrect/Level.java        |   275 -
 .../com/sun/opengl/util/packrect/LevelSet.java     |   213 -
 .../classes/com/sun/opengl/util/packrect/Rect.java |   170 -
 .../com/sun/opengl/util/packrect/RectVisitor.java  |    47 -
 .../sun/opengl/util/packrect/RectanglePacker.java  |   306 -
 .../com/sun/opengl/util/packrect/package.html      |     9 -
 .../com/sun/opengl/util/texture/Texture.java       |  1120 ---
 .../com/sun/opengl/util/texture/TextureCoords.java |    79 -
 .../com/sun/opengl/util/texture/TextureData.java   |   370 -
 .../util/texture/TextureIO.java.javame_cdc_fp      |  1256 ---
 .../sun/opengl/util/texture/TextureIO.java.javase  |  1258 ---
 .../opengl/util/texture/awt/AWTTextureData.java    |   498 -
 .../sun/opengl/util/texture/awt/AWTTextureIO.java  |   129 -
 .../util/texture/spi/DDSImage.java.javame_cdc_fp   |   889 --
 .../opengl/util/texture/spi/DDSImage.java.javase   |   919 --
 .../opengl/util/texture/spi/LEDataInputStream.java |   223 -
 .../util/texture/spi/LEDataOutputStream.java       |   165 -
 .../util/texture/spi/NetPbmTextureWriter.java      |   169 -
 .../com/sun/opengl/util/texture/spi/SGIImage.java  |   670 --
 .../util/texture/spi/TGAImage.java.javame_cdc_fp   |   417 -
 .../opengl/util/texture/spi/TGAImage.java.javase   |   420 -
 .../opengl/util/texture/spi/TextureProvider.java   |   172 -
 .../sun/opengl/util/texture/spi/TextureWriter.java |    57 -
 .../util/texture/spi/awt/IIOTextureProvider.java   |   101 -
 .../util/texture/spi/awt/IIOTextureWriter.java     |   119 -
 .../media/opengl/DefaultGLCapabilitiesChooser.java |     2 +-
 .../classes/javax/media/opengl/GLAutoDrawable.java |     2 +-
 .../javax/media/opengl/GLDrawableFactory.java      |    13 +-
 .../javax/media/opengl/GLPipelineFactory.java      |     2 +-
 src/jogl/classes/javax/media/opengl/GLProfile.java |    42 +-
 src/jogl/classes/javax/media/opengl/Threading.java |     2 +-
 .../classes/javax/media/opengl/awt/GLCanvas.java   |     2 +-
 .../classes/javax/media/opengl/awt/GLJPanel.java   |    11 +-
 .../classes/javax/media/opengl/glu/GLUquadric.java |     2 +-
 .../media/opengl/glu/GLUtessellatorCallback.java   |     2 +-
 .../opengl/glu/GLUtessellatorCallbackAdapter.java  |     2 +-
 247 files changed, 42969 insertions(+), 58026 deletions(-)
 delete mode 100755 make/stub_includes/opengl/GL3/gl3.h.orig
 delete mode 100644 make/stub_includes/opengl/GL3/gl3ext.h.orig
 delete mode 100755 make/stub_includes/opengl/GL3_/gl3.h
 delete mode 100644 make/stub_includes/opengl/GL3_/gl3ext.h
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/AWTAnimatorImpl.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/Animator.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/AnimatorImpl.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/FBObject.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/FileUtil.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/FixedPoint.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/GLArrayDataEditable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/GLArrayDataServer.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/GLArrayHandler.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/GLFixedArrayHandler.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/Gamma.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/Locator.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/TGAWriter.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/awt/ImageUtil.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/awt/Overlay.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/awt/Screenshot.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/awt/TextureRenderer.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapCharRec.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapFontRec.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/CoordRec.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/GLUT.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap8x13.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap9x15.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica10.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica12.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica18.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman10.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman24.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeMonoRoman.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeRoman.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeCharRec.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeFontRec.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeRec.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/gl2/TileRenderer.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/GLSLArrayHandler.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShaderNVidia.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/packrect/BackingStoreManager.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/packrect/Level.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/packrect/LevelSet.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/packrect/Rect.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/packrect/RectVisitor.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/packrect/package.html
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/TextureCoords.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/TextureData.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureData.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureIO.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataOutputStream.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/spi/SGIImage.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureProvider.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureWriter.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureWriter.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/AWTAnimatorImpl.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/Animator.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/AnimatorImpl.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javame_cdc_fp
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javase
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/FBObject.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/FPSAnimator.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/FileUtil.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/FixedPoint.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/GLArrayDataClient.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/GLArrayDataEditable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/GLArrayDataWrapper.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/GLArrayHandler.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/GLFixedArrayHandler.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/Gamma.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/ImmModeSink.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/Locator.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/PMVMatrix.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/StreamUtil.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/TGAWriter.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/awt/ImageUtil.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/awt/Overlay.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/awt/Screenshot.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/awt/TextRenderer.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/awt/TextureRenderer.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/BitmapCharRec.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/BitmapFontRec.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/CoordRec.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/GLUT.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap8x13.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap9x15.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica10.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica12.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica18.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman10.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman24.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeMonoRoman.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeRoman.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/StrokeCharRec.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/StrokeFontRec.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/gl2/StrokeRec.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/gl2/TileRenderer.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/GLSLArrayHandler.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/ShaderCode.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/ShaderProgram.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/ShaderState.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/ShaderUtil.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShader.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShaderNVidia.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/packrect/BackingStoreManager.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/packrect/Level.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/packrect/LevelSet.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/packrect/Rect.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/packrect/RectVisitor.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/packrect/RectanglePacker.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/packrect/package.html
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/Texture.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/TextureCoords.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/TextureData.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureIO.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javase
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataInputStream.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataOutputStream.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/texture/spi/NetPbmTextureWriter.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/spi/SGIImage.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javase
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/spi/TextureProvider.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/util/texture/spi/TextureWriter.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureProvider.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureWriter.java

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c976f68db..39112dbf0 100755
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -103,3 +103,6 @@ Changes between JOGL 1.0.0 and 1.1.0:
 
  - Worked around breakage of JOGL with 5.0u10; see Sun bug IDs 6504460
    and 6333613.
+
+Changes between JOGL 1.1.1 and 2.0:
+ - lots of changes
\ No newline at end of file
diff --git a/doc/userguide/index.html b/doc/userguide/index.html
index 64047cf8d..6b4d281bb 100644
--- a/doc/userguide/index.html
+++ b/doc/userguide/index.html
@@ -209,7 +209,7 @@ as 1.4.2, which is the earliest version of Java supported by JOGL.
 <P>
 
 The JOGLAppletInstaller is distributed inside jogl.jar as a utility
-class in com.sun.opengl.util. It requires that the developer host a
+class in com.jogamp.opengl.util. It requires that the developer host a
 local, signed copy of jogl.jar and all of the jogl-natives jars; the
 certificates must be the same on all of these jars. Note that in the
 release builds of JOGL all of these jars are signed by Sun
diff --git a/doc/wiki/FAQ.xml b/doc/wiki/FAQ.xml
index 25c3fe99d..7ee1f639b 100644
--- a/doc/wiki/FAQ.xml
+++ b/doc/wiki/FAQ.xml
@@ -86,7 +86,7 @@ and the output is:
  Detected screen size 1920x1200                                                                                                                   
  GLProfile[GL2ES1/GL2ES12] Entering initialization                                                                        
  GLProfile[GL2ES1/GL2ES12] GL Profile: GLProfile[GL2ES1/GL2ES12]                                                                   
- GLProfile[GL2ES1/GL2ES12] GL:com.sun.opengl.impl.gl2es12.GL2ES12Impl@b815859
+ GLProfile[GL2ES1/GL2ES12] GL:com.jogamp.opengl.impl.gl2es12.GL2ES12Impl@b815859
  GLProfile[GL2ES1/GL2ES12] GL_VERSION=3.0.0 NVIDIA 185.18.14                               
  GLProfile[GL2ES1/GL2ES12] GL_EXTENSIONS: ..            
 
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index a98de0b4a..80b106467 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -95,86 +95,86 @@
         <!-- partitioning -->
 
         <property name="java.part.core" 
-                  value="javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/sun/opengl/impl/* com/sun/opengl/impl/glu/* com/sun/opengl/impl/glu/error/*"/>
+                  value="javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/jogamp/opengl/impl/* com/jogamp/opengl/impl/glu/* com/jogamp/opengl/impl/glu/error/*"/>
         <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace*"/>
 
         <property name="java.part.nv-cg"
-                  value="com/sun/opengl/cg com/sun/opengl/cg/*"/>
+                  value="com/jogamp/opengl/cg com/jogamp/opengl/cg/*"/>
 
         <property name="java.part.egl"
-                  value="com/sun/opengl/impl/egl/*"/>
+                  value="com/jogamp/opengl/impl/egl/*"/>
 
         <property name="java.part.glutess"
-                  value="com/sun/opengl/impl/glu/tessellator/**"/>
+                  value="com/jogamp/opengl/impl/glu/tessellator/**"/>
 
         <property name="java.part.glumipmap"
-                  value="com/sun/opengl/impl/glu/mipmap/**"/>
+                  value="com/jogamp/opengl/impl/glu/mipmap/**"/>
 
         <property name="java.part.glugl2"
-                  value="com/sun/opengl/impl/glu/gl2/** com/sun/opengl/impl/glu/nurbs/** com/sun/opengl/impl/glu/registry/** javax/media/opengl/glu/gl2/**"/>
+                  value="com/jogamp/opengl/impl/glu/gl2/** com/jogamp/opengl/impl/glu/nurbs/** com/jogamp/opengl/impl/glu/registry/** javax/media/opengl/glu/gl2/**"/>
 
         <property name="java.part.openmax"
                   value="com/sun/openmax/**"/>
 
         <property name="java.part.sdk"
-                  value="com/sun/opengl/util/glsl/sdk/**"/>
+                  value="com/jogamp/opengl/util/glsl/sdk/**"/>
 
         <property name="java.part.glx"
-                  value="com/sun/opengl/impl/x11/glx/*"/>
+                  value="com/jogamp/opengl/impl/x11/glx/*"/>
 
         <property name="java.part.wgl"
-                  value="com/sun/opengl/impl/windows/wgl/*"/>
+                  value="com/jogamp/opengl/impl/windows/wgl/*"/>
 
         <property name="java.part.cgl"
-                  value="com/sun/opengl/impl/macosx/cgl/*"/>
+                  value="com/jogamp/opengl/impl/macosx/cgl/*"/>
 
         <property name="java.part.gl2es12"
-                  value="com/sun/opengl/impl/gl2es12/**"/>
+                  value="com/jogamp/opengl/impl/gl2es12/**"/>
 
         <property name="java.part.gl3"
-                  value="com/sun/opengl/impl/**/gl3/**"/>
+                  value="com/jogamp/opengl/impl/**/gl3/**"/>
 
         <property name="java.part.gl3.dbg"
                   value="javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.*"/>
 
         <property name="java.part.gl2"
-                  value="com/sun/opengl/impl/**/gl2/**"/>
+                  value="com/jogamp/opengl/impl/**/gl2/**"/>
 
         <property name="java.part.gl2.dbg"
                   value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL2GL3.* javax/media/opengl/DebugGL2GL3.*"/>
 
         <property name="java.part.es1"
-                  value="javax/media/opengl/**/es1/** com/sun/opengl/**/es1/**"/>
+                  value="javax/media/opengl/**/es1/** com/jogamp/opengl/**/es1/**"/>
 
         <property name="java.part.es1.dbg"
                   value="javax/media/opengl/TraceGLES1.* javax/media/opengl/DebugGLES1.* javax/media/opengl/TraceGL2ES1.* javax/media/opengl/DebugGL2ES1.*"/>
 
         <property name="java.part.es2"
-                  value="javax/media/opengl/**/es2/** com/sun/opengl/**/es2/**"/>
+                  value="javax/media/opengl/**/es2/** com/jogamp/opengl/**/es2/**"/>
 
         <property name="java.part.es2.dbg"
                   value="javax/media/opengl/TraceGLES2.* javax/media/opengl/DebugGLES2.* javax/media/opengl/TraceGL2ES2.* javax/media/opengl/DebugGL2ES2.*"/>
 
         <property name="java.part.awt"
-                  value="javax/media/opengl/awt/** com/sun/opengl/impl/**/awt/**"/>
+                  value="javax/media/opengl/awt/** com/jogamp/opengl/impl/**/awt/**"/>
 
         <property name="java.part.util"
-                  value="com/sun/opengl/util/* com/sun/opengl/util/texture/** com/sun/opengl/util/packrect/**"/>
+                  value="com/jogamp/opengl/util/* com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/packrect/**"/>
 
         <property name="java.part.util.awt"
-                  value="com/sun/opengl/util/**/awt/** com/sun/opengl/util/AWTAnimatorImpl*"/>
+                  value="com/jogamp/opengl/util/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/>
 
         <property name="java.part.util.gl2"
-                  value="com/sun/opengl/util/**/gl2/**"/>
+                  value="com/jogamp/opengl/util/**/gl2/**"/>
 
         <property name="java.part.util.glsl"
-                  value="com/sun/opengl/util/glsl/* com/sun/opengl/util/glsl/fixedfunc/*"/>
+                  value="com/jogamp/opengl/util/glsl/* com/jogamp/opengl/util/glsl/fixedfunc/*"/>
 
         <property name="java.part.util.fixedfuncemu"
-                  value="com/sun/opengl/util/glsl/fixedfunc/impl/**"/>
+                  value="com/jogamp/opengl/util/glsl/fixedfunc/impl/**"/>
 
         <property name="java.part.util.fixedfuncemu.shadercode"
-                  value="com/sun/opengl/util/glsl/fixedfunc/impl/shaders/* com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/**"/>
+                  value="com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/* com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/**"/>
 
         <!-- condition excludes -->
 
@@ -191,13 +191,13 @@
         </condition>
 
         <property name="java.excludes.javadoc.packagenames"
-                  value="com.sun.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
+                  value="com.jogamp.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
 
         <property name="java.excludes.fixme" 
-                  value="com/sun/opengl/impl/gl2/fixme/** com/sun/javafx/audio/windows/waveout/TestSpatialization.java" />
+                  value="com/jogamp/opengl/impl/gl2/fixme/** com/sun/javafx/audio/windows/waveout/TestSpatialization.java" />
 
         <property name="java.excludes.cdcfp"
-                  value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gl2} ${java.part.gl2.dbg} ${java.part.gl3} ${java.part.gl3.dbg} ${java.part.awt} ${java.part.glugl2} ${java.part.util.awt} ${java.part.util.gl2} com/sun/opengl/util/TGAWriter.java"/>
+                  value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gl2} ${java.part.gl2.dbg} ${java.part.gl3} ${java.part.gl3.dbg} ${java.part.awt} ${java.part.glugl2} ${java.part.util.awt} ${java.part.util.gl2} com/jogamp/opengl/util/TGAWriter.java"/>
 
         <condition property="java.excludes.desktop"
                    value="${java.part.glx} ${java.excludes.cdcfp}">
@@ -310,7 +310,7 @@
         <property name="src.generated" value="${build}/gensrc" />
         <property name="src.generated.java" value="${src.generated}/classes" />
         <property name="src.generated.java-cdc" value="${src.generated}/classes-cdc" />
-        <property name="src.generated.java.cg" value="${src.generated.java}/com/sun/opengl/cg" />
+        <property name="src.generated.java.cg" value="${src.generated.java}/com/jogamp/opengl/cg" />
         <property name="src.generated.c" value="${src.generated}/native/jogl" />
         <property name="src.generated.c.openmax" value="${src.generated}/native/openmax" />
         <property name="src.generated.c.cg" value="${src.generated}/native/jogl_cg" />
@@ -468,9 +468,9 @@
         <property name="javadoc.overview" value="doc/jogl/spec-overview.html" />
         <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" />
 
-        <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.sun.opengl.util.*" />
+        <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.jogamp.opengl.util.*" />
 
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.opengl.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
     <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
     </target>
     
@@ -498,21 +498,21 @@
     </target>
 
     <target name="setup.javacdc">
-        <copy file="../src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/impl/SystemUtil.java" />
-        <copy file="../src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/util/BufferUtil.java" />
-        <copy file="../src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/impl/InternalBufferUtil.java" />
-        <copy file="../src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/util/texture/TextureIO.java" />
-        <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/util/texture/spi/DDSImage.java" />
-        <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/util/texture/spi/TGAImage.java" />
+        <copy file="../src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/impl/SystemUtil.java" />
+        <copy file="../src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/BufferUtil.java" />
+        <copy file="../src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/impl/InternalBufferUtil.java" />
+        <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/TextureIO.java" />
+        <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/spi/DDSImage.java" />
+        <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/spi/TGAImage.java" />
     </target>
 
     <target name="setup.javase">
-        <copy file="../src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javase" tofile="${src.generated.java}/com/sun/opengl/impl/SystemUtil.java" />
-        <copy file="../src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javase" tofile="${src.generated.java}/com/sun/opengl/util/BufferUtil.java" />
-        <copy file="../src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javase" tofile="${src.generated.java}/com/sun/opengl/impl/InternalBufferUtil.java" />
-        <copy file="../src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase" tofile="${src.generated.java}/com/sun/opengl/util/texture/TextureIO.java" />
-        <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javase" tofile="${src.generated.java}/com/sun/opengl/util/texture/spi/DDSImage.java" />
-        <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javase" tofile="${src.generated.java}/com/sun/opengl/util/texture/spi/TGAImage.java" />
+        <copy file="../src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/impl/SystemUtil.java" />
+        <copy file="../src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/BufferUtil.java" />
+        <copy file="../src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/impl/InternalBufferUtil.java" />
+        <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/TextureIO.java" />
+        <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/spi/DDSImage.java" />
+        <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/spi/TGAImage.java" />
     </target>
 
     <!-- ================================================================== -->
@@ -932,7 +932,7 @@
         <!-- Now check for the presence of one well-known file -->
         <uptodate property="java.generate.cg.skip">
             <srcfiles refid="stub.includes.cg.dependencies.fileset" />
-            <mapper type="merge" to="${src.generated.java}/com/sun/opengl/cg/CgGL.java" />
+            <mapper type="merge" to="${src.generated.java}/com/jogamp/opengl/cg/CgGL.java" />
         </uptodate>
     </target>
 
@@ -1017,7 +1017,7 @@
             <targetfileset dir="${src.generated.java}/javax/media/opengl"
                            includes="DebugGL2.java,TraceGL2.java" />
         </dependset>
-                           
+
         <!-- Now choose one of the two to test to see if we have to regenerate -->
         <uptodate property="java.generate.composable.pipeline.skip.gl2"
                   srcfile="${classes}/javax/media/opengl/GL2.class"
@@ -1119,31 +1119,31 @@
         <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
              (the uptodate element doesn't support arbitrary source and destination files) -->
         <dependset>
-            <srcfilelist dir="${classes}/com/sun/opengl/util/glsl/fixedfunc" files="FixedFuncHook.class" />
+            <srcfilelist dir="${classes}/com/jogamp/opengl/util/glsl/fixedfunc" files="FixedFuncHook.class" />
             <srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES1.class" />
             <srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES2.class" />
-            <targetfileset dir="${src.generated.java}/com/sun/opengl/util/glsl/fixedfunc/impl"
+            <targetfileset dir="${src.generated.java}/com/jogamp/opengl/util/glsl/fixedfunc/impl"
                            includes="FixedFuncImpl.java" />
         </dependset>
                            
         <!-- Now choose one of the two to test to see if we have to regenerate -->
         <uptodate property="java.generate.composable.pipeline.custom.skip.glfixfunc"
                   srcfile="${classes}/javax/media/opengl/GL2ES1.class"
-                  targetfile="${src.generated.java}/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" />
+                  targetfile="${src.generated.java}/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" />
     </target>        
     <target name="java.generate.composable.pipeline.custom.glfixfunc" depends="java.generate.composable.pipeline.custom.check.glfixfunc" unless="java.generate.composable.pipeline.custom.skip.glfixfunc">
         <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GL2ES1" />
-            <arg value="${src.generated.java}/com/sun/opengl/util/glsl/fixedfunc/impl" />
-            <arg value="com.sun.opengl.util.glsl.fixedfunc.impl.FixedFuncImpl" />
-            <arg value="com.sun.opengl.util.glsl.fixedfunc.impl.FixedFuncHook" />
+            <arg value="${src.generated.java}/com/jogamp/opengl/util/glsl/fixedfunc/impl" />
+            <arg value="com.jogamp.opengl.util.glsl.fixedfunc.impl.FixedFuncImpl" />
+            <arg value="com.jogamp.opengl.util.glsl.fixedfunc.impl.FixedFuncHook" />
             <arg value="javax.media.opengl.GL2ES2" />
             <arg value="prolog_xor_downstream" />
             <classpath refid="pipeline.classpath" />
         </java>
         <copy todir="${src.generated.java-cdc}">
             <fileset dir="${src.generated.java}"
-                     includes="com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" />
+                     includes="com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" />
         </copy>
     </target>          
     <target name="java.generate.composable.pipeline.custom" depends="init, build.gluegen, java.generate.composable.pipeline.custom.glfixfunc">
@@ -1171,7 +1171,7 @@
         <copy todir="${src.generated.java-cdc}">
             <fileset dir="${src.generated.java}"
                      includes="**" 
-                     excludes="com/sun/opengl/cg/** com/sun/opengl/impl/gl2/** com/sun/opengl/impl/gl3/** com/sun/opengl/impl/glu/gl2/** javax/media/opengl/glu/gl2/**"/>
+                     excludes="com/jogamp/opengl/cg/** com/jogamp/opengl/impl/gl2/** com/jogamp/opengl/impl/gl3/** com/jogamp/opengl/impl/glu/gl2/** javax/media/opengl/glu/gl2/**"/>
         </copy>
         <copy todir="${classes-cdc}">
             <fileset dir="${classes}"
@@ -1182,7 +1182,7 @@
     <target name="java.compile.secondpass.javase">
         <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
         <javac destdir="${classes}"
-               excludes="com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}"
+               excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}"
                source="${jogl.sourcelevel}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
@@ -1196,7 +1196,7 @@
     <target name="java.compile.secondpass.javacdc" unless="setup.noCDC">
         <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
         <javac destdir="${classes-cdc}"
-               excludes="com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all},${java.excludes.cdcfp}"
+               excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all},${java.excludes.cdcfp}"
                source="${jogl.sourcelevel}"
                bootclasspath="${javac.bootclasspath-cdc.jar}"
                fork="yes"
@@ -1823,7 +1823,7 @@
             <fileset dir="${classes}">
                 <include name="javax/media/opengl/**" />
                 <include name="com/sun/gluegen/runtime/**" />
-                <include name="com/sun/opengl/**" />
+                <include name="com/jogamp/opengl/**" />
                 <include name="${java.part.openmax}" />
                 <!-- FIXME: this is temporary until we move these classes to another workspace -->
                 <include name="com/sun/javafx/**" />
@@ -1835,7 +1835,7 @@
     <target name="build-jars-all-noawt" depends="setup-manifestfile">
         <jar manifest="${build}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true">
             <fileset dir="${classes}"
-                includes="javax/media/opengl/** com/sun/gluegen/runtime/** com/sun/opengl/** ${java.part.openmax} com/sun/javafx/**"
+                includes="javax/media/opengl/** com/sun/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/sun/javafx/**"
                 excludes="${java.part.awt} ${java.part.util.awt}">
             </fileset>
             <fileset dir="${src.java}"
@@ -1907,7 +1907,7 @@
         <jar manifest="${build}/tempversion" destfile="${jogl.util.gl2.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.util.gl2}"
-                     excludes="com/sun/opengl/**/awt/**"/>
+                     excludes="com/jogamp/opengl/**/awt/**"/>
         </jar>
     </target>
 
@@ -1968,7 +1968,7 @@
     <!-- Same as above but with Cg directories added -->
     <target name="javadoc.cg" depends="load.user.properties,init" if="jogl.cg">
         <!-- Build the general public Javadoc with CG -->
-        <javadoc packagenames="${javadoc.packagenames},com.sun.opengl.cg"
+        <javadoc packagenames="${javadoc.packagenames},com.jogamp.opengl.cg"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
                  sourcepath="${src.java};${src.generated.java}"        
                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
@@ -2038,7 +2038,7 @@
     <!-- Same as above but with Cg directories added -->
     <target name="javadoc.dev.cg" if="jogl.cg">
         <!-- Build the internal developer Javadoc -->
-        <javadoc packagenames="${javadoc.dev.packagenames},com.sun.opengl.cg"
+        <javadoc packagenames="${javadoc.dev.packagenames},com.jogamp.opengl.cg"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
                  sourcepath="${src.java};${src.generated.java}"        
                  destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
diff --git a/make/build-newt.xml b/make/build-newt.xml
index e74a036bb..df5783319 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -27,14 +27,14 @@
    -                       Java and C file generators. Note that it is only supported
    -                       to create the Javadoc for the platform on which you are
    -                       currently running.
-   - 
+   -
    - Note: on Windows the "win32.c.compiler" property in newt.properties
    - is required to select the appropriate C compiler. See the example
    - newt.properties in this directory for valid values. On Mac OS X
    - universal binaries may also be built by setting the "macosxfat"
    - property in newt.properties; again see the example file in this
    - directory.
-   -   
+   -
    - Thanks to Rob Grzywinski and Artur Biesiadowski for the bulk of the
    - ANT build, including the GlueGen and StaticGLInfo tasks, the building of
    - the Java generated sources, the first and second phase Java compiles, and
@@ -63,7 +63,7 @@
   <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
 
     <!-- ================================================================== -->
-    <!-- 
+    <!--
        - Base initialization and detection of operating system.
       -->
     <target name="base.init" depends="gluegen.cpptasks.detect.os">
@@ -79,7 +79,7 @@
         </condition>
 
         <condition property="setup.noall">
-            <isset property="setup.noAWT"/> 
+            <isset property="setup.noAWT"/>
         </condition>
 
         <condition property="setup.nonatives">
@@ -132,19 +132,19 @@
 
         <condition property="java.excludes.awt"
                    value="${java.part.awt}">
-           <isset property="setup.noAWT"/> 
+           <isset property="setup.noAWT"/>
         </condition>
 
         <condition property="java.excludes.opengl"
                    value="${java.part.opengl} ${java.part.broadcomegl}">
-           <isset property="setup.noOpenGL"/> 
+           <isset property="setup.noOpenGL"/>
         </condition>
 
         <property name="java.excludes.cdcfp" value="${java.part.awt}"/>
 
         <condition property="java.excludes.desktop"
                    value="${java.part.x11} ${java.part.windows}, ${java.part.macosx}, ${java.part.awt}">
-           <isset property="setup.nodesktop"/> 
+           <isset property="setup.nodesktop"/>
         </condition>
 
         <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl} ${java.excludes.desktop}" />
@@ -153,7 +153,7 @@
 
         <!-- Set the project root directory to be up one directory. -->
         <property name="project.root" value=".." />
-    
+
         <!-- Set the configuration and build files to this directory. -->
         <property name="make" value="." />
     </target>
@@ -167,7 +167,7 @@
     </target-->
 
     <!-- ================================================================== -->
-    <!-- 
+    <!--
        - Load user properties which override build defaults.
       -->
     <target name="load.user.properties" depends="base.init,base.init.sourcelevel.1" unless="user.properties.file">
@@ -182,17 +182,17 @@
     </target>
 
     <!-- ================================================================== -->
-    <!-- 
+    <!--
        - Declare all paths and user defined variables.
       -->
     <target name="declare.common" description="Declare properties" depends="load.user.properties">
-        <!-- The location and name of the configuration ANT file that will 
+        <!-- The location and name of the configuration ANT file that will
            - validate to ensure that all user-define variables are set. -->
         <property name="validate.user.properties" value="${make}/validate-properties.xml" />
-           
+
         <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
-        <property name="javacdebug"       value="true" /> 
-        <property name="javacdebuglevel"  value="source,lines" /> 
+        <property name="javacdebug"       value="true" />
+        <property name="javacdebuglevel"  value="source,lines" />
 
         <!-- Names of directories relative to the project root.
              Some of these are used in FileMappers later for dependence information
@@ -226,7 +226,7 @@
         <property name="src.java" value="${project.root}/${rootrel.src.java}" />
         <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
         <property name="build"    value="${project.root}/${rootrel.build.newt}" />
-        
+
         <!-- The generated source directories. -->
         <property name="src.generated" value="${build}/gensrc" />
         <property name="src.generated.c" value="${src.generated}/native/newt" />
@@ -286,16 +286,16 @@
         <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.javafx.newt.*" />
     <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
     </target>
-    
+
     <!-- ================================================================== -->
-    <!-- 
+    <!--
        - Initialize all parameters required for the build and create any
        - required directories.
       -->
     <target name="init" depends="declare.common">
         <!-- Call the external config validator script to make sure the config is ok and consistent -->
         <ant antfile="${validate.user.properties}" inheritall="true"/>
-        
+
         <mkdir dir="${src.generated.c}" />
         <mkdir dir="${src.generated.c}/X11" />
         <mkdir dir="${src.generated.c}/MacOSX" />
@@ -309,7 +309,7 @@
     </target>
 
     <!-- ================================================================== -->
-    <!-- 
+    <!--
        - Compile the original and generated source.
       -->
     <target name="java.compile.javase">
@@ -342,7 +342,7 @@
     <target name="java.compile" depends="java.compile.javase,java.compile.javacdc" />
 
     <!-- ================================================================== -->
-    <!-- 
+    <!--
        - Compile the native C code for JOGL (and optionally the Cg binding).
       -->
 
@@ -356,7 +356,7 @@
       </compiler>
 
       <!-- linker configuration -->
- 
+
       <linker id="linker.cfg.linux.newt.broadcom_egl" extends="linker.cfg.linux">
         <syslibset dir="/nfsroot/lg/lib" libs="EGL"/>
         <syslibset dir="/nfsroot/lg/lib" libs="GLES_CM"/>
@@ -409,7 +409,7 @@
       <property name="linker.cfg.id.core"                   value="linker.cfg.win32.msvc" />
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.win32.msvc.newt" />
     </target>
-    
+
     <target name="c.configure.win32.mingw" if="isMingW">
       <echo message="Win32.MingW" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.win32.mingw" />
@@ -427,7 +427,7 @@
       </condition>
       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
     </target>
-    
+
     <target name="c.configure.linux.amd64" if="isLinuxAMD64">
       <echo message="Linux.AMD64" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.linux.amd64" />
@@ -438,7 +438,7 @@
       </condition>
       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
     </target>
-    
+
     <target name="c.configure.linux.ia64" if="isLinuxIA64">
       <echo message="Linux.IA64" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
@@ -454,15 +454,15 @@
       <property name="linker.cfg.id.core"                   value="linker.cfg.solaris" />
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.newt.x11" />
     </target>
-  
- 
+
+
     <target name="c.configure.solaris.sparcv9" depends="c.configure.x11" if="isSolarisSparcv9">
       <echo message="SolarisSparcv9" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.sparcv9" />
       <property name="linker.cfg.id.core"                   value="linker.cfg.solaris.sparcv9" />
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.sparcv9.newt.x11" />
     </target>
-   
+
 
     <target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64">
       <echo message="SolarisAMD64" />
@@ -470,7 +470,7 @@
       <property name="linker.cfg.id.core"                   value="linker.cfg.solaris.amd64" />
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.amd64.newt.x11" />
     </target>
-   
+
     <target name="c.configure.freebsd" depends="c.configure.x11" if="isFreeBSD">
       <echo message="FreeBSD" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
@@ -494,7 +494,7 @@
       <property name="linker.cfg.id.core"                   value="linker.cfg.macosx" />
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.macosx.newt" />
     </target>
-    
+
     <target name="c.configure.2" depends="c.configure.win32,c.configure.linux,c.configure.solaris32,c.configure.solaris.sparcv9,c.configure.solaris.amd64,c.configure.macosx,c.configure.freebsd,c.configure.hpux" />
 
     <target name="c.configure" depends="c.configure.1,c.configure.2" />
@@ -518,9 +518,9 @@
         <echo message="Output lib name = @{output.lib.name}" />
 
         <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
-        <property name="c.compiler.debug"     value="false" /> 
-        <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } --> 
-        <property name="c.compiler.optimise"  value="none" /> 
+        <property name="c.compiler.debug"     value="false" />
+        <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } -->
+        <property name="c.compiler.optimise"  value="none" />
 
         <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
 
@@ -535,25 +535,25 @@
 
         <echo message="Compiling @{output.lib.name}" />
 
-        <cc outtype="shared" 
-            objdir="${obj}" 
+        <cc outtype="shared"
+            objdir="${obj}"
             outfile="${obj}/@{output.lib.name}"
-            optimize="${c.compiler.optimise}" 
+            optimize="${c.compiler.optimise}"
             debug="${c.compiler.debug}"
-            multithreaded="true" 
-            exceptions="false" 
-            rtti="false">   
-  
+            multithreaded="true"
+            exceptions="false"
+            rtti="false">
+
           <!-- TODO: versioninfo  companyname="java.net"
                         legalcopyright="Copyright"
-                        productname="JOGL" 
+                        productname="JOGL"
                         productversion="x.y.z"
                         description="Description"
-                        fileversion="x.y.z" 
-                        filecomments="File Comment" /-->      
-  
+                        fileversion="x.y.z"
+                        filecomments="File Comment" /-->
+
           <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
-  
+
           <compiler extends="@{compiler.cfg.id}" >
             <sysincludepath path="${java.includes.dir}"/>
             <sysincludepath path="${java.includes.dir.platform}"/>
@@ -567,11 +567,11 @@
             <includepath path="${src.generated.c}/IntelGDL" if="useIntelGDL" />
             <includepath path="stub_includes/embedded/IntelGDL" if="useIntelGDL" />
             <includepath path="${src.generated.c}/BroadcomEGL" if="useBroadcomEGL" />
-  
+
             <!-- This must come last to not override real include paths -->
             <!-- includepath path="stub_includes/macosx" if="isOSX" / -->
           </compiler>
-  
+
           <linker extends="@{linker.cfg.id}">
             <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
             <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
@@ -593,7 +593,7 @@
             <param name="dest" value="${build}/obj/@{output.lib.name}.dll" />
         </antcall>
       </sequential>
-    </macrodef>  
+    </macrodef>
 
     <target name="c.build.newt.prepare.KD" if="useKD">
       <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="com.sun.javafx.newt.opengl.kd.KDWindow" />
@@ -797,17 +797,17 @@
     <!-- ================================================================== -->
     <!--
        - Build the Javadocs for the sources.
-       - NOTE:  these are not entirely correct as the javadocs targets depend 
-       -        on the platform specific build targets.  To circumvent any 
+       - NOTE:  these are not entirely correct as the javadocs targets depend
+       -        on the platform specific build targets.  To circumvent any
        -        errors, ensure that the source is built first.
       -->
     <target name="javadoc" depends="load.user.properties,init">
         <!-- Build the general Javadoc -->
         <javadoc packagenames="${javadoc.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
-                 sourcepath="${src.java};${src.generated.java}"        
+                 sourcepath="${src.java};${src.generated.java}"
                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}" 
+                 overview="${javadoc.overview}"
                  source="1.4"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
@@ -828,14 +828,14 @@
          <classpath refid="nativewindow_gluegen_jogl.classpath"/>
         </javadoc>
     </target>
-                                                                                                                                   
+
     <target name="javadoc.dev" depends="load.user.properties,init">
         <!-- Build the internal developer Javadoc -->
         <javadoc packagenames="${javadoc.dev.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
-                 sourcepath="${src.java};${src.generated.java}"        
+                 sourcepath="${src.java};${src.generated.java}"
                  destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
-                 overview="${javadoc.overview}" 
+                 overview="${javadoc.overview}"
                  source="1.4"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
diff --git a/make/build.xml b/make/build.xml
index 758017639..cd3ee2ab9 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -43,12 +43,12 @@
         <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" />
 
         <property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" />
-        <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames},${javadoc.spec.packagenames},com.sun.opengl.util.*,com.sun.javafx.newt, com.sun.javafx.newt.opengl" />
+        <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames},${javadoc.spec.packagenames},com.jogamp.opengl.util.*,com.sun.javafx.newt, com.sun.javafx.newt.opengl" />
 
         <property name="javadoc.dev" value="${project.root}/javadoc_dev" />
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.opengl.impl.*,com.sun.nativewindow.impl.*,com.sun.javafx.newt.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.sun.nativewindow.impl.*,com.sun.javafx.newt.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
 
-        <property name="java.excludes.javadoc.packagenames" value="com.sun.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
+        <property name="java.excludes.javadoc.packagenames" value="com.jogamp.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
         <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
 
         <property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" />
diff --git a/make/config/jogl/cg-common-CustomJavaCode.java b/make/config/jogl/cg-common-CustomJavaCode.java
index 1f109d9f6..974e24bf4 100755
--- a/make/config/jogl/cg-common-CustomJavaCode.java
+++ b/make/config/jogl/cg-common-CustomJavaCode.java
@@ -1,5 +1,5 @@
 static {
-  com.sun.opengl.impl.NativeLibLoader.loadCgImpl();
+  com.jogamp.opengl.impl.NativeLibLoader.loadCgImpl();
 }
 
 /** A convenience method which reads all available data from the InputStream and then calls cgCreateProgram. */
diff --git a/make/config/jogl/cg-common.cfg b/make/config/jogl/cg-common.cfg
index 9b8dba079..e9ff9d907 100644
--- a/make/config/jogl/cg-common.cfg
+++ b/make/config/jogl/cg-common.cfg
@@ -1,6 +1,6 @@
 # This .cfg file provides common options used among all Cg glue code
 # generated for Jogl on all platforms.
-Package com.sun.opengl.cg
+Package com.jogamp.opengl.cg
 JavaClass CgGL
 Style AllStatic
 JavaOutputDir gensrc/classes
@@ -97,7 +97,7 @@ Ignore cgGetProgramOptions
 #
 Import java.nio.*
 # And NativeLibLoader for help loading the native libraries
-Import com.sun.opengl.impl.*
+Import com.jogamp.opengl.impl.*
 
 #
 # NIODirectOnly directives for routines requiring them for semantic reasons
diff --git a/make/config/jogl/cgl-macosx.cfg b/make/config/jogl/cgl-macosx.cfg
index 54b4be171..f2af29e00 100644
--- a/make/config/jogl/cgl-macosx.cfg
+++ b/make/config/jogl/cgl-macosx.cfg
@@ -3,7 +3,7 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/MacOSX
 
-Package com.sun.opengl.impl.macosx.cgl
+Package com.jogamp.opengl.impl.macosx.cgl
 JavaClass CGL
 Style allstatic
 Include gl-common.cfg
diff --git a/make/config/jogl/cglext.cfg b/make/config/jogl/cglext.cfg
index 3bd027c84..404a852b0 100755
--- a/make/config/jogl/cglext.cfg
+++ b/make/config/jogl/cglext.cfg
@@ -6,10 +6,10 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/MacOSX
 
-Package com.sun.opengl.impl.macosx.cgl
+Package com.jogamp.opengl.impl.macosx.cgl
 Style InterfaceAndImpl
 JavaClass CGLExt
-ImplPackage com.sun.opengl.impl.macosx.cgl
+ImplPackage com.jogamp.opengl.impl.macosx.cgl
 ImplJavaClass CGLExtImpl
 Include gl-common.cfg
 Include gl-desktop.cfg
diff --git a/make/config/jogl/egl-common.cfg b/make/config/jogl/egl-common.cfg
index bcda00b07..01b681b87 100644
--- a/make/config/jogl/egl-common.cfg
+++ b/make/config/jogl/egl-common.cfg
@@ -8,7 +8,7 @@ Import java.nio.*
 Import java.util.*
 Import javax.media.opengl.*
 Import javax.media.opengl.fixedfunc.*
-Import com.sun.opengl.impl.*
+Import com.jogamp.opengl.impl.*
 
 # Treat all of the EGL types as opaque longs
 # Opaque long EGLConfig
diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg
index 713f74ef2..c6b5870d8 100755
--- a/make/config/jogl/egl.cfg
+++ b/make/config/jogl/egl.cfg
@@ -3,7 +3,7 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/egl
 
-Package com.sun.opengl.impl.egl
+Package com.jogamp.opengl.impl.egl
 JavaClass EGL
 Style allstatic
 # Shouldn't matter which one of these we pick up
diff --git a/make/config/jogl/eglext.cfg b/make/config/jogl/eglext.cfg
index fedff35e9..40239371d 100755
--- a/make/config/jogl/eglext.cfg
+++ b/make/config/jogl/eglext.cfg
@@ -3,15 +3,15 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/egl
 
-Package com.sun.opengl.impl.egl
+Package com.jogamp.opengl.impl.egl
 Style InterfaceAndImpl
 JavaClass EGLExt
-ImplPackage com.sun.opengl.impl.egl
+ImplPackage com.jogamp.opengl.impl.egl
 ImplJavaClass EGLExtImpl
 # Shouldn't matter which one of these we pick up
 Include egl-common.cfg
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/sun/opengl/impl/egl/EGL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/impl/egl/EGL.java
 
 HierarchicalNativeOutput false
 
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index 36d156727..022c272df 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -12,7 +12,7 @@ Import java.nio.*
 Import java.util.*
 Import javax.media.opengl.*
 Import javax.media.opengl.fixedfunc.*
-Import com.sun.opengl.impl.*
+Import com.jogamp.opengl.impl.*
 
 #####################################################################
 # Mostly desktop OpenGL stuff below
@@ -22,11 +22,6 @@ Import com.sun.opengl.impl.*
 # because we don't need them java-side. 
 Ignore GL_VERSION_.+
 
-Ignore glWaitSync
-Ignore glVertexP[2-4].+
-Ignore glVertexAttribP[1-4].+
-Ignore glUniformSubroutines.+
-
 # Ignore GL functions that deal with explicit pointer values in such a
 # way that we cannot implement the functionality in Java
 Ignore glGetBufferPointerv
diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg
index 867ef8a83..da2267186 100755
--- a/make/config/jogl/gl-es1.cfg
+++ b/make/config/jogl/gl-es1.cfg
@@ -17,7 +17,7 @@ JavaClass GLES1
 Extends GLES1 GLBase
 Extends GLES1 GL
 Extends GLES1 GL2ES1
-ImplPackage com.sun.opengl.impl.es1
+ImplPackage com.jogamp.opengl.impl.es1
 ImplJavaClass GLES1Impl
 Implements GLES1Impl GLBase
 Implements GLES1Impl GL
@@ -97,4 +97,4 @@ IncludeAs CustomCCode gl-impl-CustomCCode-gles1.c
 Import javax.media.opengl.GLES1
 Import javax.media.opengl.GLES2
 Import javax.media.opengl.GL2
-Import com.sun.opengl.impl.InternalBufferUtil
+Import com.jogamp.opengl.impl.InternalBufferUtil
diff --git a/make/config/jogl/gl-es2.cfg b/make/config/jogl/gl-es2.cfg
index f78001dee..fd11ffcf0 100755
--- a/make/config/jogl/gl-es2.cfg
+++ b/make/config/jogl/gl-es2.cfg
@@ -12,7 +12,7 @@ JavaClass GLES2
 Extends GLES2 GLBase
 Extends GLES2 GL
 Extends GLES2 GL2ES2
-ImplPackage com.sun.opengl.impl.es2
+ImplPackage com.jogamp.opengl.impl.es2
 ImplJavaClass GLES2Impl
 Implements GLES2Impl GLBase
 Implements GLES2Impl GL
@@ -79,6 +79,6 @@ Import javax.media.opengl.GLES2
 Import javax.media.opengl.GL2
 Import javax.media.opengl.GLArrayData
 Import javax.media.opengl.GLUniformData
-Import com.sun.opengl.impl.InternalBufferUtil
+Import com.jogamp.opengl.impl.InternalBufferUtil
 Import java.io.PrintStream
 
diff --git a/make/config/jogl/gl-gl2.cfg b/make/config/jogl/gl-gl2.cfg
index 820243ff5..37452d159 100644
--- a/make/config/jogl/gl-gl2.cfg
+++ b/make/config/jogl/gl-gl2.cfg
@@ -19,7 +19,7 @@ Extends GL2 GL
 Extends GL2 GL2ES1
 Extends GL2 GL2ES2
 Extends GL2 GL2GL3
-ImplPackage com.sun.opengl.impl.gl2
+ImplPackage com.jogamp.opengl.impl.gl2
 ImplJavaClass GL2Impl
 Implements GL2Impl GLBase
 Implements GL2Impl GL
@@ -79,5 +79,5 @@ Import javax.media.opengl.GLES2
 Import javax.media.opengl.GL2
 Import javax.media.opengl.GLArrayData
 Import javax.media.opengl.GLUniformData
-Import com.sun.opengl.impl.InternalBufferUtil
+Import com.jogamp.opengl.impl.InternalBufferUtil
 Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg
index 232116a61..3942b1419 100644
--- a/make/config/jogl/gl-gl2es12.cfg
+++ b/make/config/jogl/gl-gl2es12.cfg
@@ -11,7 +11,7 @@ ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GL
 ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
 
 Style ImplOnly
-ImplPackage com.sun.opengl.impl.gl2es12
+ImplPackage com.jogamp.opengl.impl.gl2es12
 ImplJavaClass GL2ES12Impl
 Implements GL2ES12Impl GLBase
 Implements GL2ES12Impl GL
@@ -86,5 +86,5 @@ IncludeAs CustomCCode gl-impl-CustomCCode-gl2es12.c
 
 Import javax.media.opengl.GLES1
 Import javax.media.opengl.GLES2
-Import com.sun.opengl.impl.InternalBufferUtil
+Import com.jogamp.opengl.impl.InternalBufferUtil
 Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl3.cfg b/make/config/jogl/gl-gl3.cfg
index 9f0ea05a8..0bfe2cc38 100644
--- a/make/config/jogl/gl-gl3.cfg
+++ b/make/config/jogl/gl-gl3.cfg
@@ -14,7 +14,7 @@ Extends GL3 GLBase
 Extends GL3 GL
 Extends GL3 GL2ES2
 Extends GL3 GL2GL3
-ImplPackage com.sun.opengl.impl.gl3
+ImplPackage com.jogamp.opengl.impl.gl3
 ImplJavaClass GL3Impl
 Implements GL3Impl GLBase
 Implements GL3Impl GL
@@ -70,5 +70,5 @@ Import javax.media.opengl.GLES2
 Import javax.media.opengl.GL3
 Import javax.media.opengl.GLArrayData
 Import javax.media.opengl.GLUniformData
-Import com.sun.opengl.impl.InternalBufferUtil
+Import com.jogamp.opengl.impl.InternalBufferUtil
 Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl3bc.cfg b/make/config/jogl/gl-gl3bc.cfg
index 28a4b6cde..a637df941 100644
--- a/make/config/jogl/gl-gl3bc.cfg
+++ b/make/config/jogl/gl-gl3bc.cfg
@@ -23,7 +23,7 @@ Extends GL3bc GL2ES2
 Extends GL3bc GL2GL3
 Extends GL3bc GL2
 Extends GL3bc GL3
-ImplPackage com.sun.opengl.impl.gl3
+ImplPackage com.jogamp.opengl.impl.gl3
 ImplJavaClass GL3bcImpl
 Implements GL3bcImpl GLBase
 Implements GL3bcImpl GL
@@ -82,7 +82,7 @@ CustomJavaCode GL3bcImpl   glClearDepth((double)depth); }
 CustomJavaCode GL3bcImpl public void glDepthRangef(float zNear, float zFar) {
 CustomJavaCode GL3bcImpl    glDepthRange((double)zNear, (double)zFar); }
 
-Include gl3-headers.cfg
+Include gl-headers.cfg
 Include ../intptr.cfg
 
 IncludeAs CustomJavaCode GL3bcImpl gl-impl-CustomJavaCode-common.java
@@ -97,5 +97,5 @@ Import javax.media.opengl.GL2GL3
 Import javax.media.opengl.GL2
 Import javax.media.opengl.GL3
 Import javax.media.opengl.GL3bc
-Import com.sun.opengl.impl.InternalBufferUtil
+Import com.jogamp.opengl.impl.InternalBufferUtil
 Import java.io.PrintStream
diff --git a/make/config/jogl/gl-if-CustomJavaCode-gl3.java b/make/config/jogl/gl-if-CustomJavaCode-gl3.java
index b295e7f8f..1777c1557 100644
--- a/make/config/jogl/gl-if-CustomJavaCode-gl3.java
+++ b/make/config/jogl/gl-if-CustomJavaCode-gl3.java
@@ -1,4 +1,4 @@
-//foobar
+
 /** Part of <code>GL_ARB_uniform_buffer_object</code> */
 public static final int GL_INVALID_INDEX = 0xFFFFFFFF ;
 
diff --git a/make/config/jogl/gl-impl-CustomCCode-gl2.c b/make/config/jogl/gl-impl-CustomCCode-gl2.c
index f97b8eaff..35bc8be49 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl2.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl2.c
@@ -1,5 +1,5 @@
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.gl2.GL2Impl
+ *   Java package: com.jogamp.opengl.impl.gl2.GL2Impl
  *    Java method: long dispatch_glMapBuffer(int target, int access)
  *     C function: void * glMapBuffer(GLenum target, GLenum access);
  */
@@ -14,7 +14,7 @@ Java_com_sun_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject
 }
 
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.gl2.GL2Impl
+ *   Java package: com.jogamp.opengl.impl.gl2.GL2Impl
  *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
  *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
  */
diff --git a/make/config/jogl/gl-impl-CustomCCode-gl2es12.c b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
index e2d5cb58d..a8aa57585 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
@@ -1,5 +1,5 @@
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.gl2es12.GL2ES12Impl
+ *   Java package: com.jogamp.opengl.impl.gl2es12.GL2ES12Impl
  *    Java method: long dispatch_glMapBuffer(int target, int access)
  *     C function: void * glMapBuffer(GLenum target, GLenum access);
  */
@@ -14,7 +14,7 @@ Java_com_sun_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env,
 }
 
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.gl2es12.GL2ES12Impl
+ *   Java package: com.jogamp.opengl.impl.gl2es12.GL2ES12Impl
  *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
  *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
  */
diff --git a/make/config/jogl/gl-impl-CustomCCode-gl3.c b/make/config/jogl/gl-impl-CustomCCode-gl3.c
index a5f78a460..adb2f8964 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl3.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl3.c
@@ -1,5 +1,5 @@
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.gl3.GL3Impl
+ *   Java package: com.jogamp.opengl.impl.gl3.GL3Impl
  *    Java method: long dispatch_glMapBuffer(int target, int access)
  *     C function: void * glMapBuffer(GLenum target, GLenum access);
  */
@@ -14,7 +14,7 @@ Java_com_sun_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject
 }
 
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.gl3.GL3Impl
+ *   Java package: com.jogamp.opengl.impl.gl3.GL3Impl
  *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
  *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
  */
diff --git a/make/config/jogl/gl-impl-CustomCCode-gl3bc.c b/make/config/jogl/gl-impl-CustomCCode-gl3bc.c
index a69204198..701e3a942 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl3bc.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl3bc.c
@@ -1,5 +1,5 @@
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.gl3.GL3bcImpl
+ *   Java package: com.jogamp.opengl.impl.gl3.GL3bcImpl
  *    Java method: long dispatch_glMapBuffer(int target, int access)
  *     C function: void * glMapBuffer(GLenum target, GLenum access);
  */
@@ -14,7 +14,7 @@ Java_com_sun_opengl_impl_gl3_GL3bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobjec
 }
 
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.gl3.GL3bcImpl
+ *   Java package: com.jogamp.opengl.impl.gl3.GL3bcImpl
  *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
  *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
  */
diff --git a/make/config/jogl/gl-impl-CustomCCode-gles1.c b/make/config/jogl/gl-impl-CustomCCode-gles1.c
index efc614e64..7e875c4d0 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gles1.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gles1.c
@@ -1,6 +1,6 @@
 typedef GLvoid* (GL_APIENTRY* PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.es1.GLES1Impl
+ *   Java package: com.jogamp.opengl.impl.es1.GLES1Impl
  *    Java method: long dispatch_glMapBuffer(int target, int access)
  *     C function: void * glMapBuffer(GLenum target, GLenum access);
  */
@@ -15,7 +15,7 @@ Java_com_sun_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobjec
 }
 
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.es1.GLES1Impl
+ *   Java package: com.jogamp.opengl.impl.es1.GLES1Impl
  *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
  *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
  */
diff --git a/make/config/jogl/gl-impl-CustomCCode-gles2.c b/make/config/jogl/gl-impl-CustomCCode-gles2.c
index 27be04749..8dc92049e 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gles2.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gles2.c
@@ -1,6 +1,6 @@
 typedef GLvoid* (GL_APIENTRY* PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.es2.GLES2Impl
+ *   Java package: com.jogamp.opengl.impl.es2.GLES2Impl
  *    Java method: long dispatch_glMapBuffer(int target, int access)
  *     C function: void * glMapBuffer(GLenum target, GLenum access);
  */
@@ -15,7 +15,7 @@ Java_com_sun_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobjec
 }
 
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.es2.GLES2Impl
+ *   Java package: com.jogamp.opengl.impl.es2.GLES2Impl
  *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
  *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
  */
diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java
index 78c067606..aeb4f2ef9 100755
--- a/make/config/jogl/glu-CustomJavaCode-base.java
+++ b/make/config/jogl/glu-CustomJavaCode-base.java
@@ -169,7 +169,7 @@ protected static boolean checkedGLUtessellatorImpl = false;
 
 protected static final void validateGLUtessellatorImpl() {
     if(!checkedGLUtessellatorImpl) {
-        availableGLUtessellatorImpl = NWReflection.isClassAvailable("com.sun.opengl.impl.glu.tessellator.GLUtessellatorImpl");
+        availableGLUtessellatorImpl = NWReflection.isClassAvailable("com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl");
         checkedGLUtessellatorImpl = true;
     }
     if(!availableGLUtessellatorImpl) {
@@ -1220,7 +1220,7 @@ protected static final void validateGLUquadricImpl() {
     if(!checkedGLUquadricImpl) {
         synchronized (syncObject) {
             if(!checkedGLUquadricImpl) {
-                availableGLUquadricImpl = NWReflection.isClassAvailable("com.sun.opengl.impl.glu.GLUquadricImpl");
+                availableGLUquadricImpl = NWReflection.isClassAvailable("com.jogamp.opengl.impl.glu.GLUquadricImpl");
                 checkedGLUquadricImpl = true;
             }
         }
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
index 8afc28c15..b5cb3b2f8 100755
--- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
@@ -86,7 +86,7 @@ protected static boolean checkedMipmap = false;
 
 protected static final void validateMipmap() {
     if(!checkedMipmap) {
-        availableMipmap = NWReflection.isClassAvailable("com.sun.opengl.impl.glu.mipmap.Mipmap");
+        availableMipmap = NWReflection.isClassAvailable("com.jogamp.opengl.impl.glu.mipmap.Mipmap");
         checkedMipmap = true;
     }
     if(!availableMipmap) {
diff --git a/make/config/jogl/glu-base.cfg b/make/config/jogl/glu-base.cfg
index f67673a78..d859225ec 100755
--- a/make/config/jogl/glu-base.cfg
+++ b/make/config/jogl/glu-base.cfg
@@ -20,8 +20,8 @@ Ignore gluScaleImage
 IncludeAs CustomJavaCode GLU glu-CustomJavaCode-base.java
 
 # Imports for the Error and Registry classes
-Import com.sun.opengl.impl.glu.error.Error
-Import com.sun.opengl.impl.glu.registry.Registry
+Import com.jogamp.opengl.impl.glu.error.Error
+Import com.jogamp.opengl.impl.glu.registry.Registry
 
 Include glu-common.cfg
 
diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg
index df59175bb..28a075954 100644
--- a/make/config/jogl/glu-common.cfg
+++ b/make/config/jogl/glu-common.cfg
@@ -12,9 +12,9 @@ TagNativeBinding true
 Import java.nio.*
 Import javax.media.opengl.*
 Import javax.media.opengl.glu.*
-Import com.sun.opengl.impl.*
-Import com.sun.opengl.impl.glu.*
-Import com.sun.opengl.impl.glu.tessellator.GLUtessellatorImpl
+Import com.jogamp.opengl.impl.*
+Import com.jogamp.opengl.impl.glu.*
+Import com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl
 Import com.sun.nativewindow.impl.NWReflection
 
 # Raise GLException instead of RuntimeException in glue code
diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg
index 8b77178f4..cc5b16f0f 100755
--- a/make/config/jogl/glu-gl2.cfg
+++ b/make/config/jogl/glu-gl2.cfg
@@ -25,7 +25,7 @@ CustomCCode #endif
 Include ../intptr.cfg
 
 EmitProcAddressTable true
-ProcAddressTablePackage   com.sun.opengl.impl.glu.gl2
+ProcAddressTablePackage   com.jogamp.opengl.impl.glu.gl2
 ProcAddressTableClassName GLUgl2ProcAddressTable
 GetProcAddressTableExpr   getGLUProcAddressTable()
 
@@ -38,14 +38,14 @@ IncludeAs CustomJavaCode GLUgl2 glu-CustomJavaCode-gl2.java
 # GLU needs access to the GLUtesselatorImpl class for GLUtesselator,
 # to the Mipmap class for scaling and mipmap generation,
 # and to the nurbs.* package for the NURBS functionality
-Import com.sun.opengl.impl.glu.nurbs.*
+Import com.jogamp.opengl.impl.glu.nurbs.*
 Import java.security.*
 Import com.jogamp.gluegen.runtime.opengl.GLProcAddressHelper
-Import com.sun.opengl.impl.glu.gl2.nurbs.*
-Import com.sun.opengl.impl.glu.mipmap.Mipmap
-Import com.sun.opengl.impl.glu.gl2.*
+Import com.jogamp.opengl.impl.glu.gl2.nurbs.*
+Import com.jogamp.opengl.impl.glu.mipmap.Mipmap
+Import com.jogamp.opengl.impl.glu.gl2.*
 Import javax.media.opengl.GL2
-Import com.sun.opengl.impl.gl2.ProjectDouble
+Import com.jogamp.opengl.impl.gl2.ProjectDouble
 
 #
 # ------------------------
diff --git a/make/config/jogl/glu-gl2es1.cfg b/make/config/jogl/glu-gl2es1.cfg
index 8927f96b9..af89014f4 100755
--- a/make/config/jogl/glu-gl2es1.cfg
+++ b/make/config/jogl/glu-gl2es1.cfg
@@ -20,7 +20,7 @@ Ignore gluScaleImage
 IncludeAs CustomJavaCode GLUgl2es1 glu-CustomJavaCode-gl2es1.java
 
 Import javax.media.opengl.GLES1
-Import com.sun.opengl.impl.glu.mipmap.Mipmap
+Import com.jogamp.opengl.impl.glu.mipmap.Mipmap
 
 
 Include glu-common.cfg
diff --git a/make/config/jogl/glx-CustomCCode.c b/make/config/jogl/glx-CustomCCode.c
index a075c4852..efe4d5351 100755
--- a/make/config/jogl/glx-CustomCCode.c
+++ b/make/config/jogl/glx-CustomCCode.c
@@ -15,7 +15,7 @@
 /* We expect glXGetProcAddressARB to be defined */
 extern void (*glXGetProcAddressARB(const GLubyte *procname))();
 
-static const char * clazzNameInternalBufferUtil = "com/sun/opengl/impl/InternalBufferUtil";
+static const char * clazzNameInternalBufferUtil = "com/jogamp/opengl/impl/InternalBufferUtil";
 static const char * clazzNameInternalBufferUtilStaticCstrName = "copyByteBuffer";
 static const char * clazzNameInternalBufferUtilStaticCstrSignature = "(Ljava/nio/ByteBuffer;)Ljava/nio/ByteBuffer;";
 static const char * clazzNameByteBuffer = "java/nio/ByteBuffer";
@@ -60,7 +60,7 @@ static void _initClazzAccess(JNIEnv *env) {
 }
 
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.x11.glx.GLX
+ *   Java package: com.jogamp.opengl.impl.x11.glx.GLX
  *    Java method: XVisualInfo glXGetVisualFromFBConfig(long dpy, long config)
  *     C function: XVisualInfo *  glXGetVisualFromFBConfig(Display *  dpy, GLXFBConfig config);
  */
@@ -85,7 +85,7 @@ Java_com_sun_opengl_impl_x11_glx_GLX_glXGetVisualFromFBConfigCopied0__JJ(JNIEnv
 }
 
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.x11.glx.GLX
+ *   Java package: com.jogamp.opengl.impl.x11.glx.GLX
  *    Java method: java.nio.LongBuffer glXChooseFBConfig(long dpy, int screen, java.nio.IntBuffer attribList, java.nio.IntBuffer nitems)
  *     C function: GLXFBConfig *  glXChooseFBConfig(Display *  dpy, int screen, const int *  attribList, int *  nitems);
  */
@@ -126,7 +126,7 @@ Java_com_sun_opengl_impl_x11_glx_GLX_glXChooseFBConfigCopied1__JILjava_lang_Obje
 }
 
 /*   Java->C glue code:
- *   Java package: com.sun.opengl.impl.x11.glx.GLX
+ *   Java package: com.jogamp.opengl.impl.x11.glx.GLX
  *    Java method: XVisualInfo glXChooseVisual(long dpy, int screen, java.nio.IntBuffer attribList)
  *     C function: XVisualInfo *  glXChooseVisual(Display *  dpy, int screen, int *  attribList);
  */
diff --git a/make/config/jogl/glx-x11.cfg b/make/config/jogl/glx-x11.cfg
index c9079b84f..8814f5e2f 100644
--- a/make/config/jogl/glx-x11.cfg
+++ b/make/config/jogl/glx-x11.cfg
@@ -3,7 +3,7 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/X11
 
-Package com.sun.opengl.impl.x11.glx
+Package com.jogamp.opengl.impl.x11.glx
 JavaClass GLX
 Style allstatic
 Include gl-common.cfg
diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg
index 39ba379c4..f07d5cc1b 100755
--- a/make/config/jogl/glxext.cfg
+++ b/make/config/jogl/glxext.cfg
@@ -3,13 +3,13 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/X11
 
-Package com.sun.opengl.impl.x11.glx
+Package com.jogamp.opengl.impl.x11.glx
 Style InterfaceAndImpl
 JavaClass GLXExt
-ImplPackage com.sun.opengl.impl.x11.glx
+ImplPackage com.jogamp.opengl.impl.x11.glx
 ImplJavaClass GLXExtImpl
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/sun/opengl/impl/x11/glx/GLX.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/impl/x11/glx/GLX.java
 Include gl-common.cfg
 Include gl-desktop.cfg
 
diff --git a/make/config/jogl/wgl-win32.cfg b/make/config/jogl/wgl-win32.cfg
index 6cd4fd412..2a69290a4 100644
--- a/make/config/jogl/wgl-win32.cfg
+++ b/make/config/jogl/wgl-win32.cfg
@@ -3,7 +3,7 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/Windows
 
-Package com.sun.opengl.impl.windows.wgl
+Package com.jogamp.opengl.impl.windows.wgl
 JavaClass WGL
 Style allstatic
 Include gl-common.cfg
diff --git a/make/config/jogl/wglext.cfg b/make/config/jogl/wglext.cfg
index ea9a0257e..35c43cb86 100644
--- a/make/config/jogl/wglext.cfg
+++ b/make/config/jogl/wglext.cfg
@@ -3,10 +3,10 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/Windows
 
-Package com.sun.opengl.impl.windows.wgl
+Package com.jogamp.opengl.impl.windows.wgl
 Style InterfaceAndImpl
 JavaClass WGLExt
-ImplPackage com.sun.opengl.impl.windows.wgl
+ImplPackage com.jogamp.opengl.impl.windows.wgl
 ImplJavaClass WGLExtImpl
 Include gl-common.cfg
 Include gl-desktop.cfg
diff --git a/make/stub_includes/opengl/GL3/gl3.h.orig b/make/stub_includes/opengl/GL3/gl3.h.orig
deleted file mode 100755
index 1f4867169..000000000
--- a/make/stub_includes/opengl/GL3/gl3.h.orig
+++ /dev/null
@@ -1,2742 +0,0 @@
-#ifndef __gl3_h_
-#define __gl3_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007-2010 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-/* This is a draft release of gl3.h, a header for use with OpenGL 3.1, and
- * OpenGL 3.2/3.3/4.0 core profile implementations. The current version is
- * available at http://www.opengl.org/registry/ . Please don't package
- * gl3.h for release with other software until it's out of draft status.
- * The structure of the file may change significantly, and the details
- * will probably change slightly as we make sure exactly the right set
- * of interfaces is included.
- *
- * gl3.h last updated on $Date: 2010-03-11 11:19:31 -0800 (Thu, 11 Mar 2010) $
- *
- * RELEASE NOTES - 2010/03/11
- *
- * gl3.h should be placed under a directory 'GL3' and included as
- * '<GL3/gl3.h>'.
- *
- * gl3.h only includes interfaces supported in a core OpenGL 3.1, 3.2,
- * 3.3, or 3.4 core profile implementation implementation, as well as
- * interfaces for a few ARB extensions which have identical enums and
- * entry points. It does not, and never will include functionality
- * removed from core OpenGL 3.1, such as fixed-function vertex and
- * fragment processing.
- *
- * Implementations of OpenGL 3.1 supporting the optional
- * GL_ARB_compatibility extension continue to provide that functionality,
- * as do implementations of the OpenGL 3.2+ compatibility profiles, and
- * source code requiring it should use the traditional <GL/gl.h> and
- * <GL/glext.h> headers instead of <GL3/gl3.h>.
- *
- * It is not possible to #include both <GL3/gl3.h> and either of
- * <GL/gl.h> or <GL/glext.h> in the same source file.
- *
- * We welcome feedback on gl3.h. Please register for the Khronos Bugzilla
- * (www.khronos.org/bugzilla) and file issues there under product
- * "OpenGL", category "Registry". Feedback on the opengl.org forums
- * may not be responded to in a timely fashion.
- */
-
-/* Function declaration macros - to move into glplatform.h */
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/* Base GL types */
-
-typedef unsigned int GLenum;
-typedef unsigned char GLboolean;
-typedef unsigned int GLbitfield;
-typedef signed char GLbyte;
-typedef short GLshort;
-typedef int GLint;
-typedef int GLsizei;
-typedef unsigned char GLubyte;
-typedef unsigned short GLushort;
-typedef unsigned int GLuint;
-typedef float GLfloat;
-typedef float GLclampf;
-typedef double GLdouble;
-typedef double GLclampd;
-typedef void GLvoid;
-
-/*************************************************************/
-
-#ifndef GL_VERSION_1_1
-/* AttribMask */
-#define GL_DEPTH_BUFFER_BIT               0x00000100
-#define GL_STENCIL_BUFFER_BIT             0x00000400
-#define GL_COLOR_BUFFER_BIT               0x00004000
-/* Boolean */
-#define GL_FALSE                          0
-#define GL_TRUE                           1
-/* BeginMode */
-#define GL_POINTS                         0x0000
-#define GL_LINES                          0x0001
-#define GL_LINE_LOOP                      0x0002
-#define GL_LINE_STRIP                     0x0003
-#define GL_TRIANGLES                      0x0004
-#define GL_TRIANGLE_STRIP                 0x0005
-#define GL_TRIANGLE_FAN                   0x0006
-/* AlphaFunction */
-#define GL_NEVER                          0x0200
-#define GL_LESS                           0x0201
-#define GL_EQUAL                          0x0202
-#define GL_LEQUAL                         0x0203
-#define GL_GREATER                        0x0204
-#define GL_NOTEQUAL                       0x0205
-#define GL_GEQUAL                         0x0206
-#define GL_ALWAYS                         0x0207
-/* BlendingFactorDest */
-#define GL_ZERO                           0
-#define GL_ONE                            1
-#define GL_SRC_COLOR                      0x0300
-#define GL_ONE_MINUS_SRC_COLOR            0x0301
-#define GL_SRC_ALPHA                      0x0302
-#define GL_ONE_MINUS_SRC_ALPHA            0x0303
-#define GL_DST_ALPHA                      0x0304
-#define GL_ONE_MINUS_DST_ALPHA            0x0305
-/* BlendingFactorSrc */
-#define GL_DST_COLOR                      0x0306
-#define GL_ONE_MINUS_DST_COLOR            0x0307
-#define GL_SRC_ALPHA_SATURATE             0x0308
-/* DrawBufferMode */
-#define GL_NONE                           0
-#define GL_FRONT_LEFT                     0x0400
-#define GL_FRONT_RIGHT                    0x0401
-#define GL_BACK_LEFT                      0x0402
-#define GL_BACK_RIGHT                     0x0403
-#define GL_FRONT                          0x0404
-#define GL_BACK                           0x0405
-#define GL_LEFT                           0x0406
-#define GL_RIGHT                          0x0407
-#define GL_FRONT_AND_BACK                 0x0408
-/* ErrorCode */
-#define GL_NO_ERROR                       0
-#define GL_INVALID_ENUM                   0x0500
-#define GL_INVALID_VALUE                  0x0501
-#define GL_INVALID_OPERATION              0x0502
-#define GL_OUT_OF_MEMORY                  0x0505
-/* FrontFaceDirection */
-#define GL_CW                             0x0900
-#define GL_CCW                            0x0901
-/* GetPName */
-#define GL_POINT_SIZE                     0x0B11
-#define GL_POINT_SIZE_RANGE               0x0B12
-#define GL_POINT_SIZE_GRANULARITY         0x0B13
-#define GL_LINE_SMOOTH                    0x0B20
-#define GL_LINE_WIDTH                     0x0B21
-#define GL_LINE_WIDTH_RANGE               0x0B22
-#define GL_LINE_WIDTH_GRANULARITY         0x0B23
-#define GL_POLYGON_SMOOTH                 0x0B41
-#define GL_CULL_FACE                      0x0B44
-#define GL_CULL_FACE_MODE                 0x0B45
-#define GL_FRONT_FACE                     0x0B46
-#define GL_DEPTH_RANGE                    0x0B70
-#define GL_DEPTH_TEST                     0x0B71
-#define GL_DEPTH_WRITEMASK                0x0B72
-#define GL_DEPTH_CLEAR_VALUE              0x0B73
-#define GL_DEPTH_FUNC                     0x0B74
-#define GL_STENCIL_TEST                   0x0B90
-#define GL_STENCIL_CLEAR_VALUE            0x0B91
-#define GL_STENCIL_FUNC                   0x0B92
-#define GL_STENCIL_VALUE_MASK             0x0B93
-#define GL_STENCIL_FAIL                   0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
-#define GL_STENCIL_REF                    0x0B97
-#define GL_STENCIL_WRITEMASK              0x0B98
-#define GL_VIEWPORT                       0x0BA2
-#define GL_DITHER                         0x0BD0
-#define GL_BLEND_DST                      0x0BE0
-#define GL_BLEND_SRC                      0x0BE1
-#define GL_BLEND                          0x0BE2
-#define GL_LOGIC_OP_MODE                  0x0BF0
-#define GL_COLOR_LOGIC_OP                 0x0BF2
-#define GL_DRAW_BUFFER                    0x0C01
-#define GL_READ_BUFFER                    0x0C02
-#define GL_SCISSOR_BOX                    0x0C10
-#define GL_SCISSOR_TEST                   0x0C11
-#define GL_COLOR_CLEAR_VALUE              0x0C22
-#define GL_COLOR_WRITEMASK                0x0C23
-#define GL_DOUBLEBUFFER                   0x0C32
-#define GL_STEREO                         0x0C33
-#define GL_LINE_SMOOTH_HINT               0x0C52
-#define GL_POLYGON_SMOOTH_HINT            0x0C53
-#define GL_UNPACK_SWAP_BYTES              0x0CF0
-#define GL_UNPACK_LSB_FIRST               0x0CF1
-#define GL_UNPACK_ROW_LENGTH              0x0CF2
-#define GL_UNPACK_SKIP_ROWS               0x0CF3
-#define GL_UNPACK_SKIP_PIXELS             0x0CF4
-#define GL_UNPACK_ALIGNMENT               0x0CF5
-#define GL_PACK_SWAP_BYTES                0x0D00
-#define GL_PACK_LSB_FIRST                 0x0D01
-#define GL_PACK_ROW_LENGTH                0x0D02
-#define GL_PACK_SKIP_ROWS                 0x0D03
-#define GL_PACK_SKIP_PIXELS               0x0D04
-#define GL_PACK_ALIGNMENT                 0x0D05
-#define GL_MAX_TEXTURE_SIZE               0x0D33
-#define GL_MAX_VIEWPORT_DIMS              0x0D3A
-#define GL_SUBPIXEL_BITS                  0x0D50
-#define GL_TEXTURE_1D                     0x0DE0
-#define GL_TEXTURE_2D                     0x0DE1
-#define GL_POLYGON_OFFSET_UNITS           0x2A00
-#define GL_POLYGON_OFFSET_POINT           0x2A01
-#define GL_POLYGON_OFFSET_LINE            0x2A02
-#define GL_POLYGON_OFFSET_FILL            0x8037
-#define GL_POLYGON_OFFSET_FACTOR          0x8038
-#define GL_TEXTURE_BINDING_1D             0x8068
-#define GL_TEXTURE_BINDING_2D             0x8069
-/* GetTextureParameter */
-#define GL_TEXTURE_WIDTH                  0x1000
-#define GL_TEXTURE_HEIGHT                 0x1001
-#define GL_TEXTURE_INTERNAL_FORMAT        0x1003
-#define GL_TEXTURE_BORDER_COLOR           0x1004
-#define GL_TEXTURE_RED_SIZE               0x805C
-#define GL_TEXTURE_GREEN_SIZE             0x805D
-#define GL_TEXTURE_BLUE_SIZE              0x805E
-#define GL_TEXTURE_ALPHA_SIZE             0x805F
-/* HintMode */
-#define GL_DONT_CARE                      0x1100
-#define GL_FASTEST                        0x1101
-#define GL_NICEST                         0x1102
-/* DataType */
-#define GL_BYTE                           0x1400
-#define GL_UNSIGNED_BYTE                  0x1401
-#define GL_SHORT                          0x1402
-#define GL_UNSIGNED_SHORT                 0x1403
-#define GL_INT                            0x1404
-#define GL_UNSIGNED_INT                   0x1405
-#define GL_FLOAT                          0x1406
-#define GL_DOUBLE                         0x140A
-/* LogicOp */
-#define GL_CLEAR                          0x1500
-#define GL_AND                            0x1501
-#define GL_AND_REVERSE                    0x1502
-#define GL_COPY                           0x1503
-#define GL_AND_INVERTED                   0x1504
-#define GL_NOOP                           0x1505
-#define GL_XOR                            0x1506
-#define GL_OR                             0x1507
-#define GL_NOR                            0x1508
-#define GL_EQUIV                          0x1509
-#define GL_INVERT                         0x150A
-#define GL_OR_REVERSE                     0x150B
-#define GL_COPY_INVERTED                  0x150C
-#define GL_OR_INVERTED                    0x150D
-#define GL_NAND                           0x150E
-#define GL_SET                            0x150F
-/* MatrixMode (for gl3.h, FBO attachment type) */
-#define GL_TEXTURE                        0x1702
-/* PixelCopyType */
-#define GL_COLOR                          0x1800
-#define GL_DEPTH                          0x1801
-#define GL_STENCIL                        0x1802
-/* PixelFormat */
-#define GL_STENCIL_INDEX                  0x1901
-#define GL_DEPTH_COMPONENT                0x1902
-#define GL_RED                            0x1903
-#define GL_GREEN                          0x1904
-#define GL_BLUE                           0x1905
-#define GL_ALPHA                          0x1906
-#define GL_RGB                            0x1907
-#define GL_RGBA                           0x1908
-/* PolygonMode */
-#define GL_POINT                          0x1B00
-#define GL_LINE                           0x1B01
-#define GL_FILL                           0x1B02
-/* StencilOp */
-#define GL_KEEP                           0x1E00
-#define GL_REPLACE                        0x1E01
-#define GL_INCR                           0x1E02
-#define GL_DECR                           0x1E03
-/* StringName */
-#define GL_VENDOR                         0x1F00
-#define GL_RENDERER                       0x1F01
-#define GL_VERSION                        0x1F02
-#define GL_EXTENSIONS                     0x1F03
-/* TextureMagFilter */
-#define GL_NEAREST                        0x2600
-#define GL_LINEAR                         0x2601
-/* TextureMinFilter */
-#define GL_NEAREST_MIPMAP_NEAREST         0x2700
-#define GL_LINEAR_MIPMAP_NEAREST          0x2701
-#define GL_NEAREST_MIPMAP_LINEAR          0x2702
-#define GL_LINEAR_MIPMAP_LINEAR           0x2703
-/* TextureParameterName */
-#define GL_TEXTURE_MAG_FILTER             0x2800
-#define GL_TEXTURE_MIN_FILTER             0x2801
-#define GL_TEXTURE_WRAP_S                 0x2802
-#define GL_TEXTURE_WRAP_T                 0x2803
-/* TextureTarget */
-#define GL_PROXY_TEXTURE_1D               0x8063
-#define GL_PROXY_TEXTURE_2D               0x8064
-/* TextureWrapMode */
-#define GL_REPEAT                         0x2901
-/* PixelInternalFormat */
-#define GL_R3_G3_B2                       0x2A10
-#define GL_RGB4                           0x804F
-#define GL_RGB5                           0x8050
-#define GL_RGB8                           0x8051
-#define GL_RGB10                          0x8052
-#define GL_RGB12                          0x8053
-#define GL_RGB16                          0x8054
-#define GL_RGBA2                          0x8055
-#define GL_RGBA4                          0x8056
-#define GL_RGB5_A1                        0x8057
-#define GL_RGBA8                          0x8058
-#define GL_RGB10_A2                       0x8059
-#define GL_RGBA12                         0x805A
-#define GL_RGBA16                         0x805B
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_TEXTURE_BINDING_3D             0x806A
-#define GL_PACK_SKIP_IMAGES               0x806B
-#define GL_PACK_IMAGE_HEIGHT              0x806C
-#define GL_UNPACK_SKIP_IMAGES             0x806D
-#define GL_UNPACK_IMAGE_HEIGHT            0x806E
-#define GL_TEXTURE_3D                     0x806F
-#define GL_PROXY_TEXTURE_3D               0x8070
-#define GL_TEXTURE_DEPTH                  0x8071
-#define GL_TEXTURE_WRAP_R                 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE            0x8073
-#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_TEXTURE_MIN_LOD                0x813A
-#define GL_TEXTURE_MAX_LOD                0x813B
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#endif
-
-#ifndef GL_ARB_imaging
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_COMPRESSED_RGB                 0x84ED
-#define GL_COMPRESSED_RGBA                0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
-#define GL_TEXTURE_COMPRESSED             0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_CLAMP_TO_BORDER                0x812D
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_DEPTH_COMPONENT24              0x81A6
-#define GL_DEPTH_COMPONENT32              0x81A7
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
-#define GL_TEXTURE_LOD_BIAS               0x8501
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_TEXTURE_DEPTH_SIZE             0x884A
-#define GL_TEXTURE_COMPARE_MODE           0x884C
-#define GL_TEXTURE_COMPARE_FUNC           0x884D
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_QUERY_COUNTER_BITS             0x8864
-#define GL_CURRENT_QUERY                  0x8865
-#define GL_QUERY_RESULT                   0x8866
-#define GL_QUERY_RESULT_AVAILABLE         0x8867
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_BUFFER_ACCESS                  0x88BB
-#define GL_BUFFER_MAPPED                  0x88BC
-#define GL_BUFFER_MAP_POINTER             0x88BD
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_STREAM_COPY                    0x88E2
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_STATIC_READ                    0x88E5
-#define GL_STATIC_COPY                    0x88E6
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_DYNAMIC_READ                   0x88E9
-#define GL_DYNAMIC_COPY                   0x88EA
-#define GL_SAMPLES_PASSED                 0x8914
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             0x8009
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_PIXEL_PACK_BUFFER              0x88EB
-#define GL_PIXEL_UNPACK_BUFFER            0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
-#define GL_FLOAT_MAT2x3                   0x8B65
-#define GL_FLOAT_MAT2x4                   0x8B66
-#define GL_FLOAT_MAT3x2                   0x8B67
-#define GL_FLOAT_MAT3x4                   0x8B68
-#define GL_FLOAT_MAT4x2                   0x8B69
-#define GL_FLOAT_MAT4x3                   0x8B6A
-#define GL_SRGB                           0x8C40
-#define GL_SRGB8                          0x8C41
-#define GL_SRGB_ALPHA                     0x8C42
-#define GL_SRGB8_ALPHA8                   0x8C43
-#define GL_COMPRESSED_SRGB                0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
-#endif
-
-#ifndef GL_VERSION_3_0
-#define GL_COMPARE_REF_TO_TEXTURE         0x884E
-#define GL_CLIP_DISTANCE0                 0x3000
-#define GL_CLIP_DISTANCE1                 0x3001
-#define GL_CLIP_DISTANCE2                 0x3002
-#define GL_CLIP_DISTANCE3                 0x3003
-#define GL_CLIP_DISTANCE4                 0x3004
-#define GL_CLIP_DISTANCE5                 0x3005
-#define GL_CLIP_DISTANCE6                 0x3006
-#define GL_CLIP_DISTANCE7                 0x3007
-#define GL_MAX_CLIP_DISTANCES             0x0D32
-#define GL_MAJOR_VERSION                  0x821B
-#define GL_MINOR_VERSION                  0x821C
-#define GL_NUM_EXTENSIONS                 0x821D
-#define GL_CONTEXT_FLAGS                  0x821E
-#define GL_DEPTH_BUFFER                   0x8223
-#define GL_STENCIL_BUFFER                 0x8224
-#define GL_COMPRESSED_RED                 0x8225
-#define GL_COMPRESSED_RG                  0x8226
-#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
-#define GL_RGBA32F                        0x8814
-#define GL_RGB32F                         0x8815
-#define GL_RGBA16F                        0x881A
-#define GL_RGB16F                         0x881B
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
-#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
-#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
-#define GL_CLAMP_READ_COLOR               0x891C
-#define GL_FIXED_ONLY                     0x891D
-#define GL_MAX_VARYING_COMPONENTS         0x8B4B
-#define GL_TEXTURE_1D_ARRAY               0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
-#define GL_TEXTURE_2D_ARRAY               0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
-#define GL_R11F_G11F_B10F                 0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
-#define GL_RGB9_E5                        0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
-#define GL_TEXTURE_SHARED_SIZE            0x8C3F
-#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
-#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
-#define GL_PRIMITIVES_GENERATED           0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
-#define GL_RASTERIZER_DISCARD             0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS            0x8C8C
-#define GL_SEPARATE_ATTRIBS               0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
-#define GL_RGBA32UI                       0x8D70
-#define GL_RGB32UI                        0x8D71
-#define GL_RGBA16UI                       0x8D76
-#define GL_RGB16UI                        0x8D77
-#define GL_RGBA8UI                        0x8D7C
-#define GL_RGB8UI                         0x8D7D
-#define GL_RGBA32I                        0x8D82
-#define GL_RGB32I                         0x8D83
-#define GL_RGBA16I                        0x8D88
-#define GL_RGB16I                         0x8D89
-#define GL_RGBA8I                         0x8D8E
-#define GL_RGB8I                          0x8D8F
-#define GL_RED_INTEGER                    0x8D94
-#define GL_GREEN_INTEGER                  0x8D95
-#define GL_BLUE_INTEGER                   0x8D96
-#define GL_RGB_INTEGER                    0x8D98
-#define GL_RGBA_INTEGER                   0x8D99
-#define GL_BGR_INTEGER                    0x8D9A
-#define GL_BGRA_INTEGER                   0x8D9B
-#define GL_SAMPLER_1D_ARRAY               0x8DC0
-#define GL_SAMPLER_2D_ARRAY               0x8DC1
-#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
-#define GL_UNSIGNED_INT_VEC2              0x8DC6
-#define GL_UNSIGNED_INT_VEC3              0x8DC7
-#define GL_UNSIGNED_INT_VEC4              0x8DC8
-#define GL_INT_SAMPLER_1D                 0x8DC9
-#define GL_INT_SAMPLER_2D                 0x8DCA
-#define GL_INT_SAMPLER_3D                 0x8DCB
-#define GL_INT_SAMPLER_CUBE               0x8DCC
-#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
-#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
-#define GL_QUERY_WAIT                     0x8E13
-#define GL_QUERY_NO_WAIT                  0x8E14
-#define GL_QUERY_BY_REGION_WAIT           0x8E15
-#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
-#define GL_BUFFER_ACCESS_FLAGS            0x911F
-#define GL_BUFFER_MAP_LENGTH              0x9120
-#define GL_BUFFER_MAP_OFFSET              0x9121
-/* Reuse tokens from ARB_depth_buffer_float */
-/* reuse GL_DEPTH_COMPONENT32F */
-/* reuse GL_DEPTH32F_STENCIL8 */
-/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
-/* Reuse tokens from ARB_framebuffer_object */
-/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-/* reuse GL_FRAMEBUFFER_DEFAULT */
-/* reuse GL_FRAMEBUFFER_UNDEFINED */
-/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
-/* reuse GL_INDEX */
-/* reuse GL_MAX_RENDERBUFFER_SIZE */
-/* reuse GL_DEPTH_STENCIL */
-/* reuse GL_UNSIGNED_INT_24_8 */
-/* reuse GL_DEPTH24_STENCIL8 */
-/* reuse GL_TEXTURE_STENCIL_SIZE */
-/* reuse GL_TEXTURE_RED_TYPE */
-/* reuse GL_TEXTURE_GREEN_TYPE */
-/* reuse GL_TEXTURE_BLUE_TYPE */
-/* reuse GL_TEXTURE_ALPHA_TYPE */
-/* reuse GL_TEXTURE_DEPTH_TYPE */
-/* reuse GL_UNSIGNED_NORMALIZED */
-/* reuse GL_FRAMEBUFFER_BINDING */
-/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
-/* reuse GL_RENDERBUFFER_BINDING */
-/* reuse GL_READ_FRAMEBUFFER */
-/* reuse GL_DRAW_FRAMEBUFFER */
-/* reuse GL_READ_FRAMEBUFFER_BINDING */
-/* reuse GL_RENDERBUFFER_SAMPLES */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-/* reuse GL_FRAMEBUFFER_COMPLETE */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
-/* reuse GL_MAX_COLOR_ATTACHMENTS */
-/* reuse GL_COLOR_ATTACHMENT0 */
-/* reuse GL_COLOR_ATTACHMENT1 */
-/* reuse GL_COLOR_ATTACHMENT2 */
-/* reuse GL_COLOR_ATTACHMENT3 */
-/* reuse GL_COLOR_ATTACHMENT4 */
-/* reuse GL_COLOR_ATTACHMENT5 */
-/* reuse GL_COLOR_ATTACHMENT6 */
-/* reuse GL_COLOR_ATTACHMENT7 */
-/* reuse GL_COLOR_ATTACHMENT8 */
-/* reuse GL_COLOR_ATTACHMENT9 */
-/* reuse GL_COLOR_ATTACHMENT10 */
-/* reuse GL_COLOR_ATTACHMENT11 */
-/* reuse GL_COLOR_ATTACHMENT12 */
-/* reuse GL_COLOR_ATTACHMENT13 */
-/* reuse GL_COLOR_ATTACHMENT14 */
-/* reuse GL_COLOR_ATTACHMENT15 */
-/* reuse GL_DEPTH_ATTACHMENT */
-/* reuse GL_STENCIL_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER */
-/* reuse GL_RENDERBUFFER */
-/* reuse GL_RENDERBUFFER_WIDTH */
-/* reuse GL_RENDERBUFFER_HEIGHT */
-/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
-/* reuse GL_STENCIL_INDEX1 */
-/* reuse GL_STENCIL_INDEX4 */
-/* reuse GL_STENCIL_INDEX8 */
-/* reuse GL_STENCIL_INDEX16 */
-/* reuse GL_RENDERBUFFER_RED_SIZE */
-/* reuse GL_RENDERBUFFER_GREEN_SIZE */
-/* reuse GL_RENDERBUFFER_BLUE_SIZE */
-/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
-/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
-/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-/* reuse GL_MAX_SAMPLES */
-/* Reuse tokens from ARB_framebuffer_sRGB */
-/* reuse GL_FRAMEBUFFER_SRGB */
-/* Reuse tokens from ARB_half_float_vertex */
-/* reuse GL_HALF_FLOAT */
-/* Reuse tokens from ARB_map_buffer_range */
-/* reuse GL_MAP_READ_BIT */
-/* reuse GL_MAP_WRITE_BIT */
-/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
-/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
-/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
-/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
-/* Reuse tokens from ARB_texture_compression_rgtc */
-/* reuse GL_COMPRESSED_RED_RGTC1 */
-/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
-/* reuse GL_COMPRESSED_RG_RGTC2 */
-/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
-/* Reuse tokens from ARB_texture_rg */
-/* reuse GL_RG */
-/* reuse GL_RG_INTEGER */
-/* reuse GL_R8 */
-/* reuse GL_R16 */
-/* reuse GL_RG8 */
-/* reuse GL_RG16 */
-/* reuse GL_R16F */
-/* reuse GL_R32F */
-/* reuse GL_RG16F */
-/* reuse GL_RG32F */
-/* reuse GL_R8I */
-/* reuse GL_R8UI */
-/* reuse GL_R16I */
-/* reuse GL_R16UI */
-/* reuse GL_R32I */
-/* reuse GL_R32UI */
-/* reuse GL_RG8I */
-/* reuse GL_RG8UI */
-/* reuse GL_RG16I */
-/* reuse GL_RG16UI */
-/* reuse GL_RG32I */
-/* reuse GL_RG32UI */
-/* Reuse tokens from ARB_vertex_array_object */
-/* reuse GL_VERTEX_ARRAY_BINDING */
-#endif
-
-#ifndef GL_VERSION_3_1
-#define GL_SAMPLER_2D_RECT                0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW         0x8B64
-#define GL_SAMPLER_BUFFER                 0x8DC2
-#define GL_INT_SAMPLER_2D_RECT            0x8DCD
-#define GL_INT_SAMPLER_BUFFER             0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT   0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER    0x8DD8
-#define GL_TEXTURE_BUFFER                 0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE        0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER         0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT          0x8C2E
-#define GL_TEXTURE_RECTANGLE              0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
-#define GL_RED_SNORM                      0x8F90
-#define GL_RG_SNORM                       0x8F91
-#define GL_RGB_SNORM                      0x8F92
-#define GL_RGBA_SNORM                     0x8F93
-#define GL_R8_SNORM                       0x8F94
-#define GL_RG8_SNORM                      0x8F95
-#define GL_RGB8_SNORM                     0x8F96
-#define GL_RGBA8_SNORM                    0x8F97
-#define GL_R16_SNORM                      0x8F98
-#define GL_RG16_SNORM                     0x8F99
-#define GL_RGB16_SNORM                    0x8F9A
-#define GL_RGBA16_SNORM                   0x8F9B
-#define GL_SIGNED_NORMALIZED              0x8F9C
-#define GL_PRIMITIVE_RESTART              0x8F9D
-#define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
-/* Reuse tokens from ARB_copy_buffer */
-/* reuse GL_COPY_READ_BUFFER */
-/* reuse GL_COPY_WRITE_BUFFER */
-/* Would reuse tokens from ARB_draw_instanced, but it has none */
-/* Reuse tokens from ARB_uniform_buffer_object */
-/* reuse GL_UNIFORM_BUFFER */
-/* reuse GL_UNIFORM_BUFFER_BINDING */
-/* reuse GL_UNIFORM_BUFFER_START */
-/* reuse GL_UNIFORM_BUFFER_SIZE */
-/* reuse GL_MAX_VERTEX_UNIFORM_BLOCKS */
-/* reuse GL_MAX_FRAGMENT_UNIFORM_BLOCKS */
-/* reuse GL_MAX_COMBINED_UNIFORM_BLOCKS */
-/* reuse GL_MAX_UNIFORM_BUFFER_BINDINGS */
-/* reuse GL_MAX_UNIFORM_BLOCK_SIZE */
-/* reuse GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS */
-/* reuse GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT */
-/* reuse GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH */
-/* reuse GL_ACTIVE_UNIFORM_BLOCKS */
-/* reuse GL_UNIFORM_TYPE */
-/* reuse GL_UNIFORM_SIZE */
-/* reuse GL_UNIFORM_NAME_LENGTH */
-/* reuse GL_UNIFORM_BLOCK_INDEX */
-/* reuse GL_UNIFORM_OFFSET */
-/* reuse GL_UNIFORM_ARRAY_STRIDE */
-/* reuse GL_UNIFORM_MATRIX_STRIDE */
-/* reuse GL_UNIFORM_IS_ROW_MAJOR */
-/* reuse GL_UNIFORM_BLOCK_BINDING */
-/* reuse GL_UNIFORM_BLOCK_DATA_SIZE */
-/* reuse GL_UNIFORM_BLOCK_NAME_LENGTH */
-/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS */
-/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER */
-/* reuse GL_INVALID_INDEX */
-#endif
-
-#ifndef GL_VERSION_3_2
-#define GL_CONTEXT_CORE_PROFILE_BIT       0x00000001
-#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
-#define GL_LINES_ADJACENCY                0x000A
-#define GL_LINE_STRIP_ADJACENCY           0x000B
-#define GL_TRIANGLES_ADJACENCY            0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY       0x000D
-#define GL_PROGRAM_POINT_SIZE             0x8642
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
-#define GL_GEOMETRY_SHADER                0x8DD9
-#define GL_GEOMETRY_VERTICES_OUT          0x8916
-#define GL_GEOMETRY_INPUT_TYPE            0x8917
-#define GL_GEOMETRY_OUTPUT_TYPE           0x8918
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES   0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
-#define GL_MAX_VERTEX_OUTPUT_COMPONENTS   0x9122
-#define GL_MAX_GEOMETRY_INPUT_COMPONENTS  0x9123
-#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
-#define GL_MAX_FRAGMENT_INPUT_COMPONENTS  0x9125
-#define GL_CONTEXT_PROFILE_MASK           0x9126
-/* reuse GL_MAX_VARYING_COMPONENTS */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-/* Reuse tokens from ARB_depth_clamp */
-/* reuse GL_DEPTH_CLAMP */
-/* Would reuse tokens from ARB_draw_elements_base_vertex, but it has none */
-/* Would reuse tokens from ARB_fragment_coord_conventions, but it has none */
-/* Reuse tokens from ARB_provoking_vertex */
-/* reuse GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-/* reuse GL_FIRST_VERTEX_CONVENTION */
-/* reuse GL_LAST_VERTEX_CONVENTION */
-/* reuse GL_PROVOKING_VERTEX */
-/* Reuse tokens from ARB_seamless_cube_map */
-/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS */
-/* Reuse tokens from ARB_sync */
-/* reuse GL_MAX_SERVER_WAIT_TIMEOUT */
-/* reuse GL_OBJECT_TYPE */
-/* reuse GL_SYNC_CONDITION */
-/* reuse GL_SYNC_STATUS */
-/* reuse GL_SYNC_FLAGS */
-/* reuse GL_SYNC_FENCE */
-/* reuse GL_SYNC_GPU_COMMANDS_COMPLETE */
-/* reuse GL_UNSIGNALED */
-/* reuse GL_SIGNALED */
-/* reuse GL_ALREADY_SIGNALED */
-/* reuse GL_TIMEOUT_EXPIRED */
-/* reuse GL_CONDITION_SATISFIED */
-/* reuse GL_WAIT_FAILED */
-/* reuse GL_TIMEOUT_IGNORED */
-/* reuse GL_SYNC_FLUSH_COMMANDS_BIT */
-/* reuse GL_TIMEOUT_IGNORED */
-/* Reuse tokens from ARB_texture_multisample */
-/* reuse GL_SAMPLE_POSITION */
-/* reuse GL_SAMPLE_MASK */
-/* reuse GL_SAMPLE_MASK_VALUE */
-/* reuse GL_MAX_SAMPLE_MASK_WORDS */
-/* reuse GL_TEXTURE_2D_MULTISAMPLE */
-/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE */
-/* reuse GL_TEXTURE_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE */
-/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_TEXTURE_SAMPLES */
-/* reuse GL_TEXTURE_FIXED_SAMPLE_LOCATIONS */
-/* reuse GL_SAMPLER_2D_MULTISAMPLE */
-/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE */
-/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE */
-/* reuse GL_SAMPLER_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_MAX_COLOR_TEXTURE_SAMPLES */
-/* reuse GL_MAX_DEPTH_TEXTURE_SAMPLES */
-/* reuse GL_MAX_INTEGER_SAMPLES */
-/* Don't need to reuse tokens from ARB_vertex_array_bgra since they're already in 1.2 core */
-#endif
-
-#ifndef GL_VERSION_3_3
-/* Reuse tokens from ARB_blend_func_extended */
-/* reuse GL_SRC1_COLOR */
-/* reuse GL_ONE_MINUS_SRC1_COLOR */
-/* reuse GL_ONE_MINUS_SRC1_ALPHA */
-/* reuse GL_MAX_DUAL_SOURCE_DRAW_BUFFERS */
-/* Would reuse tokens from ARB_explicit_attrib_location, but it has none */
-/* Reuse tokens from ARB_occlusion_query2 */
-/* reuse GL_ANY_SAMPLES_PASSED */
-/* Reuse tokens from ARB_sampler_objects */
-/* reuse GL_SAMPLER_BINDING */
-/* Would reuse tokens from ARB_shader_bit_encoding, but it has none */
-/* Reuse tokens from ARB_texture_rgb10_a2ui */
-/* reuse GL_RGB10_A2UI */
-/* Reuse tokens from ARB_texture_swizzle */
-/* reuse GL_TEXTURE_SWIZZLE_R */
-/* reuse GL_TEXTURE_SWIZZLE_G */
-/* reuse GL_TEXTURE_SWIZZLE_B */
-/* reuse GL_TEXTURE_SWIZZLE_A */
-/* reuse GL_TEXTURE_SWIZZLE_RGBA */
-/* Reuse tokens from ARB_timer_query */
-/* reuse GL_TIME_ELAPSED */
-/* reuse GL_TIMESTAMP */
-/* Reuse tokens from ARB_vertex_type_2_10_10_10_rev */
-/* reuse GL_INT_2_10_10_10_REV */
-#endif
-
-#ifndef GL_VERSION_4_0
-/* Reuse tokens from ARB_draw_indirect */
-/* reuse GL_DRAW_INDIRECT_BUFFER */
-/* reuse GL_DRAW_INDIRECT_BUFFER_BINDING */
-/* Reuse tokens from ARB_gpu_shader5 */
-/* reuse GL_GEOMETRY_SHADER_INVOCATIONS */
-/* reuse GL_MAX_GEOMETRY_SHADER_INVOCATIONS */
-/* reuse GL_MIN_FRAGMENT_INTERPOLATION_OFFSET */
-/* reuse GL_MAX_FRAGMENT_INTERPOLATION_OFFSET */
-/* reuse GL_FRAGMENT_INTERPOLATION_OFFSET_BITS */
-/* reuse GL_MAX_VERTEX_STREAMS */
-/* Reuse tokens from ARB_gpu_shader_fp64 */
-/* reuse GL_DOUBLE_VEC2 */
-/* reuse GL_DOUBLE_VEC3 */
-/* reuse GL_DOUBLE_VEC4 */
-/* reuse GL_DOUBLE_MAT2 */
-/* reuse GL_DOUBLE_MAT3 */
-/* reuse GL_DOUBLE_MAT4 */
-/* reuse GL_DOUBLE_MAT2x3 */
-/* reuse GL_DOUBLE_MAT2x4 */
-/* reuse GL_DOUBLE_MAT3x2 */
-/* reuse GL_DOUBLE_MAT3x4 */
-/* reuse GL_DOUBLE_MAT4x2 */
-/* reuse GL_DOUBLE_MAT4x3 */
-/* Reuse tokens from ARB_shader_subroutine */
-/* reuse GL_ACTIVE_SUBROUTINES */
-/* reuse GL_ACTIVE_SUBROUTINE_UNIFORMS */
-/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS */
-/* reuse GL_ACTIVE_SUBROUTINE_MAX_LENGTH */
-/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH */
-/* reuse GL_MAX_SUBROUTINES */
-/* reuse GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS */
-/* reuse GL_NUM_COMPATIBLE_SUBROUTINES */
-/* reuse GL_COMPATIBLE_SUBROUTINES */
-/* Reuse tokens from ARB_tessellation_shader */
-/* reuse GL_PATCHES */
-/* reuse GL_PATCH_VERTICES */
-/* reuse GL_PATCH_DEFAULT_INNER_LEVEL */
-/* reuse GL_PATCH_DEFAULT_OUTER_LEVEL */
-/* reuse GL_TESS_CONTROL_OUTPUT_VERTICES */
-/* reuse GL_TESS_GEN_MODE */
-/* reuse GL_TESS_GEN_SPACING */
-/* reuse GL_TESS_GEN_VERTEX_ORDER */
-/* reuse GL_TESS_GEN_POINT_MODE */
-/* reuse GL_ISOLINES */
-/* reuse GL_FRACTIONAL_ODD */
-/* reuse GL_FRACTIONAL_EVEN */
-/* reuse GL_MAX_PATCH_VERTICES */
-/* reuse GL_MAX_TESS_GEN_LEVEL */
-/* reuse GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS */
-/* reuse GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS */
-/* reuse GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS */
-/* reuse GL_MAX_TESS_PATCH_COMPONENTS */
-/* reuse GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS */
-/* reuse GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS */
-/* reuse GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS */
-/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS */
-/* reuse GL_MAX_TESS_CONTROL_INPUT_COMPONENTS */
-/* reuse GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS */
-/* reuse GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER */
-/* reuse GL_TESS_EVALUATION_SHADER */
-/* reuse GL_TESS_CONTROL_SHADER */
-/* Would reuse tokens from ARB_texture_buffer_object_rgb32, but it has none */
-/* Reuse tokens from ARB_transform_feedback2 */
-/* reuse GL_TRANSFORM_FEEDBACK */
-/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-/* reuse GL_TRANSFORM_FEEDBACK_BINDING */
-/* Reuse tokens from ARB_transform_feedback3 */
-/* reuse GL_MAX_TRANSFORM_FEEDBACK_BUFFERS */
-/* reuse GL_MAX_VERTEX_STREAMS */
-#endif
-
-#ifndef GL_ARB_depth_buffer_float
-#define GL_DEPTH_COMPONENT32F             0x8CAC
-#define GL_DEPTH32F_STENCIL8              0x8CAD
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
-#endif
-
-#ifndef GL_ARB_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
-#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
-#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
-#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
-#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
-#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
-#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
-#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
-#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
-#define GL_FRAMEBUFFER_DEFAULT            0x8218
-#define GL_FRAMEBUFFER_UNDEFINED          0x8219
-#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
-#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
-#define GL_DEPTH_STENCIL                  0x84F9
-#define GL_UNSIGNED_INT_24_8              0x84FA
-#define GL_DEPTH24_STENCIL8               0x88F0
-#define GL_TEXTURE_STENCIL_SIZE           0x88F1
-#define GL_TEXTURE_RED_TYPE               0x8C10
-#define GL_TEXTURE_GREEN_TYPE             0x8C11
-#define GL_TEXTURE_BLUE_TYPE              0x8C12
-#define GL_TEXTURE_ALPHA_TYPE             0x8C13
-#define GL_TEXTURE_DEPTH_TYPE             0x8C16
-#define GL_UNSIGNED_NORMALIZED            0x8C17
-#define GL_FRAMEBUFFER_BINDING            0x8CA6
-#define GL_DRAW_FRAMEBUFFER_BINDING       GL_FRAMEBUFFER_BINDING
-#define GL_RENDERBUFFER_BINDING           0x8CA7
-#define GL_READ_FRAMEBUFFER               0x8CA8
-#define GL_DRAW_FRAMEBUFFER               0x8CA9
-#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
-#define GL_RENDERBUFFER_SAMPLES           0x8CAB
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
-#define GL_COLOR_ATTACHMENT0              0x8CE0
-#define GL_COLOR_ATTACHMENT1              0x8CE1
-#define GL_COLOR_ATTACHMENT2              0x8CE2
-#define GL_COLOR_ATTACHMENT3              0x8CE3
-#define GL_COLOR_ATTACHMENT4              0x8CE4
-#define GL_COLOR_ATTACHMENT5              0x8CE5
-#define GL_COLOR_ATTACHMENT6              0x8CE6
-#define GL_COLOR_ATTACHMENT7              0x8CE7
-#define GL_COLOR_ATTACHMENT8              0x8CE8
-#define GL_COLOR_ATTACHMENT9              0x8CE9
-#define GL_COLOR_ATTACHMENT10             0x8CEA
-#define GL_COLOR_ATTACHMENT11             0x8CEB
-#define GL_COLOR_ATTACHMENT12             0x8CEC
-#define GL_COLOR_ATTACHMENT13             0x8CED
-#define GL_COLOR_ATTACHMENT14             0x8CEE
-#define GL_COLOR_ATTACHMENT15             0x8CEF
-#define GL_DEPTH_ATTACHMENT               0x8D00
-#define GL_STENCIL_ATTACHMENT             0x8D20
-#define GL_FRAMEBUFFER                    0x8D40
-#define GL_RENDERBUFFER                   0x8D41
-#define GL_RENDERBUFFER_WIDTH             0x8D42
-#define GL_RENDERBUFFER_HEIGHT            0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
-#define GL_STENCIL_INDEX1                 0x8D46
-#define GL_STENCIL_INDEX4                 0x8D47
-#define GL_STENCIL_INDEX8                 0x8D48
-#define GL_STENCIL_INDEX16                0x8D49
-#define GL_RENDERBUFFER_RED_SIZE          0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
-#define GL_MAX_SAMPLES                    0x8D57
-#endif
-
-#ifndef GL_ARB_framebuffer_sRGB
-#define GL_FRAMEBUFFER_SRGB               0x8DB9
-#endif
-
-#ifndef GL_ARB_half_float_vertex
-#define GL_HALF_FLOAT                     0x140B
-#endif
-
-#ifndef GL_ARB_map_buffer_range
-#define GL_MAP_READ_BIT                   0x0001
-#define GL_MAP_WRITE_BIT                  0x0002
-#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
-#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
-#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
-#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
-#endif
-
-#ifndef GL_ARB_texture_compression_rgtc
-#define GL_COMPRESSED_RED_RGTC1           0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
-#define GL_COMPRESSED_RG_RGTC2            0x8DBD
-#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
-#endif
-
-#ifndef GL_ARB_texture_rg
-#define GL_RG                             0x8227
-#define GL_RG_INTEGER                     0x8228
-#define GL_R8                             0x8229
-#define GL_R16                            0x822A
-#define GL_RG8                            0x822B
-#define GL_RG16                           0x822C
-#define GL_R16F                           0x822D
-#define GL_R32F                           0x822E
-#define GL_RG16F                          0x822F
-#define GL_RG32F                          0x8230
-#define GL_R8I                            0x8231
-#define GL_R8UI                           0x8232
-#define GL_R16I                           0x8233
-#define GL_R16UI                          0x8234
-#define GL_R32I                           0x8235
-#define GL_R32UI                          0x8236
-#define GL_RG8I                           0x8237
-#define GL_RG8UI                          0x8238
-#define GL_RG16I                          0x8239
-#define GL_RG16UI                         0x823A
-#define GL_RG32I                          0x823B
-#define GL_RG32UI                         0x823C
-#endif
-
-#ifndef GL_ARB_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING           0x85B5
-#endif
-
-#ifndef GL_ARB_uniform_buffer_object
-#define GL_UNIFORM_BUFFER                 0x8A11
-#define GL_UNIFORM_BUFFER_BINDING         0x8A28
-#define GL_UNIFORM_BUFFER_START           0x8A29
-#define GL_UNIFORM_BUFFER_SIZE            0x8A2A
-#define GL_MAX_VERTEX_UNIFORM_BLOCKS      0x8A2B
-#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS    0x8A2C
-#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS    0x8A2D
-#define GL_MAX_COMBINED_UNIFORM_BLOCKS    0x8A2E
-#define GL_MAX_UNIFORM_BUFFER_BINDINGS    0x8A2F
-#define GL_MAX_UNIFORM_BLOCK_SIZE         0x8A30
-#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
-#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
-#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
-#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
-#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
-#define GL_ACTIVE_UNIFORM_BLOCKS          0x8A36
-#define GL_UNIFORM_TYPE                   0x8A37
-#define GL_UNIFORM_SIZE                   0x8A38
-#define GL_UNIFORM_NAME_LENGTH            0x8A39
-#define GL_UNIFORM_BLOCK_INDEX            0x8A3A
-#define GL_UNIFORM_OFFSET                 0x8A3B
-#define GL_UNIFORM_ARRAY_STRIDE           0x8A3C
-#define GL_UNIFORM_MATRIX_STRIDE          0x8A3D
-#define GL_UNIFORM_IS_ROW_MAJOR           0x8A3E
-#define GL_UNIFORM_BLOCK_BINDING          0x8A3F
-#define GL_UNIFORM_BLOCK_DATA_SIZE        0x8A40
-#define GL_UNIFORM_BLOCK_NAME_LENGTH      0x8A41
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS  0x8A42
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
-#define GL_INVALID_INDEX                  0xFFFFFFFFu
-#endif
-
-#ifndef GL_ARB_copy_buffer
-#define GL_COPY_READ_BUFFER               0x8F36
-#define GL_COPY_WRITE_BUFFER              0x8F37
-#endif
-
-#ifndef GL_ARB_depth_clamp
-#define GL_DEPTH_CLAMP                    0x864F
-#endif
-
-#ifndef GL_ARB_draw_elements_base_vertex
-#endif
-
-#ifndef GL_ARB_fragment_coord_conventions
-#endif
-
-#ifndef GL_ARB_provoking_vertex
-#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
-#define GL_FIRST_VERTEX_CONVENTION        0x8E4D
-#define GL_LAST_VERTEX_CONVENTION         0x8E4E
-#define GL_PROVOKING_VERTEX               0x8E4F
-#endif
-
-#ifndef GL_ARB_seamless_cube_map
-#define GL_TEXTURE_CUBE_MAP_SEAMLESS      0x884F
-#endif
-
-#ifndef GL_ARB_sync
-#define GL_MAX_SERVER_WAIT_TIMEOUT        0x9111
-#define GL_OBJECT_TYPE                    0x9112
-#define GL_SYNC_CONDITION                 0x9113
-#define GL_SYNC_STATUS                    0x9114
-#define GL_SYNC_FLAGS                     0x9115
-#define GL_SYNC_FENCE                     0x9116
-#define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
-#define GL_UNSIGNALED                     0x9118
-#define GL_SIGNALED                       0x9119
-#define GL_ALREADY_SIGNALED               0x911A
-#define GL_TIMEOUT_EXPIRED                0x911B
-#define GL_CONDITION_SATISFIED            0x911C
-#define GL_WAIT_FAILED                    0x911D
-#define GL_SYNC_FLUSH_COMMANDS_BIT        0x00000001
-#define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
-#endif
-
-#ifndef GL_ARB_texture_multisample
-#define GL_SAMPLE_POSITION                0x8E50
-#define GL_SAMPLE_MASK                    0x8E51
-#define GL_SAMPLE_MASK_VALUE              0x8E52
-#define GL_MAX_SAMPLE_MASK_WORDS          0x8E59
-#define GL_TEXTURE_2D_MULTISAMPLE         0x9100
-#define GL_PROXY_TEXTURE_2D_MULTISAMPLE   0x9101
-#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY   0x9102
-#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
-#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
-#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
-#define GL_TEXTURE_SAMPLES                0x9106
-#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
-#define GL_SAMPLER_2D_MULTISAMPLE         0x9108
-#define GL_INT_SAMPLER_2D_MULTISAMPLE     0x9109
-#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
-#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910B
-#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
-#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
-#define GL_MAX_COLOR_TEXTURE_SAMPLES      0x910E
-#define GL_MAX_DEPTH_TEXTURE_SAMPLES      0x910F
-#define GL_MAX_INTEGER_SAMPLES            0x9110
-#endif
-
-#ifndef GL_ARB_vertex_array_bgra
-/* reuse GL_BGRA */
-#endif
-
-#ifndef GL_ARB_draw_buffers_blend
-#endif
-
-#ifndef GL_ARB_sample_shading
-#define GL_SAMPLE_SHADING                 0x8C36
-#define GL_MIN_SAMPLE_SHADING_VALUE       0x8C37
-#endif
-
-#ifndef GL_ARB_texture_cube_map_array
-#define GL_TEXTURE_CUBE_MAP_ARRAY         0x9009
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY   0x900B
-#define GL_SAMPLER_CUBE_MAP_ARRAY         0x900C
-#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW  0x900D
-#define GL_INT_SAMPLER_CUBE_MAP_ARRAY     0x900E
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
-#endif
-
-#ifndef GL_ARB_texture_gather
-#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E
-#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F
-#endif
-
-#ifndef GL_ARB_texture_query_lod
-#endif
-
-#ifndef GL_ARB_blend_func_extended
-#define GL_SRC1_COLOR                     0x88F9
-/* reuse GL_SRC1_ALPHA */
-#define GL_ONE_MINUS_SRC1_COLOR           0x88FA
-#define GL_ONE_MINUS_SRC1_ALPHA           0x88FB
-#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS   0x88FC
-#endif
-
-#ifndef GL_ARB_explicit_attrib_location
-#endif
-
-#ifndef GL_ARB_occlusion_query2
-#define GL_ANY_SAMPLES_PASSED             0x8C2F
-#endif
-
-#ifndef GL_ARB_sampler_objects
-#define GL_SAMPLER_BINDING                0x8919
-#endif
-
-#ifndef GL_ARB_shader_bit_encoding
-#endif
-
-#ifndef GL_ARB_texture_rgb10_a2ui
-#define GL_RGB10_A2UI                     0x906F
-#endif
-
-#ifndef GL_ARB_texture_swizzle
-#define GL_TEXTURE_SWIZZLE_R              0x8E42
-#define GL_TEXTURE_SWIZZLE_G              0x8E43
-#define GL_TEXTURE_SWIZZLE_B              0x8E44
-#define GL_TEXTURE_SWIZZLE_A              0x8E45
-#define GL_TEXTURE_SWIZZLE_RGBA           0x8E46
-#endif
-
-#ifndef GL_ARB_timer_query
-#define GL_TIME_ELAPSED                   0x88BF
-#define GL_TIMESTAMP                      0x8E28
-#endif
-
-#ifndef GL_ARB_vertex_type_2_10_10_10_rev
-/* reuse GL_UNSIGNED_INT_2_10_10_10_REV */
-#define GL_INT_2_10_10_10_REV             0x8D9F
-#endif
-
-#ifndef GL_ARB_draw_indirect
-#define GL_DRAW_INDIRECT_BUFFER           0x8F3F
-#define GL_DRAW_INDIRECT_BUFFER_BINDING   0x8F43
-#endif
-
-#ifndef GL_ARB_gpu_shader5
-#define GL_GEOMETRY_SHADER_INVOCATIONS    0x887F
-#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
-#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
-#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
-#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
-#define GL_MAX_VERTEX_STREAMS             0x8E71
-#endif
-
-#ifndef GL_ARB_gpu_shader_fp64
-/* reuse GL_DOUBLE */
-#define GL_DOUBLE_VEC2                    0x8FFC
-#define GL_DOUBLE_VEC3                    0x8FFD
-#define GL_DOUBLE_VEC4                    0x8FFE
-#define GL_DOUBLE_MAT2                    0x8F46
-#define GL_DOUBLE_MAT3                    0x8F47
-#define GL_DOUBLE_MAT4                    0x8F48
-#define GL_DOUBLE_MAT2x3                  0x8F49
-#define GL_DOUBLE_MAT2x4                  0x8F4A
-#define GL_DOUBLE_MAT3x2                  0x8F4B
-#define GL_DOUBLE_MAT3x4                  0x8F4C
-#define GL_DOUBLE_MAT4x2                  0x8F4D
-#define GL_DOUBLE_MAT4x3                  0x8F4E
-#endif
-
-#ifndef GL_ARB_shader_subroutine
-#define GL_ACTIVE_SUBROUTINES             0x8DE5
-#define GL_ACTIVE_SUBROUTINE_UNIFORMS     0x8DE6
-#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
-#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH   0x8E48
-#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
-#define GL_MAX_SUBROUTINES                0x8DE7
-#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
-#define GL_NUM_COMPATIBLE_SUBROUTINES     0x8E4A
-#define GL_COMPATIBLE_SUBROUTINES         0x8E4B
-/* reuse GL_UNIFORM_SIZE */
-/* reuse GL_UNIFORM_NAME_LENGTH */
-#endif
-
-#ifndef GL_ARB_tessellation_shader
-#define GL_PATCHES                        0x000E
-#define GL_PATCH_VERTICES                 0x8E72
-#define GL_PATCH_DEFAULT_INNER_LEVEL      0x8E73
-#define GL_PATCH_DEFAULT_OUTER_LEVEL      0x8E74
-#define GL_TESS_CONTROL_OUTPUT_VERTICES   0x8E75
-#define GL_TESS_GEN_MODE                  0x8E76
-#define GL_TESS_GEN_SPACING               0x8E77
-#define GL_TESS_GEN_VERTEX_ORDER          0x8E78
-#define GL_TESS_GEN_POINT_MODE            0x8E79
-/* reuse GL_TRIANGLES */
-/* reuse GL_QUADS */
-#define GL_ISOLINES                       0x8E7A
-/* reuse GL_EQUAL */
-#define GL_FRACTIONAL_ODD                 0x8E7B
-#define GL_FRACTIONAL_EVEN                0x8E7C
-/* reuse GL_CCW */
-/* reuse GL_CW */
-#define GL_MAX_PATCH_VERTICES             0x8E7D
-#define GL_MAX_TESS_GEN_LEVEL             0x8E7E
-#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
-#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
-#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
-#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
-#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
-#define GL_MAX_TESS_PATCH_COMPONENTS      0x8E84
-#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
-#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
-#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
-#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
-#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
-#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
-#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
-#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
-#define GL_TESS_EVALUATION_SHADER         0x8E87
-#define GL_TESS_CONTROL_SHADER            0x8E88
-#endif
-
-#ifndef GL_ARB_texture_buffer_object_rgb32
-/* reuse GL_RGB32F */
-/* reuse GL_RGB32UI */
-/* reuse GL_RGB32I */
-#endif
-
-#ifndef GL_ARB_transform_feedback2
-#define GL_TRANSFORM_FEEDBACK             0x8E22
-#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
-#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
-#define GL_TRANSFORM_FEEDBACK_BINDING     0x8E25
-#endif
-
-#ifndef GL_ARB_transform_feedback3
-#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
-#endif
-
-
-/*************************************************************/
-
-#include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;
-#endif
-
-#ifndef GL_VERSION_1_5
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#ifndef GL_ARB_shader_objects
-/* GL types for program/shader text and shader object handles */
-typedef char GLcharARB;
-typedef unsigned int GLhandleARB;
-#endif
-
-/* GL type for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
-#ifndef GL_NV_half_float
-typedef unsigned short GLhalfNV;
-#endif
-
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glxext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GL_EXT_timer_query extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__) || defined(__digital__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__) || defined(_LP64)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS ) || defined(__sgi)
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-/* Fallback if nothing above works */
-#include <inttypes.h>
-#endif
-#endif
-
-#ifndef GL_EXT_timer_query
-typedef int64_t GLint64EXT;
-typedef uint64_t GLuint64EXT;
-#endif
-
-#ifndef ARB_sync
-typedef int64_t GLint64;
-typedef uint64_t GLuint64;
-typedef struct __GLsync *GLsync;
-#endif
-
-#ifndef GL_VERSION_1_0
-#define GL_VERSION_1_0 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glCullFace (GLenum mode);
-GLAPI void APIENTRY glFrontFace (GLenum mode);
-GLAPI void APIENTRY glHint (GLenum target, GLenum mode);
-GLAPI void APIENTRY glLineWidth (GLfloat width);
-GLAPI void APIENTRY glPointSize (GLfloat size);
-GLAPI void APIENTRY glPolygonMode (GLenum face, GLenum mode);
-GLAPI void APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glDrawBuffer (GLenum mode);
-GLAPI void APIENTRY glClear (GLbitfield mask);
-GLAPI void APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-GLAPI void APIENTRY glClearStencil (GLint s);
-GLAPI void APIENTRY glClearDepth (GLclampd depth);
-GLAPI void APIENTRY glStencilMask (GLuint mask);
-GLAPI void APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-GLAPI void APIENTRY glDepthMask (GLboolean flag);
-GLAPI void APIENTRY glDisable (GLenum cap);
-GLAPI void APIENTRY glEnable (GLenum cap);
-GLAPI void APIENTRY glFinish (void);
-GLAPI void APIENTRY glFlush (void);
-GLAPI void APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
-GLAPI void APIENTRY glLogicOp (GLenum opcode);
-GLAPI void APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
-GLAPI void APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
-GLAPI void APIENTRY glDepthFunc (GLenum func);
-GLAPI void APIENTRY glPixelStoref (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPixelStorei (GLenum pname, GLint param);
-GLAPI void APIENTRY glReadBuffer (GLenum mode);
-GLAPI void APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-GLAPI void APIENTRY glGetBooleanv (GLenum pname, GLboolean *params);
-GLAPI void APIENTRY glGetDoublev (GLenum pname, GLdouble *params);
-GLAPI GLenum APIENTRY glGetError (void);
-GLAPI void APIENTRY glGetFloatv (GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetIntegerv (GLenum pname, GLint *params);
-GLAPI const GLubyte * APIENTRY glGetString (GLenum name);
-GLAPI void APIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-GLAPI void APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params);
-GLAPI GLboolean APIENTRY glIsEnabled (GLenum cap);
-GLAPI void APIENTRY glDepthRange (GLclampd near, GLclampd far);
-GLAPI void APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCULLFACEPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLFRONTFACEPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLHINTPROC) (GLenum target, GLenum mode);
-typedef void (APIENTRYP PFNGLLINEWIDTHPROC) (GLfloat width);
-typedef void (APIENTRYP PFNGLPOINTSIZEPROC) (GLfloat size);
-typedef void (APIENTRYP PFNGLPOLYGONMODEPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRYP PFNGLSCISSORPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLTEXPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLTEXPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXIMAGE1DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLDRAWBUFFERPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLCLEARPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLCLEARCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLCLEARSTENCILPROC) (GLint s);
-typedef void (APIENTRYP PFNGLCLEARDEPTHPROC) (GLclampd depth);
-typedef void (APIENTRYP PFNGLSTENCILMASKPROC) (GLuint mask);
-typedef void (APIENTRYP PFNGLCOLORMASKPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-typedef void (APIENTRYP PFNGLDEPTHMASKPROC) (GLboolean flag);
-typedef void (APIENTRYP PFNGLDISABLEPROC) (GLenum cap);
-typedef void (APIENTRYP PFNGLENABLEPROC) (GLenum cap);
-typedef void (APIENTRYP PFNGLFINISHPROC) (void);
-typedef void (APIENTRYP PFNGLFLUSHPROC) (void);
-typedef void (APIENTRYP PFNGLBLENDFUNCPROC) (GLenum sfactor, GLenum dfactor);
-typedef void (APIENTRYP PFNGLLOGICOPPROC) (GLenum opcode);
-typedef void (APIENTRYP PFNGLSTENCILFUNCPROC) (GLenum func, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILOPPROC) (GLenum fail, GLenum zfail, GLenum zpass);
-typedef void (APIENTRYP PFNGLDEPTHFUNCPROC) (GLenum func);
-typedef void (APIENTRYP PFNGLPIXELSTOREFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELSTOREIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLREADBUFFERPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-typedef void (APIENTRYP PFNGLGETBOOLEANVPROC) (GLenum pname, GLboolean *params);
-typedef void (APIENTRYP PFNGLGETDOUBLEVPROC) (GLenum pname, GLdouble *params);
-typedef GLenum (APIENTRYP PFNGLGETERRORPROC) (void);
-typedef void (APIENTRYP PFNGLGETFLOATVPROC) (GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETINTEGERVPROC) (GLenum pname, GLint *params);
-typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGPROC) (GLenum name);
-typedef void (APIENTRYP PFNGLGETTEXIMAGEPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC) (GLenum target, GLint level, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC) (GLenum target, GLint level, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC) (GLenum cap);
-typedef void (APIENTRYP PFNGLDEPTHRANGEPROC) (GLclampd near, GLclampd far);
-typedef void (APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_1
-#define GL_VERSION_1_1 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
-GLAPI void APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-GLAPI void APIENTRY glGetPointerv (GLenum pname, GLvoid* *params);
-GLAPI void APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
-GLAPI void APIENTRY glCopyTexImage1D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-GLAPI void APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GLAPI void APIENTRY glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glBindTexture (GLenum target, GLuint texture);
-GLAPI void APIENTRY glDeleteTextures (GLsizei n, const GLuint *textures);
-GLAPI void APIENTRY glGenTextures (GLsizei n, GLuint *textures);
-GLAPI GLboolean APIENTRY glIsTexture (GLuint texture);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETPROC) (GLfloat factor, GLfloat units);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLBINDTEXTUREPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLDELETETEXTURESPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRYP PFNGLGENTEXTURESPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREPROC) (GLuint texture);
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-GLAPI void APIENTRY glBlendEquation (GLenum mode);
-GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum texture);
-GLAPI void APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, GLvoid *img);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param);
-GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids);
-GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint id);
-GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id);
-GLAPI void APIENTRY glEndQuery (GLenum target);
-GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
-GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer);
-GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum target, GLenum access);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, GLvoid* *params);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
-GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
-GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader);
-GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
-GLAPI void APIENTRY glCompileShader (GLuint shader);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum type);
-GLAPI void APIENTRY glDeleteProgram (GLuint program);
-GLAPI void APIENTRY glDeleteShader (GLuint shader);
-GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params);
-GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid* *pointer);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint program);
-GLAPI GLboolean APIENTRY glIsShader (GLuint shader);
-GLAPI void APIENTRY glLinkProgram (GLuint program);
-GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-GLAPI void APIENTRY glUseProgram (GLuint program);
-GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0);
-GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
-GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-GLAPI void APIENTRY glUniform1i (GLint location, GLint v0);
-GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1);
-GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2);
-GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glValidateProgram (GLuint program);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_VERSION_2_1 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-#endif
-
-#ifndef GL_VERSION_3_0
-#define GL_VERSION_3_0 1
-/* OpenGL 3.0 also reuses entry points from these extensions: */
-/* ARB_framebuffer_object */
-/* ARB_map_buffer_range */
-/* ARB_vertex_array_object */
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data);
-GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data);
-GLAPI void APIENTRY glEnablei (GLenum target, GLuint index);
-GLAPI void APIENTRY glDisablei (GLenum target, GLuint index);
-GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index);
-GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode);
-GLAPI void APIENTRY glEndTransformFeedback (void);
-GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
-GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp);
-GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode);
-GLAPI void APIENTRY glEndConditionalRender (void);
-GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x);
-GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y);
-GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x);
-GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y);
-GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z);
-GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params);
-GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name);
-GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0);
-GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1);
-GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2);
-GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params);
-GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value);
-GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value);
-GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value);
-GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-GLAPI const GLubyte * APIENTRY glGetStringi (GLenum name, GLuint index);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
-typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
-typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
-#endif
-
-#ifndef GL_VERSION_3_1
-#define GL_VERSION_3_1 1
-/* OpenGL 3.1 also reuses entry points from these extensions: */
-/* ARB_copy_buffer */
-/* ARB_uniform_buffer_object */
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer);
-GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
-#endif
-
-#ifndef GL_VERSION_3_2
-#define GL_VERSION_3_2 1
-/* OpenGL 3.2 also reuses entry points from these extensions: */
-/* ARB_draw_elements_base_vertex */
-/* ARB_provoking_vertex */
-/* ARB_sync */
-/* ARB_texture_multisample */
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data);
-GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params);
-GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value);
-GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-#endif
-
-#ifndef GL_VERSION_3_3
-#define GL_VERSION_3_3 1
-/* OpenGL 3.3 also reuses entry points from these extensions: */
-/* ARB_blend_func_extended */
-/* ARB_sampler_objects */
-/* ARB_explicit_attrib_location, but it has none */
-/* ARB_occlusion_query2 (no entry points) */
-/* ARB_shader_bit_encoding (no entry points) */
-/* ARB_texture_rgb10_a2ui (no entry points) */
-/* ARB_texture_swizzle (no entry points) */
-/* ARB_timer_query */
-/* ARB_vertex_type_2_10_10_10_rev */
-#endif
-
-#ifndef GL_VERSION_4_0
-#define GL_VERSION_4_0 1
-/* OpenGL 4.0 also reuses entry points from these extensions: */
-/* ARB_gpu_shader5 (no entry points) */
-/* ARB_gpu_shader_fp64 */
-/* ARB_shader_subroutine */
-/* ARB_tessellation_shader */
-/* ARB_texture_buffer_object_rgb32 (no entry points) */
-/* ARB_transform_feedback2 */
-/* ARB_transform_feedback3 */
-#endif
-
-#ifndef GL_ARB_depth_buffer_float
-#define GL_ARB_depth_buffer_float 1
-#endif
-
-#ifndef GL_ARB_framebuffer_object
-#define GL_ARB_framebuffer_object 1
-#ifdef GL3_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer);
-GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
-GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers);
-GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers);
-GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer);
-GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
-GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers);
-GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers);
-GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target);
-GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGenerateMipmap (GLenum target);
-GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-#endif /* GL3_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-#endif
-
-#ifndef GL_ARB_framebuffer_sRGB
-#define GL_ARB_framebuffer_sRGB 1
-#endif
-
-#ifndef GL_ARB_half_float_vertex
-#define GL_ARB_half_float_vertex 1
-#endif
-
-#ifndef GL_ARB_map_buffer_range
-#define GL_ARB_map_buffer_range 1
-#ifdef GL3_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length);
-#endif /* GL3_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
-#endif
-
-#ifndef GL_ARB_texture_compression_rgtc
-#define GL_ARB_texture_compression_rgtc 1
-#endif
-
-#ifndef GL_ARB_texture_rg
-#define GL_ARB_texture_rg 1
-#endif
-
-#ifndef GL_ARB_vertex_array_object
-#define GL_ARB_vertex_array_object 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArray (GLuint array);
-GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays);
-GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays);
-GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
-#endif
-
-#ifndef GL_ARB_uniform_buffer_object
-#define GL_ARB_uniform_buffer_object 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
-GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
-GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName);
-GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
-GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
-typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
-typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-#endif
-
-#ifndef GL_ARB_copy_buffer
-#define GL_ARB_copy_buffer 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-#endif
-
-#ifndef GL_ARB_depth_clamp
-#define GL_ARB_depth_clamp 1
-#endif
-
-#ifndef GL_ARB_draw_elements_base_vertex
-#define GL_ARB_draw_elements_base_vertex 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
-GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
-#endif
-
-#ifndef GL_ARB_fragment_coord_conventions
-#define GL_ARB_fragment_coord_conventions 1
-#endif
-
-#ifndef GL_ARB_provoking_vertex
-#define GL_ARB_provoking_vertex 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glProvokingVertex (GLenum mode);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_ARB_seamless_cube_map
-#define GL_ARB_seamless_cube_map 1
-#endif
-
-#ifndef GL_ARB_sync
-#define GL_ARB_sync 1
-#ifdef GL3_PROTOTYPES
-GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags);
-GLAPI GLboolean APIENTRY glIsSync (GLsync sync);
-GLAPI void APIENTRY glDeleteSync (GLsync sync);
-GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
-GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
-GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *params);
-GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-#endif /* GL3_PROTOTYPES */
-typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
-typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync);
-typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync);
-typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
-typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
-typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params);
-typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-#endif
-
-#ifndef GL_ARB_texture_multisample
-#define GL_ARB_texture_multisample 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val);
-GLAPI void APIENTRY glSampleMaski (GLuint index, GLbitfield mask);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val);
-typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask);
-#endif
-
-#ifndef GL_ARB_vertex_array_bgra
-#define GL_ARB_vertex_array_bgra 1
-#endif
-
-#ifndef GL_ARB_draw_buffers_blend
-#define GL_ARB_draw_buffers_blend 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode);
-GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst);
-GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-#endif
-
-#ifndef GL_ARB_sample_shading
-#define GL_ARB_sample_shading 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glMinSampleShading (GLclampf value);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLclampf value);
-#endif
-
-#ifndef GL_ARB_texture_cube_map_array
-#define GL_ARB_texture_cube_map_array 1
-#endif
-
-#ifndef GL_ARB_texture_gather
-#define GL_ARB_texture_gather 1
-#endif
-
-#ifndef GL_ARB_texture_query_lod
-#define GL_ARB_texture_query_lod 1
-#endif
-
-#ifndef GL_ARB_blend_func_extended
-#define GL_ARB_blend_func_extended 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
-GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name);
-#endif
-
-#ifndef GL_ARB_sampler_objects
-#define GL_ARB_sampler_objects 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers);
-GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers);
-GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler);
-GLAPI void APIENTRY glBindSampler (GLenum unit, GLuint sampler);
-GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param);
-GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param);
-GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param);
-GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param);
-GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param);
-GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetSamplerParameterIfv (GLuint sampler, GLenum pname, GLfloat *params);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
-typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers);
-typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler);
-typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLenum unit, GLuint sampler);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param);
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_ARB_timer_query
-#define GL_ARB_timer_query 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target);
-GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params);
-GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params);
-#endif
-
-#ifndef GL_ARB_vertex_type_2_10_10_10_rev
-#define GL_ARB_vertex_type_2_10_10_10_rev 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value);
-GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value);
-GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value);
-GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value);
-GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value);
-GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value);
-GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords);
-GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords);
-GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords);
-GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords);
-GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color);
-GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color);
-GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color);
-GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color);
-GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color);
-GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color);
-GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value);
-typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color);
-typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color);
-typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color);
-typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-#endif
-
-#ifndef GL_ARB_draw_indirect
-#define GL_ARB_draw_indirect 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const GLvoid *indirect);
-GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const GLvoid *indirect);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const GLvoid *indirect);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const GLvoid *indirect);
-#endif
-
-#ifndef GL_ARB_gpu_shader_fp64
-#define GL_ARB_gpu_shader_fp64 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x);
-GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params);
-GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x);
-GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x);
-typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-#endif
-
-#ifndef GL_ARB_shader_subroutine
-#define GL_ARB_shader_subroutine 1
-#ifdef GL3_PROTOTYPES
-GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name);
-GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name);
-GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
-GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices);
-GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params);
-GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
-#endif /* GL3_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name);
-typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
-typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices);
-typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
-#endif
-
-#ifndef GL_ARB_tessellation_shader
-#define GL_ARB_tessellation_shader 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value);
-GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
-typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values);
-#endif
-
-#ifndef GL_ARB_transform_feedback2
-#define GL_ARB_transform_feedback2 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id);
-GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids);
-GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids);
-GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id);
-GLAPI void APIENTRY glPauseTransformFeedback (void);
-GLAPI void APIENTRY glResumeTransformFeedback (void);
-GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids);
-typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
-#endif
-
-#ifndef GL_ARB_transform_feedback3
-#define GL_ARB_transform_feedback3 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream);
-GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id);
-GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index);
-GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
-typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/make/stub_includes/opengl/GL3/gl3ext.h.orig b/make/stub_includes/opengl/GL3/gl3ext.h.orig
deleted file mode 100644
index a2991cc77..000000000
--- a/make/stub_includes/opengl/GL3/gl3ext.h.orig
+++ /dev/null
@@ -1,10073 +0,0 @@
-#ifndef __glext_h_
-#define __glext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007-2010 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated $Date: 2010-03-11 11:19:31 -0800 (Thu, 11 Mar 2010) $ */
-/* Current version at http://www.opengl.org/registry/ */
-#define GL_GLEXT_VERSION 60
-/* Function declaration macros - to move into glplatform.h */
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-#ifndef GL_VERSION_1_2
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_TEXTURE_BINDING_3D             0x806A
-#define GL_PACK_SKIP_IMAGES               0x806B
-#define GL_PACK_IMAGE_HEIGHT              0x806C
-#define GL_UNPACK_SKIP_IMAGES             0x806D
-#define GL_UNPACK_IMAGE_HEIGHT            0x806E
-#define GL_TEXTURE_3D                     0x806F
-#define GL_PROXY_TEXTURE_3D               0x8070
-#define GL_TEXTURE_DEPTH                  0x8071
-#define GL_TEXTURE_WRAP_R                 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE            0x8073
-#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_TEXTURE_MIN_LOD                0x813A
-#define GL_TEXTURE_MAX_LOD                0x813B
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#endif
-
-#ifndef GL_VERSION_1_2_DEPRECATED
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
-#define GL_SINGLE_COLOR                   0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#endif
-
-#ifndef GL_ARB_imaging
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#endif
-
-#ifndef GL_ARB_imaging_DEPRECATED
-#define GL_CONVOLUTION_1D                 0x8010
-#define GL_CONVOLUTION_2D                 0x8011
-#define GL_SEPARABLE_2D                   0x8012
-#define GL_CONVOLUTION_BORDER_MODE        0x8013
-#define GL_CONVOLUTION_FILTER_SCALE       0x8014
-#define GL_CONVOLUTION_FILTER_BIAS        0x8015
-#define GL_REDUCE                         0x8016
-#define GL_CONVOLUTION_FORMAT             0x8017
-#define GL_CONVOLUTION_WIDTH              0x8018
-#define GL_CONVOLUTION_HEIGHT             0x8019
-#define GL_MAX_CONVOLUTION_WIDTH          0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
-#define GL_HISTOGRAM                      0x8024
-#define GL_PROXY_HISTOGRAM                0x8025
-#define GL_HISTOGRAM_WIDTH                0x8026
-#define GL_HISTOGRAM_FORMAT               0x8027
-#define GL_HISTOGRAM_RED_SIZE             0x8028
-#define GL_HISTOGRAM_GREEN_SIZE           0x8029
-#define GL_HISTOGRAM_BLUE_SIZE            0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
-#define GL_HISTOGRAM_SINK                 0x802D
-#define GL_MINMAX                         0x802E
-#define GL_MINMAX_FORMAT                  0x802F
-#define GL_MINMAX_SINK                    0x8030
-#define GL_TABLE_TOO_LARGE                0x8031
-#define GL_COLOR_MATRIX                   0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
-#define GL_COLOR_TABLE                    0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
-#define GL_PROXY_COLOR_TABLE              0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE              0x80D6
-#define GL_COLOR_TABLE_BIAS               0x80D7
-#define GL_COLOR_TABLE_FORMAT             0x80D8
-#define GL_COLOR_TABLE_WIDTH              0x80D9
-#define GL_COLOR_TABLE_RED_SIZE           0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
-#define GL_CONSTANT_BORDER                0x8151
-#define GL_REPLICATE_BORDER               0x8153
-#define GL_CONVOLUTION_BORDER_COLOR       0x8154
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_COMPRESSED_RGB                 0x84ED
-#define GL_COMPRESSED_RGBA                0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
-#define GL_TEXTURE_COMPRESSED             0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_CLAMP_TO_BORDER                0x812D
-#endif
-
-#ifndef GL_VERSION_1_3_DEPRECATED
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
-#define GL_MULTISAMPLE_BIT                0x20000000
-#define GL_NORMAL_MAP                     0x8511
-#define GL_REFLECTION_MAP                 0x8512
-#define GL_COMPRESSED_ALPHA               0x84E9
-#define GL_COMPRESSED_LUMINANCE           0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
-#define GL_COMPRESSED_INTENSITY           0x84EC
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_SOURCE0_RGB                    0x8580
-#define GL_SOURCE1_RGB                    0x8581
-#define GL_SOURCE2_RGB                    0x8582
-#define GL_SOURCE0_ALPHA                  0x8588
-#define GL_SOURCE1_ALPHA                  0x8589
-#define GL_SOURCE2_ALPHA                  0x858A
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_SUBTRACT                       0x84E7
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_DEPTH_COMPONENT24              0x81A6
-#define GL_DEPTH_COMPONENT32              0x81A7
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
-#define GL_TEXTURE_LOD_BIAS               0x8501
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_TEXTURE_DEPTH_SIZE             0x884A
-#define GL_TEXTURE_COMPARE_MODE           0x884C
-#define GL_TEXTURE_COMPARE_FUNC           0x884D
-#endif
-
-#ifndef GL_VERSION_1_4_DEPRECATED
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_GENERATE_MIPMAP                0x8191
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-#define GL_FOG_COORDINATE_SOURCE          0x8450
-#define GL_FOG_COORDINATE                 0x8451
-#define GL_FRAGMENT_DEPTH                 0x8452
-#define GL_CURRENT_FOG_COORDINATE         0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
-#define GL_FOG_COORDINATE_ARRAY           0x8457
-#define GL_COLOR_SUM                      0x8458
-#define GL_CURRENT_SECONDARY_COLOR        0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
-#define GL_SECONDARY_COLOR_ARRAY          0x845E
-#define GL_TEXTURE_FILTER_CONTROL         0x8500
-#define GL_DEPTH_TEXTURE_MODE             0x884B
-#define GL_COMPARE_R_TO_TEXTURE           0x884E
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_QUERY_COUNTER_BITS             0x8864
-#define GL_CURRENT_QUERY                  0x8865
-#define GL_QUERY_RESULT                   0x8866
-#define GL_QUERY_RESULT_AVAILABLE         0x8867
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_BUFFER_ACCESS                  0x88BB
-#define GL_BUFFER_MAPPED                  0x88BC
-#define GL_BUFFER_MAP_POINTER             0x88BD
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_STREAM_COPY                    0x88E2
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_STATIC_READ                    0x88E5
-#define GL_STATIC_COPY                    0x88E6
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_DYNAMIC_READ                   0x88E9
-#define GL_DYNAMIC_COPY                   0x88EA
-#define GL_SAMPLES_PASSED                 0x8914
-#endif
-
-#ifndef GL_VERSION_1_5_DEPRECATED
-#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
-#define GL_FOG_COORD_SRC                  0x8450
-#define GL_FOG_COORD                      0x8451
-#define GL_CURRENT_FOG_COORD              0x8453
-#define GL_FOG_COORD_ARRAY_TYPE           0x8454
-#define GL_FOG_COORD_ARRAY_STRIDE         0x8455
-#define GL_FOG_COORD_ARRAY_POINTER        0x8456
-#define GL_FOG_COORD_ARRAY                0x8457
-#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D
-#define GL_SRC0_RGB                       0x8580
-#define GL_SRC1_RGB                       0x8581
-#define GL_SRC2_RGB                       0x8582
-#define GL_SRC0_ALPHA                     0x8588
-#define GL_SRC1_ALPHA                     0x8589
-#define GL_SRC2_ALPHA                     0x858A
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             0x8009
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
-#ifndef GL_VERSION_2_0_DEPRECATED
-#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
-#define GL_POINT_SPRITE                   0x8861
-#define GL_COORD_REPLACE                  0x8862
-#define GL_MAX_TEXTURE_COORDS             0x8871
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_PIXEL_PACK_BUFFER              0x88EB
-#define GL_PIXEL_UNPACK_BUFFER            0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
-#define GL_FLOAT_MAT2x3                   0x8B65
-#define GL_FLOAT_MAT2x4                   0x8B66
-#define GL_FLOAT_MAT3x2                   0x8B67
-#define GL_FLOAT_MAT3x4                   0x8B68
-#define GL_FLOAT_MAT4x2                   0x8B69
-#define GL_FLOAT_MAT4x3                   0x8B6A
-#define GL_SRGB                           0x8C40
-#define GL_SRGB8                          0x8C41
-#define GL_SRGB_ALPHA                     0x8C42
-#define GL_SRGB8_ALPHA8                   0x8C43
-#define GL_COMPRESSED_SRGB                0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
-#endif
-
-#ifndef GL_VERSION_2_1_DEPRECATED
-#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
-#define GL_SLUMINANCE_ALPHA               0x8C44
-#define GL_SLUMINANCE8_ALPHA8             0x8C45
-#define GL_SLUMINANCE                     0x8C46
-#define GL_SLUMINANCE8                    0x8C47
-#define GL_COMPRESSED_SLUMINANCE          0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
-#endif
-
-#ifndef GL_VERSION_3_0
-#define GL_COMPARE_REF_TO_TEXTURE         0x884E
-#define GL_CLIP_DISTANCE0                 0x3000
-#define GL_CLIP_DISTANCE1                 0x3001
-#define GL_CLIP_DISTANCE2                 0x3002
-#define GL_CLIP_DISTANCE3                 0x3003
-#define GL_CLIP_DISTANCE4                 0x3004
-#define GL_CLIP_DISTANCE5                 0x3005
-#define GL_CLIP_DISTANCE6                 0x3006
-#define GL_CLIP_DISTANCE7                 0x3007
-#define GL_MAX_CLIP_DISTANCES             0x0D32
-#define GL_MAJOR_VERSION                  0x821B
-#define GL_MINOR_VERSION                  0x821C
-#define GL_NUM_EXTENSIONS                 0x821D
-#define GL_CONTEXT_FLAGS                  0x821E
-#define GL_DEPTH_BUFFER                   0x8223
-#define GL_STENCIL_BUFFER                 0x8224
-#define GL_COMPRESSED_RED                 0x8225
-#define GL_COMPRESSED_RG                  0x8226
-#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
-#define GL_RGBA32F                        0x8814
-#define GL_RGB32F                         0x8815
-#define GL_RGBA16F                        0x881A
-#define GL_RGB16F                         0x881B
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
-#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
-#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
-#define GL_CLAMP_READ_COLOR               0x891C
-#define GL_FIXED_ONLY                     0x891D
-#define GL_MAX_VARYING_COMPONENTS         0x8B4B
-#define GL_TEXTURE_1D_ARRAY               0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
-#define GL_TEXTURE_2D_ARRAY               0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
-#define GL_R11F_G11F_B10F                 0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
-#define GL_RGB9_E5                        0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
-#define GL_TEXTURE_SHARED_SIZE            0x8C3F
-#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
-#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
-#define GL_PRIMITIVES_GENERATED           0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
-#define GL_RASTERIZER_DISCARD             0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS            0x8C8C
-#define GL_SEPARATE_ATTRIBS               0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
-#define GL_RGBA32UI                       0x8D70
-#define GL_RGB32UI                        0x8D71
-#define GL_RGBA16UI                       0x8D76
-#define GL_RGB16UI                        0x8D77
-#define GL_RGBA8UI                        0x8D7C
-#define GL_RGB8UI                         0x8D7D
-#define GL_RGBA32I                        0x8D82
-#define GL_RGB32I                         0x8D83
-#define GL_RGBA16I                        0x8D88
-#define GL_RGB16I                         0x8D89
-#define GL_RGBA8I                         0x8D8E
-#define GL_RGB8I                          0x8D8F
-#define GL_RED_INTEGER                    0x8D94
-#define GL_GREEN_INTEGER                  0x8D95
-#define GL_BLUE_INTEGER                   0x8D96
-#define GL_RGB_INTEGER                    0x8D98
-#define GL_RGBA_INTEGER                   0x8D99
-#define GL_BGR_INTEGER                    0x8D9A
-#define GL_BGRA_INTEGER                   0x8D9B
-#define GL_SAMPLER_1D_ARRAY               0x8DC0
-#define GL_SAMPLER_2D_ARRAY               0x8DC1
-#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
-#define GL_UNSIGNED_INT_VEC2              0x8DC6
-#define GL_UNSIGNED_INT_VEC3              0x8DC7
-#define GL_UNSIGNED_INT_VEC4              0x8DC8
-#define GL_INT_SAMPLER_1D                 0x8DC9
-#define GL_INT_SAMPLER_2D                 0x8DCA
-#define GL_INT_SAMPLER_3D                 0x8DCB
-#define GL_INT_SAMPLER_CUBE               0x8DCC
-#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
-#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
-#define GL_QUERY_WAIT                     0x8E13
-#define GL_QUERY_NO_WAIT                  0x8E14
-#define GL_QUERY_BY_REGION_WAIT           0x8E15
-#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
-#define GL_BUFFER_ACCESS_FLAGS            0x911F
-#define GL_BUFFER_MAP_LENGTH              0x9120
-#define GL_BUFFER_MAP_OFFSET              0x9121
-/* Reuse tokens from ARB_depth_buffer_float */
-/* reuse GL_DEPTH_COMPONENT32F */
-/* reuse GL_DEPTH32F_STENCIL8 */
-/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
-/* Reuse tokens from ARB_framebuffer_object */
-/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-/* reuse GL_FRAMEBUFFER_DEFAULT */
-/* reuse GL_FRAMEBUFFER_UNDEFINED */
-/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
-/* reuse GL_INDEX */
-/* reuse GL_MAX_RENDERBUFFER_SIZE */
-/* reuse GL_DEPTH_STENCIL */
-/* reuse GL_UNSIGNED_INT_24_8 */
-/* reuse GL_DEPTH24_STENCIL8 */
-/* reuse GL_TEXTURE_STENCIL_SIZE */
-/* reuse GL_TEXTURE_RED_TYPE */
-/* reuse GL_TEXTURE_GREEN_TYPE */
-/* reuse GL_TEXTURE_BLUE_TYPE */
-/* reuse GL_TEXTURE_ALPHA_TYPE */
-/* reuse GL_TEXTURE_DEPTH_TYPE */
-/* reuse GL_UNSIGNED_NORMALIZED */
-/* reuse GL_FRAMEBUFFER_BINDING */
-/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
-/* reuse GL_RENDERBUFFER_BINDING */
-/* reuse GL_READ_FRAMEBUFFER */
-/* reuse GL_DRAW_FRAMEBUFFER */
-/* reuse GL_READ_FRAMEBUFFER_BINDING */
-/* reuse GL_RENDERBUFFER_SAMPLES */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-/* reuse GL_FRAMEBUFFER_COMPLETE */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
-/* reuse GL_MAX_COLOR_ATTACHMENTS */
-/* reuse GL_COLOR_ATTACHMENT0 */
-/* reuse GL_COLOR_ATTACHMENT1 */
-/* reuse GL_COLOR_ATTACHMENT2 */
-/* reuse GL_COLOR_ATTACHMENT3 */
-/* reuse GL_COLOR_ATTACHMENT4 */
-/* reuse GL_COLOR_ATTACHMENT5 */
-/* reuse GL_COLOR_ATTACHMENT6 */
-/* reuse GL_COLOR_ATTACHMENT7 */
-/* reuse GL_COLOR_ATTACHMENT8 */
-/* reuse GL_COLOR_ATTACHMENT9 */
-/* reuse GL_COLOR_ATTACHMENT10 */
-/* reuse GL_COLOR_ATTACHMENT11 */
-/* reuse GL_COLOR_ATTACHMENT12 */
-/* reuse GL_COLOR_ATTACHMENT13 */
-/* reuse GL_COLOR_ATTACHMENT14 */
-/* reuse GL_COLOR_ATTACHMENT15 */
-/* reuse GL_DEPTH_ATTACHMENT */
-/* reuse GL_STENCIL_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER */
-/* reuse GL_RENDERBUFFER */
-/* reuse GL_RENDERBUFFER_WIDTH */
-/* reuse GL_RENDERBUFFER_HEIGHT */
-/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
-/* reuse GL_STENCIL_INDEX1 */
-/* reuse GL_STENCIL_INDEX4 */
-/* reuse GL_STENCIL_INDEX8 */
-/* reuse GL_STENCIL_INDEX16 */
-/* reuse GL_RENDERBUFFER_RED_SIZE */
-/* reuse GL_RENDERBUFFER_GREEN_SIZE */
-/* reuse GL_RENDERBUFFER_BLUE_SIZE */
-/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
-/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
-/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-/* reuse GL_MAX_SAMPLES */
-/* Reuse tokens from ARB_framebuffer_sRGB */
-/* reuse GL_FRAMEBUFFER_SRGB */
-/* Reuse tokens from ARB_half_float_vertex */
-/* reuse GL_HALF_FLOAT */
-/* Reuse tokens from ARB_map_buffer_range */
-/* reuse GL_MAP_READ_BIT */
-/* reuse GL_MAP_WRITE_BIT */
-/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
-/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
-/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
-/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
-/* Reuse tokens from ARB_texture_compression_rgtc */
-/* reuse GL_COMPRESSED_RED_RGTC1 */
-/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
-/* reuse GL_COMPRESSED_RG_RGTC2 */
-/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
-/* Reuse tokens from ARB_texture_rg */
-/* reuse GL_RG */
-/* reuse GL_RG_INTEGER */
-/* reuse GL_R8 */
-/* reuse GL_R16 */
-/* reuse GL_RG8 */
-/* reuse GL_RG16 */
-/* reuse GL_R16F */
-/* reuse GL_R32F */
-/* reuse GL_RG16F */
-/* reuse GL_RG32F */
-/* reuse GL_R8I */
-/* reuse GL_R8UI */
-/* reuse GL_R16I */
-/* reuse GL_R16UI */
-/* reuse GL_R32I */
-/* reuse GL_R32UI */
-/* reuse GL_RG8I */
-/* reuse GL_RG8UI */
-/* reuse GL_RG16I */
-/* reuse GL_RG16UI */
-/* reuse GL_RG32I */
-/* reuse GL_RG32UI */
-/* Reuse tokens from ARB_vertex_array_object */
-/* reuse GL_VERTEX_ARRAY_BINDING */
-#endif
-
-#ifndef GL_VERSION_3_0_DEPRECATED
-#define GL_CLAMP_VERTEX_COLOR             0x891A
-#define GL_CLAMP_FRAGMENT_COLOR           0x891B
-#define GL_ALPHA_INTEGER                  0x8D97
-/* Reuse tokens from ARB_framebuffer_object */
-/* reuse GL_TEXTURE_LUMINANCE_TYPE */
-/* reuse GL_TEXTURE_INTENSITY_TYPE */
-#endif
-
-#ifndef GL_VERSION_3_1
-#define GL_SAMPLER_2D_RECT                0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW         0x8B64
-#define GL_SAMPLER_BUFFER                 0x8DC2
-#define GL_INT_SAMPLER_2D_RECT            0x8DCD
-#define GL_INT_SAMPLER_BUFFER             0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT   0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER    0x8DD8
-#define GL_TEXTURE_BUFFER                 0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE        0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER         0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT          0x8C2E
-#define GL_TEXTURE_RECTANGLE              0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
-#define GL_RED_SNORM                      0x8F90
-#define GL_RG_SNORM                       0x8F91
-#define GL_RGB_SNORM                      0x8F92
-#define GL_RGBA_SNORM                     0x8F93
-#define GL_R8_SNORM                       0x8F94
-#define GL_RG8_SNORM                      0x8F95
-#define GL_RGB8_SNORM                     0x8F96
-#define GL_RGBA8_SNORM                    0x8F97
-#define GL_R16_SNORM                      0x8F98
-#define GL_RG16_SNORM                     0x8F99
-#define GL_RGB16_SNORM                    0x8F9A
-#define GL_RGBA16_SNORM                   0x8F9B
-#define GL_SIGNED_NORMALIZED              0x8F9C
-#define GL_PRIMITIVE_RESTART              0x8F9D
-#define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
-/* Reuse tokens from ARB_copy_buffer */
-/* reuse GL_COPY_READ_BUFFER */
-/* reuse GL_COPY_WRITE_BUFFER */
-/* Would reuse tokens from ARB_draw_instanced, but it has none */
-/* Reuse tokens from ARB_uniform_buffer_object */
-/* reuse GL_UNIFORM_BUFFER */
-/* reuse GL_UNIFORM_BUFFER_BINDING */
-/* reuse GL_UNIFORM_BUFFER_START */
-/* reuse GL_UNIFORM_BUFFER_SIZE */
-/* reuse GL_MAX_VERTEX_UNIFORM_BLOCKS */
-/* reuse GL_MAX_FRAGMENT_UNIFORM_BLOCKS */
-/* reuse GL_MAX_COMBINED_UNIFORM_BLOCKS */
-/* reuse GL_MAX_UNIFORM_BUFFER_BINDINGS */
-/* reuse GL_MAX_UNIFORM_BLOCK_SIZE */
-/* reuse GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS */
-/* reuse GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT */
-/* reuse GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH */
-/* reuse GL_ACTIVE_UNIFORM_BLOCKS */
-/* reuse GL_UNIFORM_TYPE */
-/* reuse GL_UNIFORM_SIZE */
-/* reuse GL_UNIFORM_NAME_LENGTH */
-/* reuse GL_UNIFORM_BLOCK_INDEX */
-/* reuse GL_UNIFORM_OFFSET */
-/* reuse GL_UNIFORM_ARRAY_STRIDE */
-/* reuse GL_UNIFORM_MATRIX_STRIDE */
-/* reuse GL_UNIFORM_IS_ROW_MAJOR */
-/* reuse GL_UNIFORM_BLOCK_BINDING */
-/* reuse GL_UNIFORM_BLOCK_DATA_SIZE */
-/* reuse GL_UNIFORM_BLOCK_NAME_LENGTH */
-/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS */
-/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER */
-/* reuse GL_INVALID_INDEX */
-#endif
-
-#ifndef GL_VERSION_3_2
-#define GL_CONTEXT_CORE_PROFILE_BIT       0x00000001
-#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
-#define GL_LINES_ADJACENCY                0x000A
-#define GL_LINE_STRIP_ADJACENCY           0x000B
-#define GL_TRIANGLES_ADJACENCY            0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY       0x000D
-#define GL_PROGRAM_POINT_SIZE             0x8642
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
-#define GL_GEOMETRY_SHADER                0x8DD9
-#define GL_GEOMETRY_VERTICES_OUT          0x8916
-#define GL_GEOMETRY_INPUT_TYPE            0x8917
-#define GL_GEOMETRY_OUTPUT_TYPE           0x8918
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES   0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
-#define GL_MAX_VERTEX_OUTPUT_COMPONENTS   0x9122
-#define GL_MAX_GEOMETRY_INPUT_COMPONENTS  0x9123
-#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
-#define GL_MAX_FRAGMENT_INPUT_COMPONENTS  0x9125
-#define GL_CONTEXT_PROFILE_MASK           0x9126
-/* reuse GL_MAX_VARYING_COMPONENTS */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-/* Reuse tokens from ARB_depth_clamp */
-/* reuse GL_DEPTH_CLAMP */
-/* Would reuse tokens from ARB_draw_elements_base_vertex, but it has none */
-/* Would reuse tokens from ARB_fragment_coord_conventions, but it has none */
-/* Reuse tokens from ARB_provoking_vertex */
-/* reuse GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-/* reuse GL_FIRST_VERTEX_CONVENTION */
-/* reuse GL_LAST_VERTEX_CONVENTION */
-/* reuse GL_PROVOKING_VERTEX */
-/* Reuse tokens from ARB_seamless_cube_map */
-/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS */
-/* Reuse tokens from ARB_sync */
-/* reuse GL_MAX_SERVER_WAIT_TIMEOUT */
-/* reuse GL_OBJECT_TYPE */
-/* reuse GL_SYNC_CONDITION */
-/* reuse GL_SYNC_STATUS */
-/* reuse GL_SYNC_FLAGS */
-/* reuse GL_SYNC_FENCE */
-/* reuse GL_SYNC_GPU_COMMANDS_COMPLETE */
-/* reuse GL_UNSIGNALED */
-/* reuse GL_SIGNALED */
-/* reuse GL_ALREADY_SIGNALED */
-/* reuse GL_TIMEOUT_EXPIRED */
-/* reuse GL_CONDITION_SATISFIED */
-/* reuse GL_WAIT_FAILED */
-/* reuse GL_TIMEOUT_IGNORED */
-/* reuse GL_SYNC_FLUSH_COMMANDS_BIT */
-/* reuse GL_TIMEOUT_IGNORED */
-/* Reuse tokens from ARB_texture_multisample */
-/* reuse GL_SAMPLE_POSITION */
-/* reuse GL_SAMPLE_MASK */
-/* reuse GL_SAMPLE_MASK_VALUE */
-/* reuse GL_MAX_SAMPLE_MASK_WORDS */
-/* reuse GL_TEXTURE_2D_MULTISAMPLE */
-/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE */
-/* reuse GL_TEXTURE_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE */
-/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_TEXTURE_SAMPLES */
-/* reuse GL_TEXTURE_FIXED_SAMPLE_LOCATIONS */
-/* reuse GL_SAMPLER_2D_MULTISAMPLE */
-/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE */
-/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE */
-/* reuse GL_SAMPLER_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_MAX_COLOR_TEXTURE_SAMPLES */
-/* reuse GL_MAX_DEPTH_TEXTURE_SAMPLES */
-/* reuse GL_MAX_INTEGER_SAMPLES */
-/* Don't need to reuse tokens from ARB_vertex_array_bgra since they're already in 1.2 core */
-#endif
-
-#ifndef GL_VERSION_3_3
-/* Reuse tokens from ARB_blend_func_extended */
-/* reuse GL_SRC1_COLOR */
-/* reuse GL_ONE_MINUS_SRC1_COLOR */
-/* reuse GL_ONE_MINUS_SRC1_ALPHA */
-/* reuse GL_MAX_DUAL_SOURCE_DRAW_BUFFERS */
-/* Would reuse tokens from ARB_explicit_attrib_location, but it has none */
-/* Reuse tokens from ARB_occlusion_query2 */
-/* reuse GL_ANY_SAMPLES_PASSED */
-/* Reuse tokens from ARB_sampler_objects */
-/* reuse GL_SAMPLER_BINDING */
-/* Would reuse tokens from ARB_shader_bit_encoding, but it has none */
-/* Reuse tokens from ARB_texture_rgb10_a2ui */
-/* reuse GL_RGB10_A2UI */
-/* Reuse tokens from ARB_texture_swizzle */
-/* reuse GL_TEXTURE_SWIZZLE_R */
-/* reuse GL_TEXTURE_SWIZZLE_G */
-/* reuse GL_TEXTURE_SWIZZLE_B */
-/* reuse GL_TEXTURE_SWIZZLE_A */
-/* reuse GL_TEXTURE_SWIZZLE_RGBA */
-/* Reuse tokens from ARB_timer_query */
-/* reuse GL_TIME_ELAPSED */
-/* reuse GL_TIMESTAMP */
-/* Reuse tokens from ARB_vertex_type_2_10_10_10_rev */
-/* reuse GL_INT_2_10_10_10_REV */
-#endif
-
-#ifndef GL_VERSION_4_0
-/* Reuse tokens from ARB_draw_indirect */
-/* reuse GL_DRAW_INDIRECT_BUFFER */
-/* reuse GL_DRAW_INDIRECT_BUFFER_BINDING */
-/* Reuse tokens from ARB_gpu_shader5 */
-/* reuse GL_GEOMETRY_SHADER_INVOCATIONS */
-/* reuse GL_MAX_GEOMETRY_SHADER_INVOCATIONS */
-/* reuse GL_MIN_FRAGMENT_INTERPOLATION_OFFSET */
-/* reuse GL_MAX_FRAGMENT_INTERPOLATION_OFFSET */
-/* reuse GL_FRAGMENT_INTERPOLATION_OFFSET_BITS */
-/* reuse GL_MAX_VERTEX_STREAMS */
-/* Reuse tokens from ARB_gpu_shader_fp64 */
-/* reuse GL_DOUBLE_VEC2 */
-/* reuse GL_DOUBLE_VEC3 */
-/* reuse GL_DOUBLE_VEC4 */
-/* reuse GL_DOUBLE_MAT2 */
-/* reuse GL_DOUBLE_MAT3 */
-/* reuse GL_DOUBLE_MAT4 */
-/* reuse GL_DOUBLE_MAT2x3 */
-/* reuse GL_DOUBLE_MAT2x4 */
-/* reuse GL_DOUBLE_MAT3x2 */
-/* reuse GL_DOUBLE_MAT3x4 */
-/* reuse GL_DOUBLE_MAT4x2 */
-/* reuse GL_DOUBLE_MAT4x3 */
-/* Reuse tokens from ARB_shader_subroutine */
-/* reuse GL_ACTIVE_SUBROUTINES */
-/* reuse GL_ACTIVE_SUBROUTINE_UNIFORMS */
-/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS */
-/* reuse GL_ACTIVE_SUBROUTINE_MAX_LENGTH */
-/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH */
-/* reuse GL_MAX_SUBROUTINES */
-/* reuse GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS */
-/* reuse GL_NUM_COMPATIBLE_SUBROUTINES */
-/* reuse GL_COMPATIBLE_SUBROUTINES */
-/* Reuse tokens from ARB_tessellation_shader */
-/* reuse GL_PATCHES */
-/* reuse GL_PATCH_VERTICES */
-/* reuse GL_PATCH_DEFAULT_INNER_LEVEL */
-/* reuse GL_PATCH_DEFAULT_OUTER_LEVEL */
-/* reuse GL_TESS_CONTROL_OUTPUT_VERTICES */
-/* reuse GL_TESS_GEN_MODE */
-/* reuse GL_TESS_GEN_SPACING */
-/* reuse GL_TESS_GEN_VERTEX_ORDER */
-/* reuse GL_TESS_GEN_POINT_MODE */
-/* reuse GL_ISOLINES */
-/* reuse GL_FRACTIONAL_ODD */
-/* reuse GL_FRACTIONAL_EVEN */
-/* reuse GL_MAX_PATCH_VERTICES */
-/* reuse GL_MAX_TESS_GEN_LEVEL */
-/* reuse GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS */
-/* reuse GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS */
-/* reuse GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS */
-/* reuse GL_MAX_TESS_PATCH_COMPONENTS */
-/* reuse GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS */
-/* reuse GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS */
-/* reuse GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS */
-/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS */
-/* reuse GL_MAX_TESS_CONTROL_INPUT_COMPONENTS */
-/* reuse GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS */
-/* reuse GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER */
-/* reuse GL_TESS_EVALUATION_SHADER */
-/* reuse GL_TESS_CONTROL_SHADER */
-/* Would reuse tokens from ARB_texture_buffer_object_rgb32, but it has none */
-/* Reuse tokens from ARB_transform_feedback2 */
-/* reuse GL_TRANSFORM_FEEDBACK */
-/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-/* reuse GL_TRANSFORM_FEEDBACK_BINDING */
-/* Reuse tokens from ARB_transform_feedback3 */
-/* reuse GL_MAX_TRANSFORM_FEEDBACK_BUFFERS */
-/* reuse GL_MAX_VERTEX_STREAMS */
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_TEXTURE0_ARB                   0x84C0
-#define GL_TEXTURE1_ARB                   0x84C1
-#define GL_TEXTURE2_ARB                   0x84C2
-#define GL_TEXTURE3_ARB                   0x84C3
-#define GL_TEXTURE4_ARB                   0x84C4
-#define GL_TEXTURE5_ARB                   0x84C5
-#define GL_TEXTURE6_ARB                   0x84C6
-#define GL_TEXTURE7_ARB                   0x84C7
-#define GL_TEXTURE8_ARB                   0x84C8
-#define GL_TEXTURE9_ARB                   0x84C9
-#define GL_TEXTURE10_ARB                  0x84CA
-#define GL_TEXTURE11_ARB                  0x84CB
-#define GL_TEXTURE12_ARB                  0x84CC
-#define GL_TEXTURE13_ARB                  0x84CD
-#define GL_TEXTURE14_ARB                  0x84CE
-#define GL_TEXTURE15_ARB                  0x84CF
-#define GL_TEXTURE16_ARB                  0x84D0
-#define GL_TEXTURE17_ARB                  0x84D1
-#define GL_TEXTURE18_ARB                  0x84D2
-#define GL_TEXTURE19_ARB                  0x84D3
-#define GL_TEXTURE20_ARB                  0x84D4
-#define GL_TEXTURE21_ARB                  0x84D5
-#define GL_TEXTURE22_ARB                  0x84D6
-#define GL_TEXTURE23_ARB                  0x84D7
-#define GL_TEXTURE24_ARB                  0x84D8
-#define GL_TEXTURE25_ARB                  0x84D9
-#define GL_TEXTURE26_ARB                  0x84DA
-#define GL_TEXTURE27_ARB                  0x84DB
-#define GL_TEXTURE28_ARB                  0x84DC
-#define GL_TEXTURE29_ARB                  0x84DD
-#define GL_TEXTURE30_ARB                  0x84DE
-#define GL_TEXTURE31_ARB                  0x84DF
-#define GL_ACTIVE_TEXTURE_ARB             0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_MULTISAMPLE_ARB                0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
-#define GL_SAMPLE_COVERAGE_ARB            0x80A0
-#define GL_SAMPLE_BUFFERS_ARB             0x80A8
-#define GL_SAMPLES_ARB                    0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
-#define GL_MULTISAMPLE_BIT_ARB            0x20000000
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_NORMAL_MAP_ARB                 0x8511
-#define GL_REFLECTION_MAP_ARB             0x8512
-#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_COMPRESSED_ALPHA_ARB           0x84E9
-#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
-#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
-#define GL_COMPRESSED_RGB_ARB             0x84ED
-#define GL_COMPRESSED_RGBA_ARB            0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
-#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_ARB            0x812D
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_POINT_SIZE_MIN_ARB             0x8126
-#define GL_POINT_SIZE_MAX_ARB             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
-#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
-#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
-#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
-#define GL_VERTEX_BLEND_ARB               0x86A7
-#define GL_CURRENT_WEIGHT_ARB             0x86A8
-#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
-#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
-#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
-#define GL_WEIGHT_ARRAY_ARB               0x86AD
-#define GL_MODELVIEW0_ARB                 0x1700
-#define GL_MODELVIEW1_ARB                 0x850A
-#define GL_MODELVIEW2_ARB                 0x8722
-#define GL_MODELVIEW3_ARB                 0x8723
-#define GL_MODELVIEW4_ARB                 0x8724
-#define GL_MODELVIEW5_ARB                 0x8725
-#define GL_MODELVIEW6_ARB                 0x8726
-#define GL_MODELVIEW7_ARB                 0x8727
-#define GL_MODELVIEW8_ARB                 0x8728
-#define GL_MODELVIEW9_ARB                 0x8729
-#define GL_MODELVIEW10_ARB                0x872A
-#define GL_MODELVIEW11_ARB                0x872B
-#define GL_MODELVIEW12_ARB                0x872C
-#define GL_MODELVIEW13_ARB                0x872D
-#define GL_MODELVIEW14_ARB                0x872E
-#define GL_MODELVIEW15_ARB                0x872F
-#define GL_MODELVIEW16_ARB                0x8730
-#define GL_MODELVIEW17_ARB                0x8731
-#define GL_MODELVIEW18_ARB                0x8732
-#define GL_MODELVIEW19_ARB                0x8733
-#define GL_MODELVIEW20_ARB                0x8734
-#define GL_MODELVIEW21_ARB                0x8735
-#define GL_MODELVIEW22_ARB                0x8736
-#define GL_MODELVIEW23_ARB                0x8737
-#define GL_MODELVIEW24_ARB                0x8738
-#define GL_MODELVIEW25_ARB                0x8739
-#define GL_MODELVIEW26_ARB                0x873A
-#define GL_MODELVIEW27_ARB                0x873B
-#define GL_MODELVIEW28_ARB                0x873C
-#define GL_MODELVIEW29_ARB                0x873D
-#define GL_MODELVIEW30_ARB                0x873E
-#define GL_MODELVIEW31_ARB                0x873F
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_MATRIX_PALETTE_ARB             0x8840
-#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
-#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
-#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
-#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
-#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
-#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_COMBINE_ARB                    0x8570
-#define GL_COMBINE_RGB_ARB                0x8571
-#define GL_COMBINE_ALPHA_ARB              0x8572
-#define GL_SOURCE0_RGB_ARB                0x8580
-#define GL_SOURCE1_RGB_ARB                0x8581
-#define GL_SOURCE2_RGB_ARB                0x8582
-#define GL_SOURCE0_ALPHA_ARB              0x8588
-#define GL_SOURCE1_ALPHA_ARB              0x8589
-#define GL_SOURCE2_ALPHA_ARB              0x858A
-#define GL_OPERAND0_RGB_ARB               0x8590
-#define GL_OPERAND1_RGB_ARB               0x8591
-#define GL_OPERAND2_RGB_ARB               0x8592
-#define GL_OPERAND0_ALPHA_ARB             0x8598
-#define GL_OPERAND1_ALPHA_ARB             0x8599
-#define GL_OPERAND2_ALPHA_ARB             0x859A
-#define GL_RGB_SCALE_ARB                  0x8573
-#define GL_ADD_SIGNED_ARB                 0x8574
-#define GL_INTERPOLATE_ARB                0x8575
-#define GL_SUBTRACT_ARB                   0x84E7
-#define GL_CONSTANT_ARB                   0x8576
-#define GL_PRIMARY_COLOR_ARB              0x8577
-#define GL_PREVIOUS_ARB                   0x8578
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_DOT3_RGB_ARB                   0x86AE
-#define GL_DOT3_RGBA_ARB                  0x86AF
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_ARB            0x8370
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_DEPTH_COMPONENT16_ARB          0x81A5
-#define GL_DEPTH_COMPONENT24_ARB          0x81A6
-#define GL_DEPTH_COMPONENT32_ARB          0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
-#endif
-
-#ifndef GL_ARB_window_pos
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_COLOR_SUM_ARB                  0x8458
-#define GL_VERTEX_PROGRAM_ARB             0x8620
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
-#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
-#define GL_PROGRAM_LENGTH_ARB             0x8627
-#define GL_PROGRAM_STRING_ARB             0x8628
-#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
-#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
-#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
-#define GL_CURRENT_MATRIX_ARB             0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
-#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
-#define GL_PROGRAM_BINDING_ARB            0x8677
-#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
-#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
-#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
-#define GL_PROGRAM_FORMAT_ARB             0x8876
-#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
-#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
-#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
-#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
-#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
-#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
-#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
-#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
-#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
-#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
-#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
-#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
-#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
-#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
-#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
-#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
-#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
-#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
-#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
-#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
-#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
-#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
-#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
-#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
-#define GL_MATRIX0_ARB                    0x88C0
-#define GL_MATRIX1_ARB                    0x88C1
-#define GL_MATRIX2_ARB                    0x88C2
-#define GL_MATRIX3_ARB                    0x88C3
-#define GL_MATRIX4_ARB                    0x88C4
-#define GL_MATRIX5_ARB                    0x88C5
-#define GL_MATRIX6_ARB                    0x88C6
-#define GL_MATRIX7_ARB                    0x88C7
-#define GL_MATRIX8_ARB                    0x88C8
-#define GL_MATRIX9_ARB                    0x88C9
-#define GL_MATRIX10_ARB                   0x88CA
-#define GL_MATRIX11_ARB                   0x88CB
-#define GL_MATRIX12_ARB                   0x88CC
-#define GL_MATRIX13_ARB                   0x88CD
-#define GL_MATRIX14_ARB                   0x88CE
-#define GL_MATRIX15_ARB                   0x88CF
-#define GL_MATRIX16_ARB                   0x88D0
-#define GL_MATRIX17_ARB                   0x88D1
-#define GL_MATRIX18_ARB                   0x88D2
-#define GL_MATRIX19_ARB                   0x88D3
-#define GL_MATRIX20_ARB                   0x88D4
-#define GL_MATRIX21_ARB                   0x88D5
-#define GL_MATRIX22_ARB                   0x88D6
-#define GL_MATRIX23_ARB                   0x88D7
-#define GL_MATRIX24_ARB                   0x88D8
-#define GL_MATRIX25_ARB                   0x88D9
-#define GL_MATRIX26_ARB                   0x88DA
-#define GL_MATRIX27_ARB                   0x88DB
-#define GL_MATRIX28_ARB                   0x88DC
-#define GL_MATRIX29_ARB                   0x88DD
-#define GL_MATRIX30_ARB                   0x88DE
-#define GL_MATRIX31_ARB                   0x88DF
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_FRAGMENT_PROGRAM_ARB           0x8804
-#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
-#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
-#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
-#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
-#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
-#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
-#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
-#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
-#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
-#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
-#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
-#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
-#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_BUFFER_SIZE_ARB                0x8764
-#define GL_BUFFER_USAGE_ARB               0x8765
-#define GL_ARRAY_BUFFER_ARB               0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
-#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
-#define GL_READ_ONLY_ARB                  0x88B8
-#define GL_WRITE_ONLY_ARB                 0x88B9
-#define GL_READ_WRITE_ARB                 0x88BA
-#define GL_BUFFER_ACCESS_ARB              0x88BB
-#define GL_BUFFER_MAPPED_ARB              0x88BC
-#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
-#define GL_STREAM_DRAW_ARB                0x88E0
-#define GL_STREAM_READ_ARB                0x88E1
-#define GL_STREAM_COPY_ARB                0x88E2
-#define GL_STATIC_DRAW_ARB                0x88E4
-#define GL_STATIC_READ_ARB                0x88E5
-#define GL_STATIC_COPY_ARB                0x88E6
-#define GL_DYNAMIC_DRAW_ARB               0x88E8
-#define GL_DYNAMIC_READ_ARB               0x88E9
-#define GL_DYNAMIC_COPY_ARB               0x88EA
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_QUERY_COUNTER_BITS_ARB         0x8864
-#define GL_CURRENT_QUERY_ARB              0x8865
-#define GL_QUERY_RESULT_ARB               0x8866
-#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
-#define GL_SAMPLES_PASSED_ARB             0x8914
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_PROGRAM_OBJECT_ARB             0x8B40
-#define GL_SHADER_OBJECT_ARB              0x8B48
-#define GL_OBJECT_TYPE_ARB                0x8B4E
-#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
-#define GL_FLOAT_VEC2_ARB                 0x8B50
-#define GL_FLOAT_VEC3_ARB                 0x8B51
-#define GL_FLOAT_VEC4_ARB                 0x8B52
-#define GL_INT_VEC2_ARB                   0x8B53
-#define GL_INT_VEC3_ARB                   0x8B54
-#define GL_INT_VEC4_ARB                   0x8B55
-#define GL_BOOL_ARB                       0x8B56
-#define GL_BOOL_VEC2_ARB                  0x8B57
-#define GL_BOOL_VEC3_ARB                  0x8B58
-#define GL_BOOL_VEC4_ARB                  0x8B59
-#define GL_FLOAT_MAT2_ARB                 0x8B5A
-#define GL_FLOAT_MAT3_ARB                 0x8B5B
-#define GL_FLOAT_MAT4_ARB                 0x8B5C
-#define GL_SAMPLER_1D_ARB                 0x8B5D
-#define GL_SAMPLER_2D_ARB                 0x8B5E
-#define GL_SAMPLER_3D_ARB                 0x8B5F
-#define GL_SAMPLER_CUBE_ARB               0x8B60
-#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
-#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
-#define GL_SAMPLER_2D_RECT_ARB            0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
-#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
-#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
-#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
-#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
-#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
-#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_VERTEX_SHADER_ARB              0x8B31
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
-#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
-#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
-#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_FRAGMENT_SHADER_ARB            0x8B30
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_POINT_SPRITE_ARB               0x8861
-#define GL_COORD_REPLACE_ARB              0x8862
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
-#define GL_DRAW_BUFFER0_ARB               0x8825
-#define GL_DRAW_BUFFER1_ARB               0x8826
-#define GL_DRAW_BUFFER2_ARB               0x8827
-#define GL_DRAW_BUFFER3_ARB               0x8828
-#define GL_DRAW_BUFFER4_ARB               0x8829
-#define GL_DRAW_BUFFER5_ARB               0x882A
-#define GL_DRAW_BUFFER6_ARB               0x882B
-#define GL_DRAW_BUFFER7_ARB               0x882C
-#define GL_DRAW_BUFFER8_ARB               0x882D
-#define GL_DRAW_BUFFER9_ARB               0x882E
-#define GL_DRAW_BUFFER10_ARB              0x882F
-#define GL_DRAW_BUFFER11_ARB              0x8830
-#define GL_DRAW_BUFFER12_ARB              0x8831
-#define GL_DRAW_BUFFER13_ARB              0x8832
-#define GL_DRAW_BUFFER14_ARB              0x8833
-#define GL_DRAW_BUFFER15_ARB              0x8834
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_RGBA_FLOAT_MODE_ARB            0x8820
-#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
-#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
-#define GL_CLAMP_READ_COLOR_ARB           0x891C
-#define GL_FIXED_ONLY_ARB                 0x891D
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB                 0x140B
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
-#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
-#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
-#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
-#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
-#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
-#define GL_RGBA32F_ARB                    0x8814
-#define GL_RGB32F_ARB                     0x8815
-#define GL_ALPHA32F_ARB                   0x8816
-#define GL_INTENSITY32F_ARB               0x8817
-#define GL_LUMINANCE32F_ARB               0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
-#define GL_RGBA16F_ARB                    0x881A
-#define GL_RGB16F_ARB                     0x881B
-#define GL_ALPHA16F_ARB                   0x881C
-#define GL_INTENSITY16F_ARB               0x881D
-#define GL_LUMINANCE16F_ARB               0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
-#endif
-
-#ifndef GL_ARB_depth_buffer_float
-#define GL_DEPTH_COMPONENT32F             0x8CAC
-#define GL_DEPTH32F_STENCIL8              0x8CAD
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
-#endif
-
-#ifndef GL_ARB_draw_instanced
-#endif
-
-#ifndef GL_ARB_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
-#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
-#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
-#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
-#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
-#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
-#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
-#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
-#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
-#define GL_FRAMEBUFFER_DEFAULT            0x8218
-#define GL_FRAMEBUFFER_UNDEFINED          0x8219
-#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
-#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
-#define GL_DEPTH_STENCIL                  0x84F9
-#define GL_UNSIGNED_INT_24_8              0x84FA
-#define GL_DEPTH24_STENCIL8               0x88F0
-#define GL_TEXTURE_STENCIL_SIZE           0x88F1
-#define GL_TEXTURE_RED_TYPE               0x8C10
-#define GL_TEXTURE_GREEN_TYPE             0x8C11
-#define GL_TEXTURE_BLUE_TYPE              0x8C12
-#define GL_TEXTURE_ALPHA_TYPE             0x8C13
-#define GL_TEXTURE_DEPTH_TYPE             0x8C16
-#define GL_UNSIGNED_NORMALIZED            0x8C17
-#define GL_FRAMEBUFFER_BINDING            0x8CA6
-#define GL_DRAW_FRAMEBUFFER_BINDING       GL_FRAMEBUFFER_BINDING
-#define GL_RENDERBUFFER_BINDING           0x8CA7
-#define GL_READ_FRAMEBUFFER               0x8CA8
-#define GL_DRAW_FRAMEBUFFER               0x8CA9
-#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
-#define GL_RENDERBUFFER_SAMPLES           0x8CAB
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
-#define GL_COLOR_ATTACHMENT0              0x8CE0
-#define GL_COLOR_ATTACHMENT1              0x8CE1
-#define GL_COLOR_ATTACHMENT2              0x8CE2
-#define GL_COLOR_ATTACHMENT3              0x8CE3
-#define GL_COLOR_ATTACHMENT4              0x8CE4
-#define GL_COLOR_ATTACHMENT5              0x8CE5
-#define GL_COLOR_ATTACHMENT6              0x8CE6
-#define GL_COLOR_ATTACHMENT7              0x8CE7
-#define GL_COLOR_ATTACHMENT8              0x8CE8
-#define GL_COLOR_ATTACHMENT9              0x8CE9
-#define GL_COLOR_ATTACHMENT10             0x8CEA
-#define GL_COLOR_ATTACHMENT11             0x8CEB
-#define GL_COLOR_ATTACHMENT12             0x8CEC
-#define GL_COLOR_ATTACHMENT13             0x8CED
-#define GL_COLOR_ATTACHMENT14             0x8CEE
-#define GL_COLOR_ATTACHMENT15             0x8CEF
-#define GL_DEPTH_ATTACHMENT               0x8D00
-#define GL_STENCIL_ATTACHMENT             0x8D20
-#define GL_FRAMEBUFFER                    0x8D40
-#define GL_RENDERBUFFER                   0x8D41
-#define GL_RENDERBUFFER_WIDTH             0x8D42
-#define GL_RENDERBUFFER_HEIGHT            0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
-#define GL_STENCIL_INDEX1                 0x8D46
-#define GL_STENCIL_INDEX4                 0x8D47
-#define GL_STENCIL_INDEX8                 0x8D48
-#define GL_STENCIL_INDEX16                0x8D49
-#define GL_RENDERBUFFER_RED_SIZE          0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
-#define GL_MAX_SAMPLES                    0x8D57
-#endif
-
-#ifndef GL_ARB_framebuffer_object_DEPRECATED
-#define GL_INDEX                          0x8222
-#define GL_TEXTURE_LUMINANCE_TYPE         0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE         0x8C15
-#endif
-
-#ifndef GL_ARB_framebuffer_sRGB
-#define GL_FRAMEBUFFER_SRGB               0x8DB9
-#endif
-
-#ifndef GL_ARB_geometry_shader4
-#define GL_LINES_ADJACENCY_ARB            0x000A
-#define GL_LINE_STRIP_ADJACENCY_ARB       0x000B
-#define GL_TRIANGLES_ADJACENCY_ARB        0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY_ARB   0x000D
-#define GL_PROGRAM_POINT_SIZE_ARB         0x8642
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
-#define GL_GEOMETRY_SHADER_ARB            0x8DD9
-#define GL_GEOMETRY_VERTICES_OUT_ARB      0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_ARB        0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_ARB       0x8DDC
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
-/* reuse GL_MAX_VARYING_COMPONENTS */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-#endif
-
-#ifndef GL_ARB_half_float_vertex
-#define GL_HALF_FLOAT                     0x140B
-#endif
-
-#ifndef GL_ARB_instanced_arrays
-#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE
-#endif
-
-#ifndef GL_ARB_map_buffer_range
-#define GL_MAP_READ_BIT                   0x0001
-#define GL_MAP_WRITE_BIT                  0x0002
-#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
-#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
-#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
-#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
-#endif
-
-#ifndef GL_ARB_texture_buffer_object
-#define GL_TEXTURE_BUFFER_ARB             0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB    0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER_ARB     0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT_ARB      0x8C2E
-#endif
-
-#ifndef GL_ARB_texture_compression_rgtc
-#define GL_COMPRESSED_RED_RGTC1           0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
-#define GL_COMPRESSED_RG_RGTC2            0x8DBD
-#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
-#endif
-
-#ifndef GL_ARB_texture_rg
-#define GL_RG                             0x8227
-#define GL_RG_INTEGER                     0x8228
-#define GL_R8                             0x8229
-#define GL_R16                            0x822A
-#define GL_RG8                            0x822B
-#define GL_RG16                           0x822C
-#define GL_R16F                           0x822D
-#define GL_R32F                           0x822E
-#define GL_RG16F                          0x822F
-#define GL_RG32F                          0x8230
-#define GL_R8I                            0x8231
-#define GL_R8UI                           0x8232
-#define GL_R16I                           0x8233
-#define GL_R16UI                          0x8234
-#define GL_R32I                           0x8235
-#define GL_R32UI                          0x8236
-#define GL_RG8I                           0x8237
-#define GL_RG8UI                          0x8238
-#define GL_RG16I                          0x8239
-#define GL_RG16UI                         0x823A
-#define GL_RG32I                          0x823B
-#define GL_RG32UI                         0x823C
-#endif
-
-#ifndef GL_ARB_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING           0x85B5
-#endif
-
-#ifndef GL_ARB_uniform_buffer_object
-#define GL_UNIFORM_BUFFER                 0x8A11
-#define GL_UNIFORM_BUFFER_BINDING         0x8A28
-#define GL_UNIFORM_BUFFER_START           0x8A29
-#define GL_UNIFORM_BUFFER_SIZE            0x8A2A
-#define GL_MAX_VERTEX_UNIFORM_BLOCKS      0x8A2B
-#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS    0x8A2C
-#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS    0x8A2D
-#define GL_MAX_COMBINED_UNIFORM_BLOCKS    0x8A2E
-#define GL_MAX_UNIFORM_BUFFER_BINDINGS    0x8A2F
-#define GL_MAX_UNIFORM_BLOCK_SIZE         0x8A30
-#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
-#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
-#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
-#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
-#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
-#define GL_ACTIVE_UNIFORM_BLOCKS          0x8A36
-#define GL_UNIFORM_TYPE                   0x8A37
-#define GL_UNIFORM_SIZE                   0x8A38
-#define GL_UNIFORM_NAME_LENGTH            0x8A39
-#define GL_UNIFORM_BLOCK_INDEX            0x8A3A
-#define GL_UNIFORM_OFFSET                 0x8A3B
-#define GL_UNIFORM_ARRAY_STRIDE           0x8A3C
-#define GL_UNIFORM_MATRIX_STRIDE          0x8A3D
-#define GL_UNIFORM_IS_ROW_MAJOR           0x8A3E
-#define GL_UNIFORM_BLOCK_BINDING          0x8A3F
-#define GL_UNIFORM_BLOCK_DATA_SIZE        0x8A40
-#define GL_UNIFORM_BLOCK_NAME_LENGTH      0x8A41
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS  0x8A42
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
-#define GL_INVALID_INDEX                  0xFFFFFFFFu
-#endif
-
-#ifndef GL_ARB_compatibility
-/* ARB_compatibility just defines tokens from core 3.0 */
-#endif
-
-#ifndef GL_ARB_copy_buffer
-#define GL_COPY_READ_BUFFER               0x8F36
-#define GL_COPY_WRITE_BUFFER              0x8F37
-#endif
-
-#ifndef GL_ARB_shader_texture_lod
-#endif
-
-#ifndef GL_ARB_depth_clamp
-#define GL_DEPTH_CLAMP                    0x864F
-#endif
-
-#ifndef GL_ARB_draw_elements_base_vertex
-#endif
-
-#ifndef GL_ARB_fragment_coord_conventions
-#endif
-
-#ifndef GL_ARB_provoking_vertex
-#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
-#define GL_FIRST_VERTEX_CONVENTION        0x8E4D
-#define GL_LAST_VERTEX_CONVENTION         0x8E4E
-#define GL_PROVOKING_VERTEX               0x8E4F
-#endif
-
-#ifndef GL_ARB_seamless_cube_map
-#define GL_TEXTURE_CUBE_MAP_SEAMLESS      0x884F
-#endif
-
-#ifndef GL_ARB_sync
-#define GL_MAX_SERVER_WAIT_TIMEOUT        0x9111
-#define GL_OBJECT_TYPE                    0x9112
-#define GL_SYNC_CONDITION                 0x9113
-#define GL_SYNC_STATUS                    0x9114
-#define GL_SYNC_FLAGS                     0x9115
-#define GL_SYNC_FENCE                     0x9116
-#define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
-#define GL_UNSIGNALED                     0x9118
-#define GL_SIGNALED                       0x9119
-#define GL_ALREADY_SIGNALED               0x911A
-#define GL_TIMEOUT_EXPIRED                0x911B
-#define GL_CONDITION_SATISFIED            0x911C
-#define GL_WAIT_FAILED                    0x911D
-#define GL_SYNC_FLUSH_COMMANDS_BIT        0x00000001
-#define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
-#endif
-
-#ifndef GL_ARB_texture_multisample
-#define GL_SAMPLE_POSITION                0x8E50
-#define GL_SAMPLE_MASK                    0x8E51
-#define GL_SAMPLE_MASK_VALUE              0x8E52
-#define GL_MAX_SAMPLE_MASK_WORDS          0x8E59
-#define GL_TEXTURE_2D_MULTISAMPLE         0x9100
-#define GL_PROXY_TEXTURE_2D_MULTISAMPLE   0x9101
-#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY   0x9102
-#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
-#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
-#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
-#define GL_TEXTURE_SAMPLES                0x9106
-#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
-#define GL_SAMPLER_2D_MULTISAMPLE         0x9108
-#define GL_INT_SAMPLER_2D_MULTISAMPLE     0x9109
-#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
-#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910B
-#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
-#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
-#define GL_MAX_COLOR_TEXTURE_SAMPLES      0x910E
-#define GL_MAX_DEPTH_TEXTURE_SAMPLES      0x910F
-#define GL_MAX_INTEGER_SAMPLES            0x9110
-#endif
-
-#ifndef GL_ARB_vertex_array_bgra
-/* reuse GL_BGRA */
-#endif
-
-#ifndef GL_ARB_draw_buffers_blend
-#endif
-
-#ifndef GL_ARB_sample_shading
-#define GL_SAMPLE_SHADING                 0x8C36
-#define GL_MIN_SAMPLE_SHADING_VALUE       0x8C37
-#endif
-
-#ifndef GL_ARB_texture_cube_map_array
-#define GL_TEXTURE_CUBE_MAP_ARRAY         0x9009
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY   0x900B
-#define GL_SAMPLER_CUBE_MAP_ARRAY         0x900C
-#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW  0x900D
-#define GL_INT_SAMPLER_CUBE_MAP_ARRAY     0x900E
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
-#endif
-
-#ifndef GL_ARB_texture_gather
-#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E
-#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F
-#endif
-
-#ifndef GL_ARB_texture_query_lod
-#endif
-
-#ifndef GL_ARB_shading_language_include
-#define GL_SHADER_INCLUDE_ARB             0x8DAE
-#define GL_NAMED_STRING_LENGTH_ARB        0x8DE9
-#define GL_NAMED_STRING_TYPE_ARB          0x8DEA
-#endif
-
-#ifndef GL_ARB_texture_compression_bptc
-#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C
-#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D
-#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E
-#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F
-#endif
-
-#ifndef GL_ARB_blend_func_extended
-#define GL_SRC1_COLOR                     0x88F9
-/* reuse GL_SRC1_ALPHA */
-#define GL_ONE_MINUS_SRC1_COLOR           0x88FA
-#define GL_ONE_MINUS_SRC1_ALPHA           0x88FB
-#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS   0x88FC
-#endif
-
-#ifndef GL_ARB_explicit_attrib_location
-#endif
-
-#ifndef GL_ARB_occlusion_query2
-#define GL_ANY_SAMPLES_PASSED             0x8C2F
-#endif
-
-#ifndef GL_ARB_sampler_objects
-#define GL_SAMPLER_BINDING                0x8919
-#endif
-
-#ifndef GL_ARB_shader_bit_encoding
-#endif
-
-#ifndef GL_ARB_texture_rgb10_a2ui
-#define GL_RGB10_A2UI                     0x906F
-#endif
-
-#ifndef GL_ARB_texture_swizzle
-#define GL_TEXTURE_SWIZZLE_R              0x8E42
-#define GL_TEXTURE_SWIZZLE_G              0x8E43
-#define GL_TEXTURE_SWIZZLE_B              0x8E44
-#define GL_TEXTURE_SWIZZLE_A              0x8E45
-#define GL_TEXTURE_SWIZZLE_RGBA           0x8E46
-#endif
-
-#ifndef GL_ARB_timer_query
-#define GL_TIME_ELAPSED                   0x88BF
-#define GL_TIMESTAMP                      0x8E28
-#endif
-
-#ifndef GL_ARB_vertex_type_2_10_10_10_rev
-/* reuse GL_UNSIGNED_INT_2_10_10_10_REV */
-#define GL_INT_2_10_10_10_REV             0x8D9F
-#endif
-
-#ifndef GL_ARB_draw_indirect
-#define GL_DRAW_INDIRECT_BUFFER           0x8F3F
-#define GL_DRAW_INDIRECT_BUFFER_BINDING   0x8F43
-#endif
-
-#ifndef GL_ARB_gpu_shader5
-#define GL_GEOMETRY_SHADER_INVOCATIONS    0x887F
-#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
-#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
-#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
-#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
-#define GL_MAX_VERTEX_STREAMS             0x8E71
-#endif
-
-#ifndef GL_ARB_gpu_shader_fp64
-/* reuse GL_DOUBLE */
-#define GL_DOUBLE_VEC2                    0x8FFC
-#define GL_DOUBLE_VEC3                    0x8FFD
-#define GL_DOUBLE_VEC4                    0x8FFE
-#define GL_DOUBLE_MAT2                    0x8F46
-#define GL_DOUBLE_MAT3                    0x8F47
-#define GL_DOUBLE_MAT4                    0x8F48
-#define GL_DOUBLE_MAT2x3                  0x8F49
-#define GL_DOUBLE_MAT2x4                  0x8F4A
-#define GL_DOUBLE_MAT3x2                  0x8F4B
-#define GL_DOUBLE_MAT3x4                  0x8F4C
-#define GL_DOUBLE_MAT4x2                  0x8F4D
-#define GL_DOUBLE_MAT4x3                  0x8F4E
-#endif
-
-#ifndef GL_ARB_shader_subroutine
-#define GL_ACTIVE_SUBROUTINES             0x8DE5
-#define GL_ACTIVE_SUBROUTINE_UNIFORMS     0x8DE6
-#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
-#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH   0x8E48
-#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
-#define GL_MAX_SUBROUTINES                0x8DE7
-#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
-#define GL_NUM_COMPATIBLE_SUBROUTINES     0x8E4A
-#define GL_COMPATIBLE_SUBROUTINES         0x8E4B
-/* reuse GL_UNIFORM_SIZE */
-/* reuse GL_UNIFORM_NAME_LENGTH */
-#endif
-
-#ifndef GL_ARB_tessellation_shader
-#define GL_PATCHES                        0x000E
-#define GL_PATCH_VERTICES                 0x8E72
-#define GL_PATCH_DEFAULT_INNER_LEVEL      0x8E73
-#define GL_PATCH_DEFAULT_OUTER_LEVEL      0x8E74
-#define GL_TESS_CONTROL_OUTPUT_VERTICES   0x8E75
-#define GL_TESS_GEN_MODE                  0x8E76
-#define GL_TESS_GEN_SPACING               0x8E77
-#define GL_TESS_GEN_VERTEX_ORDER          0x8E78
-#define GL_TESS_GEN_POINT_MODE            0x8E79
-/* reuse GL_TRIANGLES */
-/* reuse GL_QUADS */
-#define GL_ISOLINES                       0x8E7A
-/* reuse GL_EQUAL */
-#define GL_FRACTIONAL_ODD                 0x8E7B
-#define GL_FRACTIONAL_EVEN                0x8E7C
-/* reuse GL_CCW */
-/* reuse GL_CW */
-#define GL_MAX_PATCH_VERTICES             0x8E7D
-#define GL_MAX_TESS_GEN_LEVEL             0x8E7E
-#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
-#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
-#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
-#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
-#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
-#define GL_MAX_TESS_PATCH_COMPONENTS      0x8E84
-#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
-#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
-#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
-#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
-#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
-#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
-#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
-#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
-#define GL_TESS_EVALUATION_SHADER         0x8E87
-#define GL_TESS_CONTROL_SHADER            0x8E88
-#endif
-
-#ifndef GL_ARB_texture_buffer_object_rgb32
-/* reuse GL_RGB32F */
-/* reuse GL_RGB32UI */
-/* reuse GL_RGB32I */
-#endif
-
-#ifndef GL_ARB_transform_feedback2
-#define GL_TRANSFORM_FEEDBACK             0x8E22
-#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
-#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
-#define GL_TRANSFORM_FEEDBACK_BINDING     0x8E25
-#endif
-
-#ifndef GL_ARB_transform_feedback3
-#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_ABGR_EXT                       0x8000
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_CONSTANT_COLOR_EXT             0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
-#define GL_CONSTANT_ALPHA_EXT             0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
-#define GL_BLEND_COLOR_EXT                0x8005
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_POLYGON_OFFSET_EXT             0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_ALPHA4_EXT                     0x803B
-#define GL_ALPHA8_EXT                     0x803C
-#define GL_ALPHA12_EXT                    0x803D
-#define GL_ALPHA16_EXT                    0x803E
-#define GL_LUMINANCE4_EXT                 0x803F
-#define GL_LUMINANCE8_EXT                 0x8040
-#define GL_LUMINANCE12_EXT                0x8041
-#define GL_LUMINANCE16_EXT                0x8042
-#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
-#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
-#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
-#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
-#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
-#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
-#define GL_INTENSITY_EXT                  0x8049
-#define GL_INTENSITY4_EXT                 0x804A
-#define GL_INTENSITY8_EXT                 0x804B
-#define GL_INTENSITY12_EXT                0x804C
-#define GL_INTENSITY16_EXT                0x804D
-#define GL_RGB2_EXT                       0x804E
-#define GL_RGB4_EXT                       0x804F
-#define GL_RGB5_EXT                       0x8050
-#define GL_RGB8_EXT                       0x8051
-#define GL_RGB10_EXT                      0x8052
-#define GL_RGB12_EXT                      0x8053
-#define GL_RGB16_EXT                      0x8054
-#define GL_RGBA2_EXT                      0x8055
-#define GL_RGBA4_EXT                      0x8056
-#define GL_RGB5_A1_EXT                    0x8057
-#define GL_RGBA8_EXT                      0x8058
-#define GL_RGB10_A2_EXT                   0x8059
-#define GL_RGBA12_EXT                     0x805A
-#define GL_RGBA16_EXT                     0x805B
-#define GL_TEXTURE_RED_SIZE_EXT           0x805C
-#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
-#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
-#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
-#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
-#define GL_REPLACE_EXT                    0x8062
-#define GL_PROXY_TEXTURE_1D_EXT           0x8063
-#define GL_PROXY_TEXTURE_2D_EXT           0x8064
-#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_PACK_SKIP_IMAGES_EXT           0x806B
-#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
-#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
-#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
-#define GL_TEXTURE_3D_EXT                 0x806F
-#define GL_PROXY_TEXTURE_3D_EXT           0x8070
-#define GL_TEXTURE_DEPTH_EXT              0x8071
-#define GL_TEXTURE_WRAP_R_EXT             0x8072
-#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_FILTER4_SGIS                   0x8146
-#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
-#endif
-
-#ifndef GL_EXT_subtexture
-#endif
-
-#ifndef GL_EXT_copy_texture
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_HISTOGRAM_EXT                  0x8024
-#define GL_PROXY_HISTOGRAM_EXT            0x8025
-#define GL_HISTOGRAM_WIDTH_EXT            0x8026
-#define GL_HISTOGRAM_FORMAT_EXT           0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
-#define GL_HISTOGRAM_SINK_EXT             0x802D
-#define GL_MINMAX_EXT                     0x802E
-#define GL_MINMAX_FORMAT_EXT              0x802F
-#define GL_MINMAX_SINK_EXT                0x8030
-#define GL_TABLE_TOO_LARGE_EXT            0x8031
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_CONVOLUTION_1D_EXT             0x8010
-#define GL_CONVOLUTION_2D_EXT             0x8011
-#define GL_SEPARABLE_2D_EXT               0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
-#define GL_REDUCE_EXT                     0x8016
-#define GL_CONVOLUTION_FORMAT_EXT         0x8017
-#define GL_CONVOLUTION_WIDTH_EXT          0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_COLOR_MATRIX_SGI               0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_COLOR_TABLE_SGI                0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
-#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
-#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
-#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
-#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
-#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_PIXEL_TEXTURE_SGIS             0x8353
-#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
-#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
-#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_PIXEL_TEX_GEN_SGIX             0x8139
-#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
-#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
-#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
-#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
-#define GL_TEXTURE_4D_SGIS                0x8134
-#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
-#define GL_TEXTURE_4DSIZE_SGIS            0x8136
-#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
-#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
-#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
-#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_CMYK_EXT                       0x800C
-#define GL_CMYKA_EXT                      0x800D
-#define GL_PACK_CMYK_HINT_EXT             0x800E
-#define GL_UNPACK_CMYK_HINT_EXT           0x800F
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_TEXTURE_PRIORITY_EXT           0x8066
-#define GL_TEXTURE_RESIDENT_EXT           0x8067
-#define GL_TEXTURE_1D_BINDING_EXT         0x8068
-#define GL_TEXTURE_2D_BINDING_EXT         0x8069
-#define GL_TEXTURE_3D_BINDING_EXT         0x806A
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
-#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
-#define GL_LINEAR_DETAIL_SGIS             0x8097
-#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
-#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
-#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
-#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
-#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_LINEAR_SHARPEN_SGIS            0x80AD
-#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
-#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
-#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
-#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
-#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
-#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_MULTISAMPLE_SGIS               0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
-#define GL_SAMPLE_MASK_SGIS               0x80A0
-#define GL_1PASS_SGIS                     0x80A1
-#define GL_2PASS_0_SGIS                   0x80A2
-#define GL_2PASS_1_SGIS                   0x80A3
-#define GL_4PASS_0_SGIS                   0x80A4
-#define GL_4PASS_1_SGIS                   0x80A5
-#define GL_4PASS_2_SGIS                   0x80A6
-#define GL_4PASS_3_SGIS                   0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
-#define GL_SAMPLES_SGIS                   0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
-#define GL_SAMPLE_PATTERN_SGIS            0x80AC
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_RESCALE_NORMAL_EXT             0x803A
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_VERTEX_ARRAY_EXT               0x8074
-#define GL_NORMAL_ARRAY_EXT               0x8075
-#define GL_COLOR_ARRAY_EXT                0x8076
-#define GL_INDEX_ARRAY_EXT                0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_GENERATE_MIPMAP_SGIS           0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
-#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
-#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
-#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
-#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
-#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
-#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
-#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
-#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
-#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
-#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
-#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_TEXTURE_COMPARE_SGIX           0x819A
-#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
-#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
-#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_CLAMP_TO_EDGE_SGIS             0x812F
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_SGIS           0x812D
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_FUNC_ADD_EXT                   0x8006
-#define GL_MIN_EXT                        0x8007
-#define GL_MAX_EXT                        0x8008
-#define GL_BLEND_EQUATION_EXT             0x8009
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_FUNC_SUBTRACT_EXT              0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_INTERLACE_SGIX                 0x8094
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
-#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
-#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
-#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
-#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
-#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
-#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
-#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
-#endif
-
-#ifndef GL_SGIS_texture_select
-#define GL_DUAL_ALPHA4_SGIS               0x8110
-#define GL_DUAL_ALPHA8_SGIS               0x8111
-#define GL_DUAL_ALPHA12_SGIS              0x8112
-#define GL_DUAL_ALPHA16_SGIS              0x8113
-#define GL_DUAL_LUMINANCE4_SGIS           0x8114
-#define GL_DUAL_LUMINANCE8_SGIS           0x8115
-#define GL_DUAL_LUMINANCE12_SGIS          0x8116
-#define GL_DUAL_LUMINANCE16_SGIS          0x8117
-#define GL_DUAL_INTENSITY4_SGIS           0x8118
-#define GL_DUAL_INTENSITY8_SGIS           0x8119
-#define GL_DUAL_INTENSITY12_SGIS          0x811A
-#define GL_DUAL_INTENSITY16_SGIS          0x811B
-#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
-#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
-#define GL_QUAD_ALPHA4_SGIS               0x811E
-#define GL_QUAD_ALPHA8_SGIS               0x811F
-#define GL_QUAD_LUMINANCE4_SGIS           0x8120
-#define GL_QUAD_LUMINANCE8_SGIS           0x8121
-#define GL_QUAD_INTENSITY4_SGIS           0x8122
-#define GL_QUAD_INTENSITY8_SGIS           0x8123
-#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
-#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SPRITE_SGIX                    0x8148
-#define GL_SPRITE_MODE_SGIX               0x8149
-#define GL_SPRITE_AXIS_SGIX               0x814A
-#define GL_SPRITE_TRANSLATION_SGIX        0x814B
-#define GL_SPRITE_AXIAL_SGIX              0x814C
-#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
-#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_POINT_SIZE_MIN_EXT             0x8126
-#define GL_POINT_SIZE_MAX_EXT             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
-#define GL_DISTANCE_ATTENUATION_EXT       0x8129
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_POINT_SIZE_MIN_SGIS            0x8126
-#define GL_POINT_SIZE_MAX_SGIS            0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
-#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
-#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
-#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
-#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
-#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_FRAMEZOOM_SGIX                 0x818B
-#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
-#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#endif
-
-#ifndef GL_FfdMaskSGIX
-#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
-#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
-#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
-#define GL_DEFORMATIONS_MASK_SGIX         0x8196
-#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_REFERENCE_PLANE_SGIX           0x817D
-#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
-#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
-#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_FOG_FUNC_SGIS                  0x812A
-#define GL_FOG_FUNC_POINTS_SGIS           0x812B
-#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_FOG_OFFSET_SGIX                0x8198
-#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_IMAGE_SCALE_X_HP               0x8155
-#define GL_IMAGE_SCALE_Y_HP               0x8156
-#define GL_IMAGE_TRANSLATE_X_HP           0x8157
-#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
-#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
-#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
-#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
-#define GL_IMAGE_MAG_FILTER_HP            0x815C
-#define GL_IMAGE_MIN_FILTER_HP            0x815D
-#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
-#define GL_CUBIC_HP                       0x815F
-#define GL_AVERAGE_HP                     0x8160
-#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
-#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
-#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_IGNORE_BORDER_HP               0x8150
-#define GL_CONSTANT_BORDER_HP             0x8151
-#define GL_REPLICATE_BORDER_HP            0x8153
-#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
-#endif
-
-#ifndef GL_INGR_palette_buffer
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
-#endif
-
-#ifndef GL_EXT_color_subtable
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
-#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
-#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
-#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
-#define GL_COLOR3_BIT_PGI                 0x00010000
-#define GL_COLOR4_BIT_PGI                 0x00020000
-#define GL_EDGEFLAG_BIT_PGI               0x00040000
-#define GL_INDEX_BIT_PGI                  0x00080000
-#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
-#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
-#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
-#define GL_MAT_EMISSION_BIT_PGI           0x00800000
-#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
-#define GL_MAT_SHININESS_BIT_PGI          0x02000000
-#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
-#define GL_NORMAL_BIT_PGI                 0x08000000
-#define GL_TEXCOORD1_BIT_PGI              0x10000000
-#define GL_TEXCOORD2_BIT_PGI              0x20000000
-#define GL_TEXCOORD3_BIT_PGI              0x40000000
-#define GL_TEXCOORD4_BIT_PGI              0x80000000
-#define GL_VERTEX23_BIT_PGI               0x00000004
-#define GL_VERTEX4_BIT_PGI                0x00000008
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
-#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
-#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
-#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
-#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
-#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
-#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
-#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
-#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
-#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
-#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
-#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
-#define GL_CLIP_NEAR_HINT_PGI             0x1A220
-#define GL_CLIP_FAR_HINT_PGI              0x1A221
-#define GL_WIDE_LINE_HINT_PGI             0x1A222
-#define GL_BACK_NORMALS_HINT_PGI          0x1A223
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_COLOR_INDEX1_EXT               0x80E2
-#define GL_COLOR_INDEX2_EXT               0x80E3
-#define GL_COLOR_INDEX4_EXT               0x80E4
-#define GL_COLOR_INDEX8_EXT               0x80E5
-#define GL_COLOR_INDEX12_EXT              0x80E6
-#define GL_COLOR_INDEX16_EXT              0x80E7
-#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_LIST_PRIORITY_SGIX             0x8182
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_IR_INSTRUMENT1_SGIX            0x817F
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
-#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
-#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SHADOW_AMBIENT_SGIX            0x80BF
-#endif
-
-#ifndef GL_EXT_index_texture
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_INDEX_MATERIAL_EXT             0x81B8
-#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
-#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_INDEX_TEST_EXT                 0x81B5
-#define GL_INDEX_TEST_FUNC_EXT            0x81B6
-#define GL_INDEX_TEST_REF_EXT             0x81B7
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_IUI_V2F_EXT                    0x81AD
-#define GL_IUI_V3F_EXT                    0x81AE
-#define GL_IUI_N3F_V2F_EXT                0x81AF
-#define GL_IUI_N3F_V3F_EXT                0x81B0
-#define GL_T2F_IUI_V2F_EXT                0x81B1
-#define GL_T2F_IUI_V3F_EXT                0x81B2
-#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
-#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_CULL_VERTEX_EXT                0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_YCRCB_422_SGIX                 0x81BB
-#define GL_YCRCB_444_SGIX                 0x81BC
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
-#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
-#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
-#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
-#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
-#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
-#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
-#define GL_LIGHT_ENV_MODE_SGIX            0x8407
-#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
-#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
-#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
-#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
-#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
-#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
-#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
-#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
-#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
-#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
-#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
-#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
-#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
-#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
-#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_PHONG_WIN                      0x80EA
-#define GL_PHONG_HINT_WIN                 0x80EB
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_FRAGMENT_MATERIAL_EXT          0x8349
-#define GL_FRAGMENT_NORMAL_EXT            0x834A
-#define GL_FRAGMENT_COLOR_EXT             0x834C
-#define GL_ATTENUATION_EXT                0x834D
-#define GL_SHADOW_ATTENUATION_EXT         0x834E
-#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
-#define GL_TEXTURE_LIGHT_EXT              0x8350
-#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
-#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
-/* reuse GL_FRAGMENT_DEPTH_EXT */
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_ALPHA_MIN_SGIX                 0x8320
-#define GL_ALPHA_MAX_SGIX                 0x8321
-#endif
-
-#ifndef GL_SGIX_impact_pixel_texture
-#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
-#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
-#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
-#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
-#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
-#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
-#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_BGR_EXT                        0x80E0
-#define GL_BGRA_EXT                       0x80E1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_ASYNC_MARKER_SGIX              0x8329
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
-#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
-#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
-#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
-#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
-#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
-#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
-#endif
-
-#ifndef GL_INTEL_texture_scissor
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
-#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
-#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
-#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
-#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_OCCLUSION_TEST_HP              0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
-#define GL_PIXEL_MAG_FILTER_EXT           0x8331
-#define GL_PIXEL_MIN_FILTER_EXT           0x8332
-#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
-#define GL_CUBIC_EXT                      0x8334
-#define GL_AVERAGE_EXT                    0x8335
-#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
-#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
-#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
-#define GL_SINGLE_COLOR_EXT               0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_COLOR_SUM_EXT                  0x8458
-#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
-#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_PERTURB_EXT                    0x85AE
-#define GL_TEXTURE_NORMAL_EXT             0x85AF
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
-#define GL_FOG_COORDINATE_EXT             0x8451
-#define GL_FRAGMENT_DEPTH_EXT             0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_SCREEN_COORDINATES_REND        0x8490
-#define GL_INVERTED_SCREEN_W_REND         0x8491
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_TANGENT_ARRAY_EXT              0x8439
-#define GL_BINORMAL_ARRAY_EXT             0x843A
-#define GL_CURRENT_TANGENT_EXT            0x843B
-#define GL_CURRENT_BINORMAL_EXT           0x843C
-#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
-#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
-#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
-#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
-#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
-#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
-#define GL_MAP1_TANGENT_EXT               0x8444
-#define GL_MAP2_TANGENT_EXT               0x8445
-#define GL_MAP1_BINORMAL_EXT              0x8446
-#define GL_MAP2_BINORMAL_EXT              0x8447
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_COMBINE_EXT                    0x8570
-#define GL_COMBINE_RGB_EXT                0x8571
-#define GL_COMBINE_ALPHA_EXT              0x8572
-#define GL_RGB_SCALE_EXT                  0x8573
-#define GL_ADD_SIGNED_EXT                 0x8574
-#define GL_INTERPOLATE_EXT                0x8575
-#define GL_CONSTANT_EXT                   0x8576
-#define GL_PRIMARY_COLOR_EXT              0x8577
-#define GL_PREVIOUS_EXT                   0x8578
-#define GL_SOURCE0_RGB_EXT                0x8580
-#define GL_SOURCE1_RGB_EXT                0x8581
-#define GL_SOURCE2_RGB_EXT                0x8582
-#define GL_SOURCE0_ALPHA_EXT              0x8588
-#define GL_SOURCE1_ALPHA_EXT              0x8589
-#define GL_SOURCE2_ALPHA_EXT              0x858A
-#define GL_OPERAND0_RGB_EXT               0x8590
-#define GL_OPERAND1_RGB_EXT               0x8591
-#define GL_OPERAND2_RGB_EXT               0x8592
-#define GL_OPERAND0_ALPHA_EXT             0x8598
-#define GL_OPERAND1_ALPHA_EXT             0x8599
-#define GL_OPERAND2_ALPHA_EXT             0x859A
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_TRANSFORM_HINT_APPLE           0x85B1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_FOG_SCALE_SGIX                 0x81FC
-#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
-#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_GLOBAL_ALPHA_SUN               0x81D9
-#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_RESTART_SUN                    0x0001
-#define GL_REPLACE_MIDDLE_SUN             0x0002
-#define GL_REPLACE_OLDEST_SUN             0x0003
-#define GL_TRIANGLE_LIST_SUN              0x81D7
-#define GL_REPLACEMENT_CODE_SUN           0x81D8
-#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
-#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
-#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
-#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
-#define GL_R1UI_V3F_SUN                   0x85C4
-#define GL_R1UI_C4UB_V3F_SUN              0x85C5
-#define GL_R1UI_C3F_V3F_SUN               0x85C6
-#define GL_R1UI_N3F_V3F_SUN               0x85C7
-#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
-#define GL_R1UI_T2F_V3F_SUN               0x85C9
-#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
-#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
-#endif
-
-#ifndef GL_SUN_vertex
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_BLEND_DST_RGB_EXT              0x80C8
-#define GL_BLEND_SRC_RGB_EXT              0x80C9
-#define GL_BLEND_DST_ALPHA_EXT            0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_RED_MIN_CLAMP_INGR             0x8560
-#define GL_GREEN_MIN_CLAMP_INGR           0x8561
-#define GL_BLUE_MIN_CLAMP_INGR            0x8562
-#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
-#define GL_RED_MAX_CLAMP_INGR             0x8564
-#define GL_GREEN_MAX_CLAMP_INGR           0x8565
-#define GL_BLUE_MAX_CLAMP_INGR            0x8566
-#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INTERLACE_READ_INGR            0x8568
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_INCR_WRAP_EXT                  0x8507
-#define GL_DECR_WRAP_EXT                  0x8508
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_422_EXT                        0x80CC
-#define GL_422_REV_EXT                    0x80CD
-#define GL_422_AVERAGE_EXT                0x80CE
-#define GL_422_REV_AVERAGE_EXT            0x80CF
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NORMAL_MAP_NV                  0x8511
-#define GL_REFLECTION_MAP_NV              0x8512
-#endif
-
-#ifndef GL_EXT_texture_cube_map
-#define GL_NORMAL_MAP_EXT                 0x8511
-#define GL_REFLECTION_MAP_EXT             0x8512
-#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_WRAP_BORDER_SUN                0x81D4
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
-#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
-#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
-#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
-#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
-#define GL_MODELVIEW1_MATRIX_EXT          0x8506
-#define GL_VERTEX_WEIGHTING_EXT           0x8509
-#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
-#define GL_MODELVIEW1_EXT                 0x850A
-#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
-#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_MAX_SHININESS_NV               0x8504
-#define GL_MAX_SPOT_EXPONENT_NV           0x8505
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
-#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_REGISTER_COMBINERS_NV          0x8522
-#define GL_VARIABLE_A_NV                  0x8523
-#define GL_VARIABLE_B_NV                  0x8524
-#define GL_VARIABLE_C_NV                  0x8525
-#define GL_VARIABLE_D_NV                  0x8526
-#define GL_VARIABLE_E_NV                  0x8527
-#define GL_VARIABLE_F_NV                  0x8528
-#define GL_VARIABLE_G_NV                  0x8529
-#define GL_CONSTANT_COLOR0_NV             0x852A
-#define GL_CONSTANT_COLOR1_NV             0x852B
-#define GL_PRIMARY_COLOR_NV               0x852C
-#define GL_SECONDARY_COLOR_NV             0x852D
-#define GL_SPARE0_NV                      0x852E
-#define GL_SPARE1_NV                      0x852F
-#define GL_DISCARD_NV                     0x8530
-#define GL_E_TIMES_F_NV                   0x8531
-#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
-#define GL_UNSIGNED_IDENTITY_NV           0x8536
-#define GL_UNSIGNED_INVERT_NV             0x8537
-#define GL_EXPAND_NORMAL_NV               0x8538
-#define GL_EXPAND_NEGATE_NV               0x8539
-#define GL_HALF_BIAS_NORMAL_NV            0x853A
-#define GL_HALF_BIAS_NEGATE_NV            0x853B
-#define GL_SIGNED_IDENTITY_NV             0x853C
-#define GL_SIGNED_NEGATE_NV               0x853D
-#define GL_SCALE_BY_TWO_NV                0x853E
-#define GL_SCALE_BY_FOUR_NV               0x853F
-#define GL_SCALE_BY_ONE_HALF_NV           0x8540
-#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
-#define GL_COMBINER_INPUT_NV              0x8542
-#define GL_COMBINER_MAPPING_NV            0x8543
-#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
-#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
-#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
-#define GL_COMBINER_MUX_SUM_NV            0x8547
-#define GL_COMBINER_SCALE_NV              0x8548
-#define GL_COMBINER_BIAS_NV               0x8549
-#define GL_COMBINER_AB_OUTPUT_NV          0x854A
-#define GL_COMBINER_CD_OUTPUT_NV          0x854B
-#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
-#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
-#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
-#define GL_COLOR_SUM_CLAMP_NV             0x854F
-#define GL_COMBINER0_NV                   0x8550
-#define GL_COMBINER1_NV                   0x8551
-#define GL_COMBINER2_NV                   0x8552
-#define GL_COMBINER3_NV                   0x8553
-#define GL_COMBINER4_NV                   0x8554
-#define GL_COMBINER5_NV                   0x8555
-#define GL_COMBINER6_NV                   0x8556
-#define GL_COMBINER7_NV                   0x8557
-/* reuse GL_TEXTURE0_ARB */
-/* reuse GL_TEXTURE1_ARB */
-/* reuse GL_ZERO */
-/* reuse GL_NONE */
-/* reuse GL_FOG */
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_FOG_DISTANCE_MODE_NV           0x855A
-#define GL_EYE_RADIAL_NV                  0x855B
-#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
-/* reuse GL_EYE_PLANE */
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_EMBOSS_LIGHT_NV                0x855D
-#define GL_EMBOSS_CONSTANT_NV             0x855E
-#define GL_EMBOSS_MAP_NV                  0x855F
-#endif
-
-#ifndef GL_NV_blend_square
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_COMBINE4_NV                    0x8503
-#define GL_SOURCE3_RGB_NV                 0x8583
-#define GL_SOURCE3_ALPHA_NV               0x858B
-#define GL_OPERAND3_RGB_NV                0x8593
-#define GL_OPERAND3_ALPHA_NV              0x859B
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#endif
-
-#ifndef GL_MESA_window_pos
-#endif
-
-#ifndef GL_EXT_texture_compression_s3tc
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_CULL_VERTEX_IBM                103050
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_VERTEX_ARRAY_LIST_IBM          103070
-#define GL_NORMAL_ARRAY_LIST_IBM          103071
-#define GL_COLOR_ARRAY_LIST_IBM           103072
-#define GL_INDEX_ARRAY_LIST_IBM           103073
-#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
-#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
-#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
-#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
-#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
-#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
-#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
-#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
-#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
-#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
-#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
-#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
-#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
-#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
-#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
-#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_YCRCB_SGIX                     0x8318
-#define GL_YCRCBA_SGIX                    0x8319
-#endif
-
-#ifndef GL_SGI_depth_pass_instrument
-#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
-#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
-#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
-#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_MULTISAMPLE_3DFX               0x86B2
-#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
-#define GL_SAMPLES_3DFX                   0x86B4
-#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_MULTISAMPLE_EXT                0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
-#define GL_SAMPLE_MASK_EXT                0x80A0
-#define GL_1PASS_EXT                      0x80A1
-#define GL_2PASS_0_EXT                    0x80A2
-#define GL_2PASS_1_EXT                    0x80A3
-#define GL_4PASS_0_EXT                    0x80A4
-#define GL_4PASS_1_EXT                    0x80A5
-#define GL_4PASS_2_EXT                    0x80A6
-#define GL_4PASS_3_EXT                    0x80A7
-#define GL_SAMPLE_BUFFERS_EXT             0x80A8
-#define GL_SAMPLES_EXT                    0x80A9
-#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
-#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
-#define GL_SAMPLE_PATTERN_EXT             0x80AC
-#define GL_MULTISAMPLE_BIT_EXT            0x20000000
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_VERTEX_PRECLIP_SGIX            0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_CONVOLUTION_HINT_SGIX          0x8316
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_PACK_RESAMPLE_SGIX             0x842C
-#define GL_UNPACK_RESAMPLE_SGIX           0x842D
-#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
-#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
-#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
-#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
-#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
-#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
-#define GL_EYE_POINT_SGIS                 0x81F4
-#define GL_OBJECT_POINT_SGIS              0x81F5
-#define GL_EYE_LINE_SGIS                  0x81F6
-#define GL_OBJECT_LINE_SGIS               0x81F7
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_DOT3_RGB_EXT                   0x8740
-#define GL_DOT3_RGBA_EXT                  0x8741
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_MIRROR_CLAMP_ATI               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
-#endif
-
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV               0x84F2
-#define GL_FENCE_STATUS_NV                0x84F3
-#define GL_FENCE_CONDITION_NV             0x84F4
-#endif
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_IBM            0x8370
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_EVAL_2D_NV                     0x86C0
-#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
-#define GL_MAP_TESSELLATION_NV            0x86C2
-#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
-#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
-#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
-#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
-#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
-#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
-#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
-#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
-#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
-#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
-#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
-#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
-#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
-#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
-#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
-#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
-#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
-#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
-#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
-#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
-#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_DEPTH_STENCIL_NV               0x84F9
-#define GL_UNSIGNED_INT_24_8_NV           0x84FA
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_PER_STAGE_CONSTANTS_NV         0x8535
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_NV           0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
-#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
-#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
-#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
-#define GL_SHADER_CONSISTENT_NV           0x86DD
-#define GL_TEXTURE_SHADER_NV              0x86DE
-#define GL_SHADER_OPERATION_NV            0x86DF
-#define GL_CULL_MODES_NV                  0x86E0
-#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
-#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
-#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
-#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
-#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
-#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
-#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
-#define GL_CONST_EYE_NV                   0x86E5
-#define GL_PASS_THROUGH_NV                0x86E6
-#define GL_CULL_FRAGMENT_NV               0x86E7
-#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
-#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
-#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
-#define GL_DOT_PRODUCT_NV                 0x86EC
-#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
-#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
-#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
-#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
-#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
-#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
-#define GL_HILO_NV                        0x86F4
-#define GL_DSDT_NV                        0x86F5
-#define GL_DSDT_MAG_NV                    0x86F6
-#define GL_DSDT_MAG_VIB_NV                0x86F7
-#define GL_HILO16_NV                      0x86F8
-#define GL_SIGNED_HILO_NV                 0x86F9
-#define GL_SIGNED_HILO16_NV               0x86FA
-#define GL_SIGNED_RGBA_NV                 0x86FB
-#define GL_SIGNED_RGBA8_NV                0x86FC
-#define GL_SIGNED_RGB_NV                  0x86FE
-#define GL_SIGNED_RGB8_NV                 0x86FF
-#define GL_SIGNED_LUMINANCE_NV            0x8701
-#define GL_SIGNED_LUMINANCE8_NV           0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
-#define GL_SIGNED_ALPHA_NV                0x8705
-#define GL_SIGNED_ALPHA8_NV               0x8706
-#define GL_SIGNED_INTENSITY_NV            0x8707
-#define GL_SIGNED_INTENSITY8_NV           0x8708
-#define GL_DSDT8_NV                       0x8709
-#define GL_DSDT8_MAG8_NV                  0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-#define GL_HI_SCALE_NV                    0x870E
-#define GL_LO_SCALE_NV                    0x870F
-#define GL_DS_SCALE_NV                    0x8710
-#define GL_DT_SCALE_NV                    0x8711
-#define GL_MAGNITUDE_SCALE_NV             0x8712
-#define GL_VIBRANCE_SCALE_NV              0x8713
-#define GL_HI_BIAS_NV                     0x8714
-#define GL_LO_BIAS_NV                     0x8715
-#define GL_DS_BIAS_NV                     0x8716
-#define GL_DT_BIAS_NV                     0x8717
-#define GL_MAGNITUDE_BIAS_NV              0x8718
-#define GL_VIBRANCE_BIAS_NV               0x8719
-#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
-#define GL_TEXTURE_HI_SIZE_NV             0x871B
-#define GL_TEXTURE_LO_SIZE_NV             0x871C
-#define GL_TEXTURE_DS_SIZE_NV             0x871D
-#define GL_TEXTURE_DT_SIZE_NV             0x871E
-#define GL_TEXTURE_MAG_SIZE_NV            0x871F
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_VERTEX_PROGRAM_NV              0x8620
-#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
-#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
-#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
-#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
-#define GL_CURRENT_ATTRIB_NV              0x8626
-#define GL_PROGRAM_LENGTH_NV              0x8627
-#define GL_PROGRAM_STRING_NV              0x8628
-#define GL_MODELVIEW_PROJECTION_NV        0x8629
-#define GL_IDENTITY_NV                    0x862A
-#define GL_INVERSE_NV                     0x862B
-#define GL_TRANSPOSE_NV                   0x862C
-#define GL_INVERSE_TRANSPOSE_NV           0x862D
-#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
-#define GL_MAX_TRACK_MATRICES_NV          0x862F
-#define GL_MATRIX0_NV                     0x8630
-#define GL_MATRIX1_NV                     0x8631
-#define GL_MATRIX2_NV                     0x8632
-#define GL_MATRIX3_NV                     0x8633
-#define GL_MATRIX4_NV                     0x8634
-#define GL_MATRIX5_NV                     0x8635
-#define GL_MATRIX6_NV                     0x8636
-#define GL_MATRIX7_NV                     0x8637
-#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
-#define GL_CURRENT_MATRIX_NV              0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
-#define GL_PROGRAM_PARAMETER_NV           0x8644
-#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
-#define GL_PROGRAM_TARGET_NV              0x8646
-#define GL_PROGRAM_RESIDENT_NV            0x8647
-#define GL_TRACK_MATRIX_NV                0x8648
-#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
-#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
-#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
-#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
-#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
-#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
-#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
-#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
-#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
-#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
-#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
-#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
-#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
-#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
-#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
-#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
-#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
-#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
-#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
-#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
-#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
-#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
-#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
-#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
-#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
-#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
-#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
-#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
-#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
-#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
-#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
-#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
-#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
-#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
-#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
-#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
-#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
-#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
-#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
-#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
-#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
-#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
-#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
-#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
-#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
-#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
-#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
-#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
-#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
-#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
-#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
-#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
-#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SCALEBIAS_HINT_SGIX            0x8322
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_INTERLACE_OML                  0x8980
-#define GL_INTERLACE_READ_OML             0x8981
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
-#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
-#endif
-
-#ifndef GL_OML_resample
-#define GL_PACK_RESAMPLE_OML              0x8984
-#define GL_UNPACK_RESAMPLE_OML            0x8985
-#define GL_RESAMPLE_REPLICATE_OML         0x8986
-#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
-#define GL_RESAMPLE_AVERAGE_OML           0x8988
-#define GL_RESAMPLE_DECIMATE_OML          0x8989
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
-#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_BUMP_ROT_MATRIX_ATI            0x8775
-#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
-#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
-#define GL_BUMP_TEX_UNITS_ATI             0x8778
-#define GL_DUDV_ATI                       0x8779
-#define GL_DU8DV8_ATI                     0x877A
-#define GL_BUMP_ENVMAP_ATI                0x877B
-#define GL_BUMP_TARGET_ATI                0x877C
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_FRAGMENT_SHADER_ATI            0x8920
-#define GL_REG_0_ATI                      0x8921
-#define GL_REG_1_ATI                      0x8922
-#define GL_REG_2_ATI                      0x8923
-#define GL_REG_3_ATI                      0x8924
-#define GL_REG_4_ATI                      0x8925
-#define GL_REG_5_ATI                      0x8926
-#define GL_REG_6_ATI                      0x8927
-#define GL_REG_7_ATI                      0x8928
-#define GL_REG_8_ATI                      0x8929
-#define GL_REG_9_ATI                      0x892A
-#define GL_REG_10_ATI                     0x892B
-#define GL_REG_11_ATI                     0x892C
-#define GL_REG_12_ATI                     0x892D
-#define GL_REG_13_ATI                     0x892E
-#define GL_REG_14_ATI                     0x892F
-#define GL_REG_15_ATI                     0x8930
-#define GL_REG_16_ATI                     0x8931
-#define GL_REG_17_ATI                     0x8932
-#define GL_REG_18_ATI                     0x8933
-#define GL_REG_19_ATI                     0x8934
-#define GL_REG_20_ATI                     0x8935
-#define GL_REG_21_ATI                     0x8936
-#define GL_REG_22_ATI                     0x8937
-#define GL_REG_23_ATI                     0x8938
-#define GL_REG_24_ATI                     0x8939
-#define GL_REG_25_ATI                     0x893A
-#define GL_REG_26_ATI                     0x893B
-#define GL_REG_27_ATI                     0x893C
-#define GL_REG_28_ATI                     0x893D
-#define GL_REG_29_ATI                     0x893E
-#define GL_REG_30_ATI                     0x893F
-#define GL_REG_31_ATI                     0x8940
-#define GL_CON_0_ATI                      0x8941
-#define GL_CON_1_ATI                      0x8942
-#define GL_CON_2_ATI                      0x8943
-#define GL_CON_3_ATI                      0x8944
-#define GL_CON_4_ATI                      0x8945
-#define GL_CON_5_ATI                      0x8946
-#define GL_CON_6_ATI                      0x8947
-#define GL_CON_7_ATI                      0x8948
-#define GL_CON_8_ATI                      0x8949
-#define GL_CON_9_ATI                      0x894A
-#define GL_CON_10_ATI                     0x894B
-#define GL_CON_11_ATI                     0x894C
-#define GL_CON_12_ATI                     0x894D
-#define GL_CON_13_ATI                     0x894E
-#define GL_CON_14_ATI                     0x894F
-#define GL_CON_15_ATI                     0x8950
-#define GL_CON_16_ATI                     0x8951
-#define GL_CON_17_ATI                     0x8952
-#define GL_CON_18_ATI                     0x8953
-#define GL_CON_19_ATI                     0x8954
-#define GL_CON_20_ATI                     0x8955
-#define GL_CON_21_ATI                     0x8956
-#define GL_CON_22_ATI                     0x8957
-#define GL_CON_23_ATI                     0x8958
-#define GL_CON_24_ATI                     0x8959
-#define GL_CON_25_ATI                     0x895A
-#define GL_CON_26_ATI                     0x895B
-#define GL_CON_27_ATI                     0x895C
-#define GL_CON_28_ATI                     0x895D
-#define GL_CON_29_ATI                     0x895E
-#define GL_CON_30_ATI                     0x895F
-#define GL_CON_31_ATI                     0x8960
-#define GL_MOV_ATI                        0x8961
-#define GL_ADD_ATI                        0x8963
-#define GL_MUL_ATI                        0x8964
-#define GL_SUB_ATI                        0x8965
-#define GL_DOT3_ATI                       0x8966
-#define GL_DOT4_ATI                       0x8967
-#define GL_MAD_ATI                        0x8968
-#define GL_LERP_ATI                       0x8969
-#define GL_CND_ATI                        0x896A
-#define GL_CND0_ATI                       0x896B
-#define GL_DOT2_ADD_ATI                   0x896C
-#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
-#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
-#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
-#define GL_NUM_PASSES_ATI                 0x8970
-#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
-#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
-#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
-#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
-#define GL_SWIZZLE_STR_ATI                0x8976
-#define GL_SWIZZLE_STQ_ATI                0x8977
-#define GL_SWIZZLE_STR_DR_ATI             0x8978
-#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
-#define GL_SWIZZLE_STRQ_ATI               0x897A
-#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
-#define GL_RED_BIT_ATI                    0x00000001
-#define GL_GREEN_BIT_ATI                  0x00000002
-#define GL_BLUE_BIT_ATI                   0x00000004
-#define GL_2X_BIT_ATI                     0x00000001
-#define GL_4X_BIT_ATI                     0x00000002
-#define GL_8X_BIT_ATI                     0x00000004
-#define GL_HALF_BIT_ATI                   0x00000008
-#define GL_QUARTER_BIT_ATI                0x00000010
-#define GL_EIGHTH_BIT_ATI                 0x00000020
-#define GL_SATURATE_BIT_ATI               0x00000040
-#define GL_COMP_BIT_ATI                   0x00000002
-#define GL_NEGATE_BIT_ATI                 0x00000004
-#define GL_BIAS_BIT_ATI                   0x00000008
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_PN_TRIANGLES_ATI               0x87F0
-#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
-#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
-#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
-#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
-#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
-#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
-#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
-#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_STATIC_ATI                     0x8760
-#define GL_DYNAMIC_ATI                    0x8761
-#define GL_PRESERVE_ATI                   0x8762
-#define GL_DISCARD_ATI                    0x8763
-#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
-#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
-#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
-#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_VERTEX_SHADER_EXT              0x8780
-#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
-#define GL_OP_INDEX_EXT                   0x8782
-#define GL_OP_NEGATE_EXT                  0x8783
-#define GL_OP_DOT3_EXT                    0x8784
-#define GL_OP_DOT4_EXT                    0x8785
-#define GL_OP_MUL_EXT                     0x8786
-#define GL_OP_ADD_EXT                     0x8787
-#define GL_OP_MADD_EXT                    0x8788
-#define GL_OP_FRAC_EXT                    0x8789
-#define GL_OP_MAX_EXT                     0x878A
-#define GL_OP_MIN_EXT                     0x878B
-#define GL_OP_SET_GE_EXT                  0x878C
-#define GL_OP_SET_LT_EXT                  0x878D
-#define GL_OP_CLAMP_EXT                   0x878E
-#define GL_OP_FLOOR_EXT                   0x878F
-#define GL_OP_ROUND_EXT                   0x8790
-#define GL_OP_EXP_BASE_2_EXT              0x8791
-#define GL_OP_LOG_BASE_2_EXT              0x8792
-#define GL_OP_POWER_EXT                   0x8793
-#define GL_OP_RECIP_EXT                   0x8794
-#define GL_OP_RECIP_SQRT_EXT              0x8795
-#define GL_OP_SUB_EXT                     0x8796
-#define GL_OP_CROSS_PRODUCT_EXT           0x8797
-#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
-#define GL_OP_MOV_EXT                     0x8799
-#define GL_OUTPUT_VERTEX_EXT              0x879A
-#define GL_OUTPUT_COLOR0_EXT              0x879B
-#define GL_OUTPUT_COLOR1_EXT              0x879C
-#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
-#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
-#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
-#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
-#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
-#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
-#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
-#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
-#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
-#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
-#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
-#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
-#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
-#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
-#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
-#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
-#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
-#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
-#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
-#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
-#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
-#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
-#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
-#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
-#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
-#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
-#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
-#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
-#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
-#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
-#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
-#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
-#define GL_OUTPUT_FOG_EXT                 0x87BD
-#define GL_SCALAR_EXT                     0x87BE
-#define GL_VECTOR_EXT                     0x87BF
-#define GL_MATRIX_EXT                     0x87C0
-#define GL_VARIANT_EXT                    0x87C1
-#define GL_INVARIANT_EXT                  0x87C2
-#define GL_LOCAL_CONSTANT_EXT             0x87C3
-#define GL_LOCAL_EXT                      0x87C4
-#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
-#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
-#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
-#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
-#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
-#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
-#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
-#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
-#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
-#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
-#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
-#define GL_X_EXT                          0x87D5
-#define GL_Y_EXT                          0x87D6
-#define GL_Z_EXT                          0x87D7
-#define GL_W_EXT                          0x87D8
-#define GL_NEGATIVE_X_EXT                 0x87D9
-#define GL_NEGATIVE_Y_EXT                 0x87DA
-#define GL_NEGATIVE_Z_EXT                 0x87DB
-#define GL_NEGATIVE_W_EXT                 0x87DC
-#define GL_ZERO_EXT                       0x87DD
-#define GL_ONE_EXT                        0x87DE
-#define GL_NEGATIVE_ONE_EXT               0x87DF
-#define GL_NORMALIZED_RANGE_EXT           0x87E0
-#define GL_FULL_RANGE_EXT                 0x87E1
-#define GL_CURRENT_VERTEX_EXT             0x87E2
-#define GL_MVP_MATRIX_EXT                 0x87E3
-#define GL_VARIANT_VALUE_EXT              0x87E4
-#define GL_VARIANT_DATATYPE_EXT           0x87E5
-#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
-#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
-#define GL_VARIANT_ARRAY_EXT              0x87E8
-#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
-#define GL_INVARIANT_VALUE_EXT            0x87EA
-#define GL_INVARIANT_DATATYPE_EXT         0x87EB
-#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
-#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
-#define GL_VERTEX_STREAM0_ATI             0x876C
-#define GL_VERTEX_STREAM1_ATI             0x876D
-#define GL_VERTEX_STREAM2_ATI             0x876E
-#define GL_VERTEX_STREAM3_ATI             0x876F
-#define GL_VERTEX_STREAM4_ATI             0x8770
-#define GL_VERTEX_STREAM5_ATI             0x8771
-#define GL_VERTEX_STREAM6_ATI             0x8772
-#define GL_VERTEX_STREAM7_ATI             0x8773
-#define GL_VERTEX_SOURCE_ATI              0x8774
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ELEMENT_ARRAY_ATI              0x8768
-#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
-#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_QUAD_MESH_SUN                  0x8614
-#define GL_TRIANGLE_MESH_SUN              0x8615
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SLICE_ACCUM_SUN                0x85CC
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_DEPTH_CLAMP_NV                 0x864F
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_PIXEL_COUNTER_BITS_NV          0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
-#define GL_PIXEL_COUNT_NV                 0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_POINT_SPRITE_NV                0x8861
-#define GL_COORD_REPLACE_NV               0x8862
-#define GL_POINT_SPRITE_R_MODE_NV         0x8863
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
-#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
-#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
-#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
-#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
-#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
-#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
-#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
-#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
-#define GL_HILO8_NV                       0x885E
-#define GL_SIGNED_HILO8_NV                0x885F
-#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
-#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_ELEMENT_ARRAY_APPLE            0x8768
-#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
-#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_DRAW_PIXELS_APPLE              0x8A0A
-#define GL_FENCE_APPLE                    0x8A0B
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
-#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
-#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
-#define GL_STORAGE_CACHED_APPLE           0x85BE
-#define GL_STORAGE_SHARED_APPLE           0x85BF
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_YCBCR_422_APPLE                0x85B9
-#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_RGB_S3TC                       0x83A0
-#define GL_RGB4_S3TC                      0x83A1
-#define GL_RGBA_S3TC                      0x83A2
-#define GL_RGBA4_S3TC                     0x83A3
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
-#define GL_DRAW_BUFFER0_ATI               0x8825
-#define GL_DRAW_BUFFER1_ATI               0x8826
-#define GL_DRAW_BUFFER2_ATI               0x8827
-#define GL_DRAW_BUFFER3_ATI               0x8828
-#define GL_DRAW_BUFFER4_ATI               0x8829
-#define GL_DRAW_BUFFER5_ATI               0x882A
-#define GL_DRAW_BUFFER6_ATI               0x882B
-#define GL_DRAW_BUFFER7_ATI               0x882C
-#define GL_DRAW_BUFFER8_ATI               0x882D
-#define GL_DRAW_BUFFER9_ATI               0x882E
-#define GL_DRAW_BUFFER10_ATI              0x882F
-#define GL_DRAW_BUFFER11_ATI              0x8830
-#define GL_DRAW_BUFFER12_ATI              0x8831
-#define GL_DRAW_BUFFER13_ATI              0x8832
-#define GL_DRAW_BUFFER14_ATI              0x8833
-#define GL_DRAW_BUFFER15_ATI              0x8834
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
-#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_MODULATE_ADD_ATI               0x8744
-#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
-#define GL_MODULATE_SUBTRACT_ATI          0x8746
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_RGBA_FLOAT32_ATI               0x8814
-#define GL_RGB_FLOAT32_ATI                0x8815
-#define GL_ALPHA_FLOAT32_ATI              0x8816
-#define GL_INTENSITY_FLOAT32_ATI          0x8817
-#define GL_LUMINANCE_FLOAT32_ATI          0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
-#define GL_RGBA_FLOAT16_ATI               0x881A
-#define GL_RGB_FLOAT16_ATI                0x881B
-#define GL_ALPHA_FLOAT16_ATI              0x881C
-#define GL_INTENSITY_FLOAT16_ATI          0x881D
-#define GL_LUMINANCE_FLOAT16_ATI          0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_FLOAT_R_NV                     0x8880
-#define GL_FLOAT_RG_NV                    0x8881
-#define GL_FLOAT_RGB_NV                   0x8882
-#define GL_FLOAT_RGBA_NV                  0x8883
-#define GL_FLOAT_R16_NV                   0x8884
-#define GL_FLOAT_R32_NV                   0x8885
-#define GL_FLOAT_RG16_NV                  0x8886
-#define GL_FLOAT_RG32_NV                  0x8887
-#define GL_FLOAT_RGB16_NV                 0x8888
-#define GL_FLOAT_RGB32_NV                 0x8889
-#define GL_FLOAT_RGBA16_NV                0x888A
-#define GL_FLOAT_RGBA32_NV                0x888B
-#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
-#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
-#define GL_FLOAT_RGBA_MODE_NV             0x888E
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
-#define GL_FRAGMENT_PROGRAM_NV            0x8870
-#define GL_MAX_TEXTURE_COORDS_NV          0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
-#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
-#define GL_PROGRAM_ERROR_STRING_NV        0x8874
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_HALF_FLOAT_NV                  0x140B
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
-#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
-#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
-#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
-#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
-#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_PRIMITIVE_RESTART_NV           0x8558
-#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
-#endif
-
-#ifndef GL_NV_vertex_program2
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_STENCIL_BACK_FUNC_ATI          0x8800
-#define GL_STENCIL_BACK_FAIL_ATI          0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
-#define GL_DEPTH_BOUNDS_EXT               0x8891
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_MIRROR_CLAMP_EXT               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
-#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_BLEND_EQUATION_RGB_EXT         0x8009
-#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_PACK_INVERT_MESA               0x8758
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
-#define GL_YCBCR_MESA                     0x8757
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
-#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
-#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
-#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
-#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
-#endif
-
-#ifndef GL_NV_vertex_program3
-/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
-#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
-#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
-#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
-#define GL_FRAMEBUFFER_EXT                0x8D40
-#define GL_RENDERBUFFER_EXT               0x8D41
-#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
-#define GL_STENCIL_INDEX1_EXT             0x8D46
-#define GL_STENCIL_INDEX4_EXT             0x8D47
-#define GL_STENCIL_INDEX8_EXT             0x8D48
-#define GL_STENCIL_INDEX16_EXT            0x8D49
-#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_DEPTH_STENCIL_EXT              0x84F9
-#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
-#define GL_DEPTH24_STENCIL8_EXT           0x88F0
-#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
-#endif
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_STENCIL_TAG_BITS_EXT           0x88F2
-#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
-#endif
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_SRGB_EXT                       0x8C40
-#define GL_SRGB8_EXT                      0x8C41
-#define GL_SRGB_ALPHA_EXT                 0x8C42
-#define GL_SRGB8_ALPHA8_EXT               0x8C43
-#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
-#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
-#define GL_SLUMINANCE_EXT                 0x8C46
-#define GL_SLUMINANCE8_EXT                0x8C47
-#define GL_COMPRESSED_SRGB_EXT            0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
-#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
-#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
-#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
-#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
-#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
-#endif
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
-#define GL_MAX_SAMPLES_EXT                0x8D57
-#endif
-
-#ifndef GL_MESAX_texture_stack
-#define GL_TEXTURE_1D_STACK_MESAX         0x8759
-#define GL_TEXTURE_2D_STACK_MESAX         0x875A
-#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
-#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
-#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
-#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_TIME_ELAPSED_EXT               0x88BF
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#endif
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
-#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
-#endif
-
-#ifndef GL_NV_gpu_program4
-#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
-#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
-#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
-#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
-#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
-#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
-#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
-#endif
-
-#ifndef GL_NV_geometry_program4
-#define GL_LINES_ADJACENCY_EXT            0x000A
-#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
-#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
-#define GL_GEOMETRY_PROGRAM_NV            0x8C26
-#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
-#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
-#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
-#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
-#endif
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_GEOMETRY_SHADER_EXT            0x8DD9
-/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */
-/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */
-/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */
-/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
-#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
-/* reuse GL_LINES_ADJACENCY_EXT */
-/* reuse GL_LINE_STRIP_ADJACENCY_EXT */
-/* reuse GL_TRIANGLES_ADJACENCY_EXT */
-/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-/* reuse GL_PROGRAM_POINT_SIZE_EXT */
-#endif
-
-#ifndef GL_NV_vertex_program4
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
-#endif
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
-#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
-#define GL_SAMPLER_BUFFER_EXT             0x8DC2
-#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
-#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
-#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
-#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
-#define GL_INT_SAMPLER_1D_EXT             0x8DC9
-#define GL_INT_SAMPLER_2D_EXT             0x8DCA
-#define GL_INT_SAMPLER_3D_EXT             0x8DCB
-#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
-#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
-#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
-#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
-#endif
-
-#ifndef GL_EXT_draw_instanced
-#endif
-
-#ifndef GL_EXT_packed_float
-#define GL_R11F_G11F_B10F_EXT             0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
-#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
-#endif
-
-#ifndef GL_EXT_texture_array
-#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
-#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
-#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
-#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-#endif
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_TEXTURE_BUFFER_EXT             0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
-#endif
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
-#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
-#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
-#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
-#endif
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
-#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
-#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
-#endif
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_RGB9_E5_EXT                    0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
-#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
-#endif
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
-#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
-#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
-#endif
-
-#ifndef GL_NV_fragment_program4
-#endif
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
-#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
-#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
-#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
-#endif
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
-#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
-#endif
-
-#ifndef GL_NV_geometry_shader4
-#endif
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
-#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
-#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
-#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
-#endif
-
-#ifndef GL_EXT_draw_buffers2
-#endif
-
-#ifndef GL_NV_transform_feedback
-#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
-#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
-#define GL_TEXTURE_COORD_NV               0x8C79
-#define GL_CLIP_DISTANCE_NV               0x8C7A
-#define GL_VERTEX_ID_NV                   0x8C7B
-#define GL_PRIMITIVE_ID_NV                0x8C7C
-#define GL_GENERIC_ATTRIB_NV              0x8C7D
-#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
-#define GL_ACTIVE_VARYINGS_NV             0x8C81
-#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
-#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
-#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
-#define GL_PRIMITIVES_GENERATED_NV        0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
-#define GL_RASTERIZER_DISCARD_NV          0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
-#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
-#endif
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
-#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
-#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
-#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
-#define GL_UNIFORM_BUFFER_EXT             0x8DEE
-#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
-#endif
-
-#ifndef GL_EXT_texture_integer
-#define GL_RGBA32UI_EXT                   0x8D70
-#define GL_RGB32UI_EXT                    0x8D71
-#define GL_ALPHA32UI_EXT                  0x8D72
-#define GL_INTENSITY32UI_EXT              0x8D73
-#define GL_LUMINANCE32UI_EXT              0x8D74
-#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
-#define GL_RGBA16UI_EXT                   0x8D76
-#define GL_RGB16UI_EXT                    0x8D77
-#define GL_ALPHA16UI_EXT                  0x8D78
-#define GL_INTENSITY16UI_EXT              0x8D79
-#define GL_LUMINANCE16UI_EXT              0x8D7A
-#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
-#define GL_RGBA8UI_EXT                    0x8D7C
-#define GL_RGB8UI_EXT                     0x8D7D
-#define GL_ALPHA8UI_EXT                   0x8D7E
-#define GL_INTENSITY8UI_EXT               0x8D7F
-#define GL_LUMINANCE8UI_EXT               0x8D80
-#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
-#define GL_RGBA32I_EXT                    0x8D82
-#define GL_RGB32I_EXT                     0x8D83
-#define GL_ALPHA32I_EXT                   0x8D84
-#define GL_INTENSITY32I_EXT               0x8D85
-#define GL_LUMINANCE32I_EXT               0x8D86
-#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
-#define GL_RGBA16I_EXT                    0x8D88
-#define GL_RGB16I_EXT                     0x8D89
-#define GL_ALPHA16I_EXT                   0x8D8A
-#define GL_INTENSITY16I_EXT               0x8D8B
-#define GL_LUMINANCE16I_EXT               0x8D8C
-#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
-#define GL_RGBA8I_EXT                     0x8D8E
-#define GL_RGB8I_EXT                      0x8D8F
-#define GL_ALPHA8I_EXT                    0x8D90
-#define GL_INTENSITY8I_EXT                0x8D91
-#define GL_LUMINANCE8I_EXT                0x8D92
-#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
-#define GL_RED_INTEGER_EXT                0x8D94
-#define GL_GREEN_INTEGER_EXT              0x8D95
-#define GL_BLUE_INTEGER_EXT               0x8D96
-#define GL_ALPHA_INTEGER_EXT              0x8D97
-#define GL_RGB_INTEGER_EXT                0x8D98
-#define GL_RGBA_INTEGER_EXT               0x8D99
-#define GL_BGR_INTEGER_EXT                0x8D9A
-#define GL_BGRA_INTEGER_EXT               0x8D9B
-#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
-#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
-#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
-#endif
-
-#ifndef GL_GREMEDY_frame_terminator
-#endif
-
-#ifndef GL_NV_conditional_render
-#define GL_QUERY_WAIT_NV                  0x8E13
-#define GL_QUERY_NO_WAIT_NV               0x8E14
-#define GL_QUERY_BY_REGION_WAIT_NV        0x8E15
-#define GL_QUERY_BY_REGION_NO_WAIT_NV     0x8E16
-#endif
-
-#ifndef GL_NV_present_video
-#define GL_FRAME_NV                       0x8E26
-#define GL_FIELDS_NV                      0x8E27
-#define GL_CURRENT_TIME_NV                0x8E28
-#define GL_NUM_FILL_STREAMS_NV            0x8E29
-#define GL_PRESENT_TIME_NV                0x8E2A
-#define GL_PRESENT_DURATION_NV            0x8E2B
-#endif
-
-#ifndef GL_EXT_transform_feedback
-#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT  0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F
-#define GL_INTERLEAVED_ATTRIBS_EXT        0x8C8C
-#define GL_SEPARATE_ATTRIBS_EXT           0x8C8D
-#define GL_PRIMITIVES_GENERATED_EXT       0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88
-#define GL_RASTERIZER_DISCARD_EXT         0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80
-#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F
-#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
-#endif
-
-#ifndef GL_EXT_direct_state_access
-#define GL_PROGRAM_MATRIX_EXT             0x8E2D
-#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT   0x8E2E
-#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
-#endif
-
-#ifndef GL_EXT_vertex_array_bgra
-/* reuse GL_BGRA */
-#endif
-
-#ifndef GL_EXT_texture_swizzle
-#define GL_TEXTURE_SWIZZLE_R_EXT          0x8E42
-#define GL_TEXTURE_SWIZZLE_G_EXT          0x8E43
-#define GL_TEXTURE_SWIZZLE_B_EXT          0x8E44
-#define GL_TEXTURE_SWIZZLE_A_EXT          0x8E45
-#define GL_TEXTURE_SWIZZLE_RGBA_EXT       0x8E46
-#endif
-
-#ifndef GL_NV_explicit_multisample
-#define GL_SAMPLE_POSITION_NV             0x8E50
-#define GL_SAMPLE_MASK_NV                 0x8E51
-#define GL_SAMPLE_MASK_VALUE_NV           0x8E52
-#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53
-#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54
-#define GL_TEXTURE_RENDERBUFFER_NV        0x8E55
-#define GL_SAMPLER_RENDERBUFFER_NV        0x8E56
-#define GL_INT_SAMPLER_RENDERBUFFER_NV    0x8E57
-#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58
-#define GL_MAX_SAMPLE_MASK_WORDS_NV       0x8E59
-#endif
-
-#ifndef GL_NV_transform_feedback2
-#define GL_TRANSFORM_FEEDBACK_NV          0x8E22
-#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23
-#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24
-#define GL_TRANSFORM_FEEDBACK_BINDING_NV  0x8E25
-#endif
-
-#ifndef GL_ATI_meminfo
-#define GL_VBO_FREE_MEMORY_ATI            0x87FB
-#define GL_TEXTURE_FREE_MEMORY_ATI        0x87FC
-#define GL_RENDERBUFFER_FREE_MEMORY_ATI   0x87FD
-#endif
-
-#ifndef GL_AMD_performance_monitor
-#define GL_COUNTER_TYPE_AMD               0x8BC0
-#define GL_COUNTER_RANGE_AMD              0x8BC1
-#define GL_UNSIGNED_INT64_AMD             0x8BC2
-#define GL_PERCENTAGE_AMD                 0x8BC3
-#define GL_PERFMON_RESULT_AVAILABLE_AMD   0x8BC4
-#define GL_PERFMON_RESULT_SIZE_AMD        0x8BC5
-#define GL_PERFMON_RESULT_AMD             0x8BC6
-#endif
-
-#ifndef GL_AMD_texture_texture4
-#endif
-
-#ifndef GL_AMD_vertex_shader_tesselator
-#define GL_SAMPLER_BUFFER_AMD             0x9001
-#define GL_INT_SAMPLER_BUFFER_AMD         0x9002
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003
-#define GL_TESSELLATION_MODE_AMD          0x9004
-#define GL_TESSELLATION_FACTOR_AMD        0x9005
-#define GL_DISCRETE_AMD                   0x9006
-#define GL_CONTINUOUS_AMD                 0x9007
-#endif
-
-#ifndef GL_EXT_provoking_vertex
-#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C
-#define GL_FIRST_VERTEX_CONVENTION_EXT    0x8E4D
-#define GL_LAST_VERTEX_CONVENTION_EXT     0x8E4E
-#define GL_PROVOKING_VERTEX_EXT           0x8E4F
-#endif
-
-#ifndef GL_EXT_texture_snorm
-#define GL_ALPHA_SNORM                    0x9010
-#define GL_LUMINANCE_SNORM                0x9011
-#define GL_LUMINANCE_ALPHA_SNORM          0x9012
-#define GL_INTENSITY_SNORM                0x9013
-#define GL_ALPHA8_SNORM                   0x9014
-#define GL_LUMINANCE8_SNORM               0x9015
-#define GL_LUMINANCE8_ALPHA8_SNORM        0x9016
-#define GL_INTENSITY8_SNORM               0x9017
-#define GL_ALPHA16_SNORM                  0x9018
-#define GL_LUMINANCE16_SNORM              0x9019
-#define GL_LUMINANCE16_ALPHA16_SNORM      0x901A
-#define GL_INTENSITY16_SNORM              0x901B
-/* reuse GL_RED_SNORM */
-/* reuse GL_RG_SNORM */
-/* reuse GL_RGB_SNORM */
-/* reuse GL_RGBA_SNORM */
-/* reuse GL_R8_SNORM */
-/* reuse GL_RG8_SNORM */
-/* reuse GL_RGB8_SNORM */
-/* reuse GL_RGBA8_SNORM */
-/* reuse GL_R16_SNORM */
-/* reuse GL_RG16_SNORM */
-/* reuse GL_RGB16_SNORM */
-/* reuse GL_RGBA16_SNORM */
-/* reuse GL_SIGNED_NORMALIZED */
-#endif
-
-#ifndef GL_AMD_draw_buffers_blend
-#endif
-
-#ifndef GL_APPLE_texture_range
-#define GL_TEXTURE_RANGE_LENGTH_APPLE     0x85B7
-#define GL_TEXTURE_RANGE_POINTER_APPLE    0x85B8
-#define GL_TEXTURE_STORAGE_HINT_APPLE     0x85BC
-#define GL_STORAGE_PRIVATE_APPLE          0x85BD
-/* reuse GL_STORAGE_CACHED_APPLE */
-/* reuse GL_STORAGE_SHARED_APPLE */
-#endif
-
-#ifndef GL_APPLE_float_pixels
-#define GL_HALF_APPLE                     0x140B
-#define GL_RGBA_FLOAT32_APPLE             0x8814
-#define GL_RGB_FLOAT32_APPLE              0x8815
-#define GL_ALPHA_FLOAT32_APPLE            0x8816
-#define GL_INTENSITY_FLOAT32_APPLE        0x8817
-#define GL_LUMINANCE_FLOAT32_APPLE        0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE  0x8819
-#define GL_RGBA_FLOAT16_APPLE             0x881A
-#define GL_RGB_FLOAT16_APPLE              0x881B
-#define GL_ALPHA_FLOAT16_APPLE            0x881C
-#define GL_INTENSITY_FLOAT16_APPLE        0x881D
-#define GL_LUMINANCE_FLOAT16_APPLE        0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE  0x881F
-#define GL_COLOR_FLOAT_APPLE              0x8A0F
-#endif
-
-#ifndef GL_APPLE_vertex_program_evaluators
-#define GL_VERTEX_ATTRIB_MAP1_APPLE       0x8A00
-#define GL_VERTEX_ATTRIB_MAP2_APPLE       0x8A01
-#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE  0x8A02
-#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03
-#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04
-#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05
-#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE  0x8A06
-#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07
-#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08
-#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09
-#endif
-
-#ifndef GL_APPLE_aux_depth_stencil
-#define GL_AUX_DEPTH_STENCIL_APPLE        0x8A14
-#endif
-
-#ifndef GL_APPLE_object_purgeable
-#define GL_BUFFER_OBJECT_APPLE            0x85B3
-#define GL_RELEASED_APPLE                 0x8A19
-#define GL_VOLATILE_APPLE                 0x8A1A
-#define GL_RETAINED_APPLE                 0x8A1B
-#define GL_UNDEFINED_APPLE                0x8A1C
-#define GL_PURGEABLE_APPLE                0x8A1D
-#endif
-
-#ifndef GL_APPLE_row_bytes
-#define GL_PACK_ROW_BYTES_APPLE           0x8A15
-#define GL_UNPACK_ROW_BYTES_APPLE         0x8A16
-#endif
-
-#ifndef GL_APPLE_rgb_422
-#define GL_RGB_422_APPLE                  0x8A1F
-/* reuse GL_UNSIGNED_SHORT_8_8_APPLE */
-/* reuse GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-#endif
-
-#ifndef GL_NV_video_capture
-#define GL_VIDEO_BUFFER_NV                0x9020
-#define GL_VIDEO_BUFFER_BINDING_NV        0x9021
-#define GL_FIELD_UPPER_NV                 0x9022
-#define GL_FIELD_LOWER_NV                 0x9023
-#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV   0x9024
-#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025
-#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026
-#define GL_LAST_VIDEO_CAPTURE_STATUS_NV   0x9027
-#define GL_VIDEO_BUFFER_PITCH_NV          0x9028
-#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029
-#define GL_VIDEO_COLOR_CONVERSION_MAX_NV  0x902A
-#define GL_VIDEO_COLOR_CONVERSION_MIN_NV  0x902B
-#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C
-#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D
-#define GL_PARTIAL_SUCCESS_NV             0x902E
-#define GL_SUCCESS_NV                     0x902F
-#define GL_FAILURE_NV                     0x9030
-#define GL_YCBYCR8_422_NV                 0x9031
-#define GL_YCBAYCR8A_4224_NV              0x9032
-#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV  0x9033
-#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034
-#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV  0x9035
-#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036
-#define GL_Z4Y12Z4CB12Z4CR12_444_NV       0x9037
-#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV   0x9038
-#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV  0x9039
-#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A
-#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B
-#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C
-#endif
-
-#ifndef GL_NV_copy_image
-#endif
-
-#ifndef GL_EXT_separate_shader_objects
-#define GL_ACTIVE_PROGRAM_EXT             0x8B8D
-#endif
-
-#ifndef GL_NV_parameter_buffer_object2
-#endif
-
-#ifndef GL_NV_shader_buffer_load
-#define GL_BUFFER_GPU_ADDRESS_NV          0x8F1D
-#define GL_GPU_ADDRESS_NV                 0x8F34
-#define GL_MAX_SHADER_BUFFER_ADDRESS_NV   0x8F35
-#endif
-
-#ifndef GL_NV_vertex_buffer_unified_memory
-#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E
-#define GL_ELEMENT_ARRAY_UNIFIED_NV       0x8F1F
-#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20
-#define GL_VERTEX_ARRAY_ADDRESS_NV        0x8F21
-#define GL_NORMAL_ARRAY_ADDRESS_NV        0x8F22
-#define GL_COLOR_ARRAY_ADDRESS_NV         0x8F23
-#define GL_INDEX_ARRAY_ADDRESS_NV         0x8F24
-#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25
-#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV     0x8F26
-#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
-#define GL_FOG_COORD_ARRAY_ADDRESS_NV     0x8F28
-#define GL_ELEMENT_ARRAY_ADDRESS_NV       0x8F29
-#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV  0x8F2A
-#define GL_VERTEX_ARRAY_LENGTH_NV         0x8F2B
-#define GL_NORMAL_ARRAY_LENGTH_NV         0x8F2C
-#define GL_COLOR_ARRAY_LENGTH_NV          0x8F2D
-#define GL_INDEX_ARRAY_LENGTH_NV          0x8F2E
-#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV  0x8F2F
-#define GL_EDGE_FLAG_ARRAY_LENGTH_NV      0x8F30
-#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31
-#define GL_FOG_COORD_ARRAY_LENGTH_NV      0x8F32
-#define GL_ELEMENT_ARRAY_LENGTH_NV        0x8F33
-#endif
-
-#ifndef GL_NV_texture_barrier
-#endif
-
-#ifndef GL_AMD_shader_stencil_export
-#endif
-
-#ifndef GL_AMD_seamless_cubemap_per_texture
-/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS_ARB */
-#endif
-
-
-/*************************************************************/
-
-#include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;
-#endif
-
-#ifndef GL_VERSION_1_5
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#ifndef GL_ARB_shader_objects
-/* GL types for program/shader text and shader object handles */
-typedef char GLcharARB;
-typedef unsigned int GLhandleARB;
-#endif
-
-/* GL type for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
-#ifndef GL_NV_half_float
-typedef unsigned short GLhalfNV;
-#endif
-
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glxext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GL_EXT_timer_query extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__) || defined(__digital__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__) || defined(_LP64)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS ) || defined(__sgi)
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-/* Fallback if nothing above works */
-#include <inttypes.h>
-#endif
-#endif
-
-#ifndef GL_EXT_timer_query
-typedef int64_t GLint64EXT;
-typedef uint64_t GLuint64EXT;
-#endif
-
-#ifndef ARB_sync
-typedef int64_t GLint64;
-typedef uint64_t GLuint64;
-typedef struct __GLsync *GLsync;
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-GLAPI void APIENTRY glBlendEquation (GLenum mode);
-GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_2_DEPRECATED
-#define GL_VERSION_1_2_DEPRECATED 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-GLAPI void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glGetColorTable (GLenum target, GLenum format, GLenum type, GLvoid *table);
-GLAPI void APIENTRY glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-GLAPI void APIENTRY glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-GLAPI void APIENTRY glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-GLAPI void APIENTRY glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params);
-GLAPI void APIENTRY glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glConvolutionParameteri (GLenum target, GLenum pname, GLint params);
-GLAPI void APIENTRY glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, GLvoid *image);
-GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetSeparableFilter (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-GLAPI void APIENTRY glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-GLAPI void APIENTRY glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-GLAPI void APIENTRY glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-GLAPI void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean sink);
-GLAPI void APIENTRY glResetHistogram (GLenum target);
-GLAPI void APIENTRY glResetMinmax (GLenum target);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum texture);
-GLAPI void APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, GLvoid *img);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_VERSION_1_3_DEPRECATED
-#define GL_VERSION_1_3_DEPRECATED 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClientActiveTexture (GLenum texture);
-GLAPI void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s);
-GLAPI void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord1f (GLenum target, GLfloat s);
-GLAPI void APIENTRY glMultiTexCoord1fv (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord1i (GLenum target, GLint s);
-GLAPI void APIENTRY glMultiTexCoord1iv (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord1s (GLenum target, GLshort s);
-GLAPI void APIENTRY glMultiTexCoord1sv (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t);
-GLAPI void APIENTRY glMultiTexCoord2dv (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t);
-GLAPI void APIENTRY glMultiTexCoord2fv (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord2i (GLenum target, GLint s, GLint t);
-GLAPI void APIENTRY glMultiTexCoord2iv (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord2s (GLenum target, GLshort s, GLshort t);
-GLAPI void APIENTRY glMultiTexCoord2sv (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-GLAPI void APIENTRY glMultiTexCoord3dv (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-GLAPI void APIENTRY glMultiTexCoord3fv (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r);
-GLAPI void APIENTRY glMultiTexCoord3iv (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r);
-GLAPI void APIENTRY glMultiTexCoord3sv (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-GLAPI void APIENTRY glMultiTexCoord4dv (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-GLAPI void APIENTRY glMultiTexCoord4fv (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q);
-GLAPI void APIENTRY glMultiTexCoord4iv (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-GLAPI void APIENTRY glMultiTexCoord4sv (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *m);
-GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *m);
-GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *m);
-GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param);
-GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_VERSION_1_4_DEPRECATED
-#define GL_VERSION_1_4_DEPRECATED 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordf (GLfloat coord);
-GLAPI void APIENTRY glFogCoordfv (const GLfloat *coord);
-GLAPI void APIENTRY glFogCoordd (GLdouble coord);
-GLAPI void APIENTRY glFogCoorddv (const GLdouble *coord);
-GLAPI void APIENTRY glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue);
-GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *v);
-GLAPI void APIENTRY glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue);
-GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *v);
-GLAPI void APIENTRY glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue);
-GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *v);
-GLAPI void APIENTRY glSecondaryColor3i (GLint red, GLint green, GLint blue);
-GLAPI void APIENTRY glSecondaryColor3iv (const GLint *v);
-GLAPI void APIENTRY glSecondaryColor3s (GLshort red, GLshort green, GLshort blue);
-GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *v);
-GLAPI void APIENTRY glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue);
-GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *v);
-GLAPI void APIENTRY glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue);
-GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *v);
-GLAPI void APIENTRY glSecondaryColor3us (GLushort red, GLushort green, GLushort blue);
-GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *v);
-GLAPI void APIENTRY glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glWindowPos2d (GLdouble x, GLdouble y);
-GLAPI void APIENTRY glWindowPos2dv (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos2f (GLfloat x, GLfloat y);
-GLAPI void APIENTRY glWindowPos2fv (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos2i (GLint x, GLint y);
-GLAPI void APIENTRY glWindowPos2iv (const GLint *v);
-GLAPI void APIENTRY glWindowPos2s (GLshort x, GLshort y);
-GLAPI void APIENTRY glWindowPos2sv (const GLshort *v);
-GLAPI void APIENTRY glWindowPos3d (GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glWindowPos3dv (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos3f (GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glWindowPos3fv (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glWindowPos3iv (const GLint *v);
-GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glWindowPos3sv (const GLshort *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids);
-GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint id);
-GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id);
-GLAPI void APIENTRY glEndQuery (GLenum target);
-GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
-GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer);
-GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum target, GLenum access);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, GLvoid* *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
-GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
-GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader);
-GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
-GLAPI void APIENTRY glCompileShader (GLuint shader);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum type);
-GLAPI void APIENTRY glDeleteProgram (GLuint program);
-GLAPI void APIENTRY glDeleteShader (GLuint shader);
-GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params);
-GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid* *pointer);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint program);
-GLAPI GLboolean APIENTRY glIsShader (GLuint shader);
-GLAPI void APIENTRY glLinkProgram (GLuint program);
-GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-GLAPI void APIENTRY glUseProgram (GLuint program);
-GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0);
-GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
-GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-GLAPI void APIENTRY glUniform1i (GLint location, GLint v0);
-GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1);
-GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2);
-GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glValidateProgram (GLuint program);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_VERSION_2_1 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-#endif
-
-#ifndef GL_VERSION_3_0
-#define GL_VERSION_3_0 1
-/* OpenGL 3.0 also reuses entry points from these extensions: */
-/* ARB_framebuffer_object */
-/* ARB_map_buffer_range */
-/* ARB_vertex_array_object */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data);
-GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data);
-GLAPI void APIENTRY glEnablei (GLenum target, GLuint index);
-GLAPI void APIENTRY glDisablei (GLenum target, GLuint index);
-GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index);
-GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode);
-GLAPI void APIENTRY glEndTransformFeedback (void);
-GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
-GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp);
-GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode);
-GLAPI void APIENTRY glEndConditionalRender (void);
-GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x);
-GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y);
-GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x);
-GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y);
-GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z);
-GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params);
-GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name);
-GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0);
-GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1);
-GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2);
-GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params);
-GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value);
-GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value);
-GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value);
-GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-GLAPI const GLubyte * APIENTRY glGetStringi (GLenum name, GLuint index);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
-typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
-typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
-#endif
-
-#ifndef GL_VERSION_3_1
-#define GL_VERSION_3_1 1
-/* OpenGL 3.1 also reuses entry points from these extensions: */
-/* ARB_copy_buffer */
-/* ARB_uniform_buffer_object */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer);
-GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
-#endif
-
-#ifndef GL_VERSION_3_2
-#define GL_VERSION_3_2 1
-/* OpenGL 3.2 also reuses entry points from these extensions: */
-/* ARB_draw_elements_base_vertex */
-/* ARB_provoking_vertex */
-/* ARB_sync */
-/* ARB_texture_multisample */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data);
-GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params);
-GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value);
-GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-#endif
-
-#ifndef GL_VERSION_3_3
-#define GL_VERSION_3_3 1
-/* OpenGL 3.3 also reuses entry points from these extensions: */
-/* ARB_blend_func_extended */
-/* ARB_sampler_objects */
-/* ARB_explicit_attrib_location, but it has none */
-/* ARB_occlusion_query2 (no entry points) */
-/* ARB_shader_bit_encoding (no entry points) */
-/* ARB_texture_rgb10_a2ui (no entry points) */
-/* ARB_texture_swizzle (no entry points) */
-/* ARB_timer_query */
-/* ARB_vertex_type_2_10_10_10_rev */
-#endif
-
-#ifndef GL_VERSION_4_0
-#define GL_VERSION_4_0 1
-/* OpenGL 4.0 also reuses entry points from these extensions: */
-/* ARB_gpu_shader5 (no entry points) */
-/* ARB_gpu_shader_fp64 */
-/* ARB_shader_subroutine */
-/* ARB_tessellation_shader */
-/* ARB_texture_buffer_object_rgb32 (no entry points) */
-/* ARB_transform_feedback2 */
-/* ARB_transform_feedback3 */
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTextureARB (GLenum texture);
-GLAPI void APIENTRY glClientActiveTextureARB (GLenum texture);
-GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum target, GLdouble s);
-GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum target, GLfloat s);
-GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum target, GLint s);
-GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum target, GLshort s);
-GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum target, GLdouble s, GLdouble t);
-GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum target, GLfloat s, GLfloat t);
-GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum target, GLint s, GLint t);
-GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum target, GLshort s, GLshort t);
-GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum target, GLint s, GLint t, GLint r);
-GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum target, GLshort s, GLshort t, GLshort r);
-GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum target, GLint s, GLint t, GLint r, GLint q);
-GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum target, const GLshort *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *m);
-GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *m);
-GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *m);
-GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *m);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleCoverageARB (GLclampf value, GLboolean invert);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#define GL_ARB_texture_env_add 1
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_ARB_texture_cube_map 1
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_ARB_texture_compression 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, GLvoid *img);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_ARB_texture_border_clamp 1
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_ARB_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfARB (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_ARB_vertex_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWeightbvARB (GLint size, const GLbyte *weights);
-GLAPI void APIENTRY glWeightsvARB (GLint size, const GLshort *weights);
-GLAPI void APIENTRY glWeightivARB (GLint size, const GLint *weights);
-GLAPI void APIENTRY glWeightfvARB (GLint size, const GLfloat *weights);
-GLAPI void APIENTRY glWeightdvARB (GLint size, const GLdouble *weights);
-GLAPI void APIENTRY glWeightubvARB (GLint size, const GLubyte *weights);
-GLAPI void APIENTRY glWeightusvARB (GLint size, const GLushort *weights);
-GLAPI void APIENTRY glWeightuivARB (GLint size, const GLuint *weights);
-GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glVertexBlendARB (GLint count);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_ARB_matrix_palette 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint index);
-GLAPI void APIENTRY glMatrixIndexubvARB (GLint size, const GLubyte *indices);
-GLAPI void APIENTRY glMatrixIndexusvARB (GLint size, const GLushort *indices);
-GLAPI void APIENTRY glMatrixIndexuivARB (GLint size, const GLuint *indices);
-GLAPI void APIENTRY glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#define GL_ARB_texture_env_crossbar 1
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_ARB_texture_env_dot3 1
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_ARB_texture_mirrored_repeat 1
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-#endif
-
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dARB (GLdouble x, GLdouble y);
-GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos2fARB (GLfloat x, GLfloat y);
-GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos2iARB (GLint x, GLint y);
-GLAPI void APIENTRY glWindowPos2ivARB (const GLint *v);
-GLAPI void APIENTRY glWindowPos2sARB (GLshort x, GLshort y);
-GLAPI void APIENTRY glWindowPos2svARB (const GLshort *v);
-GLAPI void APIENTRY glWindowPos3dARB (GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos3fARB (GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos3iARB (GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glWindowPos3ivARB (const GLint *v);
-GLAPI void APIENTRY glWindowPos3sARB (GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glWindowPos3svARB (const GLshort *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_ARB_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttrib1dARB (GLuint index, GLdouble x);
-GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib1fARB (GLuint index, GLfloat x);
-GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib1sARB (GLuint index, GLshort x);
-GLAPI void APIENTRY glVertexAttrib1svARB (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib2dARB (GLuint index, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib2fARB (GLuint index, GLfloat x, GLfloat y);
-GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib2sARB (GLuint index, GLshort x, GLshort y);
-GLAPI void APIENTRY glVertexAttrib2svARB (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib3dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib3fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib3sARB (GLuint index, GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glVertexAttrib3svARB (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttrib4dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib4fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttrib4sARB (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void APIENTRY glVertexAttrib4svARB (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttribPointerARB (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint index);
-GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint index);
-GLAPI void APIENTRY glProgramStringARB (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-GLAPI void APIENTRY glBindProgramARB (GLenum target, GLuint program);
-GLAPI void APIENTRY glDeleteProgramsARB (GLsizei n, const GLuint *programs);
-GLAPI void APIENTRY glGenProgramsARB (GLsizei n, GLuint *programs);
-GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
-GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
-GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
-GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
-GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum target, GLuint index, GLdouble *params);
-GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum target, GLuint index, GLfloat *params);
-GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum target, GLuint index, GLdouble *params);
-GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum target, GLuint index, GLfloat *params);
-GLAPI void APIENTRY glGetProgramivARB (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetProgramStringARB (GLenum target, GLenum pname, GLvoid *string);
-GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint index, GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVertexAttribivARB (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint index, GLenum pname, GLvoid* *pointer);
-GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_ARB_fragment_program 1
-/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_ARB_vertex_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindBufferARB (GLenum target, GLuint buffer);
-GLAPI void APIENTRY glDeleteBuffersARB (GLsizei n, const GLuint *buffers);
-GLAPI void APIENTRY glGenBuffersARB (GLsizei n, GLuint *buffers);
-GLAPI GLboolean APIENTRY glIsBufferARB (GLuint buffer);
-GLAPI void APIENTRY glBufferDataARB (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-GLAPI void APIENTRY glBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-GLAPI void APIENTRY glGetBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum target, GLenum access);
-GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum target);
-GLAPI void APIENTRY glGetBufferParameterivARB (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetBufferPointervARB (GLenum target, GLenum pname, GLvoid* *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_ARB_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueriesARB (GLsizei n, GLuint *ids);
-GLAPI void APIENTRY glDeleteQueriesARB (GLsizei n, const GLuint *ids);
-GLAPI GLboolean APIENTRY glIsQueryARB (GLuint id);
-GLAPI void APIENTRY glBeginQueryARB (GLenum target, GLuint id);
-GLAPI void APIENTRY glEndQueryARB (GLenum target);
-GLAPI void APIENTRY glGetQueryivARB (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetQueryObjectivARB (GLuint id, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_ARB_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB obj);
-GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum pname);
-GLAPI void APIENTRY glDetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj);
-GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum shaderType);
-GLAPI void APIENTRY glShaderSourceARB (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-GLAPI void APIENTRY glCompileShaderARB (GLhandleARB shaderObj);
-GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
-GLAPI void APIENTRY glAttachObjectARB (GLhandleARB containerObj, GLhandleARB obj);
-GLAPI void APIENTRY glLinkProgramARB (GLhandleARB programObj);
-GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB programObj);
-GLAPI void APIENTRY glValidateProgramARB (GLhandleARB programObj);
-GLAPI void APIENTRY glUniform1fARB (GLint location, GLfloat v0);
-GLAPI void APIENTRY glUniform2fARB (GLint location, GLfloat v0, GLfloat v1);
-GLAPI void APIENTRY glUniform3fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-GLAPI void APIENTRY glUniform4fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-GLAPI void APIENTRY glUniform1iARB (GLint location, GLint v0);
-GLAPI void APIENTRY glUniform2iARB (GLint location, GLint v0, GLint v1);
-GLAPI void APIENTRY glUniform3iARB (GLint location, GLint v0, GLint v1, GLint v2);
-GLAPI void APIENTRY glUniform4iARB (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-GLAPI void APIENTRY glUniform1fvARB (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform2fvARB (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform3fvARB (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform4fvARB (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform1ivARB (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform2ivARB (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform3ivARB (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform4ivARB (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniformMatrix2fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix3fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix4fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB obj, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB obj, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB programObj, const GLcharARB *name);
-GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB programObj, GLint location, GLfloat *params);
-GLAPI void APIENTRY glGetUniformivARB (GLhandleARB programObj, GLint location, GLint *params);
-GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_ARB_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB programObj, const GLcharARB *name);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_ARB_fragment_shader 1
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_ARB_shading_language_100 1
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#define GL_ARB_texture_non_power_of_two 1
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_ARB_point_sprite 1
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#define GL_ARB_fragment_program_shadow 1
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_ARB_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersARB (GLsizei n, const GLenum *bufs);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_ARB_texture_rectangle 1
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_ARB_color_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClampColorARB (GLenum target, GLenum clamp);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_ARB_pixel_buffer_object 1
-#endif
-
-#ifndef GL_ARB_depth_buffer_float
-#define GL_ARB_depth_buffer_float 1
-#endif
-
-#ifndef GL_ARB_draw_instanced
-#define GL_ARB_draw_instanced 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_ARB_framebuffer_object
-#define GL_ARB_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer);
-GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
-GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers);
-GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers);
-GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer);
-GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
-GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers);
-GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers);
-GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target);
-GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGenerateMipmap (GLenum target);
-GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-#endif
-
-#ifndef GL_ARB_framebuffer_sRGB
-#define GL_ARB_framebuffer_sRGB 1
-#endif
-
-#ifndef GL_ARB_geometry_shader4
-#define GL_ARB_geometry_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value);
-GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif
-
-#ifndef GL_ARB_half_float_vertex
-#define GL_ARB_half_float_vertex 1
-#endif
-
-#ifndef GL_ARB_instanced_arrays
-#define GL_ARB_instanced_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor);
-#endif
-
-#ifndef GL_ARB_map_buffer_range
-#define GL_ARB_map_buffer_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
-#endif
-
-#ifndef GL_ARB_texture_buffer_object
-#define GL_ARB_texture_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-#endif
-
-#ifndef GL_ARB_texture_compression_rgtc
-#define GL_ARB_texture_compression_rgtc 1
-#endif
-
-#ifndef GL_ARB_texture_rg
-#define GL_ARB_texture_rg 1
-#endif
-
-#ifndef GL_ARB_vertex_array_object
-#define GL_ARB_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArray (GLuint array);
-GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays);
-GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays);
-GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
-#endif
-
-#ifndef GL_ARB_uniform_buffer_object
-#define GL_ARB_uniform_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
-GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
-GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName);
-GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
-GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
-typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
-typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-#endif
-
-#ifndef GL_ARB_compatibility
-#define GL_ARB_compatibility 1
-#endif
-
-#ifndef GL_ARB_copy_buffer
-#define GL_ARB_copy_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-#endif
-
-#ifndef GL_ARB_shader_texture_lod
-#define GL_ARB_shader_texture_lod 1
-#endif
-
-#ifndef GL_ARB_depth_clamp
-#define GL_ARB_depth_clamp 1
-#endif
-
-#ifndef GL_ARB_draw_elements_base_vertex
-#define GL_ARB_draw_elements_base_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
-GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
-#endif
-
-#ifndef GL_ARB_fragment_coord_conventions
-#define GL_ARB_fragment_coord_conventions 1
-#endif
-
-#ifndef GL_ARB_provoking_vertex
-#define GL_ARB_provoking_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProvokingVertex (GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_ARB_seamless_cube_map
-#define GL_ARB_seamless_cube_map 1
-#endif
-
-#ifndef GL_ARB_sync
-#define GL_ARB_sync 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags);
-GLAPI GLboolean APIENTRY glIsSync (GLsync sync);
-GLAPI void APIENTRY glDeleteSync (GLsync sync);
-GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
-GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
-GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *params);
-GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
-typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync);
-typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync);
-typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
-typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
-typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params);
-typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-#endif
-
-#ifndef GL_ARB_texture_multisample
-#define GL_ARB_texture_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val);
-GLAPI void APIENTRY glSampleMaski (GLuint index, GLbitfield mask);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val);
-typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask);
-#endif
-
-#ifndef GL_ARB_vertex_array_bgra
-#define GL_ARB_vertex_array_bgra 1
-#endif
-
-#ifndef GL_ARB_draw_buffers_blend
-#define GL_ARB_draw_buffers_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode);
-GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst);
-GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-#endif
-
-#ifndef GL_ARB_sample_shading
-#define GL_ARB_sample_shading 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMinSampleShading (GLclampf value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLclampf value);
-#endif
-
-#ifndef GL_ARB_texture_cube_map_array
-#define GL_ARB_texture_cube_map_array 1
-#endif
-
-#ifndef GL_ARB_texture_gather
-#define GL_ARB_texture_gather 1
-#endif
-
-#ifndef GL_ARB_texture_query_lod
-#define GL_ARB_texture_query_lod 1
-#endif
-
-#ifndef GL_ARB_shading_language_include
-#define GL_ARB_shading_language_include 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glNamedStringARB (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
-GLAPI void APIENTRY glDeleteNamedStringARB (GLint namelen, const GLchar *name);
-GLAPI void APIENTRY glCompileShaderIncludeARB (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length);
-GLAPI GLboolean APIENTRY glIsNamedStringARB (GLint namelen, const GLchar *name);
-GLAPI void APIENTRY glGetNamedStringARB (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
-GLAPI void APIENTRY glGetNamedStringivARB (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
-typedef void (APIENTRYP PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length);
-typedef GLboolean (APIENTRYP PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
-typedef void (APIENTRYP PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_ARB_blend_func_extended
-#define GL_ARB_blend_func_extended 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
-GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name);
-#endif
-
-#ifndef GL_ARB_sampler_objects
-#define GL_ARB_sampler_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers);
-GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers);
-GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler);
-GLAPI void APIENTRY glBindSampler (GLenum unit, GLuint sampler);
-GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param);
-GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param);
-GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param);
-GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param);
-GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param);
-GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetSamplerParameterIfv (GLuint sampler, GLenum pname, GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
-typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers);
-typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler);
-typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLenum unit, GLuint sampler);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param);
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_ARB_timer_query
-#define GL_ARB_timer_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target);
-GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params);
-GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params);
-#endif
-
-#ifndef GL_ARB_vertex_type_2_10_10_10_rev
-#define GL_ARB_vertex_type_2_10_10_10_rev 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value);
-GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value);
-GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value);
-GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value);
-GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value);
-GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value);
-GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords);
-GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords);
-GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords);
-GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords);
-GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color);
-GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color);
-GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color);
-GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color);
-GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color);
-GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color);
-GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value);
-typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color);
-typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color);
-typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color);
-typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-#endif
-
-#ifndef GL_ARB_draw_indirect
-#define GL_ARB_draw_indirect 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const GLvoid *indirect);
-GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const GLvoid *indirect);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const GLvoid *indirect);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const GLvoid *indirect);
-#endif
-
-#ifndef GL_ARB_gpu_shader_fp64
-#define GL_ARB_gpu_shader_fp64 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x);
-GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params);
-GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x);
-GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x);
-typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-#endif
-
-#ifndef GL_ARB_shader_subroutine
-#define GL_ARB_shader_subroutine 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name);
-GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name);
-GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
-GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices);
-GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params);
-GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name);
-typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
-typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices);
-typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
-#endif
-
-#ifndef GL_ARB_tessellation_shader
-#define GL_ARB_tessellation_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value);
-GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
-typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values);
-#endif
-
-#ifndef GL_ARB_transform_feedback2
-#define GL_ARB_transform_feedback2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id);
-GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids);
-GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids);
-GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id);
-GLAPI void APIENTRY glPauseTransformFeedback (void);
-GLAPI void APIENTRY glResumeTransformFeedback (void);
-GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids);
-typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
-#endif
-
-#ifndef GL_ARB_transform_feedback3
-#define GL_ARB_transform_feedback3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream);
-GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id);
-GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index);
-GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
-typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColorEXT (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat factor, GLfloat bias);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_EXT_texture 1
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage3DEXT (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_SGIS_texture_filter4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum target, GLenum filter, GLfloat *weights);
-GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
-typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif
-
-#ifndef GL_EXT_subtexture
-#define GL_EXT_subtexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_EXT_copy_texture
-#define GL_EXT_copy_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_EXT_histogram 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetHistogramEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMinmaxEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glHistogramEXT (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-GLAPI void APIENTRY glMinmaxEXT (GLenum target, GLenum internalformat, GLboolean sink);
-GLAPI void APIENTRY glResetHistogramEXT (GLenum target);
-GLAPI void APIENTRY glResetMinmaxEXT (GLenum target);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_EXT_convolution 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum target, GLenum pname, GLfloat params);
-GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum target, GLenum pname, GLint params);
-GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *image);
-GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_SGI_color_matrix 1
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_SGI_color_table 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableSGI (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glColorTableParameterivSGI (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glCopyColorTableSGI (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glGetColorTableSGI (GLenum target, GLenum format, GLenum type, GLvoid *table);
-GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum target, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_SGIX_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenSGIX (GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_SGIS_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum pname, GLint param);
-GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum pname, const GLint *params);
-GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum pname, GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_SGIS_texture4D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage4DSGIS (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_SGI_texture_color_table 1
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_EXT_cmyka 1
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_EXT_texture_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei n, const GLuint *textures, GLboolean *residences);
-GLAPI void APIENTRY glBindTextureEXT (GLenum target, GLuint texture);
-GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei n, const GLuint *textures);
-GLAPI void APIENTRY glGenTexturesEXT (GLsizei n, GLuint *textures);
-GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint texture);
-GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
-typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
-GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum target, GLfloat *points);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_SGIS_sharpen_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
-GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum target, GLfloat *points);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_EXT_packed_pixels 1
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_SGIS_texture_lod 1
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_SGIS_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskSGIS (GLclampf value, GLboolean invert);
-GLAPI void APIENTRY glSamplePatternSGIS (GLenum pattern);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_EXT_rescale_normal 1
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glArrayElementEXT (GLint i);
-GLAPI void APIENTRY glColorPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-GLAPI void APIENTRY glDrawArraysEXT (GLenum mode, GLint first, GLsizei count);
-GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei stride, GLsizei count, const GLboolean *pointer);
-GLAPI void APIENTRY glGetPointervEXT (GLenum pname, GLvoid* *params);
-GLAPI void APIENTRY glIndexPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-GLAPI void APIENTRY glNormalPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-GLAPI void APIENTRY glTexCoordPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-GLAPI void APIENTRY glVertexPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
-typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#define GL_EXT_misc_attribute 1
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_SGIS_generate_mipmap 1
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_SGIX_clipmap 1
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_SGIX_shadow 1
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_SGIS_texture_edge_clamp 1
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_SGIS_texture_border_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationEXT (GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_EXT_blend_subtract 1
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#define GL_EXT_blend_logic_op 1
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_SGIX_interlace 1
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_SGIX_pixel_tiles 1
-#endif
-
-#ifndef GL_SGIX_texture_select
-#define GL_SGIX_texture_select 1
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SGIX_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum pname, GLint param);
-GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum pname, const GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_SGIX_texture_multi_buffer 1
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfEXT (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPointParameterfvEXT (GLenum pname, const GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_SGIS_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfSGIS (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPointParameterfvSGIS (GLenum pname, const GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_SGIX_instruments 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
-GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei size, GLint *buffer);
-GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *marker_p);
-GLAPI void APIENTRY glReadInstrumentsSGIX (GLint marker);
-GLAPI void APIENTRY glStartInstrumentsSGIX (void);
-GLAPI void APIENTRY glStopInstrumentsSGIX (GLint marker);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
-typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
-typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
-typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_SGIX_texture_scale_bias 1
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_SGIX_framezoom 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameZoomSGIX (GLint factor);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#define GL_SGIX_tag_sample_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTagSampleBufferSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_SGIX_polynomial_ffd 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-GLAPI void APIENTRY glDeformSGIX (GLbitfield mask);
-GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield mask);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_SGIX_reference_plane 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#define GL_SGIX_flush_raster 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushRasterSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_SGIX_depth_texture 1
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_SGIS_fog_function 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogFuncSGIS (GLsizei n, const GLfloat *points);
-GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *points);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_SGIX_fog_offset 1
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_HP_image_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glImageTransformParameteriHP (GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glImageTransformParameterfHP (GLenum target, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glImageTransformParameterivHP (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum target, GLenum pname, GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_HP_convolution_border_modes 1
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_SGIX_texture_add_env 1
-#endif
-
-#ifndef GL_EXT_color_subtable
-#define GL_EXT_color_subtable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorSubTableEXT (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_PGI_vertex_hints 1
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glHintPGI (GLenum target, GLint mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_EXT_paletted_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableEXT (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-GLAPI void APIENTRY glGetColorTableEXT (GLenum target, GLenum format, GLenum type, GLvoid *data);
-GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_EXT_clip_volume_hint 1
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_SGIX_list_priority 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint list, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetListParameterivSGIX (GLuint list, GLenum pname, GLint *params);
-GLAPI void APIENTRY glListParameterfSGIX (GLuint list, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glListParameterfvSGIX (GLuint list, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glListParameteriSGIX (GLuint list, GLenum pname, GLint param);
-GLAPI void APIENTRY glListParameterivSGIX (GLuint list, GLenum pname, const GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_SGIX_ir_instrument1 1
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_SGIX_calligraphic_fragment 1
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_SGIX_texture_lod_bias 1
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SGIX_shadow_ambient 1
-#endif
-
-#ifndef GL_EXT_index_texture
-#define GL_EXT_index_texture 1
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_EXT_index_material 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexMaterialEXT (GLenum face, GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_EXT_index_func 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexFuncEXT (GLenum func, GLclampf ref);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_EXT_index_array_formats 1
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLockArraysEXT (GLint first, GLsizei count);
-GLAPI void APIENTRY glUnlockArraysEXT (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCullParameterdvEXT (GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_SGIX_ycrcb 1
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_SGIX_fragment_lighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum face, GLenum mode);
-GLAPI void APIENTRY glFragmentLightfSGIX (GLenum light, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum light, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glFragmentLightiSGIX (GLenum light, GLenum pname, GLint param);
-GLAPI void APIENTRY glFragmentLightivSGIX (GLenum light, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum pname, GLint param);
-GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum pname, const GLint *params);
-GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum face, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum face, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum face, GLenum pname, GLint param);
-GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum face, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum light, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum light, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum face, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum face, GLenum pname, GLint *params);
-GLAPI void APIENTRY glLightEnviSGIX (GLenum pname, GLint param);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_IBM_rasterpos_clip 1
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_HP_texture_lighting 1
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_EXT_draw_range_elements 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_WIN_phong_shading 1
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_WIN_specular_fog 1
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_EXT_light_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glApplyTextureEXT (GLenum mode);
-GLAPI void APIENTRY glTextureLightEXT (GLenum pname);
-GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_SGIX_blend_alpha_minmax 1
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_EXT_bgra 1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_SGIX_async 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint marker);
-GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *markerp);
-GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *markerp);
-GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei range);
-GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint marker, GLsizei range);
-GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint marker);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
-typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
-typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
-typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
-typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
-typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_SGIX_async_pixel 1
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_SGIX_async_histogram 1
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_INTEL_parallel_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer);
-GLAPI void APIENTRY glNormalPointervINTEL (GLenum type, const GLvoid* *pointer);
-GLAPI void APIENTRY glColorPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer);
-GLAPI void APIENTRY glTexCoordPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_EXT_pixel_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#define GL_EXT_pixel_transform_color_table 1
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_EXT_shared_texture_palette 1
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte red, GLbyte green, GLbyte blue);
-GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *v);
-GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble red, GLdouble green, GLdouble blue);
-GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *v);
-GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat red, GLfloat green, GLfloat blue);
-GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *v);
-GLAPI void APIENTRY glSecondaryColor3iEXT (GLint red, GLint green, GLint blue);
-GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *v);
-GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort red, GLshort green, GLshort blue);
-GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *v);
-GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte red, GLubyte green, GLubyte blue);
-GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *v);
-GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint red, GLuint green, GLuint blue);
-GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *v);
-GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue);
-GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *v);
-GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_EXT_texture_perturb_normal 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureNormalEXT (GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordfEXT (GLfloat coord);
-GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *coord);
-GLAPI void APIENTRY glFogCoorddEXT (GLdouble coord);
-GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *coord);
-GLAPI void APIENTRY glFogCoordPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_REND_screen_coordinates 1
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_EXT_coordinate_frame 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTangent3bEXT (GLbyte tx, GLbyte ty, GLbyte tz);
-GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *v);
-GLAPI void APIENTRY glTangent3dEXT (GLdouble tx, GLdouble ty, GLdouble tz);
-GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *v);
-GLAPI void APIENTRY glTangent3fEXT (GLfloat tx, GLfloat ty, GLfloat tz);
-GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *v);
-GLAPI void APIENTRY glTangent3iEXT (GLint tx, GLint ty, GLint tz);
-GLAPI void APIENTRY glTangent3ivEXT (const GLint *v);
-GLAPI void APIENTRY glTangent3sEXT (GLshort tx, GLshort ty, GLshort tz);
-GLAPI void APIENTRY glTangent3svEXT (const GLshort *v);
-GLAPI void APIENTRY glBinormal3bEXT (GLbyte bx, GLbyte by, GLbyte bz);
-GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *v);
-GLAPI void APIENTRY glBinormal3dEXT (GLdouble bx, GLdouble by, GLdouble bz);
-GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *v);
-GLAPI void APIENTRY glBinormal3fEXT (GLfloat bx, GLfloat by, GLfloat bz);
-GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *v);
-GLAPI void APIENTRY glBinormal3iEXT (GLint bx, GLint by, GLint bz);
-GLAPI void APIENTRY glBinormal3ivEXT (const GLint *v);
-GLAPI void APIENTRY glBinormal3sEXT (GLshort bx, GLshort by, GLshort bz);
-GLAPI void APIENTRY glBinormal3svEXT (const GLshort *v);
-GLAPI void APIENTRY glTangentPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glBinormalPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
-typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
-typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
-typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
-typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
-typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
-typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
-typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
-typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
-typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
-typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_EXT_texture_env_combine 1
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_APPLE_specular_vector 1
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_APPLE_transform_hint 1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_SGIX_fog_scale 1
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_SUNX_constant_data 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFinishTextureSUNX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_SUN_global_alpha 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte factor);
-GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort factor);
-GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint factor);
-GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat factor);
-GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble factor);
-GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte factor);
-GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort factor);
-GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint factor);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_SUN_triangle_list 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint code);
-GLAPI void APIENTRY glReplacementCodeusSUN (GLushort code);
-GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte code);
-GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *code);
-GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *code);
-GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *code);
-GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_SUN_vertex
-#define GL_SUN_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *c, const GLfloat *v);
-GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *c, const GLfloat *v);
-GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *c, const GLfloat *v);
-GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *tc, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *tc, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *rc, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *rc, const GLubyte *c, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_blend_func_separate
-#define GL_INGR_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_INGR_color_clamp 1
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INGR_interlace_read 1
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_EXT_stencil_wrap 1
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_EXT_422_pixels 1
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NV_texgen_reflection 1
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_SUN_convolution_border_modes 1
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#define GL_EXT_texture_env_add 1
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_EXT_texture_lod_bias 1
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_EXT_vertex_weighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexWeightfEXT (GLfloat weight);
-GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *weight);
-GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_NV_light_max_exponent 1
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_NV_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
-GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei length, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_NV_register_combiners 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerParameterfvNV (GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glCombinerParameterfNV (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glCombinerParameterivNV (GLenum pname, const GLint *params);
-GLAPI void APIENTRY glCombinerParameteriNV (GLenum pname, GLint param);
-GLAPI void APIENTRY glCombinerInputNV (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-GLAPI void APIENTRY glCombinerOutputNV (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-GLAPI void APIENTRY glFinalCombinerInputNV (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum variable, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum variable, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_NV_fog_distance 1
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_NV_texgen_emboss 1
-#endif
-
-#ifndef GL_NV_blend_square
-#define GL_NV_blend_square 1
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_NV_texture_env_combine4 1
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#define GL_MESA_resize_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glResizeBuffersMESA (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
-#endif
-
-#ifndef GL_MESA_window_pos
-#define GL_MESA_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dMESA (GLdouble x, GLdouble y);
-GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos2fMESA (GLfloat x, GLfloat y);
-GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos2iMESA (GLint x, GLint y);
-GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *v);
-GLAPI void APIENTRY glWindowPos2sMESA (GLshort x, GLshort y);
-GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *v);
-GLAPI void APIENTRY glWindowPos3dMESA (GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos3fMESA (GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos3iMESA (GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *v);
-GLAPI void APIENTRY glWindowPos3sMESA (GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *v);
-GLAPI void APIENTRY glWindowPos4dMESA (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos4fMESA (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos4iMESA (GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *v);
-GLAPI void APIENTRY glWindowPos4sMESA (GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_IBM_cull_vertex 1
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#define GL_IBM_multimode_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_IBM_vertex_array_lists 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glIndexPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glNormalPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glTexCoordPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glVertexPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_SGIX_subsample 1
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_SGIX_ycrcba 1
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#define GL_SGIX_ycrcb_subsample 1
-#endif
-
-#ifndef GL_SGIX_depth_pass_instrument
-#define GL_SGIX_depth_pass_instrument 1
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_3DFX_texture_compression_FXT1 1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_3DFX_multisample 1
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#define GL_3DFX_tbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTbufferMask3DFX (GLuint mask);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_EXT_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskEXT (GLclampf value, GLboolean invert);
-GLAPI void APIENTRY glSamplePatternEXT (GLenum pattern);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_SGIX_vertex_preclip 1
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_SGIX_convolution_accuracy 1
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_SGIX_resample 1
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_SGIS_point_line_texgen 1
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_SGIS_texture_color_mask 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif
-
-#ifndef GL_SGIX_igloo_interface
-#define GL_SGIX_igloo_interface 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum pname, const GLvoid *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_EXT_texture_env_dot3 1
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_ATI_texture_mirror_once 1
-#endif
-
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);
-GLAPI void APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);
-GLAPI GLboolean APIENTRY glIsFenceNV (GLuint fence);
-GLAPI GLboolean APIENTRY glTestFenceNV (GLuint fence);
-GLAPI void APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);
-GLAPI void APIENTRY glFinishFenceNV (GLuint fence);
-GLAPI void APIENTRY glSetFenceNV (GLuint fence, GLenum condition);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_NV_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-GLAPI void APIENTRY glMapParameterivNV (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glMapParameterfvNV (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glGetMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-GLAPI void APIENTRY glGetMapParameterivNV (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMapParameterfvNV (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum target, GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glEvalMapsNV (GLenum target, GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_NV_packed_depth_stencil 1
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_NV_register_combiners2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum stage, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname, GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#define GL_NV_texture_compression_vtc 1
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_NV_texture_rectangle 1
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_NV_texture_shader 1
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_NV_texture_shader2 1
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_NV_vertex_array_range2 1
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_NV_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei n, const GLuint *programs, GLboolean *residences);
-GLAPI void APIENTRY glBindProgramNV (GLenum target, GLuint id);
-GLAPI void APIENTRY glDeleteProgramsNV (GLsizei n, const GLuint *programs);
-GLAPI void APIENTRY glExecuteProgramNV (GLenum target, GLuint id, const GLfloat *params);
-GLAPI void APIENTRY glGenProgramsNV (GLsizei n, GLuint *programs);
-GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetProgramivNV (GLuint id, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetProgramStringNV (GLuint id, GLenum pname, GLubyte *program);
-GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum target, GLuint address, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint index, GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVertexAttribivNV (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint index, GLenum pname, GLvoid* *pointer);
-GLAPI GLboolean APIENTRY glIsProgramNV (GLuint id);
-GLAPI void APIENTRY glLoadProgramNV (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-GLAPI void APIENTRY glProgramParameter4dNV (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glProgramParameter4dvNV (GLenum target, GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glProgramParameter4fNV (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glProgramParameter4fvNV (GLenum target, GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glProgramParameters4dvNV (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-GLAPI void APIENTRY glProgramParameters4fvNV (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei n, const GLuint *programs);
-GLAPI void APIENTRY glTrackMatrixNV (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-GLAPI void APIENTRY glVertexAttribPointerNV (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glVertexAttrib1dNV (GLuint index, GLdouble x);
-GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib1fNV (GLuint index, GLfloat x);
-GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib1sNV (GLuint index, GLshort x);
-GLAPI void APIENTRY glVertexAttrib1svNV (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib2dNV (GLuint index, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib2fNV (GLuint index, GLfloat x, GLfloat y);
-GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib2sNV (GLuint index, GLshort x, GLshort y);
-GLAPI void APIENTRY glVertexAttrib2svNV (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib3dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib3fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib3sNV (GLuint index, GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glVertexAttrib3svNV (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib4fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib4sNV (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void APIENTRY glVertexAttrib4svNV (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint index, GLsizei count, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint index, GLsizei count, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttribs1svNV (GLuint index, GLsizei count, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint index, GLsizei count, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint index, GLsizei count, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttribs2svNV (GLuint index, GLsizei count, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint index, GLsizei count, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint index, GLsizei count, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttribs3svNV (GLuint index, GLsizei count, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint index, GLsizei count, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint index, GLsizei count, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttribs4svNV (GLuint index, GLsizei count, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint index, GLsizei count, const GLubyte *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
-typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_SGIX_texture_coordinate_clamp 1
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SGIX_scalebias_hint 1
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_OML_interlace 1
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_OML_subsample 1
-#endif
-
-#ifndef GL_OML_resample
-#define GL_OML_resample 1
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_NV_copy_depth_to_color 1
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_ATI_envmap_bumpmap 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBumpParameterivATI (GLenum pname, const GLint *param);
-GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum pname, const GLfloat *param);
-GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum pname, GLint *param);
-GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum pname, GLfloat *param);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_ATI_fragment_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint range);
-GLAPI void APIENTRY glBindFragmentShaderATI (GLuint id);
-GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint id);
-GLAPI void APIENTRY glBeginFragmentShaderATI (void);
-GLAPI void APIENTRY glEndFragmentShaderATI (void);
-GLAPI void APIENTRY glPassTexCoordATI (GLuint dst, GLuint coord, GLenum swizzle);
-GLAPI void APIENTRY glSampleMapATI (GLuint dst, GLuint interp, GLenum swizzle);
-GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint dst, const GLfloat *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
-typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_ATI_pn_triangles 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPNTrianglesiATI (GLenum pname, GLint param);
-GLAPI void APIENTRY glPNTrianglesfATI (GLenum pname, GLfloat param);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_ATI_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei size, const GLvoid *pointer, GLenum usage);
-GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint buffer);
-GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint buffer, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetObjectBufferivATI (GLuint buffer, GLenum pname, GLint *params);
-GLAPI void APIENTRY glFreeObjectBufferATI (GLuint buffer);
-GLAPI void APIENTRY glArrayObjectATI (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum array, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetArrayObjectivATI (GLenum array, GLenum pname, GLint *params);
-GLAPI void APIENTRY glVariantArrayObjectATI (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint id, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint id, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
-typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_EXT_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVertexShaderEXT (void);
-GLAPI void APIENTRY glEndVertexShaderEXT (void);
-GLAPI void APIENTRY glBindVertexShaderEXT (GLuint id);
-GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint range);
-GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint id);
-GLAPI void APIENTRY glShaderOp1EXT (GLenum op, GLuint res, GLuint arg1);
-GLAPI void APIENTRY glShaderOp2EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-GLAPI void APIENTRY glShaderOp3EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-GLAPI void APIENTRY glSwizzleEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-GLAPI void APIENTRY glWriteMaskEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-GLAPI void APIENTRY glInsertComponentEXT (GLuint res, GLuint src, GLuint num);
-GLAPI void APIENTRY glExtractComponentEXT (GLuint res, GLuint src, GLuint num);
-GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-GLAPI void APIENTRY glSetInvariantEXT (GLuint id, GLenum type, const GLvoid *addr);
-GLAPI void APIENTRY glSetLocalConstantEXT (GLuint id, GLenum type, const GLvoid *addr);
-GLAPI void APIENTRY glVariantbvEXT (GLuint id, const GLbyte *addr);
-GLAPI void APIENTRY glVariantsvEXT (GLuint id, const GLshort *addr);
-GLAPI void APIENTRY glVariantivEXT (GLuint id, const GLint *addr);
-GLAPI void APIENTRY glVariantfvEXT (GLuint id, const GLfloat *addr);
-GLAPI void APIENTRY glVariantdvEXT (GLuint id, const GLdouble *addr);
-GLAPI void APIENTRY glVariantubvEXT (GLuint id, const GLubyte *addr);
-GLAPI void APIENTRY glVariantusvEXT (GLuint id, const GLushort *addr);
-GLAPI void APIENTRY glVariantuivEXT (GLuint id, const GLuint *addr);
-GLAPI void APIENTRY glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
-GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint id);
-GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint id);
-GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum light, GLenum value);
-GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum face, GLenum value);
-GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum unit, GLenum coord, GLenum value);
-GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum unit, GLenum value);
-GLAPI GLuint APIENTRY glBindParameterEXT (GLenum value);
-GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint id, GLenum cap);
-GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
-GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint id, GLenum value, GLint *data);
-GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
-GLAPI void APIENTRY glGetVariantPointervEXT (GLuint id, GLenum value, GLvoid* *data);
-GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
-GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint id, GLenum value, GLint *data);
-GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
-GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
-GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint id, GLenum value, GLint *data);
-GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
-typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
-typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
-typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
-typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
-typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
-typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
-typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
-typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
-typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_ATI_vertex_streams 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexStream1sATI (GLenum stream, GLshort x);
-GLAPI void APIENTRY glVertexStream1svATI (GLenum stream, const GLshort *coords);
-GLAPI void APIENTRY glVertexStream1iATI (GLenum stream, GLint x);
-GLAPI void APIENTRY glVertexStream1ivATI (GLenum stream, const GLint *coords);
-GLAPI void APIENTRY glVertexStream1fATI (GLenum stream, GLfloat x);
-GLAPI void APIENTRY glVertexStream1fvATI (GLenum stream, const GLfloat *coords);
-GLAPI void APIENTRY glVertexStream1dATI (GLenum stream, GLdouble x);
-GLAPI void APIENTRY glVertexStream1dvATI (GLenum stream, const GLdouble *coords);
-GLAPI void APIENTRY glVertexStream2sATI (GLenum stream, GLshort x, GLshort y);
-GLAPI void APIENTRY glVertexStream2svATI (GLenum stream, const GLshort *coords);
-GLAPI void APIENTRY glVertexStream2iATI (GLenum stream, GLint x, GLint y);
-GLAPI void APIENTRY glVertexStream2ivATI (GLenum stream, const GLint *coords);
-GLAPI void APIENTRY glVertexStream2fATI (GLenum stream, GLfloat x, GLfloat y);
-GLAPI void APIENTRY glVertexStream2fvATI (GLenum stream, const GLfloat *coords);
-GLAPI void APIENTRY glVertexStream2dATI (GLenum stream, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glVertexStream2dvATI (GLenum stream, const GLdouble *coords);
-GLAPI void APIENTRY glVertexStream3sATI (GLenum stream, GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glVertexStream3svATI (GLenum stream, const GLshort *coords);
-GLAPI void APIENTRY glVertexStream3iATI (GLenum stream, GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glVertexStream3ivATI (GLenum stream, const GLint *coords);
-GLAPI void APIENTRY glVertexStream3fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glVertexStream3fvATI (GLenum stream, const GLfloat *coords);
-GLAPI void APIENTRY glVertexStream3dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glVertexStream3dvATI (GLenum stream, const GLdouble *coords);
-GLAPI void APIENTRY glVertexStream4sATI (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void APIENTRY glVertexStream4svATI (GLenum stream, const GLshort *coords);
-GLAPI void APIENTRY glVertexStream4iATI (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glVertexStream4ivATI (GLenum stream, const GLint *coords);
-GLAPI void APIENTRY glVertexStream4fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glVertexStream4fvATI (GLenum stream, const GLfloat *coords);
-GLAPI void APIENTRY glVertexStream4dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glVertexStream4dvATI (GLenum stream, const GLdouble *coords);
-GLAPI void APIENTRY glNormalStream3bATI (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-GLAPI void APIENTRY glNormalStream3bvATI (GLenum stream, const GLbyte *coords);
-GLAPI void APIENTRY glNormalStream3sATI (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-GLAPI void APIENTRY glNormalStream3svATI (GLenum stream, const GLshort *coords);
-GLAPI void APIENTRY glNormalStream3iATI (GLenum stream, GLint nx, GLint ny, GLint nz);
-GLAPI void APIENTRY glNormalStream3ivATI (GLenum stream, const GLint *coords);
-GLAPI void APIENTRY glNormalStream3fATI (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-GLAPI void APIENTRY glNormalStream3fvATI (GLenum stream, const GLfloat *coords);
-GLAPI void APIENTRY glNormalStream3dATI (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-GLAPI void APIENTRY glNormalStream3dvATI (GLenum stream, const GLdouble *coords);
-GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum stream);
-GLAPI void APIENTRY glVertexBlendEnviATI (GLenum pname, GLint param);
-GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ATI_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerATI (GLenum type, const GLvoid *pointer);
-GLAPI void APIENTRY glDrawElementArrayATI (GLenum mode, GLsizei count);
-GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_SUN_mesh_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SUN_slice_accum 1
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_NV_multisample_filter_hint 1
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_NV_depth_clamp 1
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei n, GLuint *ids);
-GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei n, const GLuint *ids);
-GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint id);
-GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint id);
-GLAPI void APIENTRY glEndOcclusionQueryNV (void);
-GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint id, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint id, GLenum pname, GLuint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_NV_point_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameteriNV (GLenum pname, GLint param);
-GLAPI void APIENTRY glPointParameterivNV (GLenum pname, const GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_NV_texture_shader3 1
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#define GL_NV_vertex_program1_1 1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#define GL_EXT_shadow_funcs 1
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_EXT_stencil_two_side 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum face);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_ATI_text_fragment_shader 1
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_APPLE_client_storage 1
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_APPLE_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerAPPLE (GLenum type, const GLvoid *pointer);
-GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum mode, GLint first, GLsizei count);
-GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_APPLE_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenFencesAPPLE (GLsizei n, GLuint *fences);
-GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei n, const GLuint *fences);
-GLAPI void APIENTRY glSetFenceAPPLE (GLuint fence);
-GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint fence);
-GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint fence);
-GLAPI void APIENTRY glFinishFenceAPPLE (GLuint fence);
-GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum object, GLuint name);
-GLAPI void APIENTRY glFinishObjectAPPLE (GLenum object, GLint name);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
-typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
-typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_APPLE_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint array);
-GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei n, const GLuint *arrays);
-GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei n, GLuint *arrays);
-GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint array);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_APPLE_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer);
-GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer);
-GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum pname, GLint param);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_APPLE_ycbcr_422 1
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_S3_s3tc 1
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_ATI_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersATI (GLsizei n, const GLenum *bufs);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_ATI_pixel_format_float 1
-/* This is really a WGL extension, but defines some associated GL enums.
- * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
- */
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_ATI_texture_env_combine3 1
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_ATI_texture_float 1
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_NV_float_buffer 1
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_NV_fragment_program 1
-/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
-GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
-GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_NV_half_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y);
-GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glVertex3hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z);
-GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glVertex4hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glNormal3hNV (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
-GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glColor4hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
-GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV s);
-GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV s, GLhalfNV t);
-GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r);
-GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum target, GLhalfNV s);
-GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum target, const GLhalfNV *v);
-GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum target, GLhalfNV s, GLhalfNV t);
-GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum target, const GLhalfNV *v);
-GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
-GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v);
-GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
-GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x);
-GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y);
-GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint index, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttrib3hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
-GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint index, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttrib4hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint index, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
-typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
-typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
-typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_NV_pixel_data_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, GLvoid *pointer);
-GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum target);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_NV_primitive_restart 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPrimitiveRestartNV (void);
-GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_NV_texture_expand_normal 1
-#endif
-
-#ifndef GL_NV_vertex_program2
-#define GL_NV_vertex_program2 1
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#define GL_ATI_map_object_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint buffer);
-GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint buffer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_ATI_separate_stencil 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilOpSeparateATI (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#define GL_ATI_vertex_attrib_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint index, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_EXT_depth_bounds_test 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthBoundsEXT (GLclampd zmin, GLclampd zmax);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_EXT_texture_mirror_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_EXT_blend_equation_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum modeRGB, GLenum modeAlpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_MESA_pack_invert 1
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_MESA_ycbcr_texture 1
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_EXT_pixel_buffer_object 1
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#define GL_NV_fragment_program_option 1
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_NV_fragment_program2 1
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-#define GL_NV_vertex_program2_option 1
-#endif
-
-#ifndef GL_NV_vertex_program3
-#define GL_NV_vertex_program3 1
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint renderbuffer);
-GLAPI void APIENTRY glBindRenderbufferEXT (GLenum target, GLuint renderbuffer);
-GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei n, const GLuint *renderbuffers);
-GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei n, GLuint *renderbuffers);
-GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum target, GLenum pname, GLint *params);
-GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint framebuffer);
-GLAPI void APIENTRY glBindFramebufferEXT (GLenum target, GLuint framebuffer);
-GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei n, const GLuint *framebuffers);
-GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei n, GLuint *framebuffers);
-GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum target);
-GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGenerateMipmapEXT (GLenum target);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#define GL_GREMEDY_string_marker 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei len, const GLvoid *string);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_EXT_packed_depth_stencil 1
-#endif
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_EXT_stencil_clear_tag 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilClearTagEXT (GLsizei stencilTagBits, GLuint stencilClearTag);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
-#endif
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_EXT_texture_sRGB 1
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_EXT_framebuffer_blit 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-#endif
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_EXT_framebuffer_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_MESAX_texture_stack
-#define GL_MESAX_texture_stack 1
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_EXT_timer_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64EXT *params);
-GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64EXT *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#define GL_EXT_gpu_program_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-#endif
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_APPLE_flush_buffer_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum target, GLintptr offset, GLsizeiptr size);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
-#endif
-
-#ifndef GL_NV_gpu_program4
-#define GL_NV_gpu_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
-GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
-GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
-GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
-GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
-GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
-GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum target, GLuint index, GLint *params);
-GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum target, GLuint index, GLuint *params);
-GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum target, GLuint index, GLint *params);
-GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum target, GLuint index, GLuint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
-#endif
-
-#ifndef GL_NV_geometry_program4
-#define GL_NV_geometry_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramVertexLimitNV (GLenum target, GLint limit);
-GLAPI void APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_EXT_geometry_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
-#endif
-
-#ifndef GL_NV_vertex_program4
-#define GL_NV_vertex_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x);
-GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y);
-GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x);
-GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y);
-GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z);
-GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_EXT_gpu_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetUniformuivEXT (GLuint program, GLint location, GLuint *params);
-GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint program, GLuint color, const GLchar *name);
-GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glUniform1uiEXT (GLint location, GLuint v0);
-GLAPI void APIENTRY glUniform2uiEXT (GLint location, GLuint v0, GLuint v1);
-GLAPI void APIENTRY glUniform3uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2);
-GLAPI void APIENTRY glUniform4uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-GLAPI void APIENTRY glUniform1uivEXT (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform2uivEXT (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform3uivEXT (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform4uivEXT (GLint location, GLsizei count, const GLuint *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-#endif
-
-#ifndef GL_EXT_draw_instanced
-#define GL_EXT_draw_instanced 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
-GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_packed_float
-#define GL_EXT_packed_float 1
-#endif
-
-#ifndef GL_EXT_texture_array
-#define GL_EXT_texture_array 1
-#endif
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_EXT_texture_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-#endif
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_EXT_texture_compression_latc 1
-#endif
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_EXT_texture_compression_rgtc 1
-#endif
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_EXT_texture_shared_exponent 1
-#endif
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_NV_depth_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthRangedNV (GLdouble zNear, GLdouble zFar);
-GLAPI void APIENTRY glClearDepthdNV (GLdouble depth);
-GLAPI void APIENTRY glDepthBoundsdNV (GLdouble zmin, GLdouble zmax);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
-#endif
-
-#ifndef GL_NV_fragment_program4
-#define GL_NV_fragment_program4 1
-#endif
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_NV_framebuffer_multisample_coverage 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_EXT_framebuffer_sRGB 1
-#endif
-
-#ifndef GL_NV_geometry_shader4
-#define GL_NV_geometry_shader4 1
-#endif
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_NV_parameter_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
-GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
-GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
-#endif
-
-#ifndef GL_EXT_draw_buffers2
-#define GL_EXT_draw_buffers2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum target, GLuint index, GLboolean *data);
-GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum target, GLuint index, GLint *data);
-GLAPI void APIENTRY glEnableIndexedEXT (GLenum target, GLuint index);
-GLAPI void APIENTRY glDisableIndexedEXT (GLenum target, GLuint index);
-GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum target, GLuint index);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
-#endif
-
-#ifndef GL_NV_transform_feedback
-#define GL_NV_transform_feedback 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum primitiveMode);
-GLAPI void APIENTRY glEndTransformFeedbackNV (void);
-GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint count, const GLint *attribs, GLenum bufferMode);
-GLAPI void APIENTRY glBindBufferRangeNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-GLAPI void APIENTRY glBindBufferOffsetNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-GLAPI void APIENTRY glBindBufferBaseNV (GLenum target, GLuint index, GLuint buffer);
-GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-GLAPI void APIENTRY glActiveVaryingNV (GLuint program, const GLchar *name);
-GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glGetActiveVaryingNV (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint program, GLuint index, GLint *location);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
-#endif
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_EXT_bindable_uniform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniformBufferEXT (GLuint program, GLint location, GLuint buffer);
-GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint program, GLint location);
-GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint program, GLint location);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
-typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
-#endif
-
-#ifndef GL_EXT_texture_integer
-#define GL_EXT_texture_integer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params);
-GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glClearColorIiEXT (GLint red, GLint green, GLint blue, GLint alpha);
-GLAPI void APIENTRY glClearColorIuiEXT (GLuint red, GLuint green, GLuint blue, GLuint alpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
-typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
-#endif
-
-#ifndef GL_GREMEDY_frame_terminator
-#define GL_GREMEDY_frame_terminator 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
-#endif
-
-#ifndef GL_NV_conditional_render
-#define GL_NV_conditional_render 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint id, GLenum mode);
-GLAPI void APIENTRY glEndConditionalRenderNV (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
-typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void);
-#endif
-
-#ifndef GL_NV_present_video
-#define GL_NV_present_video 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPresentFrameKeyedNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
-GLAPI void APIENTRY glPresentFrameDualFillNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
-GLAPI void APIENTRY glGetVideoivNV (GLuint video_slot, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVideouivNV (GLuint video_slot, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glGetVideoi64vNV (GLuint video_slot, GLenum pname, GLint64EXT *params);
-GLAPI void APIENTRY glGetVideoui64vNV (GLuint video_slot, GLenum pname, GLuint64EXT *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
-typedef void (APIENTRYP PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
-typedef void (APIENTRYP PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT *params);
-typedef void (APIENTRYP PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT *params);
-#endif
-
-#ifndef GL_EXT_transform_feedback
-#define GL_EXT_transform_feedback 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum primitiveMode);
-GLAPI void APIENTRY glEndTransformFeedbackEXT (void);
-GLAPI void APIENTRY glBindBufferRangeEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-GLAPI void APIENTRY glBindBufferBaseEXT (GLenum target, GLuint index, GLuint buffer);
-GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-#endif
-
-#ifndef GL_EXT_direct_state_access
-#define GL_EXT_direct_state_access 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield mask);
-GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield mask);
-GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m);
-GLAPI void APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m);
-GLAPI void APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m);
-GLAPI void APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m);
-GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum mode);
-GLAPI void APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-GLAPI void APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-GLAPI void APIENTRY glMatrixPopEXT (GLenum mode);
-GLAPI void APIENTRY glMatrixPushEXT (GLenum mode);
-GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m);
-GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m);
-GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m);
-GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m);
-GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetTextureImageEXT (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
-GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
-GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture);
-GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum array, GLuint index);
-GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum array, GLuint index);
-GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glMultiTexEnviEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glMultiTexGendEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
-GLAPI void APIENTRY glMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
-GLAPI void APIENTRY glMultiTexGenfEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glMultiTexGeniEXT (GLenum texunit, GLenum coord, GLenum pname, GLint param);
-GLAPI void APIENTRY glMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum target, GLuint index, GLfloat *data);
-GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum target, GLuint index, GLdouble *data);
-GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum target, GLuint index, GLvoid* *data);
-GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint texture, GLenum target, GLint lod, GLvoid *img);
-GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum texunit, GLenum target, GLint lod, GLvoid *img);
-GLAPI void APIENTRY glNamedProgramStringEXT (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint program, GLenum target, GLuint index, const GLdouble *params);
-GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint program, GLenum target, GLuint index, const GLfloat *params);
-GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint program, GLenum target, GLuint index, GLdouble *params);
-GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint program, GLenum target, GLuint index, GLfloat *params);
-GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint program, GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint program, GLenum target, GLenum pname, GLvoid *string);
-GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint program, GLenum target, GLuint index, const GLint *params);
-GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
-GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint program, GLenum target, GLuint index, const GLuint *params);
-GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
-GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint program, GLenum target, GLuint index, GLint *params);
-GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint program, GLenum target, GLuint index, GLuint *params);
-GLAPI void APIENTRY glTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
-GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
-GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0);
-GLAPI void APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1);
-GLAPI void APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-GLAPI void APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-GLAPI void APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0);
-GLAPI void APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1);
-GLAPI void APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-GLAPI void APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0);
-GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1);
-GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glNamedBufferDataEXT (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage);
-GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-GLAPI GLvoid* APIENTRY glMapNamedBufferEXT (GLuint buffer, GLenum access);
-GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint buffer);
-GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint buffer, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint buffer, GLenum pname, GLvoid* *params);
-GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data);
-GLAPI void APIENTRY glTextureBufferEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
-GLAPI void APIENTRY glMultiTexBufferEXT (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
-GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint renderbuffer, GLenum pname, GLint *params);
-GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint framebuffer, GLenum target);
-GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint texture, GLenum target);
-GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum texunit, GLenum target);
-GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint framebuffer, GLenum mode);
-GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint framebuffer, GLsizei n, const GLenum *bufs);
-GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint framebuffer, GLenum mode);
-GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
-GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
-GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
-GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
-GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint texture, GLenum target, GLuint renderbuffer);
-GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum texunit, GLenum target, GLuint renderbuffer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
-typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
-typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data);
-typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLvoid* *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, GLvoid *img);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, GLvoid *img);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
-typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
-typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
-typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
-#endif
-
-#ifndef GL_EXT_vertex_array_bgra
-#define GL_EXT_vertex_array_bgra 1
-#endif
-
-#ifndef GL_EXT_texture_swizzle
-#define GL_EXT_texture_swizzle 1
-#endif
-
-#ifndef GL_NV_explicit_multisample
-#define GL_NV_explicit_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetMultisamplefvNV (GLenum pname, GLuint index, GLfloat *val);
-GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint index, GLbitfield mask);
-GLAPI void APIENTRY glTexRenderbufferNV (GLenum target, GLuint renderbuffer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val);
-typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask);
-typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer);
-#endif
-
-#ifndef GL_NV_transform_feedback2
-#define GL_NV_transform_feedback2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum target, GLuint id);
-GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei n, const GLuint *ids);
-GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei n, GLuint *ids);
-GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint id);
-GLAPI void APIENTRY glPauseTransformFeedbackNV (void);
-GLAPI void APIENTRY glResumeTransformFeedbackNV (void);
-GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids);
-typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void);
-typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void);
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id);
-#endif
-
-#ifndef GL_ATI_meminfo
-#define GL_ATI_meminfo 1
-#endif
-
-#ifndef GL_AMD_performance_monitor
-#define GL_AMD_performance_monitor 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
-GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
-GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
-GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
-GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, void *data);
-GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors);
-GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors);
-GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
-GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint monitor);
-GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint monitor);
-GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
-typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
-typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
-typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
-typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data);
-typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
-typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
-typedef void (APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
-typedef void (APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
-typedef void (APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
-typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
-#endif
-
-#ifndef GL_AMD_texture_texture4
-#define GL_AMD_texture_texture4 1
-#endif
-
-#ifndef GL_AMD_vertex_shader_tesselator
-#define GL_AMD_vertex_shader_tesselator 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTessellationFactorAMD (GLfloat factor);
-GLAPI void APIENTRY glTessellationModeAMD (GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor);
-typedef void (APIENTRYP PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_provoking_vertex
-#define GL_EXT_provoking_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProvokingVertexEXT (GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_texture_snorm
-#define GL_EXT_texture_snorm 1
-#endif
-
-#ifndef GL_AMD_draw_buffers_blend
-#define GL_AMD_draw_buffers_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncIndexedAMD (GLuint buf, GLenum src, GLenum dst);
-GLAPI void APIENTRY glBlendFuncSeparateIndexedAMD (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-GLAPI void APIENTRY glBlendEquationIndexedAMD (GLuint buf, GLenum mode);
-GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-#ifndef GL_APPLE_texture_range
-#define GL_APPLE_texture_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureRangeAPPLE (GLenum target, GLsizei length, const GLvoid *pointer);
-GLAPI void APIENTRY glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, GLvoid* *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_APPLE_float_pixels
-#define GL_APPLE_float_pixels 1
-#endif
-
-#ifndef GL_APPLE_vertex_program_evaluators
-#define GL_APPLE_vertex_program_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glEnableVertexAttribAPPLE (GLuint index, GLenum pname);
-GLAPI void APIENTRY glDisableVertexAttribAPPLE (GLuint index, GLenum pname);
-GLAPI GLboolean APIENTRY glIsVertexAttribEnabledAPPLE (GLuint index, GLenum pname);
-GLAPI void APIENTRY glMapVertexAttrib1dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
-GLAPI void APIENTRY glMapVertexAttrib1fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
-GLAPI void APIENTRY glMapVertexAttrib2dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
-GLAPI void APIENTRY glMapVertexAttrib2fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname);
-typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
-typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
-typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
-typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
-#endif
-
-#ifndef GL_APPLE_aux_depth_stencil
-#define GL_APPLE_aux_depth_stencil 1
-#endif
-
-#ifndef GL_APPLE_object_purgeable
-#define GL_APPLE_object_purgeable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLenum APIENTRY glObjectPurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
-GLAPI GLenum APIENTRY glObjectUnpurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
-GLAPI void APIENTRY glGetObjectParameterivAPPLE (GLenum objectType, GLuint name, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLenum (APIENTRYP PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
-typedef GLenum (APIENTRYP PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_APPLE_row_bytes
-#define GL_APPLE_row_bytes 1
-#endif
-
-#ifndef GL_APPLE_rgb_422
-#define GL_APPLE_rgb_422 1
-#endif
-
-#ifndef GL_NV_video_capture
-#define GL_NV_video_capture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVideoCaptureNV (GLuint video_capture_slot);
-GLAPI void APIENTRY glBindVideoCaptureStreamBufferNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
-GLAPI void APIENTRY glBindVideoCaptureStreamTextureNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
-GLAPI void APIENTRY glEndVideoCaptureNV (GLuint video_capture_slot);
-GLAPI void APIENTRY glGetVideoCaptureivNV (GLuint video_capture_slot, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
-GLAPI GLenum APIENTRY glVideoCaptureNV (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
-GLAPI void APIENTRY glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
-typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
-typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
-typedef void (APIENTRYP PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
-typedef GLenum (APIENTRYP PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
-typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
-#endif
-
-#ifndef GL_NV_copy_image
-#define GL_NV_copy_image 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyImageSubDataNV (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
-#endif
-
-#ifndef GL_EXT_separate_shader_objects
-#define GL_EXT_separate_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUseShaderProgramEXT (GLenum type, GLuint program);
-GLAPI void APIENTRY glActiveProgramEXT (GLuint program);
-GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *string);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program);
-typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string);
-#endif
-
-#ifndef GL_NV_parameter_buffer_object2
-#define GL_NV_parameter_buffer_object2 1
-#endif
-
-#ifndef GL_NV_shader_buffer_load
-#define GL_NV_shader_buffer_load 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMakeBufferResidentNV (GLenum target, GLenum access);
-GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum target);
-GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum target);
-GLAPI void APIENTRY glMakeNamedBufferResidentNV (GLuint buffer, GLenum access);
-GLAPI void APIENTRY glMakeNamedBufferNonResidentNV (GLuint buffer);
-GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint buffer);
-GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum target, GLenum pname, GLuint64EXT *params);
-GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pname, GLuint64EXT *params);
-GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result);
-GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value);
-GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
-GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params);
-GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value);
-GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access);
-typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access);
-typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer);
-typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params);
-typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params);
-typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result);
-typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value);
-typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
-typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
-#endif
-
-#ifndef GL_NV_vertex_buffer_unified_memory
-#define GL_NV_vertex_buffer_unified_memory 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBufferAddressRangeNV (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
-GLAPI void APIENTRY glVertexFormatNV (GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glNormalFormatNV (GLenum type, GLsizei stride);
-GLAPI void APIENTRY glColorFormatNV (GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glIndexFormatNV (GLenum type, GLsizei stride);
-GLAPI void APIENTRY glTexCoordFormatNV (GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei stride);
-GLAPI void APIENTRY glSecondaryColorFormatNV (GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glFogCoordFormatNV (GLenum type, GLsizei stride);
-GLAPI void APIENTRY glVertexAttribFormatNV (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
-GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum value, GLuint index, GLuint64EXT *result);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
-typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result);
-#endif
-
-#ifndef GL_NV_texture_barrier
-#define GL_NV_texture_barrier 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureBarrierNV (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void);
-#endif
-
-#ifndef GL_AMD_shader_stencil_export
-#define GL_AMD_shader_stencil_export 1
-#endif
-
-#ifndef GL_AMD_seamless_cubemap_per_texture
-#define GL_AMD_seamless_cubemap_per_texture 1
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/make/stub_includes/opengl/GL3_/gl3.h b/make/stub_includes/opengl/GL3_/gl3.h
deleted file mode 100755
index 8bdff4644..000000000
--- a/make/stub_includes/opengl/GL3_/gl3.h
+++ /dev/null
@@ -1,1659 +0,0 @@
-#ifndef __gl3_h_
-#define __gl3_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007-2009 The Khronos Group Inc.
-** 
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-** 
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-** 
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-/* This is a draft release of gl3.h, a new header intended for use with
- * core OpenGL 3.1 implementations. The current version is always
- * available at http://www.opengl.org/registry/ . Please don't package
- * gl3.h for release with other software until it's out of draft status.
- * The structure of the file may change significantly, and the details
- * will probably change slightly as we make sure exactly the right set
- * of interfaces is included.
- *
- * gl3.h last updated on $Date: 2009-05-05 15:53:39 -0700 (Tue, 05 May 2009) $
- *
- * RELEASE NOTES
- *
- * gl3.h should be placed under a directory 'GL3' and included as
- * '<GL3/gl3.h>'.
- *
- * gl3.h only includes interfaces supported in a core OpenGL 3.1
- * implementation, as well as interfaces for a few ARB extensions which
- * have identical enums and entry points. It does not, and never will
- * include functionality removed from core OpenGL 3.1, such as
- * fixed-function vertex and fragment processing.
- *
- * Implementations of OpenGL 3.1 supporting the optional
- * GL_ARB_compatibility extension continue to provide that functionality,
- * and source code requiring it should use the traditional <GL/gl.h> and
- * <GL/glext.h> headers instead of <GL3/gl3.h>.
- *
- * It is not possible to #include both <GL3/gl3.h> and either of
- * <GL/gl.h> or <GL/glext.h> in the same source file.
- *
- * We welcome feedback on gl3.h. Please register for the Khronos Bugzilla
- * (www.khronos.org/bugzilla) and file issues there under product
- * "OpenGL", category "Registry". Feedback on the opengl.org forums
- * may not be responded to in a timely fashion.
- */
-
-/* Function declaration macros - to move into glplatform.h */
-
-#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
-#define __WIN32__
-#endif
-
-#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
-#  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
-#    define GLAPI __declspec(dllexport)
-#  elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
-#    define GLAPI __declspec(dllimport)
-#  else /* for use with static link lib build of Win32 edition only */
-#    define GLAPI extern
-#  endif /* _STATIC_MESA support */
-#  define APIENTRY __stdcall
-#else
-/* non-Windows compilation */
-#  define GLAPI extern
-#  define APIENTRY
-#endif /* WIN32 / CYGWIN bracket */
-
-#ifndef APIENTRYP
-#   define APIENTRYP APIENTRY*
-#endif
-
-#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
-#  define PRAGMA_EXPORT_SUPPORTED               1
-#endif
-
-/*
- * WINDOWS: Include windows.h here to define APIENTRY.
- * It is also useful when applications include this file by
- * including only glut.h, since glut.h depends on windows.h.
- * Applications needing to include windows.h with parms other
- * than "WIN32_LEAN_AND_MEAN" may include windows.h before
- * glut.h or gl.h.
- */
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(__CYGWIN__)
-#include <gl/mesa_wgl.h>
-#endif
-
-#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
-#pragma import on
-#endif
-
-#ifdef CENTERLINE_CLPP
-#define signed
-#endif
-
-#if defined(PRAGMA_EXPORT_SUPPORTED)
-#pragma export on
-#endif
-
-/*
- * End system-specific stuff.
- **********************************************************************/
-
-/* Base GL types */
-
-typedef unsigned int GLenum;
-typedef unsigned char GLboolean;
-typedef unsigned int GLbitfield;
-typedef signed char GLbyte;
-typedef short GLshort;
-typedef int GLint;
-typedef int GLsizei;
-typedef unsigned char GLubyte;
-typedef unsigned short GLushort;
-typedef unsigned int GLuint;
-typedef float GLfloat;
-typedef float GLclampf;
-typedef double GLdouble;
-typedef double GLclampd;
-typedef void GLvoid;
-
-/*************************************************************/
-
-#ifndef GL_VERSION_1_1
-/* AttribMask */
-#define GL_DEPTH_BUFFER_BIT               0x00000100
-#define GL_STENCIL_BUFFER_BIT             0x00000400
-#define GL_COLOR_BUFFER_BIT               0x00004000
-/* Boolean */
-#define GL_FALSE                          0
-#define GL_TRUE                           1
-/* BeginMode */
-#define GL_POINTS                         0x0000
-#define GL_LINES                          0x0001
-#define GL_LINE_LOOP                      0x0002
-#define GL_LINE_STRIP                     0x0003
-#define GL_TRIANGLES                      0x0004
-#define GL_TRIANGLE_STRIP                 0x0005
-#define GL_TRIANGLE_FAN                   0x0006
-/* AlphaFunction */
-#define GL_NEVER                          0x0200
-#define GL_LESS                           0x0201
-#define GL_EQUAL                          0x0202
-#define GL_LEQUAL                         0x0203
-#define GL_GREATER                        0x0204
-#define GL_NOTEQUAL                       0x0205
-#define GL_GEQUAL                         0x0206
-#define GL_ALWAYS                         0x0207
-/* BlendingFactorDest */
-#define GL_ZERO                           0
-#define GL_ONE                            1
-#define GL_SRC_COLOR                      0x0300
-#define GL_ONE_MINUS_SRC_COLOR            0x0301
-#define GL_SRC_ALPHA                      0x0302
-#define GL_ONE_MINUS_SRC_ALPHA            0x0303
-#define GL_DST_ALPHA                      0x0304
-#define GL_ONE_MINUS_DST_ALPHA            0x0305
-/* BlendingFactorSrc */
-#define GL_DST_COLOR                      0x0306
-#define GL_ONE_MINUS_DST_COLOR            0x0307
-#define GL_SRC_ALPHA_SATURATE             0x0308
-/* DrawBufferMode */
-#define GL_NONE                           0
-#define GL_FRONT_LEFT                     0x0400
-#define GL_FRONT_RIGHT                    0x0401
-#define GL_BACK_LEFT                      0x0402
-#define GL_BACK_RIGHT                     0x0403
-#define GL_FRONT                          0x0404
-#define GL_BACK                           0x0405
-#define GL_LEFT                           0x0406
-#define GL_RIGHT                          0x0407
-#define GL_FRONT_AND_BACK                 0x0408
-/* ErrorCode */
-#define GL_NO_ERROR                       0
-#define GL_INVALID_ENUM                   0x0500
-#define GL_INVALID_VALUE                  0x0501
-#define GL_INVALID_OPERATION              0x0502
-#define GL_OUT_OF_MEMORY                  0x0505
-/* FrontFaceDirection */
-#define GL_CW                             0x0900
-#define GL_CCW                            0x0901
-/* GetPName */
-#define GL_POINT_SIZE                     0x0B11
-#define GL_POINT_SIZE_RANGE               0x0B12
-#define GL_POINT_SIZE_GRANULARITY         0x0B13
-#define GL_LINE_SMOOTH                    0x0B20
-#define GL_LINE_WIDTH                     0x0B21
-#define GL_LINE_WIDTH_RANGE               0x0B22
-#define GL_LINE_WIDTH_GRANULARITY         0x0B23
-#define GL_POLYGON_SMOOTH                 0x0B41
-#define GL_CULL_FACE                      0x0B44
-#define GL_CULL_FACE_MODE                 0x0B45
-#define GL_FRONT_FACE                     0x0B46
-#define GL_DEPTH_RANGE                    0x0B70
-#define GL_DEPTH_TEST                     0x0B71
-#define GL_DEPTH_WRITEMASK                0x0B72
-#define GL_DEPTH_CLEAR_VALUE              0x0B73
-#define GL_DEPTH_FUNC                     0x0B74
-#define GL_STENCIL_TEST                   0x0B90
-#define GL_STENCIL_CLEAR_VALUE            0x0B91
-#define GL_STENCIL_FUNC                   0x0B92
-#define GL_STENCIL_VALUE_MASK             0x0B93
-#define GL_STENCIL_FAIL                   0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
-#define GL_STENCIL_REF                    0x0B97
-#define GL_STENCIL_WRITEMASK              0x0B98
-#define GL_VIEWPORT                       0x0BA2
-#define GL_DITHER                         0x0BD0
-#define GL_BLEND_DST                      0x0BE0
-#define GL_BLEND_SRC                      0x0BE1
-#define GL_BLEND                          0x0BE2
-#define GL_LOGIC_OP_MODE                  0x0BF0
-#define GL_COLOR_LOGIC_OP                 0x0BF2
-#define GL_DRAW_BUFFER                    0x0C01
-#define GL_READ_BUFFER                    0x0C02
-#define GL_SCISSOR_BOX                    0x0C10
-#define GL_SCISSOR_TEST                   0x0C11
-#define GL_COLOR_CLEAR_VALUE              0x0C22
-#define GL_COLOR_WRITEMASK                0x0C23
-#define GL_DOUBLEBUFFER                   0x0C32
-#define GL_STEREO                         0x0C33
-#define GL_LINE_SMOOTH_HINT               0x0C52
-#define GL_POLYGON_SMOOTH_HINT            0x0C53
-#define GL_UNPACK_SWAP_BYTES              0x0CF0
-#define GL_UNPACK_LSB_FIRST               0x0CF1
-#define GL_UNPACK_ROW_LENGTH              0x0CF2
-#define GL_UNPACK_SKIP_ROWS               0x0CF3
-#define GL_UNPACK_SKIP_PIXELS             0x0CF4
-#define GL_UNPACK_ALIGNMENT               0x0CF5
-#define GL_PACK_SWAP_BYTES                0x0D00
-#define GL_PACK_LSB_FIRST                 0x0D01
-#define GL_PACK_ROW_LENGTH                0x0D02
-#define GL_PACK_SKIP_ROWS                 0x0D03
-#define GL_PACK_SKIP_PIXELS               0x0D04
-#define GL_PACK_ALIGNMENT                 0x0D05
-#define GL_MAX_TEXTURE_SIZE               0x0D33
-#define GL_MAX_VIEWPORT_DIMS              0x0D3A
-#define GL_SUBPIXEL_BITS                  0x0D50
-#define GL_TEXTURE_1D                     0x0DE0
-#define GL_TEXTURE_2D                     0x0DE1
-#define GL_POLYGON_OFFSET_UNITS           0x2A00
-#define GL_POLYGON_OFFSET_POINT           0x2A01
-#define GL_POLYGON_OFFSET_LINE            0x2A02
-#define GL_POLYGON_OFFSET_FILL            0x8037
-#define GL_POLYGON_OFFSET_FACTOR          0x8038
-#define GL_TEXTURE_BINDING_1D             0x8068
-#define GL_TEXTURE_BINDING_2D             0x8069
-/* GetTextureParameter */
-#define GL_TEXTURE_WIDTH                  0x1000
-#define GL_TEXTURE_HEIGHT                 0x1001
-#define GL_TEXTURE_INTERNAL_FORMAT        0x1003
-#define GL_TEXTURE_BORDER_COLOR           0x1004
-#define GL_TEXTURE_BORDER                 0x1005
-#define GL_TEXTURE_RED_SIZE               0x805C
-#define GL_TEXTURE_GREEN_SIZE             0x805D
-#define GL_TEXTURE_BLUE_SIZE              0x805E
-#define GL_TEXTURE_ALPHA_SIZE             0x805F
-/* HintMode */
-#define GL_DONT_CARE                      0x1100
-#define GL_FASTEST                        0x1101
-#define GL_NICEST                         0x1102
-/* DataType */
-#define GL_BYTE                           0x1400
-#define GL_UNSIGNED_BYTE                  0x1401
-#define GL_SHORT                          0x1402
-#define GL_UNSIGNED_SHORT                 0x1403
-#define GL_INT                            0x1404
-#define GL_UNSIGNED_INT                   0x1405
-#define GL_FLOAT                          0x1406
-#define GL_DOUBLE                         0x140A
-/* LogicOp */
-#define GL_CLEAR                          0x1500
-#define GL_AND                            0x1501
-#define GL_AND_REVERSE                    0x1502
-#define GL_COPY                           0x1503
-#define GL_AND_INVERTED                   0x1504
-#define GL_NOOP                           0x1505
-#define GL_XOR                            0x1506
-#define GL_OR                             0x1507
-#define GL_NOR                            0x1508
-#define GL_EQUIV                          0x1509
-#define GL_INVERT                         0x150A
-#define GL_OR_REVERSE                     0x150B
-#define GL_COPY_INVERTED                  0x150C
-#define GL_OR_INVERTED                    0x150D
-#define GL_NAND                           0x150E
-#define GL_SET                            0x150F
-/* MatrixMode (for gl3.h, FBO attachment type) */
-#define GL_TEXTURE                        0x1702
-/* PixelCopyType */
-#define GL_COLOR                          0x1800
-#define GL_DEPTH                          0x1801
-#define GL_STENCIL                        0x1802
-/* PixelFormat */
-#define GL_STENCIL_INDEX                  0x1901
-#define GL_DEPTH_COMPONENT                0x1902
-#define GL_RED                            0x1903
-#define GL_GREEN                          0x1904
-#define GL_BLUE                           0x1905
-#define GL_ALPHA                          0x1906
-#define GL_RGB                            0x1907
-#define GL_RGBA                           0x1908
-/* PolygonMode */
-#define GL_POINT                          0x1B00
-#define GL_LINE                           0x1B01
-#define GL_FILL                           0x1B02
-/* StencilOp */
-#define GL_KEEP                           0x1E00
-#define GL_REPLACE                        0x1E01
-#define GL_INCR                           0x1E02
-#define GL_DECR                           0x1E03
-/* StringName */
-#define GL_VENDOR                         0x1F00
-#define GL_RENDERER                       0x1F01
-#define GL_VERSION                        0x1F02
-#define GL_EXTENSIONS                     0x1F03
-/* TextureMagFilter */
-#define GL_NEAREST                        0x2600
-#define GL_LINEAR                         0x2601
-/* TextureMinFilter */
-#define GL_NEAREST_MIPMAP_NEAREST         0x2700
-#define GL_LINEAR_MIPMAP_NEAREST          0x2701
-#define GL_NEAREST_MIPMAP_LINEAR          0x2702
-#define GL_LINEAR_MIPMAP_LINEAR           0x2703
-/* TextureParameterName */
-#define GL_TEXTURE_MAG_FILTER             0x2800
-#define GL_TEXTURE_MIN_FILTER             0x2801
-#define GL_TEXTURE_WRAP_S                 0x2802
-#define GL_TEXTURE_WRAP_T                 0x2803
-/* TextureTarget */
-#define GL_PROXY_TEXTURE_1D               0x8063
-#define GL_PROXY_TEXTURE_2D               0x8064
-/* TextureWrapMode */
-#define GL_REPEAT                         0x2901
-/* PixelInternalFormat */
-#define GL_R3_G3_B2                       0x2A10
-#define GL_RGB4                           0x804F
-#define GL_RGB5                           0x8050
-#define GL_RGB8                           0x8051
-#define GL_RGB10                          0x8052
-#define GL_RGB12                          0x8053
-#define GL_RGB16                          0x8054
-#define GL_RGBA2                          0x8055
-#define GL_RGBA4                          0x8056
-#define GL_RGB5_A1                        0x8057
-#define GL_RGBA8                          0x8058
-#define GL_RGB10_A2                       0x8059
-#define GL_RGBA12                         0x805A
-#define GL_RGBA16                         0x805B
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_TEXTURE_BINDING_3D             0x806A
-#define GL_PACK_SKIP_IMAGES               0x806B
-#define GL_PACK_IMAGE_HEIGHT              0x806C
-#define GL_UNPACK_SKIP_IMAGES             0x806D
-#define GL_UNPACK_IMAGE_HEIGHT            0x806E
-#define GL_TEXTURE_3D                     0x806F
-#define GL_PROXY_TEXTURE_3D               0x8070
-#define GL_TEXTURE_DEPTH                  0x8071
-#define GL_TEXTURE_WRAP_R                 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE            0x8073
-#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_TEXTURE_MIN_LOD                0x813A
-#define GL_TEXTURE_MAX_LOD                0x813B
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#endif
-
-#ifndef GL_ARB_imaging
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_COMPRESSED_RGB                 0x84ED
-#define GL_COMPRESSED_RGBA                0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
-#define GL_TEXTURE_COMPRESSED             0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_CLAMP_TO_BORDER                0x812D
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_DEPTH_COMPONENT24              0x81A6
-#define GL_DEPTH_COMPONENT32              0x81A7
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
-#define GL_TEXTURE_LOD_BIAS               0x8501
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_TEXTURE_DEPTH_SIZE             0x884A
-#define GL_TEXTURE_COMPARE_MODE           0x884C
-#define GL_TEXTURE_COMPARE_FUNC           0x884D
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_QUERY_COUNTER_BITS             0x8864
-#define GL_CURRENT_QUERY                  0x8865
-#define GL_QUERY_RESULT                   0x8866
-#define GL_QUERY_RESULT_AVAILABLE         0x8867
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_BUFFER_ACCESS                  0x88BB
-#define GL_BUFFER_MAPPED                  0x88BC
-#define GL_BUFFER_MAP_POINTER             0x88BD
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_STREAM_COPY                    0x88E2
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_STATIC_READ                    0x88E5
-#define GL_STATIC_COPY                    0x88E6
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_DYNAMIC_READ                   0x88E9
-#define GL_DYNAMIC_COPY                   0x88EA
-#define GL_SAMPLES_PASSED                 0x8914
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             0x8009
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_PIXEL_PACK_BUFFER              0x88EB
-#define GL_PIXEL_UNPACK_BUFFER            0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
-#define GL_FLOAT_MAT2x3                   0x8B65
-#define GL_FLOAT_MAT2x4                   0x8B66
-#define GL_FLOAT_MAT3x2                   0x8B67
-#define GL_FLOAT_MAT3x4                   0x8B68
-#define GL_FLOAT_MAT4x2                   0x8B69
-#define GL_FLOAT_MAT4x3                   0x8B6A
-#define GL_SRGB                           0x8C40
-#define GL_SRGB8                          0x8C41
-#define GL_SRGB_ALPHA                     0x8C42
-#define GL_SRGB8_ALPHA8                   0x8C43
-#define GL_COMPRESSED_SRGB                0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
-#endif
-
-#ifndef GL_VERSION_3_0
-#define GL_COMPARE_REF_TO_TEXTURE         0x884E
-#define GL_CLIP_DISTANCE0                 0x3000
-#define GL_CLIP_DISTANCE1                 0x3001
-#define GL_CLIP_DISTANCE2                 0x3002
-#define GL_CLIP_DISTANCE3                 0x3003
-#define GL_CLIP_DISTANCE4                 0x3004
-#define GL_CLIP_DISTANCE5                 0x3005
-#define GL_MAX_CLIP_DISTANCES             0x0D32
-#define GL_MAJOR_VERSION                  0x821B
-#define GL_MINOR_VERSION                  0x821C
-#define GL_NUM_EXTENSIONS                 0x821D
-#define GL_CONTEXT_FLAGS                  0x821E
-#define GL_DEPTH_BUFFER                   0x8223
-#define GL_STENCIL_BUFFER                 0x8224
-#define GL_COMPRESSED_RED                 0x8225
-#define GL_COMPRESSED_RG                  0x8226
-#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
-#define GL_RGBA32F                        0x8814
-#define GL_RGB32F                         0x8815
-#define GL_RGBA16F                        0x881A
-#define GL_RGB16F                         0x881B
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
-#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
-#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
-#define GL_CLAMP_READ_COLOR               0x891C
-#define GL_FIXED_ONLY                     0x891D
-#define GL_MAX_VARYING_COMPONENTS         0x8B4B
-#define GL_TEXTURE_1D_ARRAY               0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
-#define GL_TEXTURE_2D_ARRAY               0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
-#define GL_R11F_G11F_B10F                 0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
-#define GL_RGB9_E5                        0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
-#define GL_TEXTURE_SHARED_SIZE            0x8C3F
-#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
-#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
-#define GL_PRIMITIVES_GENERATED           0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
-#define GL_RASTERIZER_DISCARD             0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS            0x8C8C
-#define GL_SEPARATE_ATTRIBS               0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
-#define GL_RGBA32UI                       0x8D70
-#define GL_RGB32UI                        0x8D71
-#define GL_RGBA16UI                       0x8D76
-#define GL_RGB16UI                        0x8D77
-#define GL_RGBA8UI                        0x8D7C
-#define GL_RGB8UI                         0x8D7D
-#define GL_RGBA32I                        0x8D82
-#define GL_RGB32I                         0x8D83
-#define GL_RGBA16I                        0x8D88
-#define GL_RGB16I                         0x8D89
-#define GL_RGBA8I                         0x8D8E
-#define GL_RGB8I                          0x8D8F
-#define GL_RED_INTEGER                    0x8D94
-#define GL_GREEN_INTEGER                  0x8D95
-#define GL_BLUE_INTEGER                   0x8D96
-#define GL_RGB_INTEGER                    0x8D98
-#define GL_RGBA_INTEGER                   0x8D99
-#define GL_BGR_INTEGER                    0x8D9A
-#define GL_BGRA_INTEGER                   0x8D9B
-#define GL_SAMPLER_1D_ARRAY               0x8DC0
-#define GL_SAMPLER_2D_ARRAY               0x8DC1
-#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
-#define GL_UNSIGNED_INT_VEC2              0x8DC6
-#define GL_UNSIGNED_INT_VEC3              0x8DC7
-#define GL_UNSIGNED_INT_VEC4              0x8DC8
-#define GL_INT_SAMPLER_1D                 0x8DC9
-#define GL_INT_SAMPLER_2D                 0x8DCA
-#define GL_INT_SAMPLER_3D                 0x8DCB
-#define GL_INT_SAMPLER_CUBE               0x8DCC
-#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
-#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
-#define GL_QUERY_WAIT                     0x8E13
-#define GL_QUERY_NO_WAIT                  0x8E14
-#define GL_QUERY_BY_REGION_WAIT           0x8E15
-#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
-/* Reuse tokens from ARB_depth_buffer_float */
-/* reuse GL_DEPTH_COMPONENT32F */
-/* reuse GL_DEPTH32F_STENCIL8 */
-/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
-/* Reuse tokens from ARB_framebuffer_object */
-/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-/* reuse GL_FRAMEBUFFER_DEFAULT */
-/* reuse GL_FRAMEBUFFER_UNDEFINED */
-/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
-/* reuse GL_INDEX */
-/* reuse GL_MAX_RENDERBUFFER_SIZE */
-/* reuse GL_DEPTH_STENCIL */
-/* reuse GL_UNSIGNED_INT_24_8 */
-/* reuse GL_DEPTH24_STENCIL8 */
-/* reuse GL_TEXTURE_STENCIL_SIZE */
-/* reuse GL_TEXTURE_RED_TYPE */
-/* reuse GL_TEXTURE_GREEN_TYPE */
-/* reuse GL_TEXTURE_BLUE_TYPE */
-/* reuse GL_TEXTURE_ALPHA_TYPE */
-/* reuse GL_TEXTURE_DEPTH_TYPE */
-/* reuse GL_UNSIGNED_NORMALIZED */
-/* reuse GL_FRAMEBUFFER_BINDING */
-/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
-/* reuse GL_RENDERBUFFER_BINDING */
-/* reuse GL_READ_FRAMEBUFFER */
-/* reuse GL_DRAW_FRAMEBUFFER */
-/* reuse GL_READ_FRAMEBUFFER_BINDING */
-/* reuse GL_RENDERBUFFER_SAMPLES */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-/* reuse GL_FRAMEBUFFER_COMPLETE */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
-/* reuse GL_MAX_COLOR_ATTACHMENTS */
-/* reuse GL_COLOR_ATTACHMENT0 */
-/* reuse GL_COLOR_ATTACHMENT1 */
-/* reuse GL_COLOR_ATTACHMENT2 */
-/* reuse GL_COLOR_ATTACHMENT3 */
-/* reuse GL_COLOR_ATTACHMENT4 */
-/* reuse GL_COLOR_ATTACHMENT5 */
-/* reuse GL_COLOR_ATTACHMENT6 */
-/* reuse GL_COLOR_ATTACHMENT7 */
-/* reuse GL_COLOR_ATTACHMENT8 */
-/* reuse GL_COLOR_ATTACHMENT9 */
-/* reuse GL_COLOR_ATTACHMENT10 */
-/* reuse GL_COLOR_ATTACHMENT11 */
-/* reuse GL_COLOR_ATTACHMENT12 */
-/* reuse GL_COLOR_ATTACHMENT13 */
-/* reuse GL_COLOR_ATTACHMENT14 */
-/* reuse GL_COLOR_ATTACHMENT15 */
-/* reuse GL_DEPTH_ATTACHMENT */
-/* reuse GL_STENCIL_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER */
-/* reuse GL_RENDERBUFFER */
-/* reuse GL_RENDERBUFFER_WIDTH */
-/* reuse GL_RENDERBUFFER_HEIGHT */
-/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
-/* reuse GL_STENCIL_INDEX1 */
-/* reuse GL_STENCIL_INDEX4 */
-/* reuse GL_STENCIL_INDEX8 */
-/* reuse GL_STENCIL_INDEX16 */
-/* reuse GL_RENDERBUFFER_RED_SIZE */
-/* reuse GL_RENDERBUFFER_GREEN_SIZE */
-/* reuse GL_RENDERBUFFER_BLUE_SIZE */
-/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
-/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
-/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-/* reuse GL_MAX_SAMPLES */
-/* Reuse tokens from ARB_framebuffer_sRGB */
-/* reuse GL_FRAMEBUFFER_SRGB */
-/* Reuse tokens from ARB_half_float_vertex */
-/* reuse GL_HALF_FLOAT */
-/* Reuse tokens from ARB_map_buffer_range */
-/* reuse GL_MAP_READ_BIT */
-/* reuse GL_MAP_WRITE_BIT */
-/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
-/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
-/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
-/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
-/* Reuse tokens from ARB_texture_compression_rgtc */
-/* reuse GL_COMPRESSED_RED_RGTC1 */
-/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
-/* reuse GL_COMPRESSED_RG_RGTC2 */
-/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
-/* Reuse tokens from ARB_texture_rg */
-/* reuse GL_RG */
-/* reuse GL_RG_INTEGER */
-/* reuse GL_R8 */
-/* reuse GL_R16 */
-/* reuse GL_RG8 */
-/* reuse GL_RG16 */
-/* reuse GL_R16F */
-/* reuse GL_R32F */
-/* reuse GL_RG16F */
-/* reuse GL_RG32F */
-/* reuse GL_R8I */
-/* reuse GL_R8UI */
-/* reuse GL_R16I */
-/* reuse GL_R16UI */
-/* reuse GL_R32I */
-/* reuse GL_R32UI */
-/* reuse GL_RG8I */
-/* reuse GL_RG8UI */
-/* reuse GL_RG16I */
-/* reuse GL_RG16UI */
-/* reuse GL_RG32I */
-/* reuse GL_RG32UI */
-/* Reuse tokens from ARB_vertex_array_object */
-/* reuse GL_VERTEX_ARRAY_BINDING */
-#endif
-
-#ifndef GL_ARB_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
-#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
-#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
-#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
-#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
-#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
-#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
-#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
-#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
-#define GL_FRAMEBUFFER_DEFAULT            0x8218
-#define GL_FRAMEBUFFER_UNDEFINED          0x8219
-#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
-#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
-#define GL_DEPTH_STENCIL                  0x84F9
-#define GL_UNSIGNED_INT_24_8              0x84FA
-#define GL_DEPTH24_STENCIL8               0x88F0
-#define GL_TEXTURE_STENCIL_SIZE           0x88F1
-#define GL_TEXTURE_RED_TYPE               0x8C10
-#define GL_TEXTURE_GREEN_TYPE             0x8C11
-#define GL_TEXTURE_BLUE_TYPE              0x8C12
-#define GL_TEXTURE_ALPHA_TYPE             0x8C13
-#define GL_TEXTURE_DEPTH_TYPE             0x8C16
-#define GL_UNSIGNED_NORMALIZED            0x8C17
-#define GL_FRAMEBUFFER_BINDING            0x8CA6
-#define GL_DRAW_FRAMEBUFFER_BINDING       GL_FRAMEBUFFER_BINDING
-#define GL_RENDERBUFFER_BINDING           0x8CA7
-#define GL_READ_FRAMEBUFFER               0x8CA8
-#define GL_DRAW_FRAMEBUFFER               0x8CA9
-#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
-#define GL_RENDERBUFFER_SAMPLES           0x8CAB
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
-#define GL_COLOR_ATTACHMENT0              0x8CE0
-#define GL_COLOR_ATTACHMENT1              0x8CE1
-#define GL_COLOR_ATTACHMENT2              0x8CE2
-#define GL_COLOR_ATTACHMENT3              0x8CE3
-#define GL_COLOR_ATTACHMENT4              0x8CE4
-#define GL_COLOR_ATTACHMENT5              0x8CE5
-#define GL_COLOR_ATTACHMENT6              0x8CE6
-#define GL_COLOR_ATTACHMENT7              0x8CE7
-#define GL_COLOR_ATTACHMENT8              0x8CE8
-#define GL_COLOR_ATTACHMENT9              0x8CE9
-#define GL_COLOR_ATTACHMENT10             0x8CEA
-#define GL_COLOR_ATTACHMENT11             0x8CEB
-#define GL_COLOR_ATTACHMENT12             0x8CEC
-#define GL_COLOR_ATTACHMENT13             0x8CED
-#define GL_COLOR_ATTACHMENT14             0x8CEE
-#define GL_COLOR_ATTACHMENT15             0x8CEF
-#define GL_DEPTH_ATTACHMENT               0x8D00
-#define GL_STENCIL_ATTACHMENT             0x8D20
-#define GL_FRAMEBUFFER                    0x8D40
-#define GL_RENDERBUFFER                   0x8D41
-#define GL_RENDERBUFFER_WIDTH             0x8D42
-#define GL_RENDERBUFFER_HEIGHT            0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
-#define GL_STENCIL_INDEX1                 0x8D46
-#define GL_STENCIL_INDEX4                 0x8D47
-#define GL_STENCIL_INDEX8                 0x8D48
-#define GL_STENCIL_INDEX16                0x8D49
-#define GL_RENDERBUFFER_RED_SIZE          0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
-#define GL_MAX_SAMPLES                    0x8D57
-#endif
-
-#ifndef GL_ARB_map_buffer_range
-#define GL_MAP_READ_BIT                   0x0001
-#define GL_MAP_WRITE_BIT                  0x0002
-#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
-#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
-#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
-#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
-#endif
-
-#ifndef GL_ARB_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING           0x85B5
-#endif
-
-#ifndef GL_ARB_depth_buffer_float
-#define GL_DEPTH_COMPONENT32F             0x8CAC
-#define GL_DEPTH32F_STENCIL8              0x8CAD
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
-#endif
-
-#ifndef GL_ARB_framebuffer_sRGB
-#define GL_FRAMEBUFFER_SRGB               0x8DB9
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB                 0x140B
-#endif
-
-#ifndef GL_ARB_texture_compression_rgtc
-#define GL_COMPRESSED_RED_RGTC1           0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
-#define GL_COMPRESSED_RG_RGTC2            0x8DBD
-#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
-#endif
-
-#ifndef GL_ARB_texture_rg
-#define GL_RG                             0x8227
-#define GL_RG_INTEGER                     0x8228
-#define GL_R8                             0x8229
-#define GL_R16                            0x822A
-#define GL_RG8                            0x822B
-#define GL_RG16                           0x822C
-#define GL_R16F                           0x822D
-#define GL_R32F                           0x822E
-#define GL_RG16F                          0x822F
-#define GL_RG32F                          0x8230
-#define GL_R8I                            0x8231
-#define GL_R8UI                           0x8232
-#define GL_R16I                           0x8233
-#define GL_R16UI                          0x8234
-#define GL_R32I                           0x8235
-#define GL_R32UI                          0x8236
-#define GL_RG8I                           0x8237
-#define GL_RG8UI                          0x8238
-#define GL_RG16I                          0x8239
-#define GL_RG16UI                         0x823A
-#define GL_RG32I                          0x823B
-#define GL_RG32UI                         0x823C
-#endif
-
-
-/*************************************************************/
-
-#include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;
-#endif
-
-#ifndef GL_VERSION_1_5
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#ifndef GL_ARB_shader_objects
-/* GL types for program/shader text and shader object handles */
-typedef char GLcharARB;
-typedef unsigned int GLhandleARB;
-#endif
-
-/* GL type for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
-#ifndef GL_NV_half_float
-typedef unsigned short GLhalfNV;
-#endif
-
-#ifndef GL_VERSION_1_0
-#define GL_VERSION_1_0 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glCullFace (GLenum);
-GLAPI void APIENTRY glFrontFace (GLenum);
-GLAPI void APIENTRY glHint (GLenum, GLenum);
-GLAPI void APIENTRY glLineWidth (GLfloat);
-GLAPI void APIENTRY glPointSize (GLfloat);
-GLAPI void APIENTRY glPolygonMode (GLenum, GLenum);
-GLAPI void APIENTRY glScissor (GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glTexParameterf (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glTexParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glTexParameteri (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glTexParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glTexImage1D (GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexImage2D (GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawBuffer (GLenum);
-GLAPI void APIENTRY glClear (GLbitfield);
-GLAPI void APIENTRY glClearColor (GLclampf, GLclampf, GLclampf, GLclampf);
-GLAPI void APIENTRY glClearStencil (GLint);
-GLAPI void APIENTRY glClearDepth (GLclampd);
-GLAPI void APIENTRY glStencilMask (GLuint);
-GLAPI void APIENTRY glColorMask (GLboolean, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glDepthMask (GLboolean);
-GLAPI void APIENTRY glDisable (GLenum);
-GLAPI void APIENTRY glEnable (GLenum);
-GLAPI void APIENTRY glFinish (void);
-GLAPI void APIENTRY glFlush (void);
-GLAPI void APIENTRY glBlendFunc (GLenum, GLenum);
-GLAPI void APIENTRY glLogicOp (GLenum);
-GLAPI void APIENTRY glStencilFunc (GLenum, GLint, GLuint);
-GLAPI void APIENTRY glStencilOp (GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glDepthFunc (GLenum);
-GLAPI void APIENTRY glPixelStoref (GLenum, GLfloat);
-GLAPI void APIENTRY glPixelStorei (GLenum, GLint);
-GLAPI void APIENTRY glReadBuffer (GLenum);
-GLAPI void APIENTRY glReadPixels (GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetBooleanv (GLenum, GLboolean *);
-GLAPI void APIENTRY glGetDoublev (GLenum, GLdouble *);
-GLAPI GLenum APIENTRY glGetError (void);
-GLAPI void APIENTRY glGetFloatv (GLenum, GLfloat *);
-GLAPI void APIENTRY glGetIntegerv (GLenum, GLint *);
-GLAPI const GLubyte * APIENTRY glGetString (GLenum);
-GLAPI void APIENTRY glGetTexImage (GLenum, GLint, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetTexParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetTexParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetTexLevelParameterfv (GLenum, GLint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetTexLevelParameteriv (GLenum, GLint, GLenum, GLint *);
-GLAPI GLboolean APIENTRY glIsEnabled (GLenum);
-GLAPI void APIENTRY glDepthRange (GLclampd, GLclampd);
-GLAPI void APIENTRY glViewport (GLint, GLint, GLsizei, GLsizei);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCULLFACEPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLFRONTFACEPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLHINTPROC) (GLenum target, GLenum mode);
-typedef void (APIENTRYP PFNGLLINEWIDTHPROC) (GLfloat width);
-typedef void (APIENTRYP PFNGLPOINTSIZEPROC) (GLfloat size);
-typedef void (APIENTRYP PFNGLPOLYGONMODEPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRYP PFNGLSCISSORPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLTEXPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLTEXPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXIMAGE1DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLDRAWBUFFERPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLCLEARPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLCLEARCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLCLEARSTENCILPROC) (GLint s);
-typedef void (APIENTRYP PFNGLCLEARDEPTHPROC) (GLclampd depth);
-typedef void (APIENTRYP PFNGLSTENCILMASKPROC) (GLuint mask);
-typedef void (APIENTRYP PFNGLCOLORMASKPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-typedef void (APIENTRYP PFNGLDEPTHMASKPROC) (GLboolean flag);
-typedef void (APIENTRYP PFNGLDISABLEPROC) (GLenum cap);
-typedef void (APIENTRYP PFNGLENABLEPROC) (GLenum cap);
-typedef void (APIENTRYP PFNGLFINISHPROC) (void);
-typedef void (APIENTRYP PFNGLFLUSHPROC) (void);
-typedef void (APIENTRYP PFNGLBLENDFUNCPROC) (GLenum sfactor, GLenum dfactor);
-typedef void (APIENTRYP PFNGLLOGICOPPROC) (GLenum opcode);
-typedef void (APIENTRYP PFNGLSTENCILFUNCPROC) (GLenum func, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILOPPROC) (GLenum fail, GLenum zfail, GLenum zpass);
-typedef void (APIENTRYP PFNGLDEPTHFUNCPROC) (GLenum func);
-typedef void (APIENTRYP PFNGLPIXELSTOREFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELSTOREIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLREADBUFFERPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-typedef void (APIENTRYP PFNGLGETBOOLEANVPROC) (GLenum pname, GLboolean *params);
-typedef void (APIENTRYP PFNGLGETDOUBLEVPROC) (GLenum pname, GLdouble *params);
-typedef GLenum (APIENTRYP PFNGLGETERRORPROC) (void);
-typedef void (APIENTRYP PFNGLGETFLOATVPROC) (GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETINTEGERVPROC) (GLenum pname, GLint *params);
-typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGPROC) (GLenum name);
-typedef void (APIENTRYP PFNGLGETTEXIMAGEPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC) (GLenum target, GLint level, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC) (GLenum target, GLint level, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC) (GLenum cap);
-typedef void (APIENTRYP PFNGLDEPTHRANGEPROC) (GLclampd near_val, GLclampd far_val); /* MSVC can't handle near or far var names */
-typedef void (APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_1
-#define GL_VERSION_1_1 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glDrawArrays (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glDrawElements (GLenum, GLsizei, GLenum, const GLvoid *);
-GLAPI void APIENTRY glGetPointerv (GLenum, GLvoid* *);
-GLAPI void APIENTRY glPolygonOffset (GLfloat, GLfloat);
-GLAPI void APIENTRY glCopyTexImage1D (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexImage2D (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexSubImage1D (GLenum, GLint, GLint, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage2D (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glBindTexture (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteTextures (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenTextures (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsTexture (GLuint);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETPROC) (GLfloat factor, GLfloat units);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLBINDTEXTUREPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLDELETETEXTURESPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRYP PFNGLGENTEXTURESPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREPROC) (GLuint texture);
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
-GLAPI void APIENTRY glBlendEquation (GLenum);
-GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum);
-GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
-GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint);
-GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
-GLAPI void APIENTRY glEndQuery (GLenum);
-GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
-GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
-GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
-GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
-GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
-GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
-GLAPI void APIENTRY glCompileShader (GLuint);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum);
-GLAPI void APIENTRY glDeleteProgram (GLuint);
-GLAPI void APIENTRY glDeleteShader (GLuint);
-GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint);
-GLAPI GLboolean APIENTRY glIsShader (GLuint);
-GLAPI void APIENTRY glLinkProgram (GLuint);
-GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
-GLAPI void APIENTRY glUseProgram (GLuint);
-GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1i (GLint, GLint);
-GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glValidateProgram (GLuint);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_VERSION_2_1 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glUniformMatrix2x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix2x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-#endif
-
-#ifndef GL_VERSION_3_0
-#define GL_VERSION_3_0 1
-/* OpenGL 3.0 also reuses entry points from these extensions: */
-/* ARB_framebuffer_object */
-/* ARB_map_buffer_range */
-/* ARB_vertex_array_object */
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glColorMaski (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glGetBooleani_v (GLenum, GLuint, GLboolean *);
-GLAPI void APIENTRY glGetIntegeri_v (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glEnablei (GLenum, GLuint);
-GLAPI void APIENTRY glDisablei (GLenum, GLuint);
-GLAPI GLboolean APIENTRY glIsEnabledi (GLenum, GLuint);
-GLAPI void APIENTRY glBeginTransformFeedback (GLenum);
-GLAPI void APIENTRY glEndTransformFeedback (void);
-GLAPI void APIENTRY glBindBufferRange (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
-GLAPI void APIENTRY glBindBufferBase (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint, GLsizei, const GLchar* *, GLenum);
-GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
-GLAPI void APIENTRY glClampColor (GLenum, GLenum);
-GLAPI void APIENTRY glBeginConditionalRender (GLuint, GLenum);
-GLAPI void APIENTRY glEndConditionalRender (void);
-GLAPI void APIENTRY glVertexAttribIPointer (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribIiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint, GLenum, GLuint *);
-GLAPI void APIENTRY glGetUniformuiv (GLuint, GLint, GLuint *);
-GLAPI void APIENTRY glBindFragDataLocation (GLuint, GLuint, const GLchar *);
-GLAPI GLint APIENTRY glGetFragDataLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glUniform1ui (GLint, GLuint);
-GLAPI void APIENTRY glUniform2ui (GLint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform3ui (GLint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform4ui (GLint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform1uiv (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform2uiv (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform3uiv (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform4uiv (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glTexParameterIiv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glTexParameterIuiv (GLenum, GLenum, const GLuint *);
-GLAPI void APIENTRY glGetTexParameterIiv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetTexParameterIuiv (GLenum, GLenum, GLuint *);
-GLAPI void APIENTRY glClearBufferiv (GLenum, GLint, const GLint *);
-GLAPI void APIENTRY glClearBufferuiv (GLenum, GLint, const GLuint *);
-GLAPI void APIENTRY glClearBufferfv (GLenum, GLint, const GLfloat *);
-GLAPI void APIENTRY glClearBufferfi (GLenum, GLint, GLfloat, GLint);
-GLAPI const GLubyte * APIENTRY glGetStringi (GLenum, GLuint);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
-typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
-typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
-#endif
-
-#ifndef GL_ARB_framebuffer_object
-#define GL_ARB_framebuffer_object 1
-#ifdef GL3_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint);
-GLAPI void APIENTRY glBindRenderbuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenRenderbuffers (GLsizei, GLuint *);
-GLAPI void APIENTRY glRenderbufferStorage (GLenum, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum, GLenum, GLint *);
-GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint);
-GLAPI void APIENTRY glBindFramebuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteFramebuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFramebuffers (GLsizei, GLuint *);
-GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum);
-GLAPI void APIENTRY glFramebufferTexture1D (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture2D (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture3D (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGenerateMipmap (GLenum);
-GLAPI void APIENTRY glBlitFramebuffer (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
-GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glFramebufferTextureLayer (GLenum, GLenum, GLuint, GLint, GLint);
-#endif /* GL3_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-#endif
-
-#ifndef GL_ARB_map_buffer_range
-#define GL_ARB_map_buffer_range 1
-#ifdef GL3_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapBufferRange (GLenum, GLintptr, GLsizeiptr, GLbitfield);
-GLAPI void APIENTRY glFlushMappedBufferRange (GLenum, GLintptr, GLsizeiptr);
-#endif /* GL3_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
-#endif
-
-#ifndef GL_ARB_vertex_array_object
-#define GL_ARB_vertex_array_object 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArray (GLuint);
-GLAPI void APIENTRY glDeleteVertexArrays (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenVertexArrays (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsVertexArray (GLuint);
-#endif /* GL3_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
-#endif
-
-/* Include Post-GL 3.0 changes and extensions */
-#include <GL3/gl3ext.h>
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/make/stub_includes/opengl/GL3_/gl3ext.h b/make/stub_includes/opengl/GL3_/gl3ext.h
deleted file mode 100644
index aa1ecb542..000000000
--- a/make/stub_includes/opengl/GL3_/gl3ext.h
+++ /dev/null
@@ -1,579 +0,0 @@
-#ifndef __gl3ext_h_
-#define __gl3ext_h_
-
-#include "gl3-64bit-types.h"
-
-/*
- * ------------------------------------------------
- * Everything here and below was added manually
- * to the version of glext.h obtained from:
- * http://oss.sgi.com/projects/ogl-sample/registry/index.html
- * ------------------------------------------------
- *
- * Structure is:
- *    #ifndef GL_EXTENSION_NAME
- *    Add DEFINES here
- *    #endif
- *    #ifndef GL_EXTENSION_NAME
- *    Add TYPEDEFS here
- *    #endif
- *    #ifndef GL_EXTENSION_NAME
- *    #define GL_EXTENSION_NAME 1
- *    #ifdef GL_GL3EXT_PROTOTYPES
- *    Add FUNCTION DECLARATIONS here
- *    #endif
- *    FUNCTION POINTER DECLARATIONS NOT NEEDED
- *    #endif
- */
-  
-
-#ifndef GL_VERSION_3_1
-#define GL_SAMPLER_2D_RECT                0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW         0x8B64
-#define GL_SAMPLER_BUFFER                 0x8DC2
-#define GL_INT_SAMPLER_2D_RECT            0x8DCD
-#define GL_INT_SAMPLER_BUFFER             0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT   0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER    0x8DD8
-#define GL_TEXTURE_BUFFER                 0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE        0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER         0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT          0x8C2E
-#define GL_TEXTURE_RECTANGLE              0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
-#define GL_RED_SNORM                      0x8F90
-#define GL_RG_SNORM                       0x8F91
-#define GL_RGB_SNORM                      0x8F92
-#define GL_RGBA_SNORM                     0x8F93
-#define GL_R8_SNORM                       0x8F94
-#define GL_RG8_SNORM                      0x8F95
-#define GL_RGB8_SNORM                     0x8F96
-#define GL_RGBA8_SNORM                    0x8F97
-#define GL_R16_SNORM                      0x8F98
-#define GL_RG16_SNORM                     0x8F99
-#define GL_RGB16_SNORM                    0x8F9A
-#define GL_RGBA16_SNORM                   0x8F9B
-#define GL_SIGNED_NORMALIZED              0x8F9C
-#define GL_PRIMITIVE_RESTART              0x8F9D
-#define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
-/* Reuse tokens from ARB_copy_buffer */
-/* reuse GL_COPY_READ_BUFFER */
-/* reuse GL_COPY_WRITE_BUFFER */
-/* Would reuse tokens from ARB_draw_instanced, but it has none */
-/* Reuse tokens from ARB_uniform_buffer_object */
-/* reuse GL_UNIFORM_BUFFER */
-/* reuse GL_UNIFORM_BUFFER_BINDING */
-/* reuse GL_UNIFORM_BUFFER_START */
-/* reuse GL_UNIFORM_BUFFER_SIZE */
-/* reuse GL_MAX_VERTEX_UNIFORM_BLOCKS */
-/* reuse GL_MAX_FRAGMENT_UNIFORM_BLOCKS */
-/* reuse GL_MAX_COMBINED_UNIFORM_BLOCKS */
-/* reuse GL_MAX_UNIFORM_BUFFER_BINDINGS */
-/* reuse GL_MAX_UNIFORM_BLOCK_SIZE */
-/* reuse GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS */
-/* reuse GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT */
-/* reuse GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH */
-/* reuse GL_ACTIVE_UNIFORM_BLOCKS */
-/* reuse GL_UNIFORM_TYPE */
-/* reuse GL_UNIFORM_SIZE */
-/* reuse GL_UNIFORM_NAME_LENGTH */
-/* reuse GL_UNIFORM_BLOCK_INDEX */
-/* reuse GL_UNIFORM_OFFSET */
-/* reuse GL_UNIFORM_ARRAY_STRIDE */
-/* reuse GL_UNIFORM_MATRIX_STRIDE */
-/* reuse GL_UNIFORM_IS_ROW_MAJOR */
-/* reuse GL_UNIFORM_BLOCK_BINDING */
-/* reuse GL_UNIFORM_BLOCK_DATA_SIZE */
-/* reuse GL_UNIFORM_BLOCK_NAME_LENGTH */
-/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS */
-/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER */
-/* reuse GL_INVALID_INDEX */
-#endif
-#ifndef GL_VERSION_3_1
-#define GL_VERSION_3_1 1
-/* OpenGL 3.1 also reuses entry points from these extensions: */
-/* ARB_copy_buffer */
-/* ARB_uniform_buffer_object */
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstanced (GLenum, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glDrawElementsInstanced (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
-GLAPI void APIENTRY glTexBuffer (GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint);
-#endif /* GL3_PROTOTYPES */
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-
-#ifndef GL_ARB_copy_buffer
-#define GL_COPY_READ_BUFFER               0x8F36
-#define GL_COPY_WRITE_BUFFER              0x8F37
-#endif
-#ifndef GL_ARB_copy_buffer
-#define GL_ARB_copy_buffer 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glCopyBufferSubData (GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr);
-#endif /* GL3_PROTOTYPES */
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-
-#ifndef GL_ARB_uniform_buffer_object
-#define GL_UNIFORM_BUFFER                 0x8A11
-#define GL_UNIFORM_BUFFER_BINDING         0x8A28
-#define GL_UNIFORM_BUFFER_START           0x8A29
-#define GL_UNIFORM_BUFFER_SIZE            0x8A2A
-#define GL_MAX_VERTEX_UNIFORM_BLOCKS      0x8A2B
-#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS    0x8A2C
-#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS    0x8A2D
-#define GL_MAX_COMBINED_UNIFORM_BLOCKS    0x8A2E
-#define GL_MAX_UNIFORM_BUFFER_BINDINGS    0x8A2F
-#define GL_MAX_UNIFORM_BLOCK_SIZE         0x8A30
-#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
-#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
-#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
-#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
-#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
-#define GL_ACTIVE_UNIFORM_BLOCKS          0x8A36
-#define GL_UNIFORM_TYPE                   0x8A37
-#define GL_UNIFORM_SIZE                   0x8A38
-#define GL_UNIFORM_NAME_LENGTH            0x8A39
-#define GL_UNIFORM_BLOCK_INDEX            0x8A3A
-#define GL_UNIFORM_OFFSET                 0x8A3B
-#define GL_UNIFORM_ARRAY_STRIDE           0x8A3C
-#define GL_UNIFORM_MATRIX_STRIDE          0x8A3D
-#define GL_UNIFORM_IS_ROW_MAJOR           0x8A3E
-#define GL_UNIFORM_BLOCK_BINDING          0x8A3F
-#define GL_UNIFORM_BLOCK_DATA_SIZE        0x8A40
-#define GL_UNIFORM_BLOCK_NAME_LENGTH      0x8A41
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS  0x8A42
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
-/** Manual: #define GL_INVALID_INDEX                  -1 == (int) 0xFFFFFFFFu */
-#endif
-#ifndef GL_ARB_uniform_buffer_object
-#define GL_ARB_uniform_buffer_object 1
-#ifdef GL3_PROTOTYPES
-GLAPI void APIENTRY glGetUniformIndices (GLuint, GLsizei, const GLchar* *, GLuint *);
-GLAPI void APIENTRY glGetActiveUniformsiv (GLuint, GLsizei, const GLuint *, GLenum, GLint *);
-GLAPI void APIENTRY glGetActiveUniformName (GLuint, GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint, GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glUniformBlockBinding (GLuint, GLuint, GLuint);
-#endif /* GL3_PROTOTYPES */
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-
-#ifndef GL_VERSION_3_2
-#define GL_VERSION_3_2 1
-/* OpenGL 3.2 also reuses entry points from these extensions: */
-/* ARB_vertex_array_bgra */
-/* ARB_draw_elements_base_vertex */
-/* ARB_fragment_coord_conventions */
-/* ARB_provoking_vertex */
-/* ARB_seamless_cube_map */
-/* ARB_texture_multisample */
-/* ARB_depth_clamp */
-/* ARB_geometry_shader4 */
-/* ARB_sync */
-#ifdef GL_GL3EXT_PROTOTYPES
-#endif /* GL3_PROTOTYPES */
-#endif
-
-/**
- * http://www.opengl.org/registry/specs/ARB/vertex_array_bgra.txt
- */
-#ifndef GL_ARB_vertex_array_bgra
-#define GL_BGRA 0x80E1
-#endif
-#ifndef GL_ARB_vertex_array_bgra
-#define GL_ARB_vertex_array_bgra 1
-#ifdef GL_GL3EXT_PROTOTYPES
-/* No FUNCTIONS */
-#endif
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-/**
- * http://www.opengl.org/registry/specs/ARB/draw_elements_base_vertex.txt
- */
-#ifndef GL_ARB_draw_elements_base_vertex
-/* No TOKENS */
-#endif
-#ifndef GL_ARB_draw_elements_base_vertex
-#define GL_ARB_draw_elements_base_vertex 1
-#ifdef GL_GL3EXT_PROTOTYPES
-GLAPI void APIENTRY glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
-         GLvoid *indices, GLint basevertex);
-GLAPI void APIENTRY glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
-         GLsizei count, GLenum type, GLvoid *indices, GLint basevertex);
-GLAPI void APIENTRY glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count,
-         GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
-GLAPI void APIENTRY glMultiDrawElementsBaseVertex(GLenum mode, GLsizei *count, GLenum type,
-         GLvoid **indices, GLsizei primcount, GLint *basevertex);
-#endif
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-/**
- * http://www.opengl.org/registry/specs/ARB/fragment_coord_conventions.txt
- */
-#ifndef GL_ARB_fragment_coord_conventions
-/* No Tokens */
-#endif
-#ifndef GL_ARB_fragment_coord_conventions
-#define GL_ARB_fragment_coord_conventions 1
-#ifdef GL_GL3EXT_PROTOTYPES
-/* No Functions */
-#endif
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-/**
- * http://www.opengl.org/registry/specs/ARB/provoking_vertex.txt
- */
-#ifndef GL_ARB_provoking_vertex
-#define GL_FIRST_VERTEX_CONVENTION                   0x8E4D
-#define GL_LAST_VERTEX_CONVENTION                    0x8E4E
-#define GL_PROVOKING_VERTEX                          0x8E4F
-#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION  0x8E4C
-#endif
-#ifndef GL_ARB_provoking_vertex
-#define GL_ARB_provoking_vertex 1
-#ifdef GL_GL3EXT_PROTOTYPES
-GLAPI void APIENTRY glProvokingVertex(GLenum mode);
-#endif
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-/**
- * http://www.opengl.org/registry/specs/ARB/seamless_cube_map.txt
- */
-#ifndef GL_ARB_seamless_cube_map
-#define GL_TEXTURE_CUBE_MAP_SEAMLESS                   0x884F
-#endif
-#ifndef GL_ARB_seamless_cube_map
-#define GL_ARB_seamless_cube_map 1
-#ifdef GL_GL3EXT_PROTOTYPES
-/* No Functions */
-#endif
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-/**
- * http://www.opengl.org/registry/specs/ARB/texture_multisample.txt
- */
-#ifndef GL_ARB_texture_multisample
-#define GL_SAMPLE_POSITION                             0x8E50
-#define GL_SAMPLE_MASK                                 0x8E51
-#define GL_SAMPLE_MASK_VALUE                           0x8E52
-#define GL_TEXTURE_2D_MULTISAMPLE                      0x9100
-#define GL_PROXY_TEXTURE_2D_MULTISAMPLE                0x9101
-#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY                0x9102
-#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY          0x9103
-#define GL_MAX_SAMPLE_MASK_WORDS                       0x8E59
-#define GL_MAX_COLOR_TEXTURE_SAMPLES                   0x910E
-#define GL_MAX_DEPTH_TEXTURE_SAMPLES                   0x910F
-#define GL_MAX_INTEGER_SAMPLES                         0x9110
-#define GL_TEXTURE_BINDING_2D_MULTISAMPLE              0x9104
-#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY        0x9105
-#define GL_TEXTURE_SAMPLES                             0x9106
-#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS              0x9107
-#define GL_SAMPLER_2D_MULTISAMPLE                      0x9108
-#define GL_INT_SAMPLER_2D_MULTISAMPLE                  0x9109
-#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE         0x910A
-#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY                0x910B
-#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY            0x910C
-#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910D
-#endif
-#ifndef GL_ARB_texture_multisample
-#define GL_ARB_texture_multisample 1
-#ifdef GL_GL3EXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat,
-                               GLsizei width, GLsizei height,
-                               GLboolean fixedsamplelocations);
-GLAPI void APIENTRY glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat,
-                               GLsizei width, GLsizei height, GLsizei depth,
-                               GLboolean fixedsamplelocations);
-GLAPI void APIENTRY glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val);
-GLAPI void APIENTRY glSampleMaski(GLuint index, GLbitfield mask);
-#endif
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-/**
- * http://www.opengl.org/registry/specs/ARB/depth_clamp.txt
- */
-#ifndef GL_ARB_depth_clamp
-#define GL_DEPTH_CLAMP 0x864F
-#endif
-#ifndef GL_ARB_depth_clamp
-#define GL_ARB_depth_clamp 1
-#ifdef GL_GL3EXT_PROTOTYPES
-/* No FUNCTIONS */
-#endif
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-/**
- * http://www.opengl.org/registry/specs/ARB/geometry_shader4.txt
- */
-#ifndef GL_ARB_geometry_shader4
-#define GL_LINES_ADJACENCY_ARB            0x000A
-#define GL_LINE_STRIP_ADJACENCY_ARB       0x000B
-#define GL_TRIANGLES_ADJACENCY_ARB        0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY_ARB   0x000D
-#define GL_PROGRAM_POINT_SIZE_ARB         0x8642
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
-#define GL_GEOMETRY_SHADER_ARB            0x8DD9
-#define GL_GEOMETRY_VERTICES_OUT_ARB      0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_ARB        0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_ARB       0x8DDC
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
-/* reuse GL_MAX_VARYING_COMPONENTS */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-#endif
-#ifndef GL_ARB_geometry_shader4
-#define GL_ARB_geometry_shader4 1
-#ifdef GL_GL3EXT_PROTOTYPES
-GLAPI void APIENTRY glProgramParameteriARB (GLuint, GLenum, GLint);
-GLAPI void APIENTRY glFramebufferTextureARB (GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum, GLenum, GLuint, GLint, GLenum);
-#endif
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-/**
- * http://www.opengl.org/registry/specs/ARB/sync.txt
- */
-#ifndef GL_ARB_sync
-#define GL_MAX_SERVER_WAIT_TIMEOUT    0x9111
-#define GL_OBJECT_TYPE                0x9112
-#define GL_SYNC_CONDITION             0x9113
-#define GL_SYNC_STATUS                0x9114
-#define GL_SYNC_FLAGS                 0x9115
-#define GL_SYNC_FENCE                 0x9116
-#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117
-#define GL_UNSIGNALED                 0x9118
-#define GL_SIGNALED                   0x9119
-#define GL_SYNC_FLUSH_COMMANDS_BIT    0x00000001
-/* Manual: #define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFul */
-#define GL_ALREADY_SIGNALED           0x911A
-#define GL_TIMEOUT_EXPIRED            0x911B
-#define GL_CONDITION_SATISFIED        0x911C
-#define GL_WAIT_FAILED                0x911D
-#endif
-#ifndef GL_ARB_sync
-typedef int64_t GLint64;
-typedef uint64_t GLuint64;
-typedef struct __GLsync *GLsync;
-#endif
-#ifndef GL_ARB_sync
-#define GL_ARB_sync 1
-#ifdef GL_GL3EXT_PROTOTYPES
-GLAPI GLsync    APIENTRY glFenceSync(GLenum condition, GLbitfield flags);
-GLAPI GLboolean APIENTRY glIsSync(GLsync sync);
-GLAPI void      APIENTRY glDeleteSync(GLsync sync);
-GLAPI GLenum    APIENTRY glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
-GLAPI void      APIENTRY glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
-GLAPI void      APIENTRY glGetInteger64v(GLenum pname, GLint64 *params);
-GLAPI void      APIENTRY glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-#endif
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-/**
- * Convenient names only .. actually subsumed into core
- */
-#ifndef GL_ARB_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_ARB_texture_rectangle 1
-#endif
-
-/**
- * http://www.opengl.org/registry/specs/AMD/vertex_shader_tessellator.txt
- */
-#ifndef GL_AMD_vertex_shader_tessellator
-#define GL_SAMPLER_BUFFER_AMD                0x9001
-#define GL_INT_SAMPLER_BUFFER_AMD            0x9002
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD   0x9003
-#define GL_DISCRETE_AMD                      0x9006
-#define GL_CONTINUOUS_AMD                    0x9007
-#define GL_TESSELLATION_MODE_AMD             0x9004
-#define GL_TESSELLATION_FACTOR_AMD           0x9005
-#endif
-#ifndef GL_AMD_vertex_shader_tessellator
-#define GL_AMD_vertex_shader_tessellator 1
-#ifdef GL_GL3EXT_PROTOTYPES
-GLAPI void APIENTRY glTessellationFactorAMD(GLfloat factor);
-GLAPI void APIENTRY glTessellationModeAMD(GLenum mode);
-#endif
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-/**
- * http://www.opengl.org/registry/specs/NV/shader_buffer_load.txt
- */
-#ifndef GL_NV_shader_buffer_load
-#define GL_BUFFER_GPU_ADDRESS_NV          0x8F1D
-#define GL_GPU_ADDRESS_NV                 0x8F34
-#define GL_MAX_SHADER_BUFFER_ADDRESS_NV   0x8F35
-#endif
-#ifndef GL_NV_shader_buffer_load
-#define GL_NV_shader_buffer_load 1
-#ifdef GL_GL3EXT_PROTOTYPES
-GLAPI void APIENTRY glMakeBufferResidentNV(GLenum target, GLenum access);
-GLAPI void APIENTRY glMakeBufferNonResidentNV(GLenum target);
-GLAPI GLboolean APIENTRY glIsBufferResidentNV(GLenum target);
-GLAPI void APIENTRY glNamedMakeBufferResidentNV(GLuint buffer, GLenum access);
-GLAPI void APIENTRY glNamedMakeBufferNonResidentNV(GLuint buffer);
-GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV(GLuint buffer);
-GLAPI void APIENTRY glGetBufferParameterui64vNV(GLenum target, GLenum pname, GLuint64 *params);
-GLAPI void APIENTRY glGetNamedBufferParameterui64vNV(GLuint buffer, GLenum pname, GLuint64 *params);
-GLAPI void APIENTRY glGetIntegerui64vNV(GLenum value, GLuint64 *result);
-GLAPI void APIENTRY glUniformui64NV(GLint location, GLuint64 value);
-GLAPI void APIENTRY glUniformui64vNV(GLint location, GLsizei count, GLuint64 *value);
-GLAPI void APIENTRY glGetUniformui64vNV(GLuint program, GLint location, GLuint64 *params);
-GLAPI void APIENTRY glProgramUniformui64NV(GLuint program, GLint location, GLuint64 value);
-GLAPI void APIENTRY glProgramUniformui64vNV(GLuint program, GLint location, GLsizei count, GLuint64 *value);
-#endif /* GL_GL3EXT_PROTOTYPES */
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-/**
- * http://www.opengl.org/registry/specs/NV/vertex_buffer_unified_memory.txt
- */
-#ifndef GL_NV_vertex_buffer_unified_memory
-#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV   0x8F1E
-#define GL_ELEMENT_ARRAY_UNIFIED_NV         0x8F1F
-#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV   0x8F20
-#define GL_VERTEX_ARRAY_ADDRESS_NV          0x8F21
-#define GL_NORMAL_ARRAY_ADDRESS_NV          0x8F22
-#define GL_COLOR_ARRAY_ADDRESS_NV           0x8F23
-#define GL_INDEX_ARRAY_ADDRESS_NV           0x8F24
-#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV   0x8F25
-#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV       0x8F26
-#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
-#define GL_FOG_COORD_ARRAY_ADDRESS_NV       0x8F28
-#define GL_ELEMENT_ARRAY_ADDRESS_NV         0x8F29
-#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV    0x8F2A
-#define GL_VERTEX_ARRAY_LENGTH_NV           0x8F2B
-#define GL_NORMAL_ARRAY_LENGTH_NV           0x8F2C
-#define GL_COLOR_ARRAY_LENGTH_NV            0x8F2D
-#define GL_INDEX_ARRAY_LENGTH_NV            0x8F2E
-#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV    0x8F2F
-#define GL_EDGE_FLAG_ARRAY_LENGTH_NV        0x8F30
-#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV  0x8F31
-#define GL_FOG_COORD_ARRAY_LENGTH_NV        0x8F32
-#define GL_ELEMENT_ARRAY_LENGTH_NV          0x8F33
-#endif
-#ifndef GL_NV_vertex_buffer_unified_memory
-#define GL_NV_vertex_buffer_unified_memory 1
-#ifdef GL_GL3EXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsEnabled( GLenum cap );     // extra requirement in core GL3
-GLAPI void APIENTRY glEnableClientState( GLenum cap );  // extra requirement in core GL3
-GLAPI void APIENTRY glDisableClientState( GLenum cap ); // extra requirement in core GL3
-GLAPI void APIENTRY glBufferAddressRangeNV(GLenum pname, GLuint index, GLuint64 address, GLsizeiptr length);
-GLAPI void APIENTRY glVertexFormatNV(GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glNormalFormatNV(GLenum type, GLsizei stride);
-GLAPI void APIENTRY glColorFormatNV(GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glIndexFormatNV(GLenum type, GLsizei stride);
-GLAPI void APIENTRY glTexCoordFormatNV(GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glEdgeFlagFormatNV(GLsizei stride);
-GLAPI void APIENTRY glSecondaryColorFormatNV(GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glFogCoordFormatNV(GLenum type, GLsizei stride);
-GLAPI void APIENTRY glVertexAttribFormatNV(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
-GLAPI void APIENTRY glVertexAttribIFormatNV(GLuint index, GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glGetIntegerui64i_vNV(GLenum value, GLuint index, GLuint64 *result);
-#endif /* GL_GL3EXT_PROTOTYPES */
-/* No need for explicit function pointer: we force generation of ProcAddress .. */
-#endif
-
-
-#ifndef GL_APPLE_float_pixels
-#define GL_HALF_APPLE                      0x140B
-#define GL_COLOR_FLOAT_APPLE               0x8A0F
-#define GL_RGBA_FLOAT32_APPLE              0x8814
-#define GL_RGB_FLOAT32_APPLE               0x8815
-#define GL_ALPHA_FLOAT32_APPLE             0x8816
-#define GL_INTENSITY_FLOAT32_APPLE         0x8817
-#define GL_LUMINANCE_FLOAT32_APPLE         0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE   0x8819
-#define GL_RGBA_FLOAT16_APPLE              0x881A
-#define GL_RGB_FLOAT16_APPLE               0x881B
-#define GL_ALPHA_FLOAT16_APPLE             0x881C
-#define GL_INTENSITY_FLOAT16_APPLE         0x881D
-#define GL_LUMINANCE_FLOAT16_APPLE         0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE   0x881F
-#endif
-
-#ifndef GL_APPLE_float_pixels
-#define GL_APPLE_float_pixels 1
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_RGBA_FLOAT32_ATI               0x8814
-#define GL_RGB_FLOAT32_ATI                0x8815
-#define GL_ALPHA_FLOAT32_ATI              0x8816
-#define GL_INTENSITY_FLOAT32_ATI          0x8817
-#define GL_LUMINANCE_FLOAT32_ATI          0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
-#define GL_RGBA_FLOAT16_ATI               0x881A
-#define GL_RGB_FLOAT16_ATI                0x881B
-#define GL_ALPHA_FLOAT16_ATI              0x881C
-#define GL_INTENSITY_FLOAT16_ATI          0x881D
-#define GL_LUMINANCE_FLOAT16_ATI          0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_ATI_texture_float 1
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_FLOAT_R_NV                     0x8880
-#define GL_FLOAT_RG_NV                    0x8881
-#define GL_FLOAT_RGB_NV                   0x8882
-#define GL_FLOAT_RGBA_NV                  0x8883
-#define GL_FLOAT_R16_NV                   0x8884
-#define GL_FLOAT_R32_NV                   0x8885
-#define GL_FLOAT_RG16_NV                  0x8886
-#define GL_FLOAT_RG32_NV                  0x8887
-#define GL_FLOAT_RGB16_NV                 0x8888
-#define GL_FLOAT_RGB32_NV                 0x8889
-#define GL_FLOAT_RGBA16_NV                0x888A
-#define GL_FLOAT_RGBA32_NV                0x888B
-#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
-#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
-#define GL_FLOAT_RGBA_MODE_NV             0x888E
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_NV_float_buffer 1
-#endif
-
-#endif /* __gl3ext_h_ */
-
diff --git a/src/jogl/classes/com/jogamp/opengl/util/AWTAnimatorImpl.java b/src/jogl/classes/com/jogamp/opengl/util/AWTAnimatorImpl.java
new file mode 100644
index 000000000..d8e1cf080
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/AWTAnimatorImpl.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.util;
+
+import java.awt.Component;
+import java.awt.EventQueue;
+import java.awt.Rectangle;
+import java.util.*;
+import javax.swing.*;
+
+import javax.media.opengl.*;
+
+/** Abstraction to factor out AWT dependencies from the Animator's
+    implementation in a way that still allows the FPSAnimator to pick
+    up this behavior if desired. */
+
+class AWTAnimatorImpl extends AnimatorImpl {
+    // For efficient rendering of Swing components, in particular when
+    // they overlap one another
+    private List lightweights    = new ArrayList();
+    private Map  repaintManagers = new IdentityHashMap();
+    private Map  dirtyRegions    = new IdentityHashMap();
+
+    public void display(Animator animator,
+                        boolean ignoreExceptions,
+                        boolean printExceptions) {
+        Iterator iter = animator.drawableIterator();
+        while (iter.hasNext()) {
+            GLAutoDrawable drawable = (GLAutoDrawable) iter.next();
+            if (drawable instanceof JComponent) {
+                // Lightweight components need a more efficient drawing
+                // scheme than simply forcing repainting of each one in
+                // turn since drawing one can force another one to be
+                // drawn in turn
+                lightweights.add(drawable);
+            } else {
+                try {
+                    drawable.display();
+                } catch (RuntimeException e) {
+                    if (ignoreExceptions) {
+                        if (printExceptions) {
+                            e.printStackTrace();
+                        }
+                    } else {
+                        throw(e);
+                    }
+                }
+            }
+        }
+        if (lightweights.size() > 0) {
+            try {
+                SwingUtilities.invokeAndWait(drawWithRepaintManagerRunnable);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            lightweights.clear();
+        }
+    }
+
+    // Uses RepaintManager APIs to implement more efficient redrawing of
+    // the Swing widgets we're animating
+    private Runnable drawWithRepaintManagerRunnable = new Runnable() {
+            public void run() {
+                for (Iterator iter = lightweights.iterator(); iter.hasNext(); ) {
+                    JComponent comp = (JComponent) iter.next();
+                    RepaintManager rm = RepaintManager.currentManager(comp);
+                    rm.markCompletelyDirty(comp);
+                    repaintManagers.put(rm, rm);
+
+                    // RepaintManagers don't currently optimize the case of
+                    // overlapping sibling components. If we have two
+                    // JInternalFrames in a JDesktopPane, the redraw of the
+                    // bottom one will cause the top one to be redrawn as
+                    // well. The top one will then be redrawn separately. In
+                    // order to optimize this case we need to compute the union
+                    // of all of the dirty regions on a particular JComponent if
+                    // optimized drawing isn't enabled for it.
+
+                    // Walk up the hierarchy trying to find a non-optimizable
+                    // ancestor
+                    Rectangle visible = comp.getVisibleRect();
+                    int x = visible.x;
+                    int y = visible.y;
+                    while (comp != null) {
+                        x += comp.getX();
+                        y += comp.getY();
+                        Component c = comp.getParent();
+                        if ((c == null) || (!(c instanceof JComponent))) {
+                            comp = null;
+                        } else {
+                            comp = (JComponent) c;
+                            if (!comp.isOptimizedDrawingEnabled()) {
+                                rm = RepaintManager.currentManager(comp);
+                                repaintManagers.put(rm, rm);
+                                // Need to dirty this region
+                                Rectangle dirty = (Rectangle) dirtyRegions.get(comp);
+                                if (dirty == null) {
+                                    dirty = new Rectangle(x, y, visible.width, visible.height);
+                                    dirtyRegions.put(comp, dirty);
+                                } else {
+                                    // Compute union with already dirty region
+                                    // Note we could compute multiple non-overlapping
+                                    // regions: might want to do that in the future
+                                    // (prob. need more complex algorithm -- dynamic
+                                    // programming?)
+                                    dirty.add(new Rectangle(x, y, visible.width, visible.height));
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Dirty any needed regions on non-optimizable components
+                for (Iterator iter = dirtyRegions.keySet().iterator(); iter.hasNext(); ) {
+                    JComponent comp = (JComponent) iter.next();
+                    Rectangle  rect = (Rectangle) dirtyRegions.get(comp);
+                    RepaintManager rm = RepaintManager.currentManager(comp);
+                    rm.addDirtyRegion(comp, rect.x, rect.y, rect.width, rect.height);
+                }
+
+                // Draw all dirty regions
+                for (Iterator iter = repaintManagers.keySet().iterator(); iter.hasNext(); ) {
+                    ((RepaintManager) iter.next()).paintDirtyRegions();
+                }
+                dirtyRegions.clear();
+                repaintManagers.clear();
+            }
+        };
+
+    public boolean skipWaitForStop(Thread thread) {
+        return ((Thread.currentThread() == thread) || EventQueue.isDispatchThread());
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/Animator.java b/src/jogl/classes/com/jogamp/opengl/util/Animator.java
new file mode 100755
index 000000000..30be0bd90
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/Animator.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util;
+
+import java.util.*;
+
+import javax.media.opengl.*;
+
+import com.jogamp.opengl.impl.Debug;
+
+/** <P> An Animator can be attached to one or more {@link
+    GLAutoDrawable}s to drive their display() methods in a loop. </P>
+
+    <P> The Animator class creates a background thread in which the
+    calls to <code>display()</code> are performed. After each drawable
+    has been redrawn, a brief pause is performed to avoid swamping the
+    CPU, unless {@link #setRunAsFastAsPossible} has been called.  </P>
+*/
+
+public class Animator {
+    protected static final boolean DEBUG = Debug.debug("Animator");
+
+    private volatile ArrayList/*<GLAutoDrawable>*/ drawables = new ArrayList();
+    private AnimatorImpl impl;
+    private Runnable runnable;
+    private boolean runAsFastAsPossible;
+    protected ThreadGroup threadGroup;
+    protected Thread thread;
+    protected volatile boolean shouldStop;
+    protected boolean ignoreExceptions;
+    protected boolean printExceptions;
+
+    /** Creates a new, empty Animator. */
+    public Animator(ThreadGroup tg) {
+
+        if(GLProfile.isAWTJOGLAvailable()) {
+            try {
+                impl = (AnimatorImpl) Class.forName("com.jogamp.opengl.util.awt.AWTAnimatorImpl").newInstance();
+            } catch (Exception e) { }
+        }
+        if(null==impl) {
+            impl = new AnimatorImpl();
+        }
+        threadGroup = tg;
+
+        if(DEBUG) {
+            System.out.println("Animator created, ThreadGroup: "+threadGroup);
+        }
+    }
+
+    public Animator() {
+        this((ThreadGroup)null);
+    }
+
+    /** Creates a new Animator for a particular drawable. */
+    public Animator(GLAutoDrawable drawable) {
+        this((ThreadGroup)null);
+        add(drawable);
+    }
+
+    /** Creates a new Animator for a particular drawable. */
+    public Animator(ThreadGroup tg, GLAutoDrawable drawable) {
+        this(tg);
+        add(drawable);
+    }
+
+    /** Adds a drawable to the list managed by this Animator. */
+    public synchronized void add(GLAutoDrawable drawable) {
+        ArrayList newList = (ArrayList) drawables.clone();
+        newList.add(drawable);
+        drawables = newList;
+        notifyAll();
+    }
+
+    /** Removes a drawable from the list managed by this Animator. */
+    public synchronized void remove(GLAutoDrawable drawable) {
+        ArrayList newList = (ArrayList) drawables.clone();
+        newList.remove(drawable);
+        drawables = newList;
+    }
+
+    /** Returns an iterator over the drawables managed by this
+        Animator. */
+    public Iterator/*<GLAutoDrawable>*/ drawableIterator() {
+        return drawables.iterator();
+    }
+
+    /** Sets a flag causing this Animator to ignore exceptions produced
+        while redrawing the drawables. By default this flag is set to
+        false, causing any exception thrown to halt the Animator. */
+    public void setIgnoreExceptions(boolean ignoreExceptions) {
+        this.ignoreExceptions = ignoreExceptions;
+    }
+
+    /** Sets a flag indicating that when exceptions are being ignored by
+        this Animator (see {@link #setIgnoreExceptions}), to print the
+        exceptions' stack traces for diagnostic information. Defaults to
+        false. */
+    public void setPrintExceptions(boolean printExceptions) {
+        this.printExceptions = printExceptions;
+    }
+
+    /** Sets a flag in this Animator indicating that it is to run as
+        fast as possible. By default there is a brief pause in the
+        animation loop which prevents the CPU from getting swamped.
+        This method may not have an effect on subclasses. */
+    public final void setRunAsFastAsPossible(boolean runFast) {
+        runAsFastAsPossible = runFast;
+    }
+
+    /** Called every frame to cause redrawing of all of the
+        GLAutoDrawables this Animator manages. Subclasses should call
+        this to get the most optimized painting behavior for the set of
+        components this Animator manages, in particular when multiple
+        lightweight widgets are continually being redrawn. */
+    protected void display() {
+        impl.display(this, ignoreExceptions, printExceptions);
+    }
+
+    class MainLoop implements Runnable {
+        public void run() {
+            try {
+                if(DEBUG) {
+                    System.out.println("Animator started: "+Thread.currentThread());
+                }
+                while (!shouldStop) {
+                    // Don't consume CPU unless there is work to be done
+                    if (drawables.size() == 0) {
+                        synchronized (Animator.this) {
+                            while (drawables.size() == 0 && !shouldStop) {
+                                try {
+                                    Animator.this.wait();
+                                } catch (InterruptedException e) {
+                                }
+                            }
+                        }
+                    }
+                    display();
+                    if (!runAsFastAsPossible) {
+                        // Avoid swamping the CPU
+                        Thread.yield();
+                    }
+                }
+                if(DEBUG) {
+                    System.out.println("Animator stopped: "+Thread.currentThread());
+                }
+            } finally {
+                shouldStop = false;
+                synchronized (Animator.this) {
+                    thread = null;
+                    Animator.this.notify();
+                }
+            }
+        }
+    }
+
+    /** Starts this animator. */
+    public synchronized void start() {
+        if (thread != null) {
+            throw new GLException("Already started");
+        }
+        if (runnable == null) {
+            runnable = new MainLoop();
+        }
+        if(null==threadGroup) {
+            thread = new Thread(runnable);
+        } else {
+            thread = new Thread(threadGroup, runnable);
+        }
+        thread.start();
+    }
+
+    /** Indicates whether this animator is currently running. This
+        should only be used as a heuristic to applications because in
+        some circumstances the Animator may be in the process of
+        shutting down and this method will still return true. */
+    public synchronized boolean isAnimating() {
+        return (thread != null);
+    }
+
+    /** Stops this animator. In most situations this method blocks until
+        completion, except when called from the animation thread itself
+        or in some cases from an implementation-internal thread like the
+        AWT event queue thread. */
+    public synchronized void stop() {
+        shouldStop = true;
+        notifyAll();
+
+        // It's hard to tell whether the thread which calls stop() has
+        // dependencies on the Animator's internal thread. Currently we
+        // use a couple of heuristics to determine whether we should do
+        // the blocking wait().
+        if (impl.skipWaitForStop(thread)) {
+            return;
+        }
+
+        while (shouldStop && thread != null) {
+            try {
+                wait();
+            } catch (InterruptedException ie) {
+            }
+        }
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/AnimatorImpl.java b/src/jogl/classes/com/jogamp/opengl/util/AnimatorImpl.java
new file mode 100644
index 000000000..50b91b729
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/AnimatorImpl.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.util;
+
+import java.util.*;
+import javax.media.opengl.*;
+
+/** Abstraction to factor out AWT dependencies from the Animator's
+    implementation in a way that still allows the FPSAnimator to pick
+    up this behavior if desired. */
+
+class AnimatorImpl {
+    public void display(Animator animator,
+                        boolean ignoreExceptions,
+                        boolean printExceptions) {
+        Iterator iter = animator.drawableIterator();
+        while (iter.hasNext()) {
+            GLAutoDrawable drawable = (GLAutoDrawable) iter.next();
+            try {
+                drawable.display();
+            } catch (RuntimeException e) {
+                if (ignoreExceptions) {
+                    if (printExceptions) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    throw(e);
+                }
+            }
+        }
+    }
+
+    public boolean skipWaitForStop(Thread thread) {
+        return (Thread.currentThread() == thread);
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp
new file mode 100755
index 000000000..2f82487f8
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp
@@ -0,0 +1,449 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
+import javax.media.opengl.GL2ES2;
+import javax.media.opengl.GLException;
+import javax.media.opengl.GLProfile;
+
+import java.nio.*;
+import java.util.*;
+
+import java.lang.reflect.*;
+
+/** Utility routines for dealing with direct buffers. */
+
+public class BufferUtil {
+  public static final int SIZEOF_BYTE = 1;
+  public static final int SIZEOF_SHORT = 2;
+  public static final int SIZEOF_INT = 4;
+  public static final int SIZEOF_FLOAT = 4;
+  public static final int SIZEOF_LONG = -1;    // not supported
+  public static final int SIZEOF_DOUBLE = -1;  // not supported
+
+  public static final int sizeOfGLType(int glType) {
+        switch (glType) {
+            case GL.GL_UNSIGNED_BYTE:
+                return SIZEOF_BYTE;
+            case GL.GL_BYTE:
+                return SIZEOF_BYTE;
+            case GL.GL_UNSIGNED_SHORT:
+                return SIZEOF_SHORT;
+            case GL.GL_SHORT:
+                return SIZEOF_SHORT;
+            case GL.GL_FLOAT:
+                return SIZEOF_FLOAT;
+            case GL.GL_FIXED:
+                return SIZEOF_INT;
+            case GL2ES2.GL_INT:
+                return SIZEOF_INT;
+            case GL2ES2.GL_UNSIGNED_INT:
+                return SIZEOF_INT;
+            case GL2.GL_DOUBLE:
+                return SIZEOF_DOUBLE;
+        }
+        return -1;
+  }
+
+  public static final int sizeOfBufferElem(Buffer buffer) {
+        if (buffer == null) {
+            return 0;
+        }
+        if (buffer instanceof ByteBuffer) {
+            return BufferUtil.SIZEOF_BYTE;
+        } else if (buffer instanceof IntBuffer) {
+            return BufferUtil.SIZEOF_INT;
+        } else if (buffer instanceof ShortBuffer) {
+            return BufferUtil.SIZEOF_SHORT;
+        } else if (buffer instanceof FloatBuffer) {
+            return BufferUtil.SIZEOF_FLOAT;
+        }
+        throw new RuntimeException("Unexpected buffer type " +
+                                   buffer.getClass().getName());
+  }
+
+  private BufferUtil() {}
+
+  //----------------------------------------------------------------------
+  // Allocation routines
+  //
+
+  public static final Buffer newGLBuffer(int glType, int numElements) {
+        switch (glType) {
+            case GL.GL_UNSIGNED_BYTE:
+            case GL.GL_BYTE:
+                return newByteBuffer(numElements);
+            case GL.GL_UNSIGNED_SHORT:
+            case GL.GL_SHORT:
+                return newShortBuffer(numElements);
+            case GL.GL_FLOAT:
+                return newFloatBuffer(numElements);
+            case GL.GL_FIXED:
+            case GL2ES2.GL_INT:
+            case GL2ES2.GL_UNSIGNED_INT:
+                return newIntBuffer(numElements);
+        }
+        return null;
+  }
+
+  public static final Buffer sliceGLBuffer(ByteBuffer parent, int bytePos, int byteLen, int glType) {
+        if(parent==null || byteLen==0) return null;
+        parent.position(bytePos);
+        parent.limit(bytePos + byteLen);
+
+        switch (glType) {
+            case GL.GL_UNSIGNED_BYTE:
+            case GL.GL_BYTE:
+                return parent.slice();
+            case GL.GL_UNSIGNED_SHORT:
+            case GL.GL_SHORT:
+                return parent.asShortBuffer();
+            case GL.GL_FLOAT:
+                return parent.asFloatBuffer();
+            case GL.GL_FIXED:
+            case GL2ES2.GL_INT:
+            case GL2ES2.GL_UNSIGNED_INT:
+                return parent.asIntBuffer();
+        }
+        return null;
+  }
+
+  /** Allocates a new direct ByteBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static ByteBuffer newByteBuffer(int numElements) {
+    ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
+    nativeOrder(bb);
+    return bb;
+  }
+    
+  public static ByteBuffer newByteBuffer(byte[] values, int offset, int len) {
+    ByteBuffer bb = newByteBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static ByteBuffer newByteBuffer(byte[] values, int offset) {
+    return newByteBuffer(values, offset, values.length-offset);
+  }
+    
+  public static ByteBuffer newByteBuffer(byte[] values) {
+    return newByteBuffer(values, 0);
+  }
+    
+  /** Allocates a new direct FloatBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static FloatBuffer newFloatBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_FLOAT);
+    return bb.asFloatBuffer();
+  }
+    
+  public static FloatBuffer newFloatBuffer(float[] values, int offset, int len) {
+    FloatBuffer bb = newFloatBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static FloatBuffer newFloatBuffer(float[] values, int offset) {
+    return newFloatBuffer(values, 0, values.length-offset);
+  }
+
+  public static FloatBuffer newFloatBuffer(float[] values) {
+    return newFloatBuffer(values, 0);
+  }
+    
+  /** Allocates a new direct IntBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static IntBuffer newIntBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
+    return bb.asIntBuffer();
+  }
+    
+  public static IntBuffer newIntBuffer(int[] values, int offset, int len) {
+    IntBuffer bb = newIntBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static IntBuffer newIntBuffer(int[] values, int offset) {
+    return newIntBuffer(values, 0, values.length-offset);
+  }
+
+  public static IntBuffer newIntBuffer(int[] values) {
+    return newIntBuffer(values, 0);
+  }
+    
+    
+  /** Allocates a new direct ShortBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static ShortBuffer newShortBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_SHORT);
+    return bb.asShortBuffer();
+  }
+
+  public static ShortBuffer newShortBuffer(short[] values, int offset, int len) {
+    ShortBuffer bb = newShortBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static ShortBuffer newShortBuffer(short[] values, int offset) {
+    return newShortBuffer(values, 0, values.length-offset);
+  }
+
+  public static ShortBuffer newShortBuffer(short[] values) {
+    return newShortBuffer(values, 0);
+  }
+    
+    
+  //----------------------------------------------------------------------
+  // Copy routines (type-to-type)
+  //
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed ByteBuffer into
+      a newly-allocated direct ByteBuffer. The returned buffer will
+      have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
+    ByteBuffer dest = newByteBuffer(orig.remaining());
+    dest.put(orig);
+    dest.rewind();
+    return dest;
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed FloatBuffer
+      into a newly-allocated direct FloatBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static FloatBuffer copyFloatBuffer(FloatBuffer orig) {
+    return copyFloatBufferAsByteBuffer(orig).asFloatBuffer();
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed IntBuffer
+      into a newly-allocated direct IntBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static IntBuffer copyIntBuffer(IntBuffer orig) {
+    return copyIntBufferAsByteBuffer(orig).asIntBuffer();
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed ShortBuffer
+      into a newly-allocated direct ShortBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ShortBuffer copyShortBuffer(ShortBuffer orig) {
+    return copyShortBufferAsByteBuffer(orig).asShortBuffer();
+  }
+  
+  //----------------------------------------------------------------------
+  // Copy routines (type-to-ByteBuffer)
+  //
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed FloatBuffer
+      into a newly-allocated direct ByteBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ByteBuffer copyFloatBufferAsByteBuffer(FloatBuffer orig) {
+    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_FLOAT);
+    dest.asFloatBuffer().put(orig);
+    dest.rewind();
+    return dest;
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed IntBuffer into
+      a newly-allocated direct ByteBuffer. The returned buffer will
+      have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ByteBuffer copyIntBufferAsByteBuffer(IntBuffer orig) {
+    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_INT);
+    dest.asIntBuffer().put(orig);
+    dest.rewind();
+    return dest;
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed ShortBuffer
+      into a newly-allocated direct ByteBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
+    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_SHORT);
+    dest.asShortBuffer().put(orig);
+    dest.rewind();
+    return dest;
+  }
+
+  //----------------------------------------------------------------------
+  // Conversion routines 
+  //
+
+  public final static float[] getFloatArray(double[] source) {
+      int i=source.length;
+      float[] dest = new float[i--];
+      while(i>=0) { dest[i]=(float)source[i]; i--; }
+      return dest;
+  }
+
+  public static ByteBuffer nativeOrder(ByteBuffer buf) {
+    if (!isCDCFP) {
+      try {
+        if (byteOrderClass == null) {
+          byteOrderClass = Class.forName("java.nio.ByteOrder");
+          orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
+          Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
+          nativeOrderObject = nativeOrderMethod.invoke(null, null);
+        }
+      } catch (Throwable t) {
+        // Must be running on CDC / FP
+        isCDCFP = true;
+      }
+
+      if (!isCDCFP) {
+        try {
+          orderMethod.invoke(buf, new Object[] { nativeOrderObject });
+        } catch (Throwable t) {
+        }
+      }
+    }
+    return buf;
+  }
+
+  //----------------------------------------------------------------------
+  // Convenient GL put methods with generic target Buffer
+  //
+  public static void put(Buffer dest, Buffer v) {
+    if((dest instanceof ByteBuffer) && (v instanceof ByteBuffer)) {
+        ((ByteBuffer)dest).put((ByteBuffer)v);
+    } else if((dest instanceof ShortBuffer) && (v instanceof ShortBuffer)) {
+        ((ShortBuffer)dest).put((ShortBuffer)v);
+    } else if((dest instanceof IntBuffer) && (v instanceof IntBuffer)) {
+        ((IntBuffer)dest).put((IntBuffer)v);
+    } else if((dest instanceof FloatBuffer) && (v instanceof FloatBuffer)) {
+        ((FloatBuffer)dest).put((FloatBuffer)v);
+    } else {
+        throw new GLException("Incompatible Buffer classes: dest = "+dest.getClass().getName() + ", src = " + v.getClass().getName());
+    }
+  }
+
+  public static void putb(Buffer dest, byte v) {
+    if(dest instanceof ByteBuffer) {
+        ((ByteBuffer)dest).put(v);
+    } else if(dest instanceof ShortBuffer) {
+        ((ShortBuffer)dest).put((short)v);
+    } else if(dest instanceof IntBuffer) {
+        ((IntBuffer)dest).put((int)v);
+    } else {
+        throw new GLException("Byte doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  public static void puts(Buffer dest, short v) {
+    if(dest instanceof ShortBuffer) {
+        ((ShortBuffer)dest).put(v);
+    } else if(dest instanceof IntBuffer) {
+        ((IntBuffer)dest).put((int)v);
+    } else {
+        throw new GLException("Short doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  public static void puti(Buffer dest, int v) {
+    if(dest instanceof IntBuffer) {
+        ((IntBuffer)dest).put(v);
+    } else {
+        throw new GLException("Integer doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  public static void putx(Buffer dest, int v) {
+    puti(dest, v);
+  }
+
+  public static void putf(Buffer dest, float v) {
+    if(dest instanceof FloatBuffer) {
+        ((FloatBuffer)dest).put(v);
+    } else if(dest instanceof IntBuffer) {
+        ((IntBuffer)dest).put(FixedPoint.toFixed(v));
+    } else {
+        throw new GLException("Float doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  // NOTE that this work must be done reflectively at the present time
+  // because this code must compile and run correctly on both CDC/FP and J2SE
+  private static boolean isCDCFP;
+  private static Class byteOrderClass;
+  private static Object nativeOrderObject;
+  private static Method orderMethod;
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase
new file mode 100755
index 000000000..fde1e8681
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase
@@ -0,0 +1,499 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
+import javax.media.opengl.GL2ES2;
+import javax.media.opengl.GLException;
+import javax.media.opengl.GLProfile;
+
+import java.nio.*;
+import java.util.*;
+
+import java.lang.reflect.*;
+
+/** Utility routines for dealing with direct buffers. */
+
+public class BufferUtil {
+  public static final int SIZEOF_BYTE = 1;
+  public static final int SIZEOF_SHORT = 2;
+  public static final int SIZEOF_INT = 4;
+  public static final int SIZEOF_FLOAT = 4;
+  public static final int SIZEOF_LONG = 8;
+  public static final int SIZEOF_DOUBLE = 8;
+
+  public static final int sizeOfGLType(int glType) {
+        switch (glType) {
+            case GL.GL_UNSIGNED_BYTE:
+                return SIZEOF_BYTE;
+            case GL.GL_BYTE:
+                return SIZEOF_BYTE;
+            case GL.GL_UNSIGNED_SHORT:
+                return SIZEOF_SHORT;
+            case GL.GL_SHORT:
+                return SIZEOF_SHORT;
+            case GL.GL_FLOAT:
+                return SIZEOF_FLOAT;
+            case GL.GL_FIXED:
+                return SIZEOF_INT;
+            case GL2ES2.GL_INT:
+                return SIZEOF_INT;
+            case GL2ES2.GL_UNSIGNED_INT:
+                return SIZEOF_INT;
+            case GL2.GL_DOUBLE:
+                return SIZEOF_DOUBLE;
+        }
+        return -1;
+  }
+
+  public static final int sizeOfBufferElem(Buffer buffer) {
+        if (buffer == null) {
+            return 0;
+        }
+        if (buffer instanceof ByteBuffer) {
+            return BufferUtil.SIZEOF_BYTE;
+        } else if (buffer instanceof IntBuffer) {
+            return BufferUtil.SIZEOF_INT;
+        } else if (buffer instanceof ShortBuffer) {
+            return BufferUtil.SIZEOF_SHORT;
+        } else if (buffer instanceof FloatBuffer) {
+            return BufferUtil.SIZEOF_FLOAT;
+        } else if (buffer instanceof DoubleBuffer) {
+            return BufferUtil.SIZEOF_DOUBLE;
+        }
+        throw new RuntimeException("Unexpected buffer type " +
+                                   buffer.getClass().getName());
+  }
+
+  private BufferUtil() {}
+
+  //----------------------------------------------------------------------
+  // Allocation routines
+  //
+
+  public static final Buffer newGLBuffer(int glType, int numElements) {
+        switch (glType) {
+            case GL.GL_UNSIGNED_BYTE:
+            case GL.GL_BYTE:
+                return newByteBuffer(numElements);
+            case GL.GL_UNSIGNED_SHORT:
+            case GL.GL_SHORT:
+                return newShortBuffer(numElements);
+            case GL.GL_FLOAT:
+                return newFloatBuffer(numElements);
+            case GL.GL_FIXED:
+            case GL2ES2.GL_INT:
+            case GL2ES2.GL_UNSIGNED_INT:
+                return newIntBuffer(numElements);
+            case GL2.GL_DOUBLE:
+                return newDoubleBuffer(numElements);
+        }
+        return null;
+  }
+
+  public static final Buffer sliceGLBuffer(ByteBuffer parent, int bytePos, int byteLen, int glType) {
+        if(parent==null || byteLen==0) return null;
+        parent.position(bytePos);
+        parent.limit(bytePos + byteLen);
+
+        switch (glType) {
+            case GL.GL_UNSIGNED_BYTE:
+            case GL.GL_BYTE:
+                return parent.slice();
+            case GL.GL_UNSIGNED_SHORT:
+            case GL.GL_SHORT:
+                return parent.asShortBuffer();
+            case GL.GL_FLOAT:
+                return parent.asFloatBuffer();
+            case GL.GL_FIXED:
+            case GL2ES2.GL_INT:
+            case GL2ES2.GL_UNSIGNED_INT:
+                return parent.asIntBuffer();
+            case GL2.GL_DOUBLE:
+                return parent.asDoubleBuffer();
+        }
+        return null;
+  }
+
+  /** Allocates a new direct ByteBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static ByteBuffer newByteBuffer(int numElements) {
+    ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
+    nativeOrder(bb);
+    return bb;
+  }
+    
+  public static ByteBuffer newByteBuffer(byte[] values, int offset, int len) {
+    ByteBuffer bb = newByteBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static ByteBuffer newByteBuffer(byte[] values, int offset) {
+    return newByteBuffer(values, offset, values.length-offset);
+  }
+    
+  public static ByteBuffer newByteBuffer(byte[] values) {
+    return newByteBuffer(values, 0);
+  }
+    
+    
+  /** Allocates a new direct DoubleBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static DoubleBuffer newDoubleBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_DOUBLE);
+    return bb.asDoubleBuffer();
+  }
+
+  public static DoubleBuffer newDoubleBuffer(double[] values, int offset) {
+    int len = values.length-offset;
+    DoubleBuffer bb = newDoubleBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static DoubleBuffer newDoubleBuffer(double[] values) {
+    return newDoubleBuffer(values, 0);
+  }
+    
+
+  /** Allocates a new direct FloatBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static FloatBuffer newFloatBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_FLOAT);
+    return bb.asFloatBuffer();
+  }
+    
+  public static FloatBuffer newFloatBuffer(float[] values, int offset, int len) {
+    FloatBuffer bb = newFloatBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static FloatBuffer newFloatBuffer(float[] values, int offset) {
+    return newFloatBuffer(values, 0, values.length-offset);
+  }
+
+  public static FloatBuffer newFloatBuffer(float[] values) {
+    return newFloatBuffer(values, 0);
+  }
+    
+    
+  /** Allocates a new direct IntBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static IntBuffer newIntBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
+    return bb.asIntBuffer();
+  }
+    
+  public static IntBuffer newIntBuffer(int[] values, int offset, int len) {
+    IntBuffer bb = newIntBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static IntBuffer newIntBuffer(int[] values, int offset) {
+    return newIntBuffer(values, 0, values.length-offset);
+  }
+
+  public static IntBuffer newIntBuffer(int[] values) {
+    return newIntBuffer(values, 0);
+  }
+    
+  /** Allocates a new direct LongBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static LongBuffer newLongBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_LONG);
+    return bb.asLongBuffer();
+  }
+
+  /** Allocates a new direct ShortBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static ShortBuffer newShortBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_SHORT);
+    return bb.asShortBuffer();
+  }
+
+  public static ShortBuffer newShortBuffer(short[] values, int offset, int len) {
+    ShortBuffer bb = newShortBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static ShortBuffer newShortBuffer(short[] values, int offset) {
+    return newShortBuffer(values, 0, values.length-offset);
+  }
+
+  public static ShortBuffer newShortBuffer(short[] values) {
+    return newShortBuffer(values, 0);
+  }
+    
+  //----------------------------------------------------------------------
+  // Copy routines (type-to-type)
+  //
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed ByteBuffer into
+      a newly-allocated direct ByteBuffer. The returned buffer will
+      have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
+    ByteBuffer dest = newByteBuffer(orig.remaining());
+    dest.put(orig);
+    dest.rewind();
+    return dest;
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed FloatBuffer
+      into a newly-allocated direct FloatBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static FloatBuffer copyFloatBuffer(FloatBuffer orig) {
+    return copyFloatBufferAsByteBuffer(orig).asFloatBuffer();
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed IntBuffer
+      into a newly-allocated direct IntBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static IntBuffer copyIntBuffer(IntBuffer orig) {
+    return copyIntBufferAsByteBuffer(orig).asIntBuffer();
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed ShortBuffer
+      into a newly-allocated direct ShortBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ShortBuffer copyShortBuffer(ShortBuffer orig) {
+    return copyShortBufferAsByteBuffer(orig).asShortBuffer();
+  }
+  
+  //----------------------------------------------------------------------
+  // Copy routines (type-to-ByteBuffer)
+  //
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed FloatBuffer
+      into a newly-allocated direct ByteBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ByteBuffer copyFloatBufferAsByteBuffer(FloatBuffer orig) {
+    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_FLOAT);
+    dest.asFloatBuffer().put(orig);
+    dest.rewind();
+    return dest;
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed IntBuffer into
+      a newly-allocated direct ByteBuffer. The returned buffer will
+      have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ByteBuffer copyIntBufferAsByteBuffer(IntBuffer orig) {
+    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_INT);
+    dest.asIntBuffer().put(orig);
+    dest.rewind();
+    return dest;
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed ShortBuffer
+      into a newly-allocated direct ByteBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
+    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_SHORT);
+    dest.asShortBuffer().put(orig);
+    dest.rewind();
+    return dest;
+  }
+
+  //----------------------------------------------------------------------
+  // Conversion routines 
+  //
+  
+  public final static float[] getFloatArray(double[] source) {
+      int i=source.length;
+      float[] dest = new float[i--];
+      while(i>=0) { dest[i]=(float)source[i]; i--; }
+      return dest;
+  }
+
+  public final static FloatBuffer getFloatBuffer(DoubleBuffer source) {
+      source.rewind();
+      FloatBuffer dest = BufferUtil.newFloatBuffer(source.limit());
+      while(source.hasRemaining()) { dest.put((float)source.get()); }
+      return dest;
+  }
+
+  public static ByteBuffer nativeOrder(ByteBuffer buf) {
+    if (!isCDCFP) {
+      try {
+        if (byteOrderClass == null) {
+          byteOrderClass = Class.forName("java.nio.ByteOrder");
+          orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
+          Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
+          nativeOrderObject = nativeOrderMethod.invoke(null, null);
+        }
+      } catch (Throwable t) {
+        // Must be running on CDC / FP
+        isCDCFP = true;
+      }
+
+      if (!isCDCFP) {
+        try {
+          orderMethod.invoke(buf, new Object[] { nativeOrderObject });
+        } catch (Throwable t) {
+        }
+      }
+    }
+    return buf;
+  }
+
+  //----------------------------------------------------------------------
+  // Convenient GL put methods with generic target Buffer
+  //
+  public static void put(Buffer dest, Buffer v) {
+    if((dest instanceof ByteBuffer) && (v instanceof ByteBuffer)) {
+        ((ByteBuffer)dest).put((ByteBuffer)v);
+    } else if((dest instanceof ShortBuffer) && (v instanceof ShortBuffer)) {
+        ((ShortBuffer)dest).put((ShortBuffer)v);
+    } else if((dest instanceof IntBuffer) && (v instanceof IntBuffer)) {
+        ((IntBuffer)dest).put((IntBuffer)v);
+    } else if((dest instanceof FloatBuffer) && (v instanceof FloatBuffer)) {
+        ((FloatBuffer)dest).put((FloatBuffer)v);
+    } else {
+        throw new GLException("Incompatible Buffer classes: dest = "+dest.getClass().getName() + ", src = " + v.getClass().getName());
+    }
+  }
+
+  public static void putb(Buffer dest, byte v) {
+    if(dest instanceof ByteBuffer) {
+        ((ByteBuffer)dest).put(v);
+    } else if(dest instanceof ShortBuffer) {
+        ((ShortBuffer)dest).put((short)v);
+    } else if(dest instanceof IntBuffer) {
+        ((IntBuffer)dest).put((int)v);
+    } else {
+        throw new GLException("Byte doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  public static void puts(Buffer dest, short v) {
+    if(dest instanceof ShortBuffer) {
+        ((ShortBuffer)dest).put(v);
+    } else if(dest instanceof IntBuffer) {
+        ((IntBuffer)dest).put((int)v);
+    } else {
+        throw new GLException("Short doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  public static void puti(Buffer dest, int v) {
+    if(dest instanceof IntBuffer) {
+        ((IntBuffer)dest).put(v);
+    } else {
+        throw new GLException("Integer doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  public static void putx(Buffer dest, int v) {
+    puti(dest, v);
+  }
+
+  public static void putf(Buffer dest, float v) {
+    if(dest instanceof FloatBuffer) {
+        ((FloatBuffer)dest).put(v);
+    } else if(dest instanceof IntBuffer) {
+        ((IntBuffer)dest).put(FixedPoint.toFixed(v));
+    } else {
+        throw new GLException("Float doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  public static void putd(Buffer dest, double v) {
+    if(dest instanceof FloatBuffer) {
+        ((FloatBuffer)dest).put((float)v);
+    } else {
+        throw new GLException("Double doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  // NOTE that this work must be done reflectively at the present time
+  // because this code must compile and run correctly on both CDC/FP and J2SE
+  private static boolean isCDCFP;
+  private static Class byteOrderClass;
+  private static Object nativeOrderObject;
+  private static Method orderMethod;
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/FBObject.java b/src/jogl/classes/com/jogamp/opengl/util/FBObject.java
new file mode 100755
index 000000000..4920ed5f5
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/FBObject.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.opengl.util;
+
+import javax.media.opengl.*;
+
+public class FBObject {
+    private int width, height, attr;
+    private int fb, fbo_tex, depth_rb, stencil_rb, vStatus;
+    private int texInternalFormat, texDataFormat, texDataType;
+
+    public static final int ATTR_DEPTH   = 1 << 0;
+    public static final int ATTR_STENCIL = 1 << 1;
+
+    public FBObject(int width, int height, int attributes) {
+        this.width = width;
+        this.height = height;
+        this.attr = attributes;
+    }        
+
+
+    public boolean validateStatus(GL gl) {
+        vStatus = getStatus(gl, fb);
+        switch(vStatus) {
+            case GL.GL_FRAMEBUFFER_COMPLETE:
+                return true;
+            case GL.GL_FRAMEBUFFER_UNSUPPORTED:
+            case GL.GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+            case GL.GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+            case GL.GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
+            case GL.GL_FRAMEBUFFER_INCOMPLETE_FORMATS:
+            //case GL2.GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
+            //case GL2.GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
+            //case GL2.GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT:
+            case 0:
+            default:
+                return false;
+        }
+    }
+
+    public static int getStatus(GL gl, int fb) {
+        if(!gl.glIsFramebuffer(fb)) {
+            return -1;
+        }
+        return gl.glCheckFramebufferStatus(gl.GL_FRAMEBUFFER);
+        //return gl.glCheckFramebufferStatus(fb);
+    }
+
+    public String getStatusString() {
+        return getStatusString(vStatus);
+    }
+
+    public static String getStatusString(int fbStatus) {
+        switch(fbStatus) {
+            case -1:
+                return "NOT A FBO";
+            case GL.GL_FRAMEBUFFER_COMPLETE:
+                return "OK";
+            case GL.GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+                return("GL FBO: incomplete,incomplete attachment\n");
+            case GL.GL_FRAMEBUFFER_UNSUPPORTED:
+                return("GL FBO: Unsupported framebuffer format");
+            case GL.GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+                return("GL FBO: incomplete,missing attachment");
+            case GL.GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
+                return("GL FBO: incomplete,attached images must have same dimensions");
+            case GL.GL_FRAMEBUFFER_INCOMPLETE_FORMATS:
+                 return("GL FBO: incomplete,attached images must have same format");
+                 /*
+            case GL2.GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
+                return("GL FBO: incomplete,missing draw buffer");
+            case GL2.GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
+                return("GL FBO: incomplete,missing read buffer");
+            case GL2.GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT:
+                return("GL FBO: incomplete, duplicate attachment");
+                */
+            case 0:
+                return("GL FBO: incomplete, implementation fault");
+            default:
+                return("GL FBO: incomplete, implementation ERROR");
+        }
+    }
+
+    public void init(GL gl) {
+        int textureInternalFormat, textureDataFormat, textureDataType;
+
+        if(gl.isGL2()) { 
+            textureInternalFormat=GL.GL_RGBA8;
+            textureDataFormat=GL2.GL_BGRA;
+            textureDataType=GL2.GL_UNSIGNED_INT_8_8_8_8_REV;
+        } else if(gl.isGLES()) { 
+            textureInternalFormat=GL.GL_RGBA;
+            textureDataFormat=GL.GL_RGBA;
+            textureDataType=GL.GL_UNSIGNED_BYTE;
+        } else {
+            textureInternalFormat=GL.GL_RGB;
+            textureDataFormat=GL.GL_RGB;
+            textureDataType=GL.GL_UNSIGNED_BYTE;
+        }
+        init(gl, textureInternalFormat, textureDataFormat, textureDataType);
+    }
+
+    public void init(GL gl, int textureInternalFormat, int textureDataFormat, int textureDataType) {
+        texInternalFormat=textureInternalFormat; 
+        texDataFormat=textureDataFormat;
+        texDataType=textureDataType;
+
+        // generate fbo ..
+        int name[] = new int[1];
+
+        gl.glGenFramebuffers(1, name, 0);
+        fb = name[0];
+        System.out.println("fb: "+fb);
+
+        gl.glGenTextures(1, name, 0);
+        fbo_tex = name[0];
+        System.out.println("fbo_tex: "+fbo_tex);
+
+        if(0!=(attr&ATTR_DEPTH)) {
+            gl.glGenRenderbuffers(1, name, 0);
+            depth_rb = name[0];
+            System.out.println("depth_rb: "+depth_rb);
+        } else {
+            depth_rb = 0;
+        }
+        if(0!=(attr&ATTR_STENCIL)) {
+            gl.glGenRenderbuffers(1, name, 0);
+            stencil_rb = name[0];
+            System.out.println("stencil_rb: "+stencil_rb);
+        } else {
+            stencil_rb = 0;
+        }
+
+        // bind fbo ..
+        gl.glBindFramebuffer(GL.GL_FRAMEBUFFER, fb);
+
+        gl.glBindTexture(GL.GL_TEXTURE_2D, fbo_tex);
+        gl.glTexImage2D(GL.GL_TEXTURE_2D, 0, texInternalFormat, width, height, 0,
+                        texDataFormat, texDataType, null);
+        gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST);
+        gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_NEAREST);
+        //gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP);
+        //gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_WRAP_T, GL2.GL_CLAMP);
+
+
+        // Set up the color buffer for use as a renderable texture:
+        gl.glFramebufferTexture2D(GL.GL_FRAMEBUFFER,
+                                  GL.GL_COLOR_ATTACHMENT0,
+                                  GL.GL_TEXTURE_2D, fbo_tex, 0); 
+
+        if(depth_rb!=0) {
+            // Initialize the depth buffer:
+            gl.glBindRenderbuffer(GL.GL_RENDERBUFFER, depth_rb);
+            gl.glRenderbufferStorage(GL.GL_RENDERBUFFER,
+                                        GL.GL_DEPTH_COMPONENT16, width, height);
+            // Set up the depth buffer attachment:
+            gl.glFramebufferRenderbuffer(GL.GL_FRAMEBUFFER,
+                                            GL.GL_DEPTH_ATTACHMENT,
+                                            GL.GL_RENDERBUFFER, depth_rb);
+        }
+
+        if(stencil_rb!=0) {
+            // Initialize the stencil buffer:
+            gl.glBindRenderbuffer(GL.GL_RENDERBUFFER, stencil_rb);
+            gl.glRenderbufferStorage(GL.GL_RENDERBUFFER,
+                                        GL.GL_STENCIL_INDEX8, width, height);
+            gl.glFramebufferRenderbuffer(GL.GL_FRAMEBUFFER,
+                                            GL.GL_STENCIL_ATTACHMENT,
+                                            GL.GL_RENDERBUFFER, stencil_rb);
+        }
+
+        // Check the FBO for completeness
+        if(validateStatus(gl)) {
+            System.out.println("Framebuffer " + fb + " is complete");
+        } else {
+            System.out.println("Framebuffer " + fb + " is incomplete: status = 0x" + Integer.toHexString(vStatus) + 
+                               " : " + getStatusString());
+        }
+
+        unbind(gl);
+    }
+
+    public void destroy(GL gl) {
+        unbind(gl);
+
+        int name[] = new int[1];
+
+        if(0!=stencil_rb) {
+            name[0] = stencil_rb;
+            gl.glDeleteRenderbuffers(1, name, 0);
+            stencil_rb = 0;
+        }
+        if(0!=depth_rb) {
+            name[0] = depth_rb;
+            gl.glDeleteRenderbuffers(1, name, 0);
+            depth_rb=0;
+        }
+        if(0!=fbo_tex) {
+            name[0] = fbo_tex;
+            gl.glDeleteTextures(1, name, 0);
+            fbo_tex = 0;
+        }
+        if(0!=fb) {
+            name[0] = fb;
+            gl.glDeleteFramebuffers(1, name, 0);
+            fb = 0;
+        }
+    }
+
+    public void bind(GL gl) {
+        gl.glBindTexture(GL.GL_TEXTURE_2D, fbo_tex);
+        gl.glBindFramebuffer(GL.GL_FRAMEBUFFER, fb); 
+    }
+
+    public void unbind(GL gl) {
+        gl.glBindTexture(GL.GL_TEXTURE_2D, 0);
+        gl.glBindFramebuffer(GL.GL_FRAMEBUFFER, 0);
+    }
+
+    public void use(GL gl) {
+        gl.glBindTexture(GL.GL_TEXTURE_2D, 0);
+        gl.glBindFramebuffer(GL.GL_FRAMEBUFFER, 0);
+        gl.glBindTexture(GL.GL_TEXTURE_2D, fbo_tex); // to use it ..
+    }
+
+    public int getFBName() {
+        return fb;
+    }
+    public int getTextureName() {
+        return fbo_tex;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java b/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java
new file mode 100755
index 000000000..75c4cdff7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util;
+
+import java.util.*;
+import javax.media.opengl.*;
+
+/** An Animator subclass which attempts to achieve a target
+    frames-per-second rate to avoid using all CPU time. The target FPS
+    is only an estimate and is not guaranteed. */
+
+public class FPSAnimator extends Animator {
+  private Timer timer;
+  private int   fps;
+  private boolean scheduleAtFixedRate;
+
+  /** Creates an FPSAnimator with a given target frames-per-second
+      value. Equivalent to <code>FPSAnimator(null, fps)</code>. */
+  public FPSAnimator(int fps) {
+    this(null, fps);
+  }
+
+  /** Creates an FPSAnimator with a given target frames-per-second
+      value and a flag indicating whether to use fixed-rate
+      scheduling. Equivalent to <code>FPSAnimator(null, fps,
+      scheduleAtFixedRate)</code>. */
+  public FPSAnimator(int fps, boolean scheduleAtFixedRate) {
+    this(null, fps, scheduleAtFixedRate);
+  }
+
+  /** Creates an FPSAnimator with a given target frames-per-second
+      value and an initial drawable to animate. Equivalent to
+      <code>FPSAnimator(null, fps, false)</code>. */
+  public FPSAnimator(GLAutoDrawable drawable, int fps) {
+    this(drawable, fps, false);
+  }
+
+  /** Creates an FPSAnimator with a given target frames-per-second
+      value, an initial drawable to animate, and a flag indicating
+      whether to use fixed-rate scheduling. */
+  public FPSAnimator(GLAutoDrawable drawable, int fps, boolean scheduleAtFixedRate) {
+    this.fps = fps;
+    if (drawable != null) {
+      add(drawable);
+    }
+    this.scheduleAtFixedRate = scheduleAtFixedRate;
+  }
+
+  /** Starts this FPSAnimator. */
+  public synchronized void start() {
+    if (timer != null) {
+      throw new GLException("Already started");
+    }
+    timer = new Timer();
+    long delay = (long) (1000.0f / (float) fps);
+    TimerTask task = new TimerTask() {
+        public void run() {
+          display();
+        }
+      };
+    if (scheduleAtFixedRate) {
+      timer.scheduleAtFixedRate(task, 0, delay);
+    } else {
+      timer.schedule(task, 0, delay);
+    }
+  }
+
+  /** Indicates whether this FPSAnimator is currently running. This
+      should only be used as a heuristic to applications because in
+      some circumstances the FPSAnimator may be in the process of
+      shutting down and this method will still return true. */
+  public synchronized boolean isAnimating() {
+    return (timer != null);
+  }
+
+  /** Stops this FPSAnimator. Due to the implementation of the
+      FPSAnimator it is not guaranteed that the FPSAnimator will be
+      completely stopped by the time this method returns. */
+  public synchronized void stop() {
+    if (timer == null) {
+      throw new GLException("Already stopped");
+    }
+    timer.cancel();
+    timer = null;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/FileUtil.java b/src/jogl/classes/com/jogamp/opengl/util/FileUtil.java
new file mode 100755
index 000000000..6ad0da825
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/FileUtil.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util;
+
+import java.io.*;
+
+/** Utilities for dealing with files. */
+
+public class FileUtil {
+    private FileUtil() {}
+
+    /**
+     * Returns the lowercase suffix of the given file name (the text
+     * after the last '.' in the file name). Returns null if the file
+     * name has no suffix. Only operates on the given file name;
+     * performs no I/O operations.
+     *
+     * @param file name of the file
+     * @return lowercase suffix of the file name
+     * @throws NullPointerException if file is null
+     */
+
+    public static String getFileSuffix(File file) {
+        return getFileSuffix(file.getName());
+    }
+
+    /**
+     * Returns the lowercase suffix of the given file name (the text
+     * after the last '.' in the file name). Returns null if the file
+     * name has no suffix. Only operates on the given file name;
+     * performs no I/O operations.
+     *
+     * @param filename name of the file
+     * @return lowercase suffix of the file name
+     * @throws NullPointerException if filename is null
+     */
+    public static String getFileSuffix(String filename) {
+        int lastDot = filename.lastIndexOf('.');
+        if (lastDot < 0) {
+            return null;
+        }
+        return toLowerCase(filename.substring(lastDot + 1));
+    }
+
+    private static String toLowerCase(String arg) {
+        if (arg == null) {
+            return null;
+        }
+
+        return arg.toLowerCase();
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/FixedPoint.java b/src/jogl/classes/com/jogamp/opengl/util/FixedPoint.java
new file mode 100644
index 000000000..6412db5ef
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/FixedPoint.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.opengl.util;
+
+public class FixedPoint {
+  public static final int toFixed(int value) {
+    if (value < -32768) value = -32768;
+    if (value > 32767) value = 32767;
+    return value * 65536;
+  }
+
+  public static final int toFixed(float value) {
+    if (value < -32768) value = -32768;
+    if (value > 32767) value = 32767;
+    return (int)(value * 65536.0f);
+  }
+
+  public static final float toFloat(int value) {
+    return (float)value/65536.0f;
+  }
+
+  public static final int mult(int x1, int x2) {
+    return (int) ( ((long)x1*(long)x2)/65536 );
+  }
+
+  public static final int div(int x1, int x2) {
+    return (int) ( (((long)x1)<<16)/x2 );
+  }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
new file mode 100644
index 000000000..f8951f0fd
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
@@ -0,0 +1,353 @@
+
+package com.jogamp.opengl.util;
+
+import java.security.*;
+
+import javax.media.opengl.*;
+
+import com.jogamp.opengl.util.glsl.*;
+
+import com.jogamp.opengl.impl.SystemUtil;
+
+import java.nio.*;
+
+public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayDataEditable {
+
+  /**
+   * The OpenGL ES emulation on the PC probably has a buggy VBO implementation,
+   * where we have to 'refresh' the VertexPointer or VertexAttribArray after each
+   * BindBuffer !
+   *
+   * This should not be necessary on proper native implementations.
+   */
+  public static final boolean hasVBOBug = AccessController.doPrivileged(new PrivilegedAction() {
+          public Object run() {
+              return SystemUtil.getenv("JOGL_VBO_BUG");
+          }
+      }) != null;
+
+  /**
+   * @param index The GL array index
+   * @param name  The optional custom name for the GL array index, maybe null.
+   *            If null, the default name mapping will be used, see 'getPredefinedArrayIndexName(int)'.
+   *            This name might be used as the shader attribute name.
+   * @param comps The array component number
+   * @param dataType The array index GL data type
+   * @param normalized Wheather the data shall be normalized
+   *
+   * @see javax.media.opengl.GLContext#getPredefinedArrayIndexName(int)
+   */
+  public static GLArrayDataClient createFixed(GL gl, int index, String name, int comps, int dataType, boolean normalized, 
+                                              int initialSize)
+    throws GLException
+  {
+      gl.getGLProfile().isValidArrayDataType(index, comps, dataType, false, true);
+      GLArrayDataClient adc = new GLArrayDataClient();
+      GLArrayHandler glArrayHandler = new GLFixedArrayHandler(adc);
+      adc.init(name, index, comps, dataType, normalized, 0, null, initialSize, false, glArrayHandler, 0, 0);
+      return adc;
+  }
+
+  public static GLArrayDataClient createFixed(GL gl, int index, String name, int comps, int dataType, boolean normalized, 
+                                              int stride, Buffer buffer)
+    throws GLException
+  {
+      gl.getGLProfile().isValidArrayDataType(index, comps, dataType, false, true);
+      GLArrayDataClient adc = new GLArrayDataClient();
+      GLArrayHandler glArrayHandler = new GLFixedArrayHandler(adc);
+      adc.init(name, index, comps, dataType, normalized, stride, buffer, comps*comps, false, glArrayHandler, 0, 0);
+      return adc;
+  }
+
+  public static GLArrayDataClient createGLSL(GL gl, String name, int comps, int dataType, boolean normalized, 
+                                             int initialSize)
+    throws GLException
+  {
+      if(!gl.hasGLSL()) {
+        throw new GLException("GLArrayDataClient.GLSL not supported: "+gl);
+      }
+      gl.getGLProfile().isValidArrayDataType(-1, comps, dataType, true, true);
+
+      GLArrayDataClient adc = new GLArrayDataClient();
+      GLArrayHandler glArrayHandler = new GLSLArrayHandler(adc);
+      adc.init(name, -1, comps, dataType, normalized, 0, null, initialSize, true, glArrayHandler, 0, 0);
+      return adc;
+  }
+
+  public static GLArrayDataClient createGLSL(GL gl, String name, int comps, int dataType, boolean normalized, 
+                                             int stride, Buffer buffer)
+    throws GLException
+  {
+      if(!gl.hasGLSL()) {
+        throw new GLException("GLArrayDataClient.GLSL not supported: "+gl);
+      }
+      gl.getGLProfile().isValidArrayDataType(-1, comps, dataType, true, true);
+
+      GLArrayDataClient adc = new GLArrayDataClient();
+      GLArrayHandler glArrayHandler = new GLSLArrayHandler(adc);
+      adc.init(name, -1, comps, dataType, normalized, stride, buffer, comps*comps, true, glArrayHandler, 0, 0);
+      return adc;
+  }
+
+  // 
+  // Data read access
+  //
+
+  public final boolean isBufferWritten() { return bufferWritten; }
+
+  public final boolean sealed() { return sealed; }
+
+  public int getBufferUsage() { return -1; }
+
+  //
+  // Data and GL state modification ..
+  //
+
+  public final void setBufferWritten(boolean written) { bufferWritten=written; }
+
+  public void destroy(GL gl) {
+    reset(gl);
+    buffer=null;
+  }
+
+  public void reset(GL gl) {
+    enableBuffer(gl, false);
+    reset();
+  }
+
+  public void seal(GL gl, boolean seal)
+  {
+    seal(seal);
+    if(sealedGL==seal) return;
+    sealedGL = seal;
+    if(seal) {
+        init_vbo(gl);
+
+        enableBuffer(gl, true);
+    } else {
+        enableBuffer(gl, false);
+    }
+  }
+
+  public void enableBuffer(GL gl, boolean enable) {
+    if(enableBufferAlways && enable) {
+        bufferEnabled = false;
+    }
+    if( bufferEnabled != enable && components>0 ) {
+        if(enable) {
+            checkSeal(true);
+            if(null!=buffer) {
+                buffer.rewind();
+            }
+        }
+        glArrayHandler.enableBuffer(gl, enable);
+        bufferEnabled = enable;
+    }
+  }
+
+  public void setEnableAlways(boolean always) {
+    enableBufferAlways = always;
+  }
+
+  //
+  // Data modification ..
+  //
+
+  public void reset() {
+    if(buffer!=null) {
+        buffer.clear();
+    }
+    this.sealed=false;
+    this.bufferEnabled=false;
+    this.bufferWritten=false;
+  }
+
+  public void seal(boolean seal)
+  {
+    if(sealed==seal) return;
+    sealed = seal;
+    if(seal) {
+        bufferWritten=false;
+        if (null!=buffer) {
+            buffer.flip();
+        }
+    } else {
+        if (null!=buffer) {
+            buffer.position(buffer.limit());
+            buffer.limit(buffer.capacity());
+        }
+    }
+  }
+
+
+  public void rewind() {
+    if(buffer!=null) {
+        buffer.rewind();
+    }
+  }
+
+  public void padding(int done) {
+    if ( buffer==null || sealed ) return;
+    while(done<strideL) {
+        BufferUtil.putb(buffer, (byte)0);
+        done++;
+    }
+  }
+
+  /**
+   * Generic buffer relative put method.
+   *
+   * This class buffer Class must match the arguments buffer class.
+   * The arguments remaining elements must be a multiple of this arrays element stride.
+   */
+  public void put(Buffer v) {
+    if ( buffer==null || sealed ) return;
+    if(0!=(v.remaining() % strideL)) {
+        throw new GLException("Buffer length ("+v.remaining()+") is not a multiple of component-stride:\n\t"+this);
+    }
+    growBufferIfNecessary(v.remaining());
+    BufferUtil.put(buffer, v);
+  }
+
+  public void putb(byte v) {
+    if ( buffer==null || sealed ) return;
+    growBufferIfNecessary(1);
+    BufferUtil.putb(buffer, v);
+  }
+
+  public void puts(short v) {
+    if ( buffer==null || sealed ) return;
+    growBufferIfNecessary(1);
+    BufferUtil.puts(buffer, v);
+  }
+
+  public void puti(int v) {
+    if ( buffer==null || sealed ) return;
+    growBufferIfNecessary(1);
+    BufferUtil.puti(buffer, v);
+  }
+
+  public void putx(int v) {
+    puti(v);
+  }
+
+  public void putf(float v) {
+    if ( buffer==null || sealed ) return;
+    growBufferIfNecessary(1);
+    BufferUtil.putf(buffer, v);
+  }
+
+  public String toString() {
+    return "GLArrayDataClient["+name+
+                       ", index "+index+
+                       ", location "+location+
+                       ", isVertexAttribute "+isVertexAttribute+
+                       ", dataType "+dataType+ 
+                       ", bufferClazz "+clazz+ 
+                       ", elements "+getElementNumber()+
+                       ", components "+components+ 
+                       ", stride "+stride+"u "+strideB+"b "+strideL+"c"+
+                       ", initialSize "+initialSize+ 
+                       ", sealed "+sealed+ 
+                       ", bufferEnabled "+bufferEnabled+ 
+                       ", bufferWritten "+bufferWritten+ 
+                       ", buffer "+buffer+ 
+                       "]";
+  }
+
+  // non public matters
+
+  protected final boolean growBufferIfNecessary(int spare) {
+    if(buffer==null || buffer.remaining()<spare) { 
+        growBuffer(initialSize);
+        return true;
+    }
+    return false;
+  }
+
+  protected final void growBuffer(int additional) {
+    if(sealed || 0==additional || 0==components) return;
+
+    // add the stride delta
+    additional += (additional/components)*(strideL-components);
+
+    if(components>0) {
+        int osize = (buffer!=null)?buffer.capacity():0;
+        if(clazz==ByteBuffer.class) {
+            ByteBuffer newBBuffer = BufferUtil.newByteBuffer( (osize+additional) * components );
+            if(buffer!=null) {
+                buffer.flip();
+                newBBuffer.put((ByteBuffer)buffer);
+            }
+            buffer = newBBuffer;
+        } else if(clazz==ShortBuffer.class) {
+            ShortBuffer newSBuffer = BufferUtil.newShortBuffer( (osize+additional) * components );
+            if(buffer!=null) {
+                buffer.flip();
+                newSBuffer.put((ShortBuffer)buffer);
+            }
+            buffer = newSBuffer;
+        } else if(clazz==IntBuffer.class) {
+            IntBuffer newIBuffer = BufferUtil.newIntBuffer( (osize+additional) * components );
+            if(buffer!=null) {
+                buffer.flip();
+                newIBuffer.put((IntBuffer)buffer);
+            }
+            buffer = newIBuffer;
+        } else if(clazz==FloatBuffer.class) {
+            FloatBuffer newFBuffer = BufferUtil.newFloatBuffer( (osize+additional) * components );
+            if(buffer!=null) {
+                buffer.flip();
+                newFBuffer.put((FloatBuffer)buffer);
+            }
+            buffer = newFBuffer;
+        } else {
+            throw new GLException("Given Buffer Class not supported: "+clazz+":\n\t"+this);
+        }
+    }
+  }
+
+  protected final void checkSeal(boolean test) throws GLException {
+    if(sealed!=test) {
+        if(test) {
+            throw new GLException("Not Sealed yet, seal first:\n\t"+this); 
+        } else {
+            throw new GLException("Already Sealed, can't modify VBO:\n\t"+this); 
+        }
+    }
+  }
+
+  protected void init(String name, int index, int comps, int dataType, boolean normalized, int stride, Buffer data, 
+                      int initialSize, boolean isVertexAttribute, GLArrayHandler handler,
+                      int vboName, long bufferOffset)
+    throws GLException
+  {
+    super.init(name, index, comps, dataType, normalized, stride, data, isVertexAttribute,
+               vboName, bufferOffset);
+
+    this.initialSize = initialSize;
+    this.glArrayHandler = handler;
+    this.sealed=false;
+    this.sealedGL=false;
+    this.bufferEnabled=false;
+    this.enableBufferAlways=false;
+    this.bufferWritten=false;
+    if(null==buffer) {
+        growBuffer(initialSize);
+    }
+  }
+
+  protected void init_vbo(GL gl) {}
+
+  protected GLArrayDataClient() { }
+
+  protected boolean sealed, sealedGL;
+  protected boolean bufferEnabled;
+  protected boolean bufferWritten;
+  protected boolean enableBufferAlways;
+
+  protected int initialSize;
+
+  protected GLArrayHandler glArrayHandler;
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataEditable.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataEditable.java
new file mode 100644
index 000000000..0f8ed27be
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataEditable.java
@@ -0,0 +1,110 @@
+
+package com.jogamp.opengl.util;
+
+import javax.media.opengl.*;
+
+import java.nio.*;
+
+/**
+ *
+ * The total number of bytes hold by the referenced buffer is:
+ * getComponentSize()* getComponentNumber() * getElementNumber()
+ *
+ */
+public interface GLArrayDataEditable extends GLArrayData {
+
+    public boolean sealed();
+
+    /**
+     * The VBO buffer usage, if it's an VBO, otherwise -1
+     */
+    public int getBufferUsage();
+
+    /**
+     * Is the buffer written to the GPU ?
+     */
+    public boolean isBufferWritten();
+
+    /**
+     * Marks the buffer written to the GPU
+     */
+    public void setBufferWritten(boolean written);
+
+    //
+    // Data and GL state modification ..
+    //
+
+    public void destroy(GL gl);
+
+    public void reset(GL gl);
+
+    /**
+     * If seal is true, it
+     * disable write operations to the buffer.
+     * Calls flip, ie limit:=position and position:=0.
+     * Also enables the buffer for OpenGL, and passes the data.
+     *
+     * If seal is false, it
+     * enable write operations continuing
+     * at the buffer position, where you left off at seal(true),
+     * ie position:=limit and limit:=capacity.
+     * Also disables the buffer for OpenGL.
+     *
+     * @see #seal(boolean)
+     */
+    public void seal(GL gl, boolean seal);
+
+    /**
+     * Enables/disables the buffer, which implies
+     * the client state, binding the VBO
+     * and transfering the data if not done yet.
+     * 
+     * The above will only be executed,
+     * if the buffer is disabled,
+     * or 'setEnableAlways' was called with 'true'.
+     *
+     * @see #setEnableAlways(boolean)
+     */
+    public void enableBuffer(GL gl, boolean enable);
+
+    /**
+     * Affects the behavior of 'enableBuffer'.
+     *
+     * The default is 'false'
+     *
+     * This is usefull when you mix up 
+     * GLArrayData usage with conventional GL array calls.
+     *
+     * @see #enableBuffer(GL, boolean)
+     */
+    public void setEnableAlways(boolean always);
+
+    //
+    // Data modification ..
+    //
+
+    public void reset();
+
+    /**
+     * If seal is true, it
+     * disable write operations to the buffer.
+     * Calls flip, ie limit:=position and position:=0.
+     *
+     * If seal is false, it
+     * enable write operations continuing
+     * at the buffer position, where you left off at seal(true),
+     * ie position:=limit and limit:=capacity.
+     *
+     */
+    public void seal(boolean seal);
+
+    public void rewind();
+    public void padding(int done);
+    public void put(Buffer v);
+    public void putb(byte v);
+    public void puts(short v);
+    public void puti(int v);
+    public void putx(int v);
+    public void putf(float v);
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataServer.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataServer.java
new file mode 100644
index 000000000..c061e212a
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataServer.java
@@ -0,0 +1,209 @@
+
+package com.jogamp.opengl.util;
+
+import javax.media.opengl.*;
+import java.nio.*;
+
+import com.jogamp.opengl.util.glsl.*;
+
+public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataEditable {
+
+  //
+  // lifetime matters
+  //
+
+  /**
+   * Create a VBOBuffer object, using a predefined fixed function array index
+   * and starting with a given Buffer object incl it's stride
+   *
+   * On profiles GL2 and ES1 the fixed function pipeline behavior is as expected.
+   * On profile ES2 the fixed function emulation will transform these calls to 
+   * EnableVertexAttribArray and VertexAttribPointer calls,
+   * and a predefined vertex attribute variable name will be choosen.
+   *
+   * @param index The GL array index
+   * @param name  The optional custom name for the GL array index, maybe null.
+   *            If null, the default name mapping will be used, see 'getPredefinedArrayIndexName(int)'.
+   *            This name might be used as the shader attribute name.
+   * @param comps The array component number
+   * @param dataType The array index GL data type
+   * @param normalized Wheather the data shall be normalized
+   *
+   * @see javax.media.opengl.GLContext#getPredefinedArrayIndexName(int)
+   */
+  public static GLArrayDataServer createFixed(GL gl, int index, String name, int comps, int dataType, boolean normalized,
+                                              int stride, Buffer buffer, int vboBufferUsage)
+    throws GLException
+  {
+    gl.getGLProfile().isValidArrayDataType(index, comps, dataType, false, true);
+
+    GLArrayDataServer ads = new GLArrayDataServer();
+    GLArrayHandler glArrayHandler = new GLFixedArrayHandler(ads);
+    ads.init(gl, name, index, comps, dataType, normalized, stride, buffer, buffer.limit(), false, glArrayHandler,
+             0, 0, vboBufferUsage);
+    return ads;
+  }
+
+  /**
+   * Create a VBOBuffer object, using a predefined fixed function array index
+   * and starting with a new created Buffer object with initialSize size
+   *
+   * On profiles GL2 and ES1 the fixed function pipeline behavior is as expected.
+   * On profile ES2 the fixed function emulation will transform these calls to 
+   * EnableVertexAttribArray and VertexAttribPointer calls,
+   * and a predefined vertex attribute variable name will be choosen.
+   *
+   * @see javax.media.opengl.GLContext#getPredefinedArrayIndexName(int)
+   */
+  public static GLArrayDataServer createFixed(GL gl, int index, String name, int comps, int dataType, boolean normalized, 
+                                              int initialSize, int vboBufferUsage)
+    throws GLException
+  {
+    gl.getGLProfile().isValidArrayDataType(index, comps, dataType, false, true);
+
+    GLArrayDataServer ads = new GLArrayDataServer();
+    GLArrayHandler glArrayHandler = new GLFixedArrayHandler(ads);
+    ads.init(gl, name, index, comps, dataType, normalized, 0, null, initialSize, false, glArrayHandler,
+             0, 0, vboBufferUsage);
+    return ads;
+  }
+
+  /**
+   * Create a VBOBuffer object, using a custom GLSL array attribute name
+   * and starting with a new created Buffer object with initialSize size
+   *
+   * @see javax.media.opengl.GLContext#getPredefinedArrayIndexName(int)
+   */
+  public static GLArrayDataServer createGLSL(GL gl, String name, int comps, int dataType, boolean normalized,
+                                             int initialSize, int vboBufferUsage) 
+    throws GLException
+  {
+    if(!gl.hasGLSL()) {
+        throw new GLException("GLArrayDataServer.GLSL not supported: "+gl);
+    }
+    gl.getGLProfile().isValidArrayDataType(-1, comps, dataType, true, true);
+
+    GLArrayDataServer ads = new GLArrayDataServer();
+    GLArrayHandler glArrayHandler = new GLSLArrayHandler(ads);
+    ads.init(gl, name, -1, comps, dataType, normalized, 0, null, initialSize, true, glArrayHandler,
+             0, 0, vboBufferUsage);
+    return ads;
+  }
+
+  /**
+   * Create a VBOBuffer object, using a custom GLSL array attribute name
+   * and starting with a given Buffer object incl it's stride
+   *
+   * @see javax.media.opengl.GLContext#getPredefinedArrayIndexName(int)
+   */
+  public static GLArrayDataServer createGLSL(GL gl, String name, int comps, int dataType, boolean normalized,
+                                             int stride, Buffer buffer, int vboBufferUsage) 
+    throws GLException
+  {
+    if(!gl.hasGLSL()) {
+        throw new GLException("GLArrayDataServer.GLSL not supported: "+gl);
+    }
+    gl.getGLProfile().isValidArrayDataType(-1, comps, dataType, true, true);
+
+    GLArrayDataServer ads = new GLArrayDataServer();
+    GLArrayHandler glArrayHandler = new GLSLArrayHandler(ads);
+    ads.init(gl, name, -1, comps, dataType, normalized, stride, buffer, buffer.limit(), true, glArrayHandler,
+             0, 0, vboBufferUsage);
+    return ads;
+  }
+
+  //
+  // Data matters GLArrayData
+  //
+
+  public int getBufferUsage() { return vboBufferUsage; }
+
+  //
+  // Data and GL state modification ..
+  //
+
+  public void destroy(GL gl) {
+    super.destroy(gl);
+    if(vboName!=0) {
+        int[] tmp = new int[1];
+        tmp[0] = vboName;
+        gl.glDeleteBuffers(1, tmp, 0);
+        vboName = 0;
+    }
+  }
+
+  //
+  // data matters 
+  //
+
+  /**
+   * Convenient way do disable the VBO behavior and 
+   * switch to client side data one
+   * Only possible if buffer is defined.
+   */
+  public void    setVBOUsage(boolean vboUsage) { 
+    checkSeal(false);
+    super.setVBOUsage(vboUsage);
+  }
+
+  public String toString() {
+    return "GLArrayDataServer["+name+
+                       ", index "+index+
+                       ", location "+location+
+                       ", isVertexAttribute "+isVertexAttribute+
+                       ", dataType "+dataType+ 
+                       ", bufferClazz "+clazz+ 
+                       ", elements "+getElementNumber()+
+                       ", components "+components+ 
+                       ", stride "+stride+"u "+strideB+"b "+strideL+"c"+
+                       ", initialSize "+initialSize+ 
+                       ", vboBufferUsage "+vboBufferUsage+ 
+                       ", vboUsage "+vboUsage+ 
+                       ", vboName "+vboName+ 
+                       ", sealed "+sealed+ 
+                       ", bufferEnabled "+bufferEnabled+ 
+                       ", bufferWritten "+bufferWritten+ 
+                       ", buffer "+buffer+ 
+                       ", offset "+bufferOffset+ 
+                       "]";
+  }
+
+  //
+  // non public matters ..
+  //
+
+  protected void init(GL gl, String name, int index, int comps, int dataType, boolean normalized, 
+                      int stride, Buffer data, int initialSize, boolean isVertexAttribute,
+                      GLArrayHandler glArrayHandler,
+                      int vboName, long bufferOffset, int vboBufferUsage)
+    throws GLException
+  {
+    super.init(name, index, comps, dataType, normalized, stride, data, initialSize, isVertexAttribute, glArrayHandler,
+               vboName, bufferOffset);
+
+    vboUsage=true;
+
+    if( ! (gl.isGL2ES2() && vboBufferUsage==GL2ES2.GL_STREAM_DRAW) ) {
+        switch(vboBufferUsage) {
+            case -1: // nop
+            case GL.GL_STATIC_DRAW:
+            case GL.GL_DYNAMIC_DRAW:
+                break;
+            default:
+                throw new GLException("invalid vboBufferUsage: "+vboBufferUsage+":\n\t"+this); 
+        }
+    }
+    this.vboBufferUsage=vboBufferUsage;
+  }
+
+  protected void init_vbo(GL gl) {
+    if(vboUsage && vboName==0) {
+        int[] tmp = new int[1];
+        gl.glGenBuffers(1, tmp, 0);
+        vboName = tmp[0];
+    }
+  }
+
+  protected int vboBufferUsage;
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
new file mode 100644
index 000000000..aa3059800
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
@@ -0,0 +1,215 @@
+
+package com.jogamp.opengl.util;
+
+import javax.media.opengl.*;
+
+import com.jogamp.opengl.util.glsl.fixedfunc.impl.*;
+
+import java.nio.*;
+
+public class GLArrayDataWrapper implements GLArrayData {
+
+  public static GLArrayDataWrapper createFixed(GL gl, int index, int comps, int dataType, boolean normalized, 
+                                              int stride, Buffer buffer,
+                                              int vboName, long bufferOffset)
+    throws GLException
+  {
+      gl.getGLProfile().isValidArrayDataType(index, comps, dataType, false, true);
+      GLArrayDataWrapper adc = new GLArrayDataWrapper();
+      adc.init(null, index, comps, dataType, normalized, stride, buffer, false, 
+               vboName, bufferOffset);
+      return adc;
+  }
+
+  public static GLArrayDataWrapper createGLSL(GL gl, String name, int comps, int dataType, boolean normalized, 
+                                             int stride, Buffer buffer,
+                                             int vboName, long bufferOffset)
+    throws GLException
+  {
+      if(!gl.hasGLSL()) {
+        throw new GLException("GLArrayDataWrapper.GLSL not supported: "+gl);
+      }
+      gl.getGLProfile().isValidArrayDataType(-1, comps, dataType, true, true);
+
+      GLArrayDataWrapper adc = new GLArrayDataWrapper();
+      adc.init(name, -1, comps, dataType, normalized, stride, buffer, true,
+               vboName, bufferOffset);
+      return adc;
+  }
+
+  // 
+  // Data read access
+  //
+
+  public final boolean isVertexAttribute() { return isVertexAttribute; }
+
+  public final int getIndex() { return index; }
+
+  public final int getLocation() { return location; }
+
+  public final void setLocation(int v) { location = v; }
+
+  public final String getName() { return name; }
+
+  public final long getOffset() { return vboUsage?bufferOffset:-1; }
+
+  public final int getVBOName() { return vboUsage?vboName:-1; }
+
+  public final boolean isVBO() { return vboUsage; }
+
+  public final Buffer getBuffer() { return buffer; }
+
+  public final int getComponentNumber() { return components; }
+
+  public final int getComponentType() { return dataType; }
+
+  public final int getComponentSize() {
+    if(clazz==ByteBuffer.class) {
+        return BufferUtil.SIZEOF_BYTE;
+    }
+    if(clazz==ShortBuffer.class) {
+        return BufferUtil.SIZEOF_SHORT;
+    }
+    if(clazz==IntBuffer.class) {
+        return BufferUtil.SIZEOF_INT;
+    }
+    if(clazz==FloatBuffer.class) {
+        return BufferUtil.SIZEOF_FLOAT;
+    }
+    throw new GLException("Given Buffer Class not supported: "+clazz+":\n\t"+this);
+  }
+
+  public final int getElementNumber() {
+    if(null==buffer) return 0;
+    return ( buffer.position()==0 ) ? ( buffer.limit() / components ) : ( buffer.position() / components ) ;
+  }
+
+  public final boolean getNormalized() { return normalized; }
+
+  public final int getStride() { return stride; }
+
+  public final Class getBufferClass() { return clazz; }
+
+  public void destroy(GL gl) {
+    this.buffer = null;
+    this.components = 0;
+    this.stride=0;
+    this.strideB=0;
+    this.strideL=0;
+    this.vboName=0;
+    this.vboUsage=false;
+    this.bufferOffset=0;
+  }
+
+  public String toString() {
+    return "GLArrayDataWrapper["+name+
+                       ", index "+index+
+                       ", location "+location+
+                       ", isVertexAttribute "+isVertexAttribute+
+                       ", dataType "+dataType+ 
+                       ", bufferClazz "+clazz+ 
+                       ", elements "+getElementNumber()+
+                       ", components "+components+ 
+                       ", stride "+stride+"u "+strideB+"b "+strideL+"c"+
+                       ", buffer "+buffer+ 
+                       ", offset "+bufferOffset+ 
+                       ", vboUsage "+vboUsage+ 
+                       ", vboName "+vboName+ 
+                       "]";
+  }
+
+  public static final Class getBufferClass(int dataType) {
+    switch(dataType) {
+        case GL.GL_BYTE:
+        case GL.GL_UNSIGNED_BYTE:
+            return ByteBuffer.class;
+        case GL.GL_SHORT:
+        case GL.GL_UNSIGNED_SHORT:
+            return ShortBuffer.class;
+        case GL2ES1.GL_FIXED:
+            return IntBuffer.class;
+        case GL.GL_FLOAT:
+            return FloatBuffer.class;
+        default:    
+            throw new GLException("Given OpenGL data type not supported: "+dataType);
+    }
+  }
+
+  public void setName(String newName) {
+    location = -1;
+    name = newName;
+  }
+
+  public void    setVBOUsage(boolean vboUsage) {
+    this.vboUsage=vboUsage;
+  }
+
+  public void    setVBOName(int vboName) {
+    this.vboName=vboName;
+    setVBOUsage(vboName>0);
+  }
+
+  protected void init(String name, int index, int comps, int dataType, boolean normalized, int stride, Buffer data, 
+                      boolean isVertexAttribute, 
+                      int vboName, long bufferOffset)
+    throws GLException
+  {
+    this.isVertexAttribute = isVertexAttribute;
+    this.index = index;
+    this.location = -1;
+    // We can't have any dependence on the FixedFuncUtil class here for build bootstrapping reasons
+    this.name = (null==name)?FixedFuncPipeline.getPredefinedArrayIndexName(index):name;
+    if(null==this.name) {
+        throw new GLException("Not a valid GL array index: "+index);
+    }
+    this.dataType = dataType;
+    this.clazz = getBufferClass(dataType);
+    switch(dataType) {
+        case GL.GL_BYTE:
+        case GL.GL_UNSIGNED_BYTE:
+        case GL.GL_SHORT:
+        case GL.GL_UNSIGNED_SHORT:
+        case GL2ES1.GL_FIXED:
+            this.normalized = normalized;
+            break;
+        default:    
+            this.normalized = false;
+    }
+
+    int bpc = getComponentSize();
+    if(0<stride && stride<comps*bpc) {
+        throw new GLException("stride ("+stride+") lower than component bytes, "+comps+" * "+bpc);
+    }
+    if(0<stride && stride%bpc!=0) {
+        throw new GLException("stride ("+stride+") not a multiple of bpc "+bpc);
+    }
+    this.buffer = data;
+    this.components = comps;
+    this.stride=stride;
+    this.strideB=(0==stride)?comps*bpc:stride;
+    this.strideL=(0==stride)?comps:strideB/bpc;
+    this.vboName=vboName;
+    this.vboUsage=vboName>0;
+    this.bufferOffset=bufferOffset;
+  }
+
+  protected GLArrayDataWrapper() { }
+
+  protected int index;
+  protected int location;
+  protected String name;
+  protected int components;
+  protected int dataType;
+  protected boolean normalized;
+  protected int stride;  // user given stride
+  protected int strideB; // stride in bytes
+  protected int strideL; // stride in logical components
+  protected Class clazz;
+  protected Buffer buffer;
+  protected boolean isVertexAttribute;
+
+  protected long bufferOffset;
+  protected int vboName;
+  protected boolean vboUsage;
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayHandler.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayHandler.java
new file mode 100644
index 000000000..bfabb5b01
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayHandler.java
@@ -0,0 +1,11 @@
+
+package com.jogamp.opengl.util;
+
+import javax.media.opengl.*;
+
+public interface GLArrayHandler {
+
+  public void enableBuffer(GL gl, boolean enable);
+
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLFixedArrayHandler.java b/src/jogl/classes/com/jogamp/opengl/util/GLFixedArrayHandler.java
new file mode 100644
index 000000000..f0f5ea896
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLFixedArrayHandler.java
@@ -0,0 +1,65 @@
+
+package com.jogamp.opengl.util;
+
+import javax.media.opengl.*;
+import javax.media.opengl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import java.nio.*;
+
+public class GLFixedArrayHandler implements GLArrayHandler {
+  private GLArrayDataEditable ad;
+
+  public GLFixedArrayHandler(GLArrayDataEditable ad) {
+    this.ad = ad;
+  }
+
+  protected final void passArrayPointer(GLPointerFunc gl) {
+    switch(ad.getIndex()) {
+        case GLPointerFunc.GL_VERTEX_ARRAY:
+            gl.glVertexPointer(ad);
+            break;
+        case GLPointerFunc.GL_NORMAL_ARRAY:
+            gl.glNormalPointer(ad);
+            break;
+        case GLPointerFunc.GL_COLOR_ARRAY:
+            gl.glColorPointer(ad);
+            break;
+        case GLPointerFunc.GL_TEXTURE_COORD_ARRAY:
+            gl.glTexCoordPointer(ad);
+            break;
+        default:
+            throw new GLException("invalid glArrayIndex: "+ad.getIndex()+":\n\t"+ad); 
+    }
+  }
+
+  public void enableBuffer(GL gl, boolean enable) {
+    GLPointerFunc glp = gl.getGL2ES1();
+    if(enable) {
+        glp.glEnableClientState(ad.getIndex());
+
+        Buffer buffer = ad.getBuffer();
+
+        if(ad.isVBO()) {
+            // always bind and refresh the VBO mgr, 
+            // in case more than one gl*Pointer objects are in use
+            gl.glBindBuffer(GL.GL_ARRAY_BUFFER, ad.getVBOName());
+            if(!ad.isBufferWritten()) {
+                if(null!=buffer) {
+                    gl.glBufferData(GL.GL_ARRAY_BUFFER, buffer.limit() * ad.getComponentSize(), buffer, ad.getBufferUsage());
+                }
+                ad.setBufferWritten(true);
+            }
+            passArrayPointer(glp);
+        } else if(null!=buffer) {
+            passArrayPointer(glp);
+            ad.setBufferWritten(true);
+        }
+    } else {
+        if(ad.isVBO()) {
+            gl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0);
+        }
+        glp.glDisableClientState(ad.getIndex());
+    }
+  }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/Gamma.java b/src/jogl/classes/com/jogamp/opengl/util/Gamma.java
new file mode 100755
index 000000000..672325cf3
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/Gamma.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+/** Provides control over the primary display's gamma, brightness and
+    contrast controls via the hardware gamma ramp tables. Not
+    supported on all platforms or graphics hardware. <P>
+
+    Thanks to the LWJGL project for illustrating how to access gamma
+    control on the various platforms.
+*/
+
+public class Gamma {
+  private Gamma() {}
+
+  /**
+   * Sets the gamma, brightness, and contrast of the current main
+   * display. This functionality is not available on all platforms and
+   * graphics hardware. Returns true if the settings were successfully
+   * changed, false if not. This method may return false for some
+   * values of the incoming arguments even on hardware which does
+   * support the underlying functionality. <P>
+   *
+   * If this method returns true, the display settings will
+   * automatically be reset to their original values upon JVM exit
+   * (assuming the JVM does not crash); if the user wishes to change
+   * the display settings back to normal ahead of time, use {@link
+   * #resetDisplayGamma resetDisplayGamma}(). It is recommended to
+   * call {@link #resetDisplayGamma resetDisplayGamma} before calling
+   * e.g. <code>System.exit()</code> from the application rather than
+   * rely on the shutdown hook functionality due to inevitable race
+   * conditions and unspecified behavior during JVM teardown. <P>
+   *
+   * This method may be called multiple times during the application's
+   * execution, but calling {@link #resetDisplayGamma
+   * resetDisplayGamma} will only reset the settings to the values
+   * before the first call to this method. <P>
+   *
+   * @param gamma The gamma value, typically > 1.0 (default values
+   *   vary, but typically roughly 1.0)
+   * @param brightness The brightness value between -1.0 and 1.0,
+   *   inclusive (default values vary, but typically 0)
+   * @param contrast The contrast, greater than 0.0 (default values
+   *   vary, but typically 1)
+   * @return true if gamma settings were successfully changed, false
+   *   if not
+   * @throws IllegalArgumentException if any of the parameters were
+   *   out-of-bounds
+   */
+  public static boolean setDisplayGamma(GL gl, float gamma, float brightness, float contrast) throws IllegalArgumentException {
+    return GLDrawableFactoryImpl.getFactoryImpl(gl.getContext().getGLDrawable().getGLProfile()).setDisplayGamma(gamma, brightness, contrast);
+  }
+
+  /**
+   * Resets the gamma, brightness and contrast values for the primary
+   * display to their original values before {@link #setDisplayGamma
+   * setDisplayGamma} was called the first time. {@link
+   * #setDisplayGamma setDisplayGamma} must be called before calling
+   * this method or an unspecified exception will be thrown. While it
+   * is not explicitly required that this method be called before
+   * exiting, calling it is recommended because of the inevitable
+   * unspecified behavior during JVM teardown.
+   */
+  public static void resetDisplayGamma(GL gl) {
+    GLDrawableFactoryImpl.getFactoryImpl(gl.getContext().getGLDrawable().getGLProfile()).resetDisplayGamma();
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
new file mode 100644
index 000000000..98249184d
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
@@ -0,0 +1,974 @@
+
+package com.jogamp.opengl.util;
+
+import javax.media.opengl.*;
+import javax.media.opengl.fixedfunc.*;
+import com.sun.nativewindow.impl.NWReflection;
+import java.nio.*;
+import java.util.Iterator;
+import java.util.ArrayList;
+
+public class ImmModeSink {
+
+  public static final boolean DEBUG_BEGIN_END = false;
+  public static final boolean DEBUG_DRAW = false;
+
+  // public static final int GL_QUADS      = 0x0007; // Needs data manipulation
+  public static final int GL_QUAD_STRIP = 0x0008;
+  public static final int GL_POLYGON    = 0x0009;
+
+  /**
+   * Uses a GL2ES1, or ES2 fixed function emulation immediate mode sink
+   */
+  public static ImmModeSink createFixed(GL gl, int glBufferUsage, int initialSize,
+                                        int vComps, int vDataType,
+                                        int cComps, int cDataType, 
+                                        int nComps, int nDataType, 
+                                        int tComps, int tDataType) {
+    return new ImmModeSink(gl, glBufferUsage, initialSize, 
+                           vComps, vDataType, cComps, cDataType, nComps, nDataType, tComps, tDataType, false);
+  }
+
+  /**
+   * Uses a GL2ES2 GLSL shader immediate mode sink.
+   * To issue the draw() command,
+   * a ShaderState must be current, using ShaderState.glUseProgram().
+   *
+   * @see #draw(GL, boolean)
+   * @see javax.media.opengl.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
+   * @see javax.media.opengl.glsl.ShaderState#getCurrent()
+   */
+  public static ImmModeSink createGLSL(GL gl, int glBufferUsage, int initialSize,
+                                       int vComps, int vDataType,
+                                       int cComps, int cDataType, 
+                                       int nComps, int nDataType, 
+                                       int tComps, int tDataType) {
+    return new ImmModeSink(gl, glBufferUsage, initialSize, 
+                           vComps, vDataType, cComps, cDataType, nComps, nDataType, tComps, tDataType, true);
+  }
+
+  public static boolean usesVBO() { return vboUsage; }
+
+  public static void setVBOUsage(boolean v) { vboUsage = v; }
+
+  public void destroy(GL gl) {
+    destroyList(gl);
+
+    vboSet.destroy(gl);
+  }
+
+  public void reset() {
+    reset(null);
+  }
+
+  public void reset(GL gl) {
+    destroyList(gl);
+    vboSet.reset(gl);
+  }
+
+  public String toString() {
+    StringBuffer sb = new StringBuffer("ImmModeSink[");
+    sb.append(",\n\tVBO list: "+vboSetList.size()+" [");
+    for(Iterator i=vboSetList.iterator(); i.hasNext() ; ) {
+        sb.append("\n\t");
+        sb.append( (VBOSet)i.next() );
+    }
+    if(vboSetList.size()>0) {
+        sb.append("\n\t],\nVBO current: NOP]");
+    } else {
+        sb.append("\n\t],\nVBO current: \n");
+        sb.append(vboSet);
+        sb.append("\n]");
+    }
+    return sb.toString();
+  }
+
+  public void draw(GL gl, boolean disableBufferAfterDraw) {
+    if(DEBUG_DRAW) {
+        Exception e = new Exception("ImmModeSink.draw(disableBufferAfterDraw: "+disableBufferAfterDraw+"):\n\t"+this);
+        e.printStackTrace();
+    }
+    int n=0;
+    for(Iterator i=vboSetList.iterator(); i.hasNext() ; n++) {
+        ((VBOSet)i.next()).draw(gl, null, disableBufferAfterDraw, n);
+    }
+  }
+
+  public void draw(GL gl, Buffer indices, boolean disableBufferAfterDraw) {
+    if(DEBUG_DRAW) {
+        Exception e = new Exception("ImmModeSink.draw(disableBufferAfterDraw: "+disableBufferAfterDraw+"):\n\t"+this);
+        e.printStackTrace();
+    }
+    int n=0;
+    for(Iterator i=vboSetList.iterator(); i.hasNext() ; n++) {
+        ((VBOSet)i.next()).draw(gl, indices, disableBufferAfterDraw, n);
+    }
+  }
+
+  public void glBegin(int mode) {
+    if(DEBUG_BEGIN_END) {
+        Exception e = new Exception("ImmModeSink.glBegin("+vboSet.mode+"):\n\t"+this);
+        e.printStackTrace();
+    }
+    vboSet.modeOrig = mode;
+    switch(mode) {
+        // Needs data manipulation ..
+        //case GL_QUADS:
+        //    mode=GL.GL_LINES;
+        //    break;
+        case GL_QUAD_STRIP:
+            mode=GL.GL_TRIANGLE_STRIP;
+            break;
+        case GL_POLYGON:
+            mode=GL.GL_LINES;
+            break;
+    }
+    vboSet.mode = mode;
+    vboSet.checkSeal(false);
+  }
+
+  public final void glEnd(GL gl) {
+      glEnd(gl, null, true);
+  }
+
+  public void glEnd(GL gl, boolean immediateDraw) {
+      glEnd(gl, null, immediateDraw);
+  }
+
+  public final void glEnd(GL gl, Buffer indices) {
+      glEnd(gl, indices, true);
+  }
+
+  private void glEnd(GL gl, Buffer indices, boolean immediateDraw) {
+    if(DEBUG_BEGIN_END) {
+        Exception e = new Exception("ImmModeSink START glEnd(immediate: "+immediateDraw+"):\n\t"+this);
+        e.printStackTrace();
+    }
+    if(immediateDraw) {
+        vboSet.seal(gl, true);
+        vboSet.draw(gl, indices, true, -1);
+        reset(gl);
+    } else {
+        vboSet.seal(gl, true);
+        vboSet.enableBuffer(gl, false);
+        vboSetList.add(vboSet);
+        vboSet = vboSet.regenerate();
+    }
+  }
+
+  public void glVertexv(Buffer v) {
+    vboSet.glVertexv(v);
+  }
+  public void glNormalv(Buffer v) {
+    vboSet.glNormalv(v);
+  }
+  public void glColorv(Buffer v) {
+    vboSet.glColorv(v);
+  }
+  public void glTexCoordv(Buffer v) {
+    vboSet.glTexCoordv(v);
+  }
+
+  public final void glVertex2f(float x, float y) {
+    vboSet.glVertex2f(x,y);
+  }
+
+  public final void glVertex3f(float x, float y, float z) {
+    vboSet.glVertex3f(x,y,z);
+  }
+
+  public final void glNormal3f(float x, float y, float z) {
+    vboSet.glNormal3f(x,y,z);
+  }
+
+  public final void glColor3f(float x, float y, float z) {
+    vboSet.glColor3f(x,y,z);
+  }
+
+  public final void glColor4f(float x, float y, float z, float a) {
+    vboSet.glColor4f(x,y,z, a);
+  }
+
+  public final void glTexCoord2f(float x, float y) {
+    vboSet.glTexCoord2f(x,y);
+  }
+
+  public final void glTexCoord3f(float x, float y, float z) {
+    vboSet.glTexCoord3f(x,y,z);
+  }
+
+  public final void glVertex2s(short x, short y) {
+    vboSet.glVertex2s(x,y);
+  }
+
+  public final void glVertex3s(short x, short y, short z) {
+    vboSet.glVertex3s(x,y,z);
+  }
+
+  public final void glNormal3s(short x, short y, short z) {
+    vboSet.glNormal3s(x,y,z);
+  }
+
+  public final void glColor3s(short x, short y, short z) {
+    vboSet.glColor3s(x,y,z);
+  }
+
+  public final void glColor4s(short x, short y, short z, short a) {
+    vboSet.glColor4s(x,y,z,a);
+  }
+
+  public final void glTexCoord2s(short x, short y) {
+    vboSet.glTexCoord2s(x,y);
+  }
+
+  public final void glTexCoord3s(short x, short y, short z) {
+    vboSet.glTexCoord3s(x,y,z);
+  }
+
+  public final void glVertex2b(byte x, byte y) {
+    vboSet.glVertex2b(x,y);
+  }
+
+  public final void glVertex3b(byte x, byte y, byte z) {
+    vboSet.glVertex3b(x,y,z);
+  }
+
+  public final void glNormal3b(byte x, byte y, byte z) {
+    vboSet.glNormal3b(x,y,z);
+  }
+
+  public final void glColor3b(byte x, byte y, byte z) {
+    vboSet.glColor3b(x,y,z);
+  }
+
+  public final void glColor4b(byte x, byte y, byte z, byte a) {
+    vboSet.glColor4b(x,y,z,a);
+  }
+
+  public final void glTexCoord2b(byte x, byte y) {
+    vboSet.glTexCoord2b(x,y);
+  }
+
+  public final void glTexCoord3b(byte x, byte y, byte z) {
+    vboSet.glTexCoord3b(x,y,z);
+  }
+
+  protected ImmModeSink(GL gl, int glBufferUsage, int initialSize,
+                        int vComps, int vDataType,
+                        int cComps, int cDataType, 
+                        int nComps, int nDataType, 
+                        int tComps, int tDataType, boolean useGLSL) {
+    if(useGLSL && !gl.hasGLSL()) {
+        throw new GLException("ImmModeSink GLSL usage not supported: "+gl);
+    }
+    vboSet = new  VBOSet(gl, glBufferUsage, initialSize, 
+                         vComps, vDataType, cComps, cDataType, nComps, nDataType, tComps, tDataType, useGLSL);
+    this.vboSetList   = new ArrayList();
+  }
+
+  private void destroyList(GL gl) {
+    for(Iterator i=vboSetList.iterator(); i.hasNext() ; ) {
+        ((VBOSet)i.next()).destroy(gl);
+    }
+    vboSetList.clear();
+  }
+
+  private VBOSet vboSet;
+  private ArrayList vboSetList;
+  private static boolean vboUsage = true;
+
+  protected static class VBOSet {
+    protected VBOSet (GL gl, int glBufferUsage, int initialSize,
+                      int vComps, int vDataType,
+                      int cComps, int cDataType, 
+                      int nComps, int nDataType, 
+                      int tComps, int tDataType, boolean useGLSL) {
+        this.gl=gl;
+        this.glBufferUsage=glBufferUsage;
+        this.initialSize=initialSize;
+        this.vDataType=vDataType;
+        this.vComps=vComps;
+        this.cDataType=cDataType;
+        this.cComps=cComps;
+        this.nDataType=nDataType;
+        this.nComps=nComps;
+        this.tDataType=tDataType;
+        this.tComps=tComps;
+        this.useGLSL=useGLSL;
+
+        allocateBuffer(initialSize);
+        rewind();
+
+        this.sealed=false;
+        this.sealedGL=false;
+        this.mode = -1;
+        this.modeOrig = -1;
+        this.bufferEnabled=false;
+        this.bufferWritten=false;
+    }
+
+    protected final VBOSet regenerate() {
+        return new VBOSet(gl, glBufferUsage, initialSize, 
+                          vComps, vDataType, cComps, cDataType, nComps, nDataType, tComps, tDataType, useGLSL);
+    }
+
+    protected void checkSeal(boolean test) throws GLException {
+        if(mode<0) {
+                throw new GLException("No mode set yet, call glBegin(mode) first:\n\t"+this); 
+        }
+        if(sealed!=test) {
+            if(test) {
+                throw new GLException("Not Sealed yet, call glEnd() first:\n\t"+this); 
+            } else {
+                throw new GLException("Already Sealed, can't modify VBO after glEnd():\n\t"+this); 
+            }
+        }
+    }
+
+    protected void draw(GL gl, Buffer indices, boolean disableBufferAfterDraw, int i)
+    {
+        if(DEBUG_DRAW) {
+            Exception e = new Exception("ImmModeSink.draw["+i+"](disableBufferAfterDraw: "+disableBufferAfterDraw+"):\n\t"+this);
+            e.printStackTrace();
+        }
+        enableBuffer(gl, true);
+
+        if (buffer!=null) {
+            GL2ES1 glf = gl.getGL2ES1();
+
+            if(null==indices) {
+                glf.glDrawArrays(mode, 0, count);
+            } else {
+                Class clazz = indices.getClass();
+                int type=-1;
+                if(NWReflection.instanceOf(clazz, ByteBuffer.class.getName())) {
+                    type =  GL.GL_UNSIGNED_BYTE;
+                } else if(NWReflection.instanceOf(clazz, ShortBuffer.class.getName())) {
+                    type =  GL.GL_UNSIGNED_SHORT;
+                }
+                if(0>type) {
+                    throw new GLException("Given Buffer Class not supported: "+clazz+", should be ubyte or ushort:\n\t"+this);
+                }
+                glf.glDrawElements(mode, indices.remaining(), type, indices);
+                // GL2: gl.glDrawRangeElements(mode, 0, indices.remaining()-1, indices.remaining(), type, indices);
+            }
+        }
+
+        if(disableBufferAfterDraw) {
+            enableBuffer(gl, false);
+        }
+    }
+
+    public void glVertexv(Buffer v) {
+        checkSeal(false);
+        BufferUtil.put(vertexArray, v);
+    }
+    public void glNormalv(Buffer v) {
+        checkSeal(false);
+        BufferUtil.put(normalArray, v);
+    }
+    public void glColorv(Buffer v) {
+        checkSeal(false);
+        BufferUtil.put(colorArray, v);
+    }
+    public void glTexCoordv(Buffer v) {
+        checkSeal(false);
+        BufferUtil.put(textCoordArray, v);
+    }
+
+    public void glVertex2b(byte x, byte y) {
+        checkSeal(false);
+        growBufferIfNecessary(VERTEX, 2);
+        if(vComps>0) 
+            BufferUtil.putb(vertexArray, x);
+        if(vComps>1) 
+            BufferUtil.putb(vertexArray, y);
+        padding(VERTEX, vComps-2);
+    }
+    public void glVertex3b(byte x, byte y, byte z) {
+        checkSeal(false);
+        growBufferIfNecessary(VERTEX, 3);
+        if(vComps>0) 
+            BufferUtil.putb(vertexArray, x);
+        if(vComps>1) 
+            BufferUtil.putb(vertexArray, y);
+        if(vComps>2) 
+            BufferUtil.putb(vertexArray, z);
+        padding(VERTEX, vComps-3);
+    }
+    public void glVertex2s(short x, short y) {
+        checkSeal(false);
+        growBufferIfNecessary(VERTEX, 2);
+        if(vComps>0) 
+            BufferUtil.puts(vertexArray, x);
+        if(vComps>1) 
+            BufferUtil.puts(vertexArray, y);
+        padding(VERTEX, vComps-2);
+    }
+    public void glVertex3s(short x, short y, short z) {
+        checkSeal(false);
+        growBufferIfNecessary(VERTEX, 3);
+        if(vComps>0) 
+            BufferUtil.puts(vertexArray, x);
+        if(vComps>1) 
+            BufferUtil.puts(vertexArray, y);
+        if(vComps>2) 
+            BufferUtil.puts(vertexArray, z);
+        padding(VERTEX, vComps-3);
+    }
+    public void glVertex2f(float x, float y) {
+        checkSeal(false);
+        growBufferIfNecessary(VERTEX, 2);
+        if(vComps>0) 
+            BufferUtil.putf(vertexArray, x);
+        if(vComps>1) 
+            BufferUtil.putf(vertexArray, y);
+        padding(VERTEX, vComps-2);
+    }
+    public void glVertex3f(float x, float y, float z) {
+        checkSeal(false);
+        growBufferIfNecessary(VERTEX, 3);
+        if(vComps>0) 
+            BufferUtil.putf(vertexArray, x);
+        if(vComps>1) 
+            BufferUtil.putf(vertexArray, y);
+        if(vComps>2) 
+            BufferUtil.putf(vertexArray, z);
+        padding(VERTEX, vComps-3);
+    }
+
+    public void glNormal3b(byte x, byte y, byte z) {
+        checkSeal(false);
+        growBufferIfNecessary(NORMAL, 3);
+        if(nComps>0) 
+            BufferUtil.putb(normalArray, x);
+        if(nComps>1) 
+            BufferUtil.putb(normalArray, y);
+        if(nComps>2) 
+            BufferUtil.putb(normalArray, z);
+        padding(NORMAL, nComps-3);
+    }
+    public void glNormal3s(short x, short y, short z) {
+        checkSeal(false);
+        growBufferIfNecessary(NORMAL, 3);
+        if(nComps>0) 
+            BufferUtil.puts(normalArray, x);
+        if(nComps>1) 
+            BufferUtil.puts(normalArray, y);
+        if(nComps>2) 
+            BufferUtil.puts(normalArray, z);
+        padding(NORMAL, nComps-3);
+    }
+    public void glNormal3f(float x, float y, float z) {
+        checkSeal(false);
+        growBufferIfNecessary(NORMAL, 3);
+        if(nComps>0) 
+            BufferUtil.putf(normalArray, x);
+        if(nComps>1) 
+            BufferUtil.putf(normalArray, y);
+        if(nComps>2) 
+            BufferUtil.putf(normalArray, z);
+        padding(NORMAL, nComps-3);
+    }
+
+    public void glColor3b(byte r, byte g, byte b) {
+        checkSeal(false);
+        growBufferIfNecessary(COLOR, 3);
+        if(cComps>0) 
+            BufferUtil.putb(colorArray, r);
+        if(cComps>1) 
+            BufferUtil.putb(colorArray, g);
+        if(cComps>2) 
+            BufferUtil.putb(colorArray, b);
+        padding(COLOR, cComps-3);
+    }
+    public void glColor4b(byte r, byte g, byte b, byte a) {
+        checkSeal(false);
+        growBufferIfNecessary(COLOR, 4);
+        if(cComps>0) 
+            BufferUtil.putb(colorArray, r);
+        if(cComps>1) 
+            BufferUtil.putb(colorArray, g);
+        if(cComps>2) 
+            BufferUtil.putb(colorArray, b);
+        if(cComps>3) 
+            BufferUtil.putb(colorArray, a);
+        padding(COLOR, cComps-4);
+    }
+    public void glColor3s(short r, short g, short b) {
+        checkSeal(false);
+        growBufferIfNecessary(COLOR, 3);
+        if(cComps>0) 
+            BufferUtil.puts(colorArray, r);
+        if(cComps>1) 
+            BufferUtil.puts(colorArray, g);
+        if(cComps>2) 
+            BufferUtil.puts(colorArray, b);
+        padding(COLOR, cComps-3);
+    }
+    public void glColor4s(short r, short g, short b, short a) {
+        checkSeal(false);
+        growBufferIfNecessary(COLOR, 4);
+        if(cComps>0) 
+            BufferUtil.puts(colorArray, r);
+        if(cComps>1) 
+            BufferUtil.puts(colorArray, g);
+        if(cComps>2) 
+            BufferUtil.puts(colorArray, b);
+        if(cComps>3) 
+            BufferUtil.puts(colorArray, a);
+        padding(COLOR, cComps-4);
+    }
+    public void glColor3f(float r, float g, float b) {
+        checkSeal(false);
+        growBufferIfNecessary(COLOR, 3);
+        if(cComps>0) 
+            BufferUtil.putf(colorArray, r);
+        if(cComps>1) 
+            BufferUtil.putf(colorArray, g);
+        if(cComps>2) 
+            BufferUtil.putf(colorArray, b);
+        padding(COLOR, cComps-3);
+    }
+    public void glColor4f(float r, float g, float b, float a) {
+        checkSeal(false);
+        growBufferIfNecessary(COLOR, 4);
+        if(cComps>0) 
+            BufferUtil.putf(colorArray, r);
+        if(cComps>1) 
+            BufferUtil.putf(colorArray, g);
+        if(cComps>2) 
+            BufferUtil.putf(colorArray, b);
+        if(cComps>3) 
+            BufferUtil.putf(colorArray, a);
+        padding(COLOR, cComps-4);
+    }
+
+    public void glTexCoord2b(byte x, byte y) {
+        checkSeal(false);
+        growBufferIfNecessary(TEXTCOORD, 2);
+        if(tComps>0) 
+            BufferUtil.putb(textCoordArray, x);
+        if(tComps>1) 
+            BufferUtil.putb(textCoordArray, y);
+        padding(TEXTCOORD, tComps-2);
+    }
+    public void glTexCoord3b(byte x, byte y, byte z) {
+        checkSeal(false);
+        growBufferIfNecessary(TEXTCOORD, 3);
+        if(tComps>0) 
+            BufferUtil.putb(textCoordArray, x);
+        if(tComps>1) 
+            BufferUtil.putb(textCoordArray, y);
+        if(tComps>2) 
+            BufferUtil.putb(textCoordArray, z);
+        padding(TEXTCOORD, tComps-3);
+    }
+    public void glTexCoord2s(short x, short y) {
+        checkSeal(false);
+        growBufferIfNecessary(TEXTCOORD, 2);
+        if(tComps>0) 
+            BufferUtil.puts(textCoordArray, x);
+        if(tComps>1) 
+            BufferUtil.puts(textCoordArray, y);
+        padding(TEXTCOORD, tComps-2);
+    }
+    public void glTexCoord3s(short x, short y, short z) {
+        checkSeal(false);
+        growBufferIfNecessary(TEXTCOORD, 3);
+        if(tComps>0) 
+            BufferUtil.puts(textCoordArray, x);
+        if(tComps>1) 
+            BufferUtil.puts(textCoordArray, y);
+        if(tComps>2) 
+            BufferUtil.puts(textCoordArray, z);
+        padding(TEXTCOORD, tComps-3);
+    }
+    public void glTexCoord2f(float x, float y) {
+        checkSeal(false);
+        growBufferIfNecessary(TEXTCOORD, 2);
+        if(tComps>0) 
+            BufferUtil.putf(textCoordArray, x);
+        if(tComps>1) 
+            BufferUtil.putf(textCoordArray, y);
+        padding(TEXTCOORD, tComps-2);
+    }
+    public void glTexCoord3f(float x, float y, float z) {
+        checkSeal(false);
+        growBufferIfNecessary(TEXTCOORD, 3);
+        if(tComps>0) 
+            BufferUtil.putf(textCoordArray, x);
+        if(tComps>1) 
+            BufferUtil.putf(textCoordArray, y);
+        if(tComps>2) 
+            BufferUtil.putf(textCoordArray, z);
+        padding(TEXTCOORD, tComps-3);
+    }
+
+    public void rewind() {
+        if(null!=vertexArray) {
+            vertexArray.rewind();
+        }
+        if(null!=colorArray) {
+            colorArray.rewind();
+        }
+        if(null!=normalArray) {
+            normalArray.rewind();
+        }
+        if(null!=textCoordArray) {
+            textCoordArray.rewind();
+        }
+    }
+
+    public void destroy(GL gl) {
+        reset(gl);
+
+        vertexArray=null; colorArray=null; normalArray=null; textCoordArray=null;
+        vArrayData=null; cArrayData=null; nArrayData=null; tArrayData=null;
+        buffer=null;
+        bSize=0; count=0;
+    }
+
+    public void reset(GL gl) {
+        enableBuffer(gl, false);
+        reset();
+    }
+
+    public void reset() {
+        if(buffer!=null) {
+            buffer.clear();
+        }
+        rewind();
+
+        this.mode = -1;
+        this.modeOrig = -1;
+        this.sealed=false;
+        this.bufferEnabled=false;
+        this.bufferWritten=false;
+    }
+
+    public void seal(GL glObj, boolean seal)
+    {
+        seal(seal);
+        if(sealedGL==seal) return;
+        sealedGL = seal;
+        GL gl = glObj.getGL();
+        if(seal) {
+            if(vboUsage && vboName==0) {
+                int[] tmp = new int[1];
+                gl.glGenBuffers(1, tmp, 0);
+                vboName = tmp[0];
+            }
+            if(null!=vArrayData)
+                vArrayData.setVBOName(vboName);
+            if(null!=cArrayData)
+                cArrayData.setVBOName(vboName);
+            if(null!=nArrayData)
+                nArrayData.setVBOName(vboName);
+            if(null!=tArrayData)
+                tArrayData.setVBOName(vboName);
+            enableBuffer(gl, true);
+        } else {
+            enableBuffer(gl, false);
+        }
+    }
+
+    public void seal(boolean seal)
+    {
+        if(sealed==seal) return;
+        sealed = seal;
+        if(seal) {
+            bufferWritten=false;
+        }
+    }
+
+  public void enableBuffer(GL gl, boolean enable) {
+    /* if(enableBufferAlways && enable) {
+        bufferEnabled = false;
+    } */
+    if( bufferEnabled != enable && count>0 ) {
+        if(enable) {
+            checkSeal(true);
+        }
+        if(useGLSL) { 
+            enableBufferGLSL(gl, enable);
+        } else {
+            enableBufferFixed(gl, enable);
+        }
+        bufferEnabled = enable;
+    }
+  }
+
+  public void enableBufferFixed(GL gl, boolean enable) {
+    GL2ES1 glf = gl.getGL2ES1();
+
+    if(enable) {
+        gl.glBindBuffer(GL.GL_ARRAY_BUFFER, vboName);
+
+        if(!bufferWritten) {
+            gl.glBufferData(GL.GL_ARRAY_BUFFER, buffer.limit(), buffer, GL.GL_STATIC_DRAW);
+            bufferWritten=true;
+        }
+
+        if(vComps>0) {
+           glf.glEnableClientState(glf.GL_VERTEX_ARRAY);
+           glf.glVertexPointer(vArrayData);
+        }
+        if(cComps>0) {
+           glf.glEnableClientState(glf.GL_COLOR_ARRAY);
+           glf.glColorPointer(cArrayData);
+        }
+        if(nComps>0) {
+           glf.glEnableClientState(glf.GL_NORMAL_ARRAY);
+           glf.glNormalPointer(nArrayData);
+        }
+        if(tComps>0) {
+           glf.glEnableClientState(glf.GL_TEXTURE_COORD_ARRAY);
+           glf.glTexCoordPointer(tArrayData);
+        }
+
+        gl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0);
+    } else {
+        if(vComps>0) {
+           glf.glDisableClientState(glf.GL_VERTEX_ARRAY);
+        }
+        if(cComps>0) {
+           glf.glDisableClientState(glf.GL_COLOR_ARRAY);
+        }
+        if(nComps>0) {
+           glf.glDisableClientState(glf.GL_NORMAL_ARRAY);
+        }
+        if(tComps>0) {
+           glf.glDisableClientState(glf.GL_TEXTURE_COORD_ARRAY);
+        }
+    }
+  }
+
+  public void enableBufferGLSL(GL gl, boolean enable) {
+    GL2ES2 glsl = gl.getGL2ES2();
+    com.jogamp.opengl.util.glsl.ShaderState st = com.jogamp.opengl.util.glsl.ShaderState.getCurrent();
+    if(null==st) {
+        throw new GLException("No ShaderState current");
+    }
+ 
+    if(enable) {
+        glsl.glBindBuffer(GL.GL_ARRAY_BUFFER, vboName);
+
+        if(!bufferWritten) {
+            glsl.glBufferData(GL.GL_ARRAY_BUFFER, buffer.limit(), buffer, GL.GL_STATIC_DRAW);
+            bufferWritten=true;
+        }
+
+        if(vComps>0) {
+           st.glEnableVertexAttribArray(glsl, vArrayData.getName());
+           st.glVertexAttribPointer(glsl, vArrayData);
+        }
+        if(cComps>0) {
+           st.glEnableVertexAttribArray(glsl, cArrayData.getName());
+           st.glVertexAttribPointer(glsl, cArrayData);
+        }
+        if(nComps>0) {
+           st.glEnableVertexAttribArray(glsl, nArrayData.getName());
+           st.glVertexAttribPointer(glsl, nArrayData);
+        }
+        if(tComps>0) {
+           st.glEnableVertexAttribArray(glsl, tArrayData.getName());
+           st.glVertexAttribPointer(glsl, tArrayData);
+        }
+
+        glsl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0);
+    } else {
+        if(vComps>0) {
+           st.glDisableVertexAttribArray(glsl, vArrayData.getName());
+        }
+        if(cComps>0) {
+           st.glDisableVertexAttribArray(glsl, cArrayData.getName());
+        }
+        if(nComps>0) {
+           st.glDisableVertexAttribArray(glsl, nArrayData.getName());
+        }
+        if(tComps>0) {
+           st.glDisableVertexAttribArray(glsl, tArrayData.getName());
+        }
+    }
+  }
+
+    public String toString() {
+        return "VBOSet[mode "+mode+ 
+                       ", modeOrig "+modeOrig+ 
+                       ", sealed "+sealed+ 
+                       ", bufferEnabled "+bufferEnabled+ 
+                       ", bufferWritten "+bufferWritten+ 
+                       ",\n\t"+vArrayData+
+                       ",\n\t"+cArrayData+
+                       ",\n\t"+nArrayData+
+                       ",\n\t"+tArrayData+
+                       "]";
+    }
+
+    // non public matters
+
+    protected void allocateBuffer(int elements) {
+        int vWidth = vComps * BufferUtil.sizeOfGLType(vDataType);
+        int cWidth = cComps * BufferUtil.sizeOfGLType(cDataType);
+        int nWidth = nComps * BufferUtil.sizeOfGLType(nDataType);
+        int tWidth = tComps * BufferUtil.sizeOfGLType(tDataType);
+
+        count  = elements;
+        bSize  = count * ( vWidth + cWidth + nWidth + tWidth ) ;
+
+        buffer = BufferUtil.newByteBuffer(bSize);
+
+        int pos = 0;
+        int size= count * vWidth ;
+        if(size>0) {
+            vertexArray = BufferUtil.sliceGLBuffer(buffer, pos, size, vDataType);
+        } else {
+            vertexArray = null;
+        }
+        vOffset = pos;
+        pos+=size;
+
+        size= count * cWidth ;
+        if(size>0) {
+            colorArray = BufferUtil.sliceGLBuffer(buffer, pos, size, cDataType);
+        } else {
+            colorArray = null;
+        }
+        cOffset = pos;
+        pos+=size;
+
+        size= count * nWidth ;
+        if(size>0) {
+            normalArray = BufferUtil.sliceGLBuffer(buffer, pos, size, nDataType);
+        } else {
+            normalArray = null;
+        }
+        nOffset = pos;
+        pos+=size;
+
+        size= count * tWidth ;
+        if(size>0) {
+            textCoordArray = BufferUtil.sliceGLBuffer(buffer, pos, size, tDataType);
+        } else {
+            textCoordArray = null;
+        }
+        tOffset = pos;
+        pos+=size;
+
+        buffer.position(pos);
+        buffer.flip();
+
+        if(vComps>0) {
+            vArrayData = GLArrayDataWrapper.createFixed(gl, GLPointerFunc.GL_VERTEX_ARRAY, vComps, vDataType, false,
+                                                        0, vertexArray, 0, vOffset);
+        } else {
+            vArrayData = null;
+        }
+        if(cComps>0) {
+            cArrayData = GLArrayDataWrapper.createFixed(gl, GLPointerFunc.GL_COLOR_ARRAY, cComps, cDataType, false,
+                                                        0, colorArray, 0, cOffset);
+        } else {
+            cArrayData = null;
+        }
+        if(nComps>0) {
+            nArrayData = GLArrayDataWrapper.createFixed(gl, GLPointerFunc.GL_NORMAL_ARRAY, nComps, nDataType, false,
+                                                        0, normalArray, 0, nOffset);
+        } else {
+            nArrayData = null;
+        }
+        if(tComps>0) {
+            tArrayData = GLArrayDataWrapper.createFixed(gl, GLPointerFunc.GL_TEXTURE_COORD_ARRAY, tComps, tDataType, false,
+                                                        0, textCoordArray, 0, tOffset);
+        } else {
+            tArrayData = null;
+        }
+
+    }
+
+    protected final boolean growBufferIfNecessary(int type, int spare) {
+        if(buffer==null || count < spare) { 
+            growBuffer(type, initialSize);
+            return true;
+        }
+        return false;
+    }
+
+    protected final void growBuffer(int type, int additional) {
+        if(sealed || 0==additional) return;
+
+        // save olde values ..
+        Buffer _vertexArray=vertexArray, _colorArray=colorArray, _normalArray=normalArray, _textCoordArray=textCoordArray;
+        ByteBuffer _buffer = buffer;
+
+        allocateBuffer(count+additional);
+
+        if(null!=_vertexArray) {
+            _vertexArray.flip();
+            BufferUtil.put(vertexArray, _vertexArray);
+        }
+        if(null!=_colorArray) {
+            _colorArray.flip();
+            BufferUtil.put(colorArray, _colorArray);
+        }
+        if(null!=_normalArray) {
+            _normalArray.flip();
+            BufferUtil.put(normalArray, _normalArray);
+        }
+        if(null!=_textCoordArray) {
+            _textCoordArray.flip();
+            BufferUtil.put(textCoordArray, _textCoordArray);
+        }
+    }
+
+    protected void padding(int type, int fill) {
+        if ( sealed ) return;
+
+        Buffer dest = null;
+
+        switch (type) {
+            case VERTEX:
+                dest = vertexArray;
+                break;
+            case COLOR:
+                dest = colorArray;
+                break;
+            case NORMAL:
+                dest = normalArray;
+                break;
+            case TEXTCOORD:
+                dest = textCoordArray;
+                break;
+        }
+
+        if ( null==dest ) return;
+
+        while((fill--)>0) {
+            BufferUtil.putb(dest, (byte)0);
+        }
+    }
+
+    protected int mode, modeOrig;
+    protected int glBufferUsage, initialSize;
+
+    protected ByteBuffer buffer;
+    protected int bSize, count, vboName;
+
+    public static final int VERTEX = 0;
+    public static final int COLOR = 1;
+    public static final int NORMAL = 2;
+    public static final int TEXTCOORD = 3;
+
+    protected int vOffset, cOffset, nOffset, tOffset;
+    protected int vComps,    cComps,    nComps,    tComps;
+    protected int vDataType, cDataType, nDataType, tDataType;
+    protected Buffer vertexArray, colorArray, normalArray, textCoordArray;
+    protected GLArrayDataWrapper vArrayData, cArrayData, nArrayData, tArrayData;
+
+    protected boolean sealed, sealedGL, useGLSL;
+    protected boolean bufferEnabled, bufferWritten;
+    protected GL gl;
+  }
+
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/Locator.java b/src/jogl/classes/com/jogamp/opengl/util/Locator.java
new file mode 100644
index 000000000..c524c0888
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/Locator.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.opengl.util;
+
+import java.util.*;
+import java.nio.*;
+import java.io.*;
+import java.net.*;
+
+/** Utilities for dealing with resources. */
+
+public class Locator {
+    private Locator() {}
+
+    /**
+     * Locates the resource using 'getResource(String path, ClassLoader cl)',
+     * with this context ClassLoader and the path as is,
+     * as well with the context's package name path plus the path.
+     *
+     * @see #getResource(String, ClassLoader)
+     */
+    public static URL getResource(Class context, String path) {
+        ClassLoader contextCL = (null!=context)?context.getClassLoader():null;
+        URL url = getResource(path, contextCL);
+        if (url == null && null!=context) {
+            // Try again by scoping the path within the class's package
+            String className = context.getName().replace('.', '/');
+            int lastSlash = className.lastIndexOf('/');
+            if (lastSlash >= 0) {
+                String tmpPath = className.substring(0, lastSlash + 1) + path;
+                url = getResource(tmpPath, contextCL);
+            }
+        }
+        return url;
+    }
+
+    /**
+     * Locates the resource using the ClassLoader's facility,
+     * the absolute URL and absolute file.
+     *
+     * @see ClassLoader#getResource(String)
+     * @see ClassLoader#getSystemResource(String)
+     * @see URL#URL(String)
+     * @see File#File(String)
+     */
+    public static URL getResource(String path, ClassLoader cl) {
+        URL url = null;
+        if (cl != null) {
+            url = cl.getResource(path);
+        } else {
+            url = ClassLoader.getSystemResource(path);
+        }
+        if(!urlExists(url)) {
+            url = null;
+            try {
+                url = new URL(path);
+            } catch (MalformedURLException e) { }
+        }
+        if(!urlExists(url)) {
+            url = null;
+            try {
+                File file = new File(path);
+                if(file.exists()) {
+                    url = file.toURL();
+                }
+            } catch (MalformedURLException e) {}
+        }
+        return url;
+    }
+
+    /**
+     * Generates a path for the 'relativeFile' relative to the 'absoluteFileLocation'
+     */
+    public static String getRelativeOf(String absoluteFileLocation, String relativeFile) {
+        File file = new File(absoluteFileLocation);
+        file = file.getParentFile();
+        while (file != null && relativeFile.startsWith("../")) {
+            file = file.getParentFile();
+            relativeFile = relativeFile.substring(3);
+        }
+        if (file != null) {
+            String res = new File(file, relativeFile).getPath();
+	        // Handle things on Windows
+            return res.replace('\\', '/');
+        } else {
+            return relativeFile;
+        }
+    }
+
+    /**
+     * Returns true, if the url exists,
+     * trying to open a connection.
+     */
+    public static boolean urlExists(URL url) {
+        boolean v = false;
+        if(null!=url) {
+            try {
+                URLConnection uc = url.openConnection();
+                v = true;
+            } catch (IOException ioe) { }
+        }
+        return v;
+    }
+
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
new file mode 100755
index 000000000..9cf41804f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
@@ -0,0 +1,685 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.opengl.util;
+
+import com.jogamp.opengl.impl.ProjectFloat;
+
+import java.nio.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.media.opengl.*;
+import javax.media.opengl.fixedfunc.GLMatrixFunc;
+
+public class PMVMatrix implements GLMatrixFunc {
+
+    public PMVMatrix() {
+          projectFloat = new ProjectFloat();
+
+          matrixIdent = BufferUtil.newFloatBuffer(1*16);
+          projectFloat.gluMakeIdentityf(matrixIdent);
+          matrixIdent.rewind();
+
+          // T    Texture
+          // P    Projection
+          // Mv   ModelView
+          // Mvi  Modelview-Inverse
+          // Mvit Modelview-Inverse-Transpose
+          // Pmv  P * Mv
+          matrixTPMvMvitPmv = BufferUtil.newFloatBuffer(6*16);     // grouping T + P  + Mv + Mvi + Mvit + Pmv
+          matrixPMvMvitPmv = slice(matrixTPMvMvitPmv, 1*16, 5*16); // grouping     P  + Mv + Mvi + Mvit + Pmv
+          matrixT       = slice(matrixTPMvMvitPmv, 0*16, 1*16);    //          T
+          matrixPMvMvit = slice(matrixTPMvMvitPmv, 1*16, 4*16);    // grouping     P  + Mv + Mvi + Mvit
+          matrixPMvMvi  = slice(matrixTPMvMvitPmv, 1*16, 3*16);    // grouping     P  + Mv + Mvi
+          matrixPMv     = slice(matrixTPMvMvitPmv, 1*16, 2*16);    // grouping     P  + Mv
+          matrixP       = slice(matrixTPMvMvitPmv, 1*16, 1*16);    //              P
+          matrixMv      = slice(matrixTPMvMvitPmv, 2*16, 1*16);    //                   Mv
+          matrixMvi     = slice(matrixTPMvMvitPmv, 3*16, 1*16);    //                        Mvi
+          matrixMvit    = slice(matrixTPMvMvitPmv, 4*16, 1*16);    //                              Mvit
+          matrixPmv     = slice(matrixTPMvMvitPmv, 5*16, 1*16);    //                                     Pmv
+          matrixTPMvMvitPmv.rewind();
+
+          matrixMvit3 = BufferUtil.newFloatBuffer(3*3);
+
+          localBuf = BufferUtil.newFloatBuffer(6*16);
+
+          matrixMult=slice(localBuf, 0*16, 16);
+
+          matrixTrans=slice(localBuf, 1*16, 16);
+          projectFloat.gluMakeIdentityf(matrixTrans);
+
+          matrixRot=slice(localBuf, 2*16, 16);
+          projectFloat.gluMakeIdentityf(matrixRot);
+
+          matrixScale=slice(localBuf, 3*16, 16);
+          projectFloat.gluMakeIdentityf(matrixScale);
+
+          matrixOrtho=slice(localBuf, 4*16, 16);
+          projectFloat.gluMakeIdentityf(matrixOrtho);
+
+          matrixFrustum=slice(localBuf, 5*16, 16);
+          projectFloat.gluMakeZero(matrixFrustum);
+
+          vec3f=new float[3];
+
+          matrixPStack = new ArrayList();
+          matrixMvStack= new ArrayList();
+
+          // default values and mode
+          glMatrixMode(GL_PROJECTION);
+          glLoadIdentity();
+          glMatrixMode(GL_MODELVIEW);
+          glLoadIdentity();
+          glMatrixMode(GL.GL_TEXTURE);
+          glLoadIdentity();
+          setDirty();
+    }
+
+    public void destroy() {
+        if(null!=projectFloat) {
+            projectFloat.destroy(); projectFloat=null;
+        }
+
+        if(null!=matrixIdent) {
+            matrixIdent.clear(); matrixIdent=null;
+        }
+        if(null!=matrixTPMvMvitPmv) {
+            matrixTPMvMvitPmv.clear(); matrixTPMvMvitPmv=null;
+        }
+        if(null!=matrixMvit3) {
+            matrixMvit3.clear(); matrixMvit3=null;
+        }
+        if(null!=localBuf) {
+            localBuf.clear(); localBuf=null;
+        }
+
+        if(null!=matrixPStack) {
+            matrixPStack.clear(); matrixPStack=null;
+        }
+        vec3f=null;
+        if(null!=matrixMvStack) {
+            matrixMvStack.clear(); matrixMvStack=null;
+        }
+        if(null!=matrixPStack) {
+        matrixPStack.clear(); matrixPStack=null;
+        }
+        if(null!=matrixTStack) {
+            matrixTStack.clear(); matrixTStack=null;
+        }
+
+        matrixTPMvMvitPmv=null; matrixPMvMvit=null; matrixPMvMvitPmv=null; matrixPMvMvi=null; matrixPMv=null; 
+        matrixP=null; matrixT=null; matrixMv=null; matrixMvi=null; matrixMvit=null; matrixPmv=null;
+        matrixMult=null; matrixTrans=null; matrixRot=null; matrixScale=null; matrixOrtho=null; matrixFrustum=null;
+    }
+
+    private static FloatBuffer slice(FloatBuffer buf, int pos, int len) {
+        buf.position(pos);
+        buf.limit(pos + len);
+        return buf.slice();
+    }
+
+    public static final boolean isMatrixModeName(final int matrixModeName) {
+        switch(matrixModeName) {
+            case GL_MODELVIEW_MATRIX:
+            case GL_PROJECTION_MATRIX:
+            case GL_TEXTURE_MATRIX:
+                return true;
+        }
+        return false;
+    }
+
+    public static final int matrixModeName2MatrixGetName(final int matrixModeName) {
+        switch(matrixModeName) {
+            case GL_MODELVIEW:
+                return GL_MODELVIEW_MATRIX;
+            case GL_PROJECTION:
+                return GL_PROJECTION_MATRIX;
+            case GL.GL_TEXTURE:
+                return GL_TEXTURE_MATRIX;
+            default:
+              throw new GLException("unsupported matrixName: "+matrixModeName);
+        }
+    }
+
+    public static final boolean isMatrixGetName(final int matrixGetName) {
+        switch(matrixGetName) {
+            case GL_MATRIX_MODE:
+            case GL_MODELVIEW_MATRIX:
+            case GL_PROJECTION_MATRIX:
+            case GL_TEXTURE_MATRIX:
+                return true;
+        }
+        return false;
+    }
+
+    public static final int matrixGetName2MatrixModeName(final int matrixGetName) {
+        switch(matrixGetName) {
+            case GL_MODELVIEW_MATRIX:
+                return GL_MODELVIEW;
+            case GL_PROJECTION_MATRIX:
+                return GL_PROJECTION;
+            case GL_TEXTURE_MATRIX:
+                return GL.GL_TEXTURE;
+            default:
+              throw new GLException("unsupported matrixGetName: "+matrixGetName);
+        }
+    }
+
+    public void setDirty() {
+          modified   = DIRTY_MODELVIEW | DIRTY_PROJECTION | DIRTY_TEXTURE ;
+          matrixMode = GL_MODELVIEW;
+    }
+
+    public int getDirtyBits() {
+        return modified;
+    }
+
+    public boolean isDirty(final int matrixName) {
+        boolean res;
+        switch(matrixName) {
+            case GL_MODELVIEW:
+                res = (modified&DIRTY_MODELVIEW)!=0 ;
+                break;
+            case GL_PROJECTION:
+                res = (modified&DIRTY_PROJECTION)!=0 ;
+                break;
+            case GL.GL_TEXTURE:
+                res = (modified&DIRTY_TEXTURE)!=0 ;
+                break;
+            default:
+              throw new GLException("unsupported matrixName: "+matrixName);
+        }
+        return res;
+    }
+
+    public boolean isDirty() {
+        return modified!=0;
+    }
+
+    public boolean update() {
+        // if(0==modified) return false;
+
+        // int res = modified;
+        int res = DIRTY_MODELVIEW | DIRTY_PROJECTION ;
+        if( (res&DIRTY_MODELVIEW)!=0 ) {
+            setMviMvit();
+        }
+        if( (res&DIRTY_MODELVIEW)!=0 || (res&DIRTY_PROJECTION)!=0 ) {
+            glMultMatrixf(matrixP, matrixMv, matrixPmv);
+        }
+        modified=0;
+        return res!=0;
+    }
+
+    public final int  glGetMatrixMode() {
+        return matrixMode;
+    }
+
+    public final FloatBuffer glGetTMatrixf() {
+        return matrixT;
+    }
+
+    public final FloatBuffer glGetPMatrixf() {
+        return matrixP;
+    }
+
+    public final FloatBuffer glGetMvMatrixf() {
+        return matrixMv;
+    }
+
+    public final FloatBuffer glGetPMvMvitPmvMatrixf() {
+        return matrixPMvMvitPmv;
+    }
+
+    public final FloatBuffer glGetPMvMvitMatrixf() {
+        return matrixPMvMvit;
+    }
+
+    public final FloatBuffer glGetPMvMviMatrixf() {
+        return matrixPMvMvi;
+    }
+
+    public final FloatBuffer glGetPMvMatrixf() {
+        return matrixPMv;
+    }
+
+    public final FloatBuffer glGetMviMatrixf() {
+        return matrixMvi;
+    }
+
+    public final FloatBuffer glGetPmvMatrixf() {
+        return matrixPmv;
+    }
+
+    public final FloatBuffer glGetNormalMatrixf() {
+        return matrixMvit3;
+    }
+
+   /*
+    * @return the current matrix
+    */
+    public final FloatBuffer glGetMatrixf() {
+        return glGetMatrixf(matrixMode);
+    }
+
+  /**
+   * @param pname GL_MODELVIEW, GL_PROJECTION or GL.GL_TEXTURE
+   * @return the given matrix
+   */
+    public final FloatBuffer glGetMatrixf(final int matrixName) {
+        if(matrixName==GL_MODELVIEW) {
+            return matrixMv;
+        } else if(matrixName==GL_PROJECTION) {
+            return matrixP;
+        } else if(matrixName==GL.GL_TEXTURE) {
+            return matrixT;
+        } else {
+            throw new GLException("unsupported matrixName: "+matrixName);
+        }
+    }
+
+    public final void gluPerspective(final float fovy, final float aspect, final float zNear, final float zFar) {
+      float top=(float)Math.tan(fovy*((float)Math.PI)/360.0f)*zNear;
+      float bottom=-1.0f*top;
+      float left=aspect*bottom;
+      float right=aspect*top;
+      glFrustumf(left, right, bottom, top, zNear, zFar);
+    }
+
+    public static final void glMultMatrixf(final FloatBuffer a, final FloatBuffer b, FloatBuffer p) {
+       for (int i = 0; i < 4; i++) {
+          final float ai0=a.get(i+0*4),  ai1=a.get(i+1*4),  ai2=a.get(i+2*4),  ai3=a.get(i+3*4);
+          p.put(i+0*4 , ai0 * b.get(0+0*4) + ai1 * b.get(1+0*4) + ai2 * b.get(2+0*4) + ai3 * b.get(3+0*4) );
+          p.put(i+1*4 , ai0 * b.get(0+1*4) + ai1 * b.get(1+1*4) + ai2 * b.get(2+1*4) + ai3 * b.get(3+1*4) );
+          p.put(i+2*4 , ai0 * b.get(0+2*4) + ai1 * b.get(1+2*4) + ai2 * b.get(2+2*4) + ai3 * b.get(3+2*4) );
+          p.put(i+3*4 , ai0 * b.get(0+3*4) + ai1 * b.get(1+3*4) + ai2 * b.get(2+3*4) + ai3 * b.get(3+3*4) );
+       }
+    }
+    public static final void glMultMatrixf(final FloatBuffer a, final float[] b, int b_off, FloatBuffer p) {
+       for (int i = 0; i < 4; i++) {
+          final float ai0=a.get(i+0*4),  ai1=a.get(i+1*4),  ai2=a.get(i+2*4),  ai3=a.get(i+3*4);
+          p.put(i+0*4 , ai0 * b[b_off+0+0*4] + ai1 * b[b_off+1+0*4] + ai2 * b[b_off+2+0*4] + ai3 * b[b_off+3+0*4] );
+          p.put(i+1*4 , ai0 * b[b_off+0+1*4] + ai1 * b[b_off+1+1*4] + ai2 * b[b_off+2+1*4] + ai3 * b[b_off+3+1*4] );
+          p.put(i+2*4 , ai0 * b[b_off+0+2*4] + ai1 * b[b_off+1+2*4] + ai2 * b[b_off+2+2*4] + ai3 * b[b_off+3+2*4] );
+          p.put(i+3*4 , ai0 * b[b_off+0+3*4] + ai1 * b[b_off+1+3*4] + ai2 * b[b_off+2+3*4] + ai3 * b[b_off+3+3*4] );
+       }
+    }
+
+    // 
+    // MatrixIf
+    //
+
+    public void glMatrixMode(final int matrixName) {
+        switch(matrixName) {
+            case GL_MODELVIEW:
+            case GL_PROJECTION:
+            case GL.GL_TEXTURE:
+                break;
+            default:
+              throw new GLException("unsupported matrixName: "+matrixName);
+        }
+        matrixMode = matrixName;
+    }
+
+    public void glGetFloatv(int matrixGetName, FloatBuffer params) {
+        int pos = params.position();
+        if(matrixGetName==GL_MATRIX_MODE) {
+            params.put((float)matrixMode);
+        } else {
+            FloatBuffer matrix = glGetMatrixf(matrixGetName2MatrixModeName(matrixGetName));
+            params.put(matrix);
+            matrix.rewind();
+        }
+        params.position(pos);
+    }
+    public void glGetFloatv(int matrixGetName, float[] params, int params_offset) {
+        if(matrixGetName==GL_MATRIX_MODE) {
+            params[params_offset]=(float)matrixMode;
+        } else {
+            FloatBuffer matrix = glGetMatrixf(matrixGetName2MatrixModeName(matrixGetName));
+            matrix.get(params, params_offset, 16);
+            matrix.rewind();
+        }
+    }
+    public void glGetIntegerv(int pname, IntBuffer params) {
+        int pos = params.position();
+        if(pname==GL_MATRIX_MODE) {
+            params.put(matrixMode);
+        } else {
+            throw new GLException("unsupported pname: "+pname);
+        }
+        params.position(pos);
+    }
+    public void glGetIntegerv(int pname, int[] params, int params_offset) {
+        if(pname==GL_MATRIX_MODE) {
+            params[params_offset]=matrixMode;
+        } else {
+            throw new GLException("unsupported pname: "+pname);
+        }
+    }
+
+    public final void glLoadMatrixf(final float[] values, final int offset) {
+        int len = values.length-offset;
+        if(matrixMode==GL_MODELVIEW) {
+            matrixMv.clear();
+            matrixMv.put(values, offset, len);
+            matrixMv.rewind();
+            modified |= DIRTY_MODELVIEW ;
+        } else if(matrixMode==GL_PROJECTION) {
+            matrixP.clear();
+            matrixP.put(values, offset, len);
+            matrixP.rewind();
+            modified |= DIRTY_PROJECTION ;
+        } else if(matrixMode==GL.GL_TEXTURE) {
+            matrixT.clear();
+            matrixT.put(values, offset, len);
+            matrixT.rewind();
+            modified |= DIRTY_TEXTURE ;
+        } 
+    }
+
+    public final void glLoadMatrixf(java.nio.FloatBuffer m) {
+        int spos = m.position();
+        if(matrixMode==GL_MODELVIEW) {
+            matrixMv.clear();
+            matrixMv.put(m);
+            matrixMv.rewind();
+            modified |= DIRTY_MODELVIEW ;
+        } else if(matrixMode==GL_PROJECTION) {
+            matrixP.clear();
+            matrixP.put(m);
+            matrixP.rewind();
+            modified |= DIRTY_PROJECTION ;
+        } else if(matrixMode==GL.GL_TEXTURE) {
+            matrixT.clear();
+            matrixT.put(m);
+            matrixT.rewind();
+            modified |= DIRTY_TEXTURE ;
+        } 
+        m.position(spos);
+    }
+
+    public final void glPopMatrix() {
+        float[] stackEntry=null;
+        if(matrixMode==GL_MODELVIEW) {
+            stackEntry = (float[])matrixMvStack.remove(0);
+        } else if(matrixMode==GL_PROJECTION) {
+            stackEntry = (float[])matrixPStack.remove(0);
+        } else if(matrixMode==GL.GL_TEXTURE) {
+            stackEntry = (float[])matrixTStack.remove(0);
+        } 
+        glLoadMatrixf(stackEntry, 0);
+    }
+
+    public final void glPushMatrix() {
+        float[] stackEntry = new float[1*16];
+        if(matrixMode==GL_MODELVIEW) {
+            matrixMv.get(stackEntry);
+            matrixMv.rewind();
+            matrixMvStack.add(0, stackEntry);
+        } else if(matrixMode==GL_PROJECTION) {
+            matrixP.get(stackEntry);
+            matrixP.rewind();
+            matrixPStack.add(0, stackEntry);
+        } else if(matrixMode==GL.GL_TEXTURE) {
+            matrixT.get(stackEntry);
+            matrixT.rewind();
+            matrixTStack.add(0, stackEntry);
+        }
+    }
+
+    public final void glLoadIdentity() {
+        if(matrixMode==GL_MODELVIEW) {
+            matrixMv.clear();
+            matrixMv.put(matrixIdent);
+            matrixMv.rewind();
+            matrixIdent.rewind();
+            modified |= DIRTY_MODELVIEW ;
+        } else if(matrixMode==GL_PROJECTION) {
+            matrixP.clear();
+            matrixP.put(matrixIdent);
+            matrixP.rewind();
+            matrixIdent.rewind();
+            modified |= DIRTY_PROJECTION ;
+        } else if(matrixMode==GL.GL_TEXTURE) {
+            matrixT.clear();
+            matrixT.put(matrixIdent);
+            matrixT.rewind();
+            matrixIdent.rewind();
+            modified |= DIRTY_TEXTURE ;
+        } 
+    }
+
+    public final void glMultMatrixf(final FloatBuffer m) {
+        if(matrixMode==GL_MODELVIEW) {
+            glMultMatrixf(matrixMv, m, matrixMult);
+            matrixMv.clear();
+            matrixMv.put(matrixMult);
+            matrixMv.rewind();
+            modified |= DIRTY_MODELVIEW ;
+        } else if(matrixMode==GL_PROJECTION) {
+            glMultMatrixf(matrixP, m, matrixMult);
+            matrixP.clear();
+            matrixP.put(matrixMult);
+            matrixP.rewind();
+            modified |= DIRTY_PROJECTION ;
+        } else if(matrixMode==GL.GL_TEXTURE) {
+            glMultMatrixf(matrixT, m, matrixMult);
+            matrixT.clear();
+            matrixT.put(matrixMult);
+            matrixT.rewind();
+            modified |= DIRTY_TEXTURE ;
+        } 
+        matrixMult.rewind();
+    }
+
+    public void glMultMatrixf(float[] m, int m_offset) {
+        if(matrixMode==GL_MODELVIEW) {
+            glMultMatrixf(matrixMv, m, m_offset, matrixMult);
+            matrixMv.clear();
+            matrixMv.put(matrixMult);
+            matrixMv.rewind();
+            modified |= DIRTY_MODELVIEW ;
+        } else if(matrixMode==GL_PROJECTION) {
+            glMultMatrixf(matrixP, m, m_offset, matrixMult);
+            matrixP.clear();
+            matrixP.put(matrixMult);
+            matrixP.rewind();
+            modified |= DIRTY_PROJECTION ;
+        } else if(matrixMode==GL.GL_TEXTURE) {
+            glMultMatrixf(matrixT, m, m_offset, matrixMult);
+            matrixT.clear();
+            matrixT.put(matrixMult);
+            matrixT.rewind();
+            modified |= DIRTY_TEXTURE ;
+        } 
+        matrixMult.rewind();
+    }
+
+    public final void glTranslatef(final float x, final float y, final float z) {
+        // Translation matrix: 
+        //  1 0 0 x
+        //  0 1 0 y
+        //  0 0 1 z
+        //  0 0 0 1
+        matrixTrans.put(0+4*3, x);
+        matrixTrans.put(1+4*3, y);
+        matrixTrans.put(2+4*3, z);
+        glMultMatrixf(matrixTrans);
+    }
+
+    public final void glRotatef(final float angdeg, float x, float y, float z) {
+        float angrad = angdeg   * (float) Math.PI / 180;
+        float c = (float)Math.cos(angrad);
+        float ic= 1.0f - c; 
+        float s = (float)Math.sin(angrad);
+
+        vec3f[0]=x; vec3f[1]=y; vec3f[2]=z;
+        projectFloat.normalize(vec3f);
+        x = vec3f[0]; y = vec3f[1]; z = vec3f[2];
+
+        // Rotation matrix:
+        //      xx(1−c)+c  xy(1−c)+zs xz(1−c)-ys 0
+        //      xy(1−c)-zs yy(1−c)+c  yz(1−c)+xs 0
+        //      xz(1−c)+ys yz(1−c)-xs zz(1−c)+c  0
+        //      0          0          0          1
+        float xy = x*y;
+        float xz = x*z;
+        float xs = x*s;
+        float ys = y*s;
+        float yz = y*z;
+        float zs = z*s;
+        matrixRot.put(0*4+0, x*x*ic+c);
+        matrixRot.put(0*4+1, xy*ic+zs);
+        matrixRot.put(0*4+2, xz*ic-ys);
+
+        matrixRot.put(1*4+0, xy*ic-zs);
+        matrixRot.put(1*4+1, y*y*ic+c);
+        matrixRot.put(1*4+2, yz*ic+xs);
+
+        matrixRot.put(2*4+0, xz*ic+ys);
+        matrixRot.put(2*4+1, yz*ic-xs);
+        matrixRot.put(2*4+2, z*z*ic+c);
+
+        glMultMatrixf(matrixRot);
+    }
+
+    public final void glScalef(final float x, final float y, final float z) {
+        // Scale matrix: 
+        //  x 0 0 0
+        //  0 y 0 0
+        //  0 0 z 0
+        //  0 0 0 1
+        matrixScale.put(0+4*0, x);
+        matrixScale.put(1+4*1, y);
+        matrixScale.put(2+4*2, z);
+
+        glMultMatrixf(matrixScale);
+    }
+
+    public final void glOrthof(final float left, final float right, final float bottom, final float top, final float zNear, final float zFar) {
+        // Ortho matrix: 
+        //  2/dx  0     0    tx
+        //  0     2/dy  0    ty
+        //  0     0     2/dz tz
+        //  0     0     0    1
+        float dx=right-left;
+        float dy=top-bottom;
+        float dz=zFar-zNear;
+        float tx=-1.0f*(right+left)/dx;
+        float ty=-1.0f*(top+bottom)/dy;
+        float tz=-1.0f*(zFar+zNear)/dz;
+
+        matrixOrtho.put(0+4*0, 2.0f/dx);
+        matrixOrtho.put(1+4*1, 2.0f/dy);
+        matrixOrtho.put(2+4*2, -2.0f/dz);
+        matrixOrtho.put(0+4*3, tx);
+        matrixOrtho.put(1+4*3, ty);
+        matrixOrtho.put(2+4*3, tz);
+
+        glMultMatrixf(matrixOrtho);
+    }
+
+    public final void glFrustumf(final float left, final float right, final float bottom, final float top, final float zNear, final float zFar) {
+        if(zNear<=0.0f||zFar<0.0f) {
+            throw new GLException("GL_INVALID_VALUE: zNear and zFar must be positive, and zNear>0");
+        }
+        if(left==right || top==bottom) {
+            throw new GLException("GL_INVALID_VALUE: top,bottom and left,right must not be equal");
+        }
+        // Frustum matrix: 
+        //  2*zNear/dx   0          A  0
+        //  0            2*zNear/dy B  0
+        //  0            0          C  D
+        //  0            0         −1  0
+        float zNear2 = 2.0f*zNear;
+        float dx=right-left;
+        float dy=top-bottom;
+        float dz=zFar-zNear;
+        float A=(right+left)/dx;
+        float B=(top+bottom)/dy;
+        float C=-1.0f*(zFar+zNear)/dz;
+        float D=-2.0f*(zFar*zNear)/dz;
+
+        matrixFrustum.put(0+4*0, zNear2/dx);
+        matrixFrustum.put(1+4*1, zNear2/dy);
+        matrixFrustum.put(2+4*2, C);
+
+        matrixFrustum.put(0+4*2, A);
+        matrixFrustum.put(1+4*2, B);
+
+        matrixFrustum.put(2+4*3, D);
+        matrixFrustum.put(3+4*2, -1.0f);
+
+        glMultMatrixf(matrixFrustum);
+    }
+
+    //
+    // private 
+    //
+
+    private final void setMviMvit() {
+        if(!projectFloat.gluInvertMatrixf(matrixMv, matrixMvi)) {
+            throw new GLException("Invalid source Mv matrix, can't compute inverse");
+        }
+
+        // transpose matrix 
+        for (int i = 0; i < 4; i++) {
+            for (int j = 0; j < 4; j++) {
+                matrixMvit.put(j+i*4, matrixMvi.get(i+j*4));
+            }
+        }
+
+        // fetch 3x3
+        for (int i = 0; i < 3; i++) {
+            for (int j = 0; j < 3; j++) {
+                matrixMvit3.put(i+j*3, matrixMvit.get(i+j*4));
+            }
+        }
+    }
+
+    protected FloatBuffer matrixIdent;
+    protected FloatBuffer matrixTPMvMvitPmv, matrixPMvMvit, matrixPMvMvitPmv, matrixPMvMvi, matrixPMv, matrixP, matrixT, matrixMv, matrixMvi, matrixMvit, matrixPmv;
+    protected FloatBuffer matrixMvit3;
+    protected FloatBuffer localBuf, matrixMult, matrixTrans, matrixRot, matrixScale, matrixOrtho, matrixFrustum;
+    protected float[] vec3f;
+    protected List/*FloatBuffer*/ matrixTStack, matrixPStack, matrixMvStack;
+    protected int matrixMode = GL_MODELVIEW;
+    protected int modified = 0;
+    protected ProjectFloat projectFloat;
+
+    public static final int DIRTY_MODELVIEW  = 1 << 0;
+    public static final int DIRTY_PROJECTION = 1 << 1;
+    public static final int DIRTY_TEXTURE    = 1 << 2;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java b/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java
new file mode 100755
index 000000000..294f86303
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util;
+
+import java.io.*;
+import java.nio.*;
+
+/** Utilities for dealing with streams. */
+
+public class StreamUtil {
+    private StreamUtil() {}
+
+    public static byte[] readAll2Array(InputStream stream) throws IOException {
+        BytesRead bytesRead = readAllImpl(stream);
+        byte[] data = bytesRead.data;
+        if (bytesRead.payloadLen != data.length) {
+            data = new byte[bytesRead.payloadLen];
+            System.arraycopy(bytesRead.data, 0, data, 0, bytesRead.payloadLen);
+        }
+        return data;
+    }
+
+    public static ByteBuffer readAll2Buffer(InputStream stream) throws IOException {
+        BytesRead bytesRead = readAllImpl(stream);
+        return BufferUtil.newByteBuffer(bytesRead.data, 0, bytesRead.payloadLen);
+    }
+
+    private static BytesRead readAllImpl(InputStream stream) throws IOException {
+        // FIXME: Shall we do this here ?
+        if( !(stream instanceof BufferedInputStream) ) {
+            stream = new BufferedInputStream(stream);
+        }
+        int avail = stream.available();
+        byte[] data = new byte[avail];
+        int numRead = 0;
+        int pos = 0;
+        do {
+            if (pos + avail > data.length) {
+                byte[] newData = new byte[pos + avail];
+                System.arraycopy(data, 0, newData, 0, pos);
+                data = newData;
+            }
+            numRead = stream.read(data, pos, avail);
+            if (numRead >= 0) {
+                pos += numRead;
+            }
+            avail = stream.available();
+        } while (avail > 0 && numRead >= 0);
+
+        return new BytesRead(pos, data);
+    }
+
+    private static class BytesRead {
+        BytesRead(int payloadLen, byte[] data) {
+            this.payloadLen=payloadLen;
+            this.data=data;
+        }
+        int payloadLen;
+        byte[] data;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/TGAWriter.java b/src/jogl/classes/com/jogamp/opengl/util/TGAWriter.java
new file mode 100755
index 000000000..c53cafdcb
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/TGAWriter.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.opengl.util;
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+
+/**
+ * Utility class which helps take fast screenshots of OpenGL rendering
+ * results into Targa-format files. Used by the {@link
+ * com.jogamp.opengl.util.gl2.Screenshot Screenshot} class; can also be used
+ * in conjunction with the {@link com.jogamp.opengl.util.gl2.TileRenderer
+ * TileRenderer} class. <P>
+ */
+
+public class TGAWriter {
+  private static final int TARGA_HEADER_SIZE = 18;
+
+  private FileChannel ch;
+  private ByteBuffer buf;
+
+  /** Constructor for the TGAWriter. */
+  public TGAWriter() {
+  }
+
+  /**
+   * Opens the specified Targa file for writing, overwriting any
+   * existing file, and sets up the header of the file expecting the
+   * data to be filled in before closing it.
+   *
+   * @param file the file to write containing the screenshot
+   * @param width the width of the current drawable
+   * @param height the height of the current drawable
+   * @param alpha whether the alpha channel should be saved. If true,
+   *   requires GL_EXT_abgr extension to be present.
+   *
+   * @throws IOException if an I/O error occurred while writing the
+   *   file
+   */
+  public void open(File file,
+                   int width,
+                   int height,
+                   boolean alpha) throws IOException {
+    RandomAccessFile out = new RandomAccessFile(file, "rw");
+    ch = out.getChannel();
+    int pixelSize = (alpha ? 32 : 24);
+    int numChannels = (alpha ? 4 : 3);
+
+    int fileLength = TARGA_HEADER_SIZE + width * height * numChannels;
+    out.setLength(fileLength);
+    MappedByteBuffer image = ch.map(FileChannel.MapMode.READ_WRITE, 0, fileLength);
+
+    // write the TARGA header
+    image.put(0, (byte) 0).put(1, (byte) 0);
+    image.put(2, (byte) 2); // uncompressed type
+    image.put(12, (byte) (width & 0xFF)); // width
+    image.put(13, (byte) (width >> 8)); // width
+    image.put(14, (byte) (height & 0xFF)); // height
+    image.put(15, (byte) (height >> 8)); // height
+    image.put(16, (byte) pixelSize); // pixel size
+             
+    // go to image data position
+    image.position(TARGA_HEADER_SIZE);
+    // jogl needs a sliced buffer
+    buf = image.slice();
+  }
+
+  /**
+   * Returns the ByteBuffer corresponding to the data for the image.
+   * This must be filled in with data in either BGR or BGRA format
+   * depending on whether an alpha channel was specified during
+   * open().
+   */
+  public ByteBuffer getImageData() {
+    return buf;
+  }
+
+  public void close() throws IOException {
+    // close the file channel
+    ch.close();
+    buf = null;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/ImageUtil.java b/src/jogl/classes/com/jogamp/opengl/util/awt/ImageUtil.java
new file mode 100755
index 000000000..a3139b16a
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/ImageUtil.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.awt;
+
+import java.awt.*;
+import java.awt.image.*;
+
+/** Utilities for dealing with images. */
+
+public class ImageUtil {
+  private ImageUtil() {}
+
+  /** Flips the supplied BufferedImage vertically. This is often a
+      necessary conversion step to display a Java2D image correctly
+      with OpenGL and vice versa. */
+  public static void flipImageVertically(BufferedImage image) {
+    WritableRaster raster = image.getRaster();
+    Object scanline1 = null;
+    Object scanline2 = null;
+      
+    for (int i = 0; i < image.getHeight() / 2; i++) {
+      scanline1 = raster.getDataElements(0, i, image.getWidth(), 1, scanline1);
+      scanline2 = raster.getDataElements(0, image.getHeight() - i - 1, image.getWidth(), 1, scanline2);
+      raster.setDataElements(0, i, image.getWidth(), 1, scanline2);
+      raster.setDataElements(0, image.getHeight() - i - 1, image.getWidth(), 1, scanline1);
+    }
+  }
+
+  /**
+   * Creates a <code>BufferedImage</code> with a pixel format compatible with the graphics
+   * environment. The returned image can thus benefit from hardware accelerated operations
+   * in Java2D API.
+   *
+   * @param width The width of the image to be created
+   * @param height The height of the image to be created
+   *
+   * @return A instance of <code>BufferedImage</code> with a type compatible with the graphics card.
+   */
+  public static BufferedImage createCompatibleImage(int width, int height) {
+    GraphicsConfiguration configuration =
+      GraphicsEnvironment.getLocalGraphicsEnvironment().
+      getDefaultScreenDevice().getDefaultConfiguration();
+    return configuration.createCompatibleImage(width, height);
+  }
+
+  /**
+   * Creates a thumbnail from an image. A thumbnail is a scaled down version of the original picture.
+   * This method will retain the width to height ratio of the original picture and return a new
+   * instance of <code>BufferedImage</code>. The original picture is not modified.
+   *
+   * @param image The original image to sample down
+   * @param thumbWidth The width of the thumbnail to be created
+   *
+   * @throws IllegalArgumentException If thumbWidth is greater than image.getWidth()
+   *
+   * @return A thumbnail with the requested width or the original picture if thumbWidth = image.getWidth()
+   */
+  public static BufferedImage createThumbnail(BufferedImage image, int thumbWidth) {
+    // Thanks to Romain Guy for this utility
+    if (thumbWidth > image.getWidth()) {
+      throw new IllegalArgumentException("Thumbnail width must be greater than image width");
+    }
+   
+    if (thumbWidth == image.getWidth()) {
+      return image;
+    }
+ 
+    float ratio = (float) image.getWidth() / (float) image.getHeight();
+    int width = image.getWidth();
+    BufferedImage thumb = image;
+   
+    do {
+      width /= 2;
+      if (width < thumbWidth) {
+        width = thumbWidth;
+      }
+     
+      BufferedImage temp = createCompatibleImage(width, (int) (width / ratio));
+      Graphics2D g2 = temp.createGraphics();
+      g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
+                          RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+      g2.drawImage(thumb, 0, 0, temp.getWidth(), temp.getHeight(), null);
+      g2.dispose();
+      thumb = temp;
+    } while (width != thumbWidth);
+   
+    return thumb;
+  }
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/Overlay.java b/src/jogl/classes/com/jogamp/opengl/util/awt/Overlay.java
new file mode 100755
index 000000000..1275c9391
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/Overlay.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.awt;
+
+import java.awt.Graphics2D;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.texture.*;
+
+/** Provides a Java 2D overlay on top of an arbitrary GLDrawable,
+    making it easier to do things like draw text and images on top of
+    an OpenGL scene while still maintaining reasonably good
+    efficiency. */
+
+public class Overlay {
+  private GLDrawable drawable;
+  private TextureRenderer renderer;
+  private boolean contentsLost;
+
+  /** Creates a new Java 2D overlay on top of the specified
+      GLDrawable. */
+  public Overlay(GLDrawable drawable) {
+    this.drawable = drawable;
+  }
+
+  /** Creates a {@link java.awt.Graphics2D Graphics2D} instance for
+      rendering into the overlay. The returned object should be
+      disposed of using the normal {@link java.awt.Graphics#dispose()
+      Graphics.dispose()} method once it is no longer being used.
+
+      @return a new {@link java.awt.Graphics2D Graphics2D} object for
+        rendering into the backing store of this renderer
+  */
+  public Graphics2D createGraphics() {
+    // Validate the size of the renderer against the current size of
+    // the drawable
+    validateRenderer();
+    return renderer.createGraphics();
+  }
+
+  /** Indicates whether the Java 2D contents of the overlay were lost
+      since the last time {@link #createGraphics} was called. This
+      method should be called immediately after calling {@link
+      #createGraphics} to see whether the entire contents of the
+      overlay need to be redrawn or just the region the application is
+      interested in updating.
+
+      @return whether the contents of the overlay were lost since the
+        last render
+  */
+  public boolean contentsLost() {
+    return contentsLost;
+  }
+
+  /** Marks the given region of the overlay as dirty. This region, and
+      any previously set dirty regions, will be automatically
+      synchronized with the underlying Texture during the next {@link
+      #draw draw} or {@link #drawAll drawAll} operation, at which
+      point the dirty region will be cleared. It is not necessary for
+      an OpenGL context to be current when this method is called.
+
+      @param x the x coordinate (in Java 2D coordinates -- relative to
+        upper left) of the region to update
+      @param y the y coordinate (in Java 2D coordinates -- relative to
+        upper left) of the region to update
+      @param width the width of the region to update
+      @param height the height of the region to update
+
+      @throws GLException If an OpenGL context is not current when this method is called */
+  public void markDirty(int x, int y, int width, int height) {
+    renderer.markDirty(x, y, width, height);
+  }
+
+  /** Draws the entire contents of the overlay on top of the OpenGL
+      drawable. This is a convenience method which encapsulates all
+      portions of the rendering process; if this method is used,
+      {@link #beginRendering}, {@link #endRendering}, etc. should not
+      be used. This method should be called while the OpenGL context
+      for the drawable is current, and after your OpenGL scene has
+      been rendered.
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void drawAll() throws GLException {
+    beginRendering();
+    draw(0, 0, drawable.getWidth(), drawable.getHeight());
+    endRendering();
+  }
+
+  /** Begins the OpenGL rendering process for the overlay. This is
+      separated out so advanced applications can render independent
+      pieces of the overlay to different portions of the drawable.
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void beginRendering() throws GLException {
+    renderer.beginOrthoRendering(drawable.getWidth(), drawable.getHeight());
+  }
+
+  /** Ends the OpenGL rendering process for the overlay. This is
+      separated out so advanced applications can render independent
+      pieces of the overlay to different portions of the drawable.
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void endRendering() throws GLException {
+    renderer.endOrthoRendering();
+  }
+
+  /** Draws the specified sub-rectangle of the overlay on top of the
+      OpenGL drawable. {@link #beginRendering} and {@link
+      #endRendering} must be used in conjunction with this method to
+      achieve proper rendering results. This method should be called
+      while the OpenGL context for the drawable is current, and after
+      your OpenGL scene has been rendered.
+
+      @param x the lower-left x coordinate (relative to the lower left
+        of the overlay) of the rectangle to draw
+      @param y the lower-left y coordinate (relative to the lower left
+        of the overlay) of the rectangle to draw
+      @param width the width of the rectangle to draw
+      @param height the height of the rectangle to draw
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void draw(int x, int y, int width, int height) throws GLException {
+    draw(x, y, x, y, width, height);
+  }
+
+  /** Draws the specified sub-rectangle of the overlay at the
+      specified x and y coordinate on top of the OpenGL drawable.
+      {@link #beginRendering} and {@link #endRendering} must be used
+      in conjunction with this method to achieve proper rendering
+      results. This method should be called while the OpenGL context
+      for the drawable is current, and after your OpenGL scene has
+      been rendered.
+
+      @param screenx the on-screen x coordinate at which to draw the rectangle
+      @param screeny the on-screen y coordinate (relative to lower left) at
+        which to draw the rectangle
+      @param overlayx the x coordinate of the pixel in the overlay of
+        the lower left portion of the rectangle to draw
+      @param overlayy the y coordinate of the pixel in the overlay
+        (relative to lower left) of the lower left portion of the
+        rectangle to draw
+      @param width the width of the rectangle to draw
+      @param height the height of the rectangle to draw
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void draw(int screenx, int screeny,
+                   int overlayx, int overlayy,
+                   int width, int height) throws GLException {
+    renderer.drawOrthoRect(screenx, screeny,
+                           overlayx, overlayy,
+                           width, height);
+  }
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  private void validateRenderer() {
+    if (renderer == null) {
+      renderer = new TextureRenderer(drawable.getWidth(),
+                                     drawable.getHeight(),
+                                     true);
+      contentsLost = true;
+    } else if (renderer.getWidth() != drawable.getWidth() ||
+               renderer.getHeight() != drawable.getHeight()) {
+      renderer.setSize(drawable.getWidth(), drawable.getHeight());
+      contentsLost = true;
+    } else {
+      contentsLost = false;
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/Screenshot.java b/src/jogl/classes/com/jogamp/opengl/util/awt/Screenshot.java
new file mode 100755
index 000000000..7019d720f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/Screenshot.java
@@ -0,0 +1,432 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.opengl.util.awt;
+
+import java.awt.image.*;
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+import javax.imageio.*;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+import javax.media.opengl.glu.gl2.*;
+
+import com.jogamp.opengl.util.*;
+
+/** Utilities for taking screenshots of OpenGL applications. */
+
+public class Screenshot {
+  private Screenshot() {}
+
+  /** 
+   * Takes a fast screenshot of the current OpenGL drawable to a Targa
+   * file. Requires the OpenGL context for the desired drawable to be
+   * current. Takes the screenshot from the last assigned read buffer,
+   * or the OpenGL default read buffer if none has been specified by
+   * the user (GL_FRONT for single-buffered configurations and GL_BACK
+   * for double-buffered configurations). This is the fastest
+   * mechanism for taking a screenshot of an application. Contributed
+   * by Carsten Weisse of Bytonic Software (http://bytonic.de/). <p>
+   *
+   * No alpha channel is written with this variant.
+   *
+   * @param file the file to write containing the screenshot
+   * @param width the width of the current drawable
+   * @param height the height of the current drawable
+   *
+   * @throws GLException if an OpenGL context was not current or
+   *   another OpenGL-related error occurred
+   * @throws IOException if an I/O error occurred while writing the
+   *   file
+   */
+  public static void writeToTargaFile(File file,
+                                      int width,
+                                      int height) throws GLException, IOException {
+    writeToTargaFile(file, width, height, false);
+  }
+
+  /** 
+   * Takes a fast screenshot of the current OpenGL drawable to a Targa
+   * file. Requires the OpenGL context for the desired drawable to be
+   * current. Takes the screenshot from the last assigned read buffer,
+   * or the OpenGL default read buffer if none has been specified by
+   * the user (GL_FRONT for single-buffered configurations and GL_BACK
+   * for double-buffered configurations). This is the fastest
+   * mechanism for taking a screenshot of an application. Contributed
+   * by Carsten Weisse of Bytonic Software (http://bytonic.de/).
+   *
+   * @param file the file to write containing the screenshot
+   * @param width the width of the current drawable
+   * @param height the height of the current drawable
+   * @param alpha whether the alpha channel should be saved. If true,
+   *   requires GL_EXT_abgr extension to be present.
+   *
+   * @throws GLException if an OpenGL context was not current or
+   *   another OpenGL-related error occurred
+   * @throws IOException if an I/O error occurred while writing the
+   *   file
+   */
+  public static void writeToTargaFile(File file,
+                                      int width,
+                                      int height,
+                                      boolean alpha) throws GLException, IOException {
+    writeToTargaFile(file, 0, 0, width, height, alpha);
+  }
+
+  /** 
+   * Takes a fast screenshot of the current OpenGL drawable to a Targa
+   * file. Requires the OpenGL context for the desired drawable to be
+   * current. Takes the screenshot from the last assigned read buffer,
+   * or the OpenGL default read buffer if none has been specified by
+   * the user (GL_FRONT for single-buffered configurations and GL_BACK
+   * for double-buffered configurations). This is the fastest
+   * mechanism for taking a screenshot of an application. Contributed
+   * by Carsten Weisse of Bytonic Software (http://bytonic.de/).
+   *
+   * @param file the file to write containing the screenshot
+   * @param x the starting x coordinate of the screenshot, measured from the lower-left
+   * @param y the starting y coordinate of the screenshot, measured from the lower-left
+   * @param width the width of the desired screenshot area
+   * @param height the height of the desired screenshot area
+   * @param alpha whether the alpha channel should be saved. If true,
+   *   requires GL_EXT_abgr extension to be present.
+   *
+   * @throws GLException if an OpenGL context was not current or
+   *   another OpenGL-related error occurred
+   * @throws IOException if an I/O error occurred while writing the
+   *   file
+   */
+  public static void writeToTargaFile(File file,
+                                      int x,
+                                      int y,
+                                      int width,
+                                      int height,
+                                      boolean alpha) throws GLException, IOException {
+    if (alpha) {
+      checkExtABGR();
+    }
+
+    TGAWriter writer = new TGAWriter();
+    writer.open(file, width, height, alpha);
+    ByteBuffer bgr = writer.getImageData();
+
+    GL2 gl = GLUgl2.getCurrentGL2();
+
+    // Set up pixel storage modes
+    PixelStorageModes psm = new PixelStorageModes();
+    psm.save(gl);
+
+    int readbackType = (alpha ? GL2.GL_ABGR_EXT : GL2.GL_BGR);
+
+    // read the BGR values into the image buffer
+    gl.glReadPixels(x, y, width, height, readbackType,
+                    GL2.GL_UNSIGNED_BYTE, bgr);
+
+    // Restore pixel storage modes
+    psm.restore(gl);
+
+    // close the file
+    writer.close();
+  }
+
+  /**
+   * Takes a screenshot of the current OpenGL drawable to a
+   * BufferedImage. Requires the OpenGL context for the desired
+   * drawable to be current. Takes the screenshot from the last
+   * assigned read buffer, or the OpenGL default read buffer if none
+   * has been specified by the user (GL_FRONT for single-buffered
+   * configurations and GL_BACK for double-buffered configurations).
+   * Note that the scanlines of the resulting image are flipped
+   * vertically in order to correctly match the OpenGL contents, which
+   * takes time and is therefore not as fast as the Targa screenshot
+   * function. <P>
+   *
+   * No alpha channel is read back with this variant.
+   *
+   * @param width the width of the current drawable
+   * @param height the height of the current drawable
+   *
+   * @throws GLException if an OpenGL context was not current or
+   *   another OpenGL-related error occurred
+   */
+  public static BufferedImage readToBufferedImage(int width,
+                                                  int height) throws GLException {
+    return readToBufferedImage(width, height, false);
+  }
+
+  /**
+   * Takes a screenshot of the current OpenGL drawable to a
+   * BufferedImage. Requires the OpenGL context for the desired
+   * drawable to be current. Takes the screenshot from the last
+   * assigned read buffer, or the OpenGL default read buffer if none
+   * has been specified by the user (GL_FRONT for single-buffered
+   * configurations and GL_BACK for double-buffered configurations).
+   * Note that the scanlines of the resulting image are flipped
+   * vertically in order to correctly match the OpenGL contents, which
+   * takes time and is therefore not as fast as the Targa screenshot
+   * function.
+   *
+   * @param width the width of the current drawable
+   * @param height the height of the current drawable
+   * @param alpha whether the alpha channel should be read back. If
+   *   true, requires GL_EXT_abgr extension to be present.
+   *
+   * @throws GLException if an OpenGL context was not current or
+   *   another OpenGL-related error occurred
+   */
+  public static BufferedImage readToBufferedImage(int width,
+                                                  int height,
+                                                  boolean alpha) throws GLException {
+    return readToBufferedImage(0, 0, width, height, alpha);
+  }
+
+  /**
+   * Takes a screenshot of the current OpenGL drawable to a
+   * BufferedImage. Requires the OpenGL context for the desired
+   * drawable to be current. Takes the screenshot from the last
+   * assigned read buffer, or the OpenGL default read buffer if none
+   * has been specified by the user (GL_FRONT for single-buffered
+   * configurations and GL_BACK for double-buffered configurations).
+   * Note that the scanlines of the resulting image are flipped
+   * vertically in order to correctly match the OpenGL contents, which
+   * takes time and is therefore not as fast as the Targa screenshot
+   * function.
+   *
+   * @param x the starting x coordinate of the screenshot, measured from the lower-left
+   * @param y the starting y coordinate of the screenshot, measured from the lower-left
+   * @param width the width of the desired screenshot area
+   * @param height the height of the desired screenshot area
+   * @param alpha whether the alpha channel should be read back. If
+   *   true, requires GL_EXT_abgr extension to be present.
+   *
+   * @throws GLException if an OpenGL context was not current or
+   *   another OpenGL-related error occurred
+   */
+  public static BufferedImage readToBufferedImage(int x,
+                                                  int y,
+                                                  int width,
+                                                  int height,
+                                                  boolean alpha) throws GLException {
+    int bufImgType = (alpha ? BufferedImage.TYPE_4BYTE_ABGR : BufferedImage.TYPE_3BYTE_BGR);
+    int readbackType = (alpha ? GL2.GL_ABGR_EXT : GL2.GL_BGR);
+
+    if (alpha) {
+      checkExtABGR();
+    }
+
+    // Allocate necessary storage
+    BufferedImage image = new BufferedImage(width, height, bufImgType);
+
+    GL2 gl = GLUgl2.getCurrentGL2();
+
+    // Set up pixel storage modes
+    PixelStorageModes psm = new PixelStorageModes();
+    psm.save(gl);
+
+    // read the BGR values into the image
+    gl.glReadPixels(x, y, width, height, readbackType,
+                    GL2.GL_UNSIGNED_BYTE,
+                    ByteBuffer.wrap(((DataBufferByte) image.getRaster().getDataBuffer()).getData()));
+
+    // Restore pixel storage modes
+    psm.restore(gl);
+
+    // Must flip BufferedImage vertically for correct results
+    ImageUtil.flipImageVertically(image);
+    return image;
+  }
+
+  /**
+   * Takes a screenshot of the current OpenGL drawable to the
+   * specified file on disk using the ImageIO package. Requires the
+   * OpenGL context for the desired drawable to be current. Takes the
+   * screenshot from the last assigned read buffer, or the OpenGL
+   * default read buffer if none has been specified by the user
+   * (GL_FRONT for single-buffered configurations and GL_BACK for
+   * double-buffered configurations). This is not the fastest
+   * mechanism for taking a screenshot but may be more convenient than
+   * others for getting images for consumption by other packages. The
+   * file format is inferred from the suffix of the given file. <P>
+   *
+   * No alpha channel is saved with this variant.
+   *
+   * @param file the file to write containing the screenshot
+   * @param width the width of the current drawable
+   * @param height the height of the current drawable
+   *
+   * @throws GLException if an OpenGL context was not current or
+   *   another OpenGL-related error occurred
+   *
+   * @throws IOException if an I/O error occurred or if the file could
+   *   not be written to disk due to the requested file format being
+   *   unsupported by ImageIO
+   */
+  public static void writeToFile(File file,
+                                 int width,
+                                 int height) throws IOException, GLException {
+    writeToFile(file, width, height, false);
+  }
+
+  /**
+   * Takes a screenshot of the current OpenGL drawable to the
+   * specified file on disk using the ImageIO package. Requires the
+   * OpenGL context for the desired drawable to be current. Takes the
+   * screenshot from the last assigned read buffer, or the OpenGL
+   * default read buffer if none has been specified by the user
+   * (GL_FRONT for single-buffered configurations and GL_BACK for
+   * double-buffered configurations). This is not the fastest
+   * mechanism for taking a screenshot but may be more convenient than
+   * others for getting images for consumption by other packages. The
+   * file format is inferred from the suffix of the given file. <P>
+   *
+   * Note that some file formats, in particular JPEG, can not handle
+   * an alpha channel properly. If the "alpha" argument is specified
+   * as true for such a file format it will be silently ignored.
+   *
+   * @param file the file to write containing the screenshot
+   * @param width the width of the current drawable
+   * @param height the height of the current drawable
+   * @param alpha whether an alpha channel should be saved. If true,
+   *   requires GL_EXT_abgr extension to be present.
+   *
+   * @throws GLException if an OpenGL context was not current or
+   *   another OpenGL-related error occurred
+   *
+   * @throws IOException if an I/O error occurred or if the file could
+   *   not be written to disk due to the requested file format being
+   *   unsupported by ImageIO
+   */
+  public static void writeToFile(File file,
+                                 int width,
+                                 int height,
+                                 boolean alpha) throws IOException, GLException {
+    writeToFile(file, 0, 0, width, height, alpha);
+  }
+
+  /**
+   * Takes a screenshot of the current OpenGL drawable to the
+   * specified file on disk using the ImageIO package. Requires the
+   * OpenGL context for the desired drawable to be current. Takes the
+   * screenshot from the last assigned read buffer, or the OpenGL
+   * default read buffer if none has been specified by the user
+   * (GL_FRONT for single-buffered configurations and GL_BACK for
+   * double-buffered configurations). This is not the fastest
+   * mechanism for taking a screenshot but may be more convenient than
+   * others for getting images for consumption by other packages. The
+   * file format is inferred from the suffix of the given file. <P>
+   *
+   * Note that some file formats, in particular JPEG, can not handle
+   * an alpha channel properly. If the "alpha" argument is specified
+   * as true for such a file format it will be silently ignored.
+   *
+   * @param file the file to write containing the screenshot
+   * @param x the starting x coordinate of the screenshot, measured from the lower-left
+   * @param y the starting y coordinate of the screenshot, measured from the lower-left
+   * @param width the width of the current drawable
+   * @param height the height of the current drawable
+   * @param alpha whether an alpha channel should be saved. If true,
+   *   requires GL_EXT_abgr extension to be present.
+   *
+   * @throws GLException if an OpenGL context was not current or
+   *   another OpenGL-related error occurred
+   *
+   * @throws IOException if an I/O error occurred or if the file could
+   *   not be written to disk due to the requested file format being
+   *   unsupported by ImageIO
+   */
+  public static void writeToFile(File file,
+                                 int x,
+                                 int y,
+                                 int width,
+                                 int height,
+                                 boolean alpha) throws IOException, GLException {
+    String fileSuffix = FileUtil.getFileSuffix(file);
+    if (alpha && (fileSuffix.equals("jpg") || fileSuffix.equals("jpeg"))) {
+      // JPEGs can't deal properly with alpha channels
+      alpha = false;
+    }
+
+    BufferedImage image = readToBufferedImage(x, y, width, height, alpha);
+    if (!ImageIO.write(image, fileSuffix, file)) {
+      throw new IOException("Unsupported file format " + fileSuffix);
+    }
+  }
+
+  private static int glGetInteger(GL2 gl, int pname, int[] tmp) {
+    gl.glGetIntegerv(pname, tmp, 0);
+    return tmp[0];
+  }
+
+  private static void checkExtABGR() {
+    GL2 gl = GLUgl2.getCurrentGL2();
+    if (!gl.isExtensionAvailable("GL_EXT_abgr")) {
+      throw new IllegalArgumentException("Saving alpha channel requires GL_EXT_abgr");
+    }
+  }
+ 
+  static class PixelStorageModes {
+    int packAlignment;
+    int packRowLength;
+    int packSkipRows;
+    int packSkipPixels;
+    int packSwapBytes;
+    int[] tmp = new int[1];
+
+    void save(GL2 gl) {
+      packAlignment  = glGetInteger(gl, GL2.GL_PACK_ALIGNMENT, tmp);
+      packRowLength  = glGetInteger(gl, GL2.GL_PACK_ROW_LENGTH, tmp);
+      packSkipRows   = glGetInteger(gl, GL2.GL_PACK_SKIP_ROWS, tmp);
+      packSkipPixels = glGetInteger(gl, GL2.GL_PACK_SKIP_PIXELS, tmp);
+      packSwapBytes  = glGetInteger(gl, GL2.GL_PACK_SWAP_BYTES, tmp);
+
+      gl.glPixelStorei(GL2.GL_PACK_ALIGNMENT, 1);
+      gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, 0);
+      gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, 0);
+      gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, 0);
+      gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, 0);
+    }
+
+    void restore(GL2 gl) {
+      gl.glPixelStorei(GL2.GL_PACK_ALIGNMENT, packAlignment);
+      gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, packRowLength);
+      gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, packSkipRows);
+      gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, packSkipPixels);
+      gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, packSwapBytes);
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
new file mode 100755
index 000000000..1fbdade4e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
@@ -0,0 +1,1951 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ *
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+package com.jogamp.opengl.util.awt;
+
+import com.jogamp.opengl.impl.Debug;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.packrect.*;
+import com.jogamp.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.awt.*;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+
+// For debugging purposes
+import java.awt.EventQueue;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.RenderingHints;
+import java.awt.event.*;
+import java.awt.font.*;
+import java.awt.geom.*;
+
+import java.nio.*;
+
+import java.text.*;
+
+import java.util.*;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+import javax.media.opengl.glu.gl2.*;
+import javax.media.opengl.awt.*;
+
+
+/** Renders bitmapped Java 2D text into an OpenGL window with high
+    performance, full Unicode support, and a simple API. Performs
+    appropriate caching of text rendering results in an OpenGL texture
+    internally to avoid repeated font rasterization. The caching is
+    completely automatic, does not require any user intervention, and
+    has no visible controls in the public API. <P>
+
+    Using the {@link TextRenderer TextRenderer} is simple. Add a
+    "<code>TextRenderer renderer;</code>" field to your {@link
+    javax.media.opengl.GLEventListener GLEventListener}. In your {@link
+    javax.media.opengl.GLEventListener#init init} method, add:
+
+    <PRE>
+    renderer = new TextRenderer(new Font("SansSerif", Font.BOLD, 36));
+    </PRE>
+
+    <P> In the {@link javax.media.opengl.GLEventListener#display display} method of your
+    {@link javax.media.opengl.GLEventListener GLEventListener}, add:
+    <PRE>
+    renderer.beginRendering(drawable.getWidth(), drawable.getHeight());
+    // optionally set the color
+    renderer.setColor(1.0f, 0.2f, 0.2f, 0.8f);
+    renderer.draw("Text to draw", xPosition, yPosition);
+    // ... more draw commands, color changes, etc.
+    renderer.endRendering();
+    </PRE>
+
+    Unless you are sharing textures and display lists between OpenGL
+    contexts, you do not need to call the {@link #dispose dispose}
+    method of the TextRenderer; the OpenGL resources it uses
+    internally will be cleaned up automatically when the OpenGL
+    context is destroyed. <P>
+
+    <b>Note</b> that the TextRenderer may cause the vertex and texture
+    coordinate array buffer bindings to change, or to be unbound. This
+    is important to note if you are using Vertex Buffer Objects (VBOs)
+    in your application. <P>
+
+    Internally, the renderer uses a rectangle packing algorithm to
+    pack both glyphs and full Strings' rendering results (which are
+    variable size) onto a larger OpenGL texture. The internal backing
+    store is maintained using a {@link
+    com.jogamp.opengl.util.awt.TextureRenderer TextureRenderer}. A least
+    recently used (LRU) algorithm is used to discard previously
+    rendered strings; the specific algorithm is undefined, but is
+    currently implemented by flushing unused Strings' rendering
+    results every few hundred rendering cycles, where a rendering
+    cycle is defined as a pair of calls to {@link #beginRendering
+    beginRendering} / {@link #endRendering endRendering}.
+
+    @author John Burkey
+    @author Kenneth Russell
+*/
+public class TextRenderer {
+    private static final boolean DEBUG = Debug.debug("TextRenderer");
+
+    // These are occasionally useful for more in-depth debugging
+    private static final boolean DISABLE_GLYPH_CACHE = false;
+    private static final boolean DRAW_BBOXES = false;
+
+    static final int kSize = 256;
+
+    // Every certain number of render cycles, flush the strings which
+    // haven't been used recently
+    private static final int CYCLES_PER_FLUSH = 100;
+
+    // The amount of vertical dead space on the backing store before we
+    // force a compaction
+    private static final float MAX_VERTICAL_FRAGMENTATION = 0.7f;
+    static final int kQuadsPerBuffer = 100;
+    static final int kCoordsPerVertVerts = 3;
+    static final int kCoordsPerVertTex = 2;
+    static final int kVertsPerQuad = 4;
+    static final int kTotalBufferSizeVerts = kQuadsPerBuffer * kVertsPerQuad;
+    static final int kTotalBufferSizeCoordsVerts = kQuadsPerBuffer * kVertsPerQuad * kCoordsPerVertVerts;
+    static final int kTotalBufferSizeCoordsTex = kQuadsPerBuffer * kVertsPerQuad * kCoordsPerVertTex;
+    static final int kTotalBufferSizeBytesVerts = kTotalBufferSizeCoordsVerts * 4;
+    static final int kTotalBufferSizeBytesTex = kTotalBufferSizeCoordsTex * 4;
+    static final int kSizeInBytes_OneVertices_VertexData = kCoordsPerVertVerts * 4;
+    static final int kSizeInBytes_OneVertices_TexData = kCoordsPerVertTex * 4;
+    private Font font;
+    private boolean antialiased;
+    private boolean useFractionalMetrics;
+
+    // Whether we're attempting to use automatic mipmap generation support
+    private boolean mipmap;
+    private RectanglePacker packer;
+    private boolean haveMaxSize;
+    private RenderDelegate renderDelegate;
+    private TextureRenderer cachedBackingStore;
+    private Graphics2D cachedGraphics;
+    private FontRenderContext cachedFontRenderContext;
+    private Map /*<String,Rect>*/ stringLocations = new HashMap /*<String,Rect>*/();
+    private GlyphProducer mGlyphProducer;
+
+    private int numRenderCycles;
+
+    // Need to keep track of whether we're in a beginRendering() /
+    // endRendering() cycle so we can re-enter the exact same state if
+    // we have to reallocate the backing store
+    private boolean inBeginEndPair;
+    private boolean isOrthoMode;
+    private int beginRenderingWidth;
+    private int beginRenderingHeight;
+    private boolean beginRenderingDepthTestDisabled;
+
+    // For resetting the color after disposal of the old backing store
+    private boolean haveCachedColor;
+    private float cachedR;
+    private float cachedG;
+    private float cachedB;
+    private float cachedA;
+    private Color cachedColor;
+    private boolean needToResetColor;
+
+    // For debugging only
+    private Frame dbgFrame;
+
+    // Debugging purposes only
+    private boolean debugged;
+    Pipelined_QuadRenderer mPipelinedQuadRenderer;
+    
+    //emzic: added boolean flag
+    private boolean useVertexArrays = true;
+    
+    //emzic: added boolean flag
+    private boolean isExtensionAvailable_GL_VERSION_1_5;
+    private boolean checkFor_isExtensionAvailable_GL_VERSION_1_5;
+
+    // Whether GL_LINEAR filtering is enabled for the backing store
+    private boolean smoothing = true;
+
+    /** Creates a new TextRenderer with the given font, using no
+        antialiasing or fractional metrics, and the default
+        RenderDelegate. Equivalent to <code>TextRenderer(font, false,
+        false)</code>.
+
+        @param font the font to render with
+    */
+    public TextRenderer(Font font) {
+        this(font, false, false, null, false);
+    }
+
+    /** Creates a new TextRenderer with the given font, using no
+        antialiasing or fractional metrics, and the default
+        RenderDelegate. If <CODE>mipmap</CODE> is true, attempts to use
+        OpenGL's automatic mipmap generation for better smoothing when
+        rendering the TextureRenderer's contents at a distance.
+        Equivalent to <code>TextRenderer(font, false, false)</code>.
+
+        @param font the font to render with
+        @param mipmap whether to attempt use of automatic mipmap generation
+    */
+    public TextRenderer(Font font, boolean mipmap) {
+        this(font, false, false, null, mipmap);
+    }
+
+    /** Creates a new TextRenderer with the given Font, specified font
+        properties, and default RenderDelegate. The
+        <code>antialiased</code> and <code>useFractionalMetrics</code>
+        flags provide control over the same properties at the Java 2D
+        level. No mipmap support is requested. Equivalent to
+        <code>TextRenderer(font, antialiased, useFractionalMetrics,
+        null)</code>.
+
+        @param font the font to render with
+        @param antialiased whether to use antialiased fonts
+        @param useFractionalMetrics whether to use fractional font
+        metrics at the Java 2D level
+    */
+    public TextRenderer(Font font, boolean antialiased,
+                        boolean useFractionalMetrics) {
+        this(font, antialiased, useFractionalMetrics, null, false);
+    }
+
+    /** Creates a new TextRenderer with the given Font, specified font
+        properties, and given RenderDelegate. The
+        <code>antialiased</code> and <code>useFractionalMetrics</code>
+        flags provide control over the same properties at the Java 2D
+        level. The <code>renderDelegate</code> provides more control
+        over the text rendered. No mipmap support is requested.
+
+        @param font the font to render with
+        @param antialiased whether to use antialiased fonts
+        @param useFractionalMetrics whether to use fractional font
+        metrics at the Java 2D level
+        @param renderDelegate the render delegate to use to draw the
+        text's bitmap, or null to use the default one
+    */
+    public TextRenderer(Font font, boolean antialiased,
+                        boolean useFractionalMetrics, RenderDelegate renderDelegate) {
+        this(font, antialiased, useFractionalMetrics, renderDelegate, false);
+    }
+
+    /** Creates a new TextRenderer with the given Font, specified font
+        properties, and given RenderDelegate. The
+        <code>antialiased</code> and <code>useFractionalMetrics</code>
+        flags provide control over the same properties at the Java 2D
+        level. The <code>renderDelegate</code> provides more control
+        over the text rendered. If <CODE>mipmap</CODE> is true, attempts
+        to use OpenGL's automatic mipmap generation for better smoothing
+        when rendering the TextureRenderer's contents at a distance.
+
+        @param font the font to render with
+        @param antialiased whether to use antialiased fonts
+        @param useFractionalMetrics whether to use fractional font
+        metrics at the Java 2D level
+        @param renderDelegate the render delegate to use to draw the
+        text's bitmap, or null to use the default one
+        @param mipmap whether to attempt use of automatic mipmap generation
+    */
+    public TextRenderer(Font font, boolean antialiased,
+                        boolean useFractionalMetrics, RenderDelegate renderDelegate,
+                        boolean mipmap) {
+        this.font = font;
+        this.antialiased = antialiased;
+        this.useFractionalMetrics = useFractionalMetrics;
+        this.mipmap = mipmap;
+
+        // FIXME: consider adjusting the size based on font size
+        // (it will already automatically resize if necessary)
+        packer = new RectanglePacker(new Manager(), kSize, kSize);
+
+        if (renderDelegate == null) {
+            renderDelegate = new DefaultRenderDelegate();
+        }
+
+        this.renderDelegate = renderDelegate;
+
+        mGlyphProducer = new GlyphProducer(font.getNumGlyphs());
+    }
+
+    /** Returns the bounding rectangle of the given String, assuming it
+        was rendered at the origin. See {@link #getBounds(CharSequence)
+        getBounds(CharSequence)}. */
+    public Rectangle2D getBounds(String str) {
+        return getBounds((CharSequence) str);
+    }
+
+    /** Returns the bounding rectangle of the given CharSequence,
+        assuming it was rendered at the origin. The coordinate system of
+        the returned rectangle is Java 2D's, with increasing Y
+        coordinates in the downward direction. The relative coordinate
+        (0, 0) in the returned rectangle corresponds to the baseline of
+        the leftmost character of the rendered string, in similar
+        fashion to the results returned by, for example, {@link
+        java.awt.font.GlyphVector#getVisualBounds}. Most applications
+        will use only the width and height of the returned Rectangle for
+        the purposes of centering or justifying the String. It is not
+        specified which Java 2D bounds ({@link
+        java.awt.font.GlyphVector#getVisualBounds getVisualBounds},
+        {@link java.awt.font.GlyphVector#getPixelBounds getPixelBounds},
+        etc.) the returned bounds correspond to, although every effort
+        is made to ensure an accurate bound. */
+    public Rectangle2D getBounds(CharSequence str) {
+        // FIXME: this should be more optimized and use the glyph cache
+        Rect r = null;
+
+        if ((r = (Rect) stringLocations.get(str)) != null) {
+            TextData data = (TextData) r.getUserData();
+
+            // Reconstitute the Java 2D results based on the cached values
+            return new Rectangle2D.Double(-data.origin().x, -data.origin().y,
+                                          r.w(), r.h());
+        }
+
+        // Must return a Rectangle compatible with the layout algorithm --
+        // must be idempotent
+        return normalize(renderDelegate.getBounds(str, font,
+                                                  getFontRenderContext()));
+    }
+
+    /** Returns the Font this renderer is using. */
+    public Font getFont() {
+        return font;
+    }
+
+    /** Returns a FontRenderContext which can be used for external
+        text-related size computations. This object should be considered
+        transient and may become invalidated between {@link
+        #beginRendering beginRendering} / {@link #endRendering
+        endRendering} pairs. */
+    public FontRenderContext getFontRenderContext() {
+        if (cachedFontRenderContext == null) {
+            cachedFontRenderContext = getGraphics2D().getFontRenderContext();
+        }
+
+        return cachedFontRenderContext;
+    }
+
+    /** Begins rendering with this {@link TextRenderer TextRenderer}
+        into the current OpenGL drawable, pushing the projection and
+        modelview matrices and some state bits and setting up a
+        two-dimensional orthographic projection with (0, 0) as the
+        lower-left coordinate and (width, height) as the upper-right
+        coordinate. Binds and enables the internal OpenGL texture
+        object, sets the texture environment mode to GL_MODULATE, and
+        changes the current color to the last color set with this
+        TextRenderer via {@link #setColor setColor}. This method
+        disables the depth test and is equivalent to
+        beginRendering(width, height, true).
+
+        @param width the width of the current on-screen OpenGL drawable
+        @param height the height of the current on-screen OpenGL drawable
+        @throws javax.media.opengl.GLException If an OpenGL context is not current when this method is called
+    */
+    public void beginRendering(int width, int height) throws GLException {
+        beginRendering(width, height, true);
+    }
+
+    /** Begins rendering with this {@link TextRenderer TextRenderer}
+        into the current OpenGL drawable, pushing the projection and
+        modelview matrices and some state bits and setting up a
+        two-dimensional orthographic projection with (0, 0) as the
+        lower-left coordinate and (width, height) as the upper-right
+        coordinate. Binds and enables the internal OpenGL texture
+        object, sets the texture environment mode to GL_MODULATE, and
+        changes the current color to the last color set with this
+        TextRenderer via {@link #setColor setColor}. Disables the depth
+        test if the disableDepthTest argument is true.
+
+        @param width the width of the current on-screen OpenGL drawable
+        @param height the height of the current on-screen OpenGL drawable
+        @param disableDepthTest whether to disable the depth test
+        @throws GLException If an OpenGL context is not current when this method is called
+    */
+    public void beginRendering(int width, int height, boolean disableDepthTest)
+        throws GLException {
+        beginRendering(true, width, height, disableDepthTest);
+    }
+
+    /** Begins rendering of 2D text in 3D with this {@link TextRenderer
+        TextRenderer} into the current OpenGL drawable. Assumes the end
+        user is responsible for setting up the modelview and projection
+        matrices, and will render text using the {@link #draw3D draw3D}
+        method. This method pushes some OpenGL state bits, binds and
+        enables the internal OpenGL texture object, sets the texture
+        environment mode to GL_MODULATE, and changes the current color
+        to the last color set with this TextRenderer via {@link
+        #setColor setColor}.
+
+        @throws GLException If an OpenGL context is not current when this method is called
+    */
+    public void begin3DRendering() throws GLException {
+        beginRendering(false, 0, 0, false);
+    }
+
+    /** Changes the current color of this TextRenderer to the supplied
+        one. The default color is opaque white.
+
+        @param color the new color to use for rendering text
+        @throws GLException If an OpenGL context is not current when this method is called
+    */
+    public void setColor(Color color) throws GLException {
+        boolean noNeedForFlush = (haveCachedColor && (cachedColor != null) &&
+                                  color.equals(cachedColor));
+
+        if (!noNeedForFlush) {
+            flushGlyphPipeline();
+        }
+
+        getBackingStore().setColor(color);
+        haveCachedColor = true;
+        cachedColor = color;
+    }
+
+    /** Changes the current color of this TextRenderer to the supplied
+        one, where each component ranges from 0.0f - 1.0f. The alpha
+        component, if used, does not need to be premultiplied into the
+        color channels as described in the documentation for {@link
+        com.jogamp.opengl.util.texture.Texture Texture}, although
+        premultiplied colors are used internally. The default color is
+        opaque white.
+
+        @param r the red component of the new color
+        @param g the green component of the new color
+        @param b the blue component of the new color
+        @param a the alpha component of the new color, 0.0f = completely
+        transparent, 1.0f = completely opaque
+        @throws GLException If an OpenGL context is not current when this method is called
+    */
+    public void setColor(float r, float g, float b, float a)
+        throws GLException {
+        boolean noNeedForFlush = (haveCachedColor && (cachedColor == null) &&
+                                  (r == cachedR) && (g == cachedG) && (b == cachedB) &&
+                                  (a == cachedA));
+
+        if (!noNeedForFlush) {
+            flushGlyphPipeline();
+        }
+
+        getBackingStore().setColor(r, g, b, a);
+        haveCachedColor = true;
+        cachedR = r;
+        cachedG = g;
+        cachedB = b;
+        cachedA = a;
+        cachedColor = null;
+    }
+
+    /** Draws the supplied CharSequence at the desired location using
+        the renderer's current color. The baseline of the leftmost
+        character is at position (x, y) specified in OpenGL coordinates,
+        where the origin is at the lower-left of the drawable and the Y
+        coordinate increases in the upward direction.
+
+        @param str the string to draw
+        @param x the x coordinate at which to draw
+        @param y the y coordinate at which to draw
+        @throws GLException If an OpenGL context is not current when this method is called
+    */
+    public void draw(CharSequence str, int x, int y) throws GLException {
+        draw3D(str, x, y, 0, 1);
+    }
+
+    /** Draws the supplied String at the desired location using the
+        renderer's current color. See {@link #draw(CharSequence, int,
+        int) draw(CharSequence, int, int)}. */
+    public void draw(String str, int x, int y) throws GLException {
+        draw3D(str, x, y, 0, 1);
+    }
+
+    /** Draws the supplied CharSequence at the desired 3D location using
+        the renderer's current color. The baseline of the leftmost
+        character is placed at position (x, y, z) in the current
+        coordinate system.
+
+        @param str the string to draw
+        @param x the x coordinate at which to draw
+        @param y the y coordinate at which to draw
+        @param z the z coordinate at which to draw
+        @param scaleFactor a uniform scale factor applied to the width and height of the drawn rectangle
+        @throws GLException If an OpenGL context is not current when this method is called
+    */
+    public void draw3D(CharSequence str, float x, float y, float z,
+                       float scaleFactor) {
+        internal_draw3D(str, x, y, z, scaleFactor);
+    }
+
+    /** Draws the supplied String at the desired 3D location using the
+        renderer's current color. See {@link #draw3D(CharSequence,
+        float, float, float, float) draw3D(CharSequence, float, float,
+        float, float)}. */
+    public void draw3D(String str, float x, float y, float z, float scaleFactor) {
+        internal_draw3D(str, x, y, z, scaleFactor);
+    }
+
+    /** Returns the pixel width of the given character. */
+    public float getCharWidth(char inChar) {
+        return mGlyphProducer.getGlyphPixelWidth(inChar);
+    }
+
+    /** Causes the TextRenderer to flush any internal caches it may be
+        maintaining and draw its rendering results to the screen. This
+        should be called after each call to draw() if you are setting
+        OpenGL state such as the modelview matrix between calls to
+        draw(). */
+    public void flush() {
+        flushGlyphPipeline();
+    }
+
+    /** Ends a render cycle with this {@link TextRenderer TextRenderer}.
+        Restores the projection and modelview matrices as well as
+        several OpenGL state bits. Should be paired with {@link
+        #beginRendering beginRendering}.
+
+        @throws GLException If an OpenGL context is not current when this method is called
+    */
+    public void endRendering() throws GLException {
+        endRendering(true);
+    }
+
+    /** Ends a 3D render cycle with this {@link TextRenderer TextRenderer}.
+        Restores several OpenGL state bits. Should be paired with {@link
+        #begin3DRendering begin3DRendering}.
+
+        @throws GLException If an OpenGL context is not current when this method is called
+    */
+    public void end3DRendering() throws GLException {
+        endRendering(false);
+    }
+
+    /** Disposes of all resources this TextRenderer is using. It is not
+        valid to use the TextRenderer after this method is called.
+
+        @throws GLException If an OpenGL context is not current when this method is called
+    */
+    public void dispose() throws GLException {
+        packer.dispose();
+        packer = null;
+        cachedBackingStore = null;
+        cachedGraphics = null;
+        cachedFontRenderContext = null;
+
+        if (dbgFrame != null) {
+            dbgFrame.dispose();
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    private static Rectangle2D preNormalize(Rectangle2D src) {
+        // Need to round to integer coordinates
+        // Also give ourselves a little slop around the reported
+        // bounds of glyphs because it looks like neither the visual
+        // nor the pixel bounds works perfectly well
+        int minX = (int) Math.floor(src.getMinX()) - 1;
+        int minY = (int) Math.floor(src.getMinY()) - 1;
+        int maxX = (int) Math.ceil(src.getMaxX()) + 1;
+        int maxY = (int) Math.ceil(src.getMaxY()) + 1;
+        return new Rectangle2D.Double(minX, minY, maxX - minX, maxY - minY);
+    }
+
+
+    private Rectangle2D normalize(Rectangle2D src) {
+        // Give ourselves a boundary around each entity on the backing
+        // store in order to prevent bleeding of nearby Strings due to
+        // the fact that we use linear filtering
+
+        // NOTE that this boundary is quite heuristic and is related
+        // to how far away in 3D we may view the text --
+        // heuristically, 1.5% of the font's height
+        int boundary = (int) Math.max(1, 0.015 * font.getSize());
+
+        return new Rectangle2D.Double((int) Math.floor(src.getMinX() - boundary),
+                                      (int) Math.floor(src.getMinY() - boundary),
+                                      (int) Math.ceil(src.getWidth() + 2 * boundary),
+                                      (int) Math.ceil(src.getHeight()) + 2 * boundary);
+    }
+
+    private TextureRenderer getBackingStore() {
+        TextureRenderer renderer = (TextureRenderer) packer.getBackingStore();
+
+        if (renderer != cachedBackingStore) {
+            // Backing store changed since last time; discard any cached Graphics2D
+            if (cachedGraphics != null) {
+                cachedGraphics.dispose();
+                cachedGraphics = null;
+                cachedFontRenderContext = null;
+            }
+
+            cachedBackingStore = renderer;
+        }
+
+        return cachedBackingStore;
+    }
+
+    private Graphics2D getGraphics2D() {
+        TextureRenderer renderer = getBackingStore();
+
+        if (cachedGraphics == null) {
+            cachedGraphics = renderer.createGraphics();
+
+            // Set up composite, font and rendering hints
+            cachedGraphics.setComposite(AlphaComposite.Src);
+            cachedGraphics.setColor(Color.WHITE);
+            cachedGraphics.setFont(font);
+            cachedGraphics.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
+                                            (antialiased ? RenderingHints.VALUE_TEXT_ANTIALIAS_ON
+                                             : RenderingHints.VALUE_TEXT_ANTIALIAS_OFF));
+            cachedGraphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
+                                            (useFractionalMetrics
+                                             ? RenderingHints.VALUE_FRACTIONALMETRICS_ON
+                                             : RenderingHints.VALUE_FRACTIONALMETRICS_OFF));
+        }
+
+        return cachedGraphics;
+    }
+
+    private void beginRendering(boolean ortho, int width, int height,
+                                boolean disableDepthTestForOrtho) {
+        GL2 gl = GLContext.getCurrentGL().getGL2();
+
+        if (DEBUG && !debugged) {
+            debug(gl);
+        }
+
+        inBeginEndPair = true;
+        isOrthoMode = ortho;
+        beginRenderingWidth = width;
+        beginRenderingHeight = height;
+        beginRenderingDepthTestDisabled = disableDepthTestForOrtho;
+
+        if (ortho) {
+            getBackingStore().beginOrthoRendering(width, height,
+                                                  disableDepthTestForOrtho);
+        } else {
+            getBackingStore().begin3DRendering();
+        }
+
+        // Push client attrib bits used by the pipelined quad renderer
+        gl.glPushClientAttrib((int) GL2.GL_ALL_CLIENT_ATTRIB_BITS);
+
+        if (!haveMaxSize) {
+            // Query OpenGL for the maximum texture size and set it in the
+            // RectanglePacker to keep it from expanding too large
+            int[] sz = new int[1];
+            gl.glGetIntegerv(GL2.GL_MAX_TEXTURE_SIZE, sz, 0);
+            packer.setMaxSize(sz[0], sz[0]);
+            haveMaxSize = true;
+        }
+
+        if (needToResetColor && haveCachedColor) {
+            if (cachedColor == null) {
+                getBackingStore().setColor(cachedR, cachedG, cachedB, cachedA);
+            } else {
+                getBackingStore().setColor(cachedColor);
+            }
+
+            needToResetColor = false;
+        }
+
+        // Disable future attempts to use mipmapping if TextureRenderer
+        // doesn't support it
+        if (mipmap && !getBackingStore().isUsingAutoMipmapGeneration()) {
+            if (DEBUG) {
+                System.err.println("Disabled mipmapping in TextRenderer");
+            }
+
+            mipmap = false;
+        }
+    }
+
+    /**
+     * emzic: here the call to glBindBuffer crashes on certain graphicscard/driver combinations
+     * this is why the ugly try-catch block has been added, which falls back to the old textrenderer
+     * 
+     * @param ortho
+     * @throws GLException
+     */
+    private void endRendering(boolean ortho) throws GLException {
+        flushGlyphPipeline();
+
+        inBeginEndPair = false;
+
+        GL2 gl = GLContext.getCurrentGL().getGL2();
+
+        // Pop client attrib bits used by the pipelined quad renderer
+        gl.glPopClientAttrib();
+
+        // The OpenGL spec is unclear about whether this changes the
+        // buffer bindings, so preemptively zero out the GL_ARRAY_BUFFER
+        // binding
+        if (is15Available(gl)) {
+            try {
+                gl.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0);
+            } catch (Exception e) {
+                isExtensionAvailable_GL_VERSION_1_5 = false;
+            }
+        }
+
+        if (ortho) {
+            getBackingStore().endOrthoRendering();
+        } else {
+            getBackingStore().end3DRendering();
+        }
+
+        if (++numRenderCycles >= CYCLES_PER_FLUSH) {
+            numRenderCycles = 0;
+
+            if (DEBUG) {
+                System.err.println("Clearing unused entries in endRendering()");
+            }
+
+            clearUnusedEntries();
+        }
+    }
+
+    private void clearUnusedEntries() {
+        final java.util.List deadRects = new ArrayList /*<Rect>*/();
+
+        // Iterate through the contents of the backing store, removing
+        // text strings that haven't been used recently
+        packer.visit(new RectVisitor() {
+                public void visit(Rect rect) {
+                    TextData data = (TextData) rect.getUserData();
+
+                    if (data.used()) {
+                        data.clearUsed();
+                    } else {
+                        deadRects.add(rect);
+                    }
+                }
+            });
+
+        for (Iterator iter = deadRects.iterator(); iter.hasNext();) {
+            Rect r = (Rect) iter.next();
+            packer.remove(r);
+            stringLocations.remove(((TextData) r.getUserData()).string());
+
+            int unicodeToClearFromCache = ((TextData) r.getUserData()).unicodeID;
+
+            if (unicodeToClearFromCache > 0) {
+                mGlyphProducer.clearCacheEntry(unicodeToClearFromCache);
+            }
+
+            //      if (DEBUG) {
+            //        Graphics2D g = getGraphics2D();
+            //        g.setComposite(AlphaComposite.Clear);
+            //        g.fillRect(r.x(), r.y(), r.w(), r.h());
+            //        g.setComposite(AlphaComposite.Src);
+            //      }
+        }
+
+        // If we removed dead rectangles this cycle, try to do a compaction
+        float frag = packer.verticalFragmentationRatio();
+
+        if (!deadRects.isEmpty() && (frag > MAX_VERTICAL_FRAGMENTATION)) {
+            if (DEBUG) {
+                System.err.println(
+                                   "Compacting TextRenderer backing store due to vertical fragmentation " +
+                                   frag);
+            }
+
+            packer.compact();
+        }
+
+        if (DEBUG) {
+            getBackingStore().markDirty(0, 0, getBackingStore().getWidth(),
+                                        getBackingStore().getHeight());
+        }
+    }
+
+    private void internal_draw3D(CharSequence str, float x, float y, float z,
+                                 float scaleFactor) {
+        List/*<Glyph>*/ glyphs = mGlyphProducer.getGlyphs(str);
+        for (Iterator iter = glyphs.iterator(); iter.hasNext(); ) {
+            Glyph glyph = (Glyph) iter.next();
+            float advance = glyph.draw3D(x, y, z, scaleFactor);
+            x += advance * scaleFactor;
+        }
+    }
+
+    private void flushGlyphPipeline() {
+        if (mPipelinedQuadRenderer != null) {
+            mPipelinedQuadRenderer.draw();
+        }
+    }
+
+    private void draw3D_ROBUST(CharSequence str, float x, float y, float z,
+                               float scaleFactor) {
+        String curStr;
+        if (str instanceof String) {
+            curStr = (String) str;
+        } else {
+            curStr = str.toString();
+        }
+
+        // Look up the string on the backing store
+        Rect rect = (Rect) stringLocations.get(curStr);
+
+        if (rect == null) {
+            // Rasterize this string and place it on the backing store
+            Graphics2D g = getGraphics2D();
+            Rectangle2D origBBox = preNormalize(renderDelegate.getBounds(curStr, font, getFontRenderContext()));
+            Rectangle2D bbox = normalize(origBBox);
+            Point origin = new Point((int) -bbox.getMinX(),
+                                     (int) -bbox.getMinY());
+            rect = new Rect(0, 0, (int) bbox.getWidth(),
+                            (int) bbox.getHeight(),
+                            new TextData(curStr, origin, origBBox, -1));
+
+            packer.add(rect);
+            stringLocations.put(curStr, rect);
+
+            // Re-fetch the Graphics2D in case the addition of the rectangle
+            // caused the old backing store to be thrown away
+            g = getGraphics2D();
+
+            // OK, should now have an (x, y) for this rectangle; rasterize
+            // the String
+            int strx = rect.x() + origin.x;
+            int stry = rect.y() + origin.y;
+
+            // Clear out the area we're going to draw into
+            g.setComposite(AlphaComposite.Clear);
+            g.fillRect(rect.x(), rect.y(), rect.w(), rect.h());
+            g.setComposite(AlphaComposite.Src);
+
+            // Draw the string
+            renderDelegate.draw(g, curStr, strx, stry);
+
+            if (DRAW_BBOXES) {
+                TextData data = (TextData) rect.getUserData();
+                // Draw a bounding box on the backing store
+                g.drawRect(strx - data.origOriginX(),
+                           stry - data.origOriginY(),
+                           (int) data.origRect().getWidth(),
+                           (int) data.origRect().getHeight());
+                g.drawRect(strx - data.origin().x,
+                           stry - data.origin().y,
+                           rect.w(),
+                           rect.h());
+            }
+
+            // Mark this region of the TextureRenderer as dirty
+            getBackingStore().markDirty(rect.x(), rect.y(), rect.w(),
+                                        rect.h());
+        }
+
+        // OK, now draw the portion of the backing store to the screen
+        TextureRenderer renderer = getBackingStore();
+
+        // NOTE that the rectangles managed by the packer have their
+        // origin at the upper-left but the TextureRenderer's origin is
+        // at its lower left!!!
+        TextData data = (TextData) rect.getUserData();
+        data.markUsed();
+
+        Rectangle2D origRect = data.origRect();
+        
+        // Align the leftmost point of the baseline to the (x, y, z) coordinate requested
+        renderer.draw3DRect(x - (scaleFactor * data.origOriginX()),
+                            y - (scaleFactor * ((float) origRect.getHeight() - data.origOriginY())), z,
+                            rect.x() + (data.origin().x - data.origOriginX()),
+                            renderer.getHeight() - rect.y() - (int) origRect.getHeight() -
+                              (data.origin().y - data.origOriginY()),
+                            (int) origRect.getWidth(), (int) origRect.getHeight(), scaleFactor);
+    }
+
+    //----------------------------------------------------------------------
+    // Debugging functionality
+    //
+    private void debug(GL gl) {
+        dbgFrame = new Frame("TextRenderer Debug Output");
+
+        GLCanvas dbgCanvas = new GLCanvas(new GLCapabilities(gl.getGLProfile()), null,
+                                          GLContext.getCurrent(), null);
+        dbgCanvas.addGLEventListener(new DebugListener(gl, dbgFrame));
+        dbgFrame.add(dbgCanvas);
+
+        final FPSAnimator anim = new FPSAnimator(dbgCanvas, 10);
+        dbgFrame.addWindowListener(new WindowAdapter() {
+                public void windowClosing(WindowEvent e) {
+                    // Run this on another thread than the AWT event queue to
+                    // make sure the call to Animator.stop() completes before
+                    // exiting
+                    new Thread(new Runnable() {
+                            public void run() {
+                                anim.stop();
+                            }
+                        }).start();
+                }
+            });
+        dbgFrame.setSize(kSize, kSize);
+        dbgFrame.setVisible(true);
+        anim.start();
+        debugged = true;
+    }
+
+    /** Class supporting more full control over the process of rendering
+        the bitmapped text. Allows customization of whether the backing
+        store text bitmap is full-color or intensity only, the size of
+        each individual rendered text rectangle, and the contents of
+        each individual rendered text string. The default implementation
+        of this interface uses an intensity-only texture, a
+        closely-cropped rectangle around the text, and renders text
+        using the color white, which is modulated by the set color
+        during the rendering process. */
+    public static interface RenderDelegate {
+        /** Indicates whether the backing store of this TextRenderer
+            should be intensity-only (the default) or full-color. */
+        public boolean intensityOnly();
+
+        /** Computes the bounds of the given String relative to the
+            origin. */
+        public Rectangle2D getBounds(String str, Font font,
+                                     FontRenderContext frc);
+
+        /** Computes the bounds of the given character sequence relative
+            to the origin. */
+        public Rectangle2D getBounds(CharSequence str, Font font,
+                                     FontRenderContext frc);
+
+        /** Computes the bounds of the given GlyphVector, already
+            assumed to have been created for a particular Font,
+            relative to the origin. */
+        public Rectangle2D getBounds(GlyphVector gv, FontRenderContext frc);
+
+        /** Render the passed character sequence at the designated
+            location using the supplied Graphics2D instance. The
+            surrounding region will already have been cleared to the RGB
+            color (0, 0, 0) with zero alpha. The initial drawing context
+            of the passed Graphics2D will be set to use
+            AlphaComposite.Src, the color white, the Font specified in the
+            TextRenderer's constructor, and the rendering hints specified
+            in the TextRenderer constructor.  Changes made by the end user
+            may be visible in successive calls to this method, but are not
+            guaranteed to be preserved.  Implementors of this method
+            should reset the Graphics2D's state to that desired each time
+            this method is called, in particular those states which are
+            not the defaults. */
+        public void draw(Graphics2D graphics, String str, int x, int y);
+
+        /** Render the passed GlyphVector at the designated location using
+            the supplied Graphics2D instance. The surrounding region will
+            already have been cleared to the RGB color (0, 0, 0) with zero
+            alpha. The initial drawing context of the passed Graphics2D
+            will be set to use AlphaComposite.Src, the color white, the
+            Font specified in the TextRenderer's constructor, and the
+            rendering hints specified in the TextRenderer constructor.
+            Changes made by the end user may be visible in successive
+            calls to this method, but are not guaranteed to be preserved.
+            Implementors of this method should reset the Graphics2D's
+            state to that desired each time this method is called, in
+            particular those states which are not the defaults. */
+        public void drawGlyphVector(Graphics2D graphics, GlyphVector str,
+                                    int x, int y);
+    }
+
+    private static class CharSequenceIterator implements CharacterIterator {
+        CharSequence mSequence;
+        int mLength;
+        int mCurrentIndex;
+
+        CharSequenceIterator() {
+        }
+
+        CharSequenceIterator(CharSequence sequence) {
+            initFromCharSequence(sequence);
+        }
+
+        public void initFromCharSequence(CharSequence sequence) {
+            mSequence = sequence;
+            mLength = mSequence.length();
+            mCurrentIndex = 0;
+        }
+
+        public char last() {
+            mCurrentIndex = Math.max(0, mLength - 1);
+
+            return current();
+        }
+
+        public char current() {
+            if ((mLength == 0) || (mCurrentIndex >= mLength)) {
+                return CharacterIterator.DONE;
+            }
+
+            return mSequence.charAt(mCurrentIndex);
+        }
+
+        public char next() {
+            mCurrentIndex++;
+
+            return current();
+        }
+
+        public char previous() {
+            mCurrentIndex = Math.max(mCurrentIndex - 1, 0);
+
+            return current();
+        }
+
+        public char setIndex(int position) {
+            mCurrentIndex = position;
+
+            return current();
+        }
+
+        public int getBeginIndex() {
+            return 0;
+        }
+
+        public int getEndIndex() {
+            return mLength;
+        }
+
+        public int getIndex() {
+            return mCurrentIndex;
+        }
+
+        public Object clone() {
+            CharSequenceIterator iter = new CharSequenceIterator(mSequence);
+            iter.mCurrentIndex = mCurrentIndex;
+
+            return iter;
+        }
+
+        public char first() {
+            if (mLength == 0) {
+                return CharacterIterator.DONE;
+            }
+
+            mCurrentIndex = 0;
+
+            return current();
+        }
+    }
+
+    // Data associated with each rectangle of text
+    static class TextData {
+        // Back-pointer to String this TextData describes, if it
+        // represents a String rather than a single glyph
+        private String str;
+
+        // If this TextData represents a single glyph, this is its
+        // unicode ID
+        int unicodeID;
+
+        // The following must be defined and used VERY precisely. This is
+        // the offset from the upper-left corner of this rectangle (Java
+        // 2D coordinate system) at which the string must be rasterized in
+        // order to fit within the rectangle -- the leftmost point of the
+        // baseline.
+        private Point origin;
+
+        // This represents the pre-normalized rectangle, which fits
+        // within the rectangle on the backing store. We keep a
+        // one-pixel border around entries on the backing store to
+        // prevent bleeding of adjacent letters when using GL_LINEAR
+        // filtering for rendering. The origin of this rectangle is
+        // equivalent to the origin above.
+        private Rectangle2D origRect;
+
+        private boolean used; // Whether this text was used recently
+
+        TextData(String str, Point origin, Rectangle2D origRect, int unicodeID) {
+            this.str = str;
+            this.origin = origin;
+            this.origRect = origRect;
+            this.unicodeID = unicodeID;
+        }
+
+        String string() {
+            return str;
+        }
+
+        Point origin() {
+            return origin;
+        }
+
+        // The following three methods are used to locate the glyph
+        // within the expanded rectangle coming from normalize()
+        int origOriginX() {
+            return (int) -origRect.getMinX();
+        }
+
+        int origOriginY() {
+            return (int) -origRect.getMinY();
+        }
+
+        Rectangle2D origRect() {
+            return origRect;
+        }
+
+        boolean used() {
+            return used;
+        }
+
+        void markUsed() {
+            used = true;
+        }
+
+        void clearUsed() {
+            used = false;
+        }
+    }
+
+    class Manager implements BackingStoreManager {
+        private Graphics2D g;
+
+        public Object allocateBackingStore(int w, int h) {
+            // FIXME: should consider checking Font's attributes to see
+            // whether we're likely to need to support a full RGBA backing
+            // store (i.e., non-default Paint, foreground color, etc.), but
+            // for now, let's just be more efficient
+            TextureRenderer renderer;
+
+            if (renderDelegate.intensityOnly()) {
+                renderer = TextureRenderer.createAlphaOnlyRenderer(w, h, mipmap);
+            } else {
+                renderer = new TextureRenderer(w, h, true, mipmap);
+            }
+            renderer.setSmoothing(smoothing);
+
+            if (DEBUG) {
+                System.err.println(" TextRenderer allocating backing store " +
+                                   w + " x " + h);
+            }
+
+            return renderer;
+        }
+
+        public void deleteBackingStore(Object backingStore) {
+            ((TextureRenderer) backingStore).dispose();
+        }
+
+        public boolean preExpand(Rect cause, int attemptNumber) {
+            // Only try this one time; clear out potentially obsolete entries
+            // NOTE: this heuristic and the fact that it clears the used bit
+            // of all entries seems to cause cycling of entries in some
+            // situations, where the backing store becomes small compared to
+            // the amount of text on the screen (see the TextFlow demo) and
+            // the entries continually cycle in and out of the backing
+            // store, decreasing performance. If we added a little age
+            // information to the entries, and only cleared out entries
+            // above a certain age, this behavior would be eliminated.
+            // However, it seems the system usually stabilizes itself, so
+            // for now we'll just keep things simple. Note that if we don't
+            // clear the used bit here, the backing store tends to increase
+            // very quickly to its maximum size, at least with the TextFlow
+            // demo when the text is being continually re-laid out.
+            if (attemptNumber == 0) {
+                if (DEBUG) {
+                    System.err.println(
+                        "Clearing unused entries in preExpand(): attempt number " +
+                        attemptNumber);
+                }
+
+                if (inBeginEndPair) {
+                    // Draw any outstanding glyphs
+                    flush();
+                }
+
+                clearUnusedEntries();
+
+                return true;
+            }
+
+            return false;
+        }
+
+        public boolean additionFailed(Rect cause, int attemptNumber) {
+            // Heavy hammer -- might consider doing something different
+            packer.clear();
+            stringLocations.clear();
+            mGlyphProducer.clearAllCacheEntries();
+
+            if (DEBUG) {
+                System.err.println(
+                                   " *** Cleared all text because addition failed ***");
+            }
+
+            if (attemptNumber == 0) {
+                return true;
+            }
+
+            return false;
+        }
+
+        public boolean canCompact() {
+            return true;
+        }
+
+        public void beginMovement(Object oldBackingStore, Object newBackingStore) {
+            // Exit the begin / end pair if necessary
+            if (inBeginEndPair) {
+                // Draw any outstanding glyphs
+                flush();
+
+                GL2 gl = GLContext.getCurrentGL().getGL2();
+
+                // Pop client attrib bits used by the pipelined quad renderer
+                gl.glPopClientAttrib();
+
+                // The OpenGL spec is unclear about whether this changes the
+                // buffer bindings, so preemptively zero out the GL_ARRAY_BUFFER
+                // binding
+                if (is15Available(gl)) {
+                    try {
+                        gl.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0);
+                    } catch (Exception e) {
+                        isExtensionAvailable_GL_VERSION_1_5 = false;
+                    }
+                }
+
+                if (isOrthoMode) {
+                    ((TextureRenderer) oldBackingStore).endOrthoRendering();
+                } else {
+                    ((TextureRenderer) oldBackingStore).end3DRendering();
+                }
+            }
+
+            TextureRenderer newRenderer = (TextureRenderer) newBackingStore;
+            g = newRenderer.createGraphics();
+        }
+
+        public void move(Object oldBackingStore, Rect oldLocation,
+                         Object newBackingStore, Rect newLocation) {
+            TextureRenderer oldRenderer = (TextureRenderer) oldBackingStore;
+            TextureRenderer newRenderer = (TextureRenderer) newBackingStore;
+
+            if (oldRenderer == newRenderer) {
+                // Movement on the same backing store -- easy case
+                g.copyArea(oldLocation.x(), oldLocation.y(), oldLocation.w(),
+                           oldLocation.h(), newLocation.x() - oldLocation.x(),
+                           newLocation.y() - oldLocation.y());
+            } else {
+                // Need to draw from the old renderer's image into the new one
+                Image img = oldRenderer.getImage();
+                g.drawImage(img, newLocation.x(), newLocation.y(),
+                            newLocation.x() + newLocation.w(),
+                            newLocation.y() + newLocation.h(), oldLocation.x(),
+                            oldLocation.y(), oldLocation.x() + oldLocation.w(),
+                            oldLocation.y() + oldLocation.h(), null);
+            }
+        }
+
+        public void endMovement(Object oldBackingStore, Object newBackingStore) {
+            g.dispose();
+
+            // Sync the whole surface
+            TextureRenderer newRenderer = (TextureRenderer) newBackingStore;
+            newRenderer.markDirty(0, 0, newRenderer.getWidth(),
+                                  newRenderer.getHeight());
+
+            // Re-enter the begin / end pair if necessary
+            if (inBeginEndPair) {
+                if (isOrthoMode) {
+                    ((TextureRenderer) newBackingStore).beginOrthoRendering(beginRenderingWidth,
+                                                                            beginRenderingHeight, beginRenderingDepthTestDisabled);
+                } else {
+                    ((TextureRenderer) newBackingStore).begin3DRendering();
+                }
+
+                // Push client attrib bits used by the pipelined quad renderer
+                GL2 gl = GLContext.getCurrentGL().getGL2();
+                gl.glPushClientAttrib((int) GL2.GL_ALL_CLIENT_ATTRIB_BITS);
+
+                if (haveCachedColor) {
+                    if (cachedColor == null) {
+                        ((TextureRenderer) newBackingStore).setColor(cachedR,
+                                                                     cachedG, cachedB, cachedA);
+                    } else {
+                        ((TextureRenderer) newBackingStore).setColor(cachedColor);
+                    }
+                }
+            } else {
+                needToResetColor = true;
+            }
+        }
+    }
+
+    public static class DefaultRenderDelegate implements RenderDelegate {
+        public boolean intensityOnly() {
+            return true;
+        }
+
+        public Rectangle2D getBounds(CharSequence str, Font font,
+                                     FontRenderContext frc) {
+            return getBounds(font.createGlyphVector(frc,
+                                                    new CharSequenceIterator(str)),
+                             frc);
+        }
+
+        public Rectangle2D getBounds(String str, Font font,
+                                     FontRenderContext frc) {
+            return getBounds(font.createGlyphVector(frc, str), frc);
+        }
+
+        public Rectangle2D getBounds(GlyphVector gv, FontRenderContext frc) {
+            return gv.getVisualBounds();
+        }
+
+        public void drawGlyphVector(Graphics2D graphics, GlyphVector str,
+                                    int x, int y) {
+            graphics.drawGlyphVector(str, x, y);
+        }
+
+        public void draw(Graphics2D graphics, String str, int x, int y) {
+            graphics.drawString(str, x, y);
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // Glyph-by-glyph rendering support
+    //
+
+    // A temporary to prevent excessive garbage creation
+    private char[] singleUnicode = new char[1];
+
+    /** A Glyph represents either a single unicode glyph or a
+        substring of characters to be drawn. The reason for the dual
+        behavior is so that we can take in a sequence of unicode
+        characters and partition them into runs of individual glyphs,
+        but if we encounter complex text and/or unicode sequences we
+        don't understand, we can render them using the
+        string-by-string method. <P>
+
+        Glyphs need to be able to re-upload themselves to the backing
+        store on demand as we go along in the render sequence.
+    */
+
+    class Glyph {
+        // If this Glyph represents an individual unicode glyph, this
+        // is its unicode ID. If it represents a String, this is -1.
+        private int unicodeID;
+        // If the above field isn't -1, then these fields are used.
+        // The glyph code in the font
+        private int glyphCode;
+        // The GlyphProducer which created us
+        private GlyphProducer producer;
+        // The advance of this glyph
+        private float advance;
+        // The GlyphVector for this single character; this is passed
+        // in during construction but cleared during the upload
+        // process
+        private GlyphVector singleUnicodeGlyphVector;
+        // The rectangle of this glyph on the backing store, or null
+        // if it has been cleared due to space pressure
+        private Rect glyphRectForTextureMapping;
+        // If this Glyph represents a String, this is the sequence of
+        // characters
+        private String str;
+        // Whether we need a valid advance when rendering this string
+        // (i.e., whether it has other single glyphs coming after it)
+        private boolean needAdvance;
+
+        // Creates a Glyph representing an individual Unicode character
+        public Glyph(int unicodeID,
+                     int glyphCode,
+                     float advance,
+                     GlyphVector singleUnicodeGlyphVector,
+                     GlyphProducer producer) {
+            this.unicodeID = unicodeID;
+            this.glyphCode = glyphCode;
+            this.advance = advance;
+            this.singleUnicodeGlyphVector = singleUnicodeGlyphVector;
+            this.producer = producer;
+        }
+
+        // Creates a Glyph representing a sequence of characters, with
+        // an indication of whether additional single glyphs are being
+        // rendered after it
+        public Glyph(String str, boolean needAdvance) {
+            this.str = str;
+            this.needAdvance = needAdvance;
+        }
+
+        /** Returns this glyph's unicode ID */
+        public int getUnicodeID() {
+            return unicodeID;
+        }
+
+        /** Returns this glyph's (font-specific) glyph code */
+        public int getGlyphCode() {
+            return glyphCode;
+        }
+
+        /** Returns the advance for this glyph */
+        public float getAdvance() {
+            return advance;
+        }
+
+        /** Draws this glyph and returns the (x) advance for this glyph */
+        public float draw3D(float inX, float inY, float z, float scaleFactor) {
+            if (str != null) {
+                draw3D_ROBUST(str, inX, inY, z, scaleFactor);
+                if (!needAdvance) {
+                    return 0;
+                }
+                // Compute and return the advance for this string
+                GlyphVector gv = font.createGlyphVector(getFontRenderContext(), str);
+                float totalAdvance = 0;
+                for (int i = 0; i < gv.getNumGlyphs(); i++) {
+                    totalAdvance += gv.getGlyphMetrics(i).getAdvance();
+                }
+                return totalAdvance;
+            }
+
+            // This is the code path taken for individual glyphs
+            if (glyphRectForTextureMapping == null) {
+                upload();
+            }
+
+            try {
+                if (mPipelinedQuadRenderer == null) {
+                    mPipelinedQuadRenderer = new Pipelined_QuadRenderer();
+                }
+
+                TextureRenderer renderer = getBackingStore();
+                // Handles case where NPOT texture is used for backing store
+                TextureCoords wholeImageTexCoords = renderer.getTexture().getImageTexCoords();
+                float xScale = wholeImageTexCoords.right();
+                float yScale = wholeImageTexCoords.bottom();
+
+                Rect rect = glyphRectForTextureMapping;
+                TextData data = (TextData) rect.getUserData();
+                data.markUsed();
+
+                Rectangle2D origRect = data.origRect();
+
+                float x = inX - (scaleFactor * data.origOriginX());
+                float y = inY - (scaleFactor * ((float) origRect.getHeight() - data.origOriginY()));
+
+                int texturex = rect.x() + (data.origin().x - data.origOriginX());
+                int texturey = renderer.getHeight() - rect.y() - (int) origRect.getHeight() -
+                    (data.origin().y - data.origOriginY());
+                int width = (int) origRect.getWidth();
+                int height = (int) origRect.getHeight();
+
+                float tx1 = xScale * (float) texturex / (float) renderer.getWidth();
+                float ty1 = yScale * (1.0f -
+                                      ((float) texturey / (float) renderer.getHeight()));
+                float tx2 = xScale * (float) (texturex + width) / (float) renderer.getWidth();
+                float ty2 = yScale * (1.0f -
+                                      ((float) (texturey + height) / (float) renderer.getHeight()));
+
+                mPipelinedQuadRenderer.glTexCoord2f(tx1, ty1);
+                mPipelinedQuadRenderer.glVertex3f(x, y, z);
+                mPipelinedQuadRenderer.glTexCoord2f(tx2, ty1);
+                mPipelinedQuadRenderer.glVertex3f(x + (width * scaleFactor), y,
+                                                  z);
+                mPipelinedQuadRenderer.glTexCoord2f(tx2, ty2);
+                mPipelinedQuadRenderer.glVertex3f(x + (width * scaleFactor),
+                                                  y + (height * scaleFactor), z);
+                mPipelinedQuadRenderer.glTexCoord2f(tx1, ty2);
+                mPipelinedQuadRenderer.glVertex3f(x,
+                                                  y + (height * scaleFactor), z);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return advance;
+        }
+
+        /** Notifies this glyph that it's been cleared out of the cache */
+        public void clear() {
+            glyphRectForTextureMapping = null;
+        }
+
+        private void upload() {
+            GlyphVector gv = getGlyphVector();
+            Rectangle2D origBBox = preNormalize(renderDelegate.getBounds(gv, getFontRenderContext()));
+            Rectangle2D bbox = normalize(origBBox);
+            Point origin = new Point((int) -bbox.getMinX(),
+                                     (int) -bbox.getMinY());
+            Rect rect = new Rect(0, 0, (int) bbox.getWidth(),
+                                 (int) bbox.getHeight(),
+                                 new TextData(null, origin, origBBox, unicodeID));
+            packer.add(rect);
+            glyphRectForTextureMapping = rect;
+            Graphics2D g = getGraphics2D();
+            // OK, should now have an (x, y) for this rectangle; rasterize
+            // the glyph
+            int strx = rect.x() + origin.x;
+            int stry = rect.y() + origin.y;
+
+            // Clear out the area we're going to draw into
+            g.setComposite(AlphaComposite.Clear);
+            g.fillRect(rect.x(), rect.y(), rect.w(), rect.h());
+            g.setComposite(AlphaComposite.Src);
+
+            // Draw the string
+            renderDelegate.drawGlyphVector(g, gv, strx, stry);
+
+            if (DRAW_BBOXES) {
+                TextData data = (TextData) rect.getUserData();
+                // Draw a bounding box on the backing store
+                g.drawRect(strx - data.origOriginX(),
+                           stry - data.origOriginY(),
+                           (int) data.origRect().getWidth(),
+                           (int) data.origRect().getHeight());
+                g.drawRect(strx - data.origin().x,
+                           stry - data.origin().y,
+                           rect.w(),
+                           rect.h());
+            }
+
+            // Mark this region of the TextureRenderer as dirty
+            getBackingStore().markDirty(rect.x(), rect.y(), rect.w(),
+                                        rect.h());
+            // Re-register ourselves with our producer
+            producer.register(this);
+        }
+
+        private GlyphVector getGlyphVector() {
+            GlyphVector gv = singleUnicodeGlyphVector;
+            if (gv != null) {
+                singleUnicodeGlyphVector = null; // Don't need this anymore
+                return gv;
+            }
+            singleUnicode[0] = (char) unicodeID;
+            return font.createGlyphVector(getFontRenderContext(), singleUnicode);
+        }
+    }
+
+    class GlyphProducer {
+        final int undefined = -2;
+        FontRenderContext fontRenderContext;
+        List/*<Glyph>*/ glyphsOutput = new ArrayList/*<Glyph>*/();
+        // The mapping from unicode character to font-specific glyph ID
+        int[] unicodes2Glyphs;
+        // The mapping from glyph ID to Glyph
+        Glyph[] glyphCache;
+        // We re-use this for each incoming string
+        CharSequenceIterator iter = new CharSequenceIterator();
+
+        GlyphProducer(int fontLengthInGlyphs) {
+            unicodes2Glyphs = new int[512];
+            glyphCache = new Glyph[fontLengthInGlyphs];
+            clearAllCacheEntries();
+        }
+
+        public List/*<Glyph>*/ getGlyphs(CharSequence inString) {
+            glyphsOutput.clear();
+            iter.initFromCharSequence(inString);
+            GlyphVector fullRunGlyphVector = font.createGlyphVector(getFontRenderContext(),
+                                                                    iter);
+            boolean complex = (fullRunGlyphVector.getLayoutFlags() != 0);
+            if (complex || DISABLE_GLYPH_CACHE) {
+                // Punt to the robust version of the renderer
+                glyphsOutput.add(new Glyph(inString.toString(), false));
+                return glyphsOutput;
+            }
+
+            int lengthInGlyphs = fullRunGlyphVector.getNumGlyphs();
+            int i = 0;
+            while (i < lengthInGlyphs) {
+                Glyph glyph = getGlyph(inString, fullRunGlyphVector, i);
+                if (glyph != null) {
+                    glyphsOutput.add(glyph);
+                    i++;
+                } else {
+                    // Assemble a run of characters that don't fit in
+                    // the cache
+                    StringBuffer buf = new StringBuffer();
+                    while (i < lengthInGlyphs &&
+                           getGlyph(inString, fullRunGlyphVector, i) == null) {
+                        buf.append(inString.charAt(i++));
+                    }
+                    glyphsOutput.add(new Glyph(buf.toString(),
+                                               // Any more glyphs after this run?
+                                               i < lengthInGlyphs));
+                }
+            }
+            return glyphsOutput;
+        }
+
+        public void clearCacheEntry(int unicodeID) {
+            int glyphID = unicodes2Glyphs[unicodeID];
+            if (glyphID != undefined) {
+                Glyph glyph = glyphCache[glyphID];
+                if (glyph != null) {
+                    glyph.clear();
+                }
+                glyphCache[glyphID] = null;
+            }
+            unicodes2Glyphs[unicodeID] = undefined;
+        }
+
+        public void clearAllCacheEntries() {
+            for (int i = 0; i < unicodes2Glyphs.length; i++) {
+                clearCacheEntry(i);
+            }
+        }
+
+        public void register(Glyph glyph) {
+            unicodes2Glyphs[glyph.getUnicodeID()] = glyph.getGlyphCode();
+            glyphCache[glyph.getGlyphCode()] = glyph;
+        }
+
+        public float getGlyphPixelWidth(char unicodeID) {
+            Glyph glyph = getGlyph(unicodeID);
+            if (glyph != null) {
+                return glyph.getAdvance();
+            }
+
+            // Have to do this the hard / uncached way
+            singleUnicode[0] = unicodeID;
+            GlyphVector gv = font.createGlyphVector(fontRenderContext,
+                                                                    singleUnicode);
+            return gv.getGlyphMetrics(0).getAdvance();
+        }
+
+        // Returns a glyph object for this single glyph. Returns null
+        // if the unicode or glyph ID would be out of bounds of the
+        // glyph cache.
+        private Glyph getGlyph(CharSequence inString,
+                               GlyphVector fullRunGlyphVector,
+                               int index) {
+            char unicodeID = inString.charAt(index);
+
+            if (unicodeID >= unicodes2Glyphs.length) {
+                return null;
+            }
+
+            int glyphID = unicodes2Glyphs[unicodeID];
+            if (glyphID != undefined) {
+                return glyphCache[glyphID];
+            }
+
+            // Must fabricate the glyph
+            singleUnicode[0] = unicodeID;
+            GlyphVector gv = font.createGlyphVector(getFontRenderContext(), singleUnicode);
+            return getGlyph(unicodeID, gv, fullRunGlyphVector.getGlyphMetrics(index));
+        }
+
+        // It's unclear whether this variant might produce less
+        // optimal results than if we can see the entire GlyphVector
+        // for the incoming string
+        private Glyph getGlyph(int unicodeID) {
+            if (unicodeID >= unicodes2Glyphs.length) {
+                return null;
+            }
+
+            int glyphID = unicodes2Glyphs[unicodeID];
+            if (glyphID != undefined) {
+                return glyphCache[glyphID];
+            }
+            singleUnicode[0] = (char) unicodeID;
+            GlyphVector gv = font.createGlyphVector(getFontRenderContext(), singleUnicode);
+            return getGlyph(unicodeID, gv, gv.getGlyphMetrics(0));
+        }
+
+        private Glyph getGlyph(int unicodeID,
+                               GlyphVector singleUnicodeGlyphVector,
+                               GlyphMetrics metrics) {
+            int glyphCode = singleUnicodeGlyphVector.getGlyphCode(0);
+            // Have seen huge glyph codes (65536) coming out of some fonts in some Unicode situations
+            if (glyphCode >= glyphCache.length) {
+                return null;
+            }
+            Glyph glyph = new Glyph(unicodeID,
+                                    glyphCode,
+                                    metrics.getAdvance(),
+                                    singleUnicodeGlyphVector,
+                                    this);
+            register(glyph);
+            return glyph;
+        }
+    }
+
+    class Pipelined_QuadRenderer {
+        int mOutstandingGlyphsVerticesPipeline = 0;
+        FloatBuffer mTexCoords;
+        FloatBuffer mVertCoords;
+        boolean usingVBOs;
+        int mVBO_For_ResuableTileVertices;
+        int mVBO_For_ResuableTileTexCoords;
+
+        Pipelined_QuadRenderer() {
+            GL2 gl = GLContext.getCurrentGL().getGL2();
+            mVertCoords = BufferUtil.newFloatBuffer(kTotalBufferSizeCoordsVerts);
+            mTexCoords = BufferUtil.newFloatBuffer(kTotalBufferSizeCoordsTex);
+
+            usingVBOs = is15Available(gl);
+
+            if (usingVBOs) {
+                try {
+                    int[] vbos = new int[2];
+                    gl.glGenBuffers(2, IntBuffer.wrap(vbos));
+
+                    mVBO_For_ResuableTileVertices = vbos[0];
+                    mVBO_For_ResuableTileTexCoords = vbos[1];
+
+                    gl.glBindBuffer(GL2.GL_ARRAY_BUFFER,
+                                    mVBO_For_ResuableTileVertices);
+                    gl.glBufferData(GL2.GL_ARRAY_BUFFER, kTotalBufferSizeBytesVerts,
+                                    null, GL2.GL_STREAM_DRAW); // stream draw because this is a single quad use pipeline
+
+                    gl.glBindBuffer(GL2.GL_ARRAY_BUFFER,
+                                    mVBO_For_ResuableTileTexCoords);
+                    gl.glBufferData(GL2.GL_ARRAY_BUFFER, kTotalBufferSizeBytesTex,
+                                    null, GL2.GL_STREAM_DRAW); // stream draw because this is a single quad use pipeline
+                } catch (Exception e) {
+                    isExtensionAvailable_GL_VERSION_1_5 = false;
+                    usingVBOs = false;
+                }
+            }
+        }
+
+        public void glTexCoord2f(float v, float v1) {
+            mTexCoords.put(v);
+            mTexCoords.put(v1);
+        }
+
+        public void glVertex3f(float inX, float inY, float inZ) {
+            mVertCoords.put(inX);
+            mVertCoords.put(inY);
+            mVertCoords.put(inZ);
+
+            mOutstandingGlyphsVerticesPipeline++;
+
+            if (mOutstandingGlyphsVerticesPipeline >= kTotalBufferSizeVerts) {
+                this.draw();
+            }
+        }
+
+        private void draw() {
+            if (useVertexArrays) {
+                drawVertexArrays();
+            } else {
+                drawIMMEDIATE();
+            }
+        }
+
+        private void drawVertexArrays() {
+            if (mOutstandingGlyphsVerticesPipeline > 0) {
+                GL2 gl = GLContext.getCurrentGL().getGL2();
+
+                TextureRenderer renderer = getBackingStore();
+                Texture texture = renderer.getTexture(); // triggers texture uploads.  Maybe this should be more obvious?
+
+                mVertCoords.rewind();
+                mTexCoords.rewind();
+
+                gl.glEnableClientState(GL2.GL_VERTEX_ARRAY);
+
+                if (usingVBOs) {
+                    gl.glBindBuffer(GL2.GL_ARRAY_BUFFER,
+                                    mVBO_For_ResuableTileVertices);
+                    gl.glBufferSubData(GL2.GL_ARRAY_BUFFER, 0,
+                                       mOutstandingGlyphsVerticesPipeline * kSizeInBytes_OneVertices_VertexData,
+                                       mVertCoords); // upload only the new stuff
+                    gl.glVertexPointer(3, GL2.GL_FLOAT, 0, 0);
+                } else {
+                    gl.glVertexPointer(3, GL2.GL_FLOAT, 0, mVertCoords);
+                }
+
+                gl.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY);
+
+                if (usingVBOs) {
+                    gl.glBindBuffer(GL2.GL_ARRAY_BUFFER,
+                                    mVBO_For_ResuableTileTexCoords);
+                    gl.glBufferSubData(GL2.GL_ARRAY_BUFFER, 0,
+                                       mOutstandingGlyphsVerticesPipeline * kSizeInBytes_OneVertices_TexData,
+                                       mTexCoords); // upload only the new stuff
+                    gl.glTexCoordPointer(2, GL2.GL_FLOAT, 0, 0);
+                } else {
+                    gl.glTexCoordPointer(2, GL2.GL_FLOAT, 0, mTexCoords);
+                }
+
+                gl.glDrawArrays(GL2.GL_QUADS, 0,
+                                mOutstandingGlyphsVerticesPipeline);
+
+                mVertCoords.rewind();
+                mTexCoords.rewind();
+                mOutstandingGlyphsVerticesPipeline = 0;
+            }
+        }
+
+        private void drawIMMEDIATE() {
+            if (mOutstandingGlyphsVerticesPipeline > 0) {
+                TextureRenderer renderer = getBackingStore();
+                Texture texture = renderer.getTexture(); // triggers texture uploads.  Maybe this should be more obvious?
+
+                GL2 gl = GLContext.getCurrentGL().getGL2();
+                gl.glBegin(GL2.GL_QUADS);
+
+                try {
+                    int numberOfQuads = mOutstandingGlyphsVerticesPipeline / 4;
+                    mVertCoords.rewind();
+                    mTexCoords.rewind();
+
+                    for (int i = 0; i < numberOfQuads; i++) {
+                        gl.glTexCoord2f(mTexCoords.get(), mTexCoords.get());
+                        gl.glVertex3f(mVertCoords.get(), mVertCoords.get(),
+                                      mVertCoords.get());
+
+                        gl.glTexCoord2f(mTexCoords.get(), mTexCoords.get());
+                        gl.glVertex3f(mVertCoords.get(), mVertCoords.get(),
+                                      mVertCoords.get());
+
+                        gl.glTexCoord2f(mTexCoords.get(), mTexCoords.get());
+                        gl.glVertex3f(mVertCoords.get(), mVertCoords.get(),
+                                      mVertCoords.get());
+
+                        gl.glTexCoord2f(mTexCoords.get(), mTexCoords.get());
+                        gl.glVertex3f(mVertCoords.get(), mVertCoords.get(),
+                                      mVertCoords.get());
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                } finally {
+                    gl.glEnd();
+                    mVertCoords.rewind();
+                    mTexCoords.rewind();
+                    mOutstandingGlyphsVerticesPipeline = 0;
+                }
+            }
+        }
+    }
+
+    class DebugListener implements GLEventListener {
+        private GLU glu;
+        private Frame frame;
+
+        DebugListener(GL gl, Frame frame) {
+            this.glu = GLU.createGLU(gl);
+            this.frame = frame;
+        }
+
+        public void display(GLAutoDrawable drawable) {
+            GL2 gl = GLContext.getCurrentGL().getGL2();
+            gl.glClear(GL2.GL_DEPTH_BUFFER_BIT | GL2.GL_COLOR_BUFFER_BIT);
+
+            if (packer == null) {
+                return;
+            }
+
+            TextureRenderer rend = getBackingStore();
+            final int w = rend.getWidth();
+            final int h = rend.getHeight();
+            rend.beginOrthoRendering(w, h);
+            rend.drawOrthoRect(0, 0);
+            rend.endOrthoRendering();
+
+            if ((frame.getWidth() != w) || (frame.getHeight() != h)) {
+                EventQueue.invokeLater(new Runnable() {
+                        public void run() {
+                            frame.setSize(w, h);
+                        }
+                    });
+            }
+        }
+
+        public void dispose(GLAutoDrawable drawable) {
+            glu.destroy();
+            glu=null;
+            frame=null;
+        }
+
+        // Unused methods
+        public void init(GLAutoDrawable drawable) {
+        }
+
+        public void reshape(GLAutoDrawable drawable, int x, int y, int width,
+                            int height) {
+        }
+
+        public void displayChanged(GLAutoDrawable drawable,
+                                   boolean modeChanged, boolean deviceChanged) {
+        }
+    }
+
+    /**
+     * Sets whether vertex arrays are being used internally for
+     * rendering, or whether text is rendered using the OpenGL
+     * immediate mode commands. This is provided as a concession for
+     * certain graphics cards which have poor vertex array
+     * performance. Defaults to true.
+     */
+    public void setUseVertexArrays(boolean useVertexArrays) {
+        this.useVertexArrays = useVertexArrays;
+    }
+
+    /**
+     * Indicates whether vertex arrays are being used internally for
+     * rendering, or whether text is rendered using the OpenGL
+     * immediate mode commands. Defaults to true.
+     */
+    public boolean getUseVertexArrays() {
+        return useVertexArrays;
+    }
+
+    /**
+     * Sets whether smoothing (i.e., GL_LINEAR filtering) is enabled
+     * in the backing TextureRenderer of this TextRenderer. A few
+     * graphics cards do not behave well when this is enabled,
+     * resulting in fuzzy text. Defaults to true.
+     */
+    public void setSmoothing(boolean smoothing) {
+        this.smoothing = smoothing;
+        getBackingStore().setSmoothing(smoothing);
+    }
+
+    /**
+     * Indicates whether smoothing is enabled in the backing
+     * TextureRenderer of this TextRenderer. A few graphics cards do
+     * not behave well when this is enabled, resulting in fuzzy text.
+     * Defaults to true.
+     */
+    public boolean getSmoothing() {
+        return smoothing;
+    }
+
+    private boolean is15Available(GL gl) {
+        if (!checkFor_isExtensionAvailable_GL_VERSION_1_5) {
+            isExtensionAvailable_GL_VERSION_1_5 = gl.isExtensionAvailable("GL_VERSION_1_5");
+            checkFor_isExtensionAvailable_GL_VERSION_1_5 = true;
+        }
+        return isExtensionAvailable_GL_VERSION_1_5;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/TextureRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/awt/TextureRenderer.java
new file mode 100755
index 000000000..bc5aa517e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/TextureRenderer.java
@@ -0,0 +1,699 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.awt;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.image.*;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+import javax.media.opengl.glu.gl2.*;
+import com.jogamp.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.spi.*;
+import com.jogamp.opengl.util.texture.awt.*;
+
+/** Provides the ability to render into an OpenGL {@link
+    com.jogamp.opengl.util.texture.Texture Texture} using the Java 2D
+    APIs. This renderer class uses an internal Java 2D image (of
+    unspecified type) for its backing store and flushes portions of
+    that image to an OpenGL texture on demand. The resulting OpenGL
+    texture can then be mapped on to a polygon for display. */
+
+public class TextureRenderer {
+  // For now, we supply only a BufferedImage back-end for this
+  // renderer. In theory we could use the Java 2D/JOGL bridge to fully
+  // accelerate the rendering paths, but there are restrictions on
+  // what work can be done where; for example, Graphics2D-related work
+  // must not be done on the Queue Flusher Thread, but JOGL's
+  // OpenGL-related work must be. This implies that the user's code
+  // would need to be split up into multiple callbacks run from the
+  // appropriate threads, which would be somewhat unfortunate.
+
+  // Whether we have an alpha channel in the (RGB/A) backing store
+  private boolean alpha;
+
+  // Whether we're using only a GL_INTENSITY backing store
+  private boolean intensity;
+
+  // Whether we're attempting to use automatic mipmap generation support
+  private boolean mipmap;
+
+  // Whether smoothing is enabled for the OpenGL texture (switching
+  // between GL_LINEAR and GL_NEAREST filtering)
+  private boolean smoothing = true;
+  private boolean smoothingChanged;
+
+  // The backing store itself
+  private BufferedImage image;
+
+  private Texture texture;
+  private AWTTextureData textureData;
+  private boolean mustReallocateTexture;
+  private Rectangle dirtyRegion;
+
+  private GLUgl2 glu = new GLUgl2();
+
+  // Current color
+  private float r = 1.0f;
+  private float g = 1.0f;
+  private float b = 1.0f;
+  private float a = 1.0f;
+
+  /** Creates a new renderer with backing store of the specified width
+      and height. If <CODE>alpha</CODE> is true, allocates an alpha
+      channel in the backing store image. No mipmap support is
+      requested.
+
+      @param width the width of the texture to render into
+      @param height the height of the texture to render into
+      @param alpha whether to allocate an alpha channel for the texture
+  */
+  public TextureRenderer(int width, int height, boolean alpha) {
+    this(width, height, alpha, false);
+  }
+
+  /** Creates a new renderer with backing store of the specified width
+      and height. If <CODE>alpha</CODE> is true, allocates an alpha channel in the
+      backing store image. If <CODE>mipmap</CODE> is true, attempts to use OpenGL's
+      automatic mipmap generation for better smoothing when rendering
+      the TextureRenderer's contents at a distance.
+
+      @param width the width of the texture to render into
+      @param height the height of the texture to render into
+      @param alpha whether to allocate an alpha channel for the texture
+      @param mipmap whether to attempt use of automatic mipmap generation
+  */
+  public TextureRenderer(int width, int height, boolean alpha, boolean mipmap) {
+    this(width, height, alpha, false, mipmap);
+  }
+
+  // Internal constructor to avoid confusion since alpha only makes
+  // sense when intensity is not set
+  private TextureRenderer(int width, int height, boolean alpha, boolean intensity, boolean mipmap) {
+    this.alpha = alpha;
+    this.intensity = intensity;
+    this.mipmap = mipmap;
+    init(width, height);
+  }
+
+  /** Creates a new renderer with a special kind of backing store
+      which acts only as an alpha channel. No mipmap support is
+      requested. Internally, this associates a GL_INTENSITY OpenGL
+      texture with the backing store. */
+  public static TextureRenderer createAlphaOnlyRenderer(int width, int height) {
+    return createAlphaOnlyRenderer(width, height, false);
+  }
+
+  /** Creates a new renderer with a special kind of backing store
+      which acts only as an alpha channel. If <CODE>mipmap</CODE> is
+      true, attempts to use OpenGL's automatic mipmap generation for
+      better smoothing when rendering the TextureRenderer's contents
+      at a distance. Internally, this associates a GL_INTENSITY OpenGL
+      texture with the backing store. */
+  public static TextureRenderer createAlphaOnlyRenderer(int width, int height, boolean mipmap) {
+    return new TextureRenderer(width, height, false, true, mipmap);
+  }
+
+  /** Returns the width of the backing store of this renderer.
+
+      @return the width of the backing store of this renderer
+  */
+  public int getWidth() {
+    return image.getWidth();
+  }
+
+  /** Returns the height of the backing store of this renderer.
+
+      @return the height of the backing store of this renderer
+  */
+  public int getHeight() {
+    return image.getHeight();
+  }
+
+  /** Returns the size of the backing store of this renderer in a
+      newly-allocated {@link java.awt.Dimension Dimension} object.
+
+      @return the size of the backing store of this renderer
+  */
+  public Dimension getSize() {
+    return getSize(null);
+  }
+
+  /** Returns the size of the backing store of this renderer. Uses the
+      {@link java.awt.Dimension Dimension} object if one is supplied,
+      or allocates a new one if null is passed.
+
+      @param d a {@link java.awt.Dimension Dimension} object in which
+        to store the results, or null to allocate a new one
+
+      @return the size of the backing store of this renderer
+  */
+  public Dimension getSize(Dimension d) {
+    if (d == null)
+      d = new Dimension();
+    d.setSize(image.getWidth(), image.getHeight());
+    return d;
+  }
+
+  /** Sets the size of the backing store of this renderer. This may
+      cause the OpenGL texture object associated with this renderer to
+      be invalidated; it is not recommended to cache this texture
+      object outside this class but to instead call {@link #getTexture
+      getTexture} when it is needed.
+
+      @param width the new width of the backing store of this renderer
+      @param height the new height of the backing store of this renderer
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void setSize(int width, int height) throws GLException {
+    init(width, height);
+  }
+
+  /** Sets the size of the backing store of this renderer. This may
+      cause the OpenGL texture object associated with this renderer to
+      be invalidated.
+
+      @param d the new size of the backing store of this renderer
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void setSize(Dimension d) throws GLException {
+    setSize(d.width, d.height);
+  }
+
+  /** Sets whether smoothing is enabled for the OpenGL texture; if so,
+      uses GL_LINEAR interpolation for the minification and
+      magnification filters. Defaults to true. Changes to this setting
+      will not take effect until the next call to {@link
+      #beginOrthoRendering beginOrthoRendering}.
+
+      @param smoothing whether smoothing is enabled for the OpenGL texture
+  */
+  public void setSmoothing(boolean smoothing) {
+    this.smoothing = smoothing;
+    smoothingChanged = true;
+  }
+
+  /** Returns whether smoothing is enabled for the OpenGL texture; see
+      {@link #setSmoothing setSmoothing}. Defaults to true.
+
+      @return whether smoothing is enabled for the OpenGL texture
+  */
+  public boolean getSmoothing() {
+    return smoothing;
+  }
+
+  /** Creates a {@link java.awt.Graphics2D Graphics2D} instance for
+      rendering to the backing store of this renderer. The returned
+      object should be disposed of using the normal {@link
+      java.awt.Graphics#dispose() Graphics.dispose()} method once it
+      is no longer being used.
+
+      @return a new {@link java.awt.Graphics2D Graphics2D} object for
+        rendering into the backing store of this renderer
+  */
+  public Graphics2D createGraphics() {
+    return image.createGraphics();
+  }
+
+  /** Returns the underlying Java 2D {@link java.awt.Image Image}
+      being rendered into. */
+  public Image getImage() {
+    return image;
+  }
+
+  /** Marks the given region of the TextureRenderer as dirty. This
+      region, and any previously set dirty regions, will be
+      automatically synchronized with the underlying Texture during
+      the next {@link #getTexture getTexture} operation, at which
+      point the dirty region will be cleared. It is not necessary for
+      an OpenGL context to be current when this method is called.
+
+      @param x the x coordinate (in Java 2D coordinates -- relative to
+        upper left) of the region to update
+      @param y the y coordinate (in Java 2D coordinates -- relative to
+        upper left) of the region to update
+      @param width the width of the region to update
+      @param height the height of the region to update
+  */
+  public void markDirty(int x, int y, int width, int height) {
+    Rectangle curRegion = new Rectangle(x, y, width, height);
+    if (dirtyRegion == null) {
+      dirtyRegion = curRegion;
+    } else {
+      dirtyRegion.add(curRegion);
+    }
+  }
+
+  /** Returns the underlying OpenGL Texture object associated with
+      this renderer, synchronizing any dirty regions of the
+      TextureRenderer with the underlying OpenGL texture.
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public Texture getTexture() throws GLException {
+    if (dirtyRegion != null) {
+      sync(dirtyRegion.x, dirtyRegion.y, dirtyRegion.width, dirtyRegion.height);
+      dirtyRegion = null;
+    }
+
+    ensureTexture();
+    return texture;
+  }
+
+  /** Disposes all resources associated with this renderer. It is not
+      valid to use this renderer after calling this method.
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void dispose() throws GLException {
+    if (texture != null) {
+      texture.dispose();
+      texture = null;
+    }
+    if (image != null) {
+      image.flush();
+      image = null;
+    }
+  }
+
+  /** Convenience method which assists in rendering portions of the
+      OpenGL texture to the screen, if the application intends to draw
+      them as a flat overlay on to the screen. Pushes OpenGL state
+      bits (GL_ENABLE_BIT, GL_DEPTH_BUFFER_BIT and GL_TRANSFORM_BIT);
+      disables the depth test, back-face culling, and lighting;
+      enables the texture in this renderer; and sets up the viewing
+      matrices for orthographic rendering where the coordinates go
+      from (0, 0) at the lower left to (width, height) at the upper
+      right. Equivalent to beginOrthoRendering(width, height, true).
+      {@link #endOrthoRendering} must be used in conjunction with this
+      method to restore all OpenGL states.
+
+      @param width the width of the current on-screen OpenGL drawable
+      @param height the height of the current on-screen OpenGL drawable
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void beginOrthoRendering(int width, int height) throws GLException {
+    beginOrthoRendering(width, height, true);
+  }
+
+  /** Convenience method which assists in rendering portions of the
+      OpenGL texture to the screen, if the application intends to draw
+      them as a flat overlay on to the screen. Pushes OpenGL state
+      bits (GL_ENABLE_BIT, GL_DEPTH_BUFFER_BIT and GL_TRANSFORM_BIT);
+      disables the depth test (if the "disableDepthTest" argument is
+      true), back-face culling, and lighting; enables the texture in
+      this renderer; and sets up the viewing matrices for orthographic
+      rendering where the coordinates go from (0, 0) at the lower left
+      to (width, height) at the upper right. {@link
+      #endOrthoRendering} must be used in conjunction with this method
+      to restore all OpenGL states.
+
+      @param width the width of the current on-screen OpenGL drawable
+      @param height the height of the current on-screen OpenGL drawable
+      @param disableDepthTest whether the depth test should be disabled
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void beginOrthoRendering(int width, int height, boolean disableDepthTest) throws GLException {
+    beginRendering(true, width, height, disableDepthTest);
+  }
+
+  /** Convenience method which assists in rendering portions of the
+      OpenGL texture to the screen as 2D quads in 3D space. Pushes
+      OpenGL state (GL_ENABLE_BIT); disables lighting; and enables the
+      texture in this renderer. Unlike {@link #beginOrthoRendering
+      beginOrthoRendering}, does not modify the depth test, back-face
+      culling, lighting, or the modelview or projection matrices. The
+      user is responsible for setting up the view matrices for correct
+      results of {@link #draw3DRect draw3DRect}. {@link
+      #end3DRendering} must be used in conjunction with this method to
+      restore all OpenGL states.
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void begin3DRendering() throws GLException {
+    beginRendering(false, 0, 0, false);
+  }
+
+  /** Changes the color of the polygons, and therefore the drawn
+      images, this TextureRenderer produces. Use of this method is
+      optional. The TextureRenderer uses the GL_MODULATE texture
+      environment mode, which causes the portions of the rendered
+      texture to be multiplied by the color of the rendered
+      polygons. The polygon color can be varied to achieve effects
+      like tinting of the overall output or fading in and out by
+      changing the alpha of the color. <P>
+
+      Each component ranges from 0.0f - 1.0f. The alpha component, if
+      used, does not need to be premultiplied into the color channels
+      as described in the documentation for {@link
+      com.jogamp.opengl.util.texture.Texture Texture}, although
+      premultiplied colors are used internally. The default color is
+      opaque white.
+
+      @param r the red component of the new color
+      @param g the green component of the new color
+      @param b the blue component of the new color
+      @param a the alpha component of the new color, 0.0f = completely
+        transparent, 1.0f = completely opaque
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void setColor(float r, float g, float b, float a) throws GLException {
+    GL2 gl = GLContext.getCurrentGL().getGL2();
+    this.r = r * a;
+    this.g = g * a;
+    this.b = b * a;
+    this.a = a;
+
+    gl.glColor4f(this.r, this.g, this.b, this.a);
+  }  
+
+  private float[] compArray;
+  /** Changes the current color of this TextureRenderer to the
+      supplied one. The default color is opaque white. See {@link
+      #setColor(float,float,float,float) setColor} for more details.
+
+      @param color the new color to use for rendering
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void setColor(Color color) throws GLException {
+    // Get color's RGBA components as floats in the range [0,1].
+    if (compArray == null) {
+      compArray = new float[4];
+    }
+    color.getRGBComponents(compArray);
+    setColor(compArray[0], compArray[1], compArray[2], compArray[3]);
+  }
+
+  /** Draws an orthographically projected rectangle containing all of
+      the underlying texture to the specified location on the
+      screen. All (x, y) coordinates are specified relative to the
+      lower left corner of either the texture image or the current
+      OpenGL drawable. This method is equivalent to
+      <code>drawOrthoRect(screenx, screeny, 0, 0, getWidth(),
+      getHeight());</code>.
+
+      @param screenx the on-screen x coordinate at which to draw the rectangle
+      @param screeny the on-screen y coordinate (relative to lower left) at
+        which to draw the rectangle
+      
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void drawOrthoRect(int screenx, int screeny) throws GLException {
+    drawOrthoRect(screenx, screeny, 0, 0, getWidth(), getHeight());
+  }
+
+  /** Draws an orthographically projected rectangle of the underlying
+      texture to the specified location on the screen. All (x, y)
+      coordinates are specified relative to the lower left corner of
+      either the texture image or the current OpenGL drawable.
+
+      @param screenx the on-screen x coordinate at which to draw the rectangle
+      @param screeny the on-screen y coordinate (relative to lower left) at
+        which to draw the rectangle
+      @param texturex the x coordinate of the pixel in the texture of
+        the lower left portion of the rectangle to draw
+      @param texturey the y coordinate of the pixel in the texture
+        (relative to lower left) of the lower left portion of the
+        rectangle to draw
+      @param width the width of the rectangle to draw
+      @param height the height of the rectangle to draw
+      
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void drawOrthoRect(int screenx, int screeny,
+                            int texturex, int texturey,
+                            int width, int height) throws GLException {
+    draw3DRect(screenx, screeny, 0, texturex, texturey, width, height, 1);
+  }
+
+  /** Draws a rectangle of the underlying texture to the specified 3D
+      location. In the current coordinate system, the lower left
+      corner of the rectangle is placed at (x, y, z), and the upper
+      right corner is placed at (x + width * scaleFactor, y + height *
+      scaleFactor, z). The lower left corner of the sub-rectangle of
+      the texture is (texturex, texturey) and the upper right corner
+      is (texturex + width, texturey + height). For back-face culling
+      purposes, the rectangle is drawn with counterclockwise
+      orientation of the vertices when viewed from the front.
+
+      @param x the x coordinate at which to draw the rectangle
+      @param y the y coordinate at which to draw the rectangle
+      @param z the z coordinate at which to draw the rectangle
+      @param texturex the x coordinate of the pixel in the texture of
+        the lower left portion of the rectangle to draw
+      @param texturey the y coordinate of the pixel in the texture
+        (relative to lower left) of the lower left portion of the
+        rectangle to draw
+      @param width the width in texels of the rectangle to draw
+      @param height the height in texels of the rectangle to draw
+      @param scaleFactor the scale factor to apply (multiplicatively)
+        to the size of the drawn rectangle
+      
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void draw3DRect(float x, float y, float z,
+                         int texturex, int texturey,
+                         int width, int height,
+                         float scaleFactor) throws GLException {
+    GL2 gl = GLContext.getCurrentGL().getGL2();
+    Texture texture = getTexture();
+    TextureCoords coords = texture.getSubImageTexCoords(texturex, texturey,
+                                                        texturex + width,
+                                                        texturey + height);
+    gl.glBegin(GL2.GL_QUADS);
+    gl.glTexCoord2f(coords.left(), coords.bottom());
+    gl.glVertex3f(x, y, z);
+    gl.glTexCoord2f(coords.right(), coords.bottom());
+    gl.glVertex3f(x + width * scaleFactor, y, z);
+    gl.glTexCoord2f(coords.right(), coords.top());
+    gl.glVertex3f(x + width * scaleFactor, y + height * scaleFactor, z);
+    gl.glTexCoord2f(coords.left(), coords.top());
+    gl.glVertex3f(x, y + height * scaleFactor, z);
+    gl.glEnd();
+  }
+
+  /** Convenience method which assists in rendering portions of the
+      OpenGL texture to the screen, if the application intends to draw
+      them as a flat overlay on to the screen. Must be used if {@link
+      #beginOrthoRendering} is used to set up the rendering stage for
+      this overlay. 
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void endOrthoRendering() throws GLException {
+    endRendering(true);
+  }
+
+  /** Convenience method which assists in rendering portions of the
+      OpenGL texture to the screen as 2D quads in 3D space. Must be
+      used if {@link #begin3DRendering} is used to set up the
+      rendering stage for this overlay.
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  public void end3DRendering() throws GLException {
+    endRendering(false);
+  }
+
+  /** Indicates whether automatic mipmap generation is in use for this
+      TextureRenderer. The result of this method may change from true
+      to false if it is discovered during allocation of the
+      TextureRenderer's backing store that automatic mipmap generation
+      is not supported at the OpenGL level. */
+  public boolean isUsingAutoMipmapGeneration() {
+    return mipmap;
+  }
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  private void beginRendering(boolean ortho, int width, int height, boolean disableDepthTestForOrtho) {
+    GL2 gl = GLContext.getCurrentGL().getGL2();
+    int attribBits = 
+      GL2.GL_ENABLE_BIT | GL2.GL_TEXTURE_BIT | GL2.GL_COLOR_BUFFER_BIT |
+      (ortho ? (GL2.GL_DEPTH_BUFFER_BIT | GL2.GL_TRANSFORM_BIT) : 0);
+    gl.glPushAttrib(attribBits);
+    gl.glDisable(GL2.GL_LIGHTING);
+    if (ortho) {
+      if (disableDepthTestForOrtho) {
+        gl.glDisable(GL2.GL_DEPTH_TEST);
+      }
+      gl.glDisable(GL2.GL_CULL_FACE);
+      gl.glMatrixMode(GL2.GL_PROJECTION);
+      gl.glPushMatrix();
+      gl.glLoadIdentity();
+      glu.gluOrtho2D(0, width, 0, height);
+      gl.glMatrixMode(GL2.GL_MODELVIEW);
+      gl.glPushMatrix();
+      gl.glLoadIdentity();
+      gl.glMatrixMode(GL2.GL_TEXTURE);
+      gl.glPushMatrix();
+      gl.glLoadIdentity();
+    }
+    gl.glEnable(GL2.GL_BLEND);
+    gl.glBlendFunc(GL2.GL_ONE, GL2.GL_ONE_MINUS_SRC_ALPHA);
+    Texture texture = getTexture();
+    texture.enable();
+    texture.bind();
+    gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_MODULATE);
+    // Change polygon color to last saved
+    gl.glColor4f(r, g, b, a);
+    if (smoothingChanged) {
+      smoothingChanged = false;
+      if (smoothing) {
+        texture.setTexParameteri(GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR);
+        if (mipmap) {
+          texture.setTexParameteri(GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR_MIPMAP_LINEAR);
+        } else {
+          texture.setTexParameteri(GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR);
+        }
+      } else {
+        texture.setTexParameteri(GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_NEAREST);
+        texture.setTexParameteri(GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_NEAREST);
+      }
+    }
+  }
+
+  private void endRendering(boolean ortho) {
+    GL2 gl = GLContext.getCurrentGL().getGL2();
+    Texture texture = getTexture();
+    texture.disable();
+    if (ortho) {
+      gl.glMatrixMode(GL2.GL_PROJECTION);
+      gl.glPopMatrix();
+      gl.glMatrixMode(GL2.GL_MODELVIEW);
+      gl.glPopMatrix();
+      gl.glMatrixMode(GL2.GL_TEXTURE);
+      gl.glPopMatrix();
+    }
+    gl.glPopAttrib();
+  }
+
+  private void init(int width, int height) {
+    GL2 gl = GLContext.getCurrentGL().getGL2();
+    // Discard previous BufferedImage if any
+    if (image != null) {
+      image.flush();
+      image = null;
+    }
+
+    // Infer the internal format if not an intensity texture
+    int internalFormat = (intensity ? GL2.GL_INTENSITY : 0);
+    int imageType = 
+      (intensity ? BufferedImage.TYPE_BYTE_GRAY :
+       (alpha ?  BufferedImage.TYPE_INT_ARGB_PRE : BufferedImage.TYPE_INT_RGB));
+    image = new BufferedImage(width, height, imageType);
+    // Always realllocate the TextureData associated with this
+    // BufferedImage; it's just a reference to the contents but we
+    // need it in order to update sub-regions of the underlying
+    // texture
+    textureData = new AWTTextureData(gl.getGLProfile(), internalFormat, 0, mipmap, image);
+    // For now, always reallocate the underlying OpenGL texture when
+    // the backing store size changes
+    mustReallocateTexture = true;
+  }
+
+  /** Synchronizes the specified region of the backing store down to
+      the underlying OpenGL texture. If {@link #markDirty markDirty}
+      is used instead to indicate the regions that are out of sync,
+      this method does not need to be called.
+
+      @param x the x coordinate (in Java 2D coordinates -- relative to
+        upper left) of the region to update
+      @param y the y coordinate (in Java 2D coordinates -- relative to
+        upper left) of the region to update
+      @param width the width of the region to update
+      @param height the height of the region to update
+
+      @throws GLException If an OpenGL context is not current when this method is called
+  */
+  private void sync(int x, int y, int width, int height) throws GLException {
+    // Force allocation if necessary
+    boolean canSkipUpdate = ensureTexture();
+
+    if (!canSkipUpdate) {
+      // Update specified region.
+      // NOTE that because BufferedImage-based TextureDatas now don't
+      // do anything to their contents, the coordinate systems for
+      // OpenGL and Java 2D actually line up correctly for
+      // updateSubImage calls, so we don't need to do any argument
+      // conversion here (i.e., flipping the Y coordinate).
+      texture.updateSubImage(textureData, 0, x, y, x, y, width, height);
+    }
+  }
+
+  // Returns true if the texture was newly allocated, false if not
+  private boolean ensureTexture() {
+    if (mustReallocateTexture) {
+      if (texture != null) {
+        texture.dispose();
+        texture = null;
+      }
+      mustReallocateTexture = false;
+    }
+
+    if (texture == null) {
+      texture = TextureIO.newTexture(textureData);
+      if (mipmap && !texture.isUsingAutoMipmapGeneration()) {
+        // Only try this once
+        texture.dispose();
+        mipmap = false;
+        textureData.setMipmap(false);
+        texture = TextureIO.newTexture(textureData);
+      }
+
+      if (!smoothing) {
+        // The TextureIO classes default to GL_LINEAR filtering
+        texture.setTexParameteri(GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_NEAREST);
+        texture.setTexParameteri(GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_NEAREST);
+      }
+      return true;
+    }
+
+    return false;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapCharRec.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapCharRec.java
new file mode 100644
index 000000000..34685e1b2
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapCharRec.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
+
+/* This program is freely distributable without licensing fees 
+   and is provided without guarantee or warrantee expressed or 
+   implied. This program is -not- in the public domain. */
+
+class BitmapCharRec {
+  public int width;
+  public int height;
+  public float xorig;
+  public float yorig;
+  public float advance;
+  public byte[] bitmap;
+
+  public BitmapCharRec(int width,
+                int height,
+                float xorig,
+                float yorig,
+                float advance,
+                byte[] bitmap) {
+    this.width   = width;
+    this.height  = height;
+    this.xorig   = xorig;
+    this.yorig   = yorig;
+    this.advance = advance;
+    this.bitmap  = bitmap;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapFontRec.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapFontRec.java
new file mode 100644
index 000000000..18f7d3b28
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapFontRec.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
+
+/* This program is freely distributable without licensing fees 
+   and is provided without guarantee or warrantee expressed or 
+   implied. This program is -not- in the public domain. */
+
+class BitmapFontRec {
+  public String name;
+  public int num_chars;
+  public int first;
+  public BitmapCharRec[] ch;
+
+  public BitmapFontRec(String name,
+                int num_chars,
+                int first,
+                BitmapCharRec[] ch) {
+    this.name = name;
+    this.num_chars = num_chars;
+    this.first = first;
+    this.ch = ch;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/CoordRec.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/CoordRec.java
new file mode 100644
index 000000000..9ad95ec03
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/CoordRec.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
+
+/* This program is freely distributable without licensing fees 
+   and is provided without guarantee or warrantee expressed or 
+   implied. This program is -not- in the public domain. */
+
+class CoordRec {
+  public float x;
+  public float y;
+
+  public CoordRec(float x, float y) {
+    this.x = x;
+    this.y = y;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUT.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUT.java
new file mode 100644
index 000000000..8befc13ba
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUT.java
@@ -0,0 +1,1342 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+import javax.media.opengl.glu.gl2.*;
+
+/** Subset of the routines provided by the GLUT interface. Note the
+    signatures of many of the methods are necessarily different than
+    the corresponding C version. A GLUT object must only be used from
+    one particular thread at a time. <P>
+
+    Copyright (c) Mark J. Kilgard, 1994, 1997. <P>
+
+    (c) Copyright 1993, Silicon Graphics, Inc. <P>
+
+    ALL RIGHTS RESERVED <P>
+
+    Permission to use, copy, modify, and distribute this software
+    for any purpose and without fee is hereby granted, provided
+    that the above copyright notice appear in all copies and that
+    both the copyright notice and this permission notice appear in
+    supporting documentation, and that the name of Silicon
+    Graphics, Inc. not be used in advertising or publicity
+    pertaining to distribution of the software without specific,
+    written prior permission. <P>
+
+    THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU
+    "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR
+    OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF
+    MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  IN NO
+    EVENT SHALL SILICON GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE
+    ELSE FOR ANY DIRECT, SPECIAL, INCIDENTAL, INDIRECT OR
+    CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER,
+    INCLUDING WITHOUT LIMITATION, LOSS OF PROFIT, LOSS OF USE,
+    SAVINGS OR REVENUE, OR THE CLAIMS OF THIRD PARTIES, WHETHER OR
+    NOT SILICON GRAPHICS, INC.  HAS BEEN ADVISED OF THE POSSIBILITY
+    OF SUCH LOSS, HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+    ARISING OUT OF OR IN CONNECTION WITH THE POSSESSION, USE OR
+    PERFORMANCE OF THIS SOFTWARE. <P>
+
+    US Government Users Restricted Rights <P>
+
+    Use, duplication, or disclosure by the Government is subject to
+    restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
+    (c)(1)(ii) of the Rights in Technical Data and Computer
+    Software clause at DFARS 252.227-7013 and/or in similar or
+    successor clauses in the FAR or the DOD or NASA FAR
+    Supplement.  Unpublished-- rights reserved under the copyright
+    laws of the United States.  Contractor/manufacturer is Silicon
+    Graphics, Inc., 2011 N.  Shoreline Blvd., Mountain View, CA
+    94039-7311. <P>
+
+    OpenGL(TM) is a trademark of Silicon Graphics, Inc. <P>
+*/
+
+public class GLUT {
+  public static final int STROKE_ROMAN = 0;
+  public static final int STROKE_MONO_ROMAN = 1;
+  public static final int BITMAP_9_BY_15 = 2;
+  public static final int BITMAP_8_BY_13 = 3;
+  public static final int BITMAP_TIMES_ROMAN_10 = 4;
+  public static final int BITMAP_TIMES_ROMAN_24 = 5;
+  public static final int BITMAP_HELVETICA_10 = 6;
+  public static final int BITMAP_HELVETICA_12 = 7;
+  public static final int BITMAP_HELVETICA_18 = 8;
+
+  private GLUgl2 glu = new GLUgl2();
+
+  //----------------------------------------------------------------------
+  // Shapes
+  //
+
+  public void glutWireSphere(double radius, int slices, int stacks) {
+    quadObjInit(glu);
+    glu.gluQuadricDrawStyle(quadObj, GLU.GLU_LINE);
+    glu.gluQuadricNormals(quadObj, GLU.GLU_SMOOTH);
+    /* If we ever changed/used the texture or orientation state
+       of quadObj, we'd need to change it to the defaults here
+       with gluQuadricTexture and/or gluQuadricOrientation. */
+    glu.gluSphere(quadObj, radius, slices, stacks);
+  }
+
+  public void glutSolidSphere(double radius, int slices, int stacks) {
+    quadObjInit(glu);
+    glu.gluQuadricDrawStyle(quadObj, GLU.GLU_FILL);
+    glu.gluQuadricNormals(quadObj, GLU.GLU_SMOOTH);
+    /* If we ever changed/used the texture or orientation state
+       of quadObj, we'd need to change it to the defaults here
+       with gluQuadricTexture and/or gluQuadricOrientation. */
+    glu.gluSphere(quadObj, radius, slices, stacks);
+  }
+
+  public void glutWireCone(double base, double height,
+                           int slices, int stacks) {
+    quadObjInit(glu);
+    glu.gluQuadricDrawStyle(quadObj, GLU.GLU_LINE);
+    glu.gluQuadricNormals(quadObj, GLU.GLU_SMOOTH);
+    /* If we ever changed/used the texture or orientation state
+       of quadObj, we'd need to change it to the defaults here
+       with gluQuadricTexture and/or gluQuadricOrientation. */
+    glu.gluCylinder(quadObj, base, 0.0, height, slices, stacks);
+  }
+
+  public void glutSolidCone(double base, double height,
+                            int slices, int stacks) {
+    quadObjInit(glu);
+    glu.gluQuadricDrawStyle(quadObj, GLU.GLU_FILL);
+    glu.gluQuadricNormals(quadObj, GLU.GLU_SMOOTH);
+    /* If we ever changed/used the texture or orientation state
+       of quadObj, we'd need to change it to the defaults here
+       with gluQuadricTexture and/or gluQuadricOrientation. */
+    glu.gluCylinder(quadObj, base, 0.0, height, slices, stacks);
+  }
+
+  public void glutWireCylinder(double radius, double height, int slices, int stacks) {
+    quadObjInit(glu);
+    glu.gluQuadricDrawStyle(quadObj, GLU.GLU_LINE);
+    glu.gluQuadricNormals(quadObj, GLU.GLU_SMOOTH);
+    /* If we ever changed/used the texture or orientation state
+       of quadObj, we'd need to change it to the defaults here
+       with gluQuadricTexture and/or gluQuadricOrientation. */
+    glu.gluCylinder(quadObj, radius, radius, height, slices, stacks);
+  }
+
+  public void glutSolidCylinder(double radius, double height, int slices, int stacks) {
+    GL2 gl = GLUgl2.getCurrentGL2();
+  	
+    // Prepare table of points for drawing end caps
+    double [] x = new double[slices];
+    double [] y = new double[slices];
+    double angleDelta = Math.PI * 2 / slices;
+    double angle = 0;
+    for (int i = 0 ; i < slices ; i ++) {
+      angle = i * angleDelta;
+      x[i] = Math.cos(angle) * radius;
+      y[i] = Math.sin(angle) * radius;
+    }
+  	
+    // Draw bottom cap
+    gl.glBegin(GL2.GL_TRIANGLE_FAN);
+    gl.glNormal3d(0,0,-1);
+    gl.glVertex3d(0,0,0);
+    for (int i = 0 ; i < slices ; i ++) {
+      gl.glVertex3d(x[i], y[i], 0);
+    }
+    gl.glVertex3d(x[0], y[0], 0);
+    gl.glEnd();
+  	
+    // Draw top cap
+    gl.glBegin(GL2.GL_TRIANGLE_FAN);
+    gl.glNormal3d(0,0,1);
+    gl.glVertex3d(0,0,height);
+    for (int i = 0 ; i < slices ; i ++) {
+      gl.glVertex3d(x[i], y[i], height);
+    }
+    gl.glVertex3d(x[0], y[0], height);
+    gl.glEnd();
+  	
+    // Draw walls
+    quadObjInit(glu);
+    glu.gluQuadricDrawStyle(quadObj, GLU.GLU_FILL);
+    glu.gluQuadricNormals(quadObj, GLU.GLU_SMOOTH);
+    /* If we ever changed/used the texture or orientation state
+       of quadObj, we'd need to change it to the defaults here
+       with gluQuadricTexture and/or gluQuadricOrientation. */
+    glu.gluCylinder(quadObj, radius, radius, height, slices, stacks);
+  }
+
+  public void glutWireCube(float size) {
+    drawBox(GLUgl2.getCurrentGL2(), size, GL2.GL_LINE_LOOP);
+  }
+
+  public void glutSolidCube(float size) {
+    drawBox(GLUgl2.getCurrentGL2(), size, GL2.GL_QUADS);
+  }
+
+  public void glutWireTorus(double innerRadius, double outerRadius,
+                            int nsides, int rings) {
+    GL2 gl = GLUgl2.getCurrentGL2();
+    gl.glPushAttrib(GL2.GL_POLYGON_BIT);
+    gl.glPolygonMode(GL2.GL_FRONT_AND_BACK, GL2.GL_LINE);
+    doughnut(gl, innerRadius, outerRadius, nsides, rings);
+    gl.glPopAttrib();
+  }
+
+  public void glutSolidTorus(double innerRadius, double outerRadius,
+                             int nsides, int rings) {
+    doughnut(GLUgl2.getCurrentGL2(), innerRadius, outerRadius, nsides, rings);
+  }
+
+  public void glutWireDodecahedron() {
+    dodecahedron(GLUgl2.getCurrentGL2(), GL2.GL_LINE_LOOP);
+  }
+
+  public void glutSolidDodecahedron() {
+    dodecahedron(GLUgl2.getCurrentGL2(), GL2.GL_TRIANGLE_FAN);
+  }
+
+  public void glutWireOctahedron() {
+    octahedron(GLUgl2.getCurrentGL2(), GL2.GL_LINE_LOOP);
+  }
+
+  public void glutSolidOctahedron() {
+    octahedron(GLUgl2.getCurrentGL2(), GL2.GL_TRIANGLES);
+  }
+
+  public void glutWireIcosahedron() {
+    icosahedron(GLUgl2.getCurrentGL2(), GL2.GL_LINE_LOOP);
+  }
+
+  public void glutSolidIcosahedron() {
+    icosahedron(GLUgl2.getCurrentGL2(), GL2.GL_TRIANGLES);
+  }
+
+  public void glutWireTetrahedron() {
+    tetrahedron(GLUgl2.getCurrentGL2(), GL2.GL_LINE_LOOP);
+  }
+
+  public void glutSolidTetrahedron() {
+    tetrahedron(GLUgl2.getCurrentGL2(), GL2.GL_TRIANGLES);
+  }
+
+/**
+   * Renders the teapot as a solid shape of the specified size. The teapot is
+   * created in a way that replicates the C GLUT implementation.
+   * 
+   * @param scale
+   *        the factor by which to scale the teapot
+   */
+  public void glutSolidTeapot(double scale) {
+    glutSolidTeapot(scale, true);
+  }
+
+  /**
+   * Renders the teapot as a solid shape of the specified size. The teapot can
+   * either be created in a way that is backward-compatible with the standard
+   * C glut library (i.e. broken), or in a more pleasing way (i.e. with
+   * surfaces whose front-faces point outwards and standing on the z=0 plane,
+   * instead of the y=-1 plane). Both surface normals and texture coordinates
+   * for the teapot are generated. The teapot is generated with OpenGL
+   * evaluators.
+   * 
+   * @param scale
+   *        the factor by which to scale the teapot
+   * @param cStyle
+   *        whether to create the teapot in exactly the same way as in the C
+   *        implementation of GLUT
+   */
+  public void glutSolidTeapot(double scale, boolean cStyle) {
+    teapot(GLUgl2.getCurrentGL2(), 14, scale, GL2.GL_FILL, cStyle);
+  }
+
+  /**
+   * Renders the teapot as a wireframe shape of the specified size. The teapot
+   * is created in a way that replicates the C GLUT implementation.
+   * 
+   * @param scale
+   *        the factor by which to scale the teapot
+   */
+  public void glutWireTeapot(double scale) {
+    glutWireTeapot(scale, true);
+  }
+  
+  /**
+   * Renders the teapot as a wireframe shape of the specified size. The teapot
+   * can either be created in a way that is backward-compatible with the
+   * standard C glut library (i.e. broken), or in a more pleasing way (i.e.
+   * with surfaces whose front-faces point outwards and standing on the z=0
+   * plane, instead of the y=-1 plane). Both surface normals and texture
+   * coordinates for the teapot are generated. The teapot is generated with
+   * OpenGL evaluators.
+   * 
+   * @param scale
+   *        the factor by which to scale the teapot
+   * @param cStyle
+   *        whether to create the teapot in exactly the same way as in the C
+   *        implementation of GLUT
+   */
+  public void glutWireTeapot(double scale, boolean cStyle) {
+    teapot(GLUgl2.getCurrentGL2(), 10, scale, GL2.GL_LINE, cStyle);
+  }
+
+  //----------------------------------------------------------------------
+  // Fonts
+  //
+
+  public void glutBitmapCharacter(int font, char character) {
+    GL2 gl = GLUgl2.getCurrentGL2();
+    int[] swapbytes  = new int[1];
+    int[] lsbfirst   = new int[1];
+    int[] rowlength  = new int[1];
+    int[] skiprows   = new int[1];
+    int[] skippixels = new int[1];
+    int[] alignment  = new int[1];
+    beginBitmap(gl,
+                swapbytes,
+                lsbfirst,
+                rowlength,
+                skiprows,
+                skippixels,
+                alignment);
+    bitmapCharacterImpl(gl, font, character);
+    endBitmap(gl,
+              swapbytes,
+              lsbfirst,
+              rowlength,
+              skiprows,
+              skippixels,
+              alignment);
+  }
+
+  public void glutBitmapString   (int font, String string) {
+    GL2 gl = GLUgl2.getCurrentGL2();
+    int[] swapbytes  = new int[1];
+    int[] lsbfirst   = new int[1];
+    int[] rowlength  = new int[1];
+    int[] skiprows   = new int[1];
+    int[] skippixels = new int[1];
+    int[] alignment  = new int[1];
+    beginBitmap(gl, 
+                swapbytes,
+                lsbfirst,
+                rowlength,
+                skiprows,
+                skippixels,
+                alignment);
+    int len = string.length();
+    for (int i = 0; i < len; i++) {
+      bitmapCharacterImpl(gl, font, string.charAt(i));
+    }
+    endBitmap(gl, 
+              swapbytes,
+              lsbfirst,
+              rowlength,
+              skiprows,
+              skippixels,
+              alignment);
+  }
+
+  public int  glutBitmapWidth    (int font, char character) {
+    BitmapFontRec fontinfo = getBitmapFont(font);
+    int c = character & 0xFFFF;
+    if (c < fontinfo.first || c >= fontinfo.first + fontinfo.num_chars)
+      return 0;
+    BitmapCharRec ch = fontinfo.ch[c - fontinfo.first];
+    if (ch != null)
+      return (int) ch.advance;
+    else
+      return 0;
+  }
+
+  public void glutStrokeCharacter(int font, char character) {
+    GL2 gl = GLUgl2.getCurrentGL2();
+    StrokeFontRec fontinfo = getStrokeFont(font);
+    int c = character & 0xFFFF;
+    if (c < 0 || c >= fontinfo.num_chars)
+      return;
+    StrokeCharRec ch = fontinfo.ch[c];
+    if (ch != null) {
+      for (int i = 0; i < ch.num_strokes; i++) {
+        StrokeRec stroke = ch.stroke[i];
+        gl.glBegin(GL2.GL_LINE_STRIP);
+        for (int j = 0; j < stroke.num_coords; j++) {
+          CoordRec coord = stroke.coord[j];
+          gl.glVertex2f(coord.x, coord.y);
+        }
+        gl.glEnd();
+      }
+      gl.glTranslatef(ch.right, 0.0f, 0.0f);
+    }
+  }
+
+  public void glutStrokeString(int font, String string) {
+    GL2 gl = GLUgl2.getCurrentGL2();
+    StrokeFontRec fontinfo = getStrokeFont(font);
+    int len = string.length();
+    for (int pos = 0; pos < len; pos++) {
+      int c = string.charAt(pos) & 0xFFFF;
+      if (c < 0 || c >= fontinfo.num_chars)
+        continue;
+      StrokeCharRec ch = fontinfo.ch[c];
+      if (ch != null) {
+        for (int i = 0; i < ch.num_strokes; i++) {
+          StrokeRec stroke = ch.stroke[i];
+          gl.glBegin(GL2.GL_LINE_STRIP);
+          for (int j = 0; j < stroke.num_coords; j++) {
+            CoordRec coord = stroke.coord[j];
+            gl.glVertex2f(coord.x, coord.y);
+          }
+          gl.glEnd();
+        }
+        gl.glTranslatef(ch.right, 0.0f, 0.0f);
+      }
+    }
+  }
+
+  public int  glutStrokeWidth    (int font, char character) {
+    return (int) glutStrokeWidthf(font, character);
+  }
+
+  public float glutStrokeWidthf   (int font, char character) {
+    StrokeFontRec fontinfo = getStrokeFont(font);
+    int c = character & 0xFFFF;
+    if (c < 0 || c >= fontinfo.num_chars)
+      return 0;
+    StrokeCharRec ch = fontinfo.ch[c];
+    if (ch != null)
+      return ch.right;
+    else
+      return 0;
+  }
+
+  public int  glutBitmapLength   (int font, String string) {
+    BitmapFontRec fontinfo = getBitmapFont(font);
+    int length = 0;
+    int len = string.length();
+    for (int pos = 0; pos < len; pos++) {
+      int c = string.charAt(pos) & 0xFFFF;
+      if (c >= fontinfo.first && c < fontinfo.first + fontinfo.num_chars) {
+        BitmapCharRec ch = fontinfo.ch[c - fontinfo.first];
+        if (ch != null)
+          length += ch.advance;
+      }
+    }
+    return length;
+  }
+
+  public int  glutStrokeLength   (int font, String string) {
+    return (int) glutStrokeLengthf(font, string);
+  }
+
+  public float glutStrokeLengthf  (int font, String string) {
+    StrokeFontRec fontinfo = getStrokeFont(font);
+    float length = 0;
+    int len = string.length();
+    for (int i = 0; i < len; i++) {
+      char c = string.charAt(i);
+      if (c >= 0 && c < fontinfo.num_chars) {
+        StrokeCharRec ch = fontinfo.ch[c];
+        if (ch != null)
+          length += ch.right;
+      }
+    }
+    return length;
+  }
+
+  /**
+     This function draws a wireframe dodecahedron whose
+     facets are rhombic and
+     whose vertices are at unit radius.
+     No facet lies normal to any coordinate axes.
+     The polyhedron is centered at the origin.
+  */
+  public void glutWireRhombicDodecahedron() {
+    GL2 gl = GLUgl2.getCurrentGL2();
+    for( int i = 0; i < 12; i++ ) {
+      gl.glBegin( GL2.GL_LINE_LOOP );
+      gl.glNormal3dv( rdod_n[ i ],0 );
+      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 0 ] ],0 );
+      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 1 ] ],0 );
+      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 2 ] ],0 );
+      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 3 ] ],0 );
+      gl.glEnd( );
+    }
+  }
+  
+  /**
+   This function draws a solid-shaded dodecahedron
+   whose facets are rhombic and
+   whose vertices are at unit radius.
+   No facet lies normal to any coordinate axes.
+   The polyhedron is centered at the origin.
+   */
+  public void glutSolidRhombicDodecahedron() {
+    GL2 gl = GLUgl2.getCurrentGL2();
+    gl.glBegin( GL2.GL_QUADS );
+    for( int i = 0; i < 12; i++ ) {
+      gl.glNormal3dv( rdod_n[ i ],0 );
+      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 0 ] ],0 );
+      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 1 ] ],0 );
+      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 2 ] ],0 );
+      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 3 ] ],0 );
+    }
+    gl.glEnd( );
+  }
+  
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  //----------------------------------------------------------------------
+  // Shape implementation
+  //
+
+  private GLUquadric quadObj;
+  private void quadObjInit(GLUgl2 glu) {
+    if (quadObj == null) {
+      quadObj = glu.gluNewQuadric();
+    }
+    if (quadObj == null) {
+      throw new GLException("Out of memory");
+    }
+  }
+
+  private static void doughnut(GL2 gl, double r, double R, int nsides, int rings) {
+    int i, j;
+    float theta, phi, theta1;
+    float cosTheta, sinTheta;
+    float cosTheta1, sinTheta1;
+    float ringDelta, sideDelta;
+
+    ringDelta = (float) (2.0 * Math.PI / rings);
+    sideDelta = (float) (2.0 * Math.PI / nsides);
+
+    theta = 0.0f;
+    cosTheta = 1.0f;
+    sinTheta = 0.0f;
+    for (i = rings - 1; i >= 0; i--) {
+      theta1 = theta + ringDelta;
+      cosTheta1 = (float) Math.cos(theta1);
+      sinTheta1 = (float) Math.sin(theta1);
+      gl.glBegin(GL2.GL_QUAD_STRIP);
+      phi = 0.0f;
+      for (j = nsides; j >= 0; j--) {
+        float cosPhi, sinPhi, dist;
+
+        phi += sideDelta;
+        cosPhi = (float) Math.cos(phi);
+        sinPhi = (float) Math.sin(phi);
+        dist = (float) (R + r * cosPhi);
+
+        gl.glNormal3f(cosTheta1 * cosPhi, -sinTheta1 * cosPhi, sinPhi);
+        gl.glVertex3f(cosTheta1 * dist,   -sinTheta1 * dist,   (float) r * sinPhi);
+        gl.glNormal3f(cosTheta  * cosPhi, -sinTheta  * cosPhi, sinPhi);
+        gl.glVertex3f(cosTheta  * dist,   -sinTheta  * dist,   (float) r * sinPhi);
+      }
+      gl.glEnd();
+      theta = theta1;
+      cosTheta = cosTheta1;
+      sinTheta = sinTheta1;
+    }
+  }
+
+  private static float[][] boxVertices;
+  private static final float[][] boxNormals = {
+    {-1.0f, 0.0f, 0.0f},
+    {0.0f, 1.0f, 0.0f},
+    {1.0f, 0.0f, 0.0f},
+    {0.0f, -1.0f, 0.0f},
+    {0.0f, 0.0f, 1.0f},
+    {0.0f, 0.0f, -1.0f}
+  };
+  private static final int[][] boxFaces = {
+    {0, 1, 2, 3},
+    {3, 2, 6, 7},
+    {7, 6, 5, 4},
+    {4, 5, 1, 0},
+    {5, 6, 2, 1},
+    {7, 4, 0, 3}
+  };
+  private void drawBox(GL2 gl, float size, int type) {
+    if (boxVertices == null) {
+      float[][] v = new float[8][];
+      for (int i = 0; i < 8; i++) {
+        v[i] = new float[3];
+      }
+      v[0][0] = v[1][0] = v[2][0] = v[3][0] = -0.5f;
+      v[4][0] = v[5][0] = v[6][0] = v[7][0] =  0.5f;
+      v[0][1] = v[1][1] = v[4][1] = v[5][1] = -0.5f;
+      v[2][1] = v[3][1] = v[6][1] = v[7][1] =  0.5f;
+      v[0][2] = v[3][2] = v[4][2] = v[7][2] = -0.5f;
+      v[1][2] = v[2][2] = v[5][2] = v[6][2] =  0.5f;
+      boxVertices = v;
+    }
+    float[][] v = boxVertices;
+    float[][] n = boxNormals;
+    int[][] faces = boxFaces;
+    for (int i = 5; i >= 0; i--) {
+      gl.glBegin(type);
+      gl.glNormal3fv(n[i], 0);
+      float[] vt = v[faces[i][0]];
+      gl.glVertex3f(vt[0] * size, vt[1] * size, vt[2] * size);
+      vt = v[faces[i][1]];
+      gl.glVertex3f(vt[0] * size, vt[1] * size, vt[2] * size);
+      vt = v[faces[i][2]];
+      gl.glVertex3f(vt[0] * size, vt[1] * size, vt[2] * size);
+      vt = v[faces[i][3]];
+      gl.glVertex3f(vt[0] * size, vt[1] * size, vt[2] * size);
+      gl.glEnd();
+    }
+  }
+
+  private float[][] dodec;
+
+  private void initDodecahedron() {
+    dodec = new float[20][];
+    for (int i = 0; i < dodec.length; i++) {
+      dodec[i] = new float[3];
+    }
+
+    float alpha, beta;
+
+    alpha = (float) Math.sqrt(2.0f / (3.0f + Math.sqrt(5.0)));
+    beta = 1.0f + (float) Math.sqrt(6.0 / (3.0 + Math.sqrt(5.0)) -
+                                    2.0 + 2.0 * Math.sqrt(2.0 / (3.0 + Math.sqrt(5.0))));
+    dodec[0][0] = -alpha; dodec[0][1] = 0; dodec[0][2] = beta;
+    dodec[1][0] = alpha; dodec[1][1] = 0; dodec[1][2] = beta;
+    dodec[2][0] = -1; dodec[2][1] = -1; dodec[2][2] = -1;
+    dodec[3][0] = -1; dodec[3][1] = -1; dodec[3][2] = 1;
+    dodec[4][0] = -1; dodec[4][1] = 1; dodec[4][2] = -1;
+    dodec[5][0] = -1; dodec[5][1] = 1; dodec[5][2] = 1;
+    dodec[6][0] = 1; dodec[6][1] = -1; dodec[6][2] = -1;
+    dodec[7][0] = 1; dodec[7][1] = -1; dodec[7][2] = 1;
+    dodec[8][0] = 1; dodec[8][1] = 1; dodec[8][2] = -1;
+    dodec[9][0] = 1; dodec[9][1] = 1; dodec[9][2] = 1;
+    dodec[10][0] = beta; dodec[10][1] = alpha; dodec[10][2] = 0;
+    dodec[11][0] = beta; dodec[11][1] = -alpha; dodec[11][2] = 0;
+    dodec[12][0] = -beta; dodec[12][1] = alpha; dodec[12][2] = 0;
+    dodec[13][0] = -beta; dodec[13][1] = -alpha; dodec[13][2] = 0;
+    dodec[14][0] = -alpha; dodec[14][1] = 0; dodec[14][2] = -beta;
+    dodec[15][0] = alpha; dodec[15][1] = 0; dodec[15][2] = -beta;
+    dodec[16][0] = 0; dodec[16][1] = beta; dodec[16][2] = alpha;
+    dodec[17][0] = 0; dodec[17][1] = beta; dodec[17][2] = -alpha;
+    dodec[18][0] = 0; dodec[18][1] = -beta; dodec[18][2] = alpha;
+    dodec[19][0] = 0; dodec[19][1] = -beta; dodec[19][2] = -alpha;
+  }
+
+  private static void diff3(float[] a, float[] b, float[] c) {
+    c[0] = a[0] - b[0];
+    c[1] = a[1] - b[1];
+    c[2] = a[2] - b[2];
+  }
+
+  private static void crossprod(float[] v1, float[] v2, float[] prod) {
+    float[] p = new float[3];         /* in case prod == v1 or v2 */
+
+    p[0] = v1[1] * v2[2] - v2[1] * v1[2];
+    p[1] = v1[2] * v2[0] - v2[2] * v1[0];
+    p[2] = v1[0] * v2[1] - v2[0] * v1[1];
+    prod[0] = p[0];
+    prod[1] = p[1];
+    prod[2] = p[2];
+  }
+
+  private static void normalize(float[] v) {
+    float d;
+
+    d = (float) Math.sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
+    if (d == 0.0) {
+      v[0] = d = 1.0f;
+    }
+    d = 1 / d;
+    v[0] *= d;
+    v[1] *= d;
+    v[2] *= d;
+  }
+
+  private void pentagon(GL2 gl, int a, int b, int c, int d, int e, int shadeType) {
+    float[] n0 = new float[3];
+    float[] d1 = new float[3];
+    float[] d2 = new float[3];
+
+    diff3(dodec[a], dodec[b], d1);
+    diff3(dodec[b], dodec[c], d2);
+    crossprod(d1, d2, n0);
+    normalize(n0);
+
+    gl.glBegin(shadeType);
+    gl.glNormal3fv(n0, 0);
+    gl.glVertex3fv(dodec[a], 0);
+    gl.glVertex3fv(dodec[b], 0);
+    gl.glVertex3fv(dodec[c], 0);
+    gl.glVertex3fv(dodec[d], 0);
+    gl.glVertex3fv(dodec[e], 0);
+    gl.glEnd();
+  }
+
+  private void dodecahedron(GL2 gl, int type) {
+    if (dodec == null) {
+      initDodecahedron();
+    }
+    pentagon(gl, 0, 1, 9, 16, 5, type);
+    pentagon(gl, 1, 0, 3, 18, 7, type);
+    pentagon(gl, 1, 7, 11, 10, 9, type);
+    pentagon(gl, 11, 7, 18, 19, 6, type);
+    pentagon(gl, 8, 17, 16, 9, 10, type);
+    pentagon(gl, 2, 14, 15, 6, 19, type);
+    pentagon(gl, 2, 13, 12, 4, 14, type);
+    pentagon(gl, 2, 19, 18, 3, 13, type);
+    pentagon(gl, 3, 0, 5, 12, 13, type);
+    pentagon(gl, 6, 15, 8, 10, 11, type);
+    pentagon(gl, 4, 17, 8, 15, 14, type);
+    pentagon(gl, 4, 12, 5, 16, 17, type);
+  }
+
+  private static void recorditem(GL2 gl, float[] n1, float[] n2, float[] n3, int shadeType) {
+    float[] q0 = new float[3];
+    float[] q1 = new float[3];
+
+    diff3(n1, n2, q0);
+    diff3(n2, n3, q1);
+    crossprod(q0, q1, q1);
+    normalize(q1);
+
+    gl.glBegin(shadeType);
+    gl.glNormal3fv(q1, 0);
+    gl.glVertex3fv(n1, 0);
+    gl.glVertex3fv(n2, 0);
+    gl.glVertex3fv(n3, 0);
+    gl.glEnd();
+  }
+
+  private static void subdivide(GL2 gl, float[] v0, float[] v1, float[] v2, int shadeType) {
+    int depth;
+    float[] w0 = new float[3];
+    float[] w1 = new float[3];
+    float[] w2 = new float[3];
+    float l;
+    int i, j, k, n;
+
+    depth = 1;
+    for (i = 0; i < depth; i++) {
+      for (j = 0; i + j < depth; j++) {
+        k = depth - i - j;
+        for (n = 0; n < 3; n++) {
+          w0[n] = (i * v0[n] + j * v1[n] + k * v2[n]) / depth;
+          w1[n] = ((i + 1) * v0[n] + j * v1[n] + (k - 1) * v2[n])
+            / depth;
+          w2[n] = (i * v0[n] + (j + 1) * v1[n] + (k - 1) * v2[n])
+            / depth;
+        }
+        l = (float) Math.sqrt(w0[0] * w0[0] + w0[1] * w0[1] + w0[2] * w0[2]);
+        w0[0] /= l;
+        w0[1] /= l;
+        w0[2] /= l;
+        l = (float) Math.sqrt(w1[0] * w1[0] + w1[1] * w1[1] + w1[2] * w1[2]);
+        w1[0] /= l;
+        w1[1] /= l;
+        w1[2] /= l;
+        l = (float) Math.sqrt(w2[0] * w2[0] + w2[1] * w2[1] + w2[2] * w2[2]);
+        w2[0] /= l;
+        w2[1] /= l;
+        w2[2] /= l;
+        recorditem(gl, w1, w0, w2, shadeType);
+      }
+    }
+  }
+
+  private static void drawtriangle(GL2 gl, int i, float[][] data, int[][] ndx, int shadeType) {
+    float[] x0 = data[ndx[i][0]];
+    float[] x1 = data[ndx[i][1]];
+    float[] x2 = data[ndx[i][2]];
+    subdivide(gl, x0, x1, x2, shadeType);
+  }
+
+  /* octahedron data: The octahedron produced is centered at the
+     origin and has radius 1.0 */
+  private static final float[][] odata =
+  {
+    {1.0f, 0.0f, 0.0f},
+    {-1.0f, 0.0f, 0.0f},
+    {0.0f, 1.0f, 0.0f},
+    {0.0f, -1.0f, 0.0f},
+    {0.0f, 0.0f, 1.0f},
+    {0.0f, 0.0f, -1.0f}
+  };
+
+  private static final int[][] ondex =
+  {
+    {0, 4, 2},
+    {1, 2, 4},
+    {0, 3, 4},
+    {1, 4, 3},
+    {0, 2, 5},
+    {1, 5, 2},
+    {0, 5, 3},
+    {1, 3, 5}
+  };
+
+  private static void octahedron(GL2 gl, int shadeType) {
+    int i;
+
+    for (i = 7; i >= 0; i--) {
+      drawtriangle(gl, i, odata, ondex, shadeType);
+    }
+  }
+
+  /* icosahedron data: These numbers are rigged to make an
+     icosahedron of radius 1.0 */
+
+  private static final float X = .525731112119133606f;
+  private static final float Z = .850650808352039932f;
+
+  private static final float[][] idata =
+  {
+    {-X, 0, Z},
+    {X, 0, Z},
+    {-X, 0, -Z},
+    {X, 0, -Z},
+    {0, Z, X},
+    {0, Z, -X},
+    {0, -Z, X},
+    {0, -Z, -X},
+    {Z, X, 0},
+    {-Z, X, 0},
+    {Z, -X, 0},
+    {-Z, -X, 0}
+  };
+
+  private static final int[][] index =
+  {
+    {0, 4, 1},
+    {0, 9, 4},
+    {9, 5, 4},
+    {4, 5, 8},
+    {4, 8, 1},
+    {8, 10, 1},
+    {8, 3, 10},
+    {5, 3, 8},
+    {5, 2, 3},
+    {2, 7, 3},
+    {7, 10, 3},
+    {7, 6, 10},
+    {7, 11, 6},
+    {11, 0, 6},
+    {0, 1, 6},
+    {6, 1, 10},
+    {9, 0, 11},
+    {9, 11, 2},
+    {9, 2, 5},
+    {7, 2, 11},
+  };
+
+  private static void icosahedron(GL2 gl, int shadeType) {
+    int i;
+
+    for (i = 19; i >= 0; i--) {
+      drawtriangle(gl, i, idata, index, shadeType);
+    }
+  }
+
+  /* rhombic dodecahedron data: */
+  
+  private static final double rdod_r[][] =
+  {
+    { 0.0, 0.0, 1.0 },
+    {  0.707106781187,  0.000000000000,  0.5 },
+    {  0.000000000000,  0.707106781187,  0.5 },
+    { -0.707106781187,  0.000000000000,  0.5 },
+    {  0.000000000000, -0.707106781187,  0.5 },
+    {  0.707106781187,  0.707106781187,  0.0 },
+    { -0.707106781187,  0.707106781187,  0.0 },
+    { -0.707106781187, -0.707106781187,  0.0 },
+    {  0.707106781187, -0.707106781187,  0.0 },
+    {  0.707106781187,  0.000000000000, -0.5 },
+    {  0.000000000000,  0.707106781187, -0.5 },
+    { -0.707106781187,  0.000000000000, -0.5 },
+    {  0.000000000000, -0.707106781187, -0.5 },
+    {  0.0, 0.0, -1.0 }
+  };
+  
+  private static final int rdod_v[][] =
+  {
+    { 0,  1,  5,  2 },
+    { 0,  2,  6,  3 },
+    { 0,  3,  7,  4 },
+    { 0,  4,  8,  1 },
+    { 5, 10,  6,  2 },
+    { 6, 11,  7,  3 },
+    { 7, 12,  8,  4 },
+    { 8,  9,  5,  1 },
+    { 5,  9, 13, 10 },
+    { 6, 10, 13, 11 },
+    { 7, 11, 13, 12 },
+    { 8, 12, 13,  9 }
+  };
+  
+  private static final double rdod_n[][] =
+  {
+    {  0.353553390594,  0.353553390594,  0.5 },
+    { -0.353553390594,  0.353553390594,  0.5 },
+    { -0.353553390594, -0.353553390594,  0.5 },
+    {  0.353553390594, -0.353553390594,  0.5 },
+    {  0.000000000000,  1.000000000000,  0.0 },
+    { -1.000000000000,  0.000000000000,  0.0 },
+    {  0.000000000000, -1.000000000000,  0.0 },
+    {  1.000000000000,  0.000000000000,  0.0 },
+    {  0.353553390594,  0.353553390594, -0.5 },
+    { -0.353553390594,  0.353553390594, -0.5 },
+    { -0.353553390594, -0.353553390594, -0.5 },
+    {  0.353553390594, -0.353553390594, -0.5 }
+  };
+  
+  /* tetrahedron data: */
+
+  private static final float T = 1.73205080756887729f;
+
+  private static final float[][] tdata =
+  {
+    {T, T, T},
+    {T, -T, -T},
+    {-T, T, -T},
+    {-T, -T, T}
+  };
+
+  private static final int[][] tndex =
+  {
+    {0, 1, 3},
+    {2, 1, 0},
+    {3, 2, 0},
+    {1, 2, 3}
+  };
+
+  private static final void tetrahedron(GL2 gl, int shadeType) {
+    for (int i = 3; i >= 0; i--)
+      drawtriangle(gl, i, tdata, tndex, shadeType);
+  }
+
+  // Teapot implementation (a modified port of glut_teapot.c)
+  //
+  // Rim, body, lid, and bottom data must be reflected in x and
+  // y; handle and spout data across the y axis only.
+  private static final int[][] teapotPatchData = {
+    /* rim */
+    {102, 103, 104, 105, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
+    /* body */
+    {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27},
+    {24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40},
+    /* lid */
+    {96, 96, 96, 96, 97, 98, 99, 100, 101, 101, 101, 101, 0, 1, 2, 3,},
+    {0, 1, 2, 3, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117},
+    /* bottom */
+    {118, 118, 118, 118, 124, 122, 119, 121, 123, 126, 125, 120, 40, 39, 38, 37},
+    /* handle */
+    {41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56},
+    {53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 28, 65, 66, 67},
+    /* spout */
+    {68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83},
+    {80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95}
+  };
+  private static final float[][] teapotCPData = {
+    {0.2f, 0f, 2.7f},
+    {0.2f, -0.112f, 2.7f},
+    {0.112f, -0.2f, 2.7f},
+    {0f, -0.2f, 2.7f},
+    {1.3375f, 0f, 2.53125f},
+    {1.3375f, -0.749f, 2.53125f},
+    {0.749f, -1.3375f, 2.53125f},
+    {0f, -1.3375f, 2.53125f},
+    {1.4375f, 0f, 2.53125f},
+    {1.4375f, -0.805f, 2.53125f},
+    {0.805f, -1.4375f, 2.53125f},
+    {0f, -1.4375f, 2.53125f},
+    {1.5f, 0f, 2.4f},
+    {1.5f, -0.84f, 2.4f},
+    {0.84f, -1.5f, 2.4f},
+    {0f, -1.5f, 2.4f},
+    {1.75f, 0f, 1.875f},
+    {1.75f, -0.98f, 1.875f},
+    {0.98f, -1.75f, 1.875f},
+    {0f, -1.75f, 1.875f},
+    {2f, 0f, 1.35f},
+    {2f, -1.12f, 1.35f},
+    {1.12f, -2f, 1.35f},
+    {0f, -2f, 1.35f},
+    {2f, 0f, 0.9f},
+    {2f, -1.12f, 0.9f},
+    {1.12f, -2f, 0.9f},
+    {0f, -2f, 0.9f},
+    {-2f, 0f, 0.9f},
+    {2f, 0f, 0.45f},
+    {2f, -1.12f, 0.45f},
+    {1.12f, -2f, 0.45f},
+    {0f, -2f, 0.45f},
+    {1.5f, 0f, 0.225f},
+    {1.5f, -0.84f, 0.225f},
+    {0.84f, -1.5f, 0.225f},
+    {0f, -1.5f, 0.225f},
+    {1.5f, 0f, 0.15f},
+    {1.5f, -0.84f, 0.15f},
+    {0.84f, -1.5f, 0.15f},
+    {0f, -1.5f, 0.15f},
+    {-1.6f, 0f, 2.025f},
+    {-1.6f, -0.3f, 2.025f},
+    {-1.5f, -0.3f, 2.25f},
+    {-1.5f, 0f, 2.25f},
+    {-2.3f, 0f, 2.025f},
+    {-2.3f, -0.3f, 2.025f},
+    {-2.5f, -0.3f, 2.25f},
+    {-2.5f, 0f, 2.25f},
+    {-2.7f, 0f, 2.025f},
+    {-2.7f, -0.3f, 2.025f},
+    {-3f, -0.3f, 2.25f},
+    {-3f, 0f, 2.25f},
+    {-2.7f, 0f, 1.8f},
+    {-2.7f, -0.3f, 1.8f},
+    {-3f, -0.3f, 1.8f},
+    {-3f, 0f, 1.8f},
+    {-2.7f, 0f, 1.575f},
+    {-2.7f, -0.3f, 1.575f},
+    {-3f, -0.3f, 1.35f},
+    {-3f, 0f, 1.35f},
+    {-2.5f, 0f, 1.125f},
+    {-2.5f, -0.3f, 1.125f},
+    {-2.65f, -0.3f, 0.9375f},
+    {-2.65f, 0f, 0.9375f},
+    {-2f, -0.3f, 0.9f},
+    {-1.9f, -0.3f, 0.6f},
+    {-1.9f, 0f, 0.6f},
+    {1.7f, 0f, 1.425f},
+    {1.7f, -0.66f, 1.425f},
+    {1.7f, -0.66f, 0.6f},
+    {1.7f, 0f, 0.6f},
+    {2.6f, 0f, 1.425f},
+    {2.6f, -0.66f, 1.425f},
+    {3.1f, -0.66f, 0.825f},
+    {3.1f, 0f, 0.825f},
+    {2.3f, 0f, 2.1f},
+    {2.3f, -0.25f, 2.1f},
+    {2.4f, -0.25f, 2.025f},
+    {2.4f, 0f, 2.025f},
+    {2.7f, 0f, 2.4f},
+    {2.7f, -0.25f, 2.4f},
+    {3.3f, -0.25f, 2.4f},
+    {3.3f, 0f, 2.4f},
+    {2.8f, 0f, 2.475f},
+    {2.8f, -0.25f, 2.475f},
+    {3.525f, -0.25f, 2.49375f},
+    {3.525f, 0f, 2.49375f},
+    {2.9f, 0f, 2.475f},
+    {2.9f, -0.15f, 2.475f},
+    {3.45f, -0.15f, 2.5125f},
+    {3.45f, 0f, 2.5125f},
+    {2.8f, 0f, 2.4f},
+    {2.8f, -0.15f, 2.4f},
+    {3.2f, -0.15f, 2.4f},
+    {3.2f, 0f, 2.4f},
+    {0f, 0f, 3.15f},
+    {0.8f, 0f, 3.15f},
+    {0.8f, -0.45f, 3.15f},
+    {0.45f, -0.8f, 3.15f},
+    {0f, -0.8f, 3.15f},
+    {0f, 0f, 2.85f},
+    {1.4f, 0f, 2.4f},
+    {1.4f, -0.784f, 2.4f},
+    {0.784f, -1.4f, 2.4f},
+    {0f, -1.4f, 2.4f},
+    {0.4f, 0f, 2.55f},
+    {0.4f, -0.224f, 2.55f},
+    {0.224f, -0.4f, 2.55f},
+    {0f, -0.4f, 2.55f},
+    {1.3f, 0f, 2.55f},
+    {1.3f, -0.728f, 2.55f},
+    {0.728f, -1.3f, 2.55f},
+    {0f, -1.3f, 2.55f},
+    {1.3f, 0f, 2.4f},
+    {1.3f, -0.728f, 2.4f},
+    {0.728f, -1.3f, 2.4f},
+    {0f, -1.3f, 2.4f},
+    {0f, 0f, 0f},
+    {1.425f, -0.798f, 0f},
+    {1.5f, 0f, 0.075f},
+    {1.425f, 0f, 0f},
+    {0.798f, -1.425f, 0f},
+    {0f, -1.5f, 0.075f},
+    {0f, -1.425f, 0f},
+    {1.5f, -0.84f, 0.075f},
+    {0.84f, -1.5f, 0.075f}
+  };
+  // Since GL2.glMap2f expects a packed array of floats, we must convert
+  // from a 3-dimensional array to a 1-dimensional array
+  private static final float[] teapotTex = {
+    0, 0, 1, 0, 0, 1, 1, 1
+  };
+
+  private static void teapot(GL2 gl,
+                             int grid,
+                             double scale,
+                             int type,
+                             boolean backCompatible)
+  {
+    // As mentioned above, GL2.glMap2f expects a packed array of floats
+    float[] p = new float[4*4*3];
+    float[] q = new float[4*4*3];
+    float[] r = new float[4*4*3];
+    float[] s = new float[4*4*3];
+    int i, j, k, l;
+  
+    gl.glPushAttrib(GL2.GL_ENABLE_BIT | GL2.GL_EVAL_BIT | GL2.GL_POLYGON_BIT);
+    gl.glEnable(GL2.GL_AUTO_NORMAL);
+    gl.glEnable(GL2.GL_NORMALIZE);
+    gl.glEnable(GL2.GL_MAP2_VERTEX_3);
+    gl.glEnable(GL2.GL_MAP2_TEXTURE_COORD_2);
+    gl.glPushMatrix();
+    if (!backCompatible) {
+      // The time has come to have the teapot no longer be inside out
+      gl.glFrontFace(GL2.GL_CW);
+      gl.glScaled(0.5*scale, 0.5*scale, 0.5*scale);
+    } else {
+      // We want the teapot in it's backward compatible position and
+      // orientation
+      gl.glRotatef(270.0f, 1, 0, 0);
+      gl.glScalef((float)(0.5 * scale),
+                  (float)(0.5 * scale),
+                  (float)(0.5 * scale));
+      gl.glTranslatef(0.0f, 0.0f, -1.5f);
+    }
+    for (i = 0; i < 10; i++) {
+      for (j = 0; j < 4; j++) {
+        for (k = 0; k < 4; k++) {
+          for (l = 0; l < 3; l++) {
+            p[(j*4+k)*3+l] = teapotCPData[teapotPatchData[i][j * 4 + k]][l];
+            q[(j*4+k)*3+l] =
+              teapotCPData[teapotPatchData[i][j * 4 + (3 - k)]][l];
+            if (l == 1)
+              q[(j*4+k)*3+l] *= -1.0;
+            if (i < 6) {
+              r[(j*4+k)*3+l] =
+                teapotCPData[teapotPatchData[i][j * 4 + (3 - k)]][l];
+              if (l == 0)
+                r[(j*4+k)*3+l] *= -1.0;
+              s[(j*4+k)*3+l] = teapotCPData[teapotPatchData[i][j * 4 + k]][l];
+              if (l == 0)
+                s[(j*4+k)*3+l] *= -1.0;
+              if (l == 1)
+                s[(j*4+k)*3+l] *= -1.0;
+            }
+          }
+        }
+      }
+      gl.glMap2f(GL2.GL_MAP2_TEXTURE_COORD_2, 0, 1, 2, 2, 0, 1, 4, 2, teapotTex, 0);
+      gl.glMap2f(GL2.GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4, p, 0);
+      gl.glMapGrid2f(grid, 0.0f, 1.0f, grid, 0.0f, 1.0f);
+      evaluateTeapotMesh(gl, grid, type, i, !backCompatible);
+      gl.glMap2f(GL2.GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4, q, 0);
+      evaluateTeapotMesh(gl, grid, type, i, !backCompatible);
+      if (i < 6) {
+        gl.glMap2f(GL2.GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4, r, 0);
+        evaluateTeapotMesh(gl, grid, type, i, !backCompatible);
+        gl.glMap2f(GL2.GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4, s, 0);
+        evaluateTeapotMesh(gl, grid, type, i, !backCompatible);
+      }
+    }
+    gl.glPopMatrix();
+    gl.glPopAttrib();
+  }
+  
+  private static void evaluateTeapotMesh(GL2 gl,
+                                         int grid,
+                                         int type,
+                                         int partNum,
+                                         boolean repairSingularities)
+  {
+    if (repairSingularities && (partNum == 5 || partNum == 3)) {
+      // Instead of using evaluators that give bad results at singularities,
+      // evaluate by hand
+      gl.glPolygonMode(GL2.GL_FRONT_AND_BACK, type);
+      for (int nv = 0; nv < grid; nv++) {
+        if (nv == 0) {
+          // Draw a small triangle-fan to fill the hole
+          gl.glDisable(GL2.GL_AUTO_NORMAL);
+          gl.glNormal3f(0, 0, partNum == 3 ? 1 : -1);
+          gl.glBegin(GL2.GL_TRIANGLE_FAN);
+          {
+            gl.glEvalCoord2f(0, 0);
+            // Note that we draw in clock-wise order to match the evaluator
+            // method
+            for (int nu = 0; nu <= grid; nu++)
+            {
+              gl.glEvalCoord2f(nu / (float)grid, (1f / grid) / (float)grid);
+            }
+          }
+          gl.glEnd();
+          gl.glEnable(GL2.GL_AUTO_NORMAL);
+        }
+        // Draw the rest of the piece as an evaluated quad-strip
+        gl.glBegin(GL2.GL_QUAD_STRIP);
+        {
+          // Note that we draw in clock-wise order to match the evaluator method
+          for (int nu = grid; nu >= 0; nu--) {
+            gl.glEvalCoord2f(nu / (float)grid, (nv + 1) / (float)grid);
+            gl.glEvalCoord2f(nu / (float)grid, Math.max(nv, 1f / grid)
+                                                         / (float)grid);
+          }
+        }
+        gl.glEnd();
+      }
+    } else {
+      gl.glEvalMesh2(type, 0, grid, 0, grid);
+    }
+  }
+
+  //----------------------------------------------------------------------
+  // Font implementation
+  //
+
+  private static void bitmapCharacterImpl(GL2 gl, int font, char cin) {
+    BitmapFontRec fontinfo = getBitmapFont(font);
+    int c = cin & 0xFFFF;
+    if (c < fontinfo.first ||
+        c >= fontinfo.first + fontinfo.num_chars)
+      return;
+    BitmapCharRec ch = fontinfo.ch[c - fontinfo.first];
+    if (ch != null) {
+      gl.glBitmap(ch.width, ch.height, ch.xorig, ch.yorig,
+                  ch.advance, 0, ch.bitmap, 0);
+    }
+  }
+
+  private static final BitmapFontRec[] bitmapFonts = new BitmapFontRec[9];
+  private static final StrokeFontRec[] strokeFonts = new StrokeFontRec[9];
+
+  private static BitmapFontRec getBitmapFont(int font) {
+    BitmapFontRec rec = bitmapFonts[font];
+    if (rec == null) {
+      switch (font) {
+        case BITMAP_9_BY_15:
+          rec = GLUTBitmap9x15.glutBitmap9By15;
+          break;
+        case BITMAP_8_BY_13:
+          rec = GLUTBitmap8x13.glutBitmap8By13;
+          break;
+        case BITMAP_TIMES_ROMAN_10:
+          rec = GLUTBitmapTimesRoman10.glutBitmapTimesRoman10;
+          break;
+        case BITMAP_TIMES_ROMAN_24:
+          rec = GLUTBitmapTimesRoman24.glutBitmapTimesRoman24;
+          break;
+        case BITMAP_HELVETICA_10:
+          rec = GLUTBitmapHelvetica10.glutBitmapHelvetica10;
+          break;
+        case BITMAP_HELVETICA_12:
+          rec = GLUTBitmapHelvetica12.glutBitmapHelvetica12;
+          break;
+        case BITMAP_HELVETICA_18:
+          rec = GLUTBitmapHelvetica18.glutBitmapHelvetica18;
+          break;
+        default:
+          throw new GLException("Unknown bitmap font number " + font);
+      }
+      bitmapFonts[font] = rec;
+    }
+    return rec;
+  }
+
+  private static StrokeFontRec getStrokeFont(int font) {
+    StrokeFontRec rec = strokeFonts[font];
+    if (rec == null) {
+      switch (font) {
+        case STROKE_ROMAN:
+          rec = GLUTStrokeRoman.glutStrokeRoman;
+          break;
+        case STROKE_MONO_ROMAN:
+          rec = GLUTStrokeMonoRoman.glutStrokeMonoRoman;
+          break;
+        default:
+          throw new GLException("Unknown stroke font number " + font);
+      }
+    }
+    return rec;
+  }
+
+  private static void beginBitmap(GL2 gl,
+                                  int[] swapbytes,
+                                  int[] lsbfirst,
+                                  int[] rowlength,
+                                  int[] skiprows,
+                                  int[] skippixels,
+                                  int[] alignment) {
+    gl.glGetIntegerv(GL2.GL_UNPACK_SWAP_BYTES, swapbytes, 0);
+    gl.glGetIntegerv(GL2.GL_UNPACK_LSB_FIRST, lsbfirst, 0);
+    gl.glGetIntegerv(GL2.GL_UNPACK_ROW_LENGTH, rowlength, 0);
+    gl.glGetIntegerv(GL2.GL_UNPACK_SKIP_ROWS, skiprows, 0);
+    gl.glGetIntegerv(GL2.GL_UNPACK_SKIP_PIXELS, skippixels, 0);
+    gl.glGetIntegerv(GL2.GL_UNPACK_ALIGNMENT, alignment, 0);
+    /* Little endian machines (DEC Alpha for example) could
+       benefit from setting GL_UNPACK_LSB_FIRST to GL_TRUE
+       instead of GL_FALSE, but this would require changing the
+       generated bitmaps too. */
+    gl.glPixelStorei(GL2.GL_UNPACK_SWAP_BYTES, GL2.GL_FALSE);
+    gl.glPixelStorei(GL2.GL_UNPACK_LSB_FIRST, GL2.GL_FALSE);
+    gl.glPixelStorei(GL2.GL_UNPACK_ROW_LENGTH, 0);
+    gl.glPixelStorei(GL2.GL_UNPACK_SKIP_ROWS, 0);
+    gl.glPixelStorei(GL2.GL_UNPACK_SKIP_PIXELS, 0);
+    gl.glPixelStorei(GL2.GL_UNPACK_ALIGNMENT, 1);
+  }
+
+  private static void endBitmap(GL2 gl,
+                                int[] swapbytes,
+                                int[] lsbfirst,
+                                int[] rowlength,
+                                int[] skiprows,
+                                int[] skippixels,
+                                int[] alignment) {
+    /* Restore saved modes. */
+    gl.glPixelStorei(GL2.GL_UNPACK_SWAP_BYTES, swapbytes[0]);
+    gl.glPixelStorei(GL2.GL_UNPACK_LSB_FIRST, lsbfirst[0]);
+    gl.glPixelStorei(GL2.GL_UNPACK_ROW_LENGTH, rowlength[0]);
+    gl.glPixelStorei(GL2.GL_UNPACK_SKIP_ROWS, skiprows[0]);
+    gl.glPixelStorei(GL2.GL_UNPACK_SKIP_PIXELS, skippixels[0]);
+    gl.glPixelStorei(GL2.GL_UNPACK_ALIGNMENT, alignment[0]);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap8x13.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap8x13.java
new file mode 100644
index 000000000..07ded652a
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap8x13.java
@@ -0,0 +1,2078 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+class GLUTBitmap8x13 {
+
+/* GENERATED FILE -- DO NOT MODIFY */
+
+
+static final BitmapCharRec ch0 = new BitmapCharRec(0,0,0,0,8,null);
+
+static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,8,null);
+
+static final BitmapCharRec ch127 = new BitmapCharRec(0,0,0,0,8,null);
+
+static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,8,null);
+
+/* char: 0xff */
+
+static final byte[] ch255data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x48,
+};
+
+static final BitmapCharRec ch255 = new BitmapCharRec(6,12,-1,2,8,ch255data);
+
+/* char: 0xfe */
+
+static final byte[] ch254data = {
+(byte) 0x80,(byte) 0x80,(byte) 0xb8,(byte) 0xc4,(byte) 0x84,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch254 = new BitmapCharRec(6,10,-1,2,8,ch254data);
+
+/* char: 0xfd */
+
+static final byte[] ch253data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch253 = new BitmapCharRec(6,12,-1,2,8,ch253data);
+
+/* char: 0xfc */
+
+static final byte[] ch252data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x48,
+};
+
+static final BitmapCharRec ch252 = new BitmapCharRec(6,10,-1,0,8,ch252data);
+
+/* char: 0xfb */
+
+static final byte[] ch251data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch251 = new BitmapCharRec(6,10,-1,0,8,ch251data);
+
+/* char: 0xfa */
+
+static final byte[] ch250data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch250 = new BitmapCharRec(6,10,-1,0,8,ch250data);
+
+/* char: 0xf9 */
+
+static final byte[] ch249data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch249 = new BitmapCharRec(6,10,-1,0,8,ch249data);
+
+/* char: 0xf8 */
+
+static final byte[] ch248data = {
+(byte) 0x80,(byte) 0x78,(byte) 0xc4,(byte) 0xa4,(byte) 0x94,(byte) 0x8c,(byte) 0x78,(byte) 0x4,
+};
+
+static final BitmapCharRec ch248 = new BitmapCharRec(6,8,-1,1,8,ch248data);
+
+/* char: 0xf7 */
+
+static final byte[] ch247data = {
+(byte) 0x20,(byte) 0x20,(byte) 0x0,(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch247 = new BitmapCharRec(5,7,-1,-1,8,ch247data);
+
+/* char: 0xf6 */
+
+static final byte[] ch246data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x48,
+};
+
+static final BitmapCharRec ch246 = new BitmapCharRec(6,10,-1,0,8,ch246data);
+
+/* char: 0xf5 */
+
+static final byte[] ch245data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch245 = new BitmapCharRec(6,10,-1,0,8,ch245data);
+
+/* char: 0xf4 */
+
+static final byte[] ch244data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch244 = new BitmapCharRec(6,10,-1,0,8,ch244data);
+
+/* char: 0xf3 */
+
+static final byte[] ch243data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch243 = new BitmapCharRec(6,10,-1,0,8,ch243data);
+
+/* char: 0xf2 */
+
+static final byte[] ch242data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch242 = new BitmapCharRec(6,10,-1,0,8,ch242data);
+
+/* char: 0xf1 */
+
+static final byte[] ch241data = {
+(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch241 = new BitmapCharRec(6,10,-1,0,8,ch241data);
+
+/* char: 0xf0 */
+
+static final byte[] ch240data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x8,(byte) 0x50,(byte) 0x30,(byte) 0x48,
+};
+
+static final BitmapCharRec ch240 = new BitmapCharRec(6,10,-1,0,8,ch240data);
+
+/* char: 0xef */
+
+static final byte[] ch239data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x50,
+};
+
+static final BitmapCharRec ch239 = new BitmapCharRec(5,10,-1,0,8,ch239data);
+
+/* char: 0xee */
+
+static final byte[] ch238data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch238 = new BitmapCharRec(5,10,-1,0,8,ch238data);
+
+/* char: 0xed */
+
+static final byte[] ch237data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch237 = new BitmapCharRec(5,10,-1,0,8,ch237data);
+
+/* char: 0xec */
+
+static final byte[] ch236data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch236 = new BitmapCharRec(5,10,-1,0,8,ch236data);
+
+/* char: 0xeb */
+
+static final byte[] ch235data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0xfc,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x48,
+};
+
+static final BitmapCharRec ch235 = new BitmapCharRec(6,10,-1,0,8,ch235data);
+
+/* char: 0xea */
+
+static final byte[] ch234data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0xfc,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch234 = new BitmapCharRec(6,10,-1,0,8,ch234data);
+
+/* char: 0xe9 */
+
+static final byte[] ch233data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0xfc,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch233 = new BitmapCharRec(6,10,-1,0,8,ch233data);
+
+/* char: 0xe8 */
+
+static final byte[] ch232data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0xfc,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch232 = new BitmapCharRec(6,10,-1,0,8,ch232data);
+
+/* char: 0xe7 */
+
+static final byte[] ch231data = {
+(byte) 0x20,(byte) 0x10,(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch231 = new BitmapCharRec(6,8,-1,2,8,ch231data);
+
+/* char: 0xe6 */
+
+static final byte[] ch230data = {
+(byte) 0x6c,(byte) 0x92,(byte) 0x90,(byte) 0x7c,(byte) 0x12,(byte) 0x6c,
+};
+
+static final BitmapCharRec ch230 = new BitmapCharRec(7,6,0,0,8,ch230data);
+
+/* char: 0xe5 */
+
+static final byte[] ch229data = {
+(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,(byte) 0x0,(byte) 0x30,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch229 = new BitmapCharRec(6,10,-1,0,8,ch229data);
+
+/* char: 0xe4 */
+
+static final byte[] ch228data = {
+(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x48,
+};
+
+static final BitmapCharRec ch228 = new BitmapCharRec(6,10,-1,0,8,ch228data);
+
+/* char: 0xe3 */
+
+static final byte[] ch227data = {
+(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch227 = new BitmapCharRec(6,10,-1,0,8,ch227data);
+
+/* char: 0xe2 */
+
+static final byte[] ch226data = {
+(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch226 = new BitmapCharRec(6,10,-1,0,8,ch226data);
+
+/* char: 0xe1 */
+
+static final byte[] ch225data = {
+(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch225 = new BitmapCharRec(6,10,-1,0,8,ch225data);
+
+/* char: 0xe0 */
+
+static final byte[] ch224data = {
+(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch224 = new BitmapCharRec(6,10,-1,0,8,ch224data);
+
+/* char: 0xdf */
+
+static final byte[] ch223data = {
+(byte) 0x80,(byte) 0xb8,(byte) 0xc4,(byte) 0x84,(byte) 0x84,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch223 = new BitmapCharRec(6,9,-1,1,8,ch223data);
+
+/* char: 0xde */
+
+static final byte[] ch222data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,(byte) 0x80,
+};
+
+static final BitmapCharRec ch222 = new BitmapCharRec(6,9,-1,0,8,ch222data);
+
+/* char: 0xdd */
+
+static final byte[] ch221data = {
+(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x50,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch221 = new BitmapCharRec(5,10,-1,0,8,ch221data);
+
+/* char: 0xdc */
+
+static final byte[] ch220data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x48,(byte) 0x48,
+};
+
+static final BitmapCharRec ch220 = new BitmapCharRec(6,10,-1,0,8,ch220data);
+
+/* char: 0xdb */
+
+static final byte[] ch219data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch219 = new BitmapCharRec(6,10,-1,0,8,ch219data);
+
+/* char: 0xda */
+
+static final byte[] ch218data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch218 = new BitmapCharRec(6,10,-1,0,8,ch218data);
+
+/* char: 0xd9 */
+
+static final byte[] ch217data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch217 = new BitmapCharRec(6,10,-1,0,8,ch217data);
+
+/* char: 0xd8 */
+
+static final byte[] ch216data = {
+(byte) 0x80,(byte) 0x78,(byte) 0xc4,(byte) 0xa4,(byte) 0xa4,(byte) 0xa4,(byte) 0x94,(byte) 0x94,(byte) 0x8c,(byte) 0x78,(byte) 0x4,
+};
+
+static final BitmapCharRec ch216 = new BitmapCharRec(6,11,-1,1,8,ch216data);
+
+/* char: 0xd7 */
+
+static final byte[] ch215data = {
+(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x30,(byte) 0x48,(byte) 0x84,
+};
+
+static final BitmapCharRec ch215 = new BitmapCharRec(6,6,-1,-1,8,ch215data);
+
+/* char: 0xd6 */
+
+static final byte[] ch214data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x28,(byte) 0x28,
+};
+
+static final BitmapCharRec ch214 = new BitmapCharRec(7,10,0,0,8,ch214data);
+
+/* char: 0xd5 */
+
+static final byte[] ch213data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x28,(byte) 0x14,
+};
+
+static final BitmapCharRec ch213 = new BitmapCharRec(7,10,0,0,8,ch213data);
+
+/* char: 0xd4 */
+
+static final byte[] ch212data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x24,(byte) 0x18,
+};
+
+static final BitmapCharRec ch212 = new BitmapCharRec(7,10,0,0,8,ch212data);
+
+/* char: 0xd3 */
+
+static final byte[] ch211data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch211 = new BitmapCharRec(7,10,0,0,8,ch211data);
+
+/* char: 0xd2 */
+
+static final byte[] ch210data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x8,(byte) 0x10,
+};
+
+static final BitmapCharRec ch210 = new BitmapCharRec(7,10,0,0,8,ch210data);
+
+/* char: 0xd1 */
+
+static final byte[] ch209data = {
+(byte) 0x82,(byte) 0x86,(byte) 0x8a,(byte) 0x92,(byte) 0xa2,(byte) 0xc2,(byte) 0x82,(byte) 0x0,(byte) 0x28,(byte) 0x14,
+};
+
+static final BitmapCharRec ch209 = new BitmapCharRec(7,10,0,0,8,ch209data);
+
+/* char: 0xd0 */
+
+static final byte[] ch208data = {
+(byte) 0xfc,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xe2,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch208 = new BitmapCharRec(7,9,0,0,8,ch208data);
+
+/* char: 0xcf */
+
+static final byte[] ch207data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x50,(byte) 0x50,
+};
+
+static final BitmapCharRec ch207 = new BitmapCharRec(5,10,-1,0,8,ch207data);
+
+/* char: 0xce */
+
+static final byte[] ch206data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch206 = new BitmapCharRec(5,10,-1,0,8,ch206data);
+
+/* char: 0xcd */
+
+static final byte[] ch205data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch205 = new BitmapCharRec(5,10,-1,0,8,ch205data);
+
+/* char: 0xcc */
+
+static final byte[] ch204data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch204 = new BitmapCharRec(5,10,-1,0,8,ch204data);
+
+/* char: 0xcb */
+
+static final byte[] ch203data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x48,(byte) 0x48,
+};
+
+static final BitmapCharRec ch203 = new BitmapCharRec(6,10,-1,0,8,ch203data);
+
+/* char: 0xca */
+
+static final byte[] ch202data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch202 = new BitmapCharRec(6,10,-1,0,8,ch202data);
+
+/* char: 0xc9 */
+
+static final byte[] ch201data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch201 = new BitmapCharRec(6,10,-1,0,8,ch201data);
+
+/* char: 0xc8 */
+
+static final byte[] ch200data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch200 = new BitmapCharRec(6,10,-1,0,8,ch200data);
+
+/* char: 0xc7 */
+
+static final byte[] ch199data = {
+(byte) 0x20,(byte) 0x10,(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch199 = new BitmapCharRec(6,11,-1,2,8,ch199data);
+
+/* char: 0xc6 */
+
+static final byte[] ch198data = {
+(byte) 0x9e,(byte) 0x90,(byte) 0x90,(byte) 0xf0,(byte) 0x9c,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x6e,
+};
+
+static final BitmapCharRec ch198 = new BitmapCharRec(7,9,0,0,8,ch198data);
+
+/* char: 0xc5 */
+
+static final byte[] ch197data = {
+(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x30,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch197 = new BitmapCharRec(6,10,-1,0,8,ch197data);
+
+/* char: 0xc4 */
+
+static final byte[] ch196data = {
+(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x0,(byte) 0x48,(byte) 0x48,
+};
+
+static final BitmapCharRec ch196 = new BitmapCharRec(6,10,-1,0,8,ch196data);
+
+/* char: 0xc3 */
+
+static final byte[] ch195data = {
+(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch195 = new BitmapCharRec(6,10,-1,0,8,ch195data);
+
+/* char: 0xc2 */
+
+static final byte[] ch194data = {
+(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x0,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch194 = new BitmapCharRec(6,10,-1,0,8,ch194data);
+
+/* char: 0xc1 */
+
+static final byte[] ch193data = {
+(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch193 = new BitmapCharRec(6,10,-1,0,8,ch193data);
+
+/* char: 0xc0 */
+
+static final byte[] ch192data = {
+(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch192 = new BitmapCharRec(6,10,-1,0,8,ch192data);
+
+/* char: 0xbf */
+
+static final byte[] ch191data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x0,(byte) 0x20,
+};
+
+static final BitmapCharRec ch191 = new BitmapCharRec(6,9,-1,0,8,ch191data);
+
+/* char: 0xbe */
+
+static final byte[] ch190data = {
+(byte) 0x6,(byte) 0x1a,(byte) 0x12,(byte) 0xa,(byte) 0x66,(byte) 0x92,(byte) 0x10,(byte) 0x20,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch190 = new BitmapCharRec(7,10,0,0,8,ch190data);
+
+/* char: 0xbd */
+
+static final byte[] ch189data = {
+(byte) 0x1e,(byte) 0x10,(byte) 0xc,(byte) 0x2,(byte) 0xf2,(byte) 0x4c,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch189 = new BitmapCharRec(7,10,0,0,8,ch189data);
+
+/* char: 0xbc */
+
+static final byte[] ch188data = {
+(byte) 0x6,(byte) 0x1a,(byte) 0x12,(byte) 0xa,(byte) 0xe6,(byte) 0x42,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch188 = new BitmapCharRec(7,10,0,0,8,ch188data);
+
+/* char: 0xbb */
+
+static final byte[] ch187data = {
+(byte) 0x90,(byte) 0x48,(byte) 0x24,(byte) 0x12,(byte) 0x24,(byte) 0x48,(byte) 0x90,
+};
+
+static final BitmapCharRec ch187 = new BitmapCharRec(7,7,0,-1,8,ch187data);
+
+/* char: 0xba */
+
+static final byte[] ch186data = {
+(byte) 0xf0,(byte) 0x0,(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch186 = new BitmapCharRec(4,6,-1,-3,8,ch186data);
+
+/* char: 0xb9 */
+
+static final byte[] ch185data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch185 = new BitmapCharRec(3,6,-1,-4,8,ch185data);
+
+/* char: 0xb8 */
+
+static final byte[] ch184data = {
+(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch184 = new BitmapCharRec(2,2,-3,2,8,ch184data);
+
+/* char: 0xb7 */
+
+static final byte[] ch183data = {
+(byte) 0xc0,
+};
+
+static final BitmapCharRec ch183 = new BitmapCharRec(2,1,-3,-4,8,ch183data);
+
+/* char: 0xb6 */
+
+static final byte[] ch182data = {
+(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x68,(byte) 0xe8,(byte) 0xe8,(byte) 0xe8,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch182 = new BitmapCharRec(6,9,-1,0,8,ch182data);
+
+/* char: 0xb5 */
+
+static final byte[] ch181data = {
+(byte) 0x80,(byte) 0xb4,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
+};
+
+static final BitmapCharRec ch181 = new BitmapCharRec(6,7,-1,1,8,ch181data);
+
+/* char: 0xb4 */
+
+static final byte[] ch180data = {
+(byte) 0x80,(byte) 0x40,
+};
+
+static final BitmapCharRec ch180 = new BitmapCharRec(2,2,-3,-8,8,ch180data);
+
+/* char: 0xb3 */
+
+static final byte[] ch179data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x10,(byte) 0x20,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch179 = new BitmapCharRec(4,6,-1,-4,8,ch179data);
+
+/* char: 0xb2 */
+
+static final byte[] ch178data = {
+(byte) 0xf0,(byte) 0x80,(byte) 0x60,(byte) 0x10,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch178 = new BitmapCharRec(4,6,-1,-4,8,ch178data);
+
+/* char: 0xb1 */
+
+static final byte[] ch177data = {
+(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch177 = new BitmapCharRec(5,7,-1,-1,8,ch177data);
+
+/* char: 0xb0 */
+
+static final byte[] ch176data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch176 = new BitmapCharRec(4,4,-2,-5,8,ch176data);
+
+/* char: 0xaf */
+
+static final byte[] ch175data = {
+(byte) 0xfc,
+};
+
+static final BitmapCharRec ch175 = new BitmapCharRec(6,1,-1,-8,8,ch175data);
+
+/* char: 0xae */
+
+static final byte[] ch174data = {
+(byte) 0x38,(byte) 0x44,(byte) 0xaa,(byte) 0xb2,(byte) 0xaa,(byte) 0xaa,(byte) 0x92,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch174 = new BitmapCharRec(7,9,0,-1,8,ch174data);
+
+/* char: 0xad */
+
+static final byte[] ch173data = {
+(byte) 0xfc,
+};
+
+static final BitmapCharRec ch173 = new BitmapCharRec(6,1,-1,-4,8,ch173data);
+
+/* char: 0xac */
+
+static final byte[] ch172data = {
+(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch172 = new BitmapCharRec(6,4,-1,-1,8,ch172data);
+
+/* char: 0xab */
+
+static final byte[] ch171data = {
+(byte) 0x12,(byte) 0x24,(byte) 0x48,(byte) 0x90,(byte) 0x48,(byte) 0x24,(byte) 0x12,
+};
+
+static final BitmapCharRec ch171 = new BitmapCharRec(7,7,0,-1,8,ch171data);
+
+/* char: 0xaa */
+
+static final byte[] ch170data = {
+(byte) 0xf8,(byte) 0x0,(byte) 0x78,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x70,
+};
+
+static final BitmapCharRec ch170 = new BitmapCharRec(5,7,-1,-2,8,ch170data);
+
+/* char: 0xa9 */
+
+static final byte[] ch169data = {
+(byte) 0x38,(byte) 0x44,(byte) 0x92,(byte) 0xaa,(byte) 0xa2,(byte) 0xaa,(byte) 0x92,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch169 = new BitmapCharRec(7,9,0,-1,8,ch169data);
+
+/* char: 0xa8 */
+
+static final byte[] ch168data = {
+(byte) 0xd8,
+};
+
+static final BitmapCharRec ch168 = new BitmapCharRec(5,1,-1,-8,8,ch168data);
+
+/* char: 0xa7 */
+
+static final byte[] ch167data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x10,(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x80,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch167 = new BitmapCharRec(4,10,-2,0,8,ch167data);
+
+/* char: 0xa6 */
+
+static final byte[] ch166data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch166 = new BitmapCharRec(1,9,-3,0,8,ch166data);
+
+/* char: 0xa5 */
+
+static final byte[] ch165data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x7c,(byte) 0x10,(byte) 0x7c,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch165 = new BitmapCharRec(7,9,0,0,8,ch165data);
+
+/* char: 0xa4 */
+
+static final byte[] ch164data = {
+(byte) 0x84,(byte) 0x78,(byte) 0x48,(byte) 0x48,(byte) 0x78,(byte) 0x84,
+};
+
+static final BitmapCharRec ch164 = new BitmapCharRec(6,6,-1,-1,8,ch164data);
+
+/* char: 0xa3 */
+
+static final byte[] ch163data = {
+(byte) 0xdc,(byte) 0x62,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x70,(byte) 0x20,(byte) 0x22,(byte) 0x1c,
+};
+
+static final BitmapCharRec ch163 = new BitmapCharRec(7,9,0,0,8,ch163data);
+
+/* char: 0xa2 */
+
+static final byte[] ch162data = {
+(byte) 0x20,(byte) 0x70,(byte) 0xa8,(byte) 0xa0,(byte) 0xa0,(byte) 0xa8,(byte) 0x70,(byte) 0x20,
+};
+
+static final BitmapCharRec ch162 = new BitmapCharRec(5,8,-1,-1,8,ch162data);
+
+/* char: 0xa1 */
+
+static final byte[] ch161data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch161 = new BitmapCharRec(1,9,-3,0,8,ch161data);
+
+/* char: 0x7e '~' */
+
+static final byte[] ch126data = {
+(byte) 0x90,(byte) 0xa8,(byte) 0x48,
+};
+
+static final BitmapCharRec ch126 = new BitmapCharRec(5,3,-1,-6,8,ch126data);
+
+/* char: 0x7d '}' */
+
+static final byte[] ch125data = {
+(byte) 0xe0,(byte) 0x10,(byte) 0x10,(byte) 0x20,(byte) 0x18,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch125 = new BitmapCharRec(5,9,-1,0,8,ch125data);
+
+/* char: 0x7c '|' */
+
+static final byte[] ch124data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch124 = new BitmapCharRec(1,9,-3,0,8,ch124data);
+
+/* char: 0x7b '{' */
+
+static final byte[] ch123data = {
+(byte) 0x38,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x38,
+};
+
+static final BitmapCharRec ch123 = new BitmapCharRec(5,9,-2,0,8,ch123data);
+
+/* char: 0x7a 'z' */
+
+static final byte[] ch122data = {
+(byte) 0xfc,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch122 = new BitmapCharRec(6,6,-1,0,8,ch122data);
+
+/* char: 0x79 'y' */
+
+static final byte[] ch121data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x84,
+};
+
+static final BitmapCharRec ch121 = new BitmapCharRec(6,8,-1,2,8,ch121data);
+
+/* char: 0x78 'x' */
+
+static final byte[] ch120data = {
+(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x30,(byte) 0x48,(byte) 0x84,
+};
+
+static final BitmapCharRec ch120 = new BitmapCharRec(6,6,-1,0,8,ch120data);
+
+/* char: 0x77 'w' */
+
+static final byte[] ch119data = {
+(byte) 0x44,(byte) 0xaa,(byte) 0x92,(byte) 0x92,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch119 = new BitmapCharRec(7,6,0,0,8,ch119data);
+
+/* char: 0x76 'v' */
+
+static final byte[] ch118data = {
+(byte) 0x20,(byte) 0x50,(byte) 0x50,(byte) 0x88,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch118 = new BitmapCharRec(5,6,-1,0,8,ch118data);
+
+/* char: 0x75 'u' */
+
+static final byte[] ch117data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch117 = new BitmapCharRec(6,6,-1,0,8,ch117data);
+
+/* char: 0x74 't' */
+
+static final byte[] ch116data = {
+(byte) 0x38,(byte) 0x44,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xf8,(byte) 0x40,(byte) 0x40,
+};
+
+static final BitmapCharRec ch116 = new BitmapCharRec(6,8,-1,0,8,ch116data);
+
+/* char: 0x73 's' */
+
+static final byte[] ch115data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x18,(byte) 0x60,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch115 = new BitmapCharRec(6,6,-1,0,8,ch115data);
+
+/* char: 0x72 'r' */
+
+static final byte[] ch114data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x44,(byte) 0xb8,
+};
+
+static final BitmapCharRec ch114 = new BitmapCharRec(6,6,-1,0,8,ch114data);
+
+/* char: 0x71 'q' */
+
+static final byte[] ch113data = {
+(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x8c,(byte) 0x74,
+};
+
+static final BitmapCharRec ch113 = new BitmapCharRec(6,8,-1,2,8,ch113data);
+
+/* char: 0x70 'p' */
+
+static final byte[] ch112data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xb8,(byte) 0xc4,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,
+};
+
+static final BitmapCharRec ch112 = new BitmapCharRec(6,8,-1,2,8,ch112data);
+
+/* char: 0x6f 'o' */
+
+static final byte[] ch111data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch111 = new BitmapCharRec(6,6,-1,0,8,ch111data);
+
+/* char: 0x6e 'n' */
+
+static final byte[] ch110data = {
+(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,
+};
+
+static final BitmapCharRec ch110 = new BitmapCharRec(6,6,-1,0,8,ch110data);
+
+/* char: 0x6d 'm' */
+
+static final byte[] ch109data = {
+(byte) 0x82,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0xec,
+};
+
+static final BitmapCharRec ch109 = new BitmapCharRec(7,6,0,0,8,ch109data);
+
+/* char: 0x6c 'l' */
+
+static final byte[] ch108data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x60,
+};
+
+static final BitmapCharRec ch108 = new BitmapCharRec(5,9,-1,0,8,ch108data);
+
+/* char: 0x6b 'k' */
+
+static final byte[] ch107data = {
+(byte) 0x84,(byte) 0x88,(byte) 0x90,(byte) 0xe0,(byte) 0x90,(byte) 0x88,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch107 = new BitmapCharRec(6,9,-1,0,8,ch107data);
+
+/* char: 0x6a 'j' */
+
+static final byte[] ch106data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x18,(byte) 0x0,(byte) 0x8,
+};
+
+static final BitmapCharRec ch106 = new BitmapCharRec(5,10,-1,2,8,ch106data);
+
+/* char: 0x69 'i' */
+
+static final byte[] ch105data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x60,(byte) 0x0,(byte) 0x20,
+};
+
+static final BitmapCharRec ch105 = new BitmapCharRec(5,8,-1,0,8,ch105data);
+
+/* char: 0x68 'h' */
+
+static final byte[] ch104data = {
+(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch104 = new BitmapCharRec(6,9,-1,0,8,ch104data);
+
+/* char: 0x67 'g' */
+
+static final byte[] ch103data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x78,(byte) 0x80,(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x74,
+};
+
+static final BitmapCharRec ch103 = new BitmapCharRec(6,8,-1,2,8,ch103data);
+
+/* char: 0x66 'f' */
+
+static final byte[] ch102data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xf8,(byte) 0x40,(byte) 0x40,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch102 = new BitmapCharRec(6,9,-1,0,8,ch102data);
+
+/* char: 0x65 'e' */
+
+static final byte[] ch101data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0xfc,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch101 = new BitmapCharRec(6,6,-1,0,8,ch101data);
+
+/* char: 0x64 'd' */
+
+static final byte[] ch100data = {
+(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x8c,(byte) 0x74,(byte) 0x4,(byte) 0x4,(byte) 0x4,
+};
+
+static final BitmapCharRec ch100 = new BitmapCharRec(6,9,-1,0,8,ch100data);
+
+/* char: 0x63 'c' */
+
+static final byte[] ch99data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch99 = new BitmapCharRec(6,6,-1,0,8,ch99data);
+
+/* char: 0x62 'b' */
+
+static final byte[] ch98data = {
+(byte) 0xb8,(byte) 0xc4,(byte) 0x84,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch98 = new BitmapCharRec(6,9,-1,0,8,ch98data);
+
+/* char: 0x61 'a' */
+
+static final byte[] ch97data = {
+(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,
+};
+
+static final BitmapCharRec ch97 = new BitmapCharRec(6,6,-1,0,8,ch97data);
+
+/* char: 0x60 '`' */
+
+static final byte[] ch96data = {
+(byte) 0x10,(byte) 0x60,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch96 = new BitmapCharRec(4,3,-2,-6,8,ch96data);
+
+/* char: 0x5f '_' */
+
+static final byte[] ch95data = {
+(byte) 0xfe,
+};
+
+static final BitmapCharRec ch95 = new BitmapCharRec(7,1,0,1,8,ch95data);
+
+/* char: 0x5e '^' */
+
+static final byte[] ch94data = {
+(byte) 0x88,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch94 = new BitmapCharRec(5,3,-1,-6,8,ch94data);
+
+/* char: 0x5d ']' */
+
+static final byte[] ch93data = {
+(byte) 0xf0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch93 = new BitmapCharRec(4,9,-1,0,8,ch93data);
+
+/* char: 0x5c '\' */
+
+static final byte[] ch92data = {
+(byte) 0x2,(byte) 0x2,(byte) 0x4,(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch92 = new BitmapCharRec(7,9,0,0,8,ch92data);
+
+/* char: 0x5b '[' */
+
+static final byte[] ch91data = {
+(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch91 = new BitmapCharRec(4,9,-2,0,8,ch91data);
+
+/* char: 0x5a 'Z' */
+
+static final byte[] ch90data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch90 = new BitmapCharRec(6,9,-1,0,8,ch90data);
+
+/* char: 0x59 'Y' */
+
+static final byte[] ch89data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch89 = new BitmapCharRec(7,9,0,0,8,ch89data);
+
+/* char: 0x58 'X' */
+
+static final byte[] ch88data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch88 = new BitmapCharRec(7,9,0,0,8,ch88data);
+
+/* char: 0x57 'W' */
+
+static final byte[] ch87data = {
+(byte) 0x44,(byte) 0xaa,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch87 = new BitmapCharRec(7,9,0,0,8,ch87data);
+
+/* char: 0x56 'V' */
+
+static final byte[] ch86data = {
+(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch86 = new BitmapCharRec(7,9,0,0,8,ch86data);
+
+/* char: 0x55 'U' */
+
+static final byte[] ch85data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
+};
+
+static final BitmapCharRec ch85 = new BitmapCharRec(6,9,-1,0,8,ch85data);
+
+/* char: 0x54 'T' */
+
+static final byte[] ch84data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch84 = new BitmapCharRec(7,9,0,0,8,ch84data);
+
+/* char: 0x53 'S' */
+
+static final byte[] ch83data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x4,(byte) 0x78,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch83 = new BitmapCharRec(6,9,-1,0,8,ch83data);
+
+/* char: 0x52 'R' */
+
+static final byte[] ch82data = {
+(byte) 0x84,(byte) 0x88,(byte) 0x90,(byte) 0xa0,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch82 = new BitmapCharRec(6,9,-1,0,8,ch82data);
+
+/* char: 0x51 'Q' */
+
+static final byte[] ch81data = {
+(byte) 0x4,(byte) 0x78,(byte) 0x94,(byte) 0xa4,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch81 = new BitmapCharRec(6,10,-1,1,8,ch81data);
+
+/* char: 0x50 'P' */
+
+static final byte[] ch80data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch80 = new BitmapCharRec(6,9,-1,0,8,ch80data);
+
+/* char: 0x4f 'O' */
+
+static final byte[] ch79data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch79 = new BitmapCharRec(6,9,-1,0,8,ch79data);
+
+/* char: 0x4e 'N' */
+
+static final byte[] ch78data = {
+(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x8c,(byte) 0x94,(byte) 0xa4,(byte) 0xc4,(byte) 0x84,(byte) 0x84,
+};
+
+static final BitmapCharRec ch78 = new BitmapCharRec(6,9,-1,0,8,ch78data);
+
+/* char: 0x4d 'M' */
+
+static final byte[] ch77data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x92,(byte) 0x92,(byte) 0xaa,(byte) 0xc6,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch77 = new BitmapCharRec(7,9,0,0,8,ch77data);
+
+/* char: 0x4c 'L' */
+
+static final byte[] ch76data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch76 = new BitmapCharRec(6,9,-1,0,8,ch76data);
+
+/* char: 0x4b 'K' */
+
+static final byte[] ch75data = {
+(byte) 0x84,(byte) 0x88,(byte) 0x90,(byte) 0xa0,(byte) 0xc0,(byte) 0xa0,(byte) 0x90,(byte) 0x88,(byte) 0x84,
+};
+
+static final BitmapCharRec ch75 = new BitmapCharRec(6,9,-1,0,8,ch75data);
+
+/* char: 0x4a 'J' */
+
+static final byte[] ch74data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch74 = new BitmapCharRec(6,9,-1,0,8,ch74data);
+
+/* char: 0x49 'I' */
+
+static final byte[] ch73data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch73 = new BitmapCharRec(5,9,-1,0,8,ch73data);
+
+/* char: 0x48 'H' */
+
+static final byte[] ch72data = {
+(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
+};
+
+static final BitmapCharRec ch72 = new BitmapCharRec(6,9,-1,0,8,ch72data);
+
+/* char: 0x47 'G' */
+
+static final byte[] ch71data = {
+(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x9c,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch71 = new BitmapCharRec(6,9,-1,0,8,ch71data);
+
+/* char: 0x46 'F' */
+
+static final byte[] ch70data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch70 = new BitmapCharRec(6,9,-1,0,8,ch70data);
+
+/* char: 0x45 'E' */
+
+static final byte[] ch69data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch69 = new BitmapCharRec(6,9,-1,0,8,ch69data);
+
+/* char: 0x44 'D' */
+
+static final byte[] ch68data = {
+(byte) 0xfc,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch68 = new BitmapCharRec(7,9,0,0,8,ch68data);
+
+/* char: 0x43 'C' */
+
+static final byte[] ch67data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch67 = new BitmapCharRec(6,9,-1,0,8,ch67data);
+
+/* char: 0x42 'B' */
+
+static final byte[] ch66data = {
+(byte) 0xfc,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x7c,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch66 = new BitmapCharRec(7,9,0,0,8,ch66data);
+
+/* char: 0x41 'A' */
+
+static final byte[] ch65data = {
+(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch65 = new BitmapCharRec(6,9,-1,0,8,ch65data);
+
+/* char: 0x40 '@' */
+
+static final byte[] ch64data = {
+(byte) 0x78,(byte) 0x80,(byte) 0x94,(byte) 0xac,(byte) 0xa4,(byte) 0x9c,(byte) 0x84,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch64 = new BitmapCharRec(6,9,-1,0,8,ch64data);
+
+/* char: 0x3f '?' */
+
+static final byte[] ch63data = {
+(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x84,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch63 = new BitmapCharRec(6,9,-1,0,8,ch63data);
+
+/* char: 0x3e '>' */
+
+static final byte[] ch62data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch62 = new BitmapCharRec(5,9,-1,0,8,ch62data);
+
+/* char: 0x3d '=' */
+
+static final byte[] ch61data = {
+(byte) 0xfc,(byte) 0x0,(byte) 0x0,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch61 = new BitmapCharRec(6,4,-1,-2,8,ch61data);
+
+/* char: 0x3c '<' */
+
+static final byte[] ch60data = {
+(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch60 = new BitmapCharRec(5,9,-2,0,8,ch60data);
+
+/* char: 0x3b ';' */
+
+static final byte[] ch59data = {
+(byte) 0x80,(byte) 0x60,(byte) 0x70,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x70,(byte) 0x20,
+};
+
+static final BitmapCharRec ch59 = new BitmapCharRec(4,8,-1,1,8,ch59data);
+
+/* char: 0x3a ':' */
+
+static final byte[] ch58data = {
+(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x0,(byte) 0x0,(byte) 0x40,(byte) 0xe0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch58 = new BitmapCharRec(3,8,-2,1,8,ch58data);
+
+/* char: 0x39 '9' */
+
+static final byte[] ch57data = {
+(byte) 0x70,(byte) 0x8,(byte) 0x4,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch57 = new BitmapCharRec(6,9,-1,0,8,ch57data);
+
+/* char: 0x38 '8' */
+
+static final byte[] ch56data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch56 = new BitmapCharRec(6,9,-1,0,8,ch56data);
+
+/* char: 0x37 '7' */
+
+static final byte[] ch55data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch55 = new BitmapCharRec(6,9,-1,0,8,ch55data);
+
+/* char: 0x36 '6' */
+
+static final byte[] ch54data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x38,
+};
+
+static final BitmapCharRec ch54 = new BitmapCharRec(6,9,-1,0,8,ch54data);
+
+/* char: 0x35 '5' */
+
+static final byte[] ch53data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x4,(byte) 0xc4,(byte) 0xb8,(byte) 0x80,(byte) 0x80,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch53 = new BitmapCharRec(6,9,-1,0,8,ch53data);
+
+/* char: 0x34 '4' */
+
+static final byte[] ch52data = {
+(byte) 0x8,(byte) 0x8,(byte) 0xfc,(byte) 0x88,(byte) 0x88,(byte) 0x48,(byte) 0x28,(byte) 0x18,(byte) 0x8,
+};
+
+static final BitmapCharRec ch52 = new BitmapCharRec(6,9,-1,0,8,ch52data);
+
+/* char: 0x33 '3' */
+
+static final byte[] ch51data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x4,(byte) 0x38,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch51 = new BitmapCharRec(6,9,-1,0,8,ch51data);
+
+/* char: 0x32 '2' */
+
+static final byte[] ch50data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x40,(byte) 0x30,(byte) 0x8,(byte) 0x4,(byte) 0x84,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch50 = new BitmapCharRec(6,9,-1,0,8,ch50data);
+
+/* char: 0x31 '1' */
+
+static final byte[] ch49data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xa0,(byte) 0x60,(byte) 0x20,
+};
+
+static final BitmapCharRec ch49 = new BitmapCharRec(5,9,-1,0,8,ch49data);
+
+/* char: 0x30 '0' */
+
+static final byte[] ch48data = {
+(byte) 0x30,(byte) 0x48,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch48 = new BitmapCharRec(6,9,-1,0,8,ch48data);
+
+/* char: 0x2f '/' */
+
+static final byte[] ch47data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0x2,
+};
+
+static final BitmapCharRec ch47 = new BitmapCharRec(7,9,0,0,8,ch47data);
+
+/* char: 0x2e '.' */
+
+static final byte[] ch46data = {
+(byte) 0x40,(byte) 0xe0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch46 = new BitmapCharRec(3,3,-2,1,8,ch46data);
+
+/* char: 0x2d '-' */
+
+static final byte[] ch45data = {
+(byte) 0xfc,
+};
+
+static final BitmapCharRec ch45 = new BitmapCharRec(6,1,-1,-4,8,ch45data);
+
+/* char: 0x2c ',' */
+
+static final byte[] ch44data = {
+(byte) 0x80,(byte) 0x60,(byte) 0x70,
+};
+
+static final BitmapCharRec ch44 = new BitmapCharRec(4,3,-1,1,8,ch44data);
+
+/* char: 0x2b '+' */
+
+static final byte[] ch43data = {
+(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch43 = new BitmapCharRec(5,5,-1,-2,8,ch43data);
+
+/* char: 0x2a '*' */
+
+static final byte[] ch42data = {
+(byte) 0x48,(byte) 0x30,(byte) 0xfc,(byte) 0x30,(byte) 0x48,
+};
+
+static final BitmapCharRec ch42 = new BitmapCharRec(6,5,-1,-2,8,ch42data);
+
+/* char: 0x29 ')' */
+
+static final byte[] ch41data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch41 = new BitmapCharRec(3,9,-2,0,8,ch41data);
+
+/* char: 0x28 '(' */
+
+static final byte[] ch40data = {
+(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch40 = new BitmapCharRec(3,9,-3,0,8,ch40data);
+
+/* char: 0x27 ''' */
+
+static final byte[] ch39data = {
+(byte) 0x80,(byte) 0x60,(byte) 0x70,
+};
+
+static final BitmapCharRec ch39 = new BitmapCharRec(4,3,-1,-6,8,ch39data);
+
+/* char: 0x26 '&' */
+
+static final byte[] ch38data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x94,(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch38 = new BitmapCharRec(6,7,-1,0,8,ch38data);
+
+/* char: 0x25 '%' */
+
+static final byte[] ch37data = {
+(byte) 0x88,(byte) 0x54,(byte) 0x48,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x48,(byte) 0xa4,(byte) 0x44,
+};
+
+static final BitmapCharRec ch37 = new BitmapCharRec(6,9,-1,0,8,ch37data);
+
+/* char: 0x24 '$' */
+
+static final byte[] ch36data = {
+(byte) 0x20,(byte) 0xf0,(byte) 0x28,(byte) 0x70,(byte) 0xa0,(byte) 0x78,(byte) 0x20,
+};
+
+static final BitmapCharRec ch36 = new BitmapCharRec(5,7,-1,-1,8,ch36data);
+
+/* char: 0x23 '#' */
+
+static final byte[] ch35data = {
+(byte) 0x48,(byte) 0x48,(byte) 0xfc,(byte) 0x48,(byte) 0xfc,(byte) 0x48,(byte) 0x48,
+};
+
+static final BitmapCharRec ch35 = new BitmapCharRec(6,7,-1,-1,8,ch35data);
+
+/* char: 0x22 '"' */
+
+static final byte[] ch34data = {
+(byte) 0x90,(byte) 0x90,(byte) 0x90,
+};
+
+static final BitmapCharRec ch34 = new BitmapCharRec(4,3,-2,-6,8,ch34data);
+
+/* char: 0x21 '!' */
+
+static final byte[] ch33data = {
+(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch33 = new BitmapCharRec(1,9,-3,0,8,ch33data);
+
+/* char: 0x1f */
+
+static final byte[] ch31data = {
+(byte) 0x80,
+};
+
+static final BitmapCharRec ch31 = new BitmapCharRec(1,1,-3,-3,8,ch31data);
+
+/* char: 0x1e */
+
+static final byte[] ch30data = {
+(byte) 0xdc,(byte) 0x62,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x70,(byte) 0x20,(byte) 0x22,(byte) 0x1c,
+};
+
+static final BitmapCharRec ch30 = new BitmapCharRec(7,9,0,0,8,ch30data);
+
+/* char: 0x1d */
+
+static final byte[] ch29data = {
+(byte) 0x80,(byte) 0x40,(byte) 0xfe,(byte) 0x10,(byte) 0xfe,(byte) 0x4,(byte) 0x2,
+};
+
+static final BitmapCharRec ch29 = new BitmapCharRec(7,7,0,0,8,ch29data);
+
+/* char: 0x1c */
+
+static final byte[] ch28data = {
+(byte) 0x88,(byte) 0x48,(byte) 0x48,(byte) 0x48,(byte) 0x48,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch28 = new BitmapCharRec(6,6,-1,0,8,ch28data);
+
+/* char: 0x1b */
+
+static final byte[] ch27data = {
+(byte) 0xfe,(byte) 0x80,(byte) 0x20,(byte) 0x8,(byte) 0x2,(byte) 0x8,(byte) 0x20,(byte) 0x80,
+};
+
+static final BitmapCharRec ch27 = new BitmapCharRec(7,8,0,0,8,ch27data);
+
+/* char: 0x1a */
+
+static final byte[] ch26data = {
+(byte) 0xfe,(byte) 0x2,(byte) 0x8,(byte) 0x20,(byte) 0x80,(byte) 0x20,(byte) 0x8,(byte) 0x2,
+};
+
+static final BitmapCharRec ch26 = new BitmapCharRec(7,8,0,0,8,ch26data);
+
+/* char: 0x19 */
+
+static final byte[] ch25data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch25 = new BitmapCharRec(1,13,-3,2,8,ch25data);
+
+/* char: 0x18 */
+
+static final byte[] ch24data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xff,
+};
+
+static final BitmapCharRec ch24 = new BitmapCharRec(8,6,0,2,8,ch24data);
+
+/* char: 0x17 */
+
+static final byte[] ch23data = {
+(byte) 0xff,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,
+};
+
+static final BitmapCharRec ch23 = new BitmapCharRec(8,8,0,-3,8,ch23data);
+
+/* char: 0x16 */
+
+static final byte[] ch22data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xf0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,
+};
+
+static final BitmapCharRec ch22 = new BitmapCharRec(4,13,0,2,8,ch22data);
+
+/* char: 0x15 */
+
+static final byte[] ch21data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch21 = new BitmapCharRec(5,13,-3,2,8,ch21data);
+
+/* char: 0x14 */
+
+static final byte[] ch20data = {
+(byte) 0xff,
+};
+
+static final BitmapCharRec ch20 = new BitmapCharRec(8,1,0,1,8,ch20data);
+
+/* char: 0x13 */
+
+static final byte[] ch19data = {
+(byte) 0xff,
+};
+
+static final BitmapCharRec ch19 = new BitmapCharRec(8,1,0,-1,8,ch19data);
+
+/* char: 0x12 */
+
+static final byte[] ch18data = {
+(byte) 0xff,
+};
+
+static final BitmapCharRec ch18 = new BitmapCharRec(8,1,0,-3,8,ch18data);
+
+/* char: 0x11 */
+
+static final byte[] ch17data = {
+(byte) 0xff,
+};
+
+static final BitmapCharRec ch17 = new BitmapCharRec(8,1,0,-5,8,ch17data);
+
+/* char: 0x10 */
+
+static final byte[] ch16data = {
+(byte) 0xff,
+};
+
+static final BitmapCharRec ch16 = new BitmapCharRec(8,1,0,-7,8,ch16data);
+
+/* char: 0xf */
+
+static final byte[] ch15data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xff,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,
+};
+
+static final BitmapCharRec ch15 = new BitmapCharRec(8,13,0,2,8,ch15data);
+
+/* char: 0xe */
+
+static final byte[] ch14data = {
+(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch14 = new BitmapCharRec(5,8,-3,-3,8,ch14data);
+
+/* char: 0xd */
+
+static final byte[] ch13data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch13 = new BitmapCharRec(5,6,-3,2,8,ch13data);
+
+/* char: 0xc */
+
+static final byte[] ch12data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch12 = new BitmapCharRec(4,6,0,2,8,ch12data);
+
+/* char: 0xb */
+
+static final byte[] ch11data = {
+(byte) 0xf0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,
+};
+
+static final BitmapCharRec ch11 = new BitmapCharRec(4,8,0,-3,8,ch11data);
+
+/* char: 0xa */
+
+static final byte[] ch10data = {
+(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x3e,(byte) 0x20,(byte) 0x50,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch10 = new BitmapCharRec(7,9,0,2,8,ch10data);
+
+/* char: 0x9 */
+
+static final byte[] ch9data = {
+(byte) 0x3e,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x88,(byte) 0x98,(byte) 0xa8,(byte) 0xc8,(byte) 0x88,
+};
+
+static final BitmapCharRec ch9 = new BitmapCharRec(7,9,0,2,8,ch9data);
+
+/* char: 0x8 */
+
+static final byte[] ch8data = {
+(byte) 0xfe,(byte) 0x10,(byte) 0x10,(byte) 0xfe,(byte) 0x10,(byte) 0x10,
+};
+
+static final BitmapCharRec ch8 = new BitmapCharRec(7,6,0,0,8,ch8data);
+
+/* char: 0x7 */
+
+static final byte[] ch7data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch7 = new BitmapCharRec(5,4,-1,-5,8,ch7data);
+
+/* char: 0x6 */
+
+static final byte[] ch6data = {
+(byte) 0x20,(byte) 0x20,(byte) 0x3c,(byte) 0x20,(byte) 0x3e,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch6 = new BitmapCharRec(7,9,0,2,8,ch6data);
+
+/* char: 0x5 */
+
+static final byte[] ch5data = {
+(byte) 0x22,(byte) 0x22,(byte) 0x3c,(byte) 0x22,(byte) 0x3c,(byte) 0x78,(byte) 0x80,(byte) 0x80,(byte) 0x78,
+};
+
+static final BitmapCharRec ch5 = new BitmapCharRec(7,9,0,2,8,ch5data);
+
+/* char: 0x4 */
+
+static final byte[] ch4data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x1c,(byte) 0x10,(byte) 0x9e,(byte) 0x80,(byte) 0xe0,(byte) 0x80,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch4 = new BitmapCharRec(7,9,0,2,8,ch4data);
+
+/* char: 0x3 */
+
+static final byte[] ch3data = {
+(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x3e,(byte) 0x88,(byte) 0x88,(byte) 0xf8,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch3 = new BitmapCharRec(7,9,0,2,8,ch3data);
+
+/* char: 0x2 */
+
+static final byte[] ch2data = {
+(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,
+};
+
+static final BitmapCharRec ch2 = new BitmapCharRec(8,12,0,2,8,ch2data);
+
+/* char: 0x1 */
+
+static final byte[] ch1data = {
+(byte) 0x10,(byte) 0x38,(byte) 0x7c,(byte) 0xfe,(byte) 0x7c,(byte) 0x38,(byte) 0x10,
+};
+
+static final BitmapCharRec ch1 = new BitmapCharRec(7,7,0,-1,8,ch1data);
+
+static final BitmapCharRec[] chars = {
+ch0,
+ch1,
+ch2,
+ch3,
+ch4,
+ch5,
+ch6,
+ch7,
+ch8,
+ch9,
+ch10,
+ch11,
+ch12,
+ch13,
+ch14,
+ch15,
+ch16,
+ch17,
+ch18,
+ch19,
+ch20,
+ch21,
+ch22,
+ch23,
+ch24,
+ch25,
+ch26,
+ch27,
+ch28,
+ch29,
+ch30,
+ch31,
+ch32,
+ch33,
+ch34,
+ch35,
+ch36,
+ch37,
+ch38,
+ch39,
+ch40,
+ch41,
+ch42,
+ch43,
+ch44,
+ch45,
+ch46,
+ch47,
+ch48,
+ch49,
+ch50,
+ch51,
+ch52,
+ch53,
+ch54,
+ch55,
+ch56,
+ch57,
+ch58,
+ch59,
+ch60,
+ch61,
+ch62,
+ch63,
+ch64,
+ch65,
+ch66,
+ch67,
+ch68,
+ch69,
+ch70,
+ch71,
+ch72,
+ch73,
+ch74,
+ch75,
+ch76,
+ch77,
+ch78,
+ch79,
+ch80,
+ch81,
+ch82,
+ch83,
+ch84,
+ch85,
+ch86,
+ch87,
+ch88,
+ch89,
+ch90,
+ch91,
+ch92,
+ch93,
+ch94,
+ch95,
+ch96,
+ch97,
+ch98,
+ch99,
+ch100,
+ch101,
+ch102,
+ch103,
+ch104,
+ch105,
+ch106,
+ch107,
+ch108,
+ch109,
+ch110,
+ch111,
+ch112,
+ch113,
+ch114,
+ch115,
+ch116,
+ch117,
+ch118,
+ch119,
+ch120,
+ch121,
+ch122,
+ch123,
+ch124,
+ch125,
+ch126,
+ch127,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+ch160,
+ch161,
+ch162,
+ch163,
+ch164,
+ch165,
+ch166,
+ch167,
+ch168,
+ch169,
+ch170,
+ch171,
+ch172,
+ch173,
+ch174,
+ch175,
+ch176,
+ch177,
+ch178,
+ch179,
+ch180,
+ch181,
+ch182,
+ch183,
+ch184,
+ch185,
+ch186,
+ch187,
+ch188,
+ch189,
+ch190,
+ch191,
+ch192,
+ch193,
+ch194,
+ch195,
+ch196,
+ch197,
+ch198,
+ch199,
+ch200,
+ch201,
+ch202,
+ch203,
+ch204,
+ch205,
+ch206,
+ch207,
+ch208,
+ch209,
+ch210,
+ch211,
+ch212,
+ch213,
+ch214,
+ch215,
+ch216,
+ch217,
+ch218,
+ch219,
+ch220,
+ch221,
+ch222,
+ch223,
+ch224,
+ch225,
+ch226,
+ch227,
+ch228,
+ch229,
+ch230,
+ch231,
+ch232,
+ch233,
+ch234,
+ch235,
+ch236,
+ch237,
+ch238,
+ch239,
+ch240,
+ch241,
+ch242,
+ch243,
+ch244,
+ch245,
+ch246,
+ch247,
+ch248,
+ch249,
+ch250,
+ch251,
+ch252,
+ch253,
+ch254,
+ch255,
+};
+
+  public static final BitmapFontRec glutBitmap8By13 = new BitmapFontRec("-misc-fixed-medium-r-normal--13-120-75-75-C-80-iso8859-1",
+                                                                 256,
+                                                                 0,
+                                                                 chars);
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap9x15.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap9x15.java
new file mode 100644
index 000000000..5d357f3f7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap9x15.java
@@ -0,0 +1,2079 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+class GLUTBitmap9x15 {
+
+/* GENERATED FILE -- DO NOT MODIFY */
+
+static final BitmapCharRec ch0 = new BitmapCharRec(0,0,0,0,9,null);
+
+static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,9,null);
+
+static final BitmapCharRec ch127 = new BitmapCharRec(0,0,0,0,9,null);
+
+static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,9,null);
+
+/* char: 0xff */
+
+static final byte[] ch255data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x28,(byte) 0x28,
+};
+
+static final BitmapCharRec ch255 = new BitmapCharRec(6,14,-1,3,9,ch255data);
+
+/* char: 0xfe */
+
+static final byte[] ch254data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xbc,(byte) 0xc2,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch254 = new BitmapCharRec(7,12,-1,3,9,ch254data);
+
+/* char: 0xfd */
+
+static final byte[] ch253data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x8,
+};
+
+static final BitmapCharRec ch253 = new BitmapCharRec(6,14,-1,3,9,ch253data);
+
+/* char: 0xfc */
+
+static final byte[] ch252data = {
+(byte) 0x7a,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x28,(byte) 0x28,
+};
+
+static final BitmapCharRec ch252 = new BitmapCharRec(7,11,-1,0,9,ch252data);
+
+/* char: 0xfb */
+
+static final byte[] ch251data = {
+(byte) 0x7a,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch251 = new BitmapCharRec(7,11,-1,0,9,ch251data);
+
+/* char: 0xfa */
+
+static final byte[] ch250data = {
+(byte) 0x7a,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x8,
+};
+
+static final BitmapCharRec ch250 = new BitmapCharRec(7,11,-1,0,9,ch250data);
+
+/* char: 0xf9 */
+
+static final byte[] ch249data = {
+(byte) 0x7a,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x18,(byte) 0x20,
+};
+
+static final BitmapCharRec ch249 = new BitmapCharRec(7,11,-1,0,9,ch249data);
+
+/* char: 0xf8 */
+
+static final byte[] ch248data = {
+(byte) 0x80,(byte) 0x7c,(byte) 0xa2,(byte) 0xa2,(byte) 0x92,(byte) 0x8a,(byte) 0x8a,(byte) 0x7c,(byte) 0x2,
+};
+
+static final BitmapCharRec ch248 = new BitmapCharRec(7,9,-1,1,9,ch248data);
+
+/* char: 0xf7 */
+
+static final byte[] ch247data = {
+(byte) 0x10,(byte) 0x38,(byte) 0x10,(byte) 0x0,(byte) 0xfe,(byte) 0x0,(byte) 0x10,(byte) 0x38,(byte) 0x10,
+};
+
+static final BitmapCharRec ch247 = new BitmapCharRec(7,9,-1,0,9,ch247data);
+
+/* char: 0xf6 */
+
+static final byte[] ch246data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x28,(byte) 0x28,
+};
+
+static final BitmapCharRec ch246 = new BitmapCharRec(7,11,-1,0,9,ch246data);
+
+/* char: 0xf5 */
+
+static final byte[] ch245data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch245 = new BitmapCharRec(7,11,-1,0,9,ch245data);
+
+/* char: 0xf4 */
+
+static final byte[] ch244data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch244 = new BitmapCharRec(7,11,-1,0,9,ch244data);
+
+/* char: 0xf3 */
+
+static final byte[] ch243data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x8,
+};
+
+static final BitmapCharRec ch243 = new BitmapCharRec(7,11,-1,0,9,ch243data);
+
+/* char: 0xf2 */
+
+static final byte[] ch242data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x18,(byte) 0x20,
+};
+
+static final BitmapCharRec ch242 = new BitmapCharRec(7,11,-1,0,9,ch242data);
+
+/* char: 0xf1 */
+
+static final byte[] ch241data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch241 = new BitmapCharRec(7,11,-1,0,9,ch241data);
+
+/* char: 0xf0 */
+
+static final byte[] ch240data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x8,(byte) 0x50,(byte) 0x30,(byte) 0x48,
+};
+
+static final BitmapCharRec ch240 = new BitmapCharRec(7,11,-1,0,9,ch240data);
+
+/* char: 0xef */
+
+static final byte[] ch239data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x50,
+};
+
+static final BitmapCharRec ch239 = new BitmapCharRec(5,11,-2,0,9,ch239data);
+
+/* char: 0xee */
+
+static final byte[] ch238data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch238 = new BitmapCharRec(5,11,-2,0,9,ch238data);
+
+/* char: 0xed */
+
+static final byte[] ch237data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x60,(byte) 0x10,
+};
+
+static final BitmapCharRec ch237 = new BitmapCharRec(5,11,-2,0,9,ch237data);
+
+/* char: 0xec */
+
+static final byte[] ch236data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x40,
+};
+
+static final BitmapCharRec ch236 = new BitmapCharRec(5,11,-2,0,9,ch236data);
+
+/* char: 0xeb */
+
+static final byte[] ch235data = {
+(byte) 0x7c,(byte) 0x80,(byte) 0x80,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x28,(byte) 0x28,
+};
+
+static final BitmapCharRec ch235 = new BitmapCharRec(7,11,-1,0,9,ch235data);
+
+/* char: 0xea */
+
+static final byte[] ch234data = {
+(byte) 0x7c,(byte) 0x80,(byte) 0x80,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch234 = new BitmapCharRec(7,11,-1,0,9,ch234data);
+
+/* char: 0xe9 */
+
+static final byte[] ch233data = {
+(byte) 0x7c,(byte) 0x80,(byte) 0x80,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x8,
+};
+
+static final BitmapCharRec ch233 = new BitmapCharRec(7,11,-1,0,9,ch233data);
+
+/* char: 0xe8 */
+
+static final byte[] ch232data = {
+(byte) 0x7c,(byte) 0x80,(byte) 0x80,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x18,(byte) 0x20,
+};
+
+static final BitmapCharRec ch232 = new BitmapCharRec(7,11,-1,0,9,ch232data);
+
+/* char: 0xe7 */
+
+static final byte[] ch231data = {
+(byte) 0x30,(byte) 0x48,(byte) 0x18,(byte) 0x7c,(byte) 0x82,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch231 = new BitmapCharRec(7,10,-1,3,9,ch231data);
+
+/* char: 0xe6 */
+
+static final byte[] ch230data = {
+(byte) 0x6e,(byte) 0x92,(byte) 0x90,(byte) 0x7c,(byte) 0x12,(byte) 0x92,(byte) 0x6c,
+};
+
+static final BitmapCharRec ch230 = new BitmapCharRec(7,7,-1,0,9,ch230data);
+
+/* char: 0xe5 */
+
+static final byte[] ch229data = {
+(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,(byte) 0x0,(byte) 0x18,(byte) 0x24,(byte) 0x18,
+};
+
+static final BitmapCharRec ch229 = new BitmapCharRec(7,11,-1,0,9,ch229data);
+
+/* char: 0xe4 */
+
+static final byte[] ch228data = {
+(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x28,(byte) 0x28,
+};
+
+static final BitmapCharRec ch228 = new BitmapCharRec(7,11,-1,0,9,ch228data);
+
+/* char: 0xe3 */
+
+static final byte[] ch227data = {
+(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch227 = new BitmapCharRec(7,11,-1,0,9,ch227data);
+
+/* char: 0xe2 */
+
+static final byte[] ch226data = {
+(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch226 = new BitmapCharRec(7,11,-1,0,9,ch226data);
+
+/* char: 0xe1 */
+
+static final byte[] ch225data = {
+(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x8,
+};
+
+static final BitmapCharRec ch225 = new BitmapCharRec(7,11,-1,0,9,ch225data);
+
+/* char: 0xe0 */
+
+static final byte[] ch224data = {
+(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x18,(byte) 0x20,
+};
+
+static final BitmapCharRec ch224 = new BitmapCharRec(7,11,-1,0,9,ch224data);
+
+/* char: 0xdf */
+
+static final byte[] ch223data = {
+(byte) 0x80,(byte) 0xbc,(byte) 0xc2,(byte) 0x82,(byte) 0x82,(byte) 0xfc,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch223 = new BitmapCharRec(7,9,-1,1,9,ch223data);
+
+/* char: 0xde */
+
+static final byte[] ch222data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfc,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch222 = new BitmapCharRec(7,10,-1,0,9,ch222data);
+
+/* char: 0xdd */
+
+static final byte[] ch221data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,(byte) 0x0,(byte) 0x30,(byte) 0x8,
+};
+
+static final BitmapCharRec ch221 = new BitmapCharRec(7,11,-1,0,9,ch221data);
+
+/* char: 0xdc */
+
+static final byte[] ch220data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x0,(byte) 0x28,(byte) 0x28,
+};
+
+static final BitmapCharRec ch220 = new BitmapCharRec(7,11,-1,0,9,ch220data);
+
+/* char: 0xdb */
+
+static final byte[] ch219data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x0,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch219 = new BitmapCharRec(7,11,-1,0,9,ch219data);
+
+/* char: 0xda */
+
+static final byte[] ch218data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x0,(byte) 0x30,(byte) 0x8,
+};
+
+static final BitmapCharRec ch218 = new BitmapCharRec(7,11,-1,0,9,ch218data);
+
+/* char: 0xd9 */
+
+static final byte[] ch217data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x0,(byte) 0x18,(byte) 0x20,
+};
+
+static final BitmapCharRec ch217 = new BitmapCharRec(7,11,-1,0,9,ch217data);
+
+/* char: 0xd8 */
+
+static final byte[] ch216data = {
+(byte) 0x80,(byte) 0x7c,(byte) 0xc2,(byte) 0xa2,(byte) 0xa2,(byte) 0x92,(byte) 0x92,(byte) 0x8a,(byte) 0x8a,(byte) 0x86,(byte) 0x7c,(byte) 0x2,
+};
+
+static final BitmapCharRec ch216 = new BitmapCharRec(7,12,-1,1,9,ch216data);
+
+/* char: 0xd7 */
+
+static final byte[] ch215data = {
+(byte) 0x82,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,
+};
+
+static final BitmapCharRec ch215 = new BitmapCharRec(7,7,-1,-1,9,ch215data);
+
+/* char: 0xd6 */
+
+static final byte[] ch214data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x28,(byte) 0x28,
+};
+
+static final BitmapCharRec ch214 = new BitmapCharRec(7,11,-1,0,9,ch214data);
+
+/* char: 0xd5 */
+
+static final byte[] ch213data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch213 = new BitmapCharRec(7,11,-1,0,9,ch213data);
+
+/* char: 0xd4 */
+
+static final byte[] ch212data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch212 = new BitmapCharRec(7,11,-1,0,9,ch212data);
+
+/* char: 0xd3 */
+
+static final byte[] ch211data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x30,(byte) 0x8,
+};
+
+static final BitmapCharRec ch211 = new BitmapCharRec(7,11,-1,0,9,ch211data);
+
+/* char: 0xd2 */
+
+static final byte[] ch210data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x18,(byte) 0x20,
+};
+
+static final BitmapCharRec ch210 = new BitmapCharRec(7,11,-1,0,9,ch210data);
+
+/* char: 0xd1 */
+
+static final byte[] ch209data = {
+(byte) 0x82,(byte) 0x86,(byte) 0x8a,(byte) 0x92,(byte) 0x92,(byte) 0xa2,(byte) 0xc2,(byte) 0x82,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch209 = new BitmapCharRec(7,11,-1,0,9,ch209data);
+
+/* char: 0xd0 */
+
+static final byte[] ch208data = {
+(byte) 0xfc,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xf2,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch208 = new BitmapCharRec(7,10,-1,0,9,ch208data);
+
+/* char: 0xcf */
+
+static final byte[] ch207data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x50,(byte) 0x50,
+};
+
+static final BitmapCharRec ch207 = new BitmapCharRec(5,11,-2,0,9,ch207data);
+
+/* char: 0xce */
+
+static final byte[] ch206data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch206 = new BitmapCharRec(5,11,-2,0,9,ch206data);
+
+/* char: 0xcd */
+
+static final byte[] ch205data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x60,(byte) 0x10,
+};
+
+static final BitmapCharRec ch205 = new BitmapCharRec(5,11,-2,0,9,ch205data);
+
+/* char: 0xcc */
+
+static final byte[] ch204data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x30,(byte) 0x40,
+};
+
+static final BitmapCharRec ch204 = new BitmapCharRec(5,11,-2,0,9,ch204data);
+
+/* char: 0xcb */
+
+static final byte[] ch203data = {
+(byte) 0xfe,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x78,(byte) 0x40,(byte) 0x40,(byte) 0xfe,(byte) 0x0,(byte) 0x28,(byte) 0x28,
+};
+
+static final BitmapCharRec ch203 = new BitmapCharRec(7,11,-1,0,9,ch203data);
+
+/* char: 0xca */
+
+static final byte[] ch202data = {
+(byte) 0xfe,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x78,(byte) 0x40,(byte) 0x40,(byte) 0xfe,(byte) 0x0,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch202 = new BitmapCharRec(7,11,-1,0,9,ch202data);
+
+/* char: 0xc9 */
+
+static final byte[] ch201data = {
+(byte) 0xfe,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x78,(byte) 0x40,(byte) 0x40,(byte) 0xfe,(byte) 0x0,(byte) 0x30,(byte) 0x8,
+};
+
+static final BitmapCharRec ch201 = new BitmapCharRec(7,11,-1,0,9,ch201data);
+
+/* char: 0xc8 */
+
+static final byte[] ch200data = {
+(byte) 0xfe,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x78,(byte) 0x40,(byte) 0x40,(byte) 0xfe,(byte) 0x0,(byte) 0x18,(byte) 0x20,
+};
+
+static final BitmapCharRec ch200 = new BitmapCharRec(7,11,-1,0,9,ch200data);
+
+/* char: 0xc7 */
+
+static final byte[] ch199data = {
+(byte) 0x30,(byte) 0x48,(byte) 0x18,(byte) 0x7c,(byte) 0x82,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch199 = new BitmapCharRec(7,13,-1,3,9,ch199data);
+
+/* char: 0xc6 */
+
+static final byte[] ch198data = {
+(byte) 0x9e,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xfc,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x6e,
+};
+
+static final BitmapCharRec ch198 = new BitmapCharRec(7,10,-1,0,9,ch198data);
+
+/* char: 0xc5 */
+
+static final byte[] ch197data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x10,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch197 = new BitmapCharRec(7,11,-1,0,9,ch197data);
+
+/* char: 0xc4 */
+
+static final byte[] ch196data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x0,(byte) 0x28,(byte) 0x28,
+};
+
+static final BitmapCharRec ch196 = new BitmapCharRec(7,11,-1,0,9,ch196data);
+
+/* char: 0xc3 */
+
+static final byte[] ch195data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch195 = new BitmapCharRec(7,11,-1,0,9,ch195data);
+
+/* char: 0xc2 */
+
+static final byte[] ch194data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x0,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch194 = new BitmapCharRec(7,11,-1,0,9,ch194data);
+
+/* char: 0xc1 */
+
+static final byte[] ch193data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x0,(byte) 0x30,(byte) 0x8,
+};
+
+static final BitmapCharRec ch193 = new BitmapCharRec(7,11,-1,0,9,ch193data);
+
+/* char: 0xc0 */
+
+static final byte[] ch192data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x0,(byte) 0x18,(byte) 0x20,
+};
+
+static final BitmapCharRec ch192 = new BitmapCharRec(7,11,-1,0,9,ch192data);
+
+/* char: 0xbf */
+
+static final byte[] ch191data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x10,
+};
+
+static final BitmapCharRec ch191 = new BitmapCharRec(7,10,-1,0,9,ch191data);
+
+/* char: 0xbe */
+
+static final byte[] ch190data = {
+(byte) 0x6,(byte) 0x1a,(byte) 0x12,(byte) 0xa,(byte) 0x66,(byte) 0x92,(byte) 0x10,(byte) 0x20,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch190 = new BitmapCharRec(7,10,-1,0,9,ch190data);
+
+/* char: 0xbd */
+
+static final byte[] ch189data = {
+(byte) 0x1e,(byte) 0x10,(byte) 0xc,(byte) 0x2,(byte) 0xf2,(byte) 0x4c,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch189 = new BitmapCharRec(7,10,-1,0,9,ch189data);
+
+/* char: 0xbc */
+
+static final byte[] ch188data = {
+(byte) 0x6,(byte) 0x1a,(byte) 0x12,(byte) 0xa,(byte) 0xe6,(byte) 0x42,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch188 = new BitmapCharRec(7,10,-1,0,9,ch188data);
+
+/* char: 0xbb */
+
+static final byte[] ch187data = {
+(byte) 0x90,(byte) 0x48,(byte) 0x24,(byte) 0x12,(byte) 0x12,(byte) 0x24,(byte) 0x48,(byte) 0x90,
+};
+
+static final BitmapCharRec ch187 = new BitmapCharRec(7,8,-1,-1,9,ch187data);
+
+/* char: 0xba */
+
+static final byte[] ch186data = {
+(byte) 0xf8,(byte) 0x0,(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch186 = new BitmapCharRec(5,6,-1,-5,9,ch186data);
+
+/* char: 0xb9 */
+
+static final byte[] ch185data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch185 = new BitmapCharRec(3,6,-1,-4,9,ch185data);
+
+/* char: 0xb8 */
+
+static final byte[] ch184data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x30,
+};
+
+static final BitmapCharRec ch184 = new BitmapCharRec(4,3,-2,3,9,ch184data);
+
+/* char: 0xb7 */
+
+static final byte[] ch183data = {
+(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch183 = new BitmapCharRec(2,2,-4,-4,9,ch183data);
+
+/* char: 0xb6 */
+
+static final byte[] ch182data = {
+(byte) 0xa,(byte) 0xa,(byte) 0xa,(byte) 0xa,(byte) 0xa,(byte) 0x7a,(byte) 0x8a,(byte) 0x8a,(byte) 0x8a,(byte) 0x7e,
+};
+
+static final BitmapCharRec ch182 = new BitmapCharRec(7,10,-1,0,9,ch182data);
+
+/* char: 0xb5 */
+
+static final byte[] ch181data = {
+(byte) 0x80,(byte) 0x80,(byte) 0xba,(byte) 0xc6,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch181 = new BitmapCharRec(7,9,-1,2,9,ch181data);
+
+/* char: 0xb4 */
+
+static final byte[] ch180data = {
+(byte) 0xc0,(byte) 0x20,
+};
+
+static final BitmapCharRec ch180 = new BitmapCharRec(3,2,-3,-9,9,ch180data);
+
+/* char: 0xb3 */
+
+static final byte[] ch179data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x10,(byte) 0x20,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch179 = new BitmapCharRec(4,6,-1,-4,9,ch179data);
+
+/* char: 0xb2 */
+
+static final byte[] ch178data = {
+(byte) 0xf0,(byte) 0x80,(byte) 0x60,(byte) 0x10,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch178 = new BitmapCharRec(4,6,-1,-4,9,ch178data);
+
+/* char: 0xb1 */
+
+static final byte[] ch177data = {
+(byte) 0xfe,(byte) 0x0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xfe,(byte) 0x10,(byte) 0x10,(byte) 0x10,
+};
+
+static final BitmapCharRec ch177 = new BitmapCharRec(7,9,-1,-1,9,ch177data);
+
+/* char: 0xb0 */
+
+static final byte[] ch176data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch176 = new BitmapCharRec(4,4,-3,-6,9,ch176data);
+
+/* char: 0xaf */
+
+static final byte[] ch175data = {
+(byte) 0xfc,
+};
+
+static final BitmapCharRec ch175 = new BitmapCharRec(6,1,-1,-9,9,ch175data);
+
+/* char: 0xae */
+
+static final byte[] ch174data = {
+(byte) 0x3c,(byte) 0x42,(byte) 0xa5,(byte) 0xa9,(byte) 0xbd,(byte) 0xa5,(byte) 0xb9,(byte) 0x42,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch174 = new BitmapCharRec(8,9,0,-1,9,ch174data);
+
+/* char: 0xad */
+
+static final byte[] ch173data = {
+(byte) 0xfc,
+};
+
+static final BitmapCharRec ch173 = new BitmapCharRec(6,1,-1,-4,9,ch173data);
+
+/* char: 0xac */
+
+static final byte[] ch172data = {
+(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch172 = new BitmapCharRec(6,4,-1,-2,9,ch172data);
+
+/* char: 0xab */
+
+static final byte[] ch171data = {
+(byte) 0x12,(byte) 0x24,(byte) 0x48,(byte) 0x90,(byte) 0x90,(byte) 0x48,(byte) 0x24,(byte) 0x12,
+};
+
+static final BitmapCharRec ch171 = new BitmapCharRec(7,8,-1,-1,9,ch171data);
+
+/* char: 0xaa */
+
+static final byte[] ch170data = {
+(byte) 0xf8,(byte) 0x0,(byte) 0x78,(byte) 0x90,(byte) 0x70,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch170 = new BitmapCharRec(5,7,-3,-3,9,ch170data);
+
+/* char: 0xa9 */
+
+static final byte[] ch169data = {
+(byte) 0x3c,(byte) 0x42,(byte) 0x99,(byte) 0xa5,(byte) 0xa1,(byte) 0xa5,(byte) 0x99,(byte) 0x42,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch169 = new BitmapCharRec(8,9,0,-1,9,ch169data);
+
+/* char: 0xa8 */
+
+static final byte[] ch168data = {
+(byte) 0xa0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch168 = new BitmapCharRec(3,2,-3,-9,9,ch168data);
+
+/* char: 0xa7 */
+
+static final byte[] ch167data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x80,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch167 = new BitmapCharRec(5,11,-2,1,9,ch167data);
+
+/* char: 0xa6 */
+
+static final byte[] ch166data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch166 = new BitmapCharRec(1,11,-4,1,9,ch166data);
+
+/* char: 0xa5 */
+
+static final byte[] ch165data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x7c,(byte) 0x10,(byte) 0x7c,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch165 = new BitmapCharRec(7,10,-1,0,9,ch165data);
+
+/* char: 0xa4 */
+
+static final byte[] ch164data = {
+(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x7c,(byte) 0x82,
+};
+
+static final BitmapCharRec ch164 = new BitmapCharRec(7,6,-1,-3,9,ch164data);
+
+/* char: 0xa3 */
+
+static final byte[] ch163data = {
+(byte) 0x5c,(byte) 0xa2,(byte) 0x60,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x22,(byte) 0x1c,
+};
+
+static final BitmapCharRec ch163 = new BitmapCharRec(7,10,-1,0,9,ch163data);
+
+/* char: 0xa2 */
+
+static final byte[] ch162data = {
+(byte) 0x40,(byte) 0x78,(byte) 0xa4,(byte) 0xa0,(byte) 0x90,(byte) 0x94,(byte) 0x78,(byte) 0x8,
+};
+
+static final BitmapCharRec ch162 = new BitmapCharRec(6,8,-1,0,9,ch162data);
+
+/* char: 0xa1 */
+
+static final byte[] ch161data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch161 = new BitmapCharRec(1,11,-4,0,9,ch161data);
+
+/* char: 0x7e '~' */
+
+static final byte[] ch126data = {
+(byte) 0x8c,(byte) 0x92,(byte) 0x62,
+};
+
+static final BitmapCharRec ch126 = new BitmapCharRec(7,3,-1,-7,9,ch126data);
+
+/* char: 0x7d '}' */
+
+static final byte[] ch125data = {
+(byte) 0xe0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x20,(byte) 0x18,(byte) 0x18,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch125 = new BitmapCharRec(5,12,-1,1,9,ch125data);
+
+/* char: 0x7c '|' */
+
+static final byte[] ch124data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch124 = new BitmapCharRec(1,12,-4,1,9,ch124data);
+
+/* char: 0x7b '{' */
+
+static final byte[] ch123data = {
+(byte) 0x38,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0xc0,(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x38,
+};
+
+static final BitmapCharRec ch123 = new BitmapCharRec(5,12,-3,1,9,ch123data);
+
+/* char: 0x7a 'z' */
+
+static final byte[] ch122data = {
+(byte) 0xfe,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch122 = new BitmapCharRec(7,7,-1,0,9,ch122data);
+
+/* char: 0x79 'y' */
+
+static final byte[] ch121data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
+};
+
+static final BitmapCharRec ch121 = new BitmapCharRec(6,10,-1,3,9,ch121data);
+
+/* char: 0x78 'x' */
+
+static final byte[] ch120data = {
+(byte) 0x82,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,
+};
+
+static final BitmapCharRec ch120 = new BitmapCharRec(7,7,-1,0,9,ch120data);
+
+/* char: 0x77 'w' */
+
+static final byte[] ch119data = {
+(byte) 0x44,(byte) 0xaa,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch119 = new BitmapCharRec(7,7,-1,0,9,ch119data);
+
+/* char: 0x76 'v' */
+
+static final byte[] ch118data = {
+(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch118 = new BitmapCharRec(7,7,-1,0,9,ch118data);
+
+/* char: 0x75 'u' */
+
+static final byte[] ch117data = {
+(byte) 0x7a,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
+};
+
+static final BitmapCharRec ch117 = new BitmapCharRec(7,7,-1,0,9,ch117data);
+
+/* char: 0x74 't' */
+
+static final byte[] ch116data = {
+(byte) 0x1c,(byte) 0x22,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xfc,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch116 = new BitmapCharRec(7,9,-1,0,9,ch116data);
+
+/* char: 0x73 's' */
+
+static final byte[] ch115data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x2,(byte) 0x7c,(byte) 0x80,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch115 = new BitmapCharRec(7,7,-1,0,9,ch115data);
+
+/* char: 0x72 'r' */
+
+static final byte[] ch114data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x42,(byte) 0x62,(byte) 0x9c,
+};
+
+static final BitmapCharRec ch114 = new BitmapCharRec(7,7,-1,0,9,ch114data);
+
+/* char: 0x71 'q' */
+
+static final byte[] ch113data = {
+(byte) 0x2,(byte) 0x2,(byte) 0x2,(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x86,(byte) 0x7a,
+};
+
+static final BitmapCharRec ch113 = new BitmapCharRec(7,10,-1,3,9,ch113data);
+
+/* char: 0x70 'p' */
+
+static final byte[] ch112data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xbc,(byte) 0xc2,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,
+};
+
+static final BitmapCharRec ch112 = new BitmapCharRec(7,10,-1,3,9,ch112data);
+
+/* char: 0x6f 'o' */
+
+static final byte[] ch111data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch111 = new BitmapCharRec(7,7,-1,0,9,ch111data);
+
+/* char: 0x6e 'n' */
+
+static final byte[] ch110data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,
+};
+
+static final BitmapCharRec ch110 = new BitmapCharRec(7,7,-1,0,9,ch110data);
+
+/* char: 0x6d 'm' */
+
+static final byte[] ch109data = {
+(byte) 0x82,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0xec,
+};
+
+static final BitmapCharRec ch109 = new BitmapCharRec(7,7,-1,0,9,ch109data);
+
+/* char: 0x6c 'l' */
+
+static final byte[] ch108data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch108 = new BitmapCharRec(5,10,-2,0,9,ch108data);
+
+/* char: 0x6b 'k' */
+
+static final byte[] ch107data = {
+(byte) 0x82,(byte) 0x8c,(byte) 0xb0,(byte) 0xc0,(byte) 0xb0,(byte) 0x8c,(byte) 0x82,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch107 = new BitmapCharRec(7,10,-1,0,9,ch107data);
+
+/* char: 0x6a 'j' */
+
+static final byte[] ch106data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x1c,(byte) 0x0,(byte) 0x0,(byte) 0xc,
+};
+
+static final BitmapCharRec ch106 = new BitmapCharRec(6,13,-1,3,9,ch106data);
+
+/* char: 0x69 'i' */
+
+static final byte[] ch105data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x60,
+};
+
+static final BitmapCharRec ch105 = new BitmapCharRec(5,10,-2,0,9,ch105data);
+
+/* char: 0x68 'h' */
+
+static final byte[] ch104data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch104 = new BitmapCharRec(7,10,-1,0,9,ch104data);
+
+/* char: 0x67 'g' */
+
+static final byte[] ch103data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x80,(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x7a,
+};
+
+static final BitmapCharRec ch103 = new BitmapCharRec(7,10,-1,3,9,ch103data);
+
+/* char: 0x66 'f' */
+
+static final byte[] ch102data = {
+(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x22,(byte) 0x22,(byte) 0x1c,
+};
+
+static final BitmapCharRec ch102 = new BitmapCharRec(7,10,-1,0,9,ch102data);
+
+/* char: 0x65 'e' */
+
+static final byte[] ch101data = {
+(byte) 0x7c,(byte) 0x80,(byte) 0x80,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch101 = new BitmapCharRec(7,7,-1,0,9,ch101data);
+
+/* char: 0x64 'd' */
+
+static final byte[] ch100data = {
+(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x86,(byte) 0x7a,(byte) 0x2,(byte) 0x2,(byte) 0x2,
+};
+
+static final BitmapCharRec ch100 = new BitmapCharRec(7,10,-1,0,9,ch100data);
+
+/* char: 0x63 'c' */
+
+static final byte[] ch99data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch99 = new BitmapCharRec(7,7,-1,0,9,ch99data);
+
+/* char: 0x62 'b' */
+
+static final byte[] ch98data = {
+(byte) 0xbc,(byte) 0xc2,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch98 = new BitmapCharRec(7,10,-1,0,9,ch98data);
+
+/* char: 0x61 'a' */
+
+static final byte[] ch97data = {
+(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch97 = new BitmapCharRec(7,7,-1,0,9,ch97data);
+
+/* char: 0x60 '`' */
+
+static final byte[] ch96data = {
+(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch96 = new BitmapCharRec(4,4,-3,-6,9,ch96data);
+
+/* char: 0x5f '_' */
+
+static final byte[] ch95data = {
+(byte) 0xff,
+};
+
+static final BitmapCharRec ch95 = new BitmapCharRec(8,1,0,1,9,ch95data);
+
+/* char: 0x5e '^' */
+
+static final byte[] ch94data = {
+(byte) 0x82,(byte) 0x44,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch94 = new BitmapCharRec(7,4,-1,-6,9,ch94data);
+
+/* char: 0x5d ']' */
+
+static final byte[] ch93data = {
+(byte) 0xf0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch93 = new BitmapCharRec(4,12,-2,1,9,ch93data);
+
+/* char: 0x5c '\' */
+
+static final byte[] ch92data = {
+(byte) 0x2,(byte) 0x4,(byte) 0x4,(byte) 0x8,(byte) 0x10,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch92 = new BitmapCharRec(7,10,-1,0,9,ch92data);
+
+/* char: 0x5b '[' */
+
+static final byte[] ch91data = {
+(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch91 = new BitmapCharRec(4,12,-3,1,9,ch91data);
+
+/* char: 0x5a 'Z' */
+
+static final byte[] ch90data = {
+(byte) 0xfe,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch90 = new BitmapCharRec(7,10,-1,0,9,ch90data);
+
+/* char: 0x59 'Y' */
+
+static final byte[] ch89data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch89 = new BitmapCharRec(7,10,-1,0,9,ch89data);
+
+/* char: 0x58 'X' */
+
+static final byte[] ch88data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch88 = new BitmapCharRec(7,10,-1,0,9,ch88data);
+
+/* char: 0x57 'W' */
+
+static final byte[] ch87data = {
+(byte) 0x44,(byte) 0xaa,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch87 = new BitmapCharRec(7,10,-1,0,9,ch87data);
+
+/* char: 0x56 'V' */
+
+static final byte[] ch86data = {
+(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch86 = new BitmapCharRec(7,10,-1,0,9,ch86data);
+
+/* char: 0x55 'U' */
+
+static final byte[] ch85data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch85 = new BitmapCharRec(7,10,-1,0,9,ch85data);
+
+/* char: 0x54 'T' */
+
+static final byte[] ch84data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch84 = new BitmapCharRec(7,10,-1,0,9,ch84data);
+
+/* char: 0x53 'S' */
+
+static final byte[] ch83data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x2,(byte) 0xc,(byte) 0x70,(byte) 0x80,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch83 = new BitmapCharRec(7,10,-1,0,9,ch83data);
+
+/* char: 0x52 'R' */
+
+static final byte[] ch82data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x84,(byte) 0x88,(byte) 0x90,(byte) 0xfc,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch82 = new BitmapCharRec(7,10,-1,0,9,ch82data);
+
+/* char: 0x51 'Q' */
+
+static final byte[] ch81data = {
+(byte) 0x6,(byte) 0x8,(byte) 0x7c,(byte) 0x92,(byte) 0xa2,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch81 = new BitmapCharRec(7,12,-1,2,9,ch81data);
+
+/* char: 0x50 'P' */
+
+static final byte[] ch80data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch80 = new BitmapCharRec(7,10,-1,0,9,ch80data);
+
+/* char: 0x4f 'O' */
+
+static final byte[] ch79data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch79 = new BitmapCharRec(7,10,-1,0,9,ch79data);
+
+/* char: 0x4e 'N' */
+
+static final byte[] ch78data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x86,(byte) 0x8a,(byte) 0x92,(byte) 0xa2,(byte) 0xc2,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch78 = new BitmapCharRec(7,10,-1,0,9,ch78data);
+
+/* char: 0x4d 'M' */
+
+static final byte[] ch77data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x92,(byte) 0x92,(byte) 0xaa,(byte) 0xaa,(byte) 0xc6,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch77 = new BitmapCharRec(7,10,-1,0,9,ch77data);
+
+/* char: 0x4c 'L' */
+
+static final byte[] ch76data = {
+(byte) 0xfe,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch76 = new BitmapCharRec(7,10,-1,0,9,ch76data);
+
+/* char: 0x4b 'K' */
+
+static final byte[] ch75data = {
+(byte) 0x82,(byte) 0x84,(byte) 0x88,(byte) 0x90,(byte) 0xa0,(byte) 0xe0,(byte) 0x90,(byte) 0x88,(byte) 0x84,(byte) 0x82,
+};
+
+static final BitmapCharRec ch75 = new BitmapCharRec(7,10,-1,0,9,ch75data);
+
+/* char: 0x4a 'J' */
+
+static final byte[] ch74data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x1e,
+};
+
+static final BitmapCharRec ch74 = new BitmapCharRec(7,10,-1,0,9,ch74data);
+
+/* char: 0x49 'I' */
+
+static final byte[] ch73data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch73 = new BitmapCharRec(5,10,-2,0,9,ch73data);
+
+/* char: 0x48 'H' */
+
+static final byte[] ch72data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch72 = new BitmapCharRec(7,10,-1,0,9,ch72data);
+
+/* char: 0x47 'G' */
+
+static final byte[] ch71data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x8e,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch71 = new BitmapCharRec(7,10,-1,0,9,ch71data);
+
+/* char: 0x46 'F' */
+
+static final byte[] ch70data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x78,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch70 = new BitmapCharRec(7,10,-1,0,9,ch70data);
+
+/* char: 0x45 'E' */
+
+static final byte[] ch69data = {
+(byte) 0xfe,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x78,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch69 = new BitmapCharRec(7,10,-1,0,9,ch69data);
+
+/* char: 0x44 'D' */
+
+static final byte[] ch68data = {
+(byte) 0xfc,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch68 = new BitmapCharRec(7,10,-1,0,9,ch68data);
+
+/* char: 0x43 'C' */
+
+static final byte[] ch67data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch67 = new BitmapCharRec(7,10,-1,0,9,ch67data);
+
+/* char: 0x42 'B' */
+
+static final byte[] ch66data = {
+(byte) 0xfc,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x7c,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch66 = new BitmapCharRec(7,10,-1,0,9,ch66data);
+
+/* char: 0x41 'A' */
+
+static final byte[] ch65data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch65 = new BitmapCharRec(7,10,-1,0,9,ch65data);
+
+/* char: 0x40 '@' */
+
+static final byte[] ch64data = {
+(byte) 0x7c,(byte) 0x80,(byte) 0x80,(byte) 0x9a,(byte) 0xa6,(byte) 0xa2,(byte) 0x9e,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch64 = new BitmapCharRec(7,10,-1,0,9,ch64data);
+
+/* char: 0x3f '?' */
+
+static final byte[] ch63data = {
+(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch63 = new BitmapCharRec(7,10,-1,0,9,ch63data);
+
+/* char: 0x3e '>' */
+
+static final byte[] ch62data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch62 = new BitmapCharRec(5,10,-2,0,9,ch62data);
+
+/* char: 0x3d '=' */
+
+static final byte[] ch61data = {
+(byte) 0xfe,(byte) 0x0,(byte) 0x0,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch61 = new BitmapCharRec(7,4,-1,-2,9,ch61data);
+
+/* char: 0x3c '<' */
+
+static final byte[] ch60data = {
+(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch60 = new BitmapCharRec(5,10,-2,0,9,ch60data);
+
+/* char: 0x3b ';' */
+
+static final byte[] ch59data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch59 = new BitmapCharRec(2,10,-4,3,9,ch59data);
+
+/* char: 0x3a ':' */
+
+static final byte[] ch58data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch58 = new BitmapCharRec(2,7,-4,0,9,ch58data);
+
+/* char: 0x39 '9' */
+
+static final byte[] ch57data = {
+(byte) 0x78,(byte) 0x4,(byte) 0x2,(byte) 0x2,(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch57 = new BitmapCharRec(7,10,-1,0,9,ch57data);
+
+/* char: 0x38 '8' */
+
+static final byte[] ch56data = {
+(byte) 0x38,(byte) 0x44,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x44,(byte) 0x82,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch56 = new BitmapCharRec(7,10,-1,0,9,ch56data);
+
+/* char: 0x37 '7' */
+
+static final byte[] ch55data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0x2,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch55 = new BitmapCharRec(7,10,-1,0,9,ch55data);
+
+/* char: 0x36 '6' */
+
+static final byte[] ch54data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch54 = new BitmapCharRec(7,10,-1,0,9,ch54data);
+
+/* char: 0x35 '5' */
+
+static final byte[] ch53data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x2,(byte) 0x2,(byte) 0x2,(byte) 0xc2,(byte) 0xbc,(byte) 0x80,(byte) 0x80,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch53 = new BitmapCharRec(7,10,-1,0,9,ch53data);
+
+/* char: 0x34 '4' */
+
+static final byte[] ch52data = {
+(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0xfe,(byte) 0x84,(byte) 0x44,(byte) 0x24,(byte) 0x14,(byte) 0xc,(byte) 0x4,
+};
+
+static final BitmapCharRec ch52 = new BitmapCharRec(7,10,-1,0,9,ch52data);
+
+/* char: 0x33 '3' */
+
+static final byte[] ch51data = {
+(byte) 0x7c,(byte) 0x82,(byte) 0x2,(byte) 0x2,(byte) 0x2,(byte) 0x1c,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch51 = new BitmapCharRec(7,10,-1,0,9,ch51data);
+
+/* char: 0x32 '2' */
+
+static final byte[] ch50data = {
+(byte) 0xfe,(byte) 0x80,(byte) 0x40,(byte) 0x30,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch50 = new BitmapCharRec(7,10,-1,0,9,ch50data);
+
+/* char: 0x31 '1' */
+
+static final byte[] ch49data = {
+(byte) 0xfe,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x90,(byte) 0x50,(byte) 0x30,(byte) 0x10,
+};
+
+static final BitmapCharRec ch49 = new BitmapCharRec(7,10,-1,0,9,ch49data);
+
+/* char: 0x30 '0' */
+
+static final byte[] ch48data = {
+(byte) 0x38,(byte) 0x44,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch48 = new BitmapCharRec(7,10,-1,0,9,ch48data);
+
+/* char: 0x2f '/' */
+
+static final byte[] ch47data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x4,(byte) 0x2,
+};
+
+static final BitmapCharRec ch47 = new BitmapCharRec(7,10,-1,0,9,ch47data);
+
+/* char: 0x2e '.' */
+
+static final byte[] ch46data = {
+(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch46 = new BitmapCharRec(2,2,-4,0,9,ch46data);
+
+/* char: 0x2d '-' */
+
+static final byte[] ch45data = {
+(byte) 0xfe,
+};
+
+static final BitmapCharRec ch45 = new BitmapCharRec(7,1,-1,-4,9,ch45data);
+
+/* char: 0x2c ',' */
+
+static final byte[] ch44data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch44 = new BitmapCharRec(2,5,-4,3,9,ch44data);
+
+/* char: 0x2b '+' */
+
+static final byte[] ch43data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xfe,(byte) 0x10,(byte) 0x10,(byte) 0x10,
+};
+
+static final BitmapCharRec ch43 = new BitmapCharRec(7,7,-1,-1,9,ch43data);
+
+/* char: 0x2a '*' */
+
+static final byte[] ch42data = {
+(byte) 0x10,(byte) 0x92,(byte) 0x54,(byte) 0x38,(byte) 0x54,(byte) 0x92,(byte) 0x10,
+};
+
+static final BitmapCharRec ch42 = new BitmapCharRec(7,7,-1,-1,9,ch42data);
+
+/* char: 0x29 ')' */
+
+static final byte[] ch41data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch41 = new BitmapCharRec(3,12,-3,1,9,ch41data);
+
+/* char: 0x28 '(' */
+
+static final byte[] ch40data = {
+(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch40 = new BitmapCharRec(3,12,-3,1,9,ch40data);
+
+/* char: 0x27 ''' */
+
+static final byte[] ch39data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x30,
+};
+
+static final BitmapCharRec ch39 = new BitmapCharRec(4,4,-3,-6,9,ch39data);
+
+/* char: 0x26 '&' */
+
+static final byte[] ch38data = {
+(byte) 0x62,(byte) 0x94,(byte) 0x88,(byte) 0x94,(byte) 0x62,(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch38 = new BitmapCharRec(7,10,-1,0,9,ch38data);
+
+/* char: 0x25 '%' */
+
+static final byte[] ch37data = {
+(byte) 0x84,(byte) 0x4a,(byte) 0x4a,(byte) 0x24,(byte) 0x10,(byte) 0x10,(byte) 0x48,(byte) 0xa4,(byte) 0xa4,(byte) 0x42,
+};
+
+static final BitmapCharRec ch37 = new BitmapCharRec(7,10,-1,0,9,ch37data);
+
+/* char: 0x24 '$' */
+
+static final byte[] ch36data = {
+(byte) 0x10,(byte) 0x7c,(byte) 0x92,(byte) 0x12,(byte) 0x12,(byte) 0x14,(byte) 0x38,(byte) 0x50,(byte) 0x90,(byte) 0x92,(byte) 0x7c,(byte) 0x10,
+};
+
+static final BitmapCharRec ch36 = new BitmapCharRec(7,12,-1,1,9,ch36data);
+
+/* char: 0x23 '#' */
+
+static final byte[] ch35data = {
+(byte) 0x48,(byte) 0x48,(byte) 0xfc,(byte) 0x48,(byte) 0x48,(byte) 0xfc,(byte) 0x48,(byte) 0x48,
+};
+
+static final BitmapCharRec ch35 = new BitmapCharRec(6,8,-1,-1,9,ch35data);
+
+/* char: 0x22 '"' */
+
+static final byte[] ch34data = {
+(byte) 0x90,(byte) 0x90,(byte) 0x90,
+};
+
+static final BitmapCharRec ch34 = new BitmapCharRec(4,3,-3,-7,9,ch34data);
+
+/* char: 0x21 '!' */
+
+static final byte[] ch33data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch33 = new BitmapCharRec(1,11,-4,0,9,ch33data);
+
+/* char: 0x1f */
+
+static final byte[] ch31data = {
+(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch31 = new BitmapCharRec(2,2,-4,-2,9,ch31data);
+
+/* char: 0x1e */
+
+static final byte[] ch30data = {
+(byte) 0x5c,(byte) 0xa2,(byte) 0x60,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x22,(byte) 0x1c,
+};
+
+static final BitmapCharRec ch30 = new BitmapCharRec(7,10,-1,0,9,ch30data);
+
+/* char: 0x1d */
+
+static final byte[] ch29data = {
+(byte) 0x80,(byte) 0x40,(byte) 0xfe,(byte) 0x10,(byte) 0xfe,(byte) 0x4,(byte) 0x2,
+};
+
+static final BitmapCharRec ch29 = new BitmapCharRec(7,7,-1,0,9,ch29data);
+
+/* char: 0x1c */
+
+static final byte[] ch28data = {
+(byte) 0x44,(byte) 0x24,(byte) 0x24,(byte) 0x24,(byte) 0x24,(byte) 0x24,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch28 = new BitmapCharRec(7,7,-1,0,9,ch28data);
+
+/* char: 0x1b */
+
+static final byte[] ch27data = {
+(byte) 0xfe,(byte) 0x0,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch27 = new BitmapCharRec(7,12,-1,2,9,ch27data);
+
+/* char: 0x1a */
+
+static final byte[] ch26data = {
+(byte) 0xfc,(byte) 0x0,(byte) 0x4,(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,
+};
+
+static final BitmapCharRec ch26 = new BitmapCharRec(6,12,-2,2,9,ch26data);
+
+/* char: 0x19 */
+
+static final byte[] ch25data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch25 = new BitmapCharRec(1,15,-4,3,9,ch25data);
+
+/* char: 0x18 */
+
+static final byte[] ch24data = {
+(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0xff,(byte) 0x80,
+};
+
+static final BitmapCharRec ch24 = new BitmapCharRec(9,7,0,3,9,ch24data);
+
+/* char: 0x17 */
+
+static final byte[] ch23data = {
+(byte) 0xff,(byte) 0x80,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,
+(byte) 0x8,(byte) 0x0,
+};
+
+static final BitmapCharRec ch23 = new BitmapCharRec(9,9,0,-3,9,ch23data);
+
+/* char: 0x16 */
+
+static final byte[] ch22data = {
+(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0xf8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,
+};
+
+static final BitmapCharRec ch22 = new BitmapCharRec(5,15,0,3,9,ch22data);
+
+/* char: 0x15 */
+
+static final byte[] ch21data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch21 = new BitmapCharRec(5,15,-4,3,9,ch21data);
+
+/* char: 0x14 */
+
+static final byte[] ch20data = {
+(byte) 0xff,(byte) 0x80,
+};
+
+static final BitmapCharRec ch20 = new BitmapCharRec(9,1,0,1,9,ch20data);
+
+/* char: 0x13 */
+
+static final byte[] ch19data = {
+(byte) 0xff,(byte) 0x80,
+};
+
+static final BitmapCharRec ch19 = new BitmapCharRec(9,1,0,-1,9,ch19data);
+
+/* char: 0x12 */
+
+static final byte[] ch18data = {
+(byte) 0xff,(byte) 0x80,
+};
+
+static final BitmapCharRec ch18 = new BitmapCharRec(9,1,0,-3,9,ch18data);
+
+/* char: 0x11 */
+
+static final byte[] ch17data = {
+(byte) 0xff,(byte) 0x80,
+};
+
+static final BitmapCharRec ch17 = new BitmapCharRec(9,1,0,-5,9,ch17data);
+
+/* char: 0x10 */
+
+static final byte[] ch16data = {
+(byte) 0xff,(byte) 0x80,
+};
+
+static final BitmapCharRec ch16 = new BitmapCharRec(9,1,0,-7,9,ch16data);
+
+/* char: 0xf */
+
+static final byte[] ch15data = {
+(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0x8,(byte) 0x0,
+(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,
+};
+
+static final BitmapCharRec ch15 = new BitmapCharRec(9,15,0,3,9,ch15data);
+
+/* char: 0xe */
+
+static final byte[] ch14data = {
+(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch14 = new BitmapCharRec(5,9,-4,-3,9,ch14data);
+
+/* char: 0xd */
+
+static final byte[] ch13data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch13 = new BitmapCharRec(5,7,-4,3,9,ch13data);
+
+/* char: 0xc */
+
+static final byte[] ch12data = {
+(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch12 = new BitmapCharRec(5,7,0,3,9,ch12data);
+
+/* char: 0xb */
+
+static final byte[] ch11data = {
+(byte) 0xf8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,
+};
+
+static final BitmapCharRec ch11 = new BitmapCharRec(5,9,0,-3,9,ch11data);
+
+/* char: 0xa */
+
+static final byte[] ch10data = {
+(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x3e,(byte) 0x0,(byte) 0x20,(byte) 0x50,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch10 = new BitmapCharRec(7,10,-1,2,9,ch10data);
+
+/* char: 0x9 */
+
+static final byte[] ch9data = {
+(byte) 0x3e,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x88,(byte) 0x98,(byte) 0xa8,(byte) 0xc8,(byte) 0x88,
+};
+
+static final BitmapCharRec ch9 = new BitmapCharRec(7,10,-1,2,9,ch9data);
+
+/* char: 0x8 */
+
+static final byte[] ch8data = {
+(byte) 0xfe,(byte) 0x10,(byte) 0x10,(byte) 0xfe,(byte) 0x10,(byte) 0x10,
+};
+
+static final BitmapCharRec ch8 = new BitmapCharRec(7,6,-1,0,9,ch8data);
+
+/* char: 0x7 */
+
+static final byte[] ch7data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch7 = new BitmapCharRec(5,4,-2,-6,9,ch7data);
+
+/* char: 0x6 */
+
+static final byte[] ch6data = {
+(byte) 0x20,(byte) 0x20,(byte) 0x3c,(byte) 0x20,(byte) 0x3e,(byte) 0x0,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch6 = new BitmapCharRec(7,10,-1,2,9,ch6data);
+
+/* char: 0x5 */
+
+static final byte[] ch5data = {
+(byte) 0x22,(byte) 0x22,(byte) 0x3c,(byte) 0x22,(byte) 0x3c,(byte) 0x0,(byte) 0x78,(byte) 0x80,(byte) 0x80,(byte) 0x78,
+};
+
+static final BitmapCharRec ch5 = new BitmapCharRec(7,10,-1,2,9,ch5data);
+
+/* char: 0x4 */
+
+static final byte[] ch4data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x1c,(byte) 0x10,(byte) 0x1e,(byte) 0x80,(byte) 0x80,(byte) 0xe0,(byte) 0x80,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch4 = new BitmapCharRec(7,10,-1,2,9,ch4data);
+
+/* char: 0x3 */
+
+static final byte[] ch3data = {
+(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x3e,(byte) 0x0,(byte) 0x88,(byte) 0x88,(byte) 0xf8,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch3 = new BitmapCharRec(7,10,-1,2,9,ch3data);
+
+/* char: 0x2 */
+
+static final byte[] ch2data = {
+(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,
+};
+
+static final BitmapCharRec ch2 = new BitmapCharRec(8,14,0,3,9,ch2data);
+
+/* char: 0x1 */
+
+static final byte[] ch1data = {
+(byte) 0x10,(byte) 0x38,(byte) 0x7c,(byte) 0xfe,(byte) 0x7c,(byte) 0x38,(byte) 0x10,
+};
+
+static final BitmapCharRec ch1 = new BitmapCharRec(7,7,-1,0,9,ch1data);
+
+static final BitmapCharRec[] chars = {
+ch0,
+ch1,
+ch2,
+ch3,
+ch4,
+ch5,
+ch6,
+ch7,
+ch8,
+ch9,
+ch10,
+ch11,
+ch12,
+ch13,
+ch14,
+ch15,
+ch16,
+ch17,
+ch18,
+ch19,
+ch20,
+ch21,
+ch22,
+ch23,
+ch24,
+ch25,
+ch26,
+ch27,
+ch28,
+ch29,
+ch30,
+ch31,
+ch32,
+ch33,
+ch34,
+ch35,
+ch36,
+ch37,
+ch38,
+ch39,
+ch40,
+ch41,
+ch42,
+ch43,
+ch44,
+ch45,
+ch46,
+ch47,
+ch48,
+ch49,
+ch50,
+ch51,
+ch52,
+ch53,
+ch54,
+ch55,
+ch56,
+ch57,
+ch58,
+ch59,
+ch60,
+ch61,
+ch62,
+ch63,
+ch64,
+ch65,
+ch66,
+ch67,
+ch68,
+ch69,
+ch70,
+ch71,
+ch72,
+ch73,
+ch74,
+ch75,
+ch76,
+ch77,
+ch78,
+ch79,
+ch80,
+ch81,
+ch82,
+ch83,
+ch84,
+ch85,
+ch86,
+ch87,
+ch88,
+ch89,
+ch90,
+ch91,
+ch92,
+ch93,
+ch94,
+ch95,
+ch96,
+ch97,
+ch98,
+ch99,
+ch100,
+ch101,
+ch102,
+ch103,
+ch104,
+ch105,
+ch106,
+ch107,
+ch108,
+ch109,
+ch110,
+ch111,
+ch112,
+ch113,
+ch114,
+ch115,
+ch116,
+ch117,
+ch118,
+ch119,
+ch120,
+ch121,
+ch122,
+ch123,
+ch124,
+ch125,
+ch126,
+ch127,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+ch160,
+ch161,
+ch162,
+ch163,
+ch164,
+ch165,
+ch166,
+ch167,
+ch168,
+ch169,
+ch170,
+ch171,
+ch172,
+ch173,
+ch174,
+ch175,
+ch176,
+ch177,
+ch178,
+ch179,
+ch180,
+ch181,
+ch182,
+ch183,
+ch184,
+ch185,
+ch186,
+ch187,
+ch188,
+ch189,
+ch190,
+ch191,
+ch192,
+ch193,
+ch194,
+ch195,
+ch196,
+ch197,
+ch198,
+ch199,
+ch200,
+ch201,
+ch202,
+ch203,
+ch204,
+ch205,
+ch206,
+ch207,
+ch208,
+ch209,
+ch210,
+ch211,
+ch212,
+ch213,
+ch214,
+ch215,
+ch216,
+ch217,
+ch218,
+ch219,
+ch220,
+ch221,
+ch222,
+ch223,
+ch224,
+ch225,
+ch226,
+ch227,
+ch228,
+ch229,
+ch230,
+ch231,
+ch232,
+ch233,
+ch234,
+ch235,
+ch236,
+ch237,
+ch238,
+ch239,
+ch240,
+ch241,
+ch242,
+ch243,
+ch244,
+ch245,
+ch246,
+ch247,
+ch248,
+ch249,
+ch250,
+ch251,
+ch252,
+ch253,
+ch254,
+ch255,
+};
+
+  public static final BitmapFontRec glutBitmap9By15 = new BitmapFontRec("-misc-fixed-medium-r-normal--15-140-75-75-C-90-iso8859-1",
+                                                                 256,
+                                                                 0,
+                                                                 chars);
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica10.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica10.java
new file mode 100644
index 000000000..b9c7e6e50
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica10.java
@@ -0,0 +1,1798 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+class GLUTBitmapHelvetica10 {
+
+/* GENERATED FILE -- DO NOT MODIFY */
+
+/* char: 0xff */
+
+static final byte[] ch255data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x60,(byte) 0xa0,(byte) 0xa0,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch255 = new BitmapCharRec(4,10,0,2,5,ch255data);
+
+/* char: 0xfe */
+
+static final byte[] ch254data = {
+(byte) 0x80,(byte) 0x80,(byte) 0xb0,(byte) 0xc8,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch254 = new BitmapCharRec(5,10,0,2,6,ch254data);
+
+/* char: 0xfd */
+
+static final byte[] ch253data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x60,(byte) 0xa0,(byte) 0xa0,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch253 = new BitmapCharRec(4,11,0,2,5,ch253data);
+
+/* char: 0xfc */
+
+static final byte[] ch252data = {
+(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch252 = new BitmapCharRec(4,8,0,0,5,ch252data);
+
+/* char: 0xfb */
+
+static final byte[] ch251data = {
+(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch251 = new BitmapCharRec(4,9,0,0,5,ch251data);
+
+/* char: 0xfa */
+
+static final byte[] ch250data = {
+(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch250 = new BitmapCharRec(4,9,0,0,5,ch250data);
+
+/* char: 0xf9 */
+
+static final byte[] ch249data = {
+(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch249 = new BitmapCharRec(4,9,0,0,5,ch249data);
+
+/* char: 0xf8 */
+
+static final byte[] ch248data = {
+(byte) 0x70,(byte) 0x88,(byte) 0xc8,(byte) 0xa8,(byte) 0x98,(byte) 0x74,
+};
+
+static final BitmapCharRec ch248 = new BitmapCharRec(6,6,0,0,6,ch248data);
+
+/* char: 0xf7 */
+
+static final byte[] ch247data = {
+(byte) 0x20,(byte) 0x0,(byte) 0xf8,(byte) 0x0,(byte) 0x20,
+};
+
+static final BitmapCharRec ch247 = new BitmapCharRec(5,5,0,-1,6,ch247data);
+
+/* char: 0xf6 */
+
+static final byte[] ch246data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch246 = new BitmapCharRec(5,8,0,0,6,ch246data);
+
+/* char: 0xf5 */
+
+static final byte[] ch245data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch245 = new BitmapCharRec(5,9,0,0,6,ch245data);
+
+/* char: 0xf4 */
+
+static final byte[] ch244data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch244 = new BitmapCharRec(5,9,0,0,6,ch244data);
+
+/* char: 0xf3 */
+
+static final byte[] ch243data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch243 = new BitmapCharRec(5,9,0,0,6,ch243data);
+
+/* char: 0xf2 */
+
+static final byte[] ch242data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch242 = new BitmapCharRec(5,9,0,0,6,ch242data);
+
+/* char: 0xf1 */
+
+static final byte[] ch241data = {
+(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch241 = new BitmapCharRec(4,9,0,0,5,ch241data);
+
+/* char: 0xf0 */
+
+static final byte[] ch240data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x90,(byte) 0x60,(byte) 0x50,
+};
+
+static final BitmapCharRec ch240 = new BitmapCharRec(5,9,0,0,6,ch240data);
+
+/* char: 0xef */
+
+static final byte[] ch239data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch239 = new BitmapCharRec(3,8,0,0,2,ch239data);
+
+/* char: 0xee */
+
+static final byte[] ch238data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch238 = new BitmapCharRec(3,9,1,0,2,ch238data);
+
+/* char: 0xed */
+
+static final byte[] ch237data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x40,
+};
+
+static final BitmapCharRec ch237 = new BitmapCharRec(2,9,0,0,2,ch237data);
+
+/* char: 0xec */
+
+static final byte[] ch236data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch236 = new BitmapCharRec(2,9,1,0,2,ch236data);
+
+/* char: 0xeb */
+
+static final byte[] ch235data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0xf0,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch235 = new BitmapCharRec(4,8,0,0,5,ch235data);
+
+/* char: 0xea */
+
+static final byte[] ch234data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0xf0,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch234 = new BitmapCharRec(4,9,0,0,5,ch234data);
+
+/* char: 0xe9 */
+
+static final byte[] ch233data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0xf0,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch233 = new BitmapCharRec(4,9,0,0,5,ch233data);
+
+/* char: 0xe8 */
+
+static final byte[] ch232data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0xf0,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch232 = new BitmapCharRec(4,9,0,0,5,ch232data);
+
+/* char: 0xe7 */
+
+static final byte[] ch231data = {
+(byte) 0x60,(byte) 0x20,(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0x80,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch231 = new BitmapCharRec(4,8,0,2,5,ch231data);
+
+/* char: 0xe6 */
+
+static final byte[] ch230data = {
+(byte) 0x6c,(byte) 0x92,(byte) 0x90,(byte) 0x7e,(byte) 0x12,(byte) 0xec,
+};
+
+static final BitmapCharRec ch230 = new BitmapCharRec(7,6,0,0,8,ch230data);
+
+/* char: 0xe5 */
+
+static final byte[] ch229data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,(byte) 0x20,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch229 = new BitmapCharRec(5,9,0,0,5,ch229data);
+
+/* char: 0xe4 */
+
+static final byte[] ch228data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch228 = new BitmapCharRec(5,8,0,0,5,ch228data);
+
+/* char: 0xe3 */
+
+static final byte[] ch227data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch227 = new BitmapCharRec(5,9,0,0,5,ch227data);
+
+/* char: 0xe2 */
+
+static final byte[] ch226data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,(byte) 0x0,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch226 = new BitmapCharRec(5,9,0,0,5,ch226data);
+
+/* char: 0xe1 */
+
+static final byte[] ch225data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch225 = new BitmapCharRec(5,9,0,0,5,ch225data);
+
+/* char: 0xe0 */
+
+static final byte[] ch224data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch224 = new BitmapCharRec(5,9,0,0,5,ch224data);
+
+/* char: 0xdf */
+
+static final byte[] ch223data = {
+(byte) 0xa0,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xa0,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch223 = new BitmapCharRec(4,8,0,0,5,ch223data);
+
+/* char: 0xde */
+
+static final byte[] ch222data = {
+(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x88,(byte) 0x88,(byte) 0xf0,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch222 = new BitmapCharRec(5,8,-1,0,7,ch222data);
+
+/* char: 0xdd */
+
+static final byte[] ch221data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x0,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch221 = new BitmapCharRec(7,11,0,0,7,ch221data);
+
+/* char: 0xdc */
+
+static final byte[] ch220data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x48,
+};
+
+static final BitmapCharRec ch220 = new BitmapCharRec(6,10,-1,0,8,ch220data);
+
+/* char: 0xdb */
+
+static final byte[] ch219data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch219 = new BitmapCharRec(6,11,-1,0,8,ch219data);
+
+/* char: 0xda */
+
+static final byte[] ch218data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch218 = new BitmapCharRec(6,11,-1,0,8,ch218data);
+
+/* char: 0xd9 */
+
+static final byte[] ch217data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch217 = new BitmapCharRec(6,11,-1,0,8,ch217data);
+
+/* char: 0xd8 */
+
+static final byte[] ch216data = {
+(byte) 0x80,(byte) 0x78,(byte) 0xc4,(byte) 0xa4,(byte) 0xa4,(byte) 0x94,(byte) 0x94,(byte) 0x8c,(byte) 0x78,(byte) 0x4,
+};
+
+static final BitmapCharRec ch216 = new BitmapCharRec(6,10,-1,1,8,ch216data);
+
+/* char: 0xd7 */
+
+static final byte[] ch215data = {
+(byte) 0x88,(byte) 0x50,(byte) 0x20,(byte) 0x50,(byte) 0x88,
+};
+
+static final BitmapCharRec ch215 = new BitmapCharRec(5,5,0,-1,6,ch215data);
+
+/* char: 0xd6 */
+
+static final byte[] ch214data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x48,
+};
+
+static final BitmapCharRec ch214 = new BitmapCharRec(6,10,-1,0,8,ch214data);
+
+/* char: 0xd5 */
+
+static final byte[] ch213data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch213 = new BitmapCharRec(6,11,-1,0,8,ch213data);
+
+/* char: 0xd4 */
+
+static final byte[] ch212data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch212 = new BitmapCharRec(6,11,-1,0,8,ch212data);
+
+/* char: 0xd3 */
+
+static final byte[] ch211data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch211 = new BitmapCharRec(6,11,-1,0,8,ch211data);
+
+/* char: 0xd2 */
+
+static final byte[] ch210data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch210 = new BitmapCharRec(6,11,-1,0,8,ch210data);
+
+/* char: 0xd1 */
+
+static final byte[] ch209data = {
+(byte) 0x8c,(byte) 0x8c,(byte) 0x94,(byte) 0x94,(byte) 0xa4,(byte) 0xa4,(byte) 0xc4,(byte) 0xc4,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch209 = new BitmapCharRec(6,11,-1,0,8,ch209data);
+
+/* char: 0xd0 */
+
+static final byte[] ch208data = {
+(byte) 0x78,(byte) 0x44,(byte) 0x42,(byte) 0x42,(byte) 0xf2,(byte) 0x42,(byte) 0x44,(byte) 0x78,
+};
+
+static final BitmapCharRec ch208 = new BitmapCharRec(7,8,0,0,8,ch208data);
+
+/* char: 0xcf */
+
+static final byte[] ch207data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch207 = new BitmapCharRec(3,10,0,0,3,ch207data);
+
+/* char: 0xce */
+
+static final byte[] ch206data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch206 = new BitmapCharRec(3,11,0,0,3,ch206data);
+
+/* char: 0xcd */
+
+static final byte[] ch205data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x40,
+};
+
+static final BitmapCharRec ch205 = new BitmapCharRec(2,11,-1,0,3,ch205data);
+
+/* char: 0xcc */
+
+static final byte[] ch204data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch204 = new BitmapCharRec(2,11,0,0,3,ch204data);
+
+/* char: 0xcb */
+
+static final byte[] ch203data = {
+(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch203 = new BitmapCharRec(5,10,-1,0,7,ch203data);
+
+/* char: 0xca */
+
+static final byte[] ch202data = {
+(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x0,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch202 = new BitmapCharRec(5,11,-1,0,7,ch202data);
+
+/* char: 0xc9 */
+
+static final byte[] ch201data = {
+(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch201 = new BitmapCharRec(5,11,-1,0,7,ch201data);
+
+/* char: 0xc8 */
+
+static final byte[] ch200data = {
+(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch200 = new BitmapCharRec(5,11,-1,0,7,ch200data);
+
+/* char: 0xc7 */
+
+static final byte[] ch199data = {
+(byte) 0x30,(byte) 0x10,(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch199 = new BitmapCharRec(6,10,-1,2,8,ch199data);
+
+/* char: 0xc6 */
+
+static final byte[] ch198data = {
+(byte) 0x8f,(byte) 0x80,(byte) 0x88,(byte) 0x0,(byte) 0x78,(byte) 0x0,(byte) 0x48,(byte) 0x0,(byte) 0x2f,(byte) 0x80,(byte) 0x28,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x1f,(byte) 0x80,
+};
+
+static final BitmapCharRec ch198 = new BitmapCharRec(9,8,0,0,10,ch198data);
+
+/* char: 0xc5 */
+
+static final byte[] ch197data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch197 = new BitmapCharRec(7,11,0,0,7,ch197data);
+
+/* char: 0xc4 */
+
+static final byte[] ch196data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x28,
+};
+
+static final BitmapCharRec ch196 = new BitmapCharRec(7,10,0,0,7,ch196data);
+
+/* char: 0xc3 */
+
+static final byte[] ch195data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x28,(byte) 0x14,
+};
+
+static final BitmapCharRec ch195 = new BitmapCharRec(7,11,0,0,7,ch195data);
+
+/* char: 0xc2 */
+
+static final byte[] ch194data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch194 = new BitmapCharRec(7,11,0,0,7,ch194data);
+
+/* char: 0xc1 */
+
+static final byte[] ch193data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch193 = new BitmapCharRec(7,11,0,0,7,ch193data);
+
+/* char: 0xc0 */
+
+static final byte[] ch192data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch192 = new BitmapCharRec(7,11,0,0,7,ch192data);
+
+/* char: 0xbf */
+
+static final byte[] ch191data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x0,(byte) 0x20,
+};
+
+static final BitmapCharRec ch191 = new BitmapCharRec(4,8,-1,2,6,ch191data);
+
+/* char: 0xbe */
+
+static final byte[] ch190data = {
+(byte) 0x21,(byte) 0x0,(byte) 0x17,(byte) 0x80,(byte) 0x13,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0xc8,(byte) 0x0,(byte) 0x24,(byte) 0x0,(byte) 0x44,(byte) 0x0,(byte) 0xe2,(byte) 0x0,
+};
+
+static final BitmapCharRec ch190 = new BitmapCharRec(9,8,0,0,9,ch190data);
+
+/* char: 0xbd */
+
+static final byte[] ch189data = {
+(byte) 0x27,(byte) 0x12,(byte) 0x15,(byte) 0xb,(byte) 0x48,(byte) 0x44,(byte) 0xc4,(byte) 0x42,
+};
+
+static final BitmapCharRec ch189 = new BitmapCharRec(8,8,0,0,9,ch189data);
+
+/* char: 0xbc */
+
+static final byte[] ch188data = {
+(byte) 0x21,(byte) 0x0,(byte) 0x17,(byte) 0x80,(byte) 0x13,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x48,(byte) 0x0,(byte) 0x44,(byte) 0x0,(byte) 0xc4,(byte) 0x0,(byte) 0x42,(byte) 0x0,
+};
+
+static final BitmapCharRec ch188 = new BitmapCharRec(9,8,0,0,9,ch188data);
+
+/* char: 0xbb */
+
+static final byte[] ch187data = {
+(byte) 0xa0,(byte) 0x50,(byte) 0x28,(byte) 0x50,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch187 = new BitmapCharRec(5,5,0,0,6,ch187data);
+
+/* char: 0xba */
+
+static final byte[] ch186data = {
+(byte) 0xe0,(byte) 0x0,(byte) 0xe0,(byte) 0xa0,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch186 = new BitmapCharRec(3,5,0,-3,4,ch186data);
+
+/* char: 0xb9 */
+
+static final byte[] ch185data = {
+(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch185 = new BitmapCharRec(2,4,0,-3,3,ch185data);
+
+/* char: 0xb8 */
+
+static final byte[] ch184data = {
+(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch184 = new BitmapCharRec(2,2,0,2,3,ch184data);
+
+/* char: 0xb7 */
+
+static final byte[] ch183data = {
+(byte) 0xc0,
+};
+
+static final BitmapCharRec ch183 = new BitmapCharRec(2,1,0,-3,3,ch183data);
+
+/* char: 0xb6 */
+
+static final byte[] ch182data = {
+(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x68,(byte) 0xe8,(byte) 0xe8,(byte) 0xe8,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch182 = new BitmapCharRec(6,10,0,2,6,ch182data);
+
+/* char: 0xb5 */
+
+static final byte[] ch181data = {
+(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,
+};
+
+static final BitmapCharRec ch181 = new BitmapCharRec(4,8,0,2,5,ch181data);
+
+/* char: 0xb4 */
+
+static final byte[] ch180data = {
+(byte) 0x80,(byte) 0x40,
+};
+
+static final BitmapCharRec ch180 = new BitmapCharRec(2,2,0,-6,3,ch180data);
+
+/* char: 0xb3 */
+
+static final byte[] ch179data = {
+(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch179 = new BitmapCharRec(3,4,0,-3,3,ch179data);
+
+/* char: 0xb2 */
+
+static final byte[] ch178data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0xa0,(byte) 0x60,
+};
+
+static final BitmapCharRec ch178 = new BitmapCharRec(3,4,0,-3,3,ch178data);
+
+/* char: 0xb1 */
+
+static final byte[] ch177data = {
+(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch177 = new BitmapCharRec(5,7,0,0,6,ch177data);
+
+/* char: 0xb0 */
+
+static final byte[] ch176data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch176 = new BitmapCharRec(4,4,0,-3,4,ch176data);
+
+/* char: 0xaf */
+
+static final byte[] ch175data = {
+(byte) 0xe0,
+};
+
+static final BitmapCharRec ch175 = new BitmapCharRec(3,1,0,-7,3,ch175data);
+
+/* char: 0xae */
+
+static final byte[] ch174data = {
+(byte) 0x38,(byte) 0x44,(byte) 0xaa,(byte) 0xb2,(byte) 0xba,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch174 = new BitmapCharRec(7,7,-1,0,9,ch174data);
+
+/* char: 0xad */
+
+static final byte[] ch173data = {
+(byte) 0xe0,
+};
+
+static final BitmapCharRec ch173 = new BitmapCharRec(3,1,0,-3,4,ch173data);
+
+/* char: 0xac */
+
+static final byte[] ch172data = {
+(byte) 0x8,(byte) 0x8,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch172 = new BitmapCharRec(5,3,-1,-2,7,ch172data);
+
+/* char: 0xab */
+
+static final byte[] ch171data = {
+(byte) 0x28,(byte) 0x50,(byte) 0xa0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch171 = new BitmapCharRec(5,5,0,0,6,ch171data);
+
+/* char: 0xaa */
+
+static final byte[] ch170data = {
+(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x20,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch170 = new BitmapCharRec(3,5,0,-3,4,ch170data);
+
+/* char: 0xa9 */
+
+static final byte[] ch169data = {
+(byte) 0x38,(byte) 0x44,(byte) 0x9a,(byte) 0xa2,(byte) 0x9a,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch169 = new BitmapCharRec(7,7,-1,0,9,ch169data);
+
+/* char: 0xa8 */
+
+static final byte[] ch168data = {
+(byte) 0xa0,
+};
+
+static final BitmapCharRec ch168 = new BitmapCharRec(3,1,0,-7,3,ch168data);
+
+/* char: 0xa7 */
+
+static final byte[] ch167data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x18,(byte) 0x70,(byte) 0xc8,(byte) 0x98,(byte) 0x70,(byte) 0xc0,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch167 = new BitmapCharRec(5,10,0,2,6,ch167data);
+
+/* char: 0xa6 */
+
+static final byte[] ch166data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch166 = new BitmapCharRec(1,10,-1,2,3,ch166data);
+
+/* char: 0xa5 */
+
+static final byte[] ch165data = {
+(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0xf8,(byte) 0x50,(byte) 0x50,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch165 = new BitmapCharRec(5,8,0,0,6,ch165data);
+
+/* char: 0xa4 */
+
+static final byte[] ch164data = {
+(byte) 0x90,(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x90,
+};
+
+static final BitmapCharRec ch164 = new BitmapCharRec(4,6,0,-1,5,ch164data);
+
+/* char: 0xa3 */
+
+static final byte[] ch163data = {
+(byte) 0xb0,(byte) 0x48,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch163 = new BitmapCharRec(5,8,0,0,6,ch163data);
+
+/* char: 0xa2 */
+
+static final byte[] ch162data = {
+(byte) 0x40,(byte) 0x70,(byte) 0xa8,(byte) 0xa0,(byte) 0xa0,(byte) 0xa8,(byte) 0x70,(byte) 0x10,
+};
+
+static final BitmapCharRec ch162 = new BitmapCharRec(5,8,0,1,6,ch162data);
+
+/* char: 0xa1 */
+
+static final byte[] ch161data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch161 = new BitmapCharRec(1,8,-1,2,3,ch161data);
+
+/* char: 0xa0 */
+
+static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,3,null);
+
+/* char: 0x7e '~' */
+
+static final byte[] ch126data = {
+(byte) 0x98,(byte) 0x64,
+};
+
+static final BitmapCharRec ch126 = new BitmapCharRec(6,2,0,-3,7,ch126data);
+
+/* char: 0x7d '}' */
+
+static final byte[] ch125data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch125 = new BitmapCharRec(3,10,0,2,3,ch125data);
+
+/* char: 0x7c '|' */
+
+static final byte[] ch124data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch124 = new BitmapCharRec(1,10,-1,2,3,ch124data);
+
+/* char: 0x7b '{' */
+
+static final byte[] ch123data = {
+(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch123 = new BitmapCharRec(3,10,0,2,3,ch123data);
+
+/* char: 0x7a 'z' */
+
+static final byte[] ch122data = {
+(byte) 0xf0,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch122 = new BitmapCharRec(4,6,0,0,5,ch122data);
+
+/* char: 0x79 'y' */
+
+static final byte[] ch121data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x60,(byte) 0xa0,(byte) 0xa0,(byte) 0x90,(byte) 0x90,
+};
+
+static final BitmapCharRec ch121 = new BitmapCharRec(4,8,0,2,5,ch121data);
+
+/* char: 0x78 'x' */
+
+static final byte[] ch120data = {
+(byte) 0x88,(byte) 0x88,(byte) 0x50,(byte) 0x20,(byte) 0x50,(byte) 0x88,
+};
+
+static final BitmapCharRec ch120 = new BitmapCharRec(5,6,0,0,6,ch120data);
+
+/* char: 0x77 'w' */
+
+static final byte[] ch119data = {
+(byte) 0x28,(byte) 0x28,(byte) 0x54,(byte) 0x54,(byte) 0x92,(byte) 0x92,
+};
+
+static final BitmapCharRec ch119 = new BitmapCharRec(7,6,0,0,8,ch119data);
+
+/* char: 0x76 'v' */
+
+static final byte[] ch118data = {
+(byte) 0x20,(byte) 0x20,(byte) 0x50,(byte) 0x50,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch118 = new BitmapCharRec(5,6,0,0,6,ch118data);
+
+/* char: 0x75 'u' */
+
+static final byte[] ch117data = {
+(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,
+};
+
+static final BitmapCharRec ch117 = new BitmapCharRec(4,6,0,0,5,ch117data);
+
+/* char: 0x74 't' */
+
+static final byte[] ch116data = {
+(byte) 0x60,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x40,
+};
+
+static final BitmapCharRec ch116 = new BitmapCharRec(3,8,0,0,4,ch116data);
+
+/* char: 0x73 's' */
+
+static final byte[] ch115data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x10,(byte) 0x60,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch115 = new BitmapCharRec(4,6,0,0,5,ch115data);
+
+/* char: 0x72 'r' */
+
+static final byte[] ch114data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch114 = new BitmapCharRec(3,6,0,0,4,ch114data);
+
+/* char: 0x71 'q' */
+
+static final byte[] ch113data = {
+(byte) 0x8,(byte) 0x8,(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x98,(byte) 0x68,
+};
+
+static final BitmapCharRec ch113 = new BitmapCharRec(5,8,0,2,6,ch113data);
+
+/* char: 0x70 'p' */
+
+static final byte[] ch112data = {
+(byte) 0x80,(byte) 0x80,(byte) 0xb0,(byte) 0xc8,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,
+};
+
+static final BitmapCharRec ch112 = new BitmapCharRec(5,8,0,2,6,ch112data);
+
+/* char: 0x6f 'o' */
+
+static final byte[] ch111data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch111 = new BitmapCharRec(5,6,0,0,6,ch111data);
+
+/* char: 0x6e 'n' */
+
+static final byte[] ch110data = {
+(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,
+};
+
+static final BitmapCharRec ch110 = new BitmapCharRec(5,6,0,0,6,ch110data);
+
+/* char: 0x6d 'm' */
+
+static final byte[] ch109data = {
+(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0xec,
+};
+
+static final BitmapCharRec ch109 = new BitmapCharRec(7,6,0,0,8,ch109data);
+
+/* char: 0x6c 'l' */
+
+static final byte[] ch108data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch108 = new BitmapCharRec(1,8,0,0,2,ch108data);
+
+/* char: 0x6b 'k' */
+
+static final byte[] ch107data = {
+(byte) 0x90,(byte) 0x90,(byte) 0xa0,(byte) 0xc0,(byte) 0xa0,(byte) 0x90,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch107 = new BitmapCharRec(4,8,0,0,5,ch107data);
+
+/* char: 0x6a 'j' */
+
+static final byte[] ch106data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch106 = new BitmapCharRec(1,9,0,1,2,ch106data);
+
+/* char: 0x69 'i' */
+
+static final byte[] ch105data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch105 = new BitmapCharRec(1,8,0,0,2,ch105data);
+
+/* char: 0x68 'h' */
+
+static final byte[] ch104data = {
+(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch104 = new BitmapCharRec(5,8,0,0,6,ch104data);
+
+/* char: 0x67 'g' */
+
+static final byte[] ch103data = {
+(byte) 0x70,(byte) 0x8,(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x98,(byte) 0x68,
+};
+
+static final BitmapCharRec ch103 = new BitmapCharRec(5,8,0,2,6,ch103data);
+
+/* char: 0x66 'f' */
+
+static final byte[] ch102data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x30,
+};
+
+static final BitmapCharRec ch102 = new BitmapCharRec(4,8,0,0,4,ch102data);
+
+/* char: 0x65 'e' */
+
+static final byte[] ch101data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0xf0,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch101 = new BitmapCharRec(4,6,0,0,5,ch101data);
+
+/* char: 0x64 'd' */
+
+static final byte[] ch100data = {
+(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x98,(byte) 0x68,(byte) 0x8,(byte) 0x8,
+};
+
+static final BitmapCharRec ch100 = new BitmapCharRec(5,8,0,0,6,ch100data);
+
+/* char: 0x63 'c' */
+
+static final byte[] ch99data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0x80,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch99 = new BitmapCharRec(4,6,0,0,5,ch99data);
+
+/* char: 0x62 'b' */
+
+static final byte[] ch98data = {
+(byte) 0xb0,(byte) 0xc8,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch98 = new BitmapCharRec(5,8,0,0,6,ch98data);
+
+/* char: 0x61 'a' */
+
+static final byte[] ch97data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch97 = new BitmapCharRec(5,6,0,0,5,ch97data);
+
+/* char: 0x60 '`' */
+
+static final byte[] ch96data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x40,
+};
+
+static final BitmapCharRec ch96 = new BitmapCharRec(2,3,0,-5,3,ch96data);
+
+/* char: 0x5f '_' */
+
+static final byte[] ch95data = {
+(byte) 0xfc,
+};
+
+static final BitmapCharRec ch95 = new BitmapCharRec(6,1,0,2,6,ch95data);
+
+/* char: 0x5e '^' */
+
+static final byte[] ch94data = {
+(byte) 0x88,(byte) 0x50,(byte) 0x50,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch94 = new BitmapCharRec(5,5,0,-3,6,ch94data);
+
+/* char: 0x5d ']' */
+
+static final byte[] ch93data = {
+(byte) 0xc0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch93 = new BitmapCharRec(2,10,0,2,3,ch93data);
+
+/* char: 0x5c '\' */
+
+static final byte[] ch92data = {
+(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch92 = new BitmapCharRec(3,8,0,0,3,ch92data);
+
+/* char: 0x5b '[' */
+
+static final byte[] ch91data = {
+(byte) 0xc0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch91 = new BitmapCharRec(2,10,-1,2,3,ch91data);
+
+/* char: 0x5a 'Z' */
+
+static final byte[] ch90data = {
+(byte) 0xf8,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch90 = new BitmapCharRec(5,8,-1,0,7,ch90data);
+
+/* char: 0x59 'Y' */
+
+static final byte[] ch89data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x82,
+};
+
+static final BitmapCharRec ch89 = new BitmapCharRec(7,8,0,0,7,ch89data);
+
+/* char: 0x58 'X' */
+
+static final byte[] ch88data = {
+(byte) 0x88,(byte) 0x88,(byte) 0x50,(byte) 0x50,(byte) 0x20,(byte) 0x50,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch88 = new BitmapCharRec(5,8,-1,0,7,ch88data);
+
+/* char: 0x57 'W' */
+
+static final byte[] ch87data = {
+(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x49,(byte) 0x0,(byte) 0x49,(byte) 0x0,(byte) 0x88,(byte) 0x80,(byte) 0x88,(byte) 0x80,
+};
+
+static final BitmapCharRec ch87 = new BitmapCharRec(9,8,0,0,9,ch87data);
+
+/* char: 0x56 'V' */
+
+static final byte[] ch86data = {
+(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch86 = new BitmapCharRec(7,8,0,0,7,ch86data);
+
+/* char: 0x55 'U' */
+
+static final byte[] ch85data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
+};
+
+static final BitmapCharRec ch85 = new BitmapCharRec(6,8,-1,0,8,ch85data);
+
+/* char: 0x54 'T' */
+
+static final byte[] ch84data = {
+(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch84 = new BitmapCharRec(5,8,0,0,5,ch84data);
+
+/* char: 0x53 'S' */
+
+static final byte[] ch83data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x8,(byte) 0x70,(byte) 0x80,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch83 = new BitmapCharRec(5,8,-1,0,7,ch83data);
+
+/* char: 0x52 'R' */
+
+static final byte[] ch82data = {
+(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xf0,(byte) 0x88,(byte) 0x88,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch82 = new BitmapCharRec(5,8,-1,0,7,ch82data);
+
+/* char: 0x51 'Q' */
+
+static final byte[] ch81data = {
+(byte) 0x2,(byte) 0x7c,(byte) 0x8c,(byte) 0x94,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch81 = new BitmapCharRec(7,9,-1,1,8,ch81data);
+
+/* char: 0x50 'P' */
+
+static final byte[] ch80data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x88,(byte) 0x88,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch80 = new BitmapCharRec(5,8,-1,0,7,ch80data);
+
+/* char: 0x4f 'O' */
+
+static final byte[] ch79data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch79 = new BitmapCharRec(6,8,-1,0,8,ch79data);
+
+/* char: 0x4e 'N' */
+
+static final byte[] ch78data = {
+(byte) 0x8c,(byte) 0x8c,(byte) 0x94,(byte) 0x94,(byte) 0xa4,(byte) 0xa4,(byte) 0xc4,(byte) 0xc4,
+};
+
+static final BitmapCharRec ch78 = new BitmapCharRec(6,8,-1,0,8,ch78data);
+
+/* char: 0x4d 'M' */
+
+static final byte[] ch77data = {
+(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0xaa,(byte) 0xaa,(byte) 0xc6,(byte) 0xc6,(byte) 0x82,
+};
+
+static final BitmapCharRec ch77 = new BitmapCharRec(7,8,-1,0,9,ch77data);
+
+/* char: 0x4c 'L' */
+
+static final byte[] ch76data = {
+(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch76 = new BitmapCharRec(4,8,-1,0,6,ch76data);
+
+/* char: 0x4b 'K' */
+
+static final byte[] ch75data = {
+(byte) 0x88,(byte) 0x88,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0xa0,(byte) 0x90,(byte) 0x88,
+};
+
+static final BitmapCharRec ch75 = new BitmapCharRec(5,8,-1,0,7,ch75data);
+
+/* char: 0x4a 'J' */
+
+static final byte[] ch74data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,
+};
+
+static final BitmapCharRec ch74 = new BitmapCharRec(4,8,0,0,5,ch74data);
+
+/* char: 0x49 'I' */
+
+static final byte[] ch73data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch73 = new BitmapCharRec(1,8,-1,0,3,ch73data);
+
+/* char: 0x48 'H' */
+
+static final byte[] ch72data = {
+(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x84,
+};
+
+static final BitmapCharRec ch72 = new BitmapCharRec(6,8,-1,0,8,ch72data);
+
+/* char: 0x47 'G' */
+
+static final byte[] ch71data = {
+(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x8c,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch71 = new BitmapCharRec(6,8,-1,0,8,ch71data);
+
+/* char: 0x46 'F' */
+
+static final byte[] ch70data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch70 = new BitmapCharRec(5,8,-1,0,6,ch70data);
+
+/* char: 0x45 'E' */
+
+static final byte[] ch69data = {
+(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch69 = new BitmapCharRec(5,8,-1,0,7,ch69data);
+
+/* char: 0x44 'D' */
+
+static final byte[] ch68data = {
+(byte) 0xf0,(byte) 0x88,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x88,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch68 = new BitmapCharRec(6,8,-1,0,8,ch68data);
+
+/* char: 0x43 'C' */
+
+static final byte[] ch67data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch67 = new BitmapCharRec(6,8,-1,0,8,ch67data);
+
+/* char: 0x42 'B' */
+
+static final byte[] ch66data = {
+(byte) 0xf0,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xf0,(byte) 0x88,(byte) 0x88,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch66 = new BitmapCharRec(5,8,-1,0,7,ch66data);
+
+/* char: 0x41 'A' */
+
+static final byte[] ch65data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,
+};
+
+static final BitmapCharRec ch65 = new BitmapCharRec(7,8,0,0,7,ch65data);
+
+/* char: 0x40 '@' */
+
+static final byte[] ch64data = {
+(byte) 0x3e,(byte) 0x0,(byte) 0x40,(byte) 0x0,(byte) 0x9b,(byte) 0x0,(byte) 0xa4,(byte) 0x80,(byte) 0xa4,(byte) 0x80,(byte) 0xa2,(byte) 0x40,(byte) 0x92,(byte) 0x40,(byte) 0x4d,(byte) 0x40,
+(byte) 0x20,(byte) 0x80,(byte) 0x1f,(byte) 0x0,
+};
+
+static final BitmapCharRec ch64 = new BitmapCharRec(10,10,0,2,11,ch64data);
+
+/* char: 0x3f '?' */
+
+static final byte[] ch63data = {
+(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch63 = new BitmapCharRec(4,8,-1,0,6,ch63data);
+
+/* char: 0x3e '>' */
+
+static final byte[] ch62data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch62 = new BitmapCharRec(3,5,-1,-1,6,ch62data);
+
+/* char: 0x3d '=' */
+
+static final byte[] ch61data = {
+(byte) 0xf0,(byte) 0x0,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch61 = new BitmapCharRec(4,3,0,-2,5,ch61data);
+
+/* char: 0x3c '<' */
+
+static final byte[] ch60data = {
+(byte) 0x20,(byte) 0x40,(byte) 0x80,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch60 = new BitmapCharRec(3,5,-1,-1,6,ch60data);
+
+/* char: 0x3b ';' */
+
+static final byte[] ch59data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch59 = new BitmapCharRec(2,8,0,2,3,ch59data);
+
+/* char: 0x3a ':' */
+
+static final byte[] ch58data = {
+(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch58 = new BitmapCharRec(1,6,-1,0,3,ch58data);
+
+/* char: 0x39 '9' */
+
+static final byte[] ch57data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch57 = new BitmapCharRec(5,8,0,0,6,ch57data);
+
+/* char: 0x38 '8' */
+
+static final byte[] ch56data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch56 = new BitmapCharRec(5,8,0,0,6,ch56data);
+
+/* char: 0x37 '7' */
+
+static final byte[] ch55data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x8,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch55 = new BitmapCharRec(5,8,0,0,6,ch55data);
+
+/* char: 0x36 '6' */
+
+static final byte[] ch54data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch54 = new BitmapCharRec(5,8,0,0,6,ch54data);
+
+/* char: 0x35 '5' */
+
+static final byte[] ch53data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch53 = new BitmapCharRec(5,8,0,0,6,ch53data);
+
+/* char: 0x34 '4' */
+
+static final byte[] ch52data = {
+(byte) 0x10,(byte) 0x10,(byte) 0xf8,(byte) 0x90,(byte) 0x50,(byte) 0x50,(byte) 0x30,(byte) 0x10,
+};
+
+static final BitmapCharRec ch52 = new BitmapCharRec(5,8,0,0,6,ch52data);
+
+/* char: 0x33 '3' */
+
+static final byte[] ch51data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch51 = new BitmapCharRec(5,8,0,0,6,ch51data);
+
+/* char: 0x32 '2' */
+
+static final byte[] ch50data = {
+(byte) 0xf8,(byte) 0x80,(byte) 0x40,(byte) 0x30,(byte) 0x8,(byte) 0x8,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch50 = new BitmapCharRec(5,8,0,0,6,ch50data);
+
+/* char: 0x31 '1' */
+
+static final byte[] ch49data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch49 = new BitmapCharRec(2,8,-1,0,6,ch49data);
+
+/* char: 0x30 '0' */
+
+static final byte[] ch48data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch48 = new BitmapCharRec(5,8,0,0,6,ch48data);
+
+/* char: 0x2f '/' */
+
+static final byte[] ch47data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch47 = new BitmapCharRec(3,8,0,0,3,ch47data);
+
+/* char: 0x2e '.' */
+
+static final byte[] ch46data = {
+(byte) 0x80,
+};
+
+static final BitmapCharRec ch46 = new BitmapCharRec(1,1,-1,0,3,ch46data);
+
+/* char: 0x2d '-' */
+
+static final byte[] ch45data = {
+(byte) 0xf8,
+};
+
+static final BitmapCharRec ch45 = new BitmapCharRec(5,1,-1,-3,7,ch45data);
+
+/* char: 0x2c ',' */
+
+static final byte[] ch44data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,
+};
+
+static final BitmapCharRec ch44 = new BitmapCharRec(2,3,0,2,3,ch44data);
+
+/* char: 0x2b '+' */
+
+static final byte[] ch43data = {
+(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch43 = new BitmapCharRec(5,5,0,-1,6,ch43data);
+
+/* char: 0x2a '*' */
+
+static final byte[] ch42data = {
+(byte) 0xa0,(byte) 0x40,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch42 = new BitmapCharRec(3,3,0,-5,4,ch42data);
+
+/* char: 0x29 ')' */
+
+static final byte[] ch41data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch41 = new BitmapCharRec(3,10,-1,2,4,ch41data);
+
+/* char: 0x28 '(' */
+
+static final byte[] ch40data = {
+(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch40 = new BitmapCharRec(3,10,0,2,4,ch40data);
+
+/* char: 0x27 ''' */
+
+static final byte[] ch39data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,
+};
+
+static final BitmapCharRec ch39 = new BitmapCharRec(2,3,-1,-5,3,ch39data);
+
+/* char: 0x26 '&' */
+
+static final byte[] ch38data = {
+(byte) 0x64,(byte) 0x98,(byte) 0x98,(byte) 0xa4,(byte) 0x60,(byte) 0x50,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch38 = new BitmapCharRec(6,8,-1,0,8,ch38data);
+
+/* char: 0x25 '%' */
+
+static final byte[] ch37data = {
+(byte) 0x26,(byte) 0x29,(byte) 0x16,(byte) 0x10,(byte) 0x8,(byte) 0x68,(byte) 0x94,(byte) 0x64,
+};
+
+static final BitmapCharRec ch37 = new BitmapCharRec(8,8,0,0,9,ch37data);
+
+/* char: 0x24 '$' */
+
+static final byte[] ch36data = {
+(byte) 0x20,(byte) 0x70,(byte) 0xa8,(byte) 0x28,(byte) 0x70,(byte) 0xa0,(byte) 0xa8,(byte) 0x70,(byte) 0x20,
+};
+
+static final BitmapCharRec ch36 = new BitmapCharRec(5,9,0,1,6,ch36data);
+
+/* char: 0x23 '#' */
+
+static final byte[] ch35data = {
+(byte) 0x50,(byte) 0x50,(byte) 0xf8,(byte) 0x28,(byte) 0x7c,(byte) 0x28,(byte) 0x28,
+};
+
+static final BitmapCharRec ch35 = new BitmapCharRec(6,7,0,0,6,ch35data);
+
+/* char: 0x22 '"' */
+
+static final byte[] ch34data = {
+(byte) 0xa0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch34 = new BitmapCharRec(3,2,-1,-6,4,ch34data);
+
+/* char: 0x21 '!' */
+
+static final byte[] ch33data = {
+(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch33 = new BitmapCharRec(1,8,-1,0,3,ch33data);
+
+/* char: 0x20 ' ' */
+
+static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,3,null);
+
+static final BitmapCharRec[] chars = {
+ch32,
+ch33,
+ch34,
+ch35,
+ch36,
+ch37,
+ch38,
+ch39,
+ch40,
+ch41,
+ch42,
+ch43,
+ch44,
+ch45,
+ch46,
+ch47,
+ch48,
+ch49,
+ch50,
+ch51,
+ch52,
+ch53,
+ch54,
+ch55,
+ch56,
+ch57,
+ch58,
+ch59,
+ch60,
+ch61,
+ch62,
+ch63,
+ch64,
+ch65,
+ch66,
+ch67,
+ch68,
+ch69,
+ch70,
+ch71,
+ch72,
+ch73,
+ch74,
+ch75,
+ch76,
+ch77,
+ch78,
+ch79,
+ch80,
+ch81,
+ch82,
+ch83,
+ch84,
+ch85,
+ch86,
+ch87,
+ch88,
+ch89,
+ch90,
+ch91,
+ch92,
+ch93,
+ch94,
+ch95,
+ch96,
+ch97,
+ch98,
+ch99,
+ch100,
+ch101,
+ch102,
+ch103,
+ch104,
+ch105,
+ch106,
+ch107,
+ch108,
+ch109,
+ch110,
+ch111,
+ch112,
+ch113,
+ch114,
+ch115,
+ch116,
+ch117,
+ch118,
+ch119,
+ch120,
+ch121,
+ch122,
+ch123,
+ch124,
+ch125,
+ch126,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+ch160,
+ch161,
+ch162,
+ch163,
+ch164,
+ch165,
+ch166,
+ch167,
+ch168,
+ch169,
+ch170,
+ch171,
+ch172,
+ch173,
+ch174,
+ch175,
+ch176,
+ch177,
+ch178,
+ch179,
+ch180,
+ch181,
+ch182,
+ch183,
+ch184,
+ch185,
+ch186,
+ch187,
+ch188,
+ch189,
+ch190,
+ch191,
+ch192,
+ch193,
+ch194,
+ch195,
+ch196,
+ch197,
+ch198,
+ch199,
+ch200,
+ch201,
+ch202,
+ch203,
+ch204,
+ch205,
+ch206,
+ch207,
+ch208,
+ch209,
+ch210,
+ch211,
+ch212,
+ch213,
+ch214,
+ch215,
+ch216,
+ch217,
+ch218,
+ch219,
+ch220,
+ch221,
+ch222,
+ch223,
+ch224,
+ch225,
+ch226,
+ch227,
+ch228,
+ch229,
+ch230,
+ch231,
+ch232,
+ch233,
+ch234,
+ch235,
+ch236,
+ch237,
+ch238,
+ch239,
+ch240,
+ch241,
+ch242,
+ch243,
+ch244,
+ch245,
+ch246,
+ch247,
+ch248,
+ch249,
+ch250,
+ch251,
+ch252,
+ch253,
+ch254,
+ch255,
+};
+
+  public static final BitmapFontRec glutBitmapHelvetica10 = new BitmapFontRec("-adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1",
+                                                                       224,
+                                                                       32,
+                                                                       chars);
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica12.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica12.java
new file mode 100644
index 000000000..bc86f6216
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica12.java
@@ -0,0 +1,1808 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+class GLUTBitmapHelvetica12 {
+
+/* GENERATED FILE -- DO NOT MODIFY */
+
+/* char: 0xff */
+
+static final byte[] ch255data = {
+(byte) 0xc0,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x30,(byte) 0x50,(byte) 0x50,(byte) 0x48,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch255 = new BitmapCharRec(5,12,-1,3,7,ch255data);
+
+/* char: 0xfe */
+
+static final byte[] ch254data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xb0,(byte) 0xc8,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch254 = new BitmapCharRec(5,12,-1,3,7,ch254data);
+
+/* char: 0xfd */
+
+static final byte[] ch253data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x50,(byte) 0x50,(byte) 0x90,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch253 = new BitmapCharRec(5,13,-1,3,7,ch253data);
+
+/* char: 0xfc */
+
+static final byte[] ch252data = {
+(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch252 = new BitmapCharRec(5,9,-1,0,7,ch252data);
+
+/* char: 0xfb */
+
+static final byte[] ch251data = {
+(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch251 = new BitmapCharRec(5,10,-1,0,7,ch251data);
+
+/* char: 0xfa */
+
+static final byte[] ch250data = {
+(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch250 = new BitmapCharRec(5,10,-1,0,7,ch250data);
+
+/* char: 0xf9 */
+
+static final byte[] ch249data = {
+(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch249 = new BitmapCharRec(5,10,-1,0,7,ch249data);
+
+/* char: 0xf8 */
+
+static final byte[] ch248data = {
+(byte) 0xb8,(byte) 0x44,(byte) 0x64,(byte) 0x54,(byte) 0x4c,(byte) 0x44,(byte) 0x3a,
+};
+
+static final BitmapCharRec ch248 = new BitmapCharRec(7,7,0,0,7,ch248data);
+
+/* char: 0xf7 */
+
+static final byte[] ch247data = {
+(byte) 0x20,(byte) 0x0,(byte) 0xf8,(byte) 0x0,(byte) 0x20,
+};
+
+static final BitmapCharRec ch247 = new BitmapCharRec(5,5,-1,-1,7,ch247data);
+
+/* char: 0xf6 */
+
+static final byte[] ch246data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch246 = new BitmapCharRec(5,9,-1,0,7,ch246data);
+
+/* char: 0xf5 */
+
+static final byte[] ch245data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch245 = new BitmapCharRec(5,10,-1,0,7,ch245data);
+
+/* char: 0xf4 */
+
+static final byte[] ch244data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch244 = new BitmapCharRec(5,10,-1,0,7,ch244data);
+
+/* char: 0xf3 */
+
+static final byte[] ch243data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch243 = new BitmapCharRec(5,10,-1,0,7,ch243data);
+
+/* char: 0xf2 */
+
+static final byte[] ch242data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch242 = new BitmapCharRec(5,10,-1,0,7,ch242data);
+
+/* char: 0xf1 */
+
+static final byte[] ch241data = {
+(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch241 = new BitmapCharRec(5,10,-1,0,7,ch241data);
+
+/* char: 0xf0 */
+
+static final byte[] ch240data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x50,(byte) 0x30,(byte) 0x68,
+};
+
+static final BitmapCharRec ch240 = new BitmapCharRec(5,10,-1,0,7,ch240data);
+
+/* char: 0xef */
+
+static final byte[] ch239data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch239 = new BitmapCharRec(3,9,0,0,3,ch239data);
+
+/* char: 0xee */
+
+static final byte[] ch238data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch238 = new BitmapCharRec(3,10,0,0,3,ch238data);
+
+/* char: 0xed */
+
+static final byte[] ch237data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x40,
+};
+
+static final BitmapCharRec ch237 = new BitmapCharRec(2,10,-1,0,3,ch237data);
+
+/* char: 0xec */
+
+static final byte[] ch236data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch236 = new BitmapCharRec(2,10,0,0,3,ch236data);
+
+/* char: 0xeb */
+
+static final byte[] ch235data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0xf8,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch235 = new BitmapCharRec(5,9,-1,0,7,ch235data);
+
+/* char: 0xea */
+
+static final byte[] ch234data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0xf8,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch234 = new BitmapCharRec(5,10,-1,0,7,ch234data);
+
+/* char: 0xe9 */
+
+static final byte[] ch233data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0xf8,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch233 = new BitmapCharRec(5,10,-1,0,7,ch233data);
+
+/* char: 0xe8 */
+
+static final byte[] ch232data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0xf8,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch232 = new BitmapCharRec(5,10,-1,0,7,ch232data);
+
+/* char: 0xe7 */
+
+static final byte[] ch231data = {
+(byte) 0x60,(byte) 0x10,(byte) 0x20,(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch231 = new BitmapCharRec(5,10,-1,3,7,ch231data);
+
+/* char: 0xe6 */
+
+static final byte[] ch230data = {
+(byte) 0x77,(byte) 0x0,(byte) 0x88,(byte) 0x80,(byte) 0x88,(byte) 0x0,(byte) 0x7f,(byte) 0x80,(byte) 0x8,(byte) 0x80,(byte) 0x88,(byte) 0x80,(byte) 0x77,(byte) 0x0,
+};
+
+static final BitmapCharRec ch230 = new BitmapCharRec(9,7,-1,0,11,ch230data);
+
+/* char: 0xe5 */
+
+static final byte[] ch229data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,(byte) 0x30,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch229 = new BitmapCharRec(6,10,-1,0,7,ch229data);
+
+/* char: 0xe4 */
+
+static final byte[] ch228data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch228 = new BitmapCharRec(6,9,-1,0,7,ch228data);
+
+/* char: 0xe3 */
+
+static final byte[] ch227data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch227 = new BitmapCharRec(6,10,-1,0,7,ch227data);
+
+/* char: 0xe2 */
+
+static final byte[] ch226data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch226 = new BitmapCharRec(6,10,-1,0,7,ch226data);
+
+/* char: 0xe1 */
+
+static final byte[] ch225data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch225 = new BitmapCharRec(6,10,-1,0,7,ch225data);
+
+/* char: 0xe0 */
+
+static final byte[] ch224data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch224 = new BitmapCharRec(6,10,-1,0,7,ch224data);
+
+/* char: 0xdf */
+
+static final byte[] ch223data = {
+(byte) 0xb0,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xb0,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch223 = new BitmapCharRec(5,9,-1,0,7,ch223data);
+
+/* char: 0xde */
+
+static final byte[] ch222data = {
+(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch222 = new BitmapCharRec(6,9,-1,0,8,ch222data);
+
+/* char: 0xdd */
+
+static final byte[] ch221data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,(byte) 0x0,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch221 = new BitmapCharRec(7,12,-1,0,9,ch221data);
+
+/* char: 0xdc */
+
+static final byte[] ch220data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x48,
+};
+
+static final BitmapCharRec ch220 = new BitmapCharRec(6,11,-1,0,8,ch220data);
+
+/* char: 0xdb */
+
+static final byte[] ch219data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch219 = new BitmapCharRec(6,12,-1,0,8,ch219data);
+
+/* char: 0xda */
+
+static final byte[] ch218data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch218 = new BitmapCharRec(6,12,-1,0,8,ch218data);
+
+/* char: 0xd9 */
+
+static final byte[] ch217data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch217 = new BitmapCharRec(6,12,-1,0,8,ch217data);
+
+/* char: 0xd8 */
+
+static final byte[] ch216data = {
+(byte) 0x80,(byte) 0x0,(byte) 0x5e,(byte) 0x0,(byte) 0x21,(byte) 0x0,(byte) 0x50,(byte) 0x80,(byte) 0x48,(byte) 0x80,(byte) 0x44,(byte) 0x80,(byte) 0x44,(byte) 0x80,(byte) 0x42,(byte) 0x80,
+(byte) 0x21,(byte) 0x0,(byte) 0x1e,(byte) 0x80,(byte) 0x0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch216 = new BitmapCharRec(10,11,0,1,10,ch216data);
+
+/* char: 0xd7 */
+
+static final byte[] ch215data = {
+(byte) 0x88,(byte) 0x50,(byte) 0x20,(byte) 0x50,(byte) 0x88,
+};
+
+static final BitmapCharRec ch215 = new BitmapCharRec(5,5,-1,-1,7,ch215data);
+
+/* char: 0xd6 */
+
+static final byte[] ch214data = {
+(byte) 0x3c,(byte) 0x42,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,(byte) 0x0,(byte) 0x24,
+};
+
+static final BitmapCharRec ch214 = new BitmapCharRec(8,11,-1,0,10,ch214data);
+
+/* char: 0xd5 */
+
+static final byte[] ch213data = {
+(byte) 0x3c,(byte) 0x42,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,(byte) 0x0,(byte) 0x28,(byte) 0x14,
+};
+
+static final BitmapCharRec ch213 = new BitmapCharRec(8,12,-1,0,10,ch213data);
+
+/* char: 0xd4 */
+
+static final byte[] ch212data = {
+(byte) 0x3c,(byte) 0x42,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,(byte) 0x0,(byte) 0x14,(byte) 0x8,
+};
+
+static final BitmapCharRec ch212 = new BitmapCharRec(8,12,-1,0,10,ch212data);
+
+/* char: 0xd3 */
+
+static final byte[] ch211data = {
+(byte) 0x3c,(byte) 0x42,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,(byte) 0x0,(byte) 0x8,(byte) 0x4,
+};
+
+static final BitmapCharRec ch211 = new BitmapCharRec(8,12,-1,0,10,ch211data);
+
+/* char: 0xd2 */
+
+static final byte[] ch210data = {
+(byte) 0x3c,(byte) 0x42,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,(byte) 0x0,(byte) 0x8,(byte) 0x10,
+};
+
+static final BitmapCharRec ch210 = new BitmapCharRec(8,12,-1,0,10,ch210data);
+
+/* char: 0xd1 */
+
+static final byte[] ch209data = {
+(byte) 0x82,(byte) 0x86,(byte) 0x8a,(byte) 0x8a,(byte) 0x92,(byte) 0xa2,(byte) 0xa2,(byte) 0xc2,(byte) 0x82,(byte) 0x0,(byte) 0x28,(byte) 0x14,
+};
+
+static final BitmapCharRec ch209 = new BitmapCharRec(7,12,-1,0,9,ch209data);
+
+/* char: 0xd0 */
+
+static final byte[] ch208data = {
+(byte) 0x7c,(byte) 0x42,(byte) 0x41,(byte) 0x41,(byte) 0xf1,(byte) 0x41,(byte) 0x41,(byte) 0x42,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch208 = new BitmapCharRec(8,9,0,0,9,ch208data);
+
+/* char: 0xcf */
+
+static final byte[] ch207data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch207 = new BitmapCharRec(3,11,0,0,3,ch207data);
+
+/* char: 0xce */
+
+static final byte[] ch206data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch206 = new BitmapCharRec(3,12,0,0,3,ch206data);
+
+/* char: 0xcd */
+
+static final byte[] ch205data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x40,
+};
+
+static final BitmapCharRec ch205 = new BitmapCharRec(2,12,-1,0,3,ch205data);
+
+/* char: 0xcc */
+
+static final byte[] ch204data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch204 = new BitmapCharRec(2,12,0,0,3,ch204data);
+
+/* char: 0xcb */
+
+static final byte[] ch203data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x28,
+};
+
+static final BitmapCharRec ch203 = new BitmapCharRec(6,11,-1,0,8,ch203data);
+
+/* char: 0xca */
+
+static final byte[] ch202data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch202 = new BitmapCharRec(6,12,-1,0,8,ch202data);
+
+/* char: 0xc9 */
+
+static final byte[] ch201data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch201 = new BitmapCharRec(6,12,-1,0,8,ch201data);
+
+/* char: 0xc8 */
+
+static final byte[] ch200data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch200 = new BitmapCharRec(6,12,-1,0,8,ch200data);
+
+/* char: 0xc7 */
+
+static final byte[] ch199data = {
+(byte) 0x30,(byte) 0x8,(byte) 0x8,(byte) 0x3c,(byte) 0x42,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x42,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch199 = new BitmapCharRec(7,12,-1,3,9,ch199data);
+
+/* char: 0xc6 */
+
+static final byte[] ch198data = {
+(byte) 0x8f,(byte) 0x80,(byte) 0x88,(byte) 0x0,(byte) 0x88,(byte) 0x0,(byte) 0x78,(byte) 0x0,(byte) 0x4f,(byte) 0x80,(byte) 0x48,(byte) 0x0,(byte) 0x28,(byte) 0x0,(byte) 0x28,(byte) 0x0,
+(byte) 0x1f,(byte) 0x80,
+};
+
+static final BitmapCharRec ch198 = new BitmapCharRec(9,9,-1,0,11,ch198data);
+
+/* char: 0xc5 */
+
+static final byte[] ch197data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch197 = new BitmapCharRec(7,12,-1,0,9,ch197data);
+
+/* char: 0xc4 */
+
+static final byte[] ch196data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x28,
+};
+
+static final BitmapCharRec ch196 = new BitmapCharRec(7,11,-1,0,9,ch196data);
+
+/* char: 0xc3 */
+
+static final byte[] ch195data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x28,(byte) 0x14,
+};
+
+static final BitmapCharRec ch195 = new BitmapCharRec(7,12,-1,0,9,ch195data);
+
+/* char: 0xc2 */
+
+static final byte[] ch194data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch194 = new BitmapCharRec(7,12,-1,0,9,ch194data);
+
+/* char: 0xc1 */
+
+static final byte[] ch193data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch193 = new BitmapCharRec(7,12,-1,0,9,ch193data);
+
+/* char: 0xc0 */
+
+static final byte[] ch192data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch192 = new BitmapCharRec(7,12,-1,0,9,ch192data);
+
+/* char: 0xbf */
+
+static final byte[] ch191data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x0,(byte) 0x20,
+};
+
+static final BitmapCharRec ch191 = new BitmapCharRec(5,9,-1,3,7,ch191data);
+
+/* char: 0xbe */
+
+static final byte[] ch190data = {
+(byte) 0x21,(byte) 0x0,(byte) 0x17,(byte) 0x80,(byte) 0x15,(byte) 0x0,(byte) 0xb,(byte) 0x0,(byte) 0xc9,(byte) 0x0,(byte) 0x24,(byte) 0x0,(byte) 0x44,(byte) 0x0,(byte) 0x22,(byte) 0x0,
+(byte) 0xe1,(byte) 0x0,
+};
+
+static final BitmapCharRec ch190 = new BitmapCharRec(9,9,0,0,10,ch190data);
+
+/* char: 0xbd */
+
+static final byte[] ch189data = {
+(byte) 0x47,(byte) 0x80,(byte) 0x22,(byte) 0x0,(byte) 0x11,(byte) 0x0,(byte) 0x14,(byte) 0x80,(byte) 0x4b,(byte) 0x0,(byte) 0x48,(byte) 0x0,(byte) 0x44,(byte) 0x0,(byte) 0xc2,(byte) 0x0,
+(byte) 0x41,(byte) 0x0,
+};
+
+static final BitmapCharRec ch189 = new BitmapCharRec(9,9,0,0,10,ch189data);
+
+/* char: 0xbc */
+
+static final byte[] ch188data = {
+(byte) 0x41,(byte) 0x0,(byte) 0x27,(byte) 0x80,(byte) 0x15,(byte) 0x0,(byte) 0x13,(byte) 0x0,(byte) 0x49,(byte) 0x0,(byte) 0x44,(byte) 0x0,(byte) 0x44,(byte) 0x0,(byte) 0xc2,(byte) 0x0,
+(byte) 0x41,(byte) 0x0,
+};
+
+static final BitmapCharRec ch188 = new BitmapCharRec(9,9,0,0,10,ch188data);
+
+/* char: 0xbb */
+
+static final byte[] ch187data = {
+(byte) 0xa0,(byte) 0x50,(byte) 0x28,(byte) 0x50,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch187 = new BitmapCharRec(5,5,-1,-1,7,ch187data);
+
+/* char: 0xba */
+
+static final byte[] ch186data = {
+(byte) 0xe0,(byte) 0x0,(byte) 0xe0,(byte) 0xa0,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch186 = new BitmapCharRec(3,5,-1,-4,5,ch186data);
+
+/* char: 0xb9 */
+
+static final byte[] ch185data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch185 = new BitmapCharRec(2,5,-1,-3,4,ch185data);
+
+/* char: 0xb8 */
+
+static final byte[] ch184data = {
+(byte) 0xc0,(byte) 0x20,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch184 = new BitmapCharRec(3,4,0,3,3,ch184data);
+
+/* char: 0xb7 */
+
+static final byte[] ch183data = {
+(byte) 0x80,
+};
+
+static final BitmapCharRec ch183 = new BitmapCharRec(1,1,-1,-3,3,ch183data);
+
+/* char: 0xb6 */
+
+static final byte[] ch182data = {
+(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x68,(byte) 0xe8,(byte) 0xe8,(byte) 0xe8,(byte) 0x68,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch182 = new BitmapCharRec(6,12,0,3,7,ch182data);
+
+/* char: 0xb5 */
+
+static final byte[] ch181data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xe8,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch181 = new BitmapCharRec(5,10,-1,3,7,ch181data);
+
+/* char: 0xb4 */
+
+static final byte[] ch180data = {
+(byte) 0x80,(byte) 0x40,
+};
+
+static final BitmapCharRec ch180 = new BitmapCharRec(2,2,0,-8,2,ch180data);
+
+/* char: 0xb3 */
+
+static final byte[] ch179data = {
+(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0x20,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch179 = new BitmapCharRec(3,5,0,-3,4,ch179data);
+
+/* char: 0xb2 */
+
+static final byte[] ch178data = {
+(byte) 0xf0,(byte) 0x40,(byte) 0x20,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch178 = new BitmapCharRec(4,5,0,-3,4,ch178data);
+
+/* char: 0xb1 */
+
+static final byte[] ch177data = {
+(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch177 = new BitmapCharRec(5,7,-1,0,7,ch177data);
+
+/* char: 0xb0 */
+
+static final byte[] ch176data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch176 = new BitmapCharRec(4,4,0,-4,5,ch176data);
+
+/* char: 0xaf */
+
+static final byte[] ch175data = {
+(byte) 0xf0,
+};
+
+static final BitmapCharRec ch175 = new BitmapCharRec(4,1,0,-8,4,ch175data);
+
+/* char: 0xae */
+
+static final byte[] ch174data = {
+(byte) 0x3e,(byte) 0x0,(byte) 0x41,(byte) 0x0,(byte) 0x94,(byte) 0x80,(byte) 0x94,(byte) 0x80,(byte) 0x98,(byte) 0x80,(byte) 0x94,(byte) 0x80,(byte) 0x9c,(byte) 0x80,(byte) 0x41,(byte) 0x0,
+(byte) 0x3e,(byte) 0x0,
+};
+
+static final BitmapCharRec ch174 = new BitmapCharRec(9,9,-1,0,11,ch174data);
+
+/* char: 0xad */
+
+static final byte[] ch173data = {
+(byte) 0xf0,
+};
+
+static final BitmapCharRec ch173 = new BitmapCharRec(4,1,0,-3,5,ch173data);
+
+/* char: 0xac */
+
+static final byte[] ch172data = {
+(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch172 = new BitmapCharRec(6,4,-1,-2,8,ch172data);
+
+/* char: 0xab */
+
+static final byte[] ch171data = {
+(byte) 0x28,(byte) 0x50,(byte) 0xa0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch171 = new BitmapCharRec(5,5,-1,-1,7,ch171data);
+
+/* char: 0xaa */
+
+static final byte[] ch170data = {
+(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x20,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch170 = new BitmapCharRec(3,5,-1,-4,5,ch170data);
+
+/* char: 0xa9 */
+
+static final byte[] ch169data = {
+(byte) 0x3e,(byte) 0x0,(byte) 0x41,(byte) 0x0,(byte) 0x9c,(byte) 0x80,(byte) 0xa2,(byte) 0x80,(byte) 0xa0,(byte) 0x80,(byte) 0xa2,(byte) 0x80,(byte) 0x9c,(byte) 0x80,(byte) 0x41,(byte) 0x0,
+(byte) 0x3e,(byte) 0x0,
+};
+
+static final BitmapCharRec ch169 = new BitmapCharRec(9,9,-1,0,11,ch169data);
+
+/* char: 0xa8 */
+
+static final byte[] ch168data = {
+(byte) 0xa0,
+};
+
+static final BitmapCharRec ch168 = new BitmapCharRec(3,1,0,-8,3,ch168data);
+
+/* char: 0xa7 */
+
+static final byte[] ch167data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x30,(byte) 0x48,(byte) 0x88,(byte) 0x88,(byte) 0x90,(byte) 0x60,(byte) 0x80,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch167 = new BitmapCharRec(5,12,0,3,6,ch167data);
+
+/* char: 0xa6 */
+
+static final byte[] ch166data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch166 = new BitmapCharRec(1,11,-1,2,3,ch166data);
+
+/* char: 0xa5 */
+
+static final byte[] ch165data = {
+(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x50,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch165 = new BitmapCharRec(5,9,-1,0,7,ch165data);
+
+/* char: 0xa4 */
+
+static final byte[] ch164data = {
+(byte) 0x84,(byte) 0x78,(byte) 0x48,(byte) 0x48,(byte) 0x78,(byte) 0x84,
+};
+
+static final BitmapCharRec ch164 = new BitmapCharRec(6,6,0,-1,7,ch164data);
+
+/* char: 0xa3 */
+
+static final byte[] ch163data = {
+(byte) 0xb0,(byte) 0x48,(byte) 0x20,(byte) 0x20,(byte) 0xf0,(byte) 0x40,(byte) 0x40,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch163 = new BitmapCharRec(5,9,-1,0,7,ch163data);
+
+/* char: 0xa2 */
+
+static final byte[] ch162data = {
+(byte) 0x40,(byte) 0x70,(byte) 0xc8,(byte) 0xa0,(byte) 0xa0,(byte) 0xa0,(byte) 0xa8,(byte) 0x70,(byte) 0x10,
+};
+
+static final BitmapCharRec ch162 = new BitmapCharRec(5,9,-1,1,7,ch162data);
+
+/* char: 0xa1 */
+
+static final byte[] ch161data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch161 = new BitmapCharRec(1,10,-1,3,3,ch161data);
+
+/* char: 0xa0 */
+
+static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,4,null);
+
+/* char: 0x7e '~' */
+
+static final byte[] ch126data = {
+(byte) 0x98,(byte) 0x64,
+};
+
+static final BitmapCharRec ch126 = new BitmapCharRec(6,2,0,-3,7,ch126data);
+
+/* char: 0x7d '}' */
+
+static final byte[] ch125data = {
+(byte) 0xc0,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch125 = new BitmapCharRec(4,12,0,3,4,ch125data);
+
+/* char: 0x7c '|' */
+
+static final byte[] ch124data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch124 = new BitmapCharRec(1,12,-1,3,3,ch124data);
+
+/* char: 0x7b '{' */
+
+static final byte[] ch123data = {
+(byte) 0x30,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x30,
+};
+
+static final BitmapCharRec ch123 = new BitmapCharRec(4,12,0,3,4,ch123data);
+
+/* char: 0x7a 'z' */
+
+static final byte[] ch122data = {
+(byte) 0xf0,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch122 = new BitmapCharRec(4,7,-1,0,6,ch122data);
+
+/* char: 0x79 'y' */
+
+static final byte[] ch121data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x50,(byte) 0x50,(byte) 0x90,(byte) 0x88,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch121 = new BitmapCharRec(5,10,-1,3,7,ch121data);
+
+/* char: 0x78 'x' */
+
+static final byte[] ch120data = {
+(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x30,(byte) 0x48,(byte) 0x84,
+};
+
+static final BitmapCharRec ch120 = new BitmapCharRec(6,7,0,0,6,ch120data);
+
+/* char: 0x77 'w' */
+
+static final byte[] ch119data = {
+(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x49,(byte) 0x0,(byte) 0x49,(byte) 0x0,(byte) 0x88,(byte) 0x80,(byte) 0x88,(byte) 0x80,
+};
+
+static final BitmapCharRec ch119 = new BitmapCharRec(9,7,0,0,9,ch119data);
+
+/* char: 0x76 'v' */
+
+static final byte[] ch118data = {
+(byte) 0x20,(byte) 0x20,(byte) 0x50,(byte) 0x50,(byte) 0x88,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch118 = new BitmapCharRec(5,7,-1,0,7,ch118data);
+
+/* char: 0x75 'u' */
+
+static final byte[] ch117data = {
+(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,
+};
+
+static final BitmapCharRec ch117 = new BitmapCharRec(5,7,-1,0,7,ch117data);
+
+/* char: 0x74 't' */
+
+static final byte[] ch116data = {
+(byte) 0x60,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x40,
+};
+
+static final BitmapCharRec ch116 = new BitmapCharRec(3,9,0,0,3,ch116data);
+
+/* char: 0x73 's' */
+
+static final byte[] ch115data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x10,(byte) 0x60,(byte) 0x80,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch115 = new BitmapCharRec(4,7,-1,0,6,ch115data);
+
+/* char: 0x72 'r' */
+
+static final byte[] ch114data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch114 = new BitmapCharRec(3,7,-1,0,4,ch114data);
+
+/* char: 0x71 'q' */
+
+static final byte[] ch113data = {
+(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x98,(byte) 0x68,
+};
+
+static final BitmapCharRec ch113 = new BitmapCharRec(5,10,-1,3,7,ch113data);
+
+/* char: 0x70 'p' */
+
+static final byte[] ch112data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xb0,(byte) 0xc8,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,
+};
+
+static final BitmapCharRec ch112 = new BitmapCharRec(5,10,-1,3,7,ch112data);
+
+/* char: 0x6f 'o' */
+
+static final byte[] ch111data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch111 = new BitmapCharRec(5,7,-1,0,7,ch111data);
+
+/* char: 0x6e 'n' */
+
+static final byte[] ch110data = {
+(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,
+};
+
+static final BitmapCharRec ch110 = new BitmapCharRec(5,7,-1,0,7,ch110data);
+
+/* char: 0x6d 'm' */
+
+static final byte[] ch109data = {
+(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0xda,(byte) 0xa4,
+};
+
+static final BitmapCharRec ch109 = new BitmapCharRec(7,7,-1,0,9,ch109data);
+
+/* char: 0x6c 'l' */
+
+static final byte[] ch108data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch108 = new BitmapCharRec(1,9,-1,0,3,ch108data);
+
+/* char: 0x6b 'k' */
+
+static final byte[] ch107data = {
+(byte) 0x88,(byte) 0x90,(byte) 0xa0,(byte) 0xc0,(byte) 0xc0,(byte) 0xa0,(byte) 0x90,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch107 = new BitmapCharRec(5,9,-1,0,6,ch107data);
+
+/* char: 0x6a 'j' */
+
+static final byte[] ch106data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch106 = new BitmapCharRec(2,12,0,3,3,ch106data);
+
+/* char: 0x69 'i' */
+
+static final byte[] ch105data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch105 = new BitmapCharRec(1,9,-1,0,3,ch105data);
+
+/* char: 0x68 'h' */
+
+static final byte[] ch104data = {
+(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch104 = new BitmapCharRec(5,9,-1,0,7,ch104data);
+
+/* char: 0x67 'g' */
+
+static final byte[] ch103data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x98,(byte) 0x68,
+};
+
+static final BitmapCharRec ch103 = new BitmapCharRec(5,10,-1,3,7,ch103data);
+
+/* char: 0x66 'f' */
+
+static final byte[] ch102data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x30,
+};
+
+static final BitmapCharRec ch102 = new BitmapCharRec(4,9,0,0,3,ch102data);
+
+/* char: 0x65 'e' */
+
+static final byte[] ch101data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0xf8,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch101 = new BitmapCharRec(5,7,-1,0,7,ch101data);
+
+/* char: 0x64 'd' */
+
+static final byte[] ch100data = {
+(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x98,(byte) 0x68,(byte) 0x8,(byte) 0x8,
+};
+
+static final BitmapCharRec ch100 = new BitmapCharRec(5,9,-1,0,7,ch100data);
+
+/* char: 0x63 'c' */
+
+static final byte[] ch99data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch99 = new BitmapCharRec(5,7,-1,0,7,ch99data);
+
+/* char: 0x62 'b' */
+
+static final byte[] ch98data = {
+(byte) 0xb0,(byte) 0xc8,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch98 = new BitmapCharRec(5,9,-1,0,7,ch98data);
+
+/* char: 0x61 'a' */
+
+static final byte[] ch97data = {
+(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch97 = new BitmapCharRec(6,7,-1,0,7,ch97data);
+
+/* char: 0x60 '`' */
+
+static final byte[] ch96data = {
+(byte) 0xc0,(byte) 0x80,(byte) 0x40,
+};
+
+static final BitmapCharRec ch96 = new BitmapCharRec(2,3,0,-6,3,ch96data);
+
+/* char: 0x5f '_' */
+
+static final byte[] ch95data = {
+(byte) 0xfe,
+};
+
+static final BitmapCharRec ch95 = new BitmapCharRec(7,1,0,2,7,ch95data);
+
+/* char: 0x5e '^' */
+
+static final byte[] ch94data = {
+(byte) 0x88,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch94 = new BitmapCharRec(5,3,0,-5,6,ch94data);
+
+/* char: 0x5d ']' */
+
+static final byte[] ch93data = {
+(byte) 0xc0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch93 = new BitmapCharRec(2,12,0,3,3,ch93data);
+
+/* char: 0x5c '\' */
+
+static final byte[] ch92data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch92 = new BitmapCharRec(4,9,0,0,4,ch92data);
+
+/* char: 0x5b '[' */
+
+static final byte[] ch91data = {
+(byte) 0xc0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch91 = new BitmapCharRec(2,12,-1,3,3,ch91data);
+
+/* char: 0x5a 'Z' */
+
+static final byte[] ch90data = {
+(byte) 0xfe,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch90 = new BitmapCharRec(7,9,-1,0,9,ch90data);
+
+/* char: 0x59 'Y' */
+
+static final byte[] ch89data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch89 = new BitmapCharRec(7,9,-1,0,9,ch89data);
+
+/* char: 0x58 'X' */
+
+static final byte[] ch88data = {
+(byte) 0x82,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x82,
+};
+
+static final BitmapCharRec ch88 = new BitmapCharRec(7,9,-1,0,9,ch88data);
+
+/* char: 0x57 'W' */
+
+static final byte[] ch87data = {
+(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x49,(byte) 0x0,(byte) 0x88,(byte) 0x80,(byte) 0x88,(byte) 0x80,
+(byte) 0x88,(byte) 0x80,
+};
+
+static final BitmapCharRec ch87 = new BitmapCharRec(9,9,-1,0,11,ch87data);
+
+/* char: 0x56 'V' */
+
+static final byte[] ch86data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch86 = new BitmapCharRec(7,9,-1,0,9,ch86data);
+
+/* char: 0x55 'U' */
+
+static final byte[] ch85data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
+};
+
+static final BitmapCharRec ch85 = new BitmapCharRec(6,9,-1,0,8,ch85data);
+
+/* char: 0x54 'T' */
+
+static final byte[] ch84data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch84 = new BitmapCharRec(7,9,0,0,7,ch84data);
+
+/* char: 0x53 'S' */
+
+static final byte[] ch83data = {
+(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x4,(byte) 0x18,(byte) 0x60,(byte) 0x80,(byte) 0x84,(byte) 0x78,
+};
+
+static final BitmapCharRec ch83 = new BitmapCharRec(6,9,-1,0,8,ch83data);
+
+/* char: 0x52 'R' */
+
+static final byte[] ch82data = {
+(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x88,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch82 = new BitmapCharRec(6,9,-1,0,8,ch82data);
+
+/* char: 0x51 'Q' */
+
+static final byte[] ch81data = {
+(byte) 0x3d,(byte) 0x42,(byte) 0x85,(byte) 0x89,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch81 = new BitmapCharRec(8,9,-1,0,10,ch81data);
+
+/* char: 0x50 'P' */
+
+static final byte[] ch80data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch80 = new BitmapCharRec(6,9,-1,0,8,ch80data);
+
+/* char: 0x4f 'O' */
+
+static final byte[] ch79data = {
+(byte) 0x3c,(byte) 0x42,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch79 = new BitmapCharRec(8,9,-1,0,10,ch79data);
+
+/* char: 0x4e 'N' */
+
+static final byte[] ch78data = {
+(byte) 0x82,(byte) 0x86,(byte) 0x8a,(byte) 0x8a,(byte) 0x92,(byte) 0xa2,(byte) 0xa2,(byte) 0xc2,(byte) 0x82,
+};
+
+static final BitmapCharRec ch78 = new BitmapCharRec(7,9,-1,0,9,ch78data);
+
+/* char: 0x4d 'M' */
+
+static final byte[] ch77data = {
+(byte) 0x88,(byte) 0x80,(byte) 0x88,(byte) 0x80,(byte) 0x94,(byte) 0x80,(byte) 0x94,(byte) 0x80,(byte) 0xa2,(byte) 0x80,(byte) 0xa2,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,
+(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch77 = new BitmapCharRec(9,9,-1,0,11,ch77data);
+
+/* char: 0x4c 'L' */
+
+static final byte[] ch76data = {
+(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch76 = new BitmapCharRec(5,9,-1,0,7,ch76data);
+
+/* char: 0x4b 'K' */
+
+static final byte[] ch75data = {
+(byte) 0x82,(byte) 0x84,(byte) 0x88,(byte) 0x90,(byte) 0xe0,(byte) 0xa0,(byte) 0x90,(byte) 0x88,(byte) 0x84,
+};
+
+static final BitmapCharRec ch75 = new BitmapCharRec(7,9,-1,0,8,ch75data);
+
+/* char: 0x4a 'J' */
+
+static final byte[] ch74data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,
+};
+
+static final BitmapCharRec ch74 = new BitmapCharRec(5,9,-1,0,7,ch74data);
+
+/* char: 0x49 'I' */
+
+static final byte[] ch73data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch73 = new BitmapCharRec(1,9,-1,0,3,ch73data);
+
+/* char: 0x48 'H' */
+
+static final byte[] ch72data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,
+};
+
+static final BitmapCharRec ch72 = new BitmapCharRec(7,9,-1,0,9,ch72data);
+
+/* char: 0x47 'G' */
+
+static final byte[] ch71data = {
+(byte) 0x3a,(byte) 0x46,(byte) 0x82,(byte) 0x82,(byte) 0x8e,(byte) 0x80,(byte) 0x80,(byte) 0x42,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch71 = new BitmapCharRec(7,9,-1,0,9,ch71data);
+
+/* char: 0x46 'F' */
+
+static final byte[] ch70data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch70 = new BitmapCharRec(6,9,-1,0,8,ch70data);
+
+/* char: 0x45 'E' */
+
+static final byte[] ch69data = {
+(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch69 = new BitmapCharRec(6,9,-1,0,8,ch69data);
+
+/* char: 0x44 'D' */
+
+static final byte[] ch68data = {
+(byte) 0xf8,(byte) 0x84,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x84,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch68 = new BitmapCharRec(7,9,-1,0,9,ch68data);
+
+/* char: 0x43 'C' */
+
+static final byte[] ch67data = {
+(byte) 0x3c,(byte) 0x42,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x42,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch67 = new BitmapCharRec(7,9,-1,0,9,ch67data);
+
+/* char: 0x42 'B' */
+
+static final byte[] ch66data = {
+(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch66 = new BitmapCharRec(6,9,-1,0,8,ch66data);
+
+/* char: 0x41 'A' */
+
+static final byte[] ch65data = {
+(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch65 = new BitmapCharRec(7,9,-1,0,9,ch65data);
+
+/* char: 0x40 '@' */
+
+static final byte[] ch64data = {
+(byte) 0x3e,(byte) 0x0,(byte) 0x40,(byte) 0x0,(byte) 0x9b,(byte) 0x0,(byte) 0xa6,(byte) 0x80,(byte) 0xa2,(byte) 0x40,(byte) 0xa2,(byte) 0x40,(byte) 0x92,(byte) 0x40,(byte) 0x4d,(byte) 0x40,
+(byte) 0x60,(byte) 0x80,(byte) 0x1f,(byte) 0x0,
+};
+
+static final BitmapCharRec ch64 = new BitmapCharRec(10,10,-1,1,12,ch64data);
+
+/* char: 0x3f '?' */
+
+static final byte[] ch63data = {
+(byte) 0x20,(byte) 0x0,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch63 = new BitmapCharRec(5,9,-1,0,7,ch63data);
+
+/* char: 0x3e '>' */
+
+static final byte[] ch62data = {
+(byte) 0xc0,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch62 = new BitmapCharRec(6,5,-1,-1,7,ch62data);
+
+/* char: 0x3d '=' */
+
+static final byte[] ch61data = {
+(byte) 0xf8,(byte) 0x0,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch61 = new BitmapCharRec(5,3,-1,-2,7,ch61data);
+
+/* char: 0x3c '<' */
+
+static final byte[] ch60data = {
+(byte) 0xc,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc,
+};
+
+static final BitmapCharRec ch60 = new BitmapCharRec(6,5,0,-1,7,ch60data);
+
+/* char: 0x3b ';' */
+
+static final byte[] ch59data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch59 = new BitmapCharRec(2,8,0,2,3,ch59data);
+
+/* char: 0x3a ':' */
+
+static final byte[] ch58data = {
+(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch58 = new BitmapCharRec(1,6,-1,0,3,ch58data);
+
+/* char: 0x39 '9' */
+
+static final byte[] ch57data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0x78,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch57 = new BitmapCharRec(5,9,-1,0,7,ch57data);
+
+/* char: 0x38 '8' */
+
+static final byte[] ch56data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch56 = new BitmapCharRec(5,9,-1,0,7,ch56data);
+
+/* char: 0x37 '7' */
+
+static final byte[] ch55data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x8,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch55 = new BitmapCharRec(5,9,-1,0,7,ch55data);
+
+/* char: 0x36 '6' */
+
+static final byte[] ch54data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch54 = new BitmapCharRec(5,9,-1,0,7,ch54data);
+
+/* char: 0x35 '5' */
+
+static final byte[] ch53data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch53 = new BitmapCharRec(5,9,-1,0,7,ch53data);
+
+/* char: 0x34 '4' */
+
+static final byte[] ch52data = {
+(byte) 0x8,(byte) 0x8,(byte) 0xfc,(byte) 0x88,(byte) 0x48,(byte) 0x28,(byte) 0x28,(byte) 0x18,(byte) 0x8,
+};
+
+static final BitmapCharRec ch52 = new BitmapCharRec(6,9,0,0,7,ch52data);
+
+/* char: 0x33 '3' */
+
+static final byte[] ch51data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch51 = new BitmapCharRec(5,9,-1,0,7,ch51data);
+
+/* char: 0x32 '2' */
+
+static final byte[] ch50data = {
+(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch50 = new BitmapCharRec(5,9,-1,0,7,ch50data);
+
+/* char: 0x31 '1' */
+
+static final byte[] ch49data = {
+(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,(byte) 0x20,
+};
+
+static final BitmapCharRec ch49 = new BitmapCharRec(3,9,-1,0,7,ch49data);
+
+/* char: 0x30 '0' */
+
+static final byte[] ch48data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,
+};
+
+static final BitmapCharRec ch48 = new BitmapCharRec(5,9,-1,0,7,ch48data);
+
+/* char: 0x2f '/' */
+
+static final byte[] ch47data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x10,
+};
+
+static final BitmapCharRec ch47 = new BitmapCharRec(4,9,0,0,4,ch47data);
+
+/* char: 0x2e '.' */
+
+static final byte[] ch46data = {
+(byte) 0x80,
+};
+
+static final BitmapCharRec ch46 = new BitmapCharRec(1,1,-1,0,3,ch46data);
+
+/* char: 0x2d '-' */
+
+static final byte[] ch45data = {
+(byte) 0xf8,
+};
+
+static final BitmapCharRec ch45 = new BitmapCharRec(5,1,-1,-3,8,ch45data);
+
+/* char: 0x2c ',' */
+
+static final byte[] ch44data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,
+};
+
+static final BitmapCharRec ch44 = new BitmapCharRec(2,3,-1,2,4,ch44data);
+
+/* char: 0x2b '+' */
+
+static final byte[] ch43data = {
+(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch43 = new BitmapCharRec(5,5,-1,-1,7,ch43data);
+
+/* char: 0x2a '*' */
+
+static final byte[] ch42data = {
+(byte) 0xa0,(byte) 0x40,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch42 = new BitmapCharRec(3,3,-1,-6,5,ch42data);
+
+/* char: 0x29 ')' */
+
+static final byte[] ch41data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch41 = new BitmapCharRec(3,12,0,3,4,ch41data);
+
+/* char: 0x28 '(' */
+
+static final byte[] ch40data = {
+(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch40 = new BitmapCharRec(3,12,-1,3,4,ch40data);
+
+/* char: 0x27 ''' */
+
+static final byte[] ch39data = {
+(byte) 0x80,(byte) 0x40,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch39 = new BitmapCharRec(2,3,-1,-6,3,ch39data);
+
+/* char: 0x26 '&' */
+
+static final byte[] ch38data = {
+(byte) 0x72,(byte) 0x8c,(byte) 0x84,(byte) 0x8a,(byte) 0x50,(byte) 0x30,(byte) 0x48,(byte) 0x48,(byte) 0x30,
+};
+
+static final BitmapCharRec ch38 = new BitmapCharRec(7,9,-1,0,9,ch38data);
+
+/* char: 0x25 '%' */
+
+static final byte[] ch37data = {
+(byte) 0x23,(byte) 0x0,(byte) 0x14,(byte) 0x80,(byte) 0x14,(byte) 0x80,(byte) 0x13,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x68,(byte) 0x0,(byte) 0x94,(byte) 0x0,(byte) 0x94,(byte) 0x0,
+(byte) 0x62,(byte) 0x0,
+};
+
+static final BitmapCharRec ch37 = new BitmapCharRec(9,9,-1,0,11,ch37data);
+
+/* char: 0x24 '$' */
+
+static final byte[] ch36data = {
+(byte) 0x20,(byte) 0x70,(byte) 0xa8,(byte) 0xa8,(byte) 0x28,(byte) 0x70,(byte) 0xa0,(byte) 0xa8,(byte) 0x70,(byte) 0x20,
+};
+
+static final BitmapCharRec ch36 = new BitmapCharRec(5,10,-1,1,7,ch36data);
+
+/* char: 0x23 '#' */
+
+static final byte[] ch35data = {
+(byte) 0x50,(byte) 0x50,(byte) 0x50,(byte) 0xfc,(byte) 0x28,(byte) 0xfc,(byte) 0x28,(byte) 0x28,
+};
+
+static final BitmapCharRec ch35 = new BitmapCharRec(6,8,0,0,7,ch35data);
+
+/* char: 0x22 '"' */
+
+static final byte[] ch34data = {
+(byte) 0xa0,(byte) 0xa0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch34 = new BitmapCharRec(3,3,-1,-6,5,ch34data);
+
+/* char: 0x21 '!' */
+
+static final byte[] ch33data = {
+(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch33 = new BitmapCharRec(1,9,-1,0,3,ch33data);
+
+/* char: 0x20 ' ' */
+
+static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,4,null);
+
+static final BitmapCharRec[] chars = {
+ch32,
+ch33,
+ch34,
+ch35,
+ch36,
+ch37,
+ch38,
+ch39,
+ch40,
+ch41,
+ch42,
+ch43,
+ch44,
+ch45,
+ch46,
+ch47,
+ch48,
+ch49,
+ch50,
+ch51,
+ch52,
+ch53,
+ch54,
+ch55,
+ch56,
+ch57,
+ch58,
+ch59,
+ch60,
+ch61,
+ch62,
+ch63,
+ch64,
+ch65,
+ch66,
+ch67,
+ch68,
+ch69,
+ch70,
+ch71,
+ch72,
+ch73,
+ch74,
+ch75,
+ch76,
+ch77,
+ch78,
+ch79,
+ch80,
+ch81,
+ch82,
+ch83,
+ch84,
+ch85,
+ch86,
+ch87,
+ch88,
+ch89,
+ch90,
+ch91,
+ch92,
+ch93,
+ch94,
+ch95,
+ch96,
+ch97,
+ch98,
+ch99,
+ch100,
+ch101,
+ch102,
+ch103,
+ch104,
+ch105,
+ch106,
+ch107,
+ch108,
+ch109,
+ch110,
+ch111,
+ch112,
+ch113,
+ch114,
+ch115,
+ch116,
+ch117,
+ch118,
+ch119,
+ch120,
+ch121,
+ch122,
+ch123,
+ch124,
+ch125,
+ch126,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+ch160,
+ch161,
+ch162,
+ch163,
+ch164,
+ch165,
+ch166,
+ch167,
+ch168,
+ch169,
+ch170,
+ch171,
+ch172,
+ch173,
+ch174,
+ch175,
+ch176,
+ch177,
+ch178,
+ch179,
+ch180,
+ch181,
+ch182,
+ch183,
+ch184,
+ch185,
+ch186,
+ch187,
+ch188,
+ch189,
+ch190,
+ch191,
+ch192,
+ch193,
+ch194,
+ch195,
+ch196,
+ch197,
+ch198,
+ch199,
+ch200,
+ch201,
+ch202,
+ch203,
+ch204,
+ch205,
+ch206,
+ch207,
+ch208,
+ch209,
+ch210,
+ch211,
+ch212,
+ch213,
+ch214,
+ch215,
+ch216,
+ch217,
+ch218,
+ch219,
+ch220,
+ch221,
+ch222,
+ch223,
+ch224,
+ch225,
+ch226,
+ch227,
+ch228,
+ch229,
+ch230,
+ch231,
+ch232,
+ch233,
+ch234,
+ch235,
+ch236,
+ch237,
+ch238,
+ch239,
+ch240,
+ch241,
+ch242,
+ch243,
+ch244,
+ch245,
+ch246,
+ch247,
+ch248,
+ch249,
+ch250,
+ch251,
+ch252,
+ch253,
+ch254,
+ch255,
+};
+
+  public static final BitmapFontRec glutBitmapHelvetica12 = new BitmapFontRec("-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1",
+                                                                       224,
+                                                                       32,
+                                                                       chars);
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica18.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica18.java
new file mode 100644
index 000000000..1b2e69ba4
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica18.java
@@ -0,0 +1,1917 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+class GLUTBitmapHelvetica18 {
+
+/* GENERATED FILE -- DO NOT MODIFY */
+
+/* char: 0xff */
+
+static final byte[] ch255data = {
+(byte) 0x70,(byte) 0x70,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x3c,(byte) 0x24,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x0,(byte) 0x66,
+(byte) 0x66,
+};
+
+static final BitmapCharRec ch255 = new BitmapCharRec(8,17,-1,4,10,ch255data);
+
+/* char: 0xfe */
+
+static final byte[] ch254data = {
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xde,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xe3,(byte) 0x0,(byte) 0xc1,(byte) 0x80,
+(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xe3,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xde,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch254 = new BitmapCharRec(9,18,-1,4,11,ch254data);
+
+/* char: 0xfd */
+
+static final byte[] ch253data = {
+(byte) 0x70,(byte) 0x70,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x3c,(byte) 0x24,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x0,(byte) 0x18,
+(byte) 0xc,(byte) 0x6,
+};
+
+static final BitmapCharRec ch253 = new BitmapCharRec(8,18,-1,4,10,ch253data);
+
+/* char: 0xfc */
+
+static final byte[] ch252data = {
+(byte) 0x73,(byte) 0xfb,(byte) 0xc7,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x0,(byte) 0x66,(byte) 0x66,
+};
+
+static final BitmapCharRec ch252 = new BitmapCharRec(8,13,-1,0,10,ch252data);
+
+/* char: 0xfb */
+
+static final byte[] ch251data = {
+(byte) 0x73,(byte) 0xfb,(byte) 0xc7,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x0,(byte) 0x66,(byte) 0x3c,(byte) 0x18,
+};
+
+static final BitmapCharRec ch251 = new BitmapCharRec(8,14,-1,0,10,ch251data);
+
+/* char: 0xfa */
+
+static final byte[] ch250data = {
+(byte) 0x73,(byte) 0xfb,(byte) 0xc7,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x6,
+};
+
+static final BitmapCharRec ch250 = new BitmapCharRec(8,14,-1,0,10,ch250data);
+
+/* char: 0xf9 */
+
+static final byte[] ch249data = {
+(byte) 0x73,(byte) 0xfb,(byte) 0xc7,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x30,
+};
+
+static final BitmapCharRec ch249 = new BitmapCharRec(8,14,-1,0,10,ch249data);
+
+/* char: 0xf8 */
+
+static final byte[] ch248data = {
+(byte) 0xce,(byte) 0x0,(byte) 0x7f,(byte) 0x80,(byte) 0x31,(byte) 0x80,(byte) 0x78,(byte) 0xc0,(byte) 0x6c,(byte) 0xc0,(byte) 0x66,(byte) 0xc0,(byte) 0x63,(byte) 0xc0,(byte) 0x31,(byte) 0x80,
+(byte) 0x3f,(byte) 0xc0,(byte) 0xe,(byte) 0x60,
+};
+
+static final BitmapCharRec ch248 = new BitmapCharRec(11,10,0,0,11,ch248data);
+
+/* char: 0xf7 */
+
+static final byte[] ch247data = {
+(byte) 0x18,(byte) 0x18,(byte) 0x0,(byte) 0xff,(byte) 0xff,(byte) 0x0,(byte) 0x18,(byte) 0x18,
+};
+
+static final BitmapCharRec ch247 = new BitmapCharRec(8,8,-1,-1,10,ch247data);
+
+/* char: 0xf6 */
+
+static final byte[] ch246data = {
+(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
+(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x36,(byte) 0x0,(byte) 0x36,(byte) 0x0,
+};
+
+static final BitmapCharRec ch246 = new BitmapCharRec(9,13,-1,0,11,ch246data);
+
+/* char: 0xf5 */
+
+static final byte[] ch245data = {
+(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
+(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x26,(byte) 0x0,(byte) 0x2d,(byte) 0x0,(byte) 0x19,(byte) 0x0,
+};
+
+static final BitmapCharRec ch245 = new BitmapCharRec(9,14,-1,0,11,ch245data);
+
+/* char: 0xf4 */
+
+static final byte[] ch244data = {
+(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
+(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0xc,(byte) 0x0,
+};
+
+static final BitmapCharRec ch244 = new BitmapCharRec(9,14,-1,0,11,ch244data);
+
+/* char: 0xf3 */
+
+static final byte[] ch243data = {
+(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
+(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+};
+
+static final BitmapCharRec ch243 = new BitmapCharRec(9,14,-1,0,11,ch243data);
+
+/* char: 0xf2 */
+
+static final byte[] ch242data = {
+(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
+(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x30,(byte) 0x0,
+};
+
+static final BitmapCharRec ch242 = new BitmapCharRec(9,14,-1,0,11,ch242data);
+
+/* char: 0xf1 */
+
+static final byte[] ch241data = {
+(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xe3,(byte) 0xdf,(byte) 0xce,(byte) 0x0,(byte) 0x4c,(byte) 0x5a,(byte) 0x32,
+};
+
+static final BitmapCharRec ch241 = new BitmapCharRec(8,14,-1,0,10,ch241data);
+
+/* char: 0xf0 */
+
+static final byte[] ch240data = {
+(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
+(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x4c,(byte) 0x0,(byte) 0x38,(byte) 0x0,(byte) 0x36,(byte) 0x0,(byte) 0x60,(byte) 0x0,
+};
+
+static final BitmapCharRec ch240 = new BitmapCharRec(9,14,-1,0,11,ch240data);
+
+/* char: 0xef */
+
+static final byte[] ch239data = {
+(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x0,(byte) 0xd8,(byte) 0xd8,
+};
+
+static final BitmapCharRec ch239 = new BitmapCharRec(5,13,0,0,4,ch239data);
+
+/* char: 0xee */
+
+static final byte[] ch238data = {
+(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0xcc,(byte) 0x78,(byte) 0x30,
+};
+
+static final BitmapCharRec ch238 = new BitmapCharRec(6,14,1,0,4,ch238data);
+
+/* char: 0xed */
+
+static final byte[] ch237data = {
+(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x0,(byte) 0xc0,(byte) 0x60,(byte) 0x30,
+};
+
+static final BitmapCharRec ch237 = new BitmapCharRec(4,14,0,0,4,ch237data);
+
+/* char: 0xec */
+
+static final byte[] ch236data = {
+(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x0,(byte) 0x30,(byte) 0x60,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch236 = new BitmapCharRec(4,14,0,0,4,ch236data);
+
+/* char: 0xeb */
+
+static final byte[] ch235data = {
+(byte) 0x3c,(byte) 0x7f,(byte) 0xe3,(byte) 0xc0,(byte) 0xc0,(byte) 0xff,(byte) 0xc3,(byte) 0xc3,(byte) 0x7e,(byte) 0x3c,(byte) 0x0,(byte) 0x36,(byte) 0x36,
+};
+
+static final BitmapCharRec ch235 = new BitmapCharRec(8,13,-1,0,10,ch235data);
+
+/* char: 0xea */
+
+static final byte[] ch234data = {
+(byte) 0x3c,(byte) 0x7f,(byte) 0xe3,(byte) 0xc0,(byte) 0xc0,(byte) 0xff,(byte) 0xc3,(byte) 0xc3,(byte) 0x7e,(byte) 0x3c,(byte) 0x0,(byte) 0x66,(byte) 0x3c,(byte) 0x18,
+};
+
+static final BitmapCharRec ch234 = new BitmapCharRec(8,14,-1,0,10,ch234data);
+
+/* char: 0xe9 */
+
+static final byte[] ch233data = {
+(byte) 0x3c,(byte) 0x7f,(byte) 0xe3,(byte) 0xc0,(byte) 0xc0,(byte) 0xff,(byte) 0xc3,(byte) 0xc3,(byte) 0x7e,(byte) 0x3c,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x6,
+};
+
+static final BitmapCharRec ch233 = new BitmapCharRec(8,14,-1,0,10,ch233data);
+
+/* char: 0xe8 */
+
+static final byte[] ch232data = {
+(byte) 0x3c,(byte) 0x7f,(byte) 0xe3,(byte) 0xc0,(byte) 0xc0,(byte) 0xff,(byte) 0xc3,(byte) 0xc3,(byte) 0x7e,(byte) 0x3c,(byte) 0x0,(byte) 0x18,(byte) 0x30,(byte) 0x60,
+};
+
+static final BitmapCharRec ch232 = new BitmapCharRec(8,14,-1,0,10,ch232data);
+
+/* char: 0xe7 */
+
+static final byte[] ch231data = {
+(byte) 0x78,(byte) 0x6c,(byte) 0xc,(byte) 0x38,(byte) 0x3e,(byte) 0x7f,(byte) 0x63,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x63,(byte) 0x7f,(byte) 0x3e,
+};
+
+static final BitmapCharRec ch231 = new BitmapCharRec(8,14,-1,4,10,ch231data);
+
+/* char: 0xe6 */
+
+static final byte[] ch230data = {
+(byte) 0x75,(byte) 0xe0,(byte) 0xef,(byte) 0xf8,(byte) 0xc7,(byte) 0x18,(byte) 0xc6,(byte) 0x0,(byte) 0xe6,(byte) 0x0,(byte) 0x7f,(byte) 0xf8,(byte) 0xe,(byte) 0x18,(byte) 0xc6,(byte) 0x18,
+(byte) 0xef,(byte) 0xf0,(byte) 0x7d,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch230 = new BitmapCharRec(13,10,-1,0,15,ch230data);
+
+/* char: 0xe5 */
+
+static final byte[] ch229data = {
+(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,(byte) 0x38,(byte) 0x6c,(byte) 0x6c,(byte) 0x38,
+};
+
+static final BitmapCharRec ch229 = new BitmapCharRec(7,14,-1,0,9,ch229data);
+
+/* char: 0xe4 */
+
+static final byte[] ch228data = {
+(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,(byte) 0x0,(byte) 0x6c,(byte) 0x6c,
+};
+
+static final BitmapCharRec ch228 = new BitmapCharRec(7,13,-1,0,9,ch228data);
+
+/* char: 0xe3 */
+
+static final byte[] ch227data = {
+(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,(byte) 0x0,(byte) 0x4c,(byte) 0x5a,(byte) 0x32,
+};
+
+static final BitmapCharRec ch227 = new BitmapCharRec(7,14,-1,0,9,ch227data);
+
+/* char: 0xe2 */
+
+static final byte[] ch226data = {
+(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,(byte) 0x0,(byte) 0x66,(byte) 0x3c,(byte) 0x18,
+};
+
+static final BitmapCharRec ch226 = new BitmapCharRec(7,14,-1,0,9,ch226data);
+
+/* char: 0xe1 */
+
+static final byte[] ch225data = {
+(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,(byte) 0x0,(byte) 0x30,(byte) 0x18,(byte) 0xc,
+};
+
+static final BitmapCharRec ch225 = new BitmapCharRec(7,14,-1,0,9,ch225data);
+
+/* char: 0xe0 */
+
+static final byte[] ch224data = {
+(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,(byte) 0x0,(byte) 0x18,(byte) 0x30,(byte) 0x60,
+};
+
+static final BitmapCharRec ch224 = new BitmapCharRec(7,14,-1,0,9,ch224data);
+
+/* char: 0xdf */
+
+static final byte[] ch223data = {
+(byte) 0xdc,(byte) 0xde,(byte) 0xc6,(byte) 0xc6,(byte) 0xc6,(byte) 0xc6,(byte) 0xdc,(byte) 0xdc,(byte) 0xc6,(byte) 0xc6,(byte) 0xc6,(byte) 0xc6,(byte) 0x7c,(byte) 0x38,
+};
+
+static final BitmapCharRec ch223 = new BitmapCharRec(7,14,-1,0,9,ch223data);
+
+/* char: 0xde */
+
+static final byte[] ch222data = {
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xc1,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc1,(byte) 0xc0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch222 = new BitmapCharRec(10,14,-1,0,12,ch222data);
+
+/* char: 0xdd */
+
+static final byte[] ch221data = {
+(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x19,(byte) 0x80,
+(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0x80,
+};
+
+static final BitmapCharRec ch221 = new BitmapCharRec(12,18,-1,0,14,ch221data);
+
+/* char: 0xdc */
+
+static final byte[] ch220data = {
+(byte) 0x1f,(byte) 0x0,(byte) 0x7f,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
+(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x19,(byte) 0x80,
+(byte) 0x19,(byte) 0x80,
+};
+
+static final BitmapCharRec ch220 = new BitmapCharRec(11,17,-1,0,13,ch220data);
+
+/* char: 0xdb */
+
+static final byte[] ch219data = {
+(byte) 0x1f,(byte) 0x0,(byte) 0x7f,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
+(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x19,(byte) 0x80,
+(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+};
+
+static final BitmapCharRec ch219 = new BitmapCharRec(11,18,-1,0,13,ch219data);
+
+/* char: 0xda */
+
+static final byte[] ch218data = {
+(byte) 0x1f,(byte) 0x0,(byte) 0x7f,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
+(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0xc,(byte) 0x0,
+(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x0,
+};
+
+static final BitmapCharRec ch218 = new BitmapCharRec(11,18,-1,0,13,ch218data);
+
+/* char: 0xd9 */
+
+static final byte[] ch217data = {
+(byte) 0x1f,(byte) 0x0,(byte) 0x7f,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
+(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0x0,
+};
+
+static final BitmapCharRec ch217 = new BitmapCharRec(11,18,-1,0,13,ch217data);
+
+/* char: 0xd8 */
+
+static final byte[] ch216data = {
+(byte) 0xc7,(byte) 0xc0,(byte) 0xff,(byte) 0xf0,(byte) 0x78,(byte) 0x38,(byte) 0x38,(byte) 0x18,(byte) 0x6c,(byte) 0x1c,(byte) 0x6e,(byte) 0xc,(byte) 0x67,(byte) 0xc,(byte) 0x63,(byte) 0x8c,
+(byte) 0x61,(byte) 0xcc,(byte) 0x70,(byte) 0xdc,(byte) 0x30,(byte) 0x78,(byte) 0x38,(byte) 0x38,(byte) 0x1f,(byte) 0xfc,(byte) 0x7,(byte) 0xcc,
+};
+
+static final BitmapCharRec ch216 = new BitmapCharRec(14,14,0,0,15,ch216data);
+
+/* char: 0xd7 */
+
+static final byte[] ch215data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x33,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x61,(byte) 0x80,
+(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch215 = new BitmapCharRec(10,9,0,0,10,ch215data);
+
+/* char: 0xd6 */
+
+static final byte[] ch214data = {
+(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x38,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
+(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0xd,(byte) 0x80,
+(byte) 0xd,(byte) 0x80,
+};
+
+static final BitmapCharRec ch214 = new BitmapCharRec(13,17,-1,0,15,ch214data);
+
+/* char: 0xd5 */
+
+static final byte[] ch213data = {
+(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x38,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
+(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x9,(byte) 0x80,
+(byte) 0xb,(byte) 0x40,(byte) 0x6,(byte) 0x40,
+};
+
+static final BitmapCharRec ch213 = new BitmapCharRec(13,18,-1,0,15,ch213data);
+
+/* char: 0xd4 */
+
+static final byte[] ch212data = {
+(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x38,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
+(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0xc,(byte) 0xc0,
+(byte) 0x7,(byte) 0x80,(byte) 0x3,(byte) 0x0,
+};
+
+static final BitmapCharRec ch212 = new BitmapCharRec(13,18,-1,0,15,ch212data);
+
+/* char: 0xd3 */
+
+static final byte[] ch211data = {
+(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x38,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
+(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x3,(byte) 0x0,
+(byte) 0x1,(byte) 0x80,(byte) 0x0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch211 = new BitmapCharRec(13,18,-1,0,15,ch211data);
+
+/* char: 0xd2 */
+
+static final byte[] ch210data = {
+(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x38,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
+(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x3,(byte) 0x0,
+(byte) 0x6,(byte) 0x0,(byte) 0xc,(byte) 0x0,
+};
+
+static final BitmapCharRec ch210 = new BitmapCharRec(13,18,-1,0,15,ch210data);
+
+/* char: 0xd1 */
+
+static final byte[] ch209data = {
+(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe0,(byte) 0xc1,(byte) 0xe0,(byte) 0xc1,(byte) 0xe0,(byte) 0xc3,(byte) 0x60,(byte) 0xc6,(byte) 0x60,(byte) 0xc6,(byte) 0x60,(byte) 0xcc,(byte) 0x60,
+(byte) 0xcc,(byte) 0x60,(byte) 0xd8,(byte) 0x60,(byte) 0xd8,(byte) 0x60,(byte) 0xf0,(byte) 0x60,(byte) 0xe0,(byte) 0x60,(byte) 0xe0,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x13,(byte) 0x0,
+(byte) 0x16,(byte) 0x80,(byte) 0xc,(byte) 0x80,
+};
+
+static final BitmapCharRec ch209 = new BitmapCharRec(11,18,-1,0,13,ch209data);
+
+/* char: 0xd0 */
+
+static final byte[] ch208data = {
+(byte) 0x7f,(byte) 0x80,(byte) 0x7f,(byte) 0xc0,(byte) 0x60,(byte) 0xe0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x30,(byte) 0x60,(byte) 0x30,(byte) 0xfc,(byte) 0x30,(byte) 0xfc,(byte) 0x30,
+(byte) 0x60,(byte) 0x30,(byte) 0x60,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xe0,(byte) 0x7f,(byte) 0xc0,(byte) 0x7f,(byte) 0x80,
+};
+
+static final BitmapCharRec ch208 = new BitmapCharRec(12,14,0,0,13,ch208data);
+
+/* char: 0xcf */
+
+static final byte[] ch207data = {
+(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0xcc,
+(byte) 0xcc,
+};
+
+static final BitmapCharRec ch207 = new BitmapCharRec(6,17,0,0,6,ch207data);
+
+/* char: 0xce */
+
+static final byte[] ch206data = {
+(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0xcc,
+(byte) 0x78,(byte) 0x30,
+};
+
+static final BitmapCharRec ch206 = new BitmapCharRec(6,18,0,0,6,ch206data);
+
+/* char: 0xcd */
+
+static final byte[] ch205data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,
+(byte) 0x60,(byte) 0x30,
+};
+
+static final BitmapCharRec ch205 = new BitmapCharRec(4,18,-2,0,6,ch205data);
+
+/* char: 0xcc */
+
+static final byte[] ch204data = {
+(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0x30,
+(byte) 0x60,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch204 = new BitmapCharRec(4,18,0,0,6,ch204data);
+
+/* char: 0xcb */
+
+static final byte[] ch203data = {
+(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x0,
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,
+(byte) 0x33,(byte) 0x0,
+};
+
+static final BitmapCharRec ch203 = new BitmapCharRec(9,17,-1,0,11,ch203data);
+
+/* char: 0xca */
+
+static final byte[] ch202data = {
+(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x0,
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,
+(byte) 0x1e,(byte) 0x0,(byte) 0xc,(byte) 0x0,
+};
+
+static final BitmapCharRec ch202 = new BitmapCharRec(9,18,-1,0,11,ch202data);
+
+/* char: 0xc9 */
+
+static final byte[] ch201data = {
+(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x0,
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0xc,(byte) 0x0,
+(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x0,
+};
+
+static final BitmapCharRec ch201 = new BitmapCharRec(9,18,-1,0,11,ch201data);
+
+/* char: 0xc8 */
+
+static final byte[] ch200data = {
+(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x0,
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0xc,(byte) 0x0,
+(byte) 0x18,(byte) 0x0,(byte) 0x30,(byte) 0x0,
+};
+
+static final BitmapCharRec ch200 = new BitmapCharRec(9,18,-1,0,11,ch200data);
+
+/* char: 0xc7 */
+
+static final byte[] ch199data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x1b,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,
+(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xe0,(byte) 0x0,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,
+(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,
+};
+
+static final BitmapCharRec ch199 = new BitmapCharRec(12,18,-1,4,14,ch199data);
+
+/* char: 0xc6 */
+
+static final byte[] ch198data = {
+(byte) 0xc1,(byte) 0xff,(byte) 0xc1,(byte) 0xff,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x7f,(byte) 0x80,(byte) 0x3f,(byte) 0x80,(byte) 0x31,(byte) 0xfe,(byte) 0x31,(byte) 0xfe,
+(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xd,(byte) 0x80,(byte) 0xd,(byte) 0x80,(byte) 0x7,(byte) 0xff,(byte) 0x7,(byte) 0xff,
+};
+
+static final BitmapCharRec ch198 = new BitmapCharRec(16,14,-1,0,18,ch198data);
+
+/* char: 0xc5 */
+
+static final byte[] ch197data = {
+(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
+(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x19,(byte) 0x80,
+(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,
+};
+
+static final BitmapCharRec ch197 = new BitmapCharRec(12,18,0,0,12,ch197data);
+
+/* char: 0xc4 */
+
+static final byte[] ch196data = {
+(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
+(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x19,(byte) 0x80,
+(byte) 0x19,(byte) 0x80,
+};
+
+static final BitmapCharRec ch196 = new BitmapCharRec(12,17,0,0,12,ch196data);
+
+/* char: 0xc3 */
+
+static final byte[] ch195data = {
+(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
+(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x13,(byte) 0x0,
+(byte) 0x16,(byte) 0x80,(byte) 0xc,(byte) 0x80,
+};
+
+static final BitmapCharRec ch195 = new BitmapCharRec(12,18,0,0,12,ch195data);
+
+/* char: 0xc2 */
+
+static final byte[] ch194data = {
+(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
+(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x19,(byte) 0x80,
+(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+};
+
+static final BitmapCharRec ch194 = new BitmapCharRec(12,18,0,0,12,ch194data);
+
+/* char: 0xc1 */
+
+static final byte[] ch193data = {
+(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
+(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0x80,
+};
+
+static final BitmapCharRec ch193 = new BitmapCharRec(12,18,0,0,12,ch193data);
+
+/* char: 0xc0 */
+
+static final byte[] ch192data = {
+(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
+(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0x0,
+};
+
+static final BitmapCharRec ch192 = new BitmapCharRec(12,18,0,0,12,ch192data);
+
+/* char: 0xbf */
+
+static final byte[] ch191data = {
+(byte) 0x7c,(byte) 0xfe,(byte) 0xc6,(byte) 0xc6,(byte) 0xe0,(byte) 0x70,(byte) 0x38,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x0,(byte) 0x0,(byte) 0x18,(byte) 0x18,
+};
+
+static final BitmapCharRec ch191 = new BitmapCharRec(7,14,-1,4,10,ch191data);
+
+/* char: 0xbe */
+
+static final byte[] ch190data = {
+(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xc,(byte) 0xfc,(byte) 0x6,(byte) 0xd8,(byte) 0x6,(byte) 0x78,(byte) 0x73,(byte) 0x38,(byte) 0xf9,(byte) 0x18,(byte) 0x99,(byte) 0x88,
+(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x98,(byte) 0x60,(byte) 0xf8,(byte) 0x30,(byte) 0x70,(byte) 0x30,
+};
+
+static final BitmapCharRec ch190 = new BitmapCharRec(14,13,0,0,15,ch190data);
+
+/* char: 0xbd */
+
+static final byte[] ch189data = {
+(byte) 0x30,(byte) 0xf8,(byte) 0x30,(byte) 0xf8,(byte) 0x18,(byte) 0x60,(byte) 0xc,(byte) 0x30,(byte) 0xc,(byte) 0x18,(byte) 0x66,(byte) 0x98,(byte) 0x62,(byte) 0xf8,(byte) 0x63,(byte) 0x70,
+(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xe0,(byte) 0xc0,(byte) 0xe0,(byte) 0x60,(byte) 0x60,(byte) 0x60,
+};
+
+static final BitmapCharRec ch189 = new BitmapCharRec(13,13,-1,0,15,ch189data);
+
+/* char: 0xbc */
+
+static final byte[] ch188data = {
+(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x19,(byte) 0xf8,(byte) 0xd,(byte) 0xb0,(byte) 0xc,(byte) 0xf0,(byte) 0x66,(byte) 0x70,(byte) 0x62,(byte) 0x30,(byte) 0x63,(byte) 0x10,
+(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xe0,(byte) 0xc0,(byte) 0xe0,(byte) 0x60,(byte) 0x60,(byte) 0x60,
+};
+
+static final BitmapCharRec ch188 = new BitmapCharRec(13,13,-1,0,15,ch188data);
+
+/* char: 0xbb */
+
+static final byte[] ch187data = {
+(byte) 0x90,(byte) 0xd8,(byte) 0x6c,(byte) 0x36,(byte) 0x36,(byte) 0x6c,(byte) 0xd8,(byte) 0x90,
+};
+
+static final BitmapCharRec ch187 = new BitmapCharRec(7,8,-1,-1,9,ch187data);
+
+/* char: 0xba */
+
+static final byte[] ch186data = {
+(byte) 0xf8,(byte) 0x0,(byte) 0x70,(byte) 0xd8,(byte) 0x88,(byte) 0x88,(byte) 0xd8,(byte) 0x70,
+};
+
+static final BitmapCharRec ch186 = new BitmapCharRec(5,8,-1,-6,7,ch186data);
+
+/* char: 0xb9 */
+
+static final byte[] ch185data = {
+(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xe0,(byte) 0xe0,(byte) 0x60,
+};
+
+static final BitmapCharRec ch185 = new BitmapCharRec(3,8,-1,-5,6,ch185data);
+
+/* char: 0xb8 */
+
+static final byte[] ch184data = {
+(byte) 0xf0,(byte) 0xd8,(byte) 0x18,(byte) 0x70,(byte) 0x60,
+};
+
+static final BitmapCharRec ch184 = new BitmapCharRec(5,5,0,4,5,ch184data);
+
+/* char: 0xb7 */
+
+static final byte[] ch183data = {
+(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch183 = new BitmapCharRec(2,2,-1,-4,4,ch183data);
+
+/* char: 0xb6 */
+
+static final byte[] ch182data = {
+(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x32,(byte) 0x72,(byte) 0xf2,(byte) 0xf2,(byte) 0xf2,(byte) 0xf2,
+(byte) 0x72,(byte) 0x3f,
+};
+
+static final BitmapCharRec ch182 = new BitmapCharRec(8,18,-1,4,10,ch182data);
+
+/* char: 0xb5 */
+
+static final byte[] ch181data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xdb,(byte) 0xff,(byte) 0xe7,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,
+};
+
+static final BitmapCharRec ch181 = new BitmapCharRec(8,14,-1,4,10,ch181data);
+
+/* char: 0xb4 */
+
+static final byte[] ch180data = {
+(byte) 0xc0,(byte) 0x60,(byte) 0x30,
+};
+
+static final BitmapCharRec ch180 = new BitmapCharRec(4,3,0,-11,4,ch180data);
+
+/* char: 0xb3 */
+
+static final byte[] ch179data = {
+(byte) 0x70,(byte) 0xf8,(byte) 0x98,(byte) 0x30,(byte) 0x30,(byte) 0x98,(byte) 0xf8,(byte) 0x70,
+};
+
+static final BitmapCharRec ch179 = new BitmapCharRec(5,8,0,-5,6,ch179data);
+
+/* char: 0xb2 */
+
+static final byte[] ch178data = {
+(byte) 0xf8,(byte) 0xf8,(byte) 0x60,(byte) 0x30,(byte) 0x18,(byte) 0x98,(byte) 0xf8,(byte) 0x70,
+};
+
+static final BitmapCharRec ch178 = new BitmapCharRec(5,8,0,-5,6,ch178data);
+
+/* char: 0xb1 */
+
+static final byte[] ch177data = {
+(byte) 0xff,(byte) 0xff,(byte) 0x0,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xff,(byte) 0xff,(byte) 0x18,(byte) 0x18,(byte) 0x18,
+};
+
+static final BitmapCharRec ch177 = new BitmapCharRec(8,11,-1,0,10,ch177data);
+
+/* char: 0xb0 */
+
+static final byte[] ch176data = {
+(byte) 0x70,(byte) 0xd8,(byte) 0x88,(byte) 0xd8,(byte) 0x70,
+};
+
+static final BitmapCharRec ch176 = new BitmapCharRec(5,5,-1,-8,7,ch176data);
+
+/* char: 0xaf */
+
+static final byte[] ch175data = {
+(byte) 0xf8,
+};
+
+static final BitmapCharRec ch175 = new BitmapCharRec(5,1,0,-12,5,ch175data);
+
+/* char: 0xae */
+
+static final byte[] ch174data = {
+(byte) 0xf,(byte) 0x80,(byte) 0x30,(byte) 0x60,(byte) 0x40,(byte) 0x10,(byte) 0x48,(byte) 0x50,(byte) 0x88,(byte) 0x88,(byte) 0x89,(byte) 0x8,(byte) 0x8f,(byte) 0x88,(byte) 0x88,(byte) 0x48,
+(byte) 0x88,(byte) 0x48,(byte) 0x4f,(byte) 0x90,(byte) 0x40,(byte) 0x10,(byte) 0x30,(byte) 0x60,(byte) 0xf,(byte) 0x80,
+};
+
+static final BitmapCharRec ch174 = new BitmapCharRec(13,13,-1,0,14,ch174data);
+
+/* char: 0xad */
+
+static final byte[] ch173data = {
+(byte) 0xf8,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch173 = new BitmapCharRec(5,2,-1,-4,7,ch173data);
+
+/* char: 0xac */
+
+static final byte[] ch172data = {
+(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,
+};
+
+static final BitmapCharRec ch172 = new BitmapCharRec(9,5,-1,-3,11,ch172data);
+
+/* char: 0xab */
+
+static final byte[] ch171data = {
+(byte) 0x12,(byte) 0x36,(byte) 0x6c,(byte) 0xd8,(byte) 0xd8,(byte) 0x6c,(byte) 0x36,(byte) 0x12,
+};
+
+static final BitmapCharRec ch171 = new BitmapCharRec(7,8,-1,-1,9,ch171data);
+
+/* char: 0xaa */
+
+static final byte[] ch170data = {
+(byte) 0xf8,(byte) 0x0,(byte) 0x68,(byte) 0xd8,(byte) 0x48,(byte) 0x38,(byte) 0xc8,(byte) 0x70,
+};
+
+static final BitmapCharRec ch170 = new BitmapCharRec(5,8,-1,-6,7,ch170data);
+
+/* char: 0xa9 */
+
+static final byte[] ch169data = {
+(byte) 0xf,(byte) 0x80,(byte) 0x30,(byte) 0x60,(byte) 0x40,(byte) 0x10,(byte) 0x47,(byte) 0x10,(byte) 0x88,(byte) 0x88,(byte) 0x90,(byte) 0x8,(byte) 0x90,(byte) 0x8,(byte) 0x90,(byte) 0x8,
+(byte) 0x88,(byte) 0x88,(byte) 0x47,(byte) 0x10,(byte) 0x40,(byte) 0x10,(byte) 0x30,(byte) 0x60,(byte) 0xf,(byte) 0x80,
+};
+
+static final BitmapCharRec ch169 = new BitmapCharRec(13,13,-1,0,15,ch169data);
+
+/* char: 0xa8 */
+
+static final byte[] ch168data = {
+(byte) 0xd8,(byte) 0xd8,
+};
+
+static final BitmapCharRec ch168 = new BitmapCharRec(5,2,0,-11,6,ch168data);
+
+/* char: 0xa7 */
+
+static final byte[] ch167data = {
+(byte) 0x3c,(byte) 0x7e,(byte) 0xc3,(byte) 0xc3,(byte) 0x7,(byte) 0xe,(byte) 0x3e,(byte) 0x73,(byte) 0xe3,(byte) 0xc3,(byte) 0xc7,(byte) 0x6e,(byte) 0x7c,(byte) 0xf0,(byte) 0xc3,(byte) 0xc3,
+(byte) 0x7e,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch167 = new BitmapCharRec(8,18,-1,4,10,ch167data);
+
+/* char: 0xa6 */
+
+static final byte[] ch166data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,
+};
+
+static final BitmapCharRec ch166 = new BitmapCharRec(2,17,-1,3,4,ch166data);
+
+/* char: 0xa5 */
+
+static final byte[] ch165data = {
+(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xff,(byte) 0x18,(byte) 0xff,(byte) 0x3c,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,
+};
+
+static final BitmapCharRec ch165 = new BitmapCharRec(8,13,-1,0,10,ch165data);
+
+/* char: 0xa4 */
+
+static final byte[] ch164data = {
+(byte) 0xc3,(byte) 0xff,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0xff,(byte) 0xc3,
+};
+
+static final BitmapCharRec ch164 = new BitmapCharRec(8,7,-1,-3,10,ch164data);
+
+/* char: 0xa3 */
+
+static final byte[] ch163data = {
+(byte) 0xdf,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0x60,(byte) 0x80,(byte) 0x30,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x7e,(byte) 0x0,(byte) 0x30,(byte) 0x0,
+(byte) 0x60,(byte) 0x0,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x3f,(byte) 0x0,(byte) 0x1e,(byte) 0x0,
+};
+
+static final BitmapCharRec ch163 = new BitmapCharRec(9,13,0,0,10,ch163data);
+
+/* char: 0xa2 */
+
+static final byte[] ch162data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x3e,(byte) 0x7f,(byte) 0x6b,(byte) 0xc8,(byte) 0xc8,(byte) 0xc8,(byte) 0xc8,(byte) 0x6b,(byte) 0x7f,(byte) 0x3e,(byte) 0x4,(byte) 0x4,
+};
+
+static final BitmapCharRec ch162 = new BitmapCharRec(8,14,-1,2,10,ch162data);
+
+/* char: 0xa1 */
+
+static final byte[] ch161data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch161 = new BitmapCharRec(2,14,-2,4,6,ch161data);
+
+/* char: 0xa0 */
+
+static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,5,null);
+
+/* char: 0x7e '~' */
+
+static final byte[] ch126data = {
+(byte) 0xcc,(byte) 0x7e,(byte) 0x33,
+};
+
+static final BitmapCharRec ch126 = new BitmapCharRec(8,3,-1,-4,10,ch126data);
+
+/* char: 0x7d '}' */
+
+static final byte[] ch125data = {
+(byte) 0xc0,(byte) 0x60,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x18,(byte) 0xc,(byte) 0x18,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
+(byte) 0x60,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch125 = new BitmapCharRec(6,18,0,4,6,ch125data);
+
+/* char: 0x7c '|' */
+
+static final byte[] ch124data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch124 = new BitmapCharRec(2,18,-1,4,4,ch124data);
+
+/* char: 0x7b '{' */
+
+static final byte[] ch123data = {
+(byte) 0xc,(byte) 0x18,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
+(byte) 0x18,(byte) 0xc,
+};
+
+static final BitmapCharRec ch123 = new BitmapCharRec(6,18,0,4,6,ch123data);
+
+/* char: 0x7a 'z' */
+
+static final byte[] ch122data = {
+(byte) 0xfe,(byte) 0xfe,(byte) 0xc0,(byte) 0x60,(byte) 0x30,(byte) 0x18,(byte) 0xc,(byte) 0x6,(byte) 0xfe,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch122 = new BitmapCharRec(7,10,-1,0,9,ch122data);
+
+/* char: 0x79 'y' */
+
+static final byte[] ch121data = {
+(byte) 0x70,(byte) 0x70,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x3c,(byte) 0x24,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,
+};
+
+static final BitmapCharRec ch121 = new BitmapCharRec(8,14,-1,4,10,ch121data);
+
+/* char: 0x78 'x' */
+
+static final byte[] ch120data = {
+(byte) 0xc3,(byte) 0xe7,(byte) 0x66,(byte) 0x3c,(byte) 0x18,(byte) 0x18,(byte) 0x3c,(byte) 0x66,(byte) 0xe7,(byte) 0xc3,
+};
+
+static final BitmapCharRec ch120 = new BitmapCharRec(8,10,-1,0,10,ch120data);
+
+/* char: 0x77 'w' */
+
+static final byte[] ch119data = {
+(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0x39,(byte) 0xc0,(byte) 0x29,(byte) 0x40,(byte) 0x69,(byte) 0x60,(byte) 0x66,(byte) 0x60,(byte) 0x66,(byte) 0x60,(byte) 0xc6,(byte) 0x30,
+(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,
+};
+
+static final BitmapCharRec ch119 = new BitmapCharRec(12,10,-1,0,14,ch119data);
+
+/* char: 0x76 'v' */
+
+static final byte[] ch118data = {
+(byte) 0x18,(byte) 0x18,(byte) 0x3c,(byte) 0x24,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,
+};
+
+static final BitmapCharRec ch118 = new BitmapCharRec(8,10,-1,0,10,ch118data);
+
+/* char: 0x75 'u' */
+
+static final byte[] ch117data = {
+(byte) 0x73,(byte) 0xfb,(byte) 0xc7,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,
+};
+
+static final BitmapCharRec ch117 = new BitmapCharRec(8,10,-1,0,10,ch117data);
+
+/* char: 0x74 't' */
+
+static final byte[] ch116data = {
+(byte) 0x18,(byte) 0x38,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0xfc,(byte) 0xfc,(byte) 0x30,(byte) 0x30,(byte) 0x30,
+};
+
+static final BitmapCharRec ch116 = new BitmapCharRec(6,13,0,0,6,ch116data);
+
+/* char: 0x73 's' */
+
+static final byte[] ch115data = {
+(byte) 0x78,(byte) 0xfc,(byte) 0xc6,(byte) 0x6,(byte) 0x3e,(byte) 0xfc,(byte) 0xc0,(byte) 0xc6,(byte) 0x7e,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch115 = new BitmapCharRec(7,10,-1,0,9,ch115data);
+
+/* char: 0x72 'r' */
+
+static final byte[] ch114data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xe0,(byte) 0xd8,(byte) 0xd8,
+};
+
+static final BitmapCharRec ch114 = new BitmapCharRec(5,10,-1,0,6,ch114data);
+
+/* char: 0x71 'q' */
+
+static final byte[] ch113data = {
+(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x3d,(byte) 0x80,(byte) 0x7f,(byte) 0x80,(byte) 0x63,(byte) 0x80,(byte) 0xc1,(byte) 0x80,
+(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x80,(byte) 0x7f,(byte) 0x80,(byte) 0x3d,(byte) 0x80,
+};
+
+static final BitmapCharRec ch113 = new BitmapCharRec(9,14,-1,4,11,ch113data);
+
+/* char: 0x70 'p' */
+
+static final byte[] ch112data = {
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xde,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xe3,(byte) 0x0,(byte) 0xc1,(byte) 0x80,
+(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xe3,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xde,(byte) 0x0,
+};
+
+static final BitmapCharRec ch112 = new BitmapCharRec(9,14,-1,4,11,ch112data);
+
+/* char: 0x6f 'o' */
+
+static final byte[] ch111data = {
+(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
+(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,
+};
+
+static final BitmapCharRec ch111 = new BitmapCharRec(9,10,-1,0,11,ch111data);
+
+/* char: 0x6e 'n' */
+
+static final byte[] ch110data = {
+(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xe3,(byte) 0xdf,(byte) 0xce,
+};
+
+static final BitmapCharRec ch110 = new BitmapCharRec(8,10,-1,0,10,ch110data);
+
+/* char: 0x6d 'm' */
+
+static final byte[] ch109data = {
+(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,(byte) 0xe7,(byte) 0x30,
+(byte) 0xde,(byte) 0xf0,(byte) 0xcc,(byte) 0x60,
+};
+
+static final BitmapCharRec ch109 = new BitmapCharRec(12,10,-1,0,14,ch109data);
+
+/* char: 0x6c 'l' */
+
+static final byte[] ch108data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch108 = new BitmapCharRec(2,14,-1,0,4,ch108data);
+
+/* char: 0x6b 'k' */
+
+static final byte[] ch107data = {
+(byte) 0xc7,(byte) 0xc6,(byte) 0xce,(byte) 0xcc,(byte) 0xd8,(byte) 0xf8,(byte) 0xf0,(byte) 0xd8,(byte) 0xcc,(byte) 0xc6,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch107 = new BitmapCharRec(8,14,-1,0,9,ch107data);
+
+/* char: 0x6a 'j' */
+
+static final byte[] ch106data = {
+(byte) 0xe0,(byte) 0xf0,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0x0,
+(byte) 0x30,(byte) 0x30,
+};
+
+static final BitmapCharRec ch106 = new BitmapCharRec(4,18,1,4,4,ch106data);
+
+/* char: 0x69 'i' */
+
+static final byte[] ch105data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch105 = new BitmapCharRec(2,14,-1,0,4,ch105data);
+
+/* char: 0x68 'h' */
+
+static final byte[] ch104data = {
+(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xe3,(byte) 0xdf,(byte) 0xce,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch104 = new BitmapCharRec(8,14,-1,0,10,ch104data);
+
+/* char: 0x67 'g' */
+
+static final byte[] ch103data = {
+(byte) 0x1c,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x3d,(byte) 0x80,(byte) 0x7f,(byte) 0x80,(byte) 0x63,(byte) 0x80,(byte) 0xc1,(byte) 0x80,
+(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x7f,(byte) 0x80,(byte) 0x3d,(byte) 0x80,
+};
+
+static final BitmapCharRec ch103 = new BitmapCharRec(9,14,-1,4,11,ch103data);
+
+/* char: 0x66 'f' */
+
+static final byte[] ch102data = {
+(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0xfc,(byte) 0xfc,(byte) 0x30,(byte) 0x30,(byte) 0x3c,(byte) 0x1c,
+};
+
+static final BitmapCharRec ch102 = new BitmapCharRec(6,14,0,0,6,ch102data);
+
+/* char: 0x65 'e' */
+
+static final byte[] ch101data = {
+(byte) 0x3c,(byte) 0x7f,(byte) 0xe3,(byte) 0xc0,(byte) 0xc0,(byte) 0xff,(byte) 0xc3,(byte) 0xc3,(byte) 0x7e,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch101 = new BitmapCharRec(8,10,-1,0,10,ch101data);
+
+/* char: 0x64 'd' */
+
+static final byte[] ch100data = {
+(byte) 0x3d,(byte) 0x80,(byte) 0x7f,(byte) 0x80,(byte) 0x63,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x80,
+(byte) 0x7f,(byte) 0x80,(byte) 0x3d,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,
+};
+
+static final BitmapCharRec ch100 = new BitmapCharRec(9,14,-1,0,11,ch100data);
+
+/* char: 0x63 'c' */
+
+static final byte[] ch99data = {
+(byte) 0x3e,(byte) 0x7f,(byte) 0x63,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x63,(byte) 0x7f,(byte) 0x3e,
+};
+
+static final BitmapCharRec ch99 = new BitmapCharRec(8,10,-1,0,10,ch99data);
+
+/* char: 0x62 'b' */
+
+static final byte[] ch98data = {
+(byte) 0xde,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xe3,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xe3,(byte) 0x0,
+(byte) 0xff,(byte) 0x0,(byte) 0xde,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch98 = new BitmapCharRec(9,14,-1,0,11,ch98data);
+
+/* char: 0x61 'a' */
+
+static final byte[] ch97data = {
+(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch97 = new BitmapCharRec(7,10,-1,0,9,ch97data);
+
+/* char: 0x60 '`' */
+
+static final byte[] ch96data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0x80,(byte) 0x80,(byte) 0x40,
+};
+
+static final BitmapCharRec ch96 = new BitmapCharRec(2,5,-1,-9,4,ch96data);
+
+/* char: 0x5f '_' */
+
+static final byte[] ch95data = {
+(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch95 = new BitmapCharRec(10,2,0,4,10,ch95data);
+
+/* char: 0x5e '^' */
+
+static final byte[] ch94data = {
+(byte) 0x82,(byte) 0xc6,(byte) 0x6c,(byte) 0x38,(byte) 0x10,
+};
+
+static final BitmapCharRec ch94 = new BitmapCharRec(7,5,-1,-8,9,ch94data);
+
+/* char: 0x5d ']' */
+
+static final byte[] ch93data = {
+(byte) 0xf0,(byte) 0xf0,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
+(byte) 0xf0,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch93 = new BitmapCharRec(4,18,0,4,5,ch93data);
+
+/* char: 0x5c '\' */
+
+static final byte[] ch92data = {
+(byte) 0x18,(byte) 0x18,(byte) 0x10,(byte) 0x10,(byte) 0x30,(byte) 0x30,(byte) 0x20,(byte) 0x20,(byte) 0x60,(byte) 0x60,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch92 = new BitmapCharRec(5,14,0,0,5,ch92data);
+
+/* char: 0x5b '[' */
+
+static final byte[] ch91data = {
+(byte) 0xf0,(byte) 0xf0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xf0,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch91 = new BitmapCharRec(4,18,-1,4,5,ch91data);
+
+/* char: 0x5a 'Z' */
+
+static final byte[] ch90data = {
+(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0xc,(byte) 0x0,
+(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x0,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch90 = new BitmapCharRec(10,14,-1,0,12,ch90data);
+
+/* char: 0x59 'Y' */
+
+static final byte[] ch89data = {
+(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x19,(byte) 0x80,
+(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,
+};
+
+static final BitmapCharRec ch89 = new BitmapCharRec(12,14,-1,0,14,ch89data);
+
+/* char: 0x58 'X' */
+
+static final byte[] ch88data = {
+(byte) 0xc0,(byte) 0x60,(byte) 0xe0,(byte) 0xe0,(byte) 0x60,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x31,(byte) 0x80,(byte) 0x1b,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xe,(byte) 0x0,
+(byte) 0x1b,(byte) 0x0,(byte) 0x31,(byte) 0x80,(byte) 0x71,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe0,(byte) 0xe0,(byte) 0xc0,(byte) 0x60,
+};
+
+static final BitmapCharRec ch88 = new BitmapCharRec(11,14,-1,0,13,ch88data);
+
+/* char: 0x57 'W' */
+
+static final byte[] ch87data = {
+(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x1c,(byte) 0x38,(byte) 0x34,(byte) 0x2c,(byte) 0x36,(byte) 0x6c,(byte) 0x36,(byte) 0x6c,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0x66,
+(byte) 0x62,(byte) 0x46,(byte) 0x63,(byte) 0xc6,(byte) 0xc3,(byte) 0xc3,(byte) 0xc1,(byte) 0x83,(byte) 0xc1,(byte) 0x83,(byte) 0xc1,(byte) 0x83,
+};
+
+static final BitmapCharRec ch87 = new BitmapCharRec(16,14,-1,0,18,ch87data);
+
+/* char: 0x56 'V' */
+
+static final byte[] ch86data = {
+(byte) 0x6,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
+(byte) 0x30,(byte) 0xc0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,
+};
+
+static final BitmapCharRec ch86 = new BitmapCharRec(12,14,-1,0,14,ch86data);
+
+/* char: 0x55 'U' */
+
+static final byte[] ch85data = {
+(byte) 0x1f,(byte) 0x0,(byte) 0x7f,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
+(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
+};
+
+static final BitmapCharRec ch85 = new BitmapCharRec(11,14,-1,0,13,ch85data);
+
+/* char: 0x54 'T' */
+
+static final byte[] ch84data = {
+(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,
+(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch84 = new BitmapCharRec(10,14,-1,0,12,ch84data);
+
+/* char: 0x53 'S' */
+
+static final byte[] ch83data = {
+(byte) 0x3f,(byte) 0x0,(byte) 0x7f,(byte) 0xc0,(byte) 0xe0,(byte) 0xe0,(byte) 0xc0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0xe0,(byte) 0x3,(byte) 0xc0,(byte) 0x1f,(byte) 0x0,
+(byte) 0x7c,(byte) 0x0,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x60,(byte) 0xe0,(byte) 0xe0,(byte) 0x7f,(byte) 0xc0,(byte) 0x1f,(byte) 0x0,
+};
+
+static final BitmapCharRec ch83 = new BitmapCharRec(11,14,-1,0,13,ch83data);
+
+/* char: 0x52 'R' */
+
+static final byte[] ch82data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x80,
+(byte) 0xc1,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0xc0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x0,
+};
+
+static final BitmapCharRec ch82 = new BitmapCharRec(10,14,-1,0,12,ch82data);
+
+/* char: 0x51 'Q' */
+
+static final byte[] ch81data = {
+(byte) 0x0,(byte) 0x30,(byte) 0xf,(byte) 0xb0,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0xf0,(byte) 0x61,(byte) 0xb0,(byte) 0xe1,(byte) 0xb8,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
+(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,
+};
+
+static final BitmapCharRec ch81 = new BitmapCharRec(13,15,-1,1,15,ch81data);
+
+/* char: 0x50 'P' */
+
+static final byte[] ch80data = {
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x80,
+(byte) 0xc1,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0xc0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x0,
+};
+
+static final BitmapCharRec ch80 = new BitmapCharRec(10,14,-1,0,12,ch80data);
+
+/* char: 0x4f 'O' */
+
+static final byte[] ch79data = {
+(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x38,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
+(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,
+};
+
+static final BitmapCharRec ch79 = new BitmapCharRec(13,14,-1,0,15,ch79data);
+
+/* char: 0x4e 'N' */
+
+static final byte[] ch78data = {
+(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe0,(byte) 0xc1,(byte) 0xe0,(byte) 0xc1,(byte) 0xe0,(byte) 0xc3,(byte) 0x60,(byte) 0xc6,(byte) 0x60,(byte) 0xc6,(byte) 0x60,(byte) 0xcc,(byte) 0x60,
+(byte) 0xcc,(byte) 0x60,(byte) 0xd8,(byte) 0x60,(byte) 0xf0,(byte) 0x60,(byte) 0xf0,(byte) 0x60,(byte) 0xe0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
+};
+
+static final BitmapCharRec ch78 = new BitmapCharRec(11,14,-1,0,13,ch78data);
+
+/* char: 0x4d 'M' */
+
+static final byte[] ch77data = {
+(byte) 0xc3,(byte) 0xc,(byte) 0xc3,(byte) 0xc,(byte) 0xc7,(byte) 0x8c,(byte) 0xc4,(byte) 0x8c,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0xd8,(byte) 0x6c,(byte) 0xd8,(byte) 0x6c,
+(byte) 0xf0,(byte) 0x3c,(byte) 0xf0,(byte) 0x3c,(byte) 0xe0,(byte) 0x1c,(byte) 0xe0,(byte) 0x1c,(byte) 0xc0,(byte) 0xc,(byte) 0xc0,(byte) 0xc,
+};
+
+static final BitmapCharRec ch77 = new BitmapCharRec(14,14,-1,0,16,ch77data);
+
+/* char: 0x4c 'L' */
+
+static final byte[] ch76data = {
+(byte) 0xff,(byte) 0xff,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch76 = new BitmapCharRec(8,14,-1,0,10,ch76data);
+
+/* char: 0x4b 'K' */
+
+static final byte[] ch75data = {
+(byte) 0xc0,(byte) 0x70,(byte) 0xc0,(byte) 0xe0,(byte) 0xc1,(byte) 0xc0,(byte) 0xc3,(byte) 0x80,(byte) 0xc7,(byte) 0x0,(byte) 0xce,(byte) 0x0,(byte) 0xfc,(byte) 0x0,(byte) 0xf8,(byte) 0x0,
+(byte) 0xdc,(byte) 0x0,(byte) 0xce,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x80,(byte) 0xc1,(byte) 0xc0,(byte) 0xc0,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch75 = new BitmapCharRec(12,14,-1,0,13,ch75data);
+
+/* char: 0x4a 'J' */
+
+static final byte[] ch74data = {
+(byte) 0x3c,(byte) 0x7e,(byte) 0xe7,(byte) 0xc3,(byte) 0xc3,(byte) 0x3,(byte) 0x3,(byte) 0x3,(byte) 0x3,(byte) 0x3,(byte) 0x3,(byte) 0x3,(byte) 0x3,(byte) 0x3,
+};
+
+static final BitmapCharRec ch74 = new BitmapCharRec(8,14,-1,0,10,ch74data);
+
+/* char: 0x49 'I' */
+
+static final byte[] ch73data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch73 = new BitmapCharRec(2,14,-2,0,6,ch73data);
+
+/* char: 0x48 'H' */
+
+static final byte[] ch72data = {
+(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xff,(byte) 0xe0,(byte) 0xff,(byte) 0xe0,
+(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
+};
+
+static final BitmapCharRec ch72 = new BitmapCharRec(11,14,-1,0,13,ch72data);
+
+/* char: 0x47 'G' */
+
+static final byte[] ch71data = {
+(byte) 0xf,(byte) 0xb0,(byte) 0x3f,(byte) 0xf0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x30,(byte) 0xc1,(byte) 0xf0,(byte) 0xc1,(byte) 0xf0,(byte) 0xc0,(byte) 0x0,
+(byte) 0xc0,(byte) 0x0,(byte) 0xe0,(byte) 0x30,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,
+};
+
+static final BitmapCharRec ch71 = new BitmapCharRec(12,14,-1,0,14,ch71data);
+
+/* char: 0x46 'F' */
+
+static final byte[] ch70data = {
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x0,
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,
+};
+
+static final BitmapCharRec ch70 = new BitmapCharRec(9,14,-1,0,11,ch70data);
+
+/* char: 0x45 'E' */
+
+static final byte[] ch69data = {
+(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x0,
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,
+};
+
+static final BitmapCharRec ch69 = new BitmapCharRec(9,14,-1,0,11,ch69data);
+
+/* char: 0x44 'D' */
+
+static final byte[] ch68data = {
+(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xc1,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
+(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0xc0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x0,
+};
+
+static final BitmapCharRec ch68 = new BitmapCharRec(11,14,-1,0,13,ch68data);
+
+/* char: 0x43 'C' */
+
+static final byte[] ch67data = {
+(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
+(byte) 0xc0,(byte) 0x0,(byte) 0xe0,(byte) 0x0,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,
+};
+
+static final BitmapCharRec ch67 = new BitmapCharRec(12,14,-1,0,14,ch67data);
+
+/* char: 0x42 'B' */
+
+static final byte[] ch66data = {
+(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0xc0,(byte) 0xc0,(byte) 0xe0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe0,(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0x80,
+(byte) 0xc1,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0xc0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x0,
+};
+
+static final BitmapCharRec ch66 = new BitmapCharRec(11,14,-1,0,13,ch66data);
+
+/* char: 0x41 'A' */
+
+static final byte[] ch65data = {
+(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
+(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+};
+
+static final BitmapCharRec ch65 = new BitmapCharRec(12,14,0,0,12,ch65data);
+
+/* char: 0x40 '@' */
+
+static final byte[] ch64data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1f,(byte) 0xf0,(byte) 0x38,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x67,(byte) 0x70,(byte) 0xcf,(byte) 0xf8,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0x66,
+(byte) 0xcc,(byte) 0x66,(byte) 0xcc,(byte) 0x63,(byte) 0xc6,(byte) 0x33,(byte) 0x67,(byte) 0x73,(byte) 0x63,(byte) 0xb3,(byte) 0x30,(byte) 0x6,(byte) 0x1c,(byte) 0xe,(byte) 0xf,(byte) 0xfc,
+(byte) 0x3,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch64 = new BitmapCharRec(16,17,-1,3,18,ch64data);
+
+/* char: 0x3f '?' */
+
+static final byte[] ch63data = {
+(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x38,(byte) 0x1c,(byte) 0xe,(byte) 0xc6,(byte) 0xc6,(byte) 0xfe,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch63 = new BitmapCharRec(7,14,-1,0,10,ch63data);
+
+/* char: 0x3e '>' */
+
+static final byte[] ch62data = {
+(byte) 0xc0,(byte) 0xf0,(byte) 0x3c,(byte) 0xe,(byte) 0x3,(byte) 0xe,(byte) 0x3c,(byte) 0xf0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch62 = new BitmapCharRec(8,9,-1,0,10,ch62data);
+
+/* char: 0x3d '=' */
+
+static final byte[] ch61data = {
+(byte) 0xfe,(byte) 0xfe,(byte) 0x0,(byte) 0x0,(byte) 0xfe,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch61 = new BitmapCharRec(7,6,-2,-2,11,ch61data);
+
+/* char: 0x3c '<' */
+
+static final byte[] ch60data = {
+(byte) 0x3,(byte) 0xf,(byte) 0x3c,(byte) 0x70,(byte) 0xc0,(byte) 0x70,(byte) 0x3c,(byte) 0xf,(byte) 0x3,
+};
+
+static final BitmapCharRec ch60 = new BitmapCharRec(8,9,-1,0,10,ch60data);
+
+/* char: 0x3b ';' */
+
+static final byte[] ch59data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch59 = new BitmapCharRec(2,13,-1,3,5,ch59data);
+
+/* char: 0x3a ':' */
+
+static final byte[] ch58data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch58 = new BitmapCharRec(2,10,-1,0,5,ch58data);
+
+/* char: 0x39 '9' */
+
+static final byte[] ch57data = {
+(byte) 0x7c,(byte) 0xfe,(byte) 0xc6,(byte) 0x3,(byte) 0x3,(byte) 0x3b,(byte) 0x7f,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc7,(byte) 0x7e,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch57 = new BitmapCharRec(8,13,-1,0,10,ch57data);
+
+/* char: 0x38 '8' */
+
+static final byte[] ch56data = {
+(byte) 0x3c,(byte) 0x7e,(byte) 0xe7,(byte) 0xc3,(byte) 0xc3,(byte) 0x66,(byte) 0x7e,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,(byte) 0xe7,(byte) 0x7e,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch56 = new BitmapCharRec(8,13,-1,0,10,ch56data);
+
+/* char: 0x37 '7' */
+
+static final byte[] ch55data = {
+(byte) 0x60,(byte) 0x60,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x18,(byte) 0x18,(byte) 0xc,(byte) 0xc,(byte) 0x6,(byte) 0x3,(byte) 0xff,(byte) 0xff,
+};
+
+static final BitmapCharRec ch55 = new BitmapCharRec(8,13,-1,0,10,ch55data);
+
+/* char: 0x36 '6' */
+
+static final byte[] ch54data = {
+(byte) 0x3c,(byte) 0x7e,(byte) 0xe3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xfe,(byte) 0xdc,(byte) 0xc0,(byte) 0xc0,(byte) 0x63,(byte) 0x7f,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch54 = new BitmapCharRec(8,13,-1,0,10,ch54data);
+
+/* char: 0x35 '5' */
+
+static final byte[] ch53data = {
+(byte) 0x7c,(byte) 0xfe,(byte) 0xc7,(byte) 0xc3,(byte) 0x3,(byte) 0x3,(byte) 0xc7,(byte) 0xfe,(byte) 0xfc,(byte) 0xc0,(byte) 0xc0,(byte) 0xfe,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch53 = new BitmapCharRec(8,13,-1,0,10,ch53data);
+
+/* char: 0x34 '4' */
+
+static final byte[] ch52data = {
+(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x33,(byte) 0x0,
+(byte) 0x33,(byte) 0x0,(byte) 0x1b,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x7,(byte) 0x0,(byte) 0x3,(byte) 0x0,
+};
+
+static final BitmapCharRec ch52 = new BitmapCharRec(9,13,-1,0,10,ch52data);
+
+/* char: 0x33 '3' */
+
+static final byte[] ch51data = {
+(byte) 0x3c,(byte) 0x7e,(byte) 0xc7,(byte) 0xc3,(byte) 0x3,(byte) 0x7,(byte) 0x1e,(byte) 0x1c,(byte) 0x6,(byte) 0xc3,(byte) 0xc3,(byte) 0x7e,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch51 = new BitmapCharRec(8,13,-1,0,10,ch51data);
+
+/* char: 0x32 '2' */
+
+static final byte[] ch50data = {
+(byte) 0xff,(byte) 0xff,(byte) 0xc0,(byte) 0xe0,(byte) 0x70,(byte) 0x38,(byte) 0x1c,(byte) 0xe,(byte) 0x7,(byte) 0x3,(byte) 0xc3,(byte) 0xfe,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch50 = new BitmapCharRec(8,13,-1,0,10,ch50data);
+
+/* char: 0x31 '1' */
+
+static final byte[] ch49data = {
+(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xf8,(byte) 0xf8,(byte) 0x18,
+};
+
+static final BitmapCharRec ch49 = new BitmapCharRec(5,13,-2,0,10,ch49data);
+
+/* char: 0x30 '0' */
+
+static final byte[] ch48data = {
+(byte) 0x3c,(byte) 0x7e,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x66,(byte) 0x7e,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch48 = new BitmapCharRec(8,13,-1,0,10,ch48data);
+
+/* char: 0x2f '/' */
+
+static final byte[] ch47data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0x40,(byte) 0x40,(byte) 0x60,(byte) 0x60,(byte) 0x20,(byte) 0x20,(byte) 0x30,(byte) 0x30,(byte) 0x10,(byte) 0x10,(byte) 0x18,(byte) 0x18,
+};
+
+static final BitmapCharRec ch47 = new BitmapCharRec(5,14,0,0,5,ch47data);
+
+/* char: 0x2e '.' */
+
+static final byte[] ch46data = {
+(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch46 = new BitmapCharRec(2,2,-1,0,5,ch46data);
+
+/* char: 0x2d '-' */
+
+static final byte[] ch45data = {
+(byte) 0xff,(byte) 0xff,
+};
+
+static final BitmapCharRec ch45 = new BitmapCharRec(8,2,-1,-4,11,ch45data);
+
+/* char: 0x2c ',' */
+
+static final byte[] ch44data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch44 = new BitmapCharRec(2,5,-1,3,5,ch44data);
+
+/* char: 0x2b '+' */
+
+static final byte[] ch43data = {
+(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xff,(byte) 0xff,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,
+};
+
+static final BitmapCharRec ch43 = new BitmapCharRec(8,10,-1,0,10,ch43data);
+
+/* char: 0x2a '*' */
+
+static final byte[] ch42data = {
+(byte) 0x88,(byte) 0x70,(byte) 0x70,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch42 = new BitmapCharRec(5,6,-1,-8,7,ch42data);
+
+/* char: 0x29 ')' */
+
+static final byte[] ch41data = {
+(byte) 0x80,(byte) 0xc0,(byte) 0x60,(byte) 0x60,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x60,(byte) 0x60,
+(byte) 0xc0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch41 = new BitmapCharRec(4,18,-1,4,6,ch41data);
+
+/* char: 0x28 '(' */
+
+static final byte[] ch40data = {
+(byte) 0x10,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0x60,
+(byte) 0x30,(byte) 0x10,
+};
+
+static final BitmapCharRec ch40 = new BitmapCharRec(4,18,-1,4,6,ch40data);
+
+/* char: 0x27 ''' */
+
+static final byte[] ch39data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch39 = new BitmapCharRec(2,5,-1,-9,4,ch39data);
+
+/* char: 0x26 '&' */
+
+static final byte[] ch38data = {
+(byte) 0x3c,(byte) 0x70,(byte) 0x7e,(byte) 0xe0,(byte) 0xe7,(byte) 0xc0,(byte) 0xc3,(byte) 0x80,(byte) 0xc3,(byte) 0xc0,(byte) 0xc6,(byte) 0xc0,(byte) 0xee,(byte) 0xc0,(byte) 0x7c,(byte) 0x0,
+(byte) 0x3c,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x7e,(byte) 0x0,(byte) 0x3c,(byte) 0x0,
+};
+
+static final BitmapCharRec ch38 = new BitmapCharRec(12,13,-1,0,13,ch38data);
+
+/* char: 0x25 '%' */
+
+static final byte[] ch37data = {
+(byte) 0x18,(byte) 0x78,(byte) 0x18,(byte) 0xfc,(byte) 0xc,(byte) 0xcc,(byte) 0xc,(byte) 0xcc,(byte) 0x6,(byte) 0xfc,(byte) 0x6,(byte) 0x78,(byte) 0x3,(byte) 0x0,(byte) 0x7b,(byte) 0x0,
+(byte) 0xfd,(byte) 0x80,(byte) 0xcd,(byte) 0x80,(byte) 0xcc,(byte) 0xc0,(byte) 0xfc,(byte) 0xc0,(byte) 0x78,(byte) 0x60,
+};
+
+static final BitmapCharRec ch37 = new BitmapCharRec(14,13,-1,0,16,ch37data);
+
+/* char: 0x24 '$' */
+
+static final byte[] ch36data = {
+(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0xeb,(byte) 0x80,(byte) 0xc9,(byte) 0x80,(byte) 0x9,(byte) 0x80,(byte) 0xf,(byte) 0x0,
+(byte) 0x3e,(byte) 0x0,(byte) 0x78,(byte) 0x0,(byte) 0xe8,(byte) 0x0,(byte) 0xc8,(byte) 0x0,(byte) 0xcb,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x8,(byte) 0x0,
+};
+
+static final BitmapCharRec ch36 = new BitmapCharRec(9,16,-1,2,10,ch36data);
+
+/* char: 0x23 '#' */
+
+static final byte[] ch35data = {
+(byte) 0x24,(byte) 0x0,(byte) 0x24,(byte) 0x0,(byte) 0x24,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0x12,(byte) 0x0,(byte) 0x12,(byte) 0x0,(byte) 0x12,(byte) 0x0,
+(byte) 0x7f,(byte) 0xc0,(byte) 0x7f,(byte) 0xc0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,
+};
+
+static final BitmapCharRec ch35 = new BitmapCharRec(10,13,0,0,10,ch35data);
+
+/* char: 0x22 '"' */
+
+static final byte[] ch34data = {
+(byte) 0x90,(byte) 0x90,(byte) 0xd8,(byte) 0xd8,(byte) 0xd8,
+};
+
+static final BitmapCharRec ch34 = new BitmapCharRec(5,5,0,-9,5,ch34data);
+
+/* char: 0x21 '!' */
+
+static final byte[] ch33data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch33 = new BitmapCharRec(2,14,-2,0,6,ch33data);
+
+/* char: 0x20 ' ' */
+
+static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,5,null);
+
+static final BitmapCharRec[] chars = {
+ch32,
+ch33,
+ch34,
+ch35,
+ch36,
+ch37,
+ch38,
+ch39,
+ch40,
+ch41,
+ch42,
+ch43,
+ch44,
+ch45,
+ch46,
+ch47,
+ch48,
+ch49,
+ch50,
+ch51,
+ch52,
+ch53,
+ch54,
+ch55,
+ch56,
+ch57,
+ch58,
+ch59,
+ch60,
+ch61,
+ch62,
+ch63,
+ch64,
+ch65,
+ch66,
+ch67,
+ch68,
+ch69,
+ch70,
+ch71,
+ch72,
+ch73,
+ch74,
+ch75,
+ch76,
+ch77,
+ch78,
+ch79,
+ch80,
+ch81,
+ch82,
+ch83,
+ch84,
+ch85,
+ch86,
+ch87,
+ch88,
+ch89,
+ch90,
+ch91,
+ch92,
+ch93,
+ch94,
+ch95,
+ch96,
+ch97,
+ch98,
+ch99,
+ch100,
+ch101,
+ch102,
+ch103,
+ch104,
+ch105,
+ch106,
+ch107,
+ch108,
+ch109,
+ch110,
+ch111,
+ch112,
+ch113,
+ch114,
+ch115,
+ch116,
+ch117,
+ch118,
+ch119,
+ch120,
+ch121,
+ch122,
+ch123,
+ch124,
+ch125,
+ch126,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+ch160,
+ch161,
+ch162,
+ch163,
+ch164,
+ch165,
+ch166,
+ch167,
+ch168,
+ch169,
+ch170,
+ch171,
+ch172,
+ch173,
+ch174,
+ch175,
+ch176,
+ch177,
+ch178,
+ch179,
+ch180,
+ch181,
+ch182,
+ch183,
+ch184,
+ch185,
+ch186,
+ch187,
+ch188,
+ch189,
+ch190,
+ch191,
+ch192,
+ch193,
+ch194,
+ch195,
+ch196,
+ch197,
+ch198,
+ch199,
+ch200,
+ch201,
+ch202,
+ch203,
+ch204,
+ch205,
+ch206,
+ch207,
+ch208,
+ch209,
+ch210,
+ch211,
+ch212,
+ch213,
+ch214,
+ch215,
+ch216,
+ch217,
+ch218,
+ch219,
+ch220,
+ch221,
+ch222,
+ch223,
+ch224,
+ch225,
+ch226,
+ch227,
+ch228,
+ch229,
+ch230,
+ch231,
+ch232,
+ch233,
+ch234,
+ch235,
+ch236,
+ch237,
+ch238,
+ch239,
+ch240,
+ch241,
+ch242,
+ch243,
+ch244,
+ch245,
+ch246,
+ch247,
+ch248,
+ch249,
+ch250,
+ch251,
+ch252,
+ch253,
+ch254,
+ch255,
+};
+
+  public static final BitmapFontRec glutBitmapHelvetica18 = new BitmapFontRec("-adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1",
+                                                                       224,
+                                                                       32,
+                                                                       chars);
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman10.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman10.java
new file mode 100644
index 000000000..f753b56f7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman10.java
@@ -0,0 +1,1797 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+class GLUTBitmapTimesRoman10 {
+
+/* GENERATED FILE -- DO NOT MODIFY */
+
+/* char: 0xff */
+
+static final byte[] ch255data = {
+(byte) 0x80,(byte) 0xc0,(byte) 0x40,(byte) 0x60,(byte) 0xa0,(byte) 0x90,(byte) 0xb8,(byte) 0x0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch255 = new BitmapCharRec(5,9,0,2,5,ch255data);
+
+/* char: 0xfe */
+
+static final byte[] ch254data = {
+(byte) 0xc0,(byte) 0x80,(byte) 0xe0,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch254 = new BitmapCharRec(4,9,0,2,5,ch254data);
+
+/* char: 0xfd */
+
+static final byte[] ch253data = {
+(byte) 0x80,(byte) 0xc0,(byte) 0x40,(byte) 0x60,(byte) 0xa0,(byte) 0x90,(byte) 0xb8,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch253 = new BitmapCharRec(5,10,0,2,5,ch253data);
+
+/* char: 0xfc */
+
+static final byte[] ch252data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch252 = new BitmapCharRec(5,7,0,0,5,ch252data);
+
+/* char: 0xfb */
+
+static final byte[] ch251data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch251 = new BitmapCharRec(5,8,0,0,5,ch251data);
+
+/* char: 0xfa */
+
+static final byte[] ch250data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch250 = new BitmapCharRec(5,8,0,0,5,ch250data);
+
+/* char: 0xf9 */
+
+static final byte[] ch249data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch249 = new BitmapCharRec(5,8,0,0,5,ch249data);
+
+/* char: 0xf8 */
+
+static final byte[] ch248data = {
+(byte) 0x80,(byte) 0x70,(byte) 0x48,(byte) 0x48,(byte) 0x48,(byte) 0x38,(byte) 0x4,
+};
+
+static final BitmapCharRec ch248 = new BitmapCharRec(6,7,1,1,5,ch248data);
+
+/* char: 0xf7 */
+
+static final byte[] ch247data = {
+(byte) 0x20,(byte) 0x0,(byte) 0xf8,(byte) 0x0,(byte) 0x20,
+};
+
+static final BitmapCharRec ch247 = new BitmapCharRec(5,5,0,0,6,ch247data);
+
+/* char: 0xf6 */
+
+static final byte[] ch246data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch246 = new BitmapCharRec(4,7,0,0,5,ch246data);
+
+/* char: 0xf5 */
+
+static final byte[] ch245data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0xa0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch245 = new BitmapCharRec(4,8,0,0,5,ch245data);
+
+/* char: 0xf4 */
+
+static final byte[] ch244data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch244 = new BitmapCharRec(4,8,0,0,5,ch244data);
+
+/* char: 0xf3 */
+
+static final byte[] ch243data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch243 = new BitmapCharRec(4,8,0,0,5,ch243data);
+
+/* char: 0xf2 */
+
+static final byte[] ch242data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch242 = new BitmapCharRec(4,8,0,0,5,ch242data);
+
+/* char: 0xf1 */
+
+static final byte[] ch241data = {
+(byte) 0xd8,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch241 = new BitmapCharRec(5,8,0,0,5,ch241data);
+
+/* char: 0xf0 */
+
+static final byte[] ch240data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0xa0,(byte) 0x70,(byte) 0x40,
+};
+
+static final BitmapCharRec ch240 = new BitmapCharRec(4,8,0,0,5,ch240data);
+
+/* char: 0xef */
+
+static final byte[] ch239data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch239 = new BitmapCharRec(3,7,0,0,4,ch239data);
+
+/* char: 0xee */
+
+static final byte[] ch238data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch238 = new BitmapCharRec(3,8,0,0,4,ch238data);
+
+/* char: 0xed */
+
+static final byte[] ch237data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x0,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch237 = new BitmapCharRec(3,8,0,0,4,ch237data);
+
+/* char: 0xec */
+
+static final byte[] ch236data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x0,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch236 = new BitmapCharRec(3,8,0,0,4,ch236data);
+
+/* char: 0xeb */
+
+static final byte[] ch235data = {
+(byte) 0x60,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,(byte) 0x60,(byte) 0x0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch235 = new BitmapCharRec(3,7,0,0,4,ch235data);
+
+/* char: 0xea */
+
+static final byte[] ch234data = {
+(byte) 0x60,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,(byte) 0x60,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch234 = new BitmapCharRec(3,8,0,0,4,ch234data);
+
+/* char: 0xe9 */
+
+static final byte[] ch233data = {
+(byte) 0x60,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,(byte) 0x60,(byte) 0x0,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch233 = new BitmapCharRec(3,8,0,0,4,ch233data);
+
+/* char: 0xe8 */
+
+static final byte[] ch232data = {
+(byte) 0x60,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,(byte) 0x60,(byte) 0x0,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch232 = new BitmapCharRec(3,8,0,0,4,ch232data);
+
+/* char: 0xe7 */
+
+static final byte[] ch231data = {
+(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0x60,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x60,
+};
+
+static final BitmapCharRec ch231 = new BitmapCharRec(3,8,0,3,4,ch231data);
+
+/* char: 0xe6 */
+
+static final byte[] ch230data = {
+(byte) 0xd8,(byte) 0xa0,(byte) 0x70,(byte) 0x28,(byte) 0xd8,
+};
+
+static final BitmapCharRec ch230 = new BitmapCharRec(5,5,0,0,6,ch230data);
+
+/* char: 0xe5 */
+
+static final byte[] ch229data = {
+(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,(byte) 0x40,(byte) 0xa0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch229 = new BitmapCharRec(3,8,0,0,4,ch229data);
+
+/* char: 0xe4 */
+
+static final byte[] ch228data = {
+(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,(byte) 0x0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch228 = new BitmapCharRec(3,7,0,0,4,ch228data);
+
+/* char: 0xe3 */
+
+static final byte[] ch227data = {
+(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,(byte) 0x0,(byte) 0xa0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch227 = new BitmapCharRec(4,8,0,0,4,ch227data);
+
+/* char: 0xe2 */
+
+static final byte[] ch226data = {
+(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch226 = new BitmapCharRec(3,8,0,0,4,ch226data);
+
+/* char: 0xe1 */
+
+static final byte[] ch225data = {
+(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,(byte) 0x0,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch225 = new BitmapCharRec(3,8,0,0,4,ch225data);
+
+/* char: 0xe0 */
+
+static final byte[] ch224data = {
+(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,(byte) 0x0,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch224 = new BitmapCharRec(3,8,0,0,4,ch224data);
+
+/* char: 0xdf */
+
+static final byte[] ch223data = {
+(byte) 0xe0,(byte) 0x50,(byte) 0x50,(byte) 0x60,(byte) 0x50,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch223 = new BitmapCharRec(4,7,0,0,5,ch223data);
+
+/* char: 0xde */
+
+static final byte[] ch222data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x70,(byte) 0x48,(byte) 0x70,(byte) 0x40,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch222 = new BitmapCharRec(5,7,0,0,6,ch222data);
+
+/* char: 0xdd */
+
+static final byte[] ch221data = {
+(byte) 0x38,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0xee,(byte) 0x0,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch221 = new BitmapCharRec(7,10,0,0,8,ch221data);
+
+/* char: 0xdc */
+
+static final byte[] ch220data = {
+(byte) 0x38,(byte) 0x6c,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0xee,(byte) 0x0,(byte) 0x28,
+};
+
+static final BitmapCharRec ch220 = new BitmapCharRec(7,9,0,0,8,ch220data);
+
+/* char: 0xdb */
+
+static final byte[] ch219data = {
+(byte) 0x38,(byte) 0x6c,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0xee,(byte) 0x0,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch219 = new BitmapCharRec(7,10,0,0,8,ch219data);
+
+/* char: 0xda */
+
+static final byte[] ch218data = {
+(byte) 0x38,(byte) 0x6c,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0xee,(byte) 0x0,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch218 = new BitmapCharRec(7,10,0,0,8,ch218data);
+
+/* char: 0xd9 */
+
+static final byte[] ch217data = {
+(byte) 0x38,(byte) 0x6c,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0xee,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch217 = new BitmapCharRec(7,10,0,0,8,ch217data);
+
+/* char: 0xd8 */
+
+static final byte[] ch216data = {
+(byte) 0x80,(byte) 0x7c,(byte) 0x66,(byte) 0x52,(byte) 0x52,(byte) 0x4a,(byte) 0x66,(byte) 0x3e,(byte) 0x1,
+};
+
+static final BitmapCharRec ch216 = new BitmapCharRec(8,9,0,1,8,ch216data);
+
+/* char: 0xd7 */
+
+static final byte[] ch215data = {
+(byte) 0x88,(byte) 0x50,(byte) 0x20,(byte) 0x50,(byte) 0x88,
+};
+
+static final BitmapCharRec ch215 = new BitmapCharRec(5,5,0,0,6,ch215data);
+
+/* char: 0xd6 */
+
+static final byte[] ch214data = {
+(byte) 0x78,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch214 = new BitmapCharRec(6,9,0,0,7,ch214data);
+
+/* char: 0xd5 */
+
+static final byte[] ch213data = {
+(byte) 0x78,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch213 = new BitmapCharRec(6,10,0,0,7,ch213data);
+
+/* char: 0xd4 */
+
+static final byte[] ch212data = {
+(byte) 0x78,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,(byte) 0x0,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch212 = new BitmapCharRec(6,10,0,0,7,ch212data);
+
+/* char: 0xd3 */
+
+static final byte[] ch211data = {
+(byte) 0x78,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,(byte) 0x0,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch211 = new BitmapCharRec(6,10,0,0,7,ch211data);
+
+/* char: 0xd2 */
+
+static final byte[] ch210data = {
+(byte) 0x78,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch210 = new BitmapCharRec(6,10,0,0,7,ch210data);
+
+/* char: 0xd1 */
+
+static final byte[] ch209data = {
+(byte) 0xe4,(byte) 0x4c,(byte) 0x4c,(byte) 0x54,(byte) 0x54,(byte) 0x64,(byte) 0xee,(byte) 0x0,(byte) 0x50,(byte) 0x28,
+};
+
+static final BitmapCharRec ch209 = new BitmapCharRec(7,10,0,0,8,ch209data);
+
+/* char: 0xd0 */
+
+static final byte[] ch208data = {
+(byte) 0xf8,(byte) 0x4c,(byte) 0x44,(byte) 0xe4,(byte) 0x44,(byte) 0x4c,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch208 = new BitmapCharRec(6,7,0,0,7,ch208data);
+
+/* char: 0xcf */
+
+static final byte[] ch207data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch207 = new BitmapCharRec(3,9,0,0,4,ch207data);
+
+/* char: 0xce */
+
+static final byte[] ch206data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch206 = new BitmapCharRec(3,10,0,0,4,ch206data);
+
+/* char: 0xcd */
+
+static final byte[] ch205data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x0,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch205 = new BitmapCharRec(3,10,0,0,4,ch205data);
+
+/* char: 0xcc */
+
+static final byte[] ch204data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x0,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch204 = new BitmapCharRec(3,10,0,0,4,ch204data);
+
+/* char: 0xcb */
+
+static final byte[] ch203data = {
+(byte) 0xf8,(byte) 0x48,(byte) 0x40,(byte) 0x70,(byte) 0x40,(byte) 0x48,(byte) 0xf8,(byte) 0x0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch203 = new BitmapCharRec(5,9,0,0,6,ch203data);
+
+/* char: 0xca */
+
+static final byte[] ch202data = {
+(byte) 0xf8,(byte) 0x48,(byte) 0x40,(byte) 0x70,(byte) 0x40,(byte) 0x48,(byte) 0xf8,(byte) 0x0,(byte) 0x50,(byte) 0x20,
+};
+
+static final BitmapCharRec ch202 = new BitmapCharRec(5,10,0,0,6,ch202data);
+
+/* char: 0xc9 */
+
+static final byte[] ch201data = {
+(byte) 0xf8,(byte) 0x48,(byte) 0x40,(byte) 0x70,(byte) 0x40,(byte) 0x48,(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x10,
+};
+
+static final BitmapCharRec ch201 = new BitmapCharRec(5,10,0,0,6,ch201data);
+
+/* char: 0xc8 */
+
+static final byte[] ch200data = {
+(byte) 0xf8,(byte) 0x48,(byte) 0x40,(byte) 0x70,(byte) 0x40,(byte) 0x48,(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch200 = new BitmapCharRec(5,10,0,0,6,ch200data);
+
+/* char: 0xc7 */
+
+static final byte[] ch199data = {
+(byte) 0x60,(byte) 0x10,(byte) 0x20,(byte) 0x78,(byte) 0xc4,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc4,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch199 = new BitmapCharRec(6,10,0,3,7,ch199data);
+
+/* char: 0xc6 */
+
+static final byte[] ch198data = {
+(byte) 0xef,(byte) 0x49,(byte) 0x78,(byte) 0x2e,(byte) 0x28,(byte) 0x39,(byte) 0x1f,
+};
+
+static final BitmapCharRec ch198 = new BitmapCharRec(8,7,0,0,9,ch198data);
+
+/* char: 0xc5 */
+
+static final byte[] ch197data = {
+(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch197 = new BitmapCharRec(7,10,0,0,8,ch197data);
+
+/* char: 0xc4 */
+
+static final byte[] ch196data = {
+(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,(byte) 0x0,(byte) 0x28,
+};
+
+static final BitmapCharRec ch196 = new BitmapCharRec(7,9,0,0,8,ch196data);
+
+/* char: 0xc3 */
+
+static final byte[] ch195data = {
+(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,(byte) 0x0,(byte) 0x28,(byte) 0x14,
+};
+
+static final BitmapCharRec ch195 = new BitmapCharRec(7,10,0,0,8,ch195data);
+
+/* char: 0xc2 */
+
+static final byte[] ch194data = {
+(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,(byte) 0x0,(byte) 0x28,(byte) 0x10,
+};
+
+static final BitmapCharRec ch194 = new BitmapCharRec(7,10,0,0,8,ch194data);
+
+/* char: 0xc1 */
+
+static final byte[] ch193data = {
+(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x8,
+};
+
+static final BitmapCharRec ch193 = new BitmapCharRec(7,10,0,0,8,ch193data);
+
+/* char: 0xc0 */
+
+static final byte[] ch192data = {
+(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x20,
+};
+
+static final BitmapCharRec ch192 = new BitmapCharRec(7,10,0,0,8,ch192data);
+
+/* char: 0xbf */
+
+static final byte[] ch191data = {
+(byte) 0xe0,(byte) 0xa0,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch191 = new BitmapCharRec(3,7,0,2,4,ch191data);
+
+/* char: 0xbe */
+
+static final byte[] ch190data = {
+(byte) 0x44,(byte) 0x3e,(byte) 0x2c,(byte) 0xd4,(byte) 0x28,(byte) 0x48,(byte) 0xe4,
+};
+
+static final BitmapCharRec ch190 = new BitmapCharRec(7,7,0,0,8,ch190data);
+
+/* char: 0xbd */
+
+static final byte[] ch189data = {
+(byte) 0x4e,(byte) 0x24,(byte) 0x2a,(byte) 0xf6,(byte) 0x48,(byte) 0xc8,(byte) 0x44,
+};
+
+static final BitmapCharRec ch189 = new BitmapCharRec(7,7,0,0,8,ch189data);
+
+/* char: 0xbc */
+
+static final byte[] ch188data = {
+(byte) 0x44,(byte) 0x3e,(byte) 0x2c,(byte) 0xf4,(byte) 0x48,(byte) 0xc8,(byte) 0x44,
+};
+
+static final BitmapCharRec ch188 = new BitmapCharRec(7,7,0,0,8,ch188data);
+
+/* char: 0xbb */
+
+static final byte[] ch187data = {
+(byte) 0xa0,(byte) 0x50,(byte) 0x50,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch187 = new BitmapCharRec(4,4,0,-1,5,ch187data);
+
+/* char: 0xba */
+
+static final byte[] ch186data = {
+(byte) 0xe0,(byte) 0x0,(byte) 0x40,(byte) 0xa0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch186 = new BitmapCharRec(3,5,0,-2,4,ch186data);
+
+/* char: 0xb9 */
+
+static final byte[] ch185data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch185 = new BitmapCharRec(3,4,0,-3,3,ch185data);
+
+/* char: 0xb8 */
+
+static final byte[] ch184data = {
+(byte) 0xc0,(byte) 0x20,(byte) 0x40,
+};
+
+static final BitmapCharRec ch184 = new BitmapCharRec(3,3,0,3,4,ch184data);
+
+/* char: 0xb7 */
+
+static final byte[] ch183data = {
+(byte) 0x80,
+};
+
+static final BitmapCharRec ch183 = new BitmapCharRec(1,1,0,-2,2,ch183data);
+
+/* char: 0xb6 */
+
+static final byte[] ch182data = {
+(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x68,(byte) 0xe8,(byte) 0xe8,(byte) 0xe8,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch182 = new BitmapCharRec(6,9,0,2,6,ch182data);
+
+/* char: 0xb5 */
+
+static final byte[] ch181data = {
+(byte) 0x80,(byte) 0x80,(byte) 0xe8,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,
+};
+
+static final BitmapCharRec ch181 = new BitmapCharRec(5,7,0,2,5,ch181data);
+
+/* char: 0xb4 */
+
+static final byte[] ch180data = {
+(byte) 0x80,(byte) 0x40,
+};
+
+static final BitmapCharRec ch180 = new BitmapCharRec(2,2,0,-5,3,ch180data);
+
+/* char: 0xb3 */
+
+static final byte[] ch179data = {
+(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch179 = new BitmapCharRec(3,4,0,-3,3,ch179data);
+
+/* char: 0xb2 */
+
+static final byte[] ch178data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0xa0,(byte) 0x60,
+};
+
+static final BitmapCharRec ch178 = new BitmapCharRec(3,4,0,-3,3,ch178data);
+
+/* char: 0xb1 */
+
+static final byte[] ch177data = {
+(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch177 = new BitmapCharRec(5,7,0,0,6,ch177data);
+
+/* char: 0xb0 */
+
+static final byte[] ch176data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch176 = new BitmapCharRec(4,4,0,-3,4,ch176data);
+
+/* char: 0xaf */
+
+static final byte[] ch175data = {
+(byte) 0xe0,
+};
+
+static final BitmapCharRec ch175 = new BitmapCharRec(3,1,0,-6,4,ch175data);
+
+/* char: 0xae */
+
+static final byte[] ch174data = {
+(byte) 0x38,(byte) 0x44,(byte) 0xaa,(byte) 0xb2,(byte) 0xba,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch174 = new BitmapCharRec(7,7,-1,0,9,ch174data);
+
+/* char: 0xad */
+
+static final byte[] ch173data = {
+(byte) 0xe0,
+};
+
+static final BitmapCharRec ch173 = new BitmapCharRec(3,1,0,-2,4,ch173data);
+
+/* char: 0xac */
+
+static final byte[] ch172data = {
+(byte) 0x8,(byte) 0x8,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch172 = new BitmapCharRec(5,3,-1,-1,7,ch172data);
+
+/* char: 0xab */
+
+static final byte[] ch171data = {
+(byte) 0x50,(byte) 0xa0,(byte) 0xa0,(byte) 0x50,
+};
+
+static final BitmapCharRec ch171 = new BitmapCharRec(4,4,0,-1,5,ch171data);
+
+/* char: 0xaa */
+
+static final byte[] ch170data = {
+(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x20,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch170 = new BitmapCharRec(3,5,0,-2,4,ch170data);
+
+/* char: 0xa9 */
+
+static final byte[] ch169data = {
+(byte) 0x38,(byte) 0x44,(byte) 0x9a,(byte) 0xa2,(byte) 0x9a,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch169 = new BitmapCharRec(7,7,-1,0,9,ch169data);
+
+/* char: 0xa8 */
+
+static final byte[] ch168data = {
+(byte) 0xa0,
+};
+
+static final BitmapCharRec ch168 = new BitmapCharRec(3,1,-1,-6,5,ch168data);
+
+/* char: 0xa7 */
+
+static final byte[] ch167data = {
+(byte) 0xe0,(byte) 0x90,(byte) 0x20,(byte) 0x50,(byte) 0x90,(byte) 0xa0,(byte) 0x40,(byte) 0x90,(byte) 0x70,
+};
+
+static final BitmapCharRec ch167 = new BitmapCharRec(4,9,0,1,5,ch167data);
+
+/* char: 0xa6 */
+
+static final byte[] ch166data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch166 = new BitmapCharRec(1,7,0,0,2,ch166data);
+
+/* char: 0xa5 */
+
+static final byte[] ch165data = {
+(byte) 0x70,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0xd8,(byte) 0x50,(byte) 0x88,
+};
+
+static final BitmapCharRec ch165 = new BitmapCharRec(5,7,0,0,5,ch165data);
+
+/* char: 0xa4 */
+
+static final byte[] ch164data = {
+(byte) 0x88,(byte) 0x70,(byte) 0x50,(byte) 0x50,(byte) 0x70,(byte) 0x88,
+};
+
+static final BitmapCharRec ch164 = new BitmapCharRec(5,6,0,-1,5,ch164data);
+
+/* char: 0xa3 */
+
+static final byte[] ch163data = {
+(byte) 0xf0,(byte) 0xc8,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x50,(byte) 0x30,
+};
+
+static final BitmapCharRec ch163 = new BitmapCharRec(5,7,0,0,5,ch163data);
+
+/* char: 0xa2 */
+
+static final byte[] ch162data = {
+(byte) 0x80,(byte) 0xe0,(byte) 0x90,(byte) 0x80,(byte) 0x90,(byte) 0x70,(byte) 0x10,
+};
+
+static final BitmapCharRec ch162 = new BitmapCharRec(4,7,0,1,5,ch162data);
+
+/* char: 0xa1 */
+
+static final byte[] ch161data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch161 = new BitmapCharRec(1,7,-1,2,3,ch161data);
+
+/* char: 0xa0 */
+
+static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,2,null);
+
+/* char: 0x7e '~' */
+
+static final byte[] ch126data = {
+(byte) 0x98,(byte) 0x64,
+};
+
+static final BitmapCharRec ch126 = new BitmapCharRec(6,2,0,-2,7,ch126data);
+
+/* char: 0x7d '}' */
+
+static final byte[] ch125data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch125 = new BitmapCharRec(3,9,0,2,4,ch125data);
+
+/* char: 0x7c '|' */
+
+static final byte[] ch124data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch124 = new BitmapCharRec(1,9,0,2,2,ch124data);
+
+/* char: 0x7b '{' */
+
+static final byte[] ch123data = {
+(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch123 = new BitmapCharRec(3,9,0,2,4,ch123data);
+
+/* char: 0x7a 'z' */
+
+static final byte[] ch122data = {
+(byte) 0xf0,(byte) 0x90,(byte) 0x40,(byte) 0x20,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch122 = new BitmapCharRec(4,5,0,0,5,ch122data);
+
+/* char: 0x79 'y' */
+
+static final byte[] ch121data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x30,(byte) 0x50,(byte) 0x48,(byte) 0xdc,
+};
+
+static final BitmapCharRec ch121 = new BitmapCharRec(6,7,1,2,5,ch121data);
+
+/* char: 0x78 'x' */
+
+static final byte[] ch120data = {
+(byte) 0xd8,(byte) 0x50,(byte) 0x20,(byte) 0x50,(byte) 0xd8,
+};
+
+static final BitmapCharRec ch120 = new BitmapCharRec(5,5,0,0,6,ch120data);
+
+/* char: 0x77 'w' */
+
+static final byte[] ch119data = {
+(byte) 0x28,(byte) 0x6c,(byte) 0x54,(byte) 0x92,(byte) 0xdb,
+};
+
+static final BitmapCharRec ch119 = new BitmapCharRec(8,5,0,0,8,ch119data);
+
+/* char: 0x76 'v' */
+
+static final byte[] ch118data = {
+(byte) 0x20,(byte) 0x60,(byte) 0x50,(byte) 0x90,(byte) 0xd8,
+};
+
+static final BitmapCharRec ch118 = new BitmapCharRec(5,5,0,0,5,ch118data);
+
+/* char: 0x75 'u' */
+
+static final byte[] ch117data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,
+};
+
+static final BitmapCharRec ch117 = new BitmapCharRec(5,5,0,0,5,ch117data);
+
+/* char: 0x74 't' */
+
+static final byte[] ch116data = {
+(byte) 0x30,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch116 = new BitmapCharRec(4,6,0,0,4,ch116data);
+
+/* char: 0x73 's' */
+
+static final byte[] ch115data = {
+(byte) 0xe0,(byte) 0x20,(byte) 0x60,(byte) 0x80,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch115 = new BitmapCharRec(3,5,0,0,4,ch115data);
+
+/* char: 0x72 'r' */
+
+static final byte[] ch114data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x60,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch114 = new BitmapCharRec(3,5,0,0,4,ch114data);
+
+/* char: 0x71 'q' */
+
+static final byte[] ch113data = {
+(byte) 0x38,(byte) 0x10,(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x70,
+};
+
+static final BitmapCharRec ch113 = new BitmapCharRec(5,7,0,2,5,ch113data);
+
+/* char: 0x70 'p' */
+
+static final byte[] ch112data = {
+(byte) 0xc0,(byte) 0x80,(byte) 0xe0,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch112 = new BitmapCharRec(4,7,0,2,5,ch112data);
+
+/* char: 0x6f 'o' */
+
+static final byte[] ch111data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch111 = new BitmapCharRec(4,5,0,0,5,ch111data);
+
+/* char: 0x6e 'n' */
+
+static final byte[] ch110data = {
+(byte) 0xd8,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch110 = new BitmapCharRec(5,5,0,0,5,ch110data);
+
+/* char: 0x6d 'm' */
+
+static final byte[] ch109data = {
+(byte) 0xdb,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0xec,
+};
+
+static final BitmapCharRec ch109 = new BitmapCharRec(8,5,0,0,8,ch109data);
+
+/* char: 0x6c 'l' */
+
+static final byte[] ch108data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch108 = new BitmapCharRec(3,7,0,0,4,ch108data);
+
+/* char: 0x6b 'k' */
+
+static final byte[] ch107data = {
+(byte) 0x98,(byte) 0x90,(byte) 0xe0,(byte) 0xa0,(byte) 0x90,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch107 = new BitmapCharRec(5,7,0,0,5,ch107data);
+
+/* char: 0x6a 'j' */
+
+static final byte[] ch106data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch106 = new BitmapCharRec(2,9,0,2,3,ch106data);
+
+/* char: 0x69 'i' */
+
+static final byte[] ch105data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch105 = new BitmapCharRec(2,7,0,0,3,ch105data);
+
+/* char: 0x68 'h' */
+
+static final byte[] ch104data = {
+(byte) 0xd8,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch104 = new BitmapCharRec(5,7,0,0,5,ch104data);
+
+/* char: 0x67 'g' */
+
+static final byte[] ch103data = {
+(byte) 0xe0,(byte) 0x90,(byte) 0x60,(byte) 0x40,(byte) 0xa0,(byte) 0xa0,(byte) 0x70,
+};
+
+static final BitmapCharRec ch103 = new BitmapCharRec(4,7,0,2,5,ch103data);
+
+/* char: 0x66 'f' */
+
+static final byte[] ch102data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x30,
+};
+
+static final BitmapCharRec ch102 = new BitmapCharRec(4,7,0,0,4,ch102data);
+
+/* char: 0x65 'e' */
+
+static final byte[] ch101data = {
+(byte) 0x60,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,(byte) 0x60,
+};
+
+static final BitmapCharRec ch101 = new BitmapCharRec(3,5,0,0,4,ch101data);
+
+/* char: 0x64 'd' */
+
+static final byte[] ch100data = {
+(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0x30,
+};
+
+static final BitmapCharRec ch100 = new BitmapCharRec(5,7,0,0,5,ch100data);
+
+/* char: 0x63 'c' */
+
+static final byte[] ch99data = {
+(byte) 0x60,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x60,
+};
+
+static final BitmapCharRec ch99 = new BitmapCharRec(3,5,0,0,4,ch99data);
+
+/* char: 0x62 'b' */
+
+static final byte[] ch98data = {
+(byte) 0xe0,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch98 = new BitmapCharRec(4,7,0,0,5,ch98data);
+
+/* char: 0x61 'a' */
+
+static final byte[] ch97data = {
+(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch97 = new BitmapCharRec(3,5,0,0,4,ch97data);
+
+/* char: 0x60 '`' */
+
+static final byte[] ch96data = {
+(byte) 0xc0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch96 = new BitmapCharRec(2,2,0,-5,3,ch96data);
+
+/* char: 0x5f '_' */
+
+static final byte[] ch95data = {
+(byte) 0xf8,
+};
+
+static final BitmapCharRec ch95 = new BitmapCharRec(5,1,0,3,5,ch95data);
+
+/* char: 0x5e '^' */
+
+static final byte[] ch94data = {
+(byte) 0xa0,(byte) 0xa0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch94 = new BitmapCharRec(3,3,-1,-4,5,ch94data);
+
+/* char: 0x5d ']' */
+
+static final byte[] ch93data = {
+(byte) 0xc0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch93 = new BitmapCharRec(2,9,0,2,3,ch93data);
+
+/* char: 0x5c '\' */
+
+static final byte[] ch92data = {
+(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch92 = new BitmapCharRec(3,7,0,0,3,ch92data);
+
+/* char: 0x5b '[' */
+
+static final byte[] ch91data = {
+(byte) 0xc0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch91 = new BitmapCharRec(2,9,0,2,3,ch91data);
+
+/* char: 0x5a 'Z' */
+
+static final byte[] ch90data = {
+(byte) 0xf8,(byte) 0x88,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x88,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch90 = new BitmapCharRec(5,7,0,0,6,ch90data);
+
+/* char: 0x59 'Y' */
+
+static final byte[] ch89data = {
+(byte) 0x38,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0xee,
+};
+
+static final BitmapCharRec ch89 = new BitmapCharRec(7,7,0,0,8,ch89data);
+
+/* char: 0x58 'X' */
+
+static final byte[] ch88data = {
+(byte) 0xee,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0xee,
+};
+
+static final BitmapCharRec ch88 = new BitmapCharRec(7,7,0,0,8,ch88data);
+
+/* char: 0x57 'W' */
+
+static final byte[] ch87data = {
+(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0xc9,(byte) 0x80,(byte) 0x88,(byte) 0x80,(byte) 0xdd,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch87 = new BitmapCharRec(10,7,0,0,10,ch87data);
+
+/* char: 0x56 'V' */
+
+static final byte[] ch86data = {
+(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x6c,(byte) 0x44,(byte) 0xee,
+};
+
+static final BitmapCharRec ch86 = new BitmapCharRec(7,7,0,0,8,ch86data);
+
+/* char: 0x55 'U' */
+
+static final byte[] ch85data = {
+(byte) 0x38,(byte) 0x6c,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0xee,
+};
+
+static final BitmapCharRec ch85 = new BitmapCharRec(7,7,0,0,8,ch85data);
+
+/* char: 0x54 'T' */
+
+static final byte[] ch84data = {
+(byte) 0x70,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xa8,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch84 = new BitmapCharRec(5,7,0,0,6,ch84data);
+
+/* char: 0x53 'S' */
+
+static final byte[] ch83data = {
+(byte) 0xe0,(byte) 0x90,(byte) 0x10,(byte) 0x60,(byte) 0xc0,(byte) 0x90,(byte) 0x70,
+};
+
+static final BitmapCharRec ch83 = new BitmapCharRec(4,7,0,0,5,ch83data);
+
+/* char: 0x52 'R' */
+
+static final byte[] ch82data = {
+(byte) 0xec,(byte) 0x48,(byte) 0x50,(byte) 0x70,(byte) 0x48,(byte) 0x48,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch82 = new BitmapCharRec(6,7,0,0,7,ch82data);
+
+/* char: 0x51 'Q' */
+
+static final byte[] ch81data = {
+(byte) 0xc,(byte) 0x18,(byte) 0x70,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,
+};
+
+static final BitmapCharRec ch81 = new BitmapCharRec(6,9,0,2,7,ch81data);
+
+/* char: 0x50 'P' */
+
+static final byte[] ch80data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x70,(byte) 0x48,(byte) 0x48,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch80 = new BitmapCharRec(5,7,0,0,6,ch80data);
+
+/* char: 0x4f 'O' */
+
+static final byte[] ch79data = {
+(byte) 0x78,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,
+};
+
+static final BitmapCharRec ch79 = new BitmapCharRec(6,7,0,0,7,ch79data);
+
+/* char: 0x4e 'N' */
+
+static final byte[] ch78data = {
+(byte) 0xe4,(byte) 0x4c,(byte) 0x4c,(byte) 0x54,(byte) 0x54,(byte) 0x64,(byte) 0xee,
+};
+
+static final BitmapCharRec ch78 = new BitmapCharRec(7,7,0,0,8,ch78data);
+
+/* char: 0x4d 'M' */
+
+static final byte[] ch77data = {
+(byte) 0xeb,(byte) 0x80,(byte) 0x49,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xe3,(byte) 0x80,
+};
+
+static final BitmapCharRec ch77 = new BitmapCharRec(9,7,0,0,10,ch77data);
+
+/* char: 0x4c 'L' */
+
+static final byte[] ch76data = {
+(byte) 0xf8,(byte) 0x48,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch76 = new BitmapCharRec(5,7,0,0,6,ch76data);
+
+/* char: 0x4b 'K' */
+
+static final byte[] ch75data = {
+(byte) 0xec,(byte) 0x48,(byte) 0x50,(byte) 0x60,(byte) 0x50,(byte) 0x48,(byte) 0xec,
+};
+
+static final BitmapCharRec ch75 = new BitmapCharRec(6,7,0,0,7,ch75data);
+
+/* char: 0x4a 'J' */
+
+static final byte[] ch74data = {
+(byte) 0xc0,(byte) 0xa0,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x70,
+};
+
+static final BitmapCharRec ch74 = new BitmapCharRec(4,7,0,0,4,ch74data);
+
+/* char: 0x49 'I' */
+
+static final byte[] ch73data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch73 = new BitmapCharRec(3,7,0,0,4,ch73data);
+
+/* char: 0x48 'H' */
+
+static final byte[] ch72data = {
+(byte) 0xee,(byte) 0x44,(byte) 0x44,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0xee,
+};
+
+static final BitmapCharRec ch72 = new BitmapCharRec(7,7,0,0,8,ch72data);
+
+/* char: 0x47 'G' */
+
+static final byte[] ch71data = {
+(byte) 0x78,(byte) 0xc4,(byte) 0x84,(byte) 0x9c,(byte) 0x80,(byte) 0xc4,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch71 = new BitmapCharRec(6,7,0,0,7,ch71data);
+
+/* char: 0x46 'F' */
+
+static final byte[] ch70data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x70,(byte) 0x40,(byte) 0x48,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch70 = new BitmapCharRec(5,7,0,0,6,ch70data);
+
+/* char: 0x45 'E' */
+
+static final byte[] ch69data = {
+(byte) 0xf8,(byte) 0x48,(byte) 0x40,(byte) 0x70,(byte) 0x40,(byte) 0x48,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch69 = new BitmapCharRec(5,7,0,0,6,ch69data);
+
+/* char: 0x44 'D' */
+
+static final byte[] ch68data = {
+(byte) 0xf8,(byte) 0x4c,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x4c,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch68 = new BitmapCharRec(6,7,0,0,7,ch68data);
+
+/* char: 0x43 'C' */
+
+static final byte[] ch67data = {
+(byte) 0x78,(byte) 0xc4,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc4,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch67 = new BitmapCharRec(6,7,0,0,7,ch67data);
+
+/* char: 0x42 'B' */
+
+static final byte[] ch66data = {
+(byte) 0xf0,(byte) 0x48,(byte) 0x48,(byte) 0x70,(byte) 0x48,(byte) 0x48,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch66 = new BitmapCharRec(5,7,0,0,6,ch66data);
+
+/* char: 0x41 'A' */
+
+static final byte[] ch65data = {
+(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,
+};
+
+static final BitmapCharRec ch65 = new BitmapCharRec(7,7,0,0,8,ch65data);
+
+/* char: 0x40 '@' */
+
+static final byte[] ch64data = {
+(byte) 0x3e,(byte) 0x40,(byte) 0x92,(byte) 0xad,(byte) 0xa5,(byte) 0xa5,(byte) 0x9d,(byte) 0x42,(byte) 0x3c,
+};
+
+static final BitmapCharRec ch64 = new BitmapCharRec(8,9,0,2,9,ch64data);
+
+/* char: 0x3f '?' */
+
+static final byte[] ch63data = {
+(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0xa0,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch63 = new BitmapCharRec(3,7,0,0,4,ch63data);
+
+/* char: 0x3e '>' */
+
+static final byte[] ch62data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch62 = new BitmapCharRec(3,5,0,0,5,ch62data);
+
+/* char: 0x3d '=' */
+
+static final byte[] ch61data = {
+(byte) 0xf8,(byte) 0x0,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch61 = new BitmapCharRec(5,3,0,-1,6,ch61data);
+
+/* char: 0x3c '<' */
+
+static final byte[] ch60data = {
+(byte) 0x20,(byte) 0x40,(byte) 0x80,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch60 = new BitmapCharRec(3,5,-1,0,5,ch60data);
+
+/* char: 0x3b ';' */
+
+static final byte[] ch59data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch59 = new BitmapCharRec(1,7,-1,2,3,ch59data);
+
+/* char: 0x3a ':' */
+
+static final byte[] ch58data = {
+(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x80,
+};
+
+static final BitmapCharRec ch58 = new BitmapCharRec(1,5,-1,0,3,ch58data);
+
+/* char: 0x39 '9' */
+
+static final byte[] ch57data = {
+(byte) 0xc0,(byte) 0x20,(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch57 = new BitmapCharRec(4,7,0,0,5,ch57data);
+
+/* char: 0x38 '8' */
+
+static final byte[] ch56data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch56 = new BitmapCharRec(4,7,0,0,5,ch56data);
+
+/* char: 0x37 '7' */
+
+static final byte[] ch55data = {
+(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x90,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch55 = new BitmapCharRec(4,7,0,0,5,ch55data);
+
+/* char: 0x36 '6' */
+
+static final byte[] ch54data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0x40,(byte) 0x30,
+};
+
+static final BitmapCharRec ch54 = new BitmapCharRec(4,7,0,0,5,ch54data);
+
+/* char: 0x35 '5' */
+
+static final byte[] ch53data = {
+(byte) 0xe0,(byte) 0x90,(byte) 0x10,(byte) 0x10,(byte) 0xe0,(byte) 0x40,(byte) 0x70,
+};
+
+static final BitmapCharRec ch53 = new BitmapCharRec(4,7,0,0,5,ch53data);
+
+/* char: 0x34 '4' */
+
+static final byte[] ch52data = {
+(byte) 0x10,(byte) 0x10,(byte) 0xf8,(byte) 0x90,(byte) 0x50,(byte) 0x30,(byte) 0x10,
+};
+
+static final BitmapCharRec ch52 = new BitmapCharRec(5,7,0,0,5,ch52data);
+
+/* char: 0x33 '3' */
+
+static final byte[] ch51data = {
+(byte) 0xe0,(byte) 0x10,(byte) 0x10,(byte) 0x60,(byte) 0x10,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch51 = new BitmapCharRec(4,7,0,0,5,ch51data);
+
+/* char: 0x32 '2' */
+
+static final byte[] ch50data = {
+(byte) 0xf0,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch50 = new BitmapCharRec(4,7,0,0,5,ch50data);
+
+/* char: 0x31 '1' */
+
+static final byte[] ch49data = {
+(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
+};
+
+static final BitmapCharRec ch49 = new BitmapCharRec(3,7,-1,0,5,ch49data);
+
+/* char: 0x30 '0' */
+
+static final byte[] ch48data = {
+(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,
+};
+
+static final BitmapCharRec ch48 = new BitmapCharRec(4,7,0,0,5,ch48data);
+
+/* char: 0x2f '/' */
+
+static final byte[] ch47data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch47 = new BitmapCharRec(3,7,0,0,3,ch47data);
+
+/* char: 0x2e '.' */
+
+static final byte[] ch46data = {
+(byte) 0x80,
+};
+
+static final BitmapCharRec ch46 = new BitmapCharRec(1,1,-1,0,3,ch46data);
+
+/* char: 0x2d '-' */
+
+static final byte[] ch45data = {
+(byte) 0xf0,
+};
+
+static final BitmapCharRec ch45 = new BitmapCharRec(4,1,-1,-2,7,ch45data);
+
+/* char: 0x2c ',' */
+
+static final byte[] ch44data = {
+(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch44 = new BitmapCharRec(1,3,-1,2,3,ch44data);
+
+/* char: 0x2b '+' */
+
+static final byte[] ch43data = {
+(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
+};
+
+static final BitmapCharRec ch43 = new BitmapCharRec(5,5,0,0,6,ch43data);
+
+/* char: 0x2a '*' */
+
+static final byte[] ch42data = {
+(byte) 0xa0,(byte) 0x40,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch42 = new BitmapCharRec(3,3,0,-4,5,ch42data);
+
+/* char: 0x29 ')' */
+
+static final byte[] ch41data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch41 = new BitmapCharRec(3,9,0,2,4,ch41data);
+
+/* char: 0x28 '(' */
+
+static final byte[] ch40data = {
+(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,
+};
+
+static final BitmapCharRec ch40 = new BitmapCharRec(3,9,0,2,4,ch40data);
+
+/* char: 0x27 ''' */
+
+static final byte[] ch39data = {
+(byte) 0x40,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch39 = new BitmapCharRec(2,2,0,-5,3,ch39data);
+
+/* char: 0x26 '&' */
+
+static final byte[] ch38data = {
+(byte) 0x76,(byte) 0x8d,(byte) 0x98,(byte) 0x74,(byte) 0x6e,(byte) 0x50,(byte) 0x30,
+};
+
+static final BitmapCharRec ch38 = new BitmapCharRec(8,7,0,0,8,ch38data);
+
+/* char: 0x25 '%' */
+
+static final byte[] ch37data = {
+(byte) 0x44,(byte) 0x2a,(byte) 0x2a,(byte) 0x56,(byte) 0xa8,(byte) 0xa4,(byte) 0x7e,
+};
+
+static final BitmapCharRec ch37 = new BitmapCharRec(7,7,0,0,8,ch37data);
+
+/* char: 0x24 '$' */
+
+static final byte[] ch36data = {
+(byte) 0x20,(byte) 0xe0,(byte) 0x90,(byte) 0x10,(byte) 0x60,(byte) 0x80,(byte) 0x90,(byte) 0x70,(byte) 0x20,
+};
+
+static final BitmapCharRec ch36 = new BitmapCharRec(4,9,0,1,5,ch36data);
+
+/* char: 0x23 '#' */
+
+static final byte[] ch35data = {
+(byte) 0x50,(byte) 0x50,(byte) 0xf8,(byte) 0x50,(byte) 0xf8,(byte) 0x50,(byte) 0x50,
+};
+
+static final BitmapCharRec ch35 = new BitmapCharRec(5,7,0,0,5,ch35data);
+
+/* char: 0x22 '"' */
+
+static final byte[] ch34data = {
+(byte) 0xa0,(byte) 0xa0,
+};
+
+static final BitmapCharRec ch34 = new BitmapCharRec(3,2,0,-5,4,ch34data);
+
+/* char: 0x21 '!' */
+
+static final byte[] ch33data = {
+(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
+};
+
+static final BitmapCharRec ch33 = new BitmapCharRec(1,7,-1,0,3,ch33data);
+
+/* char: 0x20 ' ' */
+
+static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,2,null);
+
+static final BitmapCharRec[] chars = {
+ch32,
+ch33,
+ch34,
+ch35,
+ch36,
+ch37,
+ch38,
+ch39,
+ch40,
+ch41,
+ch42,
+ch43,
+ch44,
+ch45,
+ch46,
+ch47,
+ch48,
+ch49,
+ch50,
+ch51,
+ch52,
+ch53,
+ch54,
+ch55,
+ch56,
+ch57,
+ch58,
+ch59,
+ch60,
+ch61,
+ch62,
+ch63,
+ch64,
+ch65,
+ch66,
+ch67,
+ch68,
+ch69,
+ch70,
+ch71,
+ch72,
+ch73,
+ch74,
+ch75,
+ch76,
+ch77,
+ch78,
+ch79,
+ch80,
+ch81,
+ch82,
+ch83,
+ch84,
+ch85,
+ch86,
+ch87,
+ch88,
+ch89,
+ch90,
+ch91,
+ch92,
+ch93,
+ch94,
+ch95,
+ch96,
+ch97,
+ch98,
+ch99,
+ch100,
+ch101,
+ch102,
+ch103,
+ch104,
+ch105,
+ch106,
+ch107,
+ch108,
+ch109,
+ch110,
+ch111,
+ch112,
+ch113,
+ch114,
+ch115,
+ch116,
+ch117,
+ch118,
+ch119,
+ch120,
+ch121,
+ch122,
+ch123,
+ch124,
+ch125,
+ch126,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+ch160,
+ch161,
+ch162,
+ch163,
+ch164,
+ch165,
+ch166,
+ch167,
+ch168,
+ch169,
+ch170,
+ch171,
+ch172,
+ch173,
+ch174,
+ch175,
+ch176,
+ch177,
+ch178,
+ch179,
+ch180,
+ch181,
+ch182,
+ch183,
+ch184,
+ch185,
+ch186,
+ch187,
+ch188,
+ch189,
+ch190,
+ch191,
+ch192,
+ch193,
+ch194,
+ch195,
+ch196,
+ch197,
+ch198,
+ch199,
+ch200,
+ch201,
+ch202,
+ch203,
+ch204,
+ch205,
+ch206,
+ch207,
+ch208,
+ch209,
+ch210,
+ch211,
+ch212,
+ch213,
+ch214,
+ch215,
+ch216,
+ch217,
+ch218,
+ch219,
+ch220,
+ch221,
+ch222,
+ch223,
+ch224,
+ch225,
+ch226,
+ch227,
+ch228,
+ch229,
+ch230,
+ch231,
+ch232,
+ch233,
+ch234,
+ch235,
+ch236,
+ch237,
+ch238,
+ch239,
+ch240,
+ch241,
+ch242,
+ch243,
+ch244,
+ch245,
+ch246,
+ch247,
+ch248,
+ch249,
+ch250,
+ch251,
+ch252,
+ch253,
+ch254,
+ch255,
+};
+
+  public static final BitmapFontRec glutBitmapTimesRoman10 = new BitmapFontRec("-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1",
+                                                                        224,
+                                                                        32,
+                                                                        chars);
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman24.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman24.java
new file mode 100644
index 000000000..073e6e673
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman24.java
@@ -0,0 +1,2080 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+class GLUTBitmapTimesRoman24 {
+
+/* GENERATED FILE -- DO NOT MODIFY */
+
+/* char: 0xff */
+
+static final byte[] ch255data = {
+(byte) 0xe0,(byte) 0x0,(byte) 0xf0,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xe,(byte) 0x0,
+(byte) 0x1a,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x31,(byte) 0x0,(byte) 0x30,(byte) 0x80,(byte) 0x30,(byte) 0x80,(byte) 0x60,(byte) 0x80,(byte) 0x60,(byte) 0xc0,
+(byte) 0xf1,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x33,(byte) 0x0,
+};
+
+static final BitmapCharRec ch255 = new BitmapCharRec(11,21,0,5,11,ch255data);
+
+/* char: 0xfe */
+
+static final byte[] ch254data = {
+(byte) 0xf0,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x6e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,
+(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,
+(byte) 0x6e,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0xe0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch254 = new BitmapCharRec(10,22,-1,5,12,ch254data);
+
+/* char: 0xfd */
+
+static final byte[] ch253data = {
+(byte) 0xe0,(byte) 0x0,(byte) 0xf0,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xe,(byte) 0x0,
+(byte) 0x1a,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x31,(byte) 0x0,(byte) 0x30,(byte) 0x80,(byte) 0x30,(byte) 0x80,(byte) 0x60,(byte) 0x80,(byte) 0x60,(byte) 0xc0,
+(byte) 0xf1,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x80,(byte) 0x1,(byte) 0x80,
+};
+
+static final BitmapCharRec ch253 = new BitmapCharRec(11,22,0,5,11,ch253data);
+
+/* char: 0xfc */
+
+static final byte[] ch252data = {
+(byte) 0x1c,(byte) 0xe0,(byte) 0x3e,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
+(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe1,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x33,(byte) 0x0,
+};
+
+static final BitmapCharRec ch252 = new BitmapCharRec(11,16,-1,0,13,ch252data);
+
+/* char: 0xfb */
+
+static final byte[] ch251data = {
+(byte) 0x1c,(byte) 0xe0,(byte) 0x3e,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
+(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe1,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x21,(byte) 0x0,(byte) 0x12,(byte) 0x0,(byte) 0x1e,(byte) 0x0,
+(byte) 0xc,(byte) 0x0,
+};
+
+static final BitmapCharRec ch251 = new BitmapCharRec(11,17,-1,0,13,ch251data);
+
+/* char: 0xfa */
+
+static final byte[] ch250data = {
+(byte) 0x1c,(byte) 0xe0,(byte) 0x3e,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
+(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe1,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x80,
+(byte) 0x1,(byte) 0x80,
+};
+
+static final BitmapCharRec ch250 = new BitmapCharRec(11,17,-1,0,13,ch250data);
+
+/* char: 0xf9 */
+
+static final byte[] ch249data = {
+(byte) 0x1c,(byte) 0xe0,(byte) 0x3e,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
+(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe1,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x2,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x38,(byte) 0x0,
+(byte) 0x30,(byte) 0x0,
+};
+
+static final BitmapCharRec ch249 = new BitmapCharRec(11,17,-1,0,13,ch249data);
+
+/* char: 0xf8 */
+
+static final byte[] ch248data = {
+(byte) 0xc0,(byte) 0x0,(byte) 0xde,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x71,(byte) 0x80,(byte) 0xd0,(byte) 0xc0,(byte) 0xd8,(byte) 0xc0,(byte) 0xc8,(byte) 0xc0,(byte) 0xcc,(byte) 0xc0,
+(byte) 0xc4,(byte) 0xc0,(byte) 0xc6,(byte) 0xc0,(byte) 0x63,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch248 = new BitmapCharRec(10,14,-1,1,12,ch248data);
+
+/* char: 0xf7 */
+
+static final byte[] ch247data = {
+(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,
+(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+};
+
+static final BitmapCharRec ch247 = new BitmapCharRec(12,10,-1,-2,14,ch247data);
+
+/* char: 0xf6 */
+
+static final byte[] ch246data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x33,(byte) 0x0,
+};
+
+static final BitmapCharRec ch246 = new BitmapCharRec(10,16,-1,0,12,ch246data);
+
+/* char: 0xf5 */
+
+static final byte[] ch245data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x27,(byte) 0x0,(byte) 0x1c,(byte) 0x80,
+};
+
+static final BitmapCharRec ch245 = new BitmapCharRec(10,16,-1,0,12,ch245data);
+
+/* char: 0xf4 */
+
+static final byte[] ch244data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x21,(byte) 0x0,(byte) 0x12,(byte) 0x0,(byte) 0x1e,(byte) 0x0,
+(byte) 0xc,(byte) 0x0,
+};
+
+static final BitmapCharRec ch244 = new BitmapCharRec(10,17,-1,0,12,ch244data);
+
+/* char: 0xf3 */
+
+static final byte[] ch243data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x80,
+(byte) 0x1,(byte) 0x80,
+};
+
+static final BitmapCharRec ch243 = new BitmapCharRec(10,17,-1,0,12,ch243data);
+
+/* char: 0xf2 */
+
+static final byte[] ch242data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x2,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x38,(byte) 0x0,
+(byte) 0x30,(byte) 0x0,
+};
+
+static final BitmapCharRec ch242 = new BitmapCharRec(10,17,-1,0,12,ch242data);
+
+/* char: 0xf1 */
+
+static final byte[] ch241data = {
+(byte) 0xf1,(byte) 0xe0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
+(byte) 0x60,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x6f,(byte) 0x80,(byte) 0xe7,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x27,(byte) 0x0,(byte) 0x1c,(byte) 0x80,
+};
+
+static final BitmapCharRec ch241 = new BitmapCharRec(11,16,-1,0,13,ch241data);
+
+/* char: 0xf0 */
+
+static final byte[] ch240data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1f,(byte) 0x0,(byte) 0xc6,(byte) 0x0,(byte) 0x3c,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x71,(byte) 0x80,
+(byte) 0xc0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch240 = new BitmapCharRec(10,17,-1,0,12,ch240data);
+
+/* char: 0xef */
+
+static final byte[] ch239data = {
+(byte) 0x78,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,(byte) 0x0,(byte) 0x0,(byte) 0xcc,(byte) 0xcc,
+};
+
+static final BitmapCharRec ch239 = new BitmapCharRec(6,16,0,0,6,ch239data);
+
+/* char: 0xee */
+
+static final byte[] ch238data = {
+(byte) 0x78,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,(byte) 0x0,(byte) 0x84,(byte) 0x48,(byte) 0x78,
+(byte) 0x30,
+};
+
+static final BitmapCharRec ch238 = new BitmapCharRec(6,17,0,0,6,ch238data);
+
+/* char: 0xed */
+
+static final byte[] ch237data = {
+(byte) 0xf0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xe0,(byte) 0x0,(byte) 0x80,(byte) 0x60,(byte) 0x38,
+(byte) 0x18,
+};
+
+static final BitmapCharRec ch237 = new BitmapCharRec(5,17,-1,0,6,ch237data);
+
+/* char: 0xec */
+
+static final byte[] ch236data = {
+(byte) 0x78,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,(byte) 0x0,(byte) 0x8,(byte) 0x30,(byte) 0xe0,
+(byte) 0xc0,
+};
+
+static final BitmapCharRec ch236 = new BitmapCharRec(5,17,0,0,6,ch236data);
+
+/* char: 0xeb */
+
+static final byte[] ch235data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,
+(byte) 0xc1,(byte) 0x80,(byte) 0x41,(byte) 0x80,(byte) 0x63,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x33,(byte) 0x0,
+};
+
+static final BitmapCharRec ch235 = new BitmapCharRec(9,16,-1,0,11,ch235data);
+
+/* char: 0xea */
+
+static final byte[] ch234data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,
+(byte) 0xc1,(byte) 0x80,(byte) 0x41,(byte) 0x80,(byte) 0x63,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x21,(byte) 0x0,(byte) 0x12,(byte) 0x0,(byte) 0x1e,(byte) 0x0,
+(byte) 0xc,(byte) 0x0,
+};
+
+static final BitmapCharRec ch234 = new BitmapCharRec(9,17,-1,0,11,ch234data);
+
+/* char: 0xe9 */
+
+static final byte[] ch233data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,
+(byte) 0xc1,(byte) 0x80,(byte) 0x41,(byte) 0x80,(byte) 0x63,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x7,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,
+};
+
+static final BitmapCharRec ch233 = new BitmapCharRec(9,17,-1,0,11,ch233data);
+
+/* char: 0xe8 */
+
+static final byte[] ch232data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,
+(byte) 0xc1,(byte) 0x80,(byte) 0x41,(byte) 0x80,(byte) 0x63,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x70,(byte) 0x0,
+(byte) 0x60,(byte) 0x0,
+};
+
+static final BitmapCharRec ch232 = new BitmapCharRec(9,17,-1,0,11,ch232data);
+
+/* char: 0xe7 */
+
+static final byte[] ch231data = {
+(byte) 0x3c,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,
+(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x41,(byte) 0x80,
+(byte) 0x63,(byte) 0x80,(byte) 0x1f,(byte) 0x0,
+};
+
+static final BitmapCharRec ch231 = new BitmapCharRec(9,18,-1,6,11,ch231data);
+
+/* char: 0xe6 */
+
+static final byte[] ch230data = {
+(byte) 0x70,(byte) 0xf0,(byte) 0xfb,(byte) 0xf8,(byte) 0xc7,(byte) 0x84,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0xfc,
+(byte) 0x3,(byte) 0xc,(byte) 0x63,(byte) 0xc,(byte) 0x67,(byte) 0x98,(byte) 0x3c,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch230 = new BitmapCharRec(14,12,-1,0,16,ch230data);
+
+/* char: 0xe5 */
+
+static final byte[] ch229data = {
+(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,
+(byte) 0x1c,(byte) 0x0,
+};
+
+static final BitmapCharRec ch229 = new BitmapCharRec(9,17,-1,0,11,ch229data);
+
+/* char: 0xe4 */
+
+static final byte[] ch228data = {
+(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x66,(byte) 0x0,
+};
+
+static final BitmapCharRec ch228 = new BitmapCharRec(9,16,-1,0,11,ch228data);
+
+/* char: 0xe3 */
+
+static final byte[] ch227data = {
+(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x5c,(byte) 0x0,(byte) 0x3a,(byte) 0x0,
+};
+
+static final BitmapCharRec ch227 = new BitmapCharRec(9,16,-1,0,11,ch227data);
+
+/* char: 0xe2 */
+
+static final byte[] ch226data = {
+(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x42,(byte) 0x0,(byte) 0x24,(byte) 0x0,(byte) 0x3c,(byte) 0x0,
+(byte) 0x18,(byte) 0x0,
+};
+
+static final BitmapCharRec ch226 = new BitmapCharRec(9,17,-1,0,11,ch226data);
+
+/* char: 0xe1 */
+
+static final byte[] ch225data = {
+(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x7,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,
+};
+
+static final BitmapCharRec ch225 = new BitmapCharRec(9,17,-1,0,11,ch225data);
+
+/* char: 0xe0 */
+
+static final byte[] ch224data = {
+(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x70,(byte) 0x0,
+(byte) 0x60,(byte) 0x0,
+};
+
+static final BitmapCharRec ch224 = new BitmapCharRec(9,17,-1,0,11,ch224data);
+
+/* char: 0xdf */
+
+static final byte[] ch223data = {
+(byte) 0xe7,(byte) 0x0,(byte) 0x6c,(byte) 0x80,(byte) 0x6c,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x61,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x63,(byte) 0x80,
+(byte) 0x67,(byte) 0x0,(byte) 0x6c,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x33,(byte) 0x0,
+(byte) 0x1e,(byte) 0x0,
+};
+
+static final BitmapCharRec ch223 = new BitmapCharRec(10,17,-1,0,12,ch223data);
+
+/* char: 0xde */
+
+static final byte[] ch222data = {
+(byte) 0xfc,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x70,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x18,
+(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,
+(byte) 0xfc,(byte) 0x0,
+};
+
+static final BitmapCharRec ch222 = new BitmapCharRec(13,17,-1,0,15,ch222data);
+
+/* char: 0xdd */
+
+static final byte[] ch221data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x3,(byte) 0xc0,
+(byte) 0x3,(byte) 0x40,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x20,(byte) 0xc,(byte) 0x30,(byte) 0x1c,(byte) 0x10,(byte) 0x18,(byte) 0x18,(byte) 0x38,(byte) 0x8,(byte) 0x30,(byte) 0xc,
+(byte) 0xfc,(byte) 0x3f,(byte) 0x0,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x30,
+};
+
+static final BitmapCharRec ch221 = new BitmapCharRec(16,22,0,0,16,ch221data);
+
+/* char: 0xdc */
+
+static final byte[] ch220data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x30,(byte) 0x18,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
+(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
+(byte) 0xfc,(byte) 0x1f,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x30,(byte) 0x6,(byte) 0x30,
+};
+
+static final BitmapCharRec ch220 = new BitmapCharRec(16,21,-1,0,18,ch220data);
+
+/* char: 0xdb */
+
+static final byte[] ch219data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x30,(byte) 0x18,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
+(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
+(byte) 0xfc,(byte) 0x1f,(byte) 0x0,(byte) 0x0,(byte) 0x8,(byte) 0x10,(byte) 0x6,(byte) 0x60,(byte) 0x3,(byte) 0xc0,(byte) 0x1,(byte) 0x80,
+};
+
+static final BitmapCharRec ch219 = new BitmapCharRec(16,22,-1,0,18,ch219data);
+
+/* char: 0xda */
+
+static final byte[] ch218data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x30,(byte) 0x18,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
+(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
+(byte) 0xfc,(byte) 0x1f,(byte) 0x0,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x30,
+};
+
+static final BitmapCharRec ch218 = new BitmapCharRec(16,22,-1,0,18,ch218data);
+
+/* char: 0xd9 */
+
+static final byte[] ch217data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x30,(byte) 0x18,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
+(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
+(byte) 0xfc,(byte) 0x1f,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x40,(byte) 0x1,(byte) 0x80,(byte) 0x7,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+};
+
+static final BitmapCharRec ch217 = new BitmapCharRec(16,22,-1,0,18,ch217data);
+
+/* char: 0xd8 */
+
+static final byte[] ch216data = {
+(byte) 0x20,(byte) 0x0,(byte) 0x27,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x68,(byte) 0x6,(byte) 0x64,(byte) 0x6,(byte) 0xc2,(byte) 0x3,(byte) 0xc2,(byte) 0x3,
+(byte) 0xc1,(byte) 0x3,(byte) 0xc1,(byte) 0x3,(byte) 0xc0,(byte) 0x83,(byte) 0xc0,(byte) 0x83,(byte) 0xc0,(byte) 0x43,(byte) 0x60,(byte) 0x46,(byte) 0x60,(byte) 0x26,(byte) 0x38,(byte) 0x1c,
+(byte) 0x1c,(byte) 0x38,(byte) 0x7,(byte) 0xe4,(byte) 0x0,(byte) 0x4,
+};
+
+static final BitmapCharRec ch216 = new BitmapCharRec(16,19,-1,1,18,ch216data);
+
+/* char: 0xd7 */
+
+static final byte[] ch215data = {
+(byte) 0x80,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x33,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x33,(byte) 0x0,
+(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0x80,(byte) 0x40,
+};
+
+static final BitmapCharRec ch215 = new BitmapCharRec(10,11,-2,-1,14,ch215data);
+
+/* char: 0xd6 */
+
+static final byte[] ch214data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
+(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,
+(byte) 0x7,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x60,
+};
+
+static final BitmapCharRec ch214 = new BitmapCharRec(16,21,-1,0,18,ch214data);
+
+/* char: 0xd5 */
+
+static final byte[] ch213data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
+(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,
+(byte) 0x7,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x4,(byte) 0xe0,(byte) 0x3,(byte) 0x90,
+};
+
+static final BitmapCharRec ch213 = new BitmapCharRec(16,21,-1,0,18,ch213data);
+
+/* char: 0xd4 */
+
+static final byte[] ch212data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
+(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,
+(byte) 0x7,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x8,(byte) 0x10,(byte) 0x6,(byte) 0x60,(byte) 0x3,(byte) 0xc0,(byte) 0x1,(byte) 0x80,
+};
+
+static final BitmapCharRec ch212 = new BitmapCharRec(16,22,-1,0,18,ch212data);
+
+/* char: 0xd3 */
+
+static final byte[] ch211data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
+(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,
+(byte) 0x7,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x30,
+};
+
+static final BitmapCharRec ch211 = new BitmapCharRec(16,22,-1,0,18,ch211data);
+
+/* char: 0xd2 */
+
+static final byte[] ch210data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
+(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,
+(byte) 0x7,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x40,(byte) 0x1,(byte) 0x80,(byte) 0x7,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+};
+
+static final BitmapCharRec ch210 = new BitmapCharRec(16,22,-1,0,18,ch210data);
+
+/* char: 0xd1 */
+
+static final byte[] ch209data = {
+(byte) 0xf8,(byte) 0xc,(byte) 0x20,(byte) 0x1c,(byte) 0x20,(byte) 0x1c,(byte) 0x20,(byte) 0x34,(byte) 0x20,(byte) 0x64,(byte) 0x20,(byte) 0x64,(byte) 0x20,(byte) 0xc4,(byte) 0x21,(byte) 0x84,
+(byte) 0x21,(byte) 0x84,(byte) 0x23,(byte) 0x4,(byte) 0x26,(byte) 0x4,(byte) 0x26,(byte) 0x4,(byte) 0x2c,(byte) 0x4,(byte) 0x38,(byte) 0x4,(byte) 0x38,(byte) 0x4,(byte) 0x30,(byte) 0x4,
+(byte) 0xf0,(byte) 0x1f,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x4,(byte) 0xe0,(byte) 0x3,(byte) 0x90,
+};
+
+static final BitmapCharRec ch209 = new BitmapCharRec(16,21,-1,0,18,ch209data);
+
+/* char: 0xd0 */
+
+static final byte[] ch208data = {
+(byte) 0x7f,(byte) 0xe0,(byte) 0x18,(byte) 0x38,(byte) 0x18,(byte) 0x1c,(byte) 0x18,(byte) 0x6,(byte) 0x18,(byte) 0x6,(byte) 0x18,(byte) 0x3,(byte) 0x18,(byte) 0x3,(byte) 0x18,(byte) 0x3,
+(byte) 0xff,(byte) 0x3,(byte) 0x18,(byte) 0x3,(byte) 0x18,(byte) 0x3,(byte) 0x18,(byte) 0x3,(byte) 0x18,(byte) 0x6,(byte) 0x18,(byte) 0x6,(byte) 0x18,(byte) 0x1c,(byte) 0x18,(byte) 0x38,
+(byte) 0x7f,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch208 = new BitmapCharRec(16,17,0,0,17,ch208data);
+
+/* char: 0xcf */
+
+static final byte[] ch207data = {
+(byte) 0xfc,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
+(byte) 0xfc,(byte) 0x0,(byte) 0x0,(byte) 0xcc,(byte) 0xcc,
+};
+
+static final BitmapCharRec ch207 = new BitmapCharRec(6,21,-1,0,8,ch207data);
+
+/* char: 0xce */
+
+static final byte[] ch206data = {
+(byte) 0x7e,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,
+(byte) 0x7e,(byte) 0x0,(byte) 0x81,(byte) 0x66,(byte) 0x3c,(byte) 0x18,
+};
+
+static final BitmapCharRec ch206 = new BitmapCharRec(8,22,-1,0,8,ch206data);
+
+/* char: 0xcd */
+
+static final byte[] ch205data = {
+(byte) 0xfc,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
+(byte) 0xfc,(byte) 0x0,(byte) 0x40,(byte) 0x30,(byte) 0x1c,(byte) 0xc,
+};
+
+static final BitmapCharRec ch205 = new BitmapCharRec(6,22,-1,0,8,ch205data);
+
+/* char: 0xcc */
+
+static final byte[] ch204data = {
+(byte) 0xfc,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
+(byte) 0xfc,(byte) 0x0,(byte) 0x8,(byte) 0x30,(byte) 0xe0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch204 = new BitmapCharRec(6,22,-1,0,8,ch204data);
+
+/* char: 0xcb */
+
+static final byte[] ch203data = {
+(byte) 0xff,(byte) 0xf8,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,
+(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x30,
+(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,
+};
+
+static final BitmapCharRec ch203 = new BitmapCharRec(13,21,-1,0,15,ch203data);
+
+/* char: 0xca */
+
+static final byte[] ch202data = {
+(byte) 0xff,(byte) 0xf8,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,
+(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x30,
+(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x20,(byte) 0xc,(byte) 0xc0,(byte) 0x7,(byte) 0x80,(byte) 0x3,(byte) 0x0,
+};
+
+static final BitmapCharRec ch202 = new BitmapCharRec(13,22,-1,0,15,ch202data);
+
+/* char: 0xc9 */
+
+static final byte[] ch201data = {
+(byte) 0xff,(byte) 0xf8,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,
+(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x30,
+(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch201 = new BitmapCharRec(13,22,-1,0,15,ch201data);
+
+/* char: 0xc8 */
+
+static final byte[] ch200data = {
+(byte) 0xff,(byte) 0xf8,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,
+(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x30,
+(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0x18,(byte) 0x0,
+};
+
+static final BitmapCharRec ch200 = new BitmapCharRec(13,22,-1,0,15,ch200data);
+
+/* char: 0xc7 */
+
+static final byte[] ch199data = {
+(byte) 0x7,(byte) 0x80,(byte) 0xc,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x7,(byte) 0xe0,(byte) 0x1e,(byte) 0x38,
+(byte) 0x38,(byte) 0x8,(byte) 0x60,(byte) 0x4,(byte) 0x60,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x60,(byte) 0x4,(byte) 0x60,(byte) 0x4,(byte) 0x38,(byte) 0xc,(byte) 0x1c,(byte) 0x3c,(byte) 0x7,(byte) 0xe4,
+};
+
+static final BitmapCharRec ch199 = new BitmapCharRec(14,23,-1,6,16,ch199data);
+
+/* char: 0xc6 */
+
+static final byte[] ch198data = {
+(byte) 0xf9,(byte) 0xff,(byte) 0xf0,(byte) 0x30,(byte) 0x60,(byte) 0x30,(byte) 0x10,(byte) 0x60,(byte) 0x10,(byte) 0x10,(byte) 0x60,(byte) 0x10,(byte) 0x18,(byte) 0x60,(byte) 0x0,(byte) 0x8,
+(byte) 0x60,(byte) 0x0,(byte) 0xf,(byte) 0xe0,(byte) 0x80,(byte) 0xc,(byte) 0x60,(byte) 0x80,(byte) 0x4,(byte) 0x7f,(byte) 0x80,(byte) 0x4,(byte) 0x60,(byte) 0x80,(byte) 0x6,(byte) 0x60,
+(byte) 0x80,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x20,(byte) 0x1,(byte) 0x60,(byte) 0x20,(byte) 0x1,(byte) 0xe0,(byte) 0x60,
+(byte) 0x3,(byte) 0xff,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch198 = new BitmapCharRec(20,17,0,0,21,ch198data);
+
+/* char: 0xc5 */
+
+static final byte[] ch197data = {
+(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
+(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
+(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
+(byte) 0x0,(byte) 0x80,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x2,(byte) 0x20,(byte) 0x0,(byte) 0x2,(byte) 0x20,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch197 = new BitmapCharRec(17,21,0,0,17,ch197data);
+
+/* char: 0xc4 */
+
+static final byte[] ch196data = {
+(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
+(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
+(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
+(byte) 0x0,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,(byte) 0x0,
+};
+
+static final BitmapCharRec ch196 = new BitmapCharRec(17,21,0,0,17,ch196data);
+
+/* char: 0xc3 */
+
+static final byte[] ch195data = {
+(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x7,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
+(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
+(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
+(byte) 0x0,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x4,(byte) 0xe0,(byte) 0x0,(byte) 0x3,(byte) 0x90,(byte) 0x0,
+};
+
+static final BitmapCharRec ch195 = new BitmapCharRec(17,21,0,0,17,ch195data);
+
+/* char: 0xc2 */
+
+static final byte[] ch194data = {
+(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
+(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
+(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
+(byte) 0x0,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x8,(byte) 0x10,(byte) 0x0,(byte) 0x6,(byte) 0x60,(byte) 0x0,(byte) 0x3,(byte) 0xc0,(byte) 0x0,(byte) 0x1,
+(byte) 0x80,(byte) 0x0,
+};
+
+static final BitmapCharRec ch194 = new BitmapCharRec(17,22,0,0,17,ch194data);
+
+/* char: 0xc1 */
+
+static final byte[] ch193data = {
+(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
+(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
+(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
+(byte) 0x0,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x0,
+(byte) 0x30,(byte) 0x0,
+};
+
+static final BitmapCharRec ch193 = new BitmapCharRec(17,22,0,0,17,ch193data);
+
+/* char: 0xc0 */
+
+static final byte[] ch192data = {
+(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
+(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
+(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
+(byte) 0x0,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x3,(byte) 0x80,(byte) 0x0,(byte) 0x3,
+(byte) 0x0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch192 = new BitmapCharRec(17,22,0,0,17,ch192data);
+
+/* char: 0xbf */
+
+static final byte[] ch191data = {
+(byte) 0x3e,(byte) 0x63,(byte) 0xc1,(byte) 0xc3,(byte) 0xc3,(byte) 0xe0,(byte) 0x70,(byte) 0x30,(byte) 0x38,(byte) 0x18,(byte) 0x18,(byte) 0x8,(byte) 0x8,(byte) 0x0,(byte) 0x0,(byte) 0xc,
+(byte) 0xc,
+};
+
+static final BitmapCharRec ch191 = new BitmapCharRec(8,17,-1,5,11,ch191data);
+
+/* char: 0xbe */
+
+static final byte[] ch190data = {
+(byte) 0x18,(byte) 0x2,(byte) 0x0,(byte) 0x8,(byte) 0x2,(byte) 0x0,(byte) 0xc,(byte) 0x7f,(byte) 0x80,(byte) 0x4,(byte) 0x22,(byte) 0x0,(byte) 0x6,(byte) 0x32,(byte) 0x0,(byte) 0x3,
+(byte) 0x12,(byte) 0x0,(byte) 0x1,(byte) 0xa,(byte) 0x0,(byte) 0x71,(byte) 0x8e,(byte) 0x0,(byte) 0x88,(byte) 0x86,(byte) 0x0,(byte) 0x8c,(byte) 0xc2,(byte) 0x0,(byte) 0xc,(byte) 0x60,
+(byte) 0x0,(byte) 0x8,(byte) 0x20,(byte) 0x0,(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0x8,(byte) 0x10,(byte) 0x0,(byte) 0x8c,(byte) 0x18,(byte) 0x0,(byte) 0x4c,(byte) 0xc,(byte) 0x0,
+(byte) 0x38,(byte) 0x4,(byte) 0x0,
+};
+
+static final BitmapCharRec ch190 = new BitmapCharRec(17,17,0,0,18,ch190data);
+
+/* char: 0xbd */
+
+static final byte[] ch189data = {
+(byte) 0x30,(byte) 0x7e,(byte) 0x10,(byte) 0x22,(byte) 0x18,(byte) 0x10,(byte) 0x8,(byte) 0x18,(byte) 0xc,(byte) 0x8,(byte) 0x6,(byte) 0x4,(byte) 0x2,(byte) 0x6,(byte) 0xfb,(byte) 0x46,
+(byte) 0x21,(byte) 0x26,(byte) 0x21,(byte) 0x9c,(byte) 0x20,(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0x20,(byte) 0x60,(byte) 0x20,(byte) 0x20,(byte) 0xa0,(byte) 0x30,(byte) 0x60,(byte) 0x18,
+(byte) 0x20,(byte) 0x8,
+};
+
+static final BitmapCharRec ch189 = new BitmapCharRec(15,17,-1,0,18,ch189data);
+
+/* char: 0xbc */
+
+static final byte[] ch188data = {
+(byte) 0x30,(byte) 0x4,(byte) 0x10,(byte) 0x4,(byte) 0x18,(byte) 0xff,(byte) 0x8,(byte) 0x44,(byte) 0xc,(byte) 0x64,(byte) 0x6,(byte) 0x24,(byte) 0x2,(byte) 0x14,(byte) 0xfb,(byte) 0x1c,
+(byte) 0x21,(byte) 0xc,(byte) 0x21,(byte) 0x84,(byte) 0x20,(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0x20,(byte) 0x60,(byte) 0x20,(byte) 0x20,(byte) 0xa0,(byte) 0x30,(byte) 0x60,(byte) 0x18,
+(byte) 0x20,(byte) 0x8,
+};
+
+static final BitmapCharRec ch188 = new BitmapCharRec(16,17,-1,0,18,ch188data);
+
+/* char: 0xbb */
+
+static final byte[] ch187data = {
+(byte) 0x88,(byte) 0x0,(byte) 0xcc,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0x33,(byte) 0x0,(byte) 0x66,(byte) 0x0,
+(byte) 0xcc,(byte) 0x0,(byte) 0x88,(byte) 0x0,
+};
+
+static final BitmapCharRec ch187 = new BitmapCharRec(9,10,-2,-1,12,ch187data);
+
+/* char: 0xba */
+
+static final byte[] ch186data = {
+(byte) 0xfc,(byte) 0x0,(byte) 0x78,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0x78,
+};
+
+static final BitmapCharRec ch186 = new BitmapCharRec(6,9,-1,-8,8,ch186data);
+
+/* char: 0xb9 */
+
+static final byte[] ch185data = {
+(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xa0,(byte) 0x60,(byte) 0x20,
+};
+
+static final BitmapCharRec ch185 = new BitmapCharRec(5,10,-1,-7,7,ch185data);
+
+/* char: 0xb8 */
+
+static final byte[] ch184data = {
+(byte) 0x78,(byte) 0xcc,(byte) 0xc,(byte) 0x3c,(byte) 0x30,(byte) 0x10,
+};
+
+static final BitmapCharRec ch184 = new BitmapCharRec(6,6,-1,6,8,ch184data);
+
+/* char: 0xb7 */
+
+static final byte[] ch183data = {
+(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch183 = new BitmapCharRec(2,2,-2,-6,6,ch183data);
+
+/* char: 0xb6 */
+
+static final byte[] ch182data = {
+(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,
+(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x39,(byte) 0x0,(byte) 0x79,(byte) 0x0,(byte) 0x79,(byte) 0x0,(byte) 0xf9,(byte) 0x0,
+(byte) 0xf9,(byte) 0x0,(byte) 0xf9,(byte) 0x0,(byte) 0x79,(byte) 0x0,(byte) 0x79,(byte) 0x0,(byte) 0x39,(byte) 0x0,(byte) 0x1f,(byte) 0x80,
+};
+
+static final BitmapCharRec ch182 = new BitmapCharRec(9,22,-1,5,11,ch182data);
+
+/* char: 0xb5 */
+
+static final byte[] ch181data = {
+(byte) 0x40,(byte) 0x0,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x0,(byte) 0x5c,(byte) 0xe0,(byte) 0x7e,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,
+(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
+(byte) 0xe1,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch181 = new BitmapCharRec(11,17,-1,5,13,ch181data);
+
+/* char: 0xb4 */
+
+static final byte[] ch180data = {
+(byte) 0x80,(byte) 0x60,(byte) 0x38,(byte) 0x18,
+};
+
+static final BitmapCharRec ch180 = new BitmapCharRec(5,4,-2,-13,8,ch180data);
+
+/* char: 0xb3 */
+
+static final byte[] ch179data = {
+(byte) 0x70,(byte) 0x88,(byte) 0x8c,(byte) 0xc,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x8c,(byte) 0x4c,(byte) 0x38,
+};
+
+static final BitmapCharRec ch179 = new BitmapCharRec(6,10,0,-7,7,ch179data);
+
+/* char: 0xb2 */
+
+static final byte[] ch178data = {
+(byte) 0xfc,(byte) 0x44,(byte) 0x20,(byte) 0x30,(byte) 0x10,(byte) 0x8,(byte) 0xc,(byte) 0x8c,(byte) 0x4c,(byte) 0x38,
+};
+
+static final BitmapCharRec ch178 = new BitmapCharRec(6,10,0,-7,7,ch178data);
+
+/* char: 0xb1 */
+
+static final byte[] ch177data = {
+(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+};
+
+static final BitmapCharRec ch177 = new BitmapCharRec(12,15,-1,0,14,ch177data);
+
+/* char: 0xb0 */
+
+static final byte[] ch176data = {
+(byte) 0x38,(byte) 0x44,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,
+};
+
+static final BitmapCharRec ch176 = new BitmapCharRec(7,7,-1,-10,9,ch176data);
+
+/* char: 0xaf */
+
+static final byte[] ch175data = {
+(byte) 0xfc,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch175 = new BitmapCharRec(6,2,-1,-14,8,ch175data);
+
+/* char: 0xae */
+
+static final byte[] ch174data = {
+(byte) 0x7,(byte) 0xf0,(byte) 0x0,(byte) 0x1c,(byte) 0x1c,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x60,(byte) 0x3,(byte) 0x0,(byte) 0x47,(byte) 0x19,(byte) 0x0,(byte) 0xc2,
+(byte) 0x31,(byte) 0x80,(byte) 0x82,(byte) 0x20,(byte) 0x80,(byte) 0x82,(byte) 0x40,(byte) 0x80,(byte) 0x83,(byte) 0xe0,(byte) 0x80,(byte) 0x82,(byte) 0x30,(byte) 0x80,(byte) 0x82,(byte) 0x10,
+(byte) 0x80,(byte) 0xc2,(byte) 0x11,(byte) 0x80,(byte) 0x42,(byte) 0x31,(byte) 0x0,(byte) 0x67,(byte) 0xe3,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x1c,(byte) 0x1c,(byte) 0x0,
+(byte) 0x7,(byte) 0xf0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch174 = new BitmapCharRec(17,17,-1,0,19,ch174data);
+
+/* char: 0xad */
+
+static final byte[] ch173data = {
+(byte) 0xfe,(byte) 0xfe,
+};
+
+static final BitmapCharRec ch173 = new BitmapCharRec(7,2,-1,-5,9,ch173data);
+
+/* char: 0xac */
+
+static final byte[] ch172data = {
+(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch172 = new BitmapCharRec(12,7,-1,-3,14,ch172data);
+
+/* char: 0xab */
+
+static final byte[] ch171data = {
+(byte) 0x8,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0x33,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0xcc,(byte) 0x0,(byte) 0xcc,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x33,(byte) 0x0,
+(byte) 0x19,(byte) 0x80,(byte) 0x8,(byte) 0x80,
+};
+
+static final BitmapCharRec ch171 = new BitmapCharRec(9,10,-2,-1,13,ch171data);
+
+/* char: 0xaa */
+
+static final byte[] ch170data = {
+(byte) 0x7e,(byte) 0x0,(byte) 0x76,(byte) 0xcc,(byte) 0xcc,(byte) 0x7c,(byte) 0xc,(byte) 0xcc,(byte) 0x78,
+};
+
+static final BitmapCharRec ch170 = new BitmapCharRec(7,9,0,-8,8,ch170data);
+
+/* char: 0xa9 */
+
+static final byte[] ch169data = {
+(byte) 0x7,(byte) 0xf0,(byte) 0x0,(byte) 0x1c,(byte) 0x1c,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x61,(byte) 0xc3,(byte) 0x0,(byte) 0x47,(byte) 0x71,(byte) 0x0,(byte) 0xc4,
+(byte) 0x19,(byte) 0x80,(byte) 0x8c,(byte) 0x0,(byte) 0x80,(byte) 0x88,(byte) 0x0,(byte) 0x80,(byte) 0x88,(byte) 0x0,(byte) 0x80,(byte) 0x88,(byte) 0x0,(byte) 0x80,(byte) 0x8c,(byte) 0x0,
+(byte) 0x80,(byte) 0xc4,(byte) 0x19,(byte) 0x80,(byte) 0x47,(byte) 0x31,(byte) 0x0,(byte) 0x61,(byte) 0xe3,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x1c,(byte) 0x1c,(byte) 0x0,
+(byte) 0x7,(byte) 0xf0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch169 = new BitmapCharRec(17,17,-1,0,19,ch169data);
+
+/* char: 0xa8 */
+
+static final byte[] ch168data = {
+(byte) 0xcc,(byte) 0xcc,
+};
+
+static final BitmapCharRec ch168 = new BitmapCharRec(6,2,-1,-14,8,ch168data);
+
+/* char: 0xa7 */
+
+static final byte[] ch167data = {
+(byte) 0x38,(byte) 0x64,(byte) 0x62,(byte) 0x6,(byte) 0xe,(byte) 0x1c,(byte) 0x38,(byte) 0x74,(byte) 0xe2,(byte) 0xc3,(byte) 0x83,(byte) 0x87,(byte) 0x4e,(byte) 0x3c,(byte) 0x38,(byte) 0x70,
+(byte) 0x60,(byte) 0x46,(byte) 0x26,(byte) 0x1c,
+};
+
+static final BitmapCharRec ch167 = new BitmapCharRec(8,20,-2,2,12,ch167data);
+
+/* char: 0xa6 */
+
+static final byte[] ch166data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,
+};
+
+static final BitmapCharRec ch166 = new BitmapCharRec(2,17,-2,0,6,ch166data);
+
+/* char: 0xa5 */
+
+static final byte[] ch165data = {
+(byte) 0xf,(byte) 0xc0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x1f,(byte) 0xe0,(byte) 0x3,(byte) 0x0,(byte) 0x1f,(byte) 0xe0,
+(byte) 0x3,(byte) 0x0,(byte) 0x7,(byte) 0x80,(byte) 0xc,(byte) 0x80,(byte) 0xc,(byte) 0xc0,(byte) 0x18,(byte) 0x40,(byte) 0x18,(byte) 0x60,(byte) 0x30,(byte) 0x20,(byte) 0x70,(byte) 0x30,
+(byte) 0xf8,(byte) 0x7c,
+};
+
+static final BitmapCharRec ch165 = new BitmapCharRec(14,17,0,0,14,ch165data);
+
+/* char: 0xa4 */
+
+static final byte[] ch164data = {
+(byte) 0xc0,(byte) 0x60,(byte) 0xee,(byte) 0xe0,(byte) 0x7f,(byte) 0xc0,(byte) 0x31,(byte) 0x80,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
+(byte) 0x31,(byte) 0x80,(byte) 0x7f,(byte) 0xc0,(byte) 0xee,(byte) 0xe0,(byte) 0xc0,(byte) 0x60,
+};
+
+static final BitmapCharRec ch164 = new BitmapCharRec(11,12,-1,-3,13,ch164data);
+
+/* char: 0xa3 */
+
+static final byte[] ch163data = {
+(byte) 0xe7,(byte) 0x80,(byte) 0xbe,(byte) 0xc0,(byte) 0x78,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,
+(byte) 0x30,(byte) 0x0,(byte) 0xfc,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x31,(byte) 0x80,(byte) 0x19,(byte) 0x80,
+(byte) 0xf,(byte) 0x0,
+};
+
+static final BitmapCharRec ch163 = new BitmapCharRec(10,17,-1,0,12,ch163data);
+
+/* char: 0xa2 */
+
+static final byte[] ch162data = {
+(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xd0,(byte) 0x0,(byte) 0xc8,(byte) 0x0,(byte) 0xc8,(byte) 0x0,
+(byte) 0xc8,(byte) 0x0,(byte) 0xc4,(byte) 0x0,(byte) 0xc4,(byte) 0x0,(byte) 0x43,(byte) 0x80,(byte) 0x63,(byte) 0x80,(byte) 0x1f,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x1,(byte) 0x0,
+};
+
+static final BitmapCharRec ch162 = new BitmapCharRec(9,16,-1,2,12,ch162data);
+
+/* char: 0xa1 */
+
+static final byte[] ch161data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,
+(byte) 0xc0,
+};
+
+static final BitmapCharRec ch161 = new BitmapCharRec(2,17,-4,5,8,ch161data);
+
+/* char: 0xa0 */
+
+static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,6,null);
+
+/* char: 0x7e '~' */
+
+static final byte[] ch126data = {
+(byte) 0x83,(byte) 0x80,(byte) 0xc7,(byte) 0xc0,(byte) 0x7c,(byte) 0x60,(byte) 0x38,(byte) 0x20,
+};
+
+static final BitmapCharRec ch126 = new BitmapCharRec(11,4,-1,-5,13,ch126data);
+
+/* char: 0x7d '}' */
+
+static final byte[] ch125data = {
+(byte) 0xe0,(byte) 0x30,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x8,(byte) 0xc,(byte) 0x4,(byte) 0x3,(byte) 0x4,(byte) 0xc,(byte) 0x8,(byte) 0x18,
+(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x30,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch125 = new BitmapCharRec(8,22,-1,5,10,ch125data);
+
+/* char: 0x7c '|' */
+
+static final byte[] ch124data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,
+};
+
+static final BitmapCharRec ch124 = new BitmapCharRec(2,17,-2,0,6,ch124data);
+
+/* char: 0x7b '{' */
+
+static final byte[] ch123data = {
+(byte) 0x7,(byte) 0xc,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x10,(byte) 0x30,(byte) 0x20,(byte) 0xc0,(byte) 0x20,(byte) 0x30,(byte) 0x10,(byte) 0x18,
+(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xc,(byte) 0x7,
+};
+
+static final BitmapCharRec ch123 = new BitmapCharRec(8,22,-1,5,10,ch123data);
+
+/* char: 0x7a 'z' */
+
+static final byte[] ch122data = {
+(byte) 0xff,(byte) 0xc3,(byte) 0x61,(byte) 0x70,(byte) 0x30,(byte) 0x38,(byte) 0x18,(byte) 0x1c,(byte) 0xe,(byte) 0x86,(byte) 0xc3,(byte) 0xff,
+};
+
+static final BitmapCharRec ch122 = new BitmapCharRec(8,12,-1,0,10,ch122data);
+
+/* char: 0x79 'y' */
+
+static final byte[] ch121data = {
+(byte) 0xe0,(byte) 0x0,(byte) 0xf0,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xe,(byte) 0x0,
+(byte) 0x1a,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x31,(byte) 0x0,(byte) 0x30,(byte) 0x80,(byte) 0x30,(byte) 0x80,(byte) 0x60,(byte) 0x80,(byte) 0x60,(byte) 0xc0,
+(byte) 0xf1,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch121 = new BitmapCharRec(11,17,0,5,11,ch121data);
+
+/* char: 0x78 'x' */
+
+static final byte[] ch120data = {
+(byte) 0xf1,(byte) 0xe0,(byte) 0x60,(byte) 0xc0,(byte) 0x21,(byte) 0x80,(byte) 0x33,(byte) 0x80,(byte) 0x1b,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x1a,(byte) 0x0,
+(byte) 0x39,(byte) 0x0,(byte) 0x31,(byte) 0x80,(byte) 0x60,(byte) 0xc0,(byte) 0xf1,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch120 = new BitmapCharRec(11,12,-1,0,13,ch120data);
+
+/* char: 0x77 'w' */
+
+static final byte[] ch119data = {
+(byte) 0x4,(byte) 0x10,(byte) 0x0,(byte) 0xe,(byte) 0x38,(byte) 0x0,(byte) 0xe,(byte) 0x38,(byte) 0x0,(byte) 0x1a,(byte) 0x28,(byte) 0x0,(byte) 0x1a,(byte) 0x64,(byte) 0x0,(byte) 0x19,
+(byte) 0x64,(byte) 0x0,(byte) 0x31,(byte) 0x64,(byte) 0x0,(byte) 0x30,(byte) 0xc2,(byte) 0x0,(byte) 0x30,(byte) 0xc2,(byte) 0x0,(byte) 0x60,(byte) 0xc2,(byte) 0x0,(byte) 0x60,(byte) 0xc3,
+(byte) 0x0,(byte) 0xf1,(byte) 0xe7,(byte) 0x80,
+};
+
+static final BitmapCharRec ch119 = new BitmapCharRec(17,12,0,0,17,ch119data);
+
+/* char: 0x76 'v' */
+
+static final byte[] ch118data = {
+(byte) 0x4,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0x1a,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x31,(byte) 0x0,(byte) 0x30,(byte) 0x80,
+(byte) 0x30,(byte) 0x80,(byte) 0x60,(byte) 0x80,(byte) 0x60,(byte) 0xc0,(byte) 0xf1,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch118 = new BitmapCharRec(11,12,0,0,11,ch118data);
+
+/* char: 0x75 'u' */
+
+static final byte[] ch117data = {
+(byte) 0x1c,(byte) 0xe0,(byte) 0x3e,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
+(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe1,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch117 = new BitmapCharRec(11,12,-1,0,13,ch117data);
+
+/* char: 0x74 't' */
+
+static final byte[] ch116data = {
+(byte) 0x1c,(byte) 0x32,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0xfe,(byte) 0x70,(byte) 0x30,(byte) 0x10,
+};
+
+static final BitmapCharRec ch116 = new BitmapCharRec(7,15,0,0,7,ch116data);
+
+/* char: 0x73 's' */
+
+static final byte[] ch115data = {
+(byte) 0xf8,(byte) 0xc6,(byte) 0x83,(byte) 0x3,(byte) 0x7,(byte) 0x1e,(byte) 0x7c,(byte) 0x70,(byte) 0xe0,(byte) 0xc2,(byte) 0x66,(byte) 0x3e,
+};
+
+static final BitmapCharRec ch115 = new BitmapCharRec(8,12,-1,0,10,ch115data);
+
+/* char: 0x72 'r' */
+
+static final byte[] ch114data = {
+(byte) 0xf0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x76,(byte) 0x6e,(byte) 0xe6,
+};
+
+static final BitmapCharRec ch114 = new BitmapCharRec(7,12,-1,0,8,ch114data);
+
+/* char: 0x71 'q' */
+
+static final byte[] ch113data = {
+(byte) 0x3,(byte) 0xc0,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1d,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,
+(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,
+(byte) 0x1d,(byte) 0x80,
+};
+
+static final BitmapCharRec ch113 = new BitmapCharRec(10,17,-1,5,12,ch113data);
+
+/* char: 0x70 'p' */
+
+static final byte[] ch112data = {
+(byte) 0xf0,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x6e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,
+(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,
+(byte) 0xee,(byte) 0x0,
+};
+
+static final BitmapCharRec ch112 = new BitmapCharRec(10,17,-1,5,12,ch112data);
+
+/* char: 0x6f 'o' */
+
+static final byte[] ch111data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0x0,
+};
+
+static final BitmapCharRec ch111 = new BitmapCharRec(10,12,-1,0,12,ch111data);
+
+/* char: 0x6e 'n' */
+
+static final byte[] ch110data = {
+(byte) 0xf1,(byte) 0xe0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
+(byte) 0x60,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x6f,(byte) 0x80,(byte) 0xe7,(byte) 0x0,
+};
+
+static final BitmapCharRec ch110 = new BitmapCharRec(11,12,-1,0,13,ch110data);
+
+/* char: 0x6d 'm' */
+
+static final byte[] ch109data = {
+(byte) 0xf1,(byte) 0xe3,(byte) 0xc0,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x60,
+(byte) 0xc1,(byte) 0x80,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x71,(byte) 0xe3,(byte) 0x80,(byte) 0x6f,(byte) 0x9f,
+(byte) 0x0,(byte) 0xe7,(byte) 0xe,(byte) 0x0,
+};
+
+static final BitmapCharRec ch109 = new BitmapCharRec(18,12,-1,0,20,ch109data);
+
+/* char: 0x6c 'l' */
+
+static final byte[] ch108data = {
+(byte) 0xf0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,
+(byte) 0xe0,
+};
+
+static final BitmapCharRec ch108 = new BitmapCharRec(4,17,-1,0,6,ch108data);
+
+/* char: 0x6b 'k' */
+
+static final byte[] ch107data = {
+(byte) 0xf3,(byte) 0xe0,(byte) 0x61,(byte) 0xc0,(byte) 0x63,(byte) 0x80,(byte) 0x67,(byte) 0x0,(byte) 0x6e,(byte) 0x0,(byte) 0x6c,(byte) 0x0,(byte) 0x78,(byte) 0x0,(byte) 0x68,(byte) 0x0,
+(byte) 0x64,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0xc0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,
+(byte) 0xe0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch107 = new BitmapCharRec(11,17,-1,0,12,ch107data);
+
+/* char: 0x6a 'j' */
+
+static final byte[] ch106data = {
+(byte) 0xc0,(byte) 0xe0,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
+(byte) 0x70,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x30,
+};
+
+static final BitmapCharRec ch106 = new BitmapCharRec(4,22,0,5,6,ch106data);
+
+/* char: 0x69 'i' */
+
+static final byte[] ch105data = {
+(byte) 0xf0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x60,
+(byte) 0x60,
+};
+
+static final BitmapCharRec ch105 = new BitmapCharRec(4,17,-1,0,6,ch105data);
+
+/* char: 0x68 'h' */
+
+static final byte[] ch104data = {
+(byte) 0xf1,(byte) 0xe0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
+(byte) 0x60,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x6f,(byte) 0x80,(byte) 0x67,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,
+(byte) 0xe0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch104 = new BitmapCharRec(11,17,-1,0,13,ch104data);
+
+/* char: 0x67 'g' */
+
+static final byte[] ch103data = {
+(byte) 0x3f,(byte) 0x0,(byte) 0xf1,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x20,(byte) 0x60,(byte) 0x60,(byte) 0x3f,(byte) 0xc0,(byte) 0x7f,(byte) 0x0,(byte) 0x60,(byte) 0x0,
+(byte) 0x30,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x33,(byte) 0x0,
+(byte) 0x1f,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch103 = new BitmapCharRec(11,17,-1,5,12,ch103data);
+
+/* char: 0x66 'f' */
+
+static final byte[] ch102data = {
+(byte) 0x78,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0xfe,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x16,
+(byte) 0xe,
+};
+
+static final BitmapCharRec ch102 = new BitmapCharRec(7,17,0,0,7,ch102data);
+
+/* char: 0x65 'e' */
+
+static final byte[] ch101data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,
+(byte) 0xc1,(byte) 0x80,(byte) 0x41,(byte) 0x80,(byte) 0x63,(byte) 0x0,(byte) 0x1e,(byte) 0x0,
+};
+
+static final BitmapCharRec ch101 = new BitmapCharRec(9,12,-1,0,11,ch101data);
+
+/* char: 0x64 'd' */
+
+static final byte[] ch100data = {
+(byte) 0x1e,(byte) 0xc0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,
+(byte) 0xc1,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1d,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,
+(byte) 0x3,(byte) 0x80,
+};
+
+static final BitmapCharRec ch100 = new BitmapCharRec(10,17,-1,0,12,ch100data);
+
+/* char: 0x63 'c' */
+
+static final byte[] ch99data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
+(byte) 0xc0,(byte) 0x0,(byte) 0x41,(byte) 0x80,(byte) 0x63,(byte) 0x80,(byte) 0x1f,(byte) 0x0,
+};
+
+static final BitmapCharRec ch99 = new BitmapCharRec(9,12,-1,0,11,ch99data);
+
+/* char: 0x62 'b' */
+
+static final byte[] ch98data = {
+(byte) 0x5e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
+(byte) 0x60,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x6e,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,
+(byte) 0xe0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch98 = new BitmapCharRec(10,17,-1,0,12,ch98data);
+
+/* char: 0x61 'a' */
+
+static final byte[] ch97data = {
+(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,
+};
+
+static final BitmapCharRec ch97 = new BitmapCharRec(9,12,-1,0,11,ch97data);
+
+/* char: 0x60 '`' */
+
+static final byte[] ch96data = {
+(byte) 0x60,(byte) 0xe0,(byte) 0x80,(byte) 0xc0,(byte) 0x60,
+};
+
+static final BitmapCharRec ch96 = new BitmapCharRec(3,5,-2,-12,7,ch96data);
+
+/* char: 0x5f '_' */
+
+static final byte[] ch95data = {
+(byte) 0xff,(byte) 0xf8,(byte) 0xff,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch95 = new BitmapCharRec(13,2,0,5,13,ch95data);
+
+/* char: 0x5e '^' */
+
+static final byte[] ch94data = {
+(byte) 0x80,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x41,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x36,(byte) 0x0,(byte) 0x14,(byte) 0x0,(byte) 0x1c,(byte) 0x0,
+(byte) 0x8,(byte) 0x0,
+};
+
+static final BitmapCharRec ch94 = new BitmapCharRec(9,9,-1,-8,11,ch94data);
+
+/* char: 0x5d ']' */
+
+static final byte[] ch93data = {
+(byte) 0xf8,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,
+(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch93 = new BitmapCharRec(5,21,-1,4,8,ch93data);
+
+/* char: 0x5c '\' */
+
+static final byte[] ch92data = {
+(byte) 0x6,(byte) 0x6,(byte) 0x4,(byte) 0xc,(byte) 0xc,(byte) 0x8,(byte) 0x18,(byte) 0x18,(byte) 0x10,(byte) 0x30,(byte) 0x30,(byte) 0x20,(byte) 0x60,(byte) 0x60,(byte) 0x40,(byte) 0xc0,
+(byte) 0xc0,
+};
+
+static final BitmapCharRec ch92 = new BitmapCharRec(7,17,0,0,7,ch92data);
+
+/* char: 0x5b '[' */
+
+static final byte[] ch91data = {
+(byte) 0xf8,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch91 = new BitmapCharRec(5,21,-2,4,8,ch91data);
+
+/* char: 0x5a 'Z' */
+
+static final byte[] ch90data = {
+(byte) 0xff,(byte) 0xf8,(byte) 0xe0,(byte) 0x18,(byte) 0x70,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x38,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0xe,(byte) 0x0,
+(byte) 0x6,(byte) 0x0,(byte) 0x7,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x80,(byte) 0x1,(byte) 0xc0,(byte) 0x80,(byte) 0xc0,(byte) 0x80,(byte) 0xe0,(byte) 0xc0,(byte) 0x70,
+(byte) 0xff,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch90 = new BitmapCharRec(13,17,-1,0,15,ch90data);
+
+/* char: 0x59 'Y' */
+
+static final byte[] ch89data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x3,(byte) 0xc0,
+(byte) 0x3,(byte) 0x40,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x20,(byte) 0xc,(byte) 0x30,(byte) 0x1c,(byte) 0x10,(byte) 0x18,(byte) 0x18,(byte) 0x38,(byte) 0x8,(byte) 0x30,(byte) 0xc,
+(byte) 0xfc,(byte) 0x3f,
+};
+
+static final BitmapCharRec ch89 = new BitmapCharRec(16,17,0,0,16,ch89data);
+
+/* char: 0x58 'X' */
+
+static final byte[] ch88data = {
+(byte) 0xfc,(byte) 0xf,(byte) 0xc0,(byte) 0x30,(byte) 0x3,(byte) 0x80,(byte) 0x18,(byte) 0x7,(byte) 0x0,(byte) 0x8,(byte) 0xe,(byte) 0x0,(byte) 0x4,(byte) 0xc,(byte) 0x0,(byte) 0x6,
+(byte) 0x18,(byte) 0x0,(byte) 0x2,(byte) 0x38,(byte) 0x0,(byte) 0x1,(byte) 0x70,(byte) 0x0,(byte) 0x0,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,
+(byte) 0x0,(byte) 0x3,(byte) 0xa0,(byte) 0x0,(byte) 0x3,(byte) 0x10,(byte) 0x0,(byte) 0x6,(byte) 0x8,(byte) 0x0,(byte) 0xe,(byte) 0xc,(byte) 0x0,(byte) 0x1c,(byte) 0x6,(byte) 0x0,
+(byte) 0x7e,(byte) 0xf,(byte) 0x80,
+};
+
+static final BitmapCharRec ch88 = new BitmapCharRec(18,17,0,0,18,ch88data);
+
+/* char: 0x57 'W' */
+
+static final byte[] ch87data = {
+(byte) 0x1,(byte) 0x83,(byte) 0x0,(byte) 0x1,(byte) 0x83,(byte) 0x0,(byte) 0x1,(byte) 0x83,(byte) 0x80,(byte) 0x3,(byte) 0x87,(byte) 0x80,(byte) 0x3,(byte) 0x46,(byte) 0x80,(byte) 0x3,
+(byte) 0x46,(byte) 0xc0,(byte) 0x6,(byte) 0x46,(byte) 0x40,(byte) 0x6,(byte) 0x4c,(byte) 0x40,(byte) 0x6,(byte) 0x4c,(byte) 0x60,(byte) 0xc,(byte) 0x2c,(byte) 0x60,(byte) 0xc,(byte) 0x2c,
+(byte) 0x20,(byte) 0x18,(byte) 0x2c,(byte) 0x20,(byte) 0x18,(byte) 0x18,(byte) 0x30,(byte) 0x18,(byte) 0x18,(byte) 0x10,(byte) 0x30,(byte) 0x18,(byte) 0x10,(byte) 0x30,(byte) 0x18,(byte) 0x18,
+(byte) 0xfc,(byte) 0x7e,(byte) 0x7e,
+};
+
+static final BitmapCharRec ch87 = new BitmapCharRec(23,17,0,0,23,ch87data);
+
+/* char: 0x56 'V' */
+
+static final byte[] ch86data = {
+(byte) 0x1,(byte) 0x80,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x0,(byte) 0x3,(byte) 0xc0,(byte) 0x0,(byte) 0x3,(byte) 0x40,(byte) 0x0,(byte) 0x3,
+(byte) 0x60,(byte) 0x0,(byte) 0x6,(byte) 0x20,(byte) 0x0,(byte) 0x6,(byte) 0x20,(byte) 0x0,(byte) 0x6,(byte) 0x30,(byte) 0x0,(byte) 0xc,(byte) 0x10,(byte) 0x0,(byte) 0xc,(byte) 0x18,
+(byte) 0x0,(byte) 0x18,(byte) 0x8,(byte) 0x0,(byte) 0x18,(byte) 0x8,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x30,(byte) 0x4,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,
+(byte) 0xfc,(byte) 0x1f,(byte) 0x80,
+};
+
+static final BitmapCharRec ch86 = new BitmapCharRec(17,17,0,0,17,ch86data);
+
+/* char: 0x55 'U' */
+
+static final byte[] ch85data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x30,(byte) 0x18,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
+(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
+(byte) 0xfc,(byte) 0x1f,
+};
+
+static final BitmapCharRec ch85 = new BitmapCharRec(16,17,-1,0,18,ch85data);
+
+/* char: 0x54 'T' */
+
+static final byte[] ch84data = {
+(byte) 0xf,(byte) 0xc0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x83,(byte) 0x4,(byte) 0x83,(byte) 0x4,(byte) 0xc3,(byte) 0xc,
+(byte) 0xff,(byte) 0xfc,
+};
+
+static final BitmapCharRec ch84 = new BitmapCharRec(14,17,-1,0,16,ch84data);
+
+/* char: 0x53 'S' */
+
+static final byte[] ch83data = {
+(byte) 0x9e,(byte) 0x0,(byte) 0xf1,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0x80,(byte) 0x60,(byte) 0x80,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0xe0,(byte) 0x3,(byte) 0xc0,
+(byte) 0xf,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x78,(byte) 0x0,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x40,(byte) 0xc0,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,(byte) 0x63,(byte) 0xc0,
+(byte) 0x1e,(byte) 0x40,
+};
+
+static final BitmapCharRec ch83 = new BitmapCharRec(11,17,-1,0,13,ch83data);
+
+/* char: 0x52 'R' */
+
+static final byte[] ch82data = {
+(byte) 0xfc,(byte) 0x1e,(byte) 0x30,(byte) 0x1c,(byte) 0x30,(byte) 0x38,(byte) 0x30,(byte) 0x70,(byte) 0x30,(byte) 0x60,(byte) 0x30,(byte) 0xc0,(byte) 0x31,(byte) 0xc0,(byte) 0x33,(byte) 0x80,
+(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x70,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x38,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x38,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,
+(byte) 0xff,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch82 = new BitmapCharRec(15,17,-1,0,16,ch82data);
+
+/* char: 0x51 'Q' */
+
+static final byte[] ch81data = {
+(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x38,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0xe0,(byte) 0x1,(byte) 0xc0,(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,
+(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
+(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,(byte) 0x7,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch81 = new BitmapCharRec(16,22,-1,5,18,ch81data);
+
+/* char: 0x50 'P' */
+
+static final byte[] ch80data = {
+(byte) 0xfc,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,
+(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x70,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,
+(byte) 0xff,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch80 = new BitmapCharRec(13,17,-1,0,15,ch80data);
+
+/* char: 0x4f 'O' */
+
+static final byte[] ch79data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
+(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,
+(byte) 0x7,(byte) 0xe0,
+};
+
+static final BitmapCharRec ch79 = new BitmapCharRec(16,17,-1,0,18,ch79data);
+
+/* char: 0x4e 'N' */
+
+static final byte[] ch78data = {
+(byte) 0xf8,(byte) 0xc,(byte) 0x20,(byte) 0x1c,(byte) 0x20,(byte) 0x1c,(byte) 0x20,(byte) 0x34,(byte) 0x20,(byte) 0x64,(byte) 0x20,(byte) 0x64,(byte) 0x20,(byte) 0xc4,(byte) 0x21,(byte) 0x84,
+(byte) 0x21,(byte) 0x84,(byte) 0x23,(byte) 0x4,(byte) 0x26,(byte) 0x4,(byte) 0x26,(byte) 0x4,(byte) 0x2c,(byte) 0x4,(byte) 0x38,(byte) 0x4,(byte) 0x38,(byte) 0x4,(byte) 0x30,(byte) 0x4,
+(byte) 0xf0,(byte) 0x1f,
+};
+
+static final BitmapCharRec ch78 = new BitmapCharRec(16,17,-1,0,18,ch78data);
+
+/* char: 0x4d 'M' */
+
+static final byte[] ch77data = {
+(byte) 0xf8,(byte) 0x21,(byte) 0xf8,(byte) 0x20,(byte) 0x60,(byte) 0x60,(byte) 0x20,(byte) 0x60,(byte) 0x60,(byte) 0x20,(byte) 0xd0,(byte) 0x60,(byte) 0x20,(byte) 0xd0,(byte) 0x60,(byte) 0x21,
+(byte) 0x88,(byte) 0x60,(byte) 0x21,(byte) 0x88,(byte) 0x60,(byte) 0x23,(byte) 0x8,(byte) 0x60,(byte) 0x23,(byte) 0x4,(byte) 0x60,(byte) 0x26,(byte) 0x4,(byte) 0x60,(byte) 0x26,(byte) 0x2,
+(byte) 0x60,(byte) 0x2c,(byte) 0x2,(byte) 0x60,(byte) 0x2c,(byte) 0x2,(byte) 0x60,(byte) 0x38,(byte) 0x1,(byte) 0x60,(byte) 0x38,(byte) 0x1,(byte) 0x60,(byte) 0x30,(byte) 0x0,(byte) 0xe0,
+(byte) 0xf0,(byte) 0x0,(byte) 0xf8,
+};
+
+static final BitmapCharRec ch77 = new BitmapCharRec(21,17,-1,0,22,ch77data);
+
+/* char: 0x4c 'L' */
+
+static final byte[] ch76data = {
+(byte) 0xff,(byte) 0xf8,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,
+(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,
+(byte) 0xfc,(byte) 0x0,
+};
+
+static final BitmapCharRec ch76 = new BitmapCharRec(13,17,-1,0,14,ch76data);
+
+/* char: 0x4b 'K' */
+
+static final byte[] ch75data = {
+(byte) 0xfc,(byte) 0x1f,(byte) 0x30,(byte) 0xe,(byte) 0x30,(byte) 0x1c,(byte) 0x30,(byte) 0x38,(byte) 0x30,(byte) 0x70,(byte) 0x30,(byte) 0xe0,(byte) 0x31,(byte) 0xc0,(byte) 0x33,(byte) 0x80,
+(byte) 0x3f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x31,(byte) 0x80,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x18,
+(byte) 0xfc,(byte) 0x7e,
+};
+
+static final BitmapCharRec ch75 = new BitmapCharRec(16,17,-1,0,17,ch75data);
+
+/* char: 0x4a 'J' */
+
+static final byte[] ch74data = {
+(byte) 0x78,(byte) 0x0,(byte) 0xcc,(byte) 0x0,(byte) 0xc6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+(byte) 0x1f,(byte) 0x80,
+};
+
+static final BitmapCharRec ch74 = new BitmapCharRec(9,17,-1,0,11,ch74data);
+
+/* char: 0x49 'I' */
+
+static final byte[] ch73data = {
+(byte) 0xfc,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
+(byte) 0xfc,
+};
+
+static final BitmapCharRec ch73 = new BitmapCharRec(6,17,-1,0,8,ch73data);
+
+/* char: 0x48 'H' */
+
+static final byte[] ch72data = {
+(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,
+(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x3f,(byte) 0xfe,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,
+(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,
+(byte) 0xfc,(byte) 0x1f,(byte) 0x80,
+};
+
+static final BitmapCharRec ch72 = new BitmapCharRec(17,17,-1,0,19,ch72data);
+
+/* char: 0x47 'G' */
+
+static final byte[] ch71data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1e,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0xc,(byte) 0x60,(byte) 0xc,(byte) 0xc0,(byte) 0xc,(byte) 0xc0,(byte) 0xc,(byte) 0xc0,(byte) 0x3f,
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x60,(byte) 0x4,(byte) 0x60,(byte) 0x4,(byte) 0x38,(byte) 0xc,(byte) 0x1c,(byte) 0x3c,
+(byte) 0x7,(byte) 0xe4,
+};
+
+static final BitmapCharRec ch71 = new BitmapCharRec(16,17,-1,0,18,ch71data);
+
+/* char: 0x46 'F' */
+
+static final byte[] ch70data = {
+(byte) 0xfc,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x20,(byte) 0x30,(byte) 0x20,
+(byte) 0x3f,(byte) 0xe0,(byte) 0x30,(byte) 0x20,(byte) 0x30,(byte) 0x20,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x30,
+(byte) 0xff,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch70 = new BitmapCharRec(12,17,-1,0,14,ch70data);
+
+/* char: 0x45 'E' */
+
+static final byte[] ch69data = {
+(byte) 0xff,(byte) 0xf8,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,
+(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x30,
+(byte) 0xff,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch69 = new BitmapCharRec(13,17,-1,0,15,ch69data);
+
+/* char: 0x44 'D' */
+
+static final byte[] ch68data = {
+(byte) 0xff,(byte) 0xc0,(byte) 0x30,(byte) 0x70,(byte) 0x30,(byte) 0x38,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0x6,(byte) 0x30,(byte) 0x6,(byte) 0x30,(byte) 0x6,
+(byte) 0x30,(byte) 0x6,(byte) 0x30,(byte) 0x6,(byte) 0x30,(byte) 0x6,(byte) 0x30,(byte) 0x6,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0x38,(byte) 0x30,(byte) 0x70,
+(byte) 0xff,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch68 = new BitmapCharRec(15,17,-1,0,17,ch68data);
+
+/* char: 0x43 'C' */
+
+static final byte[] ch67data = {
+(byte) 0x7,(byte) 0xe0,(byte) 0x1e,(byte) 0x38,(byte) 0x38,(byte) 0x8,(byte) 0x60,(byte) 0x4,(byte) 0x60,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
+(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x60,(byte) 0x4,(byte) 0x60,(byte) 0x4,(byte) 0x38,(byte) 0xc,(byte) 0x1c,(byte) 0x3c,
+(byte) 0x7,(byte) 0xe4,
+};
+
+static final BitmapCharRec ch67 = new BitmapCharRec(14,17,-1,0,16,ch67data);
+
+/* char: 0x42 'B' */
+
+static final byte[] ch66data = {
+(byte) 0xff,(byte) 0xe0,(byte) 0x30,(byte) 0x78,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x38,
+(byte) 0x3f,(byte) 0xe0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,
+(byte) 0xff,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch66 = new BitmapCharRec(14,17,-1,0,16,ch66data);
+
+/* char: 0x41 'A' */
+
+static final byte[] ch65data = {
+(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
+(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
+(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
+(byte) 0x0,(byte) 0x80,(byte) 0x0,
+};
+
+static final BitmapCharRec ch65 = new BitmapCharRec(17,17,0,0,17,ch65data);
+
+/* char: 0x40 '@' */
+
+static final byte[] ch64data = {
+(byte) 0x3,(byte) 0xf0,(byte) 0x0,(byte) 0xe,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x0,(byte) 0x61,(byte) 0xde,(byte) 0x0,(byte) 0x63,
+(byte) 0x7b,(byte) 0x0,(byte) 0xc6,(byte) 0x39,(byte) 0x80,(byte) 0xc6,(byte) 0x18,(byte) 0x80,(byte) 0xc6,(byte) 0x18,(byte) 0xc0,(byte) 0xc6,(byte) 0x18,(byte) 0x40,(byte) 0xc6,(byte) 0xc,
+(byte) 0x40,(byte) 0xc3,(byte) 0xc,(byte) 0x40,(byte) 0xc3,(byte) 0x8c,(byte) 0x40,(byte) 0xe1,(byte) 0xfc,(byte) 0x40,(byte) 0x60,(byte) 0xec,(byte) 0xc0,(byte) 0x70,(byte) 0x0,(byte) 0x80,
+(byte) 0x38,(byte) 0x1,(byte) 0x80,(byte) 0x1c,(byte) 0x3,(byte) 0x0,(byte) 0xf,(byte) 0xe,(byte) 0x0,(byte) 0x3,(byte) 0xf8,(byte) 0x0,
+};
+
+static final BitmapCharRec ch64 = new BitmapCharRec(18,20,-2,3,22,ch64data);
+
+/* char: 0x3f '?' */
+
+static final byte[] ch63data = {
+(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x18,(byte) 0x18,(byte) 0xc,(byte) 0xe,(byte) 0x7,(byte) 0xc3,(byte) 0xc3,(byte) 0x83,(byte) 0xc6,
+(byte) 0x7c,
+};
+
+static final BitmapCharRec ch63 = new BitmapCharRec(8,17,-2,0,11,ch63data);
+
+/* char: 0x3e '>' */
+
+static final byte[] ch62data = {
+(byte) 0xc0,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0x7,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x60,(byte) 0x1,(byte) 0xc0,(byte) 0x7,(byte) 0x0,
+(byte) 0x1c,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
+};
+
+static final BitmapCharRec ch62 = new BitmapCharRec(11,11,-1,-1,13,ch62data);
+
+/* char: 0x3d '=' */
+
+static final byte[] ch61data = {
+(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch61 = new BitmapCharRec(12,6,-1,-4,14,ch61data);
+
+/* char: 0x3c '<' */
+
+static final byte[] ch60data = {
+(byte) 0x0,(byte) 0x60,(byte) 0x1,(byte) 0xc0,(byte) 0x7,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x1c,(byte) 0x0,
+(byte) 0x7,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x60,
+};
+
+static final BitmapCharRec ch60 = new BitmapCharRec(11,11,-1,-1,13,ch60data);
+
+/* char: 0x3b ';' */
+
+static final byte[] ch59data = {
+(byte) 0xc0,(byte) 0x60,(byte) 0x20,(byte) 0xe0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch59 = new BitmapCharRec(3,14,-2,3,7,ch59data);
+
+/* char: 0x3a ':' */
+
+static final byte[] ch58data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch58 = new BitmapCharRec(2,11,-2,0,6,ch58data);
+
+/* char: 0x39 '9' */
+
+static final byte[] ch57data = {
+(byte) 0xf0,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1d,(byte) 0x80,(byte) 0x73,(byte) 0xc0,
+(byte) 0x61,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x77,(byte) 0x80,
+(byte) 0x1e,(byte) 0x0,
+};
+
+static final BitmapCharRec ch57 = new BitmapCharRec(10,17,-1,0,12,ch57data);
+
+/* char: 0x38 '8' */
+
+static final byte[] ch56data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0xe1,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x41,(byte) 0xc0,(byte) 0x61,(byte) 0x80,
+(byte) 0x37,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x33,(byte) 0x0,
+(byte) 0x1e,(byte) 0x0,
+};
+
+static final BitmapCharRec ch56 = new BitmapCharRec(10,17,-1,0,12,ch56data);
+
+/* char: 0x37 '7' */
+
+static final byte[] ch55data = {
+(byte) 0x18,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+(byte) 0x2,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x81,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,
+(byte) 0x7f,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch55 = new BitmapCharRec(10,17,-1,0,12,ch55data);
+
+/* char: 0x36 '6' */
+
+static final byte[] ch54data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x7b,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xe0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc1,(byte) 0x80,(byte) 0xf3,(byte) 0x80,(byte) 0xee,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0xe,(byte) 0x0,
+(byte) 0x3,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch54 = new BitmapCharRec(10,17,-1,0,12,ch54data);
+
+/* char: 0x35 '5' */
+
+static final byte[] ch53data = {
+(byte) 0x7e,(byte) 0x0,(byte) 0xe3,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x1,(byte) 0xc0,
+(byte) 0x3,(byte) 0x80,(byte) 0xf,(byte) 0x80,(byte) 0x7e,(byte) 0x0,(byte) 0x78,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x20,(byte) 0x0,(byte) 0x20,(byte) 0x0,(byte) 0x1f,(byte) 0x80,
+(byte) 0x1f,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch53 = new BitmapCharRec(10,17,-1,0,12,ch53data);
+
+/* char: 0x34 '4' */
+
+static final byte[] ch52data = {
+(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,(byte) 0xc3,(byte) 0x0,(byte) 0x43,(byte) 0x0,
+(byte) 0x63,(byte) 0x0,(byte) 0x23,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x13,(byte) 0x0,(byte) 0x1b,(byte) 0x0,(byte) 0xb,(byte) 0x0,(byte) 0x7,(byte) 0x0,(byte) 0x7,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,
+};
+
+static final BitmapCharRec ch52 = new BitmapCharRec(10,17,-1,0,12,ch52data);
+
+/* char: 0x33 '3' */
+
+static final byte[] ch51data = {
+(byte) 0x78,(byte) 0x0,(byte) 0xe6,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x3,(byte) 0x80,
+(byte) 0x7,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x83,(byte) 0x0,(byte) 0x83,(byte) 0x0,(byte) 0x47,(byte) 0x0,(byte) 0x7e,(byte) 0x0,
+(byte) 0x1c,(byte) 0x0,
+};
+
+static final BitmapCharRec ch51 = new BitmapCharRec(9,17,-1,0,12,ch51data);
+
+/* char: 0x32 '2' */
+
+static final byte[] ch50data = {
+(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0xc0,(byte) 0x60,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x81,(byte) 0x80,(byte) 0x81,(byte) 0x80,(byte) 0x43,(byte) 0x80,(byte) 0x7f,(byte) 0x0,
+(byte) 0x1c,(byte) 0x0,
+};
+
+static final BitmapCharRec ch50 = new BitmapCharRec(10,17,-1,0,12,ch50data);
+
+/* char: 0x31 '1' */
+
+static final byte[] ch49data = {
+(byte) 0xff,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x78,(byte) 0x18,
+(byte) 0x8,
+};
+
+static final BitmapCharRec ch49 = new BitmapCharRec(8,17,-2,0,12,ch49data);
+
+/* char: 0x30 '0' */
+
+static final byte[] ch48data = {
+(byte) 0x1e,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xe1,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x33,(byte) 0x0,
+(byte) 0x1e,(byte) 0x0,
+};
+
+static final BitmapCharRec ch48 = new BitmapCharRec(10,17,-1,0,12,ch48data);
+
+/* char: 0x2f '/' */
+
+static final byte[] ch47data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0x60,(byte) 0x20,(byte) 0x30,(byte) 0x30,(byte) 0x10,(byte) 0x18,(byte) 0x18,(byte) 0x8,(byte) 0xc,(byte) 0xc,(byte) 0x4,(byte) 0x6,
+(byte) 0x6,(byte) 0x3,(byte) 0x3,(byte) 0x3,
+};
+
+static final BitmapCharRec ch47 = new BitmapCharRec(8,20,1,3,7,ch47data);
+
+/* char: 0x2e '.' */
+
+static final byte[] ch46data = {
+(byte) 0xc0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch46 = new BitmapCharRec(2,2,-2,0,6,ch46data);
+
+/* char: 0x2d '-' */
+
+static final byte[] ch45data = {
+(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,
+};
+
+static final BitmapCharRec ch45 = new BitmapCharRec(12,2,-1,-6,14,ch45data);
+
+/* char: 0x2c ',' */
+
+static final byte[] ch44data = {
+(byte) 0xc0,(byte) 0x60,(byte) 0x20,(byte) 0xe0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch44 = new BitmapCharRec(3,5,-2,3,7,ch44data);
+
+/* char: 0x2b '+' */
+
+static final byte[] ch43data = {
+(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,(byte) 0x6,(byte) 0x0,
+(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
+};
+
+static final BitmapCharRec ch43 = new BitmapCharRec(12,12,-1,-1,14,ch43data);
+
+/* char: 0x2a '*' */
+
+static final byte[] ch42data = {
+(byte) 0x8,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0xc9,(byte) 0x80,(byte) 0xeb,(byte) 0x80,(byte) 0x1c,(byte) 0x0,(byte) 0xeb,(byte) 0x80,(byte) 0xc9,(byte) 0x80,(byte) 0x1c,(byte) 0x0,
+(byte) 0x8,(byte) 0x0,
+};
+
+static final BitmapCharRec ch42 = new BitmapCharRec(9,9,-2,-8,12,ch42data);
+
+/* char: 0x29 ')' */
+
+static final byte[] ch41data = {
+(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x30,(byte) 0x10,(byte) 0x18,(byte) 0x18,(byte) 0xc,(byte) 0xc,(byte) 0xc,(byte) 0xc,(byte) 0xc,(byte) 0xc,(byte) 0xc,(byte) 0xc,(byte) 0x18,
+(byte) 0x18,(byte) 0x10,(byte) 0x30,(byte) 0x20,(byte) 0x40,(byte) 0x80,
+};
+
+static final BitmapCharRec ch41 = new BitmapCharRec(6,22,-1,5,8,ch41data);
+
+/* char: 0x28 '(' */
+
+static final byte[] ch40data = {
+(byte) 0x4,(byte) 0x8,(byte) 0x10,(byte) 0x30,(byte) 0x20,(byte) 0x60,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,
+(byte) 0x60,(byte) 0x20,(byte) 0x30,(byte) 0x10,(byte) 0x8,(byte) 0x4,
+};
+
+static final BitmapCharRec ch40 = new BitmapCharRec(6,22,-1,5,8,ch40data);
+
+/* char: 0x27 ''' */
+
+static final byte[] ch39data = {
+(byte) 0xc0,(byte) 0x60,(byte) 0x20,(byte) 0xe0,(byte) 0xc0,
+};
+
+static final BitmapCharRec ch39 = new BitmapCharRec(3,5,-3,-12,8,ch39data);
+
+/* char: 0x26 '&' */
+
+static final byte[] ch38data = {
+(byte) 0x3c,(byte) 0x3c,(byte) 0x7f,(byte) 0x7e,(byte) 0xe1,(byte) 0xe1,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0xc0,(byte) 0xc1,(byte) 0xa0,(byte) 0x63,(byte) 0x20,(byte) 0x37,(byte) 0x10,
+(byte) 0x1e,(byte) 0x18,(byte) 0xe,(byte) 0x3e,(byte) 0xf,(byte) 0x0,(byte) 0x1d,(byte) 0x80,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0x40,(byte) 0x18,(byte) 0x40,(byte) 0xc,(byte) 0xc0,
+(byte) 0x7,(byte) 0x80,
+};
+
+static final BitmapCharRec ch38 = new BitmapCharRec(16,17,-1,0,18,ch38data);
+
+/* char: 0x25 '%' */
+
+static final byte[] ch37data = {
+(byte) 0x30,(byte) 0x3c,(byte) 0x0,(byte) 0x18,(byte) 0x72,(byte) 0x0,(byte) 0xc,(byte) 0x61,(byte) 0x0,(byte) 0x4,(byte) 0x60,(byte) 0x80,(byte) 0x6,(byte) 0x60,(byte) 0x80,(byte) 0x3,
+(byte) 0x30,(byte) 0x80,(byte) 0x1,(byte) 0x19,(byte) 0x80,(byte) 0x1,(byte) 0x8f,(byte) 0x0,(byte) 0x78,(byte) 0xc0,(byte) 0x0,(byte) 0xe4,(byte) 0x40,(byte) 0x0,(byte) 0xc2,(byte) 0x60,
+(byte) 0x0,(byte) 0xc1,(byte) 0x30,(byte) 0x0,(byte) 0xc1,(byte) 0x10,(byte) 0x0,(byte) 0x61,(byte) 0x18,(byte) 0x0,(byte) 0x33,(byte) 0xfc,(byte) 0x0,(byte) 0x1e,(byte) 0xc,(byte) 0x0,
+};
+
+static final BitmapCharRec ch37 = new BitmapCharRec(17,16,-1,0,19,ch37data);
+
+/* char: 0x24 '$' */
+
+static final byte[] ch36data = {
+(byte) 0x4,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0x3f,(byte) 0x0,(byte) 0xe5,(byte) 0xc0,(byte) 0xc4,(byte) 0xc0,(byte) 0x84,(byte) 0x60,(byte) 0x84,(byte) 0x60,(byte) 0x4,(byte) 0x60,
+(byte) 0x4,(byte) 0xe0,(byte) 0x7,(byte) 0xc0,(byte) 0x7,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x3c,(byte) 0x0,(byte) 0x74,(byte) 0x0,(byte) 0x64,(byte) 0x0,(byte) 0x64,(byte) 0x20,
+(byte) 0x64,(byte) 0x60,(byte) 0x34,(byte) 0xe0,(byte) 0x1f,(byte) 0x80,(byte) 0x4,(byte) 0x0,(byte) 0x4,(byte) 0x0,
+};
+
+static final BitmapCharRec ch36 = new BitmapCharRec(11,21,0,2,12,ch36data);
+
+/* char: 0x23 '#' */
+
+static final byte[] ch35data = {
+(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,(byte) 0x11,(byte) 0x0,
+(byte) 0x11,(byte) 0x0,(byte) 0x11,(byte) 0x0,(byte) 0x7f,(byte) 0xe0,(byte) 0x7f,(byte) 0xe0,(byte) 0x8,(byte) 0x80,(byte) 0x8,(byte) 0x80,(byte) 0x8,(byte) 0x80,(byte) 0x8,(byte) 0x80,
+(byte) 0x8,(byte) 0x80,
+};
+
+static final BitmapCharRec ch35 = new BitmapCharRec(11,17,-1,0,13,ch35data);
+
+/* char: 0x22 '"' */
+
+static final byte[] ch34data = {
+(byte) 0x88,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,
+};
+
+static final BitmapCharRec ch34 = new BitmapCharRec(6,5,-1,-12,10,ch34data);
+
+/* char: 0x21 '!' */
+
+static final byte[] ch33data = {
+(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
+(byte) 0xc0,
+};
+
+static final BitmapCharRec ch33 = new BitmapCharRec(2,17,-3,0,8,ch33data);
+
+/* char: 0x20 ' ' */
+
+static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,6,null);
+
+static final BitmapCharRec[] chars = {
+ch32,
+ch33,
+ch34,
+ch35,
+ch36,
+ch37,
+ch38,
+ch39,
+ch40,
+ch41,
+ch42,
+ch43,
+ch44,
+ch45,
+ch46,
+ch47,
+ch48,
+ch49,
+ch50,
+ch51,
+ch52,
+ch53,
+ch54,
+ch55,
+ch56,
+ch57,
+ch58,
+ch59,
+ch60,
+ch61,
+ch62,
+ch63,
+ch64,
+ch65,
+ch66,
+ch67,
+ch68,
+ch69,
+ch70,
+ch71,
+ch72,
+ch73,
+ch74,
+ch75,
+ch76,
+ch77,
+ch78,
+ch79,
+ch80,
+ch81,
+ch82,
+ch83,
+ch84,
+ch85,
+ch86,
+ch87,
+ch88,
+ch89,
+ch90,
+ch91,
+ch92,
+ch93,
+ch94,
+ch95,
+ch96,
+ch97,
+ch98,
+ch99,
+ch100,
+ch101,
+ch102,
+ch103,
+ch104,
+ch105,
+ch106,
+ch107,
+ch108,
+ch109,
+ch110,
+ch111,
+ch112,
+ch113,
+ch114,
+ch115,
+ch116,
+ch117,
+ch118,
+ch119,
+ch120,
+ch121,
+ch122,
+ch123,
+ch124,
+ch125,
+ch126,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+null,
+ch160,
+ch161,
+ch162,
+ch163,
+ch164,
+ch165,
+ch166,
+ch167,
+ch168,
+ch169,
+ch170,
+ch171,
+ch172,
+ch173,
+ch174,
+ch175,
+ch176,
+ch177,
+ch178,
+ch179,
+ch180,
+ch181,
+ch182,
+ch183,
+ch184,
+ch185,
+ch186,
+ch187,
+ch188,
+ch189,
+ch190,
+ch191,
+ch192,
+ch193,
+ch194,
+ch195,
+ch196,
+ch197,
+ch198,
+ch199,
+ch200,
+ch201,
+ch202,
+ch203,
+ch204,
+ch205,
+ch206,
+ch207,
+ch208,
+ch209,
+ch210,
+ch211,
+ch212,
+ch213,
+ch214,
+ch215,
+ch216,
+ch217,
+ch218,
+ch219,
+ch220,
+ch221,
+ch222,
+ch223,
+ch224,
+ch225,
+ch226,
+ch227,
+ch228,
+ch229,
+ch230,
+ch231,
+ch232,
+ch233,
+ch234,
+ch235,
+ch236,
+ch237,
+ch238,
+ch239,
+ch240,
+ch241,
+ch242,
+ch243,
+ch244,
+ch245,
+ch246,
+ch247,
+ch248,
+ch249,
+ch250,
+ch251,
+ch252,
+ch253,
+ch254,
+ch255,
+};
+
+  public static final BitmapFontRec glutBitmapTimesRoman24 = new BitmapFontRec("-adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1",
+                                                                        224,
+                                                                        32,
+                                                                        chars);
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeMonoRoman.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeMonoRoman.java
new file mode 100644
index 000000000..b8296924e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeMonoRoman.java
@@ -0,0 +1,2491 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+class GLUTStrokeMonoRoman {
+
+/* GENERATED FILE -- DO NOT MODIFY */
+
+/* char: 33 '!' */
+
+static final CoordRec char33_stroke0[] = {
+    new CoordRec((float) 52.381, (float) 100 ),
+    new CoordRec((float) 52.381, (float) 33.3333 ),
+};
+
+static final CoordRec char33_stroke1[] = {
+    new CoordRec((float) 52.381, (float) 9.5238 ),
+    new CoordRec((float) 47.6191, (float) 4.7619 ),
+    new CoordRec((float) 52.381, (float) 0 ),
+    new CoordRec((float) 57.1429, (float) 4.7619 ),
+    new CoordRec((float) 52.381, (float) 9.5238 ),
+};
+
+static final StrokeRec char33[] = {
+   new StrokeRec( 2, char33_stroke0 ),
+   new StrokeRec( 5, char33_stroke1 ),
+};
+
+/* char: 34 '"' */
+
+static final CoordRec char34_stroke0[] = {
+    new CoordRec((float) 33.3334, (float) 100 ),
+    new CoordRec((float) 33.3334, (float) 66.6667 ),
+};
+
+static final CoordRec char34_stroke1[] = {
+    new CoordRec((float) 71.4286, (float) 100 ),
+    new CoordRec((float) 71.4286, (float) 66.6667 ),
+};
+
+static final StrokeRec char34[] = {
+   new StrokeRec( 2, char34_stroke0 ),
+   new StrokeRec( 2, char34_stroke1 ),
+};
+
+/* char: 35 '#' */
+
+static final CoordRec char35_stroke0[] = {
+    new CoordRec((float) 54.7619, (float) 119.048 ),
+    new CoordRec((float) 21.4286, (float) -33.3333 ),
+};
+
+static final CoordRec char35_stroke1[] = {
+    new CoordRec((float) 83.3334, (float) 119.048 ),
+    new CoordRec((float) 50, (float) -33.3333 ),
+};
+
+static final CoordRec char35_stroke2[] = {
+    new CoordRec((float) 21.4286, (float) 57.1429 ),
+    new CoordRec((float) 88.0952, (float) 57.1429 ),
+};
+
+static final CoordRec char35_stroke3[] = {
+    new CoordRec((float) 16.6667, (float) 28.5714 ),
+    new CoordRec((float) 83.3334, (float) 28.5714 ),
+};
+
+static final StrokeRec char35[] = {
+   new StrokeRec( 2, char35_stroke0 ),
+   new StrokeRec( 2, char35_stroke1 ),
+   new StrokeRec( 2, char35_stroke2 ),
+   new StrokeRec( 2, char35_stroke3 ),
+};
+
+/* char: 36 '$' */
+
+static final CoordRec char36_stroke0[] = {
+    new CoordRec((float) 42.8571, (float) 119.048 ),
+    new CoordRec((float) 42.8571, (float) -19.0476 ),
+};
+
+static final CoordRec char36_stroke1[] = {
+    new CoordRec((float) 61.9047, (float) 119.048 ),
+    new CoordRec((float) 61.9047, (float) -19.0476 ),
+};
+
+static final CoordRec char36_stroke2[] = {
+    new CoordRec((float) 85.7143, (float) 85.7143 ),
+    new CoordRec((float) 76.1905, (float) 95.2381 ),
+    new CoordRec((float) 61.9047, (float) 100 ),
+    new CoordRec((float) 42.8571, (float) 100 ),
+    new CoordRec((float) 28.5714, (float) 95.2381 ),
+    new CoordRec((float) 19.0476, (float) 85.7143 ),
+    new CoordRec((float) 19.0476, (float) 76.1905 ),
+    new CoordRec((float) 23.8095, (float) 66.6667 ),
+    new CoordRec((float) 28.5714, (float) 61.9048 ),
+    new CoordRec((float) 38.0952, (float) 57.1429 ),
+    new CoordRec((float) 66.6666, (float) 47.619 ),
+    new CoordRec((float) 76.1905, (float) 42.8571 ),
+    new CoordRec((float) 80.9524, (float) 38.0952 ),
+    new CoordRec((float) 85.7143, (float) 28.5714 ),
+    new CoordRec((float) 85.7143, (float) 14.2857 ),
+    new CoordRec((float) 76.1905, (float) 4.7619 ),
+    new CoordRec((float) 61.9047, (float) 0 ),
+    new CoordRec((float) 42.8571, (float) 0 ),
+    new CoordRec((float) 28.5714, (float) 4.7619 ),
+    new CoordRec((float) 19.0476, (float) 14.2857 ),
+};
+
+static final StrokeRec char36[] = {
+   new StrokeRec( 2, char36_stroke0 ),
+   new StrokeRec( 2, char36_stroke1 ),
+   new StrokeRec( 20, char36_stroke2 ),
+};
+
+/* char: 37 '%' */
+
+static final CoordRec char37_stroke0[] = {
+    new CoordRec((float) 95.2381, (float) 100 ),
+    new CoordRec((float) 9.5238, (float) 0 ),
+};
+
+static final CoordRec char37_stroke1[] = {
+    new CoordRec((float) 33.3333, (float) 100 ),
+    new CoordRec((float) 42.8571, (float) 90.4762 ),
+    new CoordRec((float) 42.8571, (float) 80.9524 ),
+    new CoordRec((float) 38.0952, (float) 71.4286 ),
+    new CoordRec((float) 28.5714, (float) 66.6667 ),
+    new CoordRec((float) 19.0476, (float) 66.6667 ),
+    new CoordRec((float) 9.5238, (float) 76.1905 ),
+    new CoordRec((float) 9.5238, (float) 85.7143 ),
+    new CoordRec((float) 14.2857, (float) 95.2381 ),
+    new CoordRec((float) 23.8095, (float) 100 ),
+    new CoordRec((float) 33.3333, (float) 100 ),
+    new CoordRec((float) 42.8571, (float) 95.2381 ),
+    new CoordRec((float) 57.1428, (float) 90.4762 ),
+    new CoordRec((float) 71.4286, (float) 90.4762 ),
+    new CoordRec((float) 85.7143, (float) 95.2381 ),
+    new CoordRec((float) 95.2381, (float) 100 ),
+};
+
+static final CoordRec char37_stroke2[] = {
+    new CoordRec((float) 76.1905, (float) 33.3333 ),
+    new CoordRec((float) 66.6667, (float) 28.5714 ),
+    new CoordRec((float) 61.9048, (float) 19.0476 ),
+    new CoordRec((float) 61.9048, (float) 9.5238 ),
+    new CoordRec((float) 71.4286, (float) 0 ),
+    new CoordRec((float) 80.9524, (float) 0 ),
+    new CoordRec((float) 90.4762, (float) 4.7619 ),
+    new CoordRec((float) 95.2381, (float) 14.2857 ),
+    new CoordRec((float) 95.2381, (float) 23.8095 ),
+    new CoordRec((float) 85.7143, (float) 33.3333 ),
+    new CoordRec((float) 76.1905, (float) 33.3333 ),
+};
+
+static final StrokeRec char37[] = {
+   new StrokeRec( 2, char37_stroke0 ),
+   new StrokeRec( 16, char37_stroke1 ),
+   new StrokeRec( 11, char37_stroke2 ),
+};
+
+/* char: 38 '&' */
+
+static final CoordRec char38_stroke0[] = {
+    new CoordRec((float) 100, (float) 57.1429 ),
+    new CoordRec((float) 100, (float) 61.9048 ),
+    new CoordRec((float) 95.2381, (float) 66.6667 ),
+    new CoordRec((float) 90.4762, (float) 66.6667 ),
+    new CoordRec((float) 85.7143, (float) 61.9048 ),
+    new CoordRec((float) 80.9524, (float) 52.381 ),
+    new CoordRec((float) 71.4286, (float) 28.5714 ),
+    new CoordRec((float) 61.9048, (float) 14.2857 ),
+    new CoordRec((float) 52.3809, (float) 4.7619 ),
+    new CoordRec((float) 42.8571, (float) 0 ),
+    new CoordRec((float) 23.8095, (float) 0 ),
+    new CoordRec((float) 14.2857, (float) 4.7619 ),
+    new CoordRec((float) 9.5238, (float) 9.5238 ),
+    new CoordRec((float) 4.7619, (float) 19.0476 ),
+    new CoordRec((float) 4.7619, (float) 28.5714 ),
+    new CoordRec((float) 9.5238, (float) 38.0952 ),
+    new CoordRec((float) 14.2857, (float) 42.8571 ),
+    new CoordRec((float) 47.619, (float) 61.9048 ),
+    new CoordRec((float) 52.3809, (float) 66.6667 ),
+    new CoordRec((float) 57.1429, (float) 76.1905 ),
+    new CoordRec((float) 57.1429, (float) 85.7143 ),
+    new CoordRec((float) 52.3809, (float) 95.2381 ),
+    new CoordRec((float) 42.8571, (float) 100 ),
+    new CoordRec((float) 33.3333, (float) 95.2381 ),
+    new CoordRec((float) 28.5714, (float) 85.7143 ),
+    new CoordRec((float) 28.5714, (float) 76.1905 ),
+    new CoordRec((float) 33.3333, (float) 61.9048 ),
+    new CoordRec((float) 42.8571, (float) 47.619 ),
+    new CoordRec((float) 66.6667, (float) 14.2857 ),
+    new CoordRec((float) 76.1905, (float) 4.7619 ),
+    new CoordRec((float) 85.7143, (float) 0 ),
+    new CoordRec((float) 95.2381, (float) 0 ),
+    new CoordRec((float) 100, (float) 4.7619 ),
+    new CoordRec((float) 100, (float) 9.5238 ),
+};
+
+static final StrokeRec char38[] = {
+   new StrokeRec( 34, char38_stroke0 ),
+};
+
+/* char: 39 ''' */
+
+static final CoordRec char39_stroke0[] = {
+    new CoordRec((float) 52.381, (float) 100 ),
+    new CoordRec((float) 52.381, (float) 66.6667 ),
+};
+
+static final StrokeRec char39[] = {
+   new StrokeRec( 2, char39_stroke0 ),
+};
+
+/* char: 40 '(' */
+
+static final CoordRec char40_stroke0[] = {
+    new CoordRec((float) 69.0476, (float) 119.048 ),
+    new CoordRec((float) 59.5238, (float) 109.524 ),
+    new CoordRec((float) 50, (float) 95.2381 ),
+    new CoordRec((float) 40.4762, (float) 76.1905 ),
+    new CoordRec((float) 35.7143, (float) 52.381 ),
+    new CoordRec((float) 35.7143, (float) 33.3333 ),
+    new CoordRec((float) 40.4762, (float) 9.5238 ),
+    new CoordRec((float) 50, (float) -9.5238 ),
+    new CoordRec((float) 59.5238, (float) -23.8095 ),
+    new CoordRec((float) 69.0476, (float) -33.3333 ),
+};
+
+static final StrokeRec char40[] = {
+   new StrokeRec( 10, char40_stroke0 ),
+};
+
+/* char: 41 ')' */
+
+static final CoordRec char41_stroke0[] = {
+    new CoordRec((float) 35.7143, (float) 119.048 ),
+    new CoordRec((float) 45.2381, (float) 109.524 ),
+    new CoordRec((float) 54.7619, (float) 95.2381 ),
+    new CoordRec((float) 64.2857, (float) 76.1905 ),
+    new CoordRec((float) 69.0476, (float) 52.381 ),
+    new CoordRec((float) 69.0476, (float) 33.3333 ),
+    new CoordRec((float) 64.2857, (float) 9.5238 ),
+    new CoordRec((float) 54.7619, (float) -9.5238 ),
+    new CoordRec((float) 45.2381, (float) -23.8095 ),
+    new CoordRec((float) 35.7143, (float) -33.3333 ),
+};
+
+static final StrokeRec char41[] = {
+   new StrokeRec( 10, char41_stroke0 ),
+};
+
+/* char: 42 '*' */
+
+static final CoordRec char42_stroke0[] = {
+    new CoordRec((float) 52.381, (float) 71.4286 ),
+    new CoordRec((float) 52.381, (float) 14.2857 ),
+};
+
+static final CoordRec char42_stroke1[] = {
+    new CoordRec((float) 28.5715, (float) 57.1429 ),
+    new CoordRec((float) 76.1905, (float) 28.5714 ),
+};
+
+static final CoordRec char42_stroke2[] = {
+    new CoordRec((float) 76.1905, (float) 57.1429 ),
+    new CoordRec((float) 28.5715, (float) 28.5714 ),
+};
+
+static final StrokeRec char42[] = {
+   new StrokeRec( 2, char42_stroke0 ),
+   new StrokeRec( 2, char42_stroke1 ),
+   new StrokeRec( 2, char42_stroke2 ),
+};
+
+/* char: 43 '+' */
+
+static final CoordRec char43_stroke0[] = {
+    new CoordRec((float) 52.3809, (float) 85.7143 ),
+    new CoordRec((float) 52.3809, (float) 0 ),
+};
+
+static final CoordRec char43_stroke1[] = {
+    new CoordRec((float) 9.5238, (float) 42.8571 ),
+    new CoordRec((float) 95.2381, (float) 42.8571 ),
+};
+
+static final StrokeRec char43[] = {
+   new StrokeRec( 2, char43_stroke0 ),
+   new StrokeRec( 2, char43_stroke1 ),
+};
+
+/* char: 44 ',' */
+
+static final CoordRec char44_stroke0[] = {
+    new CoordRec((float) 57.1429, (float) 4.7619 ),
+    new CoordRec((float) 52.381, (float) 0 ),
+    new CoordRec((float) 47.6191, (float) 4.7619 ),
+    new CoordRec((float) 52.381, (float) 9.5238 ),
+    new CoordRec((float) 57.1429, (float) 4.7619 ),
+    new CoordRec((float) 57.1429, (float) -4.7619 ),
+    new CoordRec((float) 52.381, (float) -14.2857 ),
+    new CoordRec((float) 47.6191, (float) -19.0476 ),
+};
+
+static final StrokeRec char44[] = {
+   new StrokeRec( 8, char44_stroke0 ),
+};
+
+/* char: 45 '-' */
+
+static final CoordRec char45_stroke0[] = {
+    new CoordRec((float) 9.5238, (float) 42.8571 ),
+    new CoordRec((float) 95.2381, (float) 42.8571 ),
+};
+
+static final StrokeRec char45[] = {
+   new StrokeRec( 2, char45_stroke0 ),
+};
+
+/* char: 46 '.' */
+
+static final CoordRec char46_stroke0[] = {
+    new CoordRec((float) 52.381, (float) 9.5238 ),
+    new CoordRec((float) 47.6191, (float) 4.7619 ),
+    new CoordRec((float) 52.381, (float) 0 ),
+    new CoordRec((float) 57.1429, (float) 4.7619 ),
+    new CoordRec((float) 52.381, (float) 9.5238 ),
+};
+
+static final StrokeRec char46[] = {
+   new StrokeRec( 5, char46_stroke0 ),
+};
+
+/* char: 47 '/' */
+
+static final CoordRec char47_stroke0[] = {
+    new CoordRec((float) 19.0476, (float) -14.2857 ),
+    new CoordRec((float) 85.7143, (float) 100 ),
+};
+
+static final StrokeRec char47[] = {
+   new StrokeRec( 2, char47_stroke0 ),
+};
+
+/* char: 48 '0' */
+
+static final CoordRec char48_stroke0[] = {
+    new CoordRec((float) 47.619, (float) 100 ),
+    new CoordRec((float) 33.3333, (float) 95.2381 ),
+    new CoordRec((float) 23.8095, (float) 80.9524 ),
+    new CoordRec((float) 19.0476, (float) 57.1429 ),
+    new CoordRec((float) 19.0476, (float) 42.8571 ),
+    new CoordRec((float) 23.8095, (float) 19.0476 ),
+    new CoordRec((float) 33.3333, (float) 4.7619 ),
+    new CoordRec((float) 47.619, (float) 0 ),
+    new CoordRec((float) 57.1428, (float) 0 ),
+    new CoordRec((float) 71.4286, (float) 4.7619 ),
+    new CoordRec((float) 80.9524, (float) 19.0476 ),
+    new CoordRec((float) 85.7143, (float) 42.8571 ),
+    new CoordRec((float) 85.7143, (float) 57.1429 ),
+    new CoordRec((float) 80.9524, (float) 80.9524 ),
+    new CoordRec((float) 71.4286, (float) 95.2381 ),
+    new CoordRec((float) 57.1428, (float) 100 ),
+    new CoordRec((float) 47.619, (float) 100 ),
+};
+
+static final StrokeRec char48[] = {
+   new StrokeRec( 17, char48_stroke0 ),
+};
+
+/* char: 49 '1' */
+
+static final CoordRec char49_stroke0[] = {
+    new CoordRec((float) 40.4762, (float) 80.9524 ),
+    new CoordRec((float) 50, (float) 85.7143 ),
+    new CoordRec((float) 64.2857, (float) 100 ),
+    new CoordRec((float) 64.2857, (float) 0 ),
+};
+
+static final StrokeRec char49[] = {
+   new StrokeRec( 4, char49_stroke0 ),
+};
+
+/* char: 50 '2' */
+
+static final CoordRec char50_stroke0[] = {
+    new CoordRec((float) 23.8095, (float) 76.1905 ),
+    new CoordRec((float) 23.8095, (float) 80.9524 ),
+    new CoordRec((float) 28.5714, (float) 90.4762 ),
+    new CoordRec((float) 33.3333, (float) 95.2381 ),
+    new CoordRec((float) 42.8571, (float) 100 ),
+    new CoordRec((float) 61.9047, (float) 100 ),
+    new CoordRec((float) 71.4286, (float) 95.2381 ),
+    new CoordRec((float) 76.1905, (float) 90.4762 ),
+    new CoordRec((float) 80.9524, (float) 80.9524 ),
+    new CoordRec((float) 80.9524, (float) 71.4286 ),
+    new CoordRec((float) 76.1905, (float) 61.9048 ),
+    new CoordRec((float) 66.6666, (float) 47.619 ),
+    new CoordRec((float) 19.0476, (float) 0 ),
+    new CoordRec((float) 85.7143, (float) 0 ),
+};
+
+static final StrokeRec char50[] = {
+   new StrokeRec( 14, char50_stroke0 ),
+};
+
+/* char: 51 '3' */
+
+static final CoordRec char51_stroke0[] = {
+    new CoordRec((float) 28.5714, (float) 100 ),
+    new CoordRec((float) 80.9524, (float) 100 ),
+    new CoordRec((float) 52.3809, (float) 61.9048 ),
+    new CoordRec((float) 66.6666, (float) 61.9048 ),
+    new CoordRec((float) 76.1905, (float) 57.1429 ),
+    new CoordRec((float) 80.9524, (float) 52.381 ),
+    new CoordRec((float) 85.7143, (float) 38.0952 ),
+    new CoordRec((float) 85.7143, (float) 28.5714 ),
+    new CoordRec((float) 80.9524, (float) 14.2857 ),
+    new CoordRec((float) 71.4286, (float) 4.7619 ),
+    new CoordRec((float) 57.1428, (float) 0 ),
+    new CoordRec((float) 42.8571, (float) 0 ),
+    new CoordRec((float) 28.5714, (float) 4.7619 ),
+    new CoordRec((float) 23.8095, (float) 9.5238 ),
+    new CoordRec((float) 19.0476, (float) 19.0476 ),
+};
+
+static final StrokeRec char51[] = {
+   new StrokeRec( 15, char51_stroke0 ),
+};
+
+/* char: 52 '4' */
+
+static final CoordRec char52_stroke0[] = {
+    new CoordRec((float) 64.2857, (float) 100 ),
+    new CoordRec((float) 16.6667, (float) 33.3333 ),
+    new CoordRec((float) 88.0952, (float) 33.3333 ),
+};
+
+static final CoordRec char52_stroke1[] = {
+    new CoordRec((float) 64.2857, (float) 100 ),
+    new CoordRec((float) 64.2857, (float) 0 ),
+};
+
+static final StrokeRec char52[] = {
+   new StrokeRec( 3, char52_stroke0 ),
+   new StrokeRec( 2, char52_stroke1 ),
+};
+
+/* char: 53 '5' */
+
+static final CoordRec char53_stroke0[] = {
+    new CoordRec((float) 76.1905, (float) 100 ),
+    new CoordRec((float) 28.5714, (float) 100 ),
+    new CoordRec((float) 23.8095, (float) 57.1429 ),
+    new CoordRec((float) 28.5714, (float) 61.9048 ),
+    new CoordRec((float) 42.8571, (float) 66.6667 ),
+    new CoordRec((float) 57.1428, (float) 66.6667 ),
+    new CoordRec((float) 71.4286, (float) 61.9048 ),
+    new CoordRec((float) 80.9524, (float) 52.381 ),
+    new CoordRec((float) 85.7143, (float) 38.0952 ),
+    new CoordRec((float) 85.7143, (float) 28.5714 ),
+    new CoordRec((float) 80.9524, (float) 14.2857 ),
+    new CoordRec((float) 71.4286, (float) 4.7619 ),
+    new CoordRec((float) 57.1428, (float) 0 ),
+    new CoordRec((float) 42.8571, (float) 0 ),
+    new CoordRec((float) 28.5714, (float) 4.7619 ),
+    new CoordRec((float) 23.8095, (float) 9.5238 ),
+    new CoordRec((float) 19.0476, (float) 19.0476 ),
+};
+
+static final StrokeRec char53[] = {
+   new StrokeRec( 17, char53_stroke0 ),
+};
+
+/* char: 54 '6' */
+
+static final CoordRec char54_stroke0[] = {
+    new CoordRec((float) 78.5714, (float) 85.7143 ),
+    new CoordRec((float) 73.8096, (float) 95.2381 ),
+    new CoordRec((float) 59.5238, (float) 100 ),
+    new CoordRec((float) 50, (float) 100 ),
+    new CoordRec((float) 35.7143, (float) 95.2381 ),
+    new CoordRec((float) 26.1905, (float) 80.9524 ),
+    new CoordRec((float) 21.4286, (float) 57.1429 ),
+    new CoordRec((float) 21.4286, (float) 33.3333 ),
+    new CoordRec((float) 26.1905, (float) 14.2857 ),
+    new CoordRec((float) 35.7143, (float) 4.7619 ),
+    new CoordRec((float) 50, (float) 0 ),
+    new CoordRec((float) 54.7619, (float) 0 ),
+    new CoordRec((float) 69.0476, (float) 4.7619 ),
+    new CoordRec((float) 78.5714, (float) 14.2857 ),
+    new CoordRec((float) 83.3334, (float) 28.5714 ),
+    new CoordRec((float) 83.3334, (float) 33.3333 ),
+    new CoordRec((float) 78.5714, (float) 47.619 ),
+    new CoordRec((float) 69.0476, (float) 57.1429 ),
+    new CoordRec((float) 54.7619, (float) 61.9048 ),
+    new CoordRec((float) 50, (float) 61.9048 ),
+    new CoordRec((float) 35.7143, (float) 57.1429 ),
+    new CoordRec((float) 26.1905, (float) 47.619 ),
+    new CoordRec((float) 21.4286, (float) 33.3333 ),
+};
+
+static final StrokeRec char54[] = {
+   new StrokeRec( 23, char54_stroke0 ),
+};
+
+/* char: 55 '7' */
+
+static final CoordRec char55_stroke0[] = {
+    new CoordRec((float) 85.7143, (float) 100 ),
+    new CoordRec((float) 38.0952, (float) 0 ),
+};
+
+static final CoordRec char55_stroke1[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 85.7143, (float) 100 ),
+};
+
+static final StrokeRec char55[] = {
+   new StrokeRec( 2, char55_stroke0 ),
+   new StrokeRec( 2, char55_stroke1 ),
+};
+
+/* char: 56 '8' */
+
+static final CoordRec char56_stroke0[] = {
+    new CoordRec((float) 42.8571, (float) 100 ),
+    new CoordRec((float) 28.5714, (float) 95.2381 ),
+    new CoordRec((float) 23.8095, (float) 85.7143 ),
+    new CoordRec((float) 23.8095, (float) 76.1905 ),
+    new CoordRec((float) 28.5714, (float) 66.6667 ),
+    new CoordRec((float) 38.0952, (float) 61.9048 ),
+    new CoordRec((float) 57.1428, (float) 57.1429 ),
+    new CoordRec((float) 71.4286, (float) 52.381 ),
+    new CoordRec((float) 80.9524, (float) 42.8571 ),
+    new CoordRec((float) 85.7143, (float) 33.3333 ),
+    new CoordRec((float) 85.7143, (float) 19.0476 ),
+    new CoordRec((float) 80.9524, (float) 9.5238 ),
+    new CoordRec((float) 76.1905, (float) 4.7619 ),
+    new CoordRec((float) 61.9047, (float) 0 ),
+    new CoordRec((float) 42.8571, (float) 0 ),
+    new CoordRec((float) 28.5714, (float) 4.7619 ),
+    new CoordRec((float) 23.8095, (float) 9.5238 ),
+    new CoordRec((float) 19.0476, (float) 19.0476 ),
+    new CoordRec((float) 19.0476, (float) 33.3333 ),
+    new CoordRec((float) 23.8095, (float) 42.8571 ),
+    new CoordRec((float) 33.3333, (float) 52.381 ),
+    new CoordRec((float) 47.619, (float) 57.1429 ),
+    new CoordRec((float) 66.6666, (float) 61.9048 ),
+    new CoordRec((float) 76.1905, (float) 66.6667 ),
+    new CoordRec((float) 80.9524, (float) 76.1905 ),
+    new CoordRec((float) 80.9524, (float) 85.7143 ),
+    new CoordRec((float) 76.1905, (float) 95.2381 ),
+    new CoordRec((float) 61.9047, (float) 100 ),
+    new CoordRec((float) 42.8571, (float) 100 ),
+};
+
+static final StrokeRec char56[] = {
+   new StrokeRec( 29, char56_stroke0 ),
+};
+
+/* char: 57 '9' */
+
+static final CoordRec char57_stroke0[] = {
+    new CoordRec((float) 83.3334, (float) 66.6667 ),
+    new CoordRec((float) 78.5714, (float) 52.381 ),
+    new CoordRec((float) 69.0476, (float) 42.8571 ),
+    new CoordRec((float) 54.7619, (float) 38.0952 ),
+    new CoordRec((float) 50, (float) 38.0952 ),
+    new CoordRec((float) 35.7143, (float) 42.8571 ),
+    new CoordRec((float) 26.1905, (float) 52.381 ),
+    new CoordRec((float) 21.4286, (float) 66.6667 ),
+    new CoordRec((float) 21.4286, (float) 71.4286 ),
+    new CoordRec((float) 26.1905, (float) 85.7143 ),
+    new CoordRec((float) 35.7143, (float) 95.2381 ),
+    new CoordRec((float) 50, (float) 100 ),
+    new CoordRec((float) 54.7619, (float) 100 ),
+    new CoordRec((float) 69.0476, (float) 95.2381 ),
+    new CoordRec((float) 78.5714, (float) 85.7143 ),
+    new CoordRec((float) 83.3334, (float) 66.6667 ),
+    new CoordRec((float) 83.3334, (float) 42.8571 ),
+    new CoordRec((float) 78.5714, (float) 19.0476 ),
+    new CoordRec((float) 69.0476, (float) 4.7619 ),
+    new CoordRec((float) 54.7619, (float) 0 ),
+    new CoordRec((float) 45.2381, (float) 0 ),
+    new CoordRec((float) 30.9524, (float) 4.7619 ),
+    new CoordRec((float) 26.1905, (float) 14.2857 ),
+};
+
+static final StrokeRec char57[] = {
+   new StrokeRec( 23, char57_stroke0 ),
+};
+
+/* char: 58 ':' */
+
+static final CoordRec char58_stroke0[] = {
+    new CoordRec((float) 52.381, (float) 66.6667 ),
+    new CoordRec((float) 47.6191, (float) 61.9048 ),
+    new CoordRec((float) 52.381, (float) 57.1429 ),
+    new CoordRec((float) 57.1429, (float) 61.9048 ),
+    new CoordRec((float) 52.381, (float) 66.6667 ),
+};
+
+static final CoordRec char58_stroke1[] = {
+    new CoordRec((float) 52.381, (float) 9.5238 ),
+    new CoordRec((float) 47.6191, (float) 4.7619 ),
+    new CoordRec((float) 52.381, (float) 0 ),
+    new CoordRec((float) 57.1429, (float) 4.7619 ),
+    new CoordRec((float) 52.381, (float) 9.5238 ),
+};
+
+static final StrokeRec char58[] = {
+   new StrokeRec( 5, char58_stroke0 ),
+   new StrokeRec( 5, char58_stroke1 ),
+};
+
+/* char: 59 ';' */
+
+static final CoordRec char59_stroke0[] = {
+    new CoordRec((float) 52.381, (float) 66.6667 ),
+    new CoordRec((float) 47.6191, (float) 61.9048 ),
+    new CoordRec((float) 52.381, (float) 57.1429 ),
+    new CoordRec((float) 57.1429, (float) 61.9048 ),
+    new CoordRec((float) 52.381, (float) 66.6667 ),
+};
+
+static final CoordRec char59_stroke1[] = {
+    new CoordRec((float) 57.1429, (float) 4.7619 ),
+    new CoordRec((float) 52.381, (float) 0 ),
+    new CoordRec((float) 47.6191, (float) 4.7619 ),
+    new CoordRec((float) 52.381, (float) 9.5238 ),
+    new CoordRec((float) 57.1429, (float) 4.7619 ),
+    new CoordRec((float) 57.1429, (float) -4.7619 ),
+    new CoordRec((float) 52.381, (float) -14.2857 ),
+    new CoordRec((float) 47.6191, (float) -19.0476 ),
+};
+
+static final StrokeRec char59[] = {
+   new StrokeRec( 5, char59_stroke0 ),
+   new StrokeRec( 8, char59_stroke1 ),
+};
+
+/* char: 60 '<' */
+
+static final CoordRec char60_stroke0[] = {
+    new CoordRec((float) 90.4762, (float) 85.7143 ),
+    new CoordRec((float) 14.2857, (float) 42.8571 ),
+    new CoordRec((float) 90.4762, (float) 0 ),
+};
+
+static final StrokeRec char60[] = {
+   new StrokeRec( 3, char60_stroke0 ),
+};
+
+/* char: 61 '=' */
+
+static final CoordRec char61_stroke0[] = {
+    new CoordRec((float) 9.5238, (float) 57.1429 ),
+    new CoordRec((float) 95.2381, (float) 57.1429 ),
+};
+
+static final CoordRec char61_stroke1[] = {
+    new CoordRec((float) 9.5238, (float) 28.5714 ),
+    new CoordRec((float) 95.2381, (float) 28.5714 ),
+};
+
+static final StrokeRec char61[] = {
+   new StrokeRec( 2, char61_stroke0 ),
+   new StrokeRec( 2, char61_stroke1 ),
+};
+
+/* char: 62 '>' */
+
+static final CoordRec char62_stroke0[] = {
+    new CoordRec((float) 14.2857, (float) 85.7143 ),
+    new CoordRec((float) 90.4762, (float) 42.8571 ),
+    new CoordRec((float) 14.2857, (float) 0 ),
+};
+
+static final StrokeRec char62[] = {
+   new StrokeRec( 3, char62_stroke0 ),
+};
+
+/* char: 63 '?' */
+
+static final CoordRec char63_stroke0[] = {
+    new CoordRec((float) 23.8095, (float) 76.1905 ),
+    new CoordRec((float) 23.8095, (float) 80.9524 ),
+    new CoordRec((float) 28.5714, (float) 90.4762 ),
+    new CoordRec((float) 33.3333, (float) 95.2381 ),
+    new CoordRec((float) 42.8571, (float) 100 ),
+    new CoordRec((float) 61.9047, (float) 100 ),
+    new CoordRec((float) 71.4285, (float) 95.2381 ),
+    new CoordRec((float) 76.1905, (float) 90.4762 ),
+    new CoordRec((float) 80.9524, (float) 80.9524 ),
+    new CoordRec((float) 80.9524, (float) 71.4286 ),
+    new CoordRec((float) 76.1905, (float) 61.9048 ),
+    new CoordRec((float) 71.4285, (float) 57.1429 ),
+    new CoordRec((float) 52.3809, (float) 47.619 ),
+    new CoordRec((float) 52.3809, (float) 33.3333 ),
+};
+
+static final CoordRec char63_stroke1[] = {
+    new CoordRec((float) 52.3809, (float) 9.5238 ),
+    new CoordRec((float) 47.619, (float) 4.7619 ),
+    new CoordRec((float) 52.3809, (float) 0 ),
+    new CoordRec((float) 57.1428, (float) 4.7619 ),
+    new CoordRec((float) 52.3809, (float) 9.5238 ),
+};
+
+static final StrokeRec char63[] = {
+   new StrokeRec( 14, char63_stroke0 ),
+   new StrokeRec( 5, char63_stroke1 ),
+};
+
+/* char: 64 '@' */
+
+static final CoordRec char64_stroke0[] = {
+    new CoordRec((float) 64.2857, (float) 52.381 ),
+    new CoordRec((float) 54.7619, (float) 57.1429 ),
+    new CoordRec((float) 45.2381, (float) 57.1429 ),
+    new CoordRec((float) 40.4762, (float) 47.619 ),
+    new CoordRec((float) 40.4762, (float) 42.8571 ),
+    new CoordRec((float) 45.2381, (float) 33.3333 ),
+    new CoordRec((float) 54.7619, (float) 33.3333 ),
+    new CoordRec((float) 64.2857, (float) 38.0952 ),
+};
+
+static final CoordRec char64_stroke1[] = {
+    new CoordRec((float) 64.2857, (float) 57.1429 ),
+    new CoordRec((float) 64.2857, (float) 38.0952 ),
+    new CoordRec((float) 69.0476, (float) 33.3333 ),
+    new CoordRec((float) 78.5714, (float) 33.3333 ),
+    new CoordRec((float) 83.3334, (float) 42.8571 ),
+    new CoordRec((float) 83.3334, (float) 47.619 ),
+    new CoordRec((float) 78.5714, (float) 61.9048 ),
+    new CoordRec((float) 69.0476, (float) 71.4286 ),
+    new CoordRec((float) 54.7619, (float) 76.1905 ),
+    new CoordRec((float) 50, (float) 76.1905 ),
+    new CoordRec((float) 35.7143, (float) 71.4286 ),
+    new CoordRec((float) 26.1905, (float) 61.9048 ),
+    new CoordRec((float) 21.4286, (float) 47.619 ),
+    new CoordRec((float) 21.4286, (float) 42.8571 ),
+    new CoordRec((float) 26.1905, (float) 28.5714 ),
+    new CoordRec((float) 35.7143, (float) 19.0476 ),
+    new CoordRec((float) 50, (float) 14.2857 ),
+    new CoordRec((float) 54.7619, (float) 14.2857 ),
+    new CoordRec((float) 69.0476, (float) 19.0476 ),
+};
+
+static final StrokeRec char64[] = {
+   new StrokeRec( 8, char64_stroke0 ),
+   new StrokeRec( 19, char64_stroke1 ),
+};
+
+/* char: 65 'A' */
+
+static final CoordRec char65_stroke0[] = {
+    new CoordRec((float) 52.3809, (float) 100 ),
+    new CoordRec((float) 14.2857, (float) 0 ),
+};
+
+static final CoordRec char65_stroke1[] = {
+    new CoordRec((float) 52.3809, (float) 100 ),
+    new CoordRec((float) 90.4762, (float) 0 ),
+};
+
+static final CoordRec char65_stroke2[] = {
+    new CoordRec((float) 28.5714, (float) 33.3333 ),
+    new CoordRec((float) 76.1905, (float) 33.3333 ),
+};
+
+static final StrokeRec char65[] = {
+   new StrokeRec( 2, char65_stroke0 ),
+   new StrokeRec( 2, char65_stroke1 ),
+   new StrokeRec( 2, char65_stroke2 ),
+};
+
+/* char: 66 'B' */
+
+static final CoordRec char66_stroke0[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 19.0476, (float) 0 ),
+};
+
+static final CoordRec char66_stroke1[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 61.9047, (float) 100 ),
+    new CoordRec((float) 76.1905, (float) 95.2381 ),
+    new CoordRec((float) 80.9524, (float) 90.4762 ),
+    new CoordRec((float) 85.7143, (float) 80.9524 ),
+    new CoordRec((float) 85.7143, (float) 71.4286 ),
+    new CoordRec((float) 80.9524, (float) 61.9048 ),
+    new CoordRec((float) 76.1905, (float) 57.1429 ),
+    new CoordRec((float) 61.9047, (float) 52.381 ),
+};
+
+static final CoordRec char66_stroke2[] = {
+    new CoordRec((float) 19.0476, (float) 52.381 ),
+    new CoordRec((float) 61.9047, (float) 52.381 ),
+    new CoordRec((float) 76.1905, (float) 47.619 ),
+    new CoordRec((float) 80.9524, (float) 42.8571 ),
+    new CoordRec((float) 85.7143, (float) 33.3333 ),
+    new CoordRec((float) 85.7143, (float) 19.0476 ),
+    new CoordRec((float) 80.9524, (float) 9.5238 ),
+    new CoordRec((float) 76.1905, (float) 4.7619 ),
+    new CoordRec((float) 61.9047, (float) 0 ),
+    new CoordRec((float) 19.0476, (float) 0 ),
+};
+
+static final StrokeRec char66[] = {
+   new StrokeRec( 2, char66_stroke0 ),
+   new StrokeRec( 9, char66_stroke1 ),
+   new StrokeRec( 10, char66_stroke2 ),
+};
+
+/* char: 67 'C' */
+
+static final CoordRec char67_stroke0[] = {
+    new CoordRec((float) 88.0952, (float) 76.1905 ),
+    new CoordRec((float) 83.3334, (float) 85.7143 ),
+    new CoordRec((float) 73.8096, (float) 95.2381 ),
+    new CoordRec((float) 64.2857, (float) 100 ),
+    new CoordRec((float) 45.2381, (float) 100 ),
+    new CoordRec((float) 35.7143, (float) 95.2381 ),
+    new CoordRec((float) 26.1905, (float) 85.7143 ),
+    new CoordRec((float) 21.4286, (float) 76.1905 ),
+    new CoordRec((float) 16.6667, (float) 61.9048 ),
+    new CoordRec((float) 16.6667, (float) 38.0952 ),
+    new CoordRec((float) 21.4286, (float) 23.8095 ),
+    new CoordRec((float) 26.1905, (float) 14.2857 ),
+    new CoordRec((float) 35.7143, (float) 4.7619 ),
+    new CoordRec((float) 45.2381, (float) 0 ),
+    new CoordRec((float) 64.2857, (float) 0 ),
+    new CoordRec((float) 73.8096, (float) 4.7619 ),
+    new CoordRec((float) 83.3334, (float) 14.2857 ),
+    new CoordRec((float) 88.0952, (float) 23.8095 ),
+};
+
+static final StrokeRec char67[] = {
+   new StrokeRec( 18, char67_stroke0 ),
+};
+
+/* char: 68 'D' */
+
+static final CoordRec char68_stroke0[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 19.0476, (float) 0 ),
+};
+
+static final CoordRec char68_stroke1[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 52.3809, (float) 100 ),
+    new CoordRec((float) 66.6666, (float) 95.2381 ),
+    new CoordRec((float) 76.1905, (float) 85.7143 ),
+    new CoordRec((float) 80.9524, (float) 76.1905 ),
+    new CoordRec((float) 85.7143, (float) 61.9048 ),
+    new CoordRec((float) 85.7143, (float) 38.0952 ),
+    new CoordRec((float) 80.9524, (float) 23.8095 ),
+    new CoordRec((float) 76.1905, (float) 14.2857 ),
+    new CoordRec((float) 66.6666, (float) 4.7619 ),
+    new CoordRec((float) 52.3809, (float) 0 ),
+    new CoordRec((float) 19.0476, (float) 0 ),
+};
+
+static final StrokeRec char68[] = {
+   new StrokeRec( 2, char68_stroke0 ),
+   new StrokeRec( 12, char68_stroke1 ),
+};
+
+/* char: 69 'E' */
+
+static final CoordRec char69_stroke0[] = {
+    new CoordRec((float) 21.4286, (float) 100 ),
+    new CoordRec((float) 21.4286, (float) 0 ),
+};
+
+static final CoordRec char69_stroke1[] = {
+    new CoordRec((float) 21.4286, (float) 100 ),
+    new CoordRec((float) 83.3334, (float) 100 ),
+};
+
+static final CoordRec char69_stroke2[] = {
+    new CoordRec((float) 21.4286, (float) 52.381 ),
+    new CoordRec((float) 59.5238, (float) 52.381 ),
+};
+
+static final CoordRec char69_stroke3[] = {
+    new CoordRec((float) 21.4286, (float) 0 ),
+    new CoordRec((float) 83.3334, (float) 0 ),
+};
+
+static final StrokeRec char69[] = {
+   new StrokeRec( 2, char69_stroke0 ),
+   new StrokeRec( 2, char69_stroke1 ),
+   new StrokeRec( 2, char69_stroke2 ),
+   new StrokeRec( 2, char69_stroke3 ),
+};
+
+/* char: 70 'F' */
+
+static final CoordRec char70_stroke0[] = {
+    new CoordRec((float) 21.4286, (float) 100 ),
+    new CoordRec((float) 21.4286, (float) 0 ),
+};
+
+static final CoordRec char70_stroke1[] = {
+    new CoordRec((float) 21.4286, (float) 100 ),
+    new CoordRec((float) 83.3334, (float) 100 ),
+};
+
+static final CoordRec char70_stroke2[] = {
+    new CoordRec((float) 21.4286, (float) 52.381 ),
+    new CoordRec((float) 59.5238, (float) 52.381 ),
+};
+
+static final StrokeRec char70[] = {
+   new StrokeRec( 2, char70_stroke0 ),
+   new StrokeRec( 2, char70_stroke1 ),
+   new StrokeRec( 2, char70_stroke2 ),
+};
+
+/* char: 71 'G' */
+
+static final CoordRec char71_stroke0[] = {
+    new CoordRec((float) 88.0952, (float) 76.1905 ),
+    new CoordRec((float) 83.3334, (float) 85.7143 ),
+    new CoordRec((float) 73.8096, (float) 95.2381 ),
+    new CoordRec((float) 64.2857, (float) 100 ),
+    new CoordRec((float) 45.2381, (float) 100 ),
+    new CoordRec((float) 35.7143, (float) 95.2381 ),
+    new CoordRec((float) 26.1905, (float) 85.7143 ),
+    new CoordRec((float) 21.4286, (float) 76.1905 ),
+    new CoordRec((float) 16.6667, (float) 61.9048 ),
+    new CoordRec((float) 16.6667, (float) 38.0952 ),
+    new CoordRec((float) 21.4286, (float) 23.8095 ),
+    new CoordRec((float) 26.1905, (float) 14.2857 ),
+    new CoordRec((float) 35.7143, (float) 4.7619 ),
+    new CoordRec((float) 45.2381, (float) 0 ),
+    new CoordRec((float) 64.2857, (float) 0 ),
+    new CoordRec((float) 73.8096, (float) 4.7619 ),
+    new CoordRec((float) 83.3334, (float) 14.2857 ),
+    new CoordRec((float) 88.0952, (float) 23.8095 ),
+    new CoordRec((float) 88.0952, (float) 38.0952 ),
+};
+
+static final CoordRec char71_stroke1[] = {
+    new CoordRec((float) 64.2857, (float) 38.0952 ),
+    new CoordRec((float) 88.0952, (float) 38.0952 ),
+};
+
+static final StrokeRec char71[] = {
+   new StrokeRec( 19, char71_stroke0 ),
+   new StrokeRec( 2, char71_stroke1 ),
+};
+
+/* char: 72 'H' */
+
+static final CoordRec char72_stroke0[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 19.0476, (float) 0 ),
+};
+
+static final CoordRec char72_stroke1[] = {
+    new CoordRec((float) 85.7143, (float) 100 ),
+    new CoordRec((float) 85.7143, (float) 0 ),
+};
+
+static final CoordRec char72_stroke2[] = {
+    new CoordRec((float) 19.0476, (float) 52.381 ),
+    new CoordRec((float) 85.7143, (float) 52.381 ),
+};
+
+static final StrokeRec char72[] = {
+   new StrokeRec( 2, char72_stroke0 ),
+   new StrokeRec( 2, char72_stroke1 ),
+   new StrokeRec( 2, char72_stroke2 ),
+};
+
+/* char: 73 'I' */
+
+static final CoordRec char73_stroke0[] = {
+    new CoordRec((float) 52.381, (float) 100 ),
+    new CoordRec((float) 52.381, (float) 0 ),
+};
+
+static final StrokeRec char73[] = {
+   new StrokeRec( 2, char73_stroke0 ),
+};
+
+/* char: 74 'J' */
+
+static final CoordRec char74_stroke0[] = {
+    new CoordRec((float) 76.1905, (float) 100 ),
+    new CoordRec((float) 76.1905, (float) 23.8095 ),
+    new CoordRec((float) 71.4286, (float) 9.5238 ),
+    new CoordRec((float) 66.6667, (float) 4.7619 ),
+    new CoordRec((float) 57.1429, (float) 0 ),
+    new CoordRec((float) 47.6191, (float) 0 ),
+    new CoordRec((float) 38.0953, (float) 4.7619 ),
+    new CoordRec((float) 33.3334, (float) 9.5238 ),
+    new CoordRec((float) 28.5715, (float) 23.8095 ),
+    new CoordRec((float) 28.5715, (float) 33.3333 ),
+};
+
+static final StrokeRec char74[] = {
+   new StrokeRec( 10, char74_stroke0 ),
+};
+
+/* char: 75 'K' */
+
+static final CoordRec char75_stroke0[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 19.0476, (float) 0 ),
+};
+
+static final CoordRec char75_stroke1[] = {
+    new CoordRec((float) 85.7143, (float) 100 ),
+    new CoordRec((float) 19.0476, (float) 33.3333 ),
+};
+
+static final CoordRec char75_stroke2[] = {
+    new CoordRec((float) 42.8571, (float) 57.1429 ),
+    new CoordRec((float) 85.7143, (float) 0 ),
+};
+
+static final StrokeRec char75[] = {
+   new StrokeRec( 2, char75_stroke0 ),
+   new StrokeRec( 2, char75_stroke1 ),
+   new StrokeRec( 2, char75_stroke2 ),
+};
+
+/* char: 76 'L' */
+
+static final CoordRec char76_stroke0[] = {
+    new CoordRec((float) 23.8095, (float) 100 ),
+    new CoordRec((float) 23.8095, (float) 0 ),
+};
+
+static final CoordRec char76_stroke1[] = {
+    new CoordRec((float) 23.8095, (float) 0 ),
+    new CoordRec((float) 80.9524, (float) 0 ),
+};
+
+static final StrokeRec char76[] = {
+   new StrokeRec( 2, char76_stroke0 ),
+   new StrokeRec( 2, char76_stroke1 ),
+};
+
+/* char: 77 'M' */
+
+static final CoordRec char77_stroke0[] = {
+    new CoordRec((float) 14.2857, (float) 100 ),
+    new CoordRec((float) 14.2857, (float) 0 ),
+};
+
+static final CoordRec char77_stroke1[] = {
+    new CoordRec((float) 14.2857, (float) 100 ),
+    new CoordRec((float) 52.3809, (float) 0 ),
+};
+
+static final CoordRec char77_stroke2[] = {
+    new CoordRec((float) 90.4762, (float) 100 ),
+    new CoordRec((float) 52.3809, (float) 0 ),
+};
+
+static final CoordRec char77_stroke3[] = {
+    new CoordRec((float) 90.4762, (float) 100 ),
+    new CoordRec((float) 90.4762, (float) 0 ),
+};
+
+static final StrokeRec char77[] = {
+   new StrokeRec( 2, char77_stroke0 ),
+   new StrokeRec( 2, char77_stroke1 ),
+   new StrokeRec( 2, char77_stroke2 ),
+   new StrokeRec( 2, char77_stroke3 ),
+};
+
+/* char: 78 'N' */
+
+static final CoordRec char78_stroke0[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 19.0476, (float) 0 ),
+};
+
+static final CoordRec char78_stroke1[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 85.7143, (float) 0 ),
+};
+
+static final CoordRec char78_stroke2[] = {
+    new CoordRec((float) 85.7143, (float) 100 ),
+    new CoordRec((float) 85.7143, (float) 0 ),
+};
+
+static final StrokeRec char78[] = {
+   new StrokeRec( 2, char78_stroke0 ),
+   new StrokeRec( 2, char78_stroke1 ),
+   new StrokeRec( 2, char78_stroke2 ),
+};
+
+/* char: 79 'O' */
+
+static final CoordRec char79_stroke0[] = {
+    new CoordRec((float) 42.8571, (float) 100 ),
+    new CoordRec((float) 33.3333, (float) 95.2381 ),
+    new CoordRec((float) 23.8095, (float) 85.7143 ),
+    new CoordRec((float) 19.0476, (float) 76.1905 ),
+    new CoordRec((float) 14.2857, (float) 61.9048 ),
+    new CoordRec((float) 14.2857, (float) 38.0952 ),
+    new CoordRec((float) 19.0476, (float) 23.8095 ),
+    new CoordRec((float) 23.8095, (float) 14.2857 ),
+    new CoordRec((float) 33.3333, (float) 4.7619 ),
+    new CoordRec((float) 42.8571, (float) 0 ),
+    new CoordRec((float) 61.9047, (float) 0 ),
+    new CoordRec((float) 71.4286, (float) 4.7619 ),
+    new CoordRec((float) 80.9524, (float) 14.2857 ),
+    new CoordRec((float) 85.7143, (float) 23.8095 ),
+    new CoordRec((float) 90.4762, (float) 38.0952 ),
+    new CoordRec((float) 90.4762, (float) 61.9048 ),
+    new CoordRec((float) 85.7143, (float) 76.1905 ),
+    new CoordRec((float) 80.9524, (float) 85.7143 ),
+    new CoordRec((float) 71.4286, (float) 95.2381 ),
+    new CoordRec((float) 61.9047, (float) 100 ),
+    new CoordRec((float) 42.8571, (float) 100 ),
+};
+
+static final StrokeRec char79[] = {
+   new StrokeRec( 21, char79_stroke0 ),
+};
+
+/* char: 80 'P' */
+
+static final CoordRec char80_stroke0[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 19.0476, (float) 0 ),
+};
+
+static final CoordRec char80_stroke1[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 61.9047, (float) 100 ),
+    new CoordRec((float) 76.1905, (float) 95.2381 ),
+    new CoordRec((float) 80.9524, (float) 90.4762 ),
+    new CoordRec((float) 85.7143, (float) 80.9524 ),
+    new CoordRec((float) 85.7143, (float) 66.6667 ),
+    new CoordRec((float) 80.9524, (float) 57.1429 ),
+    new CoordRec((float) 76.1905, (float) 52.381 ),
+    new CoordRec((float) 61.9047, (float) 47.619 ),
+    new CoordRec((float) 19.0476, (float) 47.619 ),
+};
+
+static final StrokeRec char80[] = {
+   new StrokeRec( 2, char80_stroke0 ),
+   new StrokeRec( 10, char80_stroke1 ),
+};
+
+/* char: 81 'Q' */
+
+static final CoordRec char81_stroke0[] = {
+    new CoordRec((float) 42.8571, (float) 100 ),
+    new CoordRec((float) 33.3333, (float) 95.2381 ),
+    new CoordRec((float) 23.8095, (float) 85.7143 ),
+    new CoordRec((float) 19.0476, (float) 76.1905 ),
+    new CoordRec((float) 14.2857, (float) 61.9048 ),
+    new CoordRec((float) 14.2857, (float) 38.0952 ),
+    new CoordRec((float) 19.0476, (float) 23.8095 ),
+    new CoordRec((float) 23.8095, (float) 14.2857 ),
+    new CoordRec((float) 33.3333, (float) 4.7619 ),
+    new CoordRec((float) 42.8571, (float) 0 ),
+    new CoordRec((float) 61.9047, (float) 0 ),
+    new CoordRec((float) 71.4286, (float) 4.7619 ),
+    new CoordRec((float) 80.9524, (float) 14.2857 ),
+    new CoordRec((float) 85.7143, (float) 23.8095 ),
+    new CoordRec((float) 90.4762, (float) 38.0952 ),
+    new CoordRec((float) 90.4762, (float) 61.9048 ),
+    new CoordRec((float) 85.7143, (float) 76.1905 ),
+    new CoordRec((float) 80.9524, (float) 85.7143 ),
+    new CoordRec((float) 71.4286, (float) 95.2381 ),
+    new CoordRec((float) 61.9047, (float) 100 ),
+    new CoordRec((float) 42.8571, (float) 100 ),
+};
+
+static final CoordRec char81_stroke1[] = {
+    new CoordRec((float) 57.1428, (float) 19.0476 ),
+    new CoordRec((float) 85.7143, (float) -9.5238 ),
+};
+
+static final StrokeRec char81[] = {
+   new StrokeRec( 21, char81_stroke0 ),
+   new StrokeRec( 2, char81_stroke1 ),
+};
+
+/* char: 82 'R' */
+
+static final CoordRec char82_stroke0[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 19.0476, (float) 0 ),
+};
+
+static final CoordRec char82_stroke1[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 61.9047, (float) 100 ),
+    new CoordRec((float) 76.1905, (float) 95.2381 ),
+    new CoordRec((float) 80.9524, (float) 90.4762 ),
+    new CoordRec((float) 85.7143, (float) 80.9524 ),
+    new CoordRec((float) 85.7143, (float) 71.4286 ),
+    new CoordRec((float) 80.9524, (float) 61.9048 ),
+    new CoordRec((float) 76.1905, (float) 57.1429 ),
+    new CoordRec((float) 61.9047, (float) 52.381 ),
+    new CoordRec((float) 19.0476, (float) 52.381 ),
+};
+
+static final CoordRec char82_stroke2[] = {
+    new CoordRec((float) 52.3809, (float) 52.381 ),
+    new CoordRec((float) 85.7143, (float) 0 ),
+};
+
+static final StrokeRec char82[] = {
+   new StrokeRec( 2, char82_stroke0 ),
+   new StrokeRec( 10, char82_stroke1 ),
+   new StrokeRec( 2, char82_stroke2 ),
+};
+
+/* char: 83 'S' */
+
+static final CoordRec char83_stroke0[] = {
+    new CoordRec((float) 85.7143, (float) 85.7143 ),
+    new CoordRec((float) 76.1905, (float) 95.2381 ),
+    new CoordRec((float) 61.9047, (float) 100 ),
+    new CoordRec((float) 42.8571, (float) 100 ),
+    new CoordRec((float) 28.5714, (float) 95.2381 ),
+    new CoordRec((float) 19.0476, (float) 85.7143 ),
+    new CoordRec((float) 19.0476, (float) 76.1905 ),
+    new CoordRec((float) 23.8095, (float) 66.6667 ),
+    new CoordRec((float) 28.5714, (float) 61.9048 ),
+    new CoordRec((float) 38.0952, (float) 57.1429 ),
+    new CoordRec((float) 66.6666, (float) 47.619 ),
+    new CoordRec((float) 76.1905, (float) 42.8571 ),
+    new CoordRec((float) 80.9524, (float) 38.0952 ),
+    new CoordRec((float) 85.7143, (float) 28.5714 ),
+    new CoordRec((float) 85.7143, (float) 14.2857 ),
+    new CoordRec((float) 76.1905, (float) 4.7619 ),
+    new CoordRec((float) 61.9047, (float) 0 ),
+    new CoordRec((float) 42.8571, (float) 0 ),
+    new CoordRec((float) 28.5714, (float) 4.7619 ),
+    new CoordRec((float) 19.0476, (float) 14.2857 ),
+};
+
+static final StrokeRec char83[] = {
+   new StrokeRec( 20, char83_stroke0 ),
+};
+
+/* char: 84 'T' */
+
+static final CoordRec char84_stroke0[] = {
+    new CoordRec((float) 52.3809, (float) 100 ),
+    new CoordRec((float) 52.3809, (float) 0 ),
+};
+
+static final CoordRec char84_stroke1[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 85.7143, (float) 100 ),
+};
+
+static final StrokeRec char84[] = {
+   new StrokeRec( 2, char84_stroke0 ),
+   new StrokeRec( 2, char84_stroke1 ),
+};
+
+/* char: 85 'U' */
+
+static final CoordRec char85_stroke0[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 19.0476, (float) 28.5714 ),
+    new CoordRec((float) 23.8095, (float) 14.2857 ),
+    new CoordRec((float) 33.3333, (float) 4.7619 ),
+    new CoordRec((float) 47.619, (float) 0 ),
+    new CoordRec((float) 57.1428, (float) 0 ),
+    new CoordRec((float) 71.4286, (float) 4.7619 ),
+    new CoordRec((float) 80.9524, (float) 14.2857 ),
+    new CoordRec((float) 85.7143, (float) 28.5714 ),
+    new CoordRec((float) 85.7143, (float) 100 ),
+};
+
+static final StrokeRec char85[] = {
+   new StrokeRec( 10, char85_stroke0 ),
+};
+
+/* char: 86 'V' */
+
+static final CoordRec char86_stroke0[] = {
+    new CoordRec((float) 14.2857, (float) 100 ),
+    new CoordRec((float) 52.3809, (float) 0 ),
+};
+
+static final CoordRec char86_stroke1[] = {
+    new CoordRec((float) 90.4762, (float) 100 ),
+    new CoordRec((float) 52.3809, (float) 0 ),
+};
+
+static final StrokeRec char86[] = {
+   new StrokeRec( 2, char86_stroke0 ),
+   new StrokeRec( 2, char86_stroke1 ),
+};
+
+/* char: 87 'W' */
+
+static final CoordRec char87_stroke0[] = {
+    new CoordRec((float) 4.7619, (float) 100 ),
+    new CoordRec((float) 28.5714, (float) 0 ),
+};
+
+static final CoordRec char87_stroke1[] = {
+    new CoordRec((float) 52.3809, (float) 100 ),
+    new CoordRec((float) 28.5714, (float) 0 ),
+};
+
+static final CoordRec char87_stroke2[] = {
+    new CoordRec((float) 52.3809, (float) 100 ),
+    new CoordRec((float) 76.1905, (float) 0 ),
+};
+
+static final CoordRec char87_stroke3[] = {
+    new CoordRec((float) 100, (float) 100 ),
+    new CoordRec((float) 76.1905, (float) 0 ),
+};
+
+static final StrokeRec char87[] = {
+   new StrokeRec( 2, char87_stroke0 ),
+   new StrokeRec( 2, char87_stroke1 ),
+   new StrokeRec( 2, char87_stroke2 ),
+   new StrokeRec( 2, char87_stroke3 ),
+};
+
+/* char: 88 'X' */
+
+static final CoordRec char88_stroke0[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 85.7143, (float) 0 ),
+};
+
+static final CoordRec char88_stroke1[] = {
+    new CoordRec((float) 85.7143, (float) 100 ),
+    new CoordRec((float) 19.0476, (float) 0 ),
+};
+
+static final StrokeRec char88[] = {
+   new StrokeRec( 2, char88_stroke0 ),
+   new StrokeRec( 2, char88_stroke1 ),
+};
+
+/* char: 89 'Y' */
+
+static final CoordRec char89_stroke0[] = {
+    new CoordRec((float) 14.2857, (float) 100 ),
+    new CoordRec((float) 52.3809, (float) 52.381 ),
+    new CoordRec((float) 52.3809, (float) 0 ),
+};
+
+static final CoordRec char89_stroke1[] = {
+    new CoordRec((float) 90.4762, (float) 100 ),
+    new CoordRec((float) 52.3809, (float) 52.381 ),
+};
+
+static final StrokeRec char89[] = {
+   new StrokeRec( 3, char89_stroke0 ),
+   new StrokeRec( 2, char89_stroke1 ),
+};
+
+/* char: 90 'Z' */
+
+static final CoordRec char90_stroke0[] = {
+    new CoordRec((float) 85.7143, (float) 100 ),
+    new CoordRec((float) 19.0476, (float) 0 ),
+};
+
+static final CoordRec char90_stroke1[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 85.7143, (float) 100 ),
+};
+
+static final CoordRec char90_stroke2[] = {
+    new CoordRec((float) 19.0476, (float) 0 ),
+    new CoordRec((float) 85.7143, (float) 0 ),
+};
+
+static final StrokeRec char90[] = {
+   new StrokeRec( 2, char90_stroke0 ),
+   new StrokeRec( 2, char90_stroke1 ),
+   new StrokeRec( 2, char90_stroke2 ),
+};
+
+/* char: 91 '[' */
+
+static final CoordRec char91_stroke0[] = {
+    new CoordRec((float) 35.7143, (float) 119.048 ),
+    new CoordRec((float) 35.7143, (float) -33.3333 ),
+};
+
+static final CoordRec char91_stroke1[] = {
+    new CoordRec((float) 40.4762, (float) 119.048 ),
+    new CoordRec((float) 40.4762, (float) -33.3333 ),
+};
+
+static final CoordRec char91_stroke2[] = {
+    new CoordRec((float) 35.7143, (float) 119.048 ),
+    new CoordRec((float) 69.0476, (float) 119.048 ),
+};
+
+static final CoordRec char91_stroke3[] = {
+    new CoordRec((float) 35.7143, (float) -33.3333 ),
+    new CoordRec((float) 69.0476, (float) -33.3333 ),
+};
+
+static final StrokeRec char91[] = {
+   new StrokeRec( 2, char91_stroke0 ),
+   new StrokeRec( 2, char91_stroke1 ),
+   new StrokeRec( 2, char91_stroke2 ),
+   new StrokeRec( 2, char91_stroke3 ),
+};
+
+/* char: 92 '\' */
+
+static final CoordRec char92_stroke0[] = {
+    new CoordRec((float) 19.0476, (float) 100 ),
+    new CoordRec((float) 85.7143, (float) -14.2857 ),
+};
+
+static final StrokeRec char92[] = {
+   new StrokeRec( 2, char92_stroke0 ),
+};
+
+/* char: 93 ']' */
+
+static final CoordRec char93_stroke0[] = {
+    new CoordRec((float) 64.2857, (float) 119.048 ),
+    new CoordRec((float) 64.2857, (float) -33.3333 ),
+};
+
+static final CoordRec char93_stroke1[] = {
+    new CoordRec((float) 69.0476, (float) 119.048 ),
+    new CoordRec((float) 69.0476, (float) -33.3333 ),
+};
+
+static final CoordRec char93_stroke2[] = {
+    new CoordRec((float) 35.7143, (float) 119.048 ),
+    new CoordRec((float) 69.0476, (float) 119.048 ),
+};
+
+static final CoordRec char93_stroke3[] = {
+    new CoordRec((float) 35.7143, (float) -33.3333 ),
+    new CoordRec((float) 69.0476, (float) -33.3333 ),
+};
+
+static final StrokeRec char93[] = {
+   new StrokeRec( 2, char93_stroke0 ),
+   new StrokeRec( 2, char93_stroke1 ),
+   new StrokeRec( 2, char93_stroke2 ),
+   new StrokeRec( 2, char93_stroke3 ),
+};
+
+/* char: 94 '^' */
+
+static final CoordRec char94_stroke0[] = {
+    new CoordRec((float) 52.3809, (float) 109.524 ),
+    new CoordRec((float) 14.2857, (float) 42.8571 ),
+};
+
+static final CoordRec char94_stroke1[] = {
+    new CoordRec((float) 52.3809, (float) 109.524 ),
+    new CoordRec((float) 90.4762, (float) 42.8571 ),
+};
+
+static final StrokeRec char94[] = {
+   new StrokeRec( 2, char94_stroke0 ),
+   new StrokeRec( 2, char94_stroke1 ),
+};
+
+/* char: 95 '_' */
+
+static final CoordRec char95_stroke0[] = {
+    new CoordRec((float) 0, (float) -33.3333 ),
+    new CoordRec((float) 104.762, (float) -33.3333 ),
+    new CoordRec((float) 104.762, (float) -28.5714 ),
+    new CoordRec((float) 0, (float) -28.5714 ),
+    new CoordRec((float) 0, (float) -33.3333 ),
+};
+
+static final StrokeRec char95[] = {
+   new StrokeRec( 5, char95_stroke0 ),
+};
+
+/* char: 96 '`' */
+
+static final CoordRec char96_stroke0[] = {
+    new CoordRec((float) 42.8572, (float) 100 ),
+    new CoordRec((float) 66.6667, (float) 71.4286 ),
+};
+
+static final CoordRec char96_stroke1[] = {
+    new CoordRec((float) 42.8572, (float) 100 ),
+    new CoordRec((float) 38.0953, (float) 95.2381 ),
+    new CoordRec((float) 66.6667, (float) 71.4286 ),
+};
+
+static final StrokeRec char96[] = {
+   new StrokeRec( 2, char96_stroke0 ),
+   new StrokeRec( 3, char96_stroke1 ),
+};
+
+/* char: 97 'a' */
+
+static final CoordRec char97_stroke0[] = {
+    new CoordRec((float) 80.9524, (float) 66.6667 ),
+    new CoordRec((float) 80.9524, (float) 0 ),
+};
+
+static final CoordRec char97_stroke1[] = {
+    new CoordRec((float) 80.9524, (float) 52.381 ),
+    new CoordRec((float) 71.4285, (float) 61.9048 ),
+    new CoordRec((float) 61.9047, (float) 66.6667 ),
+    new CoordRec((float) 47.619, (float) 66.6667 ),
+    new CoordRec((float) 38.0952, (float) 61.9048 ),
+    new CoordRec((float) 28.5714, (float) 52.381 ),
+    new CoordRec((float) 23.8095, (float) 38.0952 ),
+    new CoordRec((float) 23.8095, (float) 28.5714 ),
+    new CoordRec((float) 28.5714, (float) 14.2857 ),
+    new CoordRec((float) 38.0952, (float) 4.7619 ),
+    new CoordRec((float) 47.619, (float) 0 ),
+    new CoordRec((float) 61.9047, (float) 0 ),
+    new CoordRec((float) 71.4285, (float) 4.7619 ),
+    new CoordRec((float) 80.9524, (float) 14.2857 ),
+};
+
+static final StrokeRec char97[] = {
+   new StrokeRec( 2, char97_stroke0 ),
+   new StrokeRec( 14, char97_stroke1 ),
+};
+
+/* char: 98 'b' */
+
+static final CoordRec char98_stroke0[] = {
+    new CoordRec((float) 23.8095, (float) 100 ),
+    new CoordRec((float) 23.8095, (float) 0 ),
+};
+
+static final CoordRec char98_stroke1[] = {
+    new CoordRec((float) 23.8095, (float) 52.381 ),
+    new CoordRec((float) 33.3333, (float) 61.9048 ),
+    new CoordRec((float) 42.8571, (float) 66.6667 ),
+    new CoordRec((float) 57.1428, (float) 66.6667 ),
+    new CoordRec((float) 66.6666, (float) 61.9048 ),
+    new CoordRec((float) 76.1905, (float) 52.381 ),
+    new CoordRec((float) 80.9524, (float) 38.0952 ),
+    new CoordRec((float) 80.9524, (float) 28.5714 ),
+    new CoordRec((float) 76.1905, (float) 14.2857 ),
+    new CoordRec((float) 66.6666, (float) 4.7619 ),
+    new CoordRec((float) 57.1428, (float) 0 ),
+    new CoordRec((float) 42.8571, (float) 0 ),
+    new CoordRec((float) 33.3333, (float) 4.7619 ),
+    new CoordRec((float) 23.8095, (float) 14.2857 ),
+};
+
+static final StrokeRec char98[] = {
+   new StrokeRec( 2, char98_stroke0 ),
+   new StrokeRec( 14, char98_stroke1 ),
+};
+
+/* char: 99 'c' */
+
+static final CoordRec char99_stroke0[] = {
+    new CoordRec((float) 80.9524, (float) 52.381 ),
+    new CoordRec((float) 71.4285, (float) 61.9048 ),
+    new CoordRec((float) 61.9047, (float) 66.6667 ),
+    new CoordRec((float) 47.619, (float) 66.6667 ),
+    new CoordRec((float) 38.0952, (float) 61.9048 ),
+    new CoordRec((float) 28.5714, (float) 52.381 ),
+    new CoordRec((float) 23.8095, (float) 38.0952 ),
+    new CoordRec((float) 23.8095, (float) 28.5714 ),
+    new CoordRec((float) 28.5714, (float) 14.2857 ),
+    new CoordRec((float) 38.0952, (float) 4.7619 ),
+    new CoordRec((float) 47.619, (float) 0 ),
+    new CoordRec((float) 61.9047, (float) 0 ),
+    new CoordRec((float) 71.4285, (float) 4.7619 ),
+    new CoordRec((float) 80.9524, (float) 14.2857 ),
+};
+
+static final StrokeRec char99[] = {
+   new StrokeRec( 14, char99_stroke0 ),
+};
+
+/* char: 100 'd' */
+
+static final CoordRec char100_stroke0[] = {
+    new CoordRec((float) 80.9524, (float) 100 ),
+    new CoordRec((float) 80.9524, (float) 0 ),
+};
+
+static final CoordRec char100_stroke1[] = {
+    new CoordRec((float) 80.9524, (float) 52.381 ),
+    new CoordRec((float) 71.4285, (float) 61.9048 ),
+    new CoordRec((float) 61.9047, (float) 66.6667 ),
+    new CoordRec((float) 47.619, (float) 66.6667 ),
+    new CoordRec((float) 38.0952, (float) 61.9048 ),
+    new CoordRec((float) 28.5714, (float) 52.381 ),
+    new CoordRec((float) 23.8095, (float) 38.0952 ),
+    new CoordRec((float) 23.8095, (float) 28.5714 ),
+    new CoordRec((float) 28.5714, (float) 14.2857 ),
+    new CoordRec((float) 38.0952, (float) 4.7619 ),
+    new CoordRec((float) 47.619, (float) 0 ),
+    new CoordRec((float) 61.9047, (float) 0 ),
+    new CoordRec((float) 71.4285, (float) 4.7619 ),
+    new CoordRec((float) 80.9524, (float) 14.2857 ),
+};
+
+static final StrokeRec char100[] = {
+   new StrokeRec( 2, char100_stroke0 ),
+   new StrokeRec( 14, char100_stroke1 ),
+};
+
+/* char: 101 'e' */
+
+static final CoordRec char101_stroke0[] = {
+    new CoordRec((float) 23.8095, (float) 38.0952 ),
+    new CoordRec((float) 80.9524, (float) 38.0952 ),
+    new CoordRec((float) 80.9524, (float) 47.619 ),
+    new CoordRec((float) 76.1905, (float) 57.1429 ),
+    new CoordRec((float) 71.4285, (float) 61.9048 ),
+    new CoordRec((float) 61.9047, (float) 66.6667 ),
+    new CoordRec((float) 47.619, (float) 66.6667 ),
+    new CoordRec((float) 38.0952, (float) 61.9048 ),
+    new CoordRec((float) 28.5714, (float) 52.381 ),
+    new CoordRec((float) 23.8095, (float) 38.0952 ),
+    new CoordRec((float) 23.8095, (float) 28.5714 ),
+    new CoordRec((float) 28.5714, (float) 14.2857 ),
+    new CoordRec((float) 38.0952, (float) 4.7619 ),
+    new CoordRec((float) 47.619, (float) 0 ),
+    new CoordRec((float) 61.9047, (float) 0 ),
+    new CoordRec((float) 71.4285, (float) 4.7619 ),
+    new CoordRec((float) 80.9524, (float) 14.2857 ),
+};
+
+static final StrokeRec char101[] = {
+   new StrokeRec( 17, char101_stroke0 ),
+};
+
+/* char: 102 'f' */
+
+static final CoordRec char102_stroke0[] = {
+    new CoordRec((float) 71.4286, (float) 100 ),
+    new CoordRec((float) 61.9048, (float) 100 ),
+    new CoordRec((float) 52.381, (float) 95.2381 ),
+    new CoordRec((float) 47.6191, (float) 80.9524 ),
+    new CoordRec((float) 47.6191, (float) 0 ),
+};
+
+static final CoordRec char102_stroke1[] = {
+    new CoordRec((float) 33.3334, (float) 66.6667 ),
+    new CoordRec((float) 66.6667, (float) 66.6667 ),
+};
+
+static final StrokeRec char102[] = {
+   new StrokeRec( 5, char102_stroke0 ),
+   new StrokeRec( 2, char102_stroke1 ),
+};
+
+/* char: 103 'g' */
+
+static final CoordRec char103_stroke0[] = {
+    new CoordRec((float) 80.9524, (float) 66.6667 ),
+    new CoordRec((float) 80.9524, (float) -9.5238 ),
+    new CoordRec((float) 76.1905, (float) -23.8095 ),
+    new CoordRec((float) 71.4285, (float) -28.5714 ),
+    new CoordRec((float) 61.9047, (float) -33.3333 ),
+    new CoordRec((float) 47.619, (float) -33.3333 ),
+    new CoordRec((float) 38.0952, (float) -28.5714 ),
+};
+
+static final CoordRec char103_stroke1[] = {
+    new CoordRec((float) 80.9524, (float) 52.381 ),
+    new CoordRec((float) 71.4285, (float) 61.9048 ),
+    new CoordRec((float) 61.9047, (float) 66.6667 ),
+    new CoordRec((float) 47.619, (float) 66.6667 ),
+    new CoordRec((float) 38.0952, (float) 61.9048 ),
+    new CoordRec((float) 28.5714, (float) 52.381 ),
+    new CoordRec((float) 23.8095, (float) 38.0952 ),
+    new CoordRec((float) 23.8095, (float) 28.5714 ),
+    new CoordRec((float) 28.5714, (float) 14.2857 ),
+    new CoordRec((float) 38.0952, (float) 4.7619 ),
+    new CoordRec((float) 47.619, (float) 0 ),
+    new CoordRec((float) 61.9047, (float) 0 ),
+    new CoordRec((float) 71.4285, (float) 4.7619 ),
+    new CoordRec((float) 80.9524, (float) 14.2857 ),
+};
+
+static final StrokeRec char103[] = {
+   new StrokeRec( 7, char103_stroke0 ),
+   new StrokeRec( 14, char103_stroke1 ),
+};
+
+/* char: 104 'h' */
+
+static final CoordRec char104_stroke0[] = {
+    new CoordRec((float) 26.1905, (float) 100 ),
+    new CoordRec((float) 26.1905, (float) 0 ),
+};
+
+static final CoordRec char104_stroke1[] = {
+    new CoordRec((float) 26.1905, (float) 47.619 ),
+    new CoordRec((float) 40.4762, (float) 61.9048 ),
+    new CoordRec((float) 50, (float) 66.6667 ),
+    new CoordRec((float) 64.2857, (float) 66.6667 ),
+    new CoordRec((float) 73.8095, (float) 61.9048 ),
+    new CoordRec((float) 78.5715, (float) 47.619 ),
+    new CoordRec((float) 78.5715, (float) 0 ),
+};
+
+static final StrokeRec char104[] = {
+   new StrokeRec( 2, char104_stroke0 ),
+   new StrokeRec( 7, char104_stroke1 ),
+};
+
+/* char: 105 'i' */
+
+static final CoordRec char105_stroke0[] = {
+    new CoordRec((float) 47.6191, (float) 100 ),
+    new CoordRec((float) 52.381, (float) 95.2381 ),
+    new CoordRec((float) 57.1429, (float) 100 ),
+    new CoordRec((float) 52.381, (float) 104.762 ),
+    new CoordRec((float) 47.6191, (float) 100 ),
+};
+
+static final CoordRec char105_stroke1[] = {
+    new CoordRec((float) 52.381, (float) 66.6667 ),
+    new CoordRec((float) 52.381, (float) 0 ),
+};
+
+static final StrokeRec char105[] = {
+   new StrokeRec( 5, char105_stroke0 ),
+   new StrokeRec( 2, char105_stroke1 ),
+};
+
+/* char: 106 'j' */
+
+static final CoordRec char106_stroke0[] = {
+    new CoordRec((float) 57.1429, (float) 100 ),
+    new CoordRec((float) 61.9048, (float) 95.2381 ),
+    new CoordRec((float) 66.6667, (float) 100 ),
+    new CoordRec((float) 61.9048, (float) 104.762 ),
+    new CoordRec((float) 57.1429, (float) 100 ),
+};
+
+static final CoordRec char106_stroke1[] = {
+    new CoordRec((float) 61.9048, (float) 66.6667 ),
+    new CoordRec((float) 61.9048, (float) -14.2857 ),
+    new CoordRec((float) 57.1429, (float) -28.5714 ),
+    new CoordRec((float) 47.6191, (float) -33.3333 ),
+    new CoordRec((float) 38.0953, (float) -33.3333 ),
+};
+
+static final StrokeRec char106[] = {
+   new StrokeRec( 5, char106_stroke0 ),
+   new StrokeRec( 5, char106_stroke1 ),
+};
+
+/* char: 107 'k' */
+
+static final CoordRec char107_stroke0[] = {
+    new CoordRec((float) 26.1905, (float) 100 ),
+    new CoordRec((float) 26.1905, (float) 0 ),
+};
+
+static final CoordRec char107_stroke1[] = {
+    new CoordRec((float) 73.8095, (float) 66.6667 ),
+    new CoordRec((float) 26.1905, (float) 19.0476 ),
+};
+
+static final CoordRec char107_stroke2[] = {
+    new CoordRec((float) 45.2381, (float) 38.0952 ),
+    new CoordRec((float) 78.5715, (float) 0 ),
+};
+
+static final StrokeRec char107[] = {
+   new StrokeRec( 2, char107_stroke0 ),
+   new StrokeRec( 2, char107_stroke1 ),
+   new StrokeRec( 2, char107_stroke2 ),
+};
+
+/* char: 108 'l' */
+
+static final CoordRec char108_stroke0[] = {
+    new CoordRec((float) 52.381, (float) 100 ),
+    new CoordRec((float) 52.381, (float) 0 ),
+};
+
+static final StrokeRec char108[] = {
+   new StrokeRec( 2, char108_stroke0 ),
+};
+
+/* char: 109 'm' */
+
+static final CoordRec char109_stroke0[] = {
+    new CoordRec((float) 0, (float) 66.6667 ),
+    new CoordRec((float) 0, (float) 0 ),
+};
+
+static final CoordRec char109_stroke1[] = {
+    new CoordRec((float) 0, (float) 47.619 ),
+    new CoordRec((float) 14.2857, (float) 61.9048 ),
+    new CoordRec((float) 23.8095, (float) 66.6667 ),
+    new CoordRec((float) 38.0952, (float) 66.6667 ),
+    new CoordRec((float) 47.619, (float) 61.9048 ),
+    new CoordRec((float) 52.381, (float) 47.619 ),
+    new CoordRec((float) 52.381, (float) 0 ),
+};
+
+static final CoordRec char109_stroke2[] = {
+    new CoordRec((float) 52.381, (float) 47.619 ),
+    new CoordRec((float) 66.6667, (float) 61.9048 ),
+    new CoordRec((float) 76.1905, (float) 66.6667 ),
+    new CoordRec((float) 90.4762, (float) 66.6667 ),
+    new CoordRec((float) 100, (float) 61.9048 ),
+    new CoordRec((float) 104.762, (float) 47.619 ),
+    new CoordRec((float) 104.762, (float) 0 ),
+};
+
+static final StrokeRec char109[] = {
+   new StrokeRec( 2, char109_stroke0 ),
+   new StrokeRec( 7, char109_stroke1 ),
+   new StrokeRec( 7, char109_stroke2 ),
+};
+
+/* char: 110 'n' */
+
+static final CoordRec char110_stroke0[] = {
+    new CoordRec((float) 26.1905, (float) 66.6667 ),
+    new CoordRec((float) 26.1905, (float) 0 ),
+};
+
+static final CoordRec char110_stroke1[] = {
+    new CoordRec((float) 26.1905, (float) 47.619 ),
+    new CoordRec((float) 40.4762, (float) 61.9048 ),
+    new CoordRec((float) 50, (float) 66.6667 ),
+    new CoordRec((float) 64.2857, (float) 66.6667 ),
+    new CoordRec((float) 73.8095, (float) 61.9048 ),
+    new CoordRec((float) 78.5715, (float) 47.619 ),
+    new CoordRec((float) 78.5715, (float) 0 ),
+};
+
+static final StrokeRec char110[] = {
+   new StrokeRec( 2, char110_stroke0 ),
+   new StrokeRec( 7, char110_stroke1 ),
+};
+
+/* char: 111 'o' */
+
+static final CoordRec char111_stroke0[] = {
+    new CoordRec((float) 45.2381, (float) 66.6667 ),
+    new CoordRec((float) 35.7143, (float) 61.9048 ),
+    new CoordRec((float) 26.1905, (float) 52.381 ),
+    new CoordRec((float) 21.4286, (float) 38.0952 ),
+    new CoordRec((float) 21.4286, (float) 28.5714 ),
+    new CoordRec((float) 26.1905, (float) 14.2857 ),
+    new CoordRec((float) 35.7143, (float) 4.7619 ),
+    new CoordRec((float) 45.2381, (float) 0 ),
+    new CoordRec((float) 59.5238, (float) 0 ),
+    new CoordRec((float) 69.0476, (float) 4.7619 ),
+    new CoordRec((float) 78.5714, (float) 14.2857 ),
+    new CoordRec((float) 83.3334, (float) 28.5714 ),
+    new CoordRec((float) 83.3334, (float) 38.0952 ),
+    new CoordRec((float) 78.5714, (float) 52.381 ),
+    new CoordRec((float) 69.0476, (float) 61.9048 ),
+    new CoordRec((float) 59.5238, (float) 66.6667 ),
+    new CoordRec((float) 45.2381, (float) 66.6667 ),
+};
+
+static final StrokeRec char111[] = {
+   new StrokeRec( 17, char111_stroke0 ),
+};
+
+/* char: 112 'p' */
+
+static final CoordRec char112_stroke0[] = {
+    new CoordRec((float) 23.8095, (float) 66.6667 ),
+    new CoordRec((float) 23.8095, (float) -33.3333 ),
+};
+
+static final CoordRec char112_stroke1[] = {
+    new CoordRec((float) 23.8095, (float) 52.381 ),
+    new CoordRec((float) 33.3333, (float) 61.9048 ),
+    new CoordRec((float) 42.8571, (float) 66.6667 ),
+    new CoordRec((float) 57.1428, (float) 66.6667 ),
+    new CoordRec((float) 66.6666, (float) 61.9048 ),
+    new CoordRec((float) 76.1905, (float) 52.381 ),
+    new CoordRec((float) 80.9524, (float) 38.0952 ),
+    new CoordRec((float) 80.9524, (float) 28.5714 ),
+    new CoordRec((float) 76.1905, (float) 14.2857 ),
+    new CoordRec((float) 66.6666, (float) 4.7619 ),
+    new CoordRec((float) 57.1428, (float) 0 ),
+    new CoordRec((float) 42.8571, (float) 0 ),
+    new CoordRec((float) 33.3333, (float) 4.7619 ),
+    new CoordRec((float) 23.8095, (float) 14.2857 ),
+};
+
+static final StrokeRec char112[] = {
+   new StrokeRec( 2, char112_stroke0 ),
+   new StrokeRec( 14, char112_stroke1 ),
+};
+
+/* char: 113 'q' */
+
+static final CoordRec char113_stroke0[] = {
+    new CoordRec((float) 80.9524, (float) 66.6667 ),
+    new CoordRec((float) 80.9524, (float) -33.3333 ),
+};
+
+static final CoordRec char113_stroke1[] = {
+    new CoordRec((float) 80.9524, (float) 52.381 ),
+    new CoordRec((float) 71.4285, (float) 61.9048 ),
+    new CoordRec((float) 61.9047, (float) 66.6667 ),
+    new CoordRec((float) 47.619, (float) 66.6667 ),
+    new CoordRec((float) 38.0952, (float) 61.9048 ),
+    new CoordRec((float) 28.5714, (float) 52.381 ),
+    new CoordRec((float) 23.8095, (float) 38.0952 ),
+    new CoordRec((float) 23.8095, (float) 28.5714 ),
+    new CoordRec((float) 28.5714, (float) 14.2857 ),
+    new CoordRec((float) 38.0952, (float) 4.7619 ),
+    new CoordRec((float) 47.619, (float) 0 ),
+    new CoordRec((float) 61.9047, (float) 0 ),
+    new CoordRec((float) 71.4285, (float) 4.7619 ),
+    new CoordRec((float) 80.9524, (float) 14.2857 ),
+};
+
+static final StrokeRec char113[] = {
+   new StrokeRec( 2, char113_stroke0 ),
+   new StrokeRec( 14, char113_stroke1 ),
+};
+
+/* char: 114 'r' */
+
+static final CoordRec char114_stroke0[] = {
+    new CoordRec((float) 33.3334, (float) 66.6667 ),
+    new CoordRec((float) 33.3334, (float) 0 ),
+};
+
+static final CoordRec char114_stroke1[] = {
+    new CoordRec((float) 33.3334, (float) 38.0952 ),
+    new CoordRec((float) 38.0953, (float) 52.381 ),
+    new CoordRec((float) 47.6191, (float) 61.9048 ),
+    new CoordRec((float) 57.1429, (float) 66.6667 ),
+    new CoordRec((float) 71.4286, (float) 66.6667 ),
+};
+
+static final StrokeRec char114[] = {
+   new StrokeRec( 2, char114_stroke0 ),
+   new StrokeRec( 5, char114_stroke1 ),
+};
+
+/* char: 115 's' */
+
+static final CoordRec char115_stroke0[] = {
+    new CoordRec((float) 78.5715, (float) 52.381 ),
+    new CoordRec((float) 73.8095, (float) 61.9048 ),
+    new CoordRec((float) 59.5238, (float) 66.6667 ),
+    new CoordRec((float) 45.2381, (float) 66.6667 ),
+    new CoordRec((float) 30.9524, (float) 61.9048 ),
+    new CoordRec((float) 26.1905, (float) 52.381 ),
+    new CoordRec((float) 30.9524, (float) 42.8571 ),
+    new CoordRec((float) 40.4762, (float) 38.0952 ),
+    new CoordRec((float) 64.2857, (float) 33.3333 ),
+    new CoordRec((float) 73.8095, (float) 28.5714 ),
+    new CoordRec((float) 78.5715, (float) 19.0476 ),
+    new CoordRec((float) 78.5715, (float) 14.2857 ),
+    new CoordRec((float) 73.8095, (float) 4.7619 ),
+    new CoordRec((float) 59.5238, (float) 0 ),
+    new CoordRec((float) 45.2381, (float) 0 ),
+    new CoordRec((float) 30.9524, (float) 4.7619 ),
+    new CoordRec((float) 26.1905, (float) 14.2857 ),
+};
+
+static final StrokeRec char115[] = {
+   new StrokeRec( 17, char115_stroke0 ),
+};
+
+/* char: 116 't' */
+
+static final CoordRec char116_stroke0[] = {
+    new CoordRec((float) 47.6191, (float) 100 ),
+    new CoordRec((float) 47.6191, (float) 19.0476 ),
+    new CoordRec((float) 52.381, (float) 4.7619 ),
+    new CoordRec((float) 61.9048, (float) 0 ),
+    new CoordRec((float) 71.4286, (float) 0 ),
+};
+
+static final CoordRec char116_stroke1[] = {
+    new CoordRec((float) 33.3334, (float) 66.6667 ),
+    new CoordRec((float) 66.6667, (float) 66.6667 ),
+};
+
+static final StrokeRec char116[] = {
+   new StrokeRec( 5, char116_stroke0 ),
+   new StrokeRec( 2, char116_stroke1 ),
+};
+
+/* char: 117 'u' */
+
+static final CoordRec char117_stroke0[] = {
+    new CoordRec((float) 26.1905, (float) 66.6667 ),
+    new CoordRec((float) 26.1905, (float) 19.0476 ),
+    new CoordRec((float) 30.9524, (float) 4.7619 ),
+    new CoordRec((float) 40.4762, (float) 0 ),
+    new CoordRec((float) 54.7619, (float) 0 ),
+    new CoordRec((float) 64.2857, (float) 4.7619 ),
+    new CoordRec((float) 78.5715, (float) 19.0476 ),
+};
+
+static final CoordRec char117_stroke1[] = {
+    new CoordRec((float) 78.5715, (float) 66.6667 ),
+    new CoordRec((float) 78.5715, (float) 0 ),
+};
+
+static final StrokeRec char117[] = {
+   new StrokeRec( 7, char117_stroke0 ),
+   new StrokeRec( 2, char117_stroke1 ),
+};
+
+/* char: 118 'v' */
+
+static final CoordRec char118_stroke0[] = {
+    new CoordRec((float) 23.8095, (float) 66.6667 ),
+    new CoordRec((float) 52.3809, (float) 0 ),
+};
+
+static final CoordRec char118_stroke1[] = {
+    new CoordRec((float) 80.9524, (float) 66.6667 ),
+    new CoordRec((float) 52.3809, (float) 0 ),
+};
+
+static final StrokeRec char118[] = {
+   new StrokeRec( 2, char118_stroke0 ),
+   new StrokeRec( 2, char118_stroke1 ),
+};
+
+/* char: 119 'w' */
+
+static final CoordRec char119_stroke0[] = {
+    new CoordRec((float) 14.2857, (float) 66.6667 ),
+    new CoordRec((float) 33.3333, (float) 0 ),
+};
+
+static final CoordRec char119_stroke1[] = {
+    new CoordRec((float) 52.3809, (float) 66.6667 ),
+    new CoordRec((float) 33.3333, (float) 0 ),
+};
+
+static final CoordRec char119_stroke2[] = {
+    new CoordRec((float) 52.3809, (float) 66.6667 ),
+    new CoordRec((float) 71.4286, (float) 0 ),
+};
+
+static final CoordRec char119_stroke3[] = {
+    new CoordRec((float) 90.4762, (float) 66.6667 ),
+    new CoordRec((float) 71.4286, (float) 0 ),
+};
+
+static final StrokeRec char119[] = {
+   new StrokeRec( 2, char119_stroke0 ),
+   new StrokeRec( 2, char119_stroke1 ),
+   new StrokeRec( 2, char119_stroke2 ),
+   new StrokeRec( 2, char119_stroke3 ),
+};
+
+/* char: 120 'x' */
+
+static final CoordRec char120_stroke0[] = {
+    new CoordRec((float) 26.1905, (float) 66.6667 ),
+    new CoordRec((float) 78.5715, (float) 0 ),
+};
+
+static final CoordRec char120_stroke1[] = {
+    new CoordRec((float) 78.5715, (float) 66.6667 ),
+    new CoordRec((float) 26.1905, (float) 0 ),
+};
+
+static final StrokeRec char120[] = {
+   new StrokeRec( 2, char120_stroke0 ),
+   new StrokeRec( 2, char120_stroke1 ),
+};
+
+/* char: 121 'y' */
+
+static final CoordRec char121_stroke0[] = {
+    new CoordRec((float) 26.1905, (float) 66.6667 ),
+    new CoordRec((float) 54.7619, (float) 0 ),
+};
+
+static final CoordRec char121_stroke1[] = {
+    new CoordRec((float) 83.3334, (float) 66.6667 ),
+    new CoordRec((float) 54.7619, (float) 0 ),
+    new CoordRec((float) 45.2381, (float) -19.0476 ),
+    new CoordRec((float) 35.7143, (float) -28.5714 ),
+    new CoordRec((float) 26.1905, (float) -33.3333 ),
+    new CoordRec((float) 21.4286, (float) -33.3333 ),
+};
+
+static final StrokeRec char121[] = {
+   new StrokeRec( 2, char121_stroke0 ),
+   new StrokeRec( 6, char121_stroke1 ),
+};
+
+/* char: 122 'z' */
+
+static final CoordRec char122_stroke0[] = {
+    new CoordRec((float) 78.5715, (float) 66.6667 ),
+    new CoordRec((float) 26.1905, (float) 0 ),
+};
+
+static final CoordRec char122_stroke1[] = {
+    new CoordRec((float) 26.1905, (float) 66.6667 ),
+    new CoordRec((float) 78.5715, (float) 66.6667 ),
+};
+
+static final CoordRec char122_stroke2[] = {
+    new CoordRec((float) 26.1905, (float) 0 ),
+    new CoordRec((float) 78.5715, (float) 0 ),
+};
+
+static final StrokeRec char122[] = {
+   new StrokeRec( 2, char122_stroke0 ),
+   new StrokeRec( 2, char122_stroke1 ),
+   new StrokeRec( 2, char122_stroke2 ),
+};
+
+/* char: 123 '{' */
+
+static final CoordRec char123_stroke0[] = {
+    new CoordRec((float) 64.2857, (float) 119.048 ),
+    new CoordRec((float) 54.7619, (float) 114.286 ),
+    new CoordRec((float) 50, (float) 109.524 ),
+    new CoordRec((float) 45.2381, (float) 100 ),
+    new CoordRec((float) 45.2381, (float) 90.4762 ),
+    new CoordRec((float) 50, (float) 80.9524 ),
+    new CoordRec((float) 54.7619, (float) 76.1905 ),
+    new CoordRec((float) 59.5238, (float) 66.6667 ),
+    new CoordRec((float) 59.5238, (float) 57.1429 ),
+    new CoordRec((float) 50, (float) 47.619 ),
+};
+
+static final CoordRec char123_stroke1[] = {
+    new CoordRec((float) 54.7619, (float) 114.286 ),
+    new CoordRec((float) 50, (float) 104.762 ),
+    new CoordRec((float) 50, (float) 95.2381 ),
+    new CoordRec((float) 54.7619, (float) 85.7143 ),
+    new CoordRec((float) 59.5238, (float) 80.9524 ),
+    new CoordRec((float) 64.2857, (float) 71.4286 ),
+    new CoordRec((float) 64.2857, (float) 61.9048 ),
+    new CoordRec((float) 59.5238, (float) 52.381 ),
+    new CoordRec((float) 40.4762, (float) 42.8571 ),
+    new CoordRec((float) 59.5238, (float) 33.3333 ),
+    new CoordRec((float) 64.2857, (float) 23.8095 ),
+    new CoordRec((float) 64.2857, (float) 14.2857 ),
+    new CoordRec((float) 59.5238, (float) 4.7619 ),
+    new CoordRec((float) 54.7619, (float) 0 ),
+    new CoordRec((float) 50, (float) -9.5238 ),
+    new CoordRec((float) 50, (float) -19.0476 ),
+    new CoordRec((float) 54.7619, (float) -28.5714 ),
+};
+
+static final CoordRec char123_stroke2[] = {
+    new CoordRec((float) 50, (float) 38.0952 ),
+    new CoordRec((float) 59.5238, (float) 28.5714 ),
+    new CoordRec((float) 59.5238, (float) 19.0476 ),
+    new CoordRec((float) 54.7619, (float) 9.5238 ),
+    new CoordRec((float) 50, (float) 4.7619 ),
+    new CoordRec((float) 45.2381, (float) -4.7619 ),
+    new CoordRec((float) 45.2381, (float) -14.2857 ),
+    new CoordRec((float) 50, (float) -23.8095 ),
+    new CoordRec((float) 54.7619, (float) -28.5714 ),
+    new CoordRec((float) 64.2857, (float) -33.3333 ),
+};
+
+static final StrokeRec char123[] = {
+   new StrokeRec( 10, char123_stroke0 ),
+   new StrokeRec( 17, char123_stroke1 ),
+   new StrokeRec( 10, char123_stroke2 ),
+};
+
+/* char: 124 '|' */
+
+static final CoordRec char124_stroke0[] = {
+    new CoordRec((float) 52.381, (float) 119.048 ),
+    new CoordRec((float) 52.381, (float) -33.3333 ),
+};
+
+static final StrokeRec char124[] = {
+   new StrokeRec( 2, char124_stroke0 ),
+};
+
+/* char: 125 '}' */
+
+static final CoordRec char125_stroke0[] = {
+    new CoordRec((float) 40.4762, (float) 119.048 ),
+    new CoordRec((float) 50, (float) 114.286 ),
+    new CoordRec((float) 54.7619, (float) 109.524 ),
+    new CoordRec((float) 59.5238, (float) 100 ),
+    new CoordRec((float) 59.5238, (float) 90.4762 ),
+    new CoordRec((float) 54.7619, (float) 80.9524 ),
+    new CoordRec((float) 50, (float) 76.1905 ),
+    new CoordRec((float) 45.2381, (float) 66.6667 ),
+    new CoordRec((float) 45.2381, (float) 57.1429 ),
+    new CoordRec((float) 54.7619, (float) 47.619 ),
+};
+
+static final CoordRec char125_stroke1[] = {
+    new CoordRec((float) 50, (float) 114.286 ),
+    new CoordRec((float) 54.7619, (float) 104.762 ),
+    new CoordRec((float) 54.7619, (float) 95.2381 ),
+    new CoordRec((float) 50, (float) 85.7143 ),
+    new CoordRec((float) 45.2381, (float) 80.9524 ),
+    new CoordRec((float) 40.4762, (float) 71.4286 ),
+    new CoordRec((float) 40.4762, (float) 61.9048 ),
+    new CoordRec((float) 45.2381, (float) 52.381 ),
+    new CoordRec((float) 64.2857, (float) 42.8571 ),
+    new CoordRec((float) 45.2381, (float) 33.3333 ),
+    new CoordRec((float) 40.4762, (float) 23.8095 ),
+    new CoordRec((float) 40.4762, (float) 14.2857 ),
+    new CoordRec((float) 45.2381, (float) 4.7619 ),
+    new CoordRec((float) 50, (float) 0 ),
+    new CoordRec((float) 54.7619, (float) -9.5238 ),
+    new CoordRec((float) 54.7619, (float) -19.0476 ),
+    new CoordRec((float) 50, (float) -28.5714 ),
+};
+
+static final CoordRec char125_stroke2[] = {
+    new CoordRec((float) 54.7619, (float) 38.0952 ),
+    new CoordRec((float) 45.2381, (float) 28.5714 ),
+    new CoordRec((float) 45.2381, (float) 19.0476 ),
+    new CoordRec((float) 50, (float) 9.5238 ),
+    new CoordRec((float) 54.7619, (float) 4.7619 ),
+    new CoordRec((float) 59.5238, (float) -4.7619 ),
+    new CoordRec((float) 59.5238, (float) -14.2857 ),
+    new CoordRec((float) 54.7619, (float) -23.8095 ),
+    new CoordRec((float) 50, (float) -28.5714 ),
+    new CoordRec((float) 40.4762, (float) -33.3333 ),
+};
+
+static final StrokeRec char125[] = {
+   new StrokeRec( 10, char125_stroke0 ),
+   new StrokeRec( 17, char125_stroke1 ),
+   new StrokeRec( 10, char125_stroke2 ),
+};
+
+/* char: 126 '~' */
+
+static final CoordRec char126_stroke0[] = {
+    new CoordRec((float) 9.5238, (float) 28.5714 ),
+    new CoordRec((float) 9.5238, (float) 38.0952 ),
+    new CoordRec((float) 14.2857, (float) 52.381 ),
+    new CoordRec((float) 23.8095, (float) 57.1429 ),
+    new CoordRec((float) 33.3333, (float) 57.1429 ),
+    new CoordRec((float) 42.8571, (float) 52.381 ),
+    new CoordRec((float) 61.9048, (float) 38.0952 ),
+    new CoordRec((float) 71.4286, (float) 33.3333 ),
+    new CoordRec((float) 80.9524, (float) 33.3333 ),
+    new CoordRec((float) 90.4762, (float) 38.0952 ),
+    new CoordRec((float) 95.2381, (float) 47.619 ),
+};
+
+static final CoordRec char126_stroke1[] = {
+    new CoordRec((float) 9.5238, (float) 38.0952 ),
+    new CoordRec((float) 14.2857, (float) 47.619 ),
+    new CoordRec((float) 23.8095, (float) 52.381 ),
+    new CoordRec((float) 33.3333, (float) 52.381 ),
+    new CoordRec((float) 42.8571, (float) 47.619 ),
+    new CoordRec((float) 61.9048, (float) 33.3333 ),
+    new CoordRec((float) 71.4286, (float) 28.5714 ),
+    new CoordRec((float) 80.9524, (float) 28.5714 ),
+    new CoordRec((float) 90.4762, (float) 33.3333 ),
+    new CoordRec((float) 95.2381, (float) 47.619 ),
+    new CoordRec((float) 95.2381, (float) 57.1429 ),
+};
+
+static final StrokeRec char126[] = {
+   new StrokeRec( 11, char126_stroke0 ),
+   new StrokeRec( 11, char126_stroke1 ),
+};
+
+/* char: 127 */
+
+static final CoordRec char127_stroke0[] = {
+    new CoordRec((float) 71.4286, (float) 100 ),
+    new CoordRec((float) 33.3333, (float) -33.3333 ),
+};
+
+static final CoordRec char127_stroke1[] = {
+    new CoordRec((float) 47.619, (float) 66.6667 ),
+    new CoordRec((float) 33.3333, (float) 61.9048 ),
+    new CoordRec((float) 23.8095, (float) 52.381 ),
+    new CoordRec((float) 19.0476, (float) 38.0952 ),
+    new CoordRec((float) 19.0476, (float) 23.8095 ),
+    new CoordRec((float) 23.8095, (float) 14.2857 ),
+    new CoordRec((float) 33.3333, (float) 4.7619 ),
+    new CoordRec((float) 47.619, (float) 0 ),
+    new CoordRec((float) 57.1428, (float) 0 ),
+    new CoordRec((float) 71.4286, (float) 4.7619 ),
+    new CoordRec((float) 80.9524, (float) 14.2857 ),
+    new CoordRec((float) 85.7143, (float) 28.5714 ),
+    new CoordRec((float) 85.7143, (float) 42.8571 ),
+    new CoordRec((float) 80.9524, (float) 52.381 ),
+    new CoordRec((float) 71.4286, (float) 61.9048 ),
+    new CoordRec((float) 57.1428, (float) 66.6667 ),
+    new CoordRec((float) 47.619, (float) 66.6667 ),
+};
+
+static final StrokeRec char127[] = {
+   new StrokeRec( 2, char127_stroke0 ),
+   new StrokeRec( 17, char127_stroke1 ),
+};
+
+static final StrokeCharRec chars[] = {
+    new StrokeCharRec(0, /* char0 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char1 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char2 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char3 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char4 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char5 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char6 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char7 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char8 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char9 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char10 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char11 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char12 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char13 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char14 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char15 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char16 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char17 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char18 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char19 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char20 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char21 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char22 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char23 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char24 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char25 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char26 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char27 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char28 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char29 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char30 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char31 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec(0, /* char32 */ null, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char33, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char34, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(4, char35, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char36, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char37, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char38, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char39, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char40, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char41, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char42, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char43, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char44, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char45, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char46, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char47, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char48, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char49, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char50, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char51, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char52, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char53, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char54, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char55, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char56, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char57, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char58, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char59, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char60, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char61, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char62, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char63, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char64, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char65, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char66, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char67, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char68, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(4, char69, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char70, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char71, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char72, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char73, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char74, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char75, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char76, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(4, char77, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char78, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char79, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char80, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char81, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char82, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char83, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char84, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char85, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char86, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(4, char87, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char88, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char89, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char90, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(4, char91, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char92, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(4, char93, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char94, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char95, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char96, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char97, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char98, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char99, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char100, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char101, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char102, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char103, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char104, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char105, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char106, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char107, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char108, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char109, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char110, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char111, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char112, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char113, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char114, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char115, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char116, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char117, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char118, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(4, char119, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char120, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char121, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char122, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char123, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(1, char124, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(3, char125, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char126, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec(2, char127, (float) 52.381, (float) 104.762 ),
+};
+
+public static final StrokeFontRec glutStrokeMonoRoman = new StrokeFontRec( "Roman", 128, chars, (float) 119.048, (float) -33.3333 );
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeRoman.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeRoman.java
new file mode 100644
index 000000000..94fa1c4fd
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeRoman.java
@@ -0,0 +1,2491 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+class GLUTStrokeRoman {
+
+/* GENERATED FILE -- DO NOT MODIFY */
+
+/* char: 33 '!' */
+
+static final CoordRec char33_stroke0[] = {
+    new CoordRec((float) 13.3819, (float) 100),
+    new CoordRec((float) 13.3819, (float) 33.3333),
+};
+
+static final CoordRec char33_stroke1[] = {
+    new CoordRec((float) 13.3819, (float) 9.5238),
+    new CoordRec((float) 8.62, (float) 4.7619),
+    new CoordRec((float) 13.3819, (float) 0),
+    new CoordRec((float) 18.1438, (float) 4.7619),
+    new CoordRec((float) 13.3819, (float) 9.5238),
+};
+
+static final StrokeRec char33[] = {
+   new StrokeRec(2, char33_stroke0),
+   new StrokeRec(5, char33_stroke1),
+};
+
+/* char: 34 '"' */
+
+static final CoordRec char34_stroke0[] = {
+    new CoordRec((float) 4.02, (float) 100),
+    new CoordRec((float) 4.02, (float) 66.6667),
+};
+
+static final CoordRec char34_stroke1[] = {
+    new CoordRec((float) 42.1152, (float) 100),
+    new CoordRec((float) 42.1152, (float) 66.6667),
+};
+
+static final StrokeRec char34[] = {
+   new StrokeRec(2, char34_stroke0),
+   new StrokeRec(2, char34_stroke1),
+};
+
+/* char: 35 '#' */
+
+static final CoordRec char35_stroke0[] = {
+    new CoordRec((float) 41.2952, (float) 119.048),
+    new CoordRec((float) 7.9619, (float) -33.3333),
+};
+
+static final CoordRec char35_stroke1[] = {
+    new CoordRec((float) 69.8667, (float) 119.048),
+    new CoordRec((float) 36.5333, (float) -33.3333),
+};
+
+static final CoordRec char35_stroke2[] = {
+    new CoordRec((float) 7.9619, (float) 57.1429),
+    new CoordRec((float) 74.6286, (float) 57.1429),
+};
+
+static final CoordRec char35_stroke3[] = {
+    new CoordRec((float) 3.2, (float) 28.5714),
+    new CoordRec((float) 69.8667, (float) 28.5714),
+};
+
+static final StrokeRec char35[] = {
+   new StrokeRec(2, char35_stroke0),
+   new StrokeRec(2, char35_stroke1),
+   new StrokeRec(2, char35_stroke2),
+   new StrokeRec(2, char35_stroke3),
+};
+
+/* char: 36 '$' */
+
+static final CoordRec char36_stroke0[] = {
+    new CoordRec((float) 28.6295, (float) 119.048),
+    new CoordRec((float) 28.6295, (float) -19.0476),
+};
+
+static final CoordRec char36_stroke1[] = {
+    new CoordRec((float) 47.6771, (float) 119.048),
+    new CoordRec((float) 47.6771, (float) -19.0476),
+};
+
+static final CoordRec char36_stroke2[] = {
+    new CoordRec((float) 71.4867, (float) 85.7143),
+    new CoordRec((float) 61.9629, (float) 95.2381),
+    new CoordRec((float) 47.6771, (float) 100),
+    new CoordRec((float) 28.6295, (float) 100),
+    new CoordRec((float) 14.3438, (float) 95.2381),
+    new CoordRec((float) 4.82, (float) 85.7143),
+    new CoordRec((float) 4.82, (float) 76.1905),
+    new CoordRec((float) 9.5819, (float) 66.6667),
+    new CoordRec((float) 14.3438, (float) 61.9048),
+    new CoordRec((float) 23.8676, (float) 57.1429),
+    new CoordRec((float) 52.439, (float) 47.619),
+    new CoordRec((float) 61.9629, (float) 42.8571),
+    new CoordRec((float) 66.7248, (float) 38.0952),
+    new CoordRec((float) 71.4867, (float) 28.5714),
+    new CoordRec((float) 71.4867, (float) 14.2857),
+    new CoordRec((float) 61.9629, (float) 4.7619),
+    new CoordRec((float) 47.6771, (float) 0),
+    new CoordRec((float) 28.6295, (float) 0),
+    new CoordRec((float) 14.3438, (float) 4.7619),
+    new CoordRec((float) 4.82, (float) 14.2857),
+};
+
+static final StrokeRec char36[] = {
+   new StrokeRec(2, char36_stroke0),
+   new StrokeRec(2, char36_stroke1),
+   new StrokeRec(20, char36_stroke2),
+};
+
+/* char: 37 '%' */
+
+static final CoordRec char37_stroke0[] = {
+    new CoordRec((float) 92.0743, (float) 100),
+    new CoordRec((float) 6.36, (float) 0),
+};
+
+static final CoordRec char37_stroke1[] = {
+    new CoordRec((float) 30.1695, (float) 100),
+    new CoordRec((float) 39.6933, (float) 90.4762),
+    new CoordRec((float) 39.6933, (float) 80.9524),
+    new CoordRec((float) 34.9314, (float) 71.4286),
+    new CoordRec((float) 25.4076, (float) 66.6667),
+    new CoordRec((float) 15.8838, (float) 66.6667),
+    new CoordRec((float) 6.36, (float) 76.1905),
+    new CoordRec((float) 6.36, (float) 85.7143),
+    new CoordRec((float) 11.1219, (float) 95.2381),
+    new CoordRec((float) 20.6457, (float) 100),
+    new CoordRec((float) 30.1695, (float) 100),
+    new CoordRec((float) 39.6933, (float) 95.2381),
+    new CoordRec((float) 53.979, (float) 90.4762),
+    new CoordRec((float) 68.2648, (float) 90.4762),
+    new CoordRec((float) 82.5505, (float) 95.2381),
+    new CoordRec((float) 92.0743, (float) 100),
+};
+
+static final CoordRec char37_stroke2[] = {
+    new CoordRec((float) 73.0267, (float) 33.3333),
+    new CoordRec((float) 63.5029, (float) 28.5714),
+    new CoordRec((float) 58.741, (float) 19.0476),
+    new CoordRec((float) 58.741, (float) 9.5238),
+    new CoordRec((float) 68.2648, (float) 0),
+    new CoordRec((float) 77.7886, (float) 0),
+    new CoordRec((float) 87.3124, (float) 4.7619),
+    new CoordRec((float) 92.0743, (float) 14.2857),
+    new CoordRec((float) 92.0743, (float) 23.8095),
+    new CoordRec((float) 82.5505, (float) 33.3333),
+    new CoordRec((float) 73.0267, (float) 33.3333),
+};
+
+static final StrokeRec char37[] = {
+   new StrokeRec(2, char37_stroke0),
+   new StrokeRec(16, char37_stroke1),
+   new StrokeRec(11, char37_stroke2),
+};
+
+/* char: 38 '&' */
+
+static final CoordRec char38_stroke0[] = {
+    new CoordRec((float) 101.218, (float) 57.1429),
+    new CoordRec((float) 101.218, (float) 61.9048),
+    new CoordRec((float) 96.4562, (float) 66.6667),
+    new CoordRec((float) 91.6943, (float) 66.6667),
+    new CoordRec((float) 86.9324, (float) 61.9048),
+    new CoordRec((float) 82.1705, (float) 52.381),
+    new CoordRec((float) 72.6467, (float) 28.5714),
+    new CoordRec((float) 63.1229, (float) 14.2857),
+    new CoordRec((float) 53.599, (float) 4.7619),
+    new CoordRec((float) 44.0752, (float) 0),
+    new CoordRec((float) 25.0276, (float) 0),
+    new CoordRec((float) 15.5038, (float) 4.7619),
+    new CoordRec((float) 10.7419, (float) 9.5238),
+    new CoordRec((float) 5.98, (float) 19.0476),
+    new CoordRec((float) 5.98, (float) 28.5714),
+    new CoordRec((float) 10.7419, (float) 38.0952),
+    new CoordRec((float) 15.5038, (float) 42.8571),
+    new CoordRec((float) 48.8371, (float) 61.9048),
+    new CoordRec((float) 53.599, (float) 66.6667),
+    new CoordRec((float) 58.361, (float) 76.1905),
+    new CoordRec((float) 58.361, (float) 85.7143),
+    new CoordRec((float) 53.599, (float) 95.2381),
+    new CoordRec((float) 44.0752, (float) 100),
+    new CoordRec((float) 34.5514, (float) 95.2381),
+    new CoordRec((float) 29.7895, (float) 85.7143),
+    new CoordRec((float) 29.7895, (float) 76.1905),
+    new CoordRec((float) 34.5514, (float) 61.9048),
+    new CoordRec((float) 44.0752, (float) 47.619),
+    new CoordRec((float) 67.8848, (float) 14.2857),
+    new CoordRec((float) 77.4086, (float) 4.7619),
+    new CoordRec((float) 86.9324, (float) 0),
+    new CoordRec((float) 96.4562, (float) 0),
+    new CoordRec((float) 101.218, (float) 4.7619),
+    new CoordRec((float) 101.218, (float) 9.5238),
+};
+
+static final StrokeRec char38[] = {
+   new StrokeRec(34, char38_stroke0),
+};
+
+/* char: 39 ''' */
+
+static final CoordRec char39_stroke0[] = {
+    new CoordRec((float) 4.44, (float) 100),
+    new CoordRec((float) 4.44, (float) 66.6667),
+};
+
+static final StrokeRec char39[] = {
+   new StrokeRec(2, char39_stroke0),
+};
+
+/* char: 40 '(' */
+
+static final CoordRec char40_stroke0[] = {
+    new CoordRec((float) 40.9133, (float) 119.048),
+    new CoordRec((float) 31.3895, (float) 109.524),
+    new CoordRec((float) 21.8657, (float) 95.2381),
+    new CoordRec((float) 12.3419, (float) 76.1905),
+    new CoordRec((float) 7.58, (float) 52.381),
+    new CoordRec((float) 7.58, (float) 33.3333),
+    new CoordRec((float) 12.3419, (float) 9.5238),
+    new CoordRec((float) 21.8657, (float) -9.5238),
+    new CoordRec((float) 31.3895, (float) -23.8095),
+    new CoordRec((float) 40.9133, (float) -33.3333),
+};
+
+static final StrokeRec char40[] = {
+   new StrokeRec(10, char40_stroke0),
+};
+
+/* char: 41 ')' */
+
+static final CoordRec char41_stroke0[] = {
+    new CoordRec((float) 5.28, (float) 119.048),
+    new CoordRec((float) 14.8038, (float) 109.524),
+    new CoordRec((float) 24.3276, (float) 95.2381),
+    new CoordRec((float) 33.8514, (float) 76.1905),
+    new CoordRec((float) 38.6133, (float) 52.381),
+    new CoordRec((float) 38.6133, (float) 33.3333),
+    new CoordRec((float) 33.8514, (float) 9.5238),
+    new CoordRec((float) 24.3276, (float) -9.5238),
+    new CoordRec((float) 14.8038, (float) -23.8095),
+    new CoordRec((float) 5.28, (float) -33.3333),
+};
+
+static final StrokeRec char41[] = {
+   new StrokeRec(10, char41_stroke0),
+};
+
+/* char: 42 '*' */
+
+static final CoordRec char42_stroke0[] = {
+    new CoordRec((float) 30.7695, (float) 71.4286),
+    new CoordRec((float) 30.7695, (float) 14.2857),
+};
+
+static final CoordRec char42_stroke1[] = {
+    new CoordRec((float) 6.96, (float) 57.1429),
+    new CoordRec((float) 54.579, (float) 28.5714),
+};
+
+static final CoordRec char42_stroke2[] = {
+    new CoordRec((float) 54.579, (float) 57.1429),
+    new CoordRec((float) 6.96, (float) 28.5714),
+};
+
+static final StrokeRec char42[] = {
+   new StrokeRec(2, char42_stroke0),
+   new StrokeRec(2, char42_stroke1),
+   new StrokeRec(2, char42_stroke2),
+};
+
+/* char: 43 '+' */
+
+static final CoordRec char43_stroke0[] = {
+    new CoordRec((float) 48.8371, (float) 85.7143),
+    new CoordRec((float) 48.8371, (float) 0),
+};
+
+static final CoordRec char43_stroke1[] = {
+    new CoordRec((float) 5.98, (float) 42.8571),
+    new CoordRec((float) 91.6943, (float) 42.8571),
+};
+
+static final StrokeRec char43[] = {
+   new StrokeRec(2, char43_stroke0),
+   new StrokeRec(2, char43_stroke1),
+};
+
+/* char: 44 ',' */
+
+static final CoordRec char44_stroke0[] = {
+    new CoordRec((float) 18.2838, (float) 4.7619),
+    new CoordRec((float) 13.5219, (float) 0),
+    new CoordRec((float) 8.76, (float) 4.7619),
+    new CoordRec((float) 13.5219, (float) 9.5238),
+    new CoordRec((float) 18.2838, (float) 4.7619),
+    new CoordRec((float) 18.2838, (float) -4.7619),
+    new CoordRec((float) 13.5219, (float) -14.2857),
+    new CoordRec((float) 8.76, (float) -19.0476),
+};
+
+static final StrokeRec char44[] = {
+   new StrokeRec(8, char44_stroke0),
+};
+
+/* char: 45 '-' */
+
+static final CoordRec char45_stroke0[] = {
+    new CoordRec((float) 7.38, (float) 42.8571),
+    new CoordRec((float) 93.0943, (float) 42.8571),
+};
+
+static final StrokeRec char45[] = {
+   new StrokeRec(2, char45_stroke0),
+};
+
+/* char: 46 '.' */
+
+static final CoordRec char46_stroke0[] = {
+    new CoordRec((float) 13.1019, (float) 9.5238),
+    new CoordRec((float) 8.34, (float) 4.7619),
+    new CoordRec((float) 13.1019, (float) 0),
+    new CoordRec((float) 17.8638, (float) 4.7619),
+    new CoordRec((float) 13.1019, (float) 9.5238),
+};
+
+static final StrokeRec char46[] = {
+   new StrokeRec(5, char46_stroke0),
+};
+
+/* char: 47 '/' */
+
+static final CoordRec char47_stroke0[] = {
+    new CoordRec((float) 7.24, (float) -14.2857),
+    new CoordRec((float) 73.9067, (float) 100),
+};
+
+static final StrokeRec char47[] = {
+   new StrokeRec(2, char47_stroke0),
+};
+
+/* char: 48 '0' */
+
+static final CoordRec char48_stroke0[] = {
+    new CoordRec((float) 33.5514, (float) 100),
+    new CoordRec((float) 19.2657, (float) 95.2381),
+    new CoordRec((float) 9.7419, (float) 80.9524),
+    new CoordRec((float) 4.98, (float) 57.1429),
+    new CoordRec((float) 4.98, (float) 42.8571),
+    new CoordRec((float) 9.7419, (float) 19.0476),
+    new CoordRec((float) 19.2657, (float) 4.7619),
+    new CoordRec((float) 33.5514, (float) 0),
+    new CoordRec((float) 43.0752, (float) 0),
+    new CoordRec((float) 57.361, (float) 4.7619),
+    new CoordRec((float) 66.8848, (float) 19.0476),
+    new CoordRec((float) 71.6467, (float) 42.8571),
+    new CoordRec((float) 71.6467, (float) 57.1429),
+    new CoordRec((float) 66.8848, (float) 80.9524),
+    new CoordRec((float) 57.361, (float) 95.2381),
+    new CoordRec((float) 43.0752, (float) 100),
+    new CoordRec((float) 33.5514, (float) 100),
+};
+
+static final StrokeRec char48[] = {
+   new StrokeRec(17, char48_stroke0),
+};
+
+/* char: 49 '1' */
+
+static final CoordRec char49_stroke0[] = {
+    new CoordRec((float) 11.82, (float) 80.9524),
+    new CoordRec((float) 21.3438, (float) 85.7143),
+    new CoordRec((float) 35.6295, (float) 100),
+    new CoordRec((float) 35.6295, (float) 0),
+};
+
+static final StrokeRec char49[] = {
+   new StrokeRec(4, char49_stroke0),
+};
+
+/* char: 50 '2' */
+
+static final CoordRec char50_stroke0[] = {
+    new CoordRec((float) 10.1819, (float) 76.1905),
+    new CoordRec((float) 10.1819, (float) 80.9524),
+    new CoordRec((float) 14.9438, (float) 90.4762),
+    new CoordRec((float) 19.7057, (float) 95.2381),
+    new CoordRec((float) 29.2295, (float) 100),
+    new CoordRec((float) 48.2771, (float) 100),
+    new CoordRec((float) 57.801, (float) 95.2381),
+    new CoordRec((float) 62.5629, (float) 90.4762),
+    new CoordRec((float) 67.3248, (float) 80.9524),
+    new CoordRec((float) 67.3248, (float) 71.4286),
+    new CoordRec((float) 62.5629, (float) 61.9048),
+    new CoordRec((float) 53.039, (float) 47.619),
+    new CoordRec((float) 5.42, (float) 0),
+    new CoordRec((float) 72.0867, (float) 0),
+};
+
+static final StrokeRec char50[] = {
+   new StrokeRec(14, char50_stroke0),
+};
+
+/* char: 51 '3' */
+
+static final CoordRec char51_stroke0[] = {
+    new CoordRec((float) 14.5238, (float) 100),
+    new CoordRec((float) 66.9048, (float) 100),
+    new CoordRec((float) 38.3333, (float) 61.9048),
+    new CoordRec((float) 52.619, (float) 61.9048),
+    new CoordRec((float) 62.1429, (float) 57.1429),
+    new CoordRec((float) 66.9048, (float) 52.381),
+    new CoordRec((float) 71.6667, (float) 38.0952),
+    new CoordRec((float) 71.6667, (float) 28.5714),
+    new CoordRec((float) 66.9048, (float) 14.2857),
+    new CoordRec((float) 57.381, (float) 4.7619),
+    new CoordRec((float) 43.0952, (float) 0),
+    new CoordRec((float) 28.8095, (float) 0),
+    new CoordRec((float) 14.5238, (float) 4.7619),
+    new CoordRec((float) 9.7619, (float) 9.5238),
+    new CoordRec((float) 5, (float) 19.0476),
+};
+
+static final StrokeRec char51[] = {
+   new StrokeRec(15, char51_stroke0),
+};
+
+/* char: 52 '4' */
+
+static final CoordRec char52_stroke0[] = {
+    new CoordRec((float) 51.499, (float) 100),
+    new CoordRec((float) 3.88, (float) 33.3333),
+    new CoordRec((float) 75.3086, (float) 33.3333),
+};
+
+static final CoordRec char52_stroke1[] = {
+    new CoordRec((float) 51.499, (float) 100),
+    new CoordRec((float) 51.499, (float) 0),
+};
+
+static final StrokeRec char52[] = {
+   new StrokeRec(3, char52_stroke0),
+   new StrokeRec(2, char52_stroke1),
+};
+
+/* char: 53 '5' */
+
+static final CoordRec char53_stroke0[] = {
+    new CoordRec((float) 62.0029, (float) 100),
+    new CoordRec((float) 14.3838, (float) 100),
+    new CoordRec((float) 9.6219, (float) 57.1429),
+    new CoordRec((float) 14.3838, (float) 61.9048),
+    new CoordRec((float) 28.6695, (float) 66.6667),
+    new CoordRec((float) 42.9552, (float) 66.6667),
+    new CoordRec((float) 57.241, (float) 61.9048),
+    new CoordRec((float) 66.7648, (float) 52.381),
+    new CoordRec((float) 71.5267, (float) 38.0952),
+    new CoordRec((float) 71.5267, (float) 28.5714),
+    new CoordRec((float) 66.7648, (float) 14.2857),
+    new CoordRec((float) 57.241, (float) 4.7619),
+    new CoordRec((float) 42.9552, (float) 0),
+    new CoordRec((float) 28.6695, (float) 0),
+    new CoordRec((float) 14.3838, (float) 4.7619),
+    new CoordRec((float) 9.6219, (float) 9.5238),
+    new CoordRec((float) 4.86, (float) 19.0476),
+};
+
+static final StrokeRec char53[] = {
+   new StrokeRec(17, char53_stroke0),
+};
+
+/* char: 54 '6' */
+
+static final CoordRec char54_stroke0[] = {
+    new CoordRec((float) 62.7229, (float) 85.7143),
+    new CoordRec((float) 57.961, (float) 95.2381),
+    new CoordRec((float) 43.6752, (float) 100),
+    new CoordRec((float) 34.1514, (float) 100),
+    new CoordRec((float) 19.8657, (float) 95.2381),
+    new CoordRec((float) 10.3419, (float) 80.9524),
+    new CoordRec((float) 5.58, (float) 57.1429),
+    new CoordRec((float) 5.58, (float) 33.3333),
+    new CoordRec((float) 10.3419, (float) 14.2857),
+    new CoordRec((float) 19.8657, (float) 4.7619),
+    new CoordRec((float) 34.1514, (float) 0),
+    new CoordRec((float) 38.9133, (float) 0),
+    new CoordRec((float) 53.199, (float) 4.7619),
+    new CoordRec((float) 62.7229, (float) 14.2857),
+    new CoordRec((float) 67.4848, (float) 28.5714),
+    new CoordRec((float) 67.4848, (float) 33.3333),
+    new CoordRec((float) 62.7229, (float) 47.619),
+    new CoordRec((float) 53.199, (float) 57.1429),
+    new CoordRec((float) 38.9133, (float) 61.9048),
+    new CoordRec((float) 34.1514, (float) 61.9048),
+    new CoordRec((float) 19.8657, (float) 57.1429),
+    new CoordRec((float) 10.3419, (float) 47.619),
+    new CoordRec((float) 5.58, (float) 33.3333),
+};
+
+static final StrokeRec char54[] = {
+   new StrokeRec(23, char54_stroke0),
+};
+
+/* char: 55 '7' */
+
+static final CoordRec char55_stroke0[] = {
+    new CoordRec((float) 72.2267, (float) 100),
+    new CoordRec((float) 24.6076, (float) 0),
+};
+
+static final CoordRec char55_stroke1[] = {
+    new CoordRec((float) 5.56, (float) 100),
+    new CoordRec((float) 72.2267, (float) 100),
+};
+
+static final StrokeRec char55[] = {
+   new StrokeRec(2, char55_stroke0),
+   new StrokeRec(2, char55_stroke1),
+};
+
+/* char: 56 '8' */
+
+static final CoordRec char56_stroke0[] = {
+    new CoordRec((float) 29.4095, (float) 100),
+    new CoordRec((float) 15.1238, (float) 95.2381),
+    new CoordRec((float) 10.3619, (float) 85.7143),
+    new CoordRec((float) 10.3619, (float) 76.1905),
+    new CoordRec((float) 15.1238, (float) 66.6667),
+    new CoordRec((float) 24.6476, (float) 61.9048),
+    new CoordRec((float) 43.6952, (float) 57.1429),
+    new CoordRec((float) 57.981, (float) 52.381),
+    new CoordRec((float) 67.5048, (float) 42.8571),
+    new CoordRec((float) 72.2667, (float) 33.3333),
+    new CoordRec((float) 72.2667, (float) 19.0476),
+    new CoordRec((float) 67.5048, (float) 9.5238),
+    new CoordRec((float) 62.7429, (float) 4.7619),
+    new CoordRec((float) 48.4571, (float) 0),
+    new CoordRec((float) 29.4095, (float) 0),
+    new CoordRec((float) 15.1238, (float) 4.7619),
+    new CoordRec((float) 10.3619, (float) 9.5238),
+    new CoordRec((float) 5.6, (float) 19.0476),
+    new CoordRec((float) 5.6, (float) 33.3333),
+    new CoordRec((float) 10.3619, (float) 42.8571),
+    new CoordRec((float) 19.8857, (float) 52.381),
+    new CoordRec((float) 34.1714, (float) 57.1429),
+    new CoordRec((float) 53.219, (float) 61.9048),
+    new CoordRec((float) 62.7429, (float) 66.6667),
+    new CoordRec((float) 67.5048, (float) 76.1905),
+    new CoordRec((float) 67.5048, (float) 85.7143),
+    new CoordRec((float) 62.7429, (float) 95.2381),
+    new CoordRec((float) 48.4571, (float) 100),
+    new CoordRec((float) 29.4095, (float) 100),
+};
+
+static final StrokeRec char56[] = {
+   new StrokeRec(29, char56_stroke0),
+};
+
+/* char: 57 '9' */
+
+static final CoordRec char57_stroke0[] = {
+    new CoordRec((float) 68.5048, (float) 66.6667),
+    new CoordRec((float) 63.7429, (float) 52.381),
+    new CoordRec((float) 54.219, (float) 42.8571),
+    new CoordRec((float) 39.9333, (float) 38.0952),
+    new CoordRec((float) 35.1714, (float) 38.0952),
+    new CoordRec((float) 20.8857, (float) 42.8571),
+    new CoordRec((float) 11.3619, (float) 52.381),
+    new CoordRec((float) 6.6, (float) 66.6667),
+    new CoordRec((float) 6.6, (float) 71.4286),
+    new CoordRec((float) 11.3619, (float) 85.7143),
+    new CoordRec((float) 20.8857, (float) 95.2381),
+    new CoordRec((float) 35.1714, (float) 100),
+    new CoordRec((float) 39.9333, (float) 100),
+    new CoordRec((float) 54.219, (float) 95.2381),
+    new CoordRec((float) 63.7429, (float) 85.7143),
+    new CoordRec((float) 68.5048, (float) 66.6667),
+    new CoordRec((float) 68.5048, (float) 42.8571),
+    new CoordRec((float) 63.7429, (float) 19.0476),
+    new CoordRec((float) 54.219, (float) 4.7619),
+    new CoordRec((float) 39.9333, (float) 0),
+    new CoordRec((float) 30.4095, (float) 0),
+    new CoordRec((float) 16.1238, (float) 4.7619),
+    new CoordRec((float) 11.3619, (float) 14.2857),
+};
+
+static final StrokeRec char57[] = {
+   new StrokeRec(23, char57_stroke0),
+};
+
+/* char: 58 ':' */
+
+static final CoordRec char58_stroke0[] = {
+    new CoordRec((float) 14.0819, (float) 66.6667),
+    new CoordRec((float) 9.32, (float) 61.9048),
+    new CoordRec((float) 14.0819, (float) 57.1429),
+    new CoordRec((float) 18.8438, (float) 61.9048),
+    new CoordRec((float) 14.0819, (float) 66.6667),
+};
+
+static final CoordRec char58_stroke1[] = {
+    new CoordRec((float) 14.0819, (float) 9.5238),
+    new CoordRec((float) 9.32, (float) 4.7619),
+    new CoordRec((float) 14.0819, (float) 0),
+    new CoordRec((float) 18.8438, (float) 4.7619),
+    new CoordRec((float) 14.0819, (float) 9.5238),
+};
+
+static final StrokeRec char58[] = {
+   new StrokeRec(5, char58_stroke0),
+   new StrokeRec(5, char58_stroke1),
+};
+
+/* char: 59 ';' */
+
+static final CoordRec char59_stroke0[] = {
+    new CoordRec((float) 12.9619, (float) 66.6667),
+    new CoordRec((float) 8.2, (float) 61.9048),
+    new CoordRec((float) 12.9619, (float) 57.1429),
+    new CoordRec((float) 17.7238, (float) 61.9048),
+    new CoordRec((float) 12.9619, (float) 66.6667),
+};
+
+static final CoordRec char59_stroke1[] = {
+    new CoordRec((float) 17.7238, (float) 4.7619),
+    new CoordRec((float) 12.9619, (float) 0),
+    new CoordRec((float) 8.2, (float) 4.7619),
+    new CoordRec((float) 12.9619, (float) 9.5238),
+    new CoordRec((float) 17.7238, (float) 4.7619),
+    new CoordRec((float) 17.7238, (float) -4.7619),
+    new CoordRec((float) 12.9619, (float) -14.2857),
+    new CoordRec((float) 8.2, (float) -19.0476),
+};
+
+static final StrokeRec char59[] = {
+   new StrokeRec(5, char59_stroke0),
+   new StrokeRec(8, char59_stroke1),
+};
+
+/* char: 60 '<' */
+
+static final CoordRec char60_stroke0[] = {
+    new CoordRec((float) 79.2505, (float) 85.7143),
+    new CoordRec((float) 3.06, (float) 42.8571),
+    new CoordRec((float) 79.2505, (float) 0),
+};
+
+static final StrokeRec char60[] = {
+   new StrokeRec(3, char60_stroke0),
+};
+
+/* char: 61 '=' */
+
+static final CoordRec char61_stroke0[] = {
+    new CoordRec((float) 5.7, (float) 57.1429),
+    new CoordRec((float) 91.4143, (float) 57.1429),
+};
+
+static final CoordRec char61_stroke1[] = {
+    new CoordRec((float) 5.7, (float) 28.5714),
+    new CoordRec((float) 91.4143, (float) 28.5714),
+};
+
+static final StrokeRec char61[] = {
+   new StrokeRec(2, char61_stroke0),
+   new StrokeRec(2, char61_stroke1),
+};
+
+/* char: 62 '>' */
+
+static final CoordRec char62_stroke0[] = {
+    new CoordRec((float) 2.78, (float) 85.7143),
+    new CoordRec((float) 78.9705, (float) 42.8571),
+    new CoordRec((float) 2.78, (float) 0),
+};
+
+static final StrokeRec char62[] = {
+   new StrokeRec(3, char62_stroke0),
+};
+
+/* char: 63 '?' */
+
+static final CoordRec char63_stroke0[] = {
+    new CoordRec((float) 8.42, (float) 76.1905),
+    new CoordRec((float) 8.42, (float) 80.9524),
+    new CoordRec((float) 13.1819, (float) 90.4762),
+    new CoordRec((float) 17.9438, (float) 95.2381),
+    new CoordRec((float) 27.4676, (float) 100),
+    new CoordRec((float) 46.5152, (float) 100),
+    new CoordRec((float) 56.039, (float) 95.2381),
+    new CoordRec((float) 60.801, (float) 90.4762),
+    new CoordRec((float) 65.5629, (float) 80.9524),
+    new CoordRec((float) 65.5629, (float) 71.4286),
+    new CoordRec((float) 60.801, (float) 61.9048),
+    new CoordRec((float) 56.039, (float) 57.1429),
+    new CoordRec((float) 36.9914, (float) 47.619),
+    new CoordRec((float) 36.9914, (float) 33.3333),
+};
+
+static final CoordRec char63_stroke1[] = {
+    new CoordRec((float) 36.9914, (float) 9.5238),
+    new CoordRec((float) 32.2295, (float) 4.7619),
+    new CoordRec((float) 36.9914, (float) 0),
+    new CoordRec((float) 41.7533, (float) 4.7619),
+    new CoordRec((float) 36.9914, (float) 9.5238),
+};
+
+static final StrokeRec char63[] = {
+   new StrokeRec(14, char63_stroke0),
+   new StrokeRec(5, char63_stroke1),
+};
+
+/* char: 64 '@' */
+
+static final CoordRec char64_stroke0[] = {
+    new CoordRec((float) 49.2171, (float) 52.381),
+    new CoordRec((float) 39.6933, (float) 57.1429),
+    new CoordRec((float) 30.1695, (float) 57.1429),
+    new CoordRec((float) 25.4076, (float) 47.619),
+    new CoordRec((float) 25.4076, (float) 42.8571),
+    new CoordRec((float) 30.1695, (float) 33.3333),
+    new CoordRec((float) 39.6933, (float) 33.3333),
+    new CoordRec((float) 49.2171, (float) 38.0952),
+};
+
+static final CoordRec char64_stroke1[] = {
+    new CoordRec((float) 49.2171, (float) 57.1429),
+    new CoordRec((float) 49.2171, (float) 38.0952),
+    new CoordRec((float) 53.979, (float) 33.3333),
+    new CoordRec((float) 63.5029, (float) 33.3333),
+    new CoordRec((float) 68.2648, (float) 42.8571),
+    new CoordRec((float) 68.2648, (float) 47.619),
+    new CoordRec((float) 63.5029, (float) 61.9048),
+    new CoordRec((float) 53.979, (float) 71.4286),
+    new CoordRec((float) 39.6933, (float) 76.1905),
+    new CoordRec((float) 34.9314, (float) 76.1905),
+    new CoordRec((float) 20.6457, (float) 71.4286),
+    new CoordRec((float) 11.1219, (float) 61.9048),
+    new CoordRec((float) 6.36, (float) 47.619),
+    new CoordRec((float) 6.36, (float) 42.8571),
+    new CoordRec((float) 11.1219, (float) 28.5714),
+    new CoordRec((float) 20.6457, (float) 19.0476),
+    new CoordRec((float) 34.9314, (float) 14.2857),
+    new CoordRec((float) 39.6933, (float) 14.2857),
+    new CoordRec((float) 53.979, (float) 19.0476),
+};
+
+static final StrokeRec char64[] = {
+   new StrokeRec(8, char64_stroke0),
+   new StrokeRec(19, char64_stroke1),
+};
+
+/* char: 65 'A' */
+
+static final CoordRec char65_stroke0[] = {
+    new CoordRec((float) 40.5952, (float) 100),
+    new CoordRec((float) 2.5, (float) 0),
+};
+
+static final CoordRec char65_stroke1[] = {
+    new CoordRec((float) 40.5952, (float) 100),
+    new CoordRec((float) 78.6905, (float) 0),
+};
+
+static final CoordRec char65_stroke2[] = {
+    new CoordRec((float) 16.7857, (float) 33.3333),
+    new CoordRec((float) 64.4048, (float) 33.3333),
+};
+
+static final StrokeRec char65[] = {
+   new StrokeRec(2, char65_stroke0),
+   new StrokeRec(2, char65_stroke1),
+   new StrokeRec(2, char65_stroke2),
+};
+
+/* char: 66 'B' */
+
+static final CoordRec char66_stroke0[] = {
+    new CoordRec((float) 11.42, (float) 100),
+    new CoordRec((float) 11.42, (float) 0),
+};
+
+static final CoordRec char66_stroke1[] = {
+    new CoordRec((float) 11.42, (float) 100),
+    new CoordRec((float) 54.2771, (float) 100),
+    new CoordRec((float) 68.5629, (float) 95.2381),
+    new CoordRec((float) 73.3248, (float) 90.4762),
+    new CoordRec((float) 78.0867, (float) 80.9524),
+    new CoordRec((float) 78.0867, (float) 71.4286),
+    new CoordRec((float) 73.3248, (float) 61.9048),
+    new CoordRec((float) 68.5629, (float) 57.1429),
+    new CoordRec((float) 54.2771, (float) 52.381),
+};
+
+static final CoordRec char66_stroke2[] = {
+    new CoordRec((float) 11.42, (float) 52.381),
+    new CoordRec((float) 54.2771, (float) 52.381),
+    new CoordRec((float) 68.5629, (float) 47.619),
+    new CoordRec((float) 73.3248, (float) 42.8571),
+    new CoordRec((float) 78.0867, (float) 33.3333),
+    new CoordRec((float) 78.0867, (float) 19.0476),
+    new CoordRec((float) 73.3248, (float) 9.5238),
+    new CoordRec((float) 68.5629, (float) 4.7619),
+    new CoordRec((float) 54.2771, (float) 0),
+    new CoordRec((float) 11.42, (float) 0),
+};
+
+static final StrokeRec char66[] = {
+   new StrokeRec(2, char66_stroke0),
+   new StrokeRec(9, char66_stroke1),
+   new StrokeRec(10, char66_stroke2),
+};
+
+/* char: 67 'C' */
+
+static final CoordRec char67_stroke0[] = {
+    new CoordRec((float) 78.0886, (float) 76.1905),
+    new CoordRec((float) 73.3267, (float) 85.7143),
+    new CoordRec((float) 63.8029, (float) 95.2381),
+    new CoordRec((float) 54.279, (float) 100),
+    new CoordRec((float) 35.2314, (float) 100),
+    new CoordRec((float) 25.7076, (float) 95.2381),
+    new CoordRec((float) 16.1838, (float) 85.7143),
+    new CoordRec((float) 11.4219, (float) 76.1905),
+    new CoordRec((float) 6.66, (float) 61.9048),
+    new CoordRec((float) 6.66, (float) 38.0952),
+    new CoordRec((float) 11.4219, (float) 23.8095),
+    new CoordRec((float) 16.1838, (float) 14.2857),
+    new CoordRec((float) 25.7076, (float) 4.7619),
+    new CoordRec((float) 35.2314, (float) 0),
+    new CoordRec((float) 54.279, (float) 0),
+    new CoordRec((float) 63.8029, (float) 4.7619),
+    new CoordRec((float) 73.3267, (float) 14.2857),
+    new CoordRec((float) 78.0886, (float) 23.8095),
+};
+
+static final StrokeRec char67[] = {
+   new StrokeRec(18, char67_stroke0),
+};
+
+/* char: 68 'D' */
+
+static final CoordRec char68_stroke0[] = {
+    new CoordRec((float) 11.96, (float) 100),
+    new CoordRec((float) 11.96, (float) 0),
+};
+
+static final CoordRec char68_stroke1[] = {
+    new CoordRec((float) 11.96, (float) 100),
+    new CoordRec((float) 45.2933, (float) 100),
+    new CoordRec((float) 59.579, (float) 95.2381),
+    new CoordRec((float) 69.1029, (float) 85.7143),
+    new CoordRec((float) 73.8648, (float) 76.1905),
+    new CoordRec((float) 78.6267, (float) 61.9048),
+    new CoordRec((float) 78.6267, (float) 38.0952),
+    new CoordRec((float) 73.8648, (float) 23.8095),
+    new CoordRec((float) 69.1029, (float) 14.2857),
+    new CoordRec((float) 59.579, (float) 4.7619),
+    new CoordRec((float) 45.2933, (float) 0),
+    new CoordRec((float) 11.96, (float) 0),
+};
+
+static final StrokeRec char68[] = {
+   new StrokeRec(2, char68_stroke0),
+   new StrokeRec(12, char68_stroke1),
+};
+
+/* char: 69 'E' */
+
+static final CoordRec char69_stroke0[] = {
+    new CoordRec((float) 11.42, (float) 100),
+    new CoordRec((float) 11.42, (float) 0),
+};
+
+static final CoordRec char69_stroke1[] = {
+    new CoordRec((float) 11.42, (float) 100),
+    new CoordRec((float) 73.3248, (float) 100),
+};
+
+static final CoordRec char69_stroke2[] = {
+    new CoordRec((float) 11.42, (float) 52.381),
+    new CoordRec((float) 49.5152, (float) 52.381),
+};
+
+static final CoordRec char69_stroke3[] = {
+    new CoordRec((float) 11.42, (float) 0),
+    new CoordRec((float) 73.3248, (float) 0),
+};
+
+static final StrokeRec char69[] = {
+   new StrokeRec(2, char69_stroke0),
+   new StrokeRec(2, char69_stroke1),
+   new StrokeRec(2, char69_stroke2),
+   new StrokeRec(2, char69_stroke3),
+};
+
+/* char: 70 'F' */
+
+static final CoordRec char70_stroke0[] = {
+    new CoordRec((float) 11.42, (float) 100),
+    new CoordRec((float) 11.42, (float) 0),
+};
+
+static final CoordRec char70_stroke1[] = {
+    new CoordRec((float) 11.42, (float) 100),
+    new CoordRec((float) 73.3248, (float) 100),
+};
+
+static final CoordRec char70_stroke2[] = {
+    new CoordRec((float) 11.42, (float) 52.381),
+    new CoordRec((float) 49.5152, (float) 52.381),
+};
+
+static final StrokeRec char70[] = {
+   new StrokeRec(2, char70_stroke0),
+   new StrokeRec(2, char70_stroke1),
+   new StrokeRec(2, char70_stroke2),
+};
+
+/* char: 71 'G' */
+
+static final CoordRec char71_stroke0[] = {
+    new CoordRec((float) 78.4886, (float) 76.1905),
+    new CoordRec((float) 73.7267, (float) 85.7143),
+    new CoordRec((float) 64.2029, (float) 95.2381),
+    new CoordRec((float) 54.679, (float) 100),
+    new CoordRec((float) 35.6314, (float) 100),
+    new CoordRec((float) 26.1076, (float) 95.2381),
+    new CoordRec((float) 16.5838, (float) 85.7143),
+    new CoordRec((float) 11.8219, (float) 76.1905),
+    new CoordRec((float) 7.06, (float) 61.9048),
+    new CoordRec((float) 7.06, (float) 38.0952),
+    new CoordRec((float) 11.8219, (float) 23.8095),
+    new CoordRec((float) 16.5838, (float) 14.2857),
+    new CoordRec((float) 26.1076, (float) 4.7619),
+    new CoordRec((float) 35.6314, (float) 0),
+    new CoordRec((float) 54.679, (float) 0),
+    new CoordRec((float) 64.2029, (float) 4.7619),
+    new CoordRec((float) 73.7267, (float) 14.2857),
+    new CoordRec((float) 78.4886, (float) 23.8095),
+    new CoordRec((float) 78.4886, (float) 38.0952),
+};
+
+static final CoordRec char71_stroke1[] = {
+    new CoordRec((float) 54.679, (float) 38.0952),
+    new CoordRec((float) 78.4886, (float) 38.0952),
+};
+
+static final StrokeRec char71[] = {
+   new StrokeRec(19, char71_stroke0),
+   new StrokeRec(2, char71_stroke1),
+};
+
+/* char: 72 'H' */
+
+static final CoordRec char72_stroke0[] = {
+    new CoordRec((float) 11.42, (float) 100),
+    new CoordRec((float) 11.42, (float) 0),
+};
+
+static final CoordRec char72_stroke1[] = {
+    new CoordRec((float) 78.0867, (float) 100),
+    new CoordRec((float) 78.0867, (float) 0),
+};
+
+static final CoordRec char72_stroke2[] = {
+    new CoordRec((float) 11.42, (float) 52.381),
+    new CoordRec((float) 78.0867, (float) 52.381),
+};
+
+static final StrokeRec char72[] = {
+   new StrokeRec(2, char72_stroke0),
+   new StrokeRec(2, char72_stroke1),
+   new StrokeRec(2, char72_stroke2),
+};
+
+/* char: 73 'I' */
+
+static final CoordRec char73_stroke0[] = {
+    new CoordRec((float) 10.86, (float) 100),
+    new CoordRec((float) 10.86, (float) 0),
+};
+
+static final StrokeRec char73[] = {
+   new StrokeRec(2, char73_stroke0),
+};
+
+/* char: 74 'J' */
+
+static final CoordRec char74_stroke0[] = {
+    new CoordRec((float) 50.119, (float) 100),
+    new CoordRec((float) 50.119, (float) 23.8095),
+    new CoordRec((float) 45.3571, (float) 9.5238),
+    new CoordRec((float) 40.5952, (float) 4.7619),
+    new CoordRec((float) 31.0714, (float) 0),
+    new CoordRec((float) 21.5476, (float) 0),
+    new CoordRec((float) 12.0238, (float) 4.7619),
+    new CoordRec((float) 7.2619, (float) 9.5238),
+    new CoordRec((float) 2.5, (float) 23.8095),
+    new CoordRec((float) 2.5, (float) 33.3333),
+};
+
+static final StrokeRec char74[] = {
+   new StrokeRec(10, char74_stroke0),
+};
+
+/* char: 75 'K' */
+
+static final CoordRec char75_stroke0[] = {
+    new CoordRec((float) 11.28, (float) 100),
+    new CoordRec((float) 11.28, (float) 0),
+};
+
+static final CoordRec char75_stroke1[] = {
+    new CoordRec((float) 77.9467, (float) 100),
+    new CoordRec((float) 11.28, (float) 33.3333),
+};
+
+static final CoordRec char75_stroke2[] = {
+    new CoordRec((float) 35.0895, (float) 57.1429),
+    new CoordRec((float) 77.9467, (float) 0),
+};
+
+static final StrokeRec char75[] = {
+   new StrokeRec(2, char75_stroke0),
+   new StrokeRec(2, char75_stroke1),
+   new StrokeRec(2, char75_stroke2),
+};
+
+/* char: 76 'L' */
+
+static final CoordRec char76_stroke0[] = {
+    new CoordRec((float) 11.68, (float) 100),
+    new CoordRec((float) 11.68, (float) 0),
+};
+
+static final CoordRec char76_stroke1[] = {
+    new CoordRec((float) 11.68, (float) 0),
+    new CoordRec((float) 68.8229, (float) 0),
+};
+
+static final StrokeRec char76[] = {
+   new StrokeRec(2, char76_stroke0),
+   new StrokeRec(2, char76_stroke1),
+};
+
+/* char: 77 'M' */
+
+static final CoordRec char77_stroke0[] = {
+    new CoordRec((float) 10.86, (float) 100),
+    new CoordRec((float) 10.86, (float) 0),
+};
+
+static final CoordRec char77_stroke1[] = {
+    new CoordRec((float) 10.86, (float) 100),
+    new CoordRec((float) 48.9552, (float) 0),
+};
+
+static final CoordRec char77_stroke2[] = {
+    new CoordRec((float) 87.0505, (float) 100),
+    new CoordRec((float) 48.9552, (float) 0),
+};
+
+static final CoordRec char77_stroke3[] = {
+    new CoordRec((float) 87.0505, (float) 100),
+    new CoordRec((float) 87.0505, (float) 0),
+};
+
+static final StrokeRec char77[] = {
+   new StrokeRec(2, char77_stroke0),
+   new StrokeRec(2, char77_stroke1),
+   new StrokeRec(2, char77_stroke2),
+   new StrokeRec(2, char77_stroke3),
+};
+
+/* char: 78 'N' */
+
+static final CoordRec char78_stroke0[] = {
+    new CoordRec((float) 11.14, (float) 100),
+    new CoordRec((float) 11.14, (float) 0),
+};
+
+static final CoordRec char78_stroke1[] = {
+    new CoordRec((float) 11.14, (float) 100),
+    new CoordRec((float) 77.8067, (float) 0),
+};
+
+static final CoordRec char78_stroke2[] = {
+    new CoordRec((float) 77.8067, (float) 100),
+    new CoordRec((float) 77.8067, (float) 0),
+};
+
+static final StrokeRec char78[] = {
+   new StrokeRec(2, char78_stroke0),
+   new StrokeRec(2, char78_stroke1),
+   new StrokeRec(2, char78_stroke2),
+};
+
+/* char: 79 'O' */
+
+static final CoordRec char79_stroke0[] = {
+    new CoordRec((float) 34.8114, (float) 100),
+    new CoordRec((float) 25.2876, (float) 95.2381),
+    new CoordRec((float) 15.7638, (float) 85.7143),
+    new CoordRec((float) 11.0019, (float) 76.1905),
+    new CoordRec((float) 6.24, (float) 61.9048),
+    new CoordRec((float) 6.24, (float) 38.0952),
+    new CoordRec((float) 11.0019, (float) 23.8095),
+    new CoordRec((float) 15.7638, (float) 14.2857),
+    new CoordRec((float) 25.2876, (float) 4.7619),
+    new CoordRec((float) 34.8114, (float) 0),
+    new CoordRec((float) 53.859, (float) 0),
+    new CoordRec((float) 63.3829, (float) 4.7619),
+    new CoordRec((float) 72.9067, (float) 14.2857),
+    new CoordRec((float) 77.6686, (float) 23.8095),
+    new CoordRec((float) 82.4305, (float) 38.0952),
+    new CoordRec((float) 82.4305, (float) 61.9048),
+    new CoordRec((float) 77.6686, (float) 76.1905),
+    new CoordRec((float) 72.9067, (float) 85.7143),
+    new CoordRec((float) 63.3829, (float) 95.2381),
+    new CoordRec((float) 53.859, (float) 100),
+    new CoordRec((float) 34.8114, (float) 100),
+};
+
+static final StrokeRec char79[] = {
+   new StrokeRec(21, char79_stroke0),
+};
+
+/* char: 80 'P' */
+
+static final CoordRec char80_stroke0[] = {
+    new CoordRec((float) 12.1, (float) 100),
+    new CoordRec((float) 12.1, (float) 0),
+};
+
+static final CoordRec char80_stroke1[] = {
+    new CoordRec((float) 12.1, (float) 100),
+    new CoordRec((float) 54.9571, (float) 100),
+    new CoordRec((float) 69.2429, (float) 95.2381),
+    new CoordRec((float) 74.0048, (float) 90.4762),
+    new CoordRec((float) 78.7667, (float) 80.9524),
+    new CoordRec((float) 78.7667, (float) 66.6667),
+    new CoordRec((float) 74.0048, (float) 57.1429),
+    new CoordRec((float) 69.2429, (float) 52.381),
+    new CoordRec((float) 54.9571, (float) 47.619),
+    new CoordRec((float) 12.1, (float) 47.619),
+};
+
+static final StrokeRec char80[] = {
+   new StrokeRec(2, char80_stroke0),
+   new StrokeRec(10, char80_stroke1),
+};
+
+/* char: 81 'Q' */
+
+static final CoordRec char81_stroke0[] = {
+    new CoordRec((float) 33.8714, (float) 100),
+    new CoordRec((float) 24.3476, (float) 95.2381),
+    new CoordRec((float) 14.8238, (float) 85.7143),
+    new CoordRec((float) 10.0619, (float) 76.1905),
+    new CoordRec((float) 5.3, (float) 61.9048),
+    new CoordRec((float) 5.3, (float) 38.0952),
+    new CoordRec((float) 10.0619, (float) 23.8095),
+    new CoordRec((float) 14.8238, (float) 14.2857),
+    new CoordRec((float) 24.3476, (float) 4.7619),
+    new CoordRec((float) 33.8714, (float) 0),
+    new CoordRec((float) 52.919, (float) 0),
+    new CoordRec((float) 62.4429, (float) 4.7619),
+    new CoordRec((float) 71.9667, (float) 14.2857),
+    new CoordRec((float) 76.7286, (float) 23.8095),
+    new CoordRec((float) 81.4905, (float) 38.0952),
+    new CoordRec((float) 81.4905, (float) 61.9048),
+    new CoordRec((float) 76.7286, (float) 76.1905),
+    new CoordRec((float) 71.9667, (float) 85.7143),
+    new CoordRec((float) 62.4429, (float) 95.2381),
+    new CoordRec((float) 52.919, (float) 100),
+    new CoordRec((float) 33.8714, (float) 100),
+};
+
+static final CoordRec char81_stroke1[] = {
+    new CoordRec((float) 48.1571, (float) 19.0476),
+    new CoordRec((float) 76.7286, (float) -9.5238),
+};
+
+static final StrokeRec char81[] = {
+   new StrokeRec(21, char81_stroke0),
+   new StrokeRec(2, char81_stroke1),
+};
+
+/* char: 82 'R' */
+
+static final CoordRec char82_stroke0[] = {
+    new CoordRec((float) 11.68, (float) 100),
+    new CoordRec((float) 11.68, (float) 0),
+};
+
+static final CoordRec char82_stroke1[] = {
+    new CoordRec((float) 11.68, (float) 100),
+    new CoordRec((float) 54.5371, (float) 100),
+    new CoordRec((float) 68.8229, (float) 95.2381),
+    new CoordRec((float) 73.5848, (float) 90.4762),
+    new CoordRec((float) 78.3467, (float) 80.9524),
+    new CoordRec((float) 78.3467, (float) 71.4286),
+    new CoordRec((float) 73.5848, (float) 61.9048),
+    new CoordRec((float) 68.8229, (float) 57.1429),
+    new CoordRec((float) 54.5371, (float) 52.381),
+    new CoordRec((float) 11.68, (float) 52.381),
+};
+
+static final CoordRec char82_stroke2[] = {
+    new CoordRec((float) 45.0133, (float) 52.381),
+    new CoordRec((float) 78.3467, (float) 0),
+};
+
+static final StrokeRec char82[] = {
+   new StrokeRec(2, char82_stroke0),
+   new StrokeRec(10, char82_stroke1),
+   new StrokeRec(2, char82_stroke2),
+};
+
+/* char: 83 'S' */
+
+static final CoordRec char83_stroke0[] = {
+    new CoordRec((float) 74.6667, (float) 85.7143),
+    new CoordRec((float) 65.1429, (float) 95.2381),
+    new CoordRec((float) 50.8571, (float) 100),
+    new CoordRec((float) 31.8095, (float) 100),
+    new CoordRec((float) 17.5238, (float) 95.2381),
+    new CoordRec((float) 8, (float) 85.7143),
+    new CoordRec((float) 8, (float) 76.1905),
+    new CoordRec((float) 12.7619, (float) 66.6667),
+    new CoordRec((float) 17.5238, (float) 61.9048),
+    new CoordRec((float) 27.0476, (float) 57.1429),
+    new CoordRec((float) 55.619, (float) 47.619),
+    new CoordRec((float) 65.1429, (float) 42.8571),
+    new CoordRec((float) 69.9048, (float) 38.0952),
+    new CoordRec((float) 74.6667, (float) 28.5714),
+    new CoordRec((float) 74.6667, (float) 14.2857),
+    new CoordRec((float) 65.1429, (float) 4.7619),
+    new CoordRec((float) 50.8571, (float) 0),
+    new CoordRec((float) 31.8095, (float) 0),
+    new CoordRec((float) 17.5238, (float) 4.7619),
+    new CoordRec((float) 8, (float) 14.2857),
+};
+
+static final StrokeRec char83[] = {
+   new StrokeRec(20, char83_stroke0),
+};
+
+/* char: 84 'T' */
+
+static final CoordRec char84_stroke0[] = {
+    new CoordRec((float) 35.6933, (float) 100),
+    new CoordRec((float) 35.6933, (float) 0),
+};
+
+static final CoordRec char84_stroke1[] = {
+    new CoordRec((float) 2.36, (float) 100),
+    new CoordRec((float) 69.0267, (float) 100),
+};
+
+static final StrokeRec char84[] = {
+   new StrokeRec(2, char84_stroke0),
+   new StrokeRec(2, char84_stroke1),
+};
+
+/* char: 85 'U' */
+
+static final CoordRec char85_stroke0[] = {
+    new CoordRec((float) 11.54, (float) 100),
+    new CoordRec((float) 11.54, (float) 28.5714),
+    new CoordRec((float) 16.3019, (float) 14.2857),
+    new CoordRec((float) 25.8257, (float) 4.7619),
+    new CoordRec((float) 40.1114, (float) 0),
+    new CoordRec((float) 49.6352, (float) 0),
+    new CoordRec((float) 63.921, (float) 4.7619),
+    new CoordRec((float) 73.4448, (float) 14.2857),
+    new CoordRec((float) 78.2067, (float) 28.5714),
+    new CoordRec((float) 78.2067, (float) 100),
+};
+
+static final StrokeRec char85[] = {
+   new StrokeRec(10, char85_stroke0),
+};
+
+/* char: 86 'V' */
+
+static final CoordRec char86_stroke0[] = {
+    new CoordRec((float) 2.36, (float) 100),
+    new CoordRec((float) 40.4552, (float) 0),
+};
+
+static final CoordRec char86_stroke1[] = {
+    new CoordRec((float) 78.5505, (float) 100),
+    new CoordRec((float) 40.4552, (float) 0),
+};
+
+static final StrokeRec char86[] = {
+   new StrokeRec(2, char86_stroke0),
+   new StrokeRec(2, char86_stroke1),
+};
+
+/* char: 87 'W' */
+
+static final CoordRec char87_stroke0[] = {
+    new CoordRec((float) 2.22, (float) 100),
+    new CoordRec((float) 26.0295, (float) 0),
+};
+
+static final CoordRec char87_stroke1[] = {
+    new CoordRec((float) 49.839, (float) 100),
+    new CoordRec((float) 26.0295, (float) 0),
+};
+
+static final CoordRec char87_stroke2[] = {
+    new CoordRec((float) 49.839, (float) 100),
+    new CoordRec((float) 73.6486, (float) 0),
+};
+
+static final CoordRec char87_stroke3[] = {
+    new CoordRec((float) 97.4581, (float) 100),
+    new CoordRec((float) 73.6486, (float) 0),
+};
+
+static final StrokeRec char87[] = {
+   new StrokeRec(2, char87_stroke0),
+   new StrokeRec(2, char87_stroke1),
+   new StrokeRec(2, char87_stroke2),
+   new StrokeRec(2, char87_stroke3),
+};
+
+/* char: 88 'X' */
+
+static final CoordRec char88_stroke0[] = {
+    new CoordRec((float) 2.5, (float) 100),
+    new CoordRec((float) 69.1667, (float) 0),
+};
+
+static final CoordRec char88_stroke1[] = {
+    new CoordRec((float) 69.1667, (float) 100),
+    new CoordRec((float) 2.5, (float) 0),
+};
+
+static final StrokeRec char88[] = {
+   new StrokeRec(2, char88_stroke0),
+   new StrokeRec(2, char88_stroke1),
+};
+
+/* char: 89 'Y' */
+
+static final CoordRec char89_stroke0[] = {
+    new CoordRec((float) 1.52, (float) 100),
+    new CoordRec((float) 39.6152, (float) 52.381),
+    new CoordRec((float) 39.6152, (float) 0),
+};
+
+static final CoordRec char89_stroke1[] = {
+    new CoordRec((float) 77.7105, (float) 100),
+    new CoordRec((float) 39.6152, (float) 52.381),
+};
+
+static final StrokeRec char89[] = {
+   new StrokeRec(3, char89_stroke0),
+   new StrokeRec(2, char89_stroke1),
+};
+
+/* char: 90 'Z' */
+
+static final CoordRec char90_stroke0[] = {
+    new CoordRec((float) 69.1667, (float) 100),
+    new CoordRec((float) 2.5, (float) 0),
+};
+
+static final CoordRec char90_stroke1[] = {
+    new CoordRec((float) 2.5, (float) 100),
+    new CoordRec((float) 69.1667, (float) 100),
+};
+
+static final CoordRec char90_stroke2[] = {
+    new CoordRec((float) 2.5, (float) 0),
+    new CoordRec((float) 69.1667, (float) 0),
+};
+
+static final StrokeRec char90[] = {
+   new StrokeRec(2, char90_stroke0),
+   new StrokeRec(2, char90_stroke1),
+   new StrokeRec(2, char90_stroke2),
+};
+
+/* char: 91 '[' */
+
+static final CoordRec char91_stroke0[] = {
+    new CoordRec((float) 7.78, (float) 119.048),
+    new CoordRec((float) 7.78, (float) -33.3333),
+};
+
+static final CoordRec char91_stroke1[] = {
+    new CoordRec((float) 12.5419, (float) 119.048),
+    new CoordRec((float) 12.5419, (float) -33.3333),
+};
+
+static final CoordRec char91_stroke2[] = {
+    new CoordRec((float) 7.78, (float) 119.048),
+    new CoordRec((float) 41.1133, (float) 119.048),
+};
+
+static final CoordRec char91_stroke3[] = {
+    new CoordRec((float) 7.78, (float) -33.3333),
+    new CoordRec((float) 41.1133, (float) -33.3333),
+};
+
+static final StrokeRec char91[] = {
+   new StrokeRec(2, char91_stroke0),
+   new StrokeRec(2, char91_stroke1),
+   new StrokeRec(2, char91_stroke2),
+   new StrokeRec(2, char91_stroke3),
+};
+
+/* char: 92 '\' */
+
+static final CoordRec char92_stroke0[] = {
+    new CoordRec((float) 5.84, (float) 100),
+    new CoordRec((float) 72.5067, (float) -14.2857),
+};
+
+static final StrokeRec char92[] = {
+   new StrokeRec(2, char92_stroke0),
+};
+
+/* char: 93 ']' */
+
+static final CoordRec char93_stroke0[] = {
+    new CoordRec((float) 33.0114, (float) 119.048),
+    new CoordRec((float) 33.0114, (float) -33.3333),
+};
+
+static final CoordRec char93_stroke1[] = {
+    new CoordRec((float) 37.7733, (float) 119.048),
+    new CoordRec((float) 37.7733, (float) -33.3333),
+};
+
+static final CoordRec char93_stroke2[] = {
+    new CoordRec((float) 4.44, (float) 119.048),
+    new CoordRec((float) 37.7733, (float) 119.048),
+};
+
+static final CoordRec char93_stroke3[] = {
+    new CoordRec((float) 4.44, (float) -33.3333),
+    new CoordRec((float) 37.7733, (float) -33.3333),
+};
+
+static final StrokeRec char93[] = {
+   new StrokeRec(2, char93_stroke0),
+   new StrokeRec(2, char93_stroke1),
+   new StrokeRec(2, char93_stroke2),
+   new StrokeRec(2, char93_stroke3),
+};
+
+/* char: 94 '^' */
+
+static final CoordRec char94_stroke0[] = {
+    new CoordRec((float) 44.0752, (float) 109.524),
+    new CoordRec((float) 5.98, (float) 42.8571),
+};
+
+static final CoordRec char94_stroke1[] = {
+    new CoordRec((float) 44.0752, (float) 109.524),
+    new CoordRec((float) 82.1705, (float) 42.8571),
+};
+
+static final StrokeRec char94[] = {
+   new StrokeRec(2, char94_stroke0),
+   new StrokeRec(2, char94_stroke1),
+};
+
+/* char: 95 '_' */
+
+static final CoordRec char95_stroke0[] = {
+    new CoordRec((float)-1.1, (float) -33.3333),
+    new CoordRec((float) 103.662, (float) -33.3333),
+    new CoordRec((float) 103.662, (float) -28.5714),
+    new CoordRec((float)-1.1, (float) -28.5714),
+    new CoordRec((float)-1.1, (float) -33.3333),
+};
+
+static final StrokeRec char95[] = {
+   new StrokeRec(5, char95_stroke0),
+};
+
+/* char: 96 '`' */
+
+static final CoordRec char96_stroke0[] = {
+    new CoordRec((float) 33.0219, (float) 100),
+    new CoordRec((float) 56.8314, (float) 71.4286),
+};
+
+static final CoordRec char96_stroke1[] = {
+    new CoordRec((float) 33.0219, (float) 100),
+    new CoordRec((float) 28.26, (float) 95.2381),
+    new CoordRec((float) 56.8314, (float) 71.4286),
+};
+
+static final StrokeRec char96[] = {
+   new StrokeRec(2, char96_stroke0),
+   new StrokeRec(3, char96_stroke1),
+};
+
+/* char: 97 'a' */
+
+static final CoordRec char97_stroke0[] = {
+    new CoordRec((float) 63.8229, (float) 66.6667),
+    new CoordRec((float) 63.8229, (float) 0),
+};
+
+static final CoordRec char97_stroke1[] = {
+    new CoordRec((float) 63.8229, (float) 52.381),
+    new CoordRec((float) 54.299, (float) 61.9048),
+    new CoordRec((float) 44.7752, (float) 66.6667),
+    new CoordRec((float) 30.4895, (float) 66.6667),
+    new CoordRec((float) 20.9657, (float) 61.9048),
+    new CoordRec((float) 11.4419, (float) 52.381),
+    new CoordRec((float) 6.68, (float) 38.0952),
+    new CoordRec((float) 6.68, (float) 28.5714),
+    new CoordRec((float) 11.4419, (float) 14.2857),
+    new CoordRec((float) 20.9657, (float) 4.7619),
+    new CoordRec((float) 30.4895, (float) 0),
+    new CoordRec((float) 44.7752, (float) 0),
+    new CoordRec((float) 54.299, (float) 4.7619),
+    new CoordRec((float) 63.8229, (float) 14.2857),
+};
+
+static final StrokeRec char97[] = {
+   new StrokeRec(2, char97_stroke0),
+   new StrokeRec(14, char97_stroke1),
+};
+
+/* char: 98 'b' */
+
+static final CoordRec char98_stroke0[] = {
+    new CoordRec((float) 8.76, (float) 100),
+    new CoordRec((float) 8.76, (float) 0),
+};
+
+static final CoordRec char98_stroke1[] = {
+    new CoordRec((float) 8.76, (float) 52.381),
+    new CoordRec((float) 18.2838, (float) 61.9048),
+    new CoordRec((float) 27.8076, (float) 66.6667),
+    new CoordRec((float) 42.0933, (float) 66.6667),
+    new CoordRec((float) 51.6171, (float) 61.9048),
+    new CoordRec((float) 61.141, (float) 52.381),
+    new CoordRec((float) 65.9029, (float) 38.0952),
+    new CoordRec((float) 65.9029, (float) 28.5714),
+    new CoordRec((float) 61.141, (float) 14.2857),
+    new CoordRec((float) 51.6171, (float) 4.7619),
+    new CoordRec((float) 42.0933, (float) 0),
+    new CoordRec((float) 27.8076, (float) 0),
+    new CoordRec((float) 18.2838, (float) 4.7619),
+    new CoordRec((float) 8.76, (float) 14.2857),
+};
+
+static final StrokeRec char98[] = {
+   new StrokeRec(2, char98_stroke0),
+   new StrokeRec(14, char98_stroke1),
+};
+
+/* char: 99 'c' */
+
+static final CoordRec char99_stroke0[] = {
+    new CoordRec((float) 62.6629, (float) 52.381),
+    new CoordRec((float) 53.139, (float) 61.9048),
+    new CoordRec((float) 43.6152, (float) 66.6667),
+    new CoordRec((float) 29.3295, (float) 66.6667),
+    new CoordRec((float) 19.8057, (float) 61.9048),
+    new CoordRec((float) 10.2819, (float) 52.381),
+    new CoordRec((float) 5.52, (float) 38.0952),
+    new CoordRec((float) 5.52, (float) 28.5714),
+    new CoordRec((float) 10.2819, (float) 14.2857),
+    new CoordRec((float) 19.8057, (float) 4.7619),
+    new CoordRec((float) 29.3295, (float) 0),
+    new CoordRec((float) 43.6152, (float) 0),
+    new CoordRec((float) 53.139, (float) 4.7619),
+    new CoordRec((float) 62.6629, (float) 14.2857),
+};
+
+static final StrokeRec char99[] = {
+   new StrokeRec(14, char99_stroke0),
+};
+
+/* char: 100 'd' */
+
+static final CoordRec char100_stroke0[] = {
+    new CoordRec((float) 61.7829, (float) 100),
+    new CoordRec((float) 61.7829, (float) 0),
+};
+
+static final CoordRec char100_stroke1[] = {
+    new CoordRec((float) 61.7829, (float) 52.381),
+    new CoordRec((float) 52.259, (float) 61.9048),
+    new CoordRec((float) 42.7352, (float) 66.6667),
+    new CoordRec((float) 28.4495, (float) 66.6667),
+    new CoordRec((float) 18.9257, (float) 61.9048),
+    new CoordRec((float) 9.4019, (float) 52.381),
+    new CoordRec((float) 4.64, (float) 38.0952),
+    new CoordRec((float) 4.64, (float) 28.5714),
+    new CoordRec((float) 9.4019, (float) 14.2857),
+    new CoordRec((float) 18.9257, (float) 4.7619),
+    new CoordRec((float) 28.4495, (float) 0),
+    new CoordRec((float) 42.7352, (float) 0),
+    new CoordRec((float) 52.259, (float) 4.7619),
+    new CoordRec((float) 61.7829, (float) 14.2857),
+};
+
+static final StrokeRec char100[] = {
+   new StrokeRec(2, char100_stroke0),
+   new StrokeRec(14, char100_stroke1),
+};
+
+/* char: 101 'e' */
+
+static final CoordRec char101_stroke0[] = {
+    new CoordRec((float) 5.72, (float) 38.0952),
+    new CoordRec((float) 62.8629, (float) 38.0952),
+    new CoordRec((float) 62.8629, (float) 47.619),
+    new CoordRec((float) 58.101, (float) 57.1429),
+    new CoordRec((float) 53.339, (float) 61.9048),
+    new CoordRec((float) 43.8152, (float) 66.6667),
+    new CoordRec((float) 29.5295, (float) 66.6667),
+    new CoordRec((float) 20.0057, (float) 61.9048),
+    new CoordRec((float) 10.4819, (float) 52.381),
+    new CoordRec((float) 5.72, (float) 38.0952),
+    new CoordRec((float) 5.72, (float) 28.5714),
+    new CoordRec((float) 10.4819, (float) 14.2857),
+    new CoordRec((float) 20.0057, (float) 4.7619),
+    new CoordRec((float) 29.5295, (float) 0),
+    new CoordRec((float) 43.8152, (float) 0),
+    new CoordRec((float) 53.339, (float) 4.7619),
+    new CoordRec((float) 62.8629, (float) 14.2857),
+};
+
+static final StrokeRec char101[] = {
+   new StrokeRec(17, char101_stroke0),
+};
+
+/* char: 102 'f' */
+
+static final CoordRec char102_stroke0[] = {
+    new CoordRec((float) 38.7752, (float) 100),
+    new CoordRec((float) 29.2514, (float) 100),
+    new CoordRec((float) 19.7276, (float) 95.2381),
+    new CoordRec((float) 14.9657, (float) 80.9524),
+    new CoordRec((float) 14.9657, (float) 0),
+};
+
+static final CoordRec char102_stroke1[] = {
+    new CoordRec((float) 0.68, (float) 66.6667),
+    new CoordRec((float) 34.0133, (float) 66.6667),
+};
+
+static final StrokeRec char102[] = {
+   new StrokeRec(5, char102_stroke0),
+   new StrokeRec(2, char102_stroke1),
+};
+
+/* char: 103 'g' */
+
+static final CoordRec char103_stroke0[] = {
+    new CoordRec((float) 62.5029, (float) 66.6667),
+    new CoordRec((float) 62.5029, (float) -9.5238),
+    new CoordRec((float) 57.741, (float) -23.8095),
+    new CoordRec((float) 52.979, (float) -28.5714),
+    new CoordRec((float) 43.4552, (float) -33.3333),
+    new CoordRec((float) 29.1695, (float) -33.3333),
+    new CoordRec((float) 19.6457, (float) -28.5714),
+};
+
+static final CoordRec char103_stroke1[] = {
+    new CoordRec((float) 62.5029, (float) 52.381),
+    new CoordRec((float) 52.979, (float) 61.9048),
+    new CoordRec((float) 43.4552, (float) 66.6667),
+    new CoordRec((float) 29.1695, (float) 66.6667),
+    new CoordRec((float) 19.6457, (float) 61.9048),
+    new CoordRec((float) 10.1219, (float) 52.381),
+    new CoordRec((float) 5.36, (float) 38.0952),
+    new CoordRec((float) 5.36, (float) 28.5714),
+    new CoordRec((float) 10.1219, (float) 14.2857),
+    new CoordRec((float) 19.6457, (float) 4.7619),
+    new CoordRec((float) 29.1695, (float) 0),
+    new CoordRec((float) 43.4552, (float) 0),
+    new CoordRec((float) 52.979, (float) 4.7619),
+    new CoordRec((float) 62.5029, (float) 14.2857),
+};
+
+static final StrokeRec char103[] = {
+   new StrokeRec(7, char103_stroke0),
+   new StrokeRec(14, char103_stroke1),
+};
+
+/* char: 104 'h' */
+
+static final CoordRec char104_stroke0[] = {
+    new CoordRec((float) 9.6, (float) 100),
+    new CoordRec((float) 9.6, (float) 0),
+};
+
+static final CoordRec char104_stroke1[] = {
+    new CoordRec((float) 9.6, (float) 47.619),
+    new CoordRec((float) 23.8857, (float) 61.9048),
+    new CoordRec((float) 33.4095, (float) 66.6667),
+    new CoordRec((float) 47.6952, (float) 66.6667),
+    new CoordRec((float) 57.219, (float) 61.9048),
+    new CoordRec((float) 61.981, (float) 47.619),
+    new CoordRec((float) 61.981, (float) 0),
+};
+
+static final StrokeRec char104[] = {
+   new StrokeRec(2, char104_stroke0),
+   new StrokeRec(7, char104_stroke1),
+};
+
+/* char: 105 'i' */
+
+static final CoordRec char105_stroke0[] = {
+    new CoordRec((float) 10.02, (float) 100),
+    new CoordRec((float) 14.7819, (float) 95.2381),
+    new CoordRec((float) 19.5438, (float) 100),
+    new CoordRec((float) 14.7819, (float) 104.762),
+    new CoordRec((float) 10.02, (float) 100),
+};
+
+static final CoordRec char105_stroke1[] = {
+    new CoordRec((float) 14.7819, (float) 66.6667),
+    new CoordRec((float) 14.7819, (float) 0),
+};
+
+static final StrokeRec char105[] = {
+   new StrokeRec(5, char105_stroke0),
+   new StrokeRec(2, char105_stroke1),
+};
+
+/* char: 106 'j' */
+
+static final CoordRec char106_stroke0[] = {
+    new CoordRec((float) 17.3876, (float) 100),
+    new CoordRec((float) 22.1495, (float) 95.2381),
+    new CoordRec((float) 26.9114, (float) 100),
+    new CoordRec((float) 22.1495, (float) 104.762),
+    new CoordRec((float) 17.3876, (float) 100),
+};
+
+static final CoordRec char106_stroke1[] = {
+    new CoordRec((float) 22.1495, (float) 66.6667),
+    new CoordRec((float) 22.1495, (float) -14.2857),
+    new CoordRec((float) 17.3876, (float) -28.5714),
+    new CoordRec((float) 7.8638, (float) -33.3333),
+    new CoordRec((float)-1.66, (float) -33.3333),
+};
+
+static final StrokeRec char106[] = {
+   new StrokeRec(5, char106_stroke0),
+   new StrokeRec(5, char106_stroke1),
+};
+
+/* char: 107 'k' */
+
+static final CoordRec char107_stroke0[] = {
+    new CoordRec((float) 9.6, (float) 100),
+    new CoordRec((float) 9.6, (float) 0),
+};
+
+static final CoordRec char107_stroke1[] = {
+    new CoordRec((float) 57.219, (float) 66.6667),
+    new CoordRec((float) 9.6, (float) 19.0476),
+};
+
+static final CoordRec char107_stroke2[] = {
+    new CoordRec((float) 28.6476, (float) 38.0952),
+    new CoordRec((float) 61.981, (float) 0),
+};
+
+static final StrokeRec char107[] = {
+   new StrokeRec(2, char107_stroke0),
+   new StrokeRec(2, char107_stroke1),
+   new StrokeRec(2, char107_stroke2),
+};
+
+/* char: 108 'l' */
+
+static final CoordRec char108_stroke0[] = {
+    new CoordRec((float) 10.02, (float) 100),
+    new CoordRec((float) 10.02, (float) 0),
+};
+
+static final StrokeRec char108[] = {
+   new StrokeRec(2, char108_stroke0),
+};
+
+/* char: 109 'm' */
+
+static final CoordRec char109_stroke0[] = {
+    new CoordRec((float) 9.6, (float) 66.6667),
+    new CoordRec((float) 9.6, (float) 0),
+};
+
+static final CoordRec char109_stroke1[] = {
+    new CoordRec((float) 9.6, (float) 47.619),
+    new CoordRec((float) 23.8857, (float) 61.9048),
+    new CoordRec((float) 33.4095, (float) 66.6667),
+    new CoordRec((float) 47.6952, (float) 66.6667),
+    new CoordRec((float) 57.219, (float) 61.9048),
+    new CoordRec((float) 61.981, (float) 47.619),
+    new CoordRec((float) 61.981, (float) 0),
+};
+
+static final CoordRec char109_stroke2[] = {
+    new CoordRec((float) 61.981, (float) 47.619),
+    new CoordRec((float) 76.2667, (float) 61.9048),
+    new CoordRec((float) 85.7905, (float) 66.6667),
+    new CoordRec((float) 100.076, (float) 66.6667),
+    new CoordRec((float) 109.6, (float) 61.9048),
+    new CoordRec((float) 114.362, (float) 47.619),
+    new CoordRec((float) 114.362, (float) 0),
+};
+
+static final StrokeRec char109[] = {
+   new StrokeRec(2, char109_stroke0),
+   new StrokeRec(7, char109_stroke1),
+   new StrokeRec(7, char109_stroke2),
+};
+
+/* char: 110 'n' */
+
+static final CoordRec char110_stroke0[] = {
+    new CoordRec((float) 9.18, (float) 66.6667),
+    new CoordRec((float) 9.18, (float) 0),
+};
+
+static final CoordRec char110_stroke1[] = {
+    new CoordRec((float) 9.18, (float) 47.619),
+    new CoordRec((float) 23.4657, (float) 61.9048),
+    new CoordRec((float) 32.9895, (float) 66.6667),
+    new CoordRec((float) 47.2752, (float) 66.6667),
+    new CoordRec((float) 56.799, (float) 61.9048),
+    new CoordRec((float) 61.561, (float) 47.619),
+    new CoordRec((float) 61.561, (float) 0),
+};
+
+static final StrokeRec char110[] = {
+   new StrokeRec(2, char110_stroke0),
+   new StrokeRec(7, char110_stroke1),
+};
+
+/* char: 111 'o' */
+
+static final CoordRec char111_stroke0[] = {
+    new CoordRec((float) 28.7895, (float) 66.6667),
+    new CoordRec((float) 19.2657, (float) 61.9048),
+    new CoordRec((float) 9.7419, (float) 52.381),
+    new CoordRec((float) 4.98, (float) 38.0952),
+    new CoordRec((float) 4.98, (float) 28.5714),
+    new CoordRec((float) 9.7419, (float) 14.2857),
+    new CoordRec((float) 19.2657, (float) 4.7619),
+    new CoordRec((float) 28.7895, (float) 0),
+    new CoordRec((float) 43.0752, (float) 0),
+    new CoordRec((float) 52.599, (float) 4.7619),
+    new CoordRec((float) 62.1229, (float) 14.2857),
+    new CoordRec((float) 66.8848, (float) 28.5714),
+    new CoordRec((float) 66.8848, (float) 38.0952),
+    new CoordRec((float) 62.1229, (float) 52.381),
+    new CoordRec((float) 52.599, (float) 61.9048),
+    new CoordRec((float) 43.0752, (float) 66.6667),
+    new CoordRec((float) 28.7895, (float) 66.6667),
+};
+
+static final StrokeRec char111[] = {
+   new StrokeRec(17, char111_stroke0),
+};
+
+/* char: 112 'p' */
+
+static final CoordRec char112_stroke0[] = {
+    new CoordRec((float) 9.46, (float) 66.6667),
+    new CoordRec((float) 9.46, (float) -33.3333),
+};
+
+static final CoordRec char112_stroke1[] = {
+    new CoordRec((float) 9.46, (float) 52.381),
+    new CoordRec((float) 18.9838, (float) 61.9048),
+    new CoordRec((float) 28.5076, (float) 66.6667),
+    new CoordRec((float) 42.7933, (float) 66.6667),
+    new CoordRec((float) 52.3171, (float) 61.9048),
+    new CoordRec((float) 61.841, (float) 52.381),
+    new CoordRec((float) 66.6029, (float) 38.0952),
+    new CoordRec((float) 66.6029, (float) 28.5714),
+    new CoordRec((float) 61.841, (float) 14.2857),
+    new CoordRec((float) 52.3171, (float) 4.7619),
+    new CoordRec((float) 42.7933, (float) 0),
+    new CoordRec((float) 28.5076, (float) 0),
+    new CoordRec((float) 18.9838, (float) 4.7619),
+    new CoordRec((float) 9.46, (float) 14.2857),
+};
+
+static final StrokeRec char112[] = {
+   new StrokeRec(2, char112_stroke0),
+   new StrokeRec(14, char112_stroke1),
+};
+
+/* char: 113 'q' */
+
+static final CoordRec char113_stroke0[] = {
+    new CoordRec((float) 61.9829, (float) 66.6667),
+    new CoordRec((float) 61.9829, (float) -33.3333),
+};
+
+static final CoordRec char113_stroke1[] = {
+    new CoordRec((float) 61.9829, (float) 52.381),
+    new CoordRec((float) 52.459, (float) 61.9048),
+    new CoordRec((float) 42.9352, (float) 66.6667),
+    new CoordRec((float) 28.6495, (float) 66.6667),
+    new CoordRec((float) 19.1257, (float) 61.9048),
+    new CoordRec((float) 9.6019, (float) 52.381),
+    new CoordRec((float) 4.84, (float) 38.0952),
+    new CoordRec((float) 4.84, (float) 28.5714),
+    new CoordRec((float) 9.6019, (float) 14.2857),
+    new CoordRec((float) 19.1257, (float) 4.7619),
+    new CoordRec((float) 28.6495, (float) 0),
+    new CoordRec((float) 42.9352, (float) 0),
+    new CoordRec((float) 52.459, (float) 4.7619),
+    new CoordRec((float) 61.9829, (float) 14.2857),
+};
+
+static final StrokeRec char113[] = {
+   new StrokeRec(2, char113_stroke0),
+   new StrokeRec(14, char113_stroke1),
+};
+
+/* char: 114 'r' */
+
+static final CoordRec char114_stroke0[] = {
+    new CoordRec((float) 9.46, (float) 66.6667),
+    new CoordRec((float) 9.46, (float) 0),
+};
+
+static final CoordRec char114_stroke1[] = {
+    new CoordRec((float) 9.46, (float) 38.0952),
+    new CoordRec((float) 14.2219, (float) 52.381),
+    new CoordRec((float) 23.7457, (float) 61.9048),
+    new CoordRec((float) 33.2695, (float) 66.6667),
+    new CoordRec((float) 47.5552, (float) 66.6667),
+};
+
+static final StrokeRec char114[] = {
+   new StrokeRec(2, char114_stroke0),
+   new StrokeRec(5, char114_stroke1),
+};
+
+/* char: 115 's' */
+
+static final CoordRec char115_stroke0[] = {
+    new CoordRec((float) 57.081, (float) 52.381),
+    new CoordRec((float) 52.319, (float) 61.9048),
+    new CoordRec((float) 38.0333, (float) 66.6667),
+    new CoordRec((float) 23.7476, (float) 66.6667),
+    new CoordRec((float) 9.4619, (float) 61.9048),
+    new CoordRec((float) 4.7, (float) 52.381),
+    new CoordRec((float) 9.4619, (float) 42.8571),
+    new CoordRec((float) 18.9857, (float) 38.0952),
+    new CoordRec((float) 42.7952, (float) 33.3333),
+    new CoordRec((float) 52.319, (float) 28.5714),
+    new CoordRec((float) 57.081, (float) 19.0476),
+    new CoordRec((float) 57.081, (float) 14.2857),
+    new CoordRec((float) 52.319, (float) 4.7619),
+    new CoordRec((float) 38.0333, (float) 0),
+    new CoordRec((float) 23.7476, (float) 0),
+    new CoordRec((float) 9.4619, (float) 4.7619),
+    new CoordRec((float) 4.7, (float) 14.2857),
+};
+
+static final StrokeRec char115[] = {
+   new StrokeRec(17, char115_stroke0),
+};
+
+/* char: 116 't' */
+
+static final CoordRec char116_stroke0[] = {
+    new CoordRec((float) 14.8257, (float) 100),
+    new CoordRec((float) 14.8257, (float) 19.0476),
+    new CoordRec((float) 19.5876, (float) 4.7619),
+    new CoordRec((float) 29.1114, (float) 0),
+    new CoordRec((float) 38.6352, (float) 0),
+};
+
+static final CoordRec char116_stroke1[] = {
+    new CoordRec((float) 0.54, (float) 66.6667),
+    new CoordRec((float) 33.8733, (float) 66.6667),
+};
+
+static final StrokeRec char116[] = {
+   new StrokeRec(5, char116_stroke0),
+   new StrokeRec(2, char116_stroke1),
+};
+
+/* char: 117 'u' */
+
+static final CoordRec char117_stroke0[] = {
+    new CoordRec((float) 9.46, (float) 66.6667),
+    new CoordRec((float) 9.46, (float) 19.0476),
+    new CoordRec((float) 14.2219, (float) 4.7619),
+    new CoordRec((float) 23.7457, (float) 0),
+    new CoordRec((float) 38.0314, (float) 0),
+    new CoordRec((float) 47.5552, (float) 4.7619),
+    new CoordRec((float) 61.841, (float) 19.0476),
+};
+
+static final CoordRec char117_stroke1[] = {
+    new CoordRec((float) 61.841, (float) 66.6667),
+    new CoordRec((float) 61.841, (float) 0),
+};
+
+static final StrokeRec char117[] = {
+   new StrokeRec(7, char117_stroke0),
+   new StrokeRec(2, char117_stroke1),
+};
+
+/* char: 118 'v' */
+
+static final CoordRec char118_stroke0[] = {
+    new CoordRec((float) 1.8, (float) 66.6667),
+    new CoordRec((float) 30.3714, (float) 0),
+};
+
+static final CoordRec char118_stroke1[] = {
+    new CoordRec((float) 58.9429, (float) 66.6667),
+    new CoordRec((float) 30.3714, (float) 0),
+};
+
+static final StrokeRec char118[] = {
+   new StrokeRec(2, char118_stroke0),
+   new StrokeRec(2, char118_stroke1),
+};
+
+/* char: 119 'w' */
+
+static final CoordRec char119_stroke0[] = {
+    new CoordRec((float) 2.5, (float) 66.6667),
+    new CoordRec((float) 21.5476, (float) 0),
+};
+
+static final CoordRec char119_stroke1[] = {
+    new CoordRec((float) 40.5952, (float) 66.6667),
+    new CoordRec((float) 21.5476, (float) 0),
+};
+
+static final CoordRec char119_stroke2[] = {
+    new CoordRec((float) 40.5952, (float) 66.6667),
+    new CoordRec((float) 59.6429, (float) 0),
+};
+
+static final CoordRec char119_stroke3[] = {
+    new CoordRec((float) 78.6905, (float) 66.6667),
+    new CoordRec((float) 59.6429, (float) 0),
+};
+
+static final StrokeRec char119[] = {
+   new StrokeRec(2, char119_stroke0),
+   new StrokeRec(2, char119_stroke1),
+   new StrokeRec(2, char119_stroke2),
+   new StrokeRec(2, char119_stroke3),
+};
+
+/* char: 120 'x' */
+
+static final CoordRec char120_stroke0[] = {
+    new CoordRec((float) 1.66, (float) 66.6667),
+    new CoordRec((float) 54.041, (float) 0),
+};
+
+static final CoordRec char120_stroke1[] = {
+    new CoordRec((float) 54.041, (float) 66.6667),
+    new CoordRec((float) 1.66, (float) 0),
+};
+
+static final StrokeRec char120[] = {
+   new StrokeRec(2, char120_stroke0),
+   new StrokeRec(2, char120_stroke1),
+};
+
+/* char: 121 'y' */
+
+static final CoordRec char121_stroke0[] = {
+    new CoordRec((float) 6.5619, (float) 66.6667),
+    new CoordRec((float) 35.1333, (float) 0),
+};
+
+static final CoordRec char121_stroke1[] = {
+    new CoordRec((float) 63.7048, (float) 66.6667),
+    new CoordRec((float) 35.1333, (float) 0),
+    new CoordRec((float) 25.6095, (float) -19.0476),
+    new CoordRec((float) 16.0857, (float) -28.5714),
+    new CoordRec((float) 6.5619, (float) -33.3333),
+    new CoordRec((float) 1.8, (float) -33.3333),
+};
+
+static final StrokeRec char121[] = {
+   new StrokeRec(2, char121_stroke0),
+   new StrokeRec(6, char121_stroke1),
+};
+
+/* char: 122 'z' */
+
+static final CoordRec char122_stroke0[] = {
+    new CoordRec((float) 56.821, (float) 66.6667),
+    new CoordRec((float) 4.44, (float) 0),
+};
+
+static final CoordRec char122_stroke1[] = {
+    new CoordRec((float) 4.44, (float) 66.6667),
+    new CoordRec((float) 56.821, (float) 66.6667),
+};
+
+static final CoordRec char122_stroke2[] = {
+    new CoordRec((float) 4.44, (float) 0),
+    new CoordRec((float) 56.821, (float) 0),
+};
+
+static final StrokeRec char122[] = {
+   new StrokeRec(2, char122_stroke0),
+   new StrokeRec(2, char122_stroke1),
+   new StrokeRec(2, char122_stroke2),
+};
+
+/* char: 123 '{' */
+
+static final CoordRec char123_stroke0[] = {
+    new CoordRec((float) 31.1895, (float) 119.048),
+    new CoordRec((float) 21.6657, (float) 114.286),
+    new CoordRec((float) 16.9038, (float) 109.524),
+    new CoordRec((float) 12.1419, (float) 100),
+    new CoordRec((float) 12.1419, (float) 90.4762),
+    new CoordRec((float) 16.9038, (float) 80.9524),
+    new CoordRec((float) 21.6657, (float) 76.1905),
+    new CoordRec((float) 26.4276, (float) 66.6667),
+    new CoordRec((float) 26.4276, (float) 57.1429),
+    new CoordRec((float) 16.9038, (float) 47.619),
+};
+
+static final CoordRec char123_stroke1[] = {
+    new CoordRec((float) 21.6657, (float) 114.286),
+    new CoordRec((float) 16.9038, (float) 104.762),
+    new CoordRec((float) 16.9038, (float) 95.2381),
+    new CoordRec((float) 21.6657, (float) 85.7143),
+    new CoordRec((float) 26.4276, (float) 80.9524),
+    new CoordRec((float) 31.1895, (float) 71.4286),
+    new CoordRec((float) 31.1895, (float) 61.9048),
+    new CoordRec((float) 26.4276, (float) 52.381),
+    new CoordRec((float) 7.38, (float) 42.8571),
+    new CoordRec((float) 26.4276, (float) 33.3333),
+    new CoordRec((float) 31.1895, (float) 23.8095),
+    new CoordRec((float) 31.1895, (float) 14.2857),
+    new CoordRec((float) 26.4276, (float) 4.7619),
+    new CoordRec((float) 21.6657, (float) 0),
+    new CoordRec((float) 16.9038, (float) -9.5238),
+    new CoordRec((float) 16.9038, (float) -19.0476),
+    new CoordRec((float) 21.6657, (float) -28.5714),
+};
+
+static final CoordRec char123_stroke2[] = {
+    new CoordRec((float) 16.9038, (float) 38.0952),
+    new CoordRec((float) 26.4276, (float) 28.5714),
+    new CoordRec((float) 26.4276, (float) 19.0476),
+    new CoordRec((float) 21.6657, (float) 9.5238),
+    new CoordRec((float) 16.9038, (float) 4.7619),
+    new CoordRec((float) 12.1419, (float) -4.7619),
+    new CoordRec((float) 12.1419, (float) -14.2857),
+    new CoordRec((float) 16.9038, (float) -23.8095),
+    new CoordRec((float) 21.6657, (float) -28.5714),
+    new CoordRec((float) 31.1895, (float) -33.3333),
+};
+
+static final StrokeRec char123[] = {
+   new StrokeRec(10, char123_stroke0),
+   new StrokeRec(17, char123_stroke1),
+   new StrokeRec(10, char123_stroke2),
+};
+
+/* char: 124 '|' */
+
+static final CoordRec char124_stroke0[] = {
+    new CoordRec((float) 11.54, (float) 119.048),
+    new CoordRec((float) 11.54, (float) -33.3333),
+};
+
+static final StrokeRec char124[] = {
+   new StrokeRec(2, char124_stroke0),
+};
+
+/* char: 125 '}' */
+
+static final CoordRec char125_stroke0[] = {
+    new CoordRec((float) 9.18, (float) 119.048),
+    new CoordRec((float) 18.7038, (float) 114.286),
+    new CoordRec((float) 23.4657, (float) 109.524),
+    new CoordRec((float) 28.2276, (float) 100),
+    new CoordRec((float) 28.2276, (float) 90.4762),
+    new CoordRec((float) 23.4657, (float) 80.9524),
+    new CoordRec((float) 18.7038, (float) 76.1905),
+    new CoordRec((float) 13.9419, (float) 66.6667),
+    new CoordRec((float) 13.9419, (float) 57.1429),
+    new CoordRec((float) 23.4657, (float) 47.619),
+};
+
+static final CoordRec char125_stroke1[] = {
+    new CoordRec((float) 18.7038, (float) 114.286),
+    new CoordRec((float) 23.4657, (float) 104.762),
+    new CoordRec((float) 23.4657, (float) 95.2381),
+    new CoordRec((float) 18.7038, (float) 85.7143),
+    new CoordRec((float) 13.9419, (float) 80.9524),
+    new CoordRec((float) 9.18, (float) 71.4286),
+    new CoordRec((float) 9.18, (float) 61.9048),
+    new CoordRec((float) 13.9419, (float) 52.381),
+    new CoordRec((float) 32.9895, (float) 42.8571),
+    new CoordRec((float) 13.9419, (float) 33.3333),
+    new CoordRec((float) 9.18, (float) 23.8095),
+    new CoordRec((float) 9.18, (float) 14.2857),
+    new CoordRec((float) 13.9419, (float) 4.7619),
+    new CoordRec((float) 18.7038, (float) 0),
+    new CoordRec((float) 23.4657, (float) -9.5238),
+    new CoordRec((float) 23.4657, (float) -19.0476),
+    new CoordRec((float) 18.7038, (float) -28.5714),
+};
+
+static final CoordRec char125_stroke2[] = {
+    new CoordRec((float) 23.4657, (float) 38.0952),
+    new CoordRec((float) 13.9419, (float) 28.5714),
+    new CoordRec((float) 13.9419, (float) 19.0476),
+    new CoordRec((float) 18.7038, (float) 9.5238),
+    new CoordRec((float) 23.4657, (float) 4.7619),
+    new CoordRec((float) 28.2276, (float) -4.7619),
+    new CoordRec((float) 28.2276, (float) -14.2857),
+    new CoordRec((float) 23.4657, (float) -23.8095),
+    new CoordRec((float) 18.7038, (float) -28.5714),
+    new CoordRec((float) 9.18, (float) -33.3333),
+};
+
+static final StrokeRec char125[] = {
+   new StrokeRec(10, char125_stroke0),
+   new StrokeRec(17, char125_stroke1),
+   new StrokeRec(10, char125_stroke2),
+};
+
+/* char: 126 '~' */
+
+static final CoordRec char126_stroke0[] = {
+    new CoordRec((float) 2.92, (float) 28.5714),
+    new CoordRec((float) 2.92, (float) 38.0952),
+    new CoordRec((float) 7.6819, (float) 52.381),
+    new CoordRec((float) 17.2057, (float) 57.1429),
+    new CoordRec((float) 26.7295, (float) 57.1429),
+    new CoordRec((float) 36.2533, (float) 52.381),
+    new CoordRec((float) 55.301, (float) 38.0952),
+    new CoordRec((float) 64.8248, (float) 33.3333),
+    new CoordRec((float) 74.3486, (float) 33.3333),
+    new CoordRec((float) 83.8724, (float) 38.0952),
+    new CoordRec((float) 88.6343, (float) 47.619),
+};
+
+static final CoordRec char126_stroke1[] = {
+    new CoordRec((float) 2.92, (float) 38.0952),
+    new CoordRec((float) 7.6819, (float) 47.619),
+    new CoordRec((float) 17.2057, (float) 52.381),
+    new CoordRec((float) 26.7295, (float) 52.381),
+    new CoordRec((float) 36.2533, (float) 47.619),
+    new CoordRec((float) 55.301, (float) 33.3333),
+    new CoordRec((float) 64.8248, (float) 28.5714),
+    new CoordRec((float) 74.3486, (float) 28.5714),
+    new CoordRec((float) 83.8724, (float) 33.3333),
+    new CoordRec((float) 88.6343, (float) 47.619),
+    new CoordRec((float) 88.6343, (float) 57.1429),
+};
+
+static final StrokeRec char126[] = {
+   new StrokeRec(11, char126_stroke0),
+   new StrokeRec(11, char126_stroke1),
+};
+
+/* char: 127 */
+
+static final CoordRec char127_stroke0[] = {
+    new CoordRec((float) 52.381, (float) 100),
+    new CoordRec((float) 14.2857, (float) -33.3333),
+};
+
+static final CoordRec char127_stroke1[] = {
+    new CoordRec((float) 28.5714, (float) 66.6667),
+    new CoordRec((float) 14.2857, (float) 61.9048),
+    new CoordRec((float) 4.7619, (float) 52.381),
+    new CoordRec((float) 0, (float) 38.0952),
+    new CoordRec((float) 0, (float) 23.8095),
+    new CoordRec((float) 4.7619, (float) 14.2857),
+    new CoordRec((float) 14.2857, (float) 4.7619),
+    new CoordRec((float) 28.5714, (float) 0),
+    new CoordRec((float) 38.0952, (float) 0),
+    new CoordRec((float) 52.381, (float) 4.7619),
+    new CoordRec((float) 61.9048, (float) 14.2857),
+    new CoordRec((float) 66.6667, (float) 28.5714),
+    new CoordRec((float) 66.6667, (float) 42.8571),
+    new CoordRec((float) 61.9048, (float) 52.381),
+    new CoordRec((float) 52.381, (float) 61.9048),
+    new CoordRec((float) 38.0952, (float) 66.6667),
+    new CoordRec((float) 28.5714, (float) 66.6667),
+};
+
+static final StrokeRec char127[] = {
+   new StrokeRec(2, char127_stroke0),
+   new StrokeRec(17, char127_stroke1),
+};
+
+static final StrokeCharRec chars[] = {
+    new StrokeCharRec( 0, /* char0 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char1 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char2 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char3 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char4 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char5 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char6 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char7 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char8 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char9 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char10 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char11 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char12 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char13 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char14 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char15 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char16 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char17 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char18 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char19 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char20 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char21 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char22 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char23 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char24 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char25 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char26 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char27 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char28 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char29 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char30 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char31 */ null, (float) 0, (float) 0 ),
+    new StrokeCharRec( 0, /* char32 */ null, (float) 52.381, (float) 104.762 ),
+    new StrokeCharRec( 2, char33, (float) 13.3819, (float) 26.6238 ),
+    new StrokeCharRec( 2, char34, (float) 23.0676, (float) 51.4352 ),
+    new StrokeCharRec( 4, char35, (float) 36.5333, (float) 79.4886 ),
+    new StrokeCharRec( 3, char36, (float) 38.1533, (float) 76.2067 ),
+    new StrokeCharRec( 3, char37, (float) 49.2171, (float) 96.5743 ),
+    new StrokeCharRec( 1, char38, (float) 53.599, (float) 101.758 ),
+    new StrokeCharRec( 1, char39, (float) 4.44, (float) 13.62 ),
+    new StrokeCharRec( 1, char40, (float) 21.8657, (float) 47.1733 ),
+    new StrokeCharRec( 1, char41, (float) 24.3276, (float) 47.5333 ),
+    new StrokeCharRec( 3, char42, (float) 30.7695, (float) 59.439 ),
+    new StrokeCharRec( 2, char43, (float) 48.8371, (float) 97.2543 ),
+    new StrokeCharRec( 1, char44, (float) 13.5219, (float) 26.0638 ),
+    new StrokeCharRec( 1, char45, (float) 50.2371, (float) 100.754 ),
+    new StrokeCharRec( 1, char46, (float) 13.1019, (float) 26.4838 ),
+    new StrokeCharRec( 1, char47, (float) 40.5733, (float) 82.1067 ),
+    new StrokeCharRec( 1, char48, (float) 38.3133, (float) 77.0667 ),
+    new StrokeCharRec( 1, char49, (float) 30.8676, (float) 66.5295 ),
+    new StrokeCharRec( 1, char50, (float) 38.7533, (float) 77.6467 ),
+    new StrokeCharRec( 1, char51, (float) 38.3333, (float) 77.0467 ),
+    new StrokeCharRec( 2, char52, (float) 37.2133, (float) 80.1686 ),
+    new StrokeCharRec( 1, char53, (float) 38.1933, (float) 77.6867 ),
+    new StrokeCharRec( 1, char54, (float) 34.1514, (float) 73.8048 ),
+    new StrokeCharRec( 2, char55, (float) 38.8933, (float) 77.2267 ),
+    new StrokeCharRec( 1, char56, (float) 38.9333, (float) 77.6667 ),
+    new StrokeCharRec( 1, char57, (float) 39.9333, (float) 74.0648 ),
+    new StrokeCharRec( 2, char58, (float) 14.0819, (float) 26.2238 ),
+    new StrokeCharRec( 2, char59, (float) 12.9619, (float) 26.3038 ),
+    new StrokeCharRec( 1, char60, (float) 41.1552, (float) 81.6105 ),
+    new StrokeCharRec( 2, char61, (float) 48.5571, (float) 97.2543 ),
+    new StrokeCharRec( 1, char62, (float) 40.8752, (float) 81.6105 ),
+    new StrokeCharRec( 2, char63, (float) 36.9914, (float) 73.9029 ),
+    new StrokeCharRec( 2, char64, (float) 34.9314, (float) 74.3648 ),
+    new StrokeCharRec( 3, char65, (float) 40.5952, (float) 80.4905 ),
+    new StrokeCharRec( 3, char66, (float) 44.7533, (float) 83.6267 ),
+    new StrokeCharRec( 1, char67, (float) 39.9933, (float) 84.4886 ),
+    new StrokeCharRec( 2, char68, (float) 45.2933, (float) 85.2867 ),
+    new StrokeCharRec( 4, char69, (float) 39.9914, (float) 78.1848 ),
+    new StrokeCharRec( 3, char70, (float) 39.9914, (float) 78.7448 ),
+    new StrokeCharRec( 2, char71, (float) 40.3933, (float) 89.7686 ),
+    new StrokeCharRec( 3, char72, (float) 44.7533, (float) 89.0867 ),
+    new StrokeCharRec( 1, char73, (float) 10.86, (float) 21.3 ),
+    new StrokeCharRec( 1, char74, (float) 31.0714, (float) 59.999 ),
+    new StrokeCharRec( 3, char75, (float) 44.6133, (float) 79.3267 ),
+    new StrokeCharRec( 2, char76, (float) 40.2514, (float) 71.3229 ),
+    new StrokeCharRec( 4, char77, (float) 48.9552, (float) 97.2105 ),
+    new StrokeCharRec( 3, char78, (float) 44.4733, (float) 88.8067 ),
+    new StrokeCharRec( 1, char79, (float) 44.3352, (float) 88.8305 ),
+    new StrokeCharRec( 2, char80, (float) 45.4333, (float) 85.6667 ),
+    new StrokeCharRec( 2, char81, (float) 43.3952, (float) 88.0905 ),
+    new StrokeCharRec( 3, char82, (float) 45.0133, (float) 82.3667 ),
+    new StrokeCharRec( 1, char83, (float) 41.3333, (float) 80.8267 ),
+    new StrokeCharRec( 2, char84, (float) 35.6933, (float) 71.9467 ),
+    new StrokeCharRec( 1, char85, (float) 44.8733, (float) 89.4867 ),
+    new StrokeCharRec( 2, char86, (float) 40.4552, (float) 81.6105 ),
+    new StrokeCharRec( 4, char87, (float) 49.839, (float) 100.518 ),
+    new StrokeCharRec( 2, char88, (float) 35.8333, (float) 72.3667 ),
+    new StrokeCharRec( 2, char89, (float) 39.6152, (float) 79.6505 ),
+    new StrokeCharRec( 3, char90, (float) 35.8333, (float) 73.7467 ),
+    new StrokeCharRec( 4, char91, (float) 22.0657, (float) 46.1133 ),
+    new StrokeCharRec( 1, char92, (float) 39.1733, (float) 78.2067 ),
+    new StrokeCharRec( 4, char93, (float) 23.4876, (float) 46.3933 ),
+    new StrokeCharRec( 2, char94, (float) 44.0752, (float) 90.2305 ),
+    new StrokeCharRec( 1, char95, (float) 51.281, (float) 104.062 ),
+    new StrokeCharRec( 2, char96, (float) 42.5457, (float) 83.5714 ),
+    new StrokeCharRec( 2, char97, (float) 35.2514, (float) 66.6029 ),
+    new StrokeCharRec( 2, char98, (float) 37.3314, (float) 70.4629 ),
+    new StrokeCharRec( 1, char99, (float) 34.0914, (float) 68.9229 ),
+    new StrokeCharRec( 2, char100, (float) 33.2114, (float) 70.2629 ),
+    new StrokeCharRec( 1, char101, (float) 34.2914, (float) 68.5229 ),
+    new StrokeCharRec( 2, char102, (float) 14.9657, (float) 38.6552 ),
+    new StrokeCharRec( 2, char103, (float) 33.9314, (float) 70.9829 ),
+    new StrokeCharRec( 2, char104, (float) 33.4095, (float) 71.021 ),
+    new StrokeCharRec( 2, char105, (float) 14.7819, (float) 28.8638 ),
+    new StrokeCharRec( 2, char106, (float) 17.3876, (float) 36.2314 ),
+    new StrokeCharRec( 3, char107, (float) 33.4095, (float) 62.521 ),
+    new StrokeCharRec( 1, char108, (float) 10.02, (float) 19.34 ),
+    new StrokeCharRec( 3, char109, (float) 61.981, (float) 123.962 ),
+    new StrokeCharRec( 2, char110, (float) 32.9895, (float) 70.881 ),
+    new StrokeCharRec( 1, char111, (float) 33.5514, (float) 71.7448 ),
+    new StrokeCharRec( 2, char112, (float) 38.0314, (float) 70.8029 ),
+    new StrokeCharRec( 2, char113, (float) 33.4114, (float) 70.7429 ),
+    new StrokeCharRec( 2, char114, (float) 23.7457, (float) 49.4952 ),
+    new StrokeCharRec( 1, char115, (float) 28.5095, (float) 62.321 ),
+    new StrokeCharRec( 2, char116, (float) 14.8257, (float) 39.3152 ),
+    new StrokeCharRec( 2, char117, (float) 33.2695, (float) 71.161 ),
+    new StrokeCharRec( 2, char118, (float) 30.3714, (float) 60.6029 ),
+    new StrokeCharRec( 4, char119, (float) 40.5952, (float) 80.4905 ),
+    new StrokeCharRec( 2, char120, (float) 25.4695, (float) 56.401 ),
+    new StrokeCharRec( 2, char121, (float) 35.1333, (float) 66.0648 ),
+    new StrokeCharRec( 3, char122, (float) 28.2495, (float) 61.821 ),
+    new StrokeCharRec( 3, char123, (float) 21.6657, (float) 41.6295 ),
+    new StrokeCharRec( 1, char124, (float) 11.54, (float) 23.78 ),
+    new StrokeCharRec( 3, char125, (float) 18.7038, (float) 41.4695 ),
+    new StrokeCharRec( 2, char126, (float) 45.7771, (float) 91.2743 ),
+    new StrokeCharRec( 2, char127, (float) 33.3333, (float) 66.6667 ),
+};
+
+public static final StrokeFontRec glutStrokeRoman = new StrokeFontRec( "Roman", 128, chars, (float) 119.048, (float) -33.3333 );
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeCharRec.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeCharRec.java
new file mode 100644
index 000000000..af3d538ae
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeCharRec.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
+
+/* This program is freely distributable without licensing fees 
+   and is provided without guarantee or warrantee expressed or 
+   implied. This program is -not- in the public domain. */
+
+class StrokeCharRec {
+  public int num_strokes;
+  public StrokeRec[] stroke;
+  public float center;
+  public float right;
+
+  public StrokeCharRec(int num_strokes,
+                StrokeRec[] stroke,
+                float center,
+                float right) {
+    this.num_strokes = num_strokes;
+    this.stroke = stroke;
+    this.center = center;
+    this.right = right;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeFontRec.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeFontRec.java
new file mode 100644
index 000000000..d3195f24d
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeFontRec.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
+
+/* This program is freely distributable without licensing fees 
+   and is provided without guarantee or warrantee expressed or 
+   implied. This program is -not- in the public domain. */
+
+class StrokeFontRec {
+  public String name;
+  public int num_chars;
+  public StrokeCharRec[] ch;
+  public float top;
+  public float bottom;
+
+  public StrokeFontRec(String name,
+                int num_chars,
+                StrokeCharRec[] ch,
+                float top,
+                float bottom) {
+    this.name = name;
+    this.num_chars = num_chars;
+    this.ch = ch;
+    this.top = top;
+    this.bottom = bottom;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeRec.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeRec.java
new file mode 100644
index 000000000..8796e8b08
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeRec.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.gl2;
+
+/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
+
+/* This program is freely distributable without licensing fees 
+   and is provided without guarantee or warrantee expressed or 
+   implied. This program is -not- in the public domain. */
+
+class StrokeRec {
+  public int num_coords;
+  public CoordRec[] coord;
+  
+  public StrokeRec(int num_coords,
+            CoordRec[] coord) {
+    this.num_coords = num_coords;
+    this.coord = coord;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/gl2/TileRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/TileRenderer.java
new file mode 100755
index 000000000..714c134d4
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/TileRenderer.java
@@ -0,0 +1,601 @@
+package com.jogamp.opengl.util.gl2;
+
+import java.awt.Dimension;
+import java.nio.Buffer;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+import javax.media.opengl.glu.gl2.*;
+
+/**
+ * A fairly direct port of Brian Paul's tile rendering library, found
+ * at <a href = "http://www.mesa3d.org/brianp/TR.html">
+ * http://www.mesa3d.org/brianp/TR.html </a> . I've java-fied it, but
+ * the functionality is the same.
+ * 
+ * Original code Copyright (C) 1997-2005 Brian Paul. Licensed under
+ * BSD-compatible terms with permission of the author. See LICENSE.txt
+ * for license information.
+ * 
+ * @author ryanm
+ */
+public class TileRenderer
+{
+  private static final int DEFAULT_TILE_WIDTH = 256;
+
+  private static final int DEFAULT_TILE_HEIGHT = 256;
+
+  private static final int DEFAULT_TILE_BORDER = 0;
+
+  //
+  // Enumeration flags for accessing variables
+  //
+  // @author ryanm
+  //
+
+  /**
+   * The width of a tile
+   */
+  public static final int TR_TILE_WIDTH = 0;
+  /**
+   * The height of a tile
+   */
+  public static final int TR_TILE_HEIGHT = 1;
+  /**
+   * The width of the border around the tiles
+   */
+  public static final int TR_TILE_BORDER = 2;
+  /**
+   * The width of the final image
+   */
+  public static final int TR_IMAGE_WIDTH = 3;
+  /**
+   * The height of the final image
+   */
+  public static final int TR_IMAGE_HEIGHT = 4;
+  /**
+   * The number of rows of tiles
+   */
+  public static final int TR_ROWS = 5;
+  /**
+   * The number of columns of tiles
+   */
+  public static final int TR_COLUMNS = 6;
+  /**
+   * The current row number
+   */
+  public static final int TR_CURRENT_ROW = 7;
+  /**
+   * The current column number
+   */
+  public static final int TR_CURRENT_COLUMN = 8;
+  /**
+   * The width of the current tile
+   */
+  public static final int TR_CURRENT_TILE_WIDTH = 9;
+  /**
+   * The height of the current tile
+   */
+  public static final int TR_CURRENT_TILE_HEIGHT = 10;
+  /**
+   * The order that the rows are traversed
+   */
+  public static final int TR_ROW_ORDER = 11;
+
+
+  /**
+   * Indicates we are traversing rows from the top to the bottom
+   */
+  public static final int TR_TOP_TO_BOTTOM = 1;
+
+  /**
+   * Indicates we are traversing rows from the bottom to the top
+   */
+  public static final int TR_BOTTOM_TO_TOP = 2;
+
+  /* Final image parameters */
+  private Dimension imageSize = new Dimension();
+
+  private int imageFormat, imageType;
+
+  private Buffer imageBuffer;
+
+  /* Tile parameters */
+  private Dimension tileSize = new Dimension();
+
+  private Dimension tileSizeNB = new Dimension();
+
+  private int tileBorder;
+
+  private int tileFormat, tileType;
+
+  private Buffer tileBuffer;
+
+  /* Projection parameters */
+  private boolean perspective;
+
+  private double left;
+
+  private double right;
+
+  private double bottom;
+
+  private double top;
+
+  private double near;
+
+  private double far;
+
+  /* Misc */
+  private int rowOrder;
+
+  private int rows, columns;
+
+  private int currentTile;
+
+  private int currentTileWidth, currentTileHeight;
+
+  private int currentRow, currentColumn;
+
+  private int[] viewportSave = new int[ 4 ];
+
+  /**
+   * Creates a new TileRenderer object
+   */
+  public TileRenderer()
+  {
+    tileSize.width = DEFAULT_TILE_WIDTH;
+    tileSize.height = DEFAULT_TILE_HEIGHT;
+    tileBorder = DEFAULT_TILE_BORDER;
+    rowOrder = TR_BOTTOM_TO_TOP;
+    currentTile = -1;
+  }
+
+  /**
+   * Sets up the number of rows and columns needed
+   */
+  private void setup()
+  {
+    columns = ( imageSize.width + tileSizeNB.width - 1 ) / tileSizeNB.width;
+    rows = ( imageSize.height + tileSizeNB.height - 1 ) / tileSizeNB.height;
+    currentTile = 0;
+
+    assert columns >= 0;
+    assert rows >= 0;
+  }
+
+  /**
+   * Sets the size of the tiles to use in rendering. The actual
+   * effective size of the tile depends on the border size, ie (
+   * width - 2*border ) * ( height - 2 * border )
+   * 
+   * @param width
+   *           The width of the tiles. Must not be larger than the GL
+   *           context
+   * @param height
+   *           The height of the tiles. Must not be larger than the
+   *           GL context
+   * @param border
+   *           The width of the borders on each tile. This is needed
+   *           to avoid artifacts when rendering lines or points with
+   *           thickness > 1.
+   */
+  public void setTileSize( int width, int height, int border )
+  {
+    assert ( border >= 0 );
+    assert ( width >= 1 );
+    assert ( height >= 1 );
+    assert ( width >= 2 * border );
+    assert ( height >= 2 * border );
+
+    tileBorder = border;
+    tileSize.width = width;
+    tileSize.height = height;
+    tileSizeNB.width = width - 2 * border;
+    tileSizeNB.height = height - 2 * border;
+    setup();
+  }
+
+  /**
+   * Specify a buffer the tiles to be copied to. This is not
+   * necessary for the creation of the final image, but useful if you
+   * want to inspect each tile in turn.
+   * 
+   * @param format
+   *           Interpreted as in glReadPixels
+   * @param type
+   *           Interpreted as in glReadPixels
+   * @param image
+   *           The buffer itself. Must be large enough to contain a
+   *           tile, minus any borders
+   */
+  public void setTileBuffer( int format, int type, Buffer image )
+  {
+    tileFormat = format;
+    tileType = type;
+    tileBuffer = image;
+  }
+
+  /**
+   * Sets the desired size of the final image
+   * 
+   * @param width
+   *           The width of the final image
+   * @param height
+   *           The height of the final image
+   */
+  public void setImageSize( int width, int height )
+  {
+    imageSize.width = width;
+    imageSize.height = height;
+    setup();
+  }
+
+  /**
+   * Sets the buffer in which to store the final image
+   * 
+   * @param format
+   *           Interpreted as in glReadPixels
+   * @param type
+   *           Interpreted as in glReadPixels
+   * @param image
+   *           the buffer itself, must be large enough to hold the
+   *           final image
+   */
+  public void setImageBuffer( int format, int type, Buffer image )
+  {
+    imageFormat = format;
+    imageType = type;
+    imageBuffer = image;
+  }
+
+  /**
+   * Gets the parameters of this TileRenderer object
+   * 
+   * @param param
+   *           The parameter that is to be retrieved
+   * @return the value of the parameter
+   */
+  public int getParam( int param )
+  {
+    switch (param) {
+      case TR_TILE_WIDTH:
+        return tileSize.width;
+      case TR_TILE_HEIGHT:
+        return tileSize.height;
+      case TR_TILE_BORDER:
+        return tileBorder;
+      case TR_IMAGE_WIDTH:
+        return imageSize.width;
+      case TR_IMAGE_HEIGHT:
+        return imageSize.height;
+      case TR_ROWS:
+        return rows;
+      case TR_COLUMNS:
+        return columns;
+      case TR_CURRENT_ROW:
+        if( currentTile < 0 )
+          return -1;
+        else
+          return currentRow;
+      case TR_CURRENT_COLUMN:
+        if( currentTile < 0 )
+          return -1;
+        else
+          return currentColumn;
+      case TR_CURRENT_TILE_WIDTH:
+        return currentTileWidth;
+      case TR_CURRENT_TILE_HEIGHT:
+        return currentTileHeight;
+      case TR_ROW_ORDER:
+        return rowOrder;
+      default:
+        throw new IllegalArgumentException("Invalid enumerant as argument");
+    }
+  }
+
+  /**
+   * Sets the order of row traversal
+   * 
+   * @param order
+   *           The row traversal order, must be
+   *           eitherTR_TOP_TO_BOTTOM or TR_BOTTOM_TO_TOP
+   */
+  public void setRowOrder( int order )
+  {
+    if (order == TR_TOP_TO_BOTTOM || order == TR_BOTTOM_TO_TOP) {
+      rowOrder = order;
+    } else {
+      throw new IllegalArgumentException("Must pass TR_TOP_TO_BOTTOM or TR_BOTTOM_TO_TOP");
+    }
+  }
+
+  /**
+   * Sets the context to use an orthographic projection. Must be
+   * called before rendering the first tile
+   * 
+   * @param left
+   *           As in glOrtho
+   * @param right
+   *           As in glOrtho
+   * @param bottom
+   *           As in glOrtho
+   * @param top
+   *           As in glOrtho
+   * @param zNear
+   *           As in glOrtho
+   * @param zFar
+   *           As in glOrtho
+   */
+  public void trOrtho( double left, double right, double bottom, double top, double zNear,
+                       double zFar )
+  {
+    this.perspective = false;
+    this.left = left;
+    this.right = right;
+    this.bottom = bottom;
+    this.top = top;
+    this.near = zNear;
+    this.far = zFar;
+  }
+
+  /**
+   * Sets the perspective projection frustrum. Must be called before
+   * rendering the first tile
+   * 
+   * @param left
+   *           As in glFrustrum
+   * @param right
+   *           As in glFrustrum
+   * @param bottom
+   *           As in glFrustrum
+   * @param top
+   *           As in glFrustrum
+   * @param zNear
+   *           As in glFrustrum
+   * @param zFar
+   *           As in glFrustrum
+   */
+  public void trFrustum( double left, double right, double bottom, double top, double zNear,
+                         double zFar )
+  {
+    this.perspective = true;
+    this.left = left;
+    this.right = right;
+    this.bottom = bottom;
+    this.top = top;
+    this.near = zNear;
+    this.far = zFar;
+  }
+
+  /**
+   * Convenient way to specify a perspective projection
+   * 
+   * @param fovy
+   *           As in gluPerspective
+   * @param aspect
+   *           As in gluPerspective
+   * @param zNear
+   *           As in gluPerspective
+   * @param zFar
+   *           As in gluPerspective
+   */
+  public void trPerspective( double fovy, double aspect, double zNear, double zFar )
+  {
+    double xmin, xmax, ymin, ymax;
+    ymax = zNear * Math.tan( fovy * 3.14159265 / 360.0 );
+    ymin = -ymax;
+    xmin = ymin * aspect;
+    xmax = ymax * aspect;
+    trFrustum( xmin, xmax, ymin, ymax, zNear, zFar );
+  }
+
+  /**
+   * Begins rendering a tile. The projection matrix stack should be
+   * left alone after calling this
+   * 
+   * @param gl
+   *           The gl context
+   */
+  public void beginTile( GL2 gl )
+  {
+    if (currentTile <= 0) {
+      setup();
+      /*
+       * Save user's viewport, will be restored after last tile
+       * rendered
+       */
+      gl.glGetIntegerv( GL2.GL_VIEWPORT, viewportSave, 0 );
+    }
+
+    /* which tile (by row and column) we're about to render */
+    if (rowOrder == TR_BOTTOM_TO_TOP) {
+      currentRow = currentTile / columns;
+      currentColumn = currentTile % columns;
+    } else {
+      currentRow = rows - ( currentTile / columns ) - 1;
+      currentColumn = currentTile % columns;
+    }
+    assert ( currentRow < rows );
+    assert ( currentColumn < columns );
+
+    int border = tileBorder;
+
+    int th, tw;
+
+    /* Compute actual size of this tile with border */
+    if (currentRow < rows - 1) {
+      th = tileSize.height;
+    } else {
+      th = imageSize.height - ( rows - 1 ) * ( tileSizeNB.height  ) + 2 * border;
+    }
+
+    if (currentColumn < columns - 1) {
+      tw = tileSize.width;
+    } else {
+      tw = imageSize.width - ( columns - 1 ) * ( tileSizeNB.width  ) + 2 * border;
+    }
+
+    /* Save tile size, with border */
+    currentTileWidth = tw;
+    currentTileHeight = th;
+
+    gl.glViewport( 0, 0, tw, th );
+
+    /* save current matrix mode */
+    int[] matrixMode = new int[ 1 ];
+    gl.glGetIntegerv( GL2.GL_MATRIX_MODE, matrixMode, 0 );
+    gl.glMatrixMode( GL2.GL_PROJECTION );
+    gl.glLoadIdentity();
+
+    /* compute projection parameters */
+    double l =
+      left + ( right - left ) * ( currentColumn * tileSizeNB.width - border )
+      / imageSize.width;
+    double r = l + ( right - left ) * tw / imageSize.width;
+    double b =
+      bottom + ( top - bottom ) * ( currentRow * tileSizeNB.height - border )
+      / imageSize.height;
+    double t = b + ( top - bottom ) * th / imageSize.height;
+
+    if( perspective ) {
+      gl.glFrustum( l, r, b, t, near, far );
+    } else {
+      gl.glOrtho( l, r, b, t, near, far );
+    }
+
+    /* restore user's matrix mode */
+    gl.glMatrixMode( matrixMode[ 0 ] );
+  }
+
+  /**
+   * Must be called after rendering the scene
+   * 
+   * @param gl
+   *           the gl context
+   * @return true if there are more tiles to be rendered, false if
+   *         the final image is complete
+   */
+  public boolean endTile( GL2 gl )
+  {
+    int[] prevRowLength = new int[ 1 ], prevSkipRows = new int[ 1 ], prevSkipPixels = new int[ 1 ], prevAlignment =
+      new int[ 1 ];
+
+    assert ( currentTile >= 0 );
+
+    // be sure OpenGL rendering is finished
+    gl.glFlush();
+
+    // save current glPixelStore values
+    gl.glGetIntegerv( GL2.GL_PACK_ROW_LENGTH, prevRowLength, 0 );
+    gl.glGetIntegerv( GL2.GL_PACK_SKIP_ROWS, prevSkipRows, 0 );
+    gl.glGetIntegerv( GL2.GL_PACK_SKIP_PIXELS, prevSkipPixels, 0 );
+    gl.glGetIntegerv( GL2.GL_PACK_ALIGNMENT, prevAlignment, 0 );
+
+    if( tileBuffer != null ) {
+      int srcX = tileBorder;
+      int srcY = tileBorder;
+      int srcWidth = tileSizeNB.width;
+      int srcHeight = tileSizeNB.height;
+      gl.glReadPixels( srcX, srcY, srcWidth, srcHeight, tileFormat, tileType, tileBuffer );
+    }
+
+    if( imageBuffer != null ) {
+      int srcX = tileBorder;
+      int srcY = tileBorder;
+      int srcWidth = currentTileWidth - 2 * tileBorder;
+      int srcHeight = currentTileHeight - 2 * tileBorder;
+      int destX = tileSizeNB.width * currentColumn;
+      int destY = tileSizeNB.height * currentRow;
+
+      /* setup pixel store for glReadPixels */
+      gl.glPixelStorei( GL2.GL_PACK_ROW_LENGTH, imageSize.width );
+      gl.glPixelStorei( GL2.GL_PACK_SKIP_ROWS, destY );
+      gl.glPixelStorei( GL2.GL_PACK_SKIP_PIXELS, destX );
+      gl.glPixelStorei( GL2.GL_PACK_ALIGNMENT, 1 );
+
+      /* read the tile into the final image */
+      gl.glReadPixels( srcX, srcY, srcWidth, srcHeight, imageFormat, imageType, imageBuffer );
+    }
+
+    /* restore previous glPixelStore values */
+    gl.glPixelStorei( GL2.GL_PACK_ROW_LENGTH, prevRowLength[ 0 ] );
+    gl.glPixelStorei( GL2.GL_PACK_SKIP_ROWS, prevSkipRows[ 0 ] );
+    gl.glPixelStorei( GL2.GL_PACK_SKIP_PIXELS, prevSkipPixels[ 0 ] );
+    gl.glPixelStorei( GL2.GL_PACK_ALIGNMENT, prevAlignment[ 0 ] );
+
+    /* increment tile counter, return 1 if more tiles left to render */
+    currentTile++;
+    if( currentTile >= rows * columns ) {
+      /* restore user's viewport */
+      gl.glViewport( viewportSave[ 0 ], viewportSave[ 1 ], viewportSave[ 2 ], viewportSave[ 3 ] );
+      currentTile = -1; /* all done */
+      return false;
+    } else {
+      return true;
+    }
+  }
+
+  /**
+   * Tile rendering causes problems with using glRasterPos3f, so you
+   * should use this replacement instead
+   * 
+   * @param x
+   *           As in glRasterPos3f
+   * @param y
+   *           As in glRasterPos3f
+   * @param z
+   *           As in glRasterPos3f
+   * @param gl
+   *           The gl context
+   * @param glu
+   *           A GLUgl2 object
+   */
+  public void trRasterPos3f( float x, float y, float z, GL2 gl, GLUgl2 glu )
+  {
+    if (currentTile < 0) {
+      /* not doing tile rendering right now. Let OpenGL do this. */
+      gl.glRasterPos3f( x, y, z );
+    } else {
+      double[] modelview = new double[ 16 ], proj = new double[ 16 ];
+      int[] viewport = new int[ 4 ];
+      double[] win = new double[3];
+
+      /* Get modelview, projection and viewport */
+      gl.glGetDoublev( GL2.GL_MODELVIEW_MATRIX, modelview, 0 );
+      gl.glGetDoublev( GL2.GL_PROJECTION_MATRIX, proj, 0 );
+      viewport[ 0 ] = 0;
+      viewport[ 1 ] = 0;
+      viewport[ 2 ] = currentTileWidth;
+      viewport[ 3 ] = currentTileHeight;
+
+      /* Project object coord to window coordinate */
+      if( glu.gluProject( x, y, z, modelview, 0, proj, 0, viewport, 0, win, 0 ) ) {
+
+        /* set raster pos to window coord (0,0) */
+        gl.glMatrixMode( GL2.GL_MODELVIEW );
+        gl.glPushMatrix();
+        gl.glLoadIdentity();
+        gl.glMatrixMode( GL2.GL_PROJECTION );
+        gl.glPushMatrix();
+        gl.glLoadIdentity();
+        gl.glOrtho( 0.0, currentTileWidth, 0.0, currentTileHeight, 0.0, 1.0 );
+        gl.glRasterPos3d( 0.0, 0.0, -win[ 2 ] );
+
+        /*
+         * Now use empty bitmap to adjust raster position to
+         * (winX,winY)
+         */
+        {
+          byte[] bitmap = { 0 };
+          gl.glBitmap( 1, 1, 0.0f, 0.0f, ( float ) win[ 0 ], ( float ) win[ 1 ], bitmap , 0 );
+        }
+
+        /* restore original matrices */
+        gl.glPopMatrix(); /* proj */
+        gl.glMatrixMode( GL2.GL_MODELVIEW );
+        gl.glPopMatrix();
+      }
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/GLSLArrayHandler.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/GLSLArrayHandler.java
new file mode 100644
index 000000000..1119aa5ab
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/GLSLArrayHandler.java
@@ -0,0 +1,60 @@
+
+package com.jogamp.opengl.util.glsl;
+
+import javax.media.opengl.*;
+import javax.media.opengl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.ShaderState;
+import java.nio.*;
+
+public class GLSLArrayHandler implements GLArrayHandler {
+  private GLArrayDataEditable ad;
+
+  public GLSLArrayHandler(GLArrayDataEditable ad) {
+    this.ad = ad;
+  }
+
+  protected final void passVertexAttribPointer(GL2ES2 gl, ShaderState st) {
+    st.glVertexAttribPointer(gl, ad);
+  }
+
+  public void enableBuffer(GL gl, boolean enable) {
+    if(!gl.isGL2ES2()) {
+        throw new GLException("GLSLArrayHandler expects a GL2ES2 implementation");
+    }
+    GL2ES2 glsl = gl.getGL2ES2();
+    ShaderState st = ShaderState.getCurrent();
+    if(null==st) {
+        throw new GLException("No ShaderState current");
+    }
+
+    if(enable) {
+        st.glEnableVertexAttribArray(glsl, ad.getName());
+
+        Buffer buffer = ad.getBuffer();
+
+        if(ad.isVBO()) {
+            // always bind and refresh the VBO mgr,
+            // in case more than one gl*Pointer objects are in use
+            glsl.glBindBuffer(GL.GL_ARRAY_BUFFER, ad.getVBOName());
+            if(!ad.isBufferWritten()) {
+                if(null!=buffer) {
+                    glsl.glBufferData(GL.GL_ARRAY_BUFFER, buffer.limit() * ad.getComponentSize(), buffer, ad.getBufferUsage());
+                }
+                ad.setBufferWritten(true);
+            }
+            passVertexAttribPointer(glsl, st);
+        } else if(null!=buffer) {
+            passVertexAttribPointer(glsl, st);
+            ad.setBufferWritten(true);
+        }
+    } else {
+        if(ad.isVBO()) {
+            glsl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0);
+        }
+        st.glDisableVertexAttribArray(glsl, ad.getName());
+    }
+  }
+
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
new file mode 100644
index 000000000..01b94d0d9
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
@@ -0,0 +1,347 @@
+
+package com.jogamp.opengl.util.glsl;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.impl.Debug;
+
+import java.util.*;
+import java.nio.*;
+import java.io.*;
+import java.net.*;
+import java.security.*;
+
+public class ShaderCode {
+    public static final boolean DEBUG = Debug.debug("GLSLCode");
+    public static final boolean DEBUG_CODE = Debug.isPropertyDefined("jogl.debug.GLSLCode", true, AccessController.getContext());
+
+    public static final String SUFFIX_VERTEX_SOURCE   =  "vp" ;
+    public static final String SUFFIX_VERTEX_BINARY   = "bvp" ;
+    public static final String SUFFIX_FRAGMENT_SOURCE =  "fp" ;
+    public static final String SUFFIX_FRAGMENT_BINARY = "bfp" ;
+    
+    public static final String SUB_PATH_NVIDIA = "nvidia" ;
+
+    public ShaderCode(int type, int number, String[][] source) {
+        switch (type) {
+            case GL2ES2.GL_VERTEX_SHADER:
+            case GL2ES2.GL_FRAGMENT_SHADER:
+                break;
+            default:
+                throw new GLException("Unknown shader type: "+type);
+        }
+        shaderSource = source;
+        shaderBinaryFormat = -1;
+        shaderBinary = null;
+        shaderType   = type;
+        shader = BufferUtil.newIntBuffer(number);
+        id = getNextID();
+
+        if(DEBUG_CODE) {
+            System.out.println("Created: "+toString());
+            dumpShaderSource(System.out);
+        }
+    }
+
+    public ShaderCode(int type, int number, int binFormat, Buffer binary) {
+        switch (type) {
+            case GL2ES2.GL_VERTEX_SHADER:
+            case GL2ES2.GL_FRAGMENT_SHADER:
+                break;
+            default:
+                throw new GLException("Unknown shader type: "+type);
+        }
+        shaderSource = null;
+        shaderBinaryFormat = binFormat;
+        shaderBinary = binary;
+        shaderType   = type;
+        shader = BufferUtil.newIntBuffer(number);
+        id = getNextID();
+    }
+
+    public static ShaderCode create(GL2ES2 gl, int type, int number, Class context, String[] sourceFiles) {
+        if(!ShaderUtil.isShaderCompilerAvailable(gl)) return null;
+
+        String[][] shaderSources = null;
+        if(null!=sourceFiles) {
+            shaderSources = new String[sourceFiles.length][1];
+            for(int i=0; null!=shaderSources && i<sourceFiles.length; i++) {
+                shaderSources[i][0] = readShaderSource(context, sourceFiles[i]);
+                if(null == shaderSources[i][0]) {
+                    shaderSources = null;
+                }
+            }
+        }
+        if(null==shaderSources) {
+            return null;
+        }
+        return new ShaderCode(type, number, shaderSources);
+    }
+
+    public static ShaderCode create(int type, int number, Class context, int binFormat, String binaryFile) {
+        ByteBuffer shaderBinary = null;
+        if(null!=binaryFile && 0<=binFormat) {
+            shaderBinary = readShaderBinary(context, binaryFile);
+            if(null == shaderBinary) {
+                binFormat = -1;
+            }
+        }
+        if(null==shaderBinary) {
+            return null;
+        }
+        return new ShaderCode(type, number, binFormat, shaderBinary);
+    }
+
+    public static String getFileSuffix(boolean binary, int type) {
+        switch (type) {
+            case GL2ES2.GL_VERTEX_SHADER:
+                return binary?SUFFIX_VERTEX_BINARY:SUFFIX_VERTEX_SOURCE;
+            case GL2ES2.GL_FRAGMENT_SHADER:
+                return binary?SUFFIX_FRAGMENT_BINARY:SUFFIX_FRAGMENT_SOURCE;
+            default:
+                throw new GLException("illegal shader type: "+type);
+        }
+    }
+
+    public static String getBinarySubPath(int binFormat) {
+        switch (binFormat) {
+            case GLES2.GL_NVIDIA_PLATFORM_BINARY_NV:
+                return SUB_PATH_NVIDIA;
+            default:
+                throw new GLException("unsupported binary format: "+binFormat);
+        }
+    }
+
+    public static ShaderCode create(GL2ES2 gl, int type, int number, Class context, 
+                                    String srcRoot, String binRoot, String basename) {
+        ShaderCode res = null;
+        String srcFileName = null;
+        String binFileName = null;
+
+        if(ShaderUtil.isShaderCompilerAvailable(gl)) {
+            String srcPath[] = new String[1];
+            srcFileName = srcRoot + '/' + basename + "." + getFileSuffix(false, type);
+            srcPath[0] = srcFileName;
+            res = create(gl, type, number, context, srcPath);
+            if(null!=res) {
+                return res;
+            }
+        }
+        Set binFmts = ShaderUtil.getShaderBinaryFormats(gl);
+        for(Iterator iter=binFmts.iterator(); null==res && iter.hasNext(); ) {
+            int bFmt = ((Integer)(iter.next())).intValue();
+            String bFmtPath = getBinarySubPath(bFmt);
+            if(null==bFmtPath) continue;
+            binFileName = binRoot + '/' + bFmtPath + '/' + basename + "." + getFileSuffix(true, type);
+            res = create(type, number, context, bFmt, binFileName);
+        }
+
+        if(null==res) {
+            throw new GLException("No shader code found (source nor binary) for src: "+srcFileName+
+                                  ", bin: "+binFileName);
+        }
+
+        return res;
+    }
+
+    /**
+     * returns the uniq shader id as an integer
+     * @see #key()
+     */
+    public int        id() { return id.intValue(); }
+
+    /**
+     * returns the uniq shader id as an Integer
+     *
+     * @see #id()
+     */
+    public Integer    key() { return id; }
+
+    public int        shaderType() { return shaderType; }
+    public String     shaderTypeStr() { return shaderTypeStr(shaderType); }
+
+    public static String shaderTypeStr(int type) { 
+        switch (type) {
+            case GL2ES2.GL_VERTEX_SHADER:
+                return "VERTEX_SHADER";
+            case GL2ES2.GL_FRAGMENT_SHADER:
+                return "FRAGMENT_SHADER";
+        }
+        return "UNKNOWN_SHADER";
+    }
+
+    public int        shaderBinaryFormat() { return shaderBinaryFormat; }
+    public Buffer     shaderBinary() { return shaderBinary; }
+    public String[][] shaderSource() { return shaderSource; }
+
+    public boolean    isValid() { return valid; }
+
+    public IntBuffer  shader() { return shader; }
+
+    public boolean compile(GL2ES2 gl) {
+        return compile(gl, null);
+    }
+    public boolean compile(GL2ES2 gl, PrintStream verboseOut) {
+        if(isValid()) return true;
+
+        // Create & Compile the vertex/fragment shader objects
+        if(null!=shaderSource) {
+            valid=ShaderUtil.createAndCompileShader(gl, shader, shaderType,
+                                                    shaderSource, verboseOut);
+        } else if(null!=shaderBinary) {
+            valid=ShaderUtil.createAndLoadShader(gl, shader, shaderType,
+                                                 shaderBinaryFormat, shaderBinary, verboseOut);
+        } else {
+            throw new GLException("no code (source or binary)");
+        }
+        return valid;
+    }
+
+    public void destroy(GL2ES2 gl) {
+        if(isValid()) {
+            if(null!=gl) {
+                ShaderUtil.deleteShader(gl, shader());
+            }
+            valid=false;
+        }
+        if(null!=shaderBinary) {
+            shaderBinary.clear();
+            shaderBinary=null;
+        }
+        shaderSource=null;
+        shaderBinaryFormat=-1;
+        shaderType=-1;
+        id=null;
+    }
+
+    public boolean equals(Object obj) {
+        if(this==obj) return true;
+        if(obj instanceof ShaderCode) {
+            return id()==((ShaderCode)obj).id();
+        }
+        return false;
+    }
+    public int hashCode() {
+        return id.intValue();
+    }
+    public String toString() {
+        StringBuffer buf = new StringBuffer("ShaderCode [id="+id+", type="+shaderTypeStr()+", valid="+valid+", shader: ");
+        for(int i=0; i<shader.remaining(); i++) {
+            buf.append(" "+shader.get(i));
+        }
+        if(null!=shaderSource) {
+            buf.append(", source]");
+        } else if(null!=shaderBinary) {
+            buf.append(", binary "+shaderBinary+"]");
+        }
+        return buf.toString();
+    }
+
+    public void dumpShaderSource(PrintStream out) {
+        if(null==shaderSource) {
+            out.println("<no shader source>");
+            return;
+        }
+        int sourceNum = (null!=shaderSource)?shaderSource.length:0;
+        int shaderNum = (null!=shader)?shader.capacity():0;
+        for(int i=0; i<shaderNum; i++) {
+            out.println("");
+            out.println("Shader #"+i+"/"+shaderNum+" name "+shader.get(i));
+            out.println("--------------------------------------------------------------");
+            if(i>=sourceNum) {
+                out.println("<no shader source>");
+            } else {
+                String[] src = shaderSource[i];
+                for(int j=0; j<src.length; j++) {
+                    out.println("Segment "+j+"/"+src.length+" :");
+                    out.println(src[j]);
+                    out.println("");
+                }
+            }
+            out.println("--------------------------------------------------------------");
+        }
+    }
+
+    public static void readShaderSource(ClassLoader context, String path, URL url, StringBuffer result) {
+        try {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
+            String line = null;
+            while ((line = reader.readLine()) != null) {
+                if (line.startsWith("#include ")) {
+                    String includeFile = line.substring(9).trim();
+                    // Try relative path first
+                    String next = Locator.getRelativeOf(path, includeFile);
+                    URL nextURL = Locator.getResource(next, context);
+                    if (nextURL == null) {
+                        // Try absolute path
+                        next = includeFile;
+                        nextURL = Locator.getResource(next, context);
+                    }
+                    if (nextURL == null) {
+                        // Fail
+                        throw new FileNotFoundException("Can't find include file " + includeFile);
+                    }
+                    readShaderSource(context, next, nextURL, result);
+                } else {
+                    result.append(line + "\n");
+                }
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String readShaderSource(Class context, String path) {
+        ClassLoader contextCL = (null!=context)?context.getClassLoader():null;
+        URL url = Locator.getResource(path, contextCL);
+        if (url == null && null!=context) {
+            // Try again by scoping the path within the class's package
+            String className = context.getName().replace('.', '/');
+            int lastSlash = className.lastIndexOf('/');
+            if (lastSlash >= 0) {
+                String tmpPath = className.substring(0, lastSlash + 1) + path;
+                url = Locator.getResource(tmpPath, contextCL);
+                if (url != null) {
+                    path = tmpPath;
+                }
+            }
+        }
+        if (url == null) {
+            return null;
+        }
+        StringBuffer result = new StringBuffer();
+        readShaderSource(contextCL, path, url, result);
+        return result.toString();
+    }
+
+    public static ByteBuffer readShaderBinary(Class context, String path) {
+        try {
+            URL url = Locator.getResource(context, path);
+            if (url == null) {
+                return null;
+            }
+            return StreamUtil.readAll2Buffer(new BufferedInputStream(url.openStream()));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    protected String[][] shaderSource = null;
+    protected Buffer     shaderBinary = null;
+    protected int        shaderBinaryFormat = -1;
+    protected IntBuffer  shader = null;
+    protected int        shaderType = -1;
+    protected Integer    id = null;
+
+    protected boolean valid=false;
+
+    private static synchronized Integer getNextID() {
+        return new Integer(nextID++);
+    }
+    protected static int nextID = 1;
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java
new file mode 100644
index 000000000..49a341cc6
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java
@@ -0,0 +1,212 @@
+
+package com.jogamp.opengl.util.glsl;
+
+import javax.media.opengl.*;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.nio.*;
+import java.io.PrintStream;
+
+public class ShaderProgram {
+    public ShaderProgram() {
+        id = getNextID();
+    }
+
+    public boolean linked() {
+        return programLinked;
+    }
+
+    public boolean inUse() {
+        return programInUse;
+    }
+
+    public int program() { return shaderProgram; }
+
+    /**
+     * returns the uniq shader id as an integer
+     * @see #key()
+     */
+    public int        id() { return id.intValue(); }
+
+    /**
+     * returns the uniq shader id as an Integer
+     *
+     * @see #id()
+     */
+    public Integer    key() { return id; }
+
+    /**
+     * Detaches all shader codes and deletes the program.
+     * Destroys the shader codes as well.
+     * Calls release(gl, true)
+     *
+     * @see #release(GL2ES2, boolean)
+     */
+    public synchronized void destroy(GL2ES2 gl) {
+        release(gl, true);
+    }
+
+    /**
+     * Detaches all shader codes and deletes the program.
+     * Calls release(gl, false)
+     *
+     * @see #release(GL2ES2, boolean)
+     */
+    public synchronized void release(GL2ES2 gl) {
+        release(gl, false);
+    }
+
+    /**
+     * Detaches all shader codes and deletes the program.
+     * If releaseShaderToo is true, destroys the shader codes as well.
+     */
+    public synchronized void release(GL2ES2 gl, boolean releaseShaderToo) {
+        glUseProgram(gl, false);
+        for(Iterator iter=shaderMap.values().iterator(); iter.hasNext(); ) {
+            ShaderCode shaderCode = (ShaderCode) iter.next();
+            ShaderUtil.detachShader(gl, shaderProgram, shaderCode.shader());
+            if(releaseShaderToo) {
+                shaderCode.destroy(gl);
+            }
+        }
+        shaderMap.clear();
+        gl.glDeleteProgram(shaderProgram);
+        shaderProgram=-1;
+    }
+
+    //
+    // ShaderCode handling
+    //
+
+    /**
+     * Adds a new shader to a this non running program.
+     *
+     * @return false if the program is in use, or the shader already exist,
+     *         otherwise true.
+     */
+    public synchronized boolean add(ShaderCode shaderCode) {
+        if(shaderMap.containsKey(shaderCode.key())) return false;
+        shaderMap.put(shaderCode.key(), shaderCode);
+        return true;
+    }
+
+    public synchronized ShaderCode getShader(int id) {
+        return (ShaderCode) shaderMap.get(new Integer(id));
+    }
+
+    //
+    // Program handling
+    //
+
+    /**
+     * Replace a shader in a 'running' program.
+     * Refetches all previously bin/get attribute names
+     * and resets all attribute data as well
+     *
+     * @see getAttribLocation
+     * @param gl 
+     * @param oldShaderID the to be replace Shader
+     * @param newShader   the new ShaderCode
+     * @param verboseOut  the optional verbose outputstream
+     * @throws GLException is the program is not linked
+     *
+     * @see #glRefetchAttribLocations
+     * @see #glResetAllVertexAttributes
+     * @see #glReplaceShader
+     */
+    public synchronized boolean glReplaceShader(GL2ES2 gl, int oldShaderID, ShaderCode newShader, PrintStream verboseOut) {
+        if(!programLinked) throw new GLException("Program is not linked");
+        boolean shaderWasInUse = programInUse;
+        glUseProgram(gl, false);
+        if(!newShader.compile(gl, verboseOut)) {
+            return false;
+        } 
+        if(oldShaderID>=0) {
+            ShaderCode oldShader = (ShaderCode) shaderMap.remove(new Integer(oldShaderID));
+            if(null!=oldShader) {
+                ShaderUtil.detachShader(gl, shaderProgram, oldShader.shader());
+            }
+        }
+        add(newShader);
+
+        ShaderUtil.attachShader(gl, shaderProgram, newShader.shader());
+        gl.glLinkProgram(shaderProgram);
+        if ( ! ShaderUtil.isProgramValid(gl, shaderProgram, System.err) )  {
+            return false;
+        }
+
+        if(shaderWasInUse) {
+            glUseProgram(gl, true);
+        }
+        return true;
+    }
+
+    public synchronized boolean link(GL2ES2 gl, PrintStream verboseOut) {
+        if(programLinked) throw new GLException("Program is already linked");
+
+        if(0>shaderProgram) {
+            shaderProgram = gl.glCreateProgram();
+        }
+
+        for(Iterator iter=shaderMap.values().iterator(); iter.hasNext(); ) {
+            ShaderCode shaderCode = (ShaderCode) iter.next();
+            if(!shaderCode.compile(gl, verboseOut)) {
+                return false;
+            }
+            ShaderUtil.attachShader(gl, shaderProgram, shaderCode.shader());
+        }
+
+        // Link the program
+        gl.glLinkProgram(shaderProgram);
+
+        programLinked = ShaderUtil.isProgramValid(gl, shaderProgram, System.err);
+
+        return programLinked;
+    }
+
+    public boolean equals(Object obj) {
+        if(this==obj) return true;
+        if(obj instanceof ShaderCode) {
+            return id()==((ShaderCode)obj).id();
+        }
+        return false;
+    }
+    public int hashCode() {
+        return id.intValue();
+    }
+    public String toString() {
+        StringBuffer buf = new StringBuffer();
+        buf.append("ShaderProgram[id="+id);
+        buf.append(", linked="+programLinked+", inUse="+programInUse+", program: "+shaderProgram+", [");
+        for(Iterator iter=shaderMap.values().iterator(); iter.hasNext(); ) {
+            buf.append((ShaderCode) iter.next());
+            buf.append(" ");
+        }
+        buf.append("]");
+        return buf.toString();
+    }
+
+    protected synchronized void glUseProgram(GL2ES2 gl, boolean on) {
+        if(!programLinked) throw new GLException("Program is not linked");
+        if(programInUse==on) return;
+        gl.glUseProgram(on?shaderProgram:0);
+        programInUse = on;
+
+        //Throwable tX = new Throwable("Info: ShaderProgram.glUseProgram: "+on);
+        //tX.printStackTrace();
+
+    }
+
+    protected boolean programLinked = false;
+    protected boolean programInUse = false;
+    protected int shaderProgram=-1;
+    protected HashMap shaderMap = new HashMap();
+    protected Integer    id = null;
+
+    private static synchronized Integer getNextID() {
+        return new Integer(nextID++);
+    }
+    protected static int nextID = 1;
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
new file mode 100644
index 000000000..33f6e210b
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
@@ -0,0 +1,652 @@
+
+package com.jogamp.opengl.util.glsl;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.impl.Debug;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.nio.*;
+import java.io.PrintStream;
+import java.security.*;
+
+public class ShaderState {
+    public static final boolean DEBUG = Debug.isPropertyDefined("jogl.debug.GLSLState", true, AccessController.getContext());
+
+    public ShaderState() {
+    }
+
+    public boolean verbose() { return verbose; }
+
+    public void setVerbose(boolean v) { verbose=v; }
+
+    /**
+     * Fetches the current shader state from the thread local storage (TLS)
+     *
+     * @see javax.media.opengl.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
+     * @see javax.media.opengl.glsl.ShaderState#getCurrent()
+     */
+    public static synchronized ShaderState getCurrent() { 
+        GLContext current = GLContext.getCurrent();
+        if(null==current) {
+            throw new GLException("No context is current on this thread");
+        }
+        return (ShaderState) current.getAttachedObject(ShaderState.class.getName());
+    }
+
+    /**
+     * Turns the shader program on or off.<br>
+     * Puts this ShaderState to to the thread local storage (TLS),
+     * if <code>on</code> is <code>true</code>.
+     *
+     * @see javax.media.opengl.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
+     * @see javax.media.opengl.glsl.ShaderState#getCurrent()
+     */
+    public synchronized void glUseProgram(GL2ES2 gl, boolean on) {
+        if(on) {
+            if(null!=shaderProgram) {
+                shaderProgram.glUseProgram(gl, true);
+            } else {
+                throw new GLException("No program is attached");
+            }
+            // update the current ShaderState to the TLS ..
+            gl.getContext().putAttachedObject(ShaderState.class.getName(), this);
+        } else if(null!=shaderProgram) {
+            shaderProgram.glUseProgram(gl, false);
+        }
+    }
+
+    public boolean linked() {
+        return (null!=shaderProgram)?shaderProgram.linked():false;
+    }
+
+    public boolean inUse() {
+        return (null!=shaderProgram)?shaderProgram.inUse():false;
+    }
+
+    /**
+     * Attach or switch a shader program
+     *
+     * Attaching a shader program the first time, 
+     * as well as switching to another program on the fly,
+     * while managing all attribute and uniform data.
+     */
+    public synchronized void attachShaderProgram(GL2ES2 gl, ShaderProgram prog) {
+        boolean prgInUse = false; // earmarked state
+
+        if(DEBUG) {
+            int curId = (null!=shaderProgram)?shaderProgram.id():-1;
+            int newId = (null!=prog)?prog.id():-1;
+            System.err.println("Info: attachShaderProgram: "+curId+" -> "+newId+"\n\t"+shaderProgram+"\n\t"+prog);
+            if(verbose) {
+                Throwable tX = new Throwable("Info: attachShaderProgram: Trace");
+                tX.printStackTrace();
+            }
+        }
+        if(null!=shaderProgram) {
+            if(shaderProgram.equals(prog)) {
+                // nothing to do ..
+                if(DEBUG) {
+                    System.err.println("Info: attachShaderProgram: NOP: equal id: "+shaderProgram.id());
+                }
+                return;
+            }
+            prgInUse = shaderProgram.inUse();
+            shaderProgram.glUseProgram(gl, false);
+        }
+
+        // register new one
+        shaderProgram = prog;
+
+        if(null!=shaderProgram) {
+            // reinstall all data ..
+            shaderProgram.glUseProgram(gl, true);
+            glResetAllVertexAttributes(gl);
+            glResetAllUniforms(gl);
+            if(!prgInUse) {
+                shaderProgram.glUseProgram(gl, false);
+            }
+        }
+        if(DEBUG) {
+            System.err.println("Info: attachShaderProgram: END");
+        }
+    }
+
+    public ShaderProgram shaderProgram() { return shaderProgram; }
+
+    /**
+     * Calls release(gl, true, true)
+     *
+     * @see #glReleaseAllVertexAttributes
+     * @see #glReleaseAllUniforms
+     * @see #release(GL2ES2, boolean, boolean)
+     */
+    public synchronized void destroy(GL2ES2 gl) {
+        release(gl, true, true);
+    }
+
+    /**
+     * Calls release(gl, false, false)
+     *
+     * @see #glReleaseAllVertexAttributes
+     * @see #glReleaseAllUniforms
+     * @see #release(GL2ES2, boolean, boolean)
+     */
+    public synchronized void releaseAllData(GL2ES2 gl) {
+        release(gl, false, false);
+    }
+
+    /**
+     * @see #glReleaseAllVertexAttributes
+     * @see #glReleaseAllUniforms
+     * @see ShaderProgram#release(GL2ES2, boolean)
+     */
+    public synchronized void release(GL2ES2 gl, boolean releaseProgramToo, boolean releaseShaderToo) {
+        boolean prgInUse = false;
+        if(null!=shaderProgram) {
+            prgInUse = shaderProgram.inUse();
+            if(!prgInUse) {
+                shaderProgram.glUseProgram(gl, true);
+            }
+        }
+        glReleaseAllVertexAttributes(gl);
+        glReleaseAllUniforms(gl);
+        if(null!=shaderProgram) {
+            if(releaseProgramToo) {
+                shaderProgram.release(gl, releaseShaderToo);
+            } else if(!prgInUse) {
+                shaderProgram.glUseProgram(gl, false);
+            }
+        }
+    }
+
+    //
+    // Shader attribute handling
+    //
+
+    /**
+     * Binds an attribute to the shader.
+     * This must be done before the program is linked !
+     * n name - 1 idx, where name is a uniq key
+     *
+     * @throws GLException is the program is already linked
+     *
+     * @see #glBindAttribLocation
+     * @see javax.media.opengl.GL2ES2#glBindAttribLocation
+     * @see #glGetAttribLocation
+     * @see javax.media.opengl.GL2ES2#glGetAttribLocation
+     * @see #getAttribLocation
+     * @see #glReplaceShader
+     */
+    public void glBindAttribLocation(GL2ES2 gl, int index, String name) {
+        if(null==shaderProgram) throw new GLException("No program is attached");
+        if(shaderProgram.linked()) throw new GLException("Program is already linked");
+        Integer idx = new Integer(index);
+        if(!attribMap2Idx.containsKey(name)) {
+            attribMap2Idx.put(name, idx);
+            gl.glBindAttribLocation(shaderProgram.program(), index, name);
+        }
+    }
+
+    /**
+     * Gets the index of a shader attribute.
+     * This must be done after the program is linked !
+     *
+     * @return -1 if there is no such attribute available, 
+     *         otherwise >= 0
+     * @throws GLException is the program is not linked
+     *
+     * @see #glBindAttribLocation
+     * @see javax.media.opengl.GL2ES2#glBindAttribLocation
+     * @see #glGetAttribLocation
+     * @see javax.media.opengl.GL2ES2#glGetAttribLocation
+     * @see #getAttribLocation
+     * @see #glReplaceShader
+     */
+    public int glGetAttribLocation(GL2ES2 gl, String name) {
+        if(!shaderProgram.linked()) throw new GLException("Program is not linked");
+        int index = getAttribLocation(name);
+        if(0>index) {
+            index = gl.glGetAttribLocation(shaderProgram.program(), name);
+            if(0<=index) {
+                Integer idx = new Integer(index);
+                attribMap2Idx.put(name, idx);
+                if(DEBUG) {
+                    System.err.println("Info: glGetAttribLocation: "+name+", loc: "+index);
+                }
+            } else if(verbose) {
+                Throwable tX = new Throwable("Info: glGetAttribLocation failed, no location for: "+name+", index: "+index);
+                tX.printStackTrace();
+            }
+        }
+        return index;
+    }
+
+    protected int getAttribLocation(String name) {
+        Integer idx = (Integer) attribMap2Idx.get(name);
+        return (null!=idx)?idx.intValue():-1;
+    }
+
+
+    //
+    // Enabled Vertex Arrays and its data
+    //
+
+    /**
+     * Enable a vertex attribute array
+     *
+     * Even if the attribute is not found in the current shader,
+     * it is stored in this state.
+     *
+     * @returns false, if the name is not found, otherwise true
+     *
+     * @throws GLException if the program is not in use
+     *
+     * @see #glEnableVertexAttribArray
+     * @see #glDisableVertexAttribArray
+     * @see #glVertexAttribPointer
+     * @see #getVertexAttributePointer
+     * @see #glReleaseAllVertexAttributes
+     * @see #glResetAllVertexAttributes
+     * @see #glReplaceShader
+     */
+    public boolean glEnableVertexAttribArray(GL2ES2 gl, String name) {
+        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
+        enabledVertexAttribArraySet.add(name);
+        int index = glGetAttribLocation(gl, name);
+        if(0>index) {
+            if(verbose) {
+                Throwable tX = new Throwable("Info: glEnableVertexAttribArray failed, no index for: "+name);
+                tX.printStackTrace();
+            }
+            return false;
+        }
+        if(DEBUG) {
+            System.err.println("Info: glEnableVertexAttribArray: "+name+", loc: "+index);
+        }
+        gl.glEnableVertexAttribArray(index);
+        return true;
+    }
+
+    public boolean isVertexAttribArrayEnabled(String name) {
+        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
+        return enabledVertexAttribArraySet.contains(name);
+    }
+
+    /**
+     * Disables a vertex attribute array
+     *
+     * Even if the attribute is not found in the current shader,
+     * it is removed from this state.
+     *
+     * @returns false, if the name is not found, otherwise true
+     *
+     * @throws GLException if the program is not in use
+     *
+     * @see #glEnableVertexAttribArray
+     * @see #glDisableVertexAttribArray
+     * @see #glVertexAttribPointer
+     * @see #getVertexAttributePointer
+     * @see #glReleaseAllVertexAttributes
+     * @see #glResetAllVertexAttributes
+     * @see #glReplaceShader
+     */
+    public boolean glDisableVertexAttribArray(GL2ES2 gl, String name) {
+        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
+        enabledVertexAttribArraySet.remove(name);
+        int index = glGetAttribLocation(gl, name);
+        if(0>index) {
+            if(verbose) {
+                Throwable tX = new Throwable("Info: glDisableVertexAttribArray failed, no index for: "+name);
+                tX.printStackTrace();
+            }
+            return false;
+        }
+        if(DEBUG) {
+            System.err.println("Info: glDisableVertexAttribArray: "+name);
+        }
+        gl.glDisableVertexAttribArray(index);
+        return true;
+    }
+
+    /**
+     * Set the vertex attribute data.
+     * Enable the attribute, if it is not enabled yet.
+     *
+     * Even if the attribute is not found in the current shader,
+     * it is stored in this state.
+     *
+     * @param data the GLArrayData's name must match the attributes one,
+     *      it's index will be set with the attribute's location,
+     *      if found.
+     *
+     * @returns false, if the name is not found, otherwise true
+     *
+     * @throws GLException if the program is not in use
+     *
+     * @see #glEnableVertexAttribArray
+     * @see #glDisableVertexAttribArray
+     * @see #glVertexAttribPointer
+     * @see #getVertexAttributePointer
+     * @see #glReleaseAllVertexAttributes
+     * @see #glResetAllVertexAttributes
+     * @see #glReplaceShader
+     */
+    public boolean glVertexAttribPointer(GL2ES2 gl, GLArrayData data) {
+        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
+        if(!enabledVertexAttribArraySet.contains(data.getName())) {
+            if(!glEnableVertexAttribArray(gl, data.getName())) {
+                if(verbose) {
+                    Throwable tX = new Throwable("Info: glVertexAttribPointer: couldn't enable: "+data);
+                    tX.printStackTrace();
+                }
+            }
+        }
+        int index = getAttribLocation(data.getName());
+        if(0>index) {
+            if(verbose) {
+                Throwable tX = new Throwable("Info: glVertexAttribPointer failed, no index for: "+data);
+                tX.printStackTrace();
+            }
+        }
+        data.setLocation(index);
+        vertexAttribMap2Data.put(data.getName(), data);
+        if(0<=index) {
+            // only pass the data, if the attribute exists in the current shader
+            if(DEBUG) {
+                System.err.println("Info: glVertexAttribPointer: "+data);
+            }
+            gl.glVertexAttribPointer(data);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get the vertex attribute data, previously set.
+     *
+     * @returns the GLArrayData object, null if not previously set.
+     *
+     * @see #glEnableVertexAttribArray
+     * @see #glDisableVertexAttribArray
+     * @see #glVertexAttribPointer
+     * @see #getVertexAttributePointer
+     * @see #glReleaseAllVertexAttributes
+     * @see #glResetAllVertexAttributes
+     * @see #glReplaceShader
+     */
+    public GLArrayData getVertexAttribPointer(String name) {
+        return (GLArrayData) vertexAttribMap2Data.get(name);
+    }
+
+    /**
+     * Releases all mapped vertex attribute data,
+     * disables all enabled attributes and loses all indices
+     *
+     * @throws GLException is the program is not in use but the shaderProgram is set
+     *
+     * @see #glEnableVertexAttribArray
+     * @see #glDisableVertexAttribArray
+     * @see #glVertexAttribPointer
+     * @see #getVertexAttributePointer
+     * @see #glReleaseAllVertexAttributes
+     * @see #glResetAllVertexAttributes
+     * @see #glResetAllVertexAttributes
+     * @see #glReplaceShader
+     */
+    public void glReleaseAllVertexAttributes(GL2ES2 gl) {
+        if(null!=shaderProgram) {
+            if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
+            for(Iterator iter = vertexAttribMap2Data.keySet().iterator(); iter.hasNext(); ) {
+                if(!glDisableVertexAttribArray(gl, (String) iter.next())) {
+                    throw new GLException("Internal Error: mapped vertex attribute couldn't be disabled");
+                }
+            }
+            for(Iterator iter = enabledVertexAttribArraySet.iterator(); iter.hasNext(); ) {
+                if(!glDisableVertexAttribArray(gl, (String) iter.next())) {
+                    throw new GLException("Internal Error: prev enabled vertex attribute couldn't be disabled");
+                }
+            }
+        }
+        vertexAttribMap2Data.clear();
+        enabledVertexAttribArraySet.clear();
+        attribMap2Idx.clear();
+    }
+        
+    /**
+     * Disables all vertex attribute arrays.
+     *
+     * Their enabled stated will be removed from this state only
+     * if 'removeFromState' is true.
+     *
+     * This method purpose is more for debugging. 
+     *
+     * @throws GLException is the program is not in use but the shaderProgram is set
+     *
+     * @see #glEnableVertexAttribArray
+     * @see #glDisableVertexAttribArray
+     * @see #glVertexAttribPointer
+     * @see #getVertexAttributePointer
+     * @see #glReleaseAllVertexAttributes
+     * @see #glResetAllVertexAttributes
+     * @see #glResetAllVertexAttributes
+     * @see #glReplaceShader
+     */
+    public void glDisableAllVertexAttributeArrays(GL2ES2 gl, boolean removeFromState) {
+        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
+
+        for(Iterator iter = enabledVertexAttribArraySet.iterator(); iter.hasNext(); ) {
+            String name = (String) iter.next();
+            if(removeFromState) {
+                enabledVertexAttribArraySet.remove(name);
+            }
+            int index = glGetAttribLocation(gl, name);
+            if(0<=index) {
+                gl.glDisableVertexAttribArray(index);
+            }
+        }
+    }
+
+    /**
+     * Reset all previously enabled mapped vertex attribute data,
+     * incl enabling them
+     *
+     * @throws GLException is the program is not in use
+     *
+     * @see #glEnableVertexAttribArray
+     * @see #glDisableVertexAttribArray
+     * @see #glVertexAttribPointer
+     * @see #getVertexAttributePointer
+     * @see #glReleaseAllVertexAttributes
+     * @see #glResetAllVertexAttributes
+     * @see #glReplaceShader
+     */
+    public void glResetAllVertexAttributes(GL2ES2 gl) {
+        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
+        attribMap2Idx.clear();
+
+        /**
+         *
+        for(Iterator iter = enabledVertexAttribArraySet.iterator(); iter.hasNext(); ) {
+            glEnableVertexAttribArray(gl, (String) iter.next());
+        }
+        for(Iterator iter = vertexAttribMap2Data.values().iterator(); iter.hasNext(); ) {
+            GLArrayData data = (GLArrayData) iter.next();
+
+            ...
+        } */
+
+        for(Iterator iter = enabledVertexAttribArraySet.iterator(); iter.hasNext(); ) {
+            // get new location ..
+            String name = (String) iter.next();
+            int loc = glGetAttribLocation(gl, name);
+
+            // get & update data ..
+            GLArrayData data = getVertexAttribPointer(name);
+            data.setLocation(loc);
+            vertexAttribMap2Data.put(name, data);
+
+            if(0>loc) {
+                // not used in shader
+                continue;
+            }
+
+            // enable attrib, VBO and pass location/data
+            gl.glEnableVertexAttribArray(loc);
+
+            if( data.isVBO() ) {
+                gl.glBindBuffer(GL.GL_ARRAY_BUFFER, data.getVBOName());
+            } 
+
+            gl.glVertexAttribPointer(data);
+        }
+    }
+
+    //
+    // Shader Uniform handling
+    //
+
+    /**
+     * Gets the index of a shader uniform.
+     * This must be done when the program is in use !
+     *
+     * @return -1 if there is no such attribute available,
+     *         otherwise >= 0
+
+     * @throws GLException is the program is not linked
+     *
+     * @see #glGetUniformLocation
+     * @see javax.media.opengl.GL2ES2#glGetUniformLocation
+     * @see #getUniformLocation
+     * @see #glReplaceShader
+     */
+    protected int glGetUniformLocation(GL2ES2 gl, String name) {
+        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
+        int index = getUniformLocation(name);
+        if(0>index) {
+            index = gl.glGetUniformLocation(shaderProgram.program(), name);
+            if(0<=index) {
+                Integer idx = new Integer(index);
+                uniformMap2Idx.put(name, idx);
+            } else if(verbose) {
+                Throwable tX = new Throwable("Info: glUniform failed, no location for: "+name+", index: "+index);
+                tX.printStackTrace();
+            }
+        }
+        return index;
+    }
+
+    protected int getUniformLocation(String name) {
+        Integer idx = (Integer) uniformMap2Idx.get(name);
+        return (null!=idx)?idx.intValue():-1;
+    }
+
+    /**
+     * Set the uniform data.
+     *
+     * Even if the uniform is not found in the current shader,
+     * it is stored in this state.
+     *
+     * @param data the GLUniforms's name must match the uniform one,
+     *      it's index will be set with the uniforms's location,
+     *      if found.
+     *
+     *
+     * @returns false, if the name is not found, otherwise true
+     *
+     * @throws GLException if the program is not in use
+     *
+     * @see #glGetUniformLocation
+     * @see javax.media.opengl.GL2ES2#glGetUniformLocation
+     * @see #getUniformLocation
+     * @see #glReplaceShader
+     */
+    public boolean glUniform(GL2ES2 gl, GLUniformData data) {
+        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
+        int location = glGetUniformLocation(gl, data.getName());
+        data.setLocation(location);
+        uniformMap2Data.put(data.getName(), data);
+        if(0<=location) {
+            // only pass the data, if the uniform exists in the current shader
+            if(DEBUG) {
+                System.err.println("Info: glUniform: "+data);
+            }
+            gl.glUniform(data);
+        }
+        return true;
+    }
+
+    /**
+     * Get the uniform data, previously set.
+     *
+     * @returns the GLUniformData object, null if not previously set.
+     */
+    public GLUniformData getUniform(String name) {
+        return (GLUniformData) uniformMap2Data.get(name);
+    }
+
+    /**
+     * Releases all mapped uniform data
+     * and loses all indices
+     *
+     * @throws GLException is the program is not in use
+     */
+    public void glReleaseAllUniforms(GL2ES2 gl) {
+        uniformMap2Data.clear();
+        uniformMap2Idx.clear();
+    }
+        
+    /**
+     * Reset all previously mapped uniform data
+     *
+     * @throws GLException is the program is not in use
+     */
+    public void glResetAllUniforms(GL2ES2 gl) {
+        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
+        uniformMap2Idx.clear();
+        for(Iterator iter = uniformMap2Data.values().iterator(); iter.hasNext(); ) {
+            glUniform(gl, (GLUniformData) iter.next());
+        }
+    }
+
+    public String toString() {
+        StringBuffer buf = new StringBuffer();
+        buf.append("ShaderState[");
+        buf.append(shaderProgram.toString());
+        buf.append(",EnabledStates: [");
+        for(Iterator iter = enabledVertexAttribArraySet.iterator(); iter.hasNext(); ) {
+            buf.append("\n  ");
+            buf.append((String)iter.next());
+        }
+        buf.append("], [");
+        for(Iterator iter = vertexAttribMap2Data.values().iterator(); iter.hasNext(); ) {
+            GLArrayData data = (GLArrayData) iter.next();
+            if(data.getLocation()>=0) {
+                buf.append("\n  ");
+                buf.append(data);
+            }
+        }
+        buf.append("], [");
+        for(Iterator iter=uniformMap2Data.values().iterator(); iter.hasNext(); ) {
+            GLUniformData data = (GLUniformData) iter.next();
+            if(data.getLocation()>=0) {
+                buf.append("\n  ");
+                buf.append(data);
+            }
+        }
+        buf.append("]");
+        return buf.toString();
+    }
+
+    protected boolean verbose = false;
+    protected ShaderProgram shaderProgram=null;
+    protected HashMap attribMap2Idx = new HashMap();
+    protected HashSet enabledVertexAttribArraySet = new HashSet();
+    protected HashMap vertexAttribMap2Data = new HashMap();
+    protected HashMap uniformMap2Idx = new HashMap();
+    protected HashMap uniformMap2Data = new HashMap();
+
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
new file mode 100644
index 000000000..21f359f52
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
@@ -0,0 +1,476 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.opengl.util.glsl;
+
+import java.io.PrintStream;
+import java.nio.*;
+import java.util.*;
+
+import javax.media.opengl.*;
+
+public class ShaderUtil {
+    static abstract class Impl {
+        public abstract String getShaderInfoLog(GL gl, int shaderObj);
+        public abstract String getProgramInfoLog(GL gl, int programObj);
+        public abstract boolean isShaderStatusValid(GL gl, int shaderObj, int name);
+        public abstract boolean isShaderStatusValid(GL gl, int shaderObj, int name, PrintStream verboseOut);
+        public abstract boolean isShaderStatusValid(GL gl, IntBuffer shaders, int name);
+        public abstract boolean isShaderStatusValid(GL gl, IntBuffer shaders, int name, PrintStream verboseOut);
+        public abstract boolean isProgramStatusValid(GL gl, int programObj, int name);
+        public abstract boolean isProgramValid(GL gl, int programObj);
+        public abstract boolean isProgramValid(GL gl, int programObj, PrintStream verboseOut);
+        public abstract void createShader(GL gl, int type, IntBuffer shaders);
+        public abstract Set getShaderBinaryFormats(GL gl);
+        public abstract boolean isShaderCompilerAvailable(GL gl);
+        public abstract void shaderSource(GL gl, int shader, java.lang.String[] source);
+        public abstract void shaderSource(GL gl, IntBuffer shaders, java.lang.String[][] sources);
+        public abstract void shaderBinary(GL gl, IntBuffer shaders, int binFormat, java.nio.Buffer bin);
+        public abstract void compileShader(GL gl, IntBuffer shaders);
+        public abstract void attachShader(GL gl, int program, IntBuffer shaders);
+        public abstract void detachShader(GL gl, int program, IntBuffer shaders);
+        public abstract void deleteShader(GL gl, IntBuffer shaders);
+
+        public abstract boolean createAndLoadShader(GL gl, IntBuffer shader, int shaderType,
+                                                    int binFormat, java.nio.Buffer bin,
+                                                    PrintStream verboseOut);
+
+        public abstract boolean createAndCompileShader(GL gl, IntBuffer shader, int shaderType,
+                                                       java.lang.String[][] sources, 
+                                                       PrintStream verboseOut);
+    }
+
+    static class GL2ES2Impl extends Impl {
+        public String getShaderInfoLog(GL _gl, int shaderObj) {
+            GL2ES2 gl = _gl.getGL2ES2();
+            int[] infoLogLength=new int[1];
+            gl.glGetShaderiv(shaderObj, gl.GL_INFO_LOG_LENGTH, infoLogLength, 0);
+
+            if(infoLogLength[0]==0) {
+                return "(no info log)";
+            }
+            int[] charsWritten=new int[1];
+            byte[] infoLogBytes = new byte[infoLogLength[0]];
+            gl.glGetShaderInfoLog(shaderObj, infoLogLength[0], charsWritten, 0, infoLogBytes, 0);
+
+            return new String(infoLogBytes, 0, charsWritten[0]);
+        }
+
+        public String getProgramInfoLog(GL _gl, int programObj) {
+            GL2ES2 gl = _gl.getGL2ES2();
+            int[] infoLogLength=new int[1];
+            gl.glGetProgramiv(programObj, gl.GL_INFO_LOG_LENGTH, infoLogLength, 0);
+
+            if(infoLogLength[0]==0) {
+                return "(no info log)";
+            }
+            int[] charsWritten=new int[1];
+            byte[] infoLogBytes = new byte[infoLogLength[0]];
+            gl.glGetProgramInfoLog(programObj, infoLogLength[0], charsWritten, 0, infoLogBytes, 0);
+
+            return new String(infoLogBytes, 0, charsWritten[0]);
+        }
+
+        public boolean isShaderStatusValid(GL _gl, int shaderObj, int name) {
+            return isShaderStatusValid(_gl, shaderObj, name, null);
+        }
+
+        public boolean isShaderStatusValid(GL _gl, int shaderObj, int name, PrintStream verboseOut) {
+            GL2ES2 gl = _gl.getGL2ES2();
+            int[] ires = new int[1];
+            gl.glGetShaderiv(shaderObj, name, ires, 0);
+
+            boolean res = ires[0]==1;
+            if(!res && null!=verboseOut) {
+                verboseOut.println("Shader status invalid: "+ getShaderInfoLog(gl, shaderObj));
+            }
+            return res;
+        }
+
+        public boolean isShaderStatusValid(GL _gl, IntBuffer shaders, int name) {
+            return isShaderStatusValid(_gl, shaders, name, null);
+        }
+
+        public boolean isShaderStatusValid(GL _gl, IntBuffer shaders, int name, PrintStream verboseOut) {
+            boolean res = true;
+            for (int i = shaders.position(); i < shaders.limit(); i++) {
+                res = isShaderStatusValid(_gl, shaders.get(i), name, verboseOut) && res;
+            }
+            return res;
+        }
+
+        public boolean isProgramStatusValid(GL _gl, int programObj, int name) {
+            GL2ES2 gl = _gl.getGL2ES2();
+            int[] ires = new int[1];
+            gl.glGetProgramiv(programObj, name, ires, 0);
+
+            return ires[0]==1;
+        }
+
+        public boolean isProgramValid(GL _gl, int programObj) {
+            return isProgramValid(_gl, programObj, null);
+        }
+
+        public boolean isProgramValid(GL _gl, int programObj, PrintStream verboseOut) {
+            GL2ES2 gl = _gl.getGL2ES2();
+            int[] ires = new int[1];
+            if(!gl.glIsProgram(programObj)) {
+                if(null!=verboseOut) {
+                    verboseOut.println("Program name invalid: "+programObj);
+                }
+                return false;
+            }
+            if(!isProgramStatusValid(gl, programObj, gl.GL_LINK_STATUS)) {
+                if(null!=verboseOut) {
+                    verboseOut.println("Program link failed: "+programObj+"\n\t"+ getProgramInfoLog(gl, programObj));
+                }
+                return false;
+            }
+            if ( !gl.isGLES2() || isShaderCompilerAvailable(gl) ) {
+                // failed on APX2500 (ES2.0, no compiler) for valid programs
+                gl.glValidateProgram(programObj);
+                if(!isProgramStatusValid(gl, programObj, gl.GL_VALIDATE_STATUS)) {
+                    if(null!=verboseOut) {
+                        verboseOut.println("Program validation failed: "+programObj+"\n\t"+ getProgramInfoLog(gl, programObj));
+                    }
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public void createShader(GL _gl, int type, IntBuffer shaders) {
+            GL2ES2 gl = _gl.getGL2ES2();
+            for (int i = shaders.position(); i < shaders.limit(); i++) {
+                shaders.put(i, gl.glCreateShader(type));
+            }
+        }
+
+        private Boolean shaderCompilerAvailable = null;
+        private Set shaderBinaryFormats = null;
+
+        public Set getShaderBinaryFormats(GL _gl) {
+            GL2ES2 gl = _gl.getGL2ES2();
+            if(null==shaderBinaryFormats) {
+                if(gl.getContext()!=GLContext.getCurrent()) {
+                    return new HashSet(0); // bail out
+                }
+
+                int[] param = new int[1];
+                shaderBinaryFormats = new HashSet();
+
+                if (gl.isGLES2()) {
+                    gl.glGetIntegerv(GL2ES2.GL_NUM_SHADER_BINARY_FORMATS, param, 0);
+                    int numFormats = param[0];
+                    if(numFormats>0) {
+                        int[] formats = new int[numFormats];
+                        gl.glGetIntegerv(GL2ES2.GL_SHADER_BINARY_FORMATS, formats, 0);
+                        for(int i=0; i<numFormats; i++) {
+                            shaderBinaryFormats.add(new Integer(formats[i]));
+                        }
+                    }
+                }
+            }
+            return shaderBinaryFormats;
+        }
+
+
+        public boolean isShaderCompilerAvailable(GL _gl) {
+            GL2ES2 gl = _gl.getGL2ES2();
+            if(null==shaderCompilerAvailable) {
+                if(gl.getContext()!=GLContext.getCurrent()) {
+                    return false; // bail out
+                }
+                Set bfs = getShaderBinaryFormats(gl);
+                if(gl.isGLES2()) {
+                    byte[] param = new byte[1];
+                    gl.glGetBooleanv(GL2ES2.GL_SHADER_COMPILER, param, 0);
+                    boolean v = param[0]!=(byte)0x00;
+                    if(!v && bfs.size()==0) {
+                        // no supported binary formats, hence a compiler must be available!
+                        v = true;
+                    }
+                    shaderCompilerAvailable = new Boolean(v);
+                } else if( gl.isGL2() || gl.isGL2ES2() ) {
+                    shaderCompilerAvailable = new Boolean(true);
+                } else {
+                    throw new GLException("Invalid OpenGL profile");
+                }
+            }
+            return shaderCompilerAvailable.booleanValue();
+        }
+
+        public void shaderSource(GL _gl, int shader, java.lang.String[] source)
+        {
+            GL2ES2 gl = _gl.getGL2ES2();
+            if(!isShaderCompilerAvailable(_gl)) {
+                throw new GLException("No compiler is available");
+            }
+
+            int count = (null!=source)?source.length:0;
+            if(count==0) {
+                throw new GLException("No sources specified");
+            }
+
+            int[] lengths = new int[count];
+            for(int i=0; i<count; i++) {
+                lengths[i] = source[i].length();
+            }
+            gl.glShaderSource(shader, count, source, lengths, 0);
+        }
+
+        public void shaderSource(GL _gl, IntBuffer shaders, java.lang.String[][] sources)
+        {
+            int sourceNum = (null!=sources)?sources.length:0;
+            int shaderNum = (null!=shaders)?shaders.remaining():0;
+            if(shaderNum<=0 || sourceNum<=0 || shaderNum!=sourceNum) {
+                throw new GLException("Invalid number of shaders and/or sources: shaders="+
+                                      shaderNum+", sources="+sourceNum);
+            }
+            for(int i=0; i<sourceNum; i++) {
+                shaderSource(_gl, shaders.get(shaders.position() + i), sources[i]);
+            }
+        }
+
+        public void shaderBinary(GL _gl, IntBuffer shaders, int binFormat, java.nio.Buffer bin)
+        {
+            GL2ES2 gl = _gl.getGL2ES2();
+            if(getShaderBinaryFormats(gl).size()<=0) {
+                throw new GLException("No binary formats are supported");
+            }
+
+            int shaderNum = shaders.remaining();
+            if(shaderNum<=0) {
+                throw new GLException("No shaders specified");
+            }
+            if(null==bin) {
+                throw new GLException("Null shader binary");
+            }
+            int binLength = bin.remaining();
+            if(0>=binLength) {
+                throw new GLException("Empty shader binary (remaining == 0)");
+            }
+            gl.glShaderBinary(shaderNum, shaders, binFormat, bin, binLength);
+        }
+
+        public void compileShader(GL _gl, IntBuffer shaders)
+        {
+            GL2ES2 gl = _gl.getGL2ES2();
+            for (int i = shaders.position(); i < shaders.limit(); i++) {
+                gl.glCompileShader(shaders.get(i));
+            }
+        }
+
+        public void attachShader(GL _gl, int program, IntBuffer shaders)
+        {
+            GL2ES2 gl = _gl.getGL2ES2();
+            for (int i = shaders.position(); i < shaders.limit(); i++) {
+                gl.glAttachShader(program, shaders.get(i));
+            }
+        }
+
+        public void detachShader(GL _gl, int program, IntBuffer shaders)
+        {
+            GL2ES2 gl = _gl.getGL2ES2();
+            for (int i = shaders.position(); i < shaders.limit(); i++) {
+                gl.glDetachShader(program, shaders.get(i));
+            }
+        }
+
+        public void deleteShader(GL _gl, IntBuffer shaders)
+        {
+            GL2ES2 gl = _gl.getGL2ES2();
+            for (int i = shaders.position(); i < shaders.limit(); i++) {
+                gl.glDeleteShader(shaders.get(i));
+
+            }
+        }
+
+        public boolean createAndLoadShader(GL _gl, IntBuffer shader, int shaderType,
+                                           int binFormat, java.nio.Buffer bin,
+                                           PrintStream verboseOut)
+        {
+            GL2ES2 gl = _gl.getGL2ES2();
+            int err = gl.glGetError(); // flush previous errors ..
+            if(err!=GL.GL_NO_ERROR && null!=verboseOut) {
+                verboseOut.println("createAndLoadShader: Pre GL Error: 0x"+Integer.toHexString(err));
+            }
+
+            createShader(gl, shaderType, shader);
+            err = gl.glGetError(); 
+            if(err!=GL.GL_NO_ERROR) {
+                throw new GLException("createAndLoadShader: CreateShader failed, GL Error: 0x"+Integer.toHexString(err));
+            }
+
+
+            shaderBinary(gl, shader, binFormat, bin);
+
+            err = gl.glGetError();
+            if(err!=GL.GL_NO_ERROR && null!=verboseOut) {
+                verboseOut.println("createAndLoadShader: ShaderBinary failed, GL Error: 0x"+Integer.toHexString(err));
+            }
+            return err == GL.GL_NO_ERROR;
+        }
+
+        public boolean createAndCompileShader(GL _gl, IntBuffer shader, int shaderType,
+                                              java.lang.String[][] sources, 
+                                              PrintStream verboseOut)
+        {
+            GL2ES2 gl = _gl.getGL2ES2();
+            int err = gl.glGetError(); // flush previous errors ..
+            if(err!=GL.GL_NO_ERROR && null!=verboseOut) {
+                verboseOut.println("createAndCompileShader: Pre GL Error: 0x"+Integer.toHexString(err));
+            }
+
+            createShader(gl, shaderType, shader);
+            err = gl.glGetError(); 
+            if(err!=GL.GL_NO_ERROR) {
+                throw new GLException("createAndCompileShader: CreateShader failed, GL Error: 0x"+Integer.toHexString(err));
+            }
+
+            shaderSource(gl, shader, sources);
+            err = gl.glGetError(); 
+            if(err!=GL.GL_NO_ERROR) {
+                throw new GLException("createAndCompileShader: ShaderSource failed, GL Error: 0x"+Integer.toHexString(err));
+            }
+
+            compileShader(gl, shader);
+            err = gl.glGetError(); 
+            if(err!=GL.GL_NO_ERROR && null!=verboseOut) {
+                verboseOut.println("createAndCompileShader: CompileShader failed, GL Error: 0x"+Integer.toHexString(err));
+            }
+
+            return isShaderStatusValid(gl, shader, gl.GL_COMPILE_STATUS, verboseOut) && err == GL.GL_NO_ERROR;
+        }
+
+    }
+
+    public static String getShaderInfoLog(GL gl, int shaderObj) {
+        return getImpl(gl).getShaderInfoLog(gl, shaderObj);
+    }
+
+    public static String getProgramInfoLog(GL gl, int programObj) {
+        return getImpl(gl).getProgramInfoLog(gl, programObj);
+    }
+
+    public static boolean isShaderStatusValid(GL gl, int shaderObj, int name) {
+        return getImpl(gl).isShaderStatusValid(gl, shaderObj, name);
+    }
+
+    public static boolean isShaderStatusValid(GL gl, int shaderObj, int name, PrintStream verboseOut) {
+        return getImpl(gl).isShaderStatusValid(gl, shaderObj, name, verboseOut);
+    }
+
+    public static boolean isShaderStatusValid(GL gl, IntBuffer shaders, int name) {
+        return getImpl(gl).isShaderStatusValid(gl, shaders, name);
+    }
+
+    public static boolean isShaderStatusValid(GL gl, IntBuffer shaders, int name, PrintStream verboseOut) {
+        return getImpl(gl).isShaderStatusValid(gl, shaders, name, verboseOut);
+    }
+
+    public static boolean isProgramStatusValid(GL gl, int programObj, int name) {
+        return getImpl(gl).isProgramStatusValid(gl, programObj, name);
+    }
+
+    public static boolean isProgramValid(GL gl, int programObj) {
+        return getImpl(gl).isProgramValid(gl, programObj);
+    }
+
+    public static boolean isProgramValid(GL gl, int programObj, PrintStream verboseOut) {
+        return getImpl(gl).isProgramValid(gl, programObj, verboseOut);
+    }
+
+    public static void createShader(GL gl, int type, IntBuffer shaders) {
+        getImpl(gl).createShader(gl, type, shaders);
+    }
+
+    public static Set getShaderBinaryFormats(GL gl) {
+        return getImpl(gl).getShaderBinaryFormats(gl);
+    }
+
+    public static boolean isShaderCompilerAvailable(GL gl) {
+        return getImpl(gl).isShaderCompilerAvailable(gl);
+    }
+
+    public static void shaderSource(GL gl, int shader, java.lang.String[] source) {
+        getImpl(gl).shaderSource(gl, shader, source);
+    }
+
+    public static void shaderSource(GL gl, IntBuffer shaders, java.lang.String[][] sources) {
+        getImpl(gl).shaderSource(gl, shaders, sources);
+    }
+
+    public static void shaderBinary(GL gl, IntBuffer shaders, int binFormat, java.nio.Buffer bin) {
+        getImpl(gl).shaderBinary(gl, shaders, binFormat, bin);
+    }
+
+    public static void compileShader(GL gl, IntBuffer shaders) {
+        getImpl(gl).compileShader(gl, shaders);
+    }
+
+    public static void attachShader(GL gl, int program, IntBuffer shaders) {
+        getImpl(gl).attachShader(gl, program, shaders);
+    }
+
+    public static void detachShader(GL gl, int program, IntBuffer shaders) {
+        getImpl(gl).detachShader(gl, program, shaders);
+    }
+
+    public static void deleteShader(GL gl, IntBuffer shaders) {
+        getImpl(gl).deleteShader(gl, shaders);
+    }
+
+    public static boolean createAndLoadShader(GL gl, IntBuffer shader, int shaderType,
+                                              int binFormat, java.nio.Buffer bin,
+                                              PrintStream verboseOut) {
+        return getImpl(gl).createAndLoadShader(gl, shader, shaderType, binFormat, bin, verboseOut);
+    }
+
+    public static boolean createAndCompileShader(GL gl, IntBuffer shader, int shaderType,
+                                                 java.lang.String[][] sources, 
+                                                 PrintStream verboseOut) {
+        return getImpl(gl).createAndCompileShader(gl, shader, shaderType, sources, verboseOut);
+    }
+
+    private static Impl getImpl(GL _gl) {
+        GL2ES2 gl = _gl.getGL2ES2();
+        GLContext context = gl.getContext();
+        Impl impl = (Impl) context.getAttachedObject(ShaderUtil.class.getName());
+        if (impl == null) {
+            impl = new GL2ES2Impl();
+            context.putAttachedObject(ShaderUtil.class.getName(), impl);
+        }
+        return impl;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
new file mode 100644
index 000000000..a7042c47a
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ */
+
+package com.jogamp.opengl.util.glsl.fixedfunc;
+
+import javax.media.opengl.*;
+import javax.media.opengl.fixedfunc.*;
+
+import com.jogamp.opengl.util.glsl.fixedfunc.impl.*;
+
+/**
+ * Tool to pipeline GL2ES2 into a fixed function emulation implementing GL2ES1.
+ */
+public class FixedFuncUtil {
+    /**
+     * @return If gl is a GL2ES1 and force is false, return the type cast object,
+     *         otherwise create a fixed function emulation pipeline with the GL2ES2 impl.
+     * @throws GLException if the GL object is neither GL2ES1 nor GL2ES2
+     */
+    public static final GL2ES1 getFixedFuncImpl(GL gl, boolean force) {
+        if(!force && gl.isGL2ES1()) {
+            return gl.getGL2ES1();
+        } else if(gl.isGL2ES2()) {
+            GL2ES2 es2 = gl.getGL2ES2();
+            FixedFuncHook hook = new FixedFuncHook(es2);
+            FixedFuncImpl impl = new FixedFuncImpl(es2, hook);
+            gl.getContext().setGL(impl);
+            return impl;
+        }
+        throw new GLException("GL Object is neither GL2ES1 nor GL2ES2");
+    }
+
+    /**
+     * @return If gl is a GL2ES1, return the type cast object,
+     *         otherwise create a fixed function emulation pipeline with the GL2ES2 impl.
+     * @throws GLException if the GL object is neither GL2ES1 nor GL2ES2
+     */
+    public static final GL2ES1 getFixedFuncImpl(GL gl) {
+        return getFixedFuncImpl(gl, false);
+    }
+
+    /**
+     * Mapping fixed function (client) array indices to 
+     * GLSL array attribute names.
+     *
+     * Useful for uniq mapping of canonical array index names as listed.
+     * 
+     * @see #mgl_Vertex
+     * @see javax.media.opengl.fixedfunc.GLPointerFunc#GL_VERTEX_ARRAY
+     * @see #mgl_Normal
+     * @see javax.media.opengl.fixedfunc.GLPointerFunc#GL_NORMAL_ARRAY
+     * @see #mgl_Color
+     * @see javax.media.opengl.fixedfunc.GLPointerFunc#GL_COLOR_ARRAY
+     * @see #mgl_MultiTexCoord
+     * @see javax.media.opengl.fixedfunc.GLPointerFunc#GL_TEXTURE_COORD_ARRAY
+     * @see javax.media.opengl.fixedfunc.GLPointerFunc#glEnableClientState
+     * @see javax.media.opengl.fixedfunc.GLPointerFunc#glVertexPointer
+     * @see javax.media.opengl.fixedfunc.GLPointerFunc#glColorPointer
+     * @see javax.media.opengl.fixedfunc.GLPointerFunc#glNormalPointer
+     * @see javax.media.opengl.fixedfunc.GLPointerFunc#glTexCoordPointer
+     */
+    public static String getPredefinedArrayIndexName(int glArrayIndex) {
+        return FixedFuncPipeline.getPredefinedArrayIndexName(glArrayIndex);
+    }
+
+    /**
+     * String name for
+     * @see javax.media.opengl.GL#GL_VERTEX_ARRAY
+     */
+    public static final String mgl_Vertex = FixedFuncPipeline.mgl_Vertex;
+
+    /**
+     * String name for
+     * @see javax.media.opengl.GL#GL_NORMAL_ARRAY
+     */
+    public static final String mgl_Normal = FixedFuncPipeline.mgl_Normal;
+
+    /**
+     * String name for
+     * @see javax.media.opengl.GL#GL_COLOR_ARRAY
+     */
+    public static final String mgl_Color = FixedFuncPipeline.mgl_Color;
+
+    /**
+     * String name for
+     * @see javax.media.opengl.GL#GL_TEXTURE_COORD_ARRAY
+     */
+    public static final String mgl_MultiTexCoord = FixedFuncPipeline.mgl_MultiTexCoord;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
new file mode 100755
index 000000000..c03ee8e30
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
@@ -0,0 +1,331 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ */
+
+package com.jogamp.opengl.util.glsl.fixedfunc.impl;
+
+import javax.media.opengl.*;
+import javax.media.opengl.fixedfunc.*;
+import javax.media.opengl.glu.*;
+import com.jogamp.gluegen.runtime.BufferFactory;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
+import java.nio.*;
+
+public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFunc {
+    public static final int MAX_TEXTURE_UNITS = 8;
+
+    protected FixedFuncPipeline fixedFunction=null;
+    protected PMVMatrix pmvMatrix=null;
+    protected GL2ES2 gl=null;
+
+    public FixedFuncHook (GL2ES2 gl) {
+        this(gl, null);
+    }
+
+    public FixedFuncHook (GL2ES2 gl, PMVMatrix matrix) {
+        this.gl = gl;
+        pmvMatrix = (null!=matrix)?matrix:new PMVMatrix();
+
+        fixedFunction = new FixedFuncPipeline(gl, pmvMatrix);
+    }
+
+    public FixedFuncHook(GL2ES2 gl, PMVMatrix matrix, 
+                       Class shaderRootClass, String shaderSrcRoot, String shaderBinRoot, 
+                       String vertexColorFile,
+                       String vertexColorLightFile,
+                       String fragmentColorFile,
+                       String fragmentColorTextureFile) {
+        this.gl = gl;
+        pmvMatrix = matrix;
+
+        fixedFunction = new FixedFuncPipeline(gl, pmvMatrix,
+                                              shaderRootClass, shaderSrcRoot, shaderBinRoot, 
+                                              vertexColorFile, vertexColorLightFile, fragmentColorFile, fragmentColorTextureFile);
+    }
+
+    public void destroy() {
+        fixedFunction.destroy(gl);
+        fixedFunction = null;
+    }
+
+    public PMVMatrix getMatrix() { return pmvMatrix; }
+
+    //
+    // FixedFuncHookIf - hooks 
+    //
+    public void glDrawArrays(int mode, int first, int count) {
+        fixedFunction.validate(gl); 
+        gl.glDrawArrays(mode, first, count);
+    }
+    public void glDrawElements(int mode, int count, int type, java.nio.Buffer indices) {
+        fixedFunction.validate(gl); 
+        gl.glDrawElements(mode, count, type, indices);
+    }
+    public void glDrawElements(int mode, int count, int type, long indices_buffer_offset) {
+        fixedFunction.validate(gl); 
+        gl.glDrawElements(mode, count, type, indices_buffer_offset);
+    }
+
+    public void glActiveTexture(int texture) {
+        fixedFunction.glActiveTexture(gl, texture);
+        gl.glActiveTexture(texture);
+    }
+    public void glEnable(int cap) {
+        if(fixedFunction.glEnable(gl, cap, true)) {
+            gl.glEnable(cap);
+        }
+    }
+    public void glDisable(int cap) {
+        if(fixedFunction.glEnable(gl, cap, false)) {
+            gl.glDisable(cap);
+        }
+    }
+    public void glCullFace(int faceName) {
+        fixedFunction.glCullFace(gl, faceName);
+        gl.glCullFace(faceName);
+    }
+
+    public void glGetFloatv(int pname, java.nio.FloatBuffer params) {
+        if(pmvMatrix.isMatrixGetName(pname)) {
+            pmvMatrix.glGetFloatv(pname, params);
+            return;
+        }
+        gl.glGetFloatv(pname, params);
+    }
+    public void glGetFloatv(int pname, float[] params, int params_offset) {
+        if(pmvMatrix.isMatrixGetName(pname)) {
+            pmvMatrix.glGetFloatv(pname, params, params_offset);
+            return;
+        }
+        gl.glGetFloatv(pname, params, params_offset);
+    }
+    public void glGetIntegerv(int pname, IntBuffer params) {
+        if(pmvMatrix.isMatrixGetName(pname)) {
+            pmvMatrix.glGetIntegerv(pname, params);
+            return;
+        }
+        gl.glGetIntegerv(pname, params);
+    }
+    public void glGetIntegerv(int pname, int[] params, int params_offset) {
+        if(pmvMatrix.isMatrixGetName(pname)) {
+            pmvMatrix.glGetIntegerv(pname, params, params_offset);
+            return;
+        }
+        gl.glGetIntegerv(pname, params, params_offset);
+    }
+
+    // 
+    // MatrixIf
+    //
+    public int  glGetMatrixMode() {
+        return pmvMatrix.glGetMatrixMode();
+    }
+    public void glMatrixMode(int mode) {
+        pmvMatrix.glMatrixMode(mode);
+    }
+    public void glLoadMatrixf(java.nio.FloatBuffer m) {
+        pmvMatrix.glLoadMatrixf(m);
+    }
+    public void glLoadMatrixf(float[] m, int m_offset) {
+        glLoadMatrixf(BufferUtil.newFloatBuffer(m, m_offset));
+    }
+    public void glPopMatrix() {
+        pmvMatrix.glPopMatrix();
+    }
+    public void glPushMatrix() {
+        pmvMatrix.glPushMatrix();
+    }
+    public void glLoadIdentity() {
+        pmvMatrix.glLoadIdentity();
+    }
+    public void glMultMatrixf(java.nio.FloatBuffer m) {
+        pmvMatrix.glMultMatrixf(m);
+    }
+    public void glMultMatrixf(float[] m, int m_offset) {
+        glMultMatrixf(BufferUtil.newFloatBuffer(m, m_offset));
+    }
+    public void glTranslatef(float x, float y, float z) {
+        pmvMatrix.glTranslatef(x, y, z);
+    }
+    public void glRotatef(float angdeg, float x, float y, float z) {
+        pmvMatrix.glRotatef(angdeg, x, y, z);
+    }
+    public void glScalef(float x, float y, float z) {
+        pmvMatrix.glScalef(x, y, z);
+    }
+    public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) {
+        pmvMatrix.glOrthof(left, right, bottom, top, zNear, zFar);
+    }
+    public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar) {
+        pmvMatrix.glFrustumf(left, right, bottom, top, zNear, zFar);
+    }
+
+    // 
+    // LightingIf
+    //
+    public void glColor4f(float red, float green, float blue, float alpha) {
+      fixedFunction.glColor4fv(gl, BufferUtil.newFloatBuffer(new float[] { red, green, blue, alpha })); 
+    }
+
+    public void glLightfv(int light, int pname, java.nio.FloatBuffer params) {
+      fixedFunction.glLightfv(gl, light, pname, params);
+    }
+    public void glLightfv(int light, int pname, float[] params, int params_offset) {
+        glLightfv(light, pname, BufferUtil.newFloatBuffer(params, params_offset));
+    }
+    public void glMaterialfv(int face, int pname, java.nio.FloatBuffer params) {
+      fixedFunction.glMaterialfv(gl, face, pname, params);
+    }
+    public void glMaterialfv(int face, int pname, float[] params, int params_offset) {
+        glMaterialfv(face, pname, BufferUtil.newFloatBuffer(params, params_offset));
+    }
+    public void glMaterialf(int face, int pname, float param) {
+        glMaterialfv(face, pname, BufferUtil.newFloatBuffer(new float[] { param }));
+    }
+    public void glShadeModel(int mode) {
+      fixedFunction.glShadeModel(gl, mode);
+    }
+
+    //
+    // PointerIf
+    //
+    public void glEnableClientState(int glArrayIndex) {
+      fixedFunction.glEnableClientState(gl, glArrayIndex);
+    }
+    public void glDisableClientState(int glArrayIndex) {
+      fixedFunction.glDisableClientState(gl, glArrayIndex);
+    }
+
+    public void glVertexPointer(GLArrayData array) {
+      if(array.isVBO()) {
+          if(!gl.glIsVBOArrayEnabled()) {
+            throw new GLException("VBO array is not enabled: "+array);
+          }
+      } else {
+          if(gl.glIsVBOArrayEnabled()) {
+            throw new GLException("VBO array is not disabled: "+array);
+          }
+          BufferFactory.rangeCheck(array.getBuffer(), 1);
+          if (!BufferFactory.isDirect(array.getBuffer())) {
+            throw new GLException("Argument \"pointer\" was not a direct buffer"); }
+      }
+      fixedFunction.glVertexPointer(gl, array);
+    }
+
+    public void glVertexPointer(int size, int type, int stride, java.nio.Buffer pointer) {
+      glVertexPointer(GLArrayDataWrapper.createFixed(gl, GL_VERTEX_ARRAY, size, type, false, stride, pointer, 0, 0));
+    }
+    public void glVertexPointer(int size, int type, int stride, long pointer_buffer_offset) {
+      int vboName = gl.glGetBoundBuffer(GL.GL_ARRAY_BUFFER);
+      if(vboName==0) {
+        throw new GLException("no GL_ARRAY_BUFFER VBO bound");
+      }
+      glVertexPointer(GLArrayDataWrapper.createFixed(gl, GL_VERTEX_ARRAY, size, type, false, 
+                                                     stride, null, vboName, pointer_buffer_offset));
+    }
+
+    public void glColorPointer(GLArrayData array) {
+      if(array.isVBO()) {
+          if(!gl.glIsVBOArrayEnabled()) {
+            throw new GLException("VBO array is not enabled: "+array);
+          }
+      } else {
+          if(gl.glIsVBOArrayEnabled()) {
+            throw new GLException("VBO array is not disabled: "+array);
+          }
+          BufferFactory.rangeCheck(array.getBuffer(), 1);
+          if (!BufferFactory.isDirect(array.getBuffer())) {
+            throw new GLException("Argument \"pointer\" was not a direct buffer"); }
+      }
+      fixedFunction.glColorPointer(gl, array);
+    }
+    public void glColorPointer(int size, int type, int stride, java.nio.Buffer pointer) {
+      glColorPointer(GLArrayDataWrapper.createFixed(gl, GL_COLOR_ARRAY, size, type, false, 
+                                                    stride, pointer, 0, 0));
+    }
+    public void glColorPointer(int size, int type, int stride, long pointer_buffer_offset) {
+      int vboName = gl.glGetBoundBuffer(GL.GL_ARRAY_BUFFER);
+      if(vboName==0) {
+        throw new GLException("no GL_ARRAY_BUFFER VBO bound");
+      }
+      glColorPointer(GLArrayDataWrapper.createFixed(gl, GL_COLOR_ARRAY, size, type, false, 
+                                                   stride, null, vboName, pointer_buffer_offset));
+    }
+
+    public void glNormalPointer(GLArrayData array) {
+      if(array.getComponentNumber()!=3) {
+        throw new GLException("Only 3 components per normal allowed");
+      }
+      if(array.isVBO()) {
+          if(!gl.glIsVBOArrayEnabled()) {
+            throw new GLException("VBO array is not enabled: "+array);
+          }
+      } else {
+          if(gl.glIsVBOArrayEnabled()) {
+            throw new GLException("VBO array is not disabled: "+array);
+          }
+          BufferFactory.rangeCheck(array.getBuffer(), 1);
+          if (!BufferFactory.isDirect(array.getBuffer())) {
+            throw new GLException("Argument \"pointer\" was not a direct buffer"); }
+      }
+      fixedFunction.glNormalPointer(gl, array);
+    }
+    public void glNormalPointer(int type, int stride, java.nio.Buffer pointer) {
+      glNormalPointer(GLArrayDataWrapper.createFixed(gl, GL_NORMAL_ARRAY, 3, type, false, 
+                                                     stride, pointer, 0, 0));
+    }
+    public void glNormalPointer(int type, int stride, long pointer_buffer_offset) {
+      int vboName = gl.glGetBoundBuffer(GL.GL_ARRAY_BUFFER);
+      if(vboName==0) {
+        throw new GLException("no GL_ARRAY_BUFFER VBO bound");
+      }
+      glNormalPointer(GLArrayDataWrapper.createFixed(gl, GL_NORMAL_ARRAY, 3, type, false, 
+                                                     stride, null, vboName, pointer_buffer_offset));
+    }
+
+    public void glTexCoordPointer(GLArrayData array) {
+      if(array.isVBO()) {
+          if(!gl.glIsVBOArrayEnabled()) {
+            throw new GLException("VBO array is not enabled: "+array);
+          }
+      } else {
+          if(gl.glIsVBOArrayEnabled()) {
+            throw new GLException("VBO array is not disabled: "+array);
+          }
+          BufferFactory.rangeCheck(array.getBuffer(), 1);
+          if (!BufferFactory.isDirect(array.getBuffer())) {
+            throw new GLException("Argument \"pointer\" was not a direct buffer"); }
+      }
+      fixedFunction.glTexCoordPointer(gl, array);
+    }
+    public void glTexCoordPointer(int size, int type, int stride, java.nio.Buffer pointer) {
+      glTexCoordPointer(
+        GLArrayDataWrapper.createFixed(gl, GL_TEXTURE_COORD_ARRAY, size, type, false, stride, pointer, 0,0));
+    }
+    public void glTexCoordPointer(int size, int type, int stride, long pointer_buffer_offset) {
+      int vboName = gl.glGetBoundBuffer(GL.GL_ARRAY_BUFFER);
+      if(vboName==0) {
+        throw new GLException("no GL_ARRAY_BUFFER VBO bound");
+      }
+      glTexCoordPointer(
+        GLArrayDataWrapper.createFixed(gl, GL_TEXTURE_COORD_ARRAY, size, type, false, 
+                                       stride, null, vboName, pointer_buffer_offset) );
+    }
+
+    public final String toString() {
+          StringBuffer buf = new StringBuffer();
+          buf.append(getClass().getName()+" (");
+          if(null!=pmvMatrix) {
+              buf.append(", matrixDirty: "+pmvMatrix.isDirty());
+          }
+          buf.append("\n\t, FixedFunction: "+fixedFunction);
+          buf.append(gl);
+          buf.append(" )");
+
+          return buf.toString();
+    }
+
+}
+
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
new file mode 100644
index 000000000..1a60ab21e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
@@ -0,0 +1,554 @@
+
+package com.jogamp.opengl.util.glsl.fixedfunc.impl;
+
+import javax.media.opengl.*;
+import javax.media.opengl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
+import java.nio.*;
+
+public class FixedFuncPipeline {
+    public static final int MAX_TEXTURE_UNITS = 8;
+    public static final int MAX_LIGHTS        = 8;
+
+    // We can't have any dependencies on the FixedFuncUtil class for build bootstrapping reasons
+    public static final String mgl_Vertex = "mgl_Vertex";
+    public static final String mgl_Normal = "mgl_Normal";
+    public static final String mgl_Color = "mgl_Color";
+    public static final String mgl_MultiTexCoord = "mgl_MultiTexCoord" ;
+
+    public static String getPredefinedArrayIndexName(int glArrayIndex) {
+        switch(glArrayIndex) {
+            case GLPointerFunc.GL_VERTEX_ARRAY:
+                return mgl_Vertex;
+            case GLPointerFunc.GL_NORMAL_ARRAY:
+                return mgl_Normal;
+            case GLPointerFunc.GL_COLOR_ARRAY:
+                return mgl_Color;
+            case GLPointerFunc.GL_TEXTURE_COORD_ARRAY:
+                return mgl_MultiTexCoord;
+        }
+        return null;
+    }
+
+    public FixedFuncPipeline(GL2ES2 gl, PMVMatrix pmvMatrix) {
+        init(gl, pmvMatrix, FixedFuncPipeline.class, shaderSrcRootDef, shaderBinRootDef, 
+             vertexColorFileDef, vertexColorLightFileDef, fragmentColorFileDef, fragmentColorTextureFileDef);
+    }
+    public FixedFuncPipeline(GL2ES2 gl, PMVMatrix pmvMatrix, Class shaderRootClass, String shaderSrcRoot, String shaderBinRoot, 
+                       String vertexColorFile,
+                       String vertexColorLightFile,
+                       String fragmentColorFile,
+                       String fragmentColorTextureFile) {
+        init(gl, pmvMatrix, shaderRootClass, shaderSrcRoot, shaderBinRoot, 
+             vertexColorFile, vertexColorLightFile, fragmentColorFile, fragmentColorTextureFile);
+    }
+
+    public boolean verbose() { return verbose; }
+
+    public void setVerbose(boolean v) { verbose=v; }
+
+    public boolean isValid() {
+        return shaderState.linked();
+    }
+
+    public ShaderState getShaderState() {
+        return shaderState;
+    }
+
+    public int getActiveTextureUnit() {
+        return activeTextureUnit;
+    }
+
+    public String getArrayIndexName(int glArrayIndex) {
+      String name = getPredefinedArrayIndexName(glArrayIndex); 
+      switch(glArrayIndex) {
+          case GLPointerFunc.GL_VERTEX_ARRAY:
+          case GLPointerFunc.GL_NORMAL_ARRAY:
+          case GLPointerFunc.GL_COLOR_ARRAY:
+              break;
+          case GLPointerFunc.GL_TEXTURE_COORD_ARRAY:
+              name = name + activeTextureUnit;
+      }
+      return name;
+    }
+
+    public void destroy(GL2ES2 gl) {
+        shaderProgramColor.release(gl, true);
+        shaderProgramColorLight.release(gl, true);
+        shaderProgramColorTexture.release(gl, true);
+        shaderProgramColorTextureLight.release(gl, true);
+        shaderState.destroy(gl);
+    }
+
+    public void glEnableClientState(GL2ES2 gl, int glArrayIndex) {
+        shaderState.glUseProgram(gl, true);
+
+        shaderState.glEnableVertexAttribArray(gl, getArrayIndexName(glArrayIndex));
+        // textureCoordsEnabled |=  (1 << activeTextureUnit);
+        if ( textureCoordsEnabled.get(activeTextureUnit) != 1 ) {
+            textureCoordsEnabled.put(activeTextureUnit, 1);
+            textureCoordsEnabledDirty = true;
+        }
+    }
+
+    public void glDisableClientState(GL2ES2 gl, int glArrayIndex) {
+        shaderState.glUseProgram(gl, true);
+
+        shaderState.glDisableVertexAttribArray(gl, getArrayIndexName(glArrayIndex));
+        // textureCoordsEnabled &= ~(1 << activeTextureUnit);
+        if ( textureCoordsEnabled.get(activeTextureUnit) != 0 ) {
+            textureCoordsEnabled.put(activeTextureUnit, 0);
+            textureCoordsEnabledDirty = true;
+        }
+    }
+
+    public void glVertexPointer(GL2ES2 gl, GLArrayData data) {
+        shaderState.glUseProgram(gl, true);
+        shaderState.glVertexAttribPointer(gl, data);
+    }
+
+    public void glColorPointer(GL2ES2 gl, GLArrayData data) {
+        shaderState.glUseProgram(gl, true);
+        shaderState.glVertexAttribPointer(gl, data);
+    }
+
+    public void glColor4fv(GL2ES2 gl, FloatBuffer data ) {
+        shaderState.glUseProgram(gl, true);
+        GLUniformData ud = shaderState.getUniform(mgl_ColorStatic);
+        if(null!=ud) {
+            ud.setData(data);
+            shaderState.glUniform(gl, ud);
+        }
+    }
+
+    public void glNormalPointer(GL2ES2 gl, GLArrayData data) {
+        shaderState.glUseProgram(gl, true);
+        shaderState.glVertexAttribPointer(gl, data);
+    }
+
+    public void glTexCoordPointer(GL2ES2 gl, GLArrayData data) {
+        shaderState.glUseProgram(gl, true);
+        data.setName( getArrayIndexName(data.getIndex()) );
+        shaderState.glVertexAttribPointer(gl, data);
+    }
+
+    public void glLightfv(GL2ES2 gl, int light, int pname, java.nio.FloatBuffer params) {
+        shaderState.glUseProgram(gl, true);
+        light -=GLLightingFunc.GL_LIGHT0;
+        if(0 <= light && light < MAX_LIGHTS) {
+            GLUniformData ud = null;
+            switch(pname) {
+                case  GLLightingFunc.GL_AMBIENT:
+                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].ambient");
+                    break;
+                case  GLLightingFunc.GL_DIFFUSE:
+                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].diffuse");
+                    break;
+                case  GLLightingFunc.GL_SPECULAR:
+                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].specular");
+                    break;
+                case GLLightingFunc.GL_POSITION:
+                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].position");
+                    break;
+                case GLLightingFunc.GL_SPOT_DIRECTION:
+                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].spotDirection");
+                    break;
+                case GLLightingFunc.GL_SPOT_EXPONENT:
+                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].spotExponent");
+                    break;
+                case GLLightingFunc.GL_SPOT_CUTOFF:
+                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].spotCutoff");
+                    break;
+                case GLLightingFunc.GL_CONSTANT_ATTENUATION:
+                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].constantAttenuation");
+                    break;
+                case GLLightingFunc.GL_LINEAR_ATTENUATION:
+                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].linearAttenuation");
+                    break;
+                case GLLightingFunc.GL_QUADRATIC_ATTENUATION:
+                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].quadraticAttenuation");
+                    break;
+                default:
+                    if(verbose) {
+                        System.err.println("glLightfv pname not within [GL_AMBIENT GL_DIFFUSE GL_SPECULAR GL_POSITION GL_SPOT_DIRECTION]: "+pname);
+                    }
+                    return;
+            }
+            if(null!=ud) {
+                ud.setData(params);
+                shaderState.glUniform(gl, ud);
+            }
+        } else if(verbose) {
+            System.err.println("glLightfv light not within [0.."+MAX_LIGHTS+"]: "+light);
+        }
+    }
+
+    public void glMaterialfv(GL2ES2 gl, int face, int pname, java.nio.FloatBuffer params) {
+        shaderState.glUseProgram(gl, true);
+
+        switch (face) {
+            case GL.GL_FRONT:
+            case GL.GL_FRONT_AND_BACK:
+                break;
+            case GL.GL_BACK:
+                if(verbose) {
+                    System.err.println("glMaterialfv face GL_BACK currently not supported");
+                }
+                break;
+            default:
+        }
+
+        GLUniformData ud = null;
+        switch(pname) {
+            case  GLLightingFunc.GL_AMBIENT:
+                ud = shaderState.getUniform(mgl_FrontMaterial+".ambient");
+                break;
+            case  GLLightingFunc.GL_AMBIENT_AND_DIFFUSE:
+                glMaterialfv(gl, face, GLLightingFunc.GL_AMBIENT, params);
+                // fall through intended ..
+            case  GLLightingFunc.GL_DIFFUSE:
+                ud = shaderState.getUniform(mgl_FrontMaterial+".diffuse");
+                break;
+            case  GLLightingFunc.GL_SPECULAR:
+                ud = shaderState.getUniform(mgl_FrontMaterial+".specular");
+                break;
+            case  GLLightingFunc.GL_EMISSION:
+                ud = shaderState.getUniform(mgl_FrontMaterial+".emission");
+                break;
+            case  GLLightingFunc.GL_SHININESS:
+                ud = shaderState.getUniform(mgl_FrontMaterial+".shininess");
+                break;
+            default:
+                if(verbose) {
+                    System.err.println("glMaterialfv pname not within [GL_AMBIENT GL_DIFFUSE GL_SPECULAR GL_EMISSION GL_SHININESS]: "+pname);
+                }
+                return;
+        }
+        if(null!=ud) {
+            ud.setData(params);
+            shaderState.glUniform(gl, ud);
+        }
+    }
+
+    public void glShadeModel(GL2ES2 gl, int mode) {
+        shaderState.glUseProgram(gl, true);
+        GLUniformData ud = shaderState.getUniform(mgl_ShadeModel);
+        if(null!=ud) {
+            ud.setData(mode);
+            shaderState.glUniform(gl, ud);
+        }
+    }
+
+    public void glActiveTexture(GL2ES2 gl, int textureUnit) {
+        textureUnit -= GL.GL_TEXTURE0;
+        if(0 <= textureUnit && textureUnit<MAX_TEXTURE_UNITS) {
+            shaderState.glUseProgram(gl, true);
+            GLUniformData ud;
+            ud = shaderState.getUniform(mgl_ActiveTexture);
+            if(null!=ud) {
+                ud.setData(textureUnit);
+                shaderState.glUniform(gl, ud);
+            }
+            ud = shaderState.getUniform(mgl_ActiveTextureIdx);
+            if(null!=ud) {
+                ud.setData(textureUnit);
+                shaderState.glUniform(gl, ud);
+            }
+            activeTextureUnit = textureUnit;
+        } else {
+            throw new GLException("glActivateTexture textureUnit not within GL_TEXTURE0 + [0.."+MAX_TEXTURE_UNITS+"]: "+textureUnit);
+        }
+    }
+
+    /**
+     * @return false if digested in regard to GL2ES2 spec, 
+     *         eg this call must not be passed to an underlying ES2 implementation.
+     *         true if this call shall be passed to an underlying GL2ES2/ES2 implementation as well.
+     */
+    public boolean glEnable(GL2ES2 gl, int cap, boolean enable) {
+        switch(cap) {
+            case GL.GL_TEXTURE_2D:
+                textureEnabled=enable;
+                return true;
+            case GLLightingFunc.GL_LIGHTING:
+                lightingEnabled=enable;
+                return false;
+            case GL.GL_CULL_FACE:
+                cullFace=Math.abs(cullFace);
+                if(!enable) {
+                    cullFace*=-1;
+                }
+                return true;
+        }
+
+        int light = cap - GLLightingFunc.GL_LIGHT0;
+        if(0 <= light && light < MAX_LIGHTS) {
+            if ( (lightsEnabled.get(light)==1) != enable ) {
+                lightsEnabled.put(light, enable?1:0);
+                lightsEnabledDirty = true;
+                return false;
+            }
+        }
+        return true; // pass it on ..
+    }
+
+    public void glCullFace(GL2ES2 gl, int faceName) {
+        switch(faceName) {
+            case GL.GL_FRONT:
+                faceName = 1; break;
+            case GL.GL_BACK:
+                faceName = 2; break;
+            case GL.GL_FRONT_AND_BACK:
+                faceName = 3; break;
+        }
+        if(0>cullFace) {
+            faceName *= -1;
+        }
+        cullFace = faceName;
+    }
+
+    public void validate(GL2ES2 gl) {
+        shaderState.glUseProgram(gl, true);
+        GLUniformData ud;
+        if(pmvMatrix.update()) {
+            ud = shaderState.getUniform(mgl_PMVMatrix);
+            if(null!=ud) {
+                // same data object ..
+                shaderState.glUniform(gl, ud);
+            } else {
+                throw new GLException("Failed to update: mgl_PMVMatrix");
+            }
+            ud = shaderState.getUniform(mgl_NormalMatrix);
+            if(null!=ud) {
+                // same data object ..
+                shaderState.glUniform(gl, ud);
+            }
+        }
+        ud = shaderState.getUniform(mgl_ColorEnabled);
+        if(null!=ud) {
+            int ca = (shaderState.isVertexAttribArrayEnabled(mgl_Color)==true)?1:0;
+            if(ca!=ud.intValue()) {
+                ud.setData(ca);
+                shaderState.glUniform(gl, ud);
+            }
+        }
+        ud = shaderState.getUniform(mgl_CullFace);
+        if(null!=ud) {
+            if(cullFace!=ud.intValue()) {
+                ud.setData(cullFace);
+                shaderState.glUniform(gl, ud);
+            }
+        }
+
+        if(lightsEnabledDirty) {
+            ud = shaderState.getUniform(mgl_LightsEnabled);
+            if(null!=ud) {
+                // same data object 
+                shaderState.glUniform(gl, ud);
+            }
+            lightsEnabledDirty=false;
+        }
+
+        if(textureCoordsEnabledDirty) {
+            ud = shaderState.getUniform(mgl_TexCoordEnabled);
+            if(null!=ud) {
+                // same data object 
+                shaderState.glUniform(gl, ud);
+            }
+            textureCoordsEnabledDirty=false;
+        }
+
+        if(textureEnabled) {
+            if(lightingEnabled) {
+                shaderState.attachShaderProgram(gl, shaderProgramColorTextureLight);
+            } else {
+                shaderState.attachShaderProgram(gl, shaderProgramColorTexture);
+            }
+        } else {
+            if(lightingEnabled) {
+                shaderState.attachShaderProgram(gl, shaderProgramColorLight);
+            } else {
+                shaderState.attachShaderProgram(gl, shaderProgramColor);
+            }
+        }
+        if(DEBUG) {
+            System.err.println("validate: "+this);
+        }
+    }
+
+    public String toString() {
+        return "FixedFuncPipeline[pmv: "+pmvMatrix+
+               ", textureEnabled: "+textureEnabled+
+               ", textureCoordsEnabled: "+textureCoordsEnabled+
+               ", lightingEnabled: "+lightingEnabled+
+               ", lightsEnabled: "+lightsEnabled+
+               "\n\t, shaderProgramColor: "+shaderProgramColor+
+               "\n\t, shaderProgramColorTexture: "+shaderProgramColorTexture+
+               "\n\t, shaderProgramColorLight: "+shaderProgramColorLight+
+               "\n\t, shaderProgramColorTextureLight: "+shaderProgramColorTextureLight+
+               "\n\t, ShaderState: "+shaderState+
+               "]";
+    }
+
+    protected void init(GL2ES2 gl, PMVMatrix pmvMatrix, Class shaderRootClass, String shaderSrcRoot, String shaderBinRoot, 
+                       String vertexColorFile,
+                       String vertexColorLightFile,
+                       String fragmentColorFile,
+                       String fragmentColorTextureFile) 
+   {
+        if(null==pmvMatrix) {
+            throw new GLException("PMVMatrix is null");
+        }
+        this.pmvMatrix=pmvMatrix;
+        this.shaderState=new ShaderState();
+        this.shaderState.setVerbose(verbose);
+        ShaderCode vertexColor, vertexColorLight, fragmentColor, fragmentColorTexture;
+
+        vertexColor = ShaderCode.create( gl, gl.GL_VERTEX_SHADER, 1, shaderRootClass,
+                                         shaderSrcRoot, shaderBinRoot, vertexColorFile);
+
+        vertexColorLight = ShaderCode.create( gl, gl.GL_VERTEX_SHADER, 1, shaderRootClass,
+                                           shaderSrcRoot, shaderBinRoot, vertexColorLightFile);
+
+        fragmentColor = ShaderCode.create( gl, gl.GL_FRAGMENT_SHADER, 1, shaderRootClass,
+                                           shaderSrcRoot, shaderBinRoot, fragmentColorFile);
+
+        fragmentColorTexture = ShaderCode.create( gl, gl.GL_FRAGMENT_SHADER, 1, shaderRootClass,
+                                                  shaderSrcRoot, shaderBinRoot, fragmentColorTextureFile);
+
+        shaderProgramColor = new ShaderProgram();
+        shaderProgramColor.add(vertexColor);
+        shaderProgramColor.add(fragmentColor);
+        if(!shaderProgramColor.link(gl, System.err)) {
+            throw new GLException("Couldn't link VertexColor program: "+shaderProgramColor);
+        }
+
+        shaderProgramColorTexture = new ShaderProgram();
+        shaderProgramColorTexture.add(vertexColor);
+        shaderProgramColorTexture.add(fragmentColorTexture);
+        if(!shaderProgramColorTexture.link(gl, System.err)) {
+            throw new GLException("Couldn't link VertexColorTexture program: "+shaderProgramColorTexture);
+        }
+
+        shaderProgramColorLight = new ShaderProgram();
+        shaderProgramColorLight.add(vertexColorLight);
+        shaderProgramColorLight.add(fragmentColor);
+        if(!shaderProgramColorLight.link(gl, System.err)) {
+            throw new GLException("Couldn't link VertexColorLight program: "+shaderProgramColorLight);
+        }
+
+        shaderProgramColorTextureLight = new ShaderProgram();
+        shaderProgramColorTextureLight.add(vertexColorLight);
+        shaderProgramColorTextureLight.add(fragmentColorTexture);
+        if(!shaderProgramColorTextureLight.link(gl, System.err)) {
+            throw new GLException("Couldn't link VertexColorLight program: "+shaderProgramColorTextureLight);
+        }
+
+        shaderState.attachShaderProgram(gl, shaderProgramColor);
+        shaderState.glUseProgram(gl, true);
+
+        // mandatory ..
+        if(!shaderState.glUniform(gl, new GLUniformData(mgl_PMVMatrix, 4, 4, pmvMatrix.glGetPMvMviMatrixf()))) {
+            throw new GLException("Error setting PMVMatrix in shader: "+this);
+        }
+
+        // optional parameter ..
+        shaderState.glUniform(gl, new GLUniformData(mgl_NormalMatrix, 3, 3, pmvMatrix.glGetNormalMatrixf()));
+
+        shaderState.glUniform(gl, new GLUniformData(mgl_ColorEnabled,  0));
+        shaderState.glUniform(gl, new GLUniformData(mgl_ColorStatic, 4, zero4f));
+        shaderState.glUniform(gl, new GLUniformData(mgl_TexCoordEnabled,  1, textureCoordsEnabled));
+        shaderState.glUniform(gl, new GLUniformData(mgl_ActiveTexture, activeTextureUnit));
+        shaderState.glUniform(gl, new GLUniformData(mgl_ActiveTextureIdx, activeTextureUnit));
+        shaderState.glUniform(gl, new GLUniformData(mgl_ShadeModel, 0));
+        shaderState.glUniform(gl, new GLUniformData(mgl_CullFace, cullFace));
+        for(int i=0; i<MAX_LIGHTS; i++) {
+            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].ambient", 4, defAmbient));
+            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].diffuse", 4, defDiffuse));
+            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].specular", 4, defSpecular));
+            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].position", 4, defPosition));
+            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].spotDirection", 3, defSpotDir));
+            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].spotExponent", defSpotExponent));
+            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].spotCutoff", defSpotCutoff));
+            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].constantAttenuation", defConstantAtten));
+            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].linearAttenuation", defLinearAtten));
+            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].quadraticAttenuation", defQuadraticAtten));
+        }
+        shaderState.glUniform(gl, new GLUniformData(mgl_LightsEnabled,  1, lightsEnabled));
+        shaderState.glUniform(gl, new GLUniformData(mgl_FrontMaterial+".ambient", 4, defMatAmbient));
+        shaderState.glUniform(gl, new GLUniformData(mgl_FrontMaterial+".diffuse", 4, defMatDiffuse));
+        shaderState.glUniform(gl, new GLUniformData(mgl_FrontMaterial+".specular", 4, defMatSpecular));
+        shaderState.glUniform(gl, new GLUniformData(mgl_FrontMaterial+".emission", 4, defMatEmission));
+        shaderState.glUniform(gl, new GLUniformData(mgl_FrontMaterial+".shininess", defMatShininess));
+
+        shaderState.glUseProgram(gl, false);
+    }
+
+    protected static final boolean DEBUG=false;
+    protected boolean verbose=false;
+
+    protected boolean textureEnabled=false;
+    protected IntBuffer textureCoordsEnabled = BufferUtil.newIntBuffer(new int[] { 0, 0, 0, 0, 0, 0, 0, 0 });
+    protected boolean textureCoordsEnabledDirty = false;
+    protected int     activeTextureUnit=0;
+
+    protected int cullFace=-2; // <=0 disabled, 1: front, 2: back (default, but disabled), 3: front & back
+
+    protected boolean lightingEnabled=false;
+    protected IntBuffer lightsEnabled = BufferUtil.newIntBuffer(new int[] { 0, 0, 0, 0, 0, 0, 0, 0 });
+    protected boolean   lightsEnabledDirty = false;
+
+    protected PMVMatrix pmvMatrix;
+    protected ShaderState shaderState;
+    protected ShaderProgram shaderProgramColor;
+    protected ShaderProgram shaderProgramColorTexture;
+    protected ShaderProgram shaderProgramColorLight;
+    protected ShaderProgram shaderProgramColorTextureLight;
+
+    // uniforms ..
+    protected static final String mgl_PMVMatrix        = "mgl_PMVMatrix";       // m4fv[3]
+    protected static final String mgl_NormalMatrix     = "mgl_NormalMatrix";    // m4fv
+    protected static final String mgl_ColorEnabled     = "mgl_ColorEnabled";    //  1i
+    protected static final String mgl_ColorStatic      = "mgl_ColorStatic";     //  4fv
+
+    protected static final String mgl_LightSource      = "mgl_LightSource";     //  struct mgl_LightSourceParameters[MAX_LIGHTS]
+    protected static final String mgl_FrontMaterial    = "mgl_FrontMaterial";   //  struct mgl_MaterialParameters
+    protected static final String mgl_LightsEnabled    = "mgl_LightsEnabled";   //  int mgl_LightsEnabled[MAX_LIGHTS];
+
+    protected static final String mgl_ShadeModel       = "mgl_ShadeModel";      //  1i
+
+    protected static final String mgl_TexCoordEnabled  = "mgl_TexCoordEnabled"; //  int mgl_TexCoordEnabled[MAX_TEXTURE_UNITS];
+    protected static final String mgl_ActiveTexture    = "mgl_ActiveTexture";   //  1i
+    protected static final String mgl_ActiveTextureIdx = "mgl_ActiveTextureIdx";//  1i
+
+    protected static final String mgl_CullFace         = "mgl_CullFace";   //  1i
+
+    protected static final FloatBuffer zero4f     = BufferUtil.newFloatBuffer(new float[] { 0.0f, 0.0f, 0.0f, 0.0f });
+
+    public static final FloatBuffer defAmbient = BufferUtil.newFloatBuffer(new float[] { 0f, 0f, 0f, 1f });
+    public static final FloatBuffer defDiffuse = zero4f;
+    public static final FloatBuffer defSpecular= zero4f;
+    public static final FloatBuffer defPosition= BufferUtil.newFloatBuffer(new float[] { 0f, 0f, 1f, 0f });
+    public static final FloatBuffer defSpotDir = BufferUtil.newFloatBuffer(new float[] { 0f, 0f, -1f });
+    public static final float defSpotExponent  = 0f;
+    public static final float defSpotCutoff    = 180f;
+    public static final float defConstantAtten = 1f;
+    public static final float defLinearAtten   = 0f;
+    public static final float defQuadraticAtten= 0f;
+
+    public static final FloatBuffer defMatAmbient = BufferUtil.newFloatBuffer(new float[] { 0.2f, 0.2f, 0.2f, 1.0f });
+    public static final FloatBuffer defMatDiffuse = BufferUtil.newFloatBuffer(new float[] { 0.8f, 0.8f, 0.8f, 1.0f });
+    public static final FloatBuffer defMatSpecular= BufferUtil.newFloatBuffer(new float[] { 0f, 0f, 0f, 1f});
+    public static final FloatBuffer defMatEmission= BufferUtil.newFloatBuffer(new float[] { 0f, 0f, 0f, 1f});
+    public static final float       defMatShininess = 0f;
+
+    protected static final String vertexColorFileDef          = "FixedFuncColor";
+    protected static final String vertexColorLightFileDef    = "FixedFuncColorLight";
+    protected static final String fragmentColorFileDef        = "FixedFuncColor";
+    protected static final String fragmentColorTextureFileDef = "FixedFuncColorTexture";
+    protected static final String shaderSrcRootDef = "shaders" ;
+    protected static final String shaderBinRootDef = "shaders/bin" ;
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp
new file mode 100644
index 000000000..408ff7251
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp
@@ -0,0 +1,16 @@
+#include es_precision.glsl
+
+#include mgl_uniform.glsl
+#include mgl_varying.glsl
+
+void main (void)
+{
+  if( mgl_CullFace > 0 && 
+      ( ( mgl_CullFace == 1 && gl_FrontFacing ) ||
+        ( mgl_CullFace == 2 && !gl_FrontFacing ) ||
+        ( mgl_CullFace == 3 ) ) ) {
+    discard;
+  }
+  gl_FragColor = frontColor;
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp
new file mode 100644
index 000000000..346e40196
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp
@@ -0,0 +1,22 @@
+#include es_precision.glsl
+
+#include mgl_const.glsl
+#include mgl_uniform.glsl
+#include mgl_attribute.glsl
+#include mgl_varying.glsl
+
+#include mgl_settexcoord.vp
+
+void main(void)
+{
+  if(mgl_ColorEnabled>0) {
+    frontColor=mgl_Color;
+  } else {
+    frontColor=mgl_ColorStatic;
+  }
+
+  gl_Position = mgl_PMVMatrix[0] * mgl_PMVMatrix[1] * mgl_Vertex;
+
+  setTexCoord(gl_Position);
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp
new file mode 100644
index 000000000..ce203cfb9
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp
@@ -0,0 +1,70 @@
+#include es_precision.glsl
+#include mgl_lightdef.glsl
+
+#include mgl_const.glsl
+#include mgl_uniform.glsl
+#include mgl_uniform_light.glsl
+#include mgl_attribute.glsl
+#include mgl_varying.glsl
+
+#include mgl_settexcoord.vp
+
+void main(void)
+{
+  vec4 position;
+  vec3 normal, lightDir, cameraDir, halfDir;
+  vec4 ambient, diffuse, specular;
+  float NdotL, NdotHV, dist, attenuation;
+  int i;
+
+  position  = mgl_PMVMatrix[1] * mgl_Vertex; // vertex eye position 
+
+  normal = normalize(mgl_NormalMatrix * mgl_Normal); 
+  // cameraPosition:      (mgl_PMVMatrix[2] * vec4(0,0,0,1.0)).xyz                   
+  cameraDir  = normalize( (mgl_PMVMatrix[2] * vec4(0,0,0,1.0)).xyz - mgl_Vertex.xyz ); 
+
+  ambient = vec4(0,0,0,0);
+  diffuse = vec4(0,0,0,0);
+  specular = vec4(0,0,0,0);
+
+  bool lightEnabled = false;
+
+  for(i=0; i<MAX_LIGHTS; i++) {
+    if( 0!= mgl_LightsEnabled[i] ) {
+      lightEnabled = true;
+      ambient += mgl_LightSource[i].ambient;
+      lightDir = mgl_LightSource[i].position.xyz - position.xyz;
+      dist     = length(lightDir);
+      lightDir = normalize(lightDir);
+      attenuation = 1.0 / ( 
+                       mgl_LightSource[i].constantAttenuation+ 
+                       mgl_LightSource[i].linearAttenuation    * dist +   
+                       mgl_LightSource[i].quadraticAttenuation * dist * dist );
+      NdotL = max(0.0, dot(normal, lightDir));
+      diffuse += mgl_LightSource[i].diffuse * NdotL * attenuation;
+      if (NdotL != 0.0) {
+        halfDir  = normalize (lightDir + cameraDir); 
+        NdotHV   = max(0.0, dot(normal, halfDir));
+        specular += mgl_LightSource[i].specular * 
+                    pow(NdotHV,mgl_FrontMaterial.shininess) * attenuation;
+      }
+    }
+  }
+  ambient  += mgl_FrontMaterial.ambient;
+  diffuse  *= mgl_FrontMaterial.diffuse;
+  specular *= mgl_FrontMaterial.specular;
+
+  if(mgl_ColorEnabled>0) {
+    frontColor=mgl_Color;
+  } else {
+    frontColor=mgl_ColorStatic;
+  }
+  if( lightEnabled ) {
+    frontColor *= ambient + diffuse + specular;
+  }
+
+  gl_Position  = mgl_PMVMatrix[0] * position;
+
+  setTexCoord(gl_Position);
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp
new file mode 100644
index 000000000..86e6ace73
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp
@@ -0,0 +1,47 @@
+
+#include es_precision.glsl
+#include mgl_lightdef.glsl
+
+#include mgl_const.glsl
+#include mgl_uniform.glsl
+#include mgl_varying.glsl
+
+vec4 getTexColor(in sampler2D tex, in int idx) {
+    vec4 coord;
+    if(idx==0) {
+        coord= mgl_TexCoords[0];
+    } else if(idx==1) {
+        coord= mgl_TexCoords[1];
+    } else if(idx==2) {
+        coord= mgl_TexCoords[2];
+    } else if(idx==3) {
+        coord= mgl_TexCoords[3];
+    } else if(idx==4) {
+        coord= mgl_TexCoords[4];
+    } else if(idx==5) {
+        coord= mgl_TexCoords[5];
+    } else if(idx==6) {
+        coord= mgl_TexCoords[6];
+    } else {
+        coord= mgl_TexCoords[7];
+    }
+    return texture2D(tex, coord.st);
+}
+
+void main (void)
+{
+  if( mgl_CullFace > 0 && 
+      ( ( mgl_CullFace == 1 && gl_FrontFacing ) ||
+        ( mgl_CullFace == 2 && !gl_FrontFacing ) ||
+        ( mgl_CullFace == 3 ) ) ) {
+    discard;
+  }
+
+  vec4 texColor = getTexColor(mgl_ActiveTexture,mgl_ActiveTextureIdx);
+
+  if(length(texColor.rgb)>0.0) {
+    gl_FragColor = vec4(frontColor.rgb*texColor.rgb, frontColor.a) ;
+  } else {
+    gl_FragColor = frontColor;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp
new file mode 100755
index 000000000..3ebaaee1d
Binary files /dev/null and b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp differ
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp
new file mode 100755
index 000000000..279ef72c7
Binary files /dev/null and b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp differ
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp
new file mode 100755
index 000000000..5a9deea71
Binary files /dev/null and b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp differ
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp
new file mode 100755
index 000000000..ce1397fe1
Binary files /dev/null and b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp differ
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl
new file mode 100644
index 000000000..fd6abe54e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl
@@ -0,0 +1,14 @@
+#ifndef es_precision_glsl
+#define es_precision_glsl
+
+#ifdef GL_ES
+  #define MEDIUMP mediump
+  #define HIGHP highp
+  #define LOWP  lowp
+#else
+  #define MEDIUMP
+  #define HIGHP
+  #define LOWP
+#endif
+
+#endif // es_precision_glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl
new file mode 100644
index 000000000..b09bdb05a
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl
@@ -0,0 +1,19 @@
+
+#ifndef mgl_attribute_glsl
+#define mgl_attribute_glsl
+
+#include es_precision.glsl
+
+attribute HIGHP vec4    mgl_Vertex;
+attribute HIGHP vec3    mgl_Normal;
+attribute HIGHP vec4    mgl_Color;
+attribute HIGHP vec4    mgl_MultiTexCoord0;
+attribute HIGHP vec4    mgl_MultiTexCoord1;
+attribute HIGHP vec4    mgl_MultiTexCoord2;
+attribute HIGHP vec4    mgl_MultiTexCoord3;
+attribute HIGHP vec4    mgl_MultiTexCoord4;
+attribute HIGHP vec4    mgl_MultiTexCoord5;
+attribute HIGHP vec4    mgl_MultiTexCoord6;
+attribute HIGHP vec4    mgl_MultiTexCoord7;
+
+#endif // mgl_attribute_glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl
new file mode 100644
index 000000000..1a464a1cb
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl
@@ -0,0 +1,10 @@
+
+#ifndef mgl_const_glsl
+#define mgl_const_glsl
+
+#include es_precision.glsl
+
+const   LOWP int     MAX_TEXTURE_UNITS = 8; // <=gl_MaxTextureImageUnits 
+const   LOWP int     MAX_LIGHTS = 8; 
+
+#endif // mgl_const_glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl
new file mode 100644
index 000000000..98e214139
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl
@@ -0,0 +1,26 @@
+#ifndef mgl_lightdef_glsl
+#define mgl_lightdef_glsl
+
+struct mgl_LightSourceParameters {
+   vec4 ambient; 
+   vec4 diffuse; 
+   vec4 specular; 
+   vec4 position; 
+   // vec4 halfVector; // is computed here
+   vec3 spotDirection; 
+   float spotExponent; 
+   float spotCutoff; // (range: [0.0,90.0], 180.0)
+   //float spotCosCutoff; // (range: [1.0,0.0],-1.0)
+   float constantAttenuation; 
+   float linearAttenuation; 
+   float quadraticAttenuation; 
+};
+struct mgl_MaterialParameters {
+   vec4 ambient;    
+   vec4 diffuse;    
+   vec4 specular;   
+   vec4 emission;   
+   float shininess; 
+};
+
+#endif // mgl_lightdef_glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp
new file mode 100644
index 000000000..1efe328d0
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp
@@ -0,0 +1,35 @@
+#ifndef mgl_settexcoord_vp
+#define mgl_settexcoord_vp
+
+#include es_precision.glsl
+
+#include mgl_const.glsl
+#include mgl_uniform.glsl
+#include mgl_attribute.glsl
+#include mgl_varying.glsl
+
+void setTexCoord(in vec4 defpos) {
+  /**
+   * bitwise operator not supported on APX 2500 ES 2.0
+   *
+  mgl_TexCoords[0] = ( 0 != (mgl_TexCoordEnabled &   1) ) ? mgl_MultiTexCoord0 : defpos;
+  mgl_TexCoords[1] = ( 0 != (mgl_TexCoordEnabled &   2) ) ? mgl_MultiTexCoord1 : defpos;
+  mgl_TexCoords[2] = ( 0 != (mgl_TexCoordEnabled &   4) ) ? mgl_MultiTexCoord2 : defpos;
+  mgl_TexCoords[3] = ( 0 != (mgl_TexCoordEnabled &   8) ) ? mgl_MultiTexCoord3 : defpos;
+  mgl_TexCoords[4] = ( 0 != (mgl_TexCoordEnabled &  16) ) ? mgl_MultiTexCoord4 : defpos;
+  mgl_TexCoords[5] = ( 0 != (mgl_TexCoordEnabled &  32) ) ? mgl_MultiTexCoord5 : defpos;
+  mgl_TexCoords[6] = ( 0 != (mgl_TexCoordEnabled &  64) ) ? mgl_MultiTexCoord6 : defpos;
+  mgl_TexCoords[7] = ( 0 != (mgl_TexCoordEnabled & 128) ) ? mgl_MultiTexCoord7 : defpos;
+   */
+  
+  mgl_TexCoords[0] = ( 0 != mgl_TexCoordEnabled[0] ) ? mgl_MultiTexCoord0 : defpos;
+  mgl_TexCoords[1] = ( 0 != mgl_TexCoordEnabled[1] ) ? mgl_MultiTexCoord1 : defpos;
+  mgl_TexCoords[2] = ( 0 != mgl_TexCoordEnabled[2] ) ? mgl_MultiTexCoord2 : defpos;
+  mgl_TexCoords[3] = ( 0 != mgl_TexCoordEnabled[3] ) ? mgl_MultiTexCoord3 : defpos;
+  mgl_TexCoords[4] = ( 0 != mgl_TexCoordEnabled[4] ) ? mgl_MultiTexCoord4 : defpos;
+  mgl_TexCoords[5] = ( 0 != mgl_TexCoordEnabled[5] ) ? mgl_MultiTexCoord5 : defpos;
+  mgl_TexCoords[6] = ( 0 != mgl_TexCoordEnabled[6] ) ? mgl_MultiTexCoord6 : defpos;
+  mgl_TexCoords[7] = ( 0 != mgl_TexCoordEnabled[7] ) ? mgl_MultiTexCoord7 : defpos;
+}
+
+#endif // mgl_settexcoord_vp
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl
new file mode 100644
index 000000000..d8b3c7f95
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl
@@ -0,0 +1,18 @@
+
+#ifndef mgl_uniform_glsl
+#define mgl_uniform_glsl
+
+#include es_precision.glsl
+
+#include mgl_const.glsl
+
+uniform   HIGHP mat4    mgl_PMVMatrix[3]; // P, Mv, and Mvi
+uniform   HIGHP mat3    mgl_NormalMatrix; // transpose(inverse(ModelView)).3x3
+uniform LOWP    int     mgl_ColorEnabled;
+uniform HIGHP   vec4    mgl_ColorStatic;
+uniform LOWP    int     mgl_TexCoordEnabled[MAX_TEXTURE_UNITS];
+uniform       sampler2D mgl_ActiveTexture;
+uniform LOWP    int     mgl_ActiveTextureIdx;
+uniform LOWP    int     mgl_CullFace;
+
+#endif // mgl_uniform_glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl
new file mode 100644
index 000000000..0dedb5d5d
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl
@@ -0,0 +1,15 @@
+
+#ifndef mgl_uniform_light_glsl
+#define mgl_uniform_light_glsl
+
+#include es_precision.glsl
+
+#include mgl_const.glsl
+#include mgl_lightdef.glsl
+
+uniform LOWP    int     mgl_LightsEnabled[MAX_LIGHTS];
+
+uniform mgl_LightSourceParameters mgl_LightSource[MAX_LIGHTS];
+uniform mgl_MaterialParameters    mgl_FrontMaterial;
+
+#endif // mgl_uniform_light_glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl
new file mode 100644
index 000000000..fc9f735d1
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl
@@ -0,0 +1,12 @@
+
+#ifndef mgl_varying_glsl
+#define mgl_varying_glsl
+
+#include es_precision.glsl
+
+#include mgl_const.glsl
+
+varying   vec4    frontColor;
+varying   vec4    mgl_TexCoords[MAX_TEXTURE_UNITS];
+
+#endif // mgl_varying_glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat
new file mode 100755
index 000000000..8a2114e07
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat
@@ -0,0 +1,9 @@
+REM 
+REM You have to call it from the 'shaders' directory, e.g.:
+REM   scripts\nvidia-apx\glslc-ff.bat 
+REM
+IF !"%JOGLDIR%"==""! GOTO YESPATH
+set JOGLDIR=..\lib
+:YESPATH
+   
+java -cp %JOGLDIR%\jogl.core.jar;%JOGLDIR%\jogl.gles2.jar;%JOGLDIR%\jogl.fixed.jar;%JOGLDIR%\jogl.sdk.jar com.jogamp.opengl.util.glsl.sdk.CompileShaderNVidia FixedFuncColor.fp FixedFuncColorTexture.fp FixedFuncColorLight.vp FixedFuncColor.vp
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat
new file mode 100755
index 000000000..c7ca0a8b7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat
@@ -0,0 +1,9 @@
+REM 
+REM You have to call it from the 'shaders' directory, e.g.:
+REM   scripts\nvidia-apx\glslc.bat <FileName>
+REM
+IF !"%JOGLDIR%"==""! GOTO YESPATH
+set JOGLDIR=..\lib
+:YESPATH
+
+java -cp %JOGLDIR%\jogl.core.jar;%JOGLDIR%\jogl.gles2.jar;%JOGLDIR%\jogl.fixed.jar;%JOGLDIR%\jogl.sdk.jar com.jogamp.opengl.util.glsl.sdk.CompileShaderNVidia %1
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java
new file mode 100755
index 000000000..9741da737
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java
@@ -0,0 +1,184 @@
+package com.jogamp.opengl.util.glsl.sdk;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
+
+import java.io.*;
+import java.net.*;
+
+/** Precompiles a shader into a vendor binary format. Input is the
+    resource name of the shader, such as
+    "com/jogamp/opengl/impl/glsl/fixed/shader/a.fp".
+    Output is "com/jogamp/opengl/impl/glsl/fixed/shader/bin/nvidia/a.bfp".
+
+    All path and suffixes are determined by the ShaderCode class,
+    which ensures runtime compatibility.
+
+    @see javax.media.opengl.glsl.ShaderCode
+  */
+
+public abstract class CompileShader {
+
+    public abstract int getBinaryFormat();
+
+    public abstract File getSDKCompilerDir();
+
+    public abstract String getVertexShaderCompiler();
+
+    public abstract String getFragmentShaderCompiler();
+
+    public void processOneShader(String resourceName)
+        throws IOException, UnsupportedEncodingException, InterruptedException
+    {
+        int type = -1;
+        String outName=null;
+        int suffixLen = -1;
+        if(resourceName.endsWith(ShaderCode.getFileSuffix(false, GL2ES2.GL_FRAGMENT_SHADER))) {
+            suffixLen = 2;
+            type = GL2ES2.GL_FRAGMENT_SHADER;
+        } else if(resourceName.endsWith(".frag")) {
+            suffixLen = 4;
+            type = GL2ES2.GL_FRAGMENT_SHADER;
+        } else if(resourceName.endsWith(ShaderCode.getFileSuffix(false, GL2ES2.GL_VERTEX_SHADER))) {
+            suffixLen = 2;
+            type = GL2ES2.GL_VERTEX_SHADER;
+        } else if(resourceName.endsWith(".vert")) {
+            suffixLen = 4;
+            type = GL2ES2.GL_VERTEX_SHADER;
+        }
+        String justName = basename(resourceName);
+        outName = justName.substring(0, justName.length() - suffixLen) +
+                  ShaderCode.getFileSuffix(true, type);
+        URL resourceURL = Locator.getResource(null, resourceName);
+        String dirName = dirname(resourceURL.getPath());
+
+        outName = dirName + File.separator + "bin" + File.separator + 
+                  ShaderCode.getBinarySubPath(getBinaryFormat()) + File.separator + 
+                  outName;
+        processOneShader(resourceName, outName, type);
+    }
+
+    public void processOneShader(String resourceName, String outName, int type)
+        throws IOException, UnsupportedEncodingException, InterruptedException
+    {
+        URL resourceURL = Locator.getResource(null, resourceName);
+        String dirName = dirname(resourceURL.getPath());
+
+        String shader = ShaderCode.readShaderSource(null, resourceName);
+        if(null==shader) {
+            System.err.println("Can't find shader source " + resourceName + " - ignored");
+            return;
+        }
+        System.err.println("Preprocessing: "+ resourceName+", in dir: "+dirName);
+        String justName = basename(resourceName);
+        String processor;
+        switch (type) {
+            case GL2ES2.GL_VERTEX_SHADER:
+                processor = getVertexShaderCompiler();
+                break;
+            case GL2ES2.GL_FRAGMENT_SHADER:
+                processor = getFragmentShaderCompiler();
+                break;
+            default:
+                throw new GLException("Unknown shader type: "+type);
+        }
+        File outputFile = new File(outName);
+
+        // Write shader to a file in java.io.tmpdir
+        File tmpDir = new File(dirName+File.separator+"tmp");
+        tmpDir.mkdirs();
+        File tmpFile = new File(tmpDir, justName);
+        Writer writer = new BufferedWriter(new FileWriter(tmpFile));
+        writer.write(shader, 0, shader.length());
+        writer.flush();
+        writer.close();
+        System.err.println("Preprocessed: "+ tmpFile.getAbsolutePath());
+
+        File processorDir = getSDKCompilerDir();
+
+        System.err.println("SDK: "+ processorDir.getAbsolutePath() + ", compiler: "+processor);
+
+        System.err.println("Output: "+ outputFile.getAbsolutePath());
+
+        // Run the tool
+        Process process = Runtime.getRuntime().exec(new String[] {
+                processorDir.getAbsolutePath() + File.separator + processor,
+                tmpFile.getAbsolutePath(),
+                outputFile.getAbsolutePath()
+            }); // , null, processorDir);
+        new StreamMonitor(process.getInputStream());
+        new StreamMonitor(process.getErrorStream());
+        process.waitFor();
+        // Delete the temporary file
+        // tmpFile.delete();
+    }
+
+    protected static String basename(String path) {
+        int lastSlash = path.lastIndexOf("/");
+        if (lastSlash < 0) {
+            lastSlash = path.lastIndexOf("\\");
+        }
+        String basename;
+        if (lastSlash < 0) {
+            basename = path;
+        } else {
+            basename = path.substring(lastSlash + 1);
+        }
+        return basename;
+    }
+
+    protected static String dirname(String path) {
+        int lastSlash = path.lastIndexOf("/");
+        if (lastSlash < 0) {
+            lastSlash = path.lastIndexOf("\\");
+        }
+        String dirname;
+        if (lastSlash < 0) {
+            dirname = new String();
+        } else {
+            dirname = path.substring(0, lastSlash + 1);
+        }
+        return dirname;
+    }
+
+    public void run(String[] args) {
+        try {
+            for (int i = 0; i < args.length; i++) {
+                processOneShader(args[i]);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static class StreamMonitor implements Runnable {
+        private InputStream istream;
+        public StreamMonitor(InputStream stream) {
+            istream = stream;
+            new Thread(this, "Output Reader Thread").start();
+        }
+
+        public void run()
+        {
+            byte[] buffer = new byte[4096];
+            try {
+                int numRead = 0;
+                do {
+                    numRead = istream.read(buffer);
+                    if (numRead > 0) {
+                        System.out.write(buffer, 0, numRead);
+                        System.out.flush();
+                    }
+                } while (numRead >= 0);
+            }
+            catch (IOException e) {
+                try {
+                    istream.close();
+                } catch (IOException e2) {
+                }
+                // Should allow clean exit when process shuts down
+            }
+        }
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShaderNVidia.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShaderNVidia.java
new file mode 100755
index 000000000..8eb9ef579
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShaderNVidia.java
@@ -0,0 +1,53 @@
+package com.jogamp.opengl.util.glsl.sdk;
+
+import javax.media.opengl.*;
+
+import java.io.*;
+
+/** Precompiles a shader into NVidia binary format. Input is the
+    resource name of the shader, such as
+    "com/jogamp/opengl/impl/glsl/fixed/shader/a.fp".
+    Output is "com/jogamp/opengl/impl/glsl/fixed/shader/bin/nvidia/a.bfp". */
+
+public class CompileShaderNVidia extends CompileShader {
+    private static final String NVAPSDK;
+
+    static {
+        String nvapSDKProp = System.getProperty("NVAPSDK");
+        if (nvapSDKProp != null) {
+            NVAPSDK = nvapSDKProp;
+        } else {
+            NVAPSDK = "C:\\nvap_sdk_0_3_x";
+        }
+    }
+
+    public int getBinaryFormat() {
+        return GLES2.GL_NVIDIA_PLATFORM_BINARY_NV;
+    }
+
+    public File getSDKCompilerDir() {
+        File compilerDir = new File( NVAPSDK + File.separator + "tools" + File.separator );
+        File compilerFile = new File( compilerDir, getVertexShaderCompiler());
+        if(!compilerFile.exists()) {
+            compilerDir = new File( NVAPSDK );
+            compilerFile = new File( compilerDir, getVertexShaderCompiler());
+        }
+        if(!compilerFile.exists()) {
+            throw new GLException("Can't find compiler: "+getVertexShaderCompiler() + " in : " +
+                                  NVAPSDK+", "+NVAPSDK + File.separator + "tools");
+        }
+        return compilerDir;
+    }
+
+    public String getVertexShaderCompiler() {
+        return "glslv.bat";
+    }
+
+    public String getFragmentShaderCompiler() {
+        return "glslf.bat";
+    }
+
+    public static void main(String[] args) {
+        new CompileShaderNVidia().run(args);
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/packrect/BackingStoreManager.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/BackingStoreManager.java
new file mode 100755
index 000000000..7b6a1b479
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/BackingStoreManager.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.packrect;
+
+/** This interface must be implemented by the end user and is called
+    in response to events like addition of rectangles into the
+    RectanglePacker. It is used both when a full re-layout must be
+    done as well as when the data in the backing store must be copied
+    to a new one. */
+
+public interface BackingStoreManager {
+  public Object allocateBackingStore(int w, int h);
+  public void   deleteBackingStore(Object backingStore);
+
+  /** Indication whether this BackingStoreManager supports compaction;
+      in other words, the allocation of a new backing store and
+      movement of the contents of the backing store from the old to
+      the new one. If it does not, then RectanglePacker.add() may
+      throw an exception if additionFailed() can not make enough room
+      available. If an implementation returns false, this also implies
+      that the backing store can not grow, so that preExpand() will
+      never be called. */
+  public boolean canCompact();
+
+  /** Notification that expansion of the backing store is about to be
+      done due to addition of the given rectangle. Gives the manager a
+      chance to do some compaction and potentially remove old entries
+      from the backing store, if it acts like a least-recently-used
+      cache. This method receives as argument the number of attempts
+      so far to add the given rectangle. Manager should return true if
+      the RectanglePacker should retry the addition (which may result
+      in this method being called again, with an increased attempt
+      number) or false if the RectanglePacker should just expand the
+      backing store. The caller should not call RectanglePacker.add()
+      in its preExpand() method. */
+  public boolean preExpand(Rect cause, int attemptNumber);
+
+  /** Notification that addition of the given Rect failed because a
+      maximum size was set in the RectanglePacker and the backing
+      store could not be expanded, or because compaction (and,
+      therefore, implicitly expansion) was not supported. Should
+      return false if the manager can do nothing more to handle the
+      failed addition, which will cause a RuntimeException to be
+      thrown from the RectanglePacker. */
+  public boolean additionFailed(Rect cause, int attemptNumber);
+
+  /** Notification that movement is starting. */
+  public void beginMovement(Object oldBackingStore, Object newBackingStore);
+
+  /** Tells the manager to move the contents of the given rect from
+      the old location on the old backing store to the new location on
+      the new backing store. The backing stores can be identical in
+      the case of compacting the existing backing store instead of
+      reallocating it. */
+  public void move(Object oldBackingStore,
+                   Rect   oldLocation,
+                   Object newBackingStore,
+                   Rect   newLocation);
+
+  /** Notification that movement is ending. */
+  public void endMovement(Object oldBackingStore, Object newBackingStore);
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/packrect/Level.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/Level.java
new file mode 100755
index 000000000..5ba3f7330
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/Level.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.packrect;
+
+import java.util.*;
+
+public class Level {
+  private int width;
+  private int height;
+  private int yPos;
+  private LevelSet holder;
+
+  private List/*<Rect>*/ rects = new ArrayList/*<Rect>*/();
+  private List/*<Rect>*/ freeList;
+  private int nextAddX;
+
+  static class RectXComparator implements Comparator {
+    public int compare(Object o1, Object o2) {
+      Rect r1 = (Rect) o1;
+      Rect r2 = (Rect) o2;
+      return r1.x() - r2.x();
+    }
+
+    public boolean equals(Object obj) {
+      return this == obj;
+    }
+  }
+  private static final Comparator rectXComparator = new RectXComparator();
+
+  public Level(int width, int height, int yPos, LevelSet holder) {
+    this.width = width;
+    this.height = height;
+    this.yPos = yPos;
+    this.holder = holder;
+  }
+
+  public int w()    { return width;  }
+  public int h()    { return height; }
+  public int yPos() { return yPos;   }
+
+  /** Tries to add the given rectangle to this level only allowing
+      non-disruptive changes like trivial expansion of the last level
+      in the RectanglePacker and allocation from the free list. More
+      disruptive changes like compaction of the level must be
+      requested explicitly. */
+  public boolean add(Rect rect) {
+    if (rect.h() > height) {
+      // See whether it's worth trying to expand vertically
+      if (nextAddX + rect.w() > width) {
+        return false;
+      }
+
+      // See whether we're the last level and can expand
+      if (!holder.canExpand(this, rect.h())) {
+        return false;
+      }
+
+      // Trivially expand and try the allocation
+      holder.expand(this, height, rect.h());
+      height = rect.h();
+    }
+
+    // See whether we can add at the end
+    if (nextAddX + rect.w() <= width) {
+      rect.setPosition(nextAddX, yPos);
+      rects.add(rect);
+      nextAddX += rect.w();
+      return true;
+    }
+
+    // See whether we can add from the free list
+    if (freeList != null) {
+      Rect candidate = null;
+      for (Iterator iter = freeList.iterator(); iter.hasNext(); ) {
+        Rect cur = (Rect) iter.next();
+        if (cur.canContain(rect)) {
+          candidate = cur;
+          break;
+        }
+      }
+
+      if (candidate != null) {
+        // Remove the candidate from the free list
+        freeList.remove(candidate);
+        // Set up and add the real rect
+        rect.setPosition(candidate.x(), candidate.y());
+        rects.add(rect);
+        // Re-add any remaining free space
+        if (candidate.w() > rect.w()) {
+          candidate.setPosition(candidate.x() + rect.w(), candidate.y());
+          candidate.setSize(candidate.w() - rect.w(), height);
+          freeList.add(candidate);
+        }
+        
+        coalesceFreeList();
+
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /** Removes the given Rect from this Level. */
+  public boolean remove(Rect rect) {
+    if (!rects.remove(rect))
+      return false;
+
+    // If this is the rightmost rectangle, instead of adding its space
+    // to the free list, we can just decrease the nextAddX
+    if (rect.maxX() + 1 == nextAddX) {
+      nextAddX -= rect.w();
+    } else {
+      if (freeList == null) {
+        freeList = new ArrayList/*<Rect>*/();
+      }
+      freeList.add(new Rect(rect.x(), rect.y(), rect.w(), height, null));
+      coalesceFreeList();
+    }
+
+    return true;
+  }
+
+  /** Indicates whether this Level contains no rectangles. */
+  public boolean isEmpty() {
+    return rects.isEmpty();
+  }
+
+  /** Indicates whether this Level could satisfy an allocation request
+      if it were compacted. */
+  public boolean couldAllocateIfCompacted(Rect rect) {
+    if (rect.h() > height)
+      return false;
+    if (freeList == null)
+      return false;
+    int freeListWidth = 0;
+    for (Iterator iter = freeList.iterator(); iter.hasNext(); ) {
+      Rect cur = (Rect) iter.next();
+      freeListWidth += cur.w();
+    }
+    // Add on the remaining space at the end
+    freeListWidth += (width - nextAddX);
+    return (freeListWidth >= rect.w());
+  }
+
+  public void compact(Object backingStore, BackingStoreManager manager) {
+    Collections.sort(rects, rectXComparator);
+    int nextCompactionDest = 0;
+    manager.beginMovement(backingStore, backingStore);
+    for (Iterator iter = rects.iterator(); iter.hasNext(); ) {
+      Rect cur = (Rect) iter.next();
+      if (cur.x() != nextCompactionDest) {
+        manager.move(backingStore, cur,
+                     backingStore, new Rect(nextCompactionDest, cur.y(), cur.w(), cur.h(), null));
+        cur.setPosition(nextCompactionDest, cur.y());
+      }
+      nextCompactionDest += cur.w();
+    }
+    nextAddX = nextCompactionDest;
+    freeList.clear();
+    manager.endMovement(backingStore, backingStore);
+  }
+
+  public Iterator iterator() {
+    return rects.iterator();
+  }
+
+  /** Visits all Rects contained in this Level. */
+  public void visit(RectVisitor visitor) {
+    for (Iterator iter = rects.iterator(); iter.hasNext(); ) {
+      Rect rect = (Rect) iter.next();
+      visitor.visit(rect);
+    }
+  }
+
+  /** Updates the references to the Rect objects in this Level with
+      the "next locations" of those Rects. This is actually used to
+      update the new Rects in a newly laid-out LevelSet with the
+      original Rects. */
+  public void updateRectangleReferences() {
+    for (int i = 0; i < rects.size(); i++) {
+      Rect cur = (Rect) rects.get(i);
+      Rect next = cur.getNextLocation();
+      next.setPosition(cur.x(), cur.y());
+      if (cur.w() != next.w() || cur.h() != next.h())
+        throw new RuntimeException("Unexpected disparity in rectangle sizes during updateRectangleReferences");
+      rects.set(i, next);
+    }
+  }
+
+  private void coalesceFreeList() {
+    if (freeList == null)
+      return;
+    if (freeList.isEmpty())
+      return;
+
+    // Try to coalesce adjacent free blocks in the free list
+    Collections.sort(freeList, rectXComparator);
+    int i = 0;
+    while (i < freeList.size() - 1) {
+      Rect r1 = (Rect) freeList.get(i);
+      Rect r2 = (Rect) freeList.get(i+1);
+      if (r1.maxX() + 1 == r2.x()) {
+        // Coalesce r1 and r2 into one block
+        freeList.remove(i+1);
+        r1.setSize(r1.w() + r2.w(), r1.h());
+      } else {
+        ++i;
+      }
+    }
+    // See whether the last block bumps up against the addition point
+    Rect last = (Rect) freeList.get(freeList.size() - 1);
+    if (last.maxX() + 1 == nextAddX) {
+      nextAddX -= last.w();
+      freeList.remove(freeList.size() - 1);
+    }
+    if (freeList.isEmpty()) {
+      freeList = null;
+    }
+  }
+
+  //----------------------------------------------------------------------
+  // Debugging functionality
+  //
+
+  public void dumpFreeSpace() {
+    int freeListWidth = 0;
+    for (Iterator iter = freeList.iterator(); iter.hasNext(); ) {
+      Rect cur = (Rect) iter.next();
+      System.err.println(" Free rectangle at " + cur);
+      freeListWidth += cur.w();
+    }
+    // Add on the remaining space at the end
+    System.err.println(" Remaining free space " + (width - nextAddX));
+    freeListWidth += (width - nextAddX);
+    System.err.println(" Total free space " + freeListWidth);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/packrect/LevelSet.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/LevelSet.java
new file mode 100755
index 000000000..6783aec3b
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/LevelSet.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.packrect;
+
+import java.util.*;
+
+/** Manages a list of Levels; this is the core data structure
+    contained within the RectanglePacker and encompasses the storage
+    algorithm for the contained Rects. */
+
+public class LevelSet {
+  // Maintained in sorted order by increasing Y coordinate
+  private List/*<Level>*/ levels = new ArrayList/*<Level>*/();
+  private int nextAddY;
+  private int w;
+  private int h;
+
+  /** A LevelSet manages all of the backing store for a region of a
+      specified width and height. */
+  public LevelSet(int w, int h) {
+    this.w = w;
+    this.h = h;
+  }
+
+  public int w() { return w; }
+  public int h() { return h; }
+
+  /** Returns true if the given rectangle was successfully added to
+      the LevelSet given its current dimensions, false if not. Caller
+      is responsible for performing compaction, expansion, etc. as a
+      consequence. */
+  public boolean add(Rect rect) {
+    if (rect.w() > w)
+      return false;
+
+    // Go in reverse order through the levels seeing whether we can
+    // trivially satisfy the allocation request
+    for (int i = levels.size() - 1; i >= 0; --i) {
+      Level level = (Level) levels.get(i);
+      if (level.add(rect))
+        return true;
+    }
+
+    // See whether compaction could satisfy this allocation. This
+    // increases the computational complexity of the addition process,
+    // but prevents us from expanding unnecessarily.
+    for (int i = levels.size() - 1; i >= 0; --i) {
+      Level level = (Level) levels.get(i);
+      if (level.couldAllocateIfCompacted(rect))
+        return false;
+    }
+
+    // OK, we need to either add a new Level or expand the backing
+    // store. Try to add a new Level.
+    if (nextAddY + rect.h() > h)
+      return false;
+
+    Level newLevel = new Level(w, rect.h(), nextAddY, this);
+    levels.add(newLevel);
+    nextAddY += rect.h();
+    boolean res = newLevel.add(rect);
+    if (!res)
+      throw new RuntimeException("Unexpected failure in addition to new Level");
+    return true;
+  }
+
+  /** Removes the given Rect from this LevelSet. */
+  public boolean remove(Rect rect) {
+    for (int i = levels.size() - 1; i >= 0; --i) {
+      Level level = (Level) levels.get(i);
+      if (level.remove(rect))
+        return true;
+    }
+    
+    return false;
+  }
+
+  /** Allocates the given Rectangle, performing compaction of a Level
+      if necessary. This is the correct fallback path to {@link
+      #add(Rect)} above. Returns true if allocated successfully, false
+      otherwise (indicating the need to expand the backing store). */
+  public boolean compactAndAdd(Rect rect,
+                               Object backingStore,
+                               BackingStoreManager manager) {
+    for (int i = levels.size() - 1; i >= 0; --i) {
+      Level level = (Level) levels.get(i);
+      if (level.couldAllocateIfCompacted(rect)) {
+        level.compact(backingStore, manager);
+        boolean res = level.add(rect);
+        if (!res)
+          throw new RuntimeException("Unexpected failure to add after compaction");
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /** Indicates whether it's legal to trivially increase the height of
+      the given Level. This is only possible if it's the last Level
+      added and there's enough room in the backing store. */
+  public boolean canExpand(Level level, int height) {
+    if (levels.isEmpty())
+      return false; // Should not happen
+    if (levels.get(levels.size() - 1) == level &&
+        (h - nextAddY >= height - level.h()))
+      return true;
+    return false;
+  }
+
+  public void expand(Level level, int oldHeight, int newHeight) {
+    nextAddY += (newHeight - oldHeight);
+  }
+
+  /** Gets the used height of the levels in this LevelSet. */
+  public int getUsedHeight() {
+    return nextAddY;
+  }
+
+  /** Sets the height of this LevelSet. It is only legal to reduce the
+      height to greater than or equal to the currently used height. */
+  public void setHeight(int height) throws IllegalArgumentException {
+    if (height < getUsedHeight()) {
+      throw new IllegalArgumentException("May not reduce height below currently used height");
+    }
+    h = height;
+  }
+
+  /** Returns the vertical fragmentation ratio of this LevelSet. This
+      is defined as the ratio of the sum of the heights of all
+      completely empty Levels divided by the overall used height of
+      the LevelSet. A high vertical fragmentation ratio indicates that
+      it may be profitable to perform a compaction. */
+  public float verticalFragmentationRatio() {
+    int freeHeight = 0;
+    int usedHeight = getUsedHeight();
+    if (usedHeight == 0)
+      return 0.0f;
+    for (Iterator iter = iterator(); iter.hasNext(); ) {
+      Level level = (Level) iter.next();
+      if (level.isEmpty()) {
+        freeHeight += level.h();
+      }
+    }
+    return (float) freeHeight / (float) usedHeight;
+  }
+
+  public Iterator iterator() {
+    return levels.iterator();
+  }
+
+  /** Visits all Rects contained in this LevelSet. */
+  public void visit(RectVisitor visitor) {
+    for (Iterator iter = levels.iterator(); iter.hasNext(); ) {
+      Level level = (Level) iter.next();
+      level.visit(visitor);
+    }
+  }
+
+  /** Updates the references to the Rect objects in this LevelSet with
+      the "next locations" of those Rects. This is actually used to
+      update the new Rects in a newly laid-out LevelSet with the
+      original Rects. */
+  public void updateRectangleReferences() {
+    for (Iterator iter = levels.iterator(); iter.hasNext(); ) {
+      Level level = (Level) iter.next();
+      level.updateRectangleReferences();
+    }
+  }
+
+  /** Clears out all Levels stored in this LevelSet. */
+  public void clear() {
+    levels.clear();
+    nextAddY = 0;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/packrect/Rect.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/Rect.java
new file mode 100755
index 000000000..6206c4a11
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/Rect.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.packrect;
+
+/** Represents a rectangular region on the backing store. The edges of
+    the rectangle are the infinitely thin region between adjacent
+    pixels on the screen. The origin of the rectangle is its
+    upper-left corner. It is inclusive of the pixels on the top and
+    left edges and exclusive of the pixels on the bottom and right
+    edges. For example, a rect at position (0, 0) and of size (1, 1)
+    would include only the pixel at (0, 0). <P>
+
+    Negative coordinates and sizes are not supported, since they make
+    no sense in the context of the packer, which deals only with
+    positively sized regions. <P>
+
+    This class contains a user data field for efficient hookup to
+    external data structures as well as enough other hooks to
+    efficiently plug into the rectangle packer. */
+
+public class Rect {
+  private int x;
+  private int y;
+  private int w;
+  private int h;
+
+  // The level we're currently installed in in the parent
+  // RectanglePacker, or null if not hooked in to the table yet
+  private Level level;
+
+  // The user's object this rectangle represents.
+  private Object userData;
+
+  // Used transiently during re-layout of the backing store (when
+  // there is no room left due either to fragmentation or just being
+  // out of space)
+  private Rect nextLocation;
+  
+  public Rect() {
+    this(null);
+  }
+
+  public Rect(Object userData) {
+    this(0, 0, 0, 0, userData);
+  }
+
+  public Rect(int x, int y, int w, int h, Object userData) {
+    setPosition(x, y);
+    setSize(w, h);
+    setUserData(userData);
+  }
+
+  public int x() { return x; }
+  public int y() { return y; }
+  public int w() { return w; }
+  public int h() { return h; }
+  public Object getUserData() { return userData; }
+  public Rect getNextLocation() { return nextLocation; }
+
+  public void setPosition(int x, int y) {
+    if (x < 0)
+      throw new IllegalArgumentException("Negative x");
+    if (y < 0)
+      throw new IllegalArgumentException("Negative y");
+    this.x = x;
+    this.y = y;
+  }
+
+  public void setSize(int w, int h) throws IllegalArgumentException {
+    if (w < 0)
+      throw new IllegalArgumentException("Negative width");
+    if (h < 0)
+      throw new IllegalArgumentException("Negative height");
+    this.w = w;
+    this.h = h;
+  }
+
+  public void setUserData(Object obj) { userData = obj; }
+  public void setNextLocation(Rect nextLocation) { this.nextLocation = nextLocation; }
+
+  // Helpers for computations.
+
+  /** Returns the maximum x-coordinate contained within this
+      rectangle. Note that this returns a different result than Java
+      2D's rectangles; for a rectangle of position (0, 0) and size (1,
+      1) this will return 0, not 1. Returns -1 if the width of this
+      rectangle is 0. */
+  public int maxX() {
+    if (w() < 1)
+      return -1;
+    return x() + w() - 1;
+  }
+
+  /** Returns the maximum y-coordinate contained within this
+      rectangle. Note that this returns a different result than Java
+      2D's rectangles; for a rectangle of position (0, 0) and size (1,
+      1) this will return 0, not 1. Returns -1 if the height of this
+      rectangle is 0. */
+  public int maxY() {
+    if (h() < 1)
+      return -1;
+    return y() + h() - 1;
+  }
+
+  public boolean canContain(Rect other) {
+    return (w() >= other.w() &&
+            h() >= other.h());
+  }
+
+  public String toString() {
+    return "[Rect x: " + x() + " y: " + y() + " w: " + w() + " h: " + h() + "]";
+  }
+
+  // Unclear whether it's a good idea to override hashCode and equals
+  // for these objects
+  /*
+  public boolean equals(Object other) {
+    if (other == null || (!(other instanceof Rect))) {
+      return false;
+    }
+
+    Rect r = (Rect) other;
+    return (this.x() == r.x() &&
+            this.y() == r.y() &&
+            this.w() == r.w() &&
+            this.h() == r.h());
+  }
+
+  public int hashCode() {
+    return (x + y * 13 + w * 17 + h * 23);
+  }
+  */
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/packrect/RectVisitor.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/RectVisitor.java
new file mode 100755
index 000000000..49cfc82e6
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/RectVisitor.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.packrect;
+
+/** Iteration construct without exposing the internals of the
+    RectanglePacker and without implementing a complex Iterator. */
+
+public interface RectVisitor {
+  public void visit(Rect rect);
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java
new file mode 100755
index 000000000..1496a04a6
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.packrect;
+
+import java.util.*;
+
+/** Packs rectangles supplied by the user (typically representing
+    image regions) into a larger backing store rectangle (typically
+    representing a large texture). Supports automatic compaction of
+    the space on the backing store, and automatic expansion of the
+    backing store, when necessary. */
+
+public class RectanglePacker {
+  private BackingStoreManager manager;
+  private Object backingStore;
+  private LevelSet levels;
+  private float EXPANSION_FACTOR = 0.5f;
+  private float SHRINK_FACTOR = 0.3f;
+
+  private int initialWidth;
+  private int initialHeight;
+
+  private int maxWidth  = -1;
+  private int maxHeight = -1;
+
+  static class RectHComparator implements Comparator {
+    public int compare(Object o1, Object o2) {
+      Rect r1 = (Rect) o1;
+      Rect r2 = (Rect) o2;
+      return r2.h() - r1.h();
+    }
+
+    public boolean equals(Object obj) {
+      return this == obj;
+    }
+  }
+  private static final Comparator rectHComparator = new RectHComparator();
+
+  public RectanglePacker(BackingStoreManager manager,
+                         int initialWidth,
+                         int initialHeight) {
+    this.manager = manager;
+    levels = new LevelSet(initialWidth, initialHeight);
+    this.initialWidth = initialWidth;
+    this.initialHeight = initialHeight;
+  }
+
+  public Object getBackingStore() {
+    if (backingStore == null) {
+      backingStore = manager.allocateBackingStore(levels.w(), levels.h());
+    }
+
+    return backingStore;
+  }
+
+  /** Sets up a maximum width and height for the backing store. These
+      are optional and if not specified the backing store will grow as
+      necessary. Setting up a maximum width and height introduces the
+      possibility that additions will fail; these are handled with the
+      BackingStoreManager's allocationFailed notification. */
+  public void setMaxSize(int maxWidth, int maxHeight) {
+    this.maxWidth  = maxWidth;
+    this.maxHeight = maxHeight;
+  }
+
+  /** Decides upon an (x, y) position for the given rectangle (leaving
+      its width and height unchanged) and places it on the backing
+      store. May provoke re-layout of other Rects already added. If
+      the BackingStoreManager does not support compaction, and {@link
+      BackingStoreManager#preExpand BackingStoreManager.preExpand}
+      does not clear enough space for the incoming rectangle, then
+      this method will throw a RuntimeException. */
+  public void add(Rect rect) throws RuntimeException {
+    // Allocate backing store if we don't have any yet
+    if (backingStore == null)
+      backingStore = manager.allocateBackingStore(levels.w(), levels.h());
+
+    int attemptNumber = 0;
+    boolean tryAgain = false;
+
+    do {
+      // Try to allocate
+      if (levels.add(rect))
+        return;
+
+      if (manager.canCompact()) {
+        // Try to allocate with horizontal compaction
+        if (levels.compactAndAdd(rect, backingStore, manager))
+          return;
+        // Let the manager have a chance at potentially evicting some entries
+        tryAgain = manager.preExpand(rect, attemptNumber++);
+      } else {
+        tryAgain = manager.additionFailed(rect, attemptNumber++);
+      }
+    } while (tryAgain);
+
+    if (!manager.canCompact()) {
+      throw new RuntimeException("BackingStoreManager does not support compaction or expansion, and didn't clear space for new rectangle");
+    }
+
+    compactImpl(rect);
+
+    // Retry the addition of the incoming rectangle
+    add(rect);
+    // Done
+  }
+
+  /** Removes the given rectangle from this RectanglePacker. */
+  public void remove(Rect rect) {
+    levels.remove(rect);
+  }
+
+  /** Visits all Rects contained in this RectanglePacker. */
+  public void visit(RectVisitor visitor) {
+    levels.visit(visitor);
+  }
+
+  /** Returns the vertical fragmentation ratio of this
+      RectanglePacker. This is defined as the ratio of the sum of the
+      heights of all completely empty Levels divided by the overall
+      used height of the LevelSet. A high vertical fragmentation ratio
+      indicates that it may be profitable to perform a compaction. */
+  public float verticalFragmentationRatio() {
+    return levels.verticalFragmentationRatio();
+  }
+
+  /** Forces a compaction cycle, which typically results in allocating
+      a new backing store and copying all entries to it. */
+  public void compact() {
+    compactImpl(null);
+  }
+
+  // The "cause" rect may be null
+  private void compactImpl(Rect cause) {
+    // Have to either expand, compact or both. Need to figure out what
+    // direction to go. Prefer to expand vertically. Expand
+    // horizontally only if rectangle being added is too wide. FIXME:
+    // may want to consider rebalancing the width and height to be
+    // more equal if it turns out we keep expanding in the vertical
+    // direction.
+    boolean done = false;
+    int newWidth = levels.w();
+    int newHeight = levels.h();
+    LevelSet nextLevelSet = null;
+    int attemptNumber = 0;
+    boolean needAdditionFailureNotification = false;
+
+    while (!done) {
+      if (cause != null) {
+        if (cause.w() > newWidth) {
+          newWidth = cause.w();
+        } else {
+          newHeight = (int) (newHeight * (1.0f + EXPANSION_FACTOR));
+        }
+      }
+
+      // Clamp to maximum values
+      needAdditionFailureNotification = false;
+      if (maxWidth > 0 && newWidth > maxWidth) {
+        newWidth = maxWidth;
+        needAdditionFailureNotification = true;
+      }
+      if (maxHeight > 0 && newHeight > maxHeight) {
+        newHeight = maxHeight;
+        needAdditionFailureNotification = true;
+      }
+
+      nextLevelSet = new LevelSet(newWidth, newHeight);
+      
+      // Make copies of all existing rectangles
+      List/*<Rect>*/ newRects = new ArrayList/*<Rect>*/();
+      for (Iterator i1 = levels.iterator(); i1.hasNext(); ) {
+        Level level = (Level) i1.next();
+        for (Iterator i2 = level.iterator(); i2.hasNext(); ) {
+          Rect cur = (Rect) i2.next();
+          Rect newRect = new Rect(0, 0, cur.w(), cur.h(), null);
+          cur.setNextLocation(newRect);
+          // Hook up the reverse mapping too for easier replacement
+          newRect.setNextLocation(cur);
+          newRects.add(newRect);
+        }
+      }
+      // Sort them by decreasing height (note: this isn't really
+      // guaranteed to improve the chances of a successful layout)
+      Collections.sort(newRects, rectHComparator);
+      // Try putting all of these rectangles into the new level set
+      done = true;
+      for (Iterator iter = newRects.iterator(); iter.hasNext(); ) {
+        if (!nextLevelSet.add((Rect) iter.next())) {
+          done = false;
+          break;
+        }
+      }
+
+      if (done && cause != null) {
+        // Try to add the new rectangle as well
+        if (nextLevelSet.add(cause)) {
+          // We're OK
+        } else {
+          done = false;
+        }
+      }
+
+      // Don't send addition failure notifications if we're only doing
+      // a compaction
+      if (!done && needAdditionFailureNotification && cause != null) {
+        manager.additionFailed(cause, attemptNumber);
+      }
+      ++attemptNumber;
+    }
+
+    // See whether the implicit compaction that just occurred has
+    // yielded excess empty space.
+    if (nextLevelSet.getUsedHeight() > 0 &&
+        nextLevelSet.getUsedHeight() < nextLevelSet.h() * SHRINK_FACTOR) {
+      int shrunkHeight = Math.max(initialHeight,
+                                  (int) (nextLevelSet.getUsedHeight() * (1.0f + EXPANSION_FACTOR)));
+      if (maxHeight > 0 && shrunkHeight > maxHeight) {
+        shrunkHeight = maxHeight;
+      }
+      nextLevelSet.setHeight(shrunkHeight);
+    }
+
+    // If we temporarily added the new rectangle to the new LevelSet,
+    // take it out since we don't "really" add it here but in add(), above
+    if (cause != null) {
+      nextLevelSet.remove(cause);
+    }
+
+    // OK, now we have a new layout and a mapping from the old to the
+    // new locations of rectangles on the backing store. Allocate a
+    // new backing store, move the contents over and deallocate the
+    // old one.
+    Object newBackingStore = manager.allocateBackingStore(nextLevelSet.w(),
+                                                          nextLevelSet.h());
+    manager.beginMovement(backingStore, newBackingStore);
+    for (Iterator i1 = levels.iterator(); i1.hasNext(); ) {
+      Level level = (Level) i1.next();
+      for (Iterator i2 = level.iterator(); i2.hasNext(); ) {
+        Rect cur = (Rect) i2.next();
+        manager.move(backingStore, cur,
+                     newBackingStore, cur.getNextLocation());
+      }
+    }
+    // Replace references to temporary rectangles with original ones
+    nextLevelSet.updateRectangleReferences();
+    manager.endMovement(backingStore, newBackingStore);
+    // Now delete the old backing store
+    manager.deleteBackingStore(backingStore);
+    // Update to new versions of backing store and LevelSet
+    backingStore = newBackingStore;
+    levels = nextLevelSet;
+  }
+
+  /** Clears all Rects contained in this RectanglePacker. */
+  public void clear() {
+    levels.clear();
+  }
+
+  /** Disposes the backing store allocated by the
+      BackingStoreManager. This RectanglePacker may no longer be used
+      after calling this method. */
+  public void dispose() {
+    if (backingStore != null)
+      manager.deleteBackingStore(backingStore);
+    backingStore = null;
+    levels = null;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/packrect/package.html b/src/jogl/classes/com/jogamp/opengl/util/packrect/package.html
new file mode 100755
index 000000000..c1c5db477
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/package.html
@@ -0,0 +1,9 @@
+<BODY>
+This package implements a rectangle packing algorithm suitable for
+tracking the placement of multiple rectangles inside a larger one. It
+is useful for cases such as placing the contents of multiple windows
+on a larger backing store texture for a compositing window manager;
+placing multiple rasterized strings in a texture map for quick
+rendering to the screen; and many other situations where it is useful
+to carve up a larger texture into smaller pieces dynamically. <P>
+</BODY>
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
new file mode 100755
index 000000000..5ef96eeaf
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
@@ -0,0 +1,1120 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.opengl.util.texture;
+
+import java.nio.*;
+import java.security.*;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+import javax.media.nativewindow.NativeWindowFactory;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.spi.*;
+
+/**
+ * Represents an OpenGL texture object. Contains convenience routines
+ * for enabling/disabling OpenGL texture state, binding this texture,
+ * and computing texture coordinates for both the entire image as well
+ * as a sub-image. 
+ * 
+ * <p><a name="nonpow2"><b>Non-power-of-two restrictions</b></a>
+ * <br> When creating an OpenGL texture object, the Texture class will
+ * attempt to leverage the <a
+ * href="http://www.opengl.org/registry/specs/ARB/texture_non_power_of_two.txt">GL_ARB_texture_non_power_of_two</a>
+ * and <a
+ * href="http://www.opengl.org/registry/specs/ARB/texture_rectangle.txt">GL_ARB_texture_rectangle</a>
+ * extensions (in that order) whenever possible.  If neither extension
+ * is available, the Texture class will simply upload a non-pow2-sized
+ * image into a standard pow2-sized texture (without any special
+ * scaling).  Since the choice of extension (or whether one is used at
+ * all) depends on the user's machine configuration, developers are
+ * recommended to use {@link #getImageTexCoords} and {@link
+ * #getSubImageTexCoords}, as those methods will calculate the
+ * appropriate texture coordinates for the situation.
+ *
+ * <p>One caveat in this approach is that certain texture wrap modes
+ * (e.g.  <code>GL_REPEAT</code>) are not legal when the GL_ARB_texture_rectangle
+ * extension is in use.  Another issue to be aware of is that in the
+ * default pow2 scenario, if the original image does not have pow2
+ * dimensions, then wrapping may not work as one might expect since
+ * the image does not extend to the edges of the pow2 texture.  If
+ * texture wrapping is important, it is recommended to use only
+ * pow2-sized images with the Texture class.
+ *
+ * <p><a name="perftips"><b>Performance Tips</b></a>
+ * <br> For best performance, try to avoid calling {@link #enable} /
+ * {@link #bind} / {@link #disable} any more than necessary. For
+ * example, applications using many Texture objects in the same scene
+ * may want to reduce the number of calls to both {@link #enable} and
+ * {@link #disable}. To do this it is necessary to call {@link
+ * #getTarget} to make sure the OpenGL texture target is the same for
+ * all of the Texture objects in use; non-power-of-two textures using
+ * the GL_ARB_texture_rectangle extension use a different target than
+ * power-of-two textures using the GL_TEXTURE_2D target. Note that
+ * when switching between textures it is necessary to call {@link
+ * #bind}, but when drawing many triangles all using the same texture,
+ * for best performance only one call to {@link #bind} should be made.
+ *
+ * <p><a name="premult"><b>Alpha premultiplication and blending</b></a>
+ * <br> The mathematically correct way to perform blending in OpenGL
+ * (with the SrcOver "source over destination" mode, or any other
+ * Porter-Duff rule) is to use "premultiplied color components", which
+ * means the R/G/ B color components have already been multiplied by
+ * the alpha value.  To make things easier for developers, the Texture
+ * class will automatically convert non-premultiplied image data into
+ * premultiplied data when storing it into an OpenGL texture.  As a
+ * result, it is important to use the correct blending function; for
+ * example, the SrcOver rule is expressed as:
+<pre>
+    gl.glBlendFunc(GL.GL_ONE, GL.GL_ONE_MINUS_SRC_ALPHA);
+</pre>
+ * Also, when using a texture function like <code>GL_MODULATE</code> where
+ * the current color plays a role, it is important to remember to make
+ * sure that the color is specified in a premultiplied form, for
+ * example:
+<pre>
+    float a = ...;
+    float r = r * a;
+    float g = g * a;
+    float b = b * a;
+    gl.glColor4f(r, g, b, a);
+</pre> 
+ *
+ * For reference, here is a list of the Porter-Duff compositing rules
+ * and the associated OpenGL blend functions (source and destination
+ * factors) to use in the face of premultiplied alpha:
+ *
+<CENTER>
+<TABLE WIDTH="75%">
+<TR> <TD> Rule     <TD> Source                  <TD> Dest
+<TR> <TD> Clear    <TD> GL_ZERO                 <TD> GL_ZERO
+<TR> <TD> Src      <TD> GL_ONE                  <TD> GL_ZERO
+<TR> <TD> SrcOver  <TD> GL_ONE                  <TD> GL_ONE_MINUS_SRC_ALPHA
+<TR> <TD> DstOver  <TD> GL_ONE_MINUS_DST_ALPHA  <TD> GL_ONE
+<TR> <TD> SrcIn    <TD> GL_DST_ALPHA            <TD> GL_ZERO
+<TR> <TD> DstIn    <TD> GL_ZERO                 <TD> GL_SRC_ALPHA
+<TR> <TD> SrcOut   <TD> GL_ONE_MINUS_DST_ALPHA  <TD> GL_ZERO
+<TR> <TD> DstOut   <TD> GL_ZERO                 <TD> GL_ONE_MINUS_SRC_ALPHA
+<TR> <TD> Dst      <TD> GL_ZERO                 <TD> GL_ONE
+<TR> <TD> SrcAtop  <TD> GL_DST_ALPHA            <TD> GL_ONE_MINUS_SRC_ALPHA
+<TR> <TD> DstAtop  <TD> GL_ONE_MINUS_DST_ALPHA  <TD> GL_SRC_ALPHA
+<TR> <TD> AlphaXor <TD> GL_ONE_MINUS_DST_ALPHA  <TD> GL_ONE_MINUS_SRC_ALPHA
+</TABLE>
+</CENTER>
+ *
+ * @author Chris Campbell
+ * @author Kenneth Russell
+ */
+public class Texture {
+    /** The GL target type. */
+    private int target;
+    /** The GL texture ID. */
+    private int texID;
+    /** The width of the texture. */
+    private int texWidth;
+    /** The height of the texture. */
+    private int texHeight;
+    /** The width of the image. */
+    private int imgWidth;
+    /** The height of the image. */
+    private int imgHeight;
+    /** The original aspect ratio of the image, before any rescaling
+        that might have occurred due to using the GLU mipmap routines. */
+    private float aspectRatio;
+    /** Indicates whether the TextureData requires a vertical flip of
+        the texture coords. */
+    private boolean mustFlipVertically;
+    /** Indicates whether we're using automatic mipmap generation
+        support (GL_GENERATE_MIPMAP). */
+    private boolean usingAutoMipmapGeneration;
+
+    /** The texture coordinates corresponding to the entire image. */
+    private TextureCoords coords;
+
+    /** An estimate of the amount of texture memory this texture consumes. */
+    private int estimatedMemorySize;
+
+    private static final AccessControlContext localACC = AccessController.getContext();
+
+    private static final boolean DEBUG = Debug.debug("Texture");
+    private static final boolean VERBOSE = Debug.verbose();
+
+    // For testing alternate code paths on more capable hardware
+    private static final boolean disableNPOT    = Debug.isPropertyDefined("jogl.texture.nonpot", true, localACC);
+    private static final boolean disableTexRect = Debug.isPropertyDefined("jogl.texture.notexrect", true, localACC);
+
+    public Texture(TextureData data) throws GLException {
+        texID = 0;
+        updateImage(data);
+    }
+
+    // Constructor for use when creating e.g. cube maps, where there is
+    // no initial texture data
+    public Texture(int target) throws GLException {
+        texID = 0;
+        this.target = target;
+    }
+
+    // Package-private constructor for creating a texture object which wraps
+    // an existing texture ID from another package
+    Texture(int textureID,
+	    int target,
+	    int texWidth,
+	    int texHeight,
+	    int imgWidth,
+	    int imgHeight,
+	    boolean mustFlipVertically) {
+	this.texID = textureID;
+	this.target = target;
+	this.mustFlipVertically = mustFlipVertically;
+	this.texWidth = texWidth;
+	this.texHeight = texHeight;
+	setImageSize(imgWidth, imgHeight, target);
+    }
+
+    /**
+     * Enables this texture's target (e.g., GL_TEXTURE_2D) in the
+     * current GL context's state. This method is a shorthand equivalent
+     * of the following OpenGL code:
+     <pre>
+     gl.glEnable(texture.getTarget());
+     </pre>
+     *
+     * See the <a href="#perftips">performance tips</a> above for hints
+     * on how to maximize performance when using many Texture objects.
+     *
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void enable() throws GLException {
+        GLContext.getCurrentGL().glEnable(target);
+    }
+
+    /**
+     * Disables this texture's target (e.g., GL_TEXTURE_2D) in the
+     * current GL context's state. This method is a shorthand equivalent
+     * of the following OpenGL code:
+     <pre>
+     gl.glDisable(texture.getTarget());
+     </pre>
+     *
+     * See the <a href="#perftips">performance tips</a> above for hints
+     * on how to maximize performance when using many Texture objects.
+     *
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void disable() throws GLException {
+        GLContext.getCurrentGL().glDisable(target); 
+    }
+
+    /**
+     * Binds this texture to the current GL context. This method is a
+     * shorthand equivalent of the following OpenGL code:
+     <pre>
+     gl.glBindTexture(texture.getTarget(), texture.getTextureObject());
+     </pre>
+     *
+     * See the <a href="#perftips">performance tips</a> above for hints
+     * on how to maximize performance when using many Texture objects.
+     *
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void bind() throws GLException {
+        validateTexID(null, true);
+        GLContext.getCurrentGL().glBindTexture(target, texID); 
+    }
+
+    /**
+     * Disposes the native resources used by this texture object.
+     *
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     * @deprecated use destroy(GL)
+     */
+    public void dispose() throws GLException {
+        destroy(GLContext.getCurrentGL());
+    }
+
+    /**
+     * Disposes the native resources used by this texture object.
+     *
+     * @throws GLException if any OpenGL-related errors occurred
+     * @deprecated use destroy(GL)
+     */
+    public void dispose(GL gl) throws GLException {
+        destroy(gl);
+    }
+
+    /**
+     * Destroys the native resources used by this texture object.
+     *
+     * @throws GLException if any OpenGL-related errors occurred
+     */
+    public void destroy(GL gl) throws GLException {
+        if(0<texID) {
+            gl.glDeleteTextures(1, new int[] {texID}, 0);
+            texID = 0;
+        }
+    }
+
+    /**
+     * Returns the OpenGL "target" of this texture.
+     *
+     * @return the OpenGL target of this texture
+     * @see javax.media.opengl.GL#GL_TEXTURE_2D
+     * @see javax.media.opengl.GL2#GL_TEXTURE_RECTANGLE_ARB
+     */
+    public int getTarget() {
+        return target;
+    }
+
+    /**
+     * Returns the width of the allocated OpenGL texture in pixels.
+     * Note that the texture width will be greater than or equal to the
+     * width of the image contained within.
+     *
+     * @return the width of the texture
+     */
+    public int getWidth() {
+        return texWidth;
+    }
+    
+    /**
+     * Returns the height of the allocated OpenGL texture in pixels.
+     * Note that the texture height will be greater than or equal to the
+     * height of the image contained within.
+     *
+     * @return the height of the texture
+     */
+    public int getHeight() {
+        return texHeight;
+    }   
+    
+    /** 
+     * Returns the width of the image contained within this texture.
+     * Note that for non-power-of-two textures in particular this may
+     * not be equal to the result of {@link #getWidth}. It is
+     * recommended that applications call {@link #getImageTexCoords} and
+     * {@link #getSubImageTexCoords} rather than using this API
+     * directly.
+     *
+     * @return the width of the image
+     */
+    public int getImageWidth() {
+        return imgWidth;
+    }
+
+    /**
+     * Returns the height of the image contained within this texture.
+     * Note that for non-power-of-two textures in particular this may
+     * not be equal to the result of {@link #getHeight}. It is
+     * recommended that applications call {@link #getImageTexCoords} and
+     * {@link #getSubImageTexCoords} rather than using this API
+     * directly.
+     *
+     * @return the height of the image
+     */
+    public int getImageHeight() {
+        return imgHeight;
+    }
+
+    /**
+     * Returns the original aspect ratio of the image, defined as (image
+     * width) / (image height), before any scaling that might have
+     * occurred as a result of using the GLU mipmap routines.
+     */
+    public float getAspectRatio() {
+        return aspectRatio;
+    }
+
+    /**
+     * Returns the set of texture coordinates corresponding to the
+     * entire image. If the TextureData indicated that the texture
+     * coordinates must be flipped vertically, the returned
+     * TextureCoords will take that into account.
+     * 
+     * @return the texture coordinates corresponding to the entire image
+     */
+    public TextureCoords getImageTexCoords() {
+        return coords;
+    }
+
+    /**
+     * Returns the set of texture coordinates corresponding to the
+     * specified sub-image. The (x1, y1) and (x2, y2) points are
+     * specified in terms of pixels starting from the lower-left of the
+     * image. (x1, y1) should specify the lower-left corner of the
+     * sub-image and (x2, y2) the upper-right corner of the sub-image.
+     * If the TextureData indicated that the texture coordinates must be
+     * flipped vertically, the returned TextureCoords will take that
+     * into account; this should not be handled by the end user in the
+     * specification of the y1 and y2 coordinates.
+     * 
+     * @return the texture coordinates corresponding to the specified sub-image
+     */
+    public TextureCoords getSubImageTexCoords(int x1, int y1, int x2, int y2) {
+        if (target == GL2.GL_TEXTURE_RECTANGLE_ARB) {
+            if (mustFlipVertically) {
+                return new TextureCoords(x1, texHeight - y1, x2, texHeight - y2);
+            } else {
+                return new TextureCoords(x1, y1, x2, y2);
+            }
+        } else {
+            float tx1 = (float)x1 / (float)texWidth;
+            float ty1 = (float)y1 / (float)texHeight;
+            float tx2 = (float)x2 / (float)texWidth;
+            float ty2 = (float)y2 / (float)texHeight;
+            if (mustFlipVertically) {
+                float yMax = (float) imgHeight / (float) texHeight;
+                return new TextureCoords(tx1, yMax - ty1, tx2, yMax - ty2);
+            } else {
+                return new TextureCoords(tx1, ty1, tx2, ty2);
+            }
+        }
+    }
+
+    /**
+     * Updates the entire content area of this texture using the data in
+     * the given image.
+     * 
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void updateImage(TextureData data) throws GLException {
+        updateImage(data, 0);
+    }
+
+    /**
+     * Indicates whether this texture's texture coordinates must be
+     * flipped vertically in order to properly display the texture. This
+     * is handled automatically by {@link #getImageTexCoords
+     * getImageTexCoords} and {@link #getSubImageTexCoords
+     * getSubImageTexCoords}, but applications may generate or otherwise
+     * produce texture coordinates which must be corrected.
+     */
+    public boolean getMustFlipVertically() {
+        return mustFlipVertically;
+    }
+
+    /**
+     * Updates the content area of the specified target of this texture
+     * using the data in the given image. In general this is intended
+     * for construction of cube maps.
+     * 
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void updateImage(TextureData data, int target) throws GLException {
+        GL gl = GLContext.getCurrentGL();
+        validateTexID(gl, true);
+
+        imgWidth = data.getWidth();
+        imgHeight = data.getHeight();
+        aspectRatio = (float) imgWidth / (float) imgHeight;
+        mustFlipVertically = data.getMustFlipVertically();
+
+        int texTarget = 0;
+        int texParamTarget = this.target;
+
+        // See whether we have automatic mipmap generation support
+        boolean haveAutoMipmapGeneration =
+            (gl.isExtensionAvailable("GL_VERSION_1_4") ||
+             gl.isExtensionAvailable("GL_SGIS_generate_mipmap"));
+
+        // Indicate to the TextureData what functionality is available
+        data.setHaveEXTABGR(gl.isExtensionAvailable("GL_EXT_abgr"));
+        data.setHaveGL12(gl.isExtensionAvailable("GL_VERSION_1_2"));
+
+        // Indicates whether both width and height are power of two
+        boolean isPOT = isPowerOfTwo(imgWidth) && isPowerOfTwo(imgHeight);
+
+        // Note that automatic mipmap generation doesn't work for
+        // GL_ARB_texture_rectangle
+        if (!isPOT && !haveNPOT(gl)) {
+            haveAutoMipmapGeneration = false;
+        }
+
+        boolean expandingCompressedTexture = false;
+        boolean done = false;
+        if (data.getMipmap() && !haveAutoMipmapGeneration) {
+            // GLU always scales the texture's dimensions to be powers of
+            // two. It also doesn't really matter exactly what the texture
+            // width and height are because the texture coords are always
+            // between 0.0 and 1.0.
+            imgWidth = nextPowerOfTwo(imgWidth);
+            imgHeight = nextPowerOfTwo(imgHeight);
+            texWidth = imgWidth;
+            texHeight = imgHeight;
+            texTarget = GL.GL_TEXTURE_2D;
+            done = true;
+        }
+
+        if (!done && preferTexRect(gl) && !isPOT &&
+            haveTexRect(gl) && !data.isDataCompressed() && gl.isGL2()) {
+            // GL_ARB_texture_rectangle does not work for compressed textures
+            if (DEBUG) {
+                System.err.println("Using GL_ARB_texture_rectangle preferentially on this hardware");
+            }
+
+            texWidth = imgWidth;
+            texHeight = imgHeight;
+            texTarget = GL2.GL_TEXTURE_RECTANGLE_ARB;
+            done = true;
+        }
+
+        if (!done && (isPOT || haveNPOT(gl))) {
+            if (DEBUG) {
+                if (isPOT) {
+                    System.err.println("Power-of-two texture");
+                } else {
+                    System.err.println("Using GL_ARB_texture_non_power_of_two");
+                }
+            }
+
+            texWidth = imgWidth;
+            texHeight = imgHeight;
+            texTarget = GL.GL_TEXTURE_2D;
+            done = true;
+        }
+
+        if (!done && haveTexRect(gl) && !data.isDataCompressed() && gl.isGL2()) {
+            // GL_ARB_texture_rectangle does not work for compressed textures
+            if (DEBUG) {
+                System.err.println("Using GL_ARB_texture_rectangle");
+            }
+
+            texWidth = imgWidth;
+            texHeight = imgHeight;
+            texTarget = GL2.GL_TEXTURE_RECTANGLE_ARB;
+            done = true;
+        }
+
+        if (!done) {
+            // If we receive non-power-of-two compressed texture data and
+            // don't have true hardware support for compressed textures, we
+            // can fake this support by producing an empty "compressed"
+            // texture image, using glCompressedTexImage2D with that to
+            // allocate the texture, and glCompressedTexSubImage2D with the
+            // incoming data.
+            if (data.isDataCompressed()) {
+                if (data.getMipmapData() != null) {
+
+                    // We don't currently support expanding of compressed,
+                    // mipmapped non-power-of-two textures to the nearest power
+                    // of two; the obvious port of the non-mipmapped code didn't
+                    // work
+                    throw new GLException("Mipmapped non-power-of-two compressed textures only supported on OpenGL 2.0 hardware (GL_ARB_texture_non_power_of_two)");
+                }
+
+                expandingCompressedTexture = true;
+            }
+
+            if (DEBUG) {
+                System.err.println("Expanding texture to power-of-two dimensions");
+            }
+
+            if (data.getBorder() != 0) {
+                throw new RuntimeException("Scaling up a non-power-of-two texture which has a border won't work");
+            }
+            texWidth = nextPowerOfTwo(imgWidth);
+            texHeight = nextPowerOfTwo(imgHeight);
+            texTarget = GL.GL_TEXTURE_2D;
+        }
+
+        texParamTarget = texTarget;
+        setImageSize(imgWidth, imgHeight, texTarget);
+
+        if (target != 0) {
+            // Allow user to override auto detection and skip bind step (for
+            // cubemap construction)
+            texTarget = target;
+            if (this.target == 0) {
+                throw new GLException("Override of target failed; no target specified yet");
+            }
+            texParamTarget = this.target;
+            gl.glBindTexture(texParamTarget, texID);
+        } else {
+            gl.glBindTexture(texTarget, texID);
+        }
+
+        if (data.getMipmap() && !haveAutoMipmapGeneration) {
+            int[] align = new int[1];
+            gl.glGetIntegerv(GL.GL_UNPACK_ALIGNMENT, align, 0); // save alignment
+            gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, data.getAlignment());
+
+            if (data.isDataCompressed()) {
+                throw new GLException("May not request mipmap generation for compressed textures");
+            }
+
+            try {
+                // FIXME: may need check for GLUnsupportedException
+                GLU glu = GLU.createGLU(gl);
+                glu.gluBuild2DMipmaps(texTarget, data.getInternalFormat(),
+                                      data.getWidth(), data.getHeight(),
+                                      data.getPixelFormat(), data.getPixelType(), data.getBuffer());
+            } finally {
+                gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, align[0]); // restore alignment
+            }
+        } else {
+            checkCompressedTextureExtensions(data);
+            Buffer[] mipmapData = data.getMipmapData();
+            if (mipmapData != null) {
+                int width = texWidth;
+                int height = texHeight;
+                for (int i = 0; i < mipmapData.length; i++) {
+                    if (data.isDataCompressed()) {
+                        // Need to use glCompressedTexImage2D directly to allocate and fill this image
+                        // Avoid spurious memory allocation when possible
+                        gl.glCompressedTexImage2D(texTarget, i, data.getInternalFormat(),
+                                                  width, height, data.getBorder(),
+                                                  mipmapData[i].remaining(), mipmapData[i]);
+                    } else {
+                        // Allocate texture image at this level
+                        gl.glTexImage2D(texTarget, i, data.getInternalFormat(),
+                                        width, height, data.getBorder(),
+                                        data.getPixelFormat(), data.getPixelType(), null);
+                        updateSubImageImpl(data, texTarget, i, 0, 0, 0, 0, data.getWidth(), data.getHeight());
+                    }
+
+                    width = Math.max(width / 2, 1);
+                    height = Math.max(height / 2, 1);
+                }
+            } else {
+                if (data.isDataCompressed()) {
+                    if (!expandingCompressedTexture) {
+                        // Need to use glCompressedTexImage2D directly to allocate and fill this image
+                        // Avoid spurious memory allocation when possible
+                        gl.glCompressedTexImage2D(texTarget, 0, data.getInternalFormat(),
+                                                  texWidth, texHeight, data.getBorder(),
+                                                  data.getBuffer().capacity(), data.getBuffer());
+                    } else {
+                        ByteBuffer buf = DDSImage.allocateBlankBuffer(texWidth,
+                                                                      texHeight,
+                                                                      data.getInternalFormat());
+                        gl.glCompressedTexImage2D(texTarget, 0, data.getInternalFormat(),
+                                                  texWidth, texHeight, data.getBorder(),
+                                                  buf.capacity(), buf);
+                        updateSubImageImpl(data, texTarget, 0, 0, 0, 0, 0, data.getWidth(), data.getHeight());
+                    }
+                } else {
+                    if (data.getMipmap() && haveAutoMipmapGeneration && gl.isGL2ES1()) {
+                        // For now, only use hardware mipmapping for uncompressed 2D
+                        // textures where the user hasn't explicitly specified
+                        // mipmap data; don't know about interactions between
+                        // GL_GENERATE_MIPMAP and glCompressedTexImage2D
+                        gl.glTexParameteri(texParamTarget, GL2ES1.GL_GENERATE_MIPMAP, GL.GL_TRUE);
+                        usingAutoMipmapGeneration = true;
+                    }
+
+                    gl.glTexImage2D(texTarget, 0, data.getInternalFormat(),
+                                    texWidth, texHeight, data.getBorder(),
+                                    data.getPixelFormat(), data.getPixelType(), null);
+                    updateSubImageImpl(data, texTarget, 0, 0, 0, 0, 0, data.getWidth(), data.getHeight());
+                }
+            }
+        }
+
+        int minFilter = (data.getMipmap() ? GL.GL_LINEAR_MIPMAP_LINEAR : GL.GL_LINEAR);
+        int magFilter = GL.GL_LINEAR;
+        int wrapMode = (gl.isExtensionAvailable("GL_VERSION_1_2") || !gl.isGL2()) ? GL.GL_CLAMP_TO_EDGE : GL2.GL_CLAMP;
+
+        // REMIND: figure out what to do for GL_TEXTURE_RECTANGLE_ARB
+        if (texTarget != GL2.GL_TEXTURE_RECTANGLE_ARB) {
+            gl.glTexParameteri(texParamTarget, GL.GL_TEXTURE_MIN_FILTER, minFilter);
+            gl.glTexParameteri(texParamTarget, GL.GL_TEXTURE_MAG_FILTER, magFilter);
+            gl.glTexParameteri(texParamTarget, GL.GL_TEXTURE_WRAP_S, wrapMode);
+            gl.glTexParameteri(texParamTarget, GL.GL_TEXTURE_WRAP_T, wrapMode);
+            if (this.target == GL2.GL_TEXTURE_CUBE_MAP) {
+                gl.glTexParameteri(texParamTarget, GL2.GL_TEXTURE_WRAP_R, wrapMode);
+            }
+        }
+
+        // Don't overwrite target if we're loading e.g. faces of a cube
+        // map
+        if ((this.target == 0) ||
+            (this.target == GL.GL_TEXTURE_2D) ||
+            (this.target == GL2.GL_TEXTURE_RECTANGLE_ARB)) {
+            this.target = texTarget;
+        }
+
+        // This estimate will be wrong for cube maps
+        estimatedMemorySize = data.getEstimatedMemorySize();
+    }
+
+    /**
+     * Updates a subregion of the content area of this texture using the
+     * given data. If automatic mipmap generation is in use (see {@link
+     * #isUsingAutoMipmapGeneration isUsingAutoMipmapGeneration}),
+     * updates to the base (level 0) mipmap will cause the lower-level
+     * mipmaps to be regenerated, and updates to other mipmap levels
+     * will be ignored. Otherwise, if automatic mipmap generation is not
+     * in use, only updates the specified mipmap level and does not
+     * re-generate mipmaps if they were originally produced or loaded.
+     *
+     * @param data the image data to be uploaded to this texture
+     * @param mipmapLevel the mipmap level of the texture to set. If
+     * this is non-zero and the TextureData contains mipmap data, the
+     * appropriate mipmap level will be selected.
+     * @param x the x offset (in pixels) relative to the lower-left corner
+     * of this texture
+     * @param y the y offset (in pixels) relative to the lower-left corner
+     * of this texture
+     *
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void updateSubImage(TextureData data, int mipmapLevel, int x, int y) throws GLException {
+        if (usingAutoMipmapGeneration && mipmapLevel != 0) {
+            // When we're using mipmap generation via GL_GENERATE_MIPMAP, we
+            // don't need to update other mipmap levels
+            return;
+        }
+        bind();
+        updateSubImageImpl(data, target, mipmapLevel, x, y, 0, 0, data.getWidth(), data.getHeight());
+    }
+
+    /**
+     * Updates a subregion of the content area of this texture using the
+     * specified sub-region of the given data.  If automatic mipmap
+     * generation is in use (see {@link #isUsingAutoMipmapGeneration
+     * isUsingAutoMipmapGeneration}), updates to the base (level 0)
+     * mipmap will cause the lower-level mipmaps to be regenerated, and
+     * updates to other mipmap levels will be ignored. Otherwise, if
+     * automatic mipmap generation is not in use, only updates the
+     * specified mipmap level and does not re-generate mipmaps if they
+     * were originally produced or loaded. This method is only supported
+     * for uncompressed TextureData sources.
+     *
+     * @param data the image data to be uploaded to this texture
+     * @param mipmapLevel the mipmap level of the texture to set. If
+     * this is non-zero and the TextureData contains mipmap data, the
+     * appropriate mipmap level will be selected.
+     * @param dstx the x offset (in pixels) relative to the lower-left corner
+     * of this texture where the update will be applied
+     * @param dsty the y offset (in pixels) relative to the lower-left corner
+     * of this texture where the update will be applied
+     * @param srcx the x offset (in pixels) relative to the lower-left corner
+     * of the supplied TextureData from which to fetch the update rectangle
+     * @param srcy the y offset (in pixels) relative to the lower-left corner
+     * of the supplied TextureData from which to fetch the update rectangle
+     * @param width the width (in pixels) of the rectangle to be updated
+     * @param height the height (in pixels) of the rectangle to be updated
+     *
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void updateSubImage(TextureData data, int mipmapLevel,
+                               int dstx, int dsty,
+                               int srcx, int srcy,
+                               int width, int height) throws GLException {
+        if (data.isDataCompressed()) {
+            throw new GLException("updateSubImage specifying a sub-rectangle is not supported for compressed TextureData");
+        }
+        if (usingAutoMipmapGeneration && mipmapLevel != 0) {
+            // When we're using mipmap generation via GL_GENERATE_MIPMAP, we
+            // don't need to update other mipmap levels
+            return;
+        }
+        bind();
+        updateSubImageImpl(data, target, mipmapLevel, dstx, dsty, srcx, srcy, width, height);
+    }
+
+    /**
+     * Sets the OpenGL floating-point texture parameter for the
+     * texture's target. This gives control over parameters such as
+     * GL_TEXTURE_MAX_ANISOTROPY_EXT. Causes this texture to be bound to
+     * the current texture state.
+     * 
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void setTexParameterf(int parameterName,
+                                 float value) {
+        bind();
+        GL gl = GLContext.getCurrentGL();
+        gl.glTexParameterf(target, parameterName, value);
+    }
+
+    /**
+     * Sets the OpenGL multi-floating-point texture parameter for the
+     * texture's target. Causes this texture to be bound to the current
+     * texture state.
+     * 
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void setTexParameterfv(int parameterName,
+                                  FloatBuffer params) {
+        bind();
+        GL gl = GLContext.getCurrentGL();
+        gl.glTexParameterfv(target, parameterName, params);
+    }
+
+    /**
+     * Sets the OpenGL multi-floating-point texture parameter for the
+     * texture's target. Causes this texture to be bound to the current
+     * texture state.
+     * 
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void setTexParameterfv(int parameterName,
+                                  float[] params, int params_offset) {
+        bind();
+        GL gl = GLContext.getCurrentGL();
+        gl.glTexParameterfv(target, parameterName, params, params_offset);
+    }
+
+    /**
+     * Sets the OpenGL integer texture parameter for the texture's
+     * target. This gives control over parameters such as
+     * GL_TEXTURE_WRAP_S and GL_TEXTURE_WRAP_T, which by default are set
+     * to GL_CLAMP_TO_EDGE if OpenGL 1.2 is supported on the current
+     * platform and GL_CLAMP if not. Causes this texture to be bound to
+     * the current texture state.
+     * 
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void setTexParameteri(int parameterName,
+                                 int value) {
+        bind();
+        GL gl = GLContext.getCurrentGL();
+        gl.glTexParameteri(target, parameterName, value);
+    }
+
+    /**
+     * Sets the OpenGL multi-integer texture parameter for the texture's
+     * target. Causes this texture to be bound to the current texture
+     * state.
+     * 
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void setTexParameteriv(int parameterName,
+                                  IntBuffer params) {
+        bind();
+        GL gl = GLContext.getCurrentGL();
+        gl.glTexParameteriv(target, parameterName, params);
+    }
+
+    /**
+     * Sets the OpenGL multi-integer texture parameter for the texture's
+     * target. Causes this texture to be bound to the current texture
+     * state.
+     * 
+     * @throws GLException if no OpenGL context was current or if any
+     * OpenGL-related errors occurred
+     */
+    public void setTexParameteriv(int parameterName,
+                                  int[] params, int params_offset) {
+        bind();
+        GL gl = GLContext.getCurrentGL();
+        gl.glTexParameteriv(target, parameterName, params, params_offset);
+    }
+
+    /**
+     * Returns the underlying OpenGL texture object for this texture.
+     * Most applications will not need to access this, since it is
+     * handled automatically by the bind() and dispose() APIs.
+     */
+    public int getTextureObject() {
+        validateTexID(null, false);
+        return texID;
+    }
+
+    /** Returns an estimate of the amount of texture memory in bytes
+        this Texture consumes. It should only be treated as an estimate;
+        most applications should not need to query this but instead let
+        the OpenGL implementation page textures in and out as
+        necessary. */
+    public int getEstimatedMemorySize() {
+        return estimatedMemorySize;
+    }
+
+    /** Indicates whether this Texture is using automatic mipmap
+        generation (via the OpenGL texture parameter
+        GL_GENERATE_MIPMAP). This will automatically be used when
+        mipmapping is requested via the TextureData and either OpenGL
+        1.4 or the GL_SGIS_generate_mipmap extension is available. If
+        so, updates to the base image (mipmap level 0) will
+        automatically propagate down to the lower mipmap levels. Manual
+        updates of the mipmap data at these lower levels will be
+        ignored. */
+    public boolean isUsingAutoMipmapGeneration() {
+        return usingAutoMipmapGeneration;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    /**
+     * Returns true if the given value is a power of two.
+     *
+     * @return true if the given value is a power of two, false otherwise
+     */
+    private static boolean isPowerOfTwo(int val) {
+        return ((val & (val - 1)) == 0);
+    }
+
+    /**
+     * Returns the nearest power of two that is larger than the given value.
+     * If the given value is already a power of two, this method will simply
+     * return that value.
+     *
+     * @param val the value
+     * @return the next power of two
+     */
+    private static int nextPowerOfTwo(int val) {
+        int ret = 1;
+        while (ret < val) {
+            ret <<= 1;
+        }
+        return ret;
+    }
+
+    /**
+     * Updates the actual image dimensions; usually only called from
+     * <code>updateImage</code>.
+     */
+    private void setImageSize(int width, int height, int target) {
+        imgWidth = width;
+        imgHeight = height;
+        if (target == GL2.GL_TEXTURE_RECTANGLE_ARB) {
+            if (mustFlipVertically) {
+                coords = new TextureCoords(0, imgHeight, imgWidth, 0);
+            } else {
+                coords = new TextureCoords(0, 0, imgWidth, imgHeight);
+            }
+        } else {
+            if (mustFlipVertically) {
+                coords = new TextureCoords(0, (float) imgHeight / (float) texHeight,
+                                           (float) imgWidth / (float) texWidth, 0);
+            } else {
+                coords = new TextureCoords(0, 0,
+                                           (float) imgWidth / (float) texWidth,
+                                           (float) imgHeight / (float) texHeight);
+            }
+        }
+    }
+
+    private void updateSubImageImpl(TextureData data, int newTarget, int mipmapLevel,
+                                    int dstx, int dsty,
+                                    int srcx, int srcy, int width, int height) throws GLException {
+        GL gl = GLContext.getCurrentGL();
+        data.setHaveEXTABGR(gl.isExtensionAvailable("GL_EXT_abgr"));
+        data.setHaveGL12(gl.isExtensionAvailable("GL_VERSION_1_2"));
+
+        Buffer buffer = data.getBuffer();
+        if (buffer == null && data.getMipmapData() == null) {
+            // Assume user just wanted to get the Texture object allocated
+            return;
+        }
+
+        int rowlen = data.getRowLength();
+        int dataWidth = data.getWidth();
+        int dataHeight = data.getHeight();
+        if (data.getMipmapData() != null) {
+            // Compute the width, height and row length at the specified mipmap level
+            // Note we do not support specification of the row length for
+            // mipmapped textures at this point
+            for (int i = 0; i < mipmapLevel; i++) {
+                width = Math.max(width / 2, 1);
+                height = Math.max(height / 2, 1);
+
+                dataWidth = Math.max(dataWidth / 2, 1);
+                dataHeight = Math.max(dataHeight / 2, 1);
+            }
+            rowlen = 0;
+            buffer = data.getMipmapData()[mipmapLevel];
+        }
+
+        // Clip incoming rectangles to what is available both on this
+        // texture and in the incoming TextureData
+        if (srcx < 0) {
+            width += srcx;
+            srcx = 0;
+        }
+        if (srcy < 0) {
+            height += srcy;
+            srcy = 0;
+        }
+        // NOTE: not sure whether the following two are the correct thing to do
+        if (dstx < 0) {
+            width += dstx;
+            dstx = 0;
+        }
+        if (dsty < 0) {
+            height += dsty;
+            dsty = 0;
+        }
+
+        if (srcx + width > dataWidth) {
+            width = dataWidth - srcx;
+        }
+        if (srcy + height > dataHeight) {
+            height = dataHeight - srcy;
+        }
+        if (dstx + width > texWidth) {
+            width = texWidth - dstx;
+        }
+        if (dsty + height > texHeight) {
+            height = texHeight - dsty;
+        }
+
+        checkCompressedTextureExtensions(data);
+
+        if (data.isDataCompressed()) {
+            gl.glCompressedTexSubImage2D(newTarget, mipmapLevel,
+                                         dstx, dsty, width, height,
+                                         data.getInternalFormat(),
+                                         buffer.remaining(), buffer);
+        } else {
+            int[] align = { 0 };
+            int[] rowLength = { 0 };
+            int[] skipRows = { 0 };
+            int[] skipPixels = { 0 };
+            gl.glGetIntegerv(GL.GL_UNPACK_ALIGNMENT,   align,      0); // save alignment
+            if(gl.isGL2()) {
+                gl.glGetIntegerv(GL2.GL_UNPACK_ROW_LENGTH,  rowLength,  0); // save row length
+                gl.glGetIntegerv(GL2.GL_UNPACK_SKIP_ROWS,   skipRows,   0); // save skipped rows
+                gl.glGetIntegerv(GL2.GL_UNPACK_SKIP_PIXELS, skipPixels, 0); // save skipped pixels
+            }
+            gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, data.getAlignment());
+            if (DEBUG && VERBOSE) {
+                System.out.println("Row length  = " + rowlen);
+                System.out.println("skip pixels = " + srcx);
+                System.out.println("skip rows   = " + srcy);
+                System.out.println("dstx        = " + dstx);
+                System.out.println("dsty        = " + dsty);
+                System.out.println("width       = " + width);
+                System.out.println("height      = " + height);
+            }
+            if(gl.isGL2()) {
+                gl.glPixelStorei(GL2.GL_UNPACK_ROW_LENGTH, rowlen);
+                gl.glPixelStorei(GL2.GL_UNPACK_SKIP_ROWS, srcy);
+                gl.glPixelStorei(GL2.GL_UNPACK_SKIP_PIXELS, srcx);
+            } else {
+                if ( rowlen!=0 && rowlen!=width &&
+                     srcy!=0 && srcx!=0 ) {
+                    throw new GLException("rowlen and/or x/y offset only available for GL2");
+                }
+            }
+
+            gl.glTexSubImage2D(newTarget, mipmapLevel,
+                               dstx, dsty, width, height,
+                               data.getPixelFormat(), data.getPixelType(),
+                               buffer);
+            gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT,   align[0]);      // restore alignment
+            if(gl.isGL2()) {
+                gl.glPixelStorei(GL2.GL_UNPACK_ROW_LENGTH,  rowLength[0]);  // restore row length
+                gl.glPixelStorei(GL2.GL_UNPACK_SKIP_ROWS,   skipRows[0]);   // restore skipped rows
+                gl.glPixelStorei(GL2.GL_UNPACK_SKIP_PIXELS, skipPixels[0]); // restore skipped pixels
+            }
+        }
+    }
+
+    private void checkCompressedTextureExtensions(TextureData data) {
+        GL gl = GLContext.getCurrentGL();
+        if (data.isDataCompressed()) {
+            switch (data.getInternalFormat()) {
+            case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+            case GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+            case GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+            case GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+                if (!gl.isExtensionAvailable("GL_EXT_texture_compression_s3tc") &&
+                    !gl.isExtensionAvailable("GL_NV_texture_compression_vtc")) {
+                    throw new GLException("DXTn compressed textures not supported by this graphics card");
+                }
+                break;
+            default:
+                // FI1027GXME: should test availability of more texture
+                // compression extensions here
+                break;
+            }
+        }
+    }
+
+    private void validateTexID(GL gl, boolean throwException) {
+        if( 0 < texID ) return;
+        if(null==gl) {
+            GLContext ctx = GLContext.getCurrent();
+            if(null!=ctx) {
+                gl = ctx.getGL();
+            } else if(throwException) {
+                throw new GLException("No context current, can't create texture ID");
+            }
+        }
+
+        if(null!=gl) {
+            int[] tmp = new int[1];
+            gl.glGenTextures(1, tmp, 0);
+            texID = tmp[0];
+        }
+    }
+
+    // Helper routines for disabling certain codepaths
+    private static boolean haveNPOT(GL gl) {
+        return (!disableNPOT &&
+                ( gl.isGLES2() ||
+                  gl.isExtensionAvailable("GL_ARB_texture_non_power_of_two") ) );
+    }
+
+    private static boolean haveTexRect(GL gl) {
+        return (!disableTexRect &&
+                TextureIO.isTexRectEnabled() &&
+                gl.isExtensionAvailable("GL_ARB_texture_rectangle"));
+    }
+
+    private static boolean preferTexRect(GL gl) {
+        // Prefer GL_ARB_texture_rectangle on ATI hardware on Mac OS X
+        // due to software fallbacks
+
+        if (NativeWindowFactory.TYPE_MACOSX.equals(NativeWindowFactory.getNativeWindowType(false))) {
+            String vendor = gl.glGetString(GL.GL_VENDOR);
+            if (vendor != null && vendor.startsWith("ATI")) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureCoords.java b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureCoords.java
new file mode 100755
index 000000000..8d8b3679d
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureCoords.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.opengl.util.texture;
+
+/** Specifies texture coordinates for a rectangular area of a
+    texture. Note that some textures are inherently flipped vertically
+    from OpenGL's standard coordinate system. This class takes care of
+    this vertical flip so that the "bottom" and "top" coordinates may
+    sometimes be reversed. From the point of view of code rendering
+    textured polygons, it can always map the bottom and left texture
+    coordinates from the TextureCoords to the lower left point of the
+    textured polygon and achieve correct results. */
+
+public class TextureCoords {
+    // These represent the lower-left point
+    private float left;
+    private float bottom;
+    // These represent the upper-right point
+    private float right;
+    private float top;
+
+    public TextureCoords(float left, float bottom,
+                         float right, float top) {
+        this.left = left;
+        this.bottom = bottom;
+        this.right = right;
+        this.top = top;
+    }
+
+    /** Returns the leftmost (x) texture coordinate of this
+        rectangle. */
+    public float left() { return left; }
+
+    /** Returns the rightmost (x) texture coordinate of this
+        rectangle. */
+    public float right() { return right; }
+
+    /** Returns the bottommost (y) texture coordinate of this
+        rectangle. */
+    public float bottom() { return bottom; }
+
+    /** Returns the topmost (y) texture coordinate of this
+        rectangle. */
+    public float top() { return top; }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureData.java b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureData.java
new file mode 100755
index 000000000..9a28f3316
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureData.java
@@ -0,0 +1,370 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.opengl.util.texture;
+
+import java.nio.*;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.*;
+
+/**
+ * Represents the data for an OpenGL texture. This is separated from
+ * the notion of a Texture to support things like streaming in of
+ * textures in a background thread without requiring an OpenGL context
+ * to be current on that thread.
+ *
+ * @author Chris Campbell
+ * @author Kenneth Russell
+ * @author Sven Gothel
+ */
+
+public class TextureData {
+    protected int width;
+    protected int height;
+    private int border;
+    protected int pixelFormat;
+    protected int pixelType;
+    protected int internalFormat; // perhaps inferred from pixelFormat?
+    protected boolean mipmap; // indicates whether mipmaps should be generated
+    // (ignored if mipmaps are supplied from the file)
+    private boolean dataIsCompressed;
+    protected boolean mustFlipVertically; // Must flip texture coordinates
+    // vertically to get OpenGL output
+    // to look correct
+    protected Buffer buffer; // the actual data...
+    private Buffer[] mipmapData; // ...or a series of mipmaps
+    private Flusher flusher;
+    protected int rowLength;
+    protected int alignment; // 1, 2, or 4 bytes
+    protected int estimatedMemorySize;
+
+    // These booleans are a concession to the AWTTextureData subclass
+    protected boolean haveEXTABGR;
+    protected boolean haveGL12;
+    protected GLProfile glProfile;
+
+    /** 
+     * Constructs a new TextureData object with the specified parameters
+     * and data contained in the given Buffer. The optional Flusher can
+     * be used to clean up native resources associated with this
+     * TextureData when processing is complete; for example, closing of
+     * memory-mapped files that might otherwise require a garbage
+     * collection to reclaim and close.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param internalFormat the OpenGL internal format for the
+     *                       resulting texture; must be specified, may
+     *                       not be 0
+     * @param width          the width in pixels of the texture
+     * @param height         the height in pixels of the texture
+     * @param border         the number of pixels of border this texture
+     *                       data has (0 or 1)
+     * @param pixelFormat    the OpenGL pixel format for the
+     *                       resulting texture; must be specified, may
+     *                       not be 0
+     * @param pixelType      the OpenGL type of the pixels of the texture
+     * @param mipmap         indicates whether mipmaps should be
+     *                       autogenerated (using GLU) for the resulting
+     *                       texture. Currently if mipmap is true then
+     *                       dataIsCompressed may not be true.
+     * @param dataIsCompressed indicates whether the texture data is in
+     *                       compressed form
+     *                       (e.g. GL_COMPRESSED_RGB_S3TC_DXT1_EXT)
+     * @param mustFlipVertically indicates whether the texture
+     *                           coordinates must be flipped vertically
+     *                           in order to properly display the
+     *                           texture
+     * @param buffer         the buffer containing the texture data
+     * @param flusher        optional flusher to perform cleanup tasks
+     *                       upon call to flush()
+     *
+     * @throws IllegalArgumentException if any parameters of the texture
+     *   data were invalid, such as requesting mipmap generation for a
+     *   compressed texture
+     */
+    public TextureData(GLProfile glp, 
+                       int internalFormat,
+                       int width,
+                       int height,
+                       int border,
+                       int pixelFormat,
+                       int pixelType,
+                       boolean mipmap,
+                       boolean dataIsCompressed,
+                       boolean mustFlipVertically,
+                       Buffer buffer,
+                       Flusher flusher) throws IllegalArgumentException {
+        if (mipmap && dataIsCompressed) {
+            throw new IllegalArgumentException("Can not generate mipmaps for compressed textures");
+        }
+
+        this.glProfile = glp;
+        this.width = width;
+        this.height = height;
+        this.border = border;
+        this.pixelFormat = pixelFormat;
+        this.pixelType = pixelType;
+        this.internalFormat = internalFormat;
+        this.mipmap = mipmap;
+        this.dataIsCompressed = dataIsCompressed;
+        this.mustFlipVertically = mustFlipVertically;
+        this.buffer = buffer;
+        this.flusher = flusher;
+        alignment = 1;  // FIXME: is this correct enough in all situations?
+        estimatedMemorySize = estimatedMemorySize(buffer);
+    }
+
+    /** 
+     * Constructs a new TextureData object with the specified parameters
+     * and data for multiple mipmap levels contained in the given array
+     * of Buffers. The optional Flusher can be used to clean up native
+     * resources associated with this TextureData when processing is
+     * complete; for example, closing of memory-mapped files that might
+     * otherwise require a garbage collection to reclaim and close.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param internalFormat the OpenGL internal format for the
+     *                       resulting texture; must be specified, may
+     *                       not be 0
+     * @param width          the width in pixels of the topmost mipmap
+     *                       level of the texture
+     * @param height         the height in pixels of the topmost mipmap
+     *                       level of the texture
+     * @param border         the number of pixels of border this texture
+     *                       data has (0 or 1)
+     * @param pixelFormat    the OpenGL pixel format for the
+     *                       resulting texture; must be specified, may
+     *                       not be 0
+     * @param pixelType      the OpenGL type of the pixels of the texture
+     * @param dataIsCompressed indicates whether the texture data is in
+     *                       compressed form
+     *                       (e.g. GL_COMPRESSED_RGB_S3TC_DXT1_EXT)
+     * @param mustFlipVertically indicates whether the texture
+     *                           coordinates must be flipped vertically
+     *                           in order to properly display the
+     *                           texture
+     * @param mipmapData     the buffers containing all mipmap levels
+     *                       of the texture's data
+     * @param flusher        optional flusher to perform cleanup tasks
+     *                       upon call to flush()
+     *
+     * @throws IllegalArgumentException if any parameters of the texture
+     *   data were invalid, such as requesting mipmap generation for a
+     *   compressed texture
+     */
+    public TextureData(GLProfile glp,
+                       int internalFormat,
+                       int width,
+                       int height,
+                       int border,
+                       int pixelFormat,
+                       int pixelType,
+                       boolean dataIsCompressed,
+                       boolean mustFlipVertically,
+                       Buffer[] mipmapData,
+                       Flusher flusher) throws IllegalArgumentException {
+        this.glProfile = glp;
+        this.width = width;
+        this.height = height;
+        this.border = border;
+        this.pixelFormat = pixelFormat;
+        this.pixelType = pixelType;
+        this.internalFormat = internalFormat;
+        this.dataIsCompressed = dataIsCompressed;
+        this.mustFlipVertically = mustFlipVertically;
+        this.mipmapData = (Buffer[]) mipmapData.clone();
+        this.flusher = flusher;
+        alignment = 1;  // FIXME: is this correct enough in all situations?
+        for (int i = 0; i < mipmapData.length; i++) {
+            estimatedMemorySize += estimatedMemorySize(mipmapData[i]);
+        }
+    }
+
+    /** Used only by subclasses */
+    protected TextureData(GLProfile glp) { this.glProfile = glp; }
+
+    /** Returns the width in pixels of the texture data. */
+    public int getWidth() { return width; }
+    /** Returns the height in pixels of the texture data. */
+    public int getHeight() { return height; }
+    /** Returns the border in pixels of the texture data. */
+    public int getBorder() { 
+        return border; 
+    }
+    /** Returns the intended OpenGL pixel format of the texture data. */
+    public int getPixelFormat() {
+        return pixelFormat;
+    }
+    /** Returns the intended OpenGL pixel type of the texture data. */
+    public int getPixelType() {
+        return pixelType;
+    }
+    /** Returns the intended OpenGL internal format of the texture data. */
+    public int getInternalFormat() { 
+        return internalFormat; 
+    }
+    /** Returns whether mipmaps should be generated for the texture data. */
+    public boolean getMipmap() { 
+        return mipmap; 
+    }
+    /** Indicates whether the texture data is in compressed form. */
+    public boolean isDataCompressed() { 
+        return dataIsCompressed; 
+    }
+    /** Indicates whether the texture coordinates must be flipped
+        vertically for proper display. */
+    public boolean getMustFlipVertically() { 
+        return mustFlipVertically; 
+    }
+    /** Returns the texture data, or null if it is specified as a set of mipmaps. */
+    public Buffer getBuffer() {
+        return buffer;
+    }
+    /** Returns all mipmap levels for the texture data, or null if it is
+        specified as a single image. */
+    public Buffer[] getMipmapData() { 
+        return mipmapData; 
+    }
+    /** Returns the required byte alignment for the texture data. */
+    public int getAlignment() { 
+        return alignment; 
+    }
+    /** Returns the row length needed for correct GL_UNPACK_ROW_LENGTH
+        specification. This is currently only supported for
+        non-mipmapped, non-compressed textures. */
+    public int getRowLength() { 
+        return rowLength; 
+    }
+
+    /** Sets the width in pixels of the texture data. */
+    public void setWidth(int width) { this.width = width; }
+    /** Sets the height in pixels of the texture data. */
+    public void setHeight(int height) { this.height = height; }
+    /** Sets the border in pixels of the texture data. */
+    public void setBorder(int border) { this.border = border; }
+    /** Sets the intended OpenGL pixel format of the texture data. */
+    public void setPixelFormat(int pixelFormat) { this.pixelFormat = pixelFormat; }
+    /** Sets the intended OpenGL pixel type of the texture data. */
+    public void setPixelType(int pixelType) { this.pixelType = pixelType; }
+    /** Sets the intended OpenGL internal format of the texture data. */
+    public void setInternalFormat(int internalFormat) { this.internalFormat = internalFormat; }
+    /** Sets whether mipmaps should be generated for the texture data. */
+    public void setMipmap(boolean mipmap) { this.mipmap = mipmap; }
+    /** Sets whether the texture data is in compressed form. */
+    public void setIsDataCompressed(boolean compressed) { this.dataIsCompressed = compressed; }
+    /** Sets whether the texture coordinates must be flipped vertically
+        for proper display. */
+    public void setMustFlipVertically(boolean mustFlipVertically) { this.mustFlipVertically = mustFlipVertically; }
+    /** Sets the texture data. */
+    public void setBuffer(Buffer buffer) {
+        this.buffer = buffer;
+        estimatedMemorySize = estimatedMemorySize(buffer);
+    }
+    /** Sets the required byte alignment for the texture data. */
+    public void setAlignment(int alignment) { this.alignment = alignment; }
+    /** Sets the row length needed for correct GL_UNPACK_ROW_LENGTH
+        specification. This is currently only supported for
+        non-mipmapped, non-compressed textures. */
+    public void setRowLength(int rowLength) { this.rowLength = rowLength; }
+    /** Indicates to this TextureData whether the GL_EXT_abgr extension
+        is available. Used for optimization along some code paths to
+        avoid data copies. */
+    public void setHaveEXTABGR(boolean haveEXTABGR) {
+        this.haveEXTABGR = haveEXTABGR;
+    }
+    /** Indicates to this TextureData whether OpenGL version 1.2 is
+        available. If not, falls back to relatively inefficient code
+        paths for several input data types (several kinds of packed
+        pixel formats, in particular). */
+    public void setHaveGL12(boolean haveGL12) {
+        this.haveGL12 = haveGL12;
+    }
+
+    /** Returns the GLProfile this texture data is intended and created for. */
+    public GLProfile getGLProfile() { return glProfile; }
+
+    /** Returns an estimate of the amount of memory in bytes this
+        TextureData will consume once uploaded to the graphics card. It
+        should only be treated as an estimate; most applications should
+        not need to query this but instead let the OpenGL implementation
+        page textures in and out as necessary. */
+    public int getEstimatedMemorySize() {
+        return estimatedMemorySize;
+    }
+
+    /** Flushes resources associated with this TextureData by calling
+        Flusher.flush(). */
+    public void flush() {
+        if (flusher != null) {
+            flusher.flush();
+            flusher = null;
+        }
+    }
+
+    /** Calls flush()
+     * @see #flush()
+     */
+    public void destroy() {
+        flush();
+    }
+
+    /** Defines a callback mechanism to allow the user to explicitly
+        deallocate native resources (memory-mapped files, etc.)
+        associated with a particular TextureData. */
+    public static interface Flusher {
+        /** Flushes any native resources associated with this
+            TextureData. */
+        public void flush();
+    }
+
+    public String toString() {
+        return "TextureData["+width+"x"+height+", internFormat "+internalFormat+", pixelFormat "+pixelFormat+", pixelType "+pixelType+", border "+border+", estSize "+estimatedMemorySize+", alignment "+alignment+", rowlen "+rowLength;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    protected static int estimatedMemorySize(Buffer buffer) {
+        if (buffer == null) {
+            return 0;
+        }
+        return buffer.capacity() * BufferUtil.sizeOfBufferElem(buffer);
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp
new file mode 100755
index 000000000..dbd194d21
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp
@@ -0,0 +1,1256 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture;
+
+import java.io.*;
+import java.net.*;
+import java.nio.*;
+import java.util.*;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+import com.jogamp.opengl.impl.Debug;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.spi.*;
+
+/** <P> Provides input and output facilities for both loading OpenGL
+    textures from disk and streams as well as writing textures already
+    in memory back to disk. </P>
+
+    <P> The TextureIO class supports an arbitrary number of plug-in
+    readers and writers via TextureProviders and TextureWriters.
+    TextureProviders know how to produce TextureData objects from
+    files, InputStreams and URLs. TextureWriters know how to write
+    TextureData objects to disk in various file formats. The
+    TextureData class represents the raw data of the texture before it
+    has been converted to an OpenGL texture object. The Texture class
+    represents the OpenGL texture object and provides easy facilities
+    for using the texture. </P>
+
+    <P> There are several built-in TextureProviders and TextureWriters
+    supplied with the TextureIO implementation. The most basic
+    provider uses the platform's Image I/O facilities to read in a
+    BufferedImage and convert it to a texture. This is the baseline
+    provider and is registered so that it is the last one consulted.
+    All others are asked first to open a given file. </P>
+
+    <P> There are three other providers registered by default as of
+    the time of this writing. One handles SGI RGB (".sgi", ".rgb")
+    images from both files and streams. One handles DirectDraw Surface
+    (".dds") images read from files, though can not read these images
+    from streams. One handles Targa (".tga") images read from both
+    files and streams. These providers are executed in an arbitrary
+    order. Some of these providers require the file's suffix to either
+    be specified via the newTextureData methods or for the file to be
+    named with the appropriate suffix. In general a file suffix should
+    be provided to the newTexture and newTextureData methods if at all
+    possible. </P>
+
+    <P> Note that additional TextureProviders, if reading images from
+    InputStreams, must use the mark()/reset() methods on InputStream
+    when probing for e.g. magic numbers at the head of the file to
+    make sure not to disturb the state of the InputStream for
+    downstream TextureProviders. </P>
+
+    <P> There are analogous TextureWriters provided for writing
+    textures back to disk if desired. As of this writing, there are
+    four TextureWriters registered by default: one for Targa files,
+    one for SGI RGB files, one for DirectDraw surface (.dds) files,
+    and one for ImageIO-supplied formats such as .jpg and .png.  Some
+    of these writers have certain limitations such as only being able
+    to write out textures stored in GL_RGB or GL_RGBA format. The DDS
+    writer supports fetching and writing to disk of texture data in
+    DXTn compressed format. Whether this will occur is dependent on
+    whether the texture's internal format is one of the DXTn
+    compressed formats and whether the target file is .dds format.
+*/
+
+public class TextureIO {
+    /** Constant which can be used as a file suffix to indicate a
+        DirectDraw Surface file. */
+    public static final String DDS     = "dds";
+
+    /** Constant which can be used as a file suffix to indicate an SGI
+        RGB file. */
+    public static final String SGI     = "sgi";
+
+    /** Constant which can be used as a file suffix to indicate an SGI
+        RGB file. */
+    public static final String SGI_RGB = "rgb";
+
+    /** Constant which can be used as a file suffix to indicate a GIF
+        file. */
+    public static final String GIF     = "gif";
+
+    /** Constant which can be used as a file suffix to indicate a JPEG
+        file. */
+    public static final String JPG     = "jpg";
+
+    /** Constant which can be used as a file suffix to indicate a PNG
+        file. */
+    public static final String PNG     = "png";
+
+    /** Constant which can be used as a file suffix to indicate a Targa
+        file. */
+    public static final String TGA     = "tga";
+
+    /** Constant which can be used as a file suffix to indicate a TIFF
+        file. */
+    public static final String TIFF    = "tiff";
+
+    private static final boolean DEBUG = Debug.debug("TextureIO");
+
+    // For manually disabling the use of the texture rectangle
+    // extensions so you know the texture target is GL_TEXTURE_2D; this
+    // is useful for shader writers (thanks to Chris Campbell for this
+    // observation)
+    private static boolean texRectEnabled = true;
+
+    //----------------------------------------------------------------------
+    // methods that *do not* require a current context
+    // These methods assume RGB or RGBA textures.
+    // Some texture providers may not recognize the file format unless
+    // the fileSuffix is specified, so it is strongly recommended to
+    // specify it wherever it is known.
+    // Some texture providers may also only support one kind of input,
+    // i.e., reading from a file as opposed to a stream.
+
+    /**
+     * Creates a TextureData from the given file. Does no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param file the file from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @return the texture data from the file, or null if none of the
+     *         registered texture providers could read the file
+     * @throws IOException if an error occurred while reading the file
+     */
+    public static TextureData newTextureData(GLProfile glp, File file,
+                                             boolean mipmap,
+                                             String fileSuffix) throws IOException {
+        if (fileSuffix == null) {
+            fileSuffix = FileUtil.getFileSuffix(file);
+        }
+        return newTextureDataImpl(glp, file, 0, 0, mipmap, fileSuffix);
+    }
+
+    /**
+     * Creates a TextureData from the given stream. Does no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param stream the stream from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @return the texture data from the stream, or null if none of the
+     *         registered texture providers could read the stream
+     * @throws IOException if an error occurred while reading the stream
+     */
+    public static TextureData newTextureData(GLProfile glp, InputStream stream,
+                                             boolean mipmap,
+                                             String fileSuffix) throws IOException {
+        return newTextureDataImpl(glp, stream, 0, 0, mipmap, fileSuffix);
+    }
+
+    /**
+     * Creates a TextureData from the given URL. Does no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param url the URL from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @return the texture data from the URL, or null if none of the
+     *         registered texture providers could read the URL
+     * @throws IOException if an error occurred while reading the URL
+     */
+    public static TextureData newTextureData(GLProfile glp, URL url,
+                                             boolean mipmap,
+                                             String fileSuffix) throws IOException {
+        if (fileSuffix == null) {
+            fileSuffix = FileUtil.getFileSuffix(url.getPath());
+        }
+        return newTextureDataImpl(glp, url, 0, 0, mipmap, fileSuffix);
+    }
+
+    //----------------------------------------------------------------------
+    // These methods make no assumption about the OpenGL internal format
+    // or pixel format of the texture; they must be specified by the
+    // user. It is not allowed to supply 0 (indicating no preference)
+    // for either the internalFormat or the pixelFormat;
+    // IllegalArgumentException will be thrown in this case.
+
+    /**
+     * Creates a TextureData from the given file, using the specified
+     * OpenGL internal format and pixel format for the texture which
+     * will eventually result. The internalFormat and pixelFormat must
+     * be specified and may not be zero; to use default values, use the
+     * variant of this method which does not take these arguments. Does
+     * no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param file the file from which to read the texture data
+     * @param internalFormat the OpenGL internal format of the texture
+     *                   which will eventually result from the TextureData
+     * @param pixelFormat the OpenGL pixel format of the texture
+     *                    which will eventually result from the TextureData
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @return the texture data from the file, or null if none of the
+     *         registered texture providers could read the file
+     * @throws IllegalArgumentException if either internalFormat or
+     *                                  pixelFormat was 0
+     * @throws IOException if an error occurred while reading the file
+     */
+    public static TextureData newTextureData(GLProfile glp, File file,
+                                             int internalFormat,
+                                             int pixelFormat,
+                                             boolean mipmap,
+                                             String fileSuffix) throws IOException, IllegalArgumentException {
+        if ((internalFormat == 0) || (pixelFormat == 0)) {
+            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
+        }
+
+        if (fileSuffix == null) {
+            fileSuffix = FileUtil.getFileSuffix(file);
+        }
+
+        return newTextureDataImpl(glp, file, internalFormat, pixelFormat, mipmap, fileSuffix);
+    }
+
+    /**
+     * Creates a TextureData from the given stream, using the specified
+     * OpenGL internal format and pixel format for the texture which
+     * will eventually result. The internalFormat and pixelFormat must
+     * be specified and may not be zero; to use default values, use the
+     * variant of this method which does not take these arguments. Does
+     * no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param stream the stream from which to read the texture data
+     * @param internalFormat the OpenGL internal format of the texture
+     *                   which will eventually result from the TextureData
+     * @param pixelFormat the OpenGL pixel format of the texture
+     *                    which will eventually result from the TextureData
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @return the texture data from the stream, or null if none of the
+     *         registered texture providers could read the stream
+     * @throws IllegalArgumentException if either internalFormat or
+     *                                  pixelFormat was 0
+     * @throws IOException if an error occurred while reading the stream
+     */
+    public static TextureData newTextureData(GLProfile glp, InputStream stream,
+                                             int internalFormat,
+                                             int pixelFormat,
+                                             boolean mipmap,
+                                             String fileSuffix) throws IOException, IllegalArgumentException {
+        if ((internalFormat == 0) || (pixelFormat == 0)) {
+            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
+        }
+
+        return newTextureDataImpl(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+    }
+
+    /**
+     * Creates a TextureData from the given URL, using the specified
+     * OpenGL internal format and pixel format for the texture which
+     * will eventually result. The internalFormat and pixelFormat must
+     * be specified and may not be zero; to use default values, use the
+     * variant of this method which does not take these arguments. Does
+     * no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param url the URL from which to read the texture data
+     * @param internalFormat the OpenGL internal format of the texture
+     *                   which will eventually result from the TextureData
+     * @param pixelFormat the OpenGL pixel format of the texture
+     *                    which will eventually result from the TextureData
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @return the texture data from the URL, or null if none of the
+     *         registered texture providers could read the URL
+     * @throws IllegalArgumentException if either internalFormat or
+     *                                  pixelFormat was 0
+     * @throws IOException if an error occurred while reading the URL
+     */
+    public static TextureData newTextureData(GLProfile glp, URL url,
+                                             int internalFormat,
+                                             int pixelFormat,
+                                             boolean mipmap,
+                                             String fileSuffix) throws IOException, IllegalArgumentException {
+        if ((internalFormat == 0) || (pixelFormat == 0)) {
+            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
+        }
+
+        if (fileSuffix == null) {
+            fileSuffix = FileUtil.getFileSuffix(url.getPath());
+        }
+
+        return newTextureDataImpl(glp, url, internalFormat, pixelFormat, mipmap, fileSuffix);
+    }
+
+    //----------------------------------------------------------------------
+    // methods that *do* require a current context
+    //
+
+    /** 
+     * Creates an OpenGL texture object from the specified TextureData
+     * using the current OpenGL context.
+     *
+     * @param data the texture data to turn into an OpenGL texture
+     * @throws GLException if no OpenGL context is current or if an
+     *                     OpenGL error occurred
+     * @throws IllegalArgumentException if the passed TextureData was null
+     */
+    public static Texture newTexture(TextureData data) throws GLException, IllegalArgumentException {
+        if (data == null) {
+            throw new IllegalArgumentException("Null TextureData");
+        }
+        return new Texture(data);
+    }
+
+    /** 
+     * Creates an OpenGL texture object from the specified file using
+     * the current OpenGL context.
+     *
+     * @param file the file from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @throws IOException if an error occurred while reading the file
+     * @throws GLException if no OpenGL context is current or if an
+     *                     OpenGL error occurred
+     */
+    public static Texture newTexture(File file, boolean mipmap) throws IOException, GLException {
+        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        TextureData data = newTextureData(glp, file, mipmap, FileUtil.getFileSuffix(file));
+        Texture texture = newTexture(data);
+        data.flush();
+        return texture;
+    }
+
+    /** 
+     * Creates an OpenGL texture object from the specified stream using
+     * the current OpenGL context.
+     *
+     * @param stream the stream from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @throws IOException if an error occurred while reading the stream
+     * @throws GLException if no OpenGL context is current or if an
+     *                     OpenGL error occurred
+     */
+    public static Texture newTexture(InputStream stream, boolean mipmap, String fileSuffix) throws IOException, GLException {
+        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        TextureData data = newTextureData(glp, stream, mipmap, fileSuffix);
+        Texture texture = newTexture(data);
+        data.flush();
+        return texture;
+    }
+
+    /** 
+     * Creates an OpenGL texture object from the specified URL using the
+     * current OpenGL context.
+     *
+     * @param url the URL from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @throws IOException if an error occurred while reading the URL
+     * @throws GLException if no OpenGL context is current or if an
+     *                     OpenGL error occurred
+     */
+    public static Texture newTexture(URL url, boolean mipmap, String fileSuffix) throws IOException, GLException {
+        if (fileSuffix == null) {
+            fileSuffix = FileUtil.getFileSuffix(url.getPath());
+        }
+        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        TextureData data = newTextureData(glp, url, mipmap, fileSuffix);
+        Texture texture = newTexture(data);
+        data.flush();
+        return texture;
+    }
+
+    /** 
+     * Creates an OpenGL texture object associated with the given OpenGL
+     * texture target using the current OpenGL context. The texture has
+     * no initial data. This is used, for example, to construct cube
+     * maps out of multiple TextureData objects.
+     *
+     * @param target the OpenGL target type, eg GL.GL_TEXTURE_2D, 
+     *               GL.GL_TEXTURE_RECTANGLE_ARB
+     *
+     * @throws GLException if no OpenGL context is current or if an
+     *                     OpenGL error occurred
+     */
+    public static Texture newTexture(int target) throws GLException {
+        return new Texture(target);
+    }
+
+    /**
+     * Wraps an OpenGL texture ID from an external library and allows
+     * some of the base methods from the Texture class, such as
+     * binding and querying of texture coordinates, to be used with
+     * it. Attempts to update such textures' contents will yield
+     * undefined results.
+     *
+     * @param textureID the OpenGL texture object to wrap
+     * @param target the OpenGL texture target, eg GL.GL_TEXTURE_2D, 
+     *               GL2.GL_TEXTURE_RECTANGLE
+     * @param texWidth the width of the texture in pixels
+     * @param texHeight the height of the texture in pixels
+     * @param imgWidth the width of the image within the texture in
+     *          pixels (if the content is a sub-rectangle in the upper
+     *          left corner); otherwise, pass in texWidth
+     * @param imgHeight the height of the image within the texture in
+     *          pixels (if the content is a sub-rectangle in the upper
+     *          left corner); otherwise, pass in texHeight
+     * @param mustFlipVertically indicates whether the texture
+     *                           coordinates must be flipped vertically
+     *                           in order to properly display the
+     *                           texture
+     */
+    public static Texture newTexture(int textureID,
+				     int target,
+				     int texWidth,
+				     int texHeight,
+				     int imgWidth,
+				     int imgHeight,
+				     boolean mustFlipVertically) {
+	return new Texture(textureID,
+			   target,
+			   texWidth,
+			   texHeight,
+			   imgWidth,
+			   imgHeight,
+			   mustFlipVertically);
+    }
+
+    /**
+     * Writes the given texture to a file. The type of the file is
+     * inferred from its suffix. An OpenGL context must be current in
+     * order to fetch the texture data back from the OpenGL pipeline.
+     * This method causes the specified Texture to be bound to the
+     * GL_TEXTURE_2D state. If no suitable writer for the requested file
+     * format was found, throws an IOException. <P>
+     *
+     * Reasonable attempts are made to produce good results in the
+     * resulting images. The Targa, SGI and ImageIO writers produce
+     * results in the correct vertical orientation for those file
+     * formats. The DDS writer performs no vertical flip of the data,
+     * even in uncompressed mode. (It is impossible to perform such a
+     * vertical flip with compressed data.) Applications should keep
+     * this in mind when using this routine to save textures to disk for
+     * later re-loading. <P>
+     *
+     * Any mipmaps for the specified texture are currently discarded
+     * when it is written to disk, regardless of whether the underlying
+     * file format supports multiple mipmaps in a given file.
+     *
+     * @throws IOException if an error occurred during writing or no
+     *   suitable writer was found
+     * @throws GLException if no OpenGL context was current or an
+     *   OpenGL-related error occurred
+     */
+    public static void write(Texture texture, File file) throws IOException, GLException {
+        if (texture.getTarget() != GL.GL_TEXTURE_2D) {
+            throw new GLException("Only GL_TEXTURE_2D textures are supported");
+        }
+
+        // First fetch the texture data
+        GL _gl = GLContext.getCurrentGL();
+        if (!_gl.isGL2()) {
+            throw new GLException("Only GL2 supports fetching compressed images, GL: " + _gl);
+        }
+        GL2 gl = _gl.getGL2();
+
+        texture.bind();
+        int internalFormat = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_INTERNAL_FORMAT);
+        int width  = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_WIDTH);
+        int height = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_HEIGHT);
+        int border = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_BORDER);
+        TextureData data = null;
+        if (internalFormat == GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT ||
+            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ||
+            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ||
+            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT) {
+            // Fetch using glGetCompressedTexImage
+            int size   = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_COMPRESSED_IMAGE_SIZE);
+            ByteBuffer res = ByteBuffer.wrap(new byte[size]);
+            gl.glGetCompressedTexImage(GL.GL_TEXTURE_2D, 0, res);
+            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, internalFormat, GL.GL_UNSIGNED_BYTE,
+                                   false, true, true, res, null);
+        } else {
+            int bytesPerPixel = 0;
+            int fetchedFormat = 0;
+            switch (internalFormat) {
+            case GL.GL_RGB:
+            case GL2.GL_BGR:
+            case GL.GL_RGB8:
+                bytesPerPixel = 3;
+                fetchedFormat = GL.GL_RGB;
+                break;
+            case GL.GL_RGBA:
+            case GL2.GL_BGRA:
+            case GL2.GL_ABGR_EXT:
+            case GL.GL_RGBA8:
+                bytesPerPixel = 4;
+                fetchedFormat = GL.GL_RGBA;
+                break;
+            default:
+                throw new IOException("Unsupported texture internal format 0x" + Integer.toHexString(internalFormat));
+            }
+
+            // Fetch using glGetTexImage
+            int packAlignment  = glGetInteger(GL.GL_PACK_ALIGNMENT);
+            int packRowLength  = glGetInteger(GL2.GL_PACK_ROW_LENGTH);
+            int packSkipRows   = glGetInteger(GL2.GL_PACK_SKIP_ROWS);
+            int packSkipPixels = glGetInteger(GL2.GL_PACK_SKIP_PIXELS);
+            int packSwapBytes  = glGetInteger(GL2.GL_PACK_SWAP_BYTES);
+
+            gl.glPixelStorei(GL.GL_PACK_ALIGNMENT, 1);
+            gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, 0);
+            gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, 0);
+            gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, 0);
+            gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, 0);
+
+            ByteBuffer res = ByteBuffer.wrap(new byte[(width + (2 * border)) *
+                                                      (height + (2 * border)) *
+                                                      bytesPerPixel]);
+            if (DEBUG) {
+                System.out.println("Allocated buffer of size " + res.remaining() + " for fetched image (" +
+                                   ((fetchedFormat == GL.GL_RGB) ? "GL_RGB" : "GL_RGBA") + ")");
+            }
+            gl.glGetTexImage(GL.GL_TEXTURE_2D, 0, fetchedFormat, GL.GL_UNSIGNED_BYTE, res);
+
+            gl.glPixelStorei(GL.GL_PACK_ALIGNMENT, packAlignment);
+            gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, packRowLength);
+            gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, packSkipRows);
+            gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, packSkipPixels);
+            gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, packSwapBytes);
+      
+            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, fetchedFormat, GL.GL_UNSIGNED_BYTE,
+                                   false, false, false, res, null);
+
+            if (DEBUG) {
+                System.out.println("data.getPixelFormat() = " +
+                                   ((data.getPixelFormat() == GL.GL_RGB) ? "GL_RGB" : "GL_RGBA"));
+            }
+        }
+
+        write(data, file);
+    }
+  
+    public static void write(TextureData data, File file) throws IOException, GLException {
+        for (Iterator iter = textureWriters.iterator(); iter.hasNext(); ) {
+            TextureWriter writer = (TextureWriter) iter.next();
+            if (writer.write(file, data)) {
+                return;
+            }
+        }
+
+        throw new IOException("No suitable texture writer found for "+file.getAbsolutePath());
+    }
+
+    //----------------------------------------------------------------------
+    // SPI support
+    //
+
+    /** Adds a TextureProvider to support reading of a new file
+        format. */
+    public static void addTextureProvider(TextureProvider provider) {
+        // Must always add at the front so the ImageIO provider is last,
+        // so we don't accidentally use it instead of a user's possibly
+        // more optimal provider
+        textureProviders.add(0, provider);
+    }
+
+    /** Adds a TextureWriter to support writing of a new file
+        format. */
+    public static void addTextureWriter(TextureWriter writer) {
+        // Must always add at the front so the ImageIO writer is last,
+        // so we don't accidentally use it instead of a user's possibly
+        // more optimal writer
+        textureWriters.add(0, writer);
+    }
+
+    //---------------------------------------------------------------------------
+    // Global disabling of texture rectangle extension
+    //
+
+    /** Toggles the use of the GL_ARB_texture_rectangle extension by the
+        TextureIO classes. By default, on hardware supporting this
+        extension, the TextureIO classes may use the
+        GL_ARB_texture_rectangle extension for non-power-of-two
+        textures. (If the hardware supports the
+        GL_ARB_texture_non_power_of_two extension, that one is
+        preferred.) In some situations, for example when writing
+        shaders, it is advantageous to force the texture target to
+        always be GL_TEXTURE_2D in order to have one version of the
+        shader, even at the expense of texture memory in the case where
+        NPOT textures are not supported. This method allows the use of
+        the GL_ARB_texture_rectangle extension to be turned off globally
+        for this purpose. The default is that the use of the extension
+        is enabled. */
+    public static void setTexRectEnabled(boolean enabled) {
+        texRectEnabled = enabled;
+    }
+
+    /** Indicates whether the GL_ARB_texture_rectangle extension is
+        allowed to be used for non-power-of-two textures; see {@link
+        #setTexRectEnabled setTexRectEnabled}. */
+    public static boolean isTexRectEnabled() {
+        return texRectEnabled;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    private static List/*<TextureProvider>*/ textureProviders = new ArrayList/*<TextureProvider>*/();
+    private static List/*<TextureWriter>*/   textureWriters   = new ArrayList/*<TextureWriter>*/();
+
+    static {
+        /*
+        if(GLProfile.isAWTJOGLAvailable()) {
+            // ImageIO provider, the fall-back, must be the first one added
+            try {
+                // Use reflection to avoid compile-time dependencies on AWT-related classes
+                TextureProvider provider = (TextureProvider)
+                    Class.forName("com.jogamp.opengl.util.texture.spi.awt.IIOTextureProvider").newInstance();
+                addTextureProvider(provider);
+            } catch (Exception e) {
+                if (DEBUG) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        */
+
+        // Other special-case providers
+        addTextureProvider(new DDSTextureProvider());
+        addTextureProvider(new SGITextureProvider());
+        addTextureProvider(new TGATextureProvider());
+
+        /*
+        // ImageIO writer, the fall-back, must be the first one added
+        if(GLProfile.isAWTJOGLAvailable()) {
+            try {
+                // Use reflection to avoid compile-time dependencies on AWT-related classes
+                TextureWriter writer = (TextureWriter)
+                    Class.forName("com.jogamp.opengl.util.texture.spi.awt.IIOTextureWriter").newInstance();
+                addTextureWriter(writer);
+            } catch (Exception e) {
+                if (DEBUG) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        */
+
+        // Other special-case writers
+        addTextureWriter(new DDSTextureWriter());
+        addTextureWriter(new SGITextureWriter());
+        addTextureWriter(new TGATextureWriter());
+        addTextureWriter(new NetPbmTextureWriter());
+    }
+
+    // Implementation methods
+    private static TextureData newTextureDataImpl(GLProfile glp, File file,
+                                                  int internalFormat,
+                                                  int pixelFormat,
+                                                  boolean mipmap,
+                                                  String fileSuffix) throws IOException {
+        if (file == null) {
+            throw new IOException("File was null");
+        }
+
+        fileSuffix = toLowerCase(fileSuffix);
+
+        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
+            TextureProvider provider = (TextureProvider) iter.next();
+            TextureData data = provider.newTextureData(glp, file,
+                                                       internalFormat,
+                                                       pixelFormat,
+                                                       mipmap,
+                                                       fileSuffix);
+            if (data != null) {
+                return data;
+            }
+        }
+
+        throw new IOException("No suitable reader for given file "+file.getAbsolutePath());
+    }
+
+    private static TextureData newTextureDataImpl(GLProfile glp, InputStream stream,
+                                                  int internalFormat,
+                                                  int pixelFormat,
+                                                  boolean mipmap,
+                                                  String fileSuffix) throws IOException {
+        if (stream == null) {
+            throw new IOException("Stream was null");
+        }
+
+        fileSuffix = toLowerCase(fileSuffix);
+
+        // Note: use of BufferedInputStream works around 4764639/4892246
+        if (!(stream instanceof BufferedInputStream)) {
+            stream = new BufferedInputStream(stream);
+        }
+
+        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
+            TextureProvider provider = (TextureProvider) iter.next();
+            TextureData data = provider.newTextureData(glp, stream,
+                                                       internalFormat,
+                                                       pixelFormat,
+                                                       mipmap,
+                                                       fileSuffix);
+            if (data != null) {
+                return data;
+            }
+        }
+
+        throw new IOException("No suitable reader for given stream");
+    }
+
+    private static TextureData newTextureDataImpl(GLProfile glp, URL url,
+                                                  int internalFormat,
+                                                  int pixelFormat,
+                                                  boolean mipmap,
+                                                  String fileSuffix) throws IOException {
+        if (url == null) {
+            throw new IOException("URL was null");
+        }
+
+        fileSuffix = toLowerCase(fileSuffix);
+
+        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
+            TextureProvider provider = (TextureProvider) iter.next();
+            TextureData data = provider.newTextureData(glp, url,
+                                                       internalFormat,
+                                                       pixelFormat,
+                                                       mipmap,
+                                                       fileSuffix);
+            if (data != null) {
+                return data;
+            }
+        }
+
+        throw new IOException("No suitable reader for given URL "+url);
+    }
+
+    //----------------------------------------------------------------------
+    // DDS provider -- supports files only for now
+    static class DDSTextureProvider implements TextureProvider {
+        public TextureData newTextureData(GLProfile glp, File file,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            if (DDS.equals(fileSuffix) ||
+                DDS.equals(FileUtil.getFileSuffix(file))) {
+                DDSImage image = DDSImage.read(file);
+                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
+            }
+
+            return null;
+        }
+
+        public TextureData newTextureData(GLProfile glp, InputStream stream,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            if (DDS.equals(fileSuffix) ||
+                DDSImage.isDDSImage(stream)) {
+                DDSImage image = DDSImage.read(stream);
+                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
+            }
+
+            return null;
+        }
+
+        public TextureData newTextureData(GLProfile glp, URL url,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            InputStream stream = new BufferedInputStream(url.openStream());
+            try {
+                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+            } finally {
+                stream.close();
+            }
+        }
+
+        private TextureData newTextureData(GLProfile glp, final DDSImage image,
+                                           int internalFormat,
+                                           int pixelFormat,
+                                           boolean mipmap) {
+            DDSImage.ImageInfo info = image.getMipMap(0);
+            if (pixelFormat == 0) {
+                switch (image.getPixelFormat()) {
+                case DDSImage.D3DFMT_R8G8B8:
+                    pixelFormat = GL.GL_RGB;
+                    break;
+                default:
+                    pixelFormat = GL.GL_RGBA;
+                    break;
+                }
+            }
+            if (info.isCompressed()) {
+                switch (info.getCompressionFormat()) {
+                case DDSImage.D3DFMT_DXT1:
+                    internalFormat = GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
+                    break;
+                case DDSImage.D3DFMT_DXT3:
+                    internalFormat = GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+                    break;
+                case DDSImage.D3DFMT_DXT5:
+                    internalFormat = GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+                    break;
+                default:
+                    throw new RuntimeException("Unsupported DDS compression format \"" +
+                                               DDSImage.getCompressionFormatName(info.getCompressionFormat()) + "\"");
+                }
+            }
+            if (internalFormat == 0) {
+                switch (image.getPixelFormat()) {
+                case DDSImage.D3DFMT_R8G8B8:
+                    pixelFormat = GL.GL_RGB;
+                    break;
+                default:
+                    pixelFormat = GL.GL_RGBA;
+                    break;
+                }
+            }
+            TextureData.Flusher flusher = new TextureData.Flusher() {
+                    public void flush() {
+                        image.close();
+                    }
+                };
+            TextureData data;
+            if (mipmap && image.getNumMipMaps() > 0) {
+                Buffer[] mipmapData = new Buffer[image.getNumMipMaps()];
+                for (int i = 0; i < image.getNumMipMaps(); i++) {
+                    mipmapData[i] = image.getMipMap(i).getData();
+                }
+                data = new TextureData(glp, internalFormat,
+                                       info.getWidth(),
+                                       info.getHeight(),
+                                       0,
+                                       pixelFormat,
+                                       GL.GL_UNSIGNED_BYTE,
+                                       info.isCompressed(),
+                                       true,
+                                       mipmapData,
+                                       flusher);
+            } else {
+                // Fix this up for the end user because we can't generate
+                // mipmaps for compressed textures
+                mipmap = false;
+                data = new TextureData(glp, internalFormat,
+                                       info.getWidth(),
+                                       info.getHeight(),
+                                       0,
+                                       pixelFormat,
+                                       GL.GL_UNSIGNED_BYTE,
+                                       mipmap,
+                                       info.isCompressed(),
+                                       true,
+                                       info.getData(),
+                                       flusher);
+            }
+            return data;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // Base class for SGI RGB and TGA image providers
+    static abstract class StreamBasedTextureProvider implements TextureProvider {
+        public TextureData newTextureData(GLProfile glp, File file,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            InputStream inStream = new BufferedInputStream(new FileInputStream(file));
+            try {
+                // The SGIImage and TGAImage implementations use InputStreams
+                // anyway so there isn't much point in having a separate code
+                // path for files
+                return newTextureData(glp, inStream,
+                                      internalFormat,
+                                      pixelFormat,
+                                      mipmap,
+                                      ((fileSuffix != null) ? fileSuffix : FileUtil.getFileSuffix(file)));
+            } finally {
+                inStream.close();
+            }
+        }
+
+        public TextureData newTextureData(GLProfile glp, URL url,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            InputStream stream = new BufferedInputStream(url.openStream());
+            try {
+                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+            } finally {
+                stream.close();
+            }
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // SGI RGB image provider
+    static class SGITextureProvider extends StreamBasedTextureProvider {
+        public TextureData newTextureData(GLProfile glp, InputStream stream,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            if (SGI.equals(fileSuffix) ||
+                SGI_RGB.equals(fileSuffix) ||
+                SGIImage.isSGIImage(stream)) {
+                SGIImage image = SGIImage.read(stream);
+                if (pixelFormat == 0) {
+                    pixelFormat = image.getFormat();
+                }
+                if (internalFormat == 0) {
+                    internalFormat = image.getFormat();
+                }
+                return new TextureData(glp, internalFormat,
+                                       image.getWidth(),
+                                       image.getHeight(),
+                                       0,
+                                       pixelFormat,
+                                       GL.GL_UNSIGNED_BYTE,
+                                       mipmap,
+                                       false,
+                                       false,
+                                       ByteBuffer.wrap(image.getData()),
+                                       null);
+            }
+
+            return null;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // TGA (Targa) image provider
+    static class TGATextureProvider extends StreamBasedTextureProvider {
+        public TextureData newTextureData(GLProfile glp, InputStream stream,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            if (TGA.equals(fileSuffix)) {
+                TGAImage image = TGAImage.read(stream);
+                if (pixelFormat == 0) {
+                    pixelFormat = image.getGLFormat();
+                }
+                if (internalFormat == 0) {
+                    GL gl = GLContext.getCurrentGL();
+                    if(gl.isGL2()) {
+                        internalFormat = GL.GL_RGBA8;
+                    } else {
+                        internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB;
+                    }
+                }
+                return new TextureData(glp, internalFormat,
+                                       image.getWidth(),
+                                       image.getHeight(),
+                                       0,
+                                       pixelFormat,
+                                       GL.GL_UNSIGNED_BYTE,
+                                       mipmap,
+                                       false,
+                                       false,
+                                       image.getData(),
+                                       null);
+            }
+
+            return null;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // DDS texture writer
+    //
+    static class DDSTextureWriter implements TextureWriter {
+        public boolean write(File file,
+                             TextureData data) throws IOException {
+            if (DDS.equals(FileUtil.getFileSuffix(file))) {
+                // See whether the DDS writer can handle this TextureData
+                int pixelFormat = data.getPixelFormat();
+                int pixelType   = data.getPixelType();
+                if (pixelType != GL.GL_BYTE &&
+                    pixelType != GL.GL_UNSIGNED_BYTE) {
+                    throw new IOException("DDS writer only supports byte / unsigned byte textures");
+                }
+
+                int d3dFormat = 0;
+                // FIXME: some of these are probably not completely correct and would require swizzling
+                switch (pixelFormat) {
+                case GL.GL_RGB:                        d3dFormat = DDSImage.D3DFMT_R8G8B8; break;
+                case GL.GL_RGBA:                       d3dFormat = DDSImage.D3DFMT_A8R8G8B8; break;
+                case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:  d3dFormat = DDSImage.D3DFMT_DXT1; break;
+                case GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: throw new IOException("RGBA DXT1 not yet supported");
+                case GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: d3dFormat = DDSImage.D3DFMT_DXT3; break;
+                case GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: d3dFormat = DDSImage.D3DFMT_DXT5; break;
+                default: throw new IOException("Unsupported pixel format 0x" + Integer.toHexString(pixelFormat) + " by DDS writer");
+                }
+        
+                ByteBuffer[] mipmaps = null;
+                if (data.getMipmapData() != null) {
+                    mipmaps = new ByteBuffer[data.getMipmapData().length];
+                    for (int i = 0; i < mipmaps.length; i++) {
+                        mipmaps[i] = (ByteBuffer) data.getMipmapData()[i];
+                    }
+                } else {
+                    mipmaps = new ByteBuffer[] { (ByteBuffer) data.getBuffer() };
+                }
+
+                DDSImage image = DDSImage.createFromData(d3dFormat,
+                                                         data.getWidth(),
+                                                         data.getHeight(),
+                                                         mipmaps);
+                image.write(file);
+                return true;
+            }
+
+            return false;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // SGI (rgb) texture writer
+    //
+    static class SGITextureWriter implements TextureWriter {
+        public boolean write(File file,
+                             TextureData data) throws IOException {
+            String fileSuffix = FileUtil.getFileSuffix(file);
+            if (SGI.equals(fileSuffix) ||
+                SGI_RGB.equals(fileSuffix)) {
+                // See whether the SGI writer can handle this TextureData
+                int pixelFormat = data.getPixelFormat();
+                int pixelType   = data.getPixelType();
+                if ((pixelFormat == GL.GL_RGB ||
+                     pixelFormat == GL.GL_RGBA) &&
+                    (pixelType == GL.GL_BYTE ||
+                     pixelType == GL.GL_UNSIGNED_BYTE)) {
+                    ByteBuffer buf = ((data.getBuffer() != null) ?
+                                      (ByteBuffer) data.getBuffer() :
+                                      (ByteBuffer) data.getMipmapData()[0]);
+                    byte[] bytes;
+                    if (buf.hasArray()) {
+                        bytes = buf.array();
+                    } else {
+                        buf.rewind();
+                        bytes = new byte[buf.remaining()];
+                        buf.get(bytes);
+                        buf.rewind();
+                    }
+
+                    SGIImage image = SGIImage.createFromData(data.getWidth(),
+                                                             data.getHeight(),
+                                                             (pixelFormat == GL.GL_RGBA),
+                                                             bytes);
+                    image.write(file, false);
+                    return true;
+                }
+
+                throw new IOException("SGI writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
+            }
+
+            return false;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // TGA (Targa) texture writer
+  
+    static class TGATextureWriter implements TextureWriter {
+        public boolean write(File file,
+                             TextureData data) throws IOException {
+            if (TGA.equals(FileUtil.getFileSuffix(file))) {
+                // See whether the TGA writer can handle this TextureData
+                int pixelFormat = data.getPixelFormat();
+                int pixelType   = data.getPixelType();
+                if ((pixelFormat == GL.GL_RGB ||
+                     pixelFormat == GL.GL_RGBA) &&
+                    (pixelType == GL.GL_BYTE ||
+                     pixelType == GL.GL_UNSIGNED_BYTE)) {
+                    ByteBuffer buf = ((data.getBuffer() != null) ?
+                                      (ByteBuffer) data.getBuffer() :
+                                      (ByteBuffer) data.getMipmapData()[0]);
+                    // Must reverse order of red and blue channels to get correct results
+                    int skip = ((pixelFormat == GL.GL_RGB) ? 3 : 4);
+                    for (int i = 0; i < buf.remaining(); i += skip) {
+                        byte red  = buf.get(i + 0);
+                        byte blue = buf.get(i + 2);
+                        buf.put(i + 0, blue);
+                        buf.put(i + 2, red);
+                    }
+
+                    TGAImage image = TGAImage.createFromData(data.getWidth(),
+                                                             data.getHeight(),
+                                                             (pixelFormat == GL.GL_RGBA),
+                                                             false,
+                                                             ((data.getBuffer() != null) ?
+                                                              (ByteBuffer) data.getBuffer() :
+                                                              (ByteBuffer) data.getMipmapData()[0]));
+                    image.write(file);
+                    return true;
+                }
+
+                throw new IOException("TGA writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
+            }
+
+            return false;
+        }    
+    }
+
+    //----------------------------------------------------------------------
+    // Helper routines
+    //
+
+    private static int glGetInteger(int pname) {
+        int[] tmp = new int[1];
+        GL gl = GLContext.getCurrentGL();
+        gl.glGetIntegerv(pname, tmp, 0);
+        return tmp[0];
+    }
+
+    private static int glGetTexLevelParameteri(GL2 gl, int target, int level, int pname) {
+        int[] tmp = new int[1];
+        gl.glGetTexLevelParameteriv(target, 0, pname, tmp, 0);
+        return tmp[0];
+    }
+
+    private static String toLowerCase(String arg) {
+        if (arg == null) {
+            return null;
+        }
+
+        return arg.toLowerCase();
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase
new file mode 100755
index 000000000..3e6f66f10
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase
@@ -0,0 +1,1258 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture;
+
+import java.io.*;
+import java.net.*;
+import java.nio.*;
+import java.util.*;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+import com.jogamp.opengl.impl.Debug;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.spi.*;
+
+/** <P> Provides input and output facilities for both loading OpenGL
+    textures from disk and streams as well as writing textures already
+    in memory back to disk. </P>
+
+    <P> The TextureIO class supports an arbitrary number of plug-in
+    readers and writers via TextureProviders and TextureWriters.
+    TextureProviders know how to produce TextureData objects from
+    files, InputStreams and URLs. TextureWriters know how to write
+    TextureData objects to disk in various file formats. The
+    TextureData class represents the raw data of the texture before it
+    has been converted to an OpenGL texture object. The Texture class
+    represents the OpenGL texture object and provides easy facilities
+    for using the texture. </P>
+
+    <P> There are several built-in TextureProviders and TextureWriters
+    supplied with the TextureIO implementation. The most basic
+    provider uses the platform's Image I/O facilities to read in a
+    BufferedImage and convert it to a texture. This is the baseline
+    provider and is registered so that it is the last one consulted.
+    All others are asked first to open a given file. </P>
+
+    <P> There are three other providers registered by default as of
+    the time of this writing. One handles SGI RGB (".sgi", ".rgb")
+    images from both files and streams. One handles DirectDraw Surface
+    (".dds") images read from files, though can not read these images
+    from streams. One handles Targa (".tga") images read from both
+    files and streams. These providers are executed in an arbitrary
+    order. Some of these providers require the file's suffix to either
+    be specified via the newTextureData methods or for the file to be
+    named with the appropriate suffix. In general a file suffix should
+    be provided to the newTexture and newTextureData methods if at all
+    possible. </P>
+
+    <P> Note that additional TextureProviders, if reading images from
+    InputStreams, must use the mark()/reset() methods on InputStream
+    when probing for e.g. magic numbers at the head of the file to
+    make sure not to disturb the state of the InputStream for
+    downstream TextureProviders. </P>
+
+    <P> There are analogous TextureWriters provided for writing
+    textures back to disk if desired. As of this writing, there are
+    four TextureWriters registered by default: one for Targa files,
+    one for SGI RGB files, one for DirectDraw surface (.dds) files,
+    and one for ImageIO-supplied formats such as .jpg and .png.  Some
+    of these writers have certain limitations such as only being able
+    to write out textures stored in GL_RGB or GL_RGBA format. The DDS
+    writer supports fetching and writing to disk of texture data in
+    DXTn compressed format. Whether this will occur is dependent on
+    whether the texture's internal format is one of the DXTn
+    compressed formats and whether the target file is .dds format.
+*/
+
+public class TextureIO {
+    /** Constant which can be used as a file suffix to indicate a
+        DirectDraw Surface file. */
+    public static final String DDS     = "dds";
+
+    /** Constant which can be used as a file suffix to indicate an SGI
+        RGB file. */
+    public static final String SGI     = "sgi";
+
+    /** Constant which can be used as a file suffix to indicate an SGI
+        RGB file. */
+    public static final String SGI_RGB = "rgb";
+
+    /** Constant which can be used as a file suffix to indicate a GIF
+        file. */
+    public static final String GIF     = "gif";
+
+    /** Constant which can be used as a file suffix to indicate a JPEG
+        file. */
+    public static final String JPG     = "jpg";
+
+    /** Constant which can be used as a file suffix to indicate a PNG
+        file. */
+    public static final String PNG     = "png";
+
+    /** Constant which can be used as a file suffix to indicate a Targa
+        file. */
+    public static final String TGA     = "tga";
+
+    /** Constant which can be used as a file suffix to indicate a TIFF
+        file. */
+    public static final String TIFF    = "tiff";
+
+    private static final boolean DEBUG = Debug.debug("TextureIO");
+
+    // For manually disabling the use of the texture rectangle
+    // extensions so you know the texture target is GL_TEXTURE_2D; this
+    // is useful for shader writers (thanks to Chris Campbell for this
+    // observation)
+    private static boolean texRectEnabled = true;
+
+    //----------------------------------------------------------------------
+    // methods that *do not* require a current context
+    // These methods assume RGB or RGBA textures.
+    // Some texture providers may not recognize the file format unless
+    // the fileSuffix is specified, so it is strongly recommended to
+    // specify it wherever it is known.
+    // Some texture providers may also only support one kind of input,
+    // i.e., reading from a file as opposed to a stream.
+
+    /**
+     * Creates a TextureData from the given file. Does no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param file the file from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @return the texture data from the file, or null if none of the
+     *         registered texture providers could read the file
+     * @throws IOException if an error occurred while reading the file
+     */
+    public static TextureData newTextureData(GLProfile glp, File file,
+                                             boolean mipmap,
+                                             String fileSuffix) throws IOException {
+        if (fileSuffix == null) {
+            fileSuffix = FileUtil.getFileSuffix(file);
+        }
+        return newTextureDataImpl(glp, file, 0, 0, mipmap, fileSuffix);
+    }
+
+    /**
+     * Creates a TextureData from the given stream. Does no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param stream the stream from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @return the texture data from the stream, or null if none of the
+     *         registered texture providers could read the stream
+     * @throws IOException if an error occurred while reading the stream
+     */
+    public static TextureData newTextureData(GLProfile glp, InputStream stream,
+                                             boolean mipmap,
+                                             String fileSuffix) throws IOException {
+        return newTextureDataImpl(glp, stream, 0, 0, mipmap, fileSuffix);
+    }
+
+    /**
+     * Creates a TextureData from the given URL. Does no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param url the URL from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @return the texture data from the URL, or null if none of the
+     *         registered texture providers could read the URL
+     * @throws IOException if an error occurred while reading the URL
+     */
+    public static TextureData newTextureData(GLProfile glp, URL url,
+                                             boolean mipmap,
+                                             String fileSuffix) throws IOException {
+        if (fileSuffix == null) {
+            fileSuffix = FileUtil.getFileSuffix(url.getPath());
+        }
+        return newTextureDataImpl(glp, url, 0, 0, mipmap, fileSuffix);
+    }
+
+    //----------------------------------------------------------------------
+    // These methods make no assumption about the OpenGL internal format
+    // or pixel format of the texture; they must be specified by the
+    // user. It is not allowed to supply 0 (indicating no preference)
+    // for either the internalFormat or the pixelFormat;
+    // IllegalArgumentException will be thrown in this case.
+
+    /**
+     * Creates a TextureData from the given file, using the specified
+     * OpenGL internal format and pixel format for the texture which
+     * will eventually result. The internalFormat and pixelFormat must
+     * be specified and may not be zero; to use default values, use the
+     * variant of this method which does not take these arguments. Does
+     * no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param file the file from which to read the texture data
+     * @param internalFormat the OpenGL internal format of the texture
+     *                   which will eventually result from the TextureData
+     * @param pixelFormat the OpenGL pixel format of the texture
+     *                    which will eventually result from the TextureData
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @return the texture data from the file, or null if none of the
+     *         registered texture providers could read the file
+     * @throws IllegalArgumentException if either internalFormat or
+     *                                  pixelFormat was 0
+     * @throws IOException if an error occurred while reading the file
+     */
+    public static TextureData newTextureData(GLProfile glp, File file,
+                                             int internalFormat,
+                                             int pixelFormat,
+                                             boolean mipmap,
+                                             String fileSuffix) throws IOException, IllegalArgumentException {
+        if ((internalFormat == 0) || (pixelFormat == 0)) {
+            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
+        }
+
+        if (fileSuffix == null) {
+            fileSuffix = FileUtil.getFileSuffix(file);
+        }
+
+        return newTextureDataImpl(glp, file, internalFormat, pixelFormat, mipmap, fileSuffix);
+    }
+
+    /**
+     * Creates a TextureData from the given stream, using the specified
+     * OpenGL internal format and pixel format for the texture which
+     * will eventually result. The internalFormat and pixelFormat must
+     * be specified and may not be zero; to use default values, use the
+     * variant of this method which does not take these arguments. Does
+     * no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param stream the stream from which to read the texture data
+     * @param internalFormat the OpenGL internal format of the texture
+     *                   which will eventually result from the TextureData
+     * @param pixelFormat the OpenGL pixel format of the texture
+     *                    which will eventually result from the TextureData
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @return the texture data from the stream, or null if none of the
+     *         registered texture providers could read the stream
+     * @throws IllegalArgumentException if either internalFormat or
+     *                                  pixelFormat was 0
+     * @throws IOException if an error occurred while reading the stream
+     */
+    public static TextureData newTextureData(GLProfile glp, InputStream stream,
+                                             int internalFormat,
+                                             int pixelFormat,
+                                             boolean mipmap,
+                                             String fileSuffix) throws IOException, IllegalArgumentException {
+        if ((internalFormat == 0) || (pixelFormat == 0)) {
+            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
+        }
+
+        return newTextureDataImpl(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+    }
+
+    /**
+     * Creates a TextureData from the given URL, using the specified
+     * OpenGL internal format and pixel format for the texture which
+     * will eventually result. The internalFormat and pixelFormat must
+     * be specified and may not be zero; to use default values, use the
+     * variant of this method which does not take these arguments. Does
+     * no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param url the URL from which to read the texture data
+     * @param internalFormat the OpenGL internal format of the texture
+     *                   which will eventually result from the TextureData
+     * @param pixelFormat the OpenGL pixel format of the texture
+     *                    which will eventually result from the TextureData
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @return the texture data from the URL, or null if none of the
+     *         registered texture providers could read the URL
+     * @throws IllegalArgumentException if either internalFormat or
+     *                                  pixelFormat was 0
+     * @throws IOException if an error occurred while reading the URL
+     */
+    public static TextureData newTextureData(GLProfile glp, URL url,
+                                             int internalFormat,
+                                             int pixelFormat,
+                                             boolean mipmap,
+                                             String fileSuffix) throws IOException, IllegalArgumentException {
+        if ((internalFormat == 0) || (pixelFormat == 0)) {
+            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
+        }
+
+        if (fileSuffix == null) {
+            fileSuffix = FileUtil.getFileSuffix(url.getPath());
+        }
+
+        return newTextureDataImpl(glp, url, internalFormat, pixelFormat, mipmap, fileSuffix);
+    }
+
+    //----------------------------------------------------------------------
+    // methods that *do* require a current context
+    //
+
+    /** 
+     * Creates an OpenGL texture object from the specified TextureData
+     * using the current OpenGL context.
+     *
+     * @param data the texture data to turn into an OpenGL texture
+     * @throws GLException if no OpenGL context is current or if an
+     *                     OpenGL error occurred
+     * @throws IllegalArgumentException if the passed TextureData was null
+     */
+    public static Texture newTexture(TextureData data) throws GLException, IllegalArgumentException {
+        if (data == null) {
+            throw new IllegalArgumentException("Null TextureData");
+        }
+        return new Texture(data);
+    }
+
+    /** 
+     * Creates an OpenGL texture object from the specified file using
+     * the current OpenGL context.
+     *
+     * @param file the file from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @throws IOException if an error occurred while reading the file
+     * @throws GLException if no OpenGL context is current or if an
+     *                     OpenGL error occurred
+     */
+    public static Texture newTexture(File file, boolean mipmap) throws IOException, GLException {
+        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        TextureData data = newTextureData(glp, file, mipmap, FileUtil.getFileSuffix(file));
+        Texture texture = newTexture(data);
+        data.flush();
+        return texture;
+    }
+
+    /** 
+     * Creates an OpenGL texture object from the specified stream using
+     * the current OpenGL context.
+     *
+     * @param stream the stream from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @throws IOException if an error occurred while reading the stream
+     * @throws GLException if no OpenGL context is current or if an
+     *                     OpenGL error occurred
+     */
+    public static Texture newTexture(InputStream stream, boolean mipmap, String fileSuffix) throws IOException, GLException {
+        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        TextureData data = newTextureData(glp, stream, mipmap, fileSuffix);
+        Texture texture = newTexture(data);
+        data.flush();
+        return texture;
+    }
+
+    /** 
+     * Creates an OpenGL texture object from the specified URL using the
+     * current OpenGL context.
+     *
+     * @param url the URL from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @param fileSuffix the suffix of the file name to be used as a
+     *                   hint of the file format to the underlying
+     *                   texture provider, or null if none and should be
+     *                   auto-detected (some texture providers do not
+     *                   support this)
+     * @throws IOException if an error occurred while reading the URL
+     * @throws GLException if no OpenGL context is current or if an
+     *                     OpenGL error occurred
+     */
+    public static Texture newTexture(URL url, boolean mipmap, String fileSuffix) throws IOException, GLException {
+        if (fileSuffix == null) {
+            fileSuffix = FileUtil.getFileSuffix(url.getPath());
+        }
+        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
+        TextureData data = newTextureData(glp, url, mipmap, fileSuffix);
+        Texture texture = newTexture(data);
+        data.flush();
+        return texture;
+    }
+
+    /** 
+     * Creates an OpenGL texture object associated with the given OpenGL
+     * texture target using the current OpenGL context. The texture has
+     * no initial data. This is used, for example, to construct cube
+     * maps out of multiple TextureData objects.
+     *
+     * @param target the OpenGL target type, eg GL.GL_TEXTURE_2D, 
+     *               GL.GL_TEXTURE_RECTANGLE_ARB
+     *
+     * @throws GLException if no OpenGL context is current or if an
+     *                     OpenGL error occurred
+     */
+    public static Texture newTexture(int target) throws GLException {
+        return new Texture(target);
+    }
+
+    /**
+     * Wraps an OpenGL texture ID from an external library and allows
+     * some of the base methods from the Texture class, such as
+     * binding and querying of texture coordinates, to be used with
+     * it. Attempts to update such textures' contents will yield
+     * undefined results.
+     *
+     * @param textureID the OpenGL texture object to wrap
+     * @param target the OpenGL texture target, eg GL.GL_TEXTURE_2D, 
+     *               GL2.GL_TEXTURE_RECTANGLE
+     * @param texWidth the width of the texture in pixels
+     * @param texHeight the height of the texture in pixels
+     * @param imgWidth the width of the image within the texture in
+     *          pixels (if the content is a sub-rectangle in the upper
+     *          left corner); otherwise, pass in texWidth
+     * @param imgHeight the height of the image within the texture in
+     *          pixels (if the content is a sub-rectangle in the upper
+     *          left corner); otherwise, pass in texHeight
+     * @param mustFlipVertically indicates whether the texture
+     *                           coordinates must be flipped vertically
+     *                           in order to properly display the
+     *                           texture
+     */
+    public static Texture newTexture(int textureID,
+				     int target,
+				     int texWidth,
+				     int texHeight,
+				     int imgWidth,
+				     int imgHeight,
+				     boolean mustFlipVertically) {
+	return new Texture(textureID,
+			   target,
+			   texWidth,
+			   texHeight,
+			   imgWidth,
+			   imgHeight,
+			   mustFlipVertically);
+    }
+
+    /**
+     * Writes the given texture to a file. The type of the file is
+     * inferred from its suffix. An OpenGL context must be current in
+     * order to fetch the texture data back from the OpenGL pipeline.
+     * This method causes the specified Texture to be bound to the
+     * GL_TEXTURE_2D state. If no suitable writer for the requested file
+     * format was found, throws an IOException. <P>
+     *
+     * Reasonable attempts are made to produce good results in the
+     * resulting images. The Targa, SGI and ImageIO writers produce
+     * results in the correct vertical orientation for those file
+     * formats. The DDS writer performs no vertical flip of the data,
+     * even in uncompressed mode. (It is impossible to perform such a
+     * vertical flip with compressed data.) Applications should keep
+     * this in mind when using this routine to save textures to disk for
+     * later re-loading. <P>
+     *
+     * Any mipmaps for the specified texture are currently discarded
+     * when it is written to disk, regardless of whether the underlying
+     * file format supports multiple mipmaps in a given file.
+     *
+     * @throws IOException if an error occurred during writing or no
+     *   suitable writer was found
+     * @throws GLException if no OpenGL context was current or an
+     *   OpenGL-related error occurred
+     */
+    public static void write(Texture texture, File file) throws IOException, GLException {
+        if (texture.getTarget() != GL.GL_TEXTURE_2D) {
+            throw new GLException("Only GL_TEXTURE_2D textures are supported");
+        }
+
+        // First fetch the texture data
+        GL _gl = GLContext.getCurrentGL();
+        if (!_gl.isGL2()) {
+            throw new GLException("Only GL2 supports fetching compressed images, GL: " + _gl);
+        }
+        GL2 gl = _gl.getGL2();
+
+        texture.bind();
+        int internalFormat = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_INTERNAL_FORMAT);
+        int width  = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_WIDTH);
+        int height = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_HEIGHT);
+        int border = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_BORDER);
+        TextureData data = null;
+        if (internalFormat == GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT ||
+            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ||
+            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ||
+            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT) {
+            // Fetch using glGetCompressedTexImage
+            int size   = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_COMPRESSED_IMAGE_SIZE);
+            ByteBuffer res = ByteBuffer.allocate(size);
+            gl.glGetCompressedTexImage(GL.GL_TEXTURE_2D, 0, res);
+            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, internalFormat, GL.GL_UNSIGNED_BYTE,
+                                   false, true, true, res, null);
+        } else {
+            int bytesPerPixel = 0;
+            int fetchedFormat = 0;
+            switch (internalFormat) {
+            case GL.GL_RGB:
+            case GL2.GL_BGR:
+            case GL.GL_RGB8:
+                bytesPerPixel = 3;
+                fetchedFormat = GL.GL_RGB;
+                break;
+            case GL.GL_RGBA:
+            case GL2.GL_BGRA:
+            case GL2.GL_ABGR_EXT:
+            case GL.GL_RGBA8:
+                bytesPerPixel = 4;
+                fetchedFormat = GL.GL_RGBA;
+                break;
+            default:
+                throw new IOException("Unsupported texture internal format 0x" + Integer.toHexString(internalFormat));
+            }
+
+            // Fetch using glGetTexImage
+            int packAlignment  = glGetInteger(GL.GL_PACK_ALIGNMENT);
+            int packRowLength  = glGetInteger(GL2.GL_PACK_ROW_LENGTH);
+            int packSkipRows   = glGetInteger(GL2.GL_PACK_SKIP_ROWS);
+            int packSkipPixels = glGetInteger(GL2.GL_PACK_SKIP_PIXELS);
+            int packSwapBytes  = glGetInteger(GL2.GL_PACK_SWAP_BYTES);
+
+            gl.glPixelStorei(GL.GL_PACK_ALIGNMENT, 1);
+            gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, 0);
+            gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, 0);
+            gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, 0);
+            gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, 0);
+
+            ByteBuffer res = ByteBuffer.allocate((width + (2 * border)) *
+                                                 (height + (2 * border)) *
+                                                 bytesPerPixel);
+            if (DEBUG) {
+                System.out.println("Allocated buffer of size " + res.remaining() + " for fetched image (" +
+                                   ((fetchedFormat == GL.GL_RGB) ? "GL_RGB" : "GL_RGBA") + ")");
+            }
+            gl.glGetTexImage(GL.GL_TEXTURE_2D, 0, fetchedFormat, GL.GL_UNSIGNED_BYTE, res);
+
+            gl.glPixelStorei(GL.GL_PACK_ALIGNMENT, packAlignment);
+            gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, packRowLength);
+            gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, packSkipRows);
+            gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, packSkipPixels);
+            gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, packSwapBytes);
+      
+            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, fetchedFormat, GL.GL_UNSIGNED_BYTE,
+                                   false, false, false, res, null);
+
+            if (DEBUG) {
+                System.out.println("data.getPixelFormat() = " +
+                                   ((data.getPixelFormat() == GL.GL_RGB) ? "GL_RGB" : "GL_RGBA"));
+            }
+        }
+
+        write(data, file);
+    }
+  
+    public static void write(TextureData data, File file) throws IOException, GLException {
+        for (Iterator iter = textureWriters.iterator(); iter.hasNext(); ) {
+            TextureWriter writer = (TextureWriter) iter.next();
+            if (writer.write(file, data)) {
+                return;
+            }
+        }
+
+        throw new IOException("No suitable texture writer found for "+file.getAbsolutePath());
+    }
+  
+    //----------------------------------------------------------------------
+    // SPI support
+    //
+
+    /** Adds a TextureProvider to support reading of a new file
+        format. */
+    public static void addTextureProvider(TextureProvider provider) {
+        // Must always add at the front so the ImageIO provider is last,
+        // so we don't accidentally use it instead of a user's possibly
+        // more optimal provider
+        textureProviders.add(0, provider);
+    }
+
+    /** Adds a TextureWriter to support writing of a new file
+        format. */
+    public static void addTextureWriter(TextureWriter writer) {
+        // Must always add at the front so the ImageIO writer is last,
+        // so we don't accidentally use it instead of a user's possibly
+        // more optimal writer
+        textureWriters.add(0, writer);
+    }
+
+    //---------------------------------------------------------------------------
+    // Global disabling of texture rectangle extension
+    //
+
+    /** Toggles the use of the GL_ARB_texture_rectangle extension by the
+        TextureIO classes. By default, on hardware supporting this
+        extension, the TextureIO classes may use the
+        GL_ARB_texture_rectangle extension for non-power-of-two
+        textures. (If the hardware supports the
+        GL_ARB_texture_non_power_of_two extension, that one is
+        preferred.) In some situations, for example when writing
+        shaders, it is advantageous to force the texture target to
+        always be GL_TEXTURE_2D in order to have one version of the
+        shader, even at the expense of texture memory in the case where
+        NPOT textures are not supported. This method allows the use of
+        the GL_ARB_texture_rectangle extension to be turned off globally
+        for this purpose. The default is that the use of the extension
+        is enabled. */
+    public static void setTexRectEnabled(boolean enabled) {
+        texRectEnabled = enabled;
+    }
+
+    /** Indicates whether the GL_ARB_texture_rectangle extension is
+        allowed to be used for non-power-of-two textures; see {@link
+        #setTexRectEnabled setTexRectEnabled}. */
+    public static boolean isTexRectEnabled() {
+        return texRectEnabled;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    private static List/*<TextureProvider>*/ textureProviders = new ArrayList/*<TextureProvider>*/();
+    private static List/*<TextureWriter>*/   textureWriters   = new ArrayList/*<TextureWriter>*/();
+
+    static {
+        // ImageIO provider, the fall-back, must be the first one added
+        if(GLProfile.isAWTJOGLAvailable()) {
+            try {
+                // Use reflection to avoid compile-time dependencies on AWT-related classes
+                TextureProvider provider = (TextureProvider)
+                    Class.forName("com.jogamp.opengl.util.texture.spi.awt.IIOTextureProvider").newInstance();
+                addTextureProvider(provider);
+            } catch (Exception e) {
+                if (DEBUG) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        // Other special-case providers
+        addTextureProvider(new DDSTextureProvider());
+        addTextureProvider(new SGITextureProvider());
+        addTextureProvider(new TGATextureProvider());
+
+        // ImageIO writer, the fall-back, must be the first one added
+        if(GLProfile.isAWTJOGLAvailable()) {
+            try {
+                // Use reflection to avoid compile-time dependencies on AWT-related classes
+                TextureWriter writer = (TextureWriter)
+                    Class.forName("com.jogamp.opengl.util.texture.spi.awt.IIOTextureWriter").newInstance();
+                addTextureWriter(writer);
+            } catch (Exception e) {
+                if (DEBUG) {
+                    e.printStackTrace();
+                }
+            } catch (Error e) {
+                if (DEBUG) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        // Other special-case writers
+        addTextureWriter(new DDSTextureWriter());
+        addTextureWriter(new SGITextureWriter());
+        addTextureWriter(new TGATextureWriter());
+        addTextureWriter(new NetPbmTextureWriter());
+    }
+
+    // Implementation methods
+    private static TextureData newTextureDataImpl(GLProfile glp, File file,
+                                                  int internalFormat,
+                                                  int pixelFormat,
+                                                  boolean mipmap,
+                                                  String fileSuffix) throws IOException {
+        if (file == null) {
+            throw new IOException("File was null");
+        }
+
+        fileSuffix = toLowerCase(fileSuffix);
+
+        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
+            TextureProvider provider = (TextureProvider) iter.next();
+            TextureData data = provider.newTextureData(glp, file,
+                                                       internalFormat,
+                                                       pixelFormat,
+                                                       mipmap,
+                                                       fileSuffix);
+            if (data != null) {
+                return data;
+            }
+        }
+
+        throw new IOException("No suitable reader for given file "+file.getAbsolutePath());
+    }
+
+    private static TextureData newTextureDataImpl(GLProfile glp, InputStream stream,
+                                                  int internalFormat,
+                                                  int pixelFormat,
+                                                  boolean mipmap,
+                                                  String fileSuffix) throws IOException {
+        if (stream == null) {
+            throw new IOException("Stream was null");
+        }
+
+        fileSuffix = toLowerCase(fileSuffix);
+
+        // Note: use of BufferedInputStream works around 4764639/4892246
+        if (!(stream instanceof BufferedInputStream)) {
+            stream = new BufferedInputStream(stream);
+        }
+
+        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
+            TextureProvider provider = (TextureProvider) iter.next();
+            TextureData data = provider.newTextureData(glp, stream,
+                                                       internalFormat,
+                                                       pixelFormat,
+                                                       mipmap,
+                                                       fileSuffix);
+            if (data != null) {
+                return data;
+            }
+        }
+
+        throw new IOException("No suitable reader for given stream");
+    }
+
+    private static TextureData newTextureDataImpl(GLProfile glp, URL url,
+                                                  int internalFormat,
+                                                  int pixelFormat,
+                                                  boolean mipmap,
+                                                  String fileSuffix) throws IOException {
+        if (url == null) {
+            throw new IOException("URL was null");
+        }
+
+        fileSuffix = toLowerCase(fileSuffix);
+
+        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
+            TextureProvider provider = (TextureProvider) iter.next();
+            TextureData data = provider.newTextureData(glp, url,
+                                                       internalFormat,
+                                                       pixelFormat,
+                                                       mipmap,
+                                                       fileSuffix);
+            if (data != null) {
+                return data;
+            }
+        }
+
+        throw new IOException("No suitable reader for given URL "+url);
+    }
+
+    //----------------------------------------------------------------------
+    // DDS provider -- supports files only for now
+    static class DDSTextureProvider implements TextureProvider {
+        public TextureData newTextureData(GLProfile glp, File file,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            if (DDS.equals(fileSuffix) ||
+                DDS.equals(FileUtil.getFileSuffix(file))) {
+                DDSImage image = DDSImage.read(file);
+                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
+            }
+
+            return null;
+        }
+
+        public TextureData newTextureData(GLProfile glp, InputStream stream,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            if (DDS.equals(fileSuffix) ||
+                DDSImage.isDDSImage(stream)) {
+                byte[] data = StreamUtil.readAll2Array(stream);
+                ByteBuffer buf = ByteBuffer.wrap(data);
+                DDSImage image = DDSImage.read(buf);
+                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
+            }
+
+            return null;
+        }
+
+        public TextureData newTextureData(GLProfile glp, URL url,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            InputStream stream = new BufferedInputStream(url.openStream());
+            try {
+                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+            } finally {
+                stream.close();
+            }
+        }
+
+        private TextureData newTextureData(GLProfile glp, final DDSImage image,
+                                           int internalFormat,
+                                           int pixelFormat,
+                                           boolean mipmap) {
+            DDSImage.ImageInfo info = image.getMipMap(0);
+            if (pixelFormat == 0) {
+                switch (image.getPixelFormat()) {
+                case DDSImage.D3DFMT_R8G8B8:
+                    pixelFormat = GL.GL_RGB;
+                    break;
+                default:
+                    pixelFormat = GL.GL_RGBA;
+                    break;
+                }
+            }
+            if (info.isCompressed()) {
+                switch (info.getCompressionFormat()) {
+                case DDSImage.D3DFMT_DXT1:
+                    internalFormat = GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
+                    break;
+                case DDSImage.D3DFMT_DXT3:
+                    internalFormat = GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+                    break;
+                case DDSImage.D3DFMT_DXT5:
+                    internalFormat = GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+                    break;
+                default:
+                    throw new RuntimeException("Unsupported DDS compression format \"" +
+                                               DDSImage.getCompressionFormatName(info.getCompressionFormat()) + "\"");
+                }
+            }
+            if (internalFormat == 0) {
+                switch (image.getPixelFormat()) {
+                case DDSImage.D3DFMT_R8G8B8:
+                    pixelFormat = GL.GL_RGB;
+                    break;
+                default:
+                    pixelFormat = GL.GL_RGBA;
+                    break;
+                }
+            }
+            TextureData.Flusher flusher = new TextureData.Flusher() {
+                    public void flush() {
+                        image.close();
+                    }
+                };
+            TextureData data;
+            if (mipmap && image.getNumMipMaps() > 0) {
+                Buffer[] mipmapData = new Buffer[image.getNumMipMaps()];
+                for (int i = 0; i < image.getNumMipMaps(); i++) {
+                    mipmapData[i] = image.getMipMap(i).getData();
+                }
+                data = new TextureData(glp, internalFormat,
+                                       info.getWidth(),
+                                       info.getHeight(),
+                                       0,
+                                       pixelFormat,
+                                       GL.GL_UNSIGNED_BYTE,
+                                       info.isCompressed(),
+                                       true,
+                                       mipmapData,
+                                       flusher);
+            } else {
+                // Fix this up for the end user because we can't generate
+                // mipmaps for compressed textures
+                mipmap = false;
+                data = new TextureData(glp, internalFormat,
+                                       info.getWidth(),
+                                       info.getHeight(),
+                                       0,
+                                       pixelFormat,
+                                       GL.GL_UNSIGNED_BYTE,
+                                       mipmap,
+                                       info.isCompressed(),
+                                       true,
+                                       info.getData(),
+                                       flusher);
+            }
+            return data;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // Base class for SGI RGB and TGA image providers
+    static abstract class StreamBasedTextureProvider implements TextureProvider {
+        public TextureData newTextureData(GLProfile glp, File file,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            InputStream inStream = new BufferedInputStream(new FileInputStream(file));
+            try {
+                // The SGIImage and TGAImage implementations use InputStreams
+                // anyway so there isn't much point in having a separate code
+                // path for files
+                return newTextureData(glp, inStream,
+                                      internalFormat,
+                                      pixelFormat,
+                                      mipmap,
+                                      ((fileSuffix != null) ? fileSuffix : FileUtil.getFileSuffix(file)));
+            } finally {
+                inStream.close();
+            }
+        }
+
+        public TextureData newTextureData(GLProfile glp, URL url,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            InputStream stream = new BufferedInputStream(url.openStream());
+            try {
+                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+            } finally {
+                stream.close();
+            }
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // SGI RGB image provider
+    static class SGITextureProvider extends StreamBasedTextureProvider {
+        public TextureData newTextureData(GLProfile glp, InputStream stream,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            if (SGI.equals(fileSuffix) ||
+                SGI_RGB.equals(fileSuffix) ||
+                SGIImage.isSGIImage(stream)) {
+                SGIImage image = SGIImage.read(stream);
+                if (pixelFormat == 0) {
+                    pixelFormat = image.getFormat();
+                }
+                if (internalFormat == 0) {
+                    internalFormat = image.getFormat();
+                }
+                return new TextureData(glp, internalFormat,
+                                       image.getWidth(),
+                                       image.getHeight(),
+                                       0,
+                                       pixelFormat,
+                                       GL.GL_UNSIGNED_BYTE,
+                                       mipmap,
+                                       false,
+                                       false,
+                                       ByteBuffer.wrap(image.getData()),
+                                       null);
+            }
+
+            return null;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // TGA (Targa) image provider
+    static class TGATextureProvider extends StreamBasedTextureProvider {
+        public TextureData newTextureData(GLProfile glp, InputStream stream,
+                                          int internalFormat,
+                                          int pixelFormat,
+                                          boolean mipmap,
+                                          String fileSuffix) throws IOException {
+            if (TGA.equals(fileSuffix)) {
+                TGAImage image = TGAImage.read(stream);
+                if (pixelFormat == 0) {
+                    pixelFormat = image.getGLFormat();
+                }
+                if (internalFormat == 0) {
+                    GL gl = GLContext.getCurrentGL();
+                    if(gl.isGL2()) {
+                        internalFormat = GL.GL_RGBA8;
+                    } else {
+                        internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB;
+                    }
+                }
+                return new TextureData(glp, internalFormat,
+                                       image.getWidth(),
+                                       image.getHeight(),
+                                       0,
+                                       pixelFormat,
+                                       GL.GL_UNSIGNED_BYTE,
+                                       mipmap,
+                                       false,
+                                       false,
+                                       image.getData(),
+                                       null);
+            }
+
+            return null;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // DDS texture writer
+    //
+    static class DDSTextureWriter implements TextureWriter {
+        public boolean write(File file,
+                             TextureData data) throws IOException {
+            if (DDS.equals(FileUtil.getFileSuffix(file))) {
+                // See whether the DDS writer can handle this TextureData
+                int pixelFormat = data.getPixelFormat();
+                int pixelType   = data.getPixelType();
+                if (pixelType != GL.GL_BYTE &&
+                    pixelType != GL.GL_UNSIGNED_BYTE) {
+                    throw new IOException("DDS writer only supports byte / unsigned byte textures");
+                }
+
+                int d3dFormat = 0;
+                // FIXME: some of these are probably not completely correct and would require swizzling
+                switch (pixelFormat) {
+                case GL.GL_RGB:                        d3dFormat = DDSImage.D3DFMT_R8G8B8; break;
+                case GL.GL_RGBA:                       d3dFormat = DDSImage.D3DFMT_A8R8G8B8; break;
+                case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:  d3dFormat = DDSImage.D3DFMT_DXT1; break;
+                case GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: throw new IOException("RGBA DXT1 not yet supported");
+                case GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: d3dFormat = DDSImage.D3DFMT_DXT3; break;
+                case GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: d3dFormat = DDSImage.D3DFMT_DXT5; break;
+                default: throw new IOException("Unsupported pixel format 0x" + Integer.toHexString(pixelFormat) + " by DDS writer");
+                }
+        
+                ByteBuffer[] mipmaps = null;
+                if (data.getMipmapData() != null) {
+                    mipmaps = new ByteBuffer[data.getMipmapData().length];
+                    for (int i = 0; i < mipmaps.length; i++) {
+                        mipmaps[i] = (ByteBuffer) data.getMipmapData()[i];
+                    }
+                } else {
+                    mipmaps = new ByteBuffer[] { (ByteBuffer) data.getBuffer() };
+                }
+
+                DDSImage image = DDSImage.createFromData(d3dFormat,
+                                                         data.getWidth(),
+                                                         data.getHeight(),
+                                                         mipmaps);
+                image.write(file);
+                return true;
+            }
+
+            return false;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // SGI (rgb) texture writer
+    //
+    static class SGITextureWriter implements TextureWriter {
+        public boolean write(File file,
+                             TextureData data) throws IOException {
+            String fileSuffix = FileUtil.getFileSuffix(file);
+            if (SGI.equals(fileSuffix) ||
+                SGI_RGB.equals(fileSuffix)) {
+                // See whether the SGI writer can handle this TextureData
+                int pixelFormat = data.getPixelFormat();
+                int pixelType   = data.getPixelType();
+                if ((pixelFormat == GL.GL_RGB ||
+                     pixelFormat == GL.GL_RGBA) &&
+                    (pixelType == GL.GL_BYTE ||
+                     pixelType == GL.GL_UNSIGNED_BYTE)) {
+                    ByteBuffer buf = ((data.getBuffer() != null) ?
+                                      (ByteBuffer) data.getBuffer() :
+                                      (ByteBuffer) data.getMipmapData()[0]);
+                    byte[] bytes;
+                    if (buf.hasArray()) {
+                        bytes = buf.array();
+                    } else {
+                        buf.rewind();
+                        bytes = new byte[buf.remaining()];
+                        buf.get(bytes);
+                        buf.rewind();
+                    }
+
+                    SGIImage image = SGIImage.createFromData(data.getWidth(),
+                                                             data.getHeight(),
+                                                             (pixelFormat == GL.GL_RGBA),
+                                                             bytes);
+                    image.write(file, false);
+                    return true;
+                }
+
+                throw new IOException("SGI writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
+            }
+
+            return false;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // TGA (Targa) texture writer
+  
+    static class TGATextureWriter implements TextureWriter {
+        public boolean write(File file,
+                             TextureData data) throws IOException {
+            if (TGA.equals(FileUtil.getFileSuffix(file))) {
+                // See whether the TGA writer can handle this TextureData
+                int pixelFormat = data.getPixelFormat();
+                int pixelType   = data.getPixelType();
+                if ((pixelFormat == GL.GL_RGB ||
+                     pixelFormat == GL.GL_RGBA) &&
+                    (pixelType == GL.GL_BYTE ||
+                     pixelType == GL.GL_UNSIGNED_BYTE)) {
+                    ByteBuffer buf = ((data.getBuffer() != null) ?
+                                      (ByteBuffer) data.getBuffer() :
+                                      (ByteBuffer) data.getMipmapData()[0]);
+                    // Must reverse order of red and blue channels to get correct results
+                    int skip = ((pixelFormat == GL.GL_RGB) ? 3 : 4);
+                    for (int i = 0; i < buf.remaining(); i += skip) {
+                        byte red  = buf.get(i + 0);
+                        byte blue = buf.get(i + 2);
+                        buf.put(i + 0, blue);
+                        buf.put(i + 2, red);
+                    }
+
+                    TGAImage image = TGAImage.createFromData(data.getWidth(),
+                                                             data.getHeight(),
+                                                             (pixelFormat == GL.GL_RGBA),
+                                                             false,
+                                                             ((data.getBuffer() != null) ?
+                                                              (ByteBuffer) data.getBuffer() :
+                                                              (ByteBuffer) data.getMipmapData()[0]));
+                    image.write(file);
+                    return true;
+                }
+
+                throw new IOException("TGA writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
+            }
+
+            return false;
+        }    
+    }
+
+    //----------------------------------------------------------------------
+    // Helper routines
+    //
+
+    private static int glGetInteger(int pname) {
+        int[] tmp = new int[1];
+        GL gl = GLContext.getCurrentGL();
+        gl.glGetIntegerv(pname, tmp, 0);
+        return tmp[0];
+    }
+
+    private static int glGetTexLevelParameteri(GL2 gl, int target, int level, int pname) {
+        int[] tmp = new int[1];
+        gl.glGetTexLevelParameteriv(target, 0, pname, tmp, 0);
+        return tmp[0];
+    }
+
+    private static String toLowerCase(String arg) {
+        if (arg == null) {
+            return null;
+        }
+
+        return arg.toLowerCase();
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureData.java b/src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureData.java
new file mode 100755
index 000000000..39ec74b97
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureData.java
@@ -0,0 +1,498 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.opengl.util.texture.awt;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Transparency;
+import java.awt.color.*;
+import java.awt.image.*;
+import java.nio.*;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.texture.*;
+
+public class AWTTextureData extends TextureData {
+    // Mechanism for lazily converting input BufferedImages with custom
+    // ColorModels to standard ones for uploading to OpenGL, as well as
+    // backing off from the optimizations of hoping that either
+    // GL_EXT_abgr or OpenGL 1.2 are present
+    private BufferedImage imageForLazyCustomConversion;
+    private boolean expectingEXTABGR;
+    private boolean expectingGL12;
+
+    private static final ColorModel rgbaColorModel =
+        new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                new int[] {8, 8, 8, 8}, true, true, 
+                                Transparency.TRANSLUCENT,
+                                DataBuffer.TYPE_BYTE);
+    private static final ColorModel rgbColorModel =
+        new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                new int[] {8, 8, 8, 0}, false, false,
+                                Transparency.OPAQUE,
+                                DataBuffer.TYPE_BYTE);
+
+
+    /** 
+     * Constructs a new TextureData object with the specified parameters
+     * and data contained in the given BufferedImage. The resulting
+     * TextureData "wraps" the contents of the BufferedImage, so if a
+     * modification is made to the BufferedImage between the time the
+     * TextureData is constructed and when a Texture is made from the
+     * TextureData, that modification will be visible in the resulting
+     * Texture.
+     *
+     * @param glp      the OpenGL Profile this texture data should be
+     *                       created for.
+     * @param internalFormat the OpenGL internal format for the
+     *                       resulting texture; may be 0, in which case
+     *                       it is inferred from the image's type
+     * @param pixelFormat    the OpenGL internal format for the
+     *                       resulting texture; may be 0, in which case
+     *                       it is inferred from the image's type (note:
+     *                       this argument is currently always ignored)
+     * @param mipmap         indicates whether mipmaps should be
+     *                       autogenerated (using GLU) for the resulting
+     *                       texture
+     * @param image          the image containing the texture data
+     */
+    public AWTTextureData(GLProfile glp, 
+                          int internalFormat,
+                          int pixelFormat,
+                          boolean mipmap,
+                          BufferedImage image) {
+        super(glp);
+        if (internalFormat == 0) {
+            this.internalFormat = image.getColorModel().hasAlpha() ? GL.GL_RGBA : GL.GL_RGB;
+        } else {
+            this.internalFormat = internalFormat;
+        }
+        createFromImage(glp, image);
+        this.mipmap = mipmap;
+        if (buffer != null) {
+            estimatedMemorySize = estimatedMemorySize(buffer);
+        } else {
+            // In the lazy custom conversion case we don't yet have a buffer
+            if (imageForLazyCustomConversion != null) {
+                estimatedMemorySize = estimatedMemorySize(wrapImageDataBuffer(imageForLazyCustomConversion));
+            }
+        }
+    }
+
+    /** Returns the intended OpenGL pixel format of the texture data. */
+    public int getPixelFormat() {
+        if (imageForLazyCustomConversion != null) {
+            if (!((expectingEXTABGR && haveEXTABGR) ||
+                  (expectingGL12    && haveGL12))) {
+                revertPixelFormatAndType();
+            }
+        }
+        return pixelFormat;
+    }
+    /** Returns the intended OpenGL pixel type of the texture data. */
+    public int getPixelType() {
+        if (imageForLazyCustomConversion != null) {
+            if (!((expectingEXTABGR && haveEXTABGR) ||
+                  (expectingGL12    && haveGL12))) {
+                revertPixelFormatAndType();
+            }
+        }
+        return pixelType;
+    }
+
+    /** Returns the texture data, or null if it is specified as a set of mipmaps. */
+    public Buffer getBuffer() {
+        if (imageForLazyCustomConversion != null) {
+            if (!((expectingEXTABGR && haveEXTABGR) ||
+                  (expectingGL12    && haveGL12))) {
+                revertPixelFormatAndType();
+                // Must present the illusion to the end user that we are simply
+                // wrapping the input BufferedImage
+                createFromCustom(imageForLazyCustomConversion);
+            }
+        }
+        return buffer;
+    }
+
+    private void createFromImage(GLProfile glp, BufferedImage image) {
+        pixelType = 0; // Determine from image
+        mustFlipVertically = true;
+
+        width = image.getWidth();
+        height = image.getHeight();
+
+        int scanlineStride;
+
+        SampleModel sm = image.getRaster().getSampleModel();
+        if (sm instanceof SinglePixelPackedSampleModel) {
+            scanlineStride =
+                ((SinglePixelPackedSampleModel)sm).getScanlineStride();
+        } else if (sm instanceof MultiPixelPackedSampleModel) {
+            scanlineStride =
+                ((MultiPixelPackedSampleModel)sm).getScanlineStride();
+        } else if (sm instanceof ComponentSampleModel) {
+            scanlineStride =
+                ((ComponentSampleModel)sm).getScanlineStride();
+        } else {
+            // This will only happen for TYPE_CUSTOM anyway
+            setupLazyCustomConversion(image);
+            return;
+        }
+
+        width = image.getWidth();
+        height = image.getHeight();
+
+        if (glp.isGL2GL3()) {
+            switch (image.getType()) {
+                case BufferedImage.TYPE_INT_RGB:
+                    pixelFormat = GL2GL3.GL_BGRA;
+                    pixelType = GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV;
+                    rowLength = scanlineStride;
+                    alignment = 4;
+                    expectingGL12 = true;
+                    setupLazyCustomConversion(image);
+                    break;
+                case BufferedImage.TYPE_INT_ARGB_PRE:
+                    pixelFormat = GL2GL3.GL_BGRA;
+                    pixelType = GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV;
+                    rowLength = scanlineStride;
+                    alignment = 4;
+                    expectingGL12 = true;
+                    setupLazyCustomConversion(image);
+                    break;
+                case BufferedImage.TYPE_INT_BGR:
+                    pixelFormat = GL.GL_RGBA;
+                    pixelType = GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV;
+                    rowLength = scanlineStride;
+                    alignment = 4;
+                    expectingGL12 = true;
+                    setupLazyCustomConversion(image);
+                    break;
+                case BufferedImage.TYPE_3BYTE_BGR:
+                    {
+                        // we can pass the image data directly to OpenGL only if
+                        // we have an integral number of pixels in each scanline
+                        if ((scanlineStride % 3) == 0) {
+                            pixelFormat = GL2GL3.GL_BGR;
+                            pixelType = GL.GL_UNSIGNED_BYTE;
+                            rowLength = scanlineStride / 3;
+                            alignment = 1;
+                        } else {
+                            setupLazyCustomConversion(image);
+                            return;
+                        }
+                    }
+                    break;
+                case BufferedImage.TYPE_4BYTE_ABGR_PRE:
+                    {
+                        // we can pass the image data directly to OpenGL only if
+                        // we have an integral number of pixels in each scanline
+                        // and only if the GL_EXT_abgr extension is present
+    
+                        // NOTE: disabling this code path for now as it appears it's
+                        // buggy at least on some NVidia drivers and doesn't perform
+                        // the necessary byte swapping (FIXME: needs more
+                        // investigation)
+                        if ((scanlineStride % 4) == 0 && glp.isGL2() && false) {
+                            pixelFormat = GL2.GL_ABGR_EXT;
+                            pixelType = GL.GL_UNSIGNED_BYTE;
+                            rowLength = scanlineStride / 4;
+                            alignment = 4;
+    
+                            // Store a reference to the original image for later in
+                            // case it turns out that we don't have GL_EXT_abgr at the
+                            // time we're going to do the texture upload to OpenGL
+                            setupLazyCustomConversion(image);
+                            expectingEXTABGR = true;
+                            break;
+                        } else {
+                            setupLazyCustomConversion(image);
+                            return;
+                        }
+                    }
+                case BufferedImage.TYPE_USHORT_565_RGB:
+                    pixelFormat = GL.GL_RGB;
+                    pixelType = GL.GL_UNSIGNED_SHORT_5_6_5;
+                    rowLength = scanlineStride;
+                    alignment = 2;
+                    expectingGL12 = true;
+                    setupLazyCustomConversion(image);
+                    break;
+                case BufferedImage.TYPE_USHORT_555_RGB:
+                    pixelFormat = GL2GL3.GL_BGRA;
+                    pixelType = GL2GL3.GL_UNSIGNED_SHORT_1_5_5_5_REV;
+                    rowLength = scanlineStride;
+                    alignment = 2;
+                    expectingGL12 = true;
+                    setupLazyCustomConversion(image);
+                    break;
+                case BufferedImage.TYPE_BYTE_GRAY:
+                    pixelFormat = GL.GL_LUMINANCE;
+                    pixelType = GL.GL_UNSIGNED_BYTE;
+                    rowLength = scanlineStride;
+                    alignment = 1;
+                    break;
+                case BufferedImage.TYPE_USHORT_GRAY:
+                    pixelFormat = GL.GL_LUMINANCE;
+                    pixelType = GL.GL_UNSIGNED_SHORT;
+                    rowLength = scanlineStride;
+                    alignment = 2;
+                    break;
+                    // Note: TYPE_INT_ARGB and TYPE_4BYTE_ABGR images go down the
+                    // custom code path to satisfy the invariant that images with an
+                    // alpha channel always go down with premultiplied alpha.
+                case BufferedImage.TYPE_INT_ARGB:
+                case BufferedImage.TYPE_4BYTE_ABGR:
+                case BufferedImage.TYPE_BYTE_BINARY:
+                case BufferedImage.TYPE_BYTE_INDEXED:
+                case BufferedImage.TYPE_CUSTOM:
+                default:
+                    ColorModel cm = image.getColorModel();
+                    if (cm.equals(rgbColorModel)) {
+                        pixelFormat = GL.GL_RGB;
+                        pixelType = GL.GL_UNSIGNED_BYTE;
+                        rowLength = scanlineStride / 3;
+                        alignment = 1;
+                    } else if (cm.equals(rgbaColorModel)) {
+                        pixelFormat = GL.GL_RGBA;
+                        pixelType = GL.GL_UNSIGNED_BYTE;
+                        rowLength = scanlineStride / 4; // FIXME: correct?
+                        alignment = 4;
+                    } else {
+                        setupLazyCustomConversion(image);
+                        return;
+                    }
+                    break;
+            }
+        } else {
+            switch (image.getType()) {
+                case BufferedImage.TYPE_INT_RGB:
+                    pixelFormat = GL.GL_RGB;
+                    pixelType = GL.GL_UNSIGNED_BYTE;
+                    rowLength = scanlineStride;
+                    alignment = 3;
+                    expectingGL12 = true;
+                    setupLazyCustomConversion(image);
+                    break;
+                case BufferedImage.TYPE_INT_ARGB_PRE:
+                    throw new GLException("INT_ARGB_PRE n.a.");
+                case BufferedImage.TYPE_INT_BGR:
+                    throw new GLException("INT_BGR n.a.");
+                case BufferedImage.TYPE_3BYTE_BGR:
+                    throw new GLException("INT_BGR n.a.");
+                case BufferedImage.TYPE_4BYTE_ABGR_PRE:
+                    throw new GLException("INT_BGR n.a.");
+                case BufferedImage.TYPE_USHORT_565_RGB:
+                    pixelFormat = GL.GL_RGB;
+                    pixelType = GL.GL_UNSIGNED_SHORT_5_6_5;
+                    rowLength = scanlineStride;
+                    alignment = 2;
+                    expectingGL12 = true;
+                    setupLazyCustomConversion(image);
+                    break;
+                case BufferedImage.TYPE_USHORT_555_RGB:
+                    pixelFormat = GL.GL_RGBA;
+                    pixelType = GL.GL_UNSIGNED_SHORT_5_5_5_1;
+                    rowLength = scanlineStride;
+                    alignment = 2;
+                    expectingGL12 = true;
+                    setupLazyCustomConversion(image);
+                    break;
+                case BufferedImage.TYPE_BYTE_GRAY:
+                    pixelFormat = GL.GL_LUMINANCE;
+                    pixelType = GL.GL_UNSIGNED_BYTE;
+                    rowLength = scanlineStride;
+                    alignment = 1;
+                    break;
+                case BufferedImage.TYPE_USHORT_GRAY:
+                    throw new GLException("USHORT_GRAY n.a.");
+                    // Note: TYPE_INT_ARGB and TYPE_4BYTE_ABGR images go down the
+                    // custom code path to satisfy the invariant that images with an
+                    // alpha channel always go down with premultiplied alpha.
+                case BufferedImage.TYPE_INT_ARGB:
+                case BufferedImage.TYPE_4BYTE_ABGR:
+                case BufferedImage.TYPE_BYTE_BINARY:
+                case BufferedImage.TYPE_BYTE_INDEXED:
+                case BufferedImage.TYPE_CUSTOM:
+                default:
+                    ColorModel cm = image.getColorModel();
+                    if (cm.equals(rgbColorModel)) {
+                        pixelFormat = GL.GL_RGB;
+                        pixelType = GL.GL_UNSIGNED_BYTE;
+                        rowLength = scanlineStride / 3;
+                        alignment = 1;
+                    } else if (cm.equals(rgbaColorModel)) {
+                        pixelFormat = GL.GL_RGBA;
+                        pixelType = GL.GL_UNSIGNED_BYTE;
+                        rowLength = scanlineStride / 4; // FIXME: correct?
+                        alignment = 4;
+                    } else {
+                        setupLazyCustomConversion(image);
+                        return;
+                    }
+                    break;
+            }
+        }
+
+        createNIOBufferFromImage(image);
+    }
+
+    private void setupLazyCustomConversion(BufferedImage image) {
+        imageForLazyCustomConversion = image;
+        boolean hasAlpha = image.getColorModel().hasAlpha();
+        if (pixelFormat == 0) {
+            pixelFormat = hasAlpha ? GL.GL_RGBA : GL.GL_RGB;
+        }
+        alignment = 1; // FIXME: do we need better?
+        rowLength = width; // FIXME: correct in all cases?
+
+        // Allow previously-selected pixelType (if any) to override that
+        // we can infer from the DataBuffer
+        DataBuffer data = image.getRaster().getDataBuffer();
+        if (data instanceof DataBufferByte || isPackedInt(image)) {
+            // Don't use GL_UNSIGNED_INT for BufferedImage packed int images
+            if (pixelType == 0) pixelType = GL.GL_UNSIGNED_BYTE;
+        } else if (data instanceof DataBufferDouble) {
+            throw new RuntimeException("DataBufferDouble rasters not supported by OpenGL");
+        } else if (data instanceof DataBufferFloat) {
+            if (pixelType == 0) pixelType = GL.GL_FLOAT;
+        } else if (data instanceof DataBufferInt) {
+            // FIXME: should we support signed ints?
+            if (pixelType == 0) pixelType = GL2GL3.GL_UNSIGNED_INT;
+        } else if (data instanceof DataBufferShort) {
+            if (pixelType == 0) pixelType = GL.GL_SHORT;
+        } else if (data instanceof DataBufferUShort) {
+            if (pixelType == 0) pixelType = GL.GL_UNSIGNED_SHORT;
+        } else {
+            throw new RuntimeException("Unexpected DataBuffer type?");
+        }
+    }
+
+    private void createFromCustom(BufferedImage image) {
+        int width = image.getWidth();
+        int height = image.getHeight();
+
+        // create a temporary image that is compatible with OpenGL
+        boolean hasAlpha = image.getColorModel().hasAlpha();
+        ColorModel cm = null;
+        int dataBufferType = image.getRaster().getDataBuffer().getDataType();
+        // Don't use integer components for packed int images
+        if (isPackedInt(image)) {
+            dataBufferType = DataBuffer.TYPE_BYTE;
+        }
+        if (dataBufferType == DataBuffer.TYPE_BYTE) {
+            cm = hasAlpha ? rgbaColorModel : rgbColorModel;
+        } else {
+            if (hasAlpha) {
+                cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                             null, true, true,
+                                             Transparency.TRANSLUCENT,
+                                             dataBufferType);
+            } else {
+                cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                             null, false, false,
+                                             Transparency.OPAQUE,
+                                             dataBufferType);
+            }
+        }
+
+        boolean premult = cm.isAlphaPremultiplied();
+        WritableRaster raster =
+            cm.createCompatibleWritableRaster(width, height);
+        BufferedImage texImage = new BufferedImage(cm, raster, premult, null);
+
+        // copy the source image into the temporary image
+        Graphics2D g = texImage.createGraphics();
+        g.setComposite(AlphaComposite.Src);
+        g.drawImage(image, 0, 0, null);
+        g.dispose();
+
+        // Wrap the buffer from the temporary image
+        createNIOBufferFromImage(texImage);
+    }
+
+    private boolean isPackedInt(BufferedImage image) {
+        int imgType = image.getType();
+        return (imgType == BufferedImage.TYPE_INT_RGB ||
+                imgType == BufferedImage.TYPE_INT_BGR ||
+                imgType == BufferedImage.TYPE_INT_ARGB ||
+                imgType == BufferedImage.TYPE_INT_ARGB_PRE);
+    }
+
+    private void revertPixelFormatAndType() {
+        // Knowing we don't have e.g. OpenGL 1.2 functionality available,
+        // and knowing we're in the process of doing the fallback code
+        // path, re-infer a vanilla pixel format and type compatible with
+        // OpenGL 1.1
+        pixelFormat = 0;
+        pixelType = 0;
+        setupLazyCustomConversion(imageForLazyCustomConversion);
+    }
+
+    private void createNIOBufferFromImage(BufferedImage image) {
+        buffer = wrapImageDataBuffer(image);
+    }
+
+    private Buffer wrapImageDataBuffer(BufferedImage image) {
+        //
+        // Note: Grabbing the DataBuffer will defeat Java2D's image
+        // management mechanism (as of JDK 5/6, at least).  This shouldn't
+        // be a problem for most JOGL apps, but those that try to upload
+        // the image into an OpenGL texture and then use the same image in
+        // Java2D rendering might find the 2D rendering is not as fast as
+        // it could be.
+        //
+
+        DataBuffer data = image.getRaster().getDataBuffer();
+        if (data instanceof DataBufferByte) {
+            return ByteBuffer.wrap(((DataBufferByte) data).getData());
+        } else if (data instanceof DataBufferDouble) {
+            throw new RuntimeException("DataBufferDouble rasters not supported by OpenGL");
+        } else if (data instanceof DataBufferFloat) {
+            return FloatBuffer.wrap(((DataBufferFloat) data).getData());
+        } else if (data instanceof DataBufferInt) {
+            return IntBuffer.wrap(((DataBufferInt) data).getData());
+        } else if (data instanceof DataBufferShort) {
+            return ShortBuffer.wrap(((DataBufferShort) data).getData());
+        } else if (data instanceof DataBufferUShort) {
+            return ShortBuffer.wrap(((DataBufferUShort) data).getData());
+        } else {
+            throw new RuntimeException("Unexpected DataBuffer type?");
+        }
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureIO.java b/src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureIO.java
new file mode 100644
index 000000000..fdd1365f7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureIO.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture.awt;
+
+import java.awt.image.*;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.texture.*;
+
+public class AWTTextureIO extends TextureIO {
+    /**
+     * Creates a TextureData from the given BufferedImage. Does no
+     * OpenGL work.
+     * We assume a desktop GLProfile GL2GL3, otherwise use the other factory.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param image the BufferedImage containing the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture by autogenerating them
+     * @return the texture data from the image
+     *
+     * @see #newTextureData(GLProfile, BufferedImage, boolean)
+     */
+    public static TextureData newTextureData(GLProfile glp, BufferedImage image,
+                                             boolean mipmap) {
+        return newTextureDataImpl(glp, image, 0, 0, mipmap);
+    }
+
+    /**
+     * Creates a TextureData from the given BufferedImage, using the
+     * specified OpenGL internal format and pixel format for the texture
+     * which will eventually result. The internalFormat and pixelFormat
+     * must be specified and may not be zero; to use default values, use
+     * the variant of this method which does not take these
+     * arguments. Does no OpenGL work.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param image the BufferedImage containing the texture data
+     * @param internalFormat the OpenGL internal format of the texture
+     *                   which will eventually result from the TextureData
+     * @param pixelFormat the OpenGL pixel format of the texture
+     *                    which will eventually result from the TextureData
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     * @return the texture data from the image
+     * @throws IllegalArgumentException if either internalFormat or
+     *                                  pixelFormat was 0
+     */
+    public static TextureData newTextureData(GLProfile glp, BufferedImage image,
+                                             int internalFormat,
+                                             int pixelFormat,
+                                             boolean mipmap) throws IllegalArgumentException {
+        if ((internalFormat == 0) || (pixelFormat == 0)) {
+            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
+        }
+
+        return newTextureDataImpl(glp, image, internalFormat, pixelFormat, mipmap);
+    }
+
+    /** 
+     * Creates an OpenGL texture object from the specified BufferedImage
+     * using the current OpenGL context.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param image the BufferedImage from which to read the texture data
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture by autogenerating them
+     * @throws GLException if no OpenGL context is current or if an
+     *                     OpenGL error occurred
+     */
+    public static Texture newTexture(GLProfile glp, BufferedImage image, boolean mipmap) throws GLException {
+        TextureData data = newTextureData(glp, image, mipmap);
+        Texture texture = newTexture(data);
+        data.flush();
+        return texture;
+    }
+
+    private static TextureData newTextureDataImpl(GLProfile glp, 
+                                                  BufferedImage image,
+                                                  int internalFormat,
+                                                  int pixelFormat,
+                                                  boolean mipmap) {
+        return new AWTTextureData(glp, internalFormat, pixelFormat, mipmap, image);
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
new file mode 100755
index 000000000..4feeb9f4e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
@@ -0,0 +1,889 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture.spi;
+
+import java.io.*;
+import java.nio.*;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.*;
+
+/** A reader and writer for DirectDraw Surface (.dds) files, which are
+    used to describe textures. These files can contain multiple mipmap
+    levels in one file. This class is currently minimal and does not
+    support all of the possible file formats. */
+
+public class DDSImage {
+
+    /** Simple class describing images and data; does not encapsulate
+        image format information. User is responsible for transmitting
+        that information in another way. */
+
+    public static class ImageInfo {
+        private ByteBuffer data;
+        private int width;
+        private int height;
+        private boolean isCompressed;
+        private int compressionFormat;
+
+        public ImageInfo(ByteBuffer data, int width, int height, boolean compressed, int compressionFormat) {
+            this.data = data; this.width = width; this.height = height;
+            this.isCompressed = compressed; this.compressionFormat = compressionFormat;
+        }
+        public int        getWidth()  { return width;  }
+        public int        getHeight() { return height; }
+        public ByteBuffer getData()   { return data;   }
+        public boolean    isCompressed() { return isCompressed; }
+        public int        getCompressionFormat() {
+            if (!isCompressed())
+                throw new RuntimeException("Should not call unless compressed");
+            return compressionFormat;
+        }
+    }
+
+    private ByteBuffer buf;
+    private Header header;
+
+    //
+    // Selected bits in header flags
+    //
+
+    public static final int DDSD_CAPS            = 0x00000001; // Capacities are valid
+    public static final int DDSD_HEIGHT          = 0x00000002; // Height is valid
+    public static final int DDSD_WIDTH           = 0x00000004; // Width is valid
+    public static final int DDSD_PITCH           = 0x00000008; // Pitch is valid
+    public static final int DDSD_BACKBUFFERCOUNT = 0x00000020; // Back buffer count is valid
+    public static final int DDSD_ZBUFFERBITDEPTH = 0x00000040; // Z-buffer bit depth is valid (shouldn't be used in DDSURFACEDESC2)
+    public static final int DDSD_ALPHABITDEPTH   = 0x00000080; // Alpha bit depth is valid
+    public static final int DDSD_LPSURFACE       = 0x00000800; // lpSurface is valid
+    public static final int DDSD_PIXELFORMAT     = 0x00001000; // ddpfPixelFormat is valid
+    public static final int DDSD_MIPMAPCOUNT     = 0x00020000; // Mip map count is valid
+    public static final int DDSD_LINEARSIZE      = 0x00080000; // dwLinearSize is valid
+    public static final int DDSD_DEPTH           = 0x00800000; // dwDepth is valid
+
+    public static final int DDPF_ALPHAPIXELS     = 0x00000001; // Alpha channel is present
+    public static final int DDPF_ALPHA           = 0x00000002; // Only contains alpha information
+    public static final int DDPF_FOURCC          = 0x00000004; // FourCC code is valid
+    public static final int DDPF_PALETTEINDEXED4 = 0x00000008; // Surface is 4-bit color indexed
+    public static final int DDPF_PALETTEINDEXEDTO8 = 0x00000010; // Surface is indexed into a palette which stores indices
+    // into the destination surface's 8-bit palette
+    public static final int DDPF_PALETTEINDEXED8 = 0x00000020; // Surface is 8-bit color indexed
+    public static final int DDPF_RGB             = 0x00000040; // RGB data is present
+    public static final int DDPF_COMPRESSED      = 0x00000080; // Surface will accept pixel data in the format specified
+    // and compress it during the write
+    public static final int DDPF_RGBTOYUV        = 0x00000100; // Surface will accept RGB data and translate it during
+    // the write to YUV data. The format of the data to be written
+    // will be contained in the pixel format structure. The DDPF_RGB
+    // flag will be set.
+    public static final int DDPF_YUV             = 0x00000200; // Pixel format is YUV - YUV data in pixel format struct is valid
+    public static final int DDPF_ZBUFFER         = 0x00000400; // Pixel format is a z buffer only surface
+    public static final int DDPF_PALETTEINDEXED1 = 0x00000800; // Surface is 1-bit color indexed
+    public static final int DDPF_PALETTEINDEXED2 = 0x00001000; // Surface is 2-bit color indexed
+    public static final int DDPF_ZPIXELS         = 0x00002000; // Surface contains Z information in the pixels
+
+    // Selected bits in DDS capabilities flags
+    public static final int DDSCAPS_TEXTURE      = 0x00001000; // Can be used as a texture
+    public static final int DDSCAPS_MIPMAP       = 0x00400000; // Is one level of a mip-map
+    public static final int DDSCAPS_COMPLEX      = 0x00000008; // Complex surface structure, such as a cube map
+
+    // Selected bits in DDS extended capabilities flags
+    public static final int DDSCAPS2_CUBEMAP           = 0x00000200;
+    public static final int DDSCAPS2_CUBEMAP_POSITIVEX = 0x00000400;
+    public static final int DDSCAPS2_CUBEMAP_NEGATIVEX = 0x00000800;
+    public static final int DDSCAPS2_CUBEMAP_POSITIVEY = 0x00001000;
+    public static final int DDSCAPS2_CUBEMAP_NEGATIVEY = 0x00002000;
+    public static final int DDSCAPS2_CUBEMAP_POSITIVEZ = 0x00004000;
+    public static final int DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x00008000;
+
+    // Known pixel formats
+    public static final int D3DFMT_UNKNOWN   =  0;
+    public static final int D3DFMT_R8G8B8    =  20;
+    public static final int D3DFMT_A8R8G8B8  =  21;
+    public static final int D3DFMT_X8R8G8B8  =  22;
+    // The following are also valid FourCC codes
+    public static final int D3DFMT_DXT1      =  0x31545844;
+    public static final int D3DFMT_DXT2      =  0x32545844;
+    public static final int D3DFMT_DXT3      =  0x33545844;
+    public static final int D3DFMT_DXT4      =  0x34545844;
+    public static final int D3DFMT_DXT5      =  0x35545844;
+
+    /** Reads a DirectDraw surface from the specified file name,
+        returning the resulting DDSImage.
+
+        @param filename File name
+        @return DDS image object
+        @throws java.io.IOException if an I/O exception occurred
+    */
+    public static DDSImage read(String filename) throws IOException {
+        return read(new File(filename));
+    }
+  
+    /** Reads a DirectDraw surface from the specified file, returning
+        the resulting DDSImage.
+
+        @param file File object
+        @return DDS image object
+        @throws java.io.IOException if an I/O exception occurred
+    */
+    public static DDSImage read(File file) throws IOException {
+        DDSImage image = new DDSImage();
+        image.readFromFile(file);
+        return image;
+    }
+
+    /** Reads a DirectDraw surface from the specified InputStream, returning
+        the resulting DDSImage.
+
+        @param input Input stream
+        @return DDS image object
+        @throws java.io.IOException if an I/O exception occurred
+    */
+    public static DDSImage read(InputStream input) throws IOException {
+        DDSImage image = new DDSImage();
+        image.readFromStream(input);
+        return image;
+    }
+
+    /** Closes open files and resources associated with the open
+        DDSImage. No other methods may be called on this object once
+        this is called. */
+    public void close() {
+    }
+
+    /** 
+     * Creates a new DDSImage from data supplied by the user. The
+     * resulting DDSImage can be written to disk using the write()
+     * method.
+     *
+     * @param d3dFormat the D3DFMT_ constant describing the data; it is
+     *                  assumed that it is packed tightly
+     * @param width  the width in pixels of the topmost mipmap image
+     * @param height the height in pixels of the topmost mipmap image
+     * @param mipmapData the data for each mipmap level of the resulting
+     *                   DDSImage; either only one mipmap level should
+     *                   be specified, or they all must be
+     * @throws IllegalArgumentException if the data does not match the
+     *   specified arguments
+     * @return DDS image object
+     */
+    public static DDSImage createFromData(int d3dFormat,
+                                          int width,
+                                          int height,
+                                          ByteBuffer[] mipmapData) throws IllegalArgumentException {
+        DDSImage image = new DDSImage();
+        image.initFromData(d3dFormat, width, height, mipmapData);
+        return image;
+    }
+
+    /** Determines from the magic number whether the given InputStream
+        points to a DDS image. The given InputStream must return true
+        from markSupported() and support a minimum of four bytes of
+        read-ahead.
+
+        @param in Stream to check
+        @return true if input stream is DDS image or false otherwise
+        @throws java.io.IOException if an I/O exception occurred
+    */
+    public static boolean isDDSImage(InputStream in) throws IOException {
+        if (!(in instanceof BufferedInputStream)) {
+            in = new BufferedInputStream(in);
+        }
+        if (!in.markSupported()) {
+            throw new IOException("Can not test non-destructively whether given InputStream is a DDS image");
+        }
+        in.mark(4);
+        int magic = 0;
+        for (int i = 0; i < 4; i++) {
+            int tmp = in.read();
+            if (tmp < 0) {
+                in.reset();
+                return false;
+            }
+            magic = ((magic >>> 8) | (tmp << 24));
+        }
+        in.reset();
+        return (magic == MAGIC);
+    }
+
+    /**
+     * Writes this DDSImage to the specified file name.
+     * @param filename File name to write to
+     * @throws java.io.IOException if an I/O exception occurred
+     */
+    public void write(String filename) throws IOException {
+        write(new File(filename));
+    }
+
+    /**
+     * Writes this DDSImage to the specified file name.
+     * @param file File object to write to
+     * @throws java.io.IOException if an I/O exception occurred
+     */
+    public void write(File file) throws IOException {
+        LEDataOutputStream output =
+            new LEDataOutputStream(new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file))));
+        header.write(output);
+        output.write(buf.array());
+        output.close();
+    }
+
+    /** Test for presence/absence of surface description flags (DDSD_*)
+     * @param flag DDSD_* flags set to test
+     * @return true if flag present or false otherwise
+     */
+    public boolean isSurfaceDescFlagSet(int flag) {
+        return ((header.flags & flag) != 0);
+    }
+
+    /** Test for presence/absence of pixel format flags (DDPF_*) */
+    public boolean isPixelFormatFlagSet(int flag) {
+        return ((header.pfFlags & flag) != 0);
+    }
+
+    /** Gets the pixel format of this texture (D3DFMT_*) based on some
+        heuristics. Returns D3DFMT_UNKNOWN if could not recognize the
+        pixel format. */
+    public int getPixelFormat() {
+        if (isCompressed()) {
+            return getCompressionFormat();
+        } else if (isPixelFormatFlagSet(DDPF_RGB)) {
+            if (isPixelFormatFlagSet(DDPF_ALPHAPIXELS)) {
+                if (getDepth() == 32 &&
+                    header.pfRBitMask == 0x00FF0000 &&
+                    header.pfGBitMask == 0x0000FF00 &&
+                    header.pfBBitMask == 0x000000FF &&
+                    header.pfABitMask == 0xFF000000) {
+                    return D3DFMT_A8R8G8B8;
+                }
+            } else {
+                if (getDepth() == 24 &&
+                    header.pfRBitMask == 0x00FF0000 &&
+                    header.pfGBitMask == 0x0000FF00 &&
+                    header.pfBBitMask == 0x000000FF) {
+                    return D3DFMT_R8G8B8;
+                } else if (getDepth() == 32 &&
+                           header.pfRBitMask == 0x00FF0000 &&
+                           header.pfGBitMask == 0x0000FF00 &&
+                           header.pfBBitMask == 0x000000FF) {
+                    return D3DFMT_X8R8G8B8;
+                }
+            }
+        }
+
+        return D3DFMT_UNKNOWN;
+    }
+
+    /**
+     * Indicates whether this texture is cubemap
+     * @return true if cubemap or false otherwise
+     */
+    public boolean isCubemap() {
+        return ((header.ddsCaps1 & DDSCAPS_COMPLEX) != 0) && ((header.ddsCaps2 & DDSCAPS2_CUBEMAP) != 0);
+    }
+
+    /**
+     * Indicates whethe this cubemap side present
+     * @param side Side to test
+     * @return true if side present or false otherwise
+     */
+    public boolean isCubemapSidePresent(int side) {
+        return isCubemap() && (header.ddsCaps2 & side) != 0;
+    }
+
+    /** Indicates whether this texture is compressed. */
+    public boolean isCompressed() {
+        return (isPixelFormatFlagSet(DDPF_FOURCC));
+    }
+
+    /** If this surface is compressed, returns the kind of compression
+        used (DXT1..DXT5). */
+    public int getCompressionFormat() {
+        return header.pfFourCC;
+    }
+
+    /** Width of the texture (or the top-most mipmap if mipmaps are
+        present) */
+    public int getWidth() {
+        return header.width;
+    }
+
+    /** Height of the texture (or the top-most mipmap if mipmaps are
+        present) */
+    public int getHeight() {
+        return header.height;
+    }
+
+    /** Total number of bits per pixel. Only valid if DDPF_RGB is
+        present. For A8R8G8B8, would be 32. */
+    public int getDepth() {
+        return header.pfRGBBitCount;
+    }
+
+    /** Number of mip maps in the texture */
+    public int getNumMipMaps() {
+        if (!isSurfaceDescFlagSet(DDSD_MIPMAPCOUNT)) {
+            return 0;
+        }
+        return header.mipMapCountOrAux;
+    }
+
+    /** Gets the <i>i</i>th mipmap data (0..getNumMipMaps() - 1)
+     * @param map Mipmap index
+     * @return Image object
+     */
+    public ImageInfo getMipMap(int map) {
+        return getMipMap( 0, map );
+    }
+
+    /**
+     * Gets the <i>i</i>th mipmap data (0..getNumMipMaps() - 1)
+     * @param side Cubemap side or 0 for 2D texture
+     * @param map Mipmap index
+     * @return Image object
+     */
+    public ImageInfo getMipMap(int side, int map) {
+        if (!isCubemap() && (side != 0)) {
+            throw new RuntimeException( "Illegal side for 2D texture: " + side );
+        }
+        if (isCubemap() && !isCubemapSidePresent(side)) {
+            throw new RuntimeException( "Illegal side, side not present: " + side );
+        }
+        if (getNumMipMaps() > 0 &&
+            ((map < 0) || (map >= getNumMipMaps()))) {
+            throw new RuntimeException("Illegal mipmap number " + map + " (0.." + (getNumMipMaps() - 1) + ")");
+        }
+
+        // Figure out how far to seek
+        int seek = 0;
+        if (isCubemap()) {
+            seek += sideShiftInBytes(side);
+        }
+        for (int i = 0; i < map; i++) {
+            seek += mipMapSizeInBytes(i);
+        }
+        buf.limit(seek + mipMapSizeInBytes(map));
+        buf.position(seek);
+        ByteBuffer next = buf.slice();
+        buf.position(0);
+        buf.limit(buf.capacity());
+        return new ImageInfo(next, mipMapWidth(map), mipMapHeight(map), isCompressed(), getCompressionFormat());
+    }
+
+    /** Returns an array of ImageInfos corresponding to all mipmap
+        levels of this DDS file.
+        @return Mipmap image objects set
+    */
+    public ImageInfo[] getAllMipMaps() {
+        return getAllMipMaps(0);
+    }
+
+    /**
+     * Returns an array of ImageInfos corresponding to all mipmap
+     * levels of this DDS file.
+     * @param side Cubemap side or 0 for 2D texture
+     * @return Mipmap image objects set
+     */
+    public ImageInfo[] getAllMipMaps( int side ) {
+        int numLevels = getNumMipMaps();
+        if (numLevels == 0) {
+            numLevels = 1;
+        }
+        ImageInfo[] result = new ImageInfo[numLevels];
+        for (int i = 0; i < numLevels; i++) {
+            result[i] = getMipMap(side, i);
+        }
+        return result;
+    }
+
+    /** Converts e.g. DXT1 compression format constant (see {@link
+        #getCompressionFormat}) into "DXT1".
+        @param compressionFormat Compression format constant
+        @return String format code
+    */
+    public static String getCompressionFormatName(int compressionFormat) {
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < 4; i++) {
+            char c = (char) (compressionFormat & 0xFF);
+            buf.append(c);
+            compressionFormat = compressionFormat >> 8;
+        }
+        return buf.toString();
+    }
+
+    /** Allocates a temporary, empty ByteBuffer suitable for use in a
+        call to glCompressedTexImage2D. This is used by the Texture
+        class to expand non-power-of-two DDS compressed textures to
+        power-of-two sizes on hardware not supporting OpenGL 2.0 and the
+        NPOT texture extension. The specified OpenGL internal format
+        must be one of GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
+        GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
+        GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, or
+        GL_COMPRESSED_RGBA_S3TC_DXT5_EXT.
+    */
+    public static ByteBuffer allocateBlankBuffer(int width,
+                                                 int height,
+                                                 int openGLInternalFormat) {
+        int size = width * height;
+        switch (openGLInternalFormat) {
+        case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+        case GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+            size /= 2;
+            break;
+
+        case GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+        case GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+            break;
+
+        default:
+            throw new IllegalArgumentException("Illegal OpenGL texture internal format " +
+                                               openGLInternalFormat);
+        }
+        if (size == 0)
+            size = 1;
+        return BufferUtil.newByteBuffer(size);
+    }
+
+    public void debugPrint() {
+        PrintStream tty = System.err;
+        tty.println("Compressed texture: " + isCompressed());
+        if (isCompressed()) {
+            int fmt = getCompressionFormat();
+            String name = getCompressionFormatName(fmt);
+            tty.println("Compression format: 0x" + Integer.toHexString(fmt) + " (" + name + ")");
+        }
+        tty.println("Width: " + header.width + " Height: " + header.height);
+        tty.println("header.pitchOrLinearSize: " + header.pitchOrLinearSize);
+        tty.println("header.pfRBitMask: 0x" + Integer.toHexString(header.pfRBitMask));
+        tty.println("header.pfGBitMask: 0x" + Integer.toHexString(header.pfGBitMask));
+        tty.println("header.pfBBitMask: 0x" + Integer.toHexString(header.pfBBitMask));
+        tty.println("SurfaceDesc flags:");
+        boolean recognizedAny = false;
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_CAPS, "DDSD_CAPS");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_HEIGHT, "DDSD_HEIGHT");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_WIDTH, "DDSD_WIDTH");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_PITCH, "DDSD_PITCH");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_BACKBUFFERCOUNT, "DDSD_BACKBUFFERCOUNT");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_ZBUFFERBITDEPTH, "DDSD_ZBUFFERBITDEPTH");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_ALPHABITDEPTH, "DDSD_ALPHABITDEPTH");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_LPSURFACE, "DDSD_LPSURFACE");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_PIXELFORMAT, "DDSD_PIXELFORMAT");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_MIPMAPCOUNT, "DDSD_MIPMAPCOUNT");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_LINEARSIZE, "DDSD_LINEARSIZE");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_DEPTH, "DDSD_DEPTH");
+        if (!recognizedAny) {
+            tty.println("(none)");
+        }
+        tty.println("Raw SurfaceDesc flags: 0x" + Integer.toHexString(header.flags));
+        tty.println("Pixel format flags:");
+        recognizedAny = false;
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ALPHAPIXELS, "DDPF_ALPHAPIXELS");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ALPHA, "DDPF_ALPHA");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_FOURCC, "DDPF_FOURCC");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED4, "DDPF_PALETTEINDEXED4");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXEDTO8, "DDPF_PALETTEINDEXEDTO8");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED8, "DDPF_PALETTEINDEXED8");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_RGB, "DDPF_RGB");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_COMPRESSED, "DDPF_COMPRESSED");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_RGBTOYUV, "DDPF_RGBTOYUV");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_YUV, "DDPF_YUV");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ZBUFFER, "DDPF_ZBUFFER");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED1, "DDPF_PALETTEINDEXED1");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED2, "DDPF_PALETTEINDEXED2");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ZPIXELS, "DDPF_ZPIXELS");
+        if (!recognizedAny) {
+            tty.println("(none)");
+        }
+        tty.println("Raw pixel format flags: 0x" + Integer.toHexString(header.pfFlags));
+        tty.println("Depth: " + getDepth());
+        tty.println("Number of mip maps: " + getNumMipMaps());
+        int fmt = getPixelFormat();
+        tty.print("Pixel format: ");
+        switch (fmt) {
+        case D3DFMT_R8G8B8:   tty.println("D3DFMT_R8G8B8"); break;
+        case D3DFMT_A8R8G8B8: tty.println("D3DFMT_A8R8G8B8"); break;
+        case D3DFMT_X8R8G8B8: tty.println("D3DFMT_X8R8G8B8"); break;
+        case D3DFMT_DXT1:     tty.println("D3DFMT_DXT1"); break;
+        case D3DFMT_DXT2:     tty.println("D3DFMT_DXT2"); break;
+        case D3DFMT_DXT3:     tty.println("D3DFMT_DXT3"); break;
+        case D3DFMT_DXT4:     tty.println("D3DFMT_DXT4"); break;
+        case D3DFMT_DXT5:     tty.println("D3DFMT_DXT5"); break;
+        case D3DFMT_UNKNOWN:  tty.println("D3DFMT_UNKNOWN"); break;
+        default:              tty.println("(unknown pixel format " + fmt + ")"); break;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    private static final int MAGIC = 0x20534444;
+
+    static class Header {
+        int size;                 // size of the DDSURFACEDESC structure
+        int flags;                // determines what fields are valid
+        int height;               // height of surface to be created
+        int width;                // width of input surface
+        int pitchOrLinearSize;
+        int backBufferCountOrDepth;
+        int mipMapCountOrAux;     // number of mip-map levels requested (in this context)
+        int alphaBitDepth;        // depth of alpha buffer requested
+        int reserved1;            // reserved
+        int surface;              // pointer to the associated surface memory
+        // NOTE: following two entries are from DDCOLORKEY data structure
+        // Are overlaid with color for empty cubemap faces (unused in this reader)
+        int colorSpaceLowValue;
+        int colorSpaceHighValue;
+        int destBltColorSpaceLowValue;
+        int destBltColorSpaceHighValue;
+        int srcOverlayColorSpaceLowValue;
+        int srcOverlayColorSpaceHighValue;
+        int srcBltColorSpaceLowValue;
+        int srcBltColorSpaceHighValue;
+        // NOTE: following entries are from DDPIXELFORMAT data structure
+        // Are overlaid with flexible vertex format description of vertex
+        // buffers (unused in this reader)
+        int pfSize;                 // size of DDPIXELFORMAT structure
+        int pfFlags;                // pixel format flags
+        int pfFourCC;               // (FOURCC code)
+        // Following five entries have multiple interpretations, not just
+        // RGBA (but that's all we support right now)
+        int pfRGBBitCount;          // how many bits per pixel
+        int pfRBitMask;             // mask for red bits
+        int pfGBitMask;             // mask for green bits
+        int pfBBitMask;             // mask for blue bits
+        int pfABitMask;             // mask for alpha channel
+        int ddsCaps1;               // Texture and mip-map flags
+        int ddsCaps2;               // Advanced capabilities including cubemap support
+        int ddsCapsReserved1;
+        int ddsCapsReserved2;
+        int textureStage;           // stage in multitexture cascade
+
+        void read(LEDataInputStream input) throws IOException {
+            int magic                     = input.readInt();
+            if (magic != MAGIC) {
+                throw new IOException("Incorrect magic number 0x" +
+                                      Integer.toHexString(magic) +
+                                      " (expected " + MAGIC + ")");
+            }
+
+            size                          = input.readInt();
+            flags                         = input.readInt();
+            height                        = input.readInt();
+            width                         = input.readInt();
+            pitchOrLinearSize             = input.readInt();
+            backBufferCountOrDepth        = input.readInt();
+            mipMapCountOrAux              = input.readInt();
+            alphaBitDepth                 = input.readInt();
+            reserved1                     = input.readInt();
+            surface                       = input.readInt();
+            colorSpaceLowValue            = input.readInt();
+            colorSpaceHighValue           = input.readInt();
+            destBltColorSpaceLowValue     = input.readInt();
+            destBltColorSpaceHighValue    = input.readInt();
+            srcOverlayColorSpaceLowValue  = input.readInt();
+            srcOverlayColorSpaceHighValue = input.readInt();
+            srcBltColorSpaceLowValue      = input.readInt();
+            srcBltColorSpaceHighValue     = input.readInt();
+            pfSize                        = input.readInt();
+            pfFlags                       = input.readInt();
+            pfFourCC                      = input.readInt();
+            pfRGBBitCount                 = input.readInt();
+            pfRBitMask                    = input.readInt();
+            pfGBitMask                    = input.readInt();
+            pfBBitMask                    = input.readInt();
+            pfABitMask                    = input.readInt();
+            ddsCaps1                      = input.readInt();
+            ddsCaps2                      = input.readInt();
+            ddsCapsReserved1              = input.readInt();
+            ddsCapsReserved2              = input.readInt();
+            textureStage                  = input.readInt();
+        }
+
+        // buf must be in little-endian byte order
+        void write(LEDataOutputStream output) throws IOException {
+            output.writeInt(MAGIC);
+            output.writeInt(size);
+            output.writeInt(flags);
+            output.writeInt(height);
+            output.writeInt(width);
+            output.writeInt(pitchOrLinearSize);
+            output.writeInt(backBufferCountOrDepth);
+            output.writeInt(mipMapCountOrAux);
+            output.writeInt(alphaBitDepth);
+            output.writeInt(reserved1);
+            output.writeInt(surface);
+            output.writeInt(colorSpaceLowValue);
+            output.writeInt(colorSpaceHighValue);
+            output.writeInt(destBltColorSpaceLowValue);
+            output.writeInt(destBltColorSpaceHighValue);
+            output.writeInt(srcOverlayColorSpaceLowValue);
+            output.writeInt(srcOverlayColorSpaceHighValue);
+            output.writeInt(srcBltColorSpaceLowValue);
+            output.writeInt(srcBltColorSpaceHighValue);
+            output.writeInt(pfSize);
+            output.writeInt(pfFlags);
+            output.writeInt(pfFourCC);
+            output.writeInt(pfRGBBitCount);
+            output.writeInt(pfRBitMask);
+            output.writeInt(pfGBitMask);
+            output.writeInt(pfBBitMask);
+            output.writeInt(pfABitMask);
+            output.writeInt(ddsCaps1);
+            output.writeInt(ddsCaps2);
+            output.writeInt(ddsCapsReserved1);
+            output.writeInt(ddsCapsReserved2);
+            output.writeInt(textureStage);
+        }
+
+        private static int size() {
+            return 124;
+        }
+
+        private static int pfSize() {
+            return 32;
+        }
+
+        private static int writtenSize() {
+            return 128;
+        }
+    }
+
+    private DDSImage() {
+    }
+
+    private void readFromFile(File file) throws IOException {
+        readFromStream(new BufferedInputStream(new FileInputStream(file)));
+    }
+
+    private void readFromStream(InputStream input) throws IOException {
+        LEDataInputStream leInput = new LEDataInputStream(input);
+        header = new Header();
+        header.read(leInput);
+        fixupHeader();
+        buf = StreamUtil.readAll2Buffer(input);
+    }
+
+    private void initFromData(int d3dFormat,
+                              int width,
+                              int height,
+                              ByteBuffer[] mipmapData) throws IllegalArgumentException {
+        // Check size of mipmap data compared against format, width and
+        // height
+        int topmostMipmapSize = width * height;
+        int pitchOrLinearSize = width;
+        boolean isCompressed = false;
+        switch (d3dFormat) {
+        case D3DFMT_R8G8B8:   topmostMipmapSize *= 3; pitchOrLinearSize *= 3; break;
+        case D3DFMT_A8R8G8B8: topmostMipmapSize *= 4; pitchOrLinearSize *= 4; break;
+        case D3DFMT_X8R8G8B8: topmostMipmapSize *= 4; pitchOrLinearSize *= 4; break;
+        case D3DFMT_DXT1:
+        case D3DFMT_DXT2:
+        case D3DFMT_DXT3:
+        case D3DFMT_DXT4:
+        case D3DFMT_DXT5:
+            topmostMipmapSize = computeCompressedBlockSize(width, height, 1, d3dFormat);
+            pitchOrLinearSize = topmostMipmapSize;
+            isCompressed = true;
+            break;
+        default:
+            throw new IllegalArgumentException("d3dFormat must be one of the known formats");
+        }
+    
+        // Now check the mipmaps against this size
+        int curSize = topmostMipmapSize;
+        int totalSize = 0;
+        for (int i = 0; i < mipmapData.length; i++) {
+            if (mipmapData[i].remaining() != curSize) {
+                throw new IllegalArgumentException("Mipmap level " + i +
+                                                   " didn't match expected data size (expected " + curSize + ", got " +
+                                                   mipmapData[i].remaining() + ")");
+            }
+            curSize /= 4;
+            totalSize += mipmapData[i].remaining();
+        }
+
+        // OK, create one large byte array to hold all of the mipmap data
+        byte[] data = new byte[totalSize];
+        ByteBuffer buf = ByteBuffer.wrap(data);
+        for (int i = 0; i < mipmapData.length; i++) {
+            buf.put(mipmapData[i]);
+        }
+        this.buf = buf;
+    
+        // Allocate and initialize a Header
+        header = new Header();
+        header.size = Header.size();
+        header.flags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT;
+        if (mipmapData.length > 1) {
+            header.flags |= DDSD_MIPMAPCOUNT;
+            header.mipMapCountOrAux = mipmapData.length;
+        }
+        header.width = width;
+        header.height = height;
+        if (isCompressed) {
+            header.flags |= DDSD_LINEARSIZE;
+            header.pfFlags |= DDPF_FOURCC;
+            header.pfFourCC = d3dFormat;
+        } else {
+            header.flags |= DDSD_PITCH;
+            // Figure out the various settings from the pixel format
+            header.pfFlags |= DDPF_RGB;
+            switch (d3dFormat) {
+            case D3DFMT_R8G8B8:   header.pfRGBBitCount = 24; break;
+            case D3DFMT_A8R8G8B8: header.pfRGBBitCount = 32; header.pfFlags |= DDPF_ALPHAPIXELS; break;
+            case D3DFMT_X8R8G8B8: header.pfRGBBitCount = 32; break;
+            }
+            header.pfRBitMask = 0x00FF0000;
+            header.pfGBitMask = 0x0000FF00;
+            header.pfBBitMask = 0x000000FF;
+            if (d3dFormat == D3DFMT_A8R8G8B8) {
+                header.pfABitMask = 0xFF000000;
+            }
+        }
+        header.pitchOrLinearSize = pitchOrLinearSize;
+        header.pfSize = Header.pfSize();
+        // Not sure whether we can get away with leaving the rest of the
+        // header blank
+    }
+
+    // Microsoft doesn't follow their own specifications and the
+    // simplest conversion using the DxTex tool to e.g. a DXT3 texture
+    // results in an illegal .dds file without either DDSD_PITCH or
+    // DDSD_LINEARSIZE set in the header's flags. This code, adapted
+    // from the DevIL library, fixes up the header in these situations.
+    private void fixupHeader() {
+        if (isCompressed() && !isSurfaceDescFlagSet(DDSD_LINEARSIZE)) {
+            // Figure out how big the linear size should be
+            int depth = header.backBufferCountOrDepth;
+            if (depth == 0) {
+                depth = 1;
+            }
+
+            header.pitchOrLinearSize = computeCompressedBlockSize(getWidth(), getHeight(), depth, getCompressionFormat());
+            header.flags |= DDSD_LINEARSIZE;
+        }
+    }
+
+    private static int computeCompressedBlockSize(int width,
+                                                  int height,
+                                                  int depth,
+                                                  int compressionFormat) {
+        int blockSize = ((width + 3)/4) * ((height + 3)/4) * ((depth + 3)/4);
+        switch (compressionFormat) {
+        case D3DFMT_DXT1:  blockSize *=  8; break;
+        default:           blockSize *= 16; break;
+        }
+        return blockSize;
+    }
+
+    private int mipMapWidth(int map) {
+        int width = getWidth();
+        for (int i = 0; i < map; i++) {
+            width >>= 1;
+        }
+        return Math.max(width, 1);
+    }
+
+    private int mipMapHeight(int map) {
+        int height = getHeight();
+        for (int i = 0; i < map; i++) {
+            height >>= 1;
+        }
+        return Math.max(height, 1);
+    }
+
+    private int mipMapSizeInBytes(int map) {
+        int width  = mipMapWidth(map);
+        int height = mipMapHeight(map);
+        if (isCompressed()) {
+            int blockSize = (getCompressionFormat() == D3DFMT_DXT1 ? 8 : 16);
+            return ((width+3)/4)*((height+3)/4)*blockSize;
+        } else {
+            return width * height * (getDepth() / 8);
+        }
+    }
+
+    private int sideSizeInBytes() {
+        int numLevels = getNumMipMaps();
+        if (numLevels == 0) {
+            numLevels = 1;
+        }
+
+        int size = 0;
+        for (int i = 0; i < numLevels; i++) {
+            size += mipMapSizeInBytes(i);
+        }
+
+        return size;
+    }
+
+    private int sideShiftInBytes(int side) {
+        int[] sides = {
+            DDSCAPS2_CUBEMAP_POSITIVEX,
+            DDSCAPS2_CUBEMAP_NEGATIVEX,
+            DDSCAPS2_CUBEMAP_POSITIVEY,
+            DDSCAPS2_CUBEMAP_NEGATIVEY,
+            DDSCAPS2_CUBEMAP_POSITIVEZ,
+            DDSCAPS2_CUBEMAP_NEGATIVEZ
+        };
+
+        int shift = 0;
+        int sideSize = sideSizeInBytes();
+        for (int i = 0; i < sides.length; i++) {
+            int temp = sides[i];
+            if ((temp & side) != 0) {
+                return shift;
+            }
+
+            shift += sideSize;
+        }
+
+        throw new RuntimeException("Illegal side: " + side);
+    }
+
+    private boolean printIfRecognized(PrintStream tty, int flags, int flag, String what) {
+        if ((flags & flag) != 0) {
+            tty.println(what);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase
new file mode 100755
index 000000000..b1f18cc9e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase
@@ -0,0 +1,919 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture.spi;
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.*;
+
+/** A reader and writer for DirectDraw Surface (.dds) files, which are
+    used to describe textures. These files can contain multiple mipmap
+    levels in one file. This class is currently minimal and does not
+    support all of the possible file formats. */
+
+public class DDSImage {
+
+    /** Simple class describing images and data; does not encapsulate
+        image format information. User is responsible for transmitting
+        that information in another way. */
+
+    public static class ImageInfo {
+        private ByteBuffer data;
+        private int width;
+        private int height;
+        private boolean isCompressed;
+        private int compressionFormat;
+
+        public ImageInfo(ByteBuffer data, int width, int height, boolean compressed, int compressionFormat) {
+            this.data = data; this.width = width; this.height = height;
+            this.isCompressed = compressed; this.compressionFormat = compressionFormat;
+        }
+        public int        getWidth()  { return width;  }
+        public int        getHeight() { return height; }
+        public ByteBuffer getData()   { return data;   }
+        public boolean    isCompressed() { return isCompressed; }
+        public int        getCompressionFormat() {
+            if (!isCompressed())
+                throw new RuntimeException("Should not call unless compressed");
+            return compressionFormat;
+        }
+    }
+
+    private FileInputStream fis;
+    private FileChannel     chan;
+    private ByteBuffer buf;
+    private Header header;
+
+    //
+    // Selected bits in header flags
+    //
+
+    public static final int DDSD_CAPS            = 0x00000001; // Capacities are valid
+    public static final int DDSD_HEIGHT          = 0x00000002; // Height is valid
+    public static final int DDSD_WIDTH           = 0x00000004; // Width is valid
+    public static final int DDSD_PITCH           = 0x00000008; // Pitch is valid
+    public static final int DDSD_BACKBUFFERCOUNT = 0x00000020; // Back buffer count is valid
+    public static final int DDSD_ZBUFFERBITDEPTH = 0x00000040; // Z-buffer bit depth is valid (shouldn't be used in DDSURFACEDESC2)
+    public static final int DDSD_ALPHABITDEPTH   = 0x00000080; // Alpha bit depth is valid
+    public static final int DDSD_LPSURFACE       = 0x00000800; // lpSurface is valid
+    public static final int DDSD_PIXELFORMAT     = 0x00001000; // ddpfPixelFormat is valid
+    public static final int DDSD_MIPMAPCOUNT     = 0x00020000; // Mip map count is valid
+    public static final int DDSD_LINEARSIZE      = 0x00080000; // dwLinearSize is valid
+    public static final int DDSD_DEPTH           = 0x00800000; // dwDepth is valid
+
+    public static final int DDPF_ALPHAPIXELS     = 0x00000001; // Alpha channel is present
+    public static final int DDPF_ALPHA           = 0x00000002; // Only contains alpha information
+    public static final int DDPF_FOURCC          = 0x00000004; // FourCC code is valid
+    public static final int DDPF_PALETTEINDEXED4 = 0x00000008; // Surface is 4-bit color indexed
+    public static final int DDPF_PALETTEINDEXEDTO8 = 0x00000010; // Surface is indexed into a palette which stores indices
+    // into the destination surface's 8-bit palette
+    public static final int DDPF_PALETTEINDEXED8 = 0x00000020; // Surface is 8-bit color indexed
+    public static final int DDPF_RGB             = 0x00000040; // RGB data is present
+    public static final int DDPF_COMPRESSED      = 0x00000080; // Surface will accept pixel data in the format specified
+    // and compress it during the write
+    public static final int DDPF_RGBTOYUV        = 0x00000100; // Surface will accept RGB data and translate it during
+    // the write to YUV data. The format of the data to be written
+    // will be contained in the pixel format structure. The DDPF_RGB
+    // flag will be set.
+    public static final int DDPF_YUV             = 0x00000200; // Pixel format is YUV - YUV data in pixel format struct is valid
+    public static final int DDPF_ZBUFFER         = 0x00000400; // Pixel format is a z buffer only surface
+    public static final int DDPF_PALETTEINDEXED1 = 0x00000800; // Surface is 1-bit color indexed
+    public static final int DDPF_PALETTEINDEXED2 = 0x00001000; // Surface is 2-bit color indexed
+    public static final int DDPF_ZPIXELS         = 0x00002000; // Surface contains Z information in the pixels
+
+    // Selected bits in DDS capabilities flags
+    public static final int DDSCAPS_TEXTURE      = 0x00001000; // Can be used as a texture
+    public static final int DDSCAPS_MIPMAP       = 0x00400000; // Is one level of a mip-map
+    public static final int DDSCAPS_COMPLEX      = 0x00000008; // Complex surface structure, such as a cube map
+
+    // Selected bits in DDS extended capabilities flags
+    public static final int DDSCAPS2_CUBEMAP           = 0x00000200;
+    public static final int DDSCAPS2_CUBEMAP_POSITIVEX = 0x00000400;
+    public static final int DDSCAPS2_CUBEMAP_NEGATIVEX = 0x00000800;
+    public static final int DDSCAPS2_CUBEMAP_POSITIVEY = 0x00001000;
+    public static final int DDSCAPS2_CUBEMAP_NEGATIVEY = 0x00002000;
+    public static final int DDSCAPS2_CUBEMAP_POSITIVEZ = 0x00004000;
+    public static final int DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x00008000;
+
+    // Known pixel formats
+    public static final int D3DFMT_UNKNOWN   =  0;
+    public static final int D3DFMT_R8G8B8    =  20;
+    public static final int D3DFMT_A8R8G8B8  =  21;
+    public static final int D3DFMT_X8R8G8B8  =  22;
+    // The following are also valid FourCC codes
+    public static final int D3DFMT_DXT1      =  0x31545844;
+    public static final int D3DFMT_DXT2      =  0x32545844;
+    public static final int D3DFMT_DXT3      =  0x33545844;
+    public static final int D3DFMT_DXT4      =  0x34545844;
+    public static final int D3DFMT_DXT5      =  0x35545844;
+
+    /** Reads a DirectDraw surface from the specified file name,
+        returning the resulting DDSImage.
+
+        @param filename File name
+        @return DDS image object
+        @throws java.io.IOException if an I/O exception occurred
+    */
+    public static DDSImage read(String filename) throws IOException {
+        return read(new File(filename));
+    }
+  
+    /** Reads a DirectDraw surface from the specified file, returning
+        the resulting DDSImage.
+
+        @param file File object
+        @return DDS image object
+        @throws java.io.IOException if an I/O exception occurred
+    */
+    public static DDSImage read(File file) throws IOException {
+        DDSImage image = new DDSImage();
+        image.readFromFile(file);
+        return image;
+    }
+
+    /** Reads a DirectDraw surface from the specified ByteBuffer, returning
+        the resulting DDSImage.
+
+        @param buf Input data
+        @return DDS image object
+        @throws java.io.IOException if an I/O exception occurred
+    */
+    public static DDSImage read(ByteBuffer buf) throws IOException {
+        DDSImage image = new DDSImage();
+        image.readFromBuffer(buf);
+        return image;
+    }
+
+    /** Closes open files and resources associated with the open
+        DDSImage. No other methods may be called on this object once
+        this is called. */
+    public void close() {
+        try {
+            if (chan != null) {
+                chan.close();
+                chan = null;
+            }
+            if (fis != null) {
+                fis.close();
+                fis = null;
+            }
+            buf = null;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /** 
+     * Creates a new DDSImage from data supplied by the user. The
+     * resulting DDSImage can be written to disk using the write()
+     * method.
+     *
+     * @param d3dFormat the D3DFMT_ constant describing the data; it is
+     *                  assumed that it is packed tightly
+     * @param width  the width in pixels of the topmost mipmap image
+     * @param height the height in pixels of the topmost mipmap image
+     * @param mipmapData the data for each mipmap level of the resulting
+     *                   DDSImage; either only one mipmap level should
+     *                   be specified, or they all must be
+     * @throws IllegalArgumentException if the data does not match the
+     *   specified arguments
+     * @return DDS image object
+     */
+    public static DDSImage createFromData(int d3dFormat,
+                                          int width,
+                                          int height,
+                                          ByteBuffer[] mipmapData) throws IllegalArgumentException {
+        DDSImage image = new DDSImage();
+        image.initFromData(d3dFormat, width, height, mipmapData);
+        return image;
+    }
+
+    /** Determines from the magic number whether the given InputStream
+        points to a DDS image. The given InputStream must return true
+        from markSupported() and support a minimum of four bytes of
+        read-ahead.
+
+        @param in Stream to check
+        @return true if input stream is DDS image or false otherwise
+        @throws java.io.IOException if an I/O exception occurred
+    */
+    public static boolean isDDSImage(InputStream in) throws IOException {
+        if (!(in instanceof BufferedInputStream)) {
+            in = new BufferedInputStream(in);
+        }
+        if (!in.markSupported()) {
+            throw new IOException("Can not test non-destructively whether given InputStream is a DDS image");
+        }
+        in.mark(4);
+        int magic = 0;
+        for (int i = 0; i < 4; i++) {
+            int tmp = in.read();
+            if (tmp < 0) {
+                in.reset();
+                return false;
+            }
+            magic = ((magic >>> 8) | (tmp << 24));
+        }
+        in.reset();
+        return (magic == MAGIC);
+    }
+
+    /**
+     * Writes this DDSImage to the specified file name.
+     * @param filename File name to write to
+     * @throws java.io.IOException if an I/O exception occurred
+     */
+    public void write(String filename) throws IOException {
+        write(new File(filename));
+    }
+
+    /**
+     * Writes this DDSImage to the specified file name.
+     * @param file File object to write to
+     * @throws java.io.IOException if an I/O exception occurred
+     */
+    public void write(File file) throws IOException {
+        FileOutputStream stream = new FileOutputStream(file);
+        FileChannel chan = stream.getChannel();
+        // Create ByteBuffer for header in case the start of our
+        // ByteBuffer isn't actually memory-mapped
+        ByteBuffer hdr = ByteBuffer.allocate(Header.writtenSize());
+        hdr.order(ByteOrder.LITTLE_ENDIAN);
+        header.write(hdr);
+        hdr.rewind();
+        chan.write(hdr);
+        buf.position(Header.writtenSize());
+        chan.write(buf);
+        chan.force(true);
+        chan.close();
+        stream.close();
+    }
+
+    /** Test for presence/absence of surface description flags (DDSD_*)
+     * @param flag DDSD_* flags set to test
+     * @return true if flag present or false otherwise
+     */
+    public boolean isSurfaceDescFlagSet(int flag) {
+        return ((header.flags & flag) != 0);
+    }
+
+    /** Test for presence/absence of pixel format flags (DDPF_*) */
+    public boolean isPixelFormatFlagSet(int flag) {
+        return ((header.pfFlags & flag) != 0);
+    }
+
+    /** Gets the pixel format of this texture (D3DFMT_*) based on some
+        heuristics. Returns D3DFMT_UNKNOWN if could not recognize the
+        pixel format. */
+    public int getPixelFormat() {
+        if (isCompressed()) {
+            return getCompressionFormat();
+        } else if (isPixelFormatFlagSet(DDPF_RGB)) {
+            if (isPixelFormatFlagSet(DDPF_ALPHAPIXELS)) {
+                if (getDepth() == 32 &&
+                    header.pfRBitMask == 0x00FF0000 &&
+                    header.pfGBitMask == 0x0000FF00 &&
+                    header.pfBBitMask == 0x000000FF &&
+                    header.pfABitMask == 0xFF000000) {
+                    return D3DFMT_A8R8G8B8;
+                }
+            } else {
+                if (getDepth() == 24 &&
+                    header.pfRBitMask == 0x00FF0000 &&
+                    header.pfGBitMask == 0x0000FF00 &&
+                    header.pfBBitMask == 0x000000FF) {
+                    return D3DFMT_R8G8B8;
+                } else if (getDepth() == 32 &&
+                           header.pfRBitMask == 0x00FF0000 &&
+                           header.pfGBitMask == 0x0000FF00 &&
+                           header.pfBBitMask == 0x000000FF) {
+                    return D3DFMT_X8R8G8B8;
+                }
+            }
+        }
+
+        return D3DFMT_UNKNOWN;
+    }
+
+    /**
+     * Indicates whether this texture is cubemap
+     * @return true if cubemap or false otherwise
+     */
+    public boolean isCubemap() {
+        return ((header.ddsCaps1 & DDSCAPS_COMPLEX) != 0) && ((header.ddsCaps2 & DDSCAPS2_CUBEMAP) != 0);
+    }
+
+    /**
+     * Indicates whethe this cubemap side present
+     * @param side Side to test
+     * @return true if side present or false otherwise
+     */
+    public boolean isCubemapSidePresent(int side) {
+        return isCubemap() && (header.ddsCaps2 & side) != 0;
+    }
+
+    /** Indicates whether this texture is compressed. */
+    public boolean isCompressed() {
+        return (isPixelFormatFlagSet(DDPF_FOURCC));
+    }
+
+    /** If this surface is compressed, returns the kind of compression
+        used (DXT1..DXT5). */
+    public int getCompressionFormat() {
+        return header.pfFourCC;
+    }
+
+    /** Width of the texture (or the top-most mipmap if mipmaps are
+        present) */
+    public int getWidth() {
+        return header.width;
+    }
+
+    /** Height of the texture (or the top-most mipmap if mipmaps are
+        present) */
+    public int getHeight() {
+        return header.height;
+    }
+
+    /** Total number of bits per pixel. Only valid if DDPF_RGB is
+        present. For A8R8G8B8, would be 32. */
+    public int getDepth() {
+        return header.pfRGBBitCount;
+    }
+
+    /** Number of mip maps in the texture */
+    public int getNumMipMaps() {
+        if (!isSurfaceDescFlagSet(DDSD_MIPMAPCOUNT)) {
+            return 0;
+        }
+        return header.mipMapCountOrAux;
+    }
+
+    /** Gets the <i>i</i>th mipmap data (0..getNumMipMaps() - 1)
+     * @param map Mipmap index
+     * @return Image object
+     */
+    public ImageInfo getMipMap(int map) {
+        return getMipMap( 0, map );
+    }
+
+    /**
+     * Gets the <i>i</i>th mipmap data (0..getNumMipMaps() - 1)
+     * @param side Cubemap side or 0 for 2D texture
+     * @param map Mipmap index
+     * @return Image object
+     */
+    public ImageInfo getMipMap(int side, int map) {
+        if (!isCubemap() && (side != 0)) {
+            throw new RuntimeException( "Illegal side for 2D texture: " + side );
+        }
+        if (isCubemap() && !isCubemapSidePresent(side)) {
+            throw new RuntimeException( "Illegal side, side not present: " + side );
+        }
+        if (getNumMipMaps() > 0 &&
+            ((map < 0) || (map >= getNumMipMaps()))) {
+            throw new RuntimeException("Illegal mipmap number " + map + " (0.." + (getNumMipMaps() - 1) + ")");
+        }
+
+        // Figure out how far to seek
+        int seek = Header.writtenSize();
+        if (isCubemap()) {
+            seek += sideShiftInBytes(side);
+        }
+        for (int i = 0; i < map; i++) {
+            seek += mipMapSizeInBytes(i);
+        }
+        buf.limit(seek + mipMapSizeInBytes(map));
+        buf.position(seek);
+        ByteBuffer next = buf.slice();
+        buf.position(0);
+        buf.limit(buf.capacity());
+        return new ImageInfo(next, mipMapWidth(map), mipMapHeight(map), isCompressed(), getCompressionFormat());
+    }
+
+    /** Returns an array of ImageInfos corresponding to all mipmap
+        levels of this DDS file.
+        @return Mipmap image objects set
+    */
+    public ImageInfo[] getAllMipMaps() {
+        return getAllMipMaps(0);
+    }
+
+    /**
+     * Returns an array of ImageInfos corresponding to all mipmap
+     * levels of this DDS file.
+     * @param side Cubemap side or 0 for 2D texture
+     * @return Mipmap image objects set
+     */
+    public ImageInfo[] getAllMipMaps( int side ) {
+        int numLevels = getNumMipMaps();
+        if (numLevels == 0) {
+            numLevels = 1;
+        }
+        ImageInfo[] result = new ImageInfo[numLevels];
+        for (int i = 0; i < numLevels; i++) {
+            result[i] = getMipMap(side, i);
+        }
+        return result;
+    }
+
+    /** Converts e.g. DXT1 compression format constant (see {@link
+        #getCompressionFormat}) into "DXT1".
+        @param compressionFormat Compression format constant
+        @return String format code
+    */
+    public static String getCompressionFormatName(int compressionFormat) {
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < 4; i++) {
+            char c = (char) (compressionFormat & 0xFF);
+            buf.append(c);
+            compressionFormat = compressionFormat >> 8;
+        }
+        return buf.toString();
+    }
+
+    /** Allocates a temporary, empty ByteBuffer suitable for use in a
+        call to glCompressedTexImage2D. This is used by the Texture
+        class to expand non-power-of-two DDS compressed textures to
+        power-of-two sizes on hardware not supporting OpenGL 2.0 and the
+        NPOT texture extension. The specified OpenGL internal format
+        must be one of GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
+        GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
+        GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, or
+        GL_COMPRESSED_RGBA_S3TC_DXT5_EXT.
+    */
+    public static ByteBuffer allocateBlankBuffer(int width,
+                                                 int height,
+                                                 int openGLInternalFormat) {
+        int size = width * height;
+        switch (openGLInternalFormat) {
+        case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+        case GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+            size /= 2;
+            break;
+
+        case GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+        case GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+            break;
+
+        default:
+            throw new IllegalArgumentException("Illegal OpenGL texture internal format " +
+                                               openGLInternalFormat);
+        }
+        if (size == 0)
+            size = 1;
+        return BufferUtil.newByteBuffer(size);
+    }
+
+    public void debugPrint() {
+        PrintStream tty = System.err;
+        tty.println("Compressed texture: " + isCompressed());
+        if (isCompressed()) {
+            int fmt = getCompressionFormat();
+            String name = getCompressionFormatName(fmt);
+            tty.println("Compression format: 0x" + Integer.toHexString(fmt) + " (" + name + ")");
+        }
+        tty.println("Width: " + header.width + " Height: " + header.height);
+        tty.println("header.pitchOrLinearSize: " + header.pitchOrLinearSize);
+        tty.println("header.pfRBitMask: 0x" + Integer.toHexString(header.pfRBitMask));
+        tty.println("header.pfGBitMask: 0x" + Integer.toHexString(header.pfGBitMask));
+        tty.println("header.pfBBitMask: 0x" + Integer.toHexString(header.pfBBitMask));
+        tty.println("SurfaceDesc flags:");
+        boolean recognizedAny = false;
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_CAPS, "DDSD_CAPS");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_HEIGHT, "DDSD_HEIGHT");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_WIDTH, "DDSD_WIDTH");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_PITCH, "DDSD_PITCH");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_BACKBUFFERCOUNT, "DDSD_BACKBUFFERCOUNT");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_ZBUFFERBITDEPTH, "DDSD_ZBUFFERBITDEPTH");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_ALPHABITDEPTH, "DDSD_ALPHABITDEPTH");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_LPSURFACE, "DDSD_LPSURFACE");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_PIXELFORMAT, "DDSD_PIXELFORMAT");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_MIPMAPCOUNT, "DDSD_MIPMAPCOUNT");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_LINEARSIZE, "DDSD_LINEARSIZE");
+        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_DEPTH, "DDSD_DEPTH");
+        if (!recognizedAny) {
+            tty.println("(none)");
+        }
+        tty.println("Raw SurfaceDesc flags: 0x" + Integer.toHexString(header.flags));
+        tty.println("Pixel format flags:");
+        recognizedAny = false;
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ALPHAPIXELS, "DDPF_ALPHAPIXELS");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ALPHA, "DDPF_ALPHA");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_FOURCC, "DDPF_FOURCC");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED4, "DDPF_PALETTEINDEXED4");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXEDTO8, "DDPF_PALETTEINDEXEDTO8");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED8, "DDPF_PALETTEINDEXED8");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_RGB, "DDPF_RGB");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_COMPRESSED, "DDPF_COMPRESSED");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_RGBTOYUV, "DDPF_RGBTOYUV");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_YUV, "DDPF_YUV");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ZBUFFER, "DDPF_ZBUFFER");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED1, "DDPF_PALETTEINDEXED1");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED2, "DDPF_PALETTEINDEXED2");
+        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ZPIXELS, "DDPF_ZPIXELS");
+        if (!recognizedAny) {
+            tty.println("(none)");
+        }
+        tty.println("Raw pixel format flags: 0x" + Integer.toHexString(header.pfFlags));
+        tty.println("Depth: " + getDepth());
+        tty.println("Number of mip maps: " + getNumMipMaps());
+        int fmt = getPixelFormat();
+        tty.print("Pixel format: ");
+        switch (fmt) {
+        case D3DFMT_R8G8B8:   tty.println("D3DFMT_R8G8B8"); break;
+        case D3DFMT_A8R8G8B8: tty.println("D3DFMT_A8R8G8B8"); break;
+        case D3DFMT_X8R8G8B8: tty.println("D3DFMT_X8R8G8B8"); break;
+        case D3DFMT_DXT1:     tty.println("D3DFMT_DXT1"); break;
+        case D3DFMT_DXT2:     tty.println("D3DFMT_DXT2"); break;
+        case D3DFMT_DXT3:     tty.println("D3DFMT_DXT3"); break;
+        case D3DFMT_DXT4:     tty.println("D3DFMT_DXT4"); break;
+        case D3DFMT_DXT5:     tty.println("D3DFMT_DXT5"); break;
+        case D3DFMT_UNKNOWN:  tty.println("D3DFMT_UNKNOWN"); break;
+        default:              tty.println("(unknown pixel format " + fmt + ")"); break;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    private static final int MAGIC = 0x20534444;
+
+    static class Header {
+        int size;                 // size of the DDSURFACEDESC structure
+        int flags;                // determines what fields are valid
+        int height;               // height of surface to be created
+        int width;                // width of input surface
+        int pitchOrLinearSize;
+        int backBufferCountOrDepth;
+        int mipMapCountOrAux;     // number of mip-map levels requested (in this context)
+        int alphaBitDepth;        // depth of alpha buffer requested
+        int reserved1;            // reserved
+        int surface;              // pointer to the associated surface memory
+        // NOTE: following two entries are from DDCOLORKEY data structure
+        // Are overlaid with color for empty cubemap faces (unused in this reader)
+        int colorSpaceLowValue;
+        int colorSpaceHighValue;
+        int destBltColorSpaceLowValue;
+        int destBltColorSpaceHighValue;
+        int srcOverlayColorSpaceLowValue;
+        int srcOverlayColorSpaceHighValue;
+        int srcBltColorSpaceLowValue;
+        int srcBltColorSpaceHighValue;
+        // NOTE: following entries are from DDPIXELFORMAT data structure
+        // Are overlaid with flexible vertex format description of vertex
+        // buffers (unused in this reader)
+        int pfSize;                 // size of DDPIXELFORMAT structure
+        int pfFlags;                // pixel format flags
+        int pfFourCC;               // (FOURCC code)
+        // Following five entries have multiple interpretations, not just
+        // RGBA (but that's all we support right now)
+        int pfRGBBitCount;          // how many bits per pixel
+        int pfRBitMask;             // mask for red bits
+        int pfGBitMask;             // mask for green bits
+        int pfBBitMask;             // mask for blue bits
+        int pfABitMask;             // mask for alpha channel
+        int ddsCaps1;               // Texture and mip-map flags
+        int ddsCaps2;               // Advanced capabilities including cubemap support
+        int ddsCapsReserved1;
+        int ddsCapsReserved2;
+        int textureStage;           // stage in multitexture cascade
+
+        void read(ByteBuffer buf) throws IOException {
+            int magic                     = buf.getInt();
+            if (magic != MAGIC) {
+                throw new IOException("Incorrect magic number 0x" +
+                                      Integer.toHexString(magic) +
+                                      " (expected " + MAGIC + ")");
+            }
+
+            size                          = buf.getInt();
+            flags                         = buf.getInt();
+            height                        = buf.getInt();
+            width                         = buf.getInt();
+            pitchOrLinearSize             = buf.getInt();
+            backBufferCountOrDepth        = buf.getInt();
+            mipMapCountOrAux              = buf.getInt();
+            alphaBitDepth                 = buf.getInt();
+            reserved1                     = buf.getInt();
+            surface                       = buf.getInt();
+            colorSpaceLowValue            = buf.getInt();
+            colorSpaceHighValue           = buf.getInt();
+            destBltColorSpaceLowValue     = buf.getInt();
+            destBltColorSpaceHighValue    = buf.getInt();
+            srcOverlayColorSpaceLowValue  = buf.getInt();
+            srcOverlayColorSpaceHighValue = buf.getInt();
+            srcBltColorSpaceLowValue      = buf.getInt();
+            srcBltColorSpaceHighValue     = buf.getInt();
+            pfSize                        = buf.getInt();
+            pfFlags                       = buf.getInt();
+            pfFourCC                      = buf.getInt();
+            pfRGBBitCount                 = buf.getInt();
+            pfRBitMask                    = buf.getInt();
+            pfGBitMask                    = buf.getInt();
+            pfBBitMask                    = buf.getInt();
+            pfABitMask                    = buf.getInt();
+            ddsCaps1                      = buf.getInt();
+            ddsCaps2                      = buf.getInt();
+            ddsCapsReserved1              = buf.getInt();
+            ddsCapsReserved2              = buf.getInt();
+            textureStage                  = buf.getInt();
+        }
+
+        // buf must be in little-endian byte order
+        void write(ByteBuffer buf) {
+            buf.putInt(MAGIC);
+            buf.putInt(size);
+            buf.putInt(flags);
+            buf.putInt(height);
+            buf.putInt(width);
+            buf.putInt(pitchOrLinearSize);
+            buf.putInt(backBufferCountOrDepth);
+            buf.putInt(mipMapCountOrAux);
+            buf.putInt(alphaBitDepth);
+            buf.putInt(reserved1);
+            buf.putInt(surface);
+            buf.putInt(colorSpaceLowValue);
+            buf.putInt(colorSpaceHighValue);
+            buf.putInt(destBltColorSpaceLowValue);
+            buf.putInt(destBltColorSpaceHighValue);
+            buf.putInt(srcOverlayColorSpaceLowValue);
+            buf.putInt(srcOverlayColorSpaceHighValue);
+            buf.putInt(srcBltColorSpaceLowValue);
+            buf.putInt(srcBltColorSpaceHighValue);
+            buf.putInt(pfSize);
+            buf.putInt(pfFlags);
+            buf.putInt(pfFourCC);
+            buf.putInt(pfRGBBitCount);
+            buf.putInt(pfRBitMask);
+            buf.putInt(pfGBitMask);
+            buf.putInt(pfBBitMask);
+            buf.putInt(pfABitMask);
+            buf.putInt(ddsCaps1);
+            buf.putInt(ddsCaps2);
+            buf.putInt(ddsCapsReserved1);
+            buf.putInt(ddsCapsReserved2);
+            buf.putInt(textureStage);
+        }
+
+        private static int size() {
+            return 124;
+        }
+
+        private static int pfSize() {
+            return 32;
+        }
+
+        private static int writtenSize() {
+            return 128;
+        }
+    }
+
+    private DDSImage() {
+    }
+
+    private void readFromFile(File file) throws IOException {
+        fis = new FileInputStream(file);
+        chan = fis.getChannel();
+        ByteBuffer buf = chan.map(FileChannel.MapMode.READ_ONLY,
+                                  0, (int) file.length());
+        readFromBuffer(buf);
+    }
+
+    private void readFromBuffer(ByteBuffer buf) throws IOException {
+        this.buf = buf;
+        buf.order(ByteOrder.LITTLE_ENDIAN);
+        header = new Header();
+        header.read(buf);
+        fixupHeader();
+    }
+
+    private void initFromData(int d3dFormat,
+                              int width,
+                              int height,
+                              ByteBuffer[] mipmapData) throws IllegalArgumentException {
+        // Check size of mipmap data compared against format, width and
+        // height
+        int topmostMipmapSize = width * height;
+        int pitchOrLinearSize = width;
+        boolean isCompressed = false;
+        switch (d3dFormat) {
+        case D3DFMT_R8G8B8:   topmostMipmapSize *= 3; pitchOrLinearSize *= 3; break;
+        case D3DFMT_A8R8G8B8: topmostMipmapSize *= 4; pitchOrLinearSize *= 4; break;
+        case D3DFMT_X8R8G8B8: topmostMipmapSize *= 4; pitchOrLinearSize *= 4; break;
+        case D3DFMT_DXT1:
+        case D3DFMT_DXT2:
+        case D3DFMT_DXT3:
+        case D3DFMT_DXT4:
+        case D3DFMT_DXT5:
+            topmostMipmapSize = computeCompressedBlockSize(width, height, 1, d3dFormat);
+            pitchOrLinearSize = topmostMipmapSize;
+            isCompressed = true;
+            break;
+        default:
+            throw new IllegalArgumentException("d3dFormat must be one of the known formats");
+        }
+    
+        // Now check the mipmaps against this size
+        int curSize = topmostMipmapSize;
+        int totalSize = 0;
+        for (int i = 0; i < mipmapData.length; i++) {
+            if (mipmapData[i].remaining() != curSize) {
+                throw new IllegalArgumentException("Mipmap level " + i +
+                                                   " didn't match expected data size (expected " + curSize + ", got " +
+                                                   mipmapData[i].remaining() + ")");
+            }
+            curSize /= 4;
+            totalSize += mipmapData[i].remaining();
+        }
+
+        // OK, create one large ByteBuffer to hold all of the mipmap data
+        totalSize += Header.writtenSize();
+        ByteBuffer buf = ByteBuffer.allocate(totalSize);
+        buf.position(Header.writtenSize());
+        for (int i = 0; i < mipmapData.length; i++) {
+            buf.put(mipmapData[i]);
+        }
+        this.buf = buf;
+    
+        // Allocate and initialize a Header
+        header = new Header();
+        header.size = Header.size();
+        header.flags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT;
+        if (mipmapData.length > 1) {
+            header.flags |= DDSD_MIPMAPCOUNT;
+            header.mipMapCountOrAux = mipmapData.length;
+        }
+        header.width = width;
+        header.height = height;
+        if (isCompressed) {
+            header.flags |= DDSD_LINEARSIZE;
+            header.pfFlags |= DDPF_FOURCC;
+            header.pfFourCC = d3dFormat;
+        } else {
+            header.flags |= DDSD_PITCH;
+            // Figure out the various settings from the pixel format
+            header.pfFlags |= DDPF_RGB;
+            switch (d3dFormat) {
+            case D3DFMT_R8G8B8:   header.pfRGBBitCount = 24; break;
+            case D3DFMT_A8R8G8B8: header.pfRGBBitCount = 32; header.pfFlags |= DDPF_ALPHAPIXELS; break;
+            case D3DFMT_X8R8G8B8: header.pfRGBBitCount = 32; break;
+            }
+            header.pfRBitMask = 0x00FF0000;
+            header.pfGBitMask = 0x0000FF00;
+            header.pfBBitMask = 0x000000FF;
+            if (d3dFormat == D3DFMT_A8R8G8B8) {
+                header.pfABitMask = 0xFF000000;
+            }
+        }
+        header.pitchOrLinearSize = pitchOrLinearSize;
+        header.pfSize = Header.pfSize();
+        // Not sure whether we can get away with leaving the rest of the
+        // header blank
+    }
+
+    // Microsoft doesn't follow their own specifications and the
+    // simplest conversion using the DxTex tool to e.g. a DXT3 texture
+    // results in an illegal .dds file without either DDSD_PITCH or
+    // DDSD_LINEARSIZE set in the header's flags. This code, adapted
+    // from the DevIL library, fixes up the header in these situations.
+    private void fixupHeader() {
+        if (isCompressed() && !isSurfaceDescFlagSet(DDSD_LINEARSIZE)) {
+            // Figure out how big the linear size should be
+            int depth = header.backBufferCountOrDepth;
+            if (depth == 0) {
+                depth = 1;
+            }
+
+            header.pitchOrLinearSize = computeCompressedBlockSize(getWidth(), getHeight(), depth, getCompressionFormat());
+            header.flags |= DDSD_LINEARSIZE;
+        }
+    }
+
+    private static int computeCompressedBlockSize(int width,
+                                                  int height,
+                                                  int depth,
+                                                  int compressionFormat) {
+        int blockSize = ((width + 3)/4) * ((height + 3)/4) * ((depth + 3)/4);
+        switch (compressionFormat) {
+        case D3DFMT_DXT1:  blockSize *=  8; break;
+        default:           blockSize *= 16; break;
+        }
+        return blockSize;
+    }
+
+    private int mipMapWidth(int map) {
+        int width = getWidth();
+        for (int i = 0; i < map; i++) {
+            width >>= 1;
+        }
+        return Math.max(width, 1);
+    }
+
+    private int mipMapHeight(int map) {
+        int height = getHeight();
+        for (int i = 0; i < map; i++) {
+            height >>= 1;
+        }
+        return Math.max(height, 1);
+    }
+
+    private int mipMapSizeInBytes(int map) {
+        int width  = mipMapWidth(map);
+        int height = mipMapHeight(map);
+        if (isCompressed()) {
+            int blockSize = (getCompressionFormat() == D3DFMT_DXT1 ? 8 : 16);
+            return ((width+3)/4)*((height+3)/4)*blockSize;
+        } else {
+            return width * height * (getDepth() / 8);
+        }
+    }
+
+    private int sideSizeInBytes() {
+        int numLevels = getNumMipMaps();
+        if (numLevels == 0) {
+            numLevels = 1;
+        }
+
+        int size = 0;
+        for (int i = 0; i < numLevels; i++) {
+            size += mipMapSizeInBytes(i);
+        }
+
+        return size;
+    }
+
+    private int sideShiftInBytes(int side) {
+        int[] sides = {
+            DDSCAPS2_CUBEMAP_POSITIVEX,
+            DDSCAPS2_CUBEMAP_NEGATIVEX,
+            DDSCAPS2_CUBEMAP_POSITIVEY,
+            DDSCAPS2_CUBEMAP_NEGATIVEY,
+            DDSCAPS2_CUBEMAP_POSITIVEZ,
+            DDSCAPS2_CUBEMAP_NEGATIVEZ
+        };
+
+        int shift = 0;
+        int sideSize = sideSizeInBytes();
+        for (int i = 0; i < sides.length; i++) {
+            int temp = sides[i];
+            if ((temp & side) != 0) {
+                return shift;
+            }
+
+            shift += sideSize;
+        }
+
+        throw new RuntimeException("Illegal side: " + side);
+    }
+
+    private boolean printIfRecognized(PrintStream tty, int flags, int flag, String what) {
+        if ((flags & flag) != 0) {
+            tty.println(what);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java
new file mode 100755
index 000000000..d5f49599c
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package	com.jogamp.opengl.util.texture.spi;
+
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.FilterInputStream;
+import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+
+/**
+ * Little Endian Data Input Stream.
+ *
+ * This class implements an input stream filter to allow reading
+ * of java native datatypes from an input stream which has those
+ * native datatypes stored in a little endian byte order.<p>
+ *
+ * This is the sister class of the DataInputStream which allows
+ * for reading of java native datatypes from an input stream with
+ * the datatypes stored in big endian byte order.<p>
+ *
+ * This class implements the minimum required and calls DataInputStream
+ * for some of the required methods for DataInput.<p>
+ *
+ * Not all methods are implemented due to lack of immediatte requirement
+ * for that functionality. It is not clear if it is ever going to be
+ * functionally required to be able to read UTF data in a LittleEndianManner<p>
+ *
+ * @author	Robin Luiten
+ * @version	1.1	15/Dec/1997
+ */
+public class LEDataInputStream extends FilterInputStream implements DataInput
+{
+    /**
+     * To reuse	some of	the	non	endian dependent methods from
+     * DataInputStreams	methods.
+     */
+    DataInputStream	dataIn;
+
+    public LEDataInputStream(InputStream in)
+    {
+        super(in);
+        dataIn = new DataInputStream(in);
+    }
+
+    public void close() throws IOException
+    {
+        dataIn.close();		// better close as we create it.
+        // this will close underlying as well.
+    }
+
+    public synchronized	final int read(byte	b[]) throws	IOException
+    {
+        return dataIn.read(b, 0, b.length);
+    }
+
+    public synchronized	final int read(byte	b[], int off, int len) throws IOException
+    {
+        int	rl = dataIn.read(b,	off, len);
+        return rl;
+    }
+
+    public final void readFully(byte b[]) throws IOException
+    {
+        dataIn.readFully(b,	0, b.length);
+    }
+
+    public final void readFully(byte b[], int off, int len)	throws IOException
+    {
+        dataIn.readFully(b,	off, len);
+    }
+
+    public final int skipBytes(int n) throws IOException
+    {
+        return dataIn.skipBytes(n);
+    }
+
+    public final boolean readBoolean() throws IOException
+    {
+        int	ch = dataIn.read();
+        if (ch < 0)
+            throw new EOFException();
+        return (ch != 0);
+    }
+
+    public final byte readByte() throws	IOException
+    {
+        int	ch = dataIn.read();
+        if (ch < 0)
+            throw new EOFException();
+        return (byte)(ch);
+    }
+
+    public final int readUnsignedByte()	throws IOException
+    {
+        int	ch = dataIn.read();
+        if (ch < 0)
+            throw new EOFException();
+        return ch;
+    }
+
+    public final short readShort() throws IOException
+    {
+        int	ch1	= dataIn.read();
+        int	ch2	= dataIn.read();
+        if ((ch1 | ch2)	< 0)
+            throw new EOFException();
+        return (short)((ch1	<< 0) +	(ch2 <<	8));
+    }
+
+    public final int readUnsignedShort() throws	IOException
+    { 
+        int	ch1	= dataIn.read();
+        int	ch2	= dataIn.read();
+        if ((ch1 | ch2)	< 0)
+            throw new EOFException();
+        return (ch1	<< 0) +	(ch2 <<	8);
+    }
+
+    public final char readChar() throws	IOException
+    {
+        int	ch1	= dataIn.read();
+        int	ch2	= dataIn.read();
+        if ((ch1 | ch2)	< 0)
+            throw new EOFException();
+        return (char)((ch1 << 0) + (ch2	<< 8));
+    }
+
+    public final int readInt() throws IOException
+    {
+        int	ch1	= dataIn.read();
+        int	ch2	= dataIn.read();
+        int	ch3	= dataIn.read();
+        int	ch4	= dataIn.read();
+        if ((ch1 | ch2 | ch3 | ch4)	< 0)
+            throw new EOFException();
+        return ((ch1 <<	0) + (ch2 << 8)	+ (ch3 << 16) +	(ch4 <<	24));
+    }
+
+    public final long readLong() throws	IOException
+    {
+        int	i1 = readInt();
+        int	i2 = readInt();
+        return ((long)(i1) & 0xFFFFFFFFL) +	(i2	<< 32);
+    }
+
+    public final float readFloat() throws IOException
+    {
+        return Float.intBitsToFloat(readInt());
+    }
+
+    public final double	readDouble() throws	IOException
+    {
+        return Double.longBitsToDouble(readLong());
+    }
+
+    /**
+     * dont call this it is not implemented.
+     * @return empty new string 
+     **/
+    public final String	readLine() throws IOException
+    {
+        return new String();
+    }
+
+    /**
+     * dont call this it is not implemented
+     * @return empty new string 
+     **/
+    public final String	readUTF() throws IOException
+    {
+        return new String();
+    }
+
+    /**
+     * dont call this it is not implemented
+     * @return empty new string 
+     **/
+    public final static	String readUTF(DataInput in) throws	IOException
+    {
+        return new String();
+    }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataOutputStream.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataOutputStream.java
new file mode 100755
index 000000000..e1e1ca924
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataOutputStream.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture.spi;
+
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.FilterOutputStream;
+import java.io.OutputStream;
+import java.io.IOException;
+
+/**
+ * Little Endian Data Output Stream.
+ *
+ * This class implements an output stream filter to allow writing
+ * of java native datatypes to an output stream which has those
+ * native datatypes stored in a little endian byte order.<p>
+ *
+ * This is the sister class of the DataOutputStream which allows
+ * for writing of java native datatypes to an output stream with
+ * the datatypes stored in big endian byte order.<p>
+ *
+ * This class implements the minimum required and calls DataOutputStream
+ * for some of the required methods for DataOutput.<p>
+ *
+ * Not all methods are implemented due to lack of immediate requirement
+ * for that functionality. It is not clear if it is ever going to be
+ * functionally required to be able to read UTF data in a LittleEndianManner<p>
+ *
+ */
+public class LEDataOutputStream extends FilterOutputStream implements DataOutput
+{
+    /**
+     * To reuse some of the non endian dependent methods from
+     * DataOutputStream's methods.
+     */
+    DataOutputStream dataOut;
+
+    public LEDataOutputStream(OutputStream out)
+    {
+        super(out);
+        dataOut = new DataOutputStream(out);
+    }
+
+    public void close() throws IOException
+    {
+        dataOut.close(); // better close as we create it.
+        // this will close underlying as well.
+    }
+
+    public synchronized final void write(byte b[]) throws IOException
+    {
+        dataOut.write(b, 0, b.length);
+    }
+
+    public synchronized final void write(byte b[], int off, int len) throws IOException
+    {
+        dataOut.write(b, off, len);
+    }
+
+    public final void write(int b) throws IOException
+    {
+        dataOut.write(b);
+    }
+
+    public final void writeBoolean(boolean v) throws IOException
+    {
+        dataOut.writeBoolean(v);
+    }
+
+    public final void writeByte(int v) throws IOException
+    {
+        dataOut.writeByte(v);
+    }
+
+    /** Don't call this -- not implemented */
+    public final void writeBytes(String s) throws IOException
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    public final void writeChar(int v) throws IOException
+    {
+        dataOut.writeChar(((v >> 8) & 0xff) |
+                          ((v & 0xff) << 8));
+    }
+
+    /** Don't call this -- not implemented */
+    public final void writeChars(String s) throws IOException
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    public final void writeDouble(double v) throws IOException
+    {
+        writeLong(Double.doubleToRawLongBits(v));
+    }
+
+    public final void writeFloat(float v) throws IOException
+    {
+        writeInt(Float.floatToRawIntBits(v));
+    }
+
+    public final void writeInt(int v) throws IOException
+    {
+        dataOut.writeInt((v >>> 24) |
+                         ((v >>> 8) & 0xff00) |
+                         ((v << 8)  & 0x00ff00) |
+                         (v << 24));
+    }
+
+    public final void writeLong(long v) throws IOException
+    {
+        writeInt((int) v);
+        writeInt((int) (v >>> 32));
+    }
+
+    public final void writeShort(int v) throws IOException
+    {
+        dataOut.writeShort(((v >> 8) & 0xff) |
+                           ((v & 0xff) << 8));
+    }
+
+    /** Don't call this -- not implemented */
+    public final void writeUTF(String s) throws IOException
+    {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java
new file mode 100644
index 000000000..499dce7fb
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture.spi;
+
+import java.io.*;
+import java.net.*;
+import java.nio.*;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.spi.*;
+
+public class NetPbmTextureWriter implements TextureWriter {
+    int magic;
+
+    public NetPbmTextureWriter() {
+        this(0); // auto
+    }
+
+    /**
+     * supported magic values are:<br>
+     * <pre>
+     *   magic 0 - detect by file suffix (TextureIO compliant)
+     *   magic 6 - PPM binary RGB
+     *   magic 7 - PAM binary RGB or RGBA
+     * </pre>
+     */
+    public NetPbmTextureWriter(int magic) {
+        switch(magic) {
+            case 0:
+            case 6:
+            case 7:
+                break;
+            default:
+                throw new GLException("Unsupported magic: "+magic+", should be 0 (auto), 6 (PPM) or 7 (PAM)");
+        }
+        this.magic = magic;
+    }
+
+    public int getMagic() { return magic; }
+
+    public static final String PPM     = "ppm";
+    public static final String PAM     = "pam";
+
+    public String getSuffix() { return (magic==6)?PPM:PAM; }
+
+    public boolean write(File file,
+                         TextureData data) throws IOException {
+
+        // file suffix selection 
+        if (0==magic) {
+            if (PPM.equals(FileUtil.getFileSuffix(file))) {
+                magic = 6;
+            } else if (PAM.equals(FileUtil.getFileSuffix(file))) {
+                magic = 7;
+            } else {
+                return false;
+            }
+        }
+
+        int pixelFormat = data.getPixelFormat();
+        int pixelType   = data.getPixelType();
+        if ((pixelFormat == GL.GL_RGB ||
+             pixelFormat == GL.GL_RGBA) &&
+            (pixelType == GL.GL_BYTE ||
+             pixelType == GL.GL_UNSIGNED_BYTE)) {
+    
+            int comps = ( pixelFormat == GL.GL_RGBA ) ? 4 : 3 ;
+
+            if(magic==6 && comps==4) {
+                throw new IOException("NetPbmTextureWriter magic 6 (PPM) doesn't RGBA pixel format, use magic 7 (PAM)");
+            }
+
+            FileOutputStream fos = new FileOutputStream(file);
+
+            StringBuffer header = new StringBuffer();
+            header.append("P");
+            header.append(magic);
+            header.append("\n");
+            if(7==magic) {
+                header.append("WIDTH ");
+            }
+            header.append(data.getWidth());
+            if(7==magic) {
+                header.append("\nHEIGHT ");
+            } else {
+                header.append(" ");
+            }
+            header.append(data.getHeight());
+            if(7==magic) {
+                header.append("\nDEPTH ");
+                header.append(comps);
+                header.append("\nMAXVAL 255\nTUPLTYPE ");
+                if(pixelFormat == GL.GL_RGBA) {
+                    header.append("RGB_ALPHA");
+                } else {
+                    header.append("RGB");
+                }
+                header.append("\nENDHDR\n");
+            } else {
+                header.append("\n255\n");
+            }
+
+            fos.write(header.toString().getBytes());
+                
+            ByteBuffer buf = (ByteBuffer) data.getBuffer();
+            if (buf == null) {
+                buf = (ByteBuffer) data.getMipmapData()[0];
+            }
+            buf.rewind();
+
+            byte[] bufArray = null;
+
+            try {
+                bufArray = buf.array();
+            } catch (Throwable t) {}
+            if(null==bufArray) {
+                bufArray = new byte[data.getWidth()*data.getHeight()*comps];
+                buf.get(bufArray);
+                buf.rewind();
+            }
+
+            fos.write(bufArray);
+            fos.close();
+
+            return true;
+        }
+      
+        throw new IOException("NetPbmTextureWriter writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/SGIImage.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/SGIImage.java
new file mode 100755
index 000000000..bb5040a31
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/SGIImage.java
@@ -0,0 +1,670 @@
+/*
+ * Portions Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture.spi;
+
+import java.io.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.*;
+
+/** <p> Reads and writes SGI RGB/RGBA images. </p>
+
+    <p> Written from <a href =
+    "http://astronomy.swin.edu.au/~pbourke/dataformats/sgirgb/">Paul
+    Bourke's adaptation</a> of the <a href =
+    "http://astronomy.swin.edu.au/~pbourke/dataformats/sgirgb/sgiversion.html">SGI
+    specification</a>. </p>
+*/
+
+public class SGIImage {
+    private Header header;
+    private int    format;
+    private byte[] data;
+    // Used for decoding RLE-compressed images
+    private int[]  rowStart;
+    private int[]  rowSize;
+    private int    rleEnd;
+    private byte[] tmpData;
+    private byte[] tmpRead;
+
+    private static final int MAGIC = 474;
+
+    static class Header {
+        short magic;        // IRIS image file magic number
+        // This should be decimal 474
+        byte  storage;      // Storage format
+        // 0 for uncompressed
+        // 1 for RLE compression
+        byte  bpc;          // Number of bytes per pixel channel 
+        // Legally 1 or 2
+        short dimension;    // Number of dimensions
+        // Legally 1, 2, or 3
+        // 1 means a single row, XSIZE long
+        // 2 means a single 2D image
+        // 3 means multiple 2D images
+        short xsize;        // X size in pixels 
+        short ysize;        // Y size in pixels 
+        short zsize;        // Number of channels
+        // 1 indicates greyscale
+        // 3 indicates RGB
+        // 4 indicates RGB and Alpha
+        int pixmin;         // Minimum pixel value
+        // This is the lowest pixel value in the image
+        int pixmax;         // Maximum pixel value
+        // This is the highest pixel value in the image
+        int dummy;          // Ignored
+        // Normally set to 0
+        String imagename;   // Image name; 80 bytes long
+        // Must be null terminated, therefore at most 79 bytes
+        int colormap;       // Colormap ID
+        // 0 - normal mode
+        // 1 - dithered, 3 mits for red and green, 2 for blue, obsolete
+        // 2 - index colour, obsolete
+        // 3 - not an image but a colourmap
+        // 404 bytes  char    DUMMY      Ignored
+        // Should be set to 0, makes the header 512 bytes.
+
+        Header() {
+            magic = MAGIC;
+        }
+
+        Header(DataInputStream in) throws IOException {
+            magic      = in.readShort();
+            storage    = in.readByte();
+            bpc        = in.readByte();
+            dimension  = in.readShort();
+            xsize      = in.readShort();
+            ysize      = in.readShort();
+            zsize      = in.readShort();
+            pixmin     = in.readInt();
+            pixmax     = in.readInt();
+            dummy      = in.readInt();
+            byte[] tmpname = new byte[80];
+            in.read(tmpname);
+            int numChars = 0;
+            while (tmpname[numChars++] != 0);
+            imagename  = new String(tmpname, 0, numChars);
+            colormap   = in.readInt();
+            byte[] tmp = new byte[404];
+            in.read(tmp);
+        }
+
+        public String toString() {
+            return ("magic: " + magic +
+                    " storage: " + (int) storage +
+                    " bpc: " + (int) bpc +
+                    " dimension: " + dimension +
+                    " xsize: " + xsize +
+                    " ysize: " + ysize +
+                    " zsize: " + zsize +
+                    " pixmin: " + pixmin +
+                    " pixmax: " + pixmax +
+                    " imagename: " + imagename +
+                    " colormap: " + colormap);
+        }
+    }
+
+    private SGIImage(Header header) {
+        this.header = header;
+    }
+
+    /** Reads an SGI image from the specified file. */
+    public static SGIImage read(String filename) throws IOException {
+        return read(new FileInputStream(filename));
+    }
+
+    /** Reads an SGI image from the specified InputStream. */
+    public static SGIImage read(InputStream in) throws IOException {
+        DataInputStream dIn = new DataInputStream(new BufferedInputStream(in));
+
+        Header header = new Header(dIn);
+        SGIImage res = new SGIImage(header);
+        res.decodeImage(dIn);
+        return res;
+    }
+
+    /** Writes this SGIImage to the specified file name. If
+        flipVertically is set, outputs the scanlines from top to bottom
+        rather than the default bottom to top order. */
+    public void write(String filename, boolean flipVertically) throws IOException {
+        write(new File(filename), flipVertically);
+    }
+
+    /** Writes this SGIImage to the specified file. If flipVertically is
+        set, outputs the scanlines from top to bottom rather than the
+        default bottom to top order. */
+    public void write(File file, boolean flipVertically) throws IOException {
+        writeImage(file, data, header.xsize, header.ysize, header.zsize, flipVertically);
+    }
+
+    /** Creates an SGIImage from the specified data in either RGB or
+        RGBA format. */
+    public static SGIImage createFromData(int width,
+                                          int height,
+                                          boolean hasAlpha,
+                                          byte[] data) {
+        Header header = new Header();
+        header.xsize = (short) width;
+        header.ysize = (short) height;
+        header.zsize = (short) (hasAlpha ? 4 : 3);
+        SGIImage image = new SGIImage(header);
+        image.data = data;
+        return image;
+    }
+
+    /** Determines from the magic number whether the given InputStream
+        points to an SGI RGB image. The given InputStream must return
+        true from markSupported() and support a minimum of two bytes
+        of read-ahead. */
+    public static boolean isSGIImage(InputStream in) throws IOException {
+        if (!(in instanceof BufferedInputStream)) {
+            in = new BufferedInputStream(in);
+        }
+        if (!in.markSupported()) {
+            throw new IOException("Can not test non-destructively whether given InputStream is an SGI RGB image");
+        }
+        DataInputStream dIn = new DataInputStream(in);
+        dIn.mark(4);
+        short magic = dIn.readShort();
+        dIn.reset();
+        return (magic == MAGIC);
+    }
+
+    /** Returns the width of the image. */
+    public int getWidth() {
+        return header.xsize;
+    }
+
+    /** Returns the height of the image. */
+    public int getHeight() {
+        return header.ysize;
+    }
+
+    /** Returns the OpenGL format for this texture; e.g. GL.GL_RGB or GL.GL_RGBA. */
+    public int getFormat() {
+        return format;
+    }
+
+    /** Returns the raw data for this texture in the correct
+        (bottom-to-top) order for calls to glTexImage2D. */
+    public byte[] getData()  { return data; }
+
+    public String toString() {
+        return header.toString();
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+  
+    private void decodeImage(DataInputStream in) throws IOException {
+        if (header.storage == 1) {
+            // Read RLE compression data; row starts and sizes
+            int x = header.ysize * header.zsize;
+            rowStart = new int[x];
+            rowSize  = new int[x];
+            rleEnd   = 4 * 2 * x + 512;
+            for (int i = 0; i < x; i++) {
+                rowStart[i] = in.readInt();
+            }
+            for (int i = 0; i < x; i++) {
+                rowSize[i] = in.readInt();
+            }
+            tmpRead = new byte[header.xsize * 256];
+        }
+        tmpData = readAll(in);
+
+        int xsize = header.xsize;
+        int ysize = header.ysize;
+        int zsize = header.zsize;
+        int lptr  = 0;
+
+        data = new byte[xsize * ysize * 4];
+        byte[] rbuf = new byte[xsize];
+        byte[] gbuf = new byte[xsize];
+        byte[] bbuf = new byte[xsize];
+        byte[] abuf = new byte[xsize];
+        for (int y = 0; y < ysize; y++) {
+            if (zsize >= 4) {
+                getRow(rbuf, y, 0);
+                getRow(gbuf, y, 1);
+                getRow(bbuf, y, 2);
+                getRow(abuf, y, 3);
+                rgbatorgba(rbuf, gbuf, bbuf, abuf, data, lptr);
+            } else if (zsize == 3) {
+                getRow(rbuf, y, 0);
+                getRow(gbuf, y, 1);
+                getRow(bbuf, y, 2);
+                rgbtorgba(rbuf, gbuf, bbuf, data, lptr);
+            } else if (zsize == 2) {
+                getRow(rbuf, y, 0);
+                getRow(abuf, y, 1);
+                latorgba(rbuf, abuf, data, lptr);
+            } else {
+                getRow(rbuf, y, 0);
+                bwtorgba(rbuf, data, lptr);
+            }
+            lptr += 4 * xsize;
+        }
+        rowStart = null;
+        rowSize  = null;
+        tmpData  = null;
+        tmpRead  = null;
+        format   = GL.GL_RGBA;
+        header.zsize = 4;
+    }
+
+    private void getRow(byte[] buf, int y, int z) {
+        if (header.storage == 1) {
+            int offs = rowStart[y + z * header.ysize] - rleEnd;
+            System.arraycopy(tmpData, offs, tmpRead, 0, rowSize[y + z * header.ysize]);
+            int iPtr = 0;
+            int oPtr = 0;
+            for (;;) {
+                byte pixel = tmpRead[iPtr++];
+                int count = (int) (pixel & 0x7F);
+                if (count == 0) {
+                    return;
+                }
+                if ((pixel & 0x80) != 0) {
+                    while ((count--) > 0) {
+                        buf[oPtr++] = tmpRead[iPtr++];
+                    }
+                } else {
+                    pixel = tmpRead[iPtr++];
+                    while ((count--) > 0) {
+                        buf[oPtr++] = pixel;
+                    }
+                }
+            }
+        } else {
+            int offs = (y * header.xsize) + (z * header.xsize * header.ysize);
+            System.arraycopy(tmpData, offs, buf, 0, header.xsize);
+        }
+    }
+
+    private void bwtorgba(byte[] b, byte[] dest, int lptr) {
+        for (int i = 0; i < b.length; i++) {
+            dest[4 * i + lptr + 0] = b[i];
+            dest[4 * i + lptr + 1] = b[i];
+            dest[4 * i + lptr + 2] = b[i];
+            dest[4 * i + lptr + 3] = (byte) 0xFF;
+        }
+    }
+
+    private void latorgba(byte[] b, byte[] a, byte[] dest, int lptr) {
+        for (int i = 0; i < b.length; i++) {
+            dest[4 * i + lptr + 0] = b[i];
+            dest[4 * i + lptr + 1] = b[i];
+            dest[4 * i + lptr + 2] = b[i];
+            dest[4 * i + lptr + 3] = a[i];
+        }
+    }
+
+    private void rgbtorgba(byte[] r, byte[] g, byte[] b, byte[] dest, int lptr) {
+        for (int i = 0; i < b.length; i++) {
+            dest[4 * i + lptr + 0] = r[i];
+            dest[4 * i + lptr + 1] = g[i];
+            dest[4 * i + lptr + 2] = b[i];
+            dest[4 * i + lptr + 3] = (byte) 0xFF;
+        }
+    }
+
+    private void rgbatorgba(byte[] r, byte[] g, byte[] b, byte[] a, byte[] dest, int lptr) {
+        for (int i = 0; i < b.length; i++) {
+            dest[4 * i + lptr + 0] = r[i];
+            dest[4 * i + lptr + 1] = g[i];
+            dest[4 * i + lptr + 2] = b[i];
+            dest[4 * i + lptr + 3] = a[i];
+        }
+    }
+
+    private static byte imgref(byte[] i,
+                               int x,
+                               int y,
+                               int z,
+                               int xs,
+                               int ys,
+                               int zs) {
+        return i[(xs*ys*z)+(xs*y)+x];
+    }
+
+
+    private void writeHeader(DataOutputStream stream,
+                             int xsize, int ysize, int zsize, boolean rle) throws IOException {
+        // effects: outputs the 512-byte IRIS RGB header to STREAM, using xsize,
+        //          ysize, and depth as the dimensions of the image. NOTE that
+        //          the following defaults are used:
+        //              STORAGE = 1     (storage format = RLE)
+        //              BPC = 1         (# bytes/channel)
+        //              DIMENSION = 3
+        //              PIXMIN = 0
+        //              PIXMAX = 255
+        //              IMAGENAME = <80 nulls>
+        //              COLORMAP = 0
+        //          See ftp://ftp.sgi.com/pub/sgi/SGIIMAGESPEC for more details.
+
+        // write out MAGIC, STORAGE, BPC
+        stream.writeShort(474);
+        stream.write((rle ? 1 : 0));
+        stream.write(1);
+
+        // write out DIMENSION
+        stream.writeShort(3);
+
+        // write XSIZE, YSIZE, ZSIZE
+        stream.writeShort(xsize);
+        stream.writeShort(ysize);
+        stream.writeShort(zsize);
+
+        // write PIXMIN, PIXMAX
+        stream.writeInt(0);
+        stream.writeInt(255);
+
+        // write DUMMY
+        stream.writeInt(0);
+
+        // write IMAGENAME
+        for (int i = 0; i < 80; i++)
+            stream.write(0);
+
+        // write COLORMAP
+        stream.writeInt(0);
+
+        // write DUMMY (404 bytes)
+        for (int i = 0; i < 404; i++)
+            stream.write(0);
+    }
+
+    private void writeImage(File file,
+                            byte[] data,
+                            int xsize,
+                            int ysize,
+                            int zsize,
+                            boolean yflip) throws IOException {
+        // Input data is in RGBRGBRGB or RGBARGBARGBA format; first unswizzle it
+        byte[] tmpData = new byte[xsize * ysize * zsize];
+        int dest = 0;
+        for (int i = 0; i < zsize; i++) {
+            for (int j = i; j < (xsize * ysize * zsize); j += zsize) {
+                tmpData[dest++] = data[j];
+            }
+        }
+        data = tmpData;
+
+        // requires: DATA must be an array of size XSIZE * YSIZE * ZSIZE,
+        //           indexed in the following manner:
+        //             data[0]    ...data[xsize-1] == first row of first channel
+        //             data[xsize]...data[2*xsize-1]   == second row of first channel
+        //         ... data[(ysize - 1) * xsize]...data[(ysize * xsize) - 1] ==
+        //                                            last row of first channel
+        //           Later channels follow the same format.
+        //           *** NOTE that "first row" is defined by the BOTTOM ROW of
+        //           the image. That is, the origin is in the lower left corner.
+        // effects: writes out an SGI image to FILE, RLE-compressed, INCLUDING
+        //          header, of dimensions (xsize, ysize, zsize), and containing
+        //          the data in DATA. If YFLIP is set, outputs the data in DATA
+        //          in reverse order vertically (equivalent to a flip about the
+        //          x axis).
+
+        // Build the offset tables
+        int[] starttab  = new int[ysize * zsize];
+        int[] lengthtab = new int[ysize * zsize];
+
+        // Temporary buffer for holding RLE data.
+        // Note that this makes the assumption that RLE-compressed data will
+        // never exceed twice the size of the input data.
+        // There are surely formal proofs about how big the RLE buffer should
+        // be, as well as what the optimal look-ahead size is (i.e. don't switch
+        // copy/repeat modes for less than N repeats). However, I'm going from
+        // empirical evidence here; the break-even point seems to be a look-
+        // ahead of 3. (That is, if the three values following this one are all
+        // the same as the current value, switch to repeat mode.)
+        int lookahead = 3;
+        byte[] rlebuf = new byte[2 * xsize * ysize * zsize];
+
+        int cur_loc = 0;   // current offset location.
+        int ptr = 0;
+        int total_size = 0;
+        int ystart = 0;
+        int yincr = 1;
+        int yend = ysize;
+
+        if (yflip) {
+            ystart = ysize - 1;
+            yend = -1;
+            yincr = -1;
+        }
+
+        boolean DEBUG = false;
+
+        for (int z = 0; z < zsize; z++) {
+            for (int y = ystart; y != yend; y += yincr) {
+                // RLE-compress each row.
+	  
+                int x = 0;
+                byte count = 0;
+                boolean repeat_mode = false;
+                boolean should_switch = false;
+                int start_ptr = ptr;
+                int num_ptr = ptr++;
+                byte repeat_val = 0;
+	  
+                while (x < xsize) {
+                    // see if we should switch modes
+                    should_switch = false;
+                    if (repeat_mode) {
+                        if (imgref(data, x, y, z, xsize, ysize, zsize) != repeat_val) {
+                            should_switch = true;
+                        }
+                    } else {
+                        // look ahead to see if we should switch to repeat mode.
+                        // stay within the scanline for the lookahead
+                        if ((x + lookahead) < xsize) {
+                            should_switch = true;
+                            for (int i = 1; i <= lookahead; i++) {
+                                if (DEBUG)
+                                    System.err.println("left side was " + ((int) imgref(data, x, y, z, xsize, ysize, zsize)) +
+                                                       ", right side was " + (int)imgref(data, x+i, y, z, xsize, ysize, zsize));
+			  
+                                if (imgref(data, x, y, z, xsize, ysize, zsize) !=
+                                    imgref(data, x+i, y, z, xsize, ysize, zsize))
+                                    should_switch = false;
+                            }
+                        }
+                    }
+
+                    if (should_switch || (count == 127)) {
+                        // update the number of elements we repeated/copied
+                        if (x > 0) {
+                            if (repeat_mode)
+                                rlebuf[num_ptr] = count;
+                            else
+                                rlebuf[num_ptr] = (byte) (count | 0x80);
+                        }
+                        // perform mode switch if necessary; output repeat_val if
+                        // switching FROM repeat mode, and set it if switching
+                        // TO repeat mode.
+                        if (repeat_mode) {
+                            if (should_switch)
+                                repeat_mode = false;
+                            rlebuf[ptr++] = repeat_val;
+                        } else {
+                            if (should_switch)
+                                repeat_mode = true;
+                            repeat_val = imgref(data, x, y, z, xsize, ysize, zsize);
+                        }
+		  
+                        if (x > 0) {
+                            // reset the number pointer
+                            num_ptr = ptr++;
+                            // reset number of bytes copied
+                            count = 0;
+                        }
+                    }
+		    
+                    // if not in repeat mode, copy element to ptr
+                    if (!repeat_mode) {
+                        rlebuf[ptr++] = imgref(data, x, y, z, xsize, ysize, zsize);
+                    }
+                    count++;
+
+                    if (x == xsize - 1) {
+                        // Need to store the number of pixels we copied/repeated.
+                        if (repeat_mode) {
+                            rlebuf[num_ptr] = count;
+                            // If we ended the row in repeat mode, store the
+                            // repeated value
+                            rlebuf[ptr++] = repeat_val;
+                        }
+                        else
+                            rlebuf[num_ptr] = (byte) (count | 0x80);
+
+                        // output zero counter for the last value in the row
+                        rlebuf[ptr++] = 0;
+                    }
+
+                    x++;
+                }
+                // output this row's length into the length table
+                int rowlen = ptr - start_ptr;
+                if (yflip)
+                    lengthtab[ysize*z+(ysize-y-1)] = rowlen;
+                else
+                    lengthtab[ysize*z+y] = rowlen;
+                // add to the start table, and update the current offset
+                if (yflip)
+                    starttab[ysize*z+(ysize-y-1)] = cur_loc;
+                else
+                    starttab[ysize*z+y] = cur_loc;
+                cur_loc += rowlen;
+            }
+        }
+
+        // Now we have the offset tables computed, as well as the RLE data.
+        // Output this information to the file.
+        total_size = ptr;
+  
+        if (DEBUG) 
+            System.err.println("total_size was " + total_size);
+
+        DataOutputStream stream = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file)));
+
+        writeHeader(stream, xsize, ysize, zsize, true);
+
+        int SIZEOF_INT = 4;
+        for (int i = 0; i < (ysize * zsize); i++)
+            stream.writeInt(starttab[i] + 512 + (2 * ysize * zsize * SIZEOF_INT));
+        for (int i = 0; i < (ysize * zsize); i++)
+            stream.writeInt(lengthtab[i]);
+        for (int i = 0; i < total_size; i++)
+            stream.write(rlebuf[i]);
+
+        stream.close();
+    }
+
+    private byte[] readAll(DataInputStream in) throws IOException {
+        byte[] dest = new byte[16384];
+        int pos = 0;
+        int numRead = 0;
+    
+        boolean done = false;
+
+        do {
+            numRead = in.read(dest, pos, dest.length - pos);
+            if (pos == dest.length) {
+                // Resize destination buffer
+                byte[] newDest = new byte[2 * dest.length];
+                System.arraycopy(dest, 0, newDest, 0, pos);
+                dest = newDest;
+            }
+            if (numRead > 0) {
+                pos += numRead;
+            }
+
+            done = ((numRead == -1) || (in.available() == 0));
+        } while (!done);
+
+        // Trim destination buffer
+        if (pos != dest.length) {
+            byte[] finalDest = new byte[pos];
+            System.arraycopy(dest, 0, finalDest, 0, pos);
+            dest = finalDest;
+        }
+
+        return dest;
+    }
+
+    // Test case
+    /*
+      import java.awt.image.*;
+      import javax.swing.*;
+
+      public static void main(String[] args) {
+      for (int i = 0; i < args.length; i++) {
+      try {
+      System.out.println(args[i] + ":");
+      SGIImage image = SGIImage.read(args[i]);
+      System.out.println(image);
+      BufferedImage img = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_4BYTE_ABGR);
+      WritableRaster raster = img.getRaster();
+      DataBufferByte db = (DataBufferByte) raster.getDataBuffer();
+      byte[] src  = image.getData();
+      byte[] dest = db.getData();
+      for (int j = 0; j < src.length; j += 4) {
+      dest[j + 0] = src[j + 3];
+      dest[j + 1] = src[j + 2];
+      dest[j + 2] = src[j + 1];
+      dest[j + 3] = src[j + 0];
+      }
+      // System.arraycopy(src, 0, dest, 0, src.length);
+      ImageIcon icon = new ImageIcon(img);
+      JLabel label = new JLabel();
+      label.setIcon(icon);
+      JFrame frame = new JFrame(args[i]);
+      frame.getContentPane().add(label);
+      frame.pack();
+      frame.show();
+      } catch (IOException e) {
+      e.printStackTrace();
+      }
+      }
+      }
+    */
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
new file mode 100755
index 000000000..d1eca7c69
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
@@ -0,0 +1,417 @@
+/*
+ * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture.spi;
+
+import java.io.*;
+import java.nio.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.spi.*;
+import com.jogamp.opengl.util.texture.*;
+
+/**
+ * Targa image reader and writer adapted from sources of the <a href =
+ * "http://java.sun.com/products/jimi/">Jimi</a> image I/O class library.
+ *
+ * <P>
+ *
+ * Image decoder for image data stored in TGA file format.
+ * Currently only the original TGA file format is supported. This is
+ * because the new TGA format has data at the end of the file, getting
+ * to the end of a file in an InputStream orient environment presents
+ * several difficulties which are avoided at the moment.
+ *
+ * <P>
+ *
+ * This is a simple decoder and is only setup to load a single image
+ * from the input stream
+ *
+ * <P>
+ *
+ * @author    Robin Luiten
+ * @author    Kenneth Russell
+ * @version    $Revision: 1768 $
+ */
+
+public class TGAImage {
+    private Header header;
+    private int    format;
+    private int    bpp;
+    private ByteBuffer data;
+
+    private TGAImage(Header header) {
+        this.header = header;
+    }
+
+    /**
+     * This class reads in all of the TGA image header in addition it also
+     * reads in the imageID field as it is convenient to handle that here.
+     *
+     * @author    Robin Luiten
+     * @version   1.1
+     */
+    public static class Header {
+        /** Set of possible file format TGA types */
+        public final static int TYPE_NEW = 0;
+        public final static int TYPE_OLD = 1;
+        public final static int TYPE_UNK = 2;               // cant rewind stream so unknown for now.
+
+        /**  Set of possible image types in TGA file */
+        public final static int NO_IMAGE = 0;               // no image data
+        public final static int UCOLORMAPPED = 1;           // uncompressed color mapped image
+        public final static int UTRUECOLOR = 2;             // uncompressed true color image
+        public final static int UBLACKWHITE = 3;            // uncompressed black and white image
+        public final static int COLORMAPPED = 9;            // compressed color mapped image
+        public final static int TRUECOLOR = 10;             // compressed true color image
+        public final static int BLACKWHITE = 11;            // compressed black and white image
+
+        /** Field image descriptor bitfield values definitions */
+        public final static int ID_ATTRIBPERPIXEL = 0xF;
+        public final static int ID_RIGHTTOLEFT = 0x10;
+        public final static int ID_TOPTOBOTTOM = 0x20;
+        public final static int ID_INTERLEAVE  = 0xC0;
+
+        /** Field image descriptor / interleave values */
+        public final static int I_NOTINTERLEAVED = 0;
+        public final static int I_TWOWAY = 1;
+        public final static int I_FOURWAY = 2;
+
+        /** Type of this TGA file format */
+        private int tgaType;
+
+        /** initial TGA image data fields */
+        private int idLength;         // byte value
+        private int colorMapType;     // byte value
+        private int imageType;        // byte value
+
+        /** TGA image colour map fields */
+        private int firstEntryIndex;
+        private int colorMapLength;
+        private byte colorMapEntrySize;
+
+        /** TGA image specification fields */
+        private int xOrigin;
+        private int yOrigin;
+        private int width;
+        private int height;
+        private byte pixelDepth;
+        private byte imageDescriptor;
+
+        private byte[] imageIDbuf;
+        private String imageID;
+
+        // For construction from user data
+        Header() {
+            tgaType = TYPE_OLD; // dont try and get footer.
+        }
+
+        Header(LEDataInputStream in) throws IOException {
+            int ret;
+
+            tgaType = TYPE_OLD; // dont try and get footer.
+
+            // initial header fields
+            idLength = in.readUnsignedByte();    
+            colorMapType = in.readUnsignedByte();
+            imageType = in.readUnsignedByte();    
+
+            // color map header fields
+            firstEntryIndex = in.readUnsignedShort();
+            colorMapLength = in.readUnsignedShort();
+            colorMapEntrySize = in.readByte();
+
+            // TGA image specification fields
+            xOrigin = in.readUnsignedShort();
+            yOrigin = in.readUnsignedShort();
+            width = in.readUnsignedShort();
+            height = in.readUnsignedShort();
+            pixelDepth = in.readByte();
+            imageDescriptor = in.readByte();
+
+            if (idLength > 0) {
+                imageIDbuf = new byte[idLength];
+                in.read(imageIDbuf, 0, idLength);
+                imageID = new String(imageIDbuf, "US-ASCII");
+            }
+        }
+
+        public int tgaType()                 { return tgaType; }
+
+        /** initial TGA image data fields */
+        public int idLength()                { return idLength; }
+        public int colorMapType()            { return colorMapType; }
+        public int imageType()               { return imageType; }
+
+        /** TGA image colour map fields */
+        public int firstEntryIndex()         { return firstEntryIndex; }
+        public int colorMapLength()          { return colorMapLength; }
+        public byte colorMapEntrySize()      { return colorMapEntrySize; }
+
+        /** TGA image specification fields */
+        public int xOrigin()                 { return xOrigin; }
+        public int yOrigin()                 { return yOrigin; }
+        public int width()                   { return width; }
+        public int height()                  { return height; }
+        public byte pixelDepth()             { return pixelDepth; }
+        public byte imageDescriptor()        { return imageDescriptor; }
+
+        /** bitfields in imageDescriptor */
+        public byte attribPerPixel()         { return (byte)(imageDescriptor & ID_ATTRIBPERPIXEL); }
+        public boolean rightToLeft()         { return ((imageDescriptor & ID_RIGHTTOLEFT) != 0); }
+        public boolean topToBottom()         { return ((imageDescriptor & ID_TOPTOBOTTOM) != 0); }
+        public byte interleave()             { return (byte)((imageDescriptor & ID_INTERLEAVE) >> 6); }
+
+        public byte[] imageIDbuf()           { return imageIDbuf; }
+        public String imageID()              { return imageID; }
+
+        public String toString() {
+            return "TGA Header " +
+                " id length: " + idLength +
+                " color map type: "+ colorMapType +
+                " image type: "+ imageType +
+                " first entry index: " + firstEntryIndex +
+                " color map length: " + colorMapLength +
+                " color map entry size: " + colorMapEntrySize +
+                " x Origin: " + xOrigin +
+                " y Origin: " + yOrigin +
+                " width: "+ width +
+                " height: "+ height +
+                " pixel depth: "+ pixelDepth +
+                " image descriptor: "+ imageDescriptor +
+                (imageIDbuf == null ? "" : (" ID String: " + imageID));
+        }
+
+        public int size() { return 18 + idLength; }
+
+        private void write(LEDataOutputStream output) throws IOException {
+            output.write(idLength);
+            output.write(colorMapType);
+            output.write(imageType);
+            output.writeShort(firstEntryIndex);
+            output.writeShort(colorMapLength);
+            output.write(colorMapEntrySize);
+            output.writeShort(xOrigin);
+            output.writeShort(yOrigin);
+            output.writeShort(width);
+            output.writeShort(height);
+            output.write(pixelDepth);
+            output.write(imageDescriptor);
+            if (idLength > 0) {
+                try {
+                    byte[] chars = imageID.getBytes("US-ASCII");
+                    output.write(chars);
+                } catch (UnsupportedEncodingException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Identifies the image type of the tga image data and loads
+     * it into the JimiImage structure. This was taken from the
+     * prototype and modified for the new Jimi structure
+     */
+    private void decodeImage(LEDataInputStream dIn) throws IOException {
+        switch (header.imageType()) {
+        case Header.UCOLORMAPPED:
+            throw new IOException("TGADecoder Uncompressed Colormapped images not supported");
+
+        case Header.UTRUECOLOR:    // pixelDepth 15, 16, 24 and 32
+            switch (header.pixelDepth) {
+            case 16:
+                throw new IOException("TGADecoder Compressed 16-bit True Color images not supported");
+
+            case 24:
+            case 32:
+                decodeRGBImageU24_32(dIn);
+                break;
+            }
+            break;
+
+        case Header.UBLACKWHITE:
+            throw new IOException("TGADecoder Uncompressed Grayscale images not supported");
+
+        case Header.COLORMAPPED:
+            throw new IOException("TGADecoder Compressed Colormapped images not supported");
+
+        case Header.TRUECOLOR:
+            throw new IOException("TGADecoder Compressed True Color images not supported");
+
+        case Header.BLACKWHITE:
+            throw new IOException("TGADecoder Compressed Grayscale images not supported");
+        }
+    }
+  
+    /**
+     * This assumes that the body is for a 24 bit or 32 bit for a
+     * RGB or ARGB image respectively.
+     */
+    private void decodeRGBImageU24_32(LEDataInputStream dIn) throws IOException {
+        int i;    // row index
+        int j;    // column index
+        int y;    // output row index
+        int raw;  // index through the raw input buffer
+        int rawWidth = header.width() * (header.pixelDepth() / 8);
+        byte[] rawBuf = new byte[rawWidth];
+        byte[] tmpData = new byte[rawWidth * header.height()];
+
+        for (i = 0; i < header.height(); ++i) {
+            dIn.readFully(rawBuf, 0, rawWidth);
+
+            if (header.topToBottom())
+                y = header.height - i - 1; // range 0 to (header.height - 1)
+            else
+                y = i;
+
+            System.arraycopy(rawBuf, 0, tmpData, y * rawWidth, rawBuf.length);
+        }
+
+        GL gl = GLContext.getCurrentGL();
+        if (header.pixelDepth() == 24) {
+            bpp=3;
+            if(gl.isGL2()) {
+                format = GL2.GL_BGR;
+            } else {
+                format = GL.GL_RGB;
+                swapBGR(tmpData, rawWidth, header.height(), bpp);
+            }
+        } else {
+            assert header.pixelDepth() == 32;
+            bpp=4;
+
+            if(gl.isGL2()) {
+                format = GL2.GL_BGRA;
+            } else {
+                format = GL.GL_RGBA;
+                swapBGR(tmpData, rawWidth, header.height(), bpp);
+            }
+        }
+
+        data = ByteBuffer.wrap(tmpData);
+    }
+
+    private static void swapBGR(byte[] data, int bWidth, int height, int bpp) {
+        byte r,b;
+        int k;
+        for(int i=0; i<height; ++i) {
+            for(int j=0; j<bWidth; j+=bpp) {
+                k=i*bWidth+j;
+                b=data[k+0];
+                r=data[k+2];
+                data[k+0]=r;
+                data[k+2]=b;
+            }
+        }
+    }
+
+    /** Returns the width of the image. */
+    public int getWidth()    { return header.width(); }
+
+    /** Returns the height of the image. */
+    public int getHeight()   { return header.height(); }
+
+    /** Returns the OpenGL format for this texture; e.g. GL.GL_BGR or GL.GL_BGRA. */
+    public int getGLFormat() { return format; }
+
+    /** Returns the bytes per pixel */
+    public int getBytesPerPixel() { return bpp; }
+
+    /** Returns the raw data for this texture in the correct
+        (bottom-to-top) order for calls to glTexImage2D. */
+    public ByteBuffer getData()  { return data; }
+
+    /** Reads a Targa image from the specified file. */
+    public static TGAImage read(String filename) throws IOException {
+        return read(new FileInputStream(filename));
+    }
+
+    /** Reads a Targa image from the specified InputStream. */
+    public static TGAImage read(InputStream in) throws IOException {
+        LEDataInputStream dIn = new LEDataInputStream(new BufferedInputStream(in));
+
+        Header header = new Header(dIn);
+        TGAImage res = new TGAImage(header);
+        res.decodeImage(dIn);
+        return res;
+    }
+
+    /** Writes the image in Targa format to the specified file name. */
+    public void write(String filename) throws IOException {
+        write(new File(filename));
+    }
+
+    /** Writes the image in Targa format to the specified file. */
+    public void write(File file) throws IOException {
+        LEDataOutputStream output =
+            new LEDataOutputStream(new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file))));
+        header.write(output);
+        if (!data.isDirect()) {
+            output.write(data.array());
+        } else {
+            for (int i = 0; i < data.limit(); i++) {
+                output.write(data.get(i));
+            }
+        }
+        output.close();
+    }
+
+    /** Creates a TGAImage from data supplied by the end user. Shares
+        data with the passed ByteBuffer. Assumes the data is already in
+        the correct byte order for writing to disk, i.e., BGR or
+        BGRA. */
+    public static TGAImage createFromData(int width,
+                                          int height,
+                                          boolean hasAlpha,
+                                          boolean topToBottom,
+                                          ByteBuffer data) {
+        Header header = new Header();
+        header.imageType = Header.UTRUECOLOR;
+        header.width = width;
+        header.height = height;
+        header.pixelDepth = (byte) (hasAlpha ? 32 : 24);
+        header.imageDescriptor = (byte) (topToBottom ? Header.ID_TOPTOBOTTOM : 0);
+        // Note ID not supported
+        TGAImage ret = new TGAImage(header);
+        ret.data = data;
+        return ret;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase
new file mode 100755
index 000000000..8575f553d
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase
@@ -0,0 +1,420 @@
+/*
+ * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture.spi;
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.spi.*;
+import com.jogamp.opengl.util.texture.*;
+
+/**
+ * Targa image reader and writer adapted from sources of the <a href =
+ * "http://java.sun.com/products/jimi/">Jimi</a> image I/O class library.
+ *
+ * <P>
+ *
+ * Image decoder for image data stored in TGA file format.
+ * Currently only the original TGA file format is supported. This is
+ * because the new TGA format has data at the end of the file, getting
+ * to the end of a file in an InputStream orient environment presents
+ * several difficulties which are avoided at the moment.
+ *
+ * <P>
+ *
+ * This is a simple decoder and is only setup to load a single image
+ * from the input stream
+ *
+ * <P>
+ *
+ * @author    Robin Luiten
+ * @author    Kenneth Russell
+ * @version    $Revision: 1768 $
+ */
+
+public class TGAImage {
+    private Header header;
+    private int    format;
+    private int    bpp;
+    private ByteBuffer data;
+
+    private TGAImage(Header header) {
+        this.header = header;
+    }
+
+    /**
+     * This class reads in all of the TGA image header in addition it also
+     * reads in the imageID field as it is convenient to handle that here.
+     *
+     * @author    Robin Luiten
+     * @version   1.1
+     */
+    public static class Header {
+        /** Set of possible file format TGA types */
+        public final static int TYPE_NEW = 0;
+        public final static int TYPE_OLD = 1;
+        public final static int TYPE_UNK = 2;               // cant rewind stream so unknown for now.
+
+        /**  Set of possible image types in TGA file */
+        public final static int NO_IMAGE = 0;               // no image data
+        public final static int UCOLORMAPPED = 1;           // uncompressed color mapped image
+        public final static int UTRUECOLOR = 2;             // uncompressed true color image
+        public final static int UBLACKWHITE = 3;            // uncompressed black and white image
+        public final static int COLORMAPPED = 9;            // compressed color mapped image
+        public final static int TRUECOLOR = 10;             // compressed true color image
+        public final static int BLACKWHITE = 11;            // compressed black and white image
+
+        /** Field image descriptor bitfield values definitions */
+        public final static int ID_ATTRIBPERPIXEL = 0xF;
+        public final static int ID_RIGHTTOLEFT = 0x10;
+        public final static int ID_TOPTOBOTTOM = 0x20;
+        public final static int ID_INTERLEAVE  = 0xC0;
+
+        /** Field image descriptor / interleave values */
+        public final static int I_NOTINTERLEAVED = 0;
+        public final static int I_TWOWAY = 1;
+        public final static int I_FOURWAY = 2;
+
+        /** Type of this TGA file format */
+        private int tgaType;
+
+        /** initial TGA image data fields */
+        private int idLength;         // byte value
+        private int colorMapType;     // byte value
+        private int imageType;        // byte value
+
+        /** TGA image colour map fields */
+        private int firstEntryIndex;
+        private int colorMapLength;
+        private byte colorMapEntrySize;
+
+        /** TGA image specification fields */
+        private int xOrigin;
+        private int yOrigin;
+        private int width;
+        private int height;
+        private byte pixelDepth;
+        private byte imageDescriptor;
+
+        private byte[] imageIDbuf;
+        private String imageID;
+
+        // For construction from user data
+        Header() {
+            tgaType = TYPE_OLD; // dont try and get footer.
+        }
+
+        Header(LEDataInputStream in) throws IOException {
+            int ret;
+
+            tgaType = TYPE_OLD; // dont try and get footer.
+
+            // initial header fields
+            idLength = in.readUnsignedByte();    
+            colorMapType = in.readUnsignedByte();
+            imageType = in.readUnsignedByte();    
+
+            // color map header fields
+            firstEntryIndex = in.readUnsignedShort();
+            colorMapLength = in.readUnsignedShort();
+            colorMapEntrySize = in.readByte();
+
+            // TGA image specification fields
+            xOrigin = in.readUnsignedShort();
+            yOrigin = in.readUnsignedShort();
+            width = in.readUnsignedShort();
+            height = in.readUnsignedShort();
+            pixelDepth = in.readByte();
+            imageDescriptor = in.readByte();
+
+            if (idLength > 0) {
+                imageIDbuf = new byte[idLength];
+                in.read(imageIDbuf, 0, idLength);
+                imageID = new String(imageIDbuf, "US-ASCII");
+            }
+        }
+
+        public int tgaType()                 { return tgaType; }
+
+        /** initial TGA image data fields */
+        public int idLength()                { return idLength; }
+        public int colorMapType()            { return colorMapType; }
+        public int imageType()               { return imageType; }
+
+        /** TGA image colour map fields */
+        public int firstEntryIndex()         { return firstEntryIndex; }
+        public int colorMapLength()          { return colorMapLength; }
+        public byte colorMapEntrySize()      { return colorMapEntrySize; }
+
+        /** TGA image specification fields */
+        public int xOrigin()                 { return xOrigin; }
+        public int yOrigin()                 { return yOrigin; }
+        public int width()                   { return width; }
+        public int height()                  { return height; }
+        public byte pixelDepth()             { return pixelDepth; }
+        public byte imageDescriptor()        { return imageDescriptor; }
+
+        /** bitfields in imageDescriptor */
+        public byte attribPerPixel()         { return (byte)(imageDescriptor & ID_ATTRIBPERPIXEL); }
+        public boolean rightToLeft()         { return ((imageDescriptor & ID_RIGHTTOLEFT) != 0); }
+        public boolean topToBottom()         { return ((imageDescriptor & ID_TOPTOBOTTOM) != 0); }
+        public byte interleave()             { return (byte)((imageDescriptor & ID_INTERLEAVE) >> 6); }
+
+        public byte[] imageIDbuf()           { return imageIDbuf; }
+        public String imageID()              { return imageID; }
+
+        public String toString() {
+            return "TGA Header " +
+                " id length: " + idLength +
+                " color map type: "+ colorMapType +
+                " image type: "+ imageType +
+                " first entry index: " + firstEntryIndex +
+                " color map length: " + colorMapLength +
+                " color map entry size: " + colorMapEntrySize +
+                " x Origin: " + xOrigin +
+                " y Origin: " + yOrigin +
+                " width: "+ width +
+                " height: "+ height +
+                " pixel depth: "+ pixelDepth +
+                " image descriptor: "+ imageDescriptor +
+                (imageIDbuf == null ? "" : (" ID String: " + imageID));
+        }
+
+        public int size() { return 18 + idLength; }
+
+        // buf must be in little-endian byte order
+        private void write(ByteBuffer buf) {
+            buf.put((byte) idLength);
+            buf.put((byte) colorMapType);
+            buf.put((byte) imageType);
+            buf.putShort((short) firstEntryIndex);
+            buf.putShort((short) colorMapLength);
+            buf.put((byte) colorMapEntrySize);
+            buf.putShort((short) xOrigin);
+            buf.putShort((short) yOrigin);
+            buf.putShort((short) width);
+            buf.putShort((short) height);
+            buf.put((byte) pixelDepth);
+            buf.put((byte) imageDescriptor);
+            if (idLength > 0) {
+                try {
+                    byte[] chars = imageID.getBytes("US-ASCII");
+                    buf.put(chars);
+                } catch (UnsupportedEncodingException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Identifies the image type of the tga image data and loads
+     * it into the JimiImage structure. This was taken from the
+     * prototype and modified for the new Jimi structure
+     */
+    private void decodeImage(LEDataInputStream dIn) throws IOException {
+        switch (header.imageType()) {
+        case Header.UCOLORMAPPED:
+            throw new IOException("TGADecoder Uncompressed Colormapped images not supported");
+
+        case Header.UTRUECOLOR:    // pixelDepth 15, 16, 24 and 32
+            switch (header.pixelDepth) {
+            case 16:
+                throw new IOException("TGADecoder Compressed 16-bit True Color images not supported");
+
+            case 24:
+            case 32:
+                decodeRGBImageU24_32(dIn);
+                break;
+            }
+            break;
+
+        case Header.UBLACKWHITE:
+            throw new IOException("TGADecoder Uncompressed Grayscale images not supported");
+
+        case Header.COLORMAPPED:
+            throw new IOException("TGADecoder Compressed Colormapped images not supported");
+
+        case Header.TRUECOLOR:
+            throw new IOException("TGADecoder Compressed True Color images not supported");
+
+        case Header.BLACKWHITE:
+            throw new IOException("TGADecoder Compressed Grayscale images not supported");
+        }
+    }
+  
+    /**
+     * This assumes that the body is for a 24 bit or 32 bit for a
+     * RGB or ARGB image respectively.
+     */
+    private void decodeRGBImageU24_32(LEDataInputStream dIn) throws IOException {
+        int i;    // row index
+        int j;    // column index
+        int y;    // output row index
+        int raw;  // index through the raw input buffer
+        int rawWidth = header.width() * (header.pixelDepth() / 8);
+        byte[] rawBuf = new byte[rawWidth];
+        byte[] tmpData = new byte[rawWidth * header.height()];
+
+        for (i = 0; i < header.height(); ++i) {
+            dIn.readFully(rawBuf, 0, rawWidth);
+
+            if (header.topToBottom())
+                y = header.height - i - 1; // range 0 to (header.height - 1)
+            else
+                y = i;
+
+            System.arraycopy(rawBuf, 0, tmpData, y * rawWidth, rawBuf.length);
+        }
+
+        GL gl = GLContext.getCurrentGL();
+        if (header.pixelDepth() == 24) {
+            bpp=3;
+            if(gl.isGL2()) {
+                format = GL2.GL_BGR;
+            } else {
+                format = GL.GL_RGB;
+                swapBGR(tmpData, rawWidth, header.height(), bpp);
+            }
+        } else {
+            assert header.pixelDepth() == 32;
+            bpp=4;
+
+            if(gl.isGL2()) {
+                format = GL2.GL_BGRA;
+            } else {
+                format = GL.GL_RGBA;
+                swapBGR(tmpData, rawWidth, header.height(), bpp);
+            }
+        }
+
+        data = ByteBuffer.wrap(tmpData);
+    }
+
+    private static void swapBGR(byte[] data, int bWidth, int height, int bpp) {
+        byte r,b;
+        int k;
+        for(int i=0; i<height; ++i) {
+            for(int j=0; j<bWidth; j+=bpp) {
+                k=i*bWidth+j;
+                b=data[k+0];
+                r=data[k+2];
+                data[k+0]=r;
+                data[k+2]=b;
+            }
+        }
+    }
+
+    /** Returns the width of the image. */
+    public int getWidth()    { return header.width(); }
+
+    /** Returns the height of the image. */
+    public int getHeight()   { return header.height(); }
+
+    /** Returns the OpenGL format for this texture; e.g. GL.GL_BGR or GL.GL_BGRA. */
+    public int getGLFormat() { return format; }
+
+    /** Returns the bytes per pixel */
+    public int getBytesPerPixel() { return bpp; }
+
+    /** Returns the raw data for this texture in the correct
+        (bottom-to-top) order for calls to glTexImage2D. */
+    public ByteBuffer getData()  { return data; }
+
+    /** Reads a Targa image from the specified file. */
+    public static TGAImage read(String filename) throws IOException {
+        return read(new FileInputStream(filename));
+    }
+
+    /** Reads a Targa image from the specified InputStream. */
+    public static TGAImage read(InputStream in) throws IOException {
+        LEDataInputStream dIn = new LEDataInputStream(new BufferedInputStream(in));
+
+        Header header = new Header(dIn);
+        TGAImage res = new TGAImage(header);
+        res.decodeImage(dIn);
+        return res;
+    }
+
+    /** Writes the image in Targa format to the specified file name. */
+    public void write(String filename) throws IOException {
+        write(new File(filename));
+    }
+
+    /** Writes the image in Targa format to the specified file. */
+    public void write(File file) throws IOException {
+        FileOutputStream stream = new FileOutputStream(file);
+        FileChannel chan = stream.getChannel();
+        ByteBuffer buf = ByteBuffer.allocate(header.size());
+        buf.order(ByteOrder.LITTLE_ENDIAN);
+        header.write(buf);
+        buf.rewind();
+        chan.write(buf);
+        chan.write(data);
+        data.rewind();
+        chan.force(true);
+        chan.close();
+        stream.close();
+    }
+
+    /** Creates a TGAImage from data supplied by the end user. Shares
+        data with the passed ByteBuffer. Assumes the data is already in
+        the correct byte order for writing to disk, i.e., BGR or
+        BGRA. */
+    public static TGAImage createFromData(int width,
+                                          int height,
+                                          boolean hasAlpha,
+                                          boolean topToBottom,
+                                          ByteBuffer data) {
+        Header header = new Header();
+        header.imageType = Header.UTRUECOLOR;
+        header.width = width;
+        header.height = height;
+        header.pixelDepth = (byte) (hasAlpha ? 32 : 24);
+        header.imageDescriptor = (byte) (topToBottom ? Header.ID_TOPTOBOTTOM : 0);
+        // Note ID not supported
+        TGAImage ret = new TGAImage(header);
+        ret.data = data;
+        return ret;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureProvider.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureProvider.java
new file mode 100755
index 000000000..88018edbe
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureProvider.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture.spi;
+
+import java.io.*;
+import java.net.*;
+import javax.media.opengl.GLProfile;
+
+import com.jogamp.opengl.util.texture.*;
+
+/** Plug-in interface to TextureIO to support reading OpenGL textures
+    from new file formats. For all methods, either internalFormat or
+    pixelFormat may be 0 in which case they must be inferred as
+    e.g. RGB or RGBA depending on the file contents.
+*/
+
+public interface TextureProvider {
+
+    /**
+     * Produces a TextureData object from a file, or returns null if the
+     * file format was not supported by this TextureProvider. Does not
+     * do any OpenGL-related work. The resulting TextureData can be
+     * converted into an OpenGL texture in a later step.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param file         the file from which to read the texture data
+     *
+     * @param internalFormat the OpenGL internal format to be used for
+     *                       the texture, or 0 if it should be inferred
+     *                       from the file's contents
+     *
+     * @param pixelFormat    the OpenGL pixel format to be used for
+     *                       the texture, or 0 if it should be inferred
+     *                       from the file's contents
+     *
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     *
+     * @param fileSuffix     the file suffix to be used as a hint to the
+     *                       provider to more quickly decide whether it
+     *                       can handle the file, or null if the
+     *                       provider should infer the type from the
+     *                       file's contents
+     *
+     * @throws IOException if an error occurred while reading the file
+     */
+    public TextureData newTextureData(GLProfile glp, File file,
+                                      int internalFormat,
+                                      int pixelFormat,
+                                      boolean mipmap,
+                                      String fileSuffix) throws IOException;
+
+    /**
+     * Produces a TextureData object from a stream, or returns null if
+     * the file format was not supported by this TextureProvider. Does
+     * not do any OpenGL-related work. The resulting TextureData can be
+     * converted into an OpenGL texture in a later step.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param stream       the stream from which to read the texture data
+     *
+     * @param internalFormat the OpenGL internal format to be used for
+     *                       the texture, or 0 if it should be inferred
+     *                       from the file's contents
+     *
+     * @param pixelFormat    the OpenGL pixel format to be used for
+     *                       the texture, or 0 if it should be inferred
+     *                       from the file's contents
+     *
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     *
+     * @param fileSuffix     the file suffix to be used as a hint to the
+     *                       provider to more quickly decide whether it
+     *                       can handle the file, or null if the
+     *                       provider should infer the type from the
+     *                       file's contents
+     *
+     * @throws IOException if an error occurred while reading the stream
+     */
+    public TextureData newTextureData(GLProfile glp, InputStream stream,
+                                      int internalFormat,
+                                      int pixelFormat,
+                                      boolean mipmap,
+                                      String fileSuffix) throws IOException;
+
+    /**
+     * Produces a TextureData object from a URL, or returns null if the
+     * file format was not supported by this TextureProvider. Does not
+     * do any OpenGL-related work. The resulting TextureData can be
+     * converted into an OpenGL texture in a later step.
+     *
+     * @param glp the OpenGL Profile this texture data should be
+     *                  created for.
+     * @param url          the URL from which to read the texture data
+     *
+     * @param internalFormat the OpenGL internal format to be used for
+     *                       the texture, or 0 if it should be inferred
+     *                       from the file's contents
+     *
+     * @param pixelFormat    the OpenGL pixel format to be used for
+     *                       the texture, or 0 if it should be inferred
+     *                       from the file's contents
+     *
+     * @param mipmap     whether mipmaps should be produced for this
+     *                   texture either by autogenerating them or
+     *                   reading them from the file. Some file formats
+     *                   support multiple mipmaps in a single file in
+     *                   which case those mipmaps will be used rather
+     *                   than generating them.
+     *
+     * @param fileSuffix     the file suffix to be used as a hint to the
+     *                       provider to more quickly decide whether it
+     *                       can handle the file, or null if the
+     *                       provider should infer the type from the
+     *                       file's contents
+     *
+     * @throws IOException if an error occurred while reading the URL
+     */
+    public TextureData newTextureData(GLProfile glp, URL url,
+                                      int internalFormat,
+                                      int pixelFormat,
+                                      boolean mipmap,
+                                      String fileSuffix) throws IOException;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureWriter.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureWriter.java
new file mode 100755
index 000000000..55527cef5
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureWriter.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture.spi;
+
+import java.io.*;
+
+import com.jogamp.opengl.util.texture.*;
+
+/** Plug-in interface to TextureIO to support writing OpenGL textures
+    to new file formats. */
+
+public interface TextureWriter {
+    /** Writes the given TextureData to the passed file. Returns true if
+        this TextureWriter successfully handled the writing of the file,
+        otherwise false. May throw IOException if either this writer did
+        not support certain parameters of the TextureData or if an I/O
+        error occurred. */
+    public boolean write(File file,
+                         TextureData data) throws IOException;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java
new file mode 100644
index 000000000..a45821d87
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture.spi.awt;
+
+import java.awt.Graphics;
+import java.awt.image.*;
+import java.io.*;
+import java.net.*;
+import javax.imageio.*;
+import javax.media.opengl.GLProfile;
+
+import com.jogamp.opengl.impl.Debug;
+import com.jogamp.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.awt.*;
+import com.jogamp.opengl.util.texture.spi.*;
+
+public class IIOTextureProvider implements TextureProvider {
+    private static final boolean DEBUG = Debug.debug("TextureIO");
+
+    public TextureData newTextureData(GLProfile glp, File file,
+                                      int internalFormat,
+                                      int pixelFormat,
+                                      boolean mipmap,
+                                      String fileSuffix) throws IOException {
+        BufferedImage img = ImageIO.read(file);
+        if (img == null) {
+            return null;
+        }
+        if (DEBUG) {
+            System.out.println("TextureIO.newTextureData(): BufferedImage type for " + file + " = " +
+                               img.getType());
+        }
+        return new AWTTextureData(glp, internalFormat, pixelFormat, mipmap, img);
+    }
+
+    public TextureData newTextureData(GLProfile glp, InputStream stream,
+                                      int internalFormat,
+                                      int pixelFormat,
+                                      boolean mipmap,
+                                      String fileSuffix) throws IOException {
+        BufferedImage img = ImageIO.read(stream);
+        if (img == null) {
+            return null;
+        }
+        if (DEBUG) {
+            System.out.println("TextureIO.newTextureData(): BufferedImage type for stream = " +
+                               img.getType());
+        }
+        return new AWTTextureData(glp, internalFormat, pixelFormat, mipmap, img);
+    }
+
+    public TextureData newTextureData(GLProfile glp, URL url,
+                                      int internalFormat,
+                                      int pixelFormat,
+                                      boolean mipmap,
+                                      String fileSuffix) throws IOException {
+        InputStream stream = url.openStream();
+        try {
+            return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
+        } finally {
+            stream.close();
+        }
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureWriter.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureWriter.java
new file mode 100644
index 000000000..405211204
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureWriter.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util.texture.spi.awt;
+
+import java.awt.Graphics;
+import java.awt.image.*;
+import java.io.*;
+import java.net.*;
+import java.nio.*;
+import javax.imageio.*;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.awt.*;
+import com.jogamp.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.spi.*;
+
+public class IIOTextureWriter implements TextureWriter {
+    public boolean write(File file,
+                         TextureData data) throws IOException {
+        int pixelFormat = data.getPixelFormat();
+        int pixelType   = data.getPixelType();
+        if ((pixelFormat == GL.GL_RGB ||
+             pixelFormat == GL.GL_RGBA) &&
+            (pixelType == GL.GL_BYTE ||
+             pixelType == GL.GL_UNSIGNED_BYTE)) {
+            // Convert TextureData to appropriate BufferedImage
+            // FIXME: almost certainly not obeying correct pixel order
+            BufferedImage image = new BufferedImage(data.getWidth(), data.getHeight(),
+                                                    (pixelFormat == GL.GL_RGB) ?
+                                                    BufferedImage.TYPE_3BYTE_BGR :
+                                                    BufferedImage.TYPE_4BYTE_ABGR);
+            byte[] imageData = ((DataBufferByte) image.getRaster().getDataBuffer()).getData();
+            ByteBuffer buf = (ByteBuffer) data.getBuffer();
+            if (buf == null) {
+                buf = (ByteBuffer) data.getMipmapData()[0];
+            }
+            buf.rewind();
+            buf.get(imageData);
+            buf.rewind();
+
+            // Swizzle image components to be correct
+            if (pixelFormat == GL.GL_RGB) {
+                for (int i = 0; i < imageData.length; i += 3) {
+                    byte red  = imageData[i + 0];
+                    byte blue = imageData[i + 2];
+                    imageData[i + 0] = blue;
+                    imageData[i + 2] = red;
+                }
+            } else {
+                for (int i = 0; i < imageData.length; i += 4) {
+                    byte red   = imageData[i + 0];
+                    byte green = imageData[i + 1];
+                    byte blue  = imageData[i + 2];
+                    byte alpha = imageData[i + 3];
+                    imageData[i + 0] = alpha;
+                    imageData[i + 1] = blue;
+                    imageData[i + 2] = green;
+                    imageData[i + 3] = red;
+                }
+            }
+
+            // Flip image vertically for the user's convenience
+            ImageUtil.flipImageVertically(image);
+
+            // Happened to notice that writing RGBA images to JPEGS is broken
+            if (TextureIO.JPG.equals(FileUtil.getFileSuffix(file)) &&
+                image.getType() == BufferedImage.TYPE_4BYTE_ABGR) {
+                BufferedImage tmpImage = new BufferedImage(image.getWidth(), image.getHeight(),
+                                                           BufferedImage.TYPE_3BYTE_BGR);
+                Graphics g = tmpImage.getGraphics();
+                g.drawImage(image, 0, 0, null);
+                g.dispose();
+                image = tmpImage;
+            }
+
+            return ImageIO.write(image, FileUtil.getFileSuffix(file), file);
+        }
+      
+        throw new IOException("ImageIO writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
+    }
+}
diff --git a/src/jogl/classes/com/sun/opengl/util/AWTAnimatorImpl.java b/src/jogl/classes/com/sun/opengl/util/AWTAnimatorImpl.java
deleted file mode 100644
index 9809e44d2..000000000
--- a/src/jogl/classes/com/sun/opengl/util/AWTAnimatorImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.opengl.util;
-
-import java.awt.Component;
-import java.awt.EventQueue;
-import java.awt.Rectangle;
-import java.util.*;
-import javax.swing.*;
-
-import javax.media.opengl.*;
-
-/** Abstraction to factor out AWT dependencies from the Animator's
-    implementation in a way that still allows the FPSAnimator to pick
-    up this behavior if desired. */
-
-class AWTAnimatorImpl extends AnimatorImpl {
-    // For efficient rendering of Swing components, in particular when
-    // they overlap one another
-    private List lightweights    = new ArrayList();
-    private Map  repaintManagers = new IdentityHashMap();
-    private Map  dirtyRegions    = new IdentityHashMap();
-
-    public void display(Animator animator,
-                        boolean ignoreExceptions,
-                        boolean printExceptions) {
-        Iterator iter = animator.drawableIterator();
-        while (iter.hasNext()) {
-            GLAutoDrawable drawable = (GLAutoDrawable) iter.next();
-            if (drawable instanceof JComponent) {
-                // Lightweight components need a more efficient drawing
-                // scheme than simply forcing repainting of each one in
-                // turn since drawing one can force another one to be
-                // drawn in turn
-                lightweights.add(drawable);
-            } else {
-                try {
-                    drawable.display();
-                } catch (RuntimeException e) {
-                    if (ignoreExceptions) {
-                        if (printExceptions) {
-                            e.printStackTrace();
-                        }
-                    } else {
-                        throw(e);
-                    }
-                }
-            }
-        }
-        if (lightweights.size() > 0) {
-            try {
-                SwingUtilities.invokeAndWait(drawWithRepaintManagerRunnable);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            lightweights.clear();
-        }
-    }
-
-    // Uses RepaintManager APIs to implement more efficient redrawing of
-    // the Swing widgets we're animating
-    private Runnable drawWithRepaintManagerRunnable = new Runnable() {
-            public void run() {
-                for (Iterator iter = lightweights.iterator(); iter.hasNext(); ) {
-                    JComponent comp = (JComponent) iter.next();
-                    RepaintManager rm = RepaintManager.currentManager(comp);
-                    rm.markCompletelyDirty(comp);
-                    repaintManagers.put(rm, rm);
-
-                    // RepaintManagers don't currently optimize the case of
-                    // overlapping sibling components. If we have two
-                    // JInternalFrames in a JDesktopPane, the redraw of the
-                    // bottom one will cause the top one to be redrawn as
-                    // well. The top one will then be redrawn separately. In
-                    // order to optimize this case we need to compute the union
-                    // of all of the dirty regions on a particular JComponent if
-                    // optimized drawing isn't enabled for it.
-
-                    // Walk up the hierarchy trying to find a non-optimizable
-                    // ancestor
-                    Rectangle visible = comp.getVisibleRect();
-                    int x = visible.x;
-                    int y = visible.y;
-                    while (comp != null) {
-                        x += comp.getX();
-                        y += comp.getY();
-                        Component c = comp.getParent();
-                        if ((c == null) || (!(c instanceof JComponent))) {
-                            comp = null;
-                        } else {
-                            comp = (JComponent) c;
-                            if (!comp.isOptimizedDrawingEnabled()) {
-                                rm = RepaintManager.currentManager(comp);
-                                repaintManagers.put(rm, rm);
-                                // Need to dirty this region
-                                Rectangle dirty = (Rectangle) dirtyRegions.get(comp);
-                                if (dirty == null) {
-                                    dirty = new Rectangle(x, y, visible.width, visible.height);
-                                    dirtyRegions.put(comp, dirty);
-                                } else {
-                                    // Compute union with already dirty region
-                                    // Note we could compute multiple non-overlapping
-                                    // regions: might want to do that in the future
-                                    // (prob. need more complex algorithm -- dynamic
-                                    // programming?)
-                                    dirty.add(new Rectangle(x, y, visible.width, visible.height));
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // Dirty any needed regions on non-optimizable components
-                for (Iterator iter = dirtyRegions.keySet().iterator(); iter.hasNext(); ) {
-                    JComponent comp = (JComponent) iter.next();
-                    Rectangle  rect = (Rectangle) dirtyRegions.get(comp);
-                    RepaintManager rm = RepaintManager.currentManager(comp);
-                    rm.addDirtyRegion(comp, rect.x, rect.y, rect.width, rect.height);
-                }
-
-                // Draw all dirty regions
-                for (Iterator iter = repaintManagers.keySet().iterator(); iter.hasNext(); ) {
-                    ((RepaintManager) iter.next()).paintDirtyRegions();
-                }
-                dirtyRegions.clear();
-                repaintManagers.clear();
-            }
-        };
-
-    public boolean skipWaitForStop(Thread thread) {
-        return ((Thread.currentThread() == thread) || EventQueue.isDispatchThread());
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/Animator.java b/src/jogl/classes/com/sun/opengl/util/Animator.java
deleted file mode 100755
index 1d4b832e8..000000000
--- a/src/jogl/classes/com/sun/opengl/util/Animator.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util;
-
-import java.util.*;
-
-import javax.media.opengl.*;
-
-import com.sun.opengl.impl.Debug;
-
-/** <P> An Animator can be attached to one or more {@link
-    GLAutoDrawable}s to drive their display() methods in a loop. </P>
-
-    <P> The Animator class creates a background thread in which the
-    calls to <code>display()</code> are performed. After each drawable
-    has been redrawn, a brief pause is performed to avoid swamping the
-    CPU, unless {@link #setRunAsFastAsPossible} has been called.  </P>
-*/
-
-public class Animator {
-    protected static final boolean DEBUG = Debug.debug("Animator");
-
-    private volatile ArrayList/*<GLAutoDrawable>*/ drawables = new ArrayList();
-    private AnimatorImpl impl;
-    private Runnable runnable;
-    private boolean runAsFastAsPossible;
-    protected ThreadGroup threadGroup;
-    protected Thread thread;
-    protected volatile boolean shouldStop;
-    protected boolean ignoreExceptions;
-    protected boolean printExceptions;
-
-    /** Creates a new, empty Animator. */
-    public Animator(ThreadGroup tg) {
-
-        if(GLProfile.isAWTJOGLAvailable()) {
-            try {
-                impl = (AnimatorImpl) Class.forName("com.sun.opengl.util.awt.AWTAnimatorImpl").newInstance();
-            } catch (Exception e) { }
-        }
-        if(null==impl) {
-            impl = new AnimatorImpl();
-        }
-        threadGroup = tg;
-
-        if(DEBUG) {
-            System.out.println("Animator created, ThreadGroup: "+threadGroup);
-        }
-    }
-
-    public Animator() {
-        this((ThreadGroup)null);
-    }
-
-    /** Creates a new Animator for a particular drawable. */
-    public Animator(GLAutoDrawable drawable) {
-        this((ThreadGroup)null);
-        add(drawable);
-    }
-
-    /** Creates a new Animator for a particular drawable. */
-    public Animator(ThreadGroup tg, GLAutoDrawable drawable) {
-        this(tg);
-        add(drawable);
-    }
-
-    /** Adds a drawable to the list managed by this Animator. */
-    public synchronized void add(GLAutoDrawable drawable) {
-        ArrayList newList = (ArrayList) drawables.clone();
-        newList.add(drawable);
-        drawables = newList;
-        notifyAll();
-    }
-
-    /** Removes a drawable from the list managed by this Animator. */
-    public synchronized void remove(GLAutoDrawable drawable) {
-        ArrayList newList = (ArrayList) drawables.clone();
-        newList.remove(drawable);
-        drawables = newList;
-    }
-
-    /** Returns an iterator over the drawables managed by this
-        Animator. */
-    public Iterator/*<GLAutoDrawable>*/ drawableIterator() {
-        return drawables.iterator();
-    }
-
-    /** Sets a flag causing this Animator to ignore exceptions produced
-        while redrawing the drawables. By default this flag is set to
-        false, causing any exception thrown to halt the Animator. */
-    public void setIgnoreExceptions(boolean ignoreExceptions) {
-        this.ignoreExceptions = ignoreExceptions;
-    }
-
-    /** Sets a flag indicating that when exceptions are being ignored by
-        this Animator (see {@link #setIgnoreExceptions}), to print the
-        exceptions' stack traces for diagnostic information. Defaults to
-        false. */
-    public void setPrintExceptions(boolean printExceptions) {
-        this.printExceptions = printExceptions;
-    }
-
-    /** Sets a flag in this Animator indicating that it is to run as
-        fast as possible. By default there is a brief pause in the
-        animation loop which prevents the CPU from getting swamped.
-        This method may not have an effect on subclasses. */
-    public final void setRunAsFastAsPossible(boolean runFast) {
-        runAsFastAsPossible = runFast;
-    }
-
-    /** Called every frame to cause redrawing of all of the
-        GLAutoDrawables this Animator manages. Subclasses should call
-        this to get the most optimized painting behavior for the set of
-        components this Animator manages, in particular when multiple
-        lightweight widgets are continually being redrawn. */
-    protected void display() {
-        impl.display(this, ignoreExceptions, printExceptions);
-    }
-
-    class MainLoop implements Runnable {
-        public void run() {
-            try {
-                if(DEBUG) {
-                    System.out.println("Animator started: "+Thread.currentThread());
-                }
-                while (!shouldStop) {
-                    // Don't consume CPU unless there is work to be done
-                    if (drawables.size() == 0) {
-                        synchronized (Animator.this) {
-                            while (drawables.size() == 0 && !shouldStop) {
-                                try {
-                                    Animator.this.wait();
-                                } catch (InterruptedException e) {
-                                }
-                            }
-                        }
-                    }
-                    display();
-                    if (!runAsFastAsPossible) {
-                        // Avoid swamping the CPU
-                        Thread.yield();
-                    }
-                }
-                if(DEBUG) {
-                    System.out.println("Animator stopped: "+Thread.currentThread());
-                }
-            } finally {
-                shouldStop = false;
-                synchronized (Animator.this) {
-                    thread = null;
-                    Animator.this.notify();
-                }
-            }
-        }
-    }
-
-    /** Starts this animator. */
-    public synchronized void start() {
-        if (thread != null) {
-            throw new GLException("Already started");
-        }
-        if (runnable == null) {
-            runnable = new MainLoop();
-        }
-        if(null==threadGroup) {
-            thread = new Thread(runnable);
-        } else {
-            thread = new Thread(threadGroup, runnable);
-        }
-        thread.start();
-    }
-
-    /** Indicates whether this animator is currently running. This
-        should only be used as a heuristic to applications because in
-        some circumstances the Animator may be in the process of
-        shutting down and this method will still return true. */
-    public synchronized boolean isAnimating() {
-        return (thread != null);
-    }
-
-    /** Stops this animator. In most situations this method blocks until
-        completion, except when called from the animation thread itself
-        or in some cases from an implementation-internal thread like the
-        AWT event queue thread. */
-    public synchronized void stop() {
-        shouldStop = true;
-        notifyAll();
-
-        // It's hard to tell whether the thread which calls stop() has
-        // dependencies on the Animator's internal thread. Currently we
-        // use a couple of heuristics to determine whether we should do
-        // the blocking wait().
-        if (impl.skipWaitForStop(thread)) {
-            return;
-        }
-
-        while (shouldStop && thread != null) {
-            try {
-                wait();
-            } catch (InterruptedException ie) {
-            }
-        }
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/AnimatorImpl.java b/src/jogl/classes/com/sun/opengl/util/AnimatorImpl.java
deleted file mode 100644
index 8bba4b71a..000000000
--- a/src/jogl/classes/com/sun/opengl/util/AnimatorImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.opengl.util;
-
-import java.util.*;
-import javax.media.opengl.*;
-
-/** Abstraction to factor out AWT dependencies from the Animator's
-    implementation in a way that still allows the FPSAnimator to pick
-    up this behavior if desired. */
-
-class AnimatorImpl {
-    public void display(Animator animator,
-                        boolean ignoreExceptions,
-                        boolean printExceptions) {
-        Iterator iter = animator.drawableIterator();
-        while (iter.hasNext()) {
-            GLAutoDrawable drawable = (GLAutoDrawable) iter.next();
-            try {
-                drawable.display();
-            } catch (RuntimeException e) {
-                if (ignoreExceptions) {
-                    if (printExceptions) {
-                        e.printStackTrace();
-                    }
-                } else {
-                    throw(e);
-                }
-            }
-        }
-    }
-
-    public boolean skipWaitForStop(Thread thread) {
-        return (Thread.currentThread() == thread);
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javame_cdc_fp b/src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javame_cdc_fp
deleted file mode 100755
index 40f035514..000000000
--- a/src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javame_cdc_fp
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util;
-
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GL2ES2;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLProfile;
-
-import java.nio.*;
-import java.util.*;
-
-import java.lang.reflect.*;
-
-/** Utility routines for dealing with direct buffers. */
-
-public class BufferUtil {
-  public static final int SIZEOF_BYTE = 1;
-  public static final int SIZEOF_SHORT = 2;
-  public static final int SIZEOF_INT = 4;
-  public static final int SIZEOF_FLOAT = 4;
-  public static final int SIZEOF_LONG = -1;    // not supported
-  public static final int SIZEOF_DOUBLE = -1;  // not supported
-
-  public static final int sizeOfGLType(int glType) {
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-                return SIZEOF_BYTE;
-            case GL.GL_BYTE:
-                return SIZEOF_BYTE;
-            case GL.GL_UNSIGNED_SHORT:
-                return SIZEOF_SHORT;
-            case GL.GL_SHORT:
-                return SIZEOF_SHORT;
-            case GL.GL_FLOAT:
-                return SIZEOF_FLOAT;
-            case GL.GL_FIXED:
-                return SIZEOF_INT;
-            case GL2ES2.GL_INT:
-                return SIZEOF_INT;
-            case GL2ES2.GL_UNSIGNED_INT:
-                return SIZEOF_INT;
-            case GL2.GL_DOUBLE:
-                return SIZEOF_DOUBLE;
-        }
-        return -1;
-  }
-
-  public static final int sizeOfBufferElem(Buffer buffer) {
-        if (buffer == null) {
-            return 0;
-        }
-        if (buffer instanceof ByteBuffer) {
-            return BufferUtil.SIZEOF_BYTE;
-        } else if (buffer instanceof IntBuffer) {
-            return BufferUtil.SIZEOF_INT;
-        } else if (buffer instanceof ShortBuffer) {
-            return BufferUtil.SIZEOF_SHORT;
-        } else if (buffer instanceof FloatBuffer) {
-            return BufferUtil.SIZEOF_FLOAT;
-        }
-        throw new RuntimeException("Unexpected buffer type " +
-                                   buffer.getClass().getName());
-  }
-
-  private BufferUtil() {}
-
-  //----------------------------------------------------------------------
-  // Allocation routines
-  //
-
-  public static final Buffer newGLBuffer(int glType, int numElements) {
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-            case GL.GL_BYTE:
-                return newByteBuffer(numElements);
-            case GL.GL_UNSIGNED_SHORT:
-            case GL.GL_SHORT:
-                return newShortBuffer(numElements);
-            case GL.GL_FLOAT:
-                return newFloatBuffer(numElements);
-            case GL.GL_FIXED:
-            case GL2ES2.GL_INT:
-            case GL2ES2.GL_UNSIGNED_INT:
-                return newIntBuffer(numElements);
-        }
-        return null;
-  }
-
-  public static final Buffer sliceGLBuffer(ByteBuffer parent, int bytePos, int byteLen, int glType) {
-        if(parent==null || byteLen==0) return null;
-        parent.position(bytePos);
-        parent.limit(bytePos + byteLen);
-
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-            case GL.GL_BYTE:
-                return parent.slice();
-            case GL.GL_UNSIGNED_SHORT:
-            case GL.GL_SHORT:
-                return parent.asShortBuffer();
-            case GL.GL_FLOAT:
-                return parent.asFloatBuffer();
-            case GL.GL_FIXED:
-            case GL2ES2.GL_INT:
-            case GL2ES2.GL_UNSIGNED_INT:
-                return parent.asIntBuffer();
-        }
-        return null;
-  }
-
-  /** Allocates a new direct ByteBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static ByteBuffer newByteBuffer(int numElements) {
-    ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
-    nativeOrder(bb);
-    return bb;
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values, int offset, int len) {
-    ByteBuffer bb = newByteBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values, int offset) {
-    return newByteBuffer(values, offset, values.length-offset);
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values) {
-    return newByteBuffer(values, 0);
-  }
-    
-  /** Allocates a new direct FloatBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static FloatBuffer newFloatBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_FLOAT);
-    return bb.asFloatBuffer();
-  }
-    
-  public static FloatBuffer newFloatBuffer(float[] values, int offset, int len) {
-    FloatBuffer bb = newFloatBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static FloatBuffer newFloatBuffer(float[] values, int offset) {
-    return newFloatBuffer(values, 0, values.length-offset);
-  }
-
-  public static FloatBuffer newFloatBuffer(float[] values) {
-    return newFloatBuffer(values, 0);
-  }
-    
-  /** Allocates a new direct IntBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static IntBuffer newIntBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
-    return bb.asIntBuffer();
-  }
-    
-  public static IntBuffer newIntBuffer(int[] values, int offset, int len) {
-    IntBuffer bb = newIntBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static IntBuffer newIntBuffer(int[] values, int offset) {
-    return newIntBuffer(values, 0, values.length-offset);
-  }
-
-  public static IntBuffer newIntBuffer(int[] values) {
-    return newIntBuffer(values, 0);
-  }
-    
-    
-  /** Allocates a new direct ShortBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static ShortBuffer newShortBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_SHORT);
-    return bb.asShortBuffer();
-  }
-
-  public static ShortBuffer newShortBuffer(short[] values, int offset, int len) {
-    ShortBuffer bb = newShortBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static ShortBuffer newShortBuffer(short[] values, int offset) {
-    return newShortBuffer(values, 0, values.length-offset);
-  }
-
-  public static ShortBuffer newShortBuffer(short[] values) {
-    return newShortBuffer(values, 0);
-  }
-    
-    
-  //----------------------------------------------------------------------
-  // Copy routines (type-to-type)
-  //
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ByteBuffer into
-      a newly-allocated direct ByteBuffer. The returned buffer will
-      have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining());
-    dest.put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed FloatBuffer
-      into a newly-allocated direct FloatBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static FloatBuffer copyFloatBuffer(FloatBuffer orig) {
-    return copyFloatBufferAsByteBuffer(orig).asFloatBuffer();
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed IntBuffer
-      into a newly-allocated direct IntBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static IntBuffer copyIntBuffer(IntBuffer orig) {
-    return copyIntBufferAsByteBuffer(orig).asIntBuffer();
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ShortBuffer
-      into a newly-allocated direct ShortBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ShortBuffer copyShortBuffer(ShortBuffer orig) {
-    return copyShortBufferAsByteBuffer(orig).asShortBuffer();
-  }
-  
-  //----------------------------------------------------------------------
-  // Copy routines (type-to-ByteBuffer)
-  //
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed FloatBuffer
-      into a newly-allocated direct ByteBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyFloatBufferAsByteBuffer(FloatBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_FLOAT);
-    dest.asFloatBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed IntBuffer into
-      a newly-allocated direct ByteBuffer. The returned buffer will
-      have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyIntBufferAsByteBuffer(IntBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_INT);
-    dest.asIntBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ShortBuffer
-      into a newly-allocated direct ByteBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_SHORT);
-    dest.asShortBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-
-  //----------------------------------------------------------------------
-  // Conversion routines 
-  //
-
-  public final static float[] getFloatArray(double[] source) {
-      int i=source.length;
-      float[] dest = new float[i--];
-      while(i>=0) { dest[i]=(float)source[i]; i--; }
-      return dest;
-  }
-
-  public static ByteBuffer nativeOrder(ByteBuffer buf) {
-    if (!isCDCFP) {
-      try {
-        if (byteOrderClass == null) {
-          byteOrderClass = Class.forName("java.nio.ByteOrder");
-          orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
-          Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
-          nativeOrderObject = nativeOrderMethod.invoke(null, null);
-        }
-      } catch (Throwable t) {
-        // Must be running on CDC / FP
-        isCDCFP = true;
-      }
-
-      if (!isCDCFP) {
-        try {
-          orderMethod.invoke(buf, new Object[] { nativeOrderObject });
-        } catch (Throwable t) {
-        }
-      }
-    }
-    return buf;
-  }
-
-  //----------------------------------------------------------------------
-  // Convenient GL put methods with generic target Buffer
-  //
-  public static void put(Buffer dest, Buffer v) {
-    if((dest instanceof ByteBuffer) && (v instanceof ByteBuffer)) {
-        ((ByteBuffer)dest).put((ByteBuffer)v);
-    } else if((dest instanceof ShortBuffer) && (v instanceof ShortBuffer)) {
-        ((ShortBuffer)dest).put((ShortBuffer)v);
-    } else if((dest instanceof IntBuffer) && (v instanceof IntBuffer)) {
-        ((IntBuffer)dest).put((IntBuffer)v);
-    } else if((dest instanceof FloatBuffer) && (v instanceof FloatBuffer)) {
-        ((FloatBuffer)dest).put((FloatBuffer)v);
-    } else {
-        throw new GLException("Incompatible Buffer classes: dest = "+dest.getClass().getName() + ", src = " + v.getClass().getName());
-    }
-  }
-
-  public static void putb(Buffer dest, byte v) {
-    if(dest instanceof ByteBuffer) {
-        ((ByteBuffer)dest).put(v);
-    } else if(dest instanceof ShortBuffer) {
-        ((ShortBuffer)dest).put((short)v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put((int)v);
-    } else {
-        throw new GLException("Byte doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void puts(Buffer dest, short v) {
-    if(dest instanceof ShortBuffer) {
-        ((ShortBuffer)dest).put(v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put((int)v);
-    } else {
-        throw new GLException("Short doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void puti(Buffer dest, int v) {
-    if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put(v);
-    } else {
-        throw new GLException("Integer doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void putx(Buffer dest, int v) {
-    puti(dest, v);
-  }
-
-  public static void putf(Buffer dest, float v) {
-    if(dest instanceof FloatBuffer) {
-        ((FloatBuffer)dest).put(v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put(FixedPoint.toFixed(v));
-    } else {
-        throw new GLException("Float doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  // NOTE that this work must be done reflectively at the present time
-  // because this code must compile and run correctly on both CDC/FP and J2SE
-  private static boolean isCDCFP;
-  private static Class byteOrderClass;
-  private static Object nativeOrderObject;
-  private static Method orderMethod;
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javase b/src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javase
deleted file mode 100755
index d02f3d15f..000000000
--- a/src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javase
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util;
-
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GL2ES2;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLProfile;
-
-import java.nio.*;
-import java.util.*;
-
-import java.lang.reflect.*;
-
-/** Utility routines for dealing with direct buffers. */
-
-public class BufferUtil {
-  public static final int SIZEOF_BYTE = 1;
-  public static final int SIZEOF_SHORT = 2;
-  public static final int SIZEOF_INT = 4;
-  public static final int SIZEOF_FLOAT = 4;
-  public static final int SIZEOF_LONG = 8;
-  public static final int SIZEOF_DOUBLE = 8;
-
-  public static final int sizeOfGLType(int glType) {
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-                return SIZEOF_BYTE;
-            case GL.GL_BYTE:
-                return SIZEOF_BYTE;
-            case GL.GL_UNSIGNED_SHORT:
-                return SIZEOF_SHORT;
-            case GL.GL_SHORT:
-                return SIZEOF_SHORT;
-            case GL.GL_FLOAT:
-                return SIZEOF_FLOAT;
-            case GL.GL_FIXED:
-                return SIZEOF_INT;
-            case GL2ES2.GL_INT:
-                return SIZEOF_INT;
-            case GL2ES2.GL_UNSIGNED_INT:
-                return SIZEOF_INT;
-            case GL2.GL_DOUBLE:
-                return SIZEOF_DOUBLE;
-        }
-        return -1;
-  }
-
-  public static final int sizeOfBufferElem(Buffer buffer) {
-        if (buffer == null) {
-            return 0;
-        }
-        if (buffer instanceof ByteBuffer) {
-            return BufferUtil.SIZEOF_BYTE;
-        } else if (buffer instanceof IntBuffer) {
-            return BufferUtil.SIZEOF_INT;
-        } else if (buffer instanceof ShortBuffer) {
-            return BufferUtil.SIZEOF_SHORT;
-        } else if (buffer instanceof FloatBuffer) {
-            return BufferUtil.SIZEOF_FLOAT;
-        } else if (buffer instanceof DoubleBuffer) {
-            return BufferUtil.SIZEOF_DOUBLE;
-        }
-        throw new RuntimeException("Unexpected buffer type " +
-                                   buffer.getClass().getName());
-  }
-
-  private BufferUtil() {}
-
-  //----------------------------------------------------------------------
-  // Allocation routines
-  //
-
-  public static final Buffer newGLBuffer(int glType, int numElements) {
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-            case GL.GL_BYTE:
-                return newByteBuffer(numElements);
-            case GL.GL_UNSIGNED_SHORT:
-            case GL.GL_SHORT:
-                return newShortBuffer(numElements);
-            case GL.GL_FLOAT:
-                return newFloatBuffer(numElements);
-            case GL.GL_FIXED:
-            case GL2ES2.GL_INT:
-            case GL2ES2.GL_UNSIGNED_INT:
-                return newIntBuffer(numElements);
-            case GL2.GL_DOUBLE:
-                return newDoubleBuffer(numElements);
-        }
-        return null;
-  }
-
-  public static final Buffer sliceGLBuffer(ByteBuffer parent, int bytePos, int byteLen, int glType) {
-        if(parent==null || byteLen==0) return null;
-        parent.position(bytePos);
-        parent.limit(bytePos + byteLen);
-
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-            case GL.GL_BYTE:
-                return parent.slice();
-            case GL.GL_UNSIGNED_SHORT:
-            case GL.GL_SHORT:
-                return parent.asShortBuffer();
-            case GL.GL_FLOAT:
-                return parent.asFloatBuffer();
-            case GL.GL_FIXED:
-            case GL2ES2.GL_INT:
-            case GL2ES2.GL_UNSIGNED_INT:
-                return parent.asIntBuffer();
-            case GL2.GL_DOUBLE:
-                return parent.asDoubleBuffer();
-        }
-        return null;
-  }
-
-  /** Allocates a new direct ByteBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static ByteBuffer newByteBuffer(int numElements) {
-    ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
-    nativeOrder(bb);
-    return bb;
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values, int offset, int len) {
-    ByteBuffer bb = newByteBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values, int offset) {
-    return newByteBuffer(values, offset, values.length-offset);
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values) {
-    return newByteBuffer(values, 0);
-  }
-    
-    
-  /** Allocates a new direct DoubleBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static DoubleBuffer newDoubleBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_DOUBLE);
-    return bb.asDoubleBuffer();
-  }
-
-  public static DoubleBuffer newDoubleBuffer(double[] values, int offset) {
-    int len = values.length-offset;
-    DoubleBuffer bb = newDoubleBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static DoubleBuffer newDoubleBuffer(double[] values) {
-    return newDoubleBuffer(values, 0);
-  }
-    
-
-  /** Allocates a new direct FloatBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static FloatBuffer newFloatBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_FLOAT);
-    return bb.asFloatBuffer();
-  }
-    
-  public static FloatBuffer newFloatBuffer(float[] values, int offset, int len) {
-    FloatBuffer bb = newFloatBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static FloatBuffer newFloatBuffer(float[] values, int offset) {
-    return newFloatBuffer(values, 0, values.length-offset);
-  }
-
-  public static FloatBuffer newFloatBuffer(float[] values) {
-    return newFloatBuffer(values, 0);
-  }
-    
-    
-  /** Allocates a new direct IntBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static IntBuffer newIntBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
-    return bb.asIntBuffer();
-  }
-    
-  public static IntBuffer newIntBuffer(int[] values, int offset, int len) {
-    IntBuffer bb = newIntBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static IntBuffer newIntBuffer(int[] values, int offset) {
-    return newIntBuffer(values, 0, values.length-offset);
-  }
-
-  public static IntBuffer newIntBuffer(int[] values) {
-    return newIntBuffer(values, 0);
-  }
-    
-  /** Allocates a new direct LongBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static LongBuffer newLongBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_LONG);
-    return bb.asLongBuffer();
-  }
-
-  /** Allocates a new direct ShortBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static ShortBuffer newShortBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_SHORT);
-    return bb.asShortBuffer();
-  }
-
-  public static ShortBuffer newShortBuffer(short[] values, int offset, int len) {
-    ShortBuffer bb = newShortBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static ShortBuffer newShortBuffer(short[] values, int offset) {
-    return newShortBuffer(values, 0, values.length-offset);
-  }
-
-  public static ShortBuffer newShortBuffer(short[] values) {
-    return newShortBuffer(values, 0);
-  }
-    
-  //----------------------------------------------------------------------
-  // Copy routines (type-to-type)
-  //
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ByteBuffer into
-      a newly-allocated direct ByteBuffer. The returned buffer will
-      have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining());
-    dest.put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed FloatBuffer
-      into a newly-allocated direct FloatBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static FloatBuffer copyFloatBuffer(FloatBuffer orig) {
-    return copyFloatBufferAsByteBuffer(orig).asFloatBuffer();
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed IntBuffer
-      into a newly-allocated direct IntBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static IntBuffer copyIntBuffer(IntBuffer orig) {
-    return copyIntBufferAsByteBuffer(orig).asIntBuffer();
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ShortBuffer
-      into a newly-allocated direct ShortBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ShortBuffer copyShortBuffer(ShortBuffer orig) {
-    return copyShortBufferAsByteBuffer(orig).asShortBuffer();
-  }
-  
-  //----------------------------------------------------------------------
-  // Copy routines (type-to-ByteBuffer)
-  //
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed FloatBuffer
-      into a newly-allocated direct ByteBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyFloatBufferAsByteBuffer(FloatBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_FLOAT);
-    dest.asFloatBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed IntBuffer into
-      a newly-allocated direct ByteBuffer. The returned buffer will
-      have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyIntBufferAsByteBuffer(IntBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_INT);
-    dest.asIntBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ShortBuffer
-      into a newly-allocated direct ByteBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_SHORT);
-    dest.asShortBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-
-  //----------------------------------------------------------------------
-  // Conversion routines 
-  //
-  
-  public final static float[] getFloatArray(double[] source) {
-      int i=source.length;
-      float[] dest = new float[i--];
-      while(i>=0) { dest[i]=(float)source[i]; i--; }
-      return dest;
-  }
-
-  public final static FloatBuffer getFloatBuffer(DoubleBuffer source) {
-      source.rewind();
-      FloatBuffer dest = BufferUtil.newFloatBuffer(source.limit());
-      while(source.hasRemaining()) { dest.put((float)source.get()); }
-      return dest;
-  }
-
-  public static ByteBuffer nativeOrder(ByteBuffer buf) {
-    if (!isCDCFP) {
-      try {
-        if (byteOrderClass == null) {
-          byteOrderClass = Class.forName("java.nio.ByteOrder");
-          orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
-          Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
-          nativeOrderObject = nativeOrderMethod.invoke(null, null);
-        }
-      } catch (Throwable t) {
-        // Must be running on CDC / FP
-        isCDCFP = true;
-      }
-
-      if (!isCDCFP) {
-        try {
-          orderMethod.invoke(buf, new Object[] { nativeOrderObject });
-        } catch (Throwable t) {
-        }
-      }
-    }
-    return buf;
-  }
-
-  //----------------------------------------------------------------------
-  // Convenient GL put methods with generic target Buffer
-  //
-  public static void put(Buffer dest, Buffer v) {
-    if((dest instanceof ByteBuffer) && (v instanceof ByteBuffer)) {
-        ((ByteBuffer)dest).put((ByteBuffer)v);
-    } else if((dest instanceof ShortBuffer) && (v instanceof ShortBuffer)) {
-        ((ShortBuffer)dest).put((ShortBuffer)v);
-    } else if((dest instanceof IntBuffer) && (v instanceof IntBuffer)) {
-        ((IntBuffer)dest).put((IntBuffer)v);
-    } else if((dest instanceof FloatBuffer) && (v instanceof FloatBuffer)) {
-        ((FloatBuffer)dest).put((FloatBuffer)v);
-    } else {
-        throw new GLException("Incompatible Buffer classes: dest = "+dest.getClass().getName() + ", src = " + v.getClass().getName());
-    }
-  }
-
-  public static void putb(Buffer dest, byte v) {
-    if(dest instanceof ByteBuffer) {
-        ((ByteBuffer)dest).put(v);
-    } else if(dest instanceof ShortBuffer) {
-        ((ShortBuffer)dest).put((short)v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put((int)v);
-    } else {
-        throw new GLException("Byte doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void puts(Buffer dest, short v) {
-    if(dest instanceof ShortBuffer) {
-        ((ShortBuffer)dest).put(v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put((int)v);
-    } else {
-        throw new GLException("Short doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void puti(Buffer dest, int v) {
-    if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put(v);
-    } else {
-        throw new GLException("Integer doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void putx(Buffer dest, int v) {
-    puti(dest, v);
-  }
-
-  public static void putf(Buffer dest, float v) {
-    if(dest instanceof FloatBuffer) {
-        ((FloatBuffer)dest).put(v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put(FixedPoint.toFixed(v));
-    } else {
-        throw new GLException("Float doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void putd(Buffer dest, double v) {
-    if(dest instanceof FloatBuffer) {
-        ((FloatBuffer)dest).put((float)v);
-    } else {
-        throw new GLException("Double doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  // NOTE that this work must be done reflectively at the present time
-  // because this code must compile and run correctly on both CDC/FP and J2SE
-  private static boolean isCDCFP;
-  private static Class byteOrderClass;
-  private static Object nativeOrderObject;
-  private static Method orderMethod;
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/FBObject.java b/src/jogl/classes/com/sun/opengl/util/FBObject.java
deleted file mode 100755
index 84b79dff4..000000000
--- a/src/jogl/classes/com/sun/opengl/util/FBObject.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.opengl.util;
-
-import javax.media.opengl.*;
-
-public class FBObject {
-    private int width, height, attr;
-    private int fb, fbo_tex, depth_rb, stencil_rb, vStatus;
-    private int texInternalFormat, texDataFormat, texDataType;
-
-    public static final int ATTR_DEPTH   = 1 << 0;
-    public static final int ATTR_STENCIL = 1 << 1;
-
-    public FBObject(int width, int height, int attributes) {
-        this.width = width;
-        this.height = height;
-        this.attr = attributes;
-    }        
-
-
-    public boolean validateStatus(GL gl) {
-        vStatus = getStatus(gl, fb);
-        switch(vStatus) {
-            case GL.GL_FRAMEBUFFER_COMPLETE:
-                return true;
-            case GL.GL_FRAMEBUFFER_UNSUPPORTED:
-            case GL.GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
-            case GL.GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
-            case GL.GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
-            case GL.GL_FRAMEBUFFER_INCOMPLETE_FORMATS:
-            //case GL2.GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
-            //case GL2.GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
-            //case GL2.GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT:
-            case 0:
-            default:
-                return false;
-        }
-    }
-
-    public static int getStatus(GL gl, int fb) {
-        if(!gl.glIsFramebuffer(fb)) {
-            return -1;
-        }
-        return gl.glCheckFramebufferStatus(gl.GL_FRAMEBUFFER);
-        //return gl.glCheckFramebufferStatus(fb);
-    }
-
-    public String getStatusString() {
-        return getStatusString(vStatus);
-    }
-
-    public static String getStatusString(int fbStatus) {
-        switch(fbStatus) {
-            case -1:
-                return "NOT A FBO";
-            case GL.GL_FRAMEBUFFER_COMPLETE:
-                return "OK";
-            case GL.GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
-                return("GL FBO: incomplete,incomplete attachment\n");
-            case GL.GL_FRAMEBUFFER_UNSUPPORTED:
-                return("GL FBO: Unsupported framebuffer format");
-            case GL.GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
-                return("GL FBO: incomplete,missing attachment");
-            case GL.GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
-                return("GL FBO: incomplete,attached images must have same dimensions");
-            case GL.GL_FRAMEBUFFER_INCOMPLETE_FORMATS:
-                 return("GL FBO: incomplete,attached images must have same format");
-                 /*
-            case GL2.GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
-                return("GL FBO: incomplete,missing draw buffer");
-            case GL2.GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
-                return("GL FBO: incomplete,missing read buffer");
-            case GL2.GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT:
-                return("GL FBO: incomplete, duplicate attachment");
-                */
-            case 0:
-                return("GL FBO: incomplete, implementation fault");
-            default:
-                return("GL FBO: incomplete, implementation ERROR");
-        }
-    }
-
-    public void init(GL gl) {
-        int textureInternalFormat, textureDataFormat, textureDataType;
-
-        if(gl.isGL2()) { 
-            textureInternalFormat=GL.GL_RGBA8;
-            textureDataFormat=GL2.GL_BGRA;
-            textureDataType=GL2.GL_UNSIGNED_INT_8_8_8_8_REV;
-        } else if(gl.isGLES()) { 
-            textureInternalFormat=GL.GL_RGBA;
-            textureDataFormat=GL.GL_RGBA;
-            textureDataType=GL.GL_UNSIGNED_BYTE;
-        } else {
-            textureInternalFormat=GL.GL_RGB;
-            textureDataFormat=GL.GL_RGB;
-            textureDataType=GL.GL_UNSIGNED_BYTE;
-        }
-        init(gl, textureInternalFormat, textureDataFormat, textureDataType);
-    }
-
-    public void init(GL gl, int textureInternalFormat, int textureDataFormat, int textureDataType) {
-        texInternalFormat=textureInternalFormat; 
-        texDataFormat=textureDataFormat;
-        texDataType=textureDataType;
-
-        // generate fbo ..
-        int name[] = new int[1];
-
-        gl.glGenFramebuffers(1, name, 0);
-        fb = name[0];
-        System.out.println("fb: "+fb);
-
-        gl.glGenTextures(1, name, 0);
-        fbo_tex = name[0];
-        System.out.println("fbo_tex: "+fbo_tex);
-
-        if(0!=(attr&ATTR_DEPTH)) {
-            gl.glGenRenderbuffers(1, name, 0);
-            depth_rb = name[0];
-            System.out.println("depth_rb: "+depth_rb);
-        } else {
-            depth_rb = 0;
-        }
-        if(0!=(attr&ATTR_STENCIL)) {
-            gl.glGenRenderbuffers(1, name, 0);
-            stencil_rb = name[0];
-            System.out.println("stencil_rb: "+stencil_rb);
-        } else {
-            stencil_rb = 0;
-        }
-
-        // bind fbo ..
-        gl.glBindFramebuffer(GL.GL_FRAMEBUFFER, fb);
-
-        gl.glBindTexture(GL.GL_TEXTURE_2D, fbo_tex);
-        gl.glTexImage2D(GL.GL_TEXTURE_2D, 0, texInternalFormat, width, height, 0,
-                        texDataFormat, texDataType, null);
-        gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST);
-        gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_NEAREST);
-        //gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP);
-        //gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_WRAP_T, GL2.GL_CLAMP);
-
-
-        // Set up the color buffer for use as a renderable texture:
-        gl.glFramebufferTexture2D(GL.GL_FRAMEBUFFER,
-                                  GL.GL_COLOR_ATTACHMENT0,
-                                  GL.GL_TEXTURE_2D, fbo_tex, 0); 
-
-        if(depth_rb!=0) {
-            // Initialize the depth buffer:
-            gl.glBindRenderbuffer(GL.GL_RENDERBUFFER, depth_rb);
-            gl.glRenderbufferStorage(GL.GL_RENDERBUFFER,
-                                        GL.GL_DEPTH_COMPONENT16, width, height);
-            // Set up the depth buffer attachment:
-            gl.glFramebufferRenderbuffer(GL.GL_FRAMEBUFFER,
-                                            GL.GL_DEPTH_ATTACHMENT,
-                                            GL.GL_RENDERBUFFER, depth_rb);
-        }
-
-        if(stencil_rb!=0) {
-            // Initialize the stencil buffer:
-            gl.glBindRenderbuffer(GL.GL_RENDERBUFFER, stencil_rb);
-            gl.glRenderbufferStorage(GL.GL_RENDERBUFFER,
-                                        GL.GL_STENCIL_INDEX8, width, height);
-            gl.glFramebufferRenderbuffer(GL.GL_FRAMEBUFFER,
-                                            GL.GL_STENCIL_ATTACHMENT,
-                                            GL.GL_RENDERBUFFER, stencil_rb);
-        }
-
-        // Check the FBO for completeness
-        if(validateStatus(gl)) {
-            System.out.println("Framebuffer " + fb + " is complete");
-        } else {
-            System.out.println("Framebuffer " + fb + " is incomplete: status = 0x" + Integer.toHexString(vStatus) + 
-                               " : " + getStatusString());
-        }
-
-        unbind(gl);
-    }
-
-    public void destroy(GL gl) {
-        unbind(gl);
-
-        int name[] = new int[1];
-
-        if(0!=stencil_rb) {
-            name[0] = stencil_rb;
-            gl.glDeleteRenderbuffers(1, name, 0);
-            stencil_rb = 0;
-        }
-        if(0!=depth_rb) {
-            name[0] = depth_rb;
-            gl.glDeleteRenderbuffers(1, name, 0);
-            depth_rb=0;
-        }
-        if(0!=fbo_tex) {
-            name[0] = fbo_tex;
-            gl.glDeleteTextures(1, name, 0);
-            fbo_tex = 0;
-        }
-        if(0!=fb) {
-            name[0] = fb;
-            gl.glDeleteFramebuffers(1, name, 0);
-            fb = 0;
-        }
-    }
-
-    public void bind(GL gl) {
-        gl.glBindTexture(GL.GL_TEXTURE_2D, fbo_tex);
-        gl.glBindFramebuffer(GL.GL_FRAMEBUFFER, fb); 
-    }
-
-    public void unbind(GL gl) {
-        gl.glBindTexture(GL.GL_TEXTURE_2D, 0);
-        gl.glBindFramebuffer(GL.GL_FRAMEBUFFER, 0);
-    }
-
-    public void use(GL gl) {
-        gl.glBindTexture(GL.GL_TEXTURE_2D, 0);
-        gl.glBindFramebuffer(GL.GL_FRAMEBUFFER, 0);
-        gl.glBindTexture(GL.GL_TEXTURE_2D, fbo_tex); // to use it ..
-    }
-
-    public int getFBName() {
-        return fb;
-    }
-    public int getTextureName() {
-        return fbo_tex;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/FPSAnimator.java b/src/jogl/classes/com/sun/opengl/util/FPSAnimator.java
deleted file mode 100755
index 290de89d6..000000000
--- a/src/jogl/classes/com/sun/opengl/util/FPSAnimator.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util;
-
-import java.util.*;
-import javax.media.opengl.*;
-
-/** An Animator subclass which attempts to achieve a target
-    frames-per-second rate to avoid using all CPU time. The target FPS
-    is only an estimate and is not guaranteed. */
-
-public class FPSAnimator extends Animator {
-  private Timer timer;
-  private int   fps;
-  private boolean scheduleAtFixedRate;
-
-  /** Creates an FPSAnimator with a given target frames-per-second
-      value. Equivalent to <code>FPSAnimator(null, fps)</code>. */
-  public FPSAnimator(int fps) {
-    this(null, fps);
-  }
-
-  /** Creates an FPSAnimator with a given target frames-per-second
-      value and a flag indicating whether to use fixed-rate
-      scheduling. Equivalent to <code>FPSAnimator(null, fps,
-      scheduleAtFixedRate)</code>. */
-  public FPSAnimator(int fps, boolean scheduleAtFixedRate) {
-    this(null, fps, scheduleAtFixedRate);
-  }
-
-  /** Creates an FPSAnimator with a given target frames-per-second
-      value and an initial drawable to animate. Equivalent to
-      <code>FPSAnimator(null, fps, false)</code>. */
-  public FPSAnimator(GLAutoDrawable drawable, int fps) {
-    this(drawable, fps, false);
-  }
-
-  /** Creates an FPSAnimator with a given target frames-per-second
-      value, an initial drawable to animate, and a flag indicating
-      whether to use fixed-rate scheduling. */
-  public FPSAnimator(GLAutoDrawable drawable, int fps, boolean scheduleAtFixedRate) {
-    this.fps = fps;
-    if (drawable != null) {
-      add(drawable);
-    }
-    this.scheduleAtFixedRate = scheduleAtFixedRate;
-  }
-
-  /** Starts this FPSAnimator. */
-  public synchronized void start() {
-    if (timer != null) {
-      throw new GLException("Already started");
-    }
-    timer = new Timer();
-    long delay = (long) (1000.0f / (float) fps);
-    TimerTask task = new TimerTask() {
-        public void run() {
-          display();
-        }
-      };
-    if (scheduleAtFixedRate) {
-      timer.scheduleAtFixedRate(task, 0, delay);
-    } else {
-      timer.schedule(task, 0, delay);
-    }
-  }
-
-  /** Indicates whether this FPSAnimator is currently running. This
-      should only be used as a heuristic to applications because in
-      some circumstances the FPSAnimator may be in the process of
-      shutting down and this method will still return true. */
-  public synchronized boolean isAnimating() {
-    return (timer != null);
-  }
-
-  /** Stops this FPSAnimator. Due to the implementation of the
-      FPSAnimator it is not guaranteed that the FPSAnimator will be
-      completely stopped by the time this method returns. */
-  public synchronized void stop() {
-    if (timer == null) {
-      throw new GLException("Already stopped");
-    }
-    timer.cancel();
-    timer = null;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/FileUtil.java b/src/jogl/classes/com/sun/opengl/util/FileUtil.java
deleted file mode 100755
index 84b846853..000000000
--- a/src/jogl/classes/com/sun/opengl/util/FileUtil.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util;
-
-import java.io.*;
-
-/** Utilities for dealing with files. */
-
-public class FileUtil {
-    private FileUtil() {}
-
-    /**
-     * Returns the lowercase suffix of the given file name (the text
-     * after the last '.' in the file name). Returns null if the file
-     * name has no suffix. Only operates on the given file name;
-     * performs no I/O operations.
-     *
-     * @param file name of the file
-     * @return lowercase suffix of the file name
-     * @throws NullPointerException if file is null
-     */
-
-    public static String getFileSuffix(File file) {
-        return getFileSuffix(file.getName());
-    }
-
-    /**
-     * Returns the lowercase suffix of the given file name (the text
-     * after the last '.' in the file name). Returns null if the file
-     * name has no suffix. Only operates on the given file name;
-     * performs no I/O operations.
-     *
-     * @param filename name of the file
-     * @return lowercase suffix of the file name
-     * @throws NullPointerException if filename is null
-     */
-    public static String getFileSuffix(String filename) {
-        int lastDot = filename.lastIndexOf('.');
-        if (lastDot < 0) {
-            return null;
-        }
-        return toLowerCase(filename.substring(lastDot + 1));
-    }
-
-    private static String toLowerCase(String arg) {
-        if (arg == null) {
-            return null;
-        }
-
-        return arg.toLowerCase();
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/FixedPoint.java b/src/jogl/classes/com/sun/opengl/util/FixedPoint.java
deleted file mode 100644
index e9bdae0e9..000000000
--- a/src/jogl/classes/com/sun/opengl/util/FixedPoint.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.opengl.util;
-
-public class FixedPoint {
-  public static final int toFixed(int value) {
-    if (value < -32768) value = -32768;
-    if (value > 32767) value = 32767;
-    return value * 65536;
-  }
-
-  public static final int toFixed(float value) {
-    if (value < -32768) value = -32768;
-    if (value > 32767) value = 32767;
-    return (int)(value * 65536.0f);
-  }
-
-  public static final float toFloat(int value) {
-    return (float)value/65536.0f;
-  }
-
-  public static final int mult(int x1, int x2) {
-    return (int) ( ((long)x1*(long)x2)/65536 );
-  }
-
-  public static final int div(int x1, int x2) {
-    return (int) ( (((long)x1)<<16)/x2 );
-  }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayDataClient.java b/src/jogl/classes/com/sun/opengl/util/GLArrayDataClient.java
deleted file mode 100644
index ec4c5e393..000000000
--- a/src/jogl/classes/com/sun/opengl/util/GLArrayDataClient.java
+++ /dev/null
@@ -1,353 +0,0 @@
-
-package com.sun.opengl.util;
-
-import java.security.*;
-
-import javax.media.opengl.*;
-
-import com.sun.opengl.util.glsl.*;
-
-import com.sun.opengl.impl.SystemUtil;
-
-import java.nio.*;
-
-public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayDataEditable {
-
-  /**
-   * The OpenGL ES emulation on the PC probably has a buggy VBO implementation,
-   * where we have to 'refresh' the VertexPointer or VertexAttribArray after each
-   * BindBuffer !
-   *
-   * This should not be necessary on proper native implementations.
-   */
-  public static final boolean hasVBOBug = AccessController.doPrivileged(new PrivilegedAction() {
-          public Object run() {
-              return SystemUtil.getenv("JOGL_VBO_BUG");
-          }
-      }) != null;
-
-  /**
-   * @param index The GL array index
-   * @param name  The optional custom name for the GL array index, maybe null.
-   *            If null, the default name mapping will be used, see 'getPredefinedArrayIndexName(int)'.
-   *            This name might be used as the shader attribute name.
-   * @param comps The array component number
-   * @param dataType The array index GL data type
-   * @param normalized Wheather the data shall be normalized
-   *
-   * @see javax.media.opengl.GLContext#getPredefinedArrayIndexName(int)
-   */
-  public static GLArrayDataClient createFixed(GL gl, int index, String name, int comps, int dataType, boolean normalized, 
-                                              int initialSize)
-    throws GLException
-  {
-      gl.getGLProfile().isValidArrayDataType(index, comps, dataType, false, true);
-      GLArrayDataClient adc = new GLArrayDataClient();
-      GLArrayHandler glArrayHandler = new GLFixedArrayHandler(adc);
-      adc.init(name, index, comps, dataType, normalized, 0, null, initialSize, false, glArrayHandler, 0, 0);
-      return adc;
-  }
-
-  public static GLArrayDataClient createFixed(GL gl, int index, String name, int comps, int dataType, boolean normalized, 
-                                              int stride, Buffer buffer)
-    throws GLException
-  {
-      gl.getGLProfile().isValidArrayDataType(index, comps, dataType, false, true);
-      GLArrayDataClient adc = new GLArrayDataClient();
-      GLArrayHandler glArrayHandler = new GLFixedArrayHandler(adc);
-      adc.init(name, index, comps, dataType, normalized, stride, buffer, comps*comps, false, glArrayHandler, 0, 0);
-      return adc;
-  }
-
-  public static GLArrayDataClient createGLSL(GL gl, String name, int comps, int dataType, boolean normalized, 
-                                             int initialSize)
-    throws GLException
-  {
-      if(!gl.hasGLSL()) {
-        throw new GLException("GLArrayDataClient.GLSL not supported: "+gl);
-      }
-      gl.getGLProfile().isValidArrayDataType(-1, comps, dataType, true, true);
-
-      GLArrayDataClient adc = new GLArrayDataClient();
-      GLArrayHandler glArrayHandler = new GLSLArrayHandler(adc);
-      adc.init(name, -1, comps, dataType, normalized, 0, null, initialSize, true, glArrayHandler, 0, 0);
-      return adc;
-  }
-
-  public static GLArrayDataClient createGLSL(GL gl, String name, int comps, int dataType, boolean normalized, 
-                                             int stride, Buffer buffer)
-    throws GLException
-  {
-      if(!gl.hasGLSL()) {
-        throw new GLException("GLArrayDataClient.GLSL not supported: "+gl);
-      }
-      gl.getGLProfile().isValidArrayDataType(-1, comps, dataType, true, true);
-
-      GLArrayDataClient adc = new GLArrayDataClient();
-      GLArrayHandler glArrayHandler = new GLSLArrayHandler(adc);
-      adc.init(name, -1, comps, dataType, normalized, stride, buffer, comps*comps, true, glArrayHandler, 0, 0);
-      return adc;
-  }
-
-  // 
-  // Data read access
-  //
-
-  public final boolean isBufferWritten() { return bufferWritten; }
-
-  public final boolean sealed() { return sealed; }
-
-  public int getBufferUsage() { return -1; }
-
-  //
-  // Data and GL state modification ..
-  //
-
-  public final void setBufferWritten(boolean written) { bufferWritten=written; }
-
-  public void destroy(GL gl) {
-    reset(gl);
-    buffer=null;
-  }
-
-  public void reset(GL gl) {
-    enableBuffer(gl, false);
-    reset();
-  }
-
-  public void seal(GL gl, boolean seal)
-  {
-    seal(seal);
-    if(sealedGL==seal) return;
-    sealedGL = seal;
-    if(seal) {
-        init_vbo(gl);
-
-        enableBuffer(gl, true);
-    } else {
-        enableBuffer(gl, false);
-    }
-  }
-
-  public void enableBuffer(GL gl, boolean enable) {
-    if(enableBufferAlways && enable) {
-        bufferEnabled = false;
-    }
-    if( bufferEnabled != enable && components>0 ) {
-        if(enable) {
-            checkSeal(true);
-            if(null!=buffer) {
-                buffer.rewind();
-            }
-        }
-        glArrayHandler.enableBuffer(gl, enable);
-        bufferEnabled = enable;
-    }
-  }
-
-  public void setEnableAlways(boolean always) {
-    enableBufferAlways = always;
-  }
-
-  //
-  // Data modification ..
-  //
-
-  public void reset() {
-    if(buffer!=null) {
-        buffer.clear();
-    }
-    this.sealed=false;
-    this.bufferEnabled=false;
-    this.bufferWritten=false;
-  }
-
-  public void seal(boolean seal)
-  {
-    if(sealed==seal) return;
-    sealed = seal;
-    if(seal) {
-        bufferWritten=false;
-        if (null!=buffer) {
-            buffer.flip();
-        }
-    } else {
-        if (null!=buffer) {
-            buffer.position(buffer.limit());
-            buffer.limit(buffer.capacity());
-        }
-    }
-  }
-
-
-  public void rewind() {
-    if(buffer!=null) {
-        buffer.rewind();
-    }
-  }
-
-  public void padding(int done) {
-    if ( buffer==null || sealed ) return;
-    while(done<strideL) {
-        BufferUtil.putb(buffer, (byte)0);
-        done++;
-    }
-  }
-
-  /**
-   * Generic buffer relative put method.
-   *
-   * This class buffer Class must match the arguments buffer class.
-   * The arguments remaining elements must be a multiple of this arrays element stride.
-   */
-  public void put(Buffer v) {
-    if ( buffer==null || sealed ) return;
-    if(0!=(v.remaining() % strideL)) {
-        throw new GLException("Buffer length ("+v.remaining()+") is not a multiple of component-stride:\n\t"+this);
-    }
-    growBufferIfNecessary(v.remaining());
-    BufferUtil.put(buffer, v);
-  }
-
-  public void putb(byte v) {
-    if ( buffer==null || sealed ) return;
-    growBufferIfNecessary(1);
-    BufferUtil.putb(buffer, v);
-  }
-
-  public void puts(short v) {
-    if ( buffer==null || sealed ) return;
-    growBufferIfNecessary(1);
-    BufferUtil.puts(buffer, v);
-  }
-
-  public void puti(int v) {
-    if ( buffer==null || sealed ) return;
-    growBufferIfNecessary(1);
-    BufferUtil.puti(buffer, v);
-  }
-
-  public void putx(int v) {
-    puti(v);
-  }
-
-  public void putf(float v) {
-    if ( buffer==null || sealed ) return;
-    growBufferIfNecessary(1);
-    BufferUtil.putf(buffer, v);
-  }
-
-  public String toString() {
-    return "GLArrayDataClient["+name+
-                       ", index "+index+
-                       ", location "+location+
-                       ", isVertexAttribute "+isVertexAttribute+
-                       ", dataType "+dataType+ 
-                       ", bufferClazz "+clazz+ 
-                       ", elements "+getElementNumber()+
-                       ", components "+components+ 
-                       ", stride "+stride+"u "+strideB+"b "+strideL+"c"+
-                       ", initialSize "+initialSize+ 
-                       ", sealed "+sealed+ 
-                       ", bufferEnabled "+bufferEnabled+ 
-                       ", bufferWritten "+bufferWritten+ 
-                       ", buffer "+buffer+ 
-                       "]";
-  }
-
-  // non public matters
-
-  protected final boolean growBufferIfNecessary(int spare) {
-    if(buffer==null || buffer.remaining()<spare) { 
-        growBuffer(initialSize);
-        return true;
-    }
-    return false;
-  }
-
-  protected final void growBuffer(int additional) {
-    if(sealed || 0==additional || 0==components) return;
-
-    // add the stride delta
-    additional += (additional/components)*(strideL-components);
-
-    if(components>0) {
-        int osize = (buffer!=null)?buffer.capacity():0;
-        if(clazz==ByteBuffer.class) {
-            ByteBuffer newBBuffer = BufferUtil.newByteBuffer( (osize+additional) * components );
-            if(buffer!=null) {
-                buffer.flip();
-                newBBuffer.put((ByteBuffer)buffer);
-            }
-            buffer = newBBuffer;
-        } else if(clazz==ShortBuffer.class) {
-            ShortBuffer newSBuffer = BufferUtil.newShortBuffer( (osize+additional) * components );
-            if(buffer!=null) {
-                buffer.flip();
-                newSBuffer.put((ShortBuffer)buffer);
-            }
-            buffer = newSBuffer;
-        } else if(clazz==IntBuffer.class) {
-            IntBuffer newIBuffer = BufferUtil.newIntBuffer( (osize+additional) * components );
-            if(buffer!=null) {
-                buffer.flip();
-                newIBuffer.put((IntBuffer)buffer);
-            }
-            buffer = newIBuffer;
-        } else if(clazz==FloatBuffer.class) {
-            FloatBuffer newFBuffer = BufferUtil.newFloatBuffer( (osize+additional) * components );
-            if(buffer!=null) {
-                buffer.flip();
-                newFBuffer.put((FloatBuffer)buffer);
-            }
-            buffer = newFBuffer;
-        } else {
-            throw new GLException("Given Buffer Class not supported: "+clazz+":\n\t"+this);
-        }
-    }
-  }
-
-  protected final void checkSeal(boolean test) throws GLException {
-    if(sealed!=test) {
-        if(test) {
-            throw new GLException("Not Sealed yet, seal first:\n\t"+this); 
-        } else {
-            throw new GLException("Already Sealed, can't modify VBO:\n\t"+this); 
-        }
-    }
-  }
-
-  protected void init(String name, int index, int comps, int dataType, boolean normalized, int stride, Buffer data, 
-                      int initialSize, boolean isVertexAttribute, GLArrayHandler handler,
-                      int vboName, long bufferOffset)
-    throws GLException
-  {
-    super.init(name, index, comps, dataType, normalized, stride, data, isVertexAttribute,
-               vboName, bufferOffset);
-
-    this.initialSize = initialSize;
-    this.glArrayHandler = handler;
-    this.sealed=false;
-    this.sealedGL=false;
-    this.bufferEnabled=false;
-    this.enableBufferAlways=false;
-    this.bufferWritten=false;
-    if(null==buffer) {
-        growBuffer(initialSize);
-    }
-  }
-
-  protected void init_vbo(GL gl) {}
-
-  protected GLArrayDataClient() { }
-
-  protected boolean sealed, sealedGL;
-  protected boolean bufferEnabled;
-  protected boolean bufferWritten;
-  protected boolean enableBufferAlways;
-
-  protected int initialSize;
-
-  protected GLArrayHandler glArrayHandler;
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayDataEditable.java b/src/jogl/classes/com/sun/opengl/util/GLArrayDataEditable.java
deleted file mode 100644
index c8fcbf573..000000000
--- a/src/jogl/classes/com/sun/opengl/util/GLArrayDataEditable.java
+++ /dev/null
@@ -1,110 +0,0 @@
-
-package com.sun.opengl.util;
-
-import javax.media.opengl.*;
-
-import java.nio.*;
-
-/**
- *
- * The total number of bytes hold by the referenced buffer is:
- * getComponentSize()* getComponentNumber() * getElementNumber()
- *
- */
-public interface GLArrayDataEditable extends GLArrayData {
-
-    public boolean sealed();
-
-    /**
-     * The VBO buffer usage, if it's an VBO, otherwise -1
-     */
-    public int getBufferUsage();
-
-    /**
-     * Is the buffer written to the GPU ?
-     */
-    public boolean isBufferWritten();
-
-    /**
-     * Marks the buffer written to the GPU
-     */
-    public void setBufferWritten(boolean written);
-
-    //
-    // Data and GL state modification ..
-    //
-
-    public void destroy(GL gl);
-
-    public void reset(GL gl);
-
-    /**
-     * If seal is true, it
-     * disable write operations to the buffer.
-     * Calls flip, ie limit:=position and position:=0.
-     * Also enables the buffer for OpenGL, and passes the data.
-     *
-     * If seal is false, it
-     * enable write operations continuing
-     * at the buffer position, where you left off at seal(true),
-     * ie position:=limit and limit:=capacity.
-     * Also disables the buffer for OpenGL.
-     *
-     * @see #seal(boolean)
-     */
-    public void seal(GL gl, boolean seal);
-
-    /**
-     * Enables/disables the buffer, which implies
-     * the client state, binding the VBO
-     * and transfering the data if not done yet.
-     * 
-     * The above will only be executed,
-     * if the buffer is disabled,
-     * or 'setEnableAlways' was called with 'true'.
-     *
-     * @see #setEnableAlways(boolean)
-     */
-    public void enableBuffer(GL gl, boolean enable);
-
-    /**
-     * Affects the behavior of 'enableBuffer'.
-     *
-     * The default is 'false'
-     *
-     * This is usefull when you mix up 
-     * GLArrayData usage with conventional GL array calls.
-     *
-     * @see #enableBuffer(GL, boolean)
-     */
-    public void setEnableAlways(boolean always);
-
-    //
-    // Data modification ..
-    //
-
-    public void reset();
-
-    /**
-     * If seal is true, it
-     * disable write operations to the buffer.
-     * Calls flip, ie limit:=position and position:=0.
-     *
-     * If seal is false, it
-     * enable write operations continuing
-     * at the buffer position, where you left off at seal(true),
-     * ie position:=limit and limit:=capacity.
-     *
-     */
-    public void seal(boolean seal);
-
-    public void rewind();
-    public void padding(int done);
-    public void put(Buffer v);
-    public void putb(byte v);
-    public void puts(short v);
-    public void puti(int v);
-    public void putx(int v);
-    public void putf(float v);
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java b/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java
deleted file mode 100644
index dc233ce36..000000000
--- a/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java
+++ /dev/null
@@ -1,209 +0,0 @@
-
-package com.sun.opengl.util;
-
-import javax.media.opengl.*;
-import java.nio.*;
-
-import com.sun.opengl.util.glsl.*;
-
-public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataEditable {
-
-  //
-  // lifetime matters
-  //
-
-  /**
-   * Create a VBOBuffer object, using a predefined fixed function array index
-   * and starting with a given Buffer object incl it's stride
-   *
-   * On profiles GL2 and ES1 the fixed function pipeline behavior is as expected.
-   * On profile ES2 the fixed function emulation will transform these calls to 
-   * EnableVertexAttribArray and VertexAttribPointer calls,
-   * and a predefined vertex attribute variable name will be choosen.
-   *
-   * @param index The GL array index
-   * @param name  The optional custom name for the GL array index, maybe null.
-   *            If null, the default name mapping will be used, see 'getPredefinedArrayIndexName(int)'.
-   *            This name might be used as the shader attribute name.
-   * @param comps The array component number
-   * @param dataType The array index GL data type
-   * @param normalized Wheather the data shall be normalized
-   *
-   * @see javax.media.opengl.GLContext#getPredefinedArrayIndexName(int)
-   */
-  public static GLArrayDataServer createFixed(GL gl, int index, String name, int comps, int dataType, boolean normalized,
-                                              int stride, Buffer buffer, int vboBufferUsage)
-    throws GLException
-  {
-    gl.getGLProfile().isValidArrayDataType(index, comps, dataType, false, true);
-
-    GLArrayDataServer ads = new GLArrayDataServer();
-    GLArrayHandler glArrayHandler = new GLFixedArrayHandler(ads);
-    ads.init(gl, name, index, comps, dataType, normalized, stride, buffer, buffer.limit(), false, glArrayHandler,
-             0, 0, vboBufferUsage);
-    return ads;
-  }
-
-  /**
-   * Create a VBOBuffer object, using a predefined fixed function array index
-   * and starting with a new created Buffer object with initialSize size
-   *
-   * On profiles GL2 and ES1 the fixed function pipeline behavior is as expected.
-   * On profile ES2 the fixed function emulation will transform these calls to 
-   * EnableVertexAttribArray and VertexAttribPointer calls,
-   * and a predefined vertex attribute variable name will be choosen.
-   *
-   * @see javax.media.opengl.GLContext#getPredefinedArrayIndexName(int)
-   */
-  public static GLArrayDataServer createFixed(GL gl, int index, String name, int comps, int dataType, boolean normalized, 
-                                              int initialSize, int vboBufferUsage)
-    throws GLException
-  {
-    gl.getGLProfile().isValidArrayDataType(index, comps, dataType, false, true);
-
-    GLArrayDataServer ads = new GLArrayDataServer();
-    GLArrayHandler glArrayHandler = new GLFixedArrayHandler(ads);
-    ads.init(gl, name, index, comps, dataType, normalized, 0, null, initialSize, false, glArrayHandler,
-             0, 0, vboBufferUsage);
-    return ads;
-  }
-
-  /**
-   * Create a VBOBuffer object, using a custom GLSL array attribute name
-   * and starting with a new created Buffer object with initialSize size
-   *
-   * @see javax.media.opengl.GLContext#getPredefinedArrayIndexName(int)
-   */
-  public static GLArrayDataServer createGLSL(GL gl, String name, int comps, int dataType, boolean normalized,
-                                             int initialSize, int vboBufferUsage) 
-    throws GLException
-  {
-    if(!gl.hasGLSL()) {
-        throw new GLException("GLArrayDataServer.GLSL not supported: "+gl);
-    }
-    gl.getGLProfile().isValidArrayDataType(-1, comps, dataType, true, true);
-
-    GLArrayDataServer ads = new GLArrayDataServer();
-    GLArrayHandler glArrayHandler = new GLSLArrayHandler(ads);
-    ads.init(gl, name, -1, comps, dataType, normalized, 0, null, initialSize, true, glArrayHandler,
-             0, 0, vboBufferUsage);
-    return ads;
-  }
-
-  /**
-   * Create a VBOBuffer object, using a custom GLSL array attribute name
-   * and starting with a given Buffer object incl it's stride
-   *
-   * @see javax.media.opengl.GLContext#getPredefinedArrayIndexName(int)
-   */
-  public static GLArrayDataServer createGLSL(GL gl, String name, int comps, int dataType, boolean normalized,
-                                             int stride, Buffer buffer, int vboBufferUsage) 
-    throws GLException
-  {
-    if(!gl.hasGLSL()) {
-        throw new GLException("GLArrayDataServer.GLSL not supported: "+gl);
-    }
-    gl.getGLProfile().isValidArrayDataType(-1, comps, dataType, true, true);
-
-    GLArrayDataServer ads = new GLArrayDataServer();
-    GLArrayHandler glArrayHandler = new GLSLArrayHandler(ads);
-    ads.init(gl, name, -1, comps, dataType, normalized, stride, buffer, buffer.limit(), true, glArrayHandler,
-             0, 0, vboBufferUsage);
-    return ads;
-  }
-
-  //
-  // Data matters GLArrayData
-  //
-
-  public int getBufferUsage() { return vboBufferUsage; }
-
-  //
-  // Data and GL state modification ..
-  //
-
-  public void destroy(GL gl) {
-    super.destroy(gl);
-    if(vboName!=0) {
-        int[] tmp = new int[1];
-        tmp[0] = vboName;
-        gl.glDeleteBuffers(1, tmp, 0);
-        vboName = 0;
-    }
-  }
-
-  //
-  // data matters 
-  //
-
-  /**
-   * Convenient way do disable the VBO behavior and 
-   * switch to client side data one
-   * Only possible if buffer is defined.
-   */
-  public void    setVBOUsage(boolean vboUsage) { 
-    checkSeal(false);
-    super.setVBOUsage(vboUsage);
-  }
-
-  public String toString() {
-    return "GLArrayDataServer["+name+
-                       ", index "+index+
-                       ", location "+location+
-                       ", isVertexAttribute "+isVertexAttribute+
-                       ", dataType "+dataType+ 
-                       ", bufferClazz "+clazz+ 
-                       ", elements "+getElementNumber()+
-                       ", components "+components+ 
-                       ", stride "+stride+"u "+strideB+"b "+strideL+"c"+
-                       ", initialSize "+initialSize+ 
-                       ", vboBufferUsage "+vboBufferUsage+ 
-                       ", vboUsage "+vboUsage+ 
-                       ", vboName "+vboName+ 
-                       ", sealed "+sealed+ 
-                       ", bufferEnabled "+bufferEnabled+ 
-                       ", bufferWritten "+bufferWritten+ 
-                       ", buffer "+buffer+ 
-                       ", offset "+bufferOffset+ 
-                       "]";
-  }
-
-  //
-  // non public matters ..
-  //
-
-  protected void init(GL gl, String name, int index, int comps, int dataType, boolean normalized, 
-                      int stride, Buffer data, int initialSize, boolean isVertexAttribute,
-                      GLArrayHandler glArrayHandler,
-                      int vboName, long bufferOffset, int vboBufferUsage)
-    throws GLException
-  {
-    super.init(name, index, comps, dataType, normalized, stride, data, initialSize, isVertexAttribute, glArrayHandler,
-               vboName, bufferOffset);
-
-    vboUsage=true;
-
-    if( ! (gl.isGL2ES2() && vboBufferUsage==GL2ES2.GL_STREAM_DRAW) ) {
-        switch(vboBufferUsage) {
-            case -1: // nop
-            case GL.GL_STATIC_DRAW:
-            case GL.GL_DYNAMIC_DRAW:
-                break;
-            default:
-                throw new GLException("invalid vboBufferUsage: "+vboBufferUsage+":\n\t"+this); 
-        }
-    }
-    this.vboBufferUsage=vboBufferUsage;
-  }
-
-  protected void init_vbo(GL gl) {
-    if(vboUsage && vboName==0) {
-        int[] tmp = new int[1];
-        gl.glGenBuffers(1, tmp, 0);
-        vboName = tmp[0];
-    }
-  }
-
-  protected int vboBufferUsage;
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayDataWrapper.java b/src/jogl/classes/com/sun/opengl/util/GLArrayDataWrapper.java
deleted file mode 100644
index 72e7c19bb..000000000
--- a/src/jogl/classes/com/sun/opengl/util/GLArrayDataWrapper.java
+++ /dev/null
@@ -1,215 +0,0 @@
-
-package com.sun.opengl.util;
-
-import javax.media.opengl.*;
-
-import com.sun.opengl.util.glsl.fixedfunc.impl.*;
-
-import java.nio.*;
-
-public class GLArrayDataWrapper implements GLArrayData {
-
-  public static GLArrayDataWrapper createFixed(GL gl, int index, int comps, int dataType, boolean normalized, 
-                                              int stride, Buffer buffer,
-                                              int vboName, long bufferOffset)
-    throws GLException
-  {
-      gl.getGLProfile().isValidArrayDataType(index, comps, dataType, false, true);
-      GLArrayDataWrapper adc = new GLArrayDataWrapper();
-      adc.init(null, index, comps, dataType, normalized, stride, buffer, false, 
-               vboName, bufferOffset);
-      return adc;
-  }
-
-  public static GLArrayDataWrapper createGLSL(GL gl, String name, int comps, int dataType, boolean normalized, 
-                                             int stride, Buffer buffer,
-                                             int vboName, long bufferOffset)
-    throws GLException
-  {
-      if(!gl.hasGLSL()) {
-        throw new GLException("GLArrayDataWrapper.GLSL not supported: "+gl);
-      }
-      gl.getGLProfile().isValidArrayDataType(-1, comps, dataType, true, true);
-
-      GLArrayDataWrapper adc = new GLArrayDataWrapper();
-      adc.init(name, -1, comps, dataType, normalized, stride, buffer, true,
-               vboName, bufferOffset);
-      return adc;
-  }
-
-  // 
-  // Data read access
-  //
-
-  public final boolean isVertexAttribute() { return isVertexAttribute; }
-
-  public final int getIndex() { return index; }
-
-  public final int getLocation() { return location; }
-
-  public final void setLocation(int v) { location = v; }
-
-  public final String getName() { return name; }
-
-  public final long getOffset() { return vboUsage?bufferOffset:-1; }
-
-  public final int getVBOName() { return vboUsage?vboName:-1; }
-
-  public final boolean isVBO() { return vboUsage; }
-
-  public final Buffer getBuffer() { return buffer; }
-
-  public final int getComponentNumber() { return components; }
-
-  public final int getComponentType() { return dataType; }
-
-  public final int getComponentSize() {
-    if(clazz==ByteBuffer.class) {
-        return BufferUtil.SIZEOF_BYTE;
-    }
-    if(clazz==ShortBuffer.class) {
-        return BufferUtil.SIZEOF_SHORT;
-    }
-    if(clazz==IntBuffer.class) {
-        return BufferUtil.SIZEOF_INT;
-    }
-    if(clazz==FloatBuffer.class) {
-        return BufferUtil.SIZEOF_FLOAT;
-    }
-    throw new GLException("Given Buffer Class not supported: "+clazz+":\n\t"+this);
-  }
-
-  public final int getElementNumber() {
-    if(null==buffer) return 0;
-    return ( buffer.position()==0 ) ? ( buffer.limit() / components ) : ( buffer.position() / components ) ;
-  }
-
-  public final boolean getNormalized() { return normalized; }
-
-  public final int getStride() { return stride; }
-
-  public final Class getBufferClass() { return clazz; }
-
-  public void destroy(GL gl) {
-    this.buffer = null;
-    this.components = 0;
-    this.stride=0;
-    this.strideB=0;
-    this.strideL=0;
-    this.vboName=0;
-    this.vboUsage=false;
-    this.bufferOffset=0;
-  }
-
-  public String toString() {
-    return "GLArrayDataWrapper["+name+
-                       ", index "+index+
-                       ", location "+location+
-                       ", isVertexAttribute "+isVertexAttribute+
-                       ", dataType "+dataType+ 
-                       ", bufferClazz "+clazz+ 
-                       ", elements "+getElementNumber()+
-                       ", components "+components+ 
-                       ", stride "+stride+"u "+strideB+"b "+strideL+"c"+
-                       ", buffer "+buffer+ 
-                       ", offset "+bufferOffset+ 
-                       ", vboUsage "+vboUsage+ 
-                       ", vboName "+vboName+ 
-                       "]";
-  }
-
-  public static final Class getBufferClass(int dataType) {
-    switch(dataType) {
-        case GL.GL_BYTE:
-        case GL.GL_UNSIGNED_BYTE:
-            return ByteBuffer.class;
-        case GL.GL_SHORT:
-        case GL.GL_UNSIGNED_SHORT:
-            return ShortBuffer.class;
-        case GL2ES1.GL_FIXED:
-            return IntBuffer.class;
-        case GL.GL_FLOAT:
-            return FloatBuffer.class;
-        default:    
-            throw new GLException("Given OpenGL data type not supported: "+dataType);
-    }
-  }
-
-  public void setName(String newName) {
-    location = -1;
-    name = newName;
-  }
-
-  public void    setVBOUsage(boolean vboUsage) {
-    this.vboUsage=vboUsage;
-  }
-
-  public void    setVBOName(int vboName) {
-    this.vboName=vboName;
-    setVBOUsage(vboName>0);
-  }
-
-  protected void init(String name, int index, int comps, int dataType, boolean normalized, int stride, Buffer data, 
-                      boolean isVertexAttribute, 
-                      int vboName, long bufferOffset)
-    throws GLException
-  {
-    this.isVertexAttribute = isVertexAttribute;
-    this.index = index;
-    this.location = -1;
-    // We can't have any dependence on the FixedFuncUtil class here for build bootstrapping reasons
-    this.name = (null==name)?FixedFuncPipeline.getPredefinedArrayIndexName(index):name;
-    if(null==this.name) {
-        throw new GLException("Not a valid GL array index: "+index);
-    }
-    this.dataType = dataType;
-    this.clazz = getBufferClass(dataType);
-    switch(dataType) {
-        case GL.GL_BYTE:
-        case GL.GL_UNSIGNED_BYTE:
-        case GL.GL_SHORT:
-        case GL.GL_UNSIGNED_SHORT:
-        case GL2ES1.GL_FIXED:
-            this.normalized = normalized;
-            break;
-        default:    
-            this.normalized = false;
-    }
-
-    int bpc = getComponentSize();
-    if(0<stride && stride<comps*bpc) {
-        throw new GLException("stride ("+stride+") lower than component bytes, "+comps+" * "+bpc);
-    }
-    if(0<stride && stride%bpc!=0) {
-        throw new GLException("stride ("+stride+") not a multiple of bpc "+bpc);
-    }
-    this.buffer = data;
-    this.components = comps;
-    this.stride=stride;
-    this.strideB=(0==stride)?comps*bpc:stride;
-    this.strideL=(0==stride)?comps:strideB/bpc;
-    this.vboName=vboName;
-    this.vboUsage=vboName>0;
-    this.bufferOffset=bufferOffset;
-  }
-
-  protected GLArrayDataWrapper() { }
-
-  protected int index;
-  protected int location;
-  protected String name;
-  protected int components;
-  protected int dataType;
-  protected boolean normalized;
-  protected int stride;  // user given stride
-  protected int strideB; // stride in bytes
-  protected int strideL; // stride in logical components
-  protected Class clazz;
-  protected Buffer buffer;
-  protected boolean isVertexAttribute;
-
-  protected long bufferOffset;
-  protected int vboName;
-  protected boolean vboUsage;
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayHandler.java b/src/jogl/classes/com/sun/opengl/util/GLArrayHandler.java
deleted file mode 100644
index 9443ad6ed..000000000
--- a/src/jogl/classes/com/sun/opengl/util/GLArrayHandler.java
+++ /dev/null
@@ -1,11 +0,0 @@
-
-package com.sun.opengl.util;
-
-import javax.media.opengl.*;
-
-public interface GLArrayHandler {
-
-  public void enableBuffer(GL gl, boolean enable);
-
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/GLFixedArrayHandler.java b/src/jogl/classes/com/sun/opengl/util/GLFixedArrayHandler.java
deleted file mode 100644
index f1e2502be..000000000
--- a/src/jogl/classes/com/sun/opengl/util/GLFixedArrayHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-
-package com.sun.opengl.util;
-
-import javax.media.opengl.*;
-import javax.media.opengl.fixedfunc.*;
-import com.sun.opengl.util.*;
-import java.nio.*;
-
-public class GLFixedArrayHandler implements GLArrayHandler {
-  private GLArrayDataEditable ad;
-
-  public GLFixedArrayHandler(GLArrayDataEditable ad) {
-    this.ad = ad;
-  }
-
-  protected final void passArrayPointer(GLPointerFunc gl) {
-    switch(ad.getIndex()) {
-        case GLPointerFunc.GL_VERTEX_ARRAY:
-            gl.glVertexPointer(ad);
-            break;
-        case GLPointerFunc.GL_NORMAL_ARRAY:
-            gl.glNormalPointer(ad);
-            break;
-        case GLPointerFunc.GL_COLOR_ARRAY:
-            gl.glColorPointer(ad);
-            break;
-        case GLPointerFunc.GL_TEXTURE_COORD_ARRAY:
-            gl.glTexCoordPointer(ad);
-            break;
-        default:
-            throw new GLException("invalid glArrayIndex: "+ad.getIndex()+":\n\t"+ad); 
-    }
-  }
-
-  public void enableBuffer(GL gl, boolean enable) {
-    GLPointerFunc glp = gl.getGL2ES1();
-    if(enable) {
-        glp.glEnableClientState(ad.getIndex());
-
-        Buffer buffer = ad.getBuffer();
-
-        if(ad.isVBO()) {
-            // always bind and refresh the VBO mgr, 
-            // in case more than one gl*Pointer objects are in use
-            gl.glBindBuffer(GL.GL_ARRAY_BUFFER, ad.getVBOName());
-            if(!ad.isBufferWritten()) {
-                if(null!=buffer) {
-                    gl.glBufferData(GL.GL_ARRAY_BUFFER, buffer.limit() * ad.getComponentSize(), buffer, ad.getBufferUsage());
-                }
-                ad.setBufferWritten(true);
-            }
-            passArrayPointer(glp);
-        } else if(null!=buffer) {
-            passArrayPointer(glp);
-            ad.setBufferWritten(true);
-        }
-    } else {
-        if(ad.isVBO()) {
-            gl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0);
-        }
-        glp.glDisableClientState(ad.getIndex());
-    }
-  }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/Gamma.java b/src/jogl/classes/com/sun/opengl/util/Gamma.java
deleted file mode 100755
index da0d7bd96..000000000
--- a/src/jogl/classes/com/sun/opengl/util/Gamma.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-/** Provides control over the primary display's gamma, brightness and
-    contrast controls via the hardware gamma ramp tables. Not
-    supported on all platforms or graphics hardware. <P>
-
-    Thanks to the LWJGL project for illustrating how to access gamma
-    control on the various platforms.
-*/
-
-public class Gamma {
-  private Gamma() {}
-
-  /**
-   * Sets the gamma, brightness, and contrast of the current main
-   * display. This functionality is not available on all platforms and
-   * graphics hardware. Returns true if the settings were successfully
-   * changed, false if not. This method may return false for some
-   * values of the incoming arguments even on hardware which does
-   * support the underlying functionality. <P>
-   *
-   * If this method returns true, the display settings will
-   * automatically be reset to their original values upon JVM exit
-   * (assuming the JVM does not crash); if the user wishes to change
-   * the display settings back to normal ahead of time, use {@link
-   * #resetDisplayGamma resetDisplayGamma}(). It is recommended to
-   * call {@link #resetDisplayGamma resetDisplayGamma} before calling
-   * e.g. <code>System.exit()</code> from the application rather than
-   * rely on the shutdown hook functionality due to inevitable race
-   * conditions and unspecified behavior during JVM teardown. <P>
-   *
-   * This method may be called multiple times during the application's
-   * execution, but calling {@link #resetDisplayGamma
-   * resetDisplayGamma} will only reset the settings to the values
-   * before the first call to this method. <P>
-   *
-   * @param gamma The gamma value, typically > 1.0 (default values
-   *   vary, but typically roughly 1.0)
-   * @param brightness The brightness value between -1.0 and 1.0,
-   *   inclusive (default values vary, but typically 0)
-   * @param contrast The contrast, greater than 0.0 (default values
-   *   vary, but typically 1)
-   * @return true if gamma settings were successfully changed, false
-   *   if not
-   * @throws IllegalArgumentException if any of the parameters were
-   *   out-of-bounds
-   */
-  public static boolean setDisplayGamma(GL gl, float gamma, float brightness, float contrast) throws IllegalArgumentException {
-    return GLDrawableFactoryImpl.getFactoryImpl(gl.getContext().getGLDrawable().getGLProfile()).setDisplayGamma(gamma, brightness, contrast);
-  }
-
-  /**
-   * Resets the gamma, brightness and contrast values for the primary
-   * display to their original values before {@link #setDisplayGamma
-   * setDisplayGamma} was called the first time. {@link
-   * #setDisplayGamma setDisplayGamma} must be called before calling
-   * this method or an unspecified exception will be thrown. While it
-   * is not explicitly required that this method be called before
-   * exiting, calling it is recommended because of the inevitable
-   * unspecified behavior during JVM teardown.
-   */
-  public static void resetDisplayGamma(GL gl) {
-    GLDrawableFactoryImpl.getFactoryImpl(gl.getContext().getGLDrawable().getGLProfile()).resetDisplayGamma();
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/ImmModeSink.java b/src/jogl/classes/com/sun/opengl/util/ImmModeSink.java
deleted file mode 100644
index 65c676f4a..000000000
--- a/src/jogl/classes/com/sun/opengl/util/ImmModeSink.java
+++ /dev/null
@@ -1,974 +0,0 @@
-
-package com.sun.opengl.util;
-
-import javax.media.opengl.*;
-import javax.media.opengl.fixedfunc.*;
-import com.sun.nativewindow.impl.NWReflection;
-import java.nio.*;
-import java.util.Iterator;
-import java.util.ArrayList;
-
-public class ImmModeSink {
-
-  public static final boolean DEBUG_BEGIN_END = false;
-  public static final boolean DEBUG_DRAW = false;
-
-  // public static final int GL_QUADS      = 0x0007; // Needs data manipulation
-  public static final int GL_QUAD_STRIP = 0x0008;
-  public static final int GL_POLYGON    = 0x0009;
-
-  /**
-   * Uses a GL2ES1, or ES2 fixed function emulation immediate mode sink
-   */
-  public static ImmModeSink createFixed(GL gl, int glBufferUsage, int initialSize,
-                                        int vComps, int vDataType,
-                                        int cComps, int cDataType, 
-                                        int nComps, int nDataType, 
-                                        int tComps, int tDataType) {
-    return new ImmModeSink(gl, glBufferUsage, initialSize, 
-                           vComps, vDataType, cComps, cDataType, nComps, nDataType, tComps, tDataType, false);
-  }
-
-  /**
-   * Uses a GL2ES2 GLSL shader immediate mode sink.
-   * To issue the draw() command,
-   * a ShaderState must be current, using ShaderState.glUseProgram().
-   *
-   * @see #draw(GL, boolean)
-   * @see javax.media.opengl.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
-   * @see javax.media.opengl.glsl.ShaderState#getCurrent()
-   */
-  public static ImmModeSink createGLSL(GL gl, int glBufferUsage, int initialSize,
-                                       int vComps, int vDataType,
-                                       int cComps, int cDataType, 
-                                       int nComps, int nDataType, 
-                                       int tComps, int tDataType) {
-    return new ImmModeSink(gl, glBufferUsage, initialSize, 
-                           vComps, vDataType, cComps, cDataType, nComps, nDataType, tComps, tDataType, true);
-  }
-
-  public static boolean usesVBO() { return vboUsage; }
-
-  public static void setVBOUsage(boolean v) { vboUsage = v; }
-
-  public void destroy(GL gl) {
-    destroyList(gl);
-
-    vboSet.destroy(gl);
-  }
-
-  public void reset() {
-    reset(null);
-  }
-
-  public void reset(GL gl) {
-    destroyList(gl);
-    vboSet.reset(gl);
-  }
-
-  public String toString() {
-    StringBuffer sb = new StringBuffer("ImmModeSink[");
-    sb.append(",\n\tVBO list: "+vboSetList.size()+" [");
-    for(Iterator i=vboSetList.iterator(); i.hasNext() ; ) {
-        sb.append("\n\t");
-        sb.append( (VBOSet)i.next() );
-    }
-    if(vboSetList.size()>0) {
-        sb.append("\n\t],\nVBO current: NOP]");
-    } else {
-        sb.append("\n\t],\nVBO current: \n");
-        sb.append(vboSet);
-        sb.append("\n]");
-    }
-    return sb.toString();
-  }
-
-  public void draw(GL gl, boolean disableBufferAfterDraw) {
-    if(DEBUG_DRAW) {
-        Exception e = new Exception("ImmModeSink.draw(disableBufferAfterDraw: "+disableBufferAfterDraw+"):\n\t"+this);
-        e.printStackTrace();
-    }
-    int n=0;
-    for(Iterator i=vboSetList.iterator(); i.hasNext() ; n++) {
-        ((VBOSet)i.next()).draw(gl, null, disableBufferAfterDraw, n);
-    }
-  }
-
-  public void draw(GL gl, Buffer indices, boolean disableBufferAfterDraw) {
-    if(DEBUG_DRAW) {
-        Exception e = new Exception("ImmModeSink.draw(disableBufferAfterDraw: "+disableBufferAfterDraw+"):\n\t"+this);
-        e.printStackTrace();
-    }
-    int n=0;
-    for(Iterator i=vboSetList.iterator(); i.hasNext() ; n++) {
-        ((VBOSet)i.next()).draw(gl, indices, disableBufferAfterDraw, n);
-    }
-  }
-
-  public void glBegin(int mode) {
-    if(DEBUG_BEGIN_END) {
-        Exception e = new Exception("ImmModeSink.glBegin("+vboSet.mode+"):\n\t"+this);
-        e.printStackTrace();
-    }
-    vboSet.modeOrig = mode;
-    switch(mode) {
-        // Needs data manipulation ..
-        //case GL_QUADS:
-        //    mode=GL.GL_LINES;
-        //    break;
-        case GL_QUAD_STRIP:
-            mode=GL.GL_TRIANGLE_STRIP;
-            break;
-        case GL_POLYGON:
-            mode=GL.GL_LINES;
-            break;
-    }
-    vboSet.mode = mode;
-    vboSet.checkSeal(false);
-  }
-
-  public final void glEnd(GL gl) {
-      glEnd(gl, null, true);
-  }
-
-  public void glEnd(GL gl, boolean immediateDraw) {
-      glEnd(gl, null, immediateDraw);
-  }
-
-  public final void glEnd(GL gl, Buffer indices) {
-      glEnd(gl, indices, true);
-  }
-
-  private void glEnd(GL gl, Buffer indices, boolean immediateDraw) {
-    if(DEBUG_BEGIN_END) {
-        Exception e = new Exception("ImmModeSink START glEnd(immediate: "+immediateDraw+"):\n\t"+this);
-        e.printStackTrace();
-    }
-    if(immediateDraw) {
-        vboSet.seal(gl, true);
-        vboSet.draw(gl, indices, true, -1);
-        reset(gl);
-    } else {
-        vboSet.seal(gl, true);
-        vboSet.enableBuffer(gl, false);
-        vboSetList.add(vboSet);
-        vboSet = vboSet.regenerate();
-    }
-  }
-
-  public void glVertexv(Buffer v) {
-    vboSet.glVertexv(v);
-  }
-  public void glNormalv(Buffer v) {
-    vboSet.glNormalv(v);
-  }
-  public void glColorv(Buffer v) {
-    vboSet.glColorv(v);
-  }
-  public void glTexCoordv(Buffer v) {
-    vboSet.glTexCoordv(v);
-  }
-
-  public final void glVertex2f(float x, float y) {
-    vboSet.glVertex2f(x,y);
-  }
-
-  public final void glVertex3f(float x, float y, float z) {
-    vboSet.glVertex3f(x,y,z);
-  }
-
-  public final void glNormal3f(float x, float y, float z) {
-    vboSet.glNormal3f(x,y,z);
-  }
-
-  public final void glColor3f(float x, float y, float z) {
-    vboSet.glColor3f(x,y,z);
-  }
-
-  public final void glColor4f(float x, float y, float z, float a) {
-    vboSet.glColor4f(x,y,z, a);
-  }
-
-  public final void glTexCoord2f(float x, float y) {
-    vboSet.glTexCoord2f(x,y);
-  }
-
-  public final void glTexCoord3f(float x, float y, float z) {
-    vboSet.glTexCoord3f(x,y,z);
-  }
-
-  public final void glVertex2s(short x, short y) {
-    vboSet.glVertex2s(x,y);
-  }
-
-  public final void glVertex3s(short x, short y, short z) {
-    vboSet.glVertex3s(x,y,z);
-  }
-
-  public final void glNormal3s(short x, short y, short z) {
-    vboSet.glNormal3s(x,y,z);
-  }
-
-  public final void glColor3s(short x, short y, short z) {
-    vboSet.glColor3s(x,y,z);
-  }
-
-  public final void glColor4s(short x, short y, short z, short a) {
-    vboSet.glColor4s(x,y,z,a);
-  }
-
-  public final void glTexCoord2s(short x, short y) {
-    vboSet.glTexCoord2s(x,y);
-  }
-
-  public final void glTexCoord3s(short x, short y, short z) {
-    vboSet.glTexCoord3s(x,y,z);
-  }
-
-  public final void glVertex2b(byte x, byte y) {
-    vboSet.glVertex2b(x,y);
-  }
-
-  public final void glVertex3b(byte x, byte y, byte z) {
-    vboSet.glVertex3b(x,y,z);
-  }
-
-  public final void glNormal3b(byte x, byte y, byte z) {
-    vboSet.glNormal3b(x,y,z);
-  }
-
-  public final void glColor3b(byte x, byte y, byte z) {
-    vboSet.glColor3b(x,y,z);
-  }
-
-  public final void glColor4b(byte x, byte y, byte z, byte a) {
-    vboSet.glColor4b(x,y,z,a);
-  }
-
-  public final void glTexCoord2b(byte x, byte y) {
-    vboSet.glTexCoord2b(x,y);
-  }
-
-  public final void glTexCoord3b(byte x, byte y, byte z) {
-    vboSet.glTexCoord3b(x,y,z);
-  }
-
-  protected ImmModeSink(GL gl, int glBufferUsage, int initialSize,
-                        int vComps, int vDataType,
-                        int cComps, int cDataType, 
-                        int nComps, int nDataType, 
-                        int tComps, int tDataType, boolean useGLSL) {
-    if(useGLSL && !gl.hasGLSL()) {
-        throw new GLException("ImmModeSink GLSL usage not supported: "+gl);
-    }
-    vboSet = new  VBOSet(gl, glBufferUsage, initialSize, 
-                         vComps, vDataType, cComps, cDataType, nComps, nDataType, tComps, tDataType, useGLSL);
-    this.vboSetList   = new ArrayList();
-  }
-
-  private void destroyList(GL gl) {
-    for(Iterator i=vboSetList.iterator(); i.hasNext() ; ) {
-        ((VBOSet)i.next()).destroy(gl);
-    }
-    vboSetList.clear();
-  }
-
-  private VBOSet vboSet;
-  private ArrayList vboSetList;
-  private static boolean vboUsage = true;
-
-  protected static class VBOSet {
-    protected VBOSet (GL gl, int glBufferUsage, int initialSize,
-                      int vComps, int vDataType,
-                      int cComps, int cDataType, 
-                      int nComps, int nDataType, 
-                      int tComps, int tDataType, boolean useGLSL) {
-        this.gl=gl;
-        this.glBufferUsage=glBufferUsage;
-        this.initialSize=initialSize;
-        this.vDataType=vDataType;
-        this.vComps=vComps;
-        this.cDataType=cDataType;
-        this.cComps=cComps;
-        this.nDataType=nDataType;
-        this.nComps=nComps;
-        this.tDataType=tDataType;
-        this.tComps=tComps;
-        this.useGLSL=useGLSL;
-
-        allocateBuffer(initialSize);
-        rewind();
-
-        this.sealed=false;
-        this.sealedGL=false;
-        this.mode = -1;
-        this.modeOrig = -1;
-        this.bufferEnabled=false;
-        this.bufferWritten=false;
-    }
-
-    protected final VBOSet regenerate() {
-        return new VBOSet(gl, glBufferUsage, initialSize, 
-                          vComps, vDataType, cComps, cDataType, nComps, nDataType, tComps, tDataType, useGLSL);
-    }
-
-    protected void checkSeal(boolean test) throws GLException {
-        if(mode<0) {
-                throw new GLException("No mode set yet, call glBegin(mode) first:\n\t"+this); 
-        }
-        if(sealed!=test) {
-            if(test) {
-                throw new GLException("Not Sealed yet, call glEnd() first:\n\t"+this); 
-            } else {
-                throw new GLException("Already Sealed, can't modify VBO after glEnd():\n\t"+this); 
-            }
-        }
-    }
-
-    protected void draw(GL gl, Buffer indices, boolean disableBufferAfterDraw, int i)
-    {
-        if(DEBUG_DRAW) {
-            Exception e = new Exception("ImmModeSink.draw["+i+"](disableBufferAfterDraw: "+disableBufferAfterDraw+"):\n\t"+this);
-            e.printStackTrace();
-        }
-        enableBuffer(gl, true);
-
-        if (buffer!=null) {
-            GL2ES1 glf = gl.getGL2ES1();
-
-            if(null==indices) {
-                glf.glDrawArrays(mode, 0, count);
-            } else {
-                Class clazz = indices.getClass();
-                int type=-1;
-                if(NWReflection.instanceOf(clazz, ByteBuffer.class.getName())) {
-                    type =  GL.GL_UNSIGNED_BYTE;
-                } else if(NWReflection.instanceOf(clazz, ShortBuffer.class.getName())) {
-                    type =  GL.GL_UNSIGNED_SHORT;
-                }
-                if(0>type) {
-                    throw new GLException("Given Buffer Class not supported: "+clazz+", should be ubyte or ushort:\n\t"+this);
-                }
-                glf.glDrawElements(mode, indices.remaining(), type, indices);
-                // GL2: gl.glDrawRangeElements(mode, 0, indices.remaining()-1, indices.remaining(), type, indices);
-            }
-        }
-
-        if(disableBufferAfterDraw) {
-            enableBuffer(gl, false);
-        }
-    }
-
-    public void glVertexv(Buffer v) {
-        checkSeal(false);
-        BufferUtil.put(vertexArray, v);
-    }
-    public void glNormalv(Buffer v) {
-        checkSeal(false);
-        BufferUtil.put(normalArray, v);
-    }
-    public void glColorv(Buffer v) {
-        checkSeal(false);
-        BufferUtil.put(colorArray, v);
-    }
-    public void glTexCoordv(Buffer v) {
-        checkSeal(false);
-        BufferUtil.put(textCoordArray, v);
-    }
-
-    public void glVertex2b(byte x, byte y) {
-        checkSeal(false);
-        growBufferIfNecessary(VERTEX, 2);
-        if(vComps>0) 
-            BufferUtil.putb(vertexArray, x);
-        if(vComps>1) 
-            BufferUtil.putb(vertexArray, y);
-        padding(VERTEX, vComps-2);
-    }
-    public void glVertex3b(byte x, byte y, byte z) {
-        checkSeal(false);
-        growBufferIfNecessary(VERTEX, 3);
-        if(vComps>0) 
-            BufferUtil.putb(vertexArray, x);
-        if(vComps>1) 
-            BufferUtil.putb(vertexArray, y);
-        if(vComps>2) 
-            BufferUtil.putb(vertexArray, z);
-        padding(VERTEX, vComps-3);
-    }
-    public void glVertex2s(short x, short y) {
-        checkSeal(false);
-        growBufferIfNecessary(VERTEX, 2);
-        if(vComps>0) 
-            BufferUtil.puts(vertexArray, x);
-        if(vComps>1) 
-            BufferUtil.puts(vertexArray, y);
-        padding(VERTEX, vComps-2);
-    }
-    public void glVertex3s(short x, short y, short z) {
-        checkSeal(false);
-        growBufferIfNecessary(VERTEX, 3);
-        if(vComps>0) 
-            BufferUtil.puts(vertexArray, x);
-        if(vComps>1) 
-            BufferUtil.puts(vertexArray, y);
-        if(vComps>2) 
-            BufferUtil.puts(vertexArray, z);
-        padding(VERTEX, vComps-3);
-    }
-    public void glVertex2f(float x, float y) {
-        checkSeal(false);
-        growBufferIfNecessary(VERTEX, 2);
-        if(vComps>0) 
-            BufferUtil.putf(vertexArray, x);
-        if(vComps>1) 
-            BufferUtil.putf(vertexArray, y);
-        padding(VERTEX, vComps-2);
-    }
-    public void glVertex3f(float x, float y, float z) {
-        checkSeal(false);
-        growBufferIfNecessary(VERTEX, 3);
-        if(vComps>0) 
-            BufferUtil.putf(vertexArray, x);
-        if(vComps>1) 
-            BufferUtil.putf(vertexArray, y);
-        if(vComps>2) 
-            BufferUtil.putf(vertexArray, z);
-        padding(VERTEX, vComps-3);
-    }
-
-    public void glNormal3b(byte x, byte y, byte z) {
-        checkSeal(false);
-        growBufferIfNecessary(NORMAL, 3);
-        if(nComps>0) 
-            BufferUtil.putb(normalArray, x);
-        if(nComps>1) 
-            BufferUtil.putb(normalArray, y);
-        if(nComps>2) 
-            BufferUtil.putb(normalArray, z);
-        padding(NORMAL, nComps-3);
-    }
-    public void glNormal3s(short x, short y, short z) {
-        checkSeal(false);
-        growBufferIfNecessary(NORMAL, 3);
-        if(nComps>0) 
-            BufferUtil.puts(normalArray, x);
-        if(nComps>1) 
-            BufferUtil.puts(normalArray, y);
-        if(nComps>2) 
-            BufferUtil.puts(normalArray, z);
-        padding(NORMAL, nComps-3);
-    }
-    public void glNormal3f(float x, float y, float z) {
-        checkSeal(false);
-        growBufferIfNecessary(NORMAL, 3);
-        if(nComps>0) 
-            BufferUtil.putf(normalArray, x);
-        if(nComps>1) 
-            BufferUtil.putf(normalArray, y);
-        if(nComps>2) 
-            BufferUtil.putf(normalArray, z);
-        padding(NORMAL, nComps-3);
-    }
-
-    public void glColor3b(byte r, byte g, byte b) {
-        checkSeal(false);
-        growBufferIfNecessary(COLOR, 3);
-        if(cComps>0) 
-            BufferUtil.putb(colorArray, r);
-        if(cComps>1) 
-            BufferUtil.putb(colorArray, g);
-        if(cComps>2) 
-            BufferUtil.putb(colorArray, b);
-        padding(COLOR, cComps-3);
-    }
-    public void glColor4b(byte r, byte g, byte b, byte a) {
-        checkSeal(false);
-        growBufferIfNecessary(COLOR, 4);
-        if(cComps>0) 
-            BufferUtil.putb(colorArray, r);
-        if(cComps>1) 
-            BufferUtil.putb(colorArray, g);
-        if(cComps>2) 
-            BufferUtil.putb(colorArray, b);
-        if(cComps>3) 
-            BufferUtil.putb(colorArray, a);
-        padding(COLOR, cComps-4);
-    }
-    public void glColor3s(short r, short g, short b) {
-        checkSeal(false);
-        growBufferIfNecessary(COLOR, 3);
-        if(cComps>0) 
-            BufferUtil.puts(colorArray, r);
-        if(cComps>1) 
-            BufferUtil.puts(colorArray, g);
-        if(cComps>2) 
-            BufferUtil.puts(colorArray, b);
-        padding(COLOR, cComps-3);
-    }
-    public void glColor4s(short r, short g, short b, short a) {
-        checkSeal(false);
-        growBufferIfNecessary(COLOR, 4);
-        if(cComps>0) 
-            BufferUtil.puts(colorArray, r);
-        if(cComps>1) 
-            BufferUtil.puts(colorArray, g);
-        if(cComps>2) 
-            BufferUtil.puts(colorArray, b);
-        if(cComps>3) 
-            BufferUtil.puts(colorArray, a);
-        padding(COLOR, cComps-4);
-    }
-    public void glColor3f(float r, float g, float b) {
-        checkSeal(false);
-        growBufferIfNecessary(COLOR, 3);
-        if(cComps>0) 
-            BufferUtil.putf(colorArray, r);
-        if(cComps>1) 
-            BufferUtil.putf(colorArray, g);
-        if(cComps>2) 
-            BufferUtil.putf(colorArray, b);
-        padding(COLOR, cComps-3);
-    }
-    public void glColor4f(float r, float g, float b, float a) {
-        checkSeal(false);
-        growBufferIfNecessary(COLOR, 4);
-        if(cComps>0) 
-            BufferUtil.putf(colorArray, r);
-        if(cComps>1) 
-            BufferUtil.putf(colorArray, g);
-        if(cComps>2) 
-            BufferUtil.putf(colorArray, b);
-        if(cComps>3) 
-            BufferUtil.putf(colorArray, a);
-        padding(COLOR, cComps-4);
-    }
-
-    public void glTexCoord2b(byte x, byte y) {
-        checkSeal(false);
-        growBufferIfNecessary(TEXTCOORD, 2);
-        if(tComps>0) 
-            BufferUtil.putb(textCoordArray, x);
-        if(tComps>1) 
-            BufferUtil.putb(textCoordArray, y);
-        padding(TEXTCOORD, tComps-2);
-    }
-    public void glTexCoord3b(byte x, byte y, byte z) {
-        checkSeal(false);
-        growBufferIfNecessary(TEXTCOORD, 3);
-        if(tComps>0) 
-            BufferUtil.putb(textCoordArray, x);
-        if(tComps>1) 
-            BufferUtil.putb(textCoordArray, y);
-        if(tComps>2) 
-            BufferUtil.putb(textCoordArray, z);
-        padding(TEXTCOORD, tComps-3);
-    }
-    public void glTexCoord2s(short x, short y) {
-        checkSeal(false);
-        growBufferIfNecessary(TEXTCOORD, 2);
-        if(tComps>0) 
-            BufferUtil.puts(textCoordArray, x);
-        if(tComps>1) 
-            BufferUtil.puts(textCoordArray, y);
-        padding(TEXTCOORD, tComps-2);
-    }
-    public void glTexCoord3s(short x, short y, short z) {
-        checkSeal(false);
-        growBufferIfNecessary(TEXTCOORD, 3);
-        if(tComps>0) 
-            BufferUtil.puts(textCoordArray, x);
-        if(tComps>1) 
-            BufferUtil.puts(textCoordArray, y);
-        if(tComps>2) 
-            BufferUtil.puts(textCoordArray, z);
-        padding(TEXTCOORD, tComps-3);
-    }
-    public void glTexCoord2f(float x, float y) {
-        checkSeal(false);
-        growBufferIfNecessary(TEXTCOORD, 2);
-        if(tComps>0) 
-            BufferUtil.putf(textCoordArray, x);
-        if(tComps>1) 
-            BufferUtil.putf(textCoordArray, y);
-        padding(TEXTCOORD, tComps-2);
-    }
-    public void glTexCoord3f(float x, float y, float z) {
-        checkSeal(false);
-        growBufferIfNecessary(TEXTCOORD, 3);
-        if(tComps>0) 
-            BufferUtil.putf(textCoordArray, x);
-        if(tComps>1) 
-            BufferUtil.putf(textCoordArray, y);
-        if(tComps>2) 
-            BufferUtil.putf(textCoordArray, z);
-        padding(TEXTCOORD, tComps-3);
-    }
-
-    public void rewind() {
-        if(null!=vertexArray) {
-            vertexArray.rewind();
-        }
-        if(null!=colorArray) {
-            colorArray.rewind();
-        }
-        if(null!=normalArray) {
-            normalArray.rewind();
-        }
-        if(null!=textCoordArray) {
-            textCoordArray.rewind();
-        }
-    }
-
-    public void destroy(GL gl) {
-        reset(gl);
-
-        vertexArray=null; colorArray=null; normalArray=null; textCoordArray=null;
-        vArrayData=null; cArrayData=null; nArrayData=null; tArrayData=null;
-        buffer=null;
-        bSize=0; count=0;
-    }
-
-    public void reset(GL gl) {
-        enableBuffer(gl, false);
-        reset();
-    }
-
-    public void reset() {
-        if(buffer!=null) {
-            buffer.clear();
-        }
-        rewind();
-
-        this.mode = -1;
-        this.modeOrig = -1;
-        this.sealed=false;
-        this.bufferEnabled=false;
-        this.bufferWritten=false;
-    }
-
-    public void seal(GL glObj, boolean seal)
-    {
-        seal(seal);
-        if(sealedGL==seal) return;
-        sealedGL = seal;
-        GL gl = glObj.getGL();
-        if(seal) {
-            if(vboUsage && vboName==0) {
-                int[] tmp = new int[1];
-                gl.glGenBuffers(1, tmp, 0);
-                vboName = tmp[0];
-            }
-            if(null!=vArrayData)
-                vArrayData.setVBOName(vboName);
-            if(null!=cArrayData)
-                cArrayData.setVBOName(vboName);
-            if(null!=nArrayData)
-                nArrayData.setVBOName(vboName);
-            if(null!=tArrayData)
-                tArrayData.setVBOName(vboName);
-            enableBuffer(gl, true);
-        } else {
-            enableBuffer(gl, false);
-        }
-    }
-
-    public void seal(boolean seal)
-    {
-        if(sealed==seal) return;
-        sealed = seal;
-        if(seal) {
-            bufferWritten=false;
-        }
-    }
-
-  public void enableBuffer(GL gl, boolean enable) {
-    /* if(enableBufferAlways && enable) {
-        bufferEnabled = false;
-    } */
-    if( bufferEnabled != enable && count>0 ) {
-        if(enable) {
-            checkSeal(true);
-        }
-        if(useGLSL) { 
-            enableBufferGLSL(gl, enable);
-        } else {
-            enableBufferFixed(gl, enable);
-        }
-        bufferEnabled = enable;
-    }
-  }
-
-  public void enableBufferFixed(GL gl, boolean enable) {
-    GL2ES1 glf = gl.getGL2ES1();
-
-    if(enable) {
-        gl.glBindBuffer(GL.GL_ARRAY_BUFFER, vboName);
-
-        if(!bufferWritten) {
-            gl.glBufferData(GL.GL_ARRAY_BUFFER, buffer.limit(), buffer, GL.GL_STATIC_DRAW);
-            bufferWritten=true;
-        }
-
-        if(vComps>0) {
-           glf.glEnableClientState(glf.GL_VERTEX_ARRAY);
-           glf.glVertexPointer(vArrayData);
-        }
-        if(cComps>0) {
-           glf.glEnableClientState(glf.GL_COLOR_ARRAY);
-           glf.glColorPointer(cArrayData);
-        }
-        if(nComps>0) {
-           glf.glEnableClientState(glf.GL_NORMAL_ARRAY);
-           glf.glNormalPointer(nArrayData);
-        }
-        if(tComps>0) {
-           glf.glEnableClientState(glf.GL_TEXTURE_COORD_ARRAY);
-           glf.glTexCoordPointer(tArrayData);
-        }
-
-        gl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0);
-    } else {
-        if(vComps>0) {
-           glf.glDisableClientState(glf.GL_VERTEX_ARRAY);
-        }
-        if(cComps>0) {
-           glf.glDisableClientState(glf.GL_COLOR_ARRAY);
-        }
-        if(nComps>0) {
-           glf.glDisableClientState(glf.GL_NORMAL_ARRAY);
-        }
-        if(tComps>0) {
-           glf.glDisableClientState(glf.GL_TEXTURE_COORD_ARRAY);
-        }
-    }
-  }
-
-  public void enableBufferGLSL(GL gl, boolean enable) {
-    GL2ES2 glsl = gl.getGL2ES2();
-    com.sun.opengl.util.glsl.ShaderState st = com.sun.opengl.util.glsl.ShaderState.getCurrent();
-    if(null==st) {
-        throw new GLException("No ShaderState current");
-    }
- 
-    if(enable) {
-        glsl.glBindBuffer(GL.GL_ARRAY_BUFFER, vboName);
-
-        if(!bufferWritten) {
-            glsl.glBufferData(GL.GL_ARRAY_BUFFER, buffer.limit(), buffer, GL.GL_STATIC_DRAW);
-            bufferWritten=true;
-        }
-
-        if(vComps>0) {
-           st.glEnableVertexAttribArray(glsl, vArrayData.getName());
-           st.glVertexAttribPointer(glsl, vArrayData);
-        }
-        if(cComps>0) {
-           st.glEnableVertexAttribArray(glsl, cArrayData.getName());
-           st.glVertexAttribPointer(glsl, cArrayData);
-        }
-        if(nComps>0) {
-           st.glEnableVertexAttribArray(glsl, nArrayData.getName());
-           st.glVertexAttribPointer(glsl, nArrayData);
-        }
-        if(tComps>0) {
-           st.glEnableVertexAttribArray(glsl, tArrayData.getName());
-           st.glVertexAttribPointer(glsl, tArrayData);
-        }
-
-        glsl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0);
-    } else {
-        if(vComps>0) {
-           st.glDisableVertexAttribArray(glsl, vArrayData.getName());
-        }
-        if(cComps>0) {
-           st.glDisableVertexAttribArray(glsl, cArrayData.getName());
-        }
-        if(nComps>0) {
-           st.glDisableVertexAttribArray(glsl, nArrayData.getName());
-        }
-        if(tComps>0) {
-           st.glDisableVertexAttribArray(glsl, tArrayData.getName());
-        }
-    }
-  }
-
-    public String toString() {
-        return "VBOSet[mode "+mode+ 
-                       ", modeOrig "+modeOrig+ 
-                       ", sealed "+sealed+ 
-                       ", bufferEnabled "+bufferEnabled+ 
-                       ", bufferWritten "+bufferWritten+ 
-                       ",\n\t"+vArrayData+
-                       ",\n\t"+cArrayData+
-                       ",\n\t"+nArrayData+
-                       ",\n\t"+tArrayData+
-                       "]";
-    }
-
-    // non public matters
-
-    protected void allocateBuffer(int elements) {
-        int vWidth = vComps * BufferUtil.sizeOfGLType(vDataType);
-        int cWidth = cComps * BufferUtil.sizeOfGLType(cDataType);
-        int nWidth = nComps * BufferUtil.sizeOfGLType(nDataType);
-        int tWidth = tComps * BufferUtil.sizeOfGLType(tDataType);
-
-        count  = elements;
-        bSize  = count * ( vWidth + cWidth + nWidth + tWidth ) ;
-
-        buffer = BufferUtil.newByteBuffer(bSize);
-
-        int pos = 0;
-        int size= count * vWidth ;
-        if(size>0) {
-            vertexArray = BufferUtil.sliceGLBuffer(buffer, pos, size, vDataType);
-        } else {
-            vertexArray = null;
-        }
-        vOffset = pos;
-        pos+=size;
-
-        size= count * cWidth ;
-        if(size>0) {
-            colorArray = BufferUtil.sliceGLBuffer(buffer, pos, size, cDataType);
-        } else {
-            colorArray = null;
-        }
-        cOffset = pos;
-        pos+=size;
-
-        size= count * nWidth ;
-        if(size>0) {
-            normalArray = BufferUtil.sliceGLBuffer(buffer, pos, size, nDataType);
-        } else {
-            normalArray = null;
-        }
-        nOffset = pos;
-        pos+=size;
-
-        size= count * tWidth ;
-        if(size>0) {
-            textCoordArray = BufferUtil.sliceGLBuffer(buffer, pos, size, tDataType);
-        } else {
-            textCoordArray = null;
-        }
-        tOffset = pos;
-        pos+=size;
-
-        buffer.position(pos);
-        buffer.flip();
-
-        if(vComps>0) {
-            vArrayData = GLArrayDataWrapper.createFixed(gl, GLPointerFunc.GL_VERTEX_ARRAY, vComps, vDataType, false,
-                                                        0, vertexArray, 0, vOffset);
-        } else {
-            vArrayData = null;
-        }
-        if(cComps>0) {
-            cArrayData = GLArrayDataWrapper.createFixed(gl, GLPointerFunc.GL_COLOR_ARRAY, cComps, cDataType, false,
-                                                        0, colorArray, 0, cOffset);
-        } else {
-            cArrayData = null;
-        }
-        if(nComps>0) {
-            nArrayData = GLArrayDataWrapper.createFixed(gl, GLPointerFunc.GL_NORMAL_ARRAY, nComps, nDataType, false,
-                                                        0, normalArray, 0, nOffset);
-        } else {
-            nArrayData = null;
-        }
-        if(tComps>0) {
-            tArrayData = GLArrayDataWrapper.createFixed(gl, GLPointerFunc.GL_TEXTURE_COORD_ARRAY, tComps, tDataType, false,
-                                                        0, textCoordArray, 0, tOffset);
-        } else {
-            tArrayData = null;
-        }
-
-    }
-
-    protected final boolean growBufferIfNecessary(int type, int spare) {
-        if(buffer==null || count < spare) { 
-            growBuffer(type, initialSize);
-            return true;
-        }
-        return false;
-    }
-
-    protected final void growBuffer(int type, int additional) {
-        if(sealed || 0==additional) return;
-
-        // save olde values ..
-        Buffer _vertexArray=vertexArray, _colorArray=colorArray, _normalArray=normalArray, _textCoordArray=textCoordArray;
-        ByteBuffer _buffer = buffer;
-
-        allocateBuffer(count+additional);
-
-        if(null!=_vertexArray) {
-            _vertexArray.flip();
-            BufferUtil.put(vertexArray, _vertexArray);
-        }
-        if(null!=_colorArray) {
-            _colorArray.flip();
-            BufferUtil.put(colorArray, _colorArray);
-        }
-        if(null!=_normalArray) {
-            _normalArray.flip();
-            BufferUtil.put(normalArray, _normalArray);
-        }
-        if(null!=_textCoordArray) {
-            _textCoordArray.flip();
-            BufferUtil.put(textCoordArray, _textCoordArray);
-        }
-    }
-
-    protected void padding(int type, int fill) {
-        if ( sealed ) return;
-
-        Buffer dest = null;
-
-        switch (type) {
-            case VERTEX:
-                dest = vertexArray;
-                break;
-            case COLOR:
-                dest = colorArray;
-                break;
-            case NORMAL:
-                dest = normalArray;
-                break;
-            case TEXTCOORD:
-                dest = textCoordArray;
-                break;
-        }
-
-        if ( null==dest ) return;
-
-        while((fill--)>0) {
-            BufferUtil.putb(dest, (byte)0);
-        }
-    }
-
-    protected int mode, modeOrig;
-    protected int glBufferUsage, initialSize;
-
-    protected ByteBuffer buffer;
-    protected int bSize, count, vboName;
-
-    public static final int VERTEX = 0;
-    public static final int COLOR = 1;
-    public static final int NORMAL = 2;
-    public static final int TEXTCOORD = 3;
-
-    protected int vOffset, cOffset, nOffset, tOffset;
-    protected int vComps,    cComps,    nComps,    tComps;
-    protected int vDataType, cDataType, nDataType, tDataType;
-    protected Buffer vertexArray, colorArray, normalArray, textCoordArray;
-    protected GLArrayDataWrapper vArrayData, cArrayData, nArrayData, tArrayData;
-
-    protected boolean sealed, sealedGL, useGLSL;
-    protected boolean bufferEnabled, bufferWritten;
-    protected GL gl;
-  }
-
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/Locator.java b/src/jogl/classes/com/sun/opengl/util/Locator.java
deleted file mode 100644
index 06cd50ce8..000000000
--- a/src/jogl/classes/com/sun/opengl/util/Locator.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.opengl.util;
-
-import java.util.*;
-import java.nio.*;
-import java.io.*;
-import java.net.*;
-
-/** Utilities for dealing with resources. */
-
-public class Locator {
-    private Locator() {}
-
-    /**
-     * Locates the resource using 'getResource(String path, ClassLoader cl)',
-     * with this context ClassLoader and the path as is,
-     * as well with the context's package name path plus the path.
-     *
-     * @see #getResource(String, ClassLoader)
-     */
-    public static URL getResource(Class context, String path) {
-        ClassLoader contextCL = (null!=context)?context.getClassLoader():null;
-        URL url = getResource(path, contextCL);
-        if (url == null && null!=context) {
-            // Try again by scoping the path within the class's package
-            String className = context.getName().replace('.', '/');
-            int lastSlash = className.lastIndexOf('/');
-            if (lastSlash >= 0) {
-                String tmpPath = className.substring(0, lastSlash + 1) + path;
-                url = getResource(tmpPath, contextCL);
-            }
-        }
-        return url;
-    }
-
-    /**
-     * Locates the resource using the ClassLoader's facility,
-     * the absolute URL and absolute file.
-     *
-     * @see ClassLoader#getResource(String)
-     * @see ClassLoader#getSystemResource(String)
-     * @see URL#URL(String)
-     * @see File#File(String)
-     */
-    public static URL getResource(String path, ClassLoader cl) {
-        URL url = null;
-        if (cl != null) {
-            url = cl.getResource(path);
-        } else {
-            url = ClassLoader.getSystemResource(path);
-        }
-        if(!urlExists(url)) {
-            url = null;
-            try {
-                url = new URL(path);
-            } catch (MalformedURLException e) { }
-        }
-        if(!urlExists(url)) {
-            url = null;
-            try {
-                File file = new File(path);
-                if(file.exists()) {
-                    url = file.toURL();
-                }
-            } catch (MalformedURLException e) {}
-        }
-        return url;
-    }
-
-    /**
-     * Generates a path for the 'relativeFile' relative to the 'absoluteFileLocation'
-     */
-    public static String getRelativeOf(String absoluteFileLocation, String relativeFile) {
-        File file = new File(absoluteFileLocation);
-        file = file.getParentFile();
-        while (file != null && relativeFile.startsWith("../")) {
-            file = file.getParentFile();
-            relativeFile = relativeFile.substring(3);
-        }
-        if (file != null) {
-            String res = new File(file, relativeFile).getPath();
-	        // Handle things on Windows
-            return res.replace('\\', '/');
-        } else {
-            return relativeFile;
-        }
-    }
-
-    /**
-     * Returns true, if the url exists,
-     * trying to open a connection.
-     */
-    public static boolean urlExists(URL url) {
-        boolean v = false;
-        if(null!=url) {
-            try {
-                URLConnection uc = url.openConnection();
-                v = true;
-            } catch (IOException ioe) { }
-        }
-        return v;
-    }
-
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/PMVMatrix.java b/src/jogl/classes/com/sun/opengl/util/PMVMatrix.java
deleted file mode 100755
index 4211e893b..000000000
--- a/src/jogl/classes/com/sun/opengl/util/PMVMatrix.java
+++ /dev/null
@@ -1,685 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.opengl.util;
-
-import com.sun.opengl.impl.ProjectFloat;                                                                       
-
-import java.nio.*;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.media.opengl.*;
-import javax.media.opengl.fixedfunc.GLMatrixFunc;
-
-public class PMVMatrix implements GLMatrixFunc {
-
-    public PMVMatrix() {
-          projectFloat = new ProjectFloat();
-
-          matrixIdent = BufferUtil.newFloatBuffer(1*16);
-          projectFloat.gluMakeIdentityf(matrixIdent);
-          matrixIdent.rewind();
-
-          // T    Texture
-          // P    Projection
-          // Mv   ModelView
-          // Mvi  Modelview-Inverse
-          // Mvit Modelview-Inverse-Transpose
-          // Pmv  P * Mv
-          matrixTPMvMvitPmv = BufferUtil.newFloatBuffer(6*16);     // grouping T + P  + Mv + Mvi + Mvit + Pmv
-          matrixPMvMvitPmv = slice(matrixTPMvMvitPmv, 1*16, 5*16); // grouping     P  + Mv + Mvi + Mvit + Pmv
-          matrixT       = slice(matrixTPMvMvitPmv, 0*16, 1*16);    //          T
-          matrixPMvMvit = slice(matrixTPMvMvitPmv, 1*16, 4*16);    // grouping     P  + Mv + Mvi + Mvit
-          matrixPMvMvi  = slice(matrixTPMvMvitPmv, 1*16, 3*16);    // grouping     P  + Mv + Mvi
-          matrixPMv     = slice(matrixTPMvMvitPmv, 1*16, 2*16);    // grouping     P  + Mv
-          matrixP       = slice(matrixTPMvMvitPmv, 1*16, 1*16);    //              P
-          matrixMv      = slice(matrixTPMvMvitPmv, 2*16, 1*16);    //                   Mv
-          matrixMvi     = slice(matrixTPMvMvitPmv, 3*16, 1*16);    //                        Mvi
-          matrixMvit    = slice(matrixTPMvMvitPmv, 4*16, 1*16);    //                              Mvit
-          matrixPmv     = slice(matrixTPMvMvitPmv, 5*16, 1*16);    //                                     Pmv
-          matrixTPMvMvitPmv.rewind();
-
-          matrixMvit3 = BufferUtil.newFloatBuffer(3*3);
-
-          localBuf = BufferUtil.newFloatBuffer(6*16);
-
-          matrixMult=slice(localBuf, 0*16, 16);
-
-          matrixTrans=slice(localBuf, 1*16, 16);
-          projectFloat.gluMakeIdentityf(matrixTrans);
-
-          matrixRot=slice(localBuf, 2*16, 16);
-          projectFloat.gluMakeIdentityf(matrixRot);
-
-          matrixScale=slice(localBuf, 3*16, 16);
-          projectFloat.gluMakeIdentityf(matrixScale);
-
-          matrixOrtho=slice(localBuf, 4*16, 16);
-          projectFloat.gluMakeIdentityf(matrixOrtho);
-
-          matrixFrustum=slice(localBuf, 5*16, 16);
-          projectFloat.gluMakeZero(matrixFrustum);
-
-          vec3f=new float[3];
-
-          matrixPStack = new ArrayList();
-          matrixMvStack= new ArrayList();
-
-          // default values and mode
-          glMatrixMode(GL_PROJECTION);
-          glLoadIdentity();
-          glMatrixMode(GL_MODELVIEW);
-          glLoadIdentity();
-          glMatrixMode(GL.GL_TEXTURE);
-          glLoadIdentity();
-          setDirty();
-    }
-
-    public void destroy() {
-        if(null!=projectFloat) {
-            projectFloat.destroy(); projectFloat=null;
-        }
-
-        if(null!=matrixIdent) {
-            matrixIdent.clear(); matrixIdent=null;
-        }
-        if(null!=matrixTPMvMvitPmv) {
-            matrixTPMvMvitPmv.clear(); matrixTPMvMvitPmv=null;
-        }
-        if(null!=matrixMvit3) {
-            matrixMvit3.clear(); matrixMvit3=null;
-        }
-        if(null!=localBuf) {
-            localBuf.clear(); localBuf=null;
-        }
-
-        if(null!=matrixPStack) {
-            matrixPStack.clear(); matrixPStack=null;
-        }
-        vec3f=null;
-        if(null!=matrixMvStack) {
-            matrixMvStack.clear(); matrixMvStack=null;
-        }
-        if(null!=matrixPStack) {
-        matrixPStack.clear(); matrixPStack=null;
-        }
-        if(null!=matrixTStack) {
-            matrixTStack.clear(); matrixTStack=null;
-        }
-
-        matrixTPMvMvitPmv=null; matrixPMvMvit=null; matrixPMvMvitPmv=null; matrixPMvMvi=null; matrixPMv=null; 
-        matrixP=null; matrixT=null; matrixMv=null; matrixMvi=null; matrixMvit=null; matrixPmv=null;
-        matrixMult=null; matrixTrans=null; matrixRot=null; matrixScale=null; matrixOrtho=null; matrixFrustum=null;
-    }
-
-    private static FloatBuffer slice(FloatBuffer buf, int pos, int len) {
-        buf.position(pos);
-        buf.limit(pos + len);
-        return buf.slice();
-    }
-
-    public static final boolean isMatrixModeName(final int matrixModeName) {
-        switch(matrixModeName) {
-            case GL_MODELVIEW_MATRIX:
-            case GL_PROJECTION_MATRIX:
-            case GL_TEXTURE_MATRIX:
-                return true;
-        }
-        return false;
-    }
-
-    public static final int matrixModeName2MatrixGetName(final int matrixModeName) {
-        switch(matrixModeName) {
-            case GL_MODELVIEW:
-                return GL_MODELVIEW_MATRIX;
-            case GL_PROJECTION:
-                return GL_PROJECTION_MATRIX;
-            case GL.GL_TEXTURE:
-                return GL_TEXTURE_MATRIX;
-            default:
-              throw new GLException("unsupported matrixName: "+matrixModeName);
-        }
-    }
-
-    public static final boolean isMatrixGetName(final int matrixGetName) {
-        switch(matrixGetName) {
-            case GL_MATRIX_MODE:
-            case GL_MODELVIEW_MATRIX:
-            case GL_PROJECTION_MATRIX:
-            case GL_TEXTURE_MATRIX:
-                return true;
-        }
-        return false;
-    }
-
-    public static final int matrixGetName2MatrixModeName(final int matrixGetName) {
-        switch(matrixGetName) {
-            case GL_MODELVIEW_MATRIX:
-                return GL_MODELVIEW;
-            case GL_PROJECTION_MATRIX:
-                return GL_PROJECTION;
-            case GL_TEXTURE_MATRIX:
-                return GL.GL_TEXTURE;
-            default:
-              throw new GLException("unsupported matrixGetName: "+matrixGetName);
-        }
-    }
-
-    public void setDirty() {
-          modified   = DIRTY_MODELVIEW | DIRTY_PROJECTION | DIRTY_TEXTURE ;
-          matrixMode = GL_MODELVIEW;
-    }
-
-    public int getDirtyBits() {
-        return modified;
-    }
-
-    public boolean isDirty(final int matrixName) {
-        boolean res;
-        switch(matrixName) {
-            case GL_MODELVIEW:
-                res = (modified&DIRTY_MODELVIEW)!=0 ;
-                break;
-            case GL_PROJECTION:
-                res = (modified&DIRTY_PROJECTION)!=0 ;
-                break;
-            case GL.GL_TEXTURE:
-                res = (modified&DIRTY_TEXTURE)!=0 ;
-                break;
-            default:
-              throw new GLException("unsupported matrixName: "+matrixName);
-        }
-        return res;
-    }
-
-    public boolean isDirty() {
-        return modified!=0;
-    }
-
-    public boolean update() {
-        // if(0==modified) return false;
-
-        // int res = modified;
-        int res = DIRTY_MODELVIEW | DIRTY_PROJECTION ;
-        if( (res&DIRTY_MODELVIEW)!=0 ) {
-            setMviMvit();
-        }
-        if( (res&DIRTY_MODELVIEW)!=0 || (res&DIRTY_PROJECTION)!=0 ) {
-            glMultMatrixf(matrixP, matrixMv, matrixPmv);
-        }
-        modified=0;
-        return res!=0;
-    }
-
-    public final int  glGetMatrixMode() {
-        return matrixMode;
-    }
-
-    public final FloatBuffer glGetTMatrixf() {
-        return matrixT;
-    }
-
-    public final FloatBuffer glGetPMatrixf() {
-        return matrixP;
-    }
-
-    public final FloatBuffer glGetMvMatrixf() {
-        return matrixMv;
-    }
-
-    public final FloatBuffer glGetPMvMvitPmvMatrixf() {
-        return matrixPMvMvitPmv;
-    }
-
-    public final FloatBuffer glGetPMvMvitMatrixf() {
-        return matrixPMvMvit;
-    }
-
-    public final FloatBuffer glGetPMvMviMatrixf() {
-        return matrixPMvMvi;
-    }
-
-    public final FloatBuffer glGetPMvMatrixf() {
-        return matrixPMv;
-    }
-
-    public final FloatBuffer glGetMviMatrixf() {
-        return matrixMvi;
-    }
-
-    public final FloatBuffer glGetPmvMatrixf() {
-        return matrixPmv;
-    }
-
-    public final FloatBuffer glGetNormalMatrixf() {
-        return matrixMvit3;
-    }
-
-   /*
-    * @return the current matrix
-    */
-    public final FloatBuffer glGetMatrixf() {
-        return glGetMatrixf(matrixMode);
-    }
-
-  /**
-   * @param pname GL_MODELVIEW, GL_PROJECTION or GL.GL_TEXTURE
-   * @return the given matrix
-   */
-    public final FloatBuffer glGetMatrixf(final int matrixName) {
-        if(matrixName==GL_MODELVIEW) {
-            return matrixMv;
-        } else if(matrixName==GL_PROJECTION) {
-            return matrixP;
-        } else if(matrixName==GL.GL_TEXTURE) {
-            return matrixT;
-        } else {
-            throw new GLException("unsupported matrixName: "+matrixName);
-        }
-    }
-
-    public final void gluPerspective(final float fovy, final float aspect, final float zNear, final float zFar) {
-      float top=(float)Math.tan(fovy*((float)Math.PI)/360.0f)*zNear;
-      float bottom=-1.0f*top;
-      float left=aspect*bottom;
-      float right=aspect*top;
-      glFrustumf(left, right, bottom, top, zNear, zFar);
-    }
-
-    public static final void glMultMatrixf(final FloatBuffer a, final FloatBuffer b, FloatBuffer p) {
-       for (int i = 0; i < 4; i++) {
-          final float ai0=a.get(i+0*4),  ai1=a.get(i+1*4),  ai2=a.get(i+2*4),  ai3=a.get(i+3*4);
-          p.put(i+0*4 , ai0 * b.get(0+0*4) + ai1 * b.get(1+0*4) + ai2 * b.get(2+0*4) + ai3 * b.get(3+0*4) );
-          p.put(i+1*4 , ai0 * b.get(0+1*4) + ai1 * b.get(1+1*4) + ai2 * b.get(2+1*4) + ai3 * b.get(3+1*4) );
-          p.put(i+2*4 , ai0 * b.get(0+2*4) + ai1 * b.get(1+2*4) + ai2 * b.get(2+2*4) + ai3 * b.get(3+2*4) );
-          p.put(i+3*4 , ai0 * b.get(0+3*4) + ai1 * b.get(1+3*4) + ai2 * b.get(2+3*4) + ai3 * b.get(3+3*4) );
-       }
-    }
-    public static final void glMultMatrixf(final FloatBuffer a, final float[] b, int b_off, FloatBuffer p) {
-       for (int i = 0; i < 4; i++) {
-          final float ai0=a.get(i+0*4),  ai1=a.get(i+1*4),  ai2=a.get(i+2*4),  ai3=a.get(i+3*4);
-          p.put(i+0*4 , ai0 * b[b_off+0+0*4] + ai1 * b[b_off+1+0*4] + ai2 * b[b_off+2+0*4] + ai3 * b[b_off+3+0*4] );
-          p.put(i+1*4 , ai0 * b[b_off+0+1*4] + ai1 * b[b_off+1+1*4] + ai2 * b[b_off+2+1*4] + ai3 * b[b_off+3+1*4] );
-          p.put(i+2*4 , ai0 * b[b_off+0+2*4] + ai1 * b[b_off+1+2*4] + ai2 * b[b_off+2+2*4] + ai3 * b[b_off+3+2*4] );
-          p.put(i+3*4 , ai0 * b[b_off+0+3*4] + ai1 * b[b_off+1+3*4] + ai2 * b[b_off+2+3*4] + ai3 * b[b_off+3+3*4] );
-       }
-    }
-
-    // 
-    // MatrixIf
-    //
-
-    public void glMatrixMode(final int matrixName) {
-        switch(matrixName) {
-            case GL_MODELVIEW:
-            case GL_PROJECTION:
-            case GL.GL_TEXTURE:
-                break;
-            default:
-              throw new GLException("unsupported matrixName: "+matrixName);
-        }
-        matrixMode = matrixName;
-    }
-
-    public void glGetFloatv(int matrixGetName, FloatBuffer params) {
-        int pos = params.position();
-        if(matrixGetName==GL_MATRIX_MODE) {
-            params.put((float)matrixMode);
-        } else {
-            FloatBuffer matrix = glGetMatrixf(matrixGetName2MatrixModeName(matrixGetName));
-            params.put(matrix);
-            matrix.rewind();
-        }
-        params.position(pos);
-    }
-    public void glGetFloatv(int matrixGetName, float[] params, int params_offset) {
-        if(matrixGetName==GL_MATRIX_MODE) {
-            params[params_offset]=(float)matrixMode;
-        } else {
-            FloatBuffer matrix = glGetMatrixf(matrixGetName2MatrixModeName(matrixGetName));
-            matrix.get(params, params_offset, 16);
-            matrix.rewind();
-        }
-    }
-    public void glGetIntegerv(int pname, IntBuffer params) {
-        int pos = params.position();
-        if(pname==GL_MATRIX_MODE) {
-            params.put(matrixMode);
-        } else {
-            throw new GLException("unsupported pname: "+pname);
-        }
-        params.position(pos);
-    }
-    public void glGetIntegerv(int pname, int[] params, int params_offset) {
-        if(pname==GL_MATRIX_MODE) {
-            params[params_offset]=matrixMode;
-        } else {
-            throw new GLException("unsupported pname: "+pname);
-        }
-    }
-
-    public final void glLoadMatrixf(final float[] values, final int offset) {
-        int len = values.length-offset;
-        if(matrixMode==GL_MODELVIEW) {
-            matrixMv.clear();
-            matrixMv.put(values, offset, len);
-            matrixMv.rewind();
-            modified |= DIRTY_MODELVIEW ;
-        } else if(matrixMode==GL_PROJECTION) {
-            matrixP.clear();
-            matrixP.put(values, offset, len);
-            matrixP.rewind();
-            modified |= DIRTY_PROJECTION ;
-        } else if(matrixMode==GL.GL_TEXTURE) {
-            matrixT.clear();
-            matrixT.put(values, offset, len);
-            matrixT.rewind();
-            modified |= DIRTY_TEXTURE ;
-        } 
-    }
-
-    public final void glLoadMatrixf(java.nio.FloatBuffer m) {
-        int spos = m.position();
-        if(matrixMode==GL_MODELVIEW) {
-            matrixMv.clear();
-            matrixMv.put(m);
-            matrixMv.rewind();
-            modified |= DIRTY_MODELVIEW ;
-        } else if(matrixMode==GL_PROJECTION) {
-            matrixP.clear();
-            matrixP.put(m);
-            matrixP.rewind();
-            modified |= DIRTY_PROJECTION ;
-        } else if(matrixMode==GL.GL_TEXTURE) {
-            matrixT.clear();
-            matrixT.put(m);
-            matrixT.rewind();
-            modified |= DIRTY_TEXTURE ;
-        } 
-        m.position(spos);
-    }
-
-    public final void glPopMatrix() {
-        float[] stackEntry=null;
-        if(matrixMode==GL_MODELVIEW) {
-            stackEntry = (float[])matrixMvStack.remove(0);
-        } else if(matrixMode==GL_PROJECTION) {
-            stackEntry = (float[])matrixPStack.remove(0);
-        } else if(matrixMode==GL.GL_TEXTURE) {
-            stackEntry = (float[])matrixTStack.remove(0);
-        } 
-        glLoadMatrixf(stackEntry, 0);
-    }
-
-    public final void glPushMatrix() {
-        float[] stackEntry = new float[1*16];
-        if(matrixMode==GL_MODELVIEW) {
-            matrixMv.get(stackEntry);
-            matrixMv.rewind();
-            matrixMvStack.add(0, stackEntry);
-        } else if(matrixMode==GL_PROJECTION) {
-            matrixP.get(stackEntry);
-            matrixP.rewind();
-            matrixPStack.add(0, stackEntry);
-        } else if(matrixMode==GL.GL_TEXTURE) {
-            matrixT.get(stackEntry);
-            matrixT.rewind();
-            matrixTStack.add(0, stackEntry);
-        }
-    }
-
-    public final void glLoadIdentity() {
-        if(matrixMode==GL_MODELVIEW) {
-            matrixMv.clear();
-            matrixMv.put(matrixIdent);
-            matrixMv.rewind();
-            matrixIdent.rewind();
-            modified |= DIRTY_MODELVIEW ;
-        } else if(matrixMode==GL_PROJECTION) {
-            matrixP.clear();
-            matrixP.put(matrixIdent);
-            matrixP.rewind();
-            matrixIdent.rewind();
-            modified |= DIRTY_PROJECTION ;
-        } else if(matrixMode==GL.GL_TEXTURE) {
-            matrixT.clear();
-            matrixT.put(matrixIdent);
-            matrixT.rewind();
-            matrixIdent.rewind();
-            modified |= DIRTY_TEXTURE ;
-        } 
-    }
-
-    public final void glMultMatrixf(final FloatBuffer m) {
-        if(matrixMode==GL_MODELVIEW) {
-            glMultMatrixf(matrixMv, m, matrixMult);
-            matrixMv.clear();
-            matrixMv.put(matrixMult);
-            matrixMv.rewind();
-            modified |= DIRTY_MODELVIEW ;
-        } else if(matrixMode==GL_PROJECTION) {
-            glMultMatrixf(matrixP, m, matrixMult);
-            matrixP.clear();
-            matrixP.put(matrixMult);
-            matrixP.rewind();
-            modified |= DIRTY_PROJECTION ;
-        } else if(matrixMode==GL.GL_TEXTURE) {
-            glMultMatrixf(matrixT, m, matrixMult);
-            matrixT.clear();
-            matrixT.put(matrixMult);
-            matrixT.rewind();
-            modified |= DIRTY_TEXTURE ;
-        } 
-        matrixMult.rewind();
-    }
-
-    public void glMultMatrixf(float[] m, int m_offset) {
-        if(matrixMode==GL_MODELVIEW) {
-            glMultMatrixf(matrixMv, m, m_offset, matrixMult);
-            matrixMv.clear();
-            matrixMv.put(matrixMult);
-            matrixMv.rewind();
-            modified |= DIRTY_MODELVIEW ;
-        } else if(matrixMode==GL_PROJECTION) {
-            glMultMatrixf(matrixP, m, m_offset, matrixMult);
-            matrixP.clear();
-            matrixP.put(matrixMult);
-            matrixP.rewind();
-            modified |= DIRTY_PROJECTION ;
-        } else if(matrixMode==GL.GL_TEXTURE) {
-            glMultMatrixf(matrixT, m, m_offset, matrixMult);
-            matrixT.clear();
-            matrixT.put(matrixMult);
-            matrixT.rewind();
-            modified |= DIRTY_TEXTURE ;
-        } 
-        matrixMult.rewind();
-    }
-
-    public final void glTranslatef(final float x, final float y, final float z) {
-        // Translation matrix: 
-        //  1 0 0 x
-        //  0 1 0 y
-        //  0 0 1 z
-        //  0 0 0 1
-        matrixTrans.put(0+4*3, x);
-        matrixTrans.put(1+4*3, y);
-        matrixTrans.put(2+4*3, z);
-        glMultMatrixf(matrixTrans);
-    }
-
-    public final void glRotatef(final float angdeg, float x, float y, float z) {
-        float angrad = angdeg   * (float) Math.PI / 180;
-        float c = (float)Math.cos(angrad);
-        float ic= 1.0f - c; 
-        float s = (float)Math.sin(angrad);
-
-        vec3f[0]=x; vec3f[1]=y; vec3f[2]=z;
-        projectFloat.normalize(vec3f);
-        x = vec3f[0]; y = vec3f[1]; z = vec3f[2];
-
-        // Rotation matrix:
-        //      xx(1−c)+c  xy(1−c)+zs xz(1−c)-ys 0
-        //      xy(1−c)-zs yy(1−c)+c  yz(1−c)+xs 0
-        //      xz(1−c)+ys yz(1−c)-xs zz(1−c)+c  0
-        //      0          0          0          1
-        float xy = x*y;
-        float xz = x*z;
-        float xs = x*s;
-        float ys = y*s;
-        float yz = y*z;
-        float zs = z*s;
-        matrixRot.put(0*4+0, x*x*ic+c);
-        matrixRot.put(0*4+1, xy*ic+zs);
-        matrixRot.put(0*4+2, xz*ic-ys);
-
-        matrixRot.put(1*4+0, xy*ic-zs);
-        matrixRot.put(1*4+1, y*y*ic+c);
-        matrixRot.put(1*4+2, yz*ic+xs);
-
-        matrixRot.put(2*4+0, xz*ic+ys);
-        matrixRot.put(2*4+1, yz*ic-xs);
-        matrixRot.put(2*4+2, z*z*ic+c);
-
-        glMultMatrixf(matrixRot);
-    }
-
-    public final void glScalef(final float x, final float y, final float z) {
-        // Scale matrix: 
-        //  x 0 0 0
-        //  0 y 0 0
-        //  0 0 z 0
-        //  0 0 0 1
-        matrixScale.put(0+4*0, x);
-        matrixScale.put(1+4*1, y);
-        matrixScale.put(2+4*2, z);
-
-        glMultMatrixf(matrixScale);
-    }
-
-    public final void glOrthof(final float left, final float right, final float bottom, final float top, final float zNear, final float zFar) {
-        // Ortho matrix: 
-        //  2/dx  0     0    tx
-        //  0     2/dy  0    ty
-        //  0     0     2/dz tz
-        //  0     0     0    1
-        float dx=right-left;
-        float dy=top-bottom;
-        float dz=zFar-zNear;
-        float tx=-1.0f*(right+left)/dx;
-        float ty=-1.0f*(top+bottom)/dy;
-        float tz=-1.0f*(zFar+zNear)/dz;
-
-        matrixOrtho.put(0+4*0, 2.0f/dx);
-        matrixOrtho.put(1+4*1, 2.0f/dy);
-        matrixOrtho.put(2+4*2, -2.0f/dz);
-        matrixOrtho.put(0+4*3, tx);
-        matrixOrtho.put(1+4*3, ty);
-        matrixOrtho.put(2+4*3, tz);
-
-        glMultMatrixf(matrixOrtho);
-    }
-
-    public final void glFrustumf(final float left, final float right, final float bottom, final float top, final float zNear, final float zFar) {
-        if(zNear<=0.0f||zFar<0.0f) {
-            throw new GLException("GL_INVALID_VALUE: zNear and zFar must be positive, and zNear>0");
-        }
-        if(left==right || top==bottom) {
-            throw new GLException("GL_INVALID_VALUE: top,bottom and left,right must not be equal");
-        }
-        // Frustum matrix: 
-        //  2*zNear/dx   0          A  0
-        //  0            2*zNear/dy B  0
-        //  0            0          C  D
-        //  0            0         −1  0
-        float zNear2 = 2.0f*zNear;
-        float dx=right-left;
-        float dy=top-bottom;
-        float dz=zFar-zNear;
-        float A=(right+left)/dx;
-        float B=(top+bottom)/dy;
-        float C=-1.0f*(zFar+zNear)/dz;
-        float D=-2.0f*(zFar*zNear)/dz;
-
-        matrixFrustum.put(0+4*0, zNear2/dx);
-        matrixFrustum.put(1+4*1, zNear2/dy);
-        matrixFrustum.put(2+4*2, C);
-
-        matrixFrustum.put(0+4*2, A);
-        matrixFrustum.put(1+4*2, B);
-
-        matrixFrustum.put(2+4*3, D);
-        matrixFrustum.put(3+4*2, -1.0f);
-
-        glMultMatrixf(matrixFrustum);
-    }
-
-    //
-    // private 
-    //
-
-    private final void setMviMvit() {
-        if(!projectFloat.gluInvertMatrixf(matrixMv, matrixMvi)) {
-            throw new GLException("Invalid source Mv matrix, can't compute inverse");
-        }
-
-        // transpose matrix 
-        for (int i = 0; i < 4; i++) {
-            for (int j = 0; j < 4; j++) {
-                matrixMvit.put(j+i*4, matrixMvi.get(i+j*4));
-            }
-        }
-
-        // fetch 3x3
-        for (int i = 0; i < 3; i++) {
-            for (int j = 0; j < 3; j++) {
-                matrixMvit3.put(i+j*3, matrixMvit.get(i+j*4));
-            }
-        }
-    }
-
-    protected FloatBuffer matrixIdent;
-    protected FloatBuffer matrixTPMvMvitPmv, matrixPMvMvit, matrixPMvMvitPmv, matrixPMvMvi, matrixPMv, matrixP, matrixT, matrixMv, matrixMvi, matrixMvit, matrixPmv;
-    protected FloatBuffer matrixMvit3;
-    protected FloatBuffer localBuf, matrixMult, matrixTrans, matrixRot, matrixScale, matrixOrtho, matrixFrustum;
-    protected float[] vec3f;
-    protected List/*FloatBuffer*/ matrixTStack, matrixPStack, matrixMvStack;
-    protected int matrixMode = GL_MODELVIEW;
-    protected int modified = 0;
-    protected ProjectFloat projectFloat;
-
-    public static final int DIRTY_MODELVIEW  = 1 << 0;
-    public static final int DIRTY_PROJECTION = 1 << 1;
-    public static final int DIRTY_TEXTURE    = 1 << 2;
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/StreamUtil.java b/src/jogl/classes/com/sun/opengl/util/StreamUtil.java
deleted file mode 100755
index 8ad731743..000000000
--- a/src/jogl/classes/com/sun/opengl/util/StreamUtil.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util;
-
-import java.io.*;
-import java.nio.*;
-
-/** Utilities for dealing with streams. */
-
-public class StreamUtil {
-    private StreamUtil() {}
-
-    public static byte[] readAll2Array(InputStream stream) throws IOException {
-        BytesRead bytesRead = readAllImpl(stream);
-        byte[] data = bytesRead.data;
-        if (bytesRead.payloadLen != data.length) {
-            data = new byte[bytesRead.payloadLen];
-            System.arraycopy(bytesRead.data, 0, data, 0, bytesRead.payloadLen);
-        }
-        return data;
-    }
-
-    public static ByteBuffer readAll2Buffer(InputStream stream) throws IOException {
-        BytesRead bytesRead = readAllImpl(stream);
-        return BufferUtil.newByteBuffer(bytesRead.data, 0, bytesRead.payloadLen);
-    }
-
-    private static BytesRead readAllImpl(InputStream stream) throws IOException {
-        // FIXME: Shall we do this here ?
-        if( !(stream instanceof BufferedInputStream) ) {
-            stream = new BufferedInputStream(stream);
-        }
-        int avail = stream.available();
-        byte[] data = new byte[avail];
-        int numRead = 0;
-        int pos = 0;
-        do {
-            if (pos + avail > data.length) {
-                byte[] newData = new byte[pos + avail];
-                System.arraycopy(data, 0, newData, 0, pos);
-                data = newData;
-            }
-            numRead = stream.read(data, pos, avail);
-            if (numRead >= 0) {
-                pos += numRead;
-            }
-            avail = stream.available();
-        } while (avail > 0 && numRead >= 0);
-
-        return new BytesRead(pos, data);
-    }
-
-    private static class BytesRead {
-        BytesRead(int payloadLen, byte[] data) {
-            this.payloadLen=payloadLen;
-            this.data=data;
-        }
-        int payloadLen;
-        byte[] data;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/TGAWriter.java b/src/jogl/classes/com/sun/opengl/util/TGAWriter.java
deleted file mode 100755
index c5b1041a0..000000000
--- a/src/jogl/classes/com/sun/opengl/util/TGAWriter.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.opengl.util;
-
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-
-/**
- * Utility class which helps take fast screenshots of OpenGL rendering
- * results into Targa-format files. Used by the {@link
- * com.sun.opengl.util.gl2.Screenshot Screenshot} class; can also be used
- * in conjunction with the {@link com.sun.opengl.util.gl2.TileRenderer
- * TileRenderer} class. <P>
- */
-
-public class TGAWriter {
-  private static final int TARGA_HEADER_SIZE = 18;
-
-  private FileChannel ch;
-  private ByteBuffer buf;
-
-  /** Constructor for the TGAWriter. */
-  public TGAWriter() {
-  }
-
-  /**
-   * Opens the specified Targa file for writing, overwriting any
-   * existing file, and sets up the header of the file expecting the
-   * data to be filled in before closing it.
-   *
-   * @param file the file to write containing the screenshot
-   * @param width the width of the current drawable
-   * @param height the height of the current drawable
-   * @param alpha whether the alpha channel should be saved. If true,
-   *   requires GL_EXT_abgr extension to be present.
-   *
-   * @throws IOException if an I/O error occurred while writing the
-   *   file
-   */
-  public void open(File file,
-                   int width,
-                   int height,
-                   boolean alpha) throws IOException {
-    RandomAccessFile out = new RandomAccessFile(file, "rw");
-    ch = out.getChannel();
-    int pixelSize = (alpha ? 32 : 24);
-    int numChannels = (alpha ? 4 : 3);
-
-    int fileLength = TARGA_HEADER_SIZE + width * height * numChannels;
-    out.setLength(fileLength);
-    MappedByteBuffer image = ch.map(FileChannel.MapMode.READ_WRITE, 0, fileLength);
-
-    // write the TARGA header
-    image.put(0, (byte) 0).put(1, (byte) 0);
-    image.put(2, (byte) 2); // uncompressed type
-    image.put(12, (byte) (width & 0xFF)); // width
-    image.put(13, (byte) (width >> 8)); // width
-    image.put(14, (byte) (height & 0xFF)); // height
-    image.put(15, (byte) (height >> 8)); // height
-    image.put(16, (byte) pixelSize); // pixel size
-             
-    // go to image data position
-    image.position(TARGA_HEADER_SIZE);
-    // jogl needs a sliced buffer
-    buf = image.slice();
-  }
-
-  /**
-   * Returns the ByteBuffer corresponding to the data for the image.
-   * This must be filled in with data in either BGR or BGRA format
-   * depending on whether an alpha channel was specified during
-   * open().
-   */
-  public ByteBuffer getImageData() {
-    return buf;
-  }
-
-  public void close() throws IOException {
-    // close the file channel
-    ch.close();
-    buf = null;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/awt/ImageUtil.java b/src/jogl/classes/com/sun/opengl/util/awt/ImageUtil.java
deleted file mode 100755
index 534ab444d..000000000
--- a/src/jogl/classes/com/sun/opengl/util/awt/ImageUtil.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.awt;
-
-import java.awt.*;
-import java.awt.image.*;
-
-/** Utilities for dealing with images. */
-
-public class ImageUtil {
-  private ImageUtil() {}
-
-  /** Flips the supplied BufferedImage vertically. This is often a
-      necessary conversion step to display a Java2D image correctly
-      with OpenGL and vice versa. */
-  public static void flipImageVertically(BufferedImage image) {
-    WritableRaster raster = image.getRaster();
-    Object scanline1 = null;
-    Object scanline2 = null;
-      
-    for (int i = 0; i < image.getHeight() / 2; i++) {
-      scanline1 = raster.getDataElements(0, i, image.getWidth(), 1, scanline1);
-      scanline2 = raster.getDataElements(0, image.getHeight() - i - 1, image.getWidth(), 1, scanline2);
-      raster.setDataElements(0, i, image.getWidth(), 1, scanline2);
-      raster.setDataElements(0, image.getHeight() - i - 1, image.getWidth(), 1, scanline1);
-    }
-  }
-
-  /**
-   * Creates a <code>BufferedImage</code> with a pixel format compatible with the graphics
-   * environment. The returned image can thus benefit from hardware accelerated operations
-   * in Java2D API.
-   *
-   * @param width The width of the image to be created
-   * @param height The height of the image to be created
-   *
-   * @return A instance of <code>BufferedImage</code> with a type compatible with the graphics card.
-   */
-  public static BufferedImage createCompatibleImage(int width, int height) {
-    GraphicsConfiguration configuration =
-      GraphicsEnvironment.getLocalGraphicsEnvironment().
-      getDefaultScreenDevice().getDefaultConfiguration();
-    return configuration.createCompatibleImage(width, height);
-  }
-
-  /**
-   * Creates a thumbnail from an image. A thumbnail is a scaled down version of the original picture.
-   * This method will retain the width to height ratio of the original picture and return a new
-   * instance of <code>BufferedImage</code>. The original picture is not modified.
-   *
-   * @param image The original image to sample down
-   * @param thumbWidth The width of the thumbnail to be created
-   *
-   * @throws IllegalArgumentException If thumbWidth is greater than image.getWidth()
-   *
-   * @return A thumbnail with the requested width or the original picture if thumbWidth = image.getWidth()
-   */
-  public static BufferedImage createThumbnail(BufferedImage image, int thumbWidth) {
-    // Thanks to Romain Guy for this utility
-    if (thumbWidth > image.getWidth()) {
-      throw new IllegalArgumentException("Thumbnail width must be greater than image width");
-    }
-   
-    if (thumbWidth == image.getWidth()) {
-      return image;
-    }
- 
-    float ratio = (float) image.getWidth() / (float) image.getHeight();
-    int width = image.getWidth();
-    BufferedImage thumb = image;
-   
-    do {
-      width /= 2;
-      if (width < thumbWidth) {
-        width = thumbWidth;
-      }
-     
-      BufferedImage temp = createCompatibleImage(width, (int) (width / ratio));
-      Graphics2D g2 = temp.createGraphics();
-      g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
-                          RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-      g2.drawImage(thumb, 0, 0, temp.getWidth(), temp.getHeight(), null);
-      g2.dispose();
-      thumb = temp;
-    } while (width != thumbWidth);
-   
-    return thumb;
-  }
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/awt/Overlay.java b/src/jogl/classes/com/sun/opengl/util/awt/Overlay.java
deleted file mode 100755
index 5a54a7161..000000000
--- a/src/jogl/classes/com/sun/opengl/util/awt/Overlay.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.awt;
-
-import java.awt.Graphics2D;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.texture.*;
-
-/** Provides a Java 2D overlay on top of an arbitrary GLDrawable,
-    making it easier to do things like draw text and images on top of
-    an OpenGL scene while still maintaining reasonably good
-    efficiency. */
-
-public class Overlay {
-  private GLDrawable drawable;
-  private TextureRenderer renderer;
-  private boolean contentsLost;
-
-  /** Creates a new Java 2D overlay on top of the specified
-      GLDrawable. */
-  public Overlay(GLDrawable drawable) {
-    this.drawable = drawable;
-  }
-
-  /** Creates a {@link java.awt.Graphics2D Graphics2D} instance for
-      rendering into the overlay. The returned object should be
-      disposed of using the normal {@link java.awt.Graphics#dispose()
-      Graphics.dispose()} method once it is no longer being used.
-
-      @return a new {@link java.awt.Graphics2D Graphics2D} object for
-        rendering into the backing store of this renderer
-  */
-  public Graphics2D createGraphics() {
-    // Validate the size of the renderer against the current size of
-    // the drawable
-    validateRenderer();
-    return renderer.createGraphics();
-  }
-
-  /** Indicates whether the Java 2D contents of the overlay were lost
-      since the last time {@link #createGraphics} was called. This
-      method should be called immediately after calling {@link
-      #createGraphics} to see whether the entire contents of the
-      overlay need to be redrawn or just the region the application is
-      interested in updating.
-
-      @return whether the contents of the overlay were lost since the
-        last render
-  */
-  public boolean contentsLost() {
-    return contentsLost;
-  }
-
-  /** Marks the given region of the overlay as dirty. This region, and
-      any previously set dirty regions, will be automatically
-      synchronized with the underlying Texture during the next {@link
-      #draw draw} or {@link #drawAll drawAll} operation, at which
-      point the dirty region will be cleared. It is not necessary for
-      an OpenGL context to be current when this method is called.
-
-      @param x the x coordinate (in Java 2D coordinates -- relative to
-        upper left) of the region to update
-      @param y the y coordinate (in Java 2D coordinates -- relative to
-        upper left) of the region to update
-      @param width the width of the region to update
-      @param height the height of the region to update
-
-      @throws GLException If an OpenGL context is not current when this method is called */
-  public void markDirty(int x, int y, int width, int height) {
-    renderer.markDirty(x, y, width, height);
-  }
-
-  /** Draws the entire contents of the overlay on top of the OpenGL
-      drawable. This is a convenience method which encapsulates all
-      portions of the rendering process; if this method is used,
-      {@link #beginRendering}, {@link #endRendering}, etc. should not
-      be used. This method should be called while the OpenGL context
-      for the drawable is current, and after your OpenGL scene has
-      been rendered.
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void drawAll() throws GLException {
-    beginRendering();
-    draw(0, 0, drawable.getWidth(), drawable.getHeight());
-    endRendering();
-  }
-
-  /** Begins the OpenGL rendering process for the overlay. This is
-      separated out so advanced applications can render independent
-      pieces of the overlay to different portions of the drawable.
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void beginRendering() throws GLException {
-    renderer.beginOrthoRendering(drawable.getWidth(), drawable.getHeight());
-  }
-
-  /** Ends the OpenGL rendering process for the overlay. This is
-      separated out so advanced applications can render independent
-      pieces of the overlay to different portions of the drawable.
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void endRendering() throws GLException {
-    renderer.endOrthoRendering();
-  }
-
-  /** Draws the specified sub-rectangle of the overlay on top of the
-      OpenGL drawable. {@link #beginRendering} and {@link
-      #endRendering} must be used in conjunction with this method to
-      achieve proper rendering results. This method should be called
-      while the OpenGL context for the drawable is current, and after
-      your OpenGL scene has been rendered.
-
-      @param x the lower-left x coordinate (relative to the lower left
-        of the overlay) of the rectangle to draw
-      @param y the lower-left y coordinate (relative to the lower left
-        of the overlay) of the rectangle to draw
-      @param width the width of the rectangle to draw
-      @param height the height of the rectangle to draw
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void draw(int x, int y, int width, int height) throws GLException {
-    draw(x, y, x, y, width, height);
-  }
-
-  /** Draws the specified sub-rectangle of the overlay at the
-      specified x and y coordinate on top of the OpenGL drawable.
-      {@link #beginRendering} and {@link #endRendering} must be used
-      in conjunction with this method to achieve proper rendering
-      results. This method should be called while the OpenGL context
-      for the drawable is current, and after your OpenGL scene has
-      been rendered.
-
-      @param screenx the on-screen x coordinate at which to draw the rectangle
-      @param screeny the on-screen y coordinate (relative to lower left) at
-        which to draw the rectangle
-      @param overlayx the x coordinate of the pixel in the overlay of
-        the lower left portion of the rectangle to draw
-      @param overlayy the y coordinate of the pixel in the overlay
-        (relative to lower left) of the lower left portion of the
-        rectangle to draw
-      @param width the width of the rectangle to draw
-      @param height the height of the rectangle to draw
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void draw(int screenx, int screeny,
-                   int overlayx, int overlayy,
-                   int width, int height) throws GLException {
-    renderer.drawOrthoRect(screenx, screeny,
-                           overlayx, overlayy,
-                           width, height);
-  }
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  private void validateRenderer() {
-    if (renderer == null) {
-      renderer = new TextureRenderer(drawable.getWidth(),
-                                     drawable.getHeight(),
-                                     true);
-      contentsLost = true;
-    } else if (renderer.getWidth() != drawable.getWidth() ||
-               renderer.getHeight() != drawable.getHeight()) {
-      renderer.setSize(drawable.getWidth(), drawable.getHeight());
-      contentsLost = true;
-    } else {
-      contentsLost = false;
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/awt/Screenshot.java b/src/jogl/classes/com/sun/opengl/util/awt/Screenshot.java
deleted file mode 100755
index 55099445a..000000000
--- a/src/jogl/classes/com/sun/opengl/util/awt/Screenshot.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.opengl.util.awt;
-
-import java.awt.image.*;
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-import javax.imageio.*;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-import javax.media.opengl.glu.gl2.*;
-
-import com.sun.opengl.util.*;
-
-/** Utilities for taking screenshots of OpenGL applications. */
-
-public class Screenshot {
-  private Screenshot() {}
-
-  /** 
-   * Takes a fast screenshot of the current OpenGL drawable to a Targa
-   * file. Requires the OpenGL context for the desired drawable to be
-   * current. Takes the screenshot from the last assigned read buffer,
-   * or the OpenGL default read buffer if none has been specified by
-   * the user (GL_FRONT for single-buffered configurations and GL_BACK
-   * for double-buffered configurations). This is the fastest
-   * mechanism for taking a screenshot of an application. Contributed
-   * by Carsten Weisse of Bytonic Software (http://bytonic.de/). <p>
-   *
-   * No alpha channel is written with this variant.
-   *
-   * @param file the file to write containing the screenshot
-   * @param width the width of the current drawable
-   * @param height the height of the current drawable
-   *
-   * @throws GLException if an OpenGL context was not current or
-   *   another OpenGL-related error occurred
-   * @throws IOException if an I/O error occurred while writing the
-   *   file
-   */
-  public static void writeToTargaFile(File file,
-                                      int width,
-                                      int height) throws GLException, IOException {
-    writeToTargaFile(file, width, height, false);
-  }
-
-  /** 
-   * Takes a fast screenshot of the current OpenGL drawable to a Targa
-   * file. Requires the OpenGL context for the desired drawable to be
-   * current. Takes the screenshot from the last assigned read buffer,
-   * or the OpenGL default read buffer if none has been specified by
-   * the user (GL_FRONT for single-buffered configurations and GL_BACK
-   * for double-buffered configurations). This is the fastest
-   * mechanism for taking a screenshot of an application. Contributed
-   * by Carsten Weisse of Bytonic Software (http://bytonic.de/).
-   *
-   * @param file the file to write containing the screenshot
-   * @param width the width of the current drawable
-   * @param height the height of the current drawable
-   * @param alpha whether the alpha channel should be saved. If true,
-   *   requires GL_EXT_abgr extension to be present.
-   *
-   * @throws GLException if an OpenGL context was not current or
-   *   another OpenGL-related error occurred
-   * @throws IOException if an I/O error occurred while writing the
-   *   file
-   */
-  public static void writeToTargaFile(File file,
-                                      int width,
-                                      int height,
-                                      boolean alpha) throws GLException, IOException {
-    writeToTargaFile(file, 0, 0, width, height, alpha);
-  }
-
-  /** 
-   * Takes a fast screenshot of the current OpenGL drawable to a Targa
-   * file. Requires the OpenGL context for the desired drawable to be
-   * current. Takes the screenshot from the last assigned read buffer,
-   * or the OpenGL default read buffer if none has been specified by
-   * the user (GL_FRONT for single-buffered configurations and GL_BACK
-   * for double-buffered configurations). This is the fastest
-   * mechanism for taking a screenshot of an application. Contributed
-   * by Carsten Weisse of Bytonic Software (http://bytonic.de/).
-   *
-   * @param file the file to write containing the screenshot
-   * @param x the starting x coordinate of the screenshot, measured from the lower-left
-   * @param y the starting y coordinate of the screenshot, measured from the lower-left
-   * @param width the width of the desired screenshot area
-   * @param height the height of the desired screenshot area
-   * @param alpha whether the alpha channel should be saved. If true,
-   *   requires GL_EXT_abgr extension to be present.
-   *
-   * @throws GLException if an OpenGL context was not current or
-   *   another OpenGL-related error occurred
-   * @throws IOException if an I/O error occurred while writing the
-   *   file
-   */
-  public static void writeToTargaFile(File file,
-                                      int x,
-                                      int y,
-                                      int width,
-                                      int height,
-                                      boolean alpha) throws GLException, IOException {
-    if (alpha) {
-      checkExtABGR();
-    }
-
-    TGAWriter writer = new TGAWriter();
-    writer.open(file, width, height, alpha);
-    ByteBuffer bgr = writer.getImageData();
-
-    GL2 gl = GLUgl2.getCurrentGL2();
-
-    // Set up pixel storage modes
-    PixelStorageModes psm = new PixelStorageModes();
-    psm.save(gl);
-
-    int readbackType = (alpha ? GL2.GL_ABGR_EXT : GL2.GL_BGR);
-
-    // read the BGR values into the image buffer
-    gl.glReadPixels(x, y, width, height, readbackType,
-                    GL2.GL_UNSIGNED_BYTE, bgr);
-
-    // Restore pixel storage modes
-    psm.restore(gl);
-
-    // close the file
-    writer.close();
-  }
-
-  /**
-   * Takes a screenshot of the current OpenGL drawable to a
-   * BufferedImage. Requires the OpenGL context for the desired
-   * drawable to be current. Takes the screenshot from the last
-   * assigned read buffer, or the OpenGL default read buffer if none
-   * has been specified by the user (GL_FRONT for single-buffered
-   * configurations and GL_BACK for double-buffered configurations).
-   * Note that the scanlines of the resulting image are flipped
-   * vertically in order to correctly match the OpenGL contents, which
-   * takes time and is therefore not as fast as the Targa screenshot
-   * function. <P>
-   *
-   * No alpha channel is read back with this variant.
-   *
-   * @param width the width of the current drawable
-   * @param height the height of the current drawable
-   *
-   * @throws GLException if an OpenGL context was not current or
-   *   another OpenGL-related error occurred
-   */
-  public static BufferedImage readToBufferedImage(int width,
-                                                  int height) throws GLException {
-    return readToBufferedImage(width, height, false);
-  }
-
-  /**
-   * Takes a screenshot of the current OpenGL drawable to a
-   * BufferedImage. Requires the OpenGL context for the desired
-   * drawable to be current. Takes the screenshot from the last
-   * assigned read buffer, or the OpenGL default read buffer if none
-   * has been specified by the user (GL_FRONT for single-buffered
-   * configurations and GL_BACK for double-buffered configurations).
-   * Note that the scanlines of the resulting image are flipped
-   * vertically in order to correctly match the OpenGL contents, which
-   * takes time and is therefore not as fast as the Targa screenshot
-   * function.
-   *
-   * @param width the width of the current drawable
-   * @param height the height of the current drawable
-   * @param alpha whether the alpha channel should be read back. If
-   *   true, requires GL_EXT_abgr extension to be present.
-   *
-   * @throws GLException if an OpenGL context was not current or
-   *   another OpenGL-related error occurred
-   */
-  public static BufferedImage readToBufferedImage(int width,
-                                                  int height,
-                                                  boolean alpha) throws GLException {
-    return readToBufferedImage(0, 0, width, height, alpha);
-  }
-
-  /**
-   * Takes a screenshot of the current OpenGL drawable to a
-   * BufferedImage. Requires the OpenGL context for the desired
-   * drawable to be current. Takes the screenshot from the last
-   * assigned read buffer, or the OpenGL default read buffer if none
-   * has been specified by the user (GL_FRONT for single-buffered
-   * configurations and GL_BACK for double-buffered configurations).
-   * Note that the scanlines of the resulting image are flipped
-   * vertically in order to correctly match the OpenGL contents, which
-   * takes time and is therefore not as fast as the Targa screenshot
-   * function.
-   *
-   * @param x the starting x coordinate of the screenshot, measured from the lower-left
-   * @param y the starting y coordinate of the screenshot, measured from the lower-left
-   * @param width the width of the desired screenshot area
-   * @param height the height of the desired screenshot area
-   * @param alpha whether the alpha channel should be read back. If
-   *   true, requires GL_EXT_abgr extension to be present.
-   *
-   * @throws GLException if an OpenGL context was not current or
-   *   another OpenGL-related error occurred
-   */
-  public static BufferedImage readToBufferedImage(int x,
-                                                  int y,
-                                                  int width,
-                                                  int height,
-                                                  boolean alpha) throws GLException {
-    int bufImgType = (alpha ? BufferedImage.TYPE_4BYTE_ABGR : BufferedImage.TYPE_3BYTE_BGR);
-    int readbackType = (alpha ? GL2.GL_ABGR_EXT : GL2.GL_BGR);
-
-    if (alpha) {
-      checkExtABGR();
-    }
-
-    // Allocate necessary storage
-    BufferedImage image = new BufferedImage(width, height, bufImgType);
-
-    GL2 gl = GLUgl2.getCurrentGL2();
-
-    // Set up pixel storage modes
-    PixelStorageModes psm = new PixelStorageModes();
-    psm.save(gl);
-
-    // read the BGR values into the image
-    gl.glReadPixels(x, y, width, height, readbackType,
-                    GL2.GL_UNSIGNED_BYTE,
-                    ByteBuffer.wrap(((DataBufferByte) image.getRaster().getDataBuffer()).getData()));
-
-    // Restore pixel storage modes
-    psm.restore(gl);
-
-    // Must flip BufferedImage vertically for correct results
-    ImageUtil.flipImageVertically(image);
-    return image;
-  }
-
-  /**
-   * Takes a screenshot of the current OpenGL drawable to the
-   * specified file on disk using the ImageIO package. Requires the
-   * OpenGL context for the desired drawable to be current. Takes the
-   * screenshot from the last assigned read buffer, or the OpenGL
-   * default read buffer if none has been specified by the user
-   * (GL_FRONT for single-buffered configurations and GL_BACK for
-   * double-buffered configurations). This is not the fastest
-   * mechanism for taking a screenshot but may be more convenient than
-   * others for getting images for consumption by other packages. The
-   * file format is inferred from the suffix of the given file. <P>
-   *
-   * No alpha channel is saved with this variant.
-   *
-   * @param file the file to write containing the screenshot
-   * @param width the width of the current drawable
-   * @param height the height of the current drawable
-   *
-   * @throws GLException if an OpenGL context was not current or
-   *   another OpenGL-related error occurred
-   *
-   * @throws IOException if an I/O error occurred or if the file could
-   *   not be written to disk due to the requested file format being
-   *   unsupported by ImageIO
-   */
-  public static void writeToFile(File file,
-                                 int width,
-                                 int height) throws IOException, GLException {
-    writeToFile(file, width, height, false);
-  }
-
-  /**
-   * Takes a screenshot of the current OpenGL drawable to the
-   * specified file on disk using the ImageIO package. Requires the
-   * OpenGL context for the desired drawable to be current. Takes the
-   * screenshot from the last assigned read buffer, or the OpenGL
-   * default read buffer if none has been specified by the user
-   * (GL_FRONT for single-buffered configurations and GL_BACK for
-   * double-buffered configurations). This is not the fastest
-   * mechanism for taking a screenshot but may be more convenient than
-   * others for getting images for consumption by other packages. The
-   * file format is inferred from the suffix of the given file. <P>
-   *
-   * Note that some file formats, in particular JPEG, can not handle
-   * an alpha channel properly. If the "alpha" argument is specified
-   * as true for such a file format it will be silently ignored.
-   *
-   * @param file the file to write containing the screenshot
-   * @param width the width of the current drawable
-   * @param height the height of the current drawable
-   * @param alpha whether an alpha channel should be saved. If true,
-   *   requires GL_EXT_abgr extension to be present.
-   *
-   * @throws GLException if an OpenGL context was not current or
-   *   another OpenGL-related error occurred
-   *
-   * @throws IOException if an I/O error occurred or if the file could
-   *   not be written to disk due to the requested file format being
-   *   unsupported by ImageIO
-   */
-  public static void writeToFile(File file,
-                                 int width,
-                                 int height,
-                                 boolean alpha) throws IOException, GLException {
-    writeToFile(file, 0, 0, width, height, alpha);
-  }
-
-  /**
-   * Takes a screenshot of the current OpenGL drawable to the
-   * specified file on disk using the ImageIO package. Requires the
-   * OpenGL context for the desired drawable to be current. Takes the
-   * screenshot from the last assigned read buffer, or the OpenGL
-   * default read buffer if none has been specified by the user
-   * (GL_FRONT for single-buffered configurations and GL_BACK for
-   * double-buffered configurations). This is not the fastest
-   * mechanism for taking a screenshot but may be more convenient than
-   * others for getting images for consumption by other packages. The
-   * file format is inferred from the suffix of the given file. <P>
-   *
-   * Note that some file formats, in particular JPEG, can not handle
-   * an alpha channel properly. If the "alpha" argument is specified
-   * as true for such a file format it will be silently ignored.
-   *
-   * @param file the file to write containing the screenshot
-   * @param x the starting x coordinate of the screenshot, measured from the lower-left
-   * @param y the starting y coordinate of the screenshot, measured from the lower-left
-   * @param width the width of the current drawable
-   * @param height the height of the current drawable
-   * @param alpha whether an alpha channel should be saved. If true,
-   *   requires GL_EXT_abgr extension to be present.
-   *
-   * @throws GLException if an OpenGL context was not current or
-   *   another OpenGL-related error occurred
-   *
-   * @throws IOException if an I/O error occurred or if the file could
-   *   not be written to disk due to the requested file format being
-   *   unsupported by ImageIO
-   */
-  public static void writeToFile(File file,
-                                 int x,
-                                 int y,
-                                 int width,
-                                 int height,
-                                 boolean alpha) throws IOException, GLException {
-    String fileSuffix = FileUtil.getFileSuffix(file);
-    if (alpha && (fileSuffix.equals("jpg") || fileSuffix.equals("jpeg"))) {
-      // JPEGs can't deal properly with alpha channels
-      alpha = false;
-    }
-
-    BufferedImage image = readToBufferedImage(x, y, width, height, alpha);
-    if (!ImageIO.write(image, fileSuffix, file)) {
-      throw new IOException("Unsupported file format " + fileSuffix);
-    }
-  }
-
-  private static int glGetInteger(GL2 gl, int pname, int[] tmp) {
-    gl.glGetIntegerv(pname, tmp, 0);
-    return tmp[0];
-  }
-
-  private static void checkExtABGR() {
-    GL2 gl = GLUgl2.getCurrentGL2();
-    if (!gl.isExtensionAvailable("GL_EXT_abgr")) {
-      throw new IllegalArgumentException("Saving alpha channel requires GL_EXT_abgr");
-    }
-  }
- 
-  static class PixelStorageModes {
-    int packAlignment;
-    int packRowLength;
-    int packSkipRows;
-    int packSkipPixels;
-    int packSwapBytes;
-    int[] tmp = new int[1];
-
-    void save(GL2 gl) {
-      packAlignment  = glGetInteger(gl, GL2.GL_PACK_ALIGNMENT, tmp);
-      packRowLength  = glGetInteger(gl, GL2.GL_PACK_ROW_LENGTH, tmp);
-      packSkipRows   = glGetInteger(gl, GL2.GL_PACK_SKIP_ROWS, tmp);
-      packSkipPixels = glGetInteger(gl, GL2.GL_PACK_SKIP_PIXELS, tmp);
-      packSwapBytes  = glGetInteger(gl, GL2.GL_PACK_SWAP_BYTES, tmp);
-
-      gl.glPixelStorei(GL2.GL_PACK_ALIGNMENT, 1);
-      gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, 0);
-      gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, 0);
-      gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, 0);
-      gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, 0);
-    }
-
-    void restore(GL2 gl) {
-      gl.glPixelStorei(GL2.GL_PACK_ALIGNMENT, packAlignment);
-      gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, packRowLength);
-      gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, packSkipRows);
-      gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, packSkipPixels);
-      gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, packSwapBytes);
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/awt/TextRenderer.java b/src/jogl/classes/com/sun/opengl/util/awt/TextRenderer.java
deleted file mode 100755
index 059ead63d..000000000
--- a/src/jogl/classes/com/sun/opengl/util/awt/TextRenderer.java
+++ /dev/null
@@ -1,1951 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- *
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- *
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-package com.sun.opengl.util.awt;
-
-import com.sun.opengl.impl.Debug;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.packrect.*;
-import com.sun.opengl.util.texture.*;
-import com.sun.opengl.util.texture.awt.*;
-
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Composite;
-
-// For debugging purposes
-import java.awt.EventQueue;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.RenderingHints;
-import java.awt.event.*;
-import java.awt.font.*;
-import java.awt.geom.*;
-
-import java.nio.*;
-
-import java.text.*;
-
-import java.util.*;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-import javax.media.opengl.glu.gl2.*;
-import javax.media.opengl.awt.*;
-
-
-/** Renders bitmapped Java 2D text into an OpenGL window with high
-    performance, full Unicode support, and a simple API. Performs
-    appropriate caching of text rendering results in an OpenGL texture
-    internally to avoid repeated font rasterization. The caching is
-    completely automatic, does not require any user intervention, and
-    has no visible controls in the public API. <P>
-
-    Using the {@link TextRenderer TextRenderer} is simple. Add a
-    "<code>TextRenderer renderer;</code>" field to your {@link
-    javax.media.opengl.GLEventListener GLEventListener}. In your {@link
-    javax.media.opengl.GLEventListener#init init} method, add:
-
-    <PRE>
-    renderer = new TextRenderer(new Font("SansSerif", Font.BOLD, 36));
-    </PRE>
-
-    <P> In the {@link javax.media.opengl.GLEventListener#display display} method of your
-    {@link javax.media.opengl.GLEventListener GLEventListener}, add:
-    <PRE>
-    renderer.beginRendering(drawable.getWidth(), drawable.getHeight());
-    // optionally set the color
-    renderer.setColor(1.0f, 0.2f, 0.2f, 0.8f);
-    renderer.draw("Text to draw", xPosition, yPosition);
-    // ... more draw commands, color changes, etc.
-    renderer.endRendering();
-    </PRE>
-
-    Unless you are sharing textures and display lists between OpenGL
-    contexts, you do not need to call the {@link #dispose dispose}
-    method of the TextRenderer; the OpenGL resources it uses
-    internally will be cleaned up automatically when the OpenGL
-    context is destroyed. <P>
-
-    <b>Note</b> that the TextRenderer may cause the vertex and texture
-    coordinate array buffer bindings to change, or to be unbound. This
-    is important to note if you are using Vertex Buffer Objects (VBOs)
-    in your application. <P>
-
-    Internally, the renderer uses a rectangle packing algorithm to
-    pack both glyphs and full Strings' rendering results (which are
-    variable size) onto a larger OpenGL texture. The internal backing
-    store is maintained using a {@link
-    com.sun.opengl.util.awt.TextureRenderer TextureRenderer}. A least
-    recently used (LRU) algorithm is used to discard previously
-    rendered strings; the specific algorithm is undefined, but is
-    currently implemented by flushing unused Strings' rendering
-    results every few hundred rendering cycles, where a rendering
-    cycle is defined as a pair of calls to {@link #beginRendering
-    beginRendering} / {@link #endRendering endRendering}.
-
-    @author John Burkey
-    @author Kenneth Russell
-*/
-public class TextRenderer {
-    private static final boolean DEBUG = Debug.debug("TextRenderer");
-
-    // These are occasionally useful for more in-depth debugging
-    private static final boolean DISABLE_GLYPH_CACHE = false;
-    private static final boolean DRAW_BBOXES = false;
-
-    static final int kSize = 256;
-
-    // Every certain number of render cycles, flush the strings which
-    // haven't been used recently
-    private static final int CYCLES_PER_FLUSH = 100;
-
-    // The amount of vertical dead space on the backing store before we
-    // force a compaction
-    private static final float MAX_VERTICAL_FRAGMENTATION = 0.7f;
-    static final int kQuadsPerBuffer = 100;
-    static final int kCoordsPerVertVerts = 3;
-    static final int kCoordsPerVertTex = 2;
-    static final int kVertsPerQuad = 4;
-    static final int kTotalBufferSizeVerts = kQuadsPerBuffer * kVertsPerQuad;
-    static final int kTotalBufferSizeCoordsVerts = kQuadsPerBuffer * kVertsPerQuad * kCoordsPerVertVerts;
-    static final int kTotalBufferSizeCoordsTex = kQuadsPerBuffer * kVertsPerQuad * kCoordsPerVertTex;
-    static final int kTotalBufferSizeBytesVerts = kTotalBufferSizeCoordsVerts * 4;
-    static final int kTotalBufferSizeBytesTex = kTotalBufferSizeCoordsTex * 4;
-    static final int kSizeInBytes_OneVertices_VertexData = kCoordsPerVertVerts * 4;
-    static final int kSizeInBytes_OneVertices_TexData = kCoordsPerVertTex * 4;
-    private Font font;
-    private boolean antialiased;
-    private boolean useFractionalMetrics;
-
-    // Whether we're attempting to use automatic mipmap generation support
-    private boolean mipmap;
-    private RectanglePacker packer;
-    private boolean haveMaxSize;
-    private RenderDelegate renderDelegate;
-    private TextureRenderer cachedBackingStore;
-    private Graphics2D cachedGraphics;
-    private FontRenderContext cachedFontRenderContext;
-    private Map /*<String,Rect>*/ stringLocations = new HashMap /*<String,Rect>*/();
-    private GlyphProducer mGlyphProducer;
-
-    private int numRenderCycles;
-
-    // Need to keep track of whether we're in a beginRendering() /
-    // endRendering() cycle so we can re-enter the exact same state if
-    // we have to reallocate the backing store
-    private boolean inBeginEndPair;
-    private boolean isOrthoMode;
-    private int beginRenderingWidth;
-    private int beginRenderingHeight;
-    private boolean beginRenderingDepthTestDisabled;
-
-    // For resetting the color after disposal of the old backing store
-    private boolean haveCachedColor;
-    private float cachedR;
-    private float cachedG;
-    private float cachedB;
-    private float cachedA;
-    private Color cachedColor;
-    private boolean needToResetColor;
-
-    // For debugging only
-    private Frame dbgFrame;
-
-    // Debugging purposes only
-    private boolean debugged;
-    Pipelined_QuadRenderer mPipelinedQuadRenderer;
-    
-    //emzic: added boolean flag
-    private boolean useVertexArrays = true;
-    
-    //emzic: added boolean flag
-    private boolean isExtensionAvailable_GL_VERSION_1_5;
-    private boolean checkFor_isExtensionAvailable_GL_VERSION_1_5;
-
-    // Whether GL_LINEAR filtering is enabled for the backing store
-    private boolean smoothing = true;
-
-    /** Creates a new TextRenderer with the given font, using no
-        antialiasing or fractional metrics, and the default
-        RenderDelegate. Equivalent to <code>TextRenderer(font, false,
-        false)</code>.
-
-        @param font the font to render with
-    */
-    public TextRenderer(Font font) {
-        this(font, false, false, null, false);
-    }
-
-    /** Creates a new TextRenderer with the given font, using no
-        antialiasing or fractional metrics, and the default
-        RenderDelegate. If <CODE>mipmap</CODE> is true, attempts to use
-        OpenGL's automatic mipmap generation for better smoothing when
-        rendering the TextureRenderer's contents at a distance.
-        Equivalent to <code>TextRenderer(font, false, false)</code>.
-
-        @param font the font to render with
-        @param mipmap whether to attempt use of automatic mipmap generation
-    */
-    public TextRenderer(Font font, boolean mipmap) {
-        this(font, false, false, null, mipmap);
-    }
-
-    /** Creates a new TextRenderer with the given Font, specified font
-        properties, and default RenderDelegate. The
-        <code>antialiased</code> and <code>useFractionalMetrics</code>
-        flags provide control over the same properties at the Java 2D
-        level. No mipmap support is requested. Equivalent to
-        <code>TextRenderer(font, antialiased, useFractionalMetrics,
-        null)</code>.
-
-        @param font the font to render with
-        @param antialiased whether to use antialiased fonts
-        @param useFractionalMetrics whether to use fractional font
-        metrics at the Java 2D level
-    */
-    public TextRenderer(Font font, boolean antialiased,
-                        boolean useFractionalMetrics) {
-        this(font, antialiased, useFractionalMetrics, null, false);
-    }
-
-    /** Creates a new TextRenderer with the given Font, specified font
-        properties, and given RenderDelegate. The
-        <code>antialiased</code> and <code>useFractionalMetrics</code>
-        flags provide control over the same properties at the Java 2D
-        level. The <code>renderDelegate</code> provides more control
-        over the text rendered. No mipmap support is requested.
-
-        @param font the font to render with
-        @param antialiased whether to use antialiased fonts
-        @param useFractionalMetrics whether to use fractional font
-        metrics at the Java 2D level
-        @param renderDelegate the render delegate to use to draw the
-        text's bitmap, or null to use the default one
-    */
-    public TextRenderer(Font font, boolean antialiased,
-                        boolean useFractionalMetrics, RenderDelegate renderDelegate) {
-        this(font, antialiased, useFractionalMetrics, renderDelegate, false);
-    }
-
-    /** Creates a new TextRenderer with the given Font, specified font
-        properties, and given RenderDelegate. The
-        <code>antialiased</code> and <code>useFractionalMetrics</code>
-        flags provide control over the same properties at the Java 2D
-        level. The <code>renderDelegate</code> provides more control
-        over the text rendered. If <CODE>mipmap</CODE> is true, attempts
-        to use OpenGL's automatic mipmap generation for better smoothing
-        when rendering the TextureRenderer's contents at a distance.
-
-        @param font the font to render with
-        @param antialiased whether to use antialiased fonts
-        @param useFractionalMetrics whether to use fractional font
-        metrics at the Java 2D level
-        @param renderDelegate the render delegate to use to draw the
-        text's bitmap, or null to use the default one
-        @param mipmap whether to attempt use of automatic mipmap generation
-    */
-    public TextRenderer(Font font, boolean antialiased,
-                        boolean useFractionalMetrics, RenderDelegate renderDelegate,
-                        boolean mipmap) {
-        this.font = font;
-        this.antialiased = antialiased;
-        this.useFractionalMetrics = useFractionalMetrics;
-        this.mipmap = mipmap;
-
-        // FIXME: consider adjusting the size based on font size
-        // (it will already automatically resize if necessary)
-        packer = new RectanglePacker(new Manager(), kSize, kSize);
-
-        if (renderDelegate == null) {
-            renderDelegate = new DefaultRenderDelegate();
-        }
-
-        this.renderDelegate = renderDelegate;
-
-        mGlyphProducer = new GlyphProducer(font.getNumGlyphs());
-    }
-
-    /** Returns the bounding rectangle of the given String, assuming it
-        was rendered at the origin. See {@link #getBounds(CharSequence)
-        getBounds(CharSequence)}. */
-    public Rectangle2D getBounds(String str) {
-        return getBounds((CharSequence) str);
-    }
-
-    /** Returns the bounding rectangle of the given CharSequence,
-        assuming it was rendered at the origin. The coordinate system of
-        the returned rectangle is Java 2D's, with increasing Y
-        coordinates in the downward direction. The relative coordinate
-        (0, 0) in the returned rectangle corresponds to the baseline of
-        the leftmost character of the rendered string, in similar
-        fashion to the results returned by, for example, {@link
-        java.awt.font.GlyphVector#getVisualBounds}. Most applications
-        will use only the width and height of the returned Rectangle for
-        the purposes of centering or justifying the String. It is not
-        specified which Java 2D bounds ({@link
-        java.awt.font.GlyphVector#getVisualBounds getVisualBounds},
-        {@link java.awt.font.GlyphVector#getPixelBounds getPixelBounds},
-        etc.) the returned bounds correspond to, although every effort
-        is made to ensure an accurate bound. */
-    public Rectangle2D getBounds(CharSequence str) {
-        // FIXME: this should be more optimized and use the glyph cache
-        Rect r = null;
-
-        if ((r = (Rect) stringLocations.get(str)) != null) {
-            TextData data = (TextData) r.getUserData();
-
-            // Reconstitute the Java 2D results based on the cached values
-            return new Rectangle2D.Double(-data.origin().x, -data.origin().y,
-                                          r.w(), r.h());
-        }
-
-        // Must return a Rectangle compatible with the layout algorithm --
-        // must be idempotent
-        return normalize(renderDelegate.getBounds(str, font,
-                                                  getFontRenderContext()));
-    }
-
-    /** Returns the Font this renderer is using. */
-    public Font getFont() {
-        return font;
-    }
-
-    /** Returns a FontRenderContext which can be used for external
-        text-related size computations. This object should be considered
-        transient and may become invalidated between {@link
-        #beginRendering beginRendering} / {@link #endRendering
-        endRendering} pairs. */
-    public FontRenderContext getFontRenderContext() {
-        if (cachedFontRenderContext == null) {
-            cachedFontRenderContext = getGraphics2D().getFontRenderContext();
-        }
-
-        return cachedFontRenderContext;
-    }
-
-    /** Begins rendering with this {@link TextRenderer TextRenderer}
-        into the current OpenGL drawable, pushing the projection and
-        modelview matrices and some state bits and setting up a
-        two-dimensional orthographic projection with (0, 0) as the
-        lower-left coordinate and (width, height) as the upper-right
-        coordinate. Binds and enables the internal OpenGL texture
-        object, sets the texture environment mode to GL_MODULATE, and
-        changes the current color to the last color set with this
-        TextRenderer via {@link #setColor setColor}. This method
-        disables the depth test and is equivalent to
-        beginRendering(width, height, true).
-
-        @param width the width of the current on-screen OpenGL drawable
-        @param height the height of the current on-screen OpenGL drawable
-        @throws javax.media.opengl.GLException If an OpenGL context is not current when this method is called
-    */
-    public void beginRendering(int width, int height) throws GLException {
-        beginRendering(width, height, true);
-    }
-
-    /** Begins rendering with this {@link TextRenderer TextRenderer}
-        into the current OpenGL drawable, pushing the projection and
-        modelview matrices and some state bits and setting up a
-        two-dimensional orthographic projection with (0, 0) as the
-        lower-left coordinate and (width, height) as the upper-right
-        coordinate. Binds and enables the internal OpenGL texture
-        object, sets the texture environment mode to GL_MODULATE, and
-        changes the current color to the last color set with this
-        TextRenderer via {@link #setColor setColor}. Disables the depth
-        test if the disableDepthTest argument is true.
-
-        @param width the width of the current on-screen OpenGL drawable
-        @param height the height of the current on-screen OpenGL drawable
-        @param disableDepthTest whether to disable the depth test
-        @throws GLException If an OpenGL context is not current when this method is called
-    */
-    public void beginRendering(int width, int height, boolean disableDepthTest)
-        throws GLException {
-        beginRendering(true, width, height, disableDepthTest);
-    }
-
-    /** Begins rendering of 2D text in 3D with this {@link TextRenderer
-        TextRenderer} into the current OpenGL drawable. Assumes the end
-        user is responsible for setting up the modelview and projection
-        matrices, and will render text using the {@link #draw3D draw3D}
-        method. This method pushes some OpenGL state bits, binds and
-        enables the internal OpenGL texture object, sets the texture
-        environment mode to GL_MODULATE, and changes the current color
-        to the last color set with this TextRenderer via {@link
-        #setColor setColor}.
-
-        @throws GLException If an OpenGL context is not current when this method is called
-    */
-    public void begin3DRendering() throws GLException {
-        beginRendering(false, 0, 0, false);
-    }
-
-    /** Changes the current color of this TextRenderer to the supplied
-        one. The default color is opaque white.
-
-        @param color the new color to use for rendering text
-        @throws GLException If an OpenGL context is not current when this method is called
-    */
-    public void setColor(Color color) throws GLException {
-        boolean noNeedForFlush = (haveCachedColor && (cachedColor != null) &&
-                                  color.equals(cachedColor));
-
-        if (!noNeedForFlush) {
-            flushGlyphPipeline();
-        }
-
-        getBackingStore().setColor(color);
-        haveCachedColor = true;
-        cachedColor = color;
-    }
-
-    /** Changes the current color of this TextRenderer to the supplied
-        one, where each component ranges from 0.0f - 1.0f. The alpha
-        component, if used, does not need to be premultiplied into the
-        color channels as described in the documentation for {@link
-        com.sun.opengl.util.texture.Texture Texture}, although
-        premultiplied colors are used internally. The default color is
-        opaque white.
-
-        @param r the red component of the new color
-        @param g the green component of the new color
-        @param b the blue component of the new color
-        @param a the alpha component of the new color, 0.0f = completely
-        transparent, 1.0f = completely opaque
-        @throws GLException If an OpenGL context is not current when this method is called
-    */
-    public void setColor(float r, float g, float b, float a)
-        throws GLException {
-        boolean noNeedForFlush = (haveCachedColor && (cachedColor == null) &&
-                                  (r == cachedR) && (g == cachedG) && (b == cachedB) &&
-                                  (a == cachedA));
-
-        if (!noNeedForFlush) {
-            flushGlyphPipeline();
-        }
-
-        getBackingStore().setColor(r, g, b, a);
-        haveCachedColor = true;
-        cachedR = r;
-        cachedG = g;
-        cachedB = b;
-        cachedA = a;
-        cachedColor = null;
-    }
-
-    /** Draws the supplied CharSequence at the desired location using
-        the renderer's current color. The baseline of the leftmost
-        character is at position (x, y) specified in OpenGL coordinates,
-        where the origin is at the lower-left of the drawable and the Y
-        coordinate increases in the upward direction.
-
-        @param str the string to draw
-        @param x the x coordinate at which to draw
-        @param y the y coordinate at which to draw
-        @throws GLException If an OpenGL context is not current when this method is called
-    */
-    public void draw(CharSequence str, int x, int y) throws GLException {
-        draw3D(str, x, y, 0, 1);
-    }
-
-    /** Draws the supplied String at the desired location using the
-        renderer's current color. See {@link #draw(CharSequence, int,
-        int) draw(CharSequence, int, int)}. */
-    public void draw(String str, int x, int y) throws GLException {
-        draw3D(str, x, y, 0, 1);
-    }
-
-    /** Draws the supplied CharSequence at the desired 3D location using
-        the renderer's current color. The baseline of the leftmost
-        character is placed at position (x, y, z) in the current
-        coordinate system.
-
-        @param str the string to draw
-        @param x the x coordinate at which to draw
-        @param y the y coordinate at which to draw
-        @param z the z coordinate at which to draw
-        @param scaleFactor a uniform scale factor applied to the width and height of the drawn rectangle
-        @throws GLException If an OpenGL context is not current when this method is called
-    */
-    public void draw3D(CharSequence str, float x, float y, float z,
-                       float scaleFactor) {
-        internal_draw3D(str, x, y, z, scaleFactor);
-    }
-
-    /** Draws the supplied String at the desired 3D location using the
-        renderer's current color. See {@link #draw3D(CharSequence,
-        float, float, float, float) draw3D(CharSequence, float, float,
-        float, float)}. */
-    public void draw3D(String str, float x, float y, float z, float scaleFactor) {
-        internal_draw3D(str, x, y, z, scaleFactor);
-    }
-
-    /** Returns the pixel width of the given character. */
-    public float getCharWidth(char inChar) {
-        return mGlyphProducer.getGlyphPixelWidth(inChar);
-    }
-
-    /** Causes the TextRenderer to flush any internal caches it may be
-        maintaining and draw its rendering results to the screen. This
-        should be called after each call to draw() if you are setting
-        OpenGL state such as the modelview matrix between calls to
-        draw(). */
-    public void flush() {
-        flushGlyphPipeline();
-    }
-
-    /** Ends a render cycle with this {@link TextRenderer TextRenderer}.
-        Restores the projection and modelview matrices as well as
-        several OpenGL state bits. Should be paired with {@link
-        #beginRendering beginRendering}.
-
-        @throws GLException If an OpenGL context is not current when this method is called
-    */
-    public void endRendering() throws GLException {
-        endRendering(true);
-    }
-
-    /** Ends a 3D render cycle with this {@link TextRenderer TextRenderer}.
-        Restores several OpenGL state bits. Should be paired with {@link
-        #begin3DRendering begin3DRendering}.
-
-        @throws GLException If an OpenGL context is not current when this method is called
-    */
-    public void end3DRendering() throws GLException {
-        endRendering(false);
-    }
-
-    /** Disposes of all resources this TextRenderer is using. It is not
-        valid to use the TextRenderer after this method is called.
-
-        @throws GLException If an OpenGL context is not current when this method is called
-    */
-    public void dispose() throws GLException {
-        packer.dispose();
-        packer = null;
-        cachedBackingStore = null;
-        cachedGraphics = null;
-        cachedFontRenderContext = null;
-
-        if (dbgFrame != null) {
-            dbgFrame.dispose();
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    private static Rectangle2D preNormalize(Rectangle2D src) {
-        // Need to round to integer coordinates
-        // Also give ourselves a little slop around the reported
-        // bounds of glyphs because it looks like neither the visual
-        // nor the pixel bounds works perfectly well
-        int minX = (int) Math.floor(src.getMinX()) - 1;
-        int minY = (int) Math.floor(src.getMinY()) - 1;
-        int maxX = (int) Math.ceil(src.getMaxX()) + 1;
-        int maxY = (int) Math.ceil(src.getMaxY()) + 1;
-        return new Rectangle2D.Double(minX, minY, maxX - minX, maxY - minY);
-    }
-
-
-    private Rectangle2D normalize(Rectangle2D src) {
-        // Give ourselves a boundary around each entity on the backing
-        // store in order to prevent bleeding of nearby Strings due to
-        // the fact that we use linear filtering
-
-        // NOTE that this boundary is quite heuristic and is related
-        // to how far away in 3D we may view the text --
-        // heuristically, 1.5% of the font's height
-        int boundary = (int) Math.max(1, 0.015 * font.getSize());
-
-        return new Rectangle2D.Double((int) Math.floor(src.getMinX() - boundary),
-                                      (int) Math.floor(src.getMinY() - boundary),
-                                      (int) Math.ceil(src.getWidth() + 2 * boundary),
-                                      (int) Math.ceil(src.getHeight()) + 2 * boundary);
-    }
-
-    private TextureRenderer getBackingStore() {
-        TextureRenderer renderer = (TextureRenderer) packer.getBackingStore();
-
-        if (renderer != cachedBackingStore) {
-            // Backing store changed since last time; discard any cached Graphics2D
-            if (cachedGraphics != null) {
-                cachedGraphics.dispose();
-                cachedGraphics = null;
-                cachedFontRenderContext = null;
-            }
-
-            cachedBackingStore = renderer;
-        }
-
-        return cachedBackingStore;
-    }
-
-    private Graphics2D getGraphics2D() {
-        TextureRenderer renderer = getBackingStore();
-
-        if (cachedGraphics == null) {
-            cachedGraphics = renderer.createGraphics();
-
-            // Set up composite, font and rendering hints
-            cachedGraphics.setComposite(AlphaComposite.Src);
-            cachedGraphics.setColor(Color.WHITE);
-            cachedGraphics.setFont(font);
-            cachedGraphics.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
-                                            (antialiased ? RenderingHints.VALUE_TEXT_ANTIALIAS_ON
-                                             : RenderingHints.VALUE_TEXT_ANTIALIAS_OFF));
-            cachedGraphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
-                                            (useFractionalMetrics
-                                             ? RenderingHints.VALUE_FRACTIONALMETRICS_ON
-                                             : RenderingHints.VALUE_FRACTIONALMETRICS_OFF));
-        }
-
-        return cachedGraphics;
-    }
-
-    private void beginRendering(boolean ortho, int width, int height,
-                                boolean disableDepthTestForOrtho) {
-        GL2 gl = GLContext.getCurrentGL().getGL2();
-
-        if (DEBUG && !debugged) {
-            debug(gl);
-        }
-
-        inBeginEndPair = true;
-        isOrthoMode = ortho;
-        beginRenderingWidth = width;
-        beginRenderingHeight = height;
-        beginRenderingDepthTestDisabled = disableDepthTestForOrtho;
-
-        if (ortho) {
-            getBackingStore().beginOrthoRendering(width, height,
-                                                  disableDepthTestForOrtho);
-        } else {
-            getBackingStore().begin3DRendering();
-        }
-
-        // Push client attrib bits used by the pipelined quad renderer
-        gl.glPushClientAttrib((int) GL2.GL_ALL_CLIENT_ATTRIB_BITS);
-
-        if (!haveMaxSize) {
-            // Query OpenGL for the maximum texture size and set it in the
-            // RectanglePacker to keep it from expanding too large
-            int[] sz = new int[1];
-            gl.glGetIntegerv(GL2.GL_MAX_TEXTURE_SIZE, sz, 0);
-            packer.setMaxSize(sz[0], sz[0]);
-            haveMaxSize = true;
-        }
-
-        if (needToResetColor && haveCachedColor) {
-            if (cachedColor == null) {
-                getBackingStore().setColor(cachedR, cachedG, cachedB, cachedA);
-            } else {
-                getBackingStore().setColor(cachedColor);
-            }
-
-            needToResetColor = false;
-        }
-
-        // Disable future attempts to use mipmapping if TextureRenderer
-        // doesn't support it
-        if (mipmap && !getBackingStore().isUsingAutoMipmapGeneration()) {
-            if (DEBUG) {
-                System.err.println("Disabled mipmapping in TextRenderer");
-            }
-
-            mipmap = false;
-        }
-    }
-
-    /**
-     * emzic: here the call to glBindBuffer crashes on certain graphicscard/driver combinations
-     * this is why the ugly try-catch block has been added, which falls back to the old textrenderer
-     * 
-     * @param ortho
-     * @throws GLException
-     */
-    private void endRendering(boolean ortho) throws GLException {
-        flushGlyphPipeline();
-
-        inBeginEndPair = false;
-
-        GL2 gl = GLContext.getCurrentGL().getGL2();
-
-        // Pop client attrib bits used by the pipelined quad renderer
-        gl.glPopClientAttrib();
-
-        // The OpenGL spec is unclear about whether this changes the
-        // buffer bindings, so preemptively zero out the GL_ARRAY_BUFFER
-        // binding
-        if (is15Available(gl)) {
-            try {
-                gl.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0);
-            } catch (Exception e) {
-                isExtensionAvailable_GL_VERSION_1_5 = false;
-            }
-        }
-
-        if (ortho) {
-            getBackingStore().endOrthoRendering();
-        } else {
-            getBackingStore().end3DRendering();
-        }
-
-        if (++numRenderCycles >= CYCLES_PER_FLUSH) {
-            numRenderCycles = 0;
-
-            if (DEBUG) {
-                System.err.println("Clearing unused entries in endRendering()");
-            }
-
-            clearUnusedEntries();
-        }
-    }
-
-    private void clearUnusedEntries() {
-        final java.util.List deadRects = new ArrayList /*<Rect>*/();
-
-        // Iterate through the contents of the backing store, removing
-        // text strings that haven't been used recently
-        packer.visit(new RectVisitor() {
-                public void visit(Rect rect) {
-                    TextData data = (TextData) rect.getUserData();
-
-                    if (data.used()) {
-                        data.clearUsed();
-                    } else {
-                        deadRects.add(rect);
-                    }
-                }
-            });
-
-        for (Iterator iter = deadRects.iterator(); iter.hasNext();) {
-            Rect r = (Rect) iter.next();
-            packer.remove(r);
-            stringLocations.remove(((TextData) r.getUserData()).string());
-
-            int unicodeToClearFromCache = ((TextData) r.getUserData()).unicodeID;
-
-            if (unicodeToClearFromCache > 0) {
-                mGlyphProducer.clearCacheEntry(unicodeToClearFromCache);
-            }
-
-            //      if (DEBUG) {
-            //        Graphics2D g = getGraphics2D();
-            //        g.setComposite(AlphaComposite.Clear);
-            //        g.fillRect(r.x(), r.y(), r.w(), r.h());
-            //        g.setComposite(AlphaComposite.Src);
-            //      }
-        }
-
-        // If we removed dead rectangles this cycle, try to do a compaction
-        float frag = packer.verticalFragmentationRatio();
-
-        if (!deadRects.isEmpty() && (frag > MAX_VERTICAL_FRAGMENTATION)) {
-            if (DEBUG) {
-                System.err.println(
-                                   "Compacting TextRenderer backing store due to vertical fragmentation " +
-                                   frag);
-            }
-
-            packer.compact();
-        }
-
-        if (DEBUG) {
-            getBackingStore().markDirty(0, 0, getBackingStore().getWidth(),
-                                        getBackingStore().getHeight());
-        }
-    }
-
-    private void internal_draw3D(CharSequence str, float x, float y, float z,
-                                 float scaleFactor) {
-        List/*<Glyph>*/ glyphs = mGlyphProducer.getGlyphs(str);
-        for (Iterator iter = glyphs.iterator(); iter.hasNext(); ) {
-            Glyph glyph = (Glyph) iter.next();
-            float advance = glyph.draw3D(x, y, z, scaleFactor);
-            x += advance * scaleFactor;
-        }
-    }
-
-    private void flushGlyphPipeline() {
-        if (mPipelinedQuadRenderer != null) {
-            mPipelinedQuadRenderer.draw();
-        }
-    }
-
-    private void draw3D_ROBUST(CharSequence str, float x, float y, float z,
-                               float scaleFactor) {
-        String curStr;
-        if (str instanceof String) {
-            curStr = (String) str;
-        } else {
-            curStr = str.toString();
-        }
-
-        // Look up the string on the backing store
-        Rect rect = (Rect) stringLocations.get(curStr);
-
-        if (rect == null) {
-            // Rasterize this string and place it on the backing store
-            Graphics2D g = getGraphics2D();
-            Rectangle2D origBBox = preNormalize(renderDelegate.getBounds(curStr, font, getFontRenderContext()));
-            Rectangle2D bbox = normalize(origBBox);
-            Point origin = new Point((int) -bbox.getMinX(),
-                                     (int) -bbox.getMinY());
-            rect = new Rect(0, 0, (int) bbox.getWidth(),
-                            (int) bbox.getHeight(),
-                            new TextData(curStr, origin, origBBox, -1));
-
-            packer.add(rect);
-            stringLocations.put(curStr, rect);
-
-            // Re-fetch the Graphics2D in case the addition of the rectangle
-            // caused the old backing store to be thrown away
-            g = getGraphics2D();
-
-            // OK, should now have an (x, y) for this rectangle; rasterize
-            // the String
-            int strx = rect.x() + origin.x;
-            int stry = rect.y() + origin.y;
-
-            // Clear out the area we're going to draw into
-            g.setComposite(AlphaComposite.Clear);
-            g.fillRect(rect.x(), rect.y(), rect.w(), rect.h());
-            g.setComposite(AlphaComposite.Src);
-
-            // Draw the string
-            renderDelegate.draw(g, curStr, strx, stry);
-
-            if (DRAW_BBOXES) {
-                TextData data = (TextData) rect.getUserData();
-                // Draw a bounding box on the backing store
-                g.drawRect(strx - data.origOriginX(),
-                           stry - data.origOriginY(),
-                           (int) data.origRect().getWidth(),
-                           (int) data.origRect().getHeight());
-                g.drawRect(strx - data.origin().x,
-                           stry - data.origin().y,
-                           rect.w(),
-                           rect.h());
-            }
-
-            // Mark this region of the TextureRenderer as dirty
-            getBackingStore().markDirty(rect.x(), rect.y(), rect.w(),
-                                        rect.h());
-        }
-
-        // OK, now draw the portion of the backing store to the screen
-        TextureRenderer renderer = getBackingStore();
-
-        // NOTE that the rectangles managed by the packer have their
-        // origin at the upper-left but the TextureRenderer's origin is
-        // at its lower left!!!
-        TextData data = (TextData) rect.getUserData();
-        data.markUsed();
-
-        Rectangle2D origRect = data.origRect();
-        
-        // Align the leftmost point of the baseline to the (x, y, z) coordinate requested
-        renderer.draw3DRect(x - (scaleFactor * data.origOriginX()),
-                            y - (scaleFactor * ((float) origRect.getHeight() - data.origOriginY())), z,
-                            rect.x() + (data.origin().x - data.origOriginX()),
-                            renderer.getHeight() - rect.y() - (int) origRect.getHeight() -
-                              (data.origin().y - data.origOriginY()),
-                            (int) origRect.getWidth(), (int) origRect.getHeight(), scaleFactor);
-    }
-
-    //----------------------------------------------------------------------
-    // Debugging functionality
-    //
-    private void debug(GL gl) {
-        dbgFrame = new Frame("TextRenderer Debug Output");
-
-        GLCanvas dbgCanvas = new GLCanvas(new GLCapabilities(gl.getGLProfile()), null,
-                                          GLContext.getCurrent(), null);
-        dbgCanvas.addGLEventListener(new DebugListener(gl, dbgFrame));
-        dbgFrame.add(dbgCanvas);
-
-        final FPSAnimator anim = new FPSAnimator(dbgCanvas, 10);
-        dbgFrame.addWindowListener(new WindowAdapter() {
-                public void windowClosing(WindowEvent e) {
-                    // Run this on another thread than the AWT event queue to
-                    // make sure the call to Animator.stop() completes before
-                    // exiting
-                    new Thread(new Runnable() {
-                            public void run() {
-                                anim.stop();
-                            }
-                        }).start();
-                }
-            });
-        dbgFrame.setSize(kSize, kSize);
-        dbgFrame.setVisible(true);
-        anim.start();
-        debugged = true;
-    }
-
-    /** Class supporting more full control over the process of rendering
-        the bitmapped text. Allows customization of whether the backing
-        store text bitmap is full-color or intensity only, the size of
-        each individual rendered text rectangle, and the contents of
-        each individual rendered text string. The default implementation
-        of this interface uses an intensity-only texture, a
-        closely-cropped rectangle around the text, and renders text
-        using the color white, which is modulated by the set color
-        during the rendering process. */
-    public static interface RenderDelegate {
-        /** Indicates whether the backing store of this TextRenderer
-            should be intensity-only (the default) or full-color. */
-        public boolean intensityOnly();
-
-        /** Computes the bounds of the given String relative to the
-            origin. */
-        public Rectangle2D getBounds(String str, Font font,
-                                     FontRenderContext frc);
-
-        /** Computes the bounds of the given character sequence relative
-            to the origin. */
-        public Rectangle2D getBounds(CharSequence str, Font font,
-                                     FontRenderContext frc);
-
-        /** Computes the bounds of the given GlyphVector, already
-            assumed to have been created for a particular Font,
-            relative to the origin. */
-        public Rectangle2D getBounds(GlyphVector gv, FontRenderContext frc);
-
-        /** Render the passed character sequence at the designated
-            location using the supplied Graphics2D instance. The
-            surrounding region will already have been cleared to the RGB
-            color (0, 0, 0) with zero alpha. The initial drawing context
-            of the passed Graphics2D will be set to use
-            AlphaComposite.Src, the color white, the Font specified in the
-            TextRenderer's constructor, and the rendering hints specified
-            in the TextRenderer constructor.  Changes made by the end user
-            may be visible in successive calls to this method, but are not
-            guaranteed to be preserved.  Implementors of this method
-            should reset the Graphics2D's state to that desired each time
-            this method is called, in particular those states which are
-            not the defaults. */
-        public void draw(Graphics2D graphics, String str, int x, int y);
-
-        /** Render the passed GlyphVector at the designated location using
-            the supplied Graphics2D instance. The surrounding region will
-            already have been cleared to the RGB color (0, 0, 0) with zero
-            alpha. The initial drawing context of the passed Graphics2D
-            will be set to use AlphaComposite.Src, the color white, the
-            Font specified in the TextRenderer's constructor, and the
-            rendering hints specified in the TextRenderer constructor.
-            Changes made by the end user may be visible in successive
-            calls to this method, but are not guaranteed to be preserved.
-            Implementors of this method should reset the Graphics2D's
-            state to that desired each time this method is called, in
-            particular those states which are not the defaults. */
-        public void drawGlyphVector(Graphics2D graphics, GlyphVector str,
-                                    int x, int y);
-    }
-
-    private static class CharSequenceIterator implements CharacterIterator {
-        CharSequence mSequence;
-        int mLength;
-        int mCurrentIndex;
-
-        CharSequenceIterator() {
-        }
-
-        CharSequenceIterator(CharSequence sequence) {
-            initFromCharSequence(sequence);
-        }
-
-        public void initFromCharSequence(CharSequence sequence) {
-            mSequence = sequence;
-            mLength = mSequence.length();
-            mCurrentIndex = 0;
-        }
-
-        public char last() {
-            mCurrentIndex = Math.max(0, mLength - 1);
-
-            return current();
-        }
-
-        public char current() {
-            if ((mLength == 0) || (mCurrentIndex >= mLength)) {
-                return CharacterIterator.DONE;
-            }
-
-            return mSequence.charAt(mCurrentIndex);
-        }
-
-        public char next() {
-            mCurrentIndex++;
-
-            return current();
-        }
-
-        public char previous() {
-            mCurrentIndex = Math.max(mCurrentIndex - 1, 0);
-
-            return current();
-        }
-
-        public char setIndex(int position) {
-            mCurrentIndex = position;
-
-            return current();
-        }
-
-        public int getBeginIndex() {
-            return 0;
-        }
-
-        public int getEndIndex() {
-            return mLength;
-        }
-
-        public int getIndex() {
-            return mCurrentIndex;
-        }
-
-        public Object clone() {
-            CharSequenceIterator iter = new CharSequenceIterator(mSequence);
-            iter.mCurrentIndex = mCurrentIndex;
-
-            return iter;
-        }
-
-        public char first() {
-            if (mLength == 0) {
-                return CharacterIterator.DONE;
-            }
-
-            mCurrentIndex = 0;
-
-            return current();
-        }
-    }
-
-    // Data associated with each rectangle of text
-    static class TextData {
-        // Back-pointer to String this TextData describes, if it
-        // represents a String rather than a single glyph
-        private String str;
-
-        // If this TextData represents a single glyph, this is its
-        // unicode ID
-        int unicodeID;
-
-        // The following must be defined and used VERY precisely. This is
-        // the offset from the upper-left corner of this rectangle (Java
-        // 2D coordinate system) at which the string must be rasterized in
-        // order to fit within the rectangle -- the leftmost point of the
-        // baseline.
-        private Point origin;
-
-        // This represents the pre-normalized rectangle, which fits
-        // within the rectangle on the backing store. We keep a
-        // one-pixel border around entries on the backing store to
-        // prevent bleeding of adjacent letters when using GL_LINEAR
-        // filtering for rendering. The origin of this rectangle is
-        // equivalent to the origin above.
-        private Rectangle2D origRect;
-
-        private boolean used; // Whether this text was used recently
-
-        TextData(String str, Point origin, Rectangle2D origRect, int unicodeID) {
-            this.str = str;
-            this.origin = origin;
-            this.origRect = origRect;
-            this.unicodeID = unicodeID;
-        }
-
-        String string() {
-            return str;
-        }
-
-        Point origin() {
-            return origin;
-        }
-
-        // The following three methods are used to locate the glyph
-        // within the expanded rectangle coming from normalize()
-        int origOriginX() {
-            return (int) -origRect.getMinX();
-        }
-
-        int origOriginY() {
-            return (int) -origRect.getMinY();
-        }
-
-        Rectangle2D origRect() {
-            return origRect;
-        }
-
-        boolean used() {
-            return used;
-        }
-
-        void markUsed() {
-            used = true;
-        }
-
-        void clearUsed() {
-            used = false;
-        }
-    }
-
-    class Manager implements BackingStoreManager {
-        private Graphics2D g;
-
-        public Object allocateBackingStore(int w, int h) {
-            // FIXME: should consider checking Font's attributes to see
-            // whether we're likely to need to support a full RGBA backing
-            // store (i.e., non-default Paint, foreground color, etc.), but
-            // for now, let's just be more efficient
-            TextureRenderer renderer;
-
-            if (renderDelegate.intensityOnly()) {
-                renderer = TextureRenderer.createAlphaOnlyRenderer(w, h, mipmap);
-            } else {
-                renderer = new TextureRenderer(w, h, true, mipmap);
-            }
-            renderer.setSmoothing(smoothing);
-
-            if (DEBUG) {
-                System.err.println(" TextRenderer allocating backing store " +
-                                   w + " x " + h);
-            }
-
-            return renderer;
-        }
-
-        public void deleteBackingStore(Object backingStore) {
-            ((TextureRenderer) backingStore).dispose();
-        }
-
-        public boolean preExpand(Rect cause, int attemptNumber) {
-            // Only try this one time; clear out potentially obsolete entries
-            // NOTE: this heuristic and the fact that it clears the used bit
-            // of all entries seems to cause cycling of entries in some
-            // situations, where the backing store becomes small compared to
-            // the amount of text on the screen (see the TextFlow demo) and
-            // the entries continually cycle in and out of the backing
-            // store, decreasing performance. If we added a little age
-            // information to the entries, and only cleared out entries
-            // above a certain age, this behavior would be eliminated.
-            // However, it seems the system usually stabilizes itself, so
-            // for now we'll just keep things simple. Note that if we don't
-            // clear the used bit here, the backing store tends to increase
-            // very quickly to its maximum size, at least with the TextFlow
-            // demo when the text is being continually re-laid out.
-            if (attemptNumber == 0) {
-                if (DEBUG) {
-                    System.err.println(
-                        "Clearing unused entries in preExpand(): attempt number " +
-                        attemptNumber);
-                }
-
-                if (inBeginEndPair) {
-                    // Draw any outstanding glyphs
-                    flush();
-                }
-
-                clearUnusedEntries();
-
-                return true;
-            }
-
-            return false;
-        }
-
-        public boolean additionFailed(Rect cause, int attemptNumber) {
-            // Heavy hammer -- might consider doing something different
-            packer.clear();
-            stringLocations.clear();
-            mGlyphProducer.clearAllCacheEntries();
-
-            if (DEBUG) {
-                System.err.println(
-                                   " *** Cleared all text because addition failed ***");
-            }
-
-            if (attemptNumber == 0) {
-                return true;
-            }
-
-            return false;
-        }
-
-        public boolean canCompact() {
-            return true;
-        }
-
-        public void beginMovement(Object oldBackingStore, Object newBackingStore) {
-            // Exit the begin / end pair if necessary
-            if (inBeginEndPair) {
-                // Draw any outstanding glyphs
-                flush();
-
-                GL2 gl = GLContext.getCurrentGL().getGL2();
-
-                // Pop client attrib bits used by the pipelined quad renderer
-                gl.glPopClientAttrib();
-
-                // The OpenGL spec is unclear about whether this changes the
-                // buffer bindings, so preemptively zero out the GL_ARRAY_BUFFER
-                // binding
-                if (is15Available(gl)) {
-                    try {
-                        gl.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0);
-                    } catch (Exception e) {
-                        isExtensionAvailable_GL_VERSION_1_5 = false;
-                    }
-                }
-
-                if (isOrthoMode) {
-                    ((TextureRenderer) oldBackingStore).endOrthoRendering();
-                } else {
-                    ((TextureRenderer) oldBackingStore).end3DRendering();
-                }
-            }
-
-            TextureRenderer newRenderer = (TextureRenderer) newBackingStore;
-            g = newRenderer.createGraphics();
-        }
-
-        public void move(Object oldBackingStore, Rect oldLocation,
-                         Object newBackingStore, Rect newLocation) {
-            TextureRenderer oldRenderer = (TextureRenderer) oldBackingStore;
-            TextureRenderer newRenderer = (TextureRenderer) newBackingStore;
-
-            if (oldRenderer == newRenderer) {
-                // Movement on the same backing store -- easy case
-                g.copyArea(oldLocation.x(), oldLocation.y(), oldLocation.w(),
-                           oldLocation.h(), newLocation.x() - oldLocation.x(),
-                           newLocation.y() - oldLocation.y());
-            } else {
-                // Need to draw from the old renderer's image into the new one
-                Image img = oldRenderer.getImage();
-                g.drawImage(img, newLocation.x(), newLocation.y(),
-                            newLocation.x() + newLocation.w(),
-                            newLocation.y() + newLocation.h(), oldLocation.x(),
-                            oldLocation.y(), oldLocation.x() + oldLocation.w(),
-                            oldLocation.y() + oldLocation.h(), null);
-            }
-        }
-
-        public void endMovement(Object oldBackingStore, Object newBackingStore) {
-            g.dispose();
-
-            // Sync the whole surface
-            TextureRenderer newRenderer = (TextureRenderer) newBackingStore;
-            newRenderer.markDirty(0, 0, newRenderer.getWidth(),
-                                  newRenderer.getHeight());
-
-            // Re-enter the begin / end pair if necessary
-            if (inBeginEndPair) {
-                if (isOrthoMode) {
-                    ((TextureRenderer) newBackingStore).beginOrthoRendering(beginRenderingWidth,
-                                                                            beginRenderingHeight, beginRenderingDepthTestDisabled);
-                } else {
-                    ((TextureRenderer) newBackingStore).begin3DRendering();
-                }
-
-                // Push client attrib bits used by the pipelined quad renderer
-                GL2 gl = GLContext.getCurrentGL().getGL2();
-                gl.glPushClientAttrib((int) GL2.GL_ALL_CLIENT_ATTRIB_BITS);
-
-                if (haveCachedColor) {
-                    if (cachedColor == null) {
-                        ((TextureRenderer) newBackingStore).setColor(cachedR,
-                                                                     cachedG, cachedB, cachedA);
-                    } else {
-                        ((TextureRenderer) newBackingStore).setColor(cachedColor);
-                    }
-                }
-            } else {
-                needToResetColor = true;
-            }
-        }
-    }
-
-    public static class DefaultRenderDelegate implements RenderDelegate {
-        public boolean intensityOnly() {
-            return true;
-        }
-
-        public Rectangle2D getBounds(CharSequence str, Font font,
-                                     FontRenderContext frc) {
-            return getBounds(font.createGlyphVector(frc,
-                                                    new CharSequenceIterator(str)),
-                             frc);
-        }
-
-        public Rectangle2D getBounds(String str, Font font,
-                                     FontRenderContext frc) {
-            return getBounds(font.createGlyphVector(frc, str), frc);
-        }
-
-        public Rectangle2D getBounds(GlyphVector gv, FontRenderContext frc) {
-            return gv.getVisualBounds();
-        }
-
-        public void drawGlyphVector(Graphics2D graphics, GlyphVector str,
-                                    int x, int y) {
-            graphics.drawGlyphVector(str, x, y);
-        }
-
-        public void draw(Graphics2D graphics, String str, int x, int y) {
-            graphics.drawString(str, x, y);
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // Glyph-by-glyph rendering support
-    //
-
-    // A temporary to prevent excessive garbage creation
-    private char[] singleUnicode = new char[1];
-
-    /** A Glyph represents either a single unicode glyph or a
-        substring of characters to be drawn. The reason for the dual
-        behavior is so that we can take in a sequence of unicode
-        characters and partition them into runs of individual glyphs,
-        but if we encounter complex text and/or unicode sequences we
-        don't understand, we can render them using the
-        string-by-string method. <P>
-
-        Glyphs need to be able to re-upload themselves to the backing
-        store on demand as we go along in the render sequence.
-    */
-
-    class Glyph {
-        // If this Glyph represents an individual unicode glyph, this
-        // is its unicode ID. If it represents a String, this is -1.
-        private int unicodeID;
-        // If the above field isn't -1, then these fields are used.
-        // The glyph code in the font
-        private int glyphCode;
-        // The GlyphProducer which created us
-        private GlyphProducer producer;
-        // The advance of this glyph
-        private float advance;
-        // The GlyphVector for this single character; this is passed
-        // in during construction but cleared during the upload
-        // process
-        private GlyphVector singleUnicodeGlyphVector;
-        // The rectangle of this glyph on the backing store, or null
-        // if it has been cleared due to space pressure
-        private Rect glyphRectForTextureMapping;
-        // If this Glyph represents a String, this is the sequence of
-        // characters
-        private String str;
-        // Whether we need a valid advance when rendering this string
-        // (i.e., whether it has other single glyphs coming after it)
-        private boolean needAdvance;
-
-        // Creates a Glyph representing an individual Unicode character
-        public Glyph(int unicodeID,
-                     int glyphCode,
-                     float advance,
-                     GlyphVector singleUnicodeGlyphVector,
-                     GlyphProducer producer) {
-            this.unicodeID = unicodeID;
-            this.glyphCode = glyphCode;
-            this.advance = advance;
-            this.singleUnicodeGlyphVector = singleUnicodeGlyphVector;
-            this.producer = producer;
-        }
-
-        // Creates a Glyph representing a sequence of characters, with
-        // an indication of whether additional single glyphs are being
-        // rendered after it
-        public Glyph(String str, boolean needAdvance) {
-            this.str = str;
-            this.needAdvance = needAdvance;
-        }
-
-        /** Returns this glyph's unicode ID */
-        public int getUnicodeID() {
-            return unicodeID;
-        }
-
-        /** Returns this glyph's (font-specific) glyph code */
-        public int getGlyphCode() {
-            return glyphCode;
-        }
-
-        /** Returns the advance for this glyph */
-        public float getAdvance() {
-            return advance;
-        }
-
-        /** Draws this glyph and returns the (x) advance for this glyph */
-        public float draw3D(float inX, float inY, float z, float scaleFactor) {
-            if (str != null) {
-                draw3D_ROBUST(str, inX, inY, z, scaleFactor);
-                if (!needAdvance) {
-                    return 0;
-                }
-                // Compute and return the advance for this string
-                GlyphVector gv = font.createGlyphVector(getFontRenderContext(), str);
-                float totalAdvance = 0;
-                for (int i = 0; i < gv.getNumGlyphs(); i++) {
-                    totalAdvance += gv.getGlyphMetrics(i).getAdvance();
-                }
-                return totalAdvance;
-            }
-
-            // This is the code path taken for individual glyphs
-            if (glyphRectForTextureMapping == null) {
-                upload();
-            }
-
-            try {
-                if (mPipelinedQuadRenderer == null) {
-                    mPipelinedQuadRenderer = new Pipelined_QuadRenderer();
-                }
-
-                TextureRenderer renderer = getBackingStore();
-                // Handles case where NPOT texture is used for backing store
-                TextureCoords wholeImageTexCoords = renderer.getTexture().getImageTexCoords();
-                float xScale = wholeImageTexCoords.right();
-                float yScale = wholeImageTexCoords.bottom();
-
-                Rect rect = glyphRectForTextureMapping;
-                TextData data = (TextData) rect.getUserData();
-                data.markUsed();
-
-                Rectangle2D origRect = data.origRect();
-
-                float x = inX - (scaleFactor * data.origOriginX());
-                float y = inY - (scaleFactor * ((float) origRect.getHeight() - data.origOriginY()));
-
-                int texturex = rect.x() + (data.origin().x - data.origOriginX());
-                int texturey = renderer.getHeight() - rect.y() - (int) origRect.getHeight() -
-                    (data.origin().y - data.origOriginY());
-                int width = (int) origRect.getWidth();
-                int height = (int) origRect.getHeight();
-
-                float tx1 = xScale * (float) texturex / (float) renderer.getWidth();
-                float ty1 = yScale * (1.0f -
-                                      ((float) texturey / (float) renderer.getHeight()));
-                float tx2 = xScale * (float) (texturex + width) / (float) renderer.getWidth();
-                float ty2 = yScale * (1.0f -
-                                      ((float) (texturey + height) / (float) renderer.getHeight()));
-
-                mPipelinedQuadRenderer.glTexCoord2f(tx1, ty1);
-                mPipelinedQuadRenderer.glVertex3f(x, y, z);
-                mPipelinedQuadRenderer.glTexCoord2f(tx2, ty1);
-                mPipelinedQuadRenderer.glVertex3f(x + (width * scaleFactor), y,
-                                                  z);
-                mPipelinedQuadRenderer.glTexCoord2f(tx2, ty2);
-                mPipelinedQuadRenderer.glVertex3f(x + (width * scaleFactor),
-                                                  y + (height * scaleFactor), z);
-                mPipelinedQuadRenderer.glTexCoord2f(tx1, ty2);
-                mPipelinedQuadRenderer.glVertex3f(x,
-                                                  y + (height * scaleFactor), z);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            return advance;
-        }
-
-        /** Notifies this glyph that it's been cleared out of the cache */
-        public void clear() {
-            glyphRectForTextureMapping = null;
-        }
-
-        private void upload() {
-            GlyphVector gv = getGlyphVector();
-            Rectangle2D origBBox = preNormalize(renderDelegate.getBounds(gv, getFontRenderContext()));
-            Rectangle2D bbox = normalize(origBBox);
-            Point origin = new Point((int) -bbox.getMinX(),
-                                     (int) -bbox.getMinY());
-            Rect rect = new Rect(0, 0, (int) bbox.getWidth(),
-                                 (int) bbox.getHeight(),
-                                 new TextData(null, origin, origBBox, unicodeID));
-            packer.add(rect);
-            glyphRectForTextureMapping = rect;
-            Graphics2D g = getGraphics2D();
-            // OK, should now have an (x, y) for this rectangle; rasterize
-            // the glyph
-            int strx = rect.x() + origin.x;
-            int stry = rect.y() + origin.y;
-
-            // Clear out the area we're going to draw into
-            g.setComposite(AlphaComposite.Clear);
-            g.fillRect(rect.x(), rect.y(), rect.w(), rect.h());
-            g.setComposite(AlphaComposite.Src);
-
-            // Draw the string
-            renderDelegate.drawGlyphVector(g, gv, strx, stry);
-
-            if (DRAW_BBOXES) {
-                TextData data = (TextData) rect.getUserData();
-                // Draw a bounding box on the backing store
-                g.drawRect(strx - data.origOriginX(),
-                           stry - data.origOriginY(),
-                           (int) data.origRect().getWidth(),
-                           (int) data.origRect().getHeight());
-                g.drawRect(strx - data.origin().x,
-                           stry - data.origin().y,
-                           rect.w(),
-                           rect.h());
-            }
-
-            // Mark this region of the TextureRenderer as dirty
-            getBackingStore().markDirty(rect.x(), rect.y(), rect.w(),
-                                        rect.h());
-            // Re-register ourselves with our producer
-            producer.register(this);
-        }
-
-        private GlyphVector getGlyphVector() {
-            GlyphVector gv = singleUnicodeGlyphVector;
-            if (gv != null) {
-                singleUnicodeGlyphVector = null; // Don't need this anymore
-                return gv;
-            }
-            singleUnicode[0] = (char) unicodeID;
-            return font.createGlyphVector(getFontRenderContext(), singleUnicode);
-        }
-    }
-
-    class GlyphProducer {
-        final int undefined = -2;
-        FontRenderContext fontRenderContext;
-        List/*<Glyph>*/ glyphsOutput = new ArrayList/*<Glyph>*/();
-        // The mapping from unicode character to font-specific glyph ID
-        int[] unicodes2Glyphs;
-        // The mapping from glyph ID to Glyph
-        Glyph[] glyphCache;
-        // We re-use this for each incoming string
-        CharSequenceIterator iter = new CharSequenceIterator();
-
-        GlyphProducer(int fontLengthInGlyphs) {
-            unicodes2Glyphs = new int[512];
-            glyphCache = new Glyph[fontLengthInGlyphs];
-            clearAllCacheEntries();
-        }
-
-        public List/*<Glyph>*/ getGlyphs(CharSequence inString) {
-            glyphsOutput.clear();
-            iter.initFromCharSequence(inString);
-            GlyphVector fullRunGlyphVector = font.createGlyphVector(getFontRenderContext(),
-                                                                    iter);
-            boolean complex = (fullRunGlyphVector.getLayoutFlags() != 0);
-            if (complex || DISABLE_GLYPH_CACHE) {
-                // Punt to the robust version of the renderer
-                glyphsOutput.add(new Glyph(inString.toString(), false));
-                return glyphsOutput;
-            }
-
-            int lengthInGlyphs = fullRunGlyphVector.getNumGlyphs();
-            int i = 0;
-            while (i < lengthInGlyphs) {
-                Glyph glyph = getGlyph(inString, fullRunGlyphVector, i);
-                if (glyph != null) {
-                    glyphsOutput.add(glyph);
-                    i++;
-                } else {
-                    // Assemble a run of characters that don't fit in
-                    // the cache
-                    StringBuffer buf = new StringBuffer();
-                    while (i < lengthInGlyphs &&
-                           getGlyph(inString, fullRunGlyphVector, i) == null) {
-                        buf.append(inString.charAt(i++));
-                    }
-                    glyphsOutput.add(new Glyph(buf.toString(),
-                                               // Any more glyphs after this run?
-                                               i < lengthInGlyphs));
-                }
-            }
-            return glyphsOutput;
-        }
-
-        public void clearCacheEntry(int unicodeID) {
-            int glyphID = unicodes2Glyphs[unicodeID];
-            if (glyphID != undefined) {
-                Glyph glyph = glyphCache[glyphID];
-                if (glyph != null) {
-                    glyph.clear();
-                }
-                glyphCache[glyphID] = null;
-            }
-            unicodes2Glyphs[unicodeID] = undefined;
-        }
-
-        public void clearAllCacheEntries() {
-            for (int i = 0; i < unicodes2Glyphs.length; i++) {
-                clearCacheEntry(i);
-            }
-        }
-
-        public void register(Glyph glyph) {
-            unicodes2Glyphs[glyph.getUnicodeID()] = glyph.getGlyphCode();
-            glyphCache[glyph.getGlyphCode()] = glyph;
-        }
-
-        public float getGlyphPixelWidth(char unicodeID) {
-            Glyph glyph = getGlyph(unicodeID);
-            if (glyph != null) {
-                return glyph.getAdvance();
-            }
-
-            // Have to do this the hard / uncached way
-            singleUnicode[0] = unicodeID;
-            GlyphVector gv = font.createGlyphVector(fontRenderContext,
-                                                                    singleUnicode);
-            return gv.getGlyphMetrics(0).getAdvance();
-        }
-
-        // Returns a glyph object for this single glyph. Returns null
-        // if the unicode or glyph ID would be out of bounds of the
-        // glyph cache.
-        private Glyph getGlyph(CharSequence inString,
-                               GlyphVector fullRunGlyphVector,
-                               int index) {
-            char unicodeID = inString.charAt(index);
-
-            if (unicodeID >= unicodes2Glyphs.length) {
-                return null;
-            }
-
-            int glyphID = unicodes2Glyphs[unicodeID];
-            if (glyphID != undefined) {
-                return glyphCache[glyphID];
-            }
-
-            // Must fabricate the glyph
-            singleUnicode[0] = unicodeID;
-            GlyphVector gv = font.createGlyphVector(getFontRenderContext(), singleUnicode);
-            return getGlyph(unicodeID, gv, fullRunGlyphVector.getGlyphMetrics(index));
-        }
-
-        // It's unclear whether this variant might produce less
-        // optimal results than if we can see the entire GlyphVector
-        // for the incoming string
-        private Glyph getGlyph(int unicodeID) {
-            if (unicodeID >= unicodes2Glyphs.length) {
-                return null;
-            }
-
-            int glyphID = unicodes2Glyphs[unicodeID];
-            if (glyphID != undefined) {
-                return glyphCache[glyphID];
-            }
-            singleUnicode[0] = (char) unicodeID;
-            GlyphVector gv = font.createGlyphVector(getFontRenderContext(), singleUnicode);
-            return getGlyph(unicodeID, gv, gv.getGlyphMetrics(0));
-        }
-
-        private Glyph getGlyph(int unicodeID,
-                               GlyphVector singleUnicodeGlyphVector,
-                               GlyphMetrics metrics) {
-            int glyphCode = singleUnicodeGlyphVector.getGlyphCode(0);
-            // Have seen huge glyph codes (65536) coming out of some fonts in some Unicode situations
-            if (glyphCode >= glyphCache.length) {
-                return null;
-            }
-            Glyph glyph = new Glyph(unicodeID,
-                                    glyphCode,
-                                    metrics.getAdvance(),
-                                    singleUnicodeGlyphVector,
-                                    this);
-            register(glyph);
-            return glyph;
-        }
-    }
-
-    class Pipelined_QuadRenderer {
-        int mOutstandingGlyphsVerticesPipeline = 0;
-        FloatBuffer mTexCoords;
-        FloatBuffer mVertCoords;
-        boolean usingVBOs;
-        int mVBO_For_ResuableTileVertices;
-        int mVBO_For_ResuableTileTexCoords;
-
-        Pipelined_QuadRenderer() {
-            GL2 gl = GLContext.getCurrentGL().getGL2();
-            mVertCoords = BufferUtil.newFloatBuffer(kTotalBufferSizeCoordsVerts);
-            mTexCoords = BufferUtil.newFloatBuffer(kTotalBufferSizeCoordsTex);
-
-            usingVBOs = is15Available(gl);
-
-            if (usingVBOs) {
-                try {
-                    int[] vbos = new int[2];
-                    gl.glGenBuffers(2, IntBuffer.wrap(vbos));
-
-                    mVBO_For_ResuableTileVertices = vbos[0];
-                    mVBO_For_ResuableTileTexCoords = vbos[1];
-
-                    gl.glBindBuffer(GL2.GL_ARRAY_BUFFER,
-                                    mVBO_For_ResuableTileVertices);
-                    gl.glBufferData(GL2.GL_ARRAY_BUFFER, kTotalBufferSizeBytesVerts,
-                                    null, GL2.GL_STREAM_DRAW); // stream draw because this is a single quad use pipeline
-
-                    gl.glBindBuffer(GL2.GL_ARRAY_BUFFER,
-                                    mVBO_For_ResuableTileTexCoords);
-                    gl.glBufferData(GL2.GL_ARRAY_BUFFER, kTotalBufferSizeBytesTex,
-                                    null, GL2.GL_STREAM_DRAW); // stream draw because this is a single quad use pipeline
-                } catch (Exception e) {
-                    isExtensionAvailable_GL_VERSION_1_5 = false;
-                    usingVBOs = false;
-                }
-            }
-        }
-
-        public void glTexCoord2f(float v, float v1) {
-            mTexCoords.put(v);
-            mTexCoords.put(v1);
-        }
-
-        public void glVertex3f(float inX, float inY, float inZ) {
-            mVertCoords.put(inX);
-            mVertCoords.put(inY);
-            mVertCoords.put(inZ);
-
-            mOutstandingGlyphsVerticesPipeline++;
-
-            if (mOutstandingGlyphsVerticesPipeline >= kTotalBufferSizeVerts) {
-                this.draw();
-            }
-        }
-
-        private void draw() {
-            if (useVertexArrays) {
-                drawVertexArrays();
-            } else {
-                drawIMMEDIATE();
-            }
-        }
-
-        private void drawVertexArrays() {
-            if (mOutstandingGlyphsVerticesPipeline > 0) {
-                GL2 gl = GLContext.getCurrentGL().getGL2();
-
-                TextureRenderer renderer = getBackingStore();
-                Texture texture = renderer.getTexture(); // triggers texture uploads.  Maybe this should be more obvious?
-
-                mVertCoords.rewind();
-                mTexCoords.rewind();
-
-                gl.glEnableClientState(GL2.GL_VERTEX_ARRAY);
-
-                if (usingVBOs) {
-                    gl.glBindBuffer(GL2.GL_ARRAY_BUFFER,
-                                    mVBO_For_ResuableTileVertices);
-                    gl.glBufferSubData(GL2.GL_ARRAY_BUFFER, 0,
-                                       mOutstandingGlyphsVerticesPipeline * kSizeInBytes_OneVertices_VertexData,
-                                       mVertCoords); // upload only the new stuff
-                    gl.glVertexPointer(3, GL2.GL_FLOAT, 0, 0);
-                } else {
-                    gl.glVertexPointer(3, GL2.GL_FLOAT, 0, mVertCoords);
-                }
-
-                gl.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY);
-
-                if (usingVBOs) {
-                    gl.glBindBuffer(GL2.GL_ARRAY_BUFFER,
-                                    mVBO_For_ResuableTileTexCoords);
-                    gl.glBufferSubData(GL2.GL_ARRAY_BUFFER, 0,
-                                       mOutstandingGlyphsVerticesPipeline * kSizeInBytes_OneVertices_TexData,
-                                       mTexCoords); // upload only the new stuff
-                    gl.glTexCoordPointer(2, GL2.GL_FLOAT, 0, 0);
-                } else {
-                    gl.glTexCoordPointer(2, GL2.GL_FLOAT, 0, mTexCoords);
-                }
-
-                gl.glDrawArrays(GL2.GL_QUADS, 0,
-                                mOutstandingGlyphsVerticesPipeline);
-
-                mVertCoords.rewind();
-                mTexCoords.rewind();
-                mOutstandingGlyphsVerticesPipeline = 0;
-            }
-        }
-
-        private void drawIMMEDIATE() {
-            if (mOutstandingGlyphsVerticesPipeline > 0) {
-                TextureRenderer renderer = getBackingStore();
-                Texture texture = renderer.getTexture(); // triggers texture uploads.  Maybe this should be more obvious?
-
-                GL2 gl = GLContext.getCurrentGL().getGL2();
-                gl.glBegin(GL2.GL_QUADS);
-
-                try {
-                    int numberOfQuads = mOutstandingGlyphsVerticesPipeline / 4;
-                    mVertCoords.rewind();
-                    mTexCoords.rewind();
-
-                    for (int i = 0; i < numberOfQuads; i++) {
-                        gl.glTexCoord2f(mTexCoords.get(), mTexCoords.get());
-                        gl.glVertex3f(mVertCoords.get(), mVertCoords.get(),
-                                      mVertCoords.get());
-
-                        gl.glTexCoord2f(mTexCoords.get(), mTexCoords.get());
-                        gl.glVertex3f(mVertCoords.get(), mVertCoords.get(),
-                                      mVertCoords.get());
-
-                        gl.glTexCoord2f(mTexCoords.get(), mTexCoords.get());
-                        gl.glVertex3f(mVertCoords.get(), mVertCoords.get(),
-                                      mVertCoords.get());
-
-                        gl.glTexCoord2f(mTexCoords.get(), mTexCoords.get());
-                        gl.glVertex3f(mVertCoords.get(), mVertCoords.get(),
-                                      mVertCoords.get());
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                } finally {
-                    gl.glEnd();
-                    mVertCoords.rewind();
-                    mTexCoords.rewind();
-                    mOutstandingGlyphsVerticesPipeline = 0;
-                }
-            }
-        }
-    }
-
-    class DebugListener implements GLEventListener {
-        private GLU glu;
-        private Frame frame;
-
-        DebugListener(GL gl, Frame frame) {
-            this.glu = GLU.createGLU(gl);
-            this.frame = frame;
-        }
-
-        public void display(GLAutoDrawable drawable) {
-            GL2 gl = GLContext.getCurrentGL().getGL2();
-            gl.glClear(GL2.GL_DEPTH_BUFFER_BIT | GL2.GL_COLOR_BUFFER_BIT);
-
-            if (packer == null) {
-                return;
-            }
-
-            TextureRenderer rend = getBackingStore();
-            final int w = rend.getWidth();
-            final int h = rend.getHeight();
-            rend.beginOrthoRendering(w, h);
-            rend.drawOrthoRect(0, 0);
-            rend.endOrthoRendering();
-
-            if ((frame.getWidth() != w) || (frame.getHeight() != h)) {
-                EventQueue.invokeLater(new Runnable() {
-                        public void run() {
-                            frame.setSize(w, h);
-                        }
-                    });
-            }
-        }
-
-        public void dispose(GLAutoDrawable drawable) {
-            glu.destroy();
-            glu=null;
-            frame=null;
-        }
-
-        // Unused methods
-        public void init(GLAutoDrawable drawable) {
-        }
-
-        public void reshape(GLAutoDrawable drawable, int x, int y, int width,
-                            int height) {
-        }
-
-        public void displayChanged(GLAutoDrawable drawable,
-                                   boolean modeChanged, boolean deviceChanged) {
-        }
-    }
-
-    /**
-     * Sets whether vertex arrays are being used internally for
-     * rendering, or whether text is rendered using the OpenGL
-     * immediate mode commands. This is provided as a concession for
-     * certain graphics cards which have poor vertex array
-     * performance. Defaults to true.
-     */
-    public void setUseVertexArrays(boolean useVertexArrays) {
-        this.useVertexArrays = useVertexArrays;
-    }
-
-    /**
-     * Indicates whether vertex arrays are being used internally for
-     * rendering, or whether text is rendered using the OpenGL
-     * immediate mode commands. Defaults to true.
-     */
-    public boolean getUseVertexArrays() {
-        return useVertexArrays;
-    }
-
-    /**
-     * Sets whether smoothing (i.e., GL_LINEAR filtering) is enabled
-     * in the backing TextureRenderer of this TextRenderer. A few
-     * graphics cards do not behave well when this is enabled,
-     * resulting in fuzzy text. Defaults to true.
-     */
-    public void setSmoothing(boolean smoothing) {
-        this.smoothing = smoothing;
-        getBackingStore().setSmoothing(smoothing);
-    }
-
-    /**
-     * Indicates whether smoothing is enabled in the backing
-     * TextureRenderer of this TextRenderer. A few graphics cards do
-     * not behave well when this is enabled, resulting in fuzzy text.
-     * Defaults to true.
-     */
-    public boolean getSmoothing() {
-        return smoothing;
-    }
-
-    private boolean is15Available(GL gl) {
-        if (!checkFor_isExtensionAvailable_GL_VERSION_1_5) {
-            isExtensionAvailable_GL_VERSION_1_5 = gl.isExtensionAvailable("GL_VERSION_1_5");
-            checkFor_isExtensionAvailable_GL_VERSION_1_5 = true;
-        }
-        return isExtensionAvailable_GL_VERSION_1_5;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/awt/TextureRenderer.java b/src/jogl/classes/com/sun/opengl/util/awt/TextureRenderer.java
deleted file mode 100755
index 86ea1dbc7..000000000
--- a/src/jogl/classes/com/sun/opengl/util/awt/TextureRenderer.java
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.awt;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.Rectangle;
-import java.awt.image.*;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-import javax.media.opengl.glu.gl2.*;
-import com.sun.opengl.util.texture.*;
-import com.sun.opengl.util.texture.spi.*;
-import com.sun.opengl.util.texture.awt.*;
-
-/** Provides the ability to render into an OpenGL {@link
-    com.sun.opengl.util.texture.Texture Texture} using the Java 2D
-    APIs. This renderer class uses an internal Java 2D image (of
-    unspecified type) for its backing store and flushes portions of
-    that image to an OpenGL texture on demand. The resulting OpenGL
-    texture can then be mapped on to a polygon for display. */
-
-public class TextureRenderer {
-  // For now, we supply only a BufferedImage back-end for this
-  // renderer. In theory we could use the Java 2D/JOGL bridge to fully
-  // accelerate the rendering paths, but there are restrictions on
-  // what work can be done where; for example, Graphics2D-related work
-  // must not be done on the Queue Flusher Thread, but JOGL's
-  // OpenGL-related work must be. This implies that the user's code
-  // would need to be split up into multiple callbacks run from the
-  // appropriate threads, which would be somewhat unfortunate.
-
-  // Whether we have an alpha channel in the (RGB/A) backing store
-  private boolean alpha;
-
-  // Whether we're using only a GL_INTENSITY backing store
-  private boolean intensity;
-
-  // Whether we're attempting to use automatic mipmap generation support
-  private boolean mipmap;
-
-  // Whether smoothing is enabled for the OpenGL texture (switching
-  // between GL_LINEAR and GL_NEAREST filtering)
-  private boolean smoothing = true;
-  private boolean smoothingChanged;
-
-  // The backing store itself
-  private BufferedImage image;
-
-  private Texture texture;
-  private AWTTextureData textureData;
-  private boolean mustReallocateTexture;
-  private Rectangle dirtyRegion;
-
-  private GLUgl2 glu = new GLUgl2();
-
-  // Current color
-  private float r = 1.0f;
-  private float g = 1.0f;
-  private float b = 1.0f;
-  private float a = 1.0f;
-
-  /** Creates a new renderer with backing store of the specified width
-      and height. If <CODE>alpha</CODE> is true, allocates an alpha
-      channel in the backing store image. No mipmap support is
-      requested.
-
-      @param width the width of the texture to render into
-      @param height the height of the texture to render into
-      @param alpha whether to allocate an alpha channel for the texture
-  */
-  public TextureRenderer(int width, int height, boolean alpha) {
-    this(width, height, alpha, false);
-  }
-
-  /** Creates a new renderer with backing store of the specified width
-      and height. If <CODE>alpha</CODE> is true, allocates an alpha channel in the
-      backing store image. If <CODE>mipmap</CODE> is true, attempts to use OpenGL's
-      automatic mipmap generation for better smoothing when rendering
-      the TextureRenderer's contents at a distance.
-
-      @param width the width of the texture to render into
-      @param height the height of the texture to render into
-      @param alpha whether to allocate an alpha channel for the texture
-      @param mipmap whether to attempt use of automatic mipmap generation
-  */
-  public TextureRenderer(int width, int height, boolean alpha, boolean mipmap) {
-    this(width, height, alpha, false, mipmap);
-  }
-
-  // Internal constructor to avoid confusion since alpha only makes
-  // sense when intensity is not set
-  private TextureRenderer(int width, int height, boolean alpha, boolean intensity, boolean mipmap) {
-    this.alpha = alpha;
-    this.intensity = intensity;
-    this.mipmap = mipmap;
-    init(width, height);
-  }
-
-  /** Creates a new renderer with a special kind of backing store
-      which acts only as an alpha channel. No mipmap support is
-      requested. Internally, this associates a GL_INTENSITY OpenGL
-      texture with the backing store. */
-  public static TextureRenderer createAlphaOnlyRenderer(int width, int height) {
-    return createAlphaOnlyRenderer(width, height, false);
-  }
-
-  /** Creates a new renderer with a special kind of backing store
-      which acts only as an alpha channel. If <CODE>mipmap</CODE> is
-      true, attempts to use OpenGL's automatic mipmap generation for
-      better smoothing when rendering the TextureRenderer's contents
-      at a distance. Internally, this associates a GL_INTENSITY OpenGL
-      texture with the backing store. */
-  public static TextureRenderer createAlphaOnlyRenderer(int width, int height, boolean mipmap) {
-    return new TextureRenderer(width, height, false, true, mipmap);
-  }
-
-  /** Returns the width of the backing store of this renderer.
-
-      @return the width of the backing store of this renderer
-  */
-  public int getWidth() {
-    return image.getWidth();
-  }
-
-  /** Returns the height of the backing store of this renderer.
-
-      @return the height of the backing store of this renderer
-  */
-  public int getHeight() {
-    return image.getHeight();
-  }
-
-  /** Returns the size of the backing store of this renderer in a
-      newly-allocated {@link java.awt.Dimension Dimension} object.
-
-      @return the size of the backing store of this renderer
-  */
-  public Dimension getSize() {
-    return getSize(null);
-  }
-
-  /** Returns the size of the backing store of this renderer. Uses the
-      {@link java.awt.Dimension Dimension} object if one is supplied,
-      or allocates a new one if null is passed.
-
-      @param d a {@link java.awt.Dimension Dimension} object in which
-        to store the results, or null to allocate a new one
-
-      @return the size of the backing store of this renderer
-  */
-  public Dimension getSize(Dimension d) {
-    if (d == null)
-      d = new Dimension();
-    d.setSize(image.getWidth(), image.getHeight());
-    return d;
-  }
-
-  /** Sets the size of the backing store of this renderer. This may
-      cause the OpenGL texture object associated with this renderer to
-      be invalidated; it is not recommended to cache this texture
-      object outside this class but to instead call {@link #getTexture
-      getTexture} when it is needed.
-
-      @param width the new width of the backing store of this renderer
-      @param height the new height of the backing store of this renderer
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void setSize(int width, int height) throws GLException {
-    init(width, height);
-  }
-
-  /** Sets the size of the backing store of this renderer. This may
-      cause the OpenGL texture object associated with this renderer to
-      be invalidated.
-
-      @param d the new size of the backing store of this renderer
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void setSize(Dimension d) throws GLException {
-    setSize(d.width, d.height);
-  }
-
-  /** Sets whether smoothing is enabled for the OpenGL texture; if so,
-      uses GL_LINEAR interpolation for the minification and
-      magnification filters. Defaults to true. Changes to this setting
-      will not take effect until the next call to {@link
-      #beginOrthoRendering beginOrthoRendering}.
-
-      @param smoothing whether smoothing is enabled for the OpenGL texture
-  */
-  public void setSmoothing(boolean smoothing) {
-    this.smoothing = smoothing;
-    smoothingChanged = true;
-  }
-
-  /** Returns whether smoothing is enabled for the OpenGL texture; see
-      {@link #setSmoothing setSmoothing}. Defaults to true.
-
-      @return whether smoothing is enabled for the OpenGL texture
-  */
-  public boolean getSmoothing() {
-    return smoothing;
-  }
-
-  /** Creates a {@link java.awt.Graphics2D Graphics2D} instance for
-      rendering to the backing store of this renderer. The returned
-      object should be disposed of using the normal {@link
-      java.awt.Graphics#dispose() Graphics.dispose()} method once it
-      is no longer being used.
-
-      @return a new {@link java.awt.Graphics2D Graphics2D} object for
-        rendering into the backing store of this renderer
-  */
-  public Graphics2D createGraphics() {
-    return image.createGraphics();
-  }
-
-  /** Returns the underlying Java 2D {@link java.awt.Image Image}
-      being rendered into. */
-  public Image getImage() {
-    return image;
-  }
-
-  /** Marks the given region of the TextureRenderer as dirty. This
-      region, and any previously set dirty regions, will be
-      automatically synchronized with the underlying Texture during
-      the next {@link #getTexture getTexture} operation, at which
-      point the dirty region will be cleared. It is not necessary for
-      an OpenGL context to be current when this method is called.
-
-      @param x the x coordinate (in Java 2D coordinates -- relative to
-        upper left) of the region to update
-      @param y the y coordinate (in Java 2D coordinates -- relative to
-        upper left) of the region to update
-      @param width the width of the region to update
-      @param height the height of the region to update
-  */
-  public void markDirty(int x, int y, int width, int height) {
-    Rectangle curRegion = new Rectangle(x, y, width, height);
-    if (dirtyRegion == null) {
-      dirtyRegion = curRegion;
-    } else {
-      dirtyRegion.add(curRegion);
-    }
-  }
-
-  /** Returns the underlying OpenGL Texture object associated with
-      this renderer, synchronizing any dirty regions of the
-      TextureRenderer with the underlying OpenGL texture.
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public Texture getTexture() throws GLException {
-    if (dirtyRegion != null) {
-      sync(dirtyRegion.x, dirtyRegion.y, dirtyRegion.width, dirtyRegion.height);
-      dirtyRegion = null;
-    }
-
-    ensureTexture();
-    return texture;
-  }
-
-  /** Disposes all resources associated with this renderer. It is not
-      valid to use this renderer after calling this method.
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void dispose() throws GLException {
-    if (texture != null) {
-      texture.dispose();
-      texture = null;
-    }
-    if (image != null) {
-      image.flush();
-      image = null;
-    }
-  }
-
-  /** Convenience method which assists in rendering portions of the
-      OpenGL texture to the screen, if the application intends to draw
-      them as a flat overlay on to the screen. Pushes OpenGL state
-      bits (GL_ENABLE_BIT, GL_DEPTH_BUFFER_BIT and GL_TRANSFORM_BIT);
-      disables the depth test, back-face culling, and lighting;
-      enables the texture in this renderer; and sets up the viewing
-      matrices for orthographic rendering where the coordinates go
-      from (0, 0) at the lower left to (width, height) at the upper
-      right. Equivalent to beginOrthoRendering(width, height, true).
-      {@link #endOrthoRendering} must be used in conjunction with this
-      method to restore all OpenGL states.
-
-      @param width the width of the current on-screen OpenGL drawable
-      @param height the height of the current on-screen OpenGL drawable
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void beginOrthoRendering(int width, int height) throws GLException {
-    beginOrthoRendering(width, height, true);
-  }
-
-  /** Convenience method which assists in rendering portions of the
-      OpenGL texture to the screen, if the application intends to draw
-      them as a flat overlay on to the screen. Pushes OpenGL state
-      bits (GL_ENABLE_BIT, GL_DEPTH_BUFFER_BIT and GL_TRANSFORM_BIT);
-      disables the depth test (if the "disableDepthTest" argument is
-      true), back-face culling, and lighting; enables the texture in
-      this renderer; and sets up the viewing matrices for orthographic
-      rendering where the coordinates go from (0, 0) at the lower left
-      to (width, height) at the upper right. {@link
-      #endOrthoRendering} must be used in conjunction with this method
-      to restore all OpenGL states.
-
-      @param width the width of the current on-screen OpenGL drawable
-      @param height the height of the current on-screen OpenGL drawable
-      @param disableDepthTest whether the depth test should be disabled
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void beginOrthoRendering(int width, int height, boolean disableDepthTest) throws GLException {
-    beginRendering(true, width, height, disableDepthTest);
-  }
-
-  /** Convenience method which assists in rendering portions of the
-      OpenGL texture to the screen as 2D quads in 3D space. Pushes
-      OpenGL state (GL_ENABLE_BIT); disables lighting; and enables the
-      texture in this renderer. Unlike {@link #beginOrthoRendering
-      beginOrthoRendering}, does not modify the depth test, back-face
-      culling, lighting, or the modelview or projection matrices. The
-      user is responsible for setting up the view matrices for correct
-      results of {@link #draw3DRect draw3DRect}. {@link
-      #end3DRendering} must be used in conjunction with this method to
-      restore all OpenGL states.
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void begin3DRendering() throws GLException {
-    beginRendering(false, 0, 0, false);
-  }
-
-  /** Changes the color of the polygons, and therefore the drawn
-      images, this TextureRenderer produces. Use of this method is
-      optional. The TextureRenderer uses the GL_MODULATE texture
-      environment mode, which causes the portions of the rendered
-      texture to be multiplied by the color of the rendered
-      polygons. The polygon color can be varied to achieve effects
-      like tinting of the overall output or fading in and out by
-      changing the alpha of the color. <P>
-
-      Each component ranges from 0.0f - 1.0f. The alpha component, if
-      used, does not need to be premultiplied into the color channels
-      as described in the documentation for {@link
-      com.sun.opengl.util.texture.Texture Texture}, although
-      premultiplied colors are used internally. The default color is
-      opaque white.
-
-      @param r the red component of the new color
-      @param g the green component of the new color
-      @param b the blue component of the new color
-      @param a the alpha component of the new color, 0.0f = completely
-        transparent, 1.0f = completely opaque
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void setColor(float r, float g, float b, float a) throws GLException {
-    GL2 gl = GLContext.getCurrentGL().getGL2();
-    this.r = r * a;
-    this.g = g * a;
-    this.b = b * a;
-    this.a = a;
-
-    gl.glColor4f(this.r, this.g, this.b, this.a);
-  }  
-
-  private float[] compArray;
-  /** Changes the current color of this TextureRenderer to the
-      supplied one. The default color is opaque white. See {@link
-      #setColor(float,float,float,float) setColor} for more details.
-
-      @param color the new color to use for rendering
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void setColor(Color color) throws GLException {
-    // Get color's RGBA components as floats in the range [0,1].
-    if (compArray == null) {
-      compArray = new float[4];
-    }
-    color.getRGBComponents(compArray);
-    setColor(compArray[0], compArray[1], compArray[2], compArray[3]);
-  }
-
-  /** Draws an orthographically projected rectangle containing all of
-      the underlying texture to the specified location on the
-      screen. All (x, y) coordinates are specified relative to the
-      lower left corner of either the texture image or the current
-      OpenGL drawable. This method is equivalent to
-      <code>drawOrthoRect(screenx, screeny, 0, 0, getWidth(),
-      getHeight());</code>.
-
-      @param screenx the on-screen x coordinate at which to draw the rectangle
-      @param screeny the on-screen y coordinate (relative to lower left) at
-        which to draw the rectangle
-      
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void drawOrthoRect(int screenx, int screeny) throws GLException {
-    drawOrthoRect(screenx, screeny, 0, 0, getWidth(), getHeight());
-  }
-
-  /** Draws an orthographically projected rectangle of the underlying
-      texture to the specified location on the screen. All (x, y)
-      coordinates are specified relative to the lower left corner of
-      either the texture image or the current OpenGL drawable.
-
-      @param screenx the on-screen x coordinate at which to draw the rectangle
-      @param screeny the on-screen y coordinate (relative to lower left) at
-        which to draw the rectangle
-      @param texturex the x coordinate of the pixel in the texture of
-        the lower left portion of the rectangle to draw
-      @param texturey the y coordinate of the pixel in the texture
-        (relative to lower left) of the lower left portion of the
-        rectangle to draw
-      @param width the width of the rectangle to draw
-      @param height the height of the rectangle to draw
-      
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void drawOrthoRect(int screenx, int screeny,
-                            int texturex, int texturey,
-                            int width, int height) throws GLException {
-    draw3DRect(screenx, screeny, 0, texturex, texturey, width, height, 1);
-  }
-
-  /** Draws a rectangle of the underlying texture to the specified 3D
-      location. In the current coordinate system, the lower left
-      corner of the rectangle is placed at (x, y, z), and the upper
-      right corner is placed at (x + width * scaleFactor, y + height *
-      scaleFactor, z). The lower left corner of the sub-rectangle of
-      the texture is (texturex, texturey) and the upper right corner
-      is (texturex + width, texturey + height). For back-face culling
-      purposes, the rectangle is drawn with counterclockwise
-      orientation of the vertices when viewed from the front.
-
-      @param x the x coordinate at which to draw the rectangle
-      @param y the y coordinate at which to draw the rectangle
-      @param z the z coordinate at which to draw the rectangle
-      @param texturex the x coordinate of the pixel in the texture of
-        the lower left portion of the rectangle to draw
-      @param texturey the y coordinate of the pixel in the texture
-        (relative to lower left) of the lower left portion of the
-        rectangle to draw
-      @param width the width in texels of the rectangle to draw
-      @param height the height in texels of the rectangle to draw
-      @param scaleFactor the scale factor to apply (multiplicatively)
-        to the size of the drawn rectangle
-      
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void draw3DRect(float x, float y, float z,
-                         int texturex, int texturey,
-                         int width, int height,
-                         float scaleFactor) throws GLException {
-    GL2 gl = GLContext.getCurrentGL().getGL2();
-    Texture texture = getTexture();
-    TextureCoords coords = texture.getSubImageTexCoords(texturex, texturey,
-                                                        texturex + width,
-                                                        texturey + height);
-    gl.glBegin(GL2.GL_QUADS);
-    gl.glTexCoord2f(coords.left(), coords.bottom());
-    gl.glVertex3f(x, y, z);
-    gl.glTexCoord2f(coords.right(), coords.bottom());
-    gl.glVertex3f(x + width * scaleFactor, y, z);
-    gl.glTexCoord2f(coords.right(), coords.top());
-    gl.glVertex3f(x + width * scaleFactor, y + height * scaleFactor, z);
-    gl.glTexCoord2f(coords.left(), coords.top());
-    gl.glVertex3f(x, y + height * scaleFactor, z);
-    gl.glEnd();
-  }
-
-  /** Convenience method which assists in rendering portions of the
-      OpenGL texture to the screen, if the application intends to draw
-      them as a flat overlay on to the screen. Must be used if {@link
-      #beginOrthoRendering} is used to set up the rendering stage for
-      this overlay. 
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void endOrthoRendering() throws GLException {
-    endRendering(true);
-  }
-
-  /** Convenience method which assists in rendering portions of the
-      OpenGL texture to the screen as 2D quads in 3D space. Must be
-      used if {@link #begin3DRendering} is used to set up the
-      rendering stage for this overlay.
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  public void end3DRendering() throws GLException {
-    endRendering(false);
-  }
-
-  /** Indicates whether automatic mipmap generation is in use for this
-      TextureRenderer. The result of this method may change from true
-      to false if it is discovered during allocation of the
-      TextureRenderer's backing store that automatic mipmap generation
-      is not supported at the OpenGL level. */
-  public boolean isUsingAutoMipmapGeneration() {
-    return mipmap;
-  }
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  private void beginRendering(boolean ortho, int width, int height, boolean disableDepthTestForOrtho) {
-    GL2 gl = GLContext.getCurrentGL().getGL2();
-    int attribBits = 
-      GL2.GL_ENABLE_BIT | GL2.GL_TEXTURE_BIT | GL2.GL_COLOR_BUFFER_BIT |
-      (ortho ? (GL2.GL_DEPTH_BUFFER_BIT | GL2.GL_TRANSFORM_BIT) : 0);
-    gl.glPushAttrib(attribBits);
-    gl.glDisable(GL2.GL_LIGHTING);
-    if (ortho) {
-      if (disableDepthTestForOrtho) {
-        gl.glDisable(GL2.GL_DEPTH_TEST);
-      }
-      gl.glDisable(GL2.GL_CULL_FACE);
-      gl.glMatrixMode(GL2.GL_PROJECTION);
-      gl.glPushMatrix();
-      gl.glLoadIdentity();
-      glu.gluOrtho2D(0, width, 0, height);
-      gl.glMatrixMode(GL2.GL_MODELVIEW);
-      gl.glPushMatrix();
-      gl.glLoadIdentity();
-      gl.glMatrixMode(GL2.GL_TEXTURE);
-      gl.glPushMatrix();
-      gl.glLoadIdentity();
-    }
-    gl.glEnable(GL2.GL_BLEND);
-    gl.glBlendFunc(GL2.GL_ONE, GL2.GL_ONE_MINUS_SRC_ALPHA);
-    Texture texture = getTexture();
-    texture.enable();
-    texture.bind();
-    gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_MODULATE);
-    // Change polygon color to last saved
-    gl.glColor4f(r, g, b, a);
-    if (smoothingChanged) {
-      smoothingChanged = false;
-      if (smoothing) {
-        texture.setTexParameteri(GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR);
-        if (mipmap) {
-          texture.setTexParameteri(GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR_MIPMAP_LINEAR);
-        } else {
-          texture.setTexParameteri(GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR);
-        }
-      } else {
-        texture.setTexParameteri(GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_NEAREST);
-        texture.setTexParameteri(GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_NEAREST);
-      }
-    }
-  }
-
-  private void endRendering(boolean ortho) {
-    GL2 gl = GLContext.getCurrentGL().getGL2();
-    Texture texture = getTexture();
-    texture.disable();
-    if (ortho) {
-      gl.glMatrixMode(GL2.GL_PROJECTION);
-      gl.glPopMatrix();
-      gl.glMatrixMode(GL2.GL_MODELVIEW);
-      gl.glPopMatrix();
-      gl.glMatrixMode(GL2.GL_TEXTURE);
-      gl.glPopMatrix();
-    }
-    gl.glPopAttrib();
-  }
-
-  private void init(int width, int height) {
-    GL2 gl = GLContext.getCurrentGL().getGL2();
-    // Discard previous BufferedImage if any
-    if (image != null) {
-      image.flush();
-      image = null;
-    }
-
-    // Infer the internal format if not an intensity texture
-    int internalFormat = (intensity ? GL2.GL_INTENSITY : 0);
-    int imageType = 
-      (intensity ? BufferedImage.TYPE_BYTE_GRAY :
-       (alpha ?  BufferedImage.TYPE_INT_ARGB_PRE : BufferedImage.TYPE_INT_RGB));
-    image = new BufferedImage(width, height, imageType);
-    // Always realllocate the TextureData associated with this
-    // BufferedImage; it's just a reference to the contents but we
-    // need it in order to update sub-regions of the underlying
-    // texture
-    textureData = new AWTTextureData(gl.getGLProfile(), internalFormat, 0, mipmap, image);
-    // For now, always reallocate the underlying OpenGL texture when
-    // the backing store size changes
-    mustReallocateTexture = true;
-  }
-
-  /** Synchronizes the specified region of the backing store down to
-      the underlying OpenGL texture. If {@link #markDirty markDirty}
-      is used instead to indicate the regions that are out of sync,
-      this method does not need to be called.
-
-      @param x the x coordinate (in Java 2D coordinates -- relative to
-        upper left) of the region to update
-      @param y the y coordinate (in Java 2D coordinates -- relative to
-        upper left) of the region to update
-      @param width the width of the region to update
-      @param height the height of the region to update
-
-      @throws GLException If an OpenGL context is not current when this method is called
-  */
-  private void sync(int x, int y, int width, int height) throws GLException {
-    // Force allocation if necessary
-    boolean canSkipUpdate = ensureTexture();
-
-    if (!canSkipUpdate) {
-      // Update specified region.
-      // NOTE that because BufferedImage-based TextureDatas now don't
-      // do anything to their contents, the coordinate systems for
-      // OpenGL and Java 2D actually line up correctly for
-      // updateSubImage calls, so we don't need to do any argument
-      // conversion here (i.e., flipping the Y coordinate).
-      texture.updateSubImage(textureData, 0, x, y, x, y, width, height);
-    }
-  }
-
-  // Returns true if the texture was newly allocated, false if not
-  private boolean ensureTexture() {
-    if (mustReallocateTexture) {
-      if (texture != null) {
-        texture.dispose();
-        texture = null;
-      }
-      mustReallocateTexture = false;
-    }
-
-    if (texture == null) {
-      texture = TextureIO.newTexture(textureData);
-      if (mipmap && !texture.isUsingAutoMipmapGeneration()) {
-        // Only try this once
-        texture.dispose();
-        mipmap = false;
-        textureData.setMipmap(false);
-        texture = TextureIO.newTexture(textureData);
-      }
-
-      if (!smoothing) {
-        // The TextureIO classes default to GL_LINEAR filtering
-        texture.setTexParameteri(GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_NEAREST);
-        texture.setTexParameteri(GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_NEAREST);
-      }
-      return true;
-    }
-
-    return false;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/BitmapCharRec.java b/src/jogl/classes/com/sun/opengl/util/gl2/BitmapCharRec.java
deleted file mode 100644
index 9738be60a..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/BitmapCharRec.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
-
-/* This program is freely distributable without licensing fees 
-   and is provided without guarantee or warrantee expressed or 
-   implied. This program is -not- in the public domain. */
-
-class BitmapCharRec {
-  public int width;
-  public int height;
-  public float xorig;
-  public float yorig;
-  public float advance;
-  public byte[] bitmap;
-
-  public BitmapCharRec(int width,
-                int height,
-                float xorig,
-                float yorig,
-                float advance,
-                byte[] bitmap) {
-    this.width   = width;
-    this.height  = height;
-    this.xorig   = xorig;
-    this.yorig   = yorig;
-    this.advance = advance;
-    this.bitmap  = bitmap;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/BitmapFontRec.java b/src/jogl/classes/com/sun/opengl/util/gl2/BitmapFontRec.java
deleted file mode 100644
index d110c262b..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/BitmapFontRec.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
-
-/* This program is freely distributable without licensing fees 
-   and is provided without guarantee or warrantee expressed or 
-   implied. This program is -not- in the public domain. */
-
-class BitmapFontRec {
-  public String name;
-  public int num_chars;
-  public int first;
-  public BitmapCharRec[] ch;
-
-  public BitmapFontRec(String name,
-                int num_chars,
-                int first,
-                BitmapCharRec[] ch) {
-    this.name = name;
-    this.num_chars = num_chars;
-    this.first = first;
-    this.ch = ch;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/CoordRec.java b/src/jogl/classes/com/sun/opengl/util/gl2/CoordRec.java
deleted file mode 100644
index e87354dbf..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/CoordRec.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
-
-/* This program is freely distributable without licensing fees 
-   and is provided without guarantee or warrantee expressed or 
-   implied. This program is -not- in the public domain. */
-
-class CoordRec {
-  public float x;
-  public float y;
-
-  public CoordRec(float x, float y) {
-    this.x = x;
-    this.y = y;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUT.java b/src/jogl/classes/com/sun/opengl/util/gl2/GLUT.java
deleted file mode 100644
index 5a1f7d12d..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUT.java
+++ /dev/null
@@ -1,1342 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-import javax.media.opengl.glu.gl2.*;
-
-/** Subset of the routines provided by the GLUT interface. Note the
-    signatures of many of the methods are necessarily different than
-    the corresponding C version. A GLUT object must only be used from
-    one particular thread at a time. <P>
-
-    Copyright (c) Mark J. Kilgard, 1994, 1997. <P>
-
-    (c) Copyright 1993, Silicon Graphics, Inc. <P>
-
-    ALL RIGHTS RESERVED <P>
-
-    Permission to use, copy, modify, and distribute this software
-    for any purpose and without fee is hereby granted, provided
-    that the above copyright notice appear in all copies and that
-    both the copyright notice and this permission notice appear in
-    supporting documentation, and that the name of Silicon
-    Graphics, Inc. not be used in advertising or publicity
-    pertaining to distribution of the software without specific,
-    written prior permission. <P>
-
-    THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU
-    "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR
-    OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF
-    MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  IN NO
-    EVENT SHALL SILICON GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE
-    ELSE FOR ANY DIRECT, SPECIAL, INCIDENTAL, INDIRECT OR
-    CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER,
-    INCLUDING WITHOUT LIMITATION, LOSS OF PROFIT, LOSS OF USE,
-    SAVINGS OR REVENUE, OR THE CLAIMS OF THIRD PARTIES, WHETHER OR
-    NOT SILICON GRAPHICS, INC.  HAS BEEN ADVISED OF THE POSSIBILITY
-    OF SUCH LOSS, HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    ARISING OUT OF OR IN CONNECTION WITH THE POSSESSION, USE OR
-    PERFORMANCE OF THIS SOFTWARE. <P>
-
-    US Government Users Restricted Rights <P>
-
-    Use, duplication, or disclosure by the Government is subject to
-    restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
-    (c)(1)(ii) of the Rights in Technical Data and Computer
-    Software clause at DFARS 252.227-7013 and/or in similar or
-    successor clauses in the FAR or the DOD or NASA FAR
-    Supplement.  Unpublished-- rights reserved under the copyright
-    laws of the United States.  Contractor/manufacturer is Silicon
-    Graphics, Inc., 2011 N.  Shoreline Blvd., Mountain View, CA
-    94039-7311. <P>
-
-    OpenGL(TM) is a trademark of Silicon Graphics, Inc. <P>
-*/
-
-public class GLUT {
-  public static final int STROKE_ROMAN = 0;
-  public static final int STROKE_MONO_ROMAN = 1;
-  public static final int BITMAP_9_BY_15 = 2;
-  public static final int BITMAP_8_BY_13 = 3;
-  public static final int BITMAP_TIMES_ROMAN_10 = 4;
-  public static final int BITMAP_TIMES_ROMAN_24 = 5;
-  public static final int BITMAP_HELVETICA_10 = 6;
-  public static final int BITMAP_HELVETICA_12 = 7;
-  public static final int BITMAP_HELVETICA_18 = 8;
-
-  private GLUgl2 glu = new GLUgl2();
-
-  //----------------------------------------------------------------------
-  // Shapes
-  //
-
-  public void glutWireSphere(double radius, int slices, int stacks) {
-    quadObjInit(glu);
-    glu.gluQuadricDrawStyle(quadObj, GLU.GLU_LINE);
-    glu.gluQuadricNormals(quadObj, GLU.GLU_SMOOTH);
-    /* If we ever changed/used the texture or orientation state
-       of quadObj, we'd need to change it to the defaults here
-       with gluQuadricTexture and/or gluQuadricOrientation. */
-    glu.gluSphere(quadObj, radius, slices, stacks);
-  }
-
-  public void glutSolidSphere(double radius, int slices, int stacks) {
-    quadObjInit(glu);
-    glu.gluQuadricDrawStyle(quadObj, GLU.GLU_FILL);
-    glu.gluQuadricNormals(quadObj, GLU.GLU_SMOOTH);
-    /* If we ever changed/used the texture or orientation state
-       of quadObj, we'd need to change it to the defaults here
-       with gluQuadricTexture and/or gluQuadricOrientation. */
-    glu.gluSphere(quadObj, radius, slices, stacks);
-  }
-
-  public void glutWireCone(double base, double height,
-                           int slices, int stacks) {
-    quadObjInit(glu);
-    glu.gluQuadricDrawStyle(quadObj, GLU.GLU_LINE);
-    glu.gluQuadricNormals(quadObj, GLU.GLU_SMOOTH);
-    /* If we ever changed/used the texture or orientation state
-       of quadObj, we'd need to change it to the defaults here
-       with gluQuadricTexture and/or gluQuadricOrientation. */
-    glu.gluCylinder(quadObj, base, 0.0, height, slices, stacks);
-  }
-
-  public void glutSolidCone(double base, double height,
-                            int slices, int stacks) {
-    quadObjInit(glu);
-    glu.gluQuadricDrawStyle(quadObj, GLU.GLU_FILL);
-    glu.gluQuadricNormals(quadObj, GLU.GLU_SMOOTH);
-    /* If we ever changed/used the texture or orientation state
-       of quadObj, we'd need to change it to the defaults here
-       with gluQuadricTexture and/or gluQuadricOrientation. */
-    glu.gluCylinder(quadObj, base, 0.0, height, slices, stacks);
-  }
-
-  public void glutWireCylinder(double radius, double height, int slices, int stacks) {
-    quadObjInit(glu);
-    glu.gluQuadricDrawStyle(quadObj, GLU.GLU_LINE);
-    glu.gluQuadricNormals(quadObj, GLU.GLU_SMOOTH);
-    /* If we ever changed/used the texture or orientation state
-       of quadObj, we'd need to change it to the defaults here
-       with gluQuadricTexture and/or gluQuadricOrientation. */
-    glu.gluCylinder(quadObj, radius, radius, height, slices, stacks);
-  }
-
-  public void glutSolidCylinder(double radius, double height, int slices, int stacks) {
-    GL2 gl = GLUgl2.getCurrentGL2();
-  	
-    // Prepare table of points for drawing end caps
-    double [] x = new double[slices];
-    double [] y = new double[slices];
-    double angleDelta = Math.PI * 2 / slices;
-    double angle = 0;
-    for (int i = 0 ; i < slices ; i ++) {
-      angle = i * angleDelta;
-      x[i] = Math.cos(angle) * radius;
-      y[i] = Math.sin(angle) * radius;
-    }
-  	
-    // Draw bottom cap
-    gl.glBegin(GL2.GL_TRIANGLE_FAN);
-    gl.glNormal3d(0,0,-1);
-    gl.glVertex3d(0,0,0);
-    for (int i = 0 ; i < slices ; i ++) {
-      gl.glVertex3d(x[i], y[i], 0);
-    }
-    gl.glVertex3d(x[0], y[0], 0);
-    gl.glEnd();
-  	
-    // Draw top cap
-    gl.glBegin(GL2.GL_TRIANGLE_FAN);
-    gl.glNormal3d(0,0,1);
-    gl.glVertex3d(0,0,height);
-    for (int i = 0 ; i < slices ; i ++) {
-      gl.glVertex3d(x[i], y[i], height);
-    }
-    gl.glVertex3d(x[0], y[0], height);
-    gl.glEnd();
-  	
-    // Draw walls
-    quadObjInit(glu);
-    glu.gluQuadricDrawStyle(quadObj, GLU.GLU_FILL);
-    glu.gluQuadricNormals(quadObj, GLU.GLU_SMOOTH);
-    /* If we ever changed/used the texture or orientation state
-       of quadObj, we'd need to change it to the defaults here
-       with gluQuadricTexture and/or gluQuadricOrientation. */
-    glu.gluCylinder(quadObj, radius, radius, height, slices, stacks);
-  }
-
-  public void glutWireCube(float size) {
-    drawBox(GLUgl2.getCurrentGL2(), size, GL2.GL_LINE_LOOP);
-  }
-
-  public void glutSolidCube(float size) {
-    drawBox(GLUgl2.getCurrentGL2(), size, GL2.GL_QUADS);
-  }
-
-  public void glutWireTorus(double innerRadius, double outerRadius,
-                            int nsides, int rings) {
-    GL2 gl = GLUgl2.getCurrentGL2();
-    gl.glPushAttrib(GL2.GL_POLYGON_BIT);
-    gl.glPolygonMode(GL2.GL_FRONT_AND_BACK, GL2.GL_LINE);
-    doughnut(gl, innerRadius, outerRadius, nsides, rings);
-    gl.glPopAttrib();
-  }
-
-  public void glutSolidTorus(double innerRadius, double outerRadius,
-                             int nsides, int rings) {
-    doughnut(GLUgl2.getCurrentGL2(), innerRadius, outerRadius, nsides, rings);
-  }
-
-  public void glutWireDodecahedron() {
-    dodecahedron(GLUgl2.getCurrentGL2(), GL2.GL_LINE_LOOP);
-  }
-
-  public void glutSolidDodecahedron() {
-    dodecahedron(GLUgl2.getCurrentGL2(), GL2.GL_TRIANGLE_FAN);
-  }
-
-  public void glutWireOctahedron() {
-    octahedron(GLUgl2.getCurrentGL2(), GL2.GL_LINE_LOOP);
-  }
-
-  public void glutSolidOctahedron() {
-    octahedron(GLUgl2.getCurrentGL2(), GL2.GL_TRIANGLES);
-  }
-
-  public void glutWireIcosahedron() {
-    icosahedron(GLUgl2.getCurrentGL2(), GL2.GL_LINE_LOOP);
-  }
-
-  public void glutSolidIcosahedron() {
-    icosahedron(GLUgl2.getCurrentGL2(), GL2.GL_TRIANGLES);
-  }
-
-  public void glutWireTetrahedron() {
-    tetrahedron(GLUgl2.getCurrentGL2(), GL2.GL_LINE_LOOP);
-  }
-
-  public void glutSolidTetrahedron() {
-    tetrahedron(GLUgl2.getCurrentGL2(), GL2.GL_TRIANGLES);
-  }
-
-/**
-   * Renders the teapot as a solid shape of the specified size. The teapot is
-   * created in a way that replicates the C GLUT implementation.
-   * 
-   * @param scale
-   *        the factor by which to scale the teapot
-   */
-  public void glutSolidTeapot(double scale) {
-    glutSolidTeapot(scale, true);
-  }
-
-  /**
-   * Renders the teapot as a solid shape of the specified size. The teapot can
-   * either be created in a way that is backward-compatible with the standard
-   * C glut library (i.e. broken), or in a more pleasing way (i.e. with
-   * surfaces whose front-faces point outwards and standing on the z=0 plane,
-   * instead of the y=-1 plane). Both surface normals and texture coordinates
-   * for the teapot are generated. The teapot is generated with OpenGL
-   * evaluators.
-   * 
-   * @param scale
-   *        the factor by which to scale the teapot
-   * @param cStyle
-   *        whether to create the teapot in exactly the same way as in the C
-   *        implementation of GLUT
-   */
-  public void glutSolidTeapot(double scale, boolean cStyle) {
-    teapot(GLUgl2.getCurrentGL2(), 14, scale, GL2.GL_FILL, cStyle);
-  }
-
-  /**
-   * Renders the teapot as a wireframe shape of the specified size. The teapot
-   * is created in a way that replicates the C GLUT implementation.
-   * 
-   * @param scale
-   *        the factor by which to scale the teapot
-   */
-  public void glutWireTeapot(double scale) {
-    glutWireTeapot(scale, true);
-  }
-  
-  /**
-   * Renders the teapot as a wireframe shape of the specified size. The teapot
-   * can either be created in a way that is backward-compatible with the
-   * standard C glut library (i.e. broken), or in a more pleasing way (i.e.
-   * with surfaces whose front-faces point outwards and standing on the z=0
-   * plane, instead of the y=-1 plane). Both surface normals and texture
-   * coordinates for the teapot are generated. The teapot is generated with
-   * OpenGL evaluators.
-   * 
-   * @param scale
-   *        the factor by which to scale the teapot
-   * @param cStyle
-   *        whether to create the teapot in exactly the same way as in the C
-   *        implementation of GLUT
-   */
-  public void glutWireTeapot(double scale, boolean cStyle) {
-    teapot(GLUgl2.getCurrentGL2(), 10, scale, GL2.GL_LINE, cStyle);
-  }
-
-  //----------------------------------------------------------------------
-  // Fonts
-  //
-
-  public void glutBitmapCharacter(int font, char character) {
-    GL2 gl = GLUgl2.getCurrentGL2();
-    int[] swapbytes  = new int[1];
-    int[] lsbfirst   = new int[1];
-    int[] rowlength  = new int[1];
-    int[] skiprows   = new int[1];
-    int[] skippixels = new int[1];
-    int[] alignment  = new int[1];
-    beginBitmap(gl,
-                swapbytes,
-                lsbfirst,
-                rowlength,
-                skiprows,
-                skippixels,
-                alignment);
-    bitmapCharacterImpl(gl, font, character);
-    endBitmap(gl,
-              swapbytes,
-              lsbfirst,
-              rowlength,
-              skiprows,
-              skippixels,
-              alignment);
-  }
-
-  public void glutBitmapString   (int font, String string) {
-    GL2 gl = GLUgl2.getCurrentGL2();
-    int[] swapbytes  = new int[1];
-    int[] lsbfirst   = new int[1];
-    int[] rowlength  = new int[1];
-    int[] skiprows   = new int[1];
-    int[] skippixels = new int[1];
-    int[] alignment  = new int[1];
-    beginBitmap(gl, 
-                swapbytes,
-                lsbfirst,
-                rowlength,
-                skiprows,
-                skippixels,
-                alignment);
-    int len = string.length();
-    for (int i = 0; i < len; i++) {
-      bitmapCharacterImpl(gl, font, string.charAt(i));
-    }
-    endBitmap(gl, 
-              swapbytes,
-              lsbfirst,
-              rowlength,
-              skiprows,
-              skippixels,
-              alignment);
-  }
-
-  public int  glutBitmapWidth    (int font, char character) {
-    BitmapFontRec fontinfo = getBitmapFont(font);
-    int c = character & 0xFFFF;
-    if (c < fontinfo.first || c >= fontinfo.first + fontinfo.num_chars)
-      return 0;
-    BitmapCharRec ch = fontinfo.ch[c - fontinfo.first];
-    if (ch != null)
-      return (int) ch.advance;
-    else
-      return 0;
-  }
-
-  public void glutStrokeCharacter(int font, char character) {
-    GL2 gl = GLUgl2.getCurrentGL2();
-    StrokeFontRec fontinfo = getStrokeFont(font);
-    int c = character & 0xFFFF;
-    if (c < 0 || c >= fontinfo.num_chars)
-      return;
-    StrokeCharRec ch = fontinfo.ch[c];
-    if (ch != null) {
-      for (int i = 0; i < ch.num_strokes; i++) {
-        StrokeRec stroke = ch.stroke[i];
-        gl.glBegin(GL2.GL_LINE_STRIP);
-        for (int j = 0; j < stroke.num_coords; j++) {
-          CoordRec coord = stroke.coord[j];
-          gl.glVertex2f(coord.x, coord.y);
-        }
-        gl.glEnd();
-      }
-      gl.glTranslatef(ch.right, 0.0f, 0.0f);
-    }
-  }
-
-  public void glutStrokeString(int font, String string) {
-    GL2 gl = GLUgl2.getCurrentGL2();
-    StrokeFontRec fontinfo = getStrokeFont(font);
-    int len = string.length();
-    for (int pos = 0; pos < len; pos++) {
-      int c = string.charAt(pos) & 0xFFFF;
-      if (c < 0 || c >= fontinfo.num_chars)
-        continue;
-      StrokeCharRec ch = fontinfo.ch[c];
-      if (ch != null) {
-        for (int i = 0; i < ch.num_strokes; i++) {
-          StrokeRec stroke = ch.stroke[i];
-          gl.glBegin(GL2.GL_LINE_STRIP);
-          for (int j = 0; j < stroke.num_coords; j++) {
-            CoordRec coord = stroke.coord[j];
-            gl.glVertex2f(coord.x, coord.y);
-          }
-          gl.glEnd();
-        }
-        gl.glTranslatef(ch.right, 0.0f, 0.0f);
-      }
-    }
-  }
-
-  public int  glutStrokeWidth    (int font, char character) {
-    return (int) glutStrokeWidthf(font, character);
-  }
-
-  public float glutStrokeWidthf   (int font, char character) {
-    StrokeFontRec fontinfo = getStrokeFont(font);
-    int c = character & 0xFFFF;
-    if (c < 0 || c >= fontinfo.num_chars)
-      return 0;
-    StrokeCharRec ch = fontinfo.ch[c];
-    if (ch != null)
-      return ch.right;
-    else
-      return 0;
-  }
-
-  public int  glutBitmapLength   (int font, String string) {
-    BitmapFontRec fontinfo = getBitmapFont(font);
-    int length = 0;
-    int len = string.length();
-    for (int pos = 0; pos < len; pos++) {
-      int c = string.charAt(pos) & 0xFFFF;
-      if (c >= fontinfo.first && c < fontinfo.first + fontinfo.num_chars) {
-        BitmapCharRec ch = fontinfo.ch[c - fontinfo.first];
-        if (ch != null)
-          length += ch.advance;
-      }
-    }
-    return length;
-  }
-
-  public int  glutStrokeLength   (int font, String string) {
-    return (int) glutStrokeLengthf(font, string);
-  }
-
-  public float glutStrokeLengthf  (int font, String string) {
-    StrokeFontRec fontinfo = getStrokeFont(font);
-    float length = 0;
-    int len = string.length();
-    for (int i = 0; i < len; i++) {
-      char c = string.charAt(i);
-      if (c >= 0 && c < fontinfo.num_chars) {
-        StrokeCharRec ch = fontinfo.ch[c];
-        if (ch != null)
-          length += ch.right;
-      }
-    }
-    return length;
-  }
-
-  /**
-     This function draws a wireframe dodecahedron whose
-     facets are rhombic and
-     whose vertices are at unit radius.
-     No facet lies normal to any coordinate axes.
-     The polyhedron is centered at the origin.
-  */
-  public void glutWireRhombicDodecahedron() {
-    GL2 gl = GLUgl2.getCurrentGL2();
-    for( int i = 0; i < 12; i++ ) {
-      gl.glBegin( GL2.GL_LINE_LOOP );
-      gl.glNormal3dv( rdod_n[ i ],0 );
-      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 0 ] ],0 );
-      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 1 ] ],0 );
-      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 2 ] ],0 );
-      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 3 ] ],0 );
-      gl.glEnd( );
-    }
-  }
-  
-  /**
-   This function draws a solid-shaded dodecahedron
-   whose facets are rhombic and
-   whose vertices are at unit radius.
-   No facet lies normal to any coordinate axes.
-   The polyhedron is centered at the origin.
-   */
-  public void glutSolidRhombicDodecahedron() {
-    GL2 gl = GLUgl2.getCurrentGL2();
-    gl.glBegin( GL2.GL_QUADS );
-    for( int i = 0; i < 12; i++ ) {
-      gl.glNormal3dv( rdod_n[ i ],0 );
-      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 0 ] ],0 );
-      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 1 ] ],0 );
-      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 2 ] ],0 );
-      gl.glVertex3dv( rdod_r[ rdod_v[ i ][ 3 ] ],0 );
-    }
-    gl.glEnd( );
-  }
-  
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  //----------------------------------------------------------------------
-  // Shape implementation
-  //
-
-  private GLUquadric quadObj;
-  private void quadObjInit(GLUgl2 glu) {
-    if (quadObj == null) {
-      quadObj = glu.gluNewQuadric();
-    }
-    if (quadObj == null) {
-      throw new GLException("Out of memory");
-    }
-  }
-
-  private static void doughnut(GL2 gl, double r, double R, int nsides, int rings) {
-    int i, j;
-    float theta, phi, theta1;
-    float cosTheta, sinTheta;
-    float cosTheta1, sinTheta1;
-    float ringDelta, sideDelta;
-
-    ringDelta = (float) (2.0 * Math.PI / rings);
-    sideDelta = (float) (2.0 * Math.PI / nsides);
-
-    theta = 0.0f;
-    cosTheta = 1.0f;
-    sinTheta = 0.0f;
-    for (i = rings - 1; i >= 0; i--) {
-      theta1 = theta + ringDelta;
-      cosTheta1 = (float) Math.cos(theta1);
-      sinTheta1 = (float) Math.sin(theta1);
-      gl.glBegin(GL2.GL_QUAD_STRIP);
-      phi = 0.0f;
-      for (j = nsides; j >= 0; j--) {
-        float cosPhi, sinPhi, dist;
-
-        phi += sideDelta;
-        cosPhi = (float) Math.cos(phi);
-        sinPhi = (float) Math.sin(phi);
-        dist = (float) (R + r * cosPhi);
-
-        gl.glNormal3f(cosTheta1 * cosPhi, -sinTheta1 * cosPhi, sinPhi);
-        gl.glVertex3f(cosTheta1 * dist,   -sinTheta1 * dist,   (float) r * sinPhi);
-        gl.glNormal3f(cosTheta  * cosPhi, -sinTheta  * cosPhi, sinPhi);
-        gl.glVertex3f(cosTheta  * dist,   -sinTheta  * dist,   (float) r * sinPhi);
-      }
-      gl.glEnd();
-      theta = theta1;
-      cosTheta = cosTheta1;
-      sinTheta = sinTheta1;
-    }
-  }
-
-  private static float[][] boxVertices;
-  private static final float[][] boxNormals = {
-    {-1.0f, 0.0f, 0.0f},
-    {0.0f, 1.0f, 0.0f},
-    {1.0f, 0.0f, 0.0f},
-    {0.0f, -1.0f, 0.0f},
-    {0.0f, 0.0f, 1.0f},
-    {0.0f, 0.0f, -1.0f}
-  };
-  private static final int[][] boxFaces = {
-    {0, 1, 2, 3},
-    {3, 2, 6, 7},
-    {7, 6, 5, 4},
-    {4, 5, 1, 0},
-    {5, 6, 2, 1},
-    {7, 4, 0, 3}
-  };
-  private void drawBox(GL2 gl, float size, int type) {
-    if (boxVertices == null) {
-      float[][] v = new float[8][];
-      for (int i = 0; i < 8; i++) {
-        v[i] = new float[3];
-      }
-      v[0][0] = v[1][0] = v[2][0] = v[3][0] = -0.5f;
-      v[4][0] = v[5][0] = v[6][0] = v[7][0] =  0.5f;
-      v[0][1] = v[1][1] = v[4][1] = v[5][1] = -0.5f;
-      v[2][1] = v[3][1] = v[6][1] = v[7][1] =  0.5f;
-      v[0][2] = v[3][2] = v[4][2] = v[7][2] = -0.5f;
-      v[1][2] = v[2][2] = v[5][2] = v[6][2] =  0.5f;
-      boxVertices = v;
-    }
-    float[][] v = boxVertices;
-    float[][] n = boxNormals;
-    int[][] faces = boxFaces;
-    for (int i = 5; i >= 0; i--) {
-      gl.glBegin(type);
-      gl.glNormal3fv(n[i], 0);
-      float[] vt = v[faces[i][0]];
-      gl.glVertex3f(vt[0] * size, vt[1] * size, vt[2] * size);
-      vt = v[faces[i][1]];
-      gl.glVertex3f(vt[0] * size, vt[1] * size, vt[2] * size);
-      vt = v[faces[i][2]];
-      gl.glVertex3f(vt[0] * size, vt[1] * size, vt[2] * size);
-      vt = v[faces[i][3]];
-      gl.glVertex3f(vt[0] * size, vt[1] * size, vt[2] * size);
-      gl.glEnd();
-    }
-  }
-
-  private float[][] dodec;
-
-  private void initDodecahedron() {
-    dodec = new float[20][];
-    for (int i = 0; i < dodec.length; i++) {
-      dodec[i] = new float[3];
-    }
-
-    float alpha, beta;
-
-    alpha = (float) Math.sqrt(2.0f / (3.0f + Math.sqrt(5.0)));
-    beta = 1.0f + (float) Math.sqrt(6.0 / (3.0 + Math.sqrt(5.0)) -
-                                    2.0 + 2.0 * Math.sqrt(2.0 / (3.0 + Math.sqrt(5.0))));
-    dodec[0][0] = -alpha; dodec[0][1] = 0; dodec[0][2] = beta;
-    dodec[1][0] = alpha; dodec[1][1] = 0; dodec[1][2] = beta;
-    dodec[2][0] = -1; dodec[2][1] = -1; dodec[2][2] = -1;
-    dodec[3][0] = -1; dodec[3][1] = -1; dodec[3][2] = 1;
-    dodec[4][0] = -1; dodec[4][1] = 1; dodec[4][2] = -1;
-    dodec[5][0] = -1; dodec[5][1] = 1; dodec[5][2] = 1;
-    dodec[6][0] = 1; dodec[6][1] = -1; dodec[6][2] = -1;
-    dodec[7][0] = 1; dodec[7][1] = -1; dodec[7][2] = 1;
-    dodec[8][0] = 1; dodec[8][1] = 1; dodec[8][2] = -1;
-    dodec[9][0] = 1; dodec[9][1] = 1; dodec[9][2] = 1;
-    dodec[10][0] = beta; dodec[10][1] = alpha; dodec[10][2] = 0;
-    dodec[11][0] = beta; dodec[11][1] = -alpha; dodec[11][2] = 0;
-    dodec[12][0] = -beta; dodec[12][1] = alpha; dodec[12][2] = 0;
-    dodec[13][0] = -beta; dodec[13][1] = -alpha; dodec[13][2] = 0;
-    dodec[14][0] = -alpha; dodec[14][1] = 0; dodec[14][2] = -beta;
-    dodec[15][0] = alpha; dodec[15][1] = 0; dodec[15][2] = -beta;
-    dodec[16][0] = 0; dodec[16][1] = beta; dodec[16][2] = alpha;
-    dodec[17][0] = 0; dodec[17][1] = beta; dodec[17][2] = -alpha;
-    dodec[18][0] = 0; dodec[18][1] = -beta; dodec[18][2] = alpha;
-    dodec[19][0] = 0; dodec[19][1] = -beta; dodec[19][2] = -alpha;
-  }
-
-  private static void diff3(float[] a, float[] b, float[] c) {
-    c[0] = a[0] - b[0];
-    c[1] = a[1] - b[1];
-    c[2] = a[2] - b[2];
-  }
-
-  private static void crossprod(float[] v1, float[] v2, float[] prod) {
-    float[] p = new float[3];         /* in case prod == v1 or v2 */
-
-    p[0] = v1[1] * v2[2] - v2[1] * v1[2];
-    p[1] = v1[2] * v2[0] - v2[2] * v1[0];
-    p[2] = v1[0] * v2[1] - v2[0] * v1[1];
-    prod[0] = p[0];
-    prod[1] = p[1];
-    prod[2] = p[2];
-  }
-
-  private static void normalize(float[] v) {
-    float d;
-
-    d = (float) Math.sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
-    if (d == 0.0) {
-      v[0] = d = 1.0f;
-    }
-    d = 1 / d;
-    v[0] *= d;
-    v[1] *= d;
-    v[2] *= d;
-  }
-
-  private void pentagon(GL2 gl, int a, int b, int c, int d, int e, int shadeType) {
-    float[] n0 = new float[3];
-    float[] d1 = new float[3];
-    float[] d2 = new float[3];
-
-    diff3(dodec[a], dodec[b], d1);
-    diff3(dodec[b], dodec[c], d2);
-    crossprod(d1, d2, n0);
-    normalize(n0);
-
-    gl.glBegin(shadeType);
-    gl.glNormal3fv(n0, 0);
-    gl.glVertex3fv(dodec[a], 0);
-    gl.glVertex3fv(dodec[b], 0);
-    gl.glVertex3fv(dodec[c], 0);
-    gl.glVertex3fv(dodec[d], 0);
-    gl.glVertex3fv(dodec[e], 0);
-    gl.glEnd();
-  }
-
-  private void dodecahedron(GL2 gl, int type) {
-    if (dodec == null) {
-      initDodecahedron();
-    }
-    pentagon(gl, 0, 1, 9, 16, 5, type);
-    pentagon(gl, 1, 0, 3, 18, 7, type);
-    pentagon(gl, 1, 7, 11, 10, 9, type);
-    pentagon(gl, 11, 7, 18, 19, 6, type);
-    pentagon(gl, 8, 17, 16, 9, 10, type);
-    pentagon(gl, 2, 14, 15, 6, 19, type);
-    pentagon(gl, 2, 13, 12, 4, 14, type);
-    pentagon(gl, 2, 19, 18, 3, 13, type);
-    pentagon(gl, 3, 0, 5, 12, 13, type);
-    pentagon(gl, 6, 15, 8, 10, 11, type);
-    pentagon(gl, 4, 17, 8, 15, 14, type);
-    pentagon(gl, 4, 12, 5, 16, 17, type);
-  }
-
-  private static void recorditem(GL2 gl, float[] n1, float[] n2, float[] n3, int shadeType) {
-    float[] q0 = new float[3];
-    float[] q1 = new float[3];
-
-    diff3(n1, n2, q0);
-    diff3(n2, n3, q1);
-    crossprod(q0, q1, q1);
-    normalize(q1);
-
-    gl.glBegin(shadeType);
-    gl.glNormal3fv(q1, 0);
-    gl.glVertex3fv(n1, 0);
-    gl.glVertex3fv(n2, 0);
-    gl.glVertex3fv(n3, 0);
-    gl.glEnd();
-  }
-
-  private static void subdivide(GL2 gl, float[] v0, float[] v1, float[] v2, int shadeType) {
-    int depth;
-    float[] w0 = new float[3];
-    float[] w1 = new float[3];
-    float[] w2 = new float[3];
-    float l;
-    int i, j, k, n;
-
-    depth = 1;
-    for (i = 0; i < depth; i++) {
-      for (j = 0; i + j < depth; j++) {
-        k = depth - i - j;
-        for (n = 0; n < 3; n++) {
-          w0[n] = (i * v0[n] + j * v1[n] + k * v2[n]) / depth;
-          w1[n] = ((i + 1) * v0[n] + j * v1[n] + (k - 1) * v2[n])
-            / depth;
-          w2[n] = (i * v0[n] + (j + 1) * v1[n] + (k - 1) * v2[n])
-            / depth;
-        }
-        l = (float) Math.sqrt(w0[0] * w0[0] + w0[1] * w0[1] + w0[2] * w0[2]);
-        w0[0] /= l;
-        w0[1] /= l;
-        w0[2] /= l;
-        l = (float) Math.sqrt(w1[0] * w1[0] + w1[1] * w1[1] + w1[2] * w1[2]);
-        w1[0] /= l;
-        w1[1] /= l;
-        w1[2] /= l;
-        l = (float) Math.sqrt(w2[0] * w2[0] + w2[1] * w2[1] + w2[2] * w2[2]);
-        w2[0] /= l;
-        w2[1] /= l;
-        w2[2] /= l;
-        recorditem(gl, w1, w0, w2, shadeType);
-      }
-    }
-  }
-
-  private static void drawtriangle(GL2 gl, int i, float[][] data, int[][] ndx, int shadeType) {
-    float[] x0 = data[ndx[i][0]];
-    float[] x1 = data[ndx[i][1]];
-    float[] x2 = data[ndx[i][2]];
-    subdivide(gl, x0, x1, x2, shadeType);
-  }
-
-  /* octahedron data: The octahedron produced is centered at the
-     origin and has radius 1.0 */
-  private static final float[][] odata =
-  {
-    {1.0f, 0.0f, 0.0f},
-    {-1.0f, 0.0f, 0.0f},
-    {0.0f, 1.0f, 0.0f},
-    {0.0f, -1.0f, 0.0f},
-    {0.0f, 0.0f, 1.0f},
-    {0.0f, 0.0f, -1.0f}
-  };
-
-  private static final int[][] ondex =
-  {
-    {0, 4, 2},
-    {1, 2, 4},
-    {0, 3, 4},
-    {1, 4, 3},
-    {0, 2, 5},
-    {1, 5, 2},
-    {0, 5, 3},
-    {1, 3, 5}
-  };
-
-  private static void octahedron(GL2 gl, int shadeType) {
-    int i;
-
-    for (i = 7; i >= 0; i--) {
-      drawtriangle(gl, i, odata, ondex, shadeType);
-    }
-  }
-
-  /* icosahedron data: These numbers are rigged to make an
-     icosahedron of radius 1.0 */
-
-  private static final float X = .525731112119133606f;
-  private static final float Z = .850650808352039932f;
-
-  private static final float[][] idata =
-  {
-    {-X, 0, Z},
-    {X, 0, Z},
-    {-X, 0, -Z},
-    {X, 0, -Z},
-    {0, Z, X},
-    {0, Z, -X},
-    {0, -Z, X},
-    {0, -Z, -X},
-    {Z, X, 0},
-    {-Z, X, 0},
-    {Z, -X, 0},
-    {-Z, -X, 0}
-  };
-
-  private static final int[][] index =
-  {
-    {0, 4, 1},
-    {0, 9, 4},
-    {9, 5, 4},
-    {4, 5, 8},
-    {4, 8, 1},
-    {8, 10, 1},
-    {8, 3, 10},
-    {5, 3, 8},
-    {5, 2, 3},
-    {2, 7, 3},
-    {7, 10, 3},
-    {7, 6, 10},
-    {7, 11, 6},
-    {11, 0, 6},
-    {0, 1, 6},
-    {6, 1, 10},
-    {9, 0, 11},
-    {9, 11, 2},
-    {9, 2, 5},
-    {7, 2, 11},
-  };
-
-  private static void icosahedron(GL2 gl, int shadeType) {
-    int i;
-
-    for (i = 19; i >= 0; i--) {
-      drawtriangle(gl, i, idata, index, shadeType);
-    }
-  }
-
-  /* rhombic dodecahedron data: */
-  
-  private static final double rdod_r[][] =
-  {
-    { 0.0, 0.0, 1.0 },
-    {  0.707106781187,  0.000000000000,  0.5 },
-    {  0.000000000000,  0.707106781187,  0.5 },
-    { -0.707106781187,  0.000000000000,  0.5 },
-    {  0.000000000000, -0.707106781187,  0.5 },
-    {  0.707106781187,  0.707106781187,  0.0 },
-    { -0.707106781187,  0.707106781187,  0.0 },
-    { -0.707106781187, -0.707106781187,  0.0 },
-    {  0.707106781187, -0.707106781187,  0.0 },
-    {  0.707106781187,  0.000000000000, -0.5 },
-    {  0.000000000000,  0.707106781187, -0.5 },
-    { -0.707106781187,  0.000000000000, -0.5 },
-    {  0.000000000000, -0.707106781187, -0.5 },
-    {  0.0, 0.0, -1.0 }
-  };
-  
-  private static final int rdod_v[][] =
-  {
-    { 0,  1,  5,  2 },
-    { 0,  2,  6,  3 },
-    { 0,  3,  7,  4 },
-    { 0,  4,  8,  1 },
-    { 5, 10,  6,  2 },
-    { 6, 11,  7,  3 },
-    { 7, 12,  8,  4 },
-    { 8,  9,  5,  1 },
-    { 5,  9, 13, 10 },
-    { 6, 10, 13, 11 },
-    { 7, 11, 13, 12 },
-    { 8, 12, 13,  9 }
-  };
-  
-  private static final double rdod_n[][] =
-  {
-    {  0.353553390594,  0.353553390594,  0.5 },
-    { -0.353553390594,  0.353553390594,  0.5 },
-    { -0.353553390594, -0.353553390594,  0.5 },
-    {  0.353553390594, -0.353553390594,  0.5 },
-    {  0.000000000000,  1.000000000000,  0.0 },
-    { -1.000000000000,  0.000000000000,  0.0 },
-    {  0.000000000000, -1.000000000000,  0.0 },
-    {  1.000000000000,  0.000000000000,  0.0 },
-    {  0.353553390594,  0.353553390594, -0.5 },
-    { -0.353553390594,  0.353553390594, -0.5 },
-    { -0.353553390594, -0.353553390594, -0.5 },
-    {  0.353553390594, -0.353553390594, -0.5 }
-  };
-  
-  /* tetrahedron data: */
-
-  private static final float T = 1.73205080756887729f;
-
-  private static final float[][] tdata =
-  {
-    {T, T, T},
-    {T, -T, -T},
-    {-T, T, -T},
-    {-T, -T, T}
-  };
-
-  private static final int[][] tndex =
-  {
-    {0, 1, 3},
-    {2, 1, 0},
-    {3, 2, 0},
-    {1, 2, 3}
-  };
-
-  private static final void tetrahedron(GL2 gl, int shadeType) {
-    for (int i = 3; i >= 0; i--)
-      drawtriangle(gl, i, tdata, tndex, shadeType);
-  }
-
-  // Teapot implementation (a modified port of glut_teapot.c)
-  //
-  // Rim, body, lid, and bottom data must be reflected in x and
-  // y; handle and spout data across the y axis only.
-  private static final int[][] teapotPatchData = {
-    /* rim */
-    {102, 103, 104, 105, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
-    /* body */
-    {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27},
-    {24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40},
-    /* lid */
-    {96, 96, 96, 96, 97, 98, 99, 100, 101, 101, 101, 101, 0, 1, 2, 3,},
-    {0, 1, 2, 3, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117},
-    /* bottom */
-    {118, 118, 118, 118, 124, 122, 119, 121, 123, 126, 125, 120, 40, 39, 38, 37},
-    /* handle */
-    {41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56},
-    {53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 28, 65, 66, 67},
-    /* spout */
-    {68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83},
-    {80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95}
-  };
-  private static final float[][] teapotCPData = {
-    {0.2f, 0f, 2.7f},
-    {0.2f, -0.112f, 2.7f},
-    {0.112f, -0.2f, 2.7f},
-    {0f, -0.2f, 2.7f},
-    {1.3375f, 0f, 2.53125f},
-    {1.3375f, -0.749f, 2.53125f},
-    {0.749f, -1.3375f, 2.53125f},
-    {0f, -1.3375f, 2.53125f},
-    {1.4375f, 0f, 2.53125f},
-    {1.4375f, -0.805f, 2.53125f},
-    {0.805f, -1.4375f, 2.53125f},
-    {0f, -1.4375f, 2.53125f},
-    {1.5f, 0f, 2.4f},
-    {1.5f, -0.84f, 2.4f},
-    {0.84f, -1.5f, 2.4f},
-    {0f, -1.5f, 2.4f},
-    {1.75f, 0f, 1.875f},
-    {1.75f, -0.98f, 1.875f},
-    {0.98f, -1.75f, 1.875f},
-    {0f, -1.75f, 1.875f},
-    {2f, 0f, 1.35f},
-    {2f, -1.12f, 1.35f},
-    {1.12f, -2f, 1.35f},
-    {0f, -2f, 1.35f},
-    {2f, 0f, 0.9f},
-    {2f, -1.12f, 0.9f},
-    {1.12f, -2f, 0.9f},
-    {0f, -2f, 0.9f},
-    {-2f, 0f, 0.9f},
-    {2f, 0f, 0.45f},
-    {2f, -1.12f, 0.45f},
-    {1.12f, -2f, 0.45f},
-    {0f, -2f, 0.45f},
-    {1.5f, 0f, 0.225f},
-    {1.5f, -0.84f, 0.225f},
-    {0.84f, -1.5f, 0.225f},
-    {0f, -1.5f, 0.225f},
-    {1.5f, 0f, 0.15f},
-    {1.5f, -0.84f, 0.15f},
-    {0.84f, -1.5f, 0.15f},
-    {0f, -1.5f, 0.15f},
-    {-1.6f, 0f, 2.025f},
-    {-1.6f, -0.3f, 2.025f},
-    {-1.5f, -0.3f, 2.25f},
-    {-1.5f, 0f, 2.25f},
-    {-2.3f, 0f, 2.025f},
-    {-2.3f, -0.3f, 2.025f},
-    {-2.5f, -0.3f, 2.25f},
-    {-2.5f, 0f, 2.25f},
-    {-2.7f, 0f, 2.025f},
-    {-2.7f, -0.3f, 2.025f},
-    {-3f, -0.3f, 2.25f},
-    {-3f, 0f, 2.25f},
-    {-2.7f, 0f, 1.8f},
-    {-2.7f, -0.3f, 1.8f},
-    {-3f, -0.3f, 1.8f},
-    {-3f, 0f, 1.8f},
-    {-2.7f, 0f, 1.575f},
-    {-2.7f, -0.3f, 1.575f},
-    {-3f, -0.3f, 1.35f},
-    {-3f, 0f, 1.35f},
-    {-2.5f, 0f, 1.125f},
-    {-2.5f, -0.3f, 1.125f},
-    {-2.65f, -0.3f, 0.9375f},
-    {-2.65f, 0f, 0.9375f},
-    {-2f, -0.3f, 0.9f},
-    {-1.9f, -0.3f, 0.6f},
-    {-1.9f, 0f, 0.6f},
-    {1.7f, 0f, 1.425f},
-    {1.7f, -0.66f, 1.425f},
-    {1.7f, -0.66f, 0.6f},
-    {1.7f, 0f, 0.6f},
-    {2.6f, 0f, 1.425f},
-    {2.6f, -0.66f, 1.425f},
-    {3.1f, -0.66f, 0.825f},
-    {3.1f, 0f, 0.825f},
-    {2.3f, 0f, 2.1f},
-    {2.3f, -0.25f, 2.1f},
-    {2.4f, -0.25f, 2.025f},
-    {2.4f, 0f, 2.025f},
-    {2.7f, 0f, 2.4f},
-    {2.7f, -0.25f, 2.4f},
-    {3.3f, -0.25f, 2.4f},
-    {3.3f, 0f, 2.4f},
-    {2.8f, 0f, 2.475f},
-    {2.8f, -0.25f, 2.475f},
-    {3.525f, -0.25f, 2.49375f},
-    {3.525f, 0f, 2.49375f},
-    {2.9f, 0f, 2.475f},
-    {2.9f, -0.15f, 2.475f},
-    {3.45f, -0.15f, 2.5125f},
-    {3.45f, 0f, 2.5125f},
-    {2.8f, 0f, 2.4f},
-    {2.8f, -0.15f, 2.4f},
-    {3.2f, -0.15f, 2.4f},
-    {3.2f, 0f, 2.4f},
-    {0f, 0f, 3.15f},
-    {0.8f, 0f, 3.15f},
-    {0.8f, -0.45f, 3.15f},
-    {0.45f, -0.8f, 3.15f},
-    {0f, -0.8f, 3.15f},
-    {0f, 0f, 2.85f},
-    {1.4f, 0f, 2.4f},
-    {1.4f, -0.784f, 2.4f},
-    {0.784f, -1.4f, 2.4f},
-    {0f, -1.4f, 2.4f},
-    {0.4f, 0f, 2.55f},
-    {0.4f, -0.224f, 2.55f},
-    {0.224f, -0.4f, 2.55f},
-    {0f, -0.4f, 2.55f},
-    {1.3f, 0f, 2.55f},
-    {1.3f, -0.728f, 2.55f},
-    {0.728f, -1.3f, 2.55f},
-    {0f, -1.3f, 2.55f},
-    {1.3f, 0f, 2.4f},
-    {1.3f, -0.728f, 2.4f},
-    {0.728f, -1.3f, 2.4f},
-    {0f, -1.3f, 2.4f},
-    {0f, 0f, 0f},
-    {1.425f, -0.798f, 0f},
-    {1.5f, 0f, 0.075f},
-    {1.425f, 0f, 0f},
-    {0.798f, -1.425f, 0f},
-    {0f, -1.5f, 0.075f},
-    {0f, -1.425f, 0f},
-    {1.5f, -0.84f, 0.075f},
-    {0.84f, -1.5f, 0.075f}
-  };
-  // Since GL2.glMap2f expects a packed array of floats, we must convert
-  // from a 3-dimensional array to a 1-dimensional array
-  private static final float[] teapotTex = {
-    0, 0, 1, 0, 0, 1, 1, 1
-  };
-
-  private static void teapot(GL2 gl,
-                             int grid,
-                             double scale,
-                             int type,
-                             boolean backCompatible)
-  {
-    // As mentioned above, GL2.glMap2f expects a packed array of floats
-    float[] p = new float[4*4*3];
-    float[] q = new float[4*4*3];
-    float[] r = new float[4*4*3];
-    float[] s = new float[4*4*3];
-    int i, j, k, l;
-  
-    gl.glPushAttrib(GL2.GL_ENABLE_BIT | GL2.GL_EVAL_BIT | GL2.GL_POLYGON_BIT);
-    gl.glEnable(GL2.GL_AUTO_NORMAL);
-    gl.glEnable(GL2.GL_NORMALIZE);
-    gl.glEnable(GL2.GL_MAP2_VERTEX_3);
-    gl.glEnable(GL2.GL_MAP2_TEXTURE_COORD_2);
-    gl.glPushMatrix();
-    if (!backCompatible) {
-      // The time has come to have the teapot no longer be inside out
-      gl.glFrontFace(GL2.GL_CW);
-      gl.glScaled(0.5*scale, 0.5*scale, 0.5*scale);
-    } else {
-      // We want the teapot in it's backward compatible position and
-      // orientation
-      gl.glRotatef(270.0f, 1, 0, 0);
-      gl.glScalef((float)(0.5 * scale),
-                  (float)(0.5 * scale),
-                  (float)(0.5 * scale));
-      gl.glTranslatef(0.0f, 0.0f, -1.5f);
-    }
-    for (i = 0; i < 10; i++) {
-      for (j = 0; j < 4; j++) {
-        for (k = 0; k < 4; k++) {
-          for (l = 0; l < 3; l++) {
-            p[(j*4+k)*3+l] = teapotCPData[teapotPatchData[i][j * 4 + k]][l];
-            q[(j*4+k)*3+l] =
-              teapotCPData[teapotPatchData[i][j * 4 + (3 - k)]][l];
-            if (l == 1)
-              q[(j*4+k)*3+l] *= -1.0;
-            if (i < 6) {
-              r[(j*4+k)*3+l] =
-                teapotCPData[teapotPatchData[i][j * 4 + (3 - k)]][l];
-              if (l == 0)
-                r[(j*4+k)*3+l] *= -1.0;
-              s[(j*4+k)*3+l] = teapotCPData[teapotPatchData[i][j * 4 + k]][l];
-              if (l == 0)
-                s[(j*4+k)*3+l] *= -1.0;
-              if (l == 1)
-                s[(j*4+k)*3+l] *= -1.0;
-            }
-          }
-        }
-      }
-      gl.glMap2f(GL2.GL_MAP2_TEXTURE_COORD_2, 0, 1, 2, 2, 0, 1, 4, 2, teapotTex, 0);
-      gl.glMap2f(GL2.GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4, p, 0);
-      gl.glMapGrid2f(grid, 0.0f, 1.0f, grid, 0.0f, 1.0f);
-      evaluateTeapotMesh(gl, grid, type, i, !backCompatible);
-      gl.glMap2f(GL2.GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4, q, 0);
-      evaluateTeapotMesh(gl, grid, type, i, !backCompatible);
-      if (i < 6) {
-        gl.glMap2f(GL2.GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4, r, 0);
-        evaluateTeapotMesh(gl, grid, type, i, !backCompatible);
-        gl.glMap2f(GL2.GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4, s, 0);
-        evaluateTeapotMesh(gl, grid, type, i, !backCompatible);
-      }
-    }
-    gl.glPopMatrix();
-    gl.glPopAttrib();
-  }
-  
-  private static void evaluateTeapotMesh(GL2 gl,
-                                         int grid,
-                                         int type,
-                                         int partNum,
-                                         boolean repairSingularities)
-  {
-    if (repairSingularities && (partNum == 5 || partNum == 3)) {
-      // Instead of using evaluators that give bad results at singularities,
-      // evaluate by hand
-      gl.glPolygonMode(GL2.GL_FRONT_AND_BACK, type);
-      for (int nv = 0; nv < grid; nv++) {
-        if (nv == 0) {
-          // Draw a small triangle-fan to fill the hole
-          gl.glDisable(GL2.GL_AUTO_NORMAL);
-          gl.glNormal3f(0, 0, partNum == 3 ? 1 : -1);
-          gl.glBegin(GL2.GL_TRIANGLE_FAN);
-          {
-            gl.glEvalCoord2f(0, 0);
-            // Note that we draw in clock-wise order to match the evaluator
-            // method
-            for (int nu = 0; nu <= grid; nu++)
-            {
-              gl.glEvalCoord2f(nu / (float)grid, (1f / grid) / (float)grid);
-            }
-          }
-          gl.glEnd();
-          gl.glEnable(GL2.GL_AUTO_NORMAL);
-        }
-        // Draw the rest of the piece as an evaluated quad-strip
-        gl.glBegin(GL2.GL_QUAD_STRIP);
-        {
-          // Note that we draw in clock-wise order to match the evaluator method
-          for (int nu = grid; nu >= 0; nu--) {
-            gl.glEvalCoord2f(nu / (float)grid, (nv + 1) / (float)grid);
-            gl.glEvalCoord2f(nu / (float)grid, Math.max(nv, 1f / grid)
-                                                         / (float)grid);
-          }
-        }
-        gl.glEnd();
-      }
-    } else {
-      gl.glEvalMesh2(type, 0, grid, 0, grid);
-    }
-  }
-
-  //----------------------------------------------------------------------
-  // Font implementation
-  //
-
-  private static void bitmapCharacterImpl(GL2 gl, int font, char cin) {
-    BitmapFontRec fontinfo = getBitmapFont(font);
-    int c = cin & 0xFFFF;
-    if (c < fontinfo.first ||
-        c >= fontinfo.first + fontinfo.num_chars)
-      return;
-    BitmapCharRec ch = fontinfo.ch[c - fontinfo.first];
-    if (ch != null) {
-      gl.glBitmap(ch.width, ch.height, ch.xorig, ch.yorig,
-                  ch.advance, 0, ch.bitmap, 0);
-    }
-  }
-
-  private static final BitmapFontRec[] bitmapFonts = new BitmapFontRec[9];
-  private static final StrokeFontRec[] strokeFonts = new StrokeFontRec[9];
-
-  private static BitmapFontRec getBitmapFont(int font) {
-    BitmapFontRec rec = bitmapFonts[font];
-    if (rec == null) {
-      switch (font) {
-        case BITMAP_9_BY_15:
-          rec = GLUTBitmap9x15.glutBitmap9By15;
-          break;
-        case BITMAP_8_BY_13:
-          rec = GLUTBitmap8x13.glutBitmap8By13;
-          break;
-        case BITMAP_TIMES_ROMAN_10:
-          rec = GLUTBitmapTimesRoman10.glutBitmapTimesRoman10;
-          break;
-        case BITMAP_TIMES_ROMAN_24:
-          rec = GLUTBitmapTimesRoman24.glutBitmapTimesRoman24;
-          break;
-        case BITMAP_HELVETICA_10:
-          rec = GLUTBitmapHelvetica10.glutBitmapHelvetica10;
-          break;
-        case BITMAP_HELVETICA_12:
-          rec = GLUTBitmapHelvetica12.glutBitmapHelvetica12;
-          break;
-        case BITMAP_HELVETICA_18:
-          rec = GLUTBitmapHelvetica18.glutBitmapHelvetica18;
-          break;
-        default:
-          throw new GLException("Unknown bitmap font number " + font);
-      }
-      bitmapFonts[font] = rec;
-    }
-    return rec;
-  }
-
-  private static StrokeFontRec getStrokeFont(int font) {
-    StrokeFontRec rec = strokeFonts[font];
-    if (rec == null) {
-      switch (font) {
-        case STROKE_ROMAN:
-          rec = GLUTStrokeRoman.glutStrokeRoman;
-          break;
-        case STROKE_MONO_ROMAN:
-          rec = GLUTStrokeMonoRoman.glutStrokeMonoRoman;
-          break;
-        default:
-          throw new GLException("Unknown stroke font number " + font);
-      }
-    }
-    return rec;
-  }
-
-  private static void beginBitmap(GL2 gl,
-                                  int[] swapbytes,
-                                  int[] lsbfirst,
-                                  int[] rowlength,
-                                  int[] skiprows,
-                                  int[] skippixels,
-                                  int[] alignment) {
-    gl.glGetIntegerv(GL2.GL_UNPACK_SWAP_BYTES, swapbytes, 0);
-    gl.glGetIntegerv(GL2.GL_UNPACK_LSB_FIRST, lsbfirst, 0);
-    gl.glGetIntegerv(GL2.GL_UNPACK_ROW_LENGTH, rowlength, 0);
-    gl.glGetIntegerv(GL2.GL_UNPACK_SKIP_ROWS, skiprows, 0);
-    gl.glGetIntegerv(GL2.GL_UNPACK_SKIP_PIXELS, skippixels, 0);
-    gl.glGetIntegerv(GL2.GL_UNPACK_ALIGNMENT, alignment, 0);
-    /* Little endian machines (DEC Alpha for example) could
-       benefit from setting GL_UNPACK_LSB_FIRST to GL_TRUE
-       instead of GL_FALSE, but this would require changing the
-       generated bitmaps too. */
-    gl.glPixelStorei(GL2.GL_UNPACK_SWAP_BYTES, GL2.GL_FALSE);
-    gl.glPixelStorei(GL2.GL_UNPACK_LSB_FIRST, GL2.GL_FALSE);
-    gl.glPixelStorei(GL2.GL_UNPACK_ROW_LENGTH, 0);
-    gl.glPixelStorei(GL2.GL_UNPACK_SKIP_ROWS, 0);
-    gl.glPixelStorei(GL2.GL_UNPACK_SKIP_PIXELS, 0);
-    gl.glPixelStorei(GL2.GL_UNPACK_ALIGNMENT, 1);
-  }
-
-  private static void endBitmap(GL2 gl,
-                                int[] swapbytes,
-                                int[] lsbfirst,
-                                int[] rowlength,
-                                int[] skiprows,
-                                int[] skippixels,
-                                int[] alignment) {
-    /* Restore saved modes. */
-    gl.glPixelStorei(GL2.GL_UNPACK_SWAP_BYTES, swapbytes[0]);
-    gl.glPixelStorei(GL2.GL_UNPACK_LSB_FIRST, lsbfirst[0]);
-    gl.glPixelStorei(GL2.GL_UNPACK_ROW_LENGTH, rowlength[0]);
-    gl.glPixelStorei(GL2.GL_UNPACK_SKIP_ROWS, skiprows[0]);
-    gl.glPixelStorei(GL2.GL_UNPACK_SKIP_PIXELS, skippixels[0]);
-    gl.glPixelStorei(GL2.GL_UNPACK_ALIGNMENT, alignment[0]);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap8x13.java b/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap8x13.java
deleted file mode 100644
index b6e5c425a..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap8x13.java
+++ /dev/null
@@ -1,2078 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-class GLUTBitmap8x13 {
-
-/* GENERATED FILE -- DO NOT MODIFY */
-
-
-static final BitmapCharRec ch0 = new BitmapCharRec(0,0,0,0,8,null);
-
-static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,8,null);
-
-static final BitmapCharRec ch127 = new BitmapCharRec(0,0,0,0,8,null);
-
-static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,8,null);
-
-/* char: 0xff */
-
-static final byte[] ch255data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x48,
-};
-
-static final BitmapCharRec ch255 = new BitmapCharRec(6,12,-1,2,8,ch255data);
-
-/* char: 0xfe */
-
-static final byte[] ch254data = {
-(byte) 0x80,(byte) 0x80,(byte) 0xb8,(byte) 0xc4,(byte) 0x84,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch254 = new BitmapCharRec(6,10,-1,2,8,ch254data);
-
-/* char: 0xfd */
-
-static final byte[] ch253data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch253 = new BitmapCharRec(6,12,-1,2,8,ch253data);
-
-/* char: 0xfc */
-
-static final byte[] ch252data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x48,
-};
-
-static final BitmapCharRec ch252 = new BitmapCharRec(6,10,-1,0,8,ch252data);
-
-/* char: 0xfb */
-
-static final byte[] ch251data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch251 = new BitmapCharRec(6,10,-1,0,8,ch251data);
-
-/* char: 0xfa */
-
-static final byte[] ch250data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch250 = new BitmapCharRec(6,10,-1,0,8,ch250data);
-
-/* char: 0xf9 */
-
-static final byte[] ch249data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch249 = new BitmapCharRec(6,10,-1,0,8,ch249data);
-
-/* char: 0xf8 */
-
-static final byte[] ch248data = {
-(byte) 0x80,(byte) 0x78,(byte) 0xc4,(byte) 0xa4,(byte) 0x94,(byte) 0x8c,(byte) 0x78,(byte) 0x4,
-};
-
-static final BitmapCharRec ch248 = new BitmapCharRec(6,8,-1,1,8,ch248data);
-
-/* char: 0xf7 */
-
-static final byte[] ch247data = {
-(byte) 0x20,(byte) 0x20,(byte) 0x0,(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch247 = new BitmapCharRec(5,7,-1,-1,8,ch247data);
-
-/* char: 0xf6 */
-
-static final byte[] ch246data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x48,
-};
-
-static final BitmapCharRec ch246 = new BitmapCharRec(6,10,-1,0,8,ch246data);
-
-/* char: 0xf5 */
-
-static final byte[] ch245data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch245 = new BitmapCharRec(6,10,-1,0,8,ch245data);
-
-/* char: 0xf4 */
-
-static final byte[] ch244data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch244 = new BitmapCharRec(6,10,-1,0,8,ch244data);
-
-/* char: 0xf3 */
-
-static final byte[] ch243data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch243 = new BitmapCharRec(6,10,-1,0,8,ch243data);
-
-/* char: 0xf2 */
-
-static final byte[] ch242data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch242 = new BitmapCharRec(6,10,-1,0,8,ch242data);
-
-/* char: 0xf1 */
-
-static final byte[] ch241data = {
-(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch241 = new BitmapCharRec(6,10,-1,0,8,ch241data);
-
-/* char: 0xf0 */
-
-static final byte[] ch240data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x8,(byte) 0x50,(byte) 0x30,(byte) 0x48,
-};
-
-static final BitmapCharRec ch240 = new BitmapCharRec(6,10,-1,0,8,ch240data);
-
-/* char: 0xef */
-
-static final byte[] ch239data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x50,
-};
-
-static final BitmapCharRec ch239 = new BitmapCharRec(5,10,-1,0,8,ch239data);
-
-/* char: 0xee */
-
-static final byte[] ch238data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch238 = new BitmapCharRec(5,10,-1,0,8,ch238data);
-
-/* char: 0xed */
-
-static final byte[] ch237data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch237 = new BitmapCharRec(5,10,-1,0,8,ch237data);
-
-/* char: 0xec */
-
-static final byte[] ch236data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch236 = new BitmapCharRec(5,10,-1,0,8,ch236data);
-
-/* char: 0xeb */
-
-static final byte[] ch235data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0xfc,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x48,
-};
-
-static final BitmapCharRec ch235 = new BitmapCharRec(6,10,-1,0,8,ch235data);
-
-/* char: 0xea */
-
-static final byte[] ch234data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0xfc,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch234 = new BitmapCharRec(6,10,-1,0,8,ch234data);
-
-/* char: 0xe9 */
-
-static final byte[] ch233data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0xfc,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch233 = new BitmapCharRec(6,10,-1,0,8,ch233data);
-
-/* char: 0xe8 */
-
-static final byte[] ch232data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0xfc,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch232 = new BitmapCharRec(6,10,-1,0,8,ch232data);
-
-/* char: 0xe7 */
-
-static final byte[] ch231data = {
-(byte) 0x20,(byte) 0x10,(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch231 = new BitmapCharRec(6,8,-1,2,8,ch231data);
-
-/* char: 0xe6 */
-
-static final byte[] ch230data = {
-(byte) 0x6c,(byte) 0x92,(byte) 0x90,(byte) 0x7c,(byte) 0x12,(byte) 0x6c,
-};
-
-static final BitmapCharRec ch230 = new BitmapCharRec(7,6,0,0,8,ch230data);
-
-/* char: 0xe5 */
-
-static final byte[] ch229data = {
-(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,(byte) 0x0,(byte) 0x30,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch229 = new BitmapCharRec(6,10,-1,0,8,ch229data);
-
-/* char: 0xe4 */
-
-static final byte[] ch228data = {
-(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x48,
-};
-
-static final BitmapCharRec ch228 = new BitmapCharRec(6,10,-1,0,8,ch228data);
-
-/* char: 0xe3 */
-
-static final byte[] ch227data = {
-(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch227 = new BitmapCharRec(6,10,-1,0,8,ch227data);
-
-/* char: 0xe2 */
-
-static final byte[] ch226data = {
-(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch226 = new BitmapCharRec(6,10,-1,0,8,ch226data);
-
-/* char: 0xe1 */
-
-static final byte[] ch225data = {
-(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch225 = new BitmapCharRec(6,10,-1,0,8,ch225data);
-
-/* char: 0xe0 */
-
-static final byte[] ch224data = {
-(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch224 = new BitmapCharRec(6,10,-1,0,8,ch224data);
-
-/* char: 0xdf */
-
-static final byte[] ch223data = {
-(byte) 0x80,(byte) 0xb8,(byte) 0xc4,(byte) 0x84,(byte) 0x84,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch223 = new BitmapCharRec(6,9,-1,1,8,ch223data);
-
-/* char: 0xde */
-
-static final byte[] ch222data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,(byte) 0x80,
-};
-
-static final BitmapCharRec ch222 = new BitmapCharRec(6,9,-1,0,8,ch222data);
-
-/* char: 0xdd */
-
-static final byte[] ch221data = {
-(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x50,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch221 = new BitmapCharRec(5,10,-1,0,8,ch221data);
-
-/* char: 0xdc */
-
-static final byte[] ch220data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x48,(byte) 0x48,
-};
-
-static final BitmapCharRec ch220 = new BitmapCharRec(6,10,-1,0,8,ch220data);
-
-/* char: 0xdb */
-
-static final byte[] ch219data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch219 = new BitmapCharRec(6,10,-1,0,8,ch219data);
-
-/* char: 0xda */
-
-static final byte[] ch218data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch218 = new BitmapCharRec(6,10,-1,0,8,ch218data);
-
-/* char: 0xd9 */
-
-static final byte[] ch217data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch217 = new BitmapCharRec(6,10,-1,0,8,ch217data);
-
-/* char: 0xd8 */
-
-static final byte[] ch216data = {
-(byte) 0x80,(byte) 0x78,(byte) 0xc4,(byte) 0xa4,(byte) 0xa4,(byte) 0xa4,(byte) 0x94,(byte) 0x94,(byte) 0x8c,(byte) 0x78,(byte) 0x4,
-};
-
-static final BitmapCharRec ch216 = new BitmapCharRec(6,11,-1,1,8,ch216data);
-
-/* char: 0xd7 */
-
-static final byte[] ch215data = {
-(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x30,(byte) 0x48,(byte) 0x84,
-};
-
-static final BitmapCharRec ch215 = new BitmapCharRec(6,6,-1,-1,8,ch215data);
-
-/* char: 0xd6 */
-
-static final byte[] ch214data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x28,(byte) 0x28,
-};
-
-static final BitmapCharRec ch214 = new BitmapCharRec(7,10,0,0,8,ch214data);
-
-/* char: 0xd5 */
-
-static final byte[] ch213data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x28,(byte) 0x14,
-};
-
-static final BitmapCharRec ch213 = new BitmapCharRec(7,10,0,0,8,ch213data);
-
-/* char: 0xd4 */
-
-static final byte[] ch212data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x24,(byte) 0x18,
-};
-
-static final BitmapCharRec ch212 = new BitmapCharRec(7,10,0,0,8,ch212data);
-
-/* char: 0xd3 */
-
-static final byte[] ch211data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch211 = new BitmapCharRec(7,10,0,0,8,ch211data);
-
-/* char: 0xd2 */
-
-static final byte[] ch210data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x8,(byte) 0x10,
-};
-
-static final BitmapCharRec ch210 = new BitmapCharRec(7,10,0,0,8,ch210data);
-
-/* char: 0xd1 */
-
-static final byte[] ch209data = {
-(byte) 0x82,(byte) 0x86,(byte) 0x8a,(byte) 0x92,(byte) 0xa2,(byte) 0xc2,(byte) 0x82,(byte) 0x0,(byte) 0x28,(byte) 0x14,
-};
-
-static final BitmapCharRec ch209 = new BitmapCharRec(7,10,0,0,8,ch209data);
-
-/* char: 0xd0 */
-
-static final byte[] ch208data = {
-(byte) 0xfc,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xe2,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch208 = new BitmapCharRec(7,9,0,0,8,ch208data);
-
-/* char: 0xcf */
-
-static final byte[] ch207data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x50,(byte) 0x50,
-};
-
-static final BitmapCharRec ch207 = new BitmapCharRec(5,10,-1,0,8,ch207data);
-
-/* char: 0xce */
-
-static final byte[] ch206data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch206 = new BitmapCharRec(5,10,-1,0,8,ch206data);
-
-/* char: 0xcd */
-
-static final byte[] ch205data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch205 = new BitmapCharRec(5,10,-1,0,8,ch205data);
-
-/* char: 0xcc */
-
-static final byte[] ch204data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch204 = new BitmapCharRec(5,10,-1,0,8,ch204data);
-
-/* char: 0xcb */
-
-static final byte[] ch203data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x48,(byte) 0x48,
-};
-
-static final BitmapCharRec ch203 = new BitmapCharRec(6,10,-1,0,8,ch203data);
-
-/* char: 0xca */
-
-static final byte[] ch202data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch202 = new BitmapCharRec(6,10,-1,0,8,ch202data);
-
-/* char: 0xc9 */
-
-static final byte[] ch201data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch201 = new BitmapCharRec(6,10,-1,0,8,ch201data);
-
-/* char: 0xc8 */
-
-static final byte[] ch200data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch200 = new BitmapCharRec(6,10,-1,0,8,ch200data);
-
-/* char: 0xc7 */
-
-static final byte[] ch199data = {
-(byte) 0x20,(byte) 0x10,(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch199 = new BitmapCharRec(6,11,-1,2,8,ch199data);
-
-/* char: 0xc6 */
-
-static final byte[] ch198data = {
-(byte) 0x9e,(byte) 0x90,(byte) 0x90,(byte) 0xf0,(byte) 0x9c,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x6e,
-};
-
-static final BitmapCharRec ch198 = new BitmapCharRec(7,9,0,0,8,ch198data);
-
-/* char: 0xc5 */
-
-static final byte[] ch197data = {
-(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x30,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch197 = new BitmapCharRec(6,10,-1,0,8,ch197data);
-
-/* char: 0xc4 */
-
-static final byte[] ch196data = {
-(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x0,(byte) 0x48,(byte) 0x48,
-};
-
-static final BitmapCharRec ch196 = new BitmapCharRec(6,10,-1,0,8,ch196data);
-
-/* char: 0xc3 */
-
-static final byte[] ch195data = {
-(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch195 = new BitmapCharRec(6,10,-1,0,8,ch195data);
-
-/* char: 0xc2 */
-
-static final byte[] ch194data = {
-(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x0,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch194 = new BitmapCharRec(6,10,-1,0,8,ch194data);
-
-/* char: 0xc1 */
-
-static final byte[] ch193data = {
-(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch193 = new BitmapCharRec(6,10,-1,0,8,ch193data);
-
-/* char: 0xc0 */
-
-static final byte[] ch192data = {
-(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch192 = new BitmapCharRec(6,10,-1,0,8,ch192data);
-
-/* char: 0xbf */
-
-static final byte[] ch191data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x0,(byte) 0x20,
-};
-
-static final BitmapCharRec ch191 = new BitmapCharRec(6,9,-1,0,8,ch191data);
-
-/* char: 0xbe */
-
-static final byte[] ch190data = {
-(byte) 0x6,(byte) 0x1a,(byte) 0x12,(byte) 0xa,(byte) 0x66,(byte) 0x92,(byte) 0x10,(byte) 0x20,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch190 = new BitmapCharRec(7,10,0,0,8,ch190data);
-
-/* char: 0xbd */
-
-static final byte[] ch189data = {
-(byte) 0x1e,(byte) 0x10,(byte) 0xc,(byte) 0x2,(byte) 0xf2,(byte) 0x4c,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch189 = new BitmapCharRec(7,10,0,0,8,ch189data);
-
-/* char: 0xbc */
-
-static final byte[] ch188data = {
-(byte) 0x6,(byte) 0x1a,(byte) 0x12,(byte) 0xa,(byte) 0xe6,(byte) 0x42,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch188 = new BitmapCharRec(7,10,0,0,8,ch188data);
-
-/* char: 0xbb */
-
-static final byte[] ch187data = {
-(byte) 0x90,(byte) 0x48,(byte) 0x24,(byte) 0x12,(byte) 0x24,(byte) 0x48,(byte) 0x90,
-};
-
-static final BitmapCharRec ch187 = new BitmapCharRec(7,7,0,-1,8,ch187data);
-
-/* char: 0xba */
-
-static final byte[] ch186data = {
-(byte) 0xf0,(byte) 0x0,(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch186 = new BitmapCharRec(4,6,-1,-3,8,ch186data);
-
-/* char: 0xb9 */
-
-static final byte[] ch185data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch185 = new BitmapCharRec(3,6,-1,-4,8,ch185data);
-
-/* char: 0xb8 */
-
-static final byte[] ch184data = {
-(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch184 = new BitmapCharRec(2,2,-3,2,8,ch184data);
-
-/* char: 0xb7 */
-
-static final byte[] ch183data = {
-(byte) 0xc0,
-};
-
-static final BitmapCharRec ch183 = new BitmapCharRec(2,1,-3,-4,8,ch183data);
-
-/* char: 0xb6 */
-
-static final byte[] ch182data = {
-(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x68,(byte) 0xe8,(byte) 0xe8,(byte) 0xe8,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch182 = new BitmapCharRec(6,9,-1,0,8,ch182data);
-
-/* char: 0xb5 */
-
-static final byte[] ch181data = {
-(byte) 0x80,(byte) 0xb4,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
-};
-
-static final BitmapCharRec ch181 = new BitmapCharRec(6,7,-1,1,8,ch181data);
-
-/* char: 0xb4 */
-
-static final byte[] ch180data = {
-(byte) 0x80,(byte) 0x40,
-};
-
-static final BitmapCharRec ch180 = new BitmapCharRec(2,2,-3,-8,8,ch180data);
-
-/* char: 0xb3 */
-
-static final byte[] ch179data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x10,(byte) 0x20,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch179 = new BitmapCharRec(4,6,-1,-4,8,ch179data);
-
-/* char: 0xb2 */
-
-static final byte[] ch178data = {
-(byte) 0xf0,(byte) 0x80,(byte) 0x60,(byte) 0x10,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch178 = new BitmapCharRec(4,6,-1,-4,8,ch178data);
-
-/* char: 0xb1 */
-
-static final byte[] ch177data = {
-(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch177 = new BitmapCharRec(5,7,-1,-1,8,ch177data);
-
-/* char: 0xb0 */
-
-static final byte[] ch176data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch176 = new BitmapCharRec(4,4,-2,-5,8,ch176data);
-
-/* char: 0xaf */
-
-static final byte[] ch175data = {
-(byte) 0xfc,
-};
-
-static final BitmapCharRec ch175 = new BitmapCharRec(6,1,-1,-8,8,ch175data);
-
-/* char: 0xae */
-
-static final byte[] ch174data = {
-(byte) 0x38,(byte) 0x44,(byte) 0xaa,(byte) 0xb2,(byte) 0xaa,(byte) 0xaa,(byte) 0x92,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch174 = new BitmapCharRec(7,9,0,-1,8,ch174data);
-
-/* char: 0xad */
-
-static final byte[] ch173data = {
-(byte) 0xfc,
-};
-
-static final BitmapCharRec ch173 = new BitmapCharRec(6,1,-1,-4,8,ch173data);
-
-/* char: 0xac */
-
-static final byte[] ch172data = {
-(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch172 = new BitmapCharRec(6,4,-1,-1,8,ch172data);
-
-/* char: 0xab */
-
-static final byte[] ch171data = {
-(byte) 0x12,(byte) 0x24,(byte) 0x48,(byte) 0x90,(byte) 0x48,(byte) 0x24,(byte) 0x12,
-};
-
-static final BitmapCharRec ch171 = new BitmapCharRec(7,7,0,-1,8,ch171data);
-
-/* char: 0xaa */
-
-static final byte[] ch170data = {
-(byte) 0xf8,(byte) 0x0,(byte) 0x78,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x70,
-};
-
-static final BitmapCharRec ch170 = new BitmapCharRec(5,7,-1,-2,8,ch170data);
-
-/* char: 0xa9 */
-
-static final byte[] ch169data = {
-(byte) 0x38,(byte) 0x44,(byte) 0x92,(byte) 0xaa,(byte) 0xa2,(byte) 0xaa,(byte) 0x92,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch169 = new BitmapCharRec(7,9,0,-1,8,ch169data);
-
-/* char: 0xa8 */
-
-static final byte[] ch168data = {
-(byte) 0xd8,
-};
-
-static final BitmapCharRec ch168 = new BitmapCharRec(5,1,-1,-8,8,ch168data);
-
-/* char: 0xa7 */
-
-static final byte[] ch167data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x10,(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x80,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch167 = new BitmapCharRec(4,10,-2,0,8,ch167data);
-
-/* char: 0xa6 */
-
-static final byte[] ch166data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch166 = new BitmapCharRec(1,9,-3,0,8,ch166data);
-
-/* char: 0xa5 */
-
-static final byte[] ch165data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x7c,(byte) 0x10,(byte) 0x7c,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch165 = new BitmapCharRec(7,9,0,0,8,ch165data);
-
-/* char: 0xa4 */
-
-static final byte[] ch164data = {
-(byte) 0x84,(byte) 0x78,(byte) 0x48,(byte) 0x48,(byte) 0x78,(byte) 0x84,
-};
-
-static final BitmapCharRec ch164 = new BitmapCharRec(6,6,-1,-1,8,ch164data);
-
-/* char: 0xa3 */
-
-static final byte[] ch163data = {
-(byte) 0xdc,(byte) 0x62,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x70,(byte) 0x20,(byte) 0x22,(byte) 0x1c,
-};
-
-static final BitmapCharRec ch163 = new BitmapCharRec(7,9,0,0,8,ch163data);
-
-/* char: 0xa2 */
-
-static final byte[] ch162data = {
-(byte) 0x20,(byte) 0x70,(byte) 0xa8,(byte) 0xa0,(byte) 0xa0,(byte) 0xa8,(byte) 0x70,(byte) 0x20,
-};
-
-static final BitmapCharRec ch162 = new BitmapCharRec(5,8,-1,-1,8,ch162data);
-
-/* char: 0xa1 */
-
-static final byte[] ch161data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch161 = new BitmapCharRec(1,9,-3,0,8,ch161data);
-
-/* char: 0x7e '~' */
-
-static final byte[] ch126data = {
-(byte) 0x90,(byte) 0xa8,(byte) 0x48,
-};
-
-static final BitmapCharRec ch126 = new BitmapCharRec(5,3,-1,-6,8,ch126data);
-
-/* char: 0x7d '}' */
-
-static final byte[] ch125data = {
-(byte) 0xe0,(byte) 0x10,(byte) 0x10,(byte) 0x20,(byte) 0x18,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch125 = new BitmapCharRec(5,9,-1,0,8,ch125data);
-
-/* char: 0x7c '|' */
-
-static final byte[] ch124data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch124 = new BitmapCharRec(1,9,-3,0,8,ch124data);
-
-/* char: 0x7b '{' */
-
-static final byte[] ch123data = {
-(byte) 0x38,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x38,
-};
-
-static final BitmapCharRec ch123 = new BitmapCharRec(5,9,-2,0,8,ch123data);
-
-/* char: 0x7a 'z' */
-
-static final byte[] ch122data = {
-(byte) 0xfc,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch122 = new BitmapCharRec(6,6,-1,0,8,ch122data);
-
-/* char: 0x79 'y' */
-
-static final byte[] ch121data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x84,
-};
-
-static final BitmapCharRec ch121 = new BitmapCharRec(6,8,-1,2,8,ch121data);
-
-/* char: 0x78 'x' */
-
-static final byte[] ch120data = {
-(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x30,(byte) 0x48,(byte) 0x84,
-};
-
-static final BitmapCharRec ch120 = new BitmapCharRec(6,6,-1,0,8,ch120data);
-
-/* char: 0x77 'w' */
-
-static final byte[] ch119data = {
-(byte) 0x44,(byte) 0xaa,(byte) 0x92,(byte) 0x92,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch119 = new BitmapCharRec(7,6,0,0,8,ch119data);
-
-/* char: 0x76 'v' */
-
-static final byte[] ch118data = {
-(byte) 0x20,(byte) 0x50,(byte) 0x50,(byte) 0x88,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch118 = new BitmapCharRec(5,6,-1,0,8,ch118data);
-
-/* char: 0x75 'u' */
-
-static final byte[] ch117data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch117 = new BitmapCharRec(6,6,-1,0,8,ch117data);
-
-/* char: 0x74 't' */
-
-static final byte[] ch116data = {
-(byte) 0x38,(byte) 0x44,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xf8,(byte) 0x40,(byte) 0x40,
-};
-
-static final BitmapCharRec ch116 = new BitmapCharRec(6,8,-1,0,8,ch116data);
-
-/* char: 0x73 's' */
-
-static final byte[] ch115data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x18,(byte) 0x60,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch115 = new BitmapCharRec(6,6,-1,0,8,ch115data);
-
-/* char: 0x72 'r' */
-
-static final byte[] ch114data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x44,(byte) 0xb8,
-};
-
-static final BitmapCharRec ch114 = new BitmapCharRec(6,6,-1,0,8,ch114data);
-
-/* char: 0x71 'q' */
-
-static final byte[] ch113data = {
-(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x8c,(byte) 0x74,
-};
-
-static final BitmapCharRec ch113 = new BitmapCharRec(6,8,-1,2,8,ch113data);
-
-/* char: 0x70 'p' */
-
-static final byte[] ch112data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xb8,(byte) 0xc4,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,
-};
-
-static final BitmapCharRec ch112 = new BitmapCharRec(6,8,-1,2,8,ch112data);
-
-/* char: 0x6f 'o' */
-
-static final byte[] ch111data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch111 = new BitmapCharRec(6,6,-1,0,8,ch111data);
-
-/* char: 0x6e 'n' */
-
-static final byte[] ch110data = {
-(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,
-};
-
-static final BitmapCharRec ch110 = new BitmapCharRec(6,6,-1,0,8,ch110data);
-
-/* char: 0x6d 'm' */
-
-static final byte[] ch109data = {
-(byte) 0x82,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0xec,
-};
-
-static final BitmapCharRec ch109 = new BitmapCharRec(7,6,0,0,8,ch109data);
-
-/* char: 0x6c 'l' */
-
-static final byte[] ch108data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x60,
-};
-
-static final BitmapCharRec ch108 = new BitmapCharRec(5,9,-1,0,8,ch108data);
-
-/* char: 0x6b 'k' */
-
-static final byte[] ch107data = {
-(byte) 0x84,(byte) 0x88,(byte) 0x90,(byte) 0xe0,(byte) 0x90,(byte) 0x88,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch107 = new BitmapCharRec(6,9,-1,0,8,ch107data);
-
-/* char: 0x6a 'j' */
-
-static final byte[] ch106data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x18,(byte) 0x0,(byte) 0x8,
-};
-
-static final BitmapCharRec ch106 = new BitmapCharRec(5,10,-1,2,8,ch106data);
-
-/* char: 0x69 'i' */
-
-static final byte[] ch105data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x60,(byte) 0x0,(byte) 0x20,
-};
-
-static final BitmapCharRec ch105 = new BitmapCharRec(5,8,-1,0,8,ch105data);
-
-/* char: 0x68 'h' */
-
-static final byte[] ch104data = {
-(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch104 = new BitmapCharRec(6,9,-1,0,8,ch104data);
-
-/* char: 0x67 'g' */
-
-static final byte[] ch103data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x78,(byte) 0x80,(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x74,
-};
-
-static final BitmapCharRec ch103 = new BitmapCharRec(6,8,-1,2,8,ch103data);
-
-/* char: 0x66 'f' */
-
-static final byte[] ch102data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xf8,(byte) 0x40,(byte) 0x40,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch102 = new BitmapCharRec(6,9,-1,0,8,ch102data);
-
-/* char: 0x65 'e' */
-
-static final byte[] ch101data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0xfc,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch101 = new BitmapCharRec(6,6,-1,0,8,ch101data);
-
-/* char: 0x64 'd' */
-
-static final byte[] ch100data = {
-(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x8c,(byte) 0x74,(byte) 0x4,(byte) 0x4,(byte) 0x4,
-};
-
-static final BitmapCharRec ch100 = new BitmapCharRec(6,9,-1,0,8,ch100data);
-
-/* char: 0x63 'c' */
-
-static final byte[] ch99data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch99 = new BitmapCharRec(6,6,-1,0,8,ch99data);
-
-/* char: 0x62 'b' */
-
-static final byte[] ch98data = {
-(byte) 0xb8,(byte) 0xc4,(byte) 0x84,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch98 = new BitmapCharRec(6,9,-1,0,8,ch98data);
-
-/* char: 0x61 'a' */
-
-static final byte[] ch97data = {
-(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x7c,(byte) 0x4,(byte) 0x78,
-};
-
-static final BitmapCharRec ch97 = new BitmapCharRec(6,6,-1,0,8,ch97data);
-
-/* char: 0x60 '`' */
-
-static final byte[] ch96data = {
-(byte) 0x10,(byte) 0x60,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch96 = new BitmapCharRec(4,3,-2,-6,8,ch96data);
-
-/* char: 0x5f '_' */
-
-static final byte[] ch95data = {
-(byte) 0xfe,
-};
-
-static final BitmapCharRec ch95 = new BitmapCharRec(7,1,0,1,8,ch95data);
-
-/* char: 0x5e '^' */
-
-static final byte[] ch94data = {
-(byte) 0x88,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch94 = new BitmapCharRec(5,3,-1,-6,8,ch94data);
-
-/* char: 0x5d ']' */
-
-static final byte[] ch93data = {
-(byte) 0xf0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch93 = new BitmapCharRec(4,9,-1,0,8,ch93data);
-
-/* char: 0x5c '\' */
-
-static final byte[] ch92data = {
-(byte) 0x2,(byte) 0x2,(byte) 0x4,(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch92 = new BitmapCharRec(7,9,0,0,8,ch92data);
-
-/* char: 0x5b '[' */
-
-static final byte[] ch91data = {
-(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch91 = new BitmapCharRec(4,9,-2,0,8,ch91data);
-
-/* char: 0x5a 'Z' */
-
-static final byte[] ch90data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch90 = new BitmapCharRec(6,9,-1,0,8,ch90data);
-
-/* char: 0x59 'Y' */
-
-static final byte[] ch89data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch89 = new BitmapCharRec(7,9,0,0,8,ch89data);
-
-/* char: 0x58 'X' */
-
-static final byte[] ch88data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch88 = new BitmapCharRec(7,9,0,0,8,ch88data);
-
-/* char: 0x57 'W' */
-
-static final byte[] ch87data = {
-(byte) 0x44,(byte) 0xaa,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch87 = new BitmapCharRec(7,9,0,0,8,ch87data);
-
-/* char: 0x56 'V' */
-
-static final byte[] ch86data = {
-(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch86 = new BitmapCharRec(7,9,0,0,8,ch86data);
-
-/* char: 0x55 'U' */
-
-static final byte[] ch85data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
-};
-
-static final BitmapCharRec ch85 = new BitmapCharRec(6,9,-1,0,8,ch85data);
-
-/* char: 0x54 'T' */
-
-static final byte[] ch84data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch84 = new BitmapCharRec(7,9,0,0,8,ch84data);
-
-/* char: 0x53 'S' */
-
-static final byte[] ch83data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x4,(byte) 0x78,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch83 = new BitmapCharRec(6,9,-1,0,8,ch83data);
-
-/* char: 0x52 'R' */
-
-static final byte[] ch82data = {
-(byte) 0x84,(byte) 0x88,(byte) 0x90,(byte) 0xa0,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch82 = new BitmapCharRec(6,9,-1,0,8,ch82data);
-
-/* char: 0x51 'Q' */
-
-static final byte[] ch81data = {
-(byte) 0x4,(byte) 0x78,(byte) 0x94,(byte) 0xa4,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch81 = new BitmapCharRec(6,10,-1,1,8,ch81data);
-
-/* char: 0x50 'P' */
-
-static final byte[] ch80data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch80 = new BitmapCharRec(6,9,-1,0,8,ch80data);
-
-/* char: 0x4f 'O' */
-
-static final byte[] ch79data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch79 = new BitmapCharRec(6,9,-1,0,8,ch79data);
-
-/* char: 0x4e 'N' */
-
-static final byte[] ch78data = {
-(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x8c,(byte) 0x94,(byte) 0xa4,(byte) 0xc4,(byte) 0x84,(byte) 0x84,
-};
-
-static final BitmapCharRec ch78 = new BitmapCharRec(6,9,-1,0,8,ch78data);
-
-/* char: 0x4d 'M' */
-
-static final byte[] ch77data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x92,(byte) 0x92,(byte) 0xaa,(byte) 0xc6,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch77 = new BitmapCharRec(7,9,0,0,8,ch77data);
-
-/* char: 0x4c 'L' */
-
-static final byte[] ch76data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch76 = new BitmapCharRec(6,9,-1,0,8,ch76data);
-
-/* char: 0x4b 'K' */
-
-static final byte[] ch75data = {
-(byte) 0x84,(byte) 0x88,(byte) 0x90,(byte) 0xa0,(byte) 0xc0,(byte) 0xa0,(byte) 0x90,(byte) 0x88,(byte) 0x84,
-};
-
-static final BitmapCharRec ch75 = new BitmapCharRec(6,9,-1,0,8,ch75data);
-
-/* char: 0x4a 'J' */
-
-static final byte[] ch74data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch74 = new BitmapCharRec(6,9,-1,0,8,ch74data);
-
-/* char: 0x49 'I' */
-
-static final byte[] ch73data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch73 = new BitmapCharRec(5,9,-1,0,8,ch73data);
-
-/* char: 0x48 'H' */
-
-static final byte[] ch72data = {
-(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
-};
-
-static final BitmapCharRec ch72 = new BitmapCharRec(6,9,-1,0,8,ch72data);
-
-/* char: 0x47 'G' */
-
-static final byte[] ch71data = {
-(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x9c,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch71 = new BitmapCharRec(6,9,-1,0,8,ch71data);
-
-/* char: 0x46 'F' */
-
-static final byte[] ch70data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch70 = new BitmapCharRec(6,9,-1,0,8,ch70data);
-
-/* char: 0x45 'E' */
-
-static final byte[] ch69data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch69 = new BitmapCharRec(6,9,-1,0,8,ch69data);
-
-/* char: 0x44 'D' */
-
-static final byte[] ch68data = {
-(byte) 0xfc,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch68 = new BitmapCharRec(7,9,0,0,8,ch68data);
-
-/* char: 0x43 'C' */
-
-static final byte[] ch67data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch67 = new BitmapCharRec(6,9,-1,0,8,ch67data);
-
-/* char: 0x42 'B' */
-
-static final byte[] ch66data = {
-(byte) 0xfc,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x7c,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch66 = new BitmapCharRec(7,9,0,0,8,ch66data);
-
-/* char: 0x41 'A' */
-
-static final byte[] ch65data = {
-(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch65 = new BitmapCharRec(6,9,-1,0,8,ch65data);
-
-/* char: 0x40 '@' */
-
-static final byte[] ch64data = {
-(byte) 0x78,(byte) 0x80,(byte) 0x94,(byte) 0xac,(byte) 0xa4,(byte) 0x9c,(byte) 0x84,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch64 = new BitmapCharRec(6,9,-1,0,8,ch64data);
-
-/* char: 0x3f '?' */
-
-static final byte[] ch63data = {
-(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x84,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch63 = new BitmapCharRec(6,9,-1,0,8,ch63data);
-
-/* char: 0x3e '>' */
-
-static final byte[] ch62data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch62 = new BitmapCharRec(5,9,-1,0,8,ch62data);
-
-/* char: 0x3d '=' */
-
-static final byte[] ch61data = {
-(byte) 0xfc,(byte) 0x0,(byte) 0x0,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch61 = new BitmapCharRec(6,4,-1,-2,8,ch61data);
-
-/* char: 0x3c '<' */
-
-static final byte[] ch60data = {
-(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch60 = new BitmapCharRec(5,9,-2,0,8,ch60data);
-
-/* char: 0x3b ';' */
-
-static final byte[] ch59data = {
-(byte) 0x80,(byte) 0x60,(byte) 0x70,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x70,(byte) 0x20,
-};
-
-static final BitmapCharRec ch59 = new BitmapCharRec(4,8,-1,1,8,ch59data);
-
-/* char: 0x3a ':' */
-
-static final byte[] ch58data = {
-(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x0,(byte) 0x0,(byte) 0x40,(byte) 0xe0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch58 = new BitmapCharRec(3,8,-2,1,8,ch58data);
-
-/* char: 0x39 '9' */
-
-static final byte[] ch57data = {
-(byte) 0x70,(byte) 0x8,(byte) 0x4,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch57 = new BitmapCharRec(6,9,-1,0,8,ch57data);
-
-/* char: 0x38 '8' */
-
-static final byte[] ch56data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch56 = new BitmapCharRec(6,9,-1,0,8,ch56data);
-
-/* char: 0x37 '7' */
-
-static final byte[] ch55data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch55 = new BitmapCharRec(6,9,-1,0,8,ch55data);
-
-/* char: 0x36 '6' */
-
-static final byte[] ch54data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0xc4,(byte) 0xb8,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x38,
-};
-
-static final BitmapCharRec ch54 = new BitmapCharRec(6,9,-1,0,8,ch54data);
-
-/* char: 0x35 '5' */
-
-static final byte[] ch53data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x4,(byte) 0xc4,(byte) 0xb8,(byte) 0x80,(byte) 0x80,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch53 = new BitmapCharRec(6,9,-1,0,8,ch53data);
-
-/* char: 0x34 '4' */
-
-static final byte[] ch52data = {
-(byte) 0x8,(byte) 0x8,(byte) 0xfc,(byte) 0x88,(byte) 0x88,(byte) 0x48,(byte) 0x28,(byte) 0x18,(byte) 0x8,
-};
-
-static final BitmapCharRec ch52 = new BitmapCharRec(6,9,-1,0,8,ch52data);
-
-/* char: 0x33 '3' */
-
-static final byte[] ch51data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x4,(byte) 0x38,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch51 = new BitmapCharRec(6,9,-1,0,8,ch51data);
-
-/* char: 0x32 '2' */
-
-static final byte[] ch50data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x40,(byte) 0x30,(byte) 0x8,(byte) 0x4,(byte) 0x84,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch50 = new BitmapCharRec(6,9,-1,0,8,ch50data);
-
-/* char: 0x31 '1' */
-
-static final byte[] ch49data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xa0,(byte) 0x60,(byte) 0x20,
-};
-
-static final BitmapCharRec ch49 = new BitmapCharRec(5,9,-1,0,8,ch49data);
-
-/* char: 0x30 '0' */
-
-static final byte[] ch48data = {
-(byte) 0x30,(byte) 0x48,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch48 = new BitmapCharRec(6,9,-1,0,8,ch48data);
-
-/* char: 0x2f '/' */
-
-static final byte[] ch47data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0x2,
-};
-
-static final BitmapCharRec ch47 = new BitmapCharRec(7,9,0,0,8,ch47data);
-
-/* char: 0x2e '.' */
-
-static final byte[] ch46data = {
-(byte) 0x40,(byte) 0xe0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch46 = new BitmapCharRec(3,3,-2,1,8,ch46data);
-
-/* char: 0x2d '-' */
-
-static final byte[] ch45data = {
-(byte) 0xfc,
-};
-
-static final BitmapCharRec ch45 = new BitmapCharRec(6,1,-1,-4,8,ch45data);
-
-/* char: 0x2c ',' */
-
-static final byte[] ch44data = {
-(byte) 0x80,(byte) 0x60,(byte) 0x70,
-};
-
-static final BitmapCharRec ch44 = new BitmapCharRec(4,3,-1,1,8,ch44data);
-
-/* char: 0x2b '+' */
-
-static final byte[] ch43data = {
-(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch43 = new BitmapCharRec(5,5,-1,-2,8,ch43data);
-
-/* char: 0x2a '*' */
-
-static final byte[] ch42data = {
-(byte) 0x48,(byte) 0x30,(byte) 0xfc,(byte) 0x30,(byte) 0x48,
-};
-
-static final BitmapCharRec ch42 = new BitmapCharRec(6,5,-1,-2,8,ch42data);
-
-/* char: 0x29 ')' */
-
-static final byte[] ch41data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch41 = new BitmapCharRec(3,9,-2,0,8,ch41data);
-
-/* char: 0x28 '(' */
-
-static final byte[] ch40data = {
-(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch40 = new BitmapCharRec(3,9,-3,0,8,ch40data);
-
-/* char: 0x27 ''' */
-
-static final byte[] ch39data = {
-(byte) 0x80,(byte) 0x60,(byte) 0x70,
-};
-
-static final BitmapCharRec ch39 = new BitmapCharRec(4,3,-1,-6,8,ch39data);
-
-/* char: 0x26 '&' */
-
-static final byte[] ch38data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x94,(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch38 = new BitmapCharRec(6,7,-1,0,8,ch38data);
-
-/* char: 0x25 '%' */
-
-static final byte[] ch37data = {
-(byte) 0x88,(byte) 0x54,(byte) 0x48,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x48,(byte) 0xa4,(byte) 0x44,
-};
-
-static final BitmapCharRec ch37 = new BitmapCharRec(6,9,-1,0,8,ch37data);
-
-/* char: 0x24 '$' */
-
-static final byte[] ch36data = {
-(byte) 0x20,(byte) 0xf0,(byte) 0x28,(byte) 0x70,(byte) 0xa0,(byte) 0x78,(byte) 0x20,
-};
-
-static final BitmapCharRec ch36 = new BitmapCharRec(5,7,-1,-1,8,ch36data);
-
-/* char: 0x23 '#' */
-
-static final byte[] ch35data = {
-(byte) 0x48,(byte) 0x48,(byte) 0xfc,(byte) 0x48,(byte) 0xfc,(byte) 0x48,(byte) 0x48,
-};
-
-static final BitmapCharRec ch35 = new BitmapCharRec(6,7,-1,-1,8,ch35data);
-
-/* char: 0x22 '"' */
-
-static final byte[] ch34data = {
-(byte) 0x90,(byte) 0x90,(byte) 0x90,
-};
-
-static final BitmapCharRec ch34 = new BitmapCharRec(4,3,-2,-6,8,ch34data);
-
-/* char: 0x21 '!' */
-
-static final byte[] ch33data = {
-(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch33 = new BitmapCharRec(1,9,-3,0,8,ch33data);
-
-/* char: 0x1f */
-
-static final byte[] ch31data = {
-(byte) 0x80,
-};
-
-static final BitmapCharRec ch31 = new BitmapCharRec(1,1,-3,-3,8,ch31data);
-
-/* char: 0x1e */
-
-static final byte[] ch30data = {
-(byte) 0xdc,(byte) 0x62,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x70,(byte) 0x20,(byte) 0x22,(byte) 0x1c,
-};
-
-static final BitmapCharRec ch30 = new BitmapCharRec(7,9,0,0,8,ch30data);
-
-/* char: 0x1d */
-
-static final byte[] ch29data = {
-(byte) 0x80,(byte) 0x40,(byte) 0xfe,(byte) 0x10,(byte) 0xfe,(byte) 0x4,(byte) 0x2,
-};
-
-static final BitmapCharRec ch29 = new BitmapCharRec(7,7,0,0,8,ch29data);
-
-/* char: 0x1c */
-
-static final byte[] ch28data = {
-(byte) 0x88,(byte) 0x48,(byte) 0x48,(byte) 0x48,(byte) 0x48,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch28 = new BitmapCharRec(6,6,-1,0,8,ch28data);
-
-/* char: 0x1b */
-
-static final byte[] ch27data = {
-(byte) 0xfe,(byte) 0x80,(byte) 0x20,(byte) 0x8,(byte) 0x2,(byte) 0x8,(byte) 0x20,(byte) 0x80,
-};
-
-static final BitmapCharRec ch27 = new BitmapCharRec(7,8,0,0,8,ch27data);
-
-/* char: 0x1a */
-
-static final byte[] ch26data = {
-(byte) 0xfe,(byte) 0x2,(byte) 0x8,(byte) 0x20,(byte) 0x80,(byte) 0x20,(byte) 0x8,(byte) 0x2,
-};
-
-static final BitmapCharRec ch26 = new BitmapCharRec(7,8,0,0,8,ch26data);
-
-/* char: 0x19 */
-
-static final byte[] ch25data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch25 = new BitmapCharRec(1,13,-3,2,8,ch25data);
-
-/* char: 0x18 */
-
-static final byte[] ch24data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xff,
-};
-
-static final BitmapCharRec ch24 = new BitmapCharRec(8,6,0,2,8,ch24data);
-
-/* char: 0x17 */
-
-static final byte[] ch23data = {
-(byte) 0xff,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,
-};
-
-static final BitmapCharRec ch23 = new BitmapCharRec(8,8,0,-3,8,ch23data);
-
-/* char: 0x16 */
-
-static final byte[] ch22data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xf0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,
-};
-
-static final BitmapCharRec ch22 = new BitmapCharRec(4,13,0,2,8,ch22data);
-
-/* char: 0x15 */
-
-static final byte[] ch21data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch21 = new BitmapCharRec(5,13,-3,2,8,ch21data);
-
-/* char: 0x14 */
-
-static final byte[] ch20data = {
-(byte) 0xff,
-};
-
-static final BitmapCharRec ch20 = new BitmapCharRec(8,1,0,1,8,ch20data);
-
-/* char: 0x13 */
-
-static final byte[] ch19data = {
-(byte) 0xff,
-};
-
-static final BitmapCharRec ch19 = new BitmapCharRec(8,1,0,-1,8,ch19data);
-
-/* char: 0x12 */
-
-static final byte[] ch18data = {
-(byte) 0xff,
-};
-
-static final BitmapCharRec ch18 = new BitmapCharRec(8,1,0,-3,8,ch18data);
-
-/* char: 0x11 */
-
-static final byte[] ch17data = {
-(byte) 0xff,
-};
-
-static final BitmapCharRec ch17 = new BitmapCharRec(8,1,0,-5,8,ch17data);
-
-/* char: 0x10 */
-
-static final byte[] ch16data = {
-(byte) 0xff,
-};
-
-static final BitmapCharRec ch16 = new BitmapCharRec(8,1,0,-7,8,ch16data);
-
-/* char: 0xf */
-
-static final byte[] ch15data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xff,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,
-};
-
-static final BitmapCharRec ch15 = new BitmapCharRec(8,13,0,2,8,ch15data);
-
-/* char: 0xe */
-
-static final byte[] ch14data = {
-(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch14 = new BitmapCharRec(5,8,-3,-3,8,ch14data);
-
-/* char: 0xd */
-
-static final byte[] ch13data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch13 = new BitmapCharRec(5,6,-3,2,8,ch13data);
-
-/* char: 0xc */
-
-static final byte[] ch12data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch12 = new BitmapCharRec(4,6,0,2,8,ch12data);
-
-/* char: 0xb */
-
-static final byte[] ch11data = {
-(byte) 0xf0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,
-};
-
-static final BitmapCharRec ch11 = new BitmapCharRec(4,8,0,-3,8,ch11data);
-
-/* char: 0xa */
-
-static final byte[] ch10data = {
-(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x3e,(byte) 0x20,(byte) 0x50,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch10 = new BitmapCharRec(7,9,0,2,8,ch10data);
-
-/* char: 0x9 */
-
-static final byte[] ch9data = {
-(byte) 0x3e,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x88,(byte) 0x98,(byte) 0xa8,(byte) 0xc8,(byte) 0x88,
-};
-
-static final BitmapCharRec ch9 = new BitmapCharRec(7,9,0,2,8,ch9data);
-
-/* char: 0x8 */
-
-static final byte[] ch8data = {
-(byte) 0xfe,(byte) 0x10,(byte) 0x10,(byte) 0xfe,(byte) 0x10,(byte) 0x10,
-};
-
-static final BitmapCharRec ch8 = new BitmapCharRec(7,6,0,0,8,ch8data);
-
-/* char: 0x7 */
-
-static final byte[] ch7data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch7 = new BitmapCharRec(5,4,-1,-5,8,ch7data);
-
-/* char: 0x6 */
-
-static final byte[] ch6data = {
-(byte) 0x20,(byte) 0x20,(byte) 0x3c,(byte) 0x20,(byte) 0x3e,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch6 = new BitmapCharRec(7,9,0,2,8,ch6data);
-
-/* char: 0x5 */
-
-static final byte[] ch5data = {
-(byte) 0x22,(byte) 0x22,(byte) 0x3c,(byte) 0x22,(byte) 0x3c,(byte) 0x78,(byte) 0x80,(byte) 0x80,(byte) 0x78,
-};
-
-static final BitmapCharRec ch5 = new BitmapCharRec(7,9,0,2,8,ch5data);
-
-/* char: 0x4 */
-
-static final byte[] ch4data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x1c,(byte) 0x10,(byte) 0x9e,(byte) 0x80,(byte) 0xe0,(byte) 0x80,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch4 = new BitmapCharRec(7,9,0,2,8,ch4data);
-
-/* char: 0x3 */
-
-static final byte[] ch3data = {
-(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x3e,(byte) 0x88,(byte) 0x88,(byte) 0xf8,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch3 = new BitmapCharRec(7,9,0,2,8,ch3data);
-
-/* char: 0x2 */
-
-static final byte[] ch2data = {
-(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,
-};
-
-static final BitmapCharRec ch2 = new BitmapCharRec(8,12,0,2,8,ch2data);
-
-/* char: 0x1 */
-
-static final byte[] ch1data = {
-(byte) 0x10,(byte) 0x38,(byte) 0x7c,(byte) 0xfe,(byte) 0x7c,(byte) 0x38,(byte) 0x10,
-};
-
-static final BitmapCharRec ch1 = new BitmapCharRec(7,7,0,-1,8,ch1data);
-
-static final BitmapCharRec[] chars = {
-ch0,
-ch1,
-ch2,
-ch3,
-ch4,
-ch5,
-ch6,
-ch7,
-ch8,
-ch9,
-ch10,
-ch11,
-ch12,
-ch13,
-ch14,
-ch15,
-ch16,
-ch17,
-ch18,
-ch19,
-ch20,
-ch21,
-ch22,
-ch23,
-ch24,
-ch25,
-ch26,
-ch27,
-ch28,
-ch29,
-ch30,
-ch31,
-ch32,
-ch33,
-ch34,
-ch35,
-ch36,
-ch37,
-ch38,
-ch39,
-ch40,
-ch41,
-ch42,
-ch43,
-ch44,
-ch45,
-ch46,
-ch47,
-ch48,
-ch49,
-ch50,
-ch51,
-ch52,
-ch53,
-ch54,
-ch55,
-ch56,
-ch57,
-ch58,
-ch59,
-ch60,
-ch61,
-ch62,
-ch63,
-ch64,
-ch65,
-ch66,
-ch67,
-ch68,
-ch69,
-ch70,
-ch71,
-ch72,
-ch73,
-ch74,
-ch75,
-ch76,
-ch77,
-ch78,
-ch79,
-ch80,
-ch81,
-ch82,
-ch83,
-ch84,
-ch85,
-ch86,
-ch87,
-ch88,
-ch89,
-ch90,
-ch91,
-ch92,
-ch93,
-ch94,
-ch95,
-ch96,
-ch97,
-ch98,
-ch99,
-ch100,
-ch101,
-ch102,
-ch103,
-ch104,
-ch105,
-ch106,
-ch107,
-ch108,
-ch109,
-ch110,
-ch111,
-ch112,
-ch113,
-ch114,
-ch115,
-ch116,
-ch117,
-ch118,
-ch119,
-ch120,
-ch121,
-ch122,
-ch123,
-ch124,
-ch125,
-ch126,
-ch127,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-ch160,
-ch161,
-ch162,
-ch163,
-ch164,
-ch165,
-ch166,
-ch167,
-ch168,
-ch169,
-ch170,
-ch171,
-ch172,
-ch173,
-ch174,
-ch175,
-ch176,
-ch177,
-ch178,
-ch179,
-ch180,
-ch181,
-ch182,
-ch183,
-ch184,
-ch185,
-ch186,
-ch187,
-ch188,
-ch189,
-ch190,
-ch191,
-ch192,
-ch193,
-ch194,
-ch195,
-ch196,
-ch197,
-ch198,
-ch199,
-ch200,
-ch201,
-ch202,
-ch203,
-ch204,
-ch205,
-ch206,
-ch207,
-ch208,
-ch209,
-ch210,
-ch211,
-ch212,
-ch213,
-ch214,
-ch215,
-ch216,
-ch217,
-ch218,
-ch219,
-ch220,
-ch221,
-ch222,
-ch223,
-ch224,
-ch225,
-ch226,
-ch227,
-ch228,
-ch229,
-ch230,
-ch231,
-ch232,
-ch233,
-ch234,
-ch235,
-ch236,
-ch237,
-ch238,
-ch239,
-ch240,
-ch241,
-ch242,
-ch243,
-ch244,
-ch245,
-ch246,
-ch247,
-ch248,
-ch249,
-ch250,
-ch251,
-ch252,
-ch253,
-ch254,
-ch255,
-};
-
-  public static final BitmapFontRec glutBitmap8By13 = new BitmapFontRec("-misc-fixed-medium-r-normal--13-120-75-75-C-80-iso8859-1",
-                                                                 256,
-                                                                 0,
-                                                                 chars);
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap9x15.java b/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap9x15.java
deleted file mode 100644
index bba9a8fc5..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap9x15.java
+++ /dev/null
@@ -1,2079 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-class GLUTBitmap9x15 {
-
-/* GENERATED FILE -- DO NOT MODIFY */
-
-static final BitmapCharRec ch0 = new BitmapCharRec(0,0,0,0,9,null);
-
-static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,9,null);
-
-static final BitmapCharRec ch127 = new BitmapCharRec(0,0,0,0,9,null);
-
-static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,9,null);
-
-/* char: 0xff */
-
-static final byte[] ch255data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x28,(byte) 0x28,
-};
-
-static final BitmapCharRec ch255 = new BitmapCharRec(6,14,-1,3,9,ch255data);
-
-/* char: 0xfe */
-
-static final byte[] ch254data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xbc,(byte) 0xc2,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch254 = new BitmapCharRec(7,12,-1,3,9,ch254data);
-
-/* char: 0xfd */
-
-static final byte[] ch253data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x8,
-};
-
-static final BitmapCharRec ch253 = new BitmapCharRec(6,14,-1,3,9,ch253data);
-
-/* char: 0xfc */
-
-static final byte[] ch252data = {
-(byte) 0x7a,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x28,(byte) 0x28,
-};
-
-static final BitmapCharRec ch252 = new BitmapCharRec(7,11,-1,0,9,ch252data);
-
-/* char: 0xfb */
-
-static final byte[] ch251data = {
-(byte) 0x7a,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch251 = new BitmapCharRec(7,11,-1,0,9,ch251data);
-
-/* char: 0xfa */
-
-static final byte[] ch250data = {
-(byte) 0x7a,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x8,
-};
-
-static final BitmapCharRec ch250 = new BitmapCharRec(7,11,-1,0,9,ch250data);
-
-/* char: 0xf9 */
-
-static final byte[] ch249data = {
-(byte) 0x7a,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x0,(byte) 0x18,(byte) 0x20,
-};
-
-static final BitmapCharRec ch249 = new BitmapCharRec(7,11,-1,0,9,ch249data);
-
-/* char: 0xf8 */
-
-static final byte[] ch248data = {
-(byte) 0x80,(byte) 0x7c,(byte) 0xa2,(byte) 0xa2,(byte) 0x92,(byte) 0x8a,(byte) 0x8a,(byte) 0x7c,(byte) 0x2,
-};
-
-static final BitmapCharRec ch248 = new BitmapCharRec(7,9,-1,1,9,ch248data);
-
-/* char: 0xf7 */
-
-static final byte[] ch247data = {
-(byte) 0x10,(byte) 0x38,(byte) 0x10,(byte) 0x0,(byte) 0xfe,(byte) 0x0,(byte) 0x10,(byte) 0x38,(byte) 0x10,
-};
-
-static final BitmapCharRec ch247 = new BitmapCharRec(7,9,-1,0,9,ch247data);
-
-/* char: 0xf6 */
-
-static final byte[] ch246data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x28,(byte) 0x28,
-};
-
-static final BitmapCharRec ch246 = new BitmapCharRec(7,11,-1,0,9,ch246data);
-
-/* char: 0xf5 */
-
-static final byte[] ch245data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch245 = new BitmapCharRec(7,11,-1,0,9,ch245data);
-
-/* char: 0xf4 */
-
-static final byte[] ch244data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch244 = new BitmapCharRec(7,11,-1,0,9,ch244data);
-
-/* char: 0xf3 */
-
-static final byte[] ch243data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x8,
-};
-
-static final BitmapCharRec ch243 = new BitmapCharRec(7,11,-1,0,9,ch243data);
-
-/* char: 0xf2 */
-
-static final byte[] ch242data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x18,(byte) 0x20,
-};
-
-static final BitmapCharRec ch242 = new BitmapCharRec(7,11,-1,0,9,ch242data);
-
-/* char: 0xf1 */
-
-static final byte[] ch241data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch241 = new BitmapCharRec(7,11,-1,0,9,ch241data);
-
-/* char: 0xf0 */
-
-static final byte[] ch240data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x8,(byte) 0x50,(byte) 0x30,(byte) 0x48,
-};
-
-static final BitmapCharRec ch240 = new BitmapCharRec(7,11,-1,0,9,ch240data);
-
-/* char: 0xef */
-
-static final byte[] ch239data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x50,
-};
-
-static final BitmapCharRec ch239 = new BitmapCharRec(5,11,-2,0,9,ch239data);
-
-/* char: 0xee */
-
-static final byte[] ch238data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch238 = new BitmapCharRec(5,11,-2,0,9,ch238data);
-
-/* char: 0xed */
-
-static final byte[] ch237data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x60,(byte) 0x10,
-};
-
-static final BitmapCharRec ch237 = new BitmapCharRec(5,11,-2,0,9,ch237data);
-
-/* char: 0xec */
-
-static final byte[] ch236data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x40,
-};
-
-static final BitmapCharRec ch236 = new BitmapCharRec(5,11,-2,0,9,ch236data);
-
-/* char: 0xeb */
-
-static final byte[] ch235data = {
-(byte) 0x7c,(byte) 0x80,(byte) 0x80,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x28,(byte) 0x28,
-};
-
-static final BitmapCharRec ch235 = new BitmapCharRec(7,11,-1,0,9,ch235data);
-
-/* char: 0xea */
-
-static final byte[] ch234data = {
-(byte) 0x7c,(byte) 0x80,(byte) 0x80,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch234 = new BitmapCharRec(7,11,-1,0,9,ch234data);
-
-/* char: 0xe9 */
-
-static final byte[] ch233data = {
-(byte) 0x7c,(byte) 0x80,(byte) 0x80,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x8,
-};
-
-static final BitmapCharRec ch233 = new BitmapCharRec(7,11,-1,0,9,ch233data);
-
-/* char: 0xe8 */
-
-static final byte[] ch232data = {
-(byte) 0x7c,(byte) 0x80,(byte) 0x80,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x18,(byte) 0x20,
-};
-
-static final BitmapCharRec ch232 = new BitmapCharRec(7,11,-1,0,9,ch232data);
-
-/* char: 0xe7 */
-
-static final byte[] ch231data = {
-(byte) 0x30,(byte) 0x48,(byte) 0x18,(byte) 0x7c,(byte) 0x82,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch231 = new BitmapCharRec(7,10,-1,3,9,ch231data);
-
-/* char: 0xe6 */
-
-static final byte[] ch230data = {
-(byte) 0x6e,(byte) 0x92,(byte) 0x90,(byte) 0x7c,(byte) 0x12,(byte) 0x92,(byte) 0x6c,
-};
-
-static final BitmapCharRec ch230 = new BitmapCharRec(7,7,-1,0,9,ch230data);
-
-/* char: 0xe5 */
-
-static final byte[] ch229data = {
-(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,(byte) 0x0,(byte) 0x18,(byte) 0x24,(byte) 0x18,
-};
-
-static final BitmapCharRec ch229 = new BitmapCharRec(7,11,-1,0,9,ch229data);
-
-/* char: 0xe4 */
-
-static final byte[] ch228data = {
-(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x28,(byte) 0x28,
-};
-
-static final BitmapCharRec ch228 = new BitmapCharRec(7,11,-1,0,9,ch228data);
-
-/* char: 0xe3 */
-
-static final byte[] ch227data = {
-(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch227 = new BitmapCharRec(7,11,-1,0,9,ch227data);
-
-/* char: 0xe2 */
-
-static final byte[] ch226data = {
-(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch226 = new BitmapCharRec(7,11,-1,0,9,ch226data);
-
-/* char: 0xe1 */
-
-static final byte[] ch225data = {
-(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x8,
-};
-
-static final BitmapCharRec ch225 = new BitmapCharRec(7,11,-1,0,9,ch225data);
-
-/* char: 0xe0 */
-
-static final byte[] ch224data = {
-(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,(byte) 0x0,(byte) 0x0,(byte) 0x18,(byte) 0x20,
-};
-
-static final BitmapCharRec ch224 = new BitmapCharRec(7,11,-1,0,9,ch224data);
-
-/* char: 0xdf */
-
-static final byte[] ch223data = {
-(byte) 0x80,(byte) 0xbc,(byte) 0xc2,(byte) 0x82,(byte) 0x82,(byte) 0xfc,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch223 = new BitmapCharRec(7,9,-1,1,9,ch223data);
-
-/* char: 0xde */
-
-static final byte[] ch222data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfc,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch222 = new BitmapCharRec(7,10,-1,0,9,ch222data);
-
-/* char: 0xdd */
-
-static final byte[] ch221data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,(byte) 0x0,(byte) 0x30,(byte) 0x8,
-};
-
-static final BitmapCharRec ch221 = new BitmapCharRec(7,11,-1,0,9,ch221data);
-
-/* char: 0xdc */
-
-static final byte[] ch220data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x0,(byte) 0x28,(byte) 0x28,
-};
-
-static final BitmapCharRec ch220 = new BitmapCharRec(7,11,-1,0,9,ch220data);
-
-/* char: 0xdb */
-
-static final byte[] ch219data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x0,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch219 = new BitmapCharRec(7,11,-1,0,9,ch219data);
-
-/* char: 0xda */
-
-static final byte[] ch218data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x0,(byte) 0x30,(byte) 0x8,
-};
-
-static final BitmapCharRec ch218 = new BitmapCharRec(7,11,-1,0,9,ch218data);
-
-/* char: 0xd9 */
-
-static final byte[] ch217data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x0,(byte) 0x18,(byte) 0x20,
-};
-
-static final BitmapCharRec ch217 = new BitmapCharRec(7,11,-1,0,9,ch217data);
-
-/* char: 0xd8 */
-
-static final byte[] ch216data = {
-(byte) 0x80,(byte) 0x7c,(byte) 0xc2,(byte) 0xa2,(byte) 0xa2,(byte) 0x92,(byte) 0x92,(byte) 0x8a,(byte) 0x8a,(byte) 0x86,(byte) 0x7c,(byte) 0x2,
-};
-
-static final BitmapCharRec ch216 = new BitmapCharRec(7,12,-1,1,9,ch216data);
-
-/* char: 0xd7 */
-
-static final byte[] ch215data = {
-(byte) 0x82,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,
-};
-
-static final BitmapCharRec ch215 = new BitmapCharRec(7,7,-1,-1,9,ch215data);
-
-/* char: 0xd6 */
-
-static final byte[] ch214data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x28,(byte) 0x28,
-};
-
-static final BitmapCharRec ch214 = new BitmapCharRec(7,11,-1,0,9,ch214data);
-
-/* char: 0xd5 */
-
-static final byte[] ch213data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch213 = new BitmapCharRec(7,11,-1,0,9,ch213data);
-
-/* char: 0xd4 */
-
-static final byte[] ch212data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch212 = new BitmapCharRec(7,11,-1,0,9,ch212data);
-
-/* char: 0xd3 */
-
-static final byte[] ch211data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x30,(byte) 0x8,
-};
-
-static final BitmapCharRec ch211 = new BitmapCharRec(7,11,-1,0,9,ch211data);
-
-/* char: 0xd2 */
-
-static final byte[] ch210data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x0,(byte) 0x18,(byte) 0x20,
-};
-
-static final BitmapCharRec ch210 = new BitmapCharRec(7,11,-1,0,9,ch210data);
-
-/* char: 0xd1 */
-
-static final byte[] ch209data = {
-(byte) 0x82,(byte) 0x86,(byte) 0x8a,(byte) 0x92,(byte) 0x92,(byte) 0xa2,(byte) 0xc2,(byte) 0x82,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch209 = new BitmapCharRec(7,11,-1,0,9,ch209data);
-
-/* char: 0xd0 */
-
-static final byte[] ch208data = {
-(byte) 0xfc,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xf2,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch208 = new BitmapCharRec(7,10,-1,0,9,ch208data);
-
-/* char: 0xcf */
-
-static final byte[] ch207data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x50,(byte) 0x50,
-};
-
-static final BitmapCharRec ch207 = new BitmapCharRec(5,11,-2,0,9,ch207data);
-
-/* char: 0xce */
-
-static final byte[] ch206data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch206 = new BitmapCharRec(5,11,-2,0,9,ch206data);
-
-/* char: 0xcd */
-
-static final byte[] ch205data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x60,(byte) 0x10,
-};
-
-static final BitmapCharRec ch205 = new BitmapCharRec(5,11,-2,0,9,ch205data);
-
-/* char: 0xcc */
-
-static final byte[] ch204data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x0,(byte) 0x30,(byte) 0x40,
-};
-
-static final BitmapCharRec ch204 = new BitmapCharRec(5,11,-2,0,9,ch204data);
-
-/* char: 0xcb */
-
-static final byte[] ch203data = {
-(byte) 0xfe,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x78,(byte) 0x40,(byte) 0x40,(byte) 0xfe,(byte) 0x0,(byte) 0x28,(byte) 0x28,
-};
-
-static final BitmapCharRec ch203 = new BitmapCharRec(7,11,-1,0,9,ch203data);
-
-/* char: 0xca */
-
-static final byte[] ch202data = {
-(byte) 0xfe,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x78,(byte) 0x40,(byte) 0x40,(byte) 0xfe,(byte) 0x0,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch202 = new BitmapCharRec(7,11,-1,0,9,ch202data);
-
-/* char: 0xc9 */
-
-static final byte[] ch201data = {
-(byte) 0xfe,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x78,(byte) 0x40,(byte) 0x40,(byte) 0xfe,(byte) 0x0,(byte) 0x30,(byte) 0x8,
-};
-
-static final BitmapCharRec ch201 = new BitmapCharRec(7,11,-1,0,9,ch201data);
-
-/* char: 0xc8 */
-
-static final byte[] ch200data = {
-(byte) 0xfe,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x78,(byte) 0x40,(byte) 0x40,(byte) 0xfe,(byte) 0x0,(byte) 0x18,(byte) 0x20,
-};
-
-static final BitmapCharRec ch200 = new BitmapCharRec(7,11,-1,0,9,ch200data);
-
-/* char: 0xc7 */
-
-static final byte[] ch199data = {
-(byte) 0x30,(byte) 0x48,(byte) 0x18,(byte) 0x7c,(byte) 0x82,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch199 = new BitmapCharRec(7,13,-1,3,9,ch199data);
-
-/* char: 0xc6 */
-
-static final byte[] ch198data = {
-(byte) 0x9e,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xfc,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x6e,
-};
-
-static final BitmapCharRec ch198 = new BitmapCharRec(7,10,-1,0,9,ch198data);
-
-/* char: 0xc5 */
-
-static final byte[] ch197data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x10,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch197 = new BitmapCharRec(7,11,-1,0,9,ch197data);
-
-/* char: 0xc4 */
-
-static final byte[] ch196data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x0,(byte) 0x28,(byte) 0x28,
-};
-
-static final BitmapCharRec ch196 = new BitmapCharRec(7,11,-1,0,9,ch196data);
-
-/* char: 0xc3 */
-
-static final byte[] ch195data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch195 = new BitmapCharRec(7,11,-1,0,9,ch195data);
-
-/* char: 0xc2 */
-
-static final byte[] ch194data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x0,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch194 = new BitmapCharRec(7,11,-1,0,9,ch194data);
-
-/* char: 0xc1 */
-
-static final byte[] ch193data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x0,(byte) 0x30,(byte) 0x8,
-};
-
-static final BitmapCharRec ch193 = new BitmapCharRec(7,11,-1,0,9,ch193data);
-
-/* char: 0xc0 */
-
-static final byte[] ch192data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x0,(byte) 0x18,(byte) 0x20,
-};
-
-static final BitmapCharRec ch192 = new BitmapCharRec(7,11,-1,0,9,ch192data);
-
-/* char: 0xbf */
-
-static final byte[] ch191data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x10,
-};
-
-static final BitmapCharRec ch191 = new BitmapCharRec(7,10,-1,0,9,ch191data);
-
-/* char: 0xbe */
-
-static final byte[] ch190data = {
-(byte) 0x6,(byte) 0x1a,(byte) 0x12,(byte) 0xa,(byte) 0x66,(byte) 0x92,(byte) 0x10,(byte) 0x20,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch190 = new BitmapCharRec(7,10,-1,0,9,ch190data);
-
-/* char: 0xbd */
-
-static final byte[] ch189data = {
-(byte) 0x1e,(byte) 0x10,(byte) 0xc,(byte) 0x2,(byte) 0xf2,(byte) 0x4c,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch189 = new BitmapCharRec(7,10,-1,0,9,ch189data);
-
-/* char: 0xbc */
-
-static final byte[] ch188data = {
-(byte) 0x6,(byte) 0x1a,(byte) 0x12,(byte) 0xa,(byte) 0xe6,(byte) 0x42,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch188 = new BitmapCharRec(7,10,-1,0,9,ch188data);
-
-/* char: 0xbb */
-
-static final byte[] ch187data = {
-(byte) 0x90,(byte) 0x48,(byte) 0x24,(byte) 0x12,(byte) 0x12,(byte) 0x24,(byte) 0x48,(byte) 0x90,
-};
-
-static final BitmapCharRec ch187 = new BitmapCharRec(7,8,-1,-1,9,ch187data);
-
-/* char: 0xba */
-
-static final byte[] ch186data = {
-(byte) 0xf8,(byte) 0x0,(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch186 = new BitmapCharRec(5,6,-1,-5,9,ch186data);
-
-/* char: 0xb9 */
-
-static final byte[] ch185data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch185 = new BitmapCharRec(3,6,-1,-4,9,ch185data);
-
-/* char: 0xb8 */
-
-static final byte[] ch184data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x30,
-};
-
-static final BitmapCharRec ch184 = new BitmapCharRec(4,3,-2,3,9,ch184data);
-
-/* char: 0xb7 */
-
-static final byte[] ch183data = {
-(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch183 = new BitmapCharRec(2,2,-4,-4,9,ch183data);
-
-/* char: 0xb6 */
-
-static final byte[] ch182data = {
-(byte) 0xa,(byte) 0xa,(byte) 0xa,(byte) 0xa,(byte) 0xa,(byte) 0x7a,(byte) 0x8a,(byte) 0x8a,(byte) 0x8a,(byte) 0x7e,
-};
-
-static final BitmapCharRec ch182 = new BitmapCharRec(7,10,-1,0,9,ch182data);
-
-/* char: 0xb5 */
-
-static final byte[] ch181data = {
-(byte) 0x80,(byte) 0x80,(byte) 0xba,(byte) 0xc6,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch181 = new BitmapCharRec(7,9,-1,2,9,ch181data);
-
-/* char: 0xb4 */
-
-static final byte[] ch180data = {
-(byte) 0xc0,(byte) 0x20,
-};
-
-static final BitmapCharRec ch180 = new BitmapCharRec(3,2,-3,-9,9,ch180data);
-
-/* char: 0xb3 */
-
-static final byte[] ch179data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x10,(byte) 0x20,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch179 = new BitmapCharRec(4,6,-1,-4,9,ch179data);
-
-/* char: 0xb2 */
-
-static final byte[] ch178data = {
-(byte) 0xf0,(byte) 0x80,(byte) 0x60,(byte) 0x10,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch178 = new BitmapCharRec(4,6,-1,-4,9,ch178data);
-
-/* char: 0xb1 */
-
-static final byte[] ch177data = {
-(byte) 0xfe,(byte) 0x0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xfe,(byte) 0x10,(byte) 0x10,(byte) 0x10,
-};
-
-static final BitmapCharRec ch177 = new BitmapCharRec(7,9,-1,-1,9,ch177data);
-
-/* char: 0xb0 */
-
-static final byte[] ch176data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch176 = new BitmapCharRec(4,4,-3,-6,9,ch176data);
-
-/* char: 0xaf */
-
-static final byte[] ch175data = {
-(byte) 0xfc,
-};
-
-static final BitmapCharRec ch175 = new BitmapCharRec(6,1,-1,-9,9,ch175data);
-
-/* char: 0xae */
-
-static final byte[] ch174data = {
-(byte) 0x3c,(byte) 0x42,(byte) 0xa5,(byte) 0xa9,(byte) 0xbd,(byte) 0xa5,(byte) 0xb9,(byte) 0x42,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch174 = new BitmapCharRec(8,9,0,-1,9,ch174data);
-
-/* char: 0xad */
-
-static final byte[] ch173data = {
-(byte) 0xfc,
-};
-
-static final BitmapCharRec ch173 = new BitmapCharRec(6,1,-1,-4,9,ch173data);
-
-/* char: 0xac */
-
-static final byte[] ch172data = {
-(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch172 = new BitmapCharRec(6,4,-1,-2,9,ch172data);
-
-/* char: 0xab */
-
-static final byte[] ch171data = {
-(byte) 0x12,(byte) 0x24,(byte) 0x48,(byte) 0x90,(byte) 0x90,(byte) 0x48,(byte) 0x24,(byte) 0x12,
-};
-
-static final BitmapCharRec ch171 = new BitmapCharRec(7,8,-1,-1,9,ch171data);
-
-/* char: 0xaa */
-
-static final byte[] ch170data = {
-(byte) 0xf8,(byte) 0x0,(byte) 0x78,(byte) 0x90,(byte) 0x70,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch170 = new BitmapCharRec(5,7,-3,-3,9,ch170data);
-
-/* char: 0xa9 */
-
-static final byte[] ch169data = {
-(byte) 0x3c,(byte) 0x42,(byte) 0x99,(byte) 0xa5,(byte) 0xa1,(byte) 0xa5,(byte) 0x99,(byte) 0x42,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch169 = new BitmapCharRec(8,9,0,-1,9,ch169data);
-
-/* char: 0xa8 */
-
-static final byte[] ch168data = {
-(byte) 0xa0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch168 = new BitmapCharRec(3,2,-3,-9,9,ch168data);
-
-/* char: 0xa7 */
-
-static final byte[] ch167data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x80,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch167 = new BitmapCharRec(5,11,-2,1,9,ch167data);
-
-/* char: 0xa6 */
-
-static final byte[] ch166data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch166 = new BitmapCharRec(1,11,-4,1,9,ch166data);
-
-/* char: 0xa5 */
-
-static final byte[] ch165data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x7c,(byte) 0x10,(byte) 0x7c,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch165 = new BitmapCharRec(7,10,-1,0,9,ch165data);
-
-/* char: 0xa4 */
-
-static final byte[] ch164data = {
-(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x7c,(byte) 0x82,
-};
-
-static final BitmapCharRec ch164 = new BitmapCharRec(7,6,-1,-3,9,ch164data);
-
-/* char: 0xa3 */
-
-static final byte[] ch163data = {
-(byte) 0x5c,(byte) 0xa2,(byte) 0x60,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x22,(byte) 0x1c,
-};
-
-static final BitmapCharRec ch163 = new BitmapCharRec(7,10,-1,0,9,ch163data);
-
-/* char: 0xa2 */
-
-static final byte[] ch162data = {
-(byte) 0x40,(byte) 0x78,(byte) 0xa4,(byte) 0xa0,(byte) 0x90,(byte) 0x94,(byte) 0x78,(byte) 0x8,
-};
-
-static final BitmapCharRec ch162 = new BitmapCharRec(6,8,-1,0,9,ch162data);
-
-/* char: 0xa1 */
-
-static final byte[] ch161data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch161 = new BitmapCharRec(1,11,-4,0,9,ch161data);
-
-/* char: 0x7e '~' */
-
-static final byte[] ch126data = {
-(byte) 0x8c,(byte) 0x92,(byte) 0x62,
-};
-
-static final BitmapCharRec ch126 = new BitmapCharRec(7,3,-1,-7,9,ch126data);
-
-/* char: 0x7d '}' */
-
-static final byte[] ch125data = {
-(byte) 0xe0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x20,(byte) 0x18,(byte) 0x18,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch125 = new BitmapCharRec(5,12,-1,1,9,ch125data);
-
-/* char: 0x7c '|' */
-
-static final byte[] ch124data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch124 = new BitmapCharRec(1,12,-4,1,9,ch124data);
-
-/* char: 0x7b '{' */
-
-static final byte[] ch123data = {
-(byte) 0x38,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0xc0,(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x38,
-};
-
-static final BitmapCharRec ch123 = new BitmapCharRec(5,12,-3,1,9,ch123data);
-
-/* char: 0x7a 'z' */
-
-static final byte[] ch122data = {
-(byte) 0xfe,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch122 = new BitmapCharRec(7,7,-1,0,9,ch122data);
-
-/* char: 0x79 'y' */
-
-static final byte[] ch121data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
-};
-
-static final BitmapCharRec ch121 = new BitmapCharRec(6,10,-1,3,9,ch121data);
-
-/* char: 0x78 'x' */
-
-static final byte[] ch120data = {
-(byte) 0x82,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,
-};
-
-static final BitmapCharRec ch120 = new BitmapCharRec(7,7,-1,0,9,ch120data);
-
-/* char: 0x77 'w' */
-
-static final byte[] ch119data = {
-(byte) 0x44,(byte) 0xaa,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch119 = new BitmapCharRec(7,7,-1,0,9,ch119data);
-
-/* char: 0x76 'v' */
-
-static final byte[] ch118data = {
-(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch118 = new BitmapCharRec(7,7,-1,0,9,ch118data);
-
-/* char: 0x75 'u' */
-
-static final byte[] ch117data = {
-(byte) 0x7a,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
-};
-
-static final BitmapCharRec ch117 = new BitmapCharRec(7,7,-1,0,9,ch117data);
-
-/* char: 0x74 't' */
-
-static final byte[] ch116data = {
-(byte) 0x1c,(byte) 0x22,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xfc,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch116 = new BitmapCharRec(7,9,-1,0,9,ch116data);
-
-/* char: 0x73 's' */
-
-static final byte[] ch115data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x2,(byte) 0x7c,(byte) 0x80,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch115 = new BitmapCharRec(7,7,-1,0,9,ch115data);
-
-/* char: 0x72 'r' */
-
-static final byte[] ch114data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x42,(byte) 0x62,(byte) 0x9c,
-};
-
-static final BitmapCharRec ch114 = new BitmapCharRec(7,7,-1,0,9,ch114data);
-
-/* char: 0x71 'q' */
-
-static final byte[] ch113data = {
-(byte) 0x2,(byte) 0x2,(byte) 0x2,(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x86,(byte) 0x7a,
-};
-
-static final BitmapCharRec ch113 = new BitmapCharRec(7,10,-1,3,9,ch113data);
-
-/* char: 0x70 'p' */
-
-static final byte[] ch112data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xbc,(byte) 0xc2,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,
-};
-
-static final BitmapCharRec ch112 = new BitmapCharRec(7,10,-1,3,9,ch112data);
-
-/* char: 0x6f 'o' */
-
-static final byte[] ch111data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch111 = new BitmapCharRec(7,7,-1,0,9,ch111data);
-
-/* char: 0x6e 'n' */
-
-static final byte[] ch110data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,
-};
-
-static final BitmapCharRec ch110 = new BitmapCharRec(7,7,-1,0,9,ch110data);
-
-/* char: 0x6d 'm' */
-
-static final byte[] ch109data = {
-(byte) 0x82,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0xec,
-};
-
-static final BitmapCharRec ch109 = new BitmapCharRec(7,7,-1,0,9,ch109data);
-
-/* char: 0x6c 'l' */
-
-static final byte[] ch108data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch108 = new BitmapCharRec(5,10,-2,0,9,ch108data);
-
-/* char: 0x6b 'k' */
-
-static final byte[] ch107data = {
-(byte) 0x82,(byte) 0x8c,(byte) 0xb0,(byte) 0xc0,(byte) 0xb0,(byte) 0x8c,(byte) 0x82,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch107 = new BitmapCharRec(7,10,-1,0,9,ch107data);
-
-/* char: 0x6a 'j' */
-
-static final byte[] ch106data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x1c,(byte) 0x0,(byte) 0x0,(byte) 0xc,
-};
-
-static final BitmapCharRec ch106 = new BitmapCharRec(6,13,-1,3,9,ch106data);
-
-/* char: 0x69 'i' */
-
-static final byte[] ch105data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x60,
-};
-
-static final BitmapCharRec ch105 = new BitmapCharRec(5,10,-2,0,9,ch105data);
-
-/* char: 0x68 'h' */
-
-static final byte[] ch104data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch104 = new BitmapCharRec(7,10,-1,0,9,ch104data);
-
-/* char: 0x67 'g' */
-
-static final byte[] ch103data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x80,(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x7a,
-};
-
-static final BitmapCharRec ch103 = new BitmapCharRec(7,10,-1,3,9,ch103data);
-
-/* char: 0x66 'f' */
-
-static final byte[] ch102data = {
-(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x22,(byte) 0x22,(byte) 0x1c,
-};
-
-static final BitmapCharRec ch102 = new BitmapCharRec(7,10,-1,0,9,ch102data);
-
-/* char: 0x65 'e' */
-
-static final byte[] ch101data = {
-(byte) 0x7c,(byte) 0x80,(byte) 0x80,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch101 = new BitmapCharRec(7,7,-1,0,9,ch101data);
-
-/* char: 0x64 'd' */
-
-static final byte[] ch100data = {
-(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x86,(byte) 0x7a,(byte) 0x2,(byte) 0x2,(byte) 0x2,
-};
-
-static final BitmapCharRec ch100 = new BitmapCharRec(7,10,-1,0,9,ch100data);
-
-/* char: 0x63 'c' */
-
-static final byte[] ch99data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch99 = new BitmapCharRec(7,7,-1,0,9,ch99data);
-
-/* char: 0x62 'b' */
-
-static final byte[] ch98data = {
-(byte) 0xbc,(byte) 0xc2,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch98 = new BitmapCharRec(7,10,-1,0,9,ch98data);
-
-/* char: 0x61 'a' */
-
-static final byte[] ch97data = {
-(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x7e,(byte) 0x2,(byte) 0x2,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch97 = new BitmapCharRec(7,7,-1,0,9,ch97data);
-
-/* char: 0x60 '`' */
-
-static final byte[] ch96data = {
-(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch96 = new BitmapCharRec(4,4,-3,-6,9,ch96data);
-
-/* char: 0x5f '_' */
-
-static final byte[] ch95data = {
-(byte) 0xff,
-};
-
-static final BitmapCharRec ch95 = new BitmapCharRec(8,1,0,1,9,ch95data);
-
-/* char: 0x5e '^' */
-
-static final byte[] ch94data = {
-(byte) 0x82,(byte) 0x44,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch94 = new BitmapCharRec(7,4,-1,-6,9,ch94data);
-
-/* char: 0x5d ']' */
-
-static final byte[] ch93data = {
-(byte) 0xf0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch93 = new BitmapCharRec(4,12,-2,1,9,ch93data);
-
-/* char: 0x5c '\' */
-
-static final byte[] ch92data = {
-(byte) 0x2,(byte) 0x4,(byte) 0x4,(byte) 0x8,(byte) 0x10,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch92 = new BitmapCharRec(7,10,-1,0,9,ch92data);
-
-/* char: 0x5b '[' */
-
-static final byte[] ch91data = {
-(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch91 = new BitmapCharRec(4,12,-3,1,9,ch91data);
-
-/* char: 0x5a 'Z' */
-
-static final byte[] ch90data = {
-(byte) 0xfe,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch90 = new BitmapCharRec(7,10,-1,0,9,ch90data);
-
-/* char: 0x59 'Y' */
-
-static final byte[] ch89data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch89 = new BitmapCharRec(7,10,-1,0,9,ch89data);
-
-/* char: 0x58 'X' */
-
-static final byte[] ch88data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch88 = new BitmapCharRec(7,10,-1,0,9,ch88data);
-
-/* char: 0x57 'W' */
-
-static final byte[] ch87data = {
-(byte) 0x44,(byte) 0xaa,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch87 = new BitmapCharRec(7,10,-1,0,9,ch87data);
-
-/* char: 0x56 'V' */
-
-static final byte[] ch86data = {
-(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch86 = new BitmapCharRec(7,10,-1,0,9,ch86data);
-
-/* char: 0x55 'U' */
-
-static final byte[] ch85data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch85 = new BitmapCharRec(7,10,-1,0,9,ch85data);
-
-/* char: 0x54 'T' */
-
-static final byte[] ch84data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch84 = new BitmapCharRec(7,10,-1,0,9,ch84data);
-
-/* char: 0x53 'S' */
-
-static final byte[] ch83data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x2,(byte) 0xc,(byte) 0x70,(byte) 0x80,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch83 = new BitmapCharRec(7,10,-1,0,9,ch83data);
-
-/* char: 0x52 'R' */
-
-static final byte[] ch82data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x84,(byte) 0x88,(byte) 0x90,(byte) 0xfc,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch82 = new BitmapCharRec(7,10,-1,0,9,ch82data);
-
-/* char: 0x51 'Q' */
-
-static final byte[] ch81data = {
-(byte) 0x6,(byte) 0x8,(byte) 0x7c,(byte) 0x92,(byte) 0xa2,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch81 = new BitmapCharRec(7,12,-1,2,9,ch81data);
-
-/* char: 0x50 'P' */
-
-static final byte[] ch80data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch80 = new BitmapCharRec(7,10,-1,0,9,ch80data);
-
-/* char: 0x4f 'O' */
-
-static final byte[] ch79data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch79 = new BitmapCharRec(7,10,-1,0,9,ch79data);
-
-/* char: 0x4e 'N' */
-
-static final byte[] ch78data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x86,(byte) 0x8a,(byte) 0x92,(byte) 0xa2,(byte) 0xc2,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch78 = new BitmapCharRec(7,10,-1,0,9,ch78data);
-
-/* char: 0x4d 'M' */
-
-static final byte[] ch77data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x92,(byte) 0x92,(byte) 0xaa,(byte) 0xaa,(byte) 0xc6,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch77 = new BitmapCharRec(7,10,-1,0,9,ch77data);
-
-/* char: 0x4c 'L' */
-
-static final byte[] ch76data = {
-(byte) 0xfe,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch76 = new BitmapCharRec(7,10,-1,0,9,ch76data);
-
-/* char: 0x4b 'K' */
-
-static final byte[] ch75data = {
-(byte) 0x82,(byte) 0x84,(byte) 0x88,(byte) 0x90,(byte) 0xa0,(byte) 0xe0,(byte) 0x90,(byte) 0x88,(byte) 0x84,(byte) 0x82,
-};
-
-static final BitmapCharRec ch75 = new BitmapCharRec(7,10,-1,0,9,ch75data);
-
-/* char: 0x4a 'J' */
-
-static final byte[] ch74data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0x1e,
-};
-
-static final BitmapCharRec ch74 = new BitmapCharRec(7,10,-1,0,9,ch74data);
-
-/* char: 0x49 'I' */
-
-static final byte[] ch73data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch73 = new BitmapCharRec(5,10,-2,0,9,ch73data);
-
-/* char: 0x48 'H' */
-
-static final byte[] ch72data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch72 = new BitmapCharRec(7,10,-1,0,9,ch72data);
-
-/* char: 0x47 'G' */
-
-static final byte[] ch71data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x8e,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch71 = new BitmapCharRec(7,10,-1,0,9,ch71data);
-
-/* char: 0x46 'F' */
-
-static final byte[] ch70data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x78,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch70 = new BitmapCharRec(7,10,-1,0,9,ch70data);
-
-/* char: 0x45 'E' */
-
-static final byte[] ch69data = {
-(byte) 0xfe,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x78,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch69 = new BitmapCharRec(7,10,-1,0,9,ch69data);
-
-/* char: 0x44 'D' */
-
-static final byte[] ch68data = {
-(byte) 0xfc,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch68 = new BitmapCharRec(7,10,-1,0,9,ch68data);
-
-/* char: 0x43 'C' */
-
-static final byte[] ch67data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch67 = new BitmapCharRec(7,10,-1,0,9,ch67data);
-
-/* char: 0x42 'B' */
-
-static final byte[] ch66data = {
-(byte) 0xfc,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0x7c,(byte) 0x42,(byte) 0x42,(byte) 0x42,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch66 = new BitmapCharRec(7,10,-1,0,9,ch66data);
-
-/* char: 0x41 'A' */
-
-static final byte[] ch65data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch65 = new BitmapCharRec(7,10,-1,0,9,ch65data);
-
-/* char: 0x40 '@' */
-
-static final byte[] ch64data = {
-(byte) 0x7c,(byte) 0x80,(byte) 0x80,(byte) 0x9a,(byte) 0xa6,(byte) 0xa2,(byte) 0x9e,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch64 = new BitmapCharRec(7,10,-1,0,9,ch64data);
-
-/* char: 0x3f '?' */
-
-static final byte[] ch63data = {
-(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch63 = new BitmapCharRec(7,10,-1,0,9,ch63data);
-
-/* char: 0x3e '>' */
-
-static final byte[] ch62data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch62 = new BitmapCharRec(5,10,-2,0,9,ch62data);
-
-/* char: 0x3d '=' */
-
-static final byte[] ch61data = {
-(byte) 0xfe,(byte) 0x0,(byte) 0x0,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch61 = new BitmapCharRec(7,4,-1,-2,9,ch61data);
-
-/* char: 0x3c '<' */
-
-static final byte[] ch60data = {
-(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch60 = new BitmapCharRec(5,10,-2,0,9,ch60data);
-
-/* char: 0x3b ';' */
-
-static final byte[] ch59data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch59 = new BitmapCharRec(2,10,-4,3,9,ch59data);
-
-/* char: 0x3a ':' */
-
-static final byte[] ch58data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch58 = new BitmapCharRec(2,7,-4,0,9,ch58data);
-
-/* char: 0x39 '9' */
-
-static final byte[] ch57data = {
-(byte) 0x78,(byte) 0x4,(byte) 0x2,(byte) 0x2,(byte) 0x7a,(byte) 0x86,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch57 = new BitmapCharRec(7,10,-1,0,9,ch57data);
-
-/* char: 0x38 '8' */
-
-static final byte[] ch56data = {
-(byte) 0x38,(byte) 0x44,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,(byte) 0x44,(byte) 0x82,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch56 = new BitmapCharRec(7,10,-1,0,9,ch56data);
-
-/* char: 0x37 '7' */
-
-static final byte[] ch55data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0x2,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch55 = new BitmapCharRec(7,10,-1,0,9,ch55data);
-
-/* char: 0x36 '6' */
-
-static final byte[] ch54data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xc2,(byte) 0xbc,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch54 = new BitmapCharRec(7,10,-1,0,9,ch54data);
-
-/* char: 0x35 '5' */
-
-static final byte[] ch53data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x2,(byte) 0x2,(byte) 0x2,(byte) 0xc2,(byte) 0xbc,(byte) 0x80,(byte) 0x80,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch53 = new BitmapCharRec(7,10,-1,0,9,ch53data);
-
-/* char: 0x34 '4' */
-
-static final byte[] ch52data = {
-(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0xfe,(byte) 0x84,(byte) 0x44,(byte) 0x24,(byte) 0x14,(byte) 0xc,(byte) 0x4,
-};
-
-static final BitmapCharRec ch52 = new BitmapCharRec(7,10,-1,0,9,ch52data);
-
-/* char: 0x33 '3' */
-
-static final byte[] ch51data = {
-(byte) 0x7c,(byte) 0x82,(byte) 0x2,(byte) 0x2,(byte) 0x2,(byte) 0x1c,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch51 = new BitmapCharRec(7,10,-1,0,9,ch51data);
-
-/* char: 0x32 '2' */
-
-static final byte[] ch50data = {
-(byte) 0xfe,(byte) 0x80,(byte) 0x40,(byte) 0x30,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0x82,(byte) 0x82,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch50 = new BitmapCharRec(7,10,-1,0,9,ch50data);
-
-/* char: 0x31 '1' */
-
-static final byte[] ch49data = {
-(byte) 0xfe,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x90,(byte) 0x50,(byte) 0x30,(byte) 0x10,
-};
-
-static final BitmapCharRec ch49 = new BitmapCharRec(7,10,-1,0,9,ch49data);
-
-/* char: 0x30 '0' */
-
-static final byte[] ch48data = {
-(byte) 0x38,(byte) 0x44,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch48 = new BitmapCharRec(7,10,-1,0,9,ch48data);
-
-/* char: 0x2f '/' */
-
-static final byte[] ch47data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x4,(byte) 0x2,
-};
-
-static final BitmapCharRec ch47 = new BitmapCharRec(7,10,-1,0,9,ch47data);
-
-/* char: 0x2e '.' */
-
-static final byte[] ch46data = {
-(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch46 = new BitmapCharRec(2,2,-4,0,9,ch46data);
-
-/* char: 0x2d '-' */
-
-static final byte[] ch45data = {
-(byte) 0xfe,
-};
-
-static final BitmapCharRec ch45 = new BitmapCharRec(7,1,-1,-4,9,ch45data);
-
-/* char: 0x2c ',' */
-
-static final byte[] ch44data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch44 = new BitmapCharRec(2,5,-4,3,9,ch44data);
-
-/* char: 0x2b '+' */
-
-static final byte[] ch43data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xfe,(byte) 0x10,(byte) 0x10,(byte) 0x10,
-};
-
-static final BitmapCharRec ch43 = new BitmapCharRec(7,7,-1,-1,9,ch43data);
-
-/* char: 0x2a '*' */
-
-static final byte[] ch42data = {
-(byte) 0x10,(byte) 0x92,(byte) 0x54,(byte) 0x38,(byte) 0x54,(byte) 0x92,(byte) 0x10,
-};
-
-static final BitmapCharRec ch42 = new BitmapCharRec(7,7,-1,-1,9,ch42data);
-
-/* char: 0x29 ')' */
-
-static final byte[] ch41data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch41 = new BitmapCharRec(3,12,-3,1,9,ch41data);
-
-/* char: 0x28 '(' */
-
-static final byte[] ch40data = {
-(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch40 = new BitmapCharRec(3,12,-3,1,9,ch40data);
-
-/* char: 0x27 ''' */
-
-static final byte[] ch39data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x30,
-};
-
-static final BitmapCharRec ch39 = new BitmapCharRec(4,4,-3,-6,9,ch39data);
-
-/* char: 0x26 '&' */
-
-static final byte[] ch38data = {
-(byte) 0x62,(byte) 0x94,(byte) 0x88,(byte) 0x94,(byte) 0x62,(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch38 = new BitmapCharRec(7,10,-1,0,9,ch38data);
-
-/* char: 0x25 '%' */
-
-static final byte[] ch37data = {
-(byte) 0x84,(byte) 0x4a,(byte) 0x4a,(byte) 0x24,(byte) 0x10,(byte) 0x10,(byte) 0x48,(byte) 0xa4,(byte) 0xa4,(byte) 0x42,
-};
-
-static final BitmapCharRec ch37 = new BitmapCharRec(7,10,-1,0,9,ch37data);
-
-/* char: 0x24 '$' */
-
-static final byte[] ch36data = {
-(byte) 0x10,(byte) 0x7c,(byte) 0x92,(byte) 0x12,(byte) 0x12,(byte) 0x14,(byte) 0x38,(byte) 0x50,(byte) 0x90,(byte) 0x92,(byte) 0x7c,(byte) 0x10,
-};
-
-static final BitmapCharRec ch36 = new BitmapCharRec(7,12,-1,1,9,ch36data);
-
-/* char: 0x23 '#' */
-
-static final byte[] ch35data = {
-(byte) 0x48,(byte) 0x48,(byte) 0xfc,(byte) 0x48,(byte) 0x48,(byte) 0xfc,(byte) 0x48,(byte) 0x48,
-};
-
-static final BitmapCharRec ch35 = new BitmapCharRec(6,8,-1,-1,9,ch35data);
-
-/* char: 0x22 '"' */
-
-static final byte[] ch34data = {
-(byte) 0x90,(byte) 0x90,(byte) 0x90,
-};
-
-static final BitmapCharRec ch34 = new BitmapCharRec(4,3,-3,-7,9,ch34data);
-
-/* char: 0x21 '!' */
-
-static final byte[] ch33data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch33 = new BitmapCharRec(1,11,-4,0,9,ch33data);
-
-/* char: 0x1f */
-
-static final byte[] ch31data = {
-(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch31 = new BitmapCharRec(2,2,-4,-2,9,ch31data);
-
-/* char: 0x1e */
-
-static final byte[] ch30data = {
-(byte) 0x5c,(byte) 0xa2,(byte) 0x60,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x22,(byte) 0x1c,
-};
-
-static final BitmapCharRec ch30 = new BitmapCharRec(7,10,-1,0,9,ch30data);
-
-/* char: 0x1d */
-
-static final byte[] ch29data = {
-(byte) 0x80,(byte) 0x40,(byte) 0xfe,(byte) 0x10,(byte) 0xfe,(byte) 0x4,(byte) 0x2,
-};
-
-static final BitmapCharRec ch29 = new BitmapCharRec(7,7,-1,0,9,ch29data);
-
-/* char: 0x1c */
-
-static final byte[] ch28data = {
-(byte) 0x44,(byte) 0x24,(byte) 0x24,(byte) 0x24,(byte) 0x24,(byte) 0x24,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch28 = new BitmapCharRec(7,7,-1,0,9,ch28data);
-
-/* char: 0x1b */
-
-static final byte[] ch27data = {
-(byte) 0xfe,(byte) 0x0,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch27 = new BitmapCharRec(7,12,-1,2,9,ch27data);
-
-/* char: 0x1a */
-
-static final byte[] ch26data = {
-(byte) 0xfc,(byte) 0x0,(byte) 0x4,(byte) 0x8,(byte) 0x10,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,
-};
-
-static final BitmapCharRec ch26 = new BitmapCharRec(6,12,-2,2,9,ch26data);
-
-/* char: 0x19 */
-
-static final byte[] ch25data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch25 = new BitmapCharRec(1,15,-4,3,9,ch25data);
-
-/* char: 0x18 */
-
-static final byte[] ch24data = {
-(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0xff,(byte) 0x80,
-};
-
-static final BitmapCharRec ch24 = new BitmapCharRec(9,7,0,3,9,ch24data);
-
-/* char: 0x17 */
-
-static final byte[] ch23data = {
-(byte) 0xff,(byte) 0x80,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,
-(byte) 0x8,(byte) 0x0,
-};
-
-static final BitmapCharRec ch23 = new BitmapCharRec(9,9,0,-3,9,ch23data);
-
-/* char: 0x16 */
-
-static final byte[] ch22data = {
-(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0xf8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,
-};
-
-static final BitmapCharRec ch22 = new BitmapCharRec(5,15,0,3,9,ch22data);
-
-/* char: 0x15 */
-
-static final byte[] ch21data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch21 = new BitmapCharRec(5,15,-4,3,9,ch21data);
-
-/* char: 0x14 */
-
-static final byte[] ch20data = {
-(byte) 0xff,(byte) 0x80,
-};
-
-static final BitmapCharRec ch20 = new BitmapCharRec(9,1,0,1,9,ch20data);
-
-/* char: 0x13 */
-
-static final byte[] ch19data = {
-(byte) 0xff,(byte) 0x80,
-};
-
-static final BitmapCharRec ch19 = new BitmapCharRec(9,1,0,-1,9,ch19data);
-
-/* char: 0x12 */
-
-static final byte[] ch18data = {
-(byte) 0xff,(byte) 0x80,
-};
-
-static final BitmapCharRec ch18 = new BitmapCharRec(9,1,0,-3,9,ch18data);
-
-/* char: 0x11 */
-
-static final byte[] ch17data = {
-(byte) 0xff,(byte) 0x80,
-};
-
-static final BitmapCharRec ch17 = new BitmapCharRec(9,1,0,-5,9,ch17data);
-
-/* char: 0x10 */
-
-static final byte[] ch16data = {
-(byte) 0xff,(byte) 0x80,
-};
-
-static final BitmapCharRec ch16 = new BitmapCharRec(9,1,0,-7,9,ch16data);
-
-/* char: 0xf */
-
-static final byte[] ch15data = {
-(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0x8,(byte) 0x0,
-(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,
-};
-
-static final BitmapCharRec ch15 = new BitmapCharRec(9,15,0,3,9,ch15data);
-
-/* char: 0xe */
-
-static final byte[] ch14data = {
-(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch14 = new BitmapCharRec(5,9,-4,-3,9,ch14data);
-
-/* char: 0xd */
-
-static final byte[] ch13data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch13 = new BitmapCharRec(5,7,-4,3,9,ch13data);
-
-/* char: 0xc */
-
-static final byte[] ch12data = {
-(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch12 = new BitmapCharRec(5,7,0,3,9,ch12data);
-
-/* char: 0xb */
-
-static final byte[] ch11data = {
-(byte) 0xf8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,
-};
-
-static final BitmapCharRec ch11 = new BitmapCharRec(5,9,0,-3,9,ch11data);
-
-/* char: 0xa */
-
-static final byte[] ch10data = {
-(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x3e,(byte) 0x0,(byte) 0x20,(byte) 0x50,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch10 = new BitmapCharRec(7,10,-1,2,9,ch10data);
-
-/* char: 0x9 */
-
-static final byte[] ch9data = {
-(byte) 0x3e,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x88,(byte) 0x98,(byte) 0xa8,(byte) 0xc8,(byte) 0x88,
-};
-
-static final BitmapCharRec ch9 = new BitmapCharRec(7,10,-1,2,9,ch9data);
-
-/* char: 0x8 */
-
-static final byte[] ch8data = {
-(byte) 0xfe,(byte) 0x10,(byte) 0x10,(byte) 0xfe,(byte) 0x10,(byte) 0x10,
-};
-
-static final BitmapCharRec ch8 = new BitmapCharRec(7,6,-1,0,9,ch8data);
-
-/* char: 0x7 */
-
-static final byte[] ch7data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch7 = new BitmapCharRec(5,4,-2,-6,9,ch7data);
-
-/* char: 0x6 */
-
-static final byte[] ch6data = {
-(byte) 0x20,(byte) 0x20,(byte) 0x3c,(byte) 0x20,(byte) 0x3e,(byte) 0x0,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch6 = new BitmapCharRec(7,10,-1,2,9,ch6data);
-
-/* char: 0x5 */
-
-static final byte[] ch5data = {
-(byte) 0x22,(byte) 0x22,(byte) 0x3c,(byte) 0x22,(byte) 0x3c,(byte) 0x0,(byte) 0x78,(byte) 0x80,(byte) 0x80,(byte) 0x78,
-};
-
-static final BitmapCharRec ch5 = new BitmapCharRec(7,10,-1,2,9,ch5data);
-
-/* char: 0x4 */
-
-static final byte[] ch4data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x1c,(byte) 0x10,(byte) 0x1e,(byte) 0x80,(byte) 0x80,(byte) 0xe0,(byte) 0x80,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch4 = new BitmapCharRec(7,10,-1,2,9,ch4data);
-
-/* char: 0x3 */
-
-static final byte[] ch3data = {
-(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x3e,(byte) 0x0,(byte) 0x88,(byte) 0x88,(byte) 0xf8,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch3 = new BitmapCharRec(7,10,-1,2,9,ch3data);
-
-/* char: 0x2 */
-
-static final byte[] ch2data = {
-(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,(byte) 0x55,(byte) 0xaa,
-};
-
-static final BitmapCharRec ch2 = new BitmapCharRec(8,14,0,3,9,ch2data);
-
-/* char: 0x1 */
-
-static final byte[] ch1data = {
-(byte) 0x10,(byte) 0x38,(byte) 0x7c,(byte) 0xfe,(byte) 0x7c,(byte) 0x38,(byte) 0x10,
-};
-
-static final BitmapCharRec ch1 = new BitmapCharRec(7,7,-1,0,9,ch1data);
-
-static final BitmapCharRec[] chars = {
-ch0,
-ch1,
-ch2,
-ch3,
-ch4,
-ch5,
-ch6,
-ch7,
-ch8,
-ch9,
-ch10,
-ch11,
-ch12,
-ch13,
-ch14,
-ch15,
-ch16,
-ch17,
-ch18,
-ch19,
-ch20,
-ch21,
-ch22,
-ch23,
-ch24,
-ch25,
-ch26,
-ch27,
-ch28,
-ch29,
-ch30,
-ch31,
-ch32,
-ch33,
-ch34,
-ch35,
-ch36,
-ch37,
-ch38,
-ch39,
-ch40,
-ch41,
-ch42,
-ch43,
-ch44,
-ch45,
-ch46,
-ch47,
-ch48,
-ch49,
-ch50,
-ch51,
-ch52,
-ch53,
-ch54,
-ch55,
-ch56,
-ch57,
-ch58,
-ch59,
-ch60,
-ch61,
-ch62,
-ch63,
-ch64,
-ch65,
-ch66,
-ch67,
-ch68,
-ch69,
-ch70,
-ch71,
-ch72,
-ch73,
-ch74,
-ch75,
-ch76,
-ch77,
-ch78,
-ch79,
-ch80,
-ch81,
-ch82,
-ch83,
-ch84,
-ch85,
-ch86,
-ch87,
-ch88,
-ch89,
-ch90,
-ch91,
-ch92,
-ch93,
-ch94,
-ch95,
-ch96,
-ch97,
-ch98,
-ch99,
-ch100,
-ch101,
-ch102,
-ch103,
-ch104,
-ch105,
-ch106,
-ch107,
-ch108,
-ch109,
-ch110,
-ch111,
-ch112,
-ch113,
-ch114,
-ch115,
-ch116,
-ch117,
-ch118,
-ch119,
-ch120,
-ch121,
-ch122,
-ch123,
-ch124,
-ch125,
-ch126,
-ch127,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-ch160,
-ch161,
-ch162,
-ch163,
-ch164,
-ch165,
-ch166,
-ch167,
-ch168,
-ch169,
-ch170,
-ch171,
-ch172,
-ch173,
-ch174,
-ch175,
-ch176,
-ch177,
-ch178,
-ch179,
-ch180,
-ch181,
-ch182,
-ch183,
-ch184,
-ch185,
-ch186,
-ch187,
-ch188,
-ch189,
-ch190,
-ch191,
-ch192,
-ch193,
-ch194,
-ch195,
-ch196,
-ch197,
-ch198,
-ch199,
-ch200,
-ch201,
-ch202,
-ch203,
-ch204,
-ch205,
-ch206,
-ch207,
-ch208,
-ch209,
-ch210,
-ch211,
-ch212,
-ch213,
-ch214,
-ch215,
-ch216,
-ch217,
-ch218,
-ch219,
-ch220,
-ch221,
-ch222,
-ch223,
-ch224,
-ch225,
-ch226,
-ch227,
-ch228,
-ch229,
-ch230,
-ch231,
-ch232,
-ch233,
-ch234,
-ch235,
-ch236,
-ch237,
-ch238,
-ch239,
-ch240,
-ch241,
-ch242,
-ch243,
-ch244,
-ch245,
-ch246,
-ch247,
-ch248,
-ch249,
-ch250,
-ch251,
-ch252,
-ch253,
-ch254,
-ch255,
-};
-
-  public static final BitmapFontRec glutBitmap9By15 = new BitmapFontRec("-misc-fixed-medium-r-normal--15-140-75-75-C-90-iso8859-1",
-                                                                 256,
-                                                                 0,
-                                                                 chars);
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica10.java b/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica10.java
deleted file mode 100644
index cca045ffa..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica10.java
+++ /dev/null
@@ -1,1798 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-class GLUTBitmapHelvetica10 {
-
-/* GENERATED FILE -- DO NOT MODIFY */
-
-/* char: 0xff */
-
-static final byte[] ch255data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x60,(byte) 0xa0,(byte) 0xa0,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch255 = new BitmapCharRec(4,10,0,2,5,ch255data);
-
-/* char: 0xfe */
-
-static final byte[] ch254data = {
-(byte) 0x80,(byte) 0x80,(byte) 0xb0,(byte) 0xc8,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch254 = new BitmapCharRec(5,10,0,2,6,ch254data);
-
-/* char: 0xfd */
-
-static final byte[] ch253data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x60,(byte) 0xa0,(byte) 0xa0,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch253 = new BitmapCharRec(4,11,0,2,5,ch253data);
-
-/* char: 0xfc */
-
-static final byte[] ch252data = {
-(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch252 = new BitmapCharRec(4,8,0,0,5,ch252data);
-
-/* char: 0xfb */
-
-static final byte[] ch251data = {
-(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch251 = new BitmapCharRec(4,9,0,0,5,ch251data);
-
-/* char: 0xfa */
-
-static final byte[] ch250data = {
-(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch250 = new BitmapCharRec(4,9,0,0,5,ch250data);
-
-/* char: 0xf9 */
-
-static final byte[] ch249data = {
-(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch249 = new BitmapCharRec(4,9,0,0,5,ch249data);
-
-/* char: 0xf8 */
-
-static final byte[] ch248data = {
-(byte) 0x70,(byte) 0x88,(byte) 0xc8,(byte) 0xa8,(byte) 0x98,(byte) 0x74,
-};
-
-static final BitmapCharRec ch248 = new BitmapCharRec(6,6,0,0,6,ch248data);
-
-/* char: 0xf7 */
-
-static final byte[] ch247data = {
-(byte) 0x20,(byte) 0x0,(byte) 0xf8,(byte) 0x0,(byte) 0x20,
-};
-
-static final BitmapCharRec ch247 = new BitmapCharRec(5,5,0,-1,6,ch247data);
-
-/* char: 0xf6 */
-
-static final byte[] ch246data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch246 = new BitmapCharRec(5,8,0,0,6,ch246data);
-
-/* char: 0xf5 */
-
-static final byte[] ch245data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch245 = new BitmapCharRec(5,9,0,0,6,ch245data);
-
-/* char: 0xf4 */
-
-static final byte[] ch244data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch244 = new BitmapCharRec(5,9,0,0,6,ch244data);
-
-/* char: 0xf3 */
-
-static final byte[] ch243data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch243 = new BitmapCharRec(5,9,0,0,6,ch243data);
-
-/* char: 0xf2 */
-
-static final byte[] ch242data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch242 = new BitmapCharRec(5,9,0,0,6,ch242data);
-
-/* char: 0xf1 */
-
-static final byte[] ch241data = {
-(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch241 = new BitmapCharRec(4,9,0,0,5,ch241data);
-
-/* char: 0xf0 */
-
-static final byte[] ch240data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x90,(byte) 0x60,(byte) 0x50,
-};
-
-static final BitmapCharRec ch240 = new BitmapCharRec(5,9,0,0,6,ch240data);
-
-/* char: 0xef */
-
-static final byte[] ch239data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch239 = new BitmapCharRec(3,8,0,0,2,ch239data);
-
-/* char: 0xee */
-
-static final byte[] ch238data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch238 = new BitmapCharRec(3,9,1,0,2,ch238data);
-
-/* char: 0xed */
-
-static final byte[] ch237data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x40,
-};
-
-static final BitmapCharRec ch237 = new BitmapCharRec(2,9,0,0,2,ch237data);
-
-/* char: 0xec */
-
-static final byte[] ch236data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch236 = new BitmapCharRec(2,9,1,0,2,ch236data);
-
-/* char: 0xeb */
-
-static final byte[] ch235data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0xf0,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch235 = new BitmapCharRec(4,8,0,0,5,ch235data);
-
-/* char: 0xea */
-
-static final byte[] ch234data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0xf0,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch234 = new BitmapCharRec(4,9,0,0,5,ch234data);
-
-/* char: 0xe9 */
-
-static final byte[] ch233data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0xf0,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch233 = new BitmapCharRec(4,9,0,0,5,ch233data);
-
-/* char: 0xe8 */
-
-static final byte[] ch232data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0xf0,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch232 = new BitmapCharRec(4,9,0,0,5,ch232data);
-
-/* char: 0xe7 */
-
-static final byte[] ch231data = {
-(byte) 0x60,(byte) 0x20,(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0x80,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch231 = new BitmapCharRec(4,8,0,2,5,ch231data);
-
-/* char: 0xe6 */
-
-static final byte[] ch230data = {
-(byte) 0x6c,(byte) 0x92,(byte) 0x90,(byte) 0x7e,(byte) 0x12,(byte) 0xec,
-};
-
-static final BitmapCharRec ch230 = new BitmapCharRec(7,6,0,0,8,ch230data);
-
-/* char: 0xe5 */
-
-static final byte[] ch229data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,(byte) 0x20,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch229 = new BitmapCharRec(5,9,0,0,5,ch229data);
-
-/* char: 0xe4 */
-
-static final byte[] ch228data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch228 = new BitmapCharRec(5,8,0,0,5,ch228data);
-
-/* char: 0xe3 */
-
-static final byte[] ch227data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch227 = new BitmapCharRec(5,9,0,0,5,ch227data);
-
-/* char: 0xe2 */
-
-static final byte[] ch226data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,(byte) 0x0,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch226 = new BitmapCharRec(5,9,0,0,5,ch226data);
-
-/* char: 0xe1 */
-
-static final byte[] ch225data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch225 = new BitmapCharRec(5,9,0,0,5,ch225data);
-
-/* char: 0xe0 */
-
-static final byte[] ch224data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch224 = new BitmapCharRec(5,9,0,0,5,ch224data);
-
-/* char: 0xdf */
-
-static final byte[] ch223data = {
-(byte) 0xa0,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xa0,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch223 = new BitmapCharRec(4,8,0,0,5,ch223data);
-
-/* char: 0xde */
-
-static final byte[] ch222data = {
-(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x88,(byte) 0x88,(byte) 0xf0,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch222 = new BitmapCharRec(5,8,-1,0,7,ch222data);
-
-/* char: 0xdd */
-
-static final byte[] ch221data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x0,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch221 = new BitmapCharRec(7,11,0,0,7,ch221data);
-
-/* char: 0xdc */
-
-static final byte[] ch220data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x48,
-};
-
-static final BitmapCharRec ch220 = new BitmapCharRec(6,10,-1,0,8,ch220data);
-
-/* char: 0xdb */
-
-static final byte[] ch219data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch219 = new BitmapCharRec(6,11,-1,0,8,ch219data);
-
-/* char: 0xda */
-
-static final byte[] ch218data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch218 = new BitmapCharRec(6,11,-1,0,8,ch218data);
-
-/* char: 0xd9 */
-
-static final byte[] ch217data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch217 = new BitmapCharRec(6,11,-1,0,8,ch217data);
-
-/* char: 0xd8 */
-
-static final byte[] ch216data = {
-(byte) 0x80,(byte) 0x78,(byte) 0xc4,(byte) 0xa4,(byte) 0xa4,(byte) 0x94,(byte) 0x94,(byte) 0x8c,(byte) 0x78,(byte) 0x4,
-};
-
-static final BitmapCharRec ch216 = new BitmapCharRec(6,10,-1,1,8,ch216data);
-
-/* char: 0xd7 */
-
-static final byte[] ch215data = {
-(byte) 0x88,(byte) 0x50,(byte) 0x20,(byte) 0x50,(byte) 0x88,
-};
-
-static final BitmapCharRec ch215 = new BitmapCharRec(5,5,0,-1,6,ch215data);
-
-/* char: 0xd6 */
-
-static final byte[] ch214data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x48,
-};
-
-static final BitmapCharRec ch214 = new BitmapCharRec(6,10,-1,0,8,ch214data);
-
-/* char: 0xd5 */
-
-static final byte[] ch213data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch213 = new BitmapCharRec(6,11,-1,0,8,ch213data);
-
-/* char: 0xd4 */
-
-static final byte[] ch212data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch212 = new BitmapCharRec(6,11,-1,0,8,ch212data);
-
-/* char: 0xd3 */
-
-static final byte[] ch211data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch211 = new BitmapCharRec(6,11,-1,0,8,ch211data);
-
-/* char: 0xd2 */
-
-static final byte[] ch210data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch210 = new BitmapCharRec(6,11,-1,0,8,ch210data);
-
-/* char: 0xd1 */
-
-static final byte[] ch209data = {
-(byte) 0x8c,(byte) 0x8c,(byte) 0x94,(byte) 0x94,(byte) 0xa4,(byte) 0xa4,(byte) 0xc4,(byte) 0xc4,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch209 = new BitmapCharRec(6,11,-1,0,8,ch209data);
-
-/* char: 0xd0 */
-
-static final byte[] ch208data = {
-(byte) 0x78,(byte) 0x44,(byte) 0x42,(byte) 0x42,(byte) 0xf2,(byte) 0x42,(byte) 0x44,(byte) 0x78,
-};
-
-static final BitmapCharRec ch208 = new BitmapCharRec(7,8,0,0,8,ch208data);
-
-/* char: 0xcf */
-
-static final byte[] ch207data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch207 = new BitmapCharRec(3,10,0,0,3,ch207data);
-
-/* char: 0xce */
-
-static final byte[] ch206data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch206 = new BitmapCharRec(3,11,0,0,3,ch206data);
-
-/* char: 0xcd */
-
-static final byte[] ch205data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x40,
-};
-
-static final BitmapCharRec ch205 = new BitmapCharRec(2,11,-1,0,3,ch205data);
-
-/* char: 0xcc */
-
-static final byte[] ch204data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch204 = new BitmapCharRec(2,11,0,0,3,ch204data);
-
-/* char: 0xcb */
-
-static final byte[] ch203data = {
-(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch203 = new BitmapCharRec(5,10,-1,0,7,ch203data);
-
-/* char: 0xca */
-
-static final byte[] ch202data = {
-(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x0,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch202 = new BitmapCharRec(5,11,-1,0,7,ch202data);
-
-/* char: 0xc9 */
-
-static final byte[] ch201data = {
-(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch201 = new BitmapCharRec(5,11,-1,0,7,ch201data);
-
-/* char: 0xc8 */
-
-static final byte[] ch200data = {
-(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch200 = new BitmapCharRec(5,11,-1,0,7,ch200data);
-
-/* char: 0xc7 */
-
-static final byte[] ch199data = {
-(byte) 0x30,(byte) 0x10,(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch199 = new BitmapCharRec(6,10,-1,2,8,ch199data);
-
-/* char: 0xc6 */
-
-static final byte[] ch198data = {
-(byte) 0x8f,(byte) 0x80,(byte) 0x88,(byte) 0x0,(byte) 0x78,(byte) 0x0,(byte) 0x48,(byte) 0x0,(byte) 0x2f,(byte) 0x80,(byte) 0x28,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x1f,(byte) 0x80,
-};
-
-static final BitmapCharRec ch198 = new BitmapCharRec(9,8,0,0,10,ch198data);
-
-/* char: 0xc5 */
-
-static final byte[] ch197data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch197 = new BitmapCharRec(7,11,0,0,7,ch197data);
-
-/* char: 0xc4 */
-
-static final byte[] ch196data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x28,
-};
-
-static final BitmapCharRec ch196 = new BitmapCharRec(7,10,0,0,7,ch196data);
-
-/* char: 0xc3 */
-
-static final byte[] ch195data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x28,(byte) 0x14,
-};
-
-static final BitmapCharRec ch195 = new BitmapCharRec(7,11,0,0,7,ch195data);
-
-/* char: 0xc2 */
-
-static final byte[] ch194data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch194 = new BitmapCharRec(7,11,0,0,7,ch194data);
-
-/* char: 0xc1 */
-
-static final byte[] ch193data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch193 = new BitmapCharRec(7,11,0,0,7,ch193data);
-
-/* char: 0xc0 */
-
-static final byte[] ch192data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch192 = new BitmapCharRec(7,11,0,0,7,ch192data);
-
-/* char: 0xbf */
-
-static final byte[] ch191data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x0,(byte) 0x20,
-};
-
-static final BitmapCharRec ch191 = new BitmapCharRec(4,8,-1,2,6,ch191data);
-
-/* char: 0xbe */
-
-static final byte[] ch190data = {
-(byte) 0x21,(byte) 0x0,(byte) 0x17,(byte) 0x80,(byte) 0x13,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0xc8,(byte) 0x0,(byte) 0x24,(byte) 0x0,(byte) 0x44,(byte) 0x0,(byte) 0xe2,(byte) 0x0,
-};
-
-static final BitmapCharRec ch190 = new BitmapCharRec(9,8,0,0,9,ch190data);
-
-/* char: 0xbd */
-
-static final byte[] ch189data = {
-(byte) 0x27,(byte) 0x12,(byte) 0x15,(byte) 0xb,(byte) 0x48,(byte) 0x44,(byte) 0xc4,(byte) 0x42,
-};
-
-static final BitmapCharRec ch189 = new BitmapCharRec(8,8,0,0,9,ch189data);
-
-/* char: 0xbc */
-
-static final byte[] ch188data = {
-(byte) 0x21,(byte) 0x0,(byte) 0x17,(byte) 0x80,(byte) 0x13,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x48,(byte) 0x0,(byte) 0x44,(byte) 0x0,(byte) 0xc4,(byte) 0x0,(byte) 0x42,(byte) 0x0,
-};
-
-static final BitmapCharRec ch188 = new BitmapCharRec(9,8,0,0,9,ch188data);
-
-/* char: 0xbb */
-
-static final byte[] ch187data = {
-(byte) 0xa0,(byte) 0x50,(byte) 0x28,(byte) 0x50,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch187 = new BitmapCharRec(5,5,0,0,6,ch187data);
-
-/* char: 0xba */
-
-static final byte[] ch186data = {
-(byte) 0xe0,(byte) 0x0,(byte) 0xe0,(byte) 0xa0,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch186 = new BitmapCharRec(3,5,0,-3,4,ch186data);
-
-/* char: 0xb9 */
-
-static final byte[] ch185data = {
-(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch185 = new BitmapCharRec(2,4,0,-3,3,ch185data);
-
-/* char: 0xb8 */
-
-static final byte[] ch184data = {
-(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch184 = new BitmapCharRec(2,2,0,2,3,ch184data);
-
-/* char: 0xb7 */
-
-static final byte[] ch183data = {
-(byte) 0xc0,
-};
-
-static final BitmapCharRec ch183 = new BitmapCharRec(2,1,0,-3,3,ch183data);
-
-/* char: 0xb6 */
-
-static final byte[] ch182data = {
-(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x68,(byte) 0xe8,(byte) 0xe8,(byte) 0xe8,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch182 = new BitmapCharRec(6,10,0,2,6,ch182data);
-
-/* char: 0xb5 */
-
-static final byte[] ch181data = {
-(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,
-};
-
-static final BitmapCharRec ch181 = new BitmapCharRec(4,8,0,2,5,ch181data);
-
-/* char: 0xb4 */
-
-static final byte[] ch180data = {
-(byte) 0x80,(byte) 0x40,
-};
-
-static final BitmapCharRec ch180 = new BitmapCharRec(2,2,0,-6,3,ch180data);
-
-/* char: 0xb3 */
-
-static final byte[] ch179data = {
-(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch179 = new BitmapCharRec(3,4,0,-3,3,ch179data);
-
-/* char: 0xb2 */
-
-static final byte[] ch178data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0xa0,(byte) 0x60,
-};
-
-static final BitmapCharRec ch178 = new BitmapCharRec(3,4,0,-3,3,ch178data);
-
-/* char: 0xb1 */
-
-static final byte[] ch177data = {
-(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch177 = new BitmapCharRec(5,7,0,0,6,ch177data);
-
-/* char: 0xb0 */
-
-static final byte[] ch176data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch176 = new BitmapCharRec(4,4,0,-3,4,ch176data);
-
-/* char: 0xaf */
-
-static final byte[] ch175data = {
-(byte) 0xe0,
-};
-
-static final BitmapCharRec ch175 = new BitmapCharRec(3,1,0,-7,3,ch175data);
-
-/* char: 0xae */
-
-static final byte[] ch174data = {
-(byte) 0x38,(byte) 0x44,(byte) 0xaa,(byte) 0xb2,(byte) 0xba,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch174 = new BitmapCharRec(7,7,-1,0,9,ch174data);
-
-/* char: 0xad */
-
-static final byte[] ch173data = {
-(byte) 0xe0,
-};
-
-static final BitmapCharRec ch173 = new BitmapCharRec(3,1,0,-3,4,ch173data);
-
-/* char: 0xac */
-
-static final byte[] ch172data = {
-(byte) 0x8,(byte) 0x8,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch172 = new BitmapCharRec(5,3,-1,-2,7,ch172data);
-
-/* char: 0xab */
-
-static final byte[] ch171data = {
-(byte) 0x28,(byte) 0x50,(byte) 0xa0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch171 = new BitmapCharRec(5,5,0,0,6,ch171data);
-
-/* char: 0xaa */
-
-static final byte[] ch170data = {
-(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x20,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch170 = new BitmapCharRec(3,5,0,-3,4,ch170data);
-
-/* char: 0xa9 */
-
-static final byte[] ch169data = {
-(byte) 0x38,(byte) 0x44,(byte) 0x9a,(byte) 0xa2,(byte) 0x9a,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch169 = new BitmapCharRec(7,7,-1,0,9,ch169data);
-
-/* char: 0xa8 */
-
-static final byte[] ch168data = {
-(byte) 0xa0,
-};
-
-static final BitmapCharRec ch168 = new BitmapCharRec(3,1,0,-7,3,ch168data);
-
-/* char: 0xa7 */
-
-static final byte[] ch167data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x18,(byte) 0x70,(byte) 0xc8,(byte) 0x98,(byte) 0x70,(byte) 0xc0,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch167 = new BitmapCharRec(5,10,0,2,6,ch167data);
-
-/* char: 0xa6 */
-
-static final byte[] ch166data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch166 = new BitmapCharRec(1,10,-1,2,3,ch166data);
-
-/* char: 0xa5 */
-
-static final byte[] ch165data = {
-(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0xf8,(byte) 0x50,(byte) 0x50,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch165 = new BitmapCharRec(5,8,0,0,6,ch165data);
-
-/* char: 0xa4 */
-
-static final byte[] ch164data = {
-(byte) 0x90,(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x90,
-};
-
-static final BitmapCharRec ch164 = new BitmapCharRec(4,6,0,-1,5,ch164data);
-
-/* char: 0xa3 */
-
-static final byte[] ch163data = {
-(byte) 0xb0,(byte) 0x48,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch163 = new BitmapCharRec(5,8,0,0,6,ch163data);
-
-/* char: 0xa2 */
-
-static final byte[] ch162data = {
-(byte) 0x40,(byte) 0x70,(byte) 0xa8,(byte) 0xa0,(byte) 0xa0,(byte) 0xa8,(byte) 0x70,(byte) 0x10,
-};
-
-static final BitmapCharRec ch162 = new BitmapCharRec(5,8,0,1,6,ch162data);
-
-/* char: 0xa1 */
-
-static final byte[] ch161data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch161 = new BitmapCharRec(1,8,-1,2,3,ch161data);
-
-/* char: 0xa0 */
-
-static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,3,null);
-
-/* char: 0x7e '~' */
-
-static final byte[] ch126data = {
-(byte) 0x98,(byte) 0x64,
-};
-
-static final BitmapCharRec ch126 = new BitmapCharRec(6,2,0,-3,7,ch126data);
-
-/* char: 0x7d '}' */
-
-static final byte[] ch125data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch125 = new BitmapCharRec(3,10,0,2,3,ch125data);
-
-/* char: 0x7c '|' */
-
-static final byte[] ch124data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch124 = new BitmapCharRec(1,10,-1,2,3,ch124data);
-
-/* char: 0x7b '{' */
-
-static final byte[] ch123data = {
-(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch123 = new BitmapCharRec(3,10,0,2,3,ch123data);
-
-/* char: 0x7a 'z' */
-
-static final byte[] ch122data = {
-(byte) 0xf0,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch122 = new BitmapCharRec(4,6,0,0,5,ch122data);
-
-/* char: 0x79 'y' */
-
-static final byte[] ch121data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x60,(byte) 0xa0,(byte) 0xa0,(byte) 0x90,(byte) 0x90,
-};
-
-static final BitmapCharRec ch121 = new BitmapCharRec(4,8,0,2,5,ch121data);
-
-/* char: 0x78 'x' */
-
-static final byte[] ch120data = {
-(byte) 0x88,(byte) 0x88,(byte) 0x50,(byte) 0x20,(byte) 0x50,(byte) 0x88,
-};
-
-static final BitmapCharRec ch120 = new BitmapCharRec(5,6,0,0,6,ch120data);
-
-/* char: 0x77 'w' */
-
-static final byte[] ch119data = {
-(byte) 0x28,(byte) 0x28,(byte) 0x54,(byte) 0x54,(byte) 0x92,(byte) 0x92,
-};
-
-static final BitmapCharRec ch119 = new BitmapCharRec(7,6,0,0,8,ch119data);
-
-/* char: 0x76 'v' */
-
-static final byte[] ch118data = {
-(byte) 0x20,(byte) 0x20,(byte) 0x50,(byte) 0x50,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch118 = new BitmapCharRec(5,6,0,0,6,ch118data);
-
-/* char: 0x75 'u' */
-
-static final byte[] ch117data = {
-(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,
-};
-
-static final BitmapCharRec ch117 = new BitmapCharRec(4,6,0,0,5,ch117data);
-
-/* char: 0x74 't' */
-
-static final byte[] ch116data = {
-(byte) 0x60,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x40,
-};
-
-static final BitmapCharRec ch116 = new BitmapCharRec(3,8,0,0,4,ch116data);
-
-/* char: 0x73 's' */
-
-static final byte[] ch115data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x10,(byte) 0x60,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch115 = new BitmapCharRec(4,6,0,0,5,ch115data);
-
-/* char: 0x72 'r' */
-
-static final byte[] ch114data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch114 = new BitmapCharRec(3,6,0,0,4,ch114data);
-
-/* char: 0x71 'q' */
-
-static final byte[] ch113data = {
-(byte) 0x8,(byte) 0x8,(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x98,(byte) 0x68,
-};
-
-static final BitmapCharRec ch113 = new BitmapCharRec(5,8,0,2,6,ch113data);
-
-/* char: 0x70 'p' */
-
-static final byte[] ch112data = {
-(byte) 0x80,(byte) 0x80,(byte) 0xb0,(byte) 0xc8,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,
-};
-
-static final BitmapCharRec ch112 = new BitmapCharRec(5,8,0,2,6,ch112data);
-
-/* char: 0x6f 'o' */
-
-static final byte[] ch111data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch111 = new BitmapCharRec(5,6,0,0,6,ch111data);
-
-/* char: 0x6e 'n' */
-
-static final byte[] ch110data = {
-(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,
-};
-
-static final BitmapCharRec ch110 = new BitmapCharRec(5,6,0,0,6,ch110data);
-
-/* char: 0x6d 'm' */
-
-static final byte[] ch109data = {
-(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0xec,
-};
-
-static final BitmapCharRec ch109 = new BitmapCharRec(7,6,0,0,8,ch109data);
-
-/* char: 0x6c 'l' */
-
-static final byte[] ch108data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch108 = new BitmapCharRec(1,8,0,0,2,ch108data);
-
-/* char: 0x6b 'k' */
-
-static final byte[] ch107data = {
-(byte) 0x90,(byte) 0x90,(byte) 0xa0,(byte) 0xc0,(byte) 0xa0,(byte) 0x90,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch107 = new BitmapCharRec(4,8,0,0,5,ch107data);
-
-/* char: 0x6a 'j' */
-
-static final byte[] ch106data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch106 = new BitmapCharRec(1,9,0,1,2,ch106data);
-
-/* char: 0x69 'i' */
-
-static final byte[] ch105data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch105 = new BitmapCharRec(1,8,0,0,2,ch105data);
-
-/* char: 0x68 'h' */
-
-static final byte[] ch104data = {
-(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch104 = new BitmapCharRec(5,8,0,0,6,ch104data);
-
-/* char: 0x67 'g' */
-
-static final byte[] ch103data = {
-(byte) 0x70,(byte) 0x8,(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x98,(byte) 0x68,
-};
-
-static final BitmapCharRec ch103 = new BitmapCharRec(5,8,0,2,6,ch103data);
-
-/* char: 0x66 'f' */
-
-static final byte[] ch102data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x30,
-};
-
-static final BitmapCharRec ch102 = new BitmapCharRec(4,8,0,0,4,ch102data);
-
-/* char: 0x65 'e' */
-
-static final byte[] ch101data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0xf0,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch101 = new BitmapCharRec(4,6,0,0,5,ch101data);
-
-/* char: 0x64 'd' */
-
-static final byte[] ch100data = {
-(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x98,(byte) 0x68,(byte) 0x8,(byte) 0x8,
-};
-
-static final BitmapCharRec ch100 = new BitmapCharRec(5,8,0,0,6,ch100data);
-
-/* char: 0x63 'c' */
-
-static final byte[] ch99data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x80,(byte) 0x80,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch99 = new BitmapCharRec(4,6,0,0,5,ch99data);
-
-/* char: 0x62 'b' */
-
-static final byte[] ch98data = {
-(byte) 0xb0,(byte) 0xc8,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch98 = new BitmapCharRec(5,8,0,0,6,ch98data);
-
-/* char: 0x61 'a' */
-
-static final byte[] ch97data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch97 = new BitmapCharRec(5,6,0,0,5,ch97data);
-
-/* char: 0x60 '`' */
-
-static final byte[] ch96data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x40,
-};
-
-static final BitmapCharRec ch96 = new BitmapCharRec(2,3,0,-5,3,ch96data);
-
-/* char: 0x5f '_' */
-
-static final byte[] ch95data = {
-(byte) 0xfc,
-};
-
-static final BitmapCharRec ch95 = new BitmapCharRec(6,1,0,2,6,ch95data);
-
-/* char: 0x5e '^' */
-
-static final byte[] ch94data = {
-(byte) 0x88,(byte) 0x50,(byte) 0x50,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch94 = new BitmapCharRec(5,5,0,-3,6,ch94data);
-
-/* char: 0x5d ']' */
-
-static final byte[] ch93data = {
-(byte) 0xc0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch93 = new BitmapCharRec(2,10,0,2,3,ch93data);
-
-/* char: 0x5c '\' */
-
-static final byte[] ch92data = {
-(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch92 = new BitmapCharRec(3,8,0,0,3,ch92data);
-
-/* char: 0x5b '[' */
-
-static final byte[] ch91data = {
-(byte) 0xc0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch91 = new BitmapCharRec(2,10,-1,2,3,ch91data);
-
-/* char: 0x5a 'Z' */
-
-static final byte[] ch90data = {
-(byte) 0xf8,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch90 = new BitmapCharRec(5,8,-1,0,7,ch90data);
-
-/* char: 0x59 'Y' */
-
-static final byte[] ch89data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x82,
-};
-
-static final BitmapCharRec ch89 = new BitmapCharRec(7,8,0,0,7,ch89data);
-
-/* char: 0x58 'X' */
-
-static final byte[] ch88data = {
-(byte) 0x88,(byte) 0x88,(byte) 0x50,(byte) 0x50,(byte) 0x20,(byte) 0x50,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch88 = new BitmapCharRec(5,8,-1,0,7,ch88data);
-
-/* char: 0x57 'W' */
-
-static final byte[] ch87data = {
-(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x49,(byte) 0x0,(byte) 0x49,(byte) 0x0,(byte) 0x88,(byte) 0x80,(byte) 0x88,(byte) 0x80,
-};
-
-static final BitmapCharRec ch87 = new BitmapCharRec(9,8,0,0,9,ch87data);
-
-/* char: 0x56 'V' */
-
-static final byte[] ch86data = {
-(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch86 = new BitmapCharRec(7,8,0,0,7,ch86data);
-
-/* char: 0x55 'U' */
-
-static final byte[] ch85data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
-};
-
-static final BitmapCharRec ch85 = new BitmapCharRec(6,8,-1,0,8,ch85data);
-
-/* char: 0x54 'T' */
-
-static final byte[] ch84data = {
-(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch84 = new BitmapCharRec(5,8,0,0,5,ch84data);
-
-/* char: 0x53 'S' */
-
-static final byte[] ch83data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x8,(byte) 0x70,(byte) 0x80,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch83 = new BitmapCharRec(5,8,-1,0,7,ch83data);
-
-/* char: 0x52 'R' */
-
-static final byte[] ch82data = {
-(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xf0,(byte) 0x88,(byte) 0x88,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch82 = new BitmapCharRec(5,8,-1,0,7,ch82data);
-
-/* char: 0x51 'Q' */
-
-static final byte[] ch81data = {
-(byte) 0x2,(byte) 0x7c,(byte) 0x8c,(byte) 0x94,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch81 = new BitmapCharRec(7,9,-1,1,8,ch81data);
-
-/* char: 0x50 'P' */
-
-static final byte[] ch80data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x88,(byte) 0x88,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch80 = new BitmapCharRec(5,8,-1,0,7,ch80data);
-
-/* char: 0x4f 'O' */
-
-static final byte[] ch79data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch79 = new BitmapCharRec(6,8,-1,0,8,ch79data);
-
-/* char: 0x4e 'N' */
-
-static final byte[] ch78data = {
-(byte) 0x8c,(byte) 0x8c,(byte) 0x94,(byte) 0x94,(byte) 0xa4,(byte) 0xa4,(byte) 0xc4,(byte) 0xc4,
-};
-
-static final BitmapCharRec ch78 = new BitmapCharRec(6,8,-1,0,8,ch78data);
-
-/* char: 0x4d 'M' */
-
-static final byte[] ch77data = {
-(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0xaa,(byte) 0xaa,(byte) 0xc6,(byte) 0xc6,(byte) 0x82,
-};
-
-static final BitmapCharRec ch77 = new BitmapCharRec(7,8,-1,0,9,ch77data);
-
-/* char: 0x4c 'L' */
-
-static final byte[] ch76data = {
-(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch76 = new BitmapCharRec(4,8,-1,0,6,ch76data);
-
-/* char: 0x4b 'K' */
-
-static final byte[] ch75data = {
-(byte) 0x88,(byte) 0x88,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0xa0,(byte) 0x90,(byte) 0x88,
-};
-
-static final BitmapCharRec ch75 = new BitmapCharRec(5,8,-1,0,7,ch75data);
-
-/* char: 0x4a 'J' */
-
-static final byte[] ch74data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,
-};
-
-static final BitmapCharRec ch74 = new BitmapCharRec(4,8,0,0,5,ch74data);
-
-/* char: 0x49 'I' */
-
-static final byte[] ch73data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch73 = new BitmapCharRec(1,8,-1,0,3,ch73data);
-
-/* char: 0x48 'H' */
-
-static final byte[] ch72data = {
-(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xfc,(byte) 0x84,(byte) 0x84,(byte) 0x84,
-};
-
-static final BitmapCharRec ch72 = new BitmapCharRec(6,8,-1,0,8,ch72data);
-
-/* char: 0x47 'G' */
-
-static final byte[] ch71data = {
-(byte) 0x74,(byte) 0x8c,(byte) 0x84,(byte) 0x8c,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch71 = new BitmapCharRec(6,8,-1,0,8,ch71data);
-
-/* char: 0x46 'F' */
-
-static final byte[] ch70data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch70 = new BitmapCharRec(5,8,-1,0,6,ch70data);
-
-/* char: 0x45 'E' */
-
-static final byte[] ch69data = {
-(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch69 = new BitmapCharRec(5,8,-1,0,7,ch69data);
-
-/* char: 0x44 'D' */
-
-static final byte[] ch68data = {
-(byte) 0xf0,(byte) 0x88,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x88,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch68 = new BitmapCharRec(6,8,-1,0,8,ch68data);
-
-/* char: 0x43 'C' */
-
-static final byte[] ch67data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch67 = new BitmapCharRec(6,8,-1,0,8,ch67data);
-
-/* char: 0x42 'B' */
-
-static final byte[] ch66data = {
-(byte) 0xf0,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xf0,(byte) 0x88,(byte) 0x88,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch66 = new BitmapCharRec(5,8,-1,0,7,ch66data);
-
-/* char: 0x41 'A' */
-
-static final byte[] ch65data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,(byte) 0x10,
-};
-
-static final BitmapCharRec ch65 = new BitmapCharRec(7,8,0,0,7,ch65data);
-
-/* char: 0x40 '@' */
-
-static final byte[] ch64data = {
-(byte) 0x3e,(byte) 0x0,(byte) 0x40,(byte) 0x0,(byte) 0x9b,(byte) 0x0,(byte) 0xa4,(byte) 0x80,(byte) 0xa4,(byte) 0x80,(byte) 0xa2,(byte) 0x40,(byte) 0x92,(byte) 0x40,(byte) 0x4d,(byte) 0x40,
-(byte) 0x20,(byte) 0x80,(byte) 0x1f,(byte) 0x0,
-};
-
-static final BitmapCharRec ch64 = new BitmapCharRec(10,10,0,2,11,ch64data);
-
-/* char: 0x3f '?' */
-
-static final byte[] ch63data = {
-(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch63 = new BitmapCharRec(4,8,-1,0,6,ch63data);
-
-/* char: 0x3e '>' */
-
-static final byte[] ch62data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch62 = new BitmapCharRec(3,5,-1,-1,6,ch62data);
-
-/* char: 0x3d '=' */
-
-static final byte[] ch61data = {
-(byte) 0xf0,(byte) 0x0,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch61 = new BitmapCharRec(4,3,0,-2,5,ch61data);
-
-/* char: 0x3c '<' */
-
-static final byte[] ch60data = {
-(byte) 0x20,(byte) 0x40,(byte) 0x80,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch60 = new BitmapCharRec(3,5,-1,-1,6,ch60data);
-
-/* char: 0x3b ';' */
-
-static final byte[] ch59data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch59 = new BitmapCharRec(2,8,0,2,3,ch59data);
-
-/* char: 0x3a ':' */
-
-static final byte[] ch58data = {
-(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch58 = new BitmapCharRec(1,6,-1,0,3,ch58data);
-
-/* char: 0x39 '9' */
-
-static final byte[] ch57data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch57 = new BitmapCharRec(5,8,0,0,6,ch57data);
-
-/* char: 0x38 '8' */
-
-static final byte[] ch56data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch56 = new BitmapCharRec(5,8,0,0,6,ch56data);
-
-/* char: 0x37 '7' */
-
-static final byte[] ch55data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x8,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch55 = new BitmapCharRec(5,8,0,0,6,ch55data);
-
-/* char: 0x36 '6' */
-
-static final byte[] ch54data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch54 = new BitmapCharRec(5,8,0,0,6,ch54data);
-
-/* char: 0x35 '5' */
-
-static final byte[] ch53data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch53 = new BitmapCharRec(5,8,0,0,6,ch53data);
-
-/* char: 0x34 '4' */
-
-static final byte[] ch52data = {
-(byte) 0x10,(byte) 0x10,(byte) 0xf8,(byte) 0x90,(byte) 0x50,(byte) 0x50,(byte) 0x30,(byte) 0x10,
-};
-
-static final BitmapCharRec ch52 = new BitmapCharRec(5,8,0,0,6,ch52data);
-
-/* char: 0x33 '3' */
-
-static final byte[] ch51data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch51 = new BitmapCharRec(5,8,0,0,6,ch51data);
-
-/* char: 0x32 '2' */
-
-static final byte[] ch50data = {
-(byte) 0xf8,(byte) 0x80,(byte) 0x40,(byte) 0x30,(byte) 0x8,(byte) 0x8,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch50 = new BitmapCharRec(5,8,0,0,6,ch50data);
-
-/* char: 0x31 '1' */
-
-static final byte[] ch49data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch49 = new BitmapCharRec(2,8,-1,0,6,ch49data);
-
-/* char: 0x30 '0' */
-
-static final byte[] ch48data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch48 = new BitmapCharRec(5,8,0,0,6,ch48data);
-
-/* char: 0x2f '/' */
-
-static final byte[] ch47data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch47 = new BitmapCharRec(3,8,0,0,3,ch47data);
-
-/* char: 0x2e '.' */
-
-static final byte[] ch46data = {
-(byte) 0x80,
-};
-
-static final BitmapCharRec ch46 = new BitmapCharRec(1,1,-1,0,3,ch46data);
-
-/* char: 0x2d '-' */
-
-static final byte[] ch45data = {
-(byte) 0xf8,
-};
-
-static final BitmapCharRec ch45 = new BitmapCharRec(5,1,-1,-3,7,ch45data);
-
-/* char: 0x2c ',' */
-
-static final byte[] ch44data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,
-};
-
-static final BitmapCharRec ch44 = new BitmapCharRec(2,3,0,2,3,ch44data);
-
-/* char: 0x2b '+' */
-
-static final byte[] ch43data = {
-(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch43 = new BitmapCharRec(5,5,0,-1,6,ch43data);
-
-/* char: 0x2a '*' */
-
-static final byte[] ch42data = {
-(byte) 0xa0,(byte) 0x40,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch42 = new BitmapCharRec(3,3,0,-5,4,ch42data);
-
-/* char: 0x29 ')' */
-
-static final byte[] ch41data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch41 = new BitmapCharRec(3,10,-1,2,4,ch41data);
-
-/* char: 0x28 '(' */
-
-static final byte[] ch40data = {
-(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch40 = new BitmapCharRec(3,10,0,2,4,ch40data);
-
-/* char: 0x27 ''' */
-
-static final byte[] ch39data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,
-};
-
-static final BitmapCharRec ch39 = new BitmapCharRec(2,3,-1,-5,3,ch39data);
-
-/* char: 0x26 '&' */
-
-static final byte[] ch38data = {
-(byte) 0x64,(byte) 0x98,(byte) 0x98,(byte) 0xa4,(byte) 0x60,(byte) 0x50,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch38 = new BitmapCharRec(6,8,-1,0,8,ch38data);
-
-/* char: 0x25 '%' */
-
-static final byte[] ch37data = {
-(byte) 0x26,(byte) 0x29,(byte) 0x16,(byte) 0x10,(byte) 0x8,(byte) 0x68,(byte) 0x94,(byte) 0x64,
-};
-
-static final BitmapCharRec ch37 = new BitmapCharRec(8,8,0,0,9,ch37data);
-
-/* char: 0x24 '$' */
-
-static final byte[] ch36data = {
-(byte) 0x20,(byte) 0x70,(byte) 0xa8,(byte) 0x28,(byte) 0x70,(byte) 0xa0,(byte) 0xa8,(byte) 0x70,(byte) 0x20,
-};
-
-static final BitmapCharRec ch36 = new BitmapCharRec(5,9,0,1,6,ch36data);
-
-/* char: 0x23 '#' */
-
-static final byte[] ch35data = {
-(byte) 0x50,(byte) 0x50,(byte) 0xf8,(byte) 0x28,(byte) 0x7c,(byte) 0x28,(byte) 0x28,
-};
-
-static final BitmapCharRec ch35 = new BitmapCharRec(6,7,0,0,6,ch35data);
-
-/* char: 0x22 '"' */
-
-static final byte[] ch34data = {
-(byte) 0xa0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch34 = new BitmapCharRec(3,2,-1,-6,4,ch34data);
-
-/* char: 0x21 '!' */
-
-static final byte[] ch33data = {
-(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch33 = new BitmapCharRec(1,8,-1,0,3,ch33data);
-
-/* char: 0x20 ' ' */
-
-static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,3,null);
-
-static final BitmapCharRec[] chars = {
-ch32,
-ch33,
-ch34,
-ch35,
-ch36,
-ch37,
-ch38,
-ch39,
-ch40,
-ch41,
-ch42,
-ch43,
-ch44,
-ch45,
-ch46,
-ch47,
-ch48,
-ch49,
-ch50,
-ch51,
-ch52,
-ch53,
-ch54,
-ch55,
-ch56,
-ch57,
-ch58,
-ch59,
-ch60,
-ch61,
-ch62,
-ch63,
-ch64,
-ch65,
-ch66,
-ch67,
-ch68,
-ch69,
-ch70,
-ch71,
-ch72,
-ch73,
-ch74,
-ch75,
-ch76,
-ch77,
-ch78,
-ch79,
-ch80,
-ch81,
-ch82,
-ch83,
-ch84,
-ch85,
-ch86,
-ch87,
-ch88,
-ch89,
-ch90,
-ch91,
-ch92,
-ch93,
-ch94,
-ch95,
-ch96,
-ch97,
-ch98,
-ch99,
-ch100,
-ch101,
-ch102,
-ch103,
-ch104,
-ch105,
-ch106,
-ch107,
-ch108,
-ch109,
-ch110,
-ch111,
-ch112,
-ch113,
-ch114,
-ch115,
-ch116,
-ch117,
-ch118,
-ch119,
-ch120,
-ch121,
-ch122,
-ch123,
-ch124,
-ch125,
-ch126,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-ch160,
-ch161,
-ch162,
-ch163,
-ch164,
-ch165,
-ch166,
-ch167,
-ch168,
-ch169,
-ch170,
-ch171,
-ch172,
-ch173,
-ch174,
-ch175,
-ch176,
-ch177,
-ch178,
-ch179,
-ch180,
-ch181,
-ch182,
-ch183,
-ch184,
-ch185,
-ch186,
-ch187,
-ch188,
-ch189,
-ch190,
-ch191,
-ch192,
-ch193,
-ch194,
-ch195,
-ch196,
-ch197,
-ch198,
-ch199,
-ch200,
-ch201,
-ch202,
-ch203,
-ch204,
-ch205,
-ch206,
-ch207,
-ch208,
-ch209,
-ch210,
-ch211,
-ch212,
-ch213,
-ch214,
-ch215,
-ch216,
-ch217,
-ch218,
-ch219,
-ch220,
-ch221,
-ch222,
-ch223,
-ch224,
-ch225,
-ch226,
-ch227,
-ch228,
-ch229,
-ch230,
-ch231,
-ch232,
-ch233,
-ch234,
-ch235,
-ch236,
-ch237,
-ch238,
-ch239,
-ch240,
-ch241,
-ch242,
-ch243,
-ch244,
-ch245,
-ch246,
-ch247,
-ch248,
-ch249,
-ch250,
-ch251,
-ch252,
-ch253,
-ch254,
-ch255,
-};
-
-  public static final BitmapFontRec glutBitmapHelvetica10 = new BitmapFontRec("-adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1",
-                                                                       224,
-                                                                       32,
-                                                                       chars);
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica12.java b/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica12.java
deleted file mode 100644
index b73c82fa9..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica12.java
+++ /dev/null
@@ -1,1808 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-class GLUTBitmapHelvetica12 {
-
-/* GENERATED FILE -- DO NOT MODIFY */
-
-/* char: 0xff */
-
-static final byte[] ch255data = {
-(byte) 0xc0,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x30,(byte) 0x50,(byte) 0x50,(byte) 0x48,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch255 = new BitmapCharRec(5,12,-1,3,7,ch255data);
-
-/* char: 0xfe */
-
-static final byte[] ch254data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xb0,(byte) 0xc8,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch254 = new BitmapCharRec(5,12,-1,3,7,ch254data);
-
-/* char: 0xfd */
-
-static final byte[] ch253data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x50,(byte) 0x50,(byte) 0x90,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch253 = new BitmapCharRec(5,13,-1,3,7,ch253data);
-
-/* char: 0xfc */
-
-static final byte[] ch252data = {
-(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch252 = new BitmapCharRec(5,9,-1,0,7,ch252data);
-
-/* char: 0xfb */
-
-static final byte[] ch251data = {
-(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch251 = new BitmapCharRec(5,10,-1,0,7,ch251data);
-
-/* char: 0xfa */
-
-static final byte[] ch250data = {
-(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch250 = new BitmapCharRec(5,10,-1,0,7,ch250data);
-
-/* char: 0xf9 */
-
-static final byte[] ch249data = {
-(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch249 = new BitmapCharRec(5,10,-1,0,7,ch249data);
-
-/* char: 0xf8 */
-
-static final byte[] ch248data = {
-(byte) 0xb8,(byte) 0x44,(byte) 0x64,(byte) 0x54,(byte) 0x4c,(byte) 0x44,(byte) 0x3a,
-};
-
-static final BitmapCharRec ch248 = new BitmapCharRec(7,7,0,0,7,ch248data);
-
-/* char: 0xf7 */
-
-static final byte[] ch247data = {
-(byte) 0x20,(byte) 0x0,(byte) 0xf8,(byte) 0x0,(byte) 0x20,
-};
-
-static final BitmapCharRec ch247 = new BitmapCharRec(5,5,-1,-1,7,ch247data);
-
-/* char: 0xf6 */
-
-static final byte[] ch246data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch246 = new BitmapCharRec(5,9,-1,0,7,ch246data);
-
-/* char: 0xf5 */
-
-static final byte[] ch245data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch245 = new BitmapCharRec(5,10,-1,0,7,ch245data);
-
-/* char: 0xf4 */
-
-static final byte[] ch244data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch244 = new BitmapCharRec(5,10,-1,0,7,ch244data);
-
-/* char: 0xf3 */
-
-static final byte[] ch243data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch243 = new BitmapCharRec(5,10,-1,0,7,ch243data);
-
-/* char: 0xf2 */
-
-static final byte[] ch242data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch242 = new BitmapCharRec(5,10,-1,0,7,ch242data);
-
-/* char: 0xf1 */
-
-static final byte[] ch241data = {
-(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch241 = new BitmapCharRec(5,10,-1,0,7,ch241data);
-
-/* char: 0xf0 */
-
-static final byte[] ch240data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x50,(byte) 0x30,(byte) 0x68,
-};
-
-static final BitmapCharRec ch240 = new BitmapCharRec(5,10,-1,0,7,ch240data);
-
-/* char: 0xef */
-
-static final byte[] ch239data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch239 = new BitmapCharRec(3,9,0,0,3,ch239data);
-
-/* char: 0xee */
-
-static final byte[] ch238data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch238 = new BitmapCharRec(3,10,0,0,3,ch238data);
-
-/* char: 0xed */
-
-static final byte[] ch237data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x40,
-};
-
-static final BitmapCharRec ch237 = new BitmapCharRec(2,10,-1,0,3,ch237data);
-
-/* char: 0xec */
-
-static final byte[] ch236data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch236 = new BitmapCharRec(2,10,0,0,3,ch236data);
-
-/* char: 0xeb */
-
-static final byte[] ch235data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0xf8,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch235 = new BitmapCharRec(5,9,-1,0,7,ch235data);
-
-/* char: 0xea */
-
-static final byte[] ch234data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0xf8,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch234 = new BitmapCharRec(5,10,-1,0,7,ch234data);
-
-/* char: 0xe9 */
-
-static final byte[] ch233data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0xf8,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch233 = new BitmapCharRec(5,10,-1,0,7,ch233data);
-
-/* char: 0xe8 */
-
-static final byte[] ch232data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0xf8,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch232 = new BitmapCharRec(5,10,-1,0,7,ch232data);
-
-/* char: 0xe7 */
-
-static final byte[] ch231data = {
-(byte) 0x60,(byte) 0x10,(byte) 0x20,(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch231 = new BitmapCharRec(5,10,-1,3,7,ch231data);
-
-/* char: 0xe6 */
-
-static final byte[] ch230data = {
-(byte) 0x77,(byte) 0x0,(byte) 0x88,(byte) 0x80,(byte) 0x88,(byte) 0x0,(byte) 0x7f,(byte) 0x80,(byte) 0x8,(byte) 0x80,(byte) 0x88,(byte) 0x80,(byte) 0x77,(byte) 0x0,
-};
-
-static final BitmapCharRec ch230 = new BitmapCharRec(9,7,-1,0,11,ch230data);
-
-/* char: 0xe5 */
-
-static final byte[] ch229data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,(byte) 0x30,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch229 = new BitmapCharRec(6,10,-1,0,7,ch229data);
-
-/* char: 0xe4 */
-
-static final byte[] ch228data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch228 = new BitmapCharRec(6,9,-1,0,7,ch228data);
-
-/* char: 0xe3 */
-
-static final byte[] ch227data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch227 = new BitmapCharRec(6,10,-1,0,7,ch227data);
-
-/* char: 0xe2 */
-
-static final byte[] ch226data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch226 = new BitmapCharRec(6,10,-1,0,7,ch226data);
-
-/* char: 0xe1 */
-
-static final byte[] ch225data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch225 = new BitmapCharRec(6,10,-1,0,7,ch225data);
-
-/* char: 0xe0 */
-
-static final byte[] ch224data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch224 = new BitmapCharRec(6,10,-1,0,7,ch224data);
-
-/* char: 0xdf */
-
-static final byte[] ch223data = {
-(byte) 0xb0,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xb0,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch223 = new BitmapCharRec(5,9,-1,0,7,ch223data);
-
-/* char: 0xde */
-
-static final byte[] ch222data = {
-(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch222 = new BitmapCharRec(6,9,-1,0,8,ch222data);
-
-/* char: 0xdd */
-
-static final byte[] ch221data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,(byte) 0x0,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch221 = new BitmapCharRec(7,12,-1,0,9,ch221data);
-
-/* char: 0xdc */
-
-static final byte[] ch220data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x48,
-};
-
-static final BitmapCharRec ch220 = new BitmapCharRec(6,11,-1,0,8,ch220data);
-
-/* char: 0xdb */
-
-static final byte[] ch219data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch219 = new BitmapCharRec(6,12,-1,0,8,ch219data);
-
-/* char: 0xda */
-
-static final byte[] ch218data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch218 = new BitmapCharRec(6,12,-1,0,8,ch218data);
-
-/* char: 0xd9 */
-
-static final byte[] ch217data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch217 = new BitmapCharRec(6,12,-1,0,8,ch217data);
-
-/* char: 0xd8 */
-
-static final byte[] ch216data = {
-(byte) 0x80,(byte) 0x0,(byte) 0x5e,(byte) 0x0,(byte) 0x21,(byte) 0x0,(byte) 0x50,(byte) 0x80,(byte) 0x48,(byte) 0x80,(byte) 0x44,(byte) 0x80,(byte) 0x44,(byte) 0x80,(byte) 0x42,(byte) 0x80,
-(byte) 0x21,(byte) 0x0,(byte) 0x1e,(byte) 0x80,(byte) 0x0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch216 = new BitmapCharRec(10,11,0,1,10,ch216data);
-
-/* char: 0xd7 */
-
-static final byte[] ch215data = {
-(byte) 0x88,(byte) 0x50,(byte) 0x20,(byte) 0x50,(byte) 0x88,
-};
-
-static final BitmapCharRec ch215 = new BitmapCharRec(5,5,-1,-1,7,ch215data);
-
-/* char: 0xd6 */
-
-static final byte[] ch214data = {
-(byte) 0x3c,(byte) 0x42,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,(byte) 0x0,(byte) 0x24,
-};
-
-static final BitmapCharRec ch214 = new BitmapCharRec(8,11,-1,0,10,ch214data);
-
-/* char: 0xd5 */
-
-static final byte[] ch213data = {
-(byte) 0x3c,(byte) 0x42,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,(byte) 0x0,(byte) 0x28,(byte) 0x14,
-};
-
-static final BitmapCharRec ch213 = new BitmapCharRec(8,12,-1,0,10,ch213data);
-
-/* char: 0xd4 */
-
-static final byte[] ch212data = {
-(byte) 0x3c,(byte) 0x42,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,(byte) 0x0,(byte) 0x14,(byte) 0x8,
-};
-
-static final BitmapCharRec ch212 = new BitmapCharRec(8,12,-1,0,10,ch212data);
-
-/* char: 0xd3 */
-
-static final byte[] ch211data = {
-(byte) 0x3c,(byte) 0x42,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,(byte) 0x0,(byte) 0x8,(byte) 0x4,
-};
-
-static final BitmapCharRec ch211 = new BitmapCharRec(8,12,-1,0,10,ch211data);
-
-/* char: 0xd2 */
-
-static final byte[] ch210data = {
-(byte) 0x3c,(byte) 0x42,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,(byte) 0x0,(byte) 0x8,(byte) 0x10,
-};
-
-static final BitmapCharRec ch210 = new BitmapCharRec(8,12,-1,0,10,ch210data);
-
-/* char: 0xd1 */
-
-static final byte[] ch209data = {
-(byte) 0x82,(byte) 0x86,(byte) 0x8a,(byte) 0x8a,(byte) 0x92,(byte) 0xa2,(byte) 0xa2,(byte) 0xc2,(byte) 0x82,(byte) 0x0,(byte) 0x28,(byte) 0x14,
-};
-
-static final BitmapCharRec ch209 = new BitmapCharRec(7,12,-1,0,9,ch209data);
-
-/* char: 0xd0 */
-
-static final byte[] ch208data = {
-(byte) 0x7c,(byte) 0x42,(byte) 0x41,(byte) 0x41,(byte) 0xf1,(byte) 0x41,(byte) 0x41,(byte) 0x42,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch208 = new BitmapCharRec(8,9,0,0,9,ch208data);
-
-/* char: 0xcf */
-
-static final byte[] ch207data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch207 = new BitmapCharRec(3,11,0,0,3,ch207data);
-
-/* char: 0xce */
-
-static final byte[] ch206data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch206 = new BitmapCharRec(3,12,0,0,3,ch206data);
-
-/* char: 0xcd */
-
-static final byte[] ch205data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x40,
-};
-
-static final BitmapCharRec ch205 = new BitmapCharRec(2,12,-1,0,3,ch205data);
-
-/* char: 0xcc */
-
-static final byte[] ch204data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch204 = new BitmapCharRec(2,12,0,0,3,ch204data);
-
-/* char: 0xcb */
-
-static final byte[] ch203data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x28,
-};
-
-static final BitmapCharRec ch203 = new BitmapCharRec(6,11,-1,0,8,ch203data);
-
-/* char: 0xca */
-
-static final byte[] ch202data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch202 = new BitmapCharRec(6,12,-1,0,8,ch202data);
-
-/* char: 0xc9 */
-
-static final byte[] ch201data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch201 = new BitmapCharRec(6,12,-1,0,8,ch201data);
-
-/* char: 0xc8 */
-
-static final byte[] ch200data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch200 = new BitmapCharRec(6,12,-1,0,8,ch200data);
-
-/* char: 0xc7 */
-
-static final byte[] ch199data = {
-(byte) 0x30,(byte) 0x8,(byte) 0x8,(byte) 0x3c,(byte) 0x42,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x42,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch199 = new BitmapCharRec(7,12,-1,3,9,ch199data);
-
-/* char: 0xc6 */
-
-static final byte[] ch198data = {
-(byte) 0x8f,(byte) 0x80,(byte) 0x88,(byte) 0x0,(byte) 0x88,(byte) 0x0,(byte) 0x78,(byte) 0x0,(byte) 0x4f,(byte) 0x80,(byte) 0x48,(byte) 0x0,(byte) 0x28,(byte) 0x0,(byte) 0x28,(byte) 0x0,
-(byte) 0x1f,(byte) 0x80,
-};
-
-static final BitmapCharRec ch198 = new BitmapCharRec(9,9,-1,0,11,ch198data);
-
-/* char: 0xc5 */
-
-static final byte[] ch197data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch197 = new BitmapCharRec(7,12,-1,0,9,ch197data);
-
-/* char: 0xc4 */
-
-static final byte[] ch196data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x28,
-};
-
-static final BitmapCharRec ch196 = new BitmapCharRec(7,11,-1,0,9,ch196data);
-
-/* char: 0xc3 */
-
-static final byte[] ch195data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x28,(byte) 0x14,
-};
-
-static final BitmapCharRec ch195 = new BitmapCharRec(7,12,-1,0,9,ch195data);
-
-/* char: 0xc2 */
-
-static final byte[] ch194data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch194 = new BitmapCharRec(7,12,-1,0,9,ch194data);
-
-/* char: 0xc1 */
-
-static final byte[] ch193data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch193 = new BitmapCharRec(7,12,-1,0,9,ch193data);
-
-/* char: 0xc0 */
-
-static final byte[] ch192data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch192 = new BitmapCharRec(7,12,-1,0,9,ch192data);
-
-/* char: 0xbf */
-
-static final byte[] ch191data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x0,(byte) 0x20,
-};
-
-static final BitmapCharRec ch191 = new BitmapCharRec(5,9,-1,3,7,ch191data);
-
-/* char: 0xbe */
-
-static final byte[] ch190data = {
-(byte) 0x21,(byte) 0x0,(byte) 0x17,(byte) 0x80,(byte) 0x15,(byte) 0x0,(byte) 0xb,(byte) 0x0,(byte) 0xc9,(byte) 0x0,(byte) 0x24,(byte) 0x0,(byte) 0x44,(byte) 0x0,(byte) 0x22,(byte) 0x0,
-(byte) 0xe1,(byte) 0x0,
-};
-
-static final BitmapCharRec ch190 = new BitmapCharRec(9,9,0,0,10,ch190data);
-
-/* char: 0xbd */
-
-static final byte[] ch189data = {
-(byte) 0x47,(byte) 0x80,(byte) 0x22,(byte) 0x0,(byte) 0x11,(byte) 0x0,(byte) 0x14,(byte) 0x80,(byte) 0x4b,(byte) 0x0,(byte) 0x48,(byte) 0x0,(byte) 0x44,(byte) 0x0,(byte) 0xc2,(byte) 0x0,
-(byte) 0x41,(byte) 0x0,
-};
-
-static final BitmapCharRec ch189 = new BitmapCharRec(9,9,0,0,10,ch189data);
-
-/* char: 0xbc */
-
-static final byte[] ch188data = {
-(byte) 0x41,(byte) 0x0,(byte) 0x27,(byte) 0x80,(byte) 0x15,(byte) 0x0,(byte) 0x13,(byte) 0x0,(byte) 0x49,(byte) 0x0,(byte) 0x44,(byte) 0x0,(byte) 0x44,(byte) 0x0,(byte) 0xc2,(byte) 0x0,
-(byte) 0x41,(byte) 0x0,
-};
-
-static final BitmapCharRec ch188 = new BitmapCharRec(9,9,0,0,10,ch188data);
-
-/* char: 0xbb */
-
-static final byte[] ch187data = {
-(byte) 0xa0,(byte) 0x50,(byte) 0x28,(byte) 0x50,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch187 = new BitmapCharRec(5,5,-1,-1,7,ch187data);
-
-/* char: 0xba */
-
-static final byte[] ch186data = {
-(byte) 0xe0,(byte) 0x0,(byte) 0xe0,(byte) 0xa0,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch186 = new BitmapCharRec(3,5,-1,-4,5,ch186data);
-
-/* char: 0xb9 */
-
-static final byte[] ch185data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch185 = new BitmapCharRec(2,5,-1,-3,4,ch185data);
-
-/* char: 0xb8 */
-
-static final byte[] ch184data = {
-(byte) 0xc0,(byte) 0x20,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch184 = new BitmapCharRec(3,4,0,3,3,ch184data);
-
-/* char: 0xb7 */
-
-static final byte[] ch183data = {
-(byte) 0x80,
-};
-
-static final BitmapCharRec ch183 = new BitmapCharRec(1,1,-1,-3,3,ch183data);
-
-/* char: 0xb6 */
-
-static final byte[] ch182data = {
-(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x68,(byte) 0xe8,(byte) 0xe8,(byte) 0xe8,(byte) 0x68,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch182 = new BitmapCharRec(6,12,0,3,7,ch182data);
-
-/* char: 0xb5 */
-
-static final byte[] ch181data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xe8,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch181 = new BitmapCharRec(5,10,-1,3,7,ch181data);
-
-/* char: 0xb4 */
-
-static final byte[] ch180data = {
-(byte) 0x80,(byte) 0x40,
-};
-
-static final BitmapCharRec ch180 = new BitmapCharRec(2,2,0,-8,2,ch180data);
-
-/* char: 0xb3 */
-
-static final byte[] ch179data = {
-(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0x20,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch179 = new BitmapCharRec(3,5,0,-3,4,ch179data);
-
-/* char: 0xb2 */
-
-static final byte[] ch178data = {
-(byte) 0xf0,(byte) 0x40,(byte) 0x20,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch178 = new BitmapCharRec(4,5,0,-3,4,ch178data);
-
-/* char: 0xb1 */
-
-static final byte[] ch177data = {
-(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch177 = new BitmapCharRec(5,7,-1,0,7,ch177data);
-
-/* char: 0xb0 */
-
-static final byte[] ch176data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch176 = new BitmapCharRec(4,4,0,-4,5,ch176data);
-
-/* char: 0xaf */
-
-static final byte[] ch175data = {
-(byte) 0xf0,
-};
-
-static final BitmapCharRec ch175 = new BitmapCharRec(4,1,0,-8,4,ch175data);
-
-/* char: 0xae */
-
-static final byte[] ch174data = {
-(byte) 0x3e,(byte) 0x0,(byte) 0x41,(byte) 0x0,(byte) 0x94,(byte) 0x80,(byte) 0x94,(byte) 0x80,(byte) 0x98,(byte) 0x80,(byte) 0x94,(byte) 0x80,(byte) 0x9c,(byte) 0x80,(byte) 0x41,(byte) 0x0,
-(byte) 0x3e,(byte) 0x0,
-};
-
-static final BitmapCharRec ch174 = new BitmapCharRec(9,9,-1,0,11,ch174data);
-
-/* char: 0xad */
-
-static final byte[] ch173data = {
-(byte) 0xf0,
-};
-
-static final BitmapCharRec ch173 = new BitmapCharRec(4,1,0,-3,5,ch173data);
-
-/* char: 0xac */
-
-static final byte[] ch172data = {
-(byte) 0x4,(byte) 0x4,(byte) 0x4,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch172 = new BitmapCharRec(6,4,-1,-2,8,ch172data);
-
-/* char: 0xab */
-
-static final byte[] ch171data = {
-(byte) 0x28,(byte) 0x50,(byte) 0xa0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch171 = new BitmapCharRec(5,5,-1,-1,7,ch171data);
-
-/* char: 0xaa */
-
-static final byte[] ch170data = {
-(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x20,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch170 = new BitmapCharRec(3,5,-1,-4,5,ch170data);
-
-/* char: 0xa9 */
-
-static final byte[] ch169data = {
-(byte) 0x3e,(byte) 0x0,(byte) 0x41,(byte) 0x0,(byte) 0x9c,(byte) 0x80,(byte) 0xa2,(byte) 0x80,(byte) 0xa0,(byte) 0x80,(byte) 0xa2,(byte) 0x80,(byte) 0x9c,(byte) 0x80,(byte) 0x41,(byte) 0x0,
-(byte) 0x3e,(byte) 0x0,
-};
-
-static final BitmapCharRec ch169 = new BitmapCharRec(9,9,-1,0,11,ch169data);
-
-/* char: 0xa8 */
-
-static final byte[] ch168data = {
-(byte) 0xa0,
-};
-
-static final BitmapCharRec ch168 = new BitmapCharRec(3,1,0,-8,3,ch168data);
-
-/* char: 0xa7 */
-
-static final byte[] ch167data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x30,(byte) 0x48,(byte) 0x88,(byte) 0x88,(byte) 0x90,(byte) 0x60,(byte) 0x80,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch167 = new BitmapCharRec(5,12,0,3,6,ch167data);
-
-/* char: 0xa6 */
-
-static final byte[] ch166data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch166 = new BitmapCharRec(1,11,-1,2,3,ch166data);
-
-/* char: 0xa5 */
-
-static final byte[] ch165data = {
-(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x50,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch165 = new BitmapCharRec(5,9,-1,0,7,ch165data);
-
-/* char: 0xa4 */
-
-static final byte[] ch164data = {
-(byte) 0x84,(byte) 0x78,(byte) 0x48,(byte) 0x48,(byte) 0x78,(byte) 0x84,
-};
-
-static final BitmapCharRec ch164 = new BitmapCharRec(6,6,0,-1,7,ch164data);
-
-/* char: 0xa3 */
-
-static final byte[] ch163data = {
-(byte) 0xb0,(byte) 0x48,(byte) 0x20,(byte) 0x20,(byte) 0xf0,(byte) 0x40,(byte) 0x40,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch163 = new BitmapCharRec(5,9,-1,0,7,ch163data);
-
-/* char: 0xa2 */
-
-static final byte[] ch162data = {
-(byte) 0x40,(byte) 0x70,(byte) 0xc8,(byte) 0xa0,(byte) 0xa0,(byte) 0xa0,(byte) 0xa8,(byte) 0x70,(byte) 0x10,
-};
-
-static final BitmapCharRec ch162 = new BitmapCharRec(5,9,-1,1,7,ch162data);
-
-/* char: 0xa1 */
-
-static final byte[] ch161data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch161 = new BitmapCharRec(1,10,-1,3,3,ch161data);
-
-/* char: 0xa0 */
-
-static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,4,null);
-
-/* char: 0x7e '~' */
-
-static final byte[] ch126data = {
-(byte) 0x98,(byte) 0x64,
-};
-
-static final BitmapCharRec ch126 = new BitmapCharRec(6,2,0,-3,7,ch126data);
-
-/* char: 0x7d '}' */
-
-static final byte[] ch125data = {
-(byte) 0xc0,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch125 = new BitmapCharRec(4,12,0,3,4,ch125data);
-
-/* char: 0x7c '|' */
-
-static final byte[] ch124data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch124 = new BitmapCharRec(1,12,-1,3,3,ch124data);
-
-/* char: 0x7b '{' */
-
-static final byte[] ch123data = {
-(byte) 0x30,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x30,
-};
-
-static final BitmapCharRec ch123 = new BitmapCharRec(4,12,0,3,4,ch123data);
-
-/* char: 0x7a 'z' */
-
-static final byte[] ch122data = {
-(byte) 0xf0,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch122 = new BitmapCharRec(4,7,-1,0,6,ch122data);
-
-/* char: 0x79 'y' */
-
-static final byte[] ch121data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x50,(byte) 0x50,(byte) 0x90,(byte) 0x88,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch121 = new BitmapCharRec(5,10,-1,3,7,ch121data);
-
-/* char: 0x78 'x' */
-
-static final byte[] ch120data = {
-(byte) 0x84,(byte) 0x84,(byte) 0x48,(byte) 0x30,(byte) 0x30,(byte) 0x48,(byte) 0x84,
-};
-
-static final BitmapCharRec ch120 = new BitmapCharRec(6,7,0,0,6,ch120data);
-
-/* char: 0x77 'w' */
-
-static final byte[] ch119data = {
-(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x49,(byte) 0x0,(byte) 0x49,(byte) 0x0,(byte) 0x88,(byte) 0x80,(byte) 0x88,(byte) 0x80,
-};
-
-static final BitmapCharRec ch119 = new BitmapCharRec(9,7,0,0,9,ch119data);
-
-/* char: 0x76 'v' */
-
-static final byte[] ch118data = {
-(byte) 0x20,(byte) 0x20,(byte) 0x50,(byte) 0x50,(byte) 0x88,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch118 = new BitmapCharRec(5,7,-1,0,7,ch118data);
-
-/* char: 0x75 'u' */
-
-static final byte[] ch117data = {
-(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,
-};
-
-static final BitmapCharRec ch117 = new BitmapCharRec(5,7,-1,0,7,ch117data);
-
-/* char: 0x74 't' */
-
-static final byte[] ch116data = {
-(byte) 0x60,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x40,
-};
-
-static final BitmapCharRec ch116 = new BitmapCharRec(3,9,0,0,3,ch116data);
-
-/* char: 0x73 's' */
-
-static final byte[] ch115data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x10,(byte) 0x60,(byte) 0x80,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch115 = new BitmapCharRec(4,7,-1,0,6,ch115data);
-
-/* char: 0x72 'r' */
-
-static final byte[] ch114data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch114 = new BitmapCharRec(3,7,-1,0,4,ch114data);
-
-/* char: 0x71 'q' */
-
-static final byte[] ch113data = {
-(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x98,(byte) 0x68,
-};
-
-static final BitmapCharRec ch113 = new BitmapCharRec(5,10,-1,3,7,ch113data);
-
-/* char: 0x70 'p' */
-
-static final byte[] ch112data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xb0,(byte) 0xc8,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,
-};
-
-static final BitmapCharRec ch112 = new BitmapCharRec(5,10,-1,3,7,ch112data);
-
-/* char: 0x6f 'o' */
-
-static final byte[] ch111data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch111 = new BitmapCharRec(5,7,-1,0,7,ch111data);
-
-/* char: 0x6e 'n' */
-
-static final byte[] ch110data = {
-(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,
-};
-
-static final BitmapCharRec ch110 = new BitmapCharRec(5,7,-1,0,7,ch110data);
-
-/* char: 0x6d 'm' */
-
-static final byte[] ch109data = {
-(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0xda,(byte) 0xa4,
-};
-
-static final BitmapCharRec ch109 = new BitmapCharRec(7,7,-1,0,9,ch109data);
-
-/* char: 0x6c 'l' */
-
-static final byte[] ch108data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch108 = new BitmapCharRec(1,9,-1,0,3,ch108data);
-
-/* char: 0x6b 'k' */
-
-static final byte[] ch107data = {
-(byte) 0x88,(byte) 0x90,(byte) 0xa0,(byte) 0xc0,(byte) 0xc0,(byte) 0xa0,(byte) 0x90,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch107 = new BitmapCharRec(5,9,-1,0,6,ch107data);
-
-/* char: 0x6a 'j' */
-
-static final byte[] ch106data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch106 = new BitmapCharRec(2,12,0,3,3,ch106data);
-
-/* char: 0x69 'i' */
-
-static final byte[] ch105data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch105 = new BitmapCharRec(1,9,-1,0,3,ch105data);
-
-/* char: 0x68 'h' */
-
-static final byte[] ch104data = {
-(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch104 = new BitmapCharRec(5,9,-1,0,7,ch104data);
-
-/* char: 0x67 'g' */
-
-static final byte[] ch103data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x98,(byte) 0x68,
-};
-
-static final BitmapCharRec ch103 = new BitmapCharRec(5,10,-1,3,7,ch103data);
-
-/* char: 0x66 'f' */
-
-static final byte[] ch102data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x30,
-};
-
-static final BitmapCharRec ch102 = new BitmapCharRec(4,9,0,0,3,ch102data);
-
-/* char: 0x65 'e' */
-
-static final byte[] ch101data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0xf8,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch101 = new BitmapCharRec(5,7,-1,0,7,ch101data);
-
-/* char: 0x64 'd' */
-
-static final byte[] ch100data = {
-(byte) 0x68,(byte) 0x98,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x98,(byte) 0x68,(byte) 0x8,(byte) 0x8,
-};
-
-static final BitmapCharRec ch100 = new BitmapCharRec(5,9,-1,0,7,ch100data);
-
-/* char: 0x63 'c' */
-
-static final byte[] ch99data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch99 = new BitmapCharRec(5,7,-1,0,7,ch99data);
-
-/* char: 0x62 'b' */
-
-static final byte[] ch98data = {
-(byte) 0xb0,(byte) 0xc8,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch98 = new BitmapCharRec(5,9,-1,0,7,ch98data);
-
-/* char: 0x61 'a' */
-
-static final byte[] ch97data = {
-(byte) 0x74,(byte) 0x88,(byte) 0x88,(byte) 0x78,(byte) 0x8,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch97 = new BitmapCharRec(6,7,-1,0,7,ch97data);
-
-/* char: 0x60 '`' */
-
-static final byte[] ch96data = {
-(byte) 0xc0,(byte) 0x80,(byte) 0x40,
-};
-
-static final BitmapCharRec ch96 = new BitmapCharRec(2,3,0,-6,3,ch96data);
-
-/* char: 0x5f '_' */
-
-static final byte[] ch95data = {
-(byte) 0xfe,
-};
-
-static final BitmapCharRec ch95 = new BitmapCharRec(7,1,0,2,7,ch95data);
-
-/* char: 0x5e '^' */
-
-static final byte[] ch94data = {
-(byte) 0x88,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch94 = new BitmapCharRec(5,3,0,-5,6,ch94data);
-
-/* char: 0x5d ']' */
-
-static final byte[] ch93data = {
-(byte) 0xc0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch93 = new BitmapCharRec(2,12,0,3,3,ch93data);
-
-/* char: 0x5c '\' */
-
-static final byte[] ch92data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch92 = new BitmapCharRec(4,9,0,0,4,ch92data);
-
-/* char: 0x5b '[' */
-
-static final byte[] ch91data = {
-(byte) 0xc0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch91 = new BitmapCharRec(2,12,-1,3,3,ch91data);
-
-/* char: 0x5a 'Z' */
-
-static final byte[] ch90data = {
-(byte) 0xfe,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x4,(byte) 0x2,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch90 = new BitmapCharRec(7,9,-1,0,9,ch90data);
-
-/* char: 0x59 'Y' */
-
-static final byte[] ch89data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch89 = new BitmapCharRec(7,9,-1,0,9,ch89data);
-
-/* char: 0x58 'X' */
-
-static final byte[] ch88data = {
-(byte) 0x82,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x82,
-};
-
-static final BitmapCharRec ch88 = new BitmapCharRec(7,9,-1,0,9,ch88data);
-
-/* char: 0x57 'W' */
-
-static final byte[] ch87data = {
-(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x49,(byte) 0x0,(byte) 0x88,(byte) 0x80,(byte) 0x88,(byte) 0x80,
-(byte) 0x88,(byte) 0x80,
-};
-
-static final BitmapCharRec ch87 = new BitmapCharRec(9,9,-1,0,11,ch87data);
-
-/* char: 0x56 'V' */
-
-static final byte[] ch86data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch86 = new BitmapCharRec(7,9,-1,0,9,ch86data);
-
-/* char: 0x55 'U' */
-
-static final byte[] ch85data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x84,
-};
-
-static final BitmapCharRec ch85 = new BitmapCharRec(6,9,-1,0,8,ch85data);
-
-/* char: 0x54 'T' */
-
-static final byte[] ch84data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch84 = new BitmapCharRec(7,9,0,0,7,ch84data);
-
-/* char: 0x53 'S' */
-
-static final byte[] ch83data = {
-(byte) 0x78,(byte) 0x84,(byte) 0x84,(byte) 0x4,(byte) 0x18,(byte) 0x60,(byte) 0x80,(byte) 0x84,(byte) 0x78,
-};
-
-static final BitmapCharRec ch83 = new BitmapCharRec(6,9,-1,0,8,ch83data);
-
-/* char: 0x52 'R' */
-
-static final byte[] ch82data = {
-(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0x88,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch82 = new BitmapCharRec(6,9,-1,0,8,ch82data);
-
-/* char: 0x51 'Q' */
-
-static final byte[] ch81data = {
-(byte) 0x3d,(byte) 0x42,(byte) 0x85,(byte) 0x89,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch81 = new BitmapCharRec(8,9,-1,0,10,ch81data);
-
-/* char: 0x50 'P' */
-
-static final byte[] ch80data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch80 = new BitmapCharRec(6,9,-1,0,8,ch80data);
-
-/* char: 0x4f 'O' */
-
-static final byte[] ch79data = {
-(byte) 0x3c,(byte) 0x42,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x81,(byte) 0x42,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch79 = new BitmapCharRec(8,9,-1,0,10,ch79data);
-
-/* char: 0x4e 'N' */
-
-static final byte[] ch78data = {
-(byte) 0x82,(byte) 0x86,(byte) 0x8a,(byte) 0x8a,(byte) 0x92,(byte) 0xa2,(byte) 0xa2,(byte) 0xc2,(byte) 0x82,
-};
-
-static final BitmapCharRec ch78 = new BitmapCharRec(7,9,-1,0,9,ch78data);
-
-/* char: 0x4d 'M' */
-
-static final byte[] ch77data = {
-(byte) 0x88,(byte) 0x80,(byte) 0x88,(byte) 0x80,(byte) 0x94,(byte) 0x80,(byte) 0x94,(byte) 0x80,(byte) 0xa2,(byte) 0x80,(byte) 0xa2,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,
-(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch77 = new BitmapCharRec(9,9,-1,0,11,ch77data);
-
-/* char: 0x4c 'L' */
-
-static final byte[] ch76data = {
-(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch76 = new BitmapCharRec(5,9,-1,0,7,ch76data);
-
-/* char: 0x4b 'K' */
-
-static final byte[] ch75data = {
-(byte) 0x82,(byte) 0x84,(byte) 0x88,(byte) 0x90,(byte) 0xe0,(byte) 0xa0,(byte) 0x90,(byte) 0x88,(byte) 0x84,
-};
-
-static final BitmapCharRec ch75 = new BitmapCharRec(7,9,-1,0,8,ch75data);
-
-/* char: 0x4a 'J' */
-
-static final byte[] ch74data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,(byte) 0x8,
-};
-
-static final BitmapCharRec ch74 = new BitmapCharRec(5,9,-1,0,7,ch74data);
-
-/* char: 0x49 'I' */
-
-static final byte[] ch73data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch73 = new BitmapCharRec(1,9,-1,0,3,ch73data);
-
-/* char: 0x48 'H' */
-
-static final byte[] ch72data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0xfe,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,
-};
-
-static final BitmapCharRec ch72 = new BitmapCharRec(7,9,-1,0,9,ch72data);
-
-/* char: 0x47 'G' */
-
-static final byte[] ch71data = {
-(byte) 0x3a,(byte) 0x46,(byte) 0x82,(byte) 0x82,(byte) 0x8e,(byte) 0x80,(byte) 0x80,(byte) 0x42,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch71 = new BitmapCharRec(7,9,-1,0,9,ch71data);
-
-/* char: 0x46 'F' */
-
-static final byte[] ch70data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch70 = new BitmapCharRec(6,9,-1,0,8,ch70data);
-
-/* char: 0x45 'E' */
-
-static final byte[] ch69data = {
-(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch69 = new BitmapCharRec(6,9,-1,0,8,ch69data);
-
-/* char: 0x44 'D' */
-
-static final byte[] ch68data = {
-(byte) 0xf8,(byte) 0x84,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x84,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch68 = new BitmapCharRec(7,9,-1,0,9,ch68data);
-
-/* char: 0x43 'C' */
-
-static final byte[] ch67data = {
-(byte) 0x3c,(byte) 0x42,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x42,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch67 = new BitmapCharRec(7,9,-1,0,9,ch67data);
-
-/* char: 0x42 'B' */
-
-static final byte[] ch66data = {
-(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch66 = new BitmapCharRec(6,9,-1,0,8,ch66data);
-
-/* char: 0x41 'A' */
-
-static final byte[] ch65data = {
-(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0x28,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch65 = new BitmapCharRec(7,9,-1,0,9,ch65data);
-
-/* char: 0x40 '@' */
-
-static final byte[] ch64data = {
-(byte) 0x3e,(byte) 0x0,(byte) 0x40,(byte) 0x0,(byte) 0x9b,(byte) 0x0,(byte) 0xa6,(byte) 0x80,(byte) 0xa2,(byte) 0x40,(byte) 0xa2,(byte) 0x40,(byte) 0x92,(byte) 0x40,(byte) 0x4d,(byte) 0x40,
-(byte) 0x60,(byte) 0x80,(byte) 0x1f,(byte) 0x0,
-};
-
-static final BitmapCharRec ch64 = new BitmapCharRec(10,10,-1,1,12,ch64data);
-
-/* char: 0x3f '?' */
-
-static final byte[] ch63data = {
-(byte) 0x20,(byte) 0x0,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch63 = new BitmapCharRec(5,9,-1,0,7,ch63data);
-
-/* char: 0x3e '>' */
-
-static final byte[] ch62data = {
-(byte) 0xc0,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch62 = new BitmapCharRec(6,5,-1,-1,7,ch62data);
-
-/* char: 0x3d '=' */
-
-static final byte[] ch61data = {
-(byte) 0xf8,(byte) 0x0,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch61 = new BitmapCharRec(5,3,-1,-2,7,ch61data);
-
-/* char: 0x3c '<' */
-
-static final byte[] ch60data = {
-(byte) 0xc,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc,
-};
-
-static final BitmapCharRec ch60 = new BitmapCharRec(6,5,0,-1,7,ch60data);
-
-/* char: 0x3b ';' */
-
-static final byte[] ch59data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch59 = new BitmapCharRec(2,8,0,2,3,ch59data);
-
-/* char: 0x3a ':' */
-
-static final byte[] ch58data = {
-(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch58 = new BitmapCharRec(1,6,-1,0,3,ch58data);
-
-/* char: 0x39 '9' */
-
-static final byte[] ch57data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0x78,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch57 = new BitmapCharRec(5,9,-1,0,7,ch57data);
-
-/* char: 0x38 '8' */
-
-static final byte[] ch56data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch56 = new BitmapCharRec(5,9,-1,0,7,ch56data);
-
-/* char: 0x37 '7' */
-
-static final byte[] ch55data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x10,(byte) 0x8,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch55 = new BitmapCharRec(5,9,-1,0,7,ch55data);
-
-/* char: 0x36 '6' */
-
-static final byte[] ch54data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0xc8,(byte) 0xb0,(byte) 0x80,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch54 = new BitmapCharRec(5,9,-1,0,7,ch54data);
-
-/* char: 0x35 '5' */
-
-static final byte[] ch53data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0xf0,(byte) 0x80,(byte) 0x80,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch53 = new BitmapCharRec(5,9,-1,0,7,ch53data);
-
-/* char: 0x34 '4' */
-
-static final byte[] ch52data = {
-(byte) 0x8,(byte) 0x8,(byte) 0xfc,(byte) 0x88,(byte) 0x48,(byte) 0x28,(byte) 0x28,(byte) 0x18,(byte) 0x8,
-};
-
-static final BitmapCharRec ch52 = new BitmapCharRec(6,9,0,0,7,ch52data);
-
-/* char: 0x33 '3' */
-
-static final byte[] ch51data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x8,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch51 = new BitmapCharRec(5,9,-1,0,7,ch51data);
-
-/* char: 0x32 '2' */
-
-static final byte[] ch50data = {
-(byte) 0xf8,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x8,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch50 = new BitmapCharRec(5,9,-1,0,7,ch50data);
-
-/* char: 0x31 '1' */
-
-static final byte[] ch49data = {
-(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xe0,(byte) 0x20,
-};
-
-static final BitmapCharRec ch49 = new BitmapCharRec(3,9,-1,0,7,ch49data);
-
-/* char: 0x30 '0' */
-
-static final byte[] ch48data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x88,(byte) 0x70,
-};
-
-static final BitmapCharRec ch48 = new BitmapCharRec(5,9,-1,0,7,ch48data);
-
-/* char: 0x2f '/' */
-
-static final byte[] ch47data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x10,
-};
-
-static final BitmapCharRec ch47 = new BitmapCharRec(4,9,0,0,4,ch47data);
-
-/* char: 0x2e '.' */
-
-static final byte[] ch46data = {
-(byte) 0x80,
-};
-
-static final BitmapCharRec ch46 = new BitmapCharRec(1,1,-1,0,3,ch46data);
-
-/* char: 0x2d '-' */
-
-static final byte[] ch45data = {
-(byte) 0xf8,
-};
-
-static final BitmapCharRec ch45 = new BitmapCharRec(5,1,-1,-3,8,ch45data);
-
-/* char: 0x2c ',' */
-
-static final byte[] ch44data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,
-};
-
-static final BitmapCharRec ch44 = new BitmapCharRec(2,3,-1,2,4,ch44data);
-
-/* char: 0x2b '+' */
-
-static final byte[] ch43data = {
-(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch43 = new BitmapCharRec(5,5,-1,-1,7,ch43data);
-
-/* char: 0x2a '*' */
-
-static final byte[] ch42data = {
-(byte) 0xa0,(byte) 0x40,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch42 = new BitmapCharRec(3,3,-1,-6,5,ch42data);
-
-/* char: 0x29 ')' */
-
-static final byte[] ch41data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch41 = new BitmapCharRec(3,12,0,3,4,ch41data);
-
-/* char: 0x28 '(' */
-
-static final byte[] ch40data = {
-(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch40 = new BitmapCharRec(3,12,-1,3,4,ch40data);
-
-/* char: 0x27 ''' */
-
-static final byte[] ch39data = {
-(byte) 0x80,(byte) 0x40,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch39 = new BitmapCharRec(2,3,-1,-6,3,ch39data);
-
-/* char: 0x26 '&' */
-
-static final byte[] ch38data = {
-(byte) 0x72,(byte) 0x8c,(byte) 0x84,(byte) 0x8a,(byte) 0x50,(byte) 0x30,(byte) 0x48,(byte) 0x48,(byte) 0x30,
-};
-
-static final BitmapCharRec ch38 = new BitmapCharRec(7,9,-1,0,9,ch38data);
-
-/* char: 0x25 '%' */
-
-static final byte[] ch37data = {
-(byte) 0x23,(byte) 0x0,(byte) 0x14,(byte) 0x80,(byte) 0x14,(byte) 0x80,(byte) 0x13,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x68,(byte) 0x0,(byte) 0x94,(byte) 0x0,(byte) 0x94,(byte) 0x0,
-(byte) 0x62,(byte) 0x0,
-};
-
-static final BitmapCharRec ch37 = new BitmapCharRec(9,9,-1,0,11,ch37data);
-
-/* char: 0x24 '$' */
-
-static final byte[] ch36data = {
-(byte) 0x20,(byte) 0x70,(byte) 0xa8,(byte) 0xa8,(byte) 0x28,(byte) 0x70,(byte) 0xa0,(byte) 0xa8,(byte) 0x70,(byte) 0x20,
-};
-
-static final BitmapCharRec ch36 = new BitmapCharRec(5,10,-1,1,7,ch36data);
-
-/* char: 0x23 '#' */
-
-static final byte[] ch35data = {
-(byte) 0x50,(byte) 0x50,(byte) 0x50,(byte) 0xfc,(byte) 0x28,(byte) 0xfc,(byte) 0x28,(byte) 0x28,
-};
-
-static final BitmapCharRec ch35 = new BitmapCharRec(6,8,0,0,7,ch35data);
-
-/* char: 0x22 '"' */
-
-static final byte[] ch34data = {
-(byte) 0xa0,(byte) 0xa0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch34 = new BitmapCharRec(3,3,-1,-6,5,ch34data);
-
-/* char: 0x21 '!' */
-
-static final byte[] ch33data = {
-(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch33 = new BitmapCharRec(1,9,-1,0,3,ch33data);
-
-/* char: 0x20 ' ' */
-
-static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,4,null);
-
-static final BitmapCharRec[] chars = {
-ch32,
-ch33,
-ch34,
-ch35,
-ch36,
-ch37,
-ch38,
-ch39,
-ch40,
-ch41,
-ch42,
-ch43,
-ch44,
-ch45,
-ch46,
-ch47,
-ch48,
-ch49,
-ch50,
-ch51,
-ch52,
-ch53,
-ch54,
-ch55,
-ch56,
-ch57,
-ch58,
-ch59,
-ch60,
-ch61,
-ch62,
-ch63,
-ch64,
-ch65,
-ch66,
-ch67,
-ch68,
-ch69,
-ch70,
-ch71,
-ch72,
-ch73,
-ch74,
-ch75,
-ch76,
-ch77,
-ch78,
-ch79,
-ch80,
-ch81,
-ch82,
-ch83,
-ch84,
-ch85,
-ch86,
-ch87,
-ch88,
-ch89,
-ch90,
-ch91,
-ch92,
-ch93,
-ch94,
-ch95,
-ch96,
-ch97,
-ch98,
-ch99,
-ch100,
-ch101,
-ch102,
-ch103,
-ch104,
-ch105,
-ch106,
-ch107,
-ch108,
-ch109,
-ch110,
-ch111,
-ch112,
-ch113,
-ch114,
-ch115,
-ch116,
-ch117,
-ch118,
-ch119,
-ch120,
-ch121,
-ch122,
-ch123,
-ch124,
-ch125,
-ch126,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-ch160,
-ch161,
-ch162,
-ch163,
-ch164,
-ch165,
-ch166,
-ch167,
-ch168,
-ch169,
-ch170,
-ch171,
-ch172,
-ch173,
-ch174,
-ch175,
-ch176,
-ch177,
-ch178,
-ch179,
-ch180,
-ch181,
-ch182,
-ch183,
-ch184,
-ch185,
-ch186,
-ch187,
-ch188,
-ch189,
-ch190,
-ch191,
-ch192,
-ch193,
-ch194,
-ch195,
-ch196,
-ch197,
-ch198,
-ch199,
-ch200,
-ch201,
-ch202,
-ch203,
-ch204,
-ch205,
-ch206,
-ch207,
-ch208,
-ch209,
-ch210,
-ch211,
-ch212,
-ch213,
-ch214,
-ch215,
-ch216,
-ch217,
-ch218,
-ch219,
-ch220,
-ch221,
-ch222,
-ch223,
-ch224,
-ch225,
-ch226,
-ch227,
-ch228,
-ch229,
-ch230,
-ch231,
-ch232,
-ch233,
-ch234,
-ch235,
-ch236,
-ch237,
-ch238,
-ch239,
-ch240,
-ch241,
-ch242,
-ch243,
-ch244,
-ch245,
-ch246,
-ch247,
-ch248,
-ch249,
-ch250,
-ch251,
-ch252,
-ch253,
-ch254,
-ch255,
-};
-
-  public static final BitmapFontRec glutBitmapHelvetica12 = new BitmapFontRec("-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1",
-                                                                       224,
-                                                                       32,
-                                                                       chars);
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica18.java b/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica18.java
deleted file mode 100644
index cf34a6d25..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica18.java
+++ /dev/null
@@ -1,1917 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-class GLUTBitmapHelvetica18 {
-
-/* GENERATED FILE -- DO NOT MODIFY */
-
-/* char: 0xff */
-
-static final byte[] ch255data = {
-(byte) 0x70,(byte) 0x70,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x3c,(byte) 0x24,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x0,(byte) 0x66,
-(byte) 0x66,
-};
-
-static final BitmapCharRec ch255 = new BitmapCharRec(8,17,-1,4,10,ch255data);
-
-/* char: 0xfe */
-
-static final byte[] ch254data = {
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xde,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xe3,(byte) 0x0,(byte) 0xc1,(byte) 0x80,
-(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xe3,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xde,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch254 = new BitmapCharRec(9,18,-1,4,11,ch254data);
-
-/* char: 0xfd */
-
-static final byte[] ch253data = {
-(byte) 0x70,(byte) 0x70,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x3c,(byte) 0x24,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x0,(byte) 0x18,
-(byte) 0xc,(byte) 0x6,
-};
-
-static final BitmapCharRec ch253 = new BitmapCharRec(8,18,-1,4,10,ch253data);
-
-/* char: 0xfc */
-
-static final byte[] ch252data = {
-(byte) 0x73,(byte) 0xfb,(byte) 0xc7,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x0,(byte) 0x66,(byte) 0x66,
-};
-
-static final BitmapCharRec ch252 = new BitmapCharRec(8,13,-1,0,10,ch252data);
-
-/* char: 0xfb */
-
-static final byte[] ch251data = {
-(byte) 0x73,(byte) 0xfb,(byte) 0xc7,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x0,(byte) 0x66,(byte) 0x3c,(byte) 0x18,
-};
-
-static final BitmapCharRec ch251 = new BitmapCharRec(8,14,-1,0,10,ch251data);
-
-/* char: 0xfa */
-
-static final byte[] ch250data = {
-(byte) 0x73,(byte) 0xfb,(byte) 0xc7,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x6,
-};
-
-static final BitmapCharRec ch250 = new BitmapCharRec(8,14,-1,0,10,ch250data);
-
-/* char: 0xf9 */
-
-static final byte[] ch249data = {
-(byte) 0x73,(byte) 0xfb,(byte) 0xc7,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x30,
-};
-
-static final BitmapCharRec ch249 = new BitmapCharRec(8,14,-1,0,10,ch249data);
-
-/* char: 0xf8 */
-
-static final byte[] ch248data = {
-(byte) 0xce,(byte) 0x0,(byte) 0x7f,(byte) 0x80,(byte) 0x31,(byte) 0x80,(byte) 0x78,(byte) 0xc0,(byte) 0x6c,(byte) 0xc0,(byte) 0x66,(byte) 0xc0,(byte) 0x63,(byte) 0xc0,(byte) 0x31,(byte) 0x80,
-(byte) 0x3f,(byte) 0xc0,(byte) 0xe,(byte) 0x60,
-};
-
-static final BitmapCharRec ch248 = new BitmapCharRec(11,10,0,0,11,ch248data);
-
-/* char: 0xf7 */
-
-static final byte[] ch247data = {
-(byte) 0x18,(byte) 0x18,(byte) 0x0,(byte) 0xff,(byte) 0xff,(byte) 0x0,(byte) 0x18,(byte) 0x18,
-};
-
-static final BitmapCharRec ch247 = new BitmapCharRec(8,8,-1,-1,10,ch247data);
-
-/* char: 0xf6 */
-
-static final byte[] ch246data = {
-(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
-(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x36,(byte) 0x0,(byte) 0x36,(byte) 0x0,
-};
-
-static final BitmapCharRec ch246 = new BitmapCharRec(9,13,-1,0,11,ch246data);
-
-/* char: 0xf5 */
-
-static final byte[] ch245data = {
-(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
-(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x26,(byte) 0x0,(byte) 0x2d,(byte) 0x0,(byte) 0x19,(byte) 0x0,
-};
-
-static final BitmapCharRec ch245 = new BitmapCharRec(9,14,-1,0,11,ch245data);
-
-/* char: 0xf4 */
-
-static final byte[] ch244data = {
-(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
-(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0xc,(byte) 0x0,
-};
-
-static final BitmapCharRec ch244 = new BitmapCharRec(9,14,-1,0,11,ch244data);
-
-/* char: 0xf3 */
-
-static final byte[] ch243data = {
-(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
-(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-};
-
-static final BitmapCharRec ch243 = new BitmapCharRec(9,14,-1,0,11,ch243data);
-
-/* char: 0xf2 */
-
-static final byte[] ch242data = {
-(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
-(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x30,(byte) 0x0,
-};
-
-static final BitmapCharRec ch242 = new BitmapCharRec(9,14,-1,0,11,ch242data);
-
-/* char: 0xf1 */
-
-static final byte[] ch241data = {
-(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xe3,(byte) 0xdf,(byte) 0xce,(byte) 0x0,(byte) 0x4c,(byte) 0x5a,(byte) 0x32,
-};
-
-static final BitmapCharRec ch241 = new BitmapCharRec(8,14,-1,0,10,ch241data);
-
-/* char: 0xf0 */
-
-static final byte[] ch240data = {
-(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
-(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x4c,(byte) 0x0,(byte) 0x38,(byte) 0x0,(byte) 0x36,(byte) 0x0,(byte) 0x60,(byte) 0x0,
-};
-
-static final BitmapCharRec ch240 = new BitmapCharRec(9,14,-1,0,11,ch240data);
-
-/* char: 0xef */
-
-static final byte[] ch239data = {
-(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x0,(byte) 0xd8,(byte) 0xd8,
-};
-
-static final BitmapCharRec ch239 = new BitmapCharRec(5,13,0,0,4,ch239data);
-
-/* char: 0xee */
-
-static final byte[] ch238data = {
-(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0xcc,(byte) 0x78,(byte) 0x30,
-};
-
-static final BitmapCharRec ch238 = new BitmapCharRec(6,14,1,0,4,ch238data);
-
-/* char: 0xed */
-
-static final byte[] ch237data = {
-(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x0,(byte) 0xc0,(byte) 0x60,(byte) 0x30,
-};
-
-static final BitmapCharRec ch237 = new BitmapCharRec(4,14,0,0,4,ch237data);
-
-/* char: 0xec */
-
-static final byte[] ch236data = {
-(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x0,(byte) 0x30,(byte) 0x60,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch236 = new BitmapCharRec(4,14,0,0,4,ch236data);
-
-/* char: 0xeb */
-
-static final byte[] ch235data = {
-(byte) 0x3c,(byte) 0x7f,(byte) 0xe3,(byte) 0xc0,(byte) 0xc0,(byte) 0xff,(byte) 0xc3,(byte) 0xc3,(byte) 0x7e,(byte) 0x3c,(byte) 0x0,(byte) 0x36,(byte) 0x36,
-};
-
-static final BitmapCharRec ch235 = new BitmapCharRec(8,13,-1,0,10,ch235data);
-
-/* char: 0xea */
-
-static final byte[] ch234data = {
-(byte) 0x3c,(byte) 0x7f,(byte) 0xe3,(byte) 0xc0,(byte) 0xc0,(byte) 0xff,(byte) 0xc3,(byte) 0xc3,(byte) 0x7e,(byte) 0x3c,(byte) 0x0,(byte) 0x66,(byte) 0x3c,(byte) 0x18,
-};
-
-static final BitmapCharRec ch234 = new BitmapCharRec(8,14,-1,0,10,ch234data);
-
-/* char: 0xe9 */
-
-static final byte[] ch233data = {
-(byte) 0x3c,(byte) 0x7f,(byte) 0xe3,(byte) 0xc0,(byte) 0xc0,(byte) 0xff,(byte) 0xc3,(byte) 0xc3,(byte) 0x7e,(byte) 0x3c,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x6,
-};
-
-static final BitmapCharRec ch233 = new BitmapCharRec(8,14,-1,0,10,ch233data);
-
-/* char: 0xe8 */
-
-static final byte[] ch232data = {
-(byte) 0x3c,(byte) 0x7f,(byte) 0xe3,(byte) 0xc0,(byte) 0xc0,(byte) 0xff,(byte) 0xc3,(byte) 0xc3,(byte) 0x7e,(byte) 0x3c,(byte) 0x0,(byte) 0x18,(byte) 0x30,(byte) 0x60,
-};
-
-static final BitmapCharRec ch232 = new BitmapCharRec(8,14,-1,0,10,ch232data);
-
-/* char: 0xe7 */
-
-static final byte[] ch231data = {
-(byte) 0x78,(byte) 0x6c,(byte) 0xc,(byte) 0x38,(byte) 0x3e,(byte) 0x7f,(byte) 0x63,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x63,(byte) 0x7f,(byte) 0x3e,
-};
-
-static final BitmapCharRec ch231 = new BitmapCharRec(8,14,-1,4,10,ch231data);
-
-/* char: 0xe6 */
-
-static final byte[] ch230data = {
-(byte) 0x75,(byte) 0xe0,(byte) 0xef,(byte) 0xf8,(byte) 0xc7,(byte) 0x18,(byte) 0xc6,(byte) 0x0,(byte) 0xe6,(byte) 0x0,(byte) 0x7f,(byte) 0xf8,(byte) 0xe,(byte) 0x18,(byte) 0xc6,(byte) 0x18,
-(byte) 0xef,(byte) 0xf0,(byte) 0x7d,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch230 = new BitmapCharRec(13,10,-1,0,15,ch230data);
-
-/* char: 0xe5 */
-
-static final byte[] ch229data = {
-(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,(byte) 0x38,(byte) 0x6c,(byte) 0x6c,(byte) 0x38,
-};
-
-static final BitmapCharRec ch229 = new BitmapCharRec(7,14,-1,0,9,ch229data);
-
-/* char: 0xe4 */
-
-static final byte[] ch228data = {
-(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,(byte) 0x0,(byte) 0x6c,(byte) 0x6c,
-};
-
-static final BitmapCharRec ch228 = new BitmapCharRec(7,13,-1,0,9,ch228data);
-
-/* char: 0xe3 */
-
-static final byte[] ch227data = {
-(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,(byte) 0x0,(byte) 0x4c,(byte) 0x5a,(byte) 0x32,
-};
-
-static final BitmapCharRec ch227 = new BitmapCharRec(7,14,-1,0,9,ch227data);
-
-/* char: 0xe2 */
-
-static final byte[] ch226data = {
-(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,(byte) 0x0,(byte) 0x66,(byte) 0x3c,(byte) 0x18,
-};
-
-static final BitmapCharRec ch226 = new BitmapCharRec(7,14,-1,0,9,ch226data);
-
-/* char: 0xe1 */
-
-static final byte[] ch225data = {
-(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,(byte) 0x0,(byte) 0x30,(byte) 0x18,(byte) 0xc,
-};
-
-static final BitmapCharRec ch225 = new BitmapCharRec(7,14,-1,0,9,ch225data);
-
-/* char: 0xe0 */
-
-static final byte[] ch224data = {
-(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,(byte) 0x0,(byte) 0x18,(byte) 0x30,(byte) 0x60,
-};
-
-static final BitmapCharRec ch224 = new BitmapCharRec(7,14,-1,0,9,ch224data);
-
-/* char: 0xdf */
-
-static final byte[] ch223data = {
-(byte) 0xdc,(byte) 0xde,(byte) 0xc6,(byte) 0xc6,(byte) 0xc6,(byte) 0xc6,(byte) 0xdc,(byte) 0xdc,(byte) 0xc6,(byte) 0xc6,(byte) 0xc6,(byte) 0xc6,(byte) 0x7c,(byte) 0x38,
-};
-
-static final BitmapCharRec ch223 = new BitmapCharRec(7,14,-1,0,9,ch223data);
-
-/* char: 0xde */
-
-static final byte[] ch222data = {
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xc1,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc1,(byte) 0xc0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch222 = new BitmapCharRec(10,14,-1,0,12,ch222data);
-
-/* char: 0xdd */
-
-static final byte[] ch221data = {
-(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x19,(byte) 0x80,
-(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0x80,
-};
-
-static final BitmapCharRec ch221 = new BitmapCharRec(12,18,-1,0,14,ch221data);
-
-/* char: 0xdc */
-
-static final byte[] ch220data = {
-(byte) 0x1f,(byte) 0x0,(byte) 0x7f,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
-(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x19,(byte) 0x80,
-(byte) 0x19,(byte) 0x80,
-};
-
-static final BitmapCharRec ch220 = new BitmapCharRec(11,17,-1,0,13,ch220data);
-
-/* char: 0xdb */
-
-static final byte[] ch219data = {
-(byte) 0x1f,(byte) 0x0,(byte) 0x7f,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
-(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x19,(byte) 0x80,
-(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-};
-
-static final BitmapCharRec ch219 = new BitmapCharRec(11,18,-1,0,13,ch219data);
-
-/* char: 0xda */
-
-static final byte[] ch218data = {
-(byte) 0x1f,(byte) 0x0,(byte) 0x7f,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
-(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0xc,(byte) 0x0,
-(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x0,
-};
-
-static final BitmapCharRec ch218 = new BitmapCharRec(11,18,-1,0,13,ch218data);
-
-/* char: 0xd9 */
-
-static final byte[] ch217data = {
-(byte) 0x1f,(byte) 0x0,(byte) 0x7f,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
-(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0x0,
-};
-
-static final BitmapCharRec ch217 = new BitmapCharRec(11,18,-1,0,13,ch217data);
-
-/* char: 0xd8 */
-
-static final byte[] ch216data = {
-(byte) 0xc7,(byte) 0xc0,(byte) 0xff,(byte) 0xf0,(byte) 0x78,(byte) 0x38,(byte) 0x38,(byte) 0x18,(byte) 0x6c,(byte) 0x1c,(byte) 0x6e,(byte) 0xc,(byte) 0x67,(byte) 0xc,(byte) 0x63,(byte) 0x8c,
-(byte) 0x61,(byte) 0xcc,(byte) 0x70,(byte) 0xdc,(byte) 0x30,(byte) 0x78,(byte) 0x38,(byte) 0x38,(byte) 0x1f,(byte) 0xfc,(byte) 0x7,(byte) 0xcc,
-};
-
-static final BitmapCharRec ch216 = new BitmapCharRec(14,14,0,0,15,ch216data);
-
-/* char: 0xd7 */
-
-static final byte[] ch215data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x33,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x61,(byte) 0x80,
-(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch215 = new BitmapCharRec(10,9,0,0,10,ch215data);
-
-/* char: 0xd6 */
-
-static final byte[] ch214data = {
-(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x38,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
-(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0xd,(byte) 0x80,
-(byte) 0xd,(byte) 0x80,
-};
-
-static final BitmapCharRec ch214 = new BitmapCharRec(13,17,-1,0,15,ch214data);
-
-/* char: 0xd5 */
-
-static final byte[] ch213data = {
-(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x38,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
-(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x9,(byte) 0x80,
-(byte) 0xb,(byte) 0x40,(byte) 0x6,(byte) 0x40,
-};
-
-static final BitmapCharRec ch213 = new BitmapCharRec(13,18,-1,0,15,ch213data);
-
-/* char: 0xd4 */
-
-static final byte[] ch212data = {
-(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x38,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
-(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0xc,(byte) 0xc0,
-(byte) 0x7,(byte) 0x80,(byte) 0x3,(byte) 0x0,
-};
-
-static final BitmapCharRec ch212 = new BitmapCharRec(13,18,-1,0,15,ch212data);
-
-/* char: 0xd3 */
-
-static final byte[] ch211data = {
-(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x38,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
-(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x3,(byte) 0x0,
-(byte) 0x1,(byte) 0x80,(byte) 0x0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch211 = new BitmapCharRec(13,18,-1,0,15,ch211data);
-
-/* char: 0xd2 */
-
-static final byte[] ch210data = {
-(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x38,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
-(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x3,(byte) 0x0,
-(byte) 0x6,(byte) 0x0,(byte) 0xc,(byte) 0x0,
-};
-
-static final BitmapCharRec ch210 = new BitmapCharRec(13,18,-1,0,15,ch210data);
-
-/* char: 0xd1 */
-
-static final byte[] ch209data = {
-(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe0,(byte) 0xc1,(byte) 0xe0,(byte) 0xc1,(byte) 0xe0,(byte) 0xc3,(byte) 0x60,(byte) 0xc6,(byte) 0x60,(byte) 0xc6,(byte) 0x60,(byte) 0xcc,(byte) 0x60,
-(byte) 0xcc,(byte) 0x60,(byte) 0xd8,(byte) 0x60,(byte) 0xd8,(byte) 0x60,(byte) 0xf0,(byte) 0x60,(byte) 0xe0,(byte) 0x60,(byte) 0xe0,(byte) 0x60,(byte) 0x0,(byte) 0x0,(byte) 0x13,(byte) 0x0,
-(byte) 0x16,(byte) 0x80,(byte) 0xc,(byte) 0x80,
-};
-
-static final BitmapCharRec ch209 = new BitmapCharRec(11,18,-1,0,13,ch209data);
-
-/* char: 0xd0 */
-
-static final byte[] ch208data = {
-(byte) 0x7f,(byte) 0x80,(byte) 0x7f,(byte) 0xc0,(byte) 0x60,(byte) 0xe0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x30,(byte) 0x60,(byte) 0x30,(byte) 0xfc,(byte) 0x30,(byte) 0xfc,(byte) 0x30,
-(byte) 0x60,(byte) 0x30,(byte) 0x60,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xe0,(byte) 0x7f,(byte) 0xc0,(byte) 0x7f,(byte) 0x80,
-};
-
-static final BitmapCharRec ch208 = new BitmapCharRec(12,14,0,0,13,ch208data);
-
-/* char: 0xcf */
-
-static final byte[] ch207data = {
-(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0xcc,
-(byte) 0xcc,
-};
-
-static final BitmapCharRec ch207 = new BitmapCharRec(6,17,0,0,6,ch207data);
-
-/* char: 0xce */
-
-static final byte[] ch206data = {
-(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0xcc,
-(byte) 0x78,(byte) 0x30,
-};
-
-static final BitmapCharRec ch206 = new BitmapCharRec(6,18,0,0,6,ch206data);
-
-/* char: 0xcd */
-
-static final byte[] ch205data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,
-(byte) 0x60,(byte) 0x30,
-};
-
-static final BitmapCharRec ch205 = new BitmapCharRec(4,18,-2,0,6,ch205data);
-
-/* char: 0xcc */
-
-static final byte[] ch204data = {
-(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0x30,
-(byte) 0x60,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch204 = new BitmapCharRec(4,18,0,0,6,ch204data);
-
-/* char: 0xcb */
-
-static final byte[] ch203data = {
-(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x0,
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,
-(byte) 0x33,(byte) 0x0,
-};
-
-static final BitmapCharRec ch203 = new BitmapCharRec(9,17,-1,0,11,ch203data);
-
-/* char: 0xca */
-
-static final byte[] ch202data = {
-(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x0,
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,
-(byte) 0x1e,(byte) 0x0,(byte) 0xc,(byte) 0x0,
-};
-
-static final BitmapCharRec ch202 = new BitmapCharRec(9,18,-1,0,11,ch202data);
-
-/* char: 0xc9 */
-
-static final byte[] ch201data = {
-(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x0,
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0xc,(byte) 0x0,
-(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x0,
-};
-
-static final BitmapCharRec ch201 = new BitmapCharRec(9,18,-1,0,11,ch201data);
-
-/* char: 0xc8 */
-
-static final byte[] ch200data = {
-(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x0,
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0xc,(byte) 0x0,
-(byte) 0x18,(byte) 0x0,(byte) 0x30,(byte) 0x0,
-};
-
-static final BitmapCharRec ch200 = new BitmapCharRec(9,18,-1,0,11,ch200data);
-
-/* char: 0xc7 */
-
-static final byte[] ch199data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x1b,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,
-(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xe0,(byte) 0x0,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,
-(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,
-};
-
-static final BitmapCharRec ch199 = new BitmapCharRec(12,18,-1,4,14,ch199data);
-
-/* char: 0xc6 */
-
-static final byte[] ch198data = {
-(byte) 0xc1,(byte) 0xff,(byte) 0xc1,(byte) 0xff,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x7f,(byte) 0x80,(byte) 0x3f,(byte) 0x80,(byte) 0x31,(byte) 0xfe,(byte) 0x31,(byte) 0xfe,
-(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xd,(byte) 0x80,(byte) 0xd,(byte) 0x80,(byte) 0x7,(byte) 0xff,(byte) 0x7,(byte) 0xff,
-};
-
-static final BitmapCharRec ch198 = new BitmapCharRec(16,14,-1,0,18,ch198data);
-
-/* char: 0xc5 */
-
-static final byte[] ch197data = {
-(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
-(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x19,(byte) 0x80,
-(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,
-};
-
-static final BitmapCharRec ch197 = new BitmapCharRec(12,18,0,0,12,ch197data);
-
-/* char: 0xc4 */
-
-static final byte[] ch196data = {
-(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
-(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x19,(byte) 0x80,
-(byte) 0x19,(byte) 0x80,
-};
-
-static final BitmapCharRec ch196 = new BitmapCharRec(12,17,0,0,12,ch196data);
-
-/* char: 0xc3 */
-
-static final byte[] ch195data = {
-(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
-(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x13,(byte) 0x0,
-(byte) 0x16,(byte) 0x80,(byte) 0xc,(byte) 0x80,
-};
-
-static final BitmapCharRec ch195 = new BitmapCharRec(12,18,0,0,12,ch195data);
-
-/* char: 0xc2 */
-
-static final byte[] ch194data = {
-(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
-(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x19,(byte) 0x80,
-(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-};
-
-static final BitmapCharRec ch194 = new BitmapCharRec(12,18,0,0,12,ch194data);
-
-/* char: 0xc1 */
-
-static final byte[] ch193data = {
-(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
-(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0x80,
-};
-
-static final BitmapCharRec ch193 = new BitmapCharRec(12,18,0,0,12,ch193data);
-
-/* char: 0xc0 */
-
-static final byte[] ch192data = {
-(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
-(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0x0,
-};
-
-static final BitmapCharRec ch192 = new BitmapCharRec(12,18,0,0,12,ch192data);
-
-/* char: 0xbf */
-
-static final byte[] ch191data = {
-(byte) 0x7c,(byte) 0xfe,(byte) 0xc6,(byte) 0xc6,(byte) 0xe0,(byte) 0x70,(byte) 0x38,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x0,(byte) 0x0,(byte) 0x18,(byte) 0x18,
-};
-
-static final BitmapCharRec ch191 = new BitmapCharRec(7,14,-1,4,10,ch191data);
-
-/* char: 0xbe */
-
-static final byte[] ch190data = {
-(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xc,(byte) 0xfc,(byte) 0x6,(byte) 0xd8,(byte) 0x6,(byte) 0x78,(byte) 0x73,(byte) 0x38,(byte) 0xf9,(byte) 0x18,(byte) 0x99,(byte) 0x88,
-(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x98,(byte) 0x60,(byte) 0xf8,(byte) 0x30,(byte) 0x70,(byte) 0x30,
-};
-
-static final BitmapCharRec ch190 = new BitmapCharRec(14,13,0,0,15,ch190data);
-
-/* char: 0xbd */
-
-static final byte[] ch189data = {
-(byte) 0x30,(byte) 0xf8,(byte) 0x30,(byte) 0xf8,(byte) 0x18,(byte) 0x60,(byte) 0xc,(byte) 0x30,(byte) 0xc,(byte) 0x18,(byte) 0x66,(byte) 0x98,(byte) 0x62,(byte) 0xf8,(byte) 0x63,(byte) 0x70,
-(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xe0,(byte) 0xc0,(byte) 0xe0,(byte) 0x60,(byte) 0x60,(byte) 0x60,
-};
-
-static final BitmapCharRec ch189 = new BitmapCharRec(13,13,-1,0,15,ch189data);
-
-/* char: 0xbc */
-
-static final byte[] ch188data = {
-(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x19,(byte) 0xf8,(byte) 0xd,(byte) 0xb0,(byte) 0xc,(byte) 0xf0,(byte) 0x66,(byte) 0x70,(byte) 0x62,(byte) 0x30,(byte) 0x63,(byte) 0x10,
-(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xe0,(byte) 0xc0,(byte) 0xe0,(byte) 0x60,(byte) 0x60,(byte) 0x60,
-};
-
-static final BitmapCharRec ch188 = new BitmapCharRec(13,13,-1,0,15,ch188data);
-
-/* char: 0xbb */
-
-static final byte[] ch187data = {
-(byte) 0x90,(byte) 0xd8,(byte) 0x6c,(byte) 0x36,(byte) 0x36,(byte) 0x6c,(byte) 0xd8,(byte) 0x90,
-};
-
-static final BitmapCharRec ch187 = new BitmapCharRec(7,8,-1,-1,9,ch187data);
-
-/* char: 0xba */
-
-static final byte[] ch186data = {
-(byte) 0xf8,(byte) 0x0,(byte) 0x70,(byte) 0xd8,(byte) 0x88,(byte) 0x88,(byte) 0xd8,(byte) 0x70,
-};
-
-static final BitmapCharRec ch186 = new BitmapCharRec(5,8,-1,-6,7,ch186data);
-
-/* char: 0xb9 */
-
-static final byte[] ch185data = {
-(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xe0,(byte) 0xe0,(byte) 0x60,
-};
-
-static final BitmapCharRec ch185 = new BitmapCharRec(3,8,-1,-5,6,ch185data);
-
-/* char: 0xb8 */
-
-static final byte[] ch184data = {
-(byte) 0xf0,(byte) 0xd8,(byte) 0x18,(byte) 0x70,(byte) 0x60,
-};
-
-static final BitmapCharRec ch184 = new BitmapCharRec(5,5,0,4,5,ch184data);
-
-/* char: 0xb7 */
-
-static final byte[] ch183data = {
-(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch183 = new BitmapCharRec(2,2,-1,-4,4,ch183data);
-
-/* char: 0xb6 */
-
-static final byte[] ch182data = {
-(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x12,(byte) 0x32,(byte) 0x72,(byte) 0xf2,(byte) 0xf2,(byte) 0xf2,(byte) 0xf2,
-(byte) 0x72,(byte) 0x3f,
-};
-
-static final BitmapCharRec ch182 = new BitmapCharRec(8,18,-1,4,10,ch182data);
-
-/* char: 0xb5 */
-
-static final byte[] ch181data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xdb,(byte) 0xff,(byte) 0xe7,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,
-};
-
-static final BitmapCharRec ch181 = new BitmapCharRec(8,14,-1,4,10,ch181data);
-
-/* char: 0xb4 */
-
-static final byte[] ch180data = {
-(byte) 0xc0,(byte) 0x60,(byte) 0x30,
-};
-
-static final BitmapCharRec ch180 = new BitmapCharRec(4,3,0,-11,4,ch180data);
-
-/* char: 0xb3 */
-
-static final byte[] ch179data = {
-(byte) 0x70,(byte) 0xf8,(byte) 0x98,(byte) 0x30,(byte) 0x30,(byte) 0x98,(byte) 0xf8,(byte) 0x70,
-};
-
-static final BitmapCharRec ch179 = new BitmapCharRec(5,8,0,-5,6,ch179data);
-
-/* char: 0xb2 */
-
-static final byte[] ch178data = {
-(byte) 0xf8,(byte) 0xf8,(byte) 0x60,(byte) 0x30,(byte) 0x18,(byte) 0x98,(byte) 0xf8,(byte) 0x70,
-};
-
-static final BitmapCharRec ch178 = new BitmapCharRec(5,8,0,-5,6,ch178data);
-
-/* char: 0xb1 */
-
-static final byte[] ch177data = {
-(byte) 0xff,(byte) 0xff,(byte) 0x0,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xff,(byte) 0xff,(byte) 0x18,(byte) 0x18,(byte) 0x18,
-};
-
-static final BitmapCharRec ch177 = new BitmapCharRec(8,11,-1,0,10,ch177data);
-
-/* char: 0xb0 */
-
-static final byte[] ch176data = {
-(byte) 0x70,(byte) 0xd8,(byte) 0x88,(byte) 0xd8,(byte) 0x70,
-};
-
-static final BitmapCharRec ch176 = new BitmapCharRec(5,5,-1,-8,7,ch176data);
-
-/* char: 0xaf */
-
-static final byte[] ch175data = {
-(byte) 0xf8,
-};
-
-static final BitmapCharRec ch175 = new BitmapCharRec(5,1,0,-12,5,ch175data);
-
-/* char: 0xae */
-
-static final byte[] ch174data = {
-(byte) 0xf,(byte) 0x80,(byte) 0x30,(byte) 0x60,(byte) 0x40,(byte) 0x10,(byte) 0x48,(byte) 0x50,(byte) 0x88,(byte) 0x88,(byte) 0x89,(byte) 0x8,(byte) 0x8f,(byte) 0x88,(byte) 0x88,(byte) 0x48,
-(byte) 0x88,(byte) 0x48,(byte) 0x4f,(byte) 0x90,(byte) 0x40,(byte) 0x10,(byte) 0x30,(byte) 0x60,(byte) 0xf,(byte) 0x80,
-};
-
-static final BitmapCharRec ch174 = new BitmapCharRec(13,13,-1,0,14,ch174data);
-
-/* char: 0xad */
-
-static final byte[] ch173data = {
-(byte) 0xf8,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch173 = new BitmapCharRec(5,2,-1,-4,7,ch173data);
-
-/* char: 0xac */
-
-static final byte[] ch172data = {
-(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,
-};
-
-static final BitmapCharRec ch172 = new BitmapCharRec(9,5,-1,-3,11,ch172data);
-
-/* char: 0xab */
-
-static final byte[] ch171data = {
-(byte) 0x12,(byte) 0x36,(byte) 0x6c,(byte) 0xd8,(byte) 0xd8,(byte) 0x6c,(byte) 0x36,(byte) 0x12,
-};
-
-static final BitmapCharRec ch171 = new BitmapCharRec(7,8,-1,-1,9,ch171data);
-
-/* char: 0xaa */
-
-static final byte[] ch170data = {
-(byte) 0xf8,(byte) 0x0,(byte) 0x68,(byte) 0xd8,(byte) 0x48,(byte) 0x38,(byte) 0xc8,(byte) 0x70,
-};
-
-static final BitmapCharRec ch170 = new BitmapCharRec(5,8,-1,-6,7,ch170data);
-
-/* char: 0xa9 */
-
-static final byte[] ch169data = {
-(byte) 0xf,(byte) 0x80,(byte) 0x30,(byte) 0x60,(byte) 0x40,(byte) 0x10,(byte) 0x47,(byte) 0x10,(byte) 0x88,(byte) 0x88,(byte) 0x90,(byte) 0x8,(byte) 0x90,(byte) 0x8,(byte) 0x90,(byte) 0x8,
-(byte) 0x88,(byte) 0x88,(byte) 0x47,(byte) 0x10,(byte) 0x40,(byte) 0x10,(byte) 0x30,(byte) 0x60,(byte) 0xf,(byte) 0x80,
-};
-
-static final BitmapCharRec ch169 = new BitmapCharRec(13,13,-1,0,15,ch169data);
-
-/* char: 0xa8 */
-
-static final byte[] ch168data = {
-(byte) 0xd8,(byte) 0xd8,
-};
-
-static final BitmapCharRec ch168 = new BitmapCharRec(5,2,0,-11,6,ch168data);
-
-/* char: 0xa7 */
-
-static final byte[] ch167data = {
-(byte) 0x3c,(byte) 0x7e,(byte) 0xc3,(byte) 0xc3,(byte) 0x7,(byte) 0xe,(byte) 0x3e,(byte) 0x73,(byte) 0xe3,(byte) 0xc3,(byte) 0xc7,(byte) 0x6e,(byte) 0x7c,(byte) 0xf0,(byte) 0xc3,(byte) 0xc3,
-(byte) 0x7e,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch167 = new BitmapCharRec(8,18,-1,4,10,ch167data);
-
-/* char: 0xa6 */
-
-static final byte[] ch166data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,
-};
-
-static final BitmapCharRec ch166 = new BitmapCharRec(2,17,-1,3,4,ch166data);
-
-/* char: 0xa5 */
-
-static final byte[] ch165data = {
-(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xff,(byte) 0x18,(byte) 0xff,(byte) 0x3c,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,
-};
-
-static final BitmapCharRec ch165 = new BitmapCharRec(8,13,-1,0,10,ch165data);
-
-/* char: 0xa4 */
-
-static final byte[] ch164data = {
-(byte) 0xc3,(byte) 0xff,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0xff,(byte) 0xc3,
-};
-
-static final BitmapCharRec ch164 = new BitmapCharRec(8,7,-1,-3,10,ch164data);
-
-/* char: 0xa3 */
-
-static final byte[] ch163data = {
-(byte) 0xdf,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0x60,(byte) 0x80,(byte) 0x30,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x7e,(byte) 0x0,(byte) 0x30,(byte) 0x0,
-(byte) 0x60,(byte) 0x0,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x3f,(byte) 0x0,(byte) 0x1e,(byte) 0x0,
-};
-
-static final BitmapCharRec ch163 = new BitmapCharRec(9,13,0,0,10,ch163data);
-
-/* char: 0xa2 */
-
-static final byte[] ch162data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x3e,(byte) 0x7f,(byte) 0x6b,(byte) 0xc8,(byte) 0xc8,(byte) 0xc8,(byte) 0xc8,(byte) 0x6b,(byte) 0x7f,(byte) 0x3e,(byte) 0x4,(byte) 0x4,
-};
-
-static final BitmapCharRec ch162 = new BitmapCharRec(8,14,-1,2,10,ch162data);
-
-/* char: 0xa1 */
-
-static final byte[] ch161data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch161 = new BitmapCharRec(2,14,-2,4,6,ch161data);
-
-/* char: 0xa0 */
-
-static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,5,null);
-
-/* char: 0x7e '~' */
-
-static final byte[] ch126data = {
-(byte) 0xcc,(byte) 0x7e,(byte) 0x33,
-};
-
-static final BitmapCharRec ch126 = new BitmapCharRec(8,3,-1,-4,10,ch126data);
-
-/* char: 0x7d '}' */
-
-static final byte[] ch125data = {
-(byte) 0xc0,(byte) 0x60,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x18,(byte) 0xc,(byte) 0x18,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
-(byte) 0x60,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch125 = new BitmapCharRec(6,18,0,4,6,ch125data);
-
-/* char: 0x7c '|' */
-
-static final byte[] ch124data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch124 = new BitmapCharRec(2,18,-1,4,4,ch124data);
-
-/* char: 0x7b '{' */
-
-static final byte[] ch123data = {
-(byte) 0xc,(byte) 0x18,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
-(byte) 0x18,(byte) 0xc,
-};
-
-static final BitmapCharRec ch123 = new BitmapCharRec(6,18,0,4,6,ch123data);
-
-/* char: 0x7a 'z' */
-
-static final byte[] ch122data = {
-(byte) 0xfe,(byte) 0xfe,(byte) 0xc0,(byte) 0x60,(byte) 0x30,(byte) 0x18,(byte) 0xc,(byte) 0x6,(byte) 0xfe,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch122 = new BitmapCharRec(7,10,-1,0,9,ch122data);
-
-/* char: 0x79 'y' */
-
-static final byte[] ch121data = {
-(byte) 0x70,(byte) 0x70,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x3c,(byte) 0x24,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,
-};
-
-static final BitmapCharRec ch121 = new BitmapCharRec(8,14,-1,4,10,ch121data);
-
-/* char: 0x78 'x' */
-
-static final byte[] ch120data = {
-(byte) 0xc3,(byte) 0xe7,(byte) 0x66,(byte) 0x3c,(byte) 0x18,(byte) 0x18,(byte) 0x3c,(byte) 0x66,(byte) 0xe7,(byte) 0xc3,
-};
-
-static final BitmapCharRec ch120 = new BitmapCharRec(8,10,-1,0,10,ch120data);
-
-/* char: 0x77 'w' */
-
-static final byte[] ch119data = {
-(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0x39,(byte) 0xc0,(byte) 0x29,(byte) 0x40,(byte) 0x69,(byte) 0x60,(byte) 0x66,(byte) 0x60,(byte) 0x66,(byte) 0x60,(byte) 0xc6,(byte) 0x30,
-(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,
-};
-
-static final BitmapCharRec ch119 = new BitmapCharRec(12,10,-1,0,14,ch119data);
-
-/* char: 0x76 'v' */
-
-static final byte[] ch118data = {
-(byte) 0x18,(byte) 0x18,(byte) 0x3c,(byte) 0x24,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,
-};
-
-static final BitmapCharRec ch118 = new BitmapCharRec(8,10,-1,0,10,ch118data);
-
-/* char: 0x75 'u' */
-
-static final byte[] ch117data = {
-(byte) 0x73,(byte) 0xfb,(byte) 0xc7,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,
-};
-
-static final BitmapCharRec ch117 = new BitmapCharRec(8,10,-1,0,10,ch117data);
-
-/* char: 0x74 't' */
-
-static final byte[] ch116data = {
-(byte) 0x18,(byte) 0x38,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0xfc,(byte) 0xfc,(byte) 0x30,(byte) 0x30,(byte) 0x30,
-};
-
-static final BitmapCharRec ch116 = new BitmapCharRec(6,13,0,0,6,ch116data);
-
-/* char: 0x73 's' */
-
-static final byte[] ch115data = {
-(byte) 0x78,(byte) 0xfc,(byte) 0xc6,(byte) 0x6,(byte) 0x3e,(byte) 0xfc,(byte) 0xc0,(byte) 0xc6,(byte) 0x7e,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch115 = new BitmapCharRec(7,10,-1,0,9,ch115data);
-
-/* char: 0x72 'r' */
-
-static final byte[] ch114data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xe0,(byte) 0xd8,(byte) 0xd8,
-};
-
-static final BitmapCharRec ch114 = new BitmapCharRec(5,10,-1,0,6,ch114data);
-
-/* char: 0x71 'q' */
-
-static final byte[] ch113data = {
-(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x3d,(byte) 0x80,(byte) 0x7f,(byte) 0x80,(byte) 0x63,(byte) 0x80,(byte) 0xc1,(byte) 0x80,
-(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x80,(byte) 0x7f,(byte) 0x80,(byte) 0x3d,(byte) 0x80,
-};
-
-static final BitmapCharRec ch113 = new BitmapCharRec(9,14,-1,4,11,ch113data);
-
-/* char: 0x70 'p' */
-
-static final byte[] ch112data = {
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xde,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xe3,(byte) 0x0,(byte) 0xc1,(byte) 0x80,
-(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xe3,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xde,(byte) 0x0,
-};
-
-static final BitmapCharRec ch112 = new BitmapCharRec(9,14,-1,4,11,ch112data);
-
-/* char: 0x6f 'o' */
-
-static final byte[] ch111data = {
-(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x0,
-(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,
-};
-
-static final BitmapCharRec ch111 = new BitmapCharRec(9,10,-1,0,11,ch111data);
-
-/* char: 0x6e 'n' */
-
-static final byte[] ch110data = {
-(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xe3,(byte) 0xdf,(byte) 0xce,
-};
-
-static final BitmapCharRec ch110 = new BitmapCharRec(8,10,-1,0,10,ch110data);
-
-/* char: 0x6d 'm' */
-
-static final byte[] ch109data = {
-(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,(byte) 0xc6,(byte) 0x30,(byte) 0xe7,(byte) 0x30,
-(byte) 0xde,(byte) 0xf0,(byte) 0xcc,(byte) 0x60,
-};
-
-static final BitmapCharRec ch109 = new BitmapCharRec(12,10,-1,0,14,ch109data);
-
-/* char: 0x6c 'l' */
-
-static final byte[] ch108data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch108 = new BitmapCharRec(2,14,-1,0,4,ch108data);
-
-/* char: 0x6b 'k' */
-
-static final byte[] ch107data = {
-(byte) 0xc7,(byte) 0xc6,(byte) 0xce,(byte) 0xcc,(byte) 0xd8,(byte) 0xf8,(byte) 0xf0,(byte) 0xd8,(byte) 0xcc,(byte) 0xc6,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch107 = new BitmapCharRec(8,14,-1,0,9,ch107data);
-
-/* char: 0x6a 'j' */
-
-static final byte[] ch106data = {
-(byte) 0xe0,(byte) 0xf0,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0x0,
-(byte) 0x30,(byte) 0x30,
-};
-
-static final BitmapCharRec ch106 = new BitmapCharRec(4,18,1,4,4,ch106data);
-
-/* char: 0x69 'i' */
-
-static final byte[] ch105data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch105 = new BitmapCharRec(2,14,-1,0,4,ch105data);
-
-/* char: 0x68 'h' */
-
-static final byte[] ch104data = {
-(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xe3,(byte) 0xdf,(byte) 0xce,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch104 = new BitmapCharRec(8,14,-1,0,10,ch104data);
-
-/* char: 0x67 'g' */
-
-static final byte[] ch103data = {
-(byte) 0x1c,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x3d,(byte) 0x80,(byte) 0x7f,(byte) 0x80,(byte) 0x63,(byte) 0x80,(byte) 0xc1,(byte) 0x80,
-(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x7f,(byte) 0x80,(byte) 0x3d,(byte) 0x80,
-};
-
-static final BitmapCharRec ch103 = new BitmapCharRec(9,14,-1,4,11,ch103data);
-
-/* char: 0x66 'f' */
-
-static final byte[] ch102data = {
-(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0xfc,(byte) 0xfc,(byte) 0x30,(byte) 0x30,(byte) 0x3c,(byte) 0x1c,
-};
-
-static final BitmapCharRec ch102 = new BitmapCharRec(6,14,0,0,6,ch102data);
-
-/* char: 0x65 'e' */
-
-static final byte[] ch101data = {
-(byte) 0x3c,(byte) 0x7f,(byte) 0xe3,(byte) 0xc0,(byte) 0xc0,(byte) 0xff,(byte) 0xc3,(byte) 0xc3,(byte) 0x7e,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch101 = new BitmapCharRec(8,10,-1,0,10,ch101data);
-
-/* char: 0x64 'd' */
-
-static final byte[] ch100data = {
-(byte) 0x3d,(byte) 0x80,(byte) 0x7f,(byte) 0x80,(byte) 0x63,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x63,(byte) 0x80,
-(byte) 0x7f,(byte) 0x80,(byte) 0x3d,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,
-};
-
-static final BitmapCharRec ch100 = new BitmapCharRec(9,14,-1,0,11,ch100data);
-
-/* char: 0x63 'c' */
-
-static final byte[] ch99data = {
-(byte) 0x3e,(byte) 0x7f,(byte) 0x63,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x63,(byte) 0x7f,(byte) 0x3e,
-};
-
-static final BitmapCharRec ch99 = new BitmapCharRec(8,10,-1,0,10,ch99data);
-
-/* char: 0x62 'b' */
-
-static final byte[] ch98data = {
-(byte) 0xde,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xe3,(byte) 0x0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xe3,(byte) 0x0,
-(byte) 0xff,(byte) 0x0,(byte) 0xde,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch98 = new BitmapCharRec(9,14,-1,0,11,ch98data);
-
-/* char: 0x61 'a' */
-
-static final byte[] ch97data = {
-(byte) 0x76,(byte) 0xee,(byte) 0xc6,(byte) 0xc6,(byte) 0xe6,(byte) 0x7e,(byte) 0xe,(byte) 0xc6,(byte) 0xee,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch97 = new BitmapCharRec(7,10,-1,0,9,ch97data);
-
-/* char: 0x60 '`' */
-
-static final byte[] ch96data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0x80,(byte) 0x80,(byte) 0x40,
-};
-
-static final BitmapCharRec ch96 = new BitmapCharRec(2,5,-1,-9,4,ch96data);
-
-/* char: 0x5f '_' */
-
-static final byte[] ch95data = {
-(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch95 = new BitmapCharRec(10,2,0,4,10,ch95data);
-
-/* char: 0x5e '^' */
-
-static final byte[] ch94data = {
-(byte) 0x82,(byte) 0xc6,(byte) 0x6c,(byte) 0x38,(byte) 0x10,
-};
-
-static final BitmapCharRec ch94 = new BitmapCharRec(7,5,-1,-8,9,ch94data);
-
-/* char: 0x5d ']' */
-
-static final byte[] ch93data = {
-(byte) 0xf0,(byte) 0xf0,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
-(byte) 0xf0,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch93 = new BitmapCharRec(4,18,0,4,5,ch93data);
-
-/* char: 0x5c '\' */
-
-static final byte[] ch92data = {
-(byte) 0x18,(byte) 0x18,(byte) 0x10,(byte) 0x10,(byte) 0x30,(byte) 0x30,(byte) 0x20,(byte) 0x20,(byte) 0x60,(byte) 0x60,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch92 = new BitmapCharRec(5,14,0,0,5,ch92data);
-
-/* char: 0x5b '[' */
-
-static final byte[] ch91data = {
-(byte) 0xf0,(byte) 0xf0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xf0,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch91 = new BitmapCharRec(4,18,-1,4,5,ch91data);
-
-/* char: 0x5a 'Z' */
-
-static final byte[] ch90data = {
-(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0xc,(byte) 0x0,
-(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x0,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch90 = new BitmapCharRec(10,14,-1,0,12,ch90data);
-
-/* char: 0x59 'Y' */
-
-static final byte[] ch89data = {
-(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x19,(byte) 0x80,
-(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,
-};
-
-static final BitmapCharRec ch89 = new BitmapCharRec(12,14,-1,0,14,ch89data);
-
-/* char: 0x58 'X' */
-
-static final byte[] ch88data = {
-(byte) 0xc0,(byte) 0x60,(byte) 0xe0,(byte) 0xe0,(byte) 0x60,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x31,(byte) 0x80,(byte) 0x1b,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xe,(byte) 0x0,
-(byte) 0x1b,(byte) 0x0,(byte) 0x31,(byte) 0x80,(byte) 0x71,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe0,(byte) 0xe0,(byte) 0xc0,(byte) 0x60,
-};
-
-static final BitmapCharRec ch88 = new BitmapCharRec(11,14,-1,0,13,ch88data);
-
-/* char: 0x57 'W' */
-
-static final byte[] ch87data = {
-(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x1c,(byte) 0x38,(byte) 0x34,(byte) 0x2c,(byte) 0x36,(byte) 0x6c,(byte) 0x36,(byte) 0x6c,(byte) 0x66,(byte) 0x66,(byte) 0x66,(byte) 0x66,
-(byte) 0x62,(byte) 0x46,(byte) 0x63,(byte) 0xc6,(byte) 0xc3,(byte) 0xc3,(byte) 0xc1,(byte) 0x83,(byte) 0xc1,(byte) 0x83,(byte) 0xc1,(byte) 0x83,
-};
-
-static final BitmapCharRec ch87 = new BitmapCharRec(16,14,-1,0,18,ch87data);
-
-/* char: 0x56 'V' */
-
-static final byte[] ch86data = {
-(byte) 0x6,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
-(byte) 0x30,(byte) 0xc0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,
-};
-
-static final BitmapCharRec ch86 = new BitmapCharRec(12,14,-1,0,14,ch86data);
-
-/* char: 0x55 'U' */
-
-static final byte[] ch85data = {
-(byte) 0x1f,(byte) 0x0,(byte) 0x7f,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
-(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
-};
-
-static final BitmapCharRec ch85 = new BitmapCharRec(11,14,-1,0,13,ch85data);
-
-/* char: 0x54 'T' */
-
-static final byte[] ch84data = {
-(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,
-(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch84 = new BitmapCharRec(10,14,-1,0,12,ch84data);
-
-/* char: 0x53 'S' */
-
-static final byte[] ch83data = {
-(byte) 0x3f,(byte) 0x0,(byte) 0x7f,(byte) 0xc0,(byte) 0xe0,(byte) 0xe0,(byte) 0xc0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0xe0,(byte) 0x3,(byte) 0xc0,(byte) 0x1f,(byte) 0x0,
-(byte) 0x7c,(byte) 0x0,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x60,(byte) 0xe0,(byte) 0xe0,(byte) 0x7f,(byte) 0xc0,(byte) 0x1f,(byte) 0x0,
-};
-
-static final BitmapCharRec ch83 = new BitmapCharRec(11,14,-1,0,13,ch83data);
-
-/* char: 0x52 'R' */
-
-static final byte[] ch82data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x80,
-(byte) 0xc1,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0xc0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x0,
-};
-
-static final BitmapCharRec ch82 = new BitmapCharRec(10,14,-1,0,12,ch82data);
-
-/* char: 0x51 'Q' */
-
-static final byte[] ch81data = {
-(byte) 0x0,(byte) 0x30,(byte) 0xf,(byte) 0xb0,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0xf0,(byte) 0x61,(byte) 0xb0,(byte) 0xe1,(byte) 0xb8,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
-(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,
-};
-
-static final BitmapCharRec ch81 = new BitmapCharRec(13,15,-1,1,15,ch81data);
-
-/* char: 0x50 'P' */
-
-static final byte[] ch80data = {
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x80,
-(byte) 0xc1,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0xc0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x0,
-};
-
-static final BitmapCharRec ch80 = new BitmapCharRec(10,14,-1,0,12,ch80data);
-
-/* char: 0x4f 'O' */
-
-static final byte[] ch79data = {
-(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x38,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0xc0,(byte) 0x18,
-(byte) 0xc0,(byte) 0x18,(byte) 0xe0,(byte) 0x38,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,
-};
-
-static final BitmapCharRec ch79 = new BitmapCharRec(13,14,-1,0,15,ch79data);
-
-/* char: 0x4e 'N' */
-
-static final byte[] ch78data = {
-(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe0,(byte) 0xc1,(byte) 0xe0,(byte) 0xc1,(byte) 0xe0,(byte) 0xc3,(byte) 0x60,(byte) 0xc6,(byte) 0x60,(byte) 0xc6,(byte) 0x60,(byte) 0xcc,(byte) 0x60,
-(byte) 0xcc,(byte) 0x60,(byte) 0xd8,(byte) 0x60,(byte) 0xf0,(byte) 0x60,(byte) 0xf0,(byte) 0x60,(byte) 0xe0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
-};
-
-static final BitmapCharRec ch78 = new BitmapCharRec(11,14,-1,0,13,ch78data);
-
-/* char: 0x4d 'M' */
-
-static final byte[] ch77data = {
-(byte) 0xc3,(byte) 0xc,(byte) 0xc3,(byte) 0xc,(byte) 0xc7,(byte) 0x8c,(byte) 0xc4,(byte) 0x8c,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0xd8,(byte) 0x6c,(byte) 0xd8,(byte) 0x6c,
-(byte) 0xf0,(byte) 0x3c,(byte) 0xf0,(byte) 0x3c,(byte) 0xe0,(byte) 0x1c,(byte) 0xe0,(byte) 0x1c,(byte) 0xc0,(byte) 0xc,(byte) 0xc0,(byte) 0xc,
-};
-
-static final BitmapCharRec ch77 = new BitmapCharRec(14,14,-1,0,16,ch77data);
-
-/* char: 0x4c 'L' */
-
-static final byte[] ch76data = {
-(byte) 0xff,(byte) 0xff,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch76 = new BitmapCharRec(8,14,-1,0,10,ch76data);
-
-/* char: 0x4b 'K' */
-
-static final byte[] ch75data = {
-(byte) 0xc0,(byte) 0x70,(byte) 0xc0,(byte) 0xe0,(byte) 0xc1,(byte) 0xc0,(byte) 0xc3,(byte) 0x80,(byte) 0xc7,(byte) 0x0,(byte) 0xce,(byte) 0x0,(byte) 0xfc,(byte) 0x0,(byte) 0xf8,(byte) 0x0,
-(byte) 0xdc,(byte) 0x0,(byte) 0xce,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x80,(byte) 0xc1,(byte) 0xc0,(byte) 0xc0,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch75 = new BitmapCharRec(12,14,-1,0,13,ch75data);
-
-/* char: 0x4a 'J' */
-
-static final byte[] ch74data = {
-(byte) 0x3c,(byte) 0x7e,(byte) 0xe7,(byte) 0xc3,(byte) 0xc3,(byte) 0x3,(byte) 0x3,(byte) 0x3,(byte) 0x3,(byte) 0x3,(byte) 0x3,(byte) 0x3,(byte) 0x3,(byte) 0x3,
-};
-
-static final BitmapCharRec ch74 = new BitmapCharRec(8,14,-1,0,10,ch74data);
-
-/* char: 0x49 'I' */
-
-static final byte[] ch73data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch73 = new BitmapCharRec(2,14,-2,0,6,ch73data);
-
-/* char: 0x48 'H' */
-
-static final byte[] ch72data = {
-(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xff,(byte) 0xe0,(byte) 0xff,(byte) 0xe0,
-(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
-};
-
-static final BitmapCharRec ch72 = new BitmapCharRec(11,14,-1,0,13,ch72data);
-
-/* char: 0x47 'G' */
-
-static final byte[] ch71data = {
-(byte) 0xf,(byte) 0xb0,(byte) 0x3f,(byte) 0xf0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x30,(byte) 0xc1,(byte) 0xf0,(byte) 0xc1,(byte) 0xf0,(byte) 0xc0,(byte) 0x0,
-(byte) 0xc0,(byte) 0x0,(byte) 0xe0,(byte) 0x30,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,
-};
-
-static final BitmapCharRec ch71 = new BitmapCharRec(12,14,-1,0,14,ch71data);
-
-/* char: 0x46 'F' */
-
-static final byte[] ch70data = {
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x0,
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,
-};
-
-static final BitmapCharRec ch70 = new BitmapCharRec(9,14,-1,0,11,ch70data);
-
-/* char: 0x45 'E' */
-
-static final byte[] ch69data = {
-(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x0,
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,
-};
-
-static final BitmapCharRec ch69 = new BitmapCharRec(9,14,-1,0,11,ch69data);
-
-/* char: 0x44 'D' */
-
-static final byte[] ch68data = {
-(byte) 0xff,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xc1,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,
-(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0xc0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x0,
-};
-
-static final BitmapCharRec ch68 = new BitmapCharRec(11,14,-1,0,13,ch68data);
-
-/* char: 0x43 'C' */
-
-static final byte[] ch67data = {
-(byte) 0xf,(byte) 0x80,(byte) 0x3f,(byte) 0xe0,(byte) 0x70,(byte) 0x70,(byte) 0x60,(byte) 0x30,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
-(byte) 0xc0,(byte) 0x0,(byte) 0xe0,(byte) 0x0,(byte) 0x60,(byte) 0x30,(byte) 0x70,(byte) 0x70,(byte) 0x3f,(byte) 0xe0,(byte) 0xf,(byte) 0x80,
-};
-
-static final BitmapCharRec ch67 = new BitmapCharRec(12,14,-1,0,14,ch67data);
-
-/* char: 0x42 'B' */
-
-static final byte[] ch66data = {
-(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0xc0,(byte) 0xc0,(byte) 0xe0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe0,(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0x80,
-(byte) 0xc1,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0xc0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x0,
-};
-
-static final BitmapCharRec ch66 = new BitmapCharRec(11,14,-1,0,13,ch66data);
-
-/* char: 0x41 'A' */
-
-static final byte[] ch65data = {
-(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x7f,(byte) 0xe0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0xc0,
-(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0xf,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-};
-
-static final BitmapCharRec ch65 = new BitmapCharRec(12,14,0,0,12,ch65data);
-
-/* char: 0x40 '@' */
-
-static final byte[] ch64data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1f,(byte) 0xf0,(byte) 0x38,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x67,(byte) 0x70,(byte) 0xcf,(byte) 0xf8,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0x66,
-(byte) 0xcc,(byte) 0x66,(byte) 0xcc,(byte) 0x63,(byte) 0xc6,(byte) 0x33,(byte) 0x67,(byte) 0x73,(byte) 0x63,(byte) 0xb3,(byte) 0x30,(byte) 0x6,(byte) 0x1c,(byte) 0xe,(byte) 0xf,(byte) 0xfc,
-(byte) 0x3,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch64 = new BitmapCharRec(16,17,-1,3,18,ch64data);
-
-/* char: 0x3f '?' */
-
-static final byte[] ch63data = {
-(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x38,(byte) 0x1c,(byte) 0xe,(byte) 0xc6,(byte) 0xc6,(byte) 0xfe,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch63 = new BitmapCharRec(7,14,-1,0,10,ch63data);
-
-/* char: 0x3e '>' */
-
-static final byte[] ch62data = {
-(byte) 0xc0,(byte) 0xf0,(byte) 0x3c,(byte) 0xe,(byte) 0x3,(byte) 0xe,(byte) 0x3c,(byte) 0xf0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch62 = new BitmapCharRec(8,9,-1,0,10,ch62data);
-
-/* char: 0x3d '=' */
-
-static final byte[] ch61data = {
-(byte) 0xfe,(byte) 0xfe,(byte) 0x0,(byte) 0x0,(byte) 0xfe,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch61 = new BitmapCharRec(7,6,-2,-2,11,ch61data);
-
-/* char: 0x3c '<' */
-
-static final byte[] ch60data = {
-(byte) 0x3,(byte) 0xf,(byte) 0x3c,(byte) 0x70,(byte) 0xc0,(byte) 0x70,(byte) 0x3c,(byte) 0xf,(byte) 0x3,
-};
-
-static final BitmapCharRec ch60 = new BitmapCharRec(8,9,-1,0,10,ch60data);
-
-/* char: 0x3b ';' */
-
-static final byte[] ch59data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch59 = new BitmapCharRec(2,13,-1,3,5,ch59data);
-
-/* char: 0x3a ':' */
-
-static final byte[] ch58data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch58 = new BitmapCharRec(2,10,-1,0,5,ch58data);
-
-/* char: 0x39 '9' */
-
-static final byte[] ch57data = {
-(byte) 0x7c,(byte) 0xfe,(byte) 0xc6,(byte) 0x3,(byte) 0x3,(byte) 0x3b,(byte) 0x7f,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc7,(byte) 0x7e,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch57 = new BitmapCharRec(8,13,-1,0,10,ch57data);
-
-/* char: 0x38 '8' */
-
-static final byte[] ch56data = {
-(byte) 0x3c,(byte) 0x7e,(byte) 0xe7,(byte) 0xc3,(byte) 0xc3,(byte) 0x66,(byte) 0x7e,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,(byte) 0xe7,(byte) 0x7e,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch56 = new BitmapCharRec(8,13,-1,0,10,ch56data);
-
-/* char: 0x37 '7' */
-
-static final byte[] ch55data = {
-(byte) 0x60,(byte) 0x60,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x18,(byte) 0x18,(byte) 0xc,(byte) 0xc,(byte) 0x6,(byte) 0x3,(byte) 0xff,(byte) 0xff,
-};
-
-static final BitmapCharRec ch55 = new BitmapCharRec(8,13,-1,0,10,ch55data);
-
-/* char: 0x36 '6' */
-
-static final byte[] ch54data = {
-(byte) 0x3c,(byte) 0x7e,(byte) 0xe3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xfe,(byte) 0xdc,(byte) 0xc0,(byte) 0xc0,(byte) 0x63,(byte) 0x7f,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch54 = new BitmapCharRec(8,13,-1,0,10,ch54data);
-
-/* char: 0x35 '5' */
-
-static final byte[] ch53data = {
-(byte) 0x7c,(byte) 0xfe,(byte) 0xc7,(byte) 0xc3,(byte) 0x3,(byte) 0x3,(byte) 0xc7,(byte) 0xfe,(byte) 0xfc,(byte) 0xc0,(byte) 0xc0,(byte) 0xfe,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch53 = new BitmapCharRec(8,13,-1,0,10,ch53data);
-
-/* char: 0x34 '4' */
-
-static final byte[] ch52data = {
-(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x33,(byte) 0x0,
-(byte) 0x33,(byte) 0x0,(byte) 0x1b,(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x7,(byte) 0x0,(byte) 0x3,(byte) 0x0,
-};
-
-static final BitmapCharRec ch52 = new BitmapCharRec(9,13,-1,0,10,ch52data);
-
-/* char: 0x33 '3' */
-
-static final byte[] ch51data = {
-(byte) 0x3c,(byte) 0x7e,(byte) 0xc7,(byte) 0xc3,(byte) 0x3,(byte) 0x7,(byte) 0x1e,(byte) 0x1c,(byte) 0x6,(byte) 0xc3,(byte) 0xc3,(byte) 0x7e,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch51 = new BitmapCharRec(8,13,-1,0,10,ch51data);
-
-/* char: 0x32 '2' */
-
-static final byte[] ch50data = {
-(byte) 0xff,(byte) 0xff,(byte) 0xc0,(byte) 0xe0,(byte) 0x70,(byte) 0x38,(byte) 0x1c,(byte) 0xe,(byte) 0x7,(byte) 0x3,(byte) 0xc3,(byte) 0xfe,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch50 = new BitmapCharRec(8,13,-1,0,10,ch50data);
-
-/* char: 0x31 '1' */
-
-static final byte[] ch49data = {
-(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xf8,(byte) 0xf8,(byte) 0x18,
-};
-
-static final BitmapCharRec ch49 = new BitmapCharRec(5,13,-2,0,10,ch49data);
-
-/* char: 0x30 '0' */
-
-static final byte[] ch48data = {
-(byte) 0x3c,(byte) 0x7e,(byte) 0x66,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0xc3,(byte) 0x66,(byte) 0x7e,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch48 = new BitmapCharRec(8,13,-1,0,10,ch48data);
-
-/* char: 0x2f '/' */
-
-static final byte[] ch47data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0x40,(byte) 0x40,(byte) 0x60,(byte) 0x60,(byte) 0x20,(byte) 0x20,(byte) 0x30,(byte) 0x30,(byte) 0x10,(byte) 0x10,(byte) 0x18,(byte) 0x18,
-};
-
-static final BitmapCharRec ch47 = new BitmapCharRec(5,14,0,0,5,ch47data);
-
-/* char: 0x2e '.' */
-
-static final byte[] ch46data = {
-(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch46 = new BitmapCharRec(2,2,-1,0,5,ch46data);
-
-/* char: 0x2d '-' */
-
-static final byte[] ch45data = {
-(byte) 0xff,(byte) 0xff,
-};
-
-static final BitmapCharRec ch45 = new BitmapCharRec(8,2,-1,-4,11,ch45data);
-
-/* char: 0x2c ',' */
-
-static final byte[] ch44data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch44 = new BitmapCharRec(2,5,-1,3,5,ch44data);
-
-/* char: 0x2b '+' */
-
-static final byte[] ch43data = {
-(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xff,(byte) 0xff,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,
-};
-
-static final BitmapCharRec ch43 = new BitmapCharRec(8,10,-1,0,10,ch43data);
-
-/* char: 0x2a '*' */
-
-static final byte[] ch42data = {
-(byte) 0x88,(byte) 0x70,(byte) 0x70,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch42 = new BitmapCharRec(5,6,-1,-8,7,ch42data);
-
-/* char: 0x29 ')' */
-
-static final byte[] ch41data = {
-(byte) 0x80,(byte) 0xc0,(byte) 0x60,(byte) 0x60,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x60,(byte) 0x60,
-(byte) 0xc0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch41 = new BitmapCharRec(4,18,-1,4,6,ch41data);
-
-/* char: 0x28 '(' */
-
-static final byte[] ch40data = {
-(byte) 0x10,(byte) 0x30,(byte) 0x60,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0x60,
-(byte) 0x30,(byte) 0x10,
-};
-
-static final BitmapCharRec ch40 = new BitmapCharRec(4,18,-1,4,6,ch40data);
-
-/* char: 0x27 ''' */
-
-static final byte[] ch39data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch39 = new BitmapCharRec(2,5,-1,-9,4,ch39data);
-
-/* char: 0x26 '&' */
-
-static final byte[] ch38data = {
-(byte) 0x3c,(byte) 0x70,(byte) 0x7e,(byte) 0xe0,(byte) 0xe7,(byte) 0xc0,(byte) 0xc3,(byte) 0x80,(byte) 0xc3,(byte) 0xc0,(byte) 0xc6,(byte) 0xc0,(byte) 0xee,(byte) 0xc0,(byte) 0x7c,(byte) 0x0,
-(byte) 0x3c,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x7e,(byte) 0x0,(byte) 0x3c,(byte) 0x0,
-};
-
-static final BitmapCharRec ch38 = new BitmapCharRec(12,13,-1,0,13,ch38data);
-
-/* char: 0x25 '%' */
-
-static final byte[] ch37data = {
-(byte) 0x18,(byte) 0x78,(byte) 0x18,(byte) 0xfc,(byte) 0xc,(byte) 0xcc,(byte) 0xc,(byte) 0xcc,(byte) 0x6,(byte) 0xfc,(byte) 0x6,(byte) 0x78,(byte) 0x3,(byte) 0x0,(byte) 0x7b,(byte) 0x0,
-(byte) 0xfd,(byte) 0x80,(byte) 0xcd,(byte) 0x80,(byte) 0xcc,(byte) 0xc0,(byte) 0xfc,(byte) 0xc0,(byte) 0x78,(byte) 0x60,
-};
-
-static final BitmapCharRec ch37 = new BitmapCharRec(14,13,-1,0,16,ch37data);
-
-/* char: 0x24 '$' */
-
-static final byte[] ch36data = {
-(byte) 0x8,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0xeb,(byte) 0x80,(byte) 0xc9,(byte) 0x80,(byte) 0x9,(byte) 0x80,(byte) 0xf,(byte) 0x0,
-(byte) 0x3e,(byte) 0x0,(byte) 0x78,(byte) 0x0,(byte) 0xe8,(byte) 0x0,(byte) 0xc8,(byte) 0x0,(byte) 0xcb,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x8,(byte) 0x0,
-};
-
-static final BitmapCharRec ch36 = new BitmapCharRec(9,16,-1,2,10,ch36data);
-
-/* char: 0x23 '#' */
-
-static final byte[] ch35data = {
-(byte) 0x24,(byte) 0x0,(byte) 0x24,(byte) 0x0,(byte) 0x24,(byte) 0x0,(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0x80,(byte) 0x12,(byte) 0x0,(byte) 0x12,(byte) 0x0,(byte) 0x12,(byte) 0x0,
-(byte) 0x7f,(byte) 0xc0,(byte) 0x7f,(byte) 0xc0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,
-};
-
-static final BitmapCharRec ch35 = new BitmapCharRec(10,13,0,0,10,ch35data);
-
-/* char: 0x22 '"' */
-
-static final byte[] ch34data = {
-(byte) 0x90,(byte) 0x90,(byte) 0xd8,(byte) 0xd8,(byte) 0xd8,
-};
-
-static final BitmapCharRec ch34 = new BitmapCharRec(5,5,0,-9,5,ch34data);
-
-/* char: 0x21 '!' */
-
-static final byte[] ch33data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch33 = new BitmapCharRec(2,14,-2,0,6,ch33data);
-
-/* char: 0x20 ' ' */
-
-static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,5,null);
-
-static final BitmapCharRec[] chars = {
-ch32,
-ch33,
-ch34,
-ch35,
-ch36,
-ch37,
-ch38,
-ch39,
-ch40,
-ch41,
-ch42,
-ch43,
-ch44,
-ch45,
-ch46,
-ch47,
-ch48,
-ch49,
-ch50,
-ch51,
-ch52,
-ch53,
-ch54,
-ch55,
-ch56,
-ch57,
-ch58,
-ch59,
-ch60,
-ch61,
-ch62,
-ch63,
-ch64,
-ch65,
-ch66,
-ch67,
-ch68,
-ch69,
-ch70,
-ch71,
-ch72,
-ch73,
-ch74,
-ch75,
-ch76,
-ch77,
-ch78,
-ch79,
-ch80,
-ch81,
-ch82,
-ch83,
-ch84,
-ch85,
-ch86,
-ch87,
-ch88,
-ch89,
-ch90,
-ch91,
-ch92,
-ch93,
-ch94,
-ch95,
-ch96,
-ch97,
-ch98,
-ch99,
-ch100,
-ch101,
-ch102,
-ch103,
-ch104,
-ch105,
-ch106,
-ch107,
-ch108,
-ch109,
-ch110,
-ch111,
-ch112,
-ch113,
-ch114,
-ch115,
-ch116,
-ch117,
-ch118,
-ch119,
-ch120,
-ch121,
-ch122,
-ch123,
-ch124,
-ch125,
-ch126,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-ch160,
-ch161,
-ch162,
-ch163,
-ch164,
-ch165,
-ch166,
-ch167,
-ch168,
-ch169,
-ch170,
-ch171,
-ch172,
-ch173,
-ch174,
-ch175,
-ch176,
-ch177,
-ch178,
-ch179,
-ch180,
-ch181,
-ch182,
-ch183,
-ch184,
-ch185,
-ch186,
-ch187,
-ch188,
-ch189,
-ch190,
-ch191,
-ch192,
-ch193,
-ch194,
-ch195,
-ch196,
-ch197,
-ch198,
-ch199,
-ch200,
-ch201,
-ch202,
-ch203,
-ch204,
-ch205,
-ch206,
-ch207,
-ch208,
-ch209,
-ch210,
-ch211,
-ch212,
-ch213,
-ch214,
-ch215,
-ch216,
-ch217,
-ch218,
-ch219,
-ch220,
-ch221,
-ch222,
-ch223,
-ch224,
-ch225,
-ch226,
-ch227,
-ch228,
-ch229,
-ch230,
-ch231,
-ch232,
-ch233,
-ch234,
-ch235,
-ch236,
-ch237,
-ch238,
-ch239,
-ch240,
-ch241,
-ch242,
-ch243,
-ch244,
-ch245,
-ch246,
-ch247,
-ch248,
-ch249,
-ch250,
-ch251,
-ch252,
-ch253,
-ch254,
-ch255,
-};
-
-  public static final BitmapFontRec glutBitmapHelvetica18 = new BitmapFontRec("-adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1",
-                                                                       224,
-                                                                       32,
-                                                                       chars);
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman10.java b/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman10.java
deleted file mode 100644
index 32699863f..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman10.java
+++ /dev/null
@@ -1,1797 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-class GLUTBitmapTimesRoman10 {
-
-/* GENERATED FILE -- DO NOT MODIFY */
-
-/* char: 0xff */
-
-static final byte[] ch255data = {
-(byte) 0x80,(byte) 0xc0,(byte) 0x40,(byte) 0x60,(byte) 0xa0,(byte) 0x90,(byte) 0xb8,(byte) 0x0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch255 = new BitmapCharRec(5,9,0,2,5,ch255data);
-
-/* char: 0xfe */
-
-static final byte[] ch254data = {
-(byte) 0xc0,(byte) 0x80,(byte) 0xe0,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch254 = new BitmapCharRec(4,9,0,2,5,ch254data);
-
-/* char: 0xfd */
-
-static final byte[] ch253data = {
-(byte) 0x80,(byte) 0xc0,(byte) 0x40,(byte) 0x60,(byte) 0xa0,(byte) 0x90,(byte) 0xb8,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch253 = new BitmapCharRec(5,10,0,2,5,ch253data);
-
-/* char: 0xfc */
-
-static final byte[] ch252data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch252 = new BitmapCharRec(5,7,0,0,5,ch252data);
-
-/* char: 0xfb */
-
-static final byte[] ch251data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch251 = new BitmapCharRec(5,8,0,0,5,ch251data);
-
-/* char: 0xfa */
-
-static final byte[] ch250data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch250 = new BitmapCharRec(5,8,0,0,5,ch250data);
-
-/* char: 0xf9 */
-
-static final byte[] ch249data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch249 = new BitmapCharRec(5,8,0,0,5,ch249data);
-
-/* char: 0xf8 */
-
-static final byte[] ch248data = {
-(byte) 0x80,(byte) 0x70,(byte) 0x48,(byte) 0x48,(byte) 0x48,(byte) 0x38,(byte) 0x4,
-};
-
-static final BitmapCharRec ch248 = new BitmapCharRec(6,7,1,1,5,ch248data);
-
-/* char: 0xf7 */
-
-static final byte[] ch247data = {
-(byte) 0x20,(byte) 0x0,(byte) 0xf8,(byte) 0x0,(byte) 0x20,
-};
-
-static final BitmapCharRec ch247 = new BitmapCharRec(5,5,0,0,6,ch247data);
-
-/* char: 0xf6 */
-
-static final byte[] ch246data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch246 = new BitmapCharRec(4,7,0,0,5,ch246data);
-
-/* char: 0xf5 */
-
-static final byte[] ch245data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0xa0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch245 = new BitmapCharRec(4,8,0,0,5,ch245data);
-
-/* char: 0xf4 */
-
-static final byte[] ch244data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch244 = new BitmapCharRec(4,8,0,0,5,ch244data);
-
-/* char: 0xf3 */
-
-static final byte[] ch243data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch243 = new BitmapCharRec(4,8,0,0,5,ch243data);
-
-/* char: 0xf2 */
-
-static final byte[] ch242data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch242 = new BitmapCharRec(4,8,0,0,5,ch242data);
-
-/* char: 0xf1 */
-
-static final byte[] ch241data = {
-(byte) 0xd8,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch241 = new BitmapCharRec(5,8,0,0,5,ch241data);
-
-/* char: 0xf0 */
-
-static final byte[] ch240data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0xa0,(byte) 0x70,(byte) 0x40,
-};
-
-static final BitmapCharRec ch240 = new BitmapCharRec(4,8,0,0,5,ch240data);
-
-/* char: 0xef */
-
-static final byte[] ch239data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch239 = new BitmapCharRec(3,7,0,0,4,ch239data);
-
-/* char: 0xee */
-
-static final byte[] ch238data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch238 = new BitmapCharRec(3,8,0,0,4,ch238data);
-
-/* char: 0xed */
-
-static final byte[] ch237data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x0,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch237 = new BitmapCharRec(3,8,0,0,4,ch237data);
-
-/* char: 0xec */
-
-static final byte[] ch236data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x0,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch236 = new BitmapCharRec(3,8,0,0,4,ch236data);
-
-/* char: 0xeb */
-
-static final byte[] ch235data = {
-(byte) 0x60,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,(byte) 0x60,(byte) 0x0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch235 = new BitmapCharRec(3,7,0,0,4,ch235data);
-
-/* char: 0xea */
-
-static final byte[] ch234data = {
-(byte) 0x60,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,(byte) 0x60,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch234 = new BitmapCharRec(3,8,0,0,4,ch234data);
-
-/* char: 0xe9 */
-
-static final byte[] ch233data = {
-(byte) 0x60,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,(byte) 0x60,(byte) 0x0,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch233 = new BitmapCharRec(3,8,0,0,4,ch233data);
-
-/* char: 0xe8 */
-
-static final byte[] ch232data = {
-(byte) 0x60,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,(byte) 0x60,(byte) 0x0,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch232 = new BitmapCharRec(3,8,0,0,4,ch232data);
-
-/* char: 0xe7 */
-
-static final byte[] ch231data = {
-(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0x60,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x60,
-};
-
-static final BitmapCharRec ch231 = new BitmapCharRec(3,8,0,3,4,ch231data);
-
-/* char: 0xe6 */
-
-static final byte[] ch230data = {
-(byte) 0xd8,(byte) 0xa0,(byte) 0x70,(byte) 0x28,(byte) 0xd8,
-};
-
-static final BitmapCharRec ch230 = new BitmapCharRec(5,5,0,0,6,ch230data);
-
-/* char: 0xe5 */
-
-static final byte[] ch229data = {
-(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,(byte) 0x40,(byte) 0xa0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch229 = new BitmapCharRec(3,8,0,0,4,ch229data);
-
-/* char: 0xe4 */
-
-static final byte[] ch228data = {
-(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,(byte) 0x0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch228 = new BitmapCharRec(3,7,0,0,4,ch228data);
-
-/* char: 0xe3 */
-
-static final byte[] ch227data = {
-(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,(byte) 0x0,(byte) 0xa0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch227 = new BitmapCharRec(4,8,0,0,4,ch227data);
-
-/* char: 0xe2 */
-
-static final byte[] ch226data = {
-(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch226 = new BitmapCharRec(3,8,0,0,4,ch226data);
-
-/* char: 0xe1 */
-
-static final byte[] ch225data = {
-(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,(byte) 0x0,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch225 = new BitmapCharRec(3,8,0,0,4,ch225data);
-
-/* char: 0xe0 */
-
-static final byte[] ch224data = {
-(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,(byte) 0x0,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch224 = new BitmapCharRec(3,8,0,0,4,ch224data);
-
-/* char: 0xdf */
-
-static final byte[] ch223data = {
-(byte) 0xe0,(byte) 0x50,(byte) 0x50,(byte) 0x60,(byte) 0x50,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch223 = new BitmapCharRec(4,7,0,0,5,ch223data);
-
-/* char: 0xde */
-
-static final byte[] ch222data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x70,(byte) 0x48,(byte) 0x70,(byte) 0x40,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch222 = new BitmapCharRec(5,7,0,0,6,ch222data);
-
-/* char: 0xdd */
-
-static final byte[] ch221data = {
-(byte) 0x38,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0xee,(byte) 0x0,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch221 = new BitmapCharRec(7,10,0,0,8,ch221data);
-
-/* char: 0xdc */
-
-static final byte[] ch220data = {
-(byte) 0x38,(byte) 0x6c,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0xee,(byte) 0x0,(byte) 0x28,
-};
-
-static final BitmapCharRec ch220 = new BitmapCharRec(7,9,0,0,8,ch220data);
-
-/* char: 0xdb */
-
-static final byte[] ch219data = {
-(byte) 0x38,(byte) 0x6c,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0xee,(byte) 0x0,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch219 = new BitmapCharRec(7,10,0,0,8,ch219data);
-
-/* char: 0xda */
-
-static final byte[] ch218data = {
-(byte) 0x38,(byte) 0x6c,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0xee,(byte) 0x0,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch218 = new BitmapCharRec(7,10,0,0,8,ch218data);
-
-/* char: 0xd9 */
-
-static final byte[] ch217data = {
-(byte) 0x38,(byte) 0x6c,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0xee,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch217 = new BitmapCharRec(7,10,0,0,8,ch217data);
-
-/* char: 0xd8 */
-
-static final byte[] ch216data = {
-(byte) 0x80,(byte) 0x7c,(byte) 0x66,(byte) 0x52,(byte) 0x52,(byte) 0x4a,(byte) 0x66,(byte) 0x3e,(byte) 0x1,
-};
-
-static final BitmapCharRec ch216 = new BitmapCharRec(8,9,0,1,8,ch216data);
-
-/* char: 0xd7 */
-
-static final byte[] ch215data = {
-(byte) 0x88,(byte) 0x50,(byte) 0x20,(byte) 0x50,(byte) 0x88,
-};
-
-static final BitmapCharRec ch215 = new BitmapCharRec(5,5,0,0,6,ch215data);
-
-/* char: 0xd6 */
-
-static final byte[] ch214data = {
-(byte) 0x78,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch214 = new BitmapCharRec(6,9,0,0,7,ch214data);
-
-/* char: 0xd5 */
-
-static final byte[] ch213data = {
-(byte) 0x78,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch213 = new BitmapCharRec(6,10,0,0,7,ch213data);
-
-/* char: 0xd4 */
-
-static final byte[] ch212data = {
-(byte) 0x78,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,(byte) 0x0,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch212 = new BitmapCharRec(6,10,0,0,7,ch212data);
-
-/* char: 0xd3 */
-
-static final byte[] ch211data = {
-(byte) 0x78,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,(byte) 0x0,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch211 = new BitmapCharRec(6,10,0,0,7,ch211data);
-
-/* char: 0xd2 */
-
-static final byte[] ch210data = {
-(byte) 0x78,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch210 = new BitmapCharRec(6,10,0,0,7,ch210data);
-
-/* char: 0xd1 */
-
-static final byte[] ch209data = {
-(byte) 0xe4,(byte) 0x4c,(byte) 0x4c,(byte) 0x54,(byte) 0x54,(byte) 0x64,(byte) 0xee,(byte) 0x0,(byte) 0x50,(byte) 0x28,
-};
-
-static final BitmapCharRec ch209 = new BitmapCharRec(7,10,0,0,8,ch209data);
-
-/* char: 0xd0 */
-
-static final byte[] ch208data = {
-(byte) 0xf8,(byte) 0x4c,(byte) 0x44,(byte) 0xe4,(byte) 0x44,(byte) 0x4c,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch208 = new BitmapCharRec(6,7,0,0,7,ch208data);
-
-/* char: 0xcf */
-
-static final byte[] ch207data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch207 = new BitmapCharRec(3,9,0,0,4,ch207data);
-
-/* char: 0xce */
-
-static final byte[] ch206data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch206 = new BitmapCharRec(3,10,0,0,4,ch206data);
-
-/* char: 0xcd */
-
-static final byte[] ch205data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x0,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch205 = new BitmapCharRec(3,10,0,0,4,ch205data);
-
-/* char: 0xcc */
-
-static final byte[] ch204data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x0,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch204 = new BitmapCharRec(3,10,0,0,4,ch204data);
-
-/* char: 0xcb */
-
-static final byte[] ch203data = {
-(byte) 0xf8,(byte) 0x48,(byte) 0x40,(byte) 0x70,(byte) 0x40,(byte) 0x48,(byte) 0xf8,(byte) 0x0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch203 = new BitmapCharRec(5,9,0,0,6,ch203data);
-
-/* char: 0xca */
-
-static final byte[] ch202data = {
-(byte) 0xf8,(byte) 0x48,(byte) 0x40,(byte) 0x70,(byte) 0x40,(byte) 0x48,(byte) 0xf8,(byte) 0x0,(byte) 0x50,(byte) 0x20,
-};
-
-static final BitmapCharRec ch202 = new BitmapCharRec(5,10,0,0,6,ch202data);
-
-/* char: 0xc9 */
-
-static final byte[] ch201data = {
-(byte) 0xf8,(byte) 0x48,(byte) 0x40,(byte) 0x70,(byte) 0x40,(byte) 0x48,(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x10,
-};
-
-static final BitmapCharRec ch201 = new BitmapCharRec(5,10,0,0,6,ch201data);
-
-/* char: 0xc8 */
-
-static final byte[] ch200data = {
-(byte) 0xf8,(byte) 0x48,(byte) 0x40,(byte) 0x70,(byte) 0x40,(byte) 0x48,(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch200 = new BitmapCharRec(5,10,0,0,6,ch200data);
-
-/* char: 0xc7 */
-
-static final byte[] ch199data = {
-(byte) 0x60,(byte) 0x10,(byte) 0x20,(byte) 0x78,(byte) 0xc4,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc4,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch199 = new BitmapCharRec(6,10,0,3,7,ch199data);
-
-/* char: 0xc6 */
-
-static final byte[] ch198data = {
-(byte) 0xef,(byte) 0x49,(byte) 0x78,(byte) 0x2e,(byte) 0x28,(byte) 0x39,(byte) 0x1f,
-};
-
-static final BitmapCharRec ch198 = new BitmapCharRec(8,7,0,0,9,ch198data);
-
-/* char: 0xc5 */
-
-static final byte[] ch197data = {
-(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch197 = new BitmapCharRec(7,10,0,0,8,ch197data);
-
-/* char: 0xc4 */
-
-static final byte[] ch196data = {
-(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,(byte) 0x0,(byte) 0x28,
-};
-
-static final BitmapCharRec ch196 = new BitmapCharRec(7,9,0,0,8,ch196data);
-
-/* char: 0xc3 */
-
-static final byte[] ch195data = {
-(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,(byte) 0x0,(byte) 0x28,(byte) 0x14,
-};
-
-static final BitmapCharRec ch195 = new BitmapCharRec(7,10,0,0,8,ch195data);
-
-/* char: 0xc2 */
-
-static final byte[] ch194data = {
-(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,(byte) 0x0,(byte) 0x28,(byte) 0x10,
-};
-
-static final BitmapCharRec ch194 = new BitmapCharRec(7,10,0,0,8,ch194data);
-
-/* char: 0xc1 */
-
-static final byte[] ch193data = {
-(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x8,
-};
-
-static final BitmapCharRec ch193 = new BitmapCharRec(7,10,0,0,8,ch193data);
-
-/* char: 0xc0 */
-
-static final byte[] ch192data = {
-(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,(byte) 0x0,(byte) 0x10,(byte) 0x20,
-};
-
-static final BitmapCharRec ch192 = new BitmapCharRec(7,10,0,0,8,ch192data);
-
-/* char: 0xbf */
-
-static final byte[] ch191data = {
-(byte) 0xe0,(byte) 0xa0,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch191 = new BitmapCharRec(3,7,0,2,4,ch191data);
-
-/* char: 0xbe */
-
-static final byte[] ch190data = {
-(byte) 0x44,(byte) 0x3e,(byte) 0x2c,(byte) 0xd4,(byte) 0x28,(byte) 0x48,(byte) 0xe4,
-};
-
-static final BitmapCharRec ch190 = new BitmapCharRec(7,7,0,0,8,ch190data);
-
-/* char: 0xbd */
-
-static final byte[] ch189data = {
-(byte) 0x4e,(byte) 0x24,(byte) 0x2a,(byte) 0xf6,(byte) 0x48,(byte) 0xc8,(byte) 0x44,
-};
-
-static final BitmapCharRec ch189 = new BitmapCharRec(7,7,0,0,8,ch189data);
-
-/* char: 0xbc */
-
-static final byte[] ch188data = {
-(byte) 0x44,(byte) 0x3e,(byte) 0x2c,(byte) 0xf4,(byte) 0x48,(byte) 0xc8,(byte) 0x44,
-};
-
-static final BitmapCharRec ch188 = new BitmapCharRec(7,7,0,0,8,ch188data);
-
-/* char: 0xbb */
-
-static final byte[] ch187data = {
-(byte) 0xa0,(byte) 0x50,(byte) 0x50,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch187 = new BitmapCharRec(4,4,0,-1,5,ch187data);
-
-/* char: 0xba */
-
-static final byte[] ch186data = {
-(byte) 0xe0,(byte) 0x0,(byte) 0x40,(byte) 0xa0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch186 = new BitmapCharRec(3,5,0,-2,4,ch186data);
-
-/* char: 0xb9 */
-
-static final byte[] ch185data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch185 = new BitmapCharRec(3,4,0,-3,3,ch185data);
-
-/* char: 0xb8 */
-
-static final byte[] ch184data = {
-(byte) 0xc0,(byte) 0x20,(byte) 0x40,
-};
-
-static final BitmapCharRec ch184 = new BitmapCharRec(3,3,0,3,4,ch184data);
-
-/* char: 0xb7 */
-
-static final byte[] ch183data = {
-(byte) 0x80,
-};
-
-static final BitmapCharRec ch183 = new BitmapCharRec(1,1,0,-2,2,ch183data);
-
-/* char: 0xb6 */
-
-static final byte[] ch182data = {
-(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x28,(byte) 0x68,(byte) 0xe8,(byte) 0xe8,(byte) 0xe8,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch182 = new BitmapCharRec(6,9,0,2,6,ch182data);
-
-/* char: 0xb5 */
-
-static final byte[] ch181data = {
-(byte) 0x80,(byte) 0x80,(byte) 0xe8,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,
-};
-
-static final BitmapCharRec ch181 = new BitmapCharRec(5,7,0,2,5,ch181data);
-
-/* char: 0xb4 */
-
-static final byte[] ch180data = {
-(byte) 0x80,(byte) 0x40,
-};
-
-static final BitmapCharRec ch180 = new BitmapCharRec(2,2,0,-5,3,ch180data);
-
-/* char: 0xb3 */
-
-static final byte[] ch179data = {
-(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch179 = new BitmapCharRec(3,4,0,-3,3,ch179data);
-
-/* char: 0xb2 */
-
-static final byte[] ch178data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0xa0,(byte) 0x60,
-};
-
-static final BitmapCharRec ch178 = new BitmapCharRec(3,4,0,-3,3,ch178data);
-
-/* char: 0xb1 */
-
-static final byte[] ch177data = {
-(byte) 0xf8,(byte) 0x0,(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch177 = new BitmapCharRec(5,7,0,0,6,ch177data);
-
-/* char: 0xb0 */
-
-static final byte[] ch176data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch176 = new BitmapCharRec(4,4,0,-3,4,ch176data);
-
-/* char: 0xaf */
-
-static final byte[] ch175data = {
-(byte) 0xe0,
-};
-
-static final BitmapCharRec ch175 = new BitmapCharRec(3,1,0,-6,4,ch175data);
-
-/* char: 0xae */
-
-static final byte[] ch174data = {
-(byte) 0x38,(byte) 0x44,(byte) 0xaa,(byte) 0xb2,(byte) 0xba,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch174 = new BitmapCharRec(7,7,-1,0,9,ch174data);
-
-/* char: 0xad */
-
-static final byte[] ch173data = {
-(byte) 0xe0,
-};
-
-static final BitmapCharRec ch173 = new BitmapCharRec(3,1,0,-2,4,ch173data);
-
-/* char: 0xac */
-
-static final byte[] ch172data = {
-(byte) 0x8,(byte) 0x8,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch172 = new BitmapCharRec(5,3,-1,-1,7,ch172data);
-
-/* char: 0xab */
-
-static final byte[] ch171data = {
-(byte) 0x50,(byte) 0xa0,(byte) 0xa0,(byte) 0x50,
-};
-
-static final BitmapCharRec ch171 = new BitmapCharRec(4,4,0,-1,5,ch171data);
-
-/* char: 0xaa */
-
-static final byte[] ch170data = {
-(byte) 0xe0,(byte) 0x0,(byte) 0xa0,(byte) 0x20,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch170 = new BitmapCharRec(3,5,0,-2,4,ch170data);
-
-/* char: 0xa9 */
-
-static final byte[] ch169data = {
-(byte) 0x38,(byte) 0x44,(byte) 0x9a,(byte) 0xa2,(byte) 0x9a,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch169 = new BitmapCharRec(7,7,-1,0,9,ch169data);
-
-/* char: 0xa8 */
-
-static final byte[] ch168data = {
-(byte) 0xa0,
-};
-
-static final BitmapCharRec ch168 = new BitmapCharRec(3,1,-1,-6,5,ch168data);
-
-/* char: 0xa7 */
-
-static final byte[] ch167data = {
-(byte) 0xe0,(byte) 0x90,(byte) 0x20,(byte) 0x50,(byte) 0x90,(byte) 0xa0,(byte) 0x40,(byte) 0x90,(byte) 0x70,
-};
-
-static final BitmapCharRec ch167 = new BitmapCharRec(4,9,0,1,5,ch167data);
-
-/* char: 0xa6 */
-
-static final byte[] ch166data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch166 = new BitmapCharRec(1,7,0,0,2,ch166data);
-
-/* char: 0xa5 */
-
-static final byte[] ch165data = {
-(byte) 0x70,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0xd8,(byte) 0x50,(byte) 0x88,
-};
-
-static final BitmapCharRec ch165 = new BitmapCharRec(5,7,0,0,5,ch165data);
-
-/* char: 0xa4 */
-
-static final byte[] ch164data = {
-(byte) 0x88,(byte) 0x70,(byte) 0x50,(byte) 0x50,(byte) 0x70,(byte) 0x88,
-};
-
-static final BitmapCharRec ch164 = new BitmapCharRec(5,6,0,-1,5,ch164data);
-
-/* char: 0xa3 */
-
-static final byte[] ch163data = {
-(byte) 0xf0,(byte) 0xc8,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x50,(byte) 0x30,
-};
-
-static final BitmapCharRec ch163 = new BitmapCharRec(5,7,0,0,5,ch163data);
-
-/* char: 0xa2 */
-
-static final byte[] ch162data = {
-(byte) 0x80,(byte) 0xe0,(byte) 0x90,(byte) 0x80,(byte) 0x90,(byte) 0x70,(byte) 0x10,
-};
-
-static final BitmapCharRec ch162 = new BitmapCharRec(4,7,0,1,5,ch162data);
-
-/* char: 0xa1 */
-
-static final byte[] ch161data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch161 = new BitmapCharRec(1,7,-1,2,3,ch161data);
-
-/* char: 0xa0 */
-
-static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,2,null);
-
-/* char: 0x7e '~' */
-
-static final byte[] ch126data = {
-(byte) 0x98,(byte) 0x64,
-};
-
-static final BitmapCharRec ch126 = new BitmapCharRec(6,2,0,-2,7,ch126data);
-
-/* char: 0x7d '}' */
-
-static final byte[] ch125data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch125 = new BitmapCharRec(3,9,0,2,4,ch125data);
-
-/* char: 0x7c '|' */
-
-static final byte[] ch124data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch124 = new BitmapCharRec(1,9,0,2,2,ch124data);
-
-/* char: 0x7b '{' */
-
-static final byte[] ch123data = {
-(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch123 = new BitmapCharRec(3,9,0,2,4,ch123data);
-
-/* char: 0x7a 'z' */
-
-static final byte[] ch122data = {
-(byte) 0xf0,(byte) 0x90,(byte) 0x40,(byte) 0x20,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch122 = new BitmapCharRec(4,5,0,0,5,ch122data);
-
-/* char: 0x79 'y' */
-
-static final byte[] ch121data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x30,(byte) 0x50,(byte) 0x48,(byte) 0xdc,
-};
-
-static final BitmapCharRec ch121 = new BitmapCharRec(6,7,1,2,5,ch121data);
-
-/* char: 0x78 'x' */
-
-static final byte[] ch120data = {
-(byte) 0xd8,(byte) 0x50,(byte) 0x20,(byte) 0x50,(byte) 0xd8,
-};
-
-static final BitmapCharRec ch120 = new BitmapCharRec(5,5,0,0,6,ch120data);
-
-/* char: 0x77 'w' */
-
-static final byte[] ch119data = {
-(byte) 0x28,(byte) 0x6c,(byte) 0x54,(byte) 0x92,(byte) 0xdb,
-};
-
-static final BitmapCharRec ch119 = new BitmapCharRec(8,5,0,0,8,ch119data);
-
-/* char: 0x76 'v' */
-
-static final byte[] ch118data = {
-(byte) 0x20,(byte) 0x60,(byte) 0x50,(byte) 0x90,(byte) 0xd8,
-};
-
-static final BitmapCharRec ch118 = new BitmapCharRec(5,5,0,0,5,ch118data);
-
-/* char: 0x75 'u' */
-
-static final byte[] ch117data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,
-};
-
-static final BitmapCharRec ch117 = new BitmapCharRec(5,5,0,0,5,ch117data);
-
-/* char: 0x74 't' */
-
-static final byte[] ch116data = {
-(byte) 0x30,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch116 = new BitmapCharRec(4,6,0,0,4,ch116data);
-
-/* char: 0x73 's' */
-
-static final byte[] ch115data = {
-(byte) 0xe0,(byte) 0x20,(byte) 0x60,(byte) 0x80,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch115 = new BitmapCharRec(3,5,0,0,4,ch115data);
-
-/* char: 0x72 'r' */
-
-static final byte[] ch114data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x60,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch114 = new BitmapCharRec(3,5,0,0,4,ch114data);
-
-/* char: 0x71 'q' */
-
-static final byte[] ch113data = {
-(byte) 0x38,(byte) 0x10,(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x70,
-};
-
-static final BitmapCharRec ch113 = new BitmapCharRec(5,7,0,2,5,ch113data);
-
-/* char: 0x70 'p' */
-
-static final byte[] ch112data = {
-(byte) 0xc0,(byte) 0x80,(byte) 0xe0,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch112 = new BitmapCharRec(4,7,0,2,5,ch112data);
-
-/* char: 0x6f 'o' */
-
-static final byte[] ch111data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch111 = new BitmapCharRec(4,5,0,0,5,ch111data);
-
-/* char: 0x6e 'n' */
-
-static final byte[] ch110data = {
-(byte) 0xd8,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch110 = new BitmapCharRec(5,5,0,0,5,ch110data);
-
-/* char: 0x6d 'm' */
-
-static final byte[] ch109data = {
-(byte) 0xdb,(byte) 0x92,(byte) 0x92,(byte) 0x92,(byte) 0xec,
-};
-
-static final BitmapCharRec ch109 = new BitmapCharRec(8,5,0,0,8,ch109data);
-
-/* char: 0x6c 'l' */
-
-static final byte[] ch108data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch108 = new BitmapCharRec(3,7,0,0,4,ch108data);
-
-/* char: 0x6b 'k' */
-
-static final byte[] ch107data = {
-(byte) 0x98,(byte) 0x90,(byte) 0xe0,(byte) 0xa0,(byte) 0x90,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch107 = new BitmapCharRec(5,7,0,0,5,ch107data);
-
-/* char: 0x6a 'j' */
-
-static final byte[] ch106data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch106 = new BitmapCharRec(2,9,0,2,3,ch106data);
-
-/* char: 0x69 'i' */
-
-static final byte[] ch105data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch105 = new BitmapCharRec(2,7,0,0,3,ch105data);
-
-/* char: 0x68 'h' */
-
-static final byte[] ch104data = {
-(byte) 0xd8,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch104 = new BitmapCharRec(5,7,0,0,5,ch104data);
-
-/* char: 0x67 'g' */
-
-static final byte[] ch103data = {
-(byte) 0xe0,(byte) 0x90,(byte) 0x60,(byte) 0x40,(byte) 0xa0,(byte) 0xa0,(byte) 0x70,
-};
-
-static final BitmapCharRec ch103 = new BitmapCharRec(4,7,0,2,5,ch103data);
-
-/* char: 0x66 'f' */
-
-static final byte[] ch102data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,(byte) 0x40,(byte) 0x30,
-};
-
-static final BitmapCharRec ch102 = new BitmapCharRec(4,7,0,0,4,ch102data);
-
-/* char: 0x65 'e' */
-
-static final byte[] ch101data = {
-(byte) 0x60,(byte) 0x80,(byte) 0xc0,(byte) 0xa0,(byte) 0x60,
-};
-
-static final BitmapCharRec ch101 = new BitmapCharRec(3,5,0,0,4,ch101data);
-
-/* char: 0x64 'd' */
-
-static final byte[] ch100data = {
-(byte) 0x68,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x70,(byte) 0x10,(byte) 0x30,
-};
-
-static final BitmapCharRec ch100 = new BitmapCharRec(5,7,0,0,5,ch100data);
-
-/* char: 0x63 'c' */
-
-static final byte[] ch99data = {
-(byte) 0x60,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x60,
-};
-
-static final BitmapCharRec ch99 = new BitmapCharRec(3,5,0,0,4,ch99data);
-
-/* char: 0x62 'b' */
-
-static final byte[] ch98data = {
-(byte) 0xe0,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch98 = new BitmapCharRec(4,7,0,0,5,ch98data);
-
-/* char: 0x61 'a' */
-
-static final byte[] ch97data = {
-(byte) 0xe0,(byte) 0xa0,(byte) 0x60,(byte) 0x20,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch97 = new BitmapCharRec(3,5,0,0,4,ch97data);
-
-/* char: 0x60 '`' */
-
-static final byte[] ch96data = {
-(byte) 0xc0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch96 = new BitmapCharRec(2,2,0,-5,3,ch96data);
-
-/* char: 0x5f '_' */
-
-static final byte[] ch95data = {
-(byte) 0xf8,
-};
-
-static final BitmapCharRec ch95 = new BitmapCharRec(5,1,0,3,5,ch95data);
-
-/* char: 0x5e '^' */
-
-static final byte[] ch94data = {
-(byte) 0xa0,(byte) 0xa0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch94 = new BitmapCharRec(3,3,-1,-4,5,ch94data);
-
-/* char: 0x5d ']' */
-
-static final byte[] ch93data = {
-(byte) 0xc0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch93 = new BitmapCharRec(2,9,0,2,3,ch93data);
-
-/* char: 0x5c '\' */
-
-static final byte[] ch92data = {
-(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch92 = new BitmapCharRec(3,7,0,0,3,ch92data);
-
-/* char: 0x5b '[' */
-
-static final byte[] ch91data = {
-(byte) 0xc0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch91 = new BitmapCharRec(2,9,0,2,3,ch91data);
-
-/* char: 0x5a 'Z' */
-
-static final byte[] ch90data = {
-(byte) 0xf8,(byte) 0x88,(byte) 0x40,(byte) 0x20,(byte) 0x10,(byte) 0x88,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch90 = new BitmapCharRec(5,7,0,0,6,ch90data);
-
-/* char: 0x59 'Y' */
-
-static final byte[] ch89data = {
-(byte) 0x38,(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x44,(byte) 0xee,
-};
-
-static final BitmapCharRec ch89 = new BitmapCharRec(7,7,0,0,8,ch89data);
-
-/* char: 0x58 'X' */
-
-static final byte[] ch88data = {
-(byte) 0xee,(byte) 0x44,(byte) 0x28,(byte) 0x10,(byte) 0x28,(byte) 0x44,(byte) 0xee,
-};
-
-static final BitmapCharRec ch88 = new BitmapCharRec(7,7,0,0,8,ch88data);
-
-/* char: 0x57 'W' */
-
-static final byte[] ch87data = {
-(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0xc9,(byte) 0x80,(byte) 0x88,(byte) 0x80,(byte) 0xdd,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch87 = new BitmapCharRec(10,7,0,0,10,ch87data);
-
-/* char: 0x56 'V' */
-
-static final byte[] ch86data = {
-(byte) 0x10,(byte) 0x10,(byte) 0x28,(byte) 0x28,(byte) 0x6c,(byte) 0x44,(byte) 0xee,
-};
-
-static final BitmapCharRec ch86 = new BitmapCharRec(7,7,0,0,8,ch86data);
-
-/* char: 0x55 'U' */
-
-static final byte[] ch85data = {
-(byte) 0x38,(byte) 0x6c,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0xee,
-};
-
-static final BitmapCharRec ch85 = new BitmapCharRec(7,7,0,0,8,ch85data);
-
-/* char: 0x54 'T' */
-
-static final byte[] ch84data = {
-(byte) 0x70,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xa8,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch84 = new BitmapCharRec(5,7,0,0,6,ch84data);
-
-/* char: 0x53 'S' */
-
-static final byte[] ch83data = {
-(byte) 0xe0,(byte) 0x90,(byte) 0x10,(byte) 0x60,(byte) 0xc0,(byte) 0x90,(byte) 0x70,
-};
-
-static final BitmapCharRec ch83 = new BitmapCharRec(4,7,0,0,5,ch83data);
-
-/* char: 0x52 'R' */
-
-static final byte[] ch82data = {
-(byte) 0xec,(byte) 0x48,(byte) 0x50,(byte) 0x70,(byte) 0x48,(byte) 0x48,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch82 = new BitmapCharRec(6,7,0,0,7,ch82data);
-
-/* char: 0x51 'Q' */
-
-static final byte[] ch81data = {
-(byte) 0xc,(byte) 0x18,(byte) 0x70,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,
-};
-
-static final BitmapCharRec ch81 = new BitmapCharRec(6,9,0,2,7,ch81data);
-
-/* char: 0x50 'P' */
-
-static final byte[] ch80data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x70,(byte) 0x48,(byte) 0x48,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch80 = new BitmapCharRec(5,7,0,0,6,ch80data);
-
-/* char: 0x4f 'O' */
-
-static final byte[] ch79data = {
-(byte) 0x78,(byte) 0xcc,(byte) 0x84,(byte) 0x84,(byte) 0x84,(byte) 0xcc,(byte) 0x78,
-};
-
-static final BitmapCharRec ch79 = new BitmapCharRec(6,7,0,0,7,ch79data);
-
-/* char: 0x4e 'N' */
-
-static final byte[] ch78data = {
-(byte) 0xe4,(byte) 0x4c,(byte) 0x4c,(byte) 0x54,(byte) 0x54,(byte) 0x64,(byte) 0xee,
-};
-
-static final BitmapCharRec ch78 = new BitmapCharRec(7,7,0,0,8,ch78data);
-
-/* char: 0x4d 'M' */
-
-static final byte[] ch77data = {
-(byte) 0xeb,(byte) 0x80,(byte) 0x49,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x55,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0xe3,(byte) 0x80,
-};
-
-static final BitmapCharRec ch77 = new BitmapCharRec(9,7,0,0,10,ch77data);
-
-/* char: 0x4c 'L' */
-
-static final byte[] ch76data = {
-(byte) 0xf8,(byte) 0x48,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch76 = new BitmapCharRec(5,7,0,0,6,ch76data);
-
-/* char: 0x4b 'K' */
-
-static final byte[] ch75data = {
-(byte) 0xec,(byte) 0x48,(byte) 0x50,(byte) 0x60,(byte) 0x50,(byte) 0x48,(byte) 0xec,
-};
-
-static final BitmapCharRec ch75 = new BitmapCharRec(6,7,0,0,7,ch75data);
-
-/* char: 0x4a 'J' */
-
-static final byte[] ch74data = {
-(byte) 0xc0,(byte) 0xa0,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x70,
-};
-
-static final BitmapCharRec ch74 = new BitmapCharRec(4,7,0,0,4,ch74data);
-
-/* char: 0x49 'I' */
-
-static final byte[] ch73data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch73 = new BitmapCharRec(3,7,0,0,4,ch73data);
-
-/* char: 0x48 'H' */
-
-static final byte[] ch72data = {
-(byte) 0xee,(byte) 0x44,(byte) 0x44,(byte) 0x7c,(byte) 0x44,(byte) 0x44,(byte) 0xee,
-};
-
-static final BitmapCharRec ch72 = new BitmapCharRec(7,7,0,0,8,ch72data);
-
-/* char: 0x47 'G' */
-
-static final byte[] ch71data = {
-(byte) 0x78,(byte) 0xc4,(byte) 0x84,(byte) 0x9c,(byte) 0x80,(byte) 0xc4,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch71 = new BitmapCharRec(6,7,0,0,7,ch71data);
-
-/* char: 0x46 'F' */
-
-static final byte[] ch70data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x70,(byte) 0x40,(byte) 0x48,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch70 = new BitmapCharRec(5,7,0,0,6,ch70data);
-
-/* char: 0x45 'E' */
-
-static final byte[] ch69data = {
-(byte) 0xf8,(byte) 0x48,(byte) 0x40,(byte) 0x70,(byte) 0x40,(byte) 0x48,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch69 = new BitmapCharRec(5,7,0,0,6,ch69data);
-
-/* char: 0x44 'D' */
-
-static final byte[] ch68data = {
-(byte) 0xf8,(byte) 0x4c,(byte) 0x44,(byte) 0x44,(byte) 0x44,(byte) 0x4c,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch68 = new BitmapCharRec(6,7,0,0,7,ch68data);
-
-/* char: 0x43 'C' */
-
-static final byte[] ch67data = {
-(byte) 0x78,(byte) 0xc4,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0xc4,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch67 = new BitmapCharRec(6,7,0,0,7,ch67data);
-
-/* char: 0x42 'B' */
-
-static final byte[] ch66data = {
-(byte) 0xf0,(byte) 0x48,(byte) 0x48,(byte) 0x70,(byte) 0x48,(byte) 0x48,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch66 = new BitmapCharRec(5,7,0,0,6,ch66data);
-
-/* char: 0x41 'A' */
-
-static final byte[] ch65data = {
-(byte) 0xee,(byte) 0x44,(byte) 0x7c,(byte) 0x28,(byte) 0x28,(byte) 0x38,(byte) 0x10,
-};
-
-static final BitmapCharRec ch65 = new BitmapCharRec(7,7,0,0,8,ch65data);
-
-/* char: 0x40 '@' */
-
-static final byte[] ch64data = {
-(byte) 0x3e,(byte) 0x40,(byte) 0x92,(byte) 0xad,(byte) 0xa5,(byte) 0xa5,(byte) 0x9d,(byte) 0x42,(byte) 0x3c,
-};
-
-static final BitmapCharRec ch64 = new BitmapCharRec(8,9,0,2,9,ch64data);
-
-/* char: 0x3f '?' */
-
-static final byte[] ch63data = {
-(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0xa0,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch63 = new BitmapCharRec(3,7,0,0,4,ch63data);
-
-/* char: 0x3e '>' */
-
-static final byte[] ch62data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch62 = new BitmapCharRec(3,5,0,0,5,ch62data);
-
-/* char: 0x3d '=' */
-
-static final byte[] ch61data = {
-(byte) 0xf8,(byte) 0x0,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch61 = new BitmapCharRec(5,3,0,-1,6,ch61data);
-
-/* char: 0x3c '<' */
-
-static final byte[] ch60data = {
-(byte) 0x20,(byte) 0x40,(byte) 0x80,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch60 = new BitmapCharRec(3,5,-1,0,5,ch60data);
-
-/* char: 0x3b ';' */
-
-static final byte[] ch59data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch59 = new BitmapCharRec(1,7,-1,2,3,ch59data);
-
-/* char: 0x3a ':' */
-
-static final byte[] ch58data = {
-(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x80,
-};
-
-static final BitmapCharRec ch58 = new BitmapCharRec(1,5,-1,0,3,ch58data);
-
-/* char: 0x39 '9' */
-
-static final byte[] ch57data = {
-(byte) 0xc0,(byte) 0x20,(byte) 0x70,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch57 = new BitmapCharRec(4,7,0,0,5,ch57data);
-
-/* char: 0x38 '8' */
-
-static final byte[] ch56data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch56 = new BitmapCharRec(4,7,0,0,5,ch56data);
-
-/* char: 0x37 '7' */
-
-static final byte[] ch55data = {
-(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x90,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch55 = new BitmapCharRec(4,7,0,0,5,ch55data);
-
-/* char: 0x36 '6' */
-
-static final byte[] ch54data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0xe0,(byte) 0x40,(byte) 0x30,
-};
-
-static final BitmapCharRec ch54 = new BitmapCharRec(4,7,0,0,5,ch54data);
-
-/* char: 0x35 '5' */
-
-static final byte[] ch53data = {
-(byte) 0xe0,(byte) 0x90,(byte) 0x10,(byte) 0x10,(byte) 0xe0,(byte) 0x40,(byte) 0x70,
-};
-
-static final BitmapCharRec ch53 = new BitmapCharRec(4,7,0,0,5,ch53data);
-
-/* char: 0x34 '4' */
-
-static final byte[] ch52data = {
-(byte) 0x10,(byte) 0x10,(byte) 0xf8,(byte) 0x90,(byte) 0x50,(byte) 0x30,(byte) 0x10,
-};
-
-static final BitmapCharRec ch52 = new BitmapCharRec(5,7,0,0,5,ch52data);
-
-/* char: 0x33 '3' */
-
-static final byte[] ch51data = {
-(byte) 0xe0,(byte) 0x10,(byte) 0x10,(byte) 0x60,(byte) 0x10,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch51 = new BitmapCharRec(4,7,0,0,5,ch51data);
-
-/* char: 0x32 '2' */
-
-static final byte[] ch50data = {
-(byte) 0xf0,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x10,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch50 = new BitmapCharRec(4,7,0,0,5,ch50data);
-
-/* char: 0x31 '1' */
-
-static final byte[] ch49data = {
-(byte) 0xe0,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0xc0,(byte) 0x40,
-};
-
-static final BitmapCharRec ch49 = new BitmapCharRec(3,7,-1,0,5,ch49data);
-
-/* char: 0x30 '0' */
-
-static final byte[] ch48data = {
-(byte) 0x60,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x90,(byte) 0x60,
-};
-
-static final BitmapCharRec ch48 = new BitmapCharRec(4,7,0,0,5,ch48data);
-
-/* char: 0x2f '/' */
-
-static final byte[] ch47data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch47 = new BitmapCharRec(3,7,0,0,3,ch47data);
-
-/* char: 0x2e '.' */
-
-static final byte[] ch46data = {
-(byte) 0x80,
-};
-
-static final BitmapCharRec ch46 = new BitmapCharRec(1,1,-1,0,3,ch46data);
-
-/* char: 0x2d '-' */
-
-static final byte[] ch45data = {
-(byte) 0xf0,
-};
-
-static final BitmapCharRec ch45 = new BitmapCharRec(4,1,-1,-2,7,ch45data);
-
-/* char: 0x2c ',' */
-
-static final byte[] ch44data = {
-(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch44 = new BitmapCharRec(1,3,-1,2,3,ch44data);
-
-/* char: 0x2b '+' */
-
-static final byte[] ch43data = {
-(byte) 0x20,(byte) 0x20,(byte) 0xf8,(byte) 0x20,(byte) 0x20,
-};
-
-static final BitmapCharRec ch43 = new BitmapCharRec(5,5,0,0,6,ch43data);
-
-/* char: 0x2a '*' */
-
-static final byte[] ch42data = {
-(byte) 0xa0,(byte) 0x40,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch42 = new BitmapCharRec(3,3,0,-4,5,ch42data);
-
-/* char: 0x29 ')' */
-
-static final byte[] ch41data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch41 = new BitmapCharRec(3,9,0,2,4,ch41data);
-
-/* char: 0x28 '(' */
-
-static final byte[] ch40data = {
-(byte) 0x20,(byte) 0x40,(byte) 0x40,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x40,(byte) 0x40,(byte) 0x20,
-};
-
-static final BitmapCharRec ch40 = new BitmapCharRec(3,9,0,2,4,ch40data);
-
-/* char: 0x27 ''' */
-
-static final byte[] ch39data = {
-(byte) 0x40,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch39 = new BitmapCharRec(2,2,0,-5,3,ch39data);
-
-/* char: 0x26 '&' */
-
-static final byte[] ch38data = {
-(byte) 0x76,(byte) 0x8d,(byte) 0x98,(byte) 0x74,(byte) 0x6e,(byte) 0x50,(byte) 0x30,
-};
-
-static final BitmapCharRec ch38 = new BitmapCharRec(8,7,0,0,8,ch38data);
-
-/* char: 0x25 '%' */
-
-static final byte[] ch37data = {
-(byte) 0x44,(byte) 0x2a,(byte) 0x2a,(byte) 0x56,(byte) 0xa8,(byte) 0xa4,(byte) 0x7e,
-};
-
-static final BitmapCharRec ch37 = new BitmapCharRec(7,7,0,0,8,ch37data);
-
-/* char: 0x24 '$' */
-
-static final byte[] ch36data = {
-(byte) 0x20,(byte) 0xe0,(byte) 0x90,(byte) 0x10,(byte) 0x60,(byte) 0x80,(byte) 0x90,(byte) 0x70,(byte) 0x20,
-};
-
-static final BitmapCharRec ch36 = new BitmapCharRec(4,9,0,1,5,ch36data);
-
-/* char: 0x23 '#' */
-
-static final byte[] ch35data = {
-(byte) 0x50,(byte) 0x50,(byte) 0xf8,(byte) 0x50,(byte) 0xf8,(byte) 0x50,(byte) 0x50,
-};
-
-static final BitmapCharRec ch35 = new BitmapCharRec(5,7,0,0,5,ch35data);
-
-/* char: 0x22 '"' */
-
-static final byte[] ch34data = {
-(byte) 0xa0,(byte) 0xa0,
-};
-
-static final BitmapCharRec ch34 = new BitmapCharRec(3,2,0,-5,4,ch34data);
-
-/* char: 0x21 '!' */
-
-static final byte[] ch33data = {
-(byte) 0x80,(byte) 0x0,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,(byte) 0x80,
-};
-
-static final BitmapCharRec ch33 = new BitmapCharRec(1,7,-1,0,3,ch33data);
-
-/* char: 0x20 ' ' */
-
-static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,2,null);
-
-static final BitmapCharRec[] chars = {
-ch32,
-ch33,
-ch34,
-ch35,
-ch36,
-ch37,
-ch38,
-ch39,
-ch40,
-ch41,
-ch42,
-ch43,
-ch44,
-ch45,
-ch46,
-ch47,
-ch48,
-ch49,
-ch50,
-ch51,
-ch52,
-ch53,
-ch54,
-ch55,
-ch56,
-ch57,
-ch58,
-ch59,
-ch60,
-ch61,
-ch62,
-ch63,
-ch64,
-ch65,
-ch66,
-ch67,
-ch68,
-ch69,
-ch70,
-ch71,
-ch72,
-ch73,
-ch74,
-ch75,
-ch76,
-ch77,
-ch78,
-ch79,
-ch80,
-ch81,
-ch82,
-ch83,
-ch84,
-ch85,
-ch86,
-ch87,
-ch88,
-ch89,
-ch90,
-ch91,
-ch92,
-ch93,
-ch94,
-ch95,
-ch96,
-ch97,
-ch98,
-ch99,
-ch100,
-ch101,
-ch102,
-ch103,
-ch104,
-ch105,
-ch106,
-ch107,
-ch108,
-ch109,
-ch110,
-ch111,
-ch112,
-ch113,
-ch114,
-ch115,
-ch116,
-ch117,
-ch118,
-ch119,
-ch120,
-ch121,
-ch122,
-ch123,
-ch124,
-ch125,
-ch126,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-ch160,
-ch161,
-ch162,
-ch163,
-ch164,
-ch165,
-ch166,
-ch167,
-ch168,
-ch169,
-ch170,
-ch171,
-ch172,
-ch173,
-ch174,
-ch175,
-ch176,
-ch177,
-ch178,
-ch179,
-ch180,
-ch181,
-ch182,
-ch183,
-ch184,
-ch185,
-ch186,
-ch187,
-ch188,
-ch189,
-ch190,
-ch191,
-ch192,
-ch193,
-ch194,
-ch195,
-ch196,
-ch197,
-ch198,
-ch199,
-ch200,
-ch201,
-ch202,
-ch203,
-ch204,
-ch205,
-ch206,
-ch207,
-ch208,
-ch209,
-ch210,
-ch211,
-ch212,
-ch213,
-ch214,
-ch215,
-ch216,
-ch217,
-ch218,
-ch219,
-ch220,
-ch221,
-ch222,
-ch223,
-ch224,
-ch225,
-ch226,
-ch227,
-ch228,
-ch229,
-ch230,
-ch231,
-ch232,
-ch233,
-ch234,
-ch235,
-ch236,
-ch237,
-ch238,
-ch239,
-ch240,
-ch241,
-ch242,
-ch243,
-ch244,
-ch245,
-ch246,
-ch247,
-ch248,
-ch249,
-ch250,
-ch251,
-ch252,
-ch253,
-ch254,
-ch255,
-};
-
-  public static final BitmapFontRec glutBitmapTimesRoman10 = new BitmapFontRec("-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1",
-                                                                        224,
-                                                                        32,
-                                                                        chars);
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman24.java b/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman24.java
deleted file mode 100644
index 36fb76c66..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman24.java
+++ /dev/null
@@ -1,2080 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-class GLUTBitmapTimesRoman24 {
-
-/* GENERATED FILE -- DO NOT MODIFY */
-
-/* char: 0xff */
-
-static final byte[] ch255data = {
-(byte) 0xe0,(byte) 0x0,(byte) 0xf0,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xe,(byte) 0x0,
-(byte) 0x1a,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x31,(byte) 0x0,(byte) 0x30,(byte) 0x80,(byte) 0x30,(byte) 0x80,(byte) 0x60,(byte) 0x80,(byte) 0x60,(byte) 0xc0,
-(byte) 0xf1,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x33,(byte) 0x0,
-};
-
-static final BitmapCharRec ch255 = new BitmapCharRec(11,21,0,5,11,ch255data);
-
-/* char: 0xfe */
-
-static final byte[] ch254data = {
-(byte) 0xf0,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x6e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,
-(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,
-(byte) 0x6e,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0xe0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch254 = new BitmapCharRec(10,22,-1,5,12,ch254data);
-
-/* char: 0xfd */
-
-static final byte[] ch253data = {
-(byte) 0xe0,(byte) 0x0,(byte) 0xf0,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xe,(byte) 0x0,
-(byte) 0x1a,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x31,(byte) 0x0,(byte) 0x30,(byte) 0x80,(byte) 0x30,(byte) 0x80,(byte) 0x60,(byte) 0x80,(byte) 0x60,(byte) 0xc0,
-(byte) 0xf1,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x80,(byte) 0x1,(byte) 0x80,
-};
-
-static final BitmapCharRec ch253 = new BitmapCharRec(11,22,0,5,11,ch253data);
-
-/* char: 0xfc */
-
-static final byte[] ch252data = {
-(byte) 0x1c,(byte) 0xe0,(byte) 0x3e,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
-(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe1,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x33,(byte) 0x0,
-};
-
-static final BitmapCharRec ch252 = new BitmapCharRec(11,16,-1,0,13,ch252data);
-
-/* char: 0xfb */
-
-static final byte[] ch251data = {
-(byte) 0x1c,(byte) 0xe0,(byte) 0x3e,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
-(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe1,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x21,(byte) 0x0,(byte) 0x12,(byte) 0x0,(byte) 0x1e,(byte) 0x0,
-(byte) 0xc,(byte) 0x0,
-};
-
-static final BitmapCharRec ch251 = new BitmapCharRec(11,17,-1,0,13,ch251data);
-
-/* char: 0xfa */
-
-static final byte[] ch250data = {
-(byte) 0x1c,(byte) 0xe0,(byte) 0x3e,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
-(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe1,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x80,
-(byte) 0x1,(byte) 0x80,
-};
-
-static final BitmapCharRec ch250 = new BitmapCharRec(11,17,-1,0,13,ch250data);
-
-/* char: 0xf9 */
-
-static final byte[] ch249data = {
-(byte) 0x1c,(byte) 0xe0,(byte) 0x3e,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
-(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe1,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x2,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x38,(byte) 0x0,
-(byte) 0x30,(byte) 0x0,
-};
-
-static final BitmapCharRec ch249 = new BitmapCharRec(11,17,-1,0,13,ch249data);
-
-/* char: 0xf8 */
-
-static final byte[] ch248data = {
-(byte) 0xc0,(byte) 0x0,(byte) 0xde,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x71,(byte) 0x80,(byte) 0xd0,(byte) 0xc0,(byte) 0xd8,(byte) 0xc0,(byte) 0xc8,(byte) 0xc0,(byte) 0xcc,(byte) 0xc0,
-(byte) 0xc4,(byte) 0xc0,(byte) 0xc6,(byte) 0xc0,(byte) 0x63,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch248 = new BitmapCharRec(10,14,-1,1,12,ch248data);
-
-/* char: 0xf7 */
-
-static final byte[] ch247data = {
-(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,
-(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-};
-
-static final BitmapCharRec ch247 = new BitmapCharRec(12,10,-1,-2,14,ch247data);
-
-/* char: 0xf6 */
-
-static final byte[] ch246data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x33,(byte) 0x0,
-};
-
-static final BitmapCharRec ch246 = new BitmapCharRec(10,16,-1,0,12,ch246data);
-
-/* char: 0xf5 */
-
-static final byte[] ch245data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x27,(byte) 0x0,(byte) 0x1c,(byte) 0x80,
-};
-
-static final BitmapCharRec ch245 = new BitmapCharRec(10,16,-1,0,12,ch245data);
-
-/* char: 0xf4 */
-
-static final byte[] ch244data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x21,(byte) 0x0,(byte) 0x12,(byte) 0x0,(byte) 0x1e,(byte) 0x0,
-(byte) 0xc,(byte) 0x0,
-};
-
-static final BitmapCharRec ch244 = new BitmapCharRec(10,17,-1,0,12,ch244data);
-
-/* char: 0xf3 */
-
-static final byte[] ch243data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x80,
-(byte) 0x1,(byte) 0x80,
-};
-
-static final BitmapCharRec ch243 = new BitmapCharRec(10,17,-1,0,12,ch243data);
-
-/* char: 0xf2 */
-
-static final byte[] ch242data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x2,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x38,(byte) 0x0,
-(byte) 0x30,(byte) 0x0,
-};
-
-static final BitmapCharRec ch242 = new BitmapCharRec(10,17,-1,0,12,ch242data);
-
-/* char: 0xf1 */
-
-static final byte[] ch241data = {
-(byte) 0xf1,(byte) 0xe0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
-(byte) 0x60,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x6f,(byte) 0x80,(byte) 0xe7,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x27,(byte) 0x0,(byte) 0x1c,(byte) 0x80,
-};
-
-static final BitmapCharRec ch241 = new BitmapCharRec(11,16,-1,0,13,ch241data);
-
-/* char: 0xf0 */
-
-static final byte[] ch240data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1f,(byte) 0x0,(byte) 0xc6,(byte) 0x0,(byte) 0x3c,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x71,(byte) 0x80,
-(byte) 0xc0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch240 = new BitmapCharRec(10,17,-1,0,12,ch240data);
-
-/* char: 0xef */
-
-static final byte[] ch239data = {
-(byte) 0x78,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,(byte) 0x0,(byte) 0x0,(byte) 0xcc,(byte) 0xcc,
-};
-
-static final BitmapCharRec ch239 = new BitmapCharRec(6,16,0,0,6,ch239data);
-
-/* char: 0xee */
-
-static final byte[] ch238data = {
-(byte) 0x78,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,(byte) 0x0,(byte) 0x84,(byte) 0x48,(byte) 0x78,
-(byte) 0x30,
-};
-
-static final BitmapCharRec ch238 = new BitmapCharRec(6,17,0,0,6,ch238data);
-
-/* char: 0xed */
-
-static final byte[] ch237data = {
-(byte) 0xf0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xe0,(byte) 0x0,(byte) 0x80,(byte) 0x60,(byte) 0x38,
-(byte) 0x18,
-};
-
-static final BitmapCharRec ch237 = new BitmapCharRec(5,17,-1,0,6,ch237data);
-
-/* char: 0xec */
-
-static final byte[] ch236data = {
-(byte) 0x78,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,(byte) 0x0,(byte) 0x8,(byte) 0x30,(byte) 0xe0,
-(byte) 0xc0,
-};
-
-static final BitmapCharRec ch236 = new BitmapCharRec(5,17,0,0,6,ch236data);
-
-/* char: 0xeb */
-
-static final byte[] ch235data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,
-(byte) 0xc1,(byte) 0x80,(byte) 0x41,(byte) 0x80,(byte) 0x63,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x33,(byte) 0x0,
-};
-
-static final BitmapCharRec ch235 = new BitmapCharRec(9,16,-1,0,11,ch235data);
-
-/* char: 0xea */
-
-static final byte[] ch234data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,
-(byte) 0xc1,(byte) 0x80,(byte) 0x41,(byte) 0x80,(byte) 0x63,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x21,(byte) 0x0,(byte) 0x12,(byte) 0x0,(byte) 0x1e,(byte) 0x0,
-(byte) 0xc,(byte) 0x0,
-};
-
-static final BitmapCharRec ch234 = new BitmapCharRec(9,17,-1,0,11,ch234data);
-
-/* char: 0xe9 */
-
-static final byte[] ch233data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,
-(byte) 0xc1,(byte) 0x80,(byte) 0x41,(byte) 0x80,(byte) 0x63,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x7,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,
-};
-
-static final BitmapCharRec ch233 = new BitmapCharRec(9,17,-1,0,11,ch233data);
-
-/* char: 0xe8 */
-
-static final byte[] ch232data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,
-(byte) 0xc1,(byte) 0x80,(byte) 0x41,(byte) 0x80,(byte) 0x63,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x70,(byte) 0x0,
-(byte) 0x60,(byte) 0x0,
-};
-
-static final BitmapCharRec ch232 = new BitmapCharRec(9,17,-1,0,11,ch232data);
-
-/* char: 0xe7 */
-
-static final byte[] ch231data = {
-(byte) 0x3c,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,
-(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x41,(byte) 0x80,
-(byte) 0x63,(byte) 0x80,(byte) 0x1f,(byte) 0x0,
-};
-
-static final BitmapCharRec ch231 = new BitmapCharRec(9,18,-1,6,11,ch231data);
-
-/* char: 0xe6 */
-
-static final byte[] ch230data = {
-(byte) 0x70,(byte) 0xf0,(byte) 0xfb,(byte) 0xf8,(byte) 0xc7,(byte) 0x84,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0xfc,
-(byte) 0x3,(byte) 0xc,(byte) 0x63,(byte) 0xc,(byte) 0x67,(byte) 0x98,(byte) 0x3c,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch230 = new BitmapCharRec(14,12,-1,0,16,ch230data);
-
-/* char: 0xe5 */
-
-static final byte[] ch229data = {
-(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,
-(byte) 0x1c,(byte) 0x0,
-};
-
-static final BitmapCharRec ch229 = new BitmapCharRec(9,17,-1,0,11,ch229data);
-
-/* char: 0xe4 */
-
-static final byte[] ch228data = {
-(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x66,(byte) 0x0,
-};
-
-static final BitmapCharRec ch228 = new BitmapCharRec(9,16,-1,0,11,ch228data);
-
-/* char: 0xe3 */
-
-static final byte[] ch227data = {
-(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x5c,(byte) 0x0,(byte) 0x3a,(byte) 0x0,
-};
-
-static final BitmapCharRec ch227 = new BitmapCharRec(9,16,-1,0,11,ch227data);
-
-/* char: 0xe2 */
-
-static final byte[] ch226data = {
-(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x42,(byte) 0x0,(byte) 0x24,(byte) 0x0,(byte) 0x3c,(byte) 0x0,
-(byte) 0x18,(byte) 0x0,
-};
-
-static final BitmapCharRec ch226 = new BitmapCharRec(9,17,-1,0,11,ch226data);
-
-/* char: 0xe1 */
-
-static final byte[] ch225data = {
-(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x7,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,
-};
-
-static final BitmapCharRec ch225 = new BitmapCharRec(9,17,-1,0,11,ch225data);
-
-/* char: 0xe0 */
-
-static final byte[] ch224data = {
-(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x70,(byte) 0x0,
-(byte) 0x60,(byte) 0x0,
-};
-
-static final BitmapCharRec ch224 = new BitmapCharRec(9,17,-1,0,11,ch224data);
-
-/* char: 0xdf */
-
-static final byte[] ch223data = {
-(byte) 0xe7,(byte) 0x0,(byte) 0x6c,(byte) 0x80,(byte) 0x6c,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x61,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x63,(byte) 0x80,
-(byte) 0x67,(byte) 0x0,(byte) 0x6c,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x33,(byte) 0x0,
-(byte) 0x1e,(byte) 0x0,
-};
-
-static final BitmapCharRec ch223 = new BitmapCharRec(10,17,-1,0,12,ch223data);
-
-/* char: 0xde */
-
-static final byte[] ch222data = {
-(byte) 0xfc,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x70,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x18,
-(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,
-(byte) 0xfc,(byte) 0x0,
-};
-
-static final BitmapCharRec ch222 = new BitmapCharRec(13,17,-1,0,15,ch222data);
-
-/* char: 0xdd */
-
-static final byte[] ch221data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x3,(byte) 0xc0,
-(byte) 0x3,(byte) 0x40,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x20,(byte) 0xc,(byte) 0x30,(byte) 0x1c,(byte) 0x10,(byte) 0x18,(byte) 0x18,(byte) 0x38,(byte) 0x8,(byte) 0x30,(byte) 0xc,
-(byte) 0xfc,(byte) 0x3f,(byte) 0x0,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x30,
-};
-
-static final BitmapCharRec ch221 = new BitmapCharRec(16,22,0,0,16,ch221data);
-
-/* char: 0xdc */
-
-static final byte[] ch220data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x30,(byte) 0x18,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
-(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
-(byte) 0xfc,(byte) 0x1f,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x30,(byte) 0x6,(byte) 0x30,
-};
-
-static final BitmapCharRec ch220 = new BitmapCharRec(16,21,-1,0,18,ch220data);
-
-/* char: 0xdb */
-
-static final byte[] ch219data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x30,(byte) 0x18,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
-(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
-(byte) 0xfc,(byte) 0x1f,(byte) 0x0,(byte) 0x0,(byte) 0x8,(byte) 0x10,(byte) 0x6,(byte) 0x60,(byte) 0x3,(byte) 0xc0,(byte) 0x1,(byte) 0x80,
-};
-
-static final BitmapCharRec ch219 = new BitmapCharRec(16,22,-1,0,18,ch219data);
-
-/* char: 0xda */
-
-static final byte[] ch218data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x30,(byte) 0x18,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
-(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
-(byte) 0xfc,(byte) 0x1f,(byte) 0x0,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x30,
-};
-
-static final BitmapCharRec ch218 = new BitmapCharRec(16,22,-1,0,18,ch218data);
-
-/* char: 0xd9 */
-
-static final byte[] ch217data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x30,(byte) 0x18,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
-(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
-(byte) 0xfc,(byte) 0x1f,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x40,(byte) 0x1,(byte) 0x80,(byte) 0x7,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-};
-
-static final BitmapCharRec ch217 = new BitmapCharRec(16,22,-1,0,18,ch217data);
-
-/* char: 0xd8 */
-
-static final byte[] ch216data = {
-(byte) 0x20,(byte) 0x0,(byte) 0x27,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x68,(byte) 0x6,(byte) 0x64,(byte) 0x6,(byte) 0xc2,(byte) 0x3,(byte) 0xc2,(byte) 0x3,
-(byte) 0xc1,(byte) 0x3,(byte) 0xc1,(byte) 0x3,(byte) 0xc0,(byte) 0x83,(byte) 0xc0,(byte) 0x83,(byte) 0xc0,(byte) 0x43,(byte) 0x60,(byte) 0x46,(byte) 0x60,(byte) 0x26,(byte) 0x38,(byte) 0x1c,
-(byte) 0x1c,(byte) 0x38,(byte) 0x7,(byte) 0xe4,(byte) 0x0,(byte) 0x4,
-};
-
-static final BitmapCharRec ch216 = new BitmapCharRec(16,19,-1,1,18,ch216data);
-
-/* char: 0xd7 */
-
-static final byte[] ch215data = {
-(byte) 0x80,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x33,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x33,(byte) 0x0,
-(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0x80,(byte) 0x40,
-};
-
-static final BitmapCharRec ch215 = new BitmapCharRec(10,11,-2,-1,14,ch215data);
-
-/* char: 0xd6 */
-
-static final byte[] ch214data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
-(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,
-(byte) 0x7,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x60,
-};
-
-static final BitmapCharRec ch214 = new BitmapCharRec(16,21,-1,0,18,ch214data);
-
-/* char: 0xd5 */
-
-static final byte[] ch213data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
-(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,
-(byte) 0x7,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x4,(byte) 0xe0,(byte) 0x3,(byte) 0x90,
-};
-
-static final BitmapCharRec ch213 = new BitmapCharRec(16,21,-1,0,18,ch213data);
-
-/* char: 0xd4 */
-
-static final byte[] ch212data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
-(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,
-(byte) 0x7,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x8,(byte) 0x10,(byte) 0x6,(byte) 0x60,(byte) 0x3,(byte) 0xc0,(byte) 0x1,(byte) 0x80,
-};
-
-static final BitmapCharRec ch212 = new BitmapCharRec(16,22,-1,0,18,ch212data);
-
-/* char: 0xd3 */
-
-static final byte[] ch211data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
-(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,
-(byte) 0x7,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x30,
-};
-
-static final BitmapCharRec ch211 = new BitmapCharRec(16,22,-1,0,18,ch211data);
-
-/* char: 0xd2 */
-
-static final byte[] ch210data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
-(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,
-(byte) 0x7,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x40,(byte) 0x1,(byte) 0x80,(byte) 0x7,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-};
-
-static final BitmapCharRec ch210 = new BitmapCharRec(16,22,-1,0,18,ch210data);
-
-/* char: 0xd1 */
-
-static final byte[] ch209data = {
-(byte) 0xf8,(byte) 0xc,(byte) 0x20,(byte) 0x1c,(byte) 0x20,(byte) 0x1c,(byte) 0x20,(byte) 0x34,(byte) 0x20,(byte) 0x64,(byte) 0x20,(byte) 0x64,(byte) 0x20,(byte) 0xc4,(byte) 0x21,(byte) 0x84,
-(byte) 0x21,(byte) 0x84,(byte) 0x23,(byte) 0x4,(byte) 0x26,(byte) 0x4,(byte) 0x26,(byte) 0x4,(byte) 0x2c,(byte) 0x4,(byte) 0x38,(byte) 0x4,(byte) 0x38,(byte) 0x4,(byte) 0x30,(byte) 0x4,
-(byte) 0xf0,(byte) 0x1f,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x4,(byte) 0xe0,(byte) 0x3,(byte) 0x90,
-};
-
-static final BitmapCharRec ch209 = new BitmapCharRec(16,21,-1,0,18,ch209data);
-
-/* char: 0xd0 */
-
-static final byte[] ch208data = {
-(byte) 0x7f,(byte) 0xe0,(byte) 0x18,(byte) 0x38,(byte) 0x18,(byte) 0x1c,(byte) 0x18,(byte) 0x6,(byte) 0x18,(byte) 0x6,(byte) 0x18,(byte) 0x3,(byte) 0x18,(byte) 0x3,(byte) 0x18,(byte) 0x3,
-(byte) 0xff,(byte) 0x3,(byte) 0x18,(byte) 0x3,(byte) 0x18,(byte) 0x3,(byte) 0x18,(byte) 0x3,(byte) 0x18,(byte) 0x6,(byte) 0x18,(byte) 0x6,(byte) 0x18,(byte) 0x1c,(byte) 0x18,(byte) 0x38,
-(byte) 0x7f,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch208 = new BitmapCharRec(16,17,0,0,17,ch208data);
-
-/* char: 0xcf */
-
-static final byte[] ch207data = {
-(byte) 0xfc,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
-(byte) 0xfc,(byte) 0x0,(byte) 0x0,(byte) 0xcc,(byte) 0xcc,
-};
-
-static final BitmapCharRec ch207 = new BitmapCharRec(6,21,-1,0,8,ch207data);
-
-/* char: 0xce */
-
-static final byte[] ch206data = {
-(byte) 0x7e,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,
-(byte) 0x7e,(byte) 0x0,(byte) 0x81,(byte) 0x66,(byte) 0x3c,(byte) 0x18,
-};
-
-static final BitmapCharRec ch206 = new BitmapCharRec(8,22,-1,0,8,ch206data);
-
-/* char: 0xcd */
-
-static final byte[] ch205data = {
-(byte) 0xfc,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
-(byte) 0xfc,(byte) 0x0,(byte) 0x40,(byte) 0x30,(byte) 0x1c,(byte) 0xc,
-};
-
-static final BitmapCharRec ch205 = new BitmapCharRec(6,22,-1,0,8,ch205data);
-
-/* char: 0xcc */
-
-static final byte[] ch204data = {
-(byte) 0xfc,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
-(byte) 0xfc,(byte) 0x0,(byte) 0x8,(byte) 0x30,(byte) 0xe0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch204 = new BitmapCharRec(6,22,-1,0,8,ch204data);
-
-/* char: 0xcb */
-
-static final byte[] ch203data = {
-(byte) 0xff,(byte) 0xf8,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,
-(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x30,
-(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,
-};
-
-static final BitmapCharRec ch203 = new BitmapCharRec(13,21,-1,0,15,ch203data);
-
-/* char: 0xca */
-
-static final byte[] ch202data = {
-(byte) 0xff,(byte) 0xf8,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,
-(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x30,
-(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x20,(byte) 0xc,(byte) 0xc0,(byte) 0x7,(byte) 0x80,(byte) 0x3,(byte) 0x0,
-};
-
-static final BitmapCharRec ch202 = new BitmapCharRec(13,22,-1,0,15,ch202data);
-
-/* char: 0xc9 */
-
-static final byte[] ch201data = {
-(byte) 0xff,(byte) 0xf8,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,
-(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x30,
-(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch201 = new BitmapCharRec(13,22,-1,0,15,ch201data);
-
-/* char: 0xc8 */
-
-static final byte[] ch200data = {
-(byte) 0xff,(byte) 0xf8,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,
-(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x30,
-(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0x18,(byte) 0x0,
-};
-
-static final BitmapCharRec ch200 = new BitmapCharRec(13,22,-1,0,15,ch200data);
-
-/* char: 0xc7 */
-
-static final byte[] ch199data = {
-(byte) 0x7,(byte) 0x80,(byte) 0xc,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x7,(byte) 0xe0,(byte) 0x1e,(byte) 0x38,
-(byte) 0x38,(byte) 0x8,(byte) 0x60,(byte) 0x4,(byte) 0x60,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x60,(byte) 0x4,(byte) 0x60,(byte) 0x4,(byte) 0x38,(byte) 0xc,(byte) 0x1c,(byte) 0x3c,(byte) 0x7,(byte) 0xe4,
-};
-
-static final BitmapCharRec ch199 = new BitmapCharRec(14,23,-1,6,16,ch199data);
-
-/* char: 0xc6 */
-
-static final byte[] ch198data = {
-(byte) 0xf9,(byte) 0xff,(byte) 0xf0,(byte) 0x30,(byte) 0x60,(byte) 0x30,(byte) 0x10,(byte) 0x60,(byte) 0x10,(byte) 0x10,(byte) 0x60,(byte) 0x10,(byte) 0x18,(byte) 0x60,(byte) 0x0,(byte) 0x8,
-(byte) 0x60,(byte) 0x0,(byte) 0xf,(byte) 0xe0,(byte) 0x80,(byte) 0xc,(byte) 0x60,(byte) 0x80,(byte) 0x4,(byte) 0x7f,(byte) 0x80,(byte) 0x4,(byte) 0x60,(byte) 0x80,(byte) 0x6,(byte) 0x60,
-(byte) 0x80,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x20,(byte) 0x1,(byte) 0x60,(byte) 0x20,(byte) 0x1,(byte) 0xe0,(byte) 0x60,
-(byte) 0x3,(byte) 0xff,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch198 = new BitmapCharRec(20,17,0,0,21,ch198data);
-
-/* char: 0xc5 */
-
-static final byte[] ch197data = {
-(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
-(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
-(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
-(byte) 0x0,(byte) 0x80,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x2,(byte) 0x20,(byte) 0x0,(byte) 0x2,(byte) 0x20,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch197 = new BitmapCharRec(17,21,0,0,17,ch197data);
-
-/* char: 0xc4 */
-
-static final byte[] ch196data = {
-(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
-(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
-(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
-(byte) 0x0,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,(byte) 0x0,
-};
-
-static final BitmapCharRec ch196 = new BitmapCharRec(17,21,0,0,17,ch196data);
-
-/* char: 0xc3 */
-
-static final byte[] ch195data = {
-(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x7,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
-(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
-(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
-(byte) 0x0,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x4,(byte) 0xe0,(byte) 0x0,(byte) 0x3,(byte) 0x90,(byte) 0x0,
-};
-
-static final BitmapCharRec ch195 = new BitmapCharRec(17,21,0,0,17,ch195data);
-
-/* char: 0xc2 */
-
-static final byte[] ch194data = {
-(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
-(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
-(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
-(byte) 0x0,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x8,(byte) 0x10,(byte) 0x0,(byte) 0x6,(byte) 0x60,(byte) 0x0,(byte) 0x3,(byte) 0xc0,(byte) 0x0,(byte) 0x1,
-(byte) 0x80,(byte) 0x0,
-};
-
-static final BitmapCharRec ch194 = new BitmapCharRec(17,22,0,0,17,ch194data);
-
-/* char: 0xc1 */
-
-static final byte[] ch193data = {
-(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
-(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
-(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
-(byte) 0x0,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x0,
-(byte) 0x30,(byte) 0x0,
-};
-
-static final BitmapCharRec ch193 = new BitmapCharRec(17,22,0,0,17,ch193data);
-
-/* char: 0xc0 */
-
-static final byte[] ch192data = {
-(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
-(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
-(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
-(byte) 0x0,(byte) 0x80,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x20,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x3,(byte) 0x80,(byte) 0x0,(byte) 0x3,
-(byte) 0x0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch192 = new BitmapCharRec(17,22,0,0,17,ch192data);
-
-/* char: 0xbf */
-
-static final byte[] ch191data = {
-(byte) 0x3e,(byte) 0x63,(byte) 0xc1,(byte) 0xc3,(byte) 0xc3,(byte) 0xe0,(byte) 0x70,(byte) 0x30,(byte) 0x38,(byte) 0x18,(byte) 0x18,(byte) 0x8,(byte) 0x8,(byte) 0x0,(byte) 0x0,(byte) 0xc,
-(byte) 0xc,
-};
-
-static final BitmapCharRec ch191 = new BitmapCharRec(8,17,-1,5,11,ch191data);
-
-/* char: 0xbe */
-
-static final byte[] ch190data = {
-(byte) 0x18,(byte) 0x2,(byte) 0x0,(byte) 0x8,(byte) 0x2,(byte) 0x0,(byte) 0xc,(byte) 0x7f,(byte) 0x80,(byte) 0x4,(byte) 0x22,(byte) 0x0,(byte) 0x6,(byte) 0x32,(byte) 0x0,(byte) 0x3,
-(byte) 0x12,(byte) 0x0,(byte) 0x1,(byte) 0xa,(byte) 0x0,(byte) 0x71,(byte) 0x8e,(byte) 0x0,(byte) 0x88,(byte) 0x86,(byte) 0x0,(byte) 0x8c,(byte) 0xc2,(byte) 0x0,(byte) 0xc,(byte) 0x60,
-(byte) 0x0,(byte) 0x8,(byte) 0x20,(byte) 0x0,(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0x8,(byte) 0x10,(byte) 0x0,(byte) 0x8c,(byte) 0x18,(byte) 0x0,(byte) 0x4c,(byte) 0xc,(byte) 0x0,
-(byte) 0x38,(byte) 0x4,(byte) 0x0,
-};
-
-static final BitmapCharRec ch190 = new BitmapCharRec(17,17,0,0,18,ch190data);
-
-/* char: 0xbd */
-
-static final byte[] ch189data = {
-(byte) 0x30,(byte) 0x7e,(byte) 0x10,(byte) 0x22,(byte) 0x18,(byte) 0x10,(byte) 0x8,(byte) 0x18,(byte) 0xc,(byte) 0x8,(byte) 0x6,(byte) 0x4,(byte) 0x2,(byte) 0x6,(byte) 0xfb,(byte) 0x46,
-(byte) 0x21,(byte) 0x26,(byte) 0x21,(byte) 0x9c,(byte) 0x20,(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0x20,(byte) 0x60,(byte) 0x20,(byte) 0x20,(byte) 0xa0,(byte) 0x30,(byte) 0x60,(byte) 0x18,
-(byte) 0x20,(byte) 0x8,
-};
-
-static final BitmapCharRec ch189 = new BitmapCharRec(15,17,-1,0,18,ch189data);
-
-/* char: 0xbc */
-
-static final byte[] ch188data = {
-(byte) 0x30,(byte) 0x4,(byte) 0x10,(byte) 0x4,(byte) 0x18,(byte) 0xff,(byte) 0x8,(byte) 0x44,(byte) 0xc,(byte) 0x64,(byte) 0x6,(byte) 0x24,(byte) 0x2,(byte) 0x14,(byte) 0xfb,(byte) 0x1c,
-(byte) 0x21,(byte) 0xc,(byte) 0x21,(byte) 0x84,(byte) 0x20,(byte) 0xc0,(byte) 0x20,(byte) 0x40,(byte) 0x20,(byte) 0x60,(byte) 0x20,(byte) 0x20,(byte) 0xa0,(byte) 0x30,(byte) 0x60,(byte) 0x18,
-(byte) 0x20,(byte) 0x8,
-};
-
-static final BitmapCharRec ch188 = new BitmapCharRec(16,17,-1,0,18,ch188data);
-
-/* char: 0xbb */
-
-static final byte[] ch187data = {
-(byte) 0x88,(byte) 0x0,(byte) 0xcc,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x19,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0x33,(byte) 0x0,(byte) 0x66,(byte) 0x0,
-(byte) 0xcc,(byte) 0x0,(byte) 0x88,(byte) 0x0,
-};
-
-static final BitmapCharRec ch187 = new BitmapCharRec(9,10,-2,-1,12,ch187data);
-
-/* char: 0xba */
-
-static final byte[] ch186data = {
-(byte) 0xfc,(byte) 0x0,(byte) 0x78,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0x78,
-};
-
-static final BitmapCharRec ch186 = new BitmapCharRec(6,9,-1,-8,8,ch186data);
-
-/* char: 0xb9 */
-
-static final byte[] ch185data = {
-(byte) 0xf8,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0x20,(byte) 0xa0,(byte) 0x60,(byte) 0x20,
-};
-
-static final BitmapCharRec ch185 = new BitmapCharRec(5,10,-1,-7,7,ch185data);
-
-/* char: 0xb8 */
-
-static final byte[] ch184data = {
-(byte) 0x78,(byte) 0xcc,(byte) 0xc,(byte) 0x3c,(byte) 0x30,(byte) 0x10,
-};
-
-static final BitmapCharRec ch184 = new BitmapCharRec(6,6,-1,6,8,ch184data);
-
-/* char: 0xb7 */
-
-static final byte[] ch183data = {
-(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch183 = new BitmapCharRec(2,2,-2,-6,6,ch183data);
-
-/* char: 0xb6 */
-
-static final byte[] ch182data = {
-(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,
-(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x9,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x39,(byte) 0x0,(byte) 0x79,(byte) 0x0,(byte) 0x79,(byte) 0x0,(byte) 0xf9,(byte) 0x0,
-(byte) 0xf9,(byte) 0x0,(byte) 0xf9,(byte) 0x0,(byte) 0x79,(byte) 0x0,(byte) 0x79,(byte) 0x0,(byte) 0x39,(byte) 0x0,(byte) 0x1f,(byte) 0x80,
-};
-
-static final BitmapCharRec ch182 = new BitmapCharRec(9,22,-1,5,11,ch182data);
-
-/* char: 0xb5 */
-
-static final byte[] ch181data = {
-(byte) 0x40,(byte) 0x0,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x0,(byte) 0x5c,(byte) 0xe0,(byte) 0x7e,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,
-(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
-(byte) 0xe1,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch181 = new BitmapCharRec(11,17,-1,5,13,ch181data);
-
-/* char: 0xb4 */
-
-static final byte[] ch180data = {
-(byte) 0x80,(byte) 0x60,(byte) 0x38,(byte) 0x18,
-};
-
-static final BitmapCharRec ch180 = new BitmapCharRec(5,4,-2,-13,8,ch180data);
-
-/* char: 0xb3 */
-
-static final byte[] ch179data = {
-(byte) 0x70,(byte) 0x88,(byte) 0x8c,(byte) 0xc,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x8c,(byte) 0x4c,(byte) 0x38,
-};
-
-static final BitmapCharRec ch179 = new BitmapCharRec(6,10,0,-7,7,ch179data);
-
-/* char: 0xb2 */
-
-static final byte[] ch178data = {
-(byte) 0xfc,(byte) 0x44,(byte) 0x20,(byte) 0x30,(byte) 0x10,(byte) 0x8,(byte) 0xc,(byte) 0x8c,(byte) 0x4c,(byte) 0x38,
-};
-
-static final BitmapCharRec ch178 = new BitmapCharRec(6,10,0,-7,7,ch178data);
-
-/* char: 0xb1 */
-
-static final byte[] ch177data = {
-(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-};
-
-static final BitmapCharRec ch177 = new BitmapCharRec(12,15,-1,0,14,ch177data);
-
-/* char: 0xb0 */
-
-static final byte[] ch176data = {
-(byte) 0x38,(byte) 0x44,(byte) 0x82,(byte) 0x82,(byte) 0x82,(byte) 0x44,(byte) 0x38,
-};
-
-static final BitmapCharRec ch176 = new BitmapCharRec(7,7,-1,-10,9,ch176data);
-
-/* char: 0xaf */
-
-static final byte[] ch175data = {
-(byte) 0xfc,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch175 = new BitmapCharRec(6,2,-1,-14,8,ch175data);
-
-/* char: 0xae */
-
-static final byte[] ch174data = {
-(byte) 0x7,(byte) 0xf0,(byte) 0x0,(byte) 0x1c,(byte) 0x1c,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x60,(byte) 0x3,(byte) 0x0,(byte) 0x47,(byte) 0x19,(byte) 0x0,(byte) 0xc2,
-(byte) 0x31,(byte) 0x80,(byte) 0x82,(byte) 0x20,(byte) 0x80,(byte) 0x82,(byte) 0x40,(byte) 0x80,(byte) 0x83,(byte) 0xe0,(byte) 0x80,(byte) 0x82,(byte) 0x30,(byte) 0x80,(byte) 0x82,(byte) 0x10,
-(byte) 0x80,(byte) 0xc2,(byte) 0x11,(byte) 0x80,(byte) 0x42,(byte) 0x31,(byte) 0x0,(byte) 0x67,(byte) 0xe3,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x1c,(byte) 0x1c,(byte) 0x0,
-(byte) 0x7,(byte) 0xf0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch174 = new BitmapCharRec(17,17,-1,0,19,ch174data);
-
-/* char: 0xad */
-
-static final byte[] ch173data = {
-(byte) 0xfe,(byte) 0xfe,
-};
-
-static final BitmapCharRec ch173 = new BitmapCharRec(7,2,-1,-5,9,ch173data);
-
-/* char: 0xac */
-
-static final byte[] ch172data = {
-(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch172 = new BitmapCharRec(12,7,-1,-3,14,ch172data);
-
-/* char: 0xab */
-
-static final byte[] ch171data = {
-(byte) 0x8,(byte) 0x80,(byte) 0x19,(byte) 0x80,(byte) 0x33,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0xcc,(byte) 0x0,(byte) 0xcc,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x33,(byte) 0x0,
-(byte) 0x19,(byte) 0x80,(byte) 0x8,(byte) 0x80,
-};
-
-static final BitmapCharRec ch171 = new BitmapCharRec(9,10,-2,-1,13,ch171data);
-
-/* char: 0xaa */
-
-static final byte[] ch170data = {
-(byte) 0x7e,(byte) 0x0,(byte) 0x76,(byte) 0xcc,(byte) 0xcc,(byte) 0x7c,(byte) 0xc,(byte) 0xcc,(byte) 0x78,
-};
-
-static final BitmapCharRec ch170 = new BitmapCharRec(7,9,0,-8,8,ch170data);
-
-/* char: 0xa9 */
-
-static final byte[] ch169data = {
-(byte) 0x7,(byte) 0xf0,(byte) 0x0,(byte) 0x1c,(byte) 0x1c,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x61,(byte) 0xc3,(byte) 0x0,(byte) 0x47,(byte) 0x71,(byte) 0x0,(byte) 0xc4,
-(byte) 0x19,(byte) 0x80,(byte) 0x8c,(byte) 0x0,(byte) 0x80,(byte) 0x88,(byte) 0x0,(byte) 0x80,(byte) 0x88,(byte) 0x0,(byte) 0x80,(byte) 0x88,(byte) 0x0,(byte) 0x80,(byte) 0x8c,(byte) 0x0,
-(byte) 0x80,(byte) 0xc4,(byte) 0x19,(byte) 0x80,(byte) 0x47,(byte) 0x31,(byte) 0x0,(byte) 0x61,(byte) 0xe3,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x1c,(byte) 0x1c,(byte) 0x0,
-(byte) 0x7,(byte) 0xf0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch169 = new BitmapCharRec(17,17,-1,0,19,ch169data);
-
-/* char: 0xa8 */
-
-static final byte[] ch168data = {
-(byte) 0xcc,(byte) 0xcc,
-};
-
-static final BitmapCharRec ch168 = new BitmapCharRec(6,2,-1,-14,8,ch168data);
-
-/* char: 0xa7 */
-
-static final byte[] ch167data = {
-(byte) 0x38,(byte) 0x64,(byte) 0x62,(byte) 0x6,(byte) 0xe,(byte) 0x1c,(byte) 0x38,(byte) 0x74,(byte) 0xe2,(byte) 0xc3,(byte) 0x83,(byte) 0x87,(byte) 0x4e,(byte) 0x3c,(byte) 0x38,(byte) 0x70,
-(byte) 0x60,(byte) 0x46,(byte) 0x26,(byte) 0x1c,
-};
-
-static final BitmapCharRec ch167 = new BitmapCharRec(8,20,-2,2,12,ch167data);
-
-/* char: 0xa6 */
-
-static final byte[] ch166data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,
-};
-
-static final BitmapCharRec ch166 = new BitmapCharRec(2,17,-2,0,6,ch166data);
-
-/* char: 0xa5 */
-
-static final byte[] ch165data = {
-(byte) 0xf,(byte) 0xc0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x1f,(byte) 0xe0,(byte) 0x3,(byte) 0x0,(byte) 0x1f,(byte) 0xe0,
-(byte) 0x3,(byte) 0x0,(byte) 0x7,(byte) 0x80,(byte) 0xc,(byte) 0x80,(byte) 0xc,(byte) 0xc0,(byte) 0x18,(byte) 0x40,(byte) 0x18,(byte) 0x60,(byte) 0x30,(byte) 0x20,(byte) 0x70,(byte) 0x30,
-(byte) 0xf8,(byte) 0x7c,
-};
-
-static final BitmapCharRec ch165 = new BitmapCharRec(14,17,0,0,14,ch165data);
-
-/* char: 0xa4 */
-
-static final byte[] ch164data = {
-(byte) 0xc0,(byte) 0x60,(byte) 0xee,(byte) 0xe0,(byte) 0x7f,(byte) 0xc0,(byte) 0x31,(byte) 0x80,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
-(byte) 0x31,(byte) 0x80,(byte) 0x7f,(byte) 0xc0,(byte) 0xee,(byte) 0xe0,(byte) 0xc0,(byte) 0x60,
-};
-
-static final BitmapCharRec ch164 = new BitmapCharRec(11,12,-1,-3,13,ch164data);
-
-/* char: 0xa3 */
-
-static final byte[] ch163data = {
-(byte) 0xe7,(byte) 0x80,(byte) 0xbe,(byte) 0xc0,(byte) 0x78,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,
-(byte) 0x30,(byte) 0x0,(byte) 0xfc,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x31,(byte) 0x80,(byte) 0x19,(byte) 0x80,
-(byte) 0xf,(byte) 0x0,
-};
-
-static final BitmapCharRec ch163 = new BitmapCharRec(10,17,-1,0,12,ch163data);
-
-/* char: 0xa2 */
-
-static final byte[] ch162data = {
-(byte) 0x40,(byte) 0x0,(byte) 0x40,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xd0,(byte) 0x0,(byte) 0xc8,(byte) 0x0,(byte) 0xc8,(byte) 0x0,
-(byte) 0xc8,(byte) 0x0,(byte) 0xc4,(byte) 0x0,(byte) 0xc4,(byte) 0x0,(byte) 0x43,(byte) 0x80,(byte) 0x63,(byte) 0x80,(byte) 0x1f,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x1,(byte) 0x0,
-};
-
-static final BitmapCharRec ch162 = new BitmapCharRec(9,16,-1,2,12,ch162data);
-
-/* char: 0xa1 */
-
-static final byte[] ch161data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,
-(byte) 0xc0,
-};
-
-static final BitmapCharRec ch161 = new BitmapCharRec(2,17,-4,5,8,ch161data);
-
-/* char: 0xa0 */
-
-static final BitmapCharRec ch160 = new BitmapCharRec(0,0,0,0,6,null);
-
-/* char: 0x7e '~' */
-
-static final byte[] ch126data = {
-(byte) 0x83,(byte) 0x80,(byte) 0xc7,(byte) 0xc0,(byte) 0x7c,(byte) 0x60,(byte) 0x38,(byte) 0x20,
-};
-
-static final BitmapCharRec ch126 = new BitmapCharRec(11,4,-1,-5,13,ch126data);
-
-/* char: 0x7d '}' */
-
-static final byte[] ch125data = {
-(byte) 0xe0,(byte) 0x30,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x8,(byte) 0xc,(byte) 0x4,(byte) 0x3,(byte) 0x4,(byte) 0xc,(byte) 0x8,(byte) 0x18,
-(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x30,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch125 = new BitmapCharRec(8,22,-1,5,10,ch125data);
-
-/* char: 0x7c '|' */
-
-static final byte[] ch124data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,
-};
-
-static final BitmapCharRec ch124 = new BitmapCharRec(2,17,-2,0,6,ch124data);
-
-/* char: 0x7b '{' */
-
-static final byte[] ch123data = {
-(byte) 0x7,(byte) 0xc,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x10,(byte) 0x30,(byte) 0x20,(byte) 0xc0,(byte) 0x20,(byte) 0x30,(byte) 0x10,(byte) 0x18,
-(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xc,(byte) 0x7,
-};
-
-static final BitmapCharRec ch123 = new BitmapCharRec(8,22,-1,5,10,ch123data);
-
-/* char: 0x7a 'z' */
-
-static final byte[] ch122data = {
-(byte) 0xff,(byte) 0xc3,(byte) 0x61,(byte) 0x70,(byte) 0x30,(byte) 0x38,(byte) 0x18,(byte) 0x1c,(byte) 0xe,(byte) 0x86,(byte) 0xc3,(byte) 0xff,
-};
-
-static final BitmapCharRec ch122 = new BitmapCharRec(8,12,-1,0,10,ch122data);
-
-/* char: 0x79 'y' */
-
-static final byte[] ch121data = {
-(byte) 0xe0,(byte) 0x0,(byte) 0xf0,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x8,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xe,(byte) 0x0,
-(byte) 0x1a,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x31,(byte) 0x0,(byte) 0x30,(byte) 0x80,(byte) 0x30,(byte) 0x80,(byte) 0x60,(byte) 0x80,(byte) 0x60,(byte) 0xc0,
-(byte) 0xf1,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch121 = new BitmapCharRec(11,17,0,5,11,ch121data);
-
-/* char: 0x78 'x' */
-
-static final byte[] ch120data = {
-(byte) 0xf1,(byte) 0xe0,(byte) 0x60,(byte) 0xc0,(byte) 0x21,(byte) 0x80,(byte) 0x33,(byte) 0x80,(byte) 0x1b,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x1a,(byte) 0x0,
-(byte) 0x39,(byte) 0x0,(byte) 0x31,(byte) 0x80,(byte) 0x60,(byte) 0xc0,(byte) 0xf1,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch120 = new BitmapCharRec(11,12,-1,0,13,ch120data);
-
-/* char: 0x77 'w' */
-
-static final byte[] ch119data = {
-(byte) 0x4,(byte) 0x10,(byte) 0x0,(byte) 0xe,(byte) 0x38,(byte) 0x0,(byte) 0xe,(byte) 0x38,(byte) 0x0,(byte) 0x1a,(byte) 0x28,(byte) 0x0,(byte) 0x1a,(byte) 0x64,(byte) 0x0,(byte) 0x19,
-(byte) 0x64,(byte) 0x0,(byte) 0x31,(byte) 0x64,(byte) 0x0,(byte) 0x30,(byte) 0xc2,(byte) 0x0,(byte) 0x30,(byte) 0xc2,(byte) 0x0,(byte) 0x60,(byte) 0xc2,(byte) 0x0,(byte) 0x60,(byte) 0xc3,
-(byte) 0x0,(byte) 0xf1,(byte) 0xe7,(byte) 0x80,
-};
-
-static final BitmapCharRec ch119 = new BitmapCharRec(17,12,0,0,17,ch119data);
-
-/* char: 0x76 'v' */
-
-static final byte[] ch118data = {
-(byte) 0x4,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0xe,(byte) 0x0,(byte) 0x1a,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x19,(byte) 0x0,(byte) 0x31,(byte) 0x0,(byte) 0x30,(byte) 0x80,
-(byte) 0x30,(byte) 0x80,(byte) 0x60,(byte) 0x80,(byte) 0x60,(byte) 0xc0,(byte) 0xf1,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch118 = new BitmapCharRec(11,12,0,0,11,ch118data);
-
-/* char: 0x75 'u' */
-
-static final byte[] ch117data = {
-(byte) 0x1c,(byte) 0xe0,(byte) 0x3e,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
-(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0xe1,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch117 = new BitmapCharRec(11,12,-1,0,13,ch117data);
-
-/* char: 0x74 't' */
-
-static final byte[] ch116data = {
-(byte) 0x1c,(byte) 0x32,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0xfe,(byte) 0x70,(byte) 0x30,(byte) 0x10,
-};
-
-static final BitmapCharRec ch116 = new BitmapCharRec(7,15,0,0,7,ch116data);
-
-/* char: 0x73 's' */
-
-static final byte[] ch115data = {
-(byte) 0xf8,(byte) 0xc6,(byte) 0x83,(byte) 0x3,(byte) 0x7,(byte) 0x1e,(byte) 0x7c,(byte) 0x70,(byte) 0xe0,(byte) 0xc2,(byte) 0x66,(byte) 0x3e,
-};
-
-static final BitmapCharRec ch115 = new BitmapCharRec(8,12,-1,0,10,ch115data);
-
-/* char: 0x72 'r' */
-
-static final byte[] ch114data = {
-(byte) 0xf0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x76,(byte) 0x6e,(byte) 0xe6,
-};
-
-static final BitmapCharRec ch114 = new BitmapCharRec(7,12,-1,0,8,ch114data);
-
-/* char: 0x71 'q' */
-
-static final byte[] ch113data = {
-(byte) 0x3,(byte) 0xc0,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1d,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,
-(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,
-(byte) 0x1d,(byte) 0x80,
-};
-
-static final BitmapCharRec ch113 = new BitmapCharRec(10,17,-1,5,12,ch113data);
-
-/* char: 0x70 'p' */
-
-static final byte[] ch112data = {
-(byte) 0xf0,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x6e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,
-(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,
-(byte) 0xee,(byte) 0x0,
-};
-
-static final BitmapCharRec ch112 = new BitmapCharRec(10,17,-1,5,12,ch112data);
-
-/* char: 0x6f 'o' */
-
-static final byte[] ch111data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1e,(byte) 0x0,
-};
-
-static final BitmapCharRec ch111 = new BitmapCharRec(10,12,-1,0,12,ch111data);
-
-/* char: 0x6e 'n' */
-
-static final byte[] ch110data = {
-(byte) 0xf1,(byte) 0xe0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
-(byte) 0x60,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x6f,(byte) 0x80,(byte) 0xe7,(byte) 0x0,
-};
-
-static final BitmapCharRec ch110 = new BitmapCharRec(11,12,-1,0,13,ch110data);
-
-/* char: 0x6d 'm' */
-
-static final byte[] ch109data = {
-(byte) 0xf1,(byte) 0xe3,(byte) 0xc0,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x60,
-(byte) 0xc1,(byte) 0x80,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x60,(byte) 0xc1,(byte) 0x80,(byte) 0x71,(byte) 0xe3,(byte) 0x80,(byte) 0x6f,(byte) 0x9f,
-(byte) 0x0,(byte) 0xe7,(byte) 0xe,(byte) 0x0,
-};
-
-static final BitmapCharRec ch109 = new BitmapCharRec(18,12,-1,0,20,ch109data);
-
-/* char: 0x6c 'l' */
-
-static final byte[] ch108data = {
-(byte) 0xf0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,
-(byte) 0xe0,
-};
-
-static final BitmapCharRec ch108 = new BitmapCharRec(4,17,-1,0,6,ch108data);
-
-/* char: 0x6b 'k' */
-
-static final byte[] ch107data = {
-(byte) 0xf3,(byte) 0xe0,(byte) 0x61,(byte) 0xc0,(byte) 0x63,(byte) 0x80,(byte) 0x67,(byte) 0x0,(byte) 0x6e,(byte) 0x0,(byte) 0x6c,(byte) 0x0,(byte) 0x78,(byte) 0x0,(byte) 0x68,(byte) 0x0,
-(byte) 0x64,(byte) 0x0,(byte) 0x66,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0xc0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,
-(byte) 0xe0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch107 = new BitmapCharRec(11,17,-1,0,12,ch107data);
-
-/* char: 0x6a 'j' */
-
-static final byte[] ch106data = {
-(byte) 0xc0,(byte) 0xe0,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
-(byte) 0x70,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x30,
-};
-
-static final BitmapCharRec ch106 = new BitmapCharRec(4,22,0,5,6,ch106data);
-
-/* char: 0x69 'i' */
-
-static final byte[] ch105data = {
-(byte) 0xf0,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0x60,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x60,
-(byte) 0x60,
-};
-
-static final BitmapCharRec ch105 = new BitmapCharRec(4,17,-1,0,6,ch105data);
-
-/* char: 0x68 'h' */
-
-static final byte[] ch104data = {
-(byte) 0xf1,(byte) 0xe0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
-(byte) 0x60,(byte) 0xc0,(byte) 0x71,(byte) 0xc0,(byte) 0x6f,(byte) 0x80,(byte) 0x67,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,
-(byte) 0xe0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch104 = new BitmapCharRec(11,17,-1,0,13,ch104data);
-
-/* char: 0x67 'g' */
-
-static final byte[] ch103data = {
-(byte) 0x3f,(byte) 0x0,(byte) 0xf1,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x20,(byte) 0x60,(byte) 0x60,(byte) 0x3f,(byte) 0xc0,(byte) 0x7f,(byte) 0x0,(byte) 0x60,(byte) 0x0,
-(byte) 0x30,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x33,(byte) 0x0,
-(byte) 0x1f,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch103 = new BitmapCharRec(11,17,-1,5,12,ch103data);
-
-/* char: 0x66 'f' */
-
-static final byte[] ch102data = {
-(byte) 0x78,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0xfe,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x16,
-(byte) 0xe,
-};
-
-static final BitmapCharRec ch102 = new BitmapCharRec(7,17,0,0,7,ch102data);
-
-/* char: 0x65 'e' */
-
-static final byte[] ch101data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xff,(byte) 0x80,
-(byte) 0xc1,(byte) 0x80,(byte) 0x41,(byte) 0x80,(byte) 0x63,(byte) 0x0,(byte) 0x1e,(byte) 0x0,
-};
-
-static final BitmapCharRec ch101 = new BitmapCharRec(9,12,-1,0,11,ch101data);
-
-/* char: 0x64 'd' */
-
-static final byte[] ch100data = {
-(byte) 0x1e,(byte) 0xc0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0xc1,(byte) 0x80,
-(byte) 0xc1,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x1d,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,
-(byte) 0x3,(byte) 0x80,
-};
-
-static final BitmapCharRec ch100 = new BitmapCharRec(10,17,-1,0,12,ch100data);
-
-/* char: 0x63 'c' */
-
-static final byte[] ch99data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x7f,(byte) 0x0,(byte) 0x70,(byte) 0x80,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
-(byte) 0xc0,(byte) 0x0,(byte) 0x41,(byte) 0x80,(byte) 0x63,(byte) 0x80,(byte) 0x1f,(byte) 0x0,
-};
-
-static final BitmapCharRec ch99 = new BitmapCharRec(9,12,-1,0,11,ch99data);
-
-/* char: 0x62 'b' */
-
-static final byte[] ch98data = {
-(byte) 0x5e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,(byte) 0x60,(byte) 0xc0,
-(byte) 0x60,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x73,(byte) 0x80,(byte) 0x6e,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,
-(byte) 0xe0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch98 = new BitmapCharRec(10,17,-1,0,12,ch98data);
-
-/* char: 0x61 'a' */
-
-static final byte[] ch97data = {
-(byte) 0x71,(byte) 0x80,(byte) 0xfb,(byte) 0x0,(byte) 0xc7,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x3b,(byte) 0x0,(byte) 0xf,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x67,(byte) 0x0,(byte) 0x3e,(byte) 0x0,
-};
-
-static final BitmapCharRec ch97 = new BitmapCharRec(9,12,-1,0,11,ch97data);
-
-/* char: 0x60 '`' */
-
-static final byte[] ch96data = {
-(byte) 0x60,(byte) 0xe0,(byte) 0x80,(byte) 0xc0,(byte) 0x60,
-};
-
-static final BitmapCharRec ch96 = new BitmapCharRec(3,5,-2,-12,7,ch96data);
-
-/* char: 0x5f '_' */
-
-static final byte[] ch95data = {
-(byte) 0xff,(byte) 0xf8,(byte) 0xff,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch95 = new BitmapCharRec(13,2,0,5,13,ch95data);
-
-/* char: 0x5e '^' */
-
-static final byte[] ch94data = {
-(byte) 0x80,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x41,(byte) 0x0,(byte) 0x63,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x36,(byte) 0x0,(byte) 0x14,(byte) 0x0,(byte) 0x1c,(byte) 0x0,
-(byte) 0x8,(byte) 0x0,
-};
-
-static final BitmapCharRec ch94 = new BitmapCharRec(9,9,-1,-8,11,ch94data);
-
-/* char: 0x5d ']' */
-
-static final byte[] ch93data = {
-(byte) 0xf8,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,
-(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch93 = new BitmapCharRec(5,21,-1,4,8,ch93data);
-
-/* char: 0x5c '\' */
-
-static final byte[] ch92data = {
-(byte) 0x6,(byte) 0x6,(byte) 0x4,(byte) 0xc,(byte) 0xc,(byte) 0x8,(byte) 0x18,(byte) 0x18,(byte) 0x10,(byte) 0x30,(byte) 0x30,(byte) 0x20,(byte) 0x60,(byte) 0x60,(byte) 0x40,(byte) 0xc0,
-(byte) 0xc0,
-};
-
-static final BitmapCharRec ch92 = new BitmapCharRec(7,17,0,0,7,ch92data);
-
-/* char: 0x5b '[' */
-
-static final byte[] ch91data = {
-(byte) 0xf8,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch91 = new BitmapCharRec(5,21,-2,4,8,ch91data);
-
-/* char: 0x5a 'Z' */
-
-static final byte[] ch90data = {
-(byte) 0xff,(byte) 0xf8,(byte) 0xe0,(byte) 0x18,(byte) 0x70,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x38,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0xe,(byte) 0x0,
-(byte) 0x6,(byte) 0x0,(byte) 0x7,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x80,(byte) 0x1,(byte) 0xc0,(byte) 0x80,(byte) 0xc0,(byte) 0x80,(byte) 0xe0,(byte) 0xc0,(byte) 0x70,
-(byte) 0xff,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch90 = new BitmapCharRec(13,17,-1,0,15,ch90data);
-
-/* char: 0x59 'Y' */
-
-static final byte[] ch89data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x3,(byte) 0xc0,
-(byte) 0x3,(byte) 0x40,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x20,(byte) 0xc,(byte) 0x30,(byte) 0x1c,(byte) 0x10,(byte) 0x18,(byte) 0x18,(byte) 0x38,(byte) 0x8,(byte) 0x30,(byte) 0xc,
-(byte) 0xfc,(byte) 0x3f,
-};
-
-static final BitmapCharRec ch89 = new BitmapCharRec(16,17,0,0,16,ch89data);
-
-/* char: 0x58 'X' */
-
-static final byte[] ch88data = {
-(byte) 0xfc,(byte) 0xf,(byte) 0xc0,(byte) 0x30,(byte) 0x3,(byte) 0x80,(byte) 0x18,(byte) 0x7,(byte) 0x0,(byte) 0x8,(byte) 0xe,(byte) 0x0,(byte) 0x4,(byte) 0xc,(byte) 0x0,(byte) 0x6,
-(byte) 0x18,(byte) 0x0,(byte) 0x2,(byte) 0x38,(byte) 0x0,(byte) 0x1,(byte) 0x70,(byte) 0x0,(byte) 0x0,(byte) 0xe0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,
-(byte) 0x0,(byte) 0x3,(byte) 0xa0,(byte) 0x0,(byte) 0x3,(byte) 0x10,(byte) 0x0,(byte) 0x6,(byte) 0x8,(byte) 0x0,(byte) 0xe,(byte) 0xc,(byte) 0x0,(byte) 0x1c,(byte) 0x6,(byte) 0x0,
-(byte) 0x7e,(byte) 0xf,(byte) 0x80,
-};
-
-static final BitmapCharRec ch88 = new BitmapCharRec(18,17,0,0,18,ch88data);
-
-/* char: 0x57 'W' */
-
-static final byte[] ch87data = {
-(byte) 0x1,(byte) 0x83,(byte) 0x0,(byte) 0x1,(byte) 0x83,(byte) 0x0,(byte) 0x1,(byte) 0x83,(byte) 0x80,(byte) 0x3,(byte) 0x87,(byte) 0x80,(byte) 0x3,(byte) 0x46,(byte) 0x80,(byte) 0x3,
-(byte) 0x46,(byte) 0xc0,(byte) 0x6,(byte) 0x46,(byte) 0x40,(byte) 0x6,(byte) 0x4c,(byte) 0x40,(byte) 0x6,(byte) 0x4c,(byte) 0x60,(byte) 0xc,(byte) 0x2c,(byte) 0x60,(byte) 0xc,(byte) 0x2c,
-(byte) 0x20,(byte) 0x18,(byte) 0x2c,(byte) 0x20,(byte) 0x18,(byte) 0x18,(byte) 0x30,(byte) 0x18,(byte) 0x18,(byte) 0x10,(byte) 0x30,(byte) 0x18,(byte) 0x10,(byte) 0x30,(byte) 0x18,(byte) 0x18,
-(byte) 0xfc,(byte) 0x7e,(byte) 0x7e,
-};
-
-static final BitmapCharRec ch87 = new BitmapCharRec(23,17,0,0,23,ch87data);
-
-/* char: 0x56 'V' */
-
-static final byte[] ch86data = {
-(byte) 0x1,(byte) 0x80,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x0,(byte) 0x3,(byte) 0xc0,(byte) 0x0,(byte) 0x3,(byte) 0x40,(byte) 0x0,(byte) 0x3,
-(byte) 0x60,(byte) 0x0,(byte) 0x6,(byte) 0x20,(byte) 0x0,(byte) 0x6,(byte) 0x20,(byte) 0x0,(byte) 0x6,(byte) 0x30,(byte) 0x0,(byte) 0xc,(byte) 0x10,(byte) 0x0,(byte) 0xc,(byte) 0x18,
-(byte) 0x0,(byte) 0x18,(byte) 0x8,(byte) 0x0,(byte) 0x18,(byte) 0x8,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x30,(byte) 0x4,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,
-(byte) 0xfc,(byte) 0x1f,(byte) 0x80,
-};
-
-static final BitmapCharRec ch86 = new BitmapCharRec(17,17,0,0,17,ch86data);
-
-/* char: 0x55 'U' */
-
-static final byte[] ch85data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x30,(byte) 0x18,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
-(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,(byte) 0x30,(byte) 0x4,
-(byte) 0xfc,(byte) 0x1f,
-};
-
-static final BitmapCharRec ch85 = new BitmapCharRec(16,17,-1,0,18,ch85data);
-
-/* char: 0x54 'T' */
-
-static final byte[] ch84data = {
-(byte) 0xf,(byte) 0xc0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x83,(byte) 0x4,(byte) 0x83,(byte) 0x4,(byte) 0xc3,(byte) 0xc,
-(byte) 0xff,(byte) 0xfc,
-};
-
-static final BitmapCharRec ch84 = new BitmapCharRec(14,17,-1,0,16,ch84data);
-
-/* char: 0x53 'S' */
-
-static final byte[] ch83data = {
-(byte) 0x9e,(byte) 0x0,(byte) 0xf1,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0x80,(byte) 0x60,(byte) 0x80,(byte) 0x60,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0xe0,(byte) 0x3,(byte) 0xc0,
-(byte) 0xf,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x78,(byte) 0x0,(byte) 0xe0,(byte) 0x0,(byte) 0xc0,(byte) 0x40,(byte) 0xc0,(byte) 0x40,(byte) 0xc0,(byte) 0xc0,(byte) 0x63,(byte) 0xc0,
-(byte) 0x1e,(byte) 0x40,
-};
-
-static final BitmapCharRec ch83 = new BitmapCharRec(11,17,-1,0,13,ch83data);
-
-/* char: 0x52 'R' */
-
-static final byte[] ch82data = {
-(byte) 0xfc,(byte) 0x1e,(byte) 0x30,(byte) 0x1c,(byte) 0x30,(byte) 0x38,(byte) 0x30,(byte) 0x70,(byte) 0x30,(byte) 0x60,(byte) 0x30,(byte) 0xc0,(byte) 0x31,(byte) 0xc0,(byte) 0x33,(byte) 0x80,
-(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x70,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x38,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x38,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,
-(byte) 0xff,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch82 = new BitmapCharRec(15,17,-1,0,16,ch82data);
-
-/* char: 0x51 'Q' */
-
-static final byte[] ch81data = {
-(byte) 0x0,(byte) 0xf,(byte) 0x0,(byte) 0x38,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0xe0,(byte) 0x1,(byte) 0xc0,(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,
-(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
-(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,(byte) 0x7,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch81 = new BitmapCharRec(16,22,-1,5,18,ch81data);
-
-/* char: 0x50 'P' */
-
-static final byte[] ch80data = {
-(byte) 0xfc,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,
-(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x70,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,
-(byte) 0xff,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch80 = new BitmapCharRec(13,17,-1,0,15,ch80data);
-
-/* char: 0x4f 'O' */
-
-static final byte[] ch79data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1c,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,
-(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0xc0,(byte) 0x3,(byte) 0x60,(byte) 0x6,(byte) 0x60,(byte) 0x6,(byte) 0x38,(byte) 0x1c,(byte) 0x1c,(byte) 0x38,
-(byte) 0x7,(byte) 0xe0,
-};
-
-static final BitmapCharRec ch79 = new BitmapCharRec(16,17,-1,0,18,ch79data);
-
-/* char: 0x4e 'N' */
-
-static final byte[] ch78data = {
-(byte) 0xf8,(byte) 0xc,(byte) 0x20,(byte) 0x1c,(byte) 0x20,(byte) 0x1c,(byte) 0x20,(byte) 0x34,(byte) 0x20,(byte) 0x64,(byte) 0x20,(byte) 0x64,(byte) 0x20,(byte) 0xc4,(byte) 0x21,(byte) 0x84,
-(byte) 0x21,(byte) 0x84,(byte) 0x23,(byte) 0x4,(byte) 0x26,(byte) 0x4,(byte) 0x26,(byte) 0x4,(byte) 0x2c,(byte) 0x4,(byte) 0x38,(byte) 0x4,(byte) 0x38,(byte) 0x4,(byte) 0x30,(byte) 0x4,
-(byte) 0xf0,(byte) 0x1f,
-};
-
-static final BitmapCharRec ch78 = new BitmapCharRec(16,17,-1,0,18,ch78data);
-
-/* char: 0x4d 'M' */
-
-static final byte[] ch77data = {
-(byte) 0xf8,(byte) 0x21,(byte) 0xf8,(byte) 0x20,(byte) 0x60,(byte) 0x60,(byte) 0x20,(byte) 0x60,(byte) 0x60,(byte) 0x20,(byte) 0xd0,(byte) 0x60,(byte) 0x20,(byte) 0xd0,(byte) 0x60,(byte) 0x21,
-(byte) 0x88,(byte) 0x60,(byte) 0x21,(byte) 0x88,(byte) 0x60,(byte) 0x23,(byte) 0x8,(byte) 0x60,(byte) 0x23,(byte) 0x4,(byte) 0x60,(byte) 0x26,(byte) 0x4,(byte) 0x60,(byte) 0x26,(byte) 0x2,
-(byte) 0x60,(byte) 0x2c,(byte) 0x2,(byte) 0x60,(byte) 0x2c,(byte) 0x2,(byte) 0x60,(byte) 0x38,(byte) 0x1,(byte) 0x60,(byte) 0x38,(byte) 0x1,(byte) 0x60,(byte) 0x30,(byte) 0x0,(byte) 0xe0,
-(byte) 0xf0,(byte) 0x0,(byte) 0xf8,
-};
-
-static final BitmapCharRec ch77 = new BitmapCharRec(21,17,-1,0,22,ch77data);
-
-/* char: 0x4c 'L' */
-
-static final byte[] ch76data = {
-(byte) 0xff,(byte) 0xf8,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,
-(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,
-(byte) 0xfc,(byte) 0x0,
-};
-
-static final BitmapCharRec ch76 = new BitmapCharRec(13,17,-1,0,14,ch76data);
-
-/* char: 0x4b 'K' */
-
-static final byte[] ch75data = {
-(byte) 0xfc,(byte) 0x1f,(byte) 0x30,(byte) 0xe,(byte) 0x30,(byte) 0x1c,(byte) 0x30,(byte) 0x38,(byte) 0x30,(byte) 0x70,(byte) 0x30,(byte) 0xe0,(byte) 0x31,(byte) 0xc0,(byte) 0x33,(byte) 0x80,
-(byte) 0x3f,(byte) 0x0,(byte) 0x3e,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x31,(byte) 0x80,(byte) 0x30,(byte) 0xc0,(byte) 0x30,(byte) 0x60,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x18,
-(byte) 0xfc,(byte) 0x7e,
-};
-
-static final BitmapCharRec ch75 = new BitmapCharRec(16,17,-1,0,17,ch75data);
-
-/* char: 0x4a 'J' */
-
-static final byte[] ch74data = {
-(byte) 0x78,(byte) 0x0,(byte) 0xcc,(byte) 0x0,(byte) 0xc6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-(byte) 0x1f,(byte) 0x80,
-};
-
-static final BitmapCharRec ch74 = new BitmapCharRec(9,17,-1,0,11,ch74data);
-
-/* char: 0x49 'I' */
-
-static final byte[] ch73data = {
-(byte) 0xfc,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x30,
-(byte) 0xfc,
-};
-
-static final BitmapCharRec ch73 = new BitmapCharRec(6,17,-1,0,8,ch73data);
-
-/* char: 0x48 'H' */
-
-static final byte[] ch72data = {
-(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,
-(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x3f,(byte) 0xfe,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,
-(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x30,(byte) 0x6,(byte) 0x0,
-(byte) 0xfc,(byte) 0x1f,(byte) 0x80,
-};
-
-static final BitmapCharRec ch72 = new BitmapCharRec(17,17,-1,0,19,ch72data);
-
-/* char: 0x47 'G' */
-
-static final byte[] ch71data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1e,(byte) 0x38,(byte) 0x38,(byte) 0x1c,(byte) 0x60,(byte) 0xc,(byte) 0x60,(byte) 0xc,(byte) 0xc0,(byte) 0xc,(byte) 0xc0,(byte) 0xc,(byte) 0xc0,(byte) 0x3f,
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x60,(byte) 0x4,(byte) 0x60,(byte) 0x4,(byte) 0x38,(byte) 0xc,(byte) 0x1c,(byte) 0x3c,
-(byte) 0x7,(byte) 0xe4,
-};
-
-static final BitmapCharRec ch71 = new BitmapCharRec(16,17,-1,0,18,ch71data);
-
-/* char: 0x46 'F' */
-
-static final byte[] ch70data = {
-(byte) 0xfc,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x20,(byte) 0x30,(byte) 0x20,
-(byte) 0x3f,(byte) 0xe0,(byte) 0x30,(byte) 0x20,(byte) 0x30,(byte) 0x20,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x30,
-(byte) 0xff,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch70 = new BitmapCharRec(12,17,-1,0,14,ch70data);
-
-/* char: 0x45 'E' */
-
-static final byte[] ch69data = {
-(byte) 0xff,(byte) 0xf8,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x8,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,
-(byte) 0x3f,(byte) 0xc0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x10,(byte) 0x30,(byte) 0x30,
-(byte) 0xff,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch69 = new BitmapCharRec(13,17,-1,0,15,ch69data);
-
-/* char: 0x44 'D' */
-
-static final byte[] ch68data = {
-(byte) 0xff,(byte) 0xc0,(byte) 0x30,(byte) 0x70,(byte) 0x30,(byte) 0x38,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0x6,(byte) 0x30,(byte) 0x6,(byte) 0x30,(byte) 0x6,
-(byte) 0x30,(byte) 0x6,(byte) 0x30,(byte) 0x6,(byte) 0x30,(byte) 0x6,(byte) 0x30,(byte) 0x6,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0x38,(byte) 0x30,(byte) 0x70,
-(byte) 0xff,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch68 = new BitmapCharRec(15,17,-1,0,17,ch68data);
-
-/* char: 0x43 'C' */
-
-static final byte[] ch67data = {
-(byte) 0x7,(byte) 0xe0,(byte) 0x1e,(byte) 0x38,(byte) 0x38,(byte) 0x8,(byte) 0x60,(byte) 0x4,(byte) 0x60,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
-(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x60,(byte) 0x4,(byte) 0x60,(byte) 0x4,(byte) 0x38,(byte) 0xc,(byte) 0x1c,(byte) 0x3c,
-(byte) 0x7,(byte) 0xe4,
-};
-
-static final BitmapCharRec ch67 = new BitmapCharRec(14,17,-1,0,16,ch67data);
-
-/* char: 0x42 'B' */
-
-static final byte[] ch66data = {
-(byte) 0xff,(byte) 0xe0,(byte) 0x30,(byte) 0x78,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0xc,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x38,
-(byte) 0x3f,(byte) 0xe0,(byte) 0x30,(byte) 0x40,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x18,(byte) 0x30,(byte) 0x30,(byte) 0x30,(byte) 0x70,
-(byte) 0xff,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch66 = new BitmapCharRec(14,17,-1,0,16,ch66data);
-
-/* char: 0x41 'A' */
-
-static final byte[] ch65data = {
-(byte) 0xfc,(byte) 0x1f,(byte) 0x80,(byte) 0x30,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0x6,(byte) 0x0,(byte) 0x10,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0xc,(byte) 0x0,(byte) 0x8,
-(byte) 0xc,(byte) 0x0,(byte) 0xf,(byte) 0xf8,(byte) 0x0,(byte) 0xc,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x18,(byte) 0x0,(byte) 0x4,(byte) 0x30,(byte) 0x0,(byte) 0x6,(byte) 0x30,
-(byte) 0x0,(byte) 0x2,(byte) 0x30,(byte) 0x0,(byte) 0x2,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0x60,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,
-(byte) 0x0,(byte) 0x80,(byte) 0x0,
-};
-
-static final BitmapCharRec ch65 = new BitmapCharRec(17,17,0,0,17,ch65data);
-
-/* char: 0x40 '@' */
-
-static final byte[] ch64data = {
-(byte) 0x3,(byte) 0xf0,(byte) 0x0,(byte) 0xe,(byte) 0xc,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x0,(byte) 0x61,(byte) 0xde,(byte) 0x0,(byte) 0x63,
-(byte) 0x7b,(byte) 0x0,(byte) 0xc6,(byte) 0x39,(byte) 0x80,(byte) 0xc6,(byte) 0x18,(byte) 0x80,(byte) 0xc6,(byte) 0x18,(byte) 0xc0,(byte) 0xc6,(byte) 0x18,(byte) 0x40,(byte) 0xc6,(byte) 0xc,
-(byte) 0x40,(byte) 0xc3,(byte) 0xc,(byte) 0x40,(byte) 0xc3,(byte) 0x8c,(byte) 0x40,(byte) 0xe1,(byte) 0xfc,(byte) 0x40,(byte) 0x60,(byte) 0xec,(byte) 0xc0,(byte) 0x70,(byte) 0x0,(byte) 0x80,
-(byte) 0x38,(byte) 0x1,(byte) 0x80,(byte) 0x1c,(byte) 0x3,(byte) 0x0,(byte) 0xf,(byte) 0xe,(byte) 0x0,(byte) 0x3,(byte) 0xf8,(byte) 0x0,
-};
-
-static final BitmapCharRec ch64 = new BitmapCharRec(18,20,-2,3,22,ch64data);
-
-/* char: 0x3f '?' */
-
-static final byte[] ch63data = {
-(byte) 0x30,(byte) 0x30,(byte) 0x0,(byte) 0x0,(byte) 0x10,(byte) 0x10,(byte) 0x10,(byte) 0x18,(byte) 0x18,(byte) 0xc,(byte) 0xe,(byte) 0x7,(byte) 0xc3,(byte) 0xc3,(byte) 0x83,(byte) 0xc6,
-(byte) 0x7c,
-};
-
-static final BitmapCharRec ch63 = new BitmapCharRec(8,17,-2,0,11,ch63data);
-
-/* char: 0x3e '>' */
-
-static final byte[] ch62data = {
-(byte) 0xc0,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0x7,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x60,(byte) 0x1,(byte) 0xc0,(byte) 0x7,(byte) 0x0,
-(byte) 0x1c,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0xc0,(byte) 0x0,
-};
-
-static final BitmapCharRec ch62 = new BitmapCharRec(11,11,-1,-1,13,ch62data);
-
-/* char: 0x3d '=' */
-
-static final byte[] ch61data = {
-(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch61 = new BitmapCharRec(12,6,-1,-4,14,ch61data);
-
-/* char: 0x3c '<' */
-
-static final byte[] ch60data = {
-(byte) 0x0,(byte) 0x60,(byte) 0x1,(byte) 0xc0,(byte) 0x7,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x1c,(byte) 0x0,
-(byte) 0x7,(byte) 0x0,(byte) 0x1,(byte) 0xc0,(byte) 0x0,(byte) 0x60,
-};
-
-static final BitmapCharRec ch60 = new BitmapCharRec(11,11,-1,-1,13,ch60data);
-
-/* char: 0x3b ';' */
-
-static final byte[] ch59data = {
-(byte) 0xc0,(byte) 0x60,(byte) 0x20,(byte) 0xe0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch59 = new BitmapCharRec(3,14,-2,3,7,ch59data);
-
-/* char: 0x3a ':' */
-
-static final byte[] ch58data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch58 = new BitmapCharRec(2,11,-2,0,6,ch58data);
-
-/* char: 0x39 '9' */
-
-static final byte[] ch57data = {
-(byte) 0xf0,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1d,(byte) 0x80,(byte) 0x73,(byte) 0xc0,
-(byte) 0x61,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x77,(byte) 0x80,
-(byte) 0x1e,(byte) 0x0,
-};
-
-static final BitmapCharRec ch57 = new BitmapCharRec(10,17,-1,0,12,ch57data);
-
-/* char: 0x38 '8' */
-
-static final byte[] ch56data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x73,(byte) 0x80,(byte) 0xe1,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x41,(byte) 0xc0,(byte) 0x61,(byte) 0x80,
-(byte) 0x37,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x33,(byte) 0x0,
-(byte) 0x1e,(byte) 0x0,
-};
-
-static final BitmapCharRec ch56 = new BitmapCharRec(10,17,-1,0,12,ch56data);
-
-/* char: 0x37 '7' */
-
-static final byte[] ch55data = {
-(byte) 0x18,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-(byte) 0x2,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x81,(byte) 0x80,(byte) 0xc0,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,
-(byte) 0x7f,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch55 = new BitmapCharRec(10,17,-1,0,12,ch55data);
-
-/* char: 0x36 '6' */
-
-static final byte[] ch54data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x7b,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xe0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc1,(byte) 0x80,(byte) 0xf3,(byte) 0x80,(byte) 0xee,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x70,(byte) 0x0,(byte) 0x30,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0xe,(byte) 0x0,
-(byte) 0x3,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch54 = new BitmapCharRec(10,17,-1,0,12,ch54data);
-
-/* char: 0x35 '5' */
-
-static final byte[] ch53data = {
-(byte) 0x7e,(byte) 0x0,(byte) 0xe3,(byte) 0x80,(byte) 0xc1,(byte) 0x80,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x0,(byte) 0xc0,(byte) 0x1,(byte) 0xc0,
-(byte) 0x3,(byte) 0x80,(byte) 0xf,(byte) 0x80,(byte) 0x7e,(byte) 0x0,(byte) 0x78,(byte) 0x0,(byte) 0x60,(byte) 0x0,(byte) 0x20,(byte) 0x0,(byte) 0x20,(byte) 0x0,(byte) 0x1f,(byte) 0x80,
-(byte) 0x1f,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch53 = new BitmapCharRec(10,17,-1,0,12,ch53data);
-
-/* char: 0x34 '4' */
-
-static final byte[] ch52data = {
-(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,(byte) 0xc3,(byte) 0x0,(byte) 0x43,(byte) 0x0,
-(byte) 0x63,(byte) 0x0,(byte) 0x23,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x13,(byte) 0x0,(byte) 0x1b,(byte) 0x0,(byte) 0xb,(byte) 0x0,(byte) 0x7,(byte) 0x0,(byte) 0x7,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,
-};
-
-static final BitmapCharRec ch52 = new BitmapCharRec(10,17,-1,0,12,ch52data);
-
-/* char: 0x33 '3' */
-
-static final byte[] ch51data = {
-(byte) 0x78,(byte) 0x0,(byte) 0xe6,(byte) 0x0,(byte) 0xc3,(byte) 0x0,(byte) 0x1,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x3,(byte) 0x80,
-(byte) 0x7,(byte) 0x0,(byte) 0x1e,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x83,(byte) 0x0,(byte) 0x83,(byte) 0x0,(byte) 0x47,(byte) 0x0,(byte) 0x7e,(byte) 0x0,
-(byte) 0x1c,(byte) 0x0,
-};
-
-static final BitmapCharRec ch51 = new BitmapCharRec(9,17,-1,0,12,ch51data);
-
-/* char: 0x32 '2' */
-
-static final byte[] ch50data = {
-(byte) 0xff,(byte) 0x80,(byte) 0xff,(byte) 0xc0,(byte) 0x60,(byte) 0x40,(byte) 0x30,(byte) 0x0,(byte) 0x18,(byte) 0x0,(byte) 0xc,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-(byte) 0x3,(byte) 0x0,(byte) 0x3,(byte) 0x0,(byte) 0x1,(byte) 0x80,(byte) 0x1,(byte) 0x80,(byte) 0x81,(byte) 0x80,(byte) 0x81,(byte) 0x80,(byte) 0x43,(byte) 0x80,(byte) 0x7f,(byte) 0x0,
-(byte) 0x1c,(byte) 0x0,
-};
-
-static final BitmapCharRec ch50 = new BitmapCharRec(10,17,-1,0,12,ch50data);
-
-/* char: 0x31 '1' */
-
-static final byte[] ch49data = {
-(byte) 0xff,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x18,(byte) 0x78,(byte) 0x18,
-(byte) 0x8,
-};
-
-static final BitmapCharRec ch49 = new BitmapCharRec(8,17,-2,0,12,ch49data);
-
-/* char: 0x30 '0' */
-
-static final byte[] ch48data = {
-(byte) 0x1e,(byte) 0x0,(byte) 0x33,(byte) 0x0,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0xe1,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x61,(byte) 0x80,(byte) 0x61,(byte) 0x80,(byte) 0x33,(byte) 0x0,
-(byte) 0x1e,(byte) 0x0,
-};
-
-static final BitmapCharRec ch48 = new BitmapCharRec(10,17,-1,0,12,ch48data);
-
-/* char: 0x2f '/' */
-
-static final byte[] ch47data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,(byte) 0x60,(byte) 0x20,(byte) 0x30,(byte) 0x30,(byte) 0x10,(byte) 0x18,(byte) 0x18,(byte) 0x8,(byte) 0xc,(byte) 0xc,(byte) 0x4,(byte) 0x6,
-(byte) 0x6,(byte) 0x3,(byte) 0x3,(byte) 0x3,
-};
-
-static final BitmapCharRec ch47 = new BitmapCharRec(8,20,1,3,7,ch47data);
-
-/* char: 0x2e '.' */
-
-static final byte[] ch46data = {
-(byte) 0xc0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch46 = new BitmapCharRec(2,2,-2,0,6,ch46data);
-
-/* char: 0x2d '-' */
-
-static final byte[] ch45data = {
-(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,
-};
-
-static final BitmapCharRec ch45 = new BitmapCharRec(12,2,-1,-6,14,ch45data);
-
-/* char: 0x2c ',' */
-
-static final byte[] ch44data = {
-(byte) 0xc0,(byte) 0x60,(byte) 0x20,(byte) 0xe0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch44 = new BitmapCharRec(3,5,-2,3,7,ch44data);
-
-/* char: 0x2b '+' */
-
-static final byte[] ch43data = {
-(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0xff,(byte) 0xf0,(byte) 0xff,(byte) 0xf0,(byte) 0x6,(byte) 0x0,
-(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,(byte) 0x6,(byte) 0x0,
-};
-
-static final BitmapCharRec ch43 = new BitmapCharRec(12,12,-1,-1,14,ch43data);
-
-/* char: 0x2a '*' */
-
-static final byte[] ch42data = {
-(byte) 0x8,(byte) 0x0,(byte) 0x1c,(byte) 0x0,(byte) 0xc9,(byte) 0x80,(byte) 0xeb,(byte) 0x80,(byte) 0x1c,(byte) 0x0,(byte) 0xeb,(byte) 0x80,(byte) 0xc9,(byte) 0x80,(byte) 0x1c,(byte) 0x0,
-(byte) 0x8,(byte) 0x0,
-};
-
-static final BitmapCharRec ch42 = new BitmapCharRec(9,9,-2,-8,12,ch42data);
-
-/* char: 0x29 ')' */
-
-static final byte[] ch41data = {
-(byte) 0x80,(byte) 0x40,(byte) 0x20,(byte) 0x30,(byte) 0x10,(byte) 0x18,(byte) 0x18,(byte) 0xc,(byte) 0xc,(byte) 0xc,(byte) 0xc,(byte) 0xc,(byte) 0xc,(byte) 0xc,(byte) 0xc,(byte) 0x18,
-(byte) 0x18,(byte) 0x10,(byte) 0x30,(byte) 0x20,(byte) 0x40,(byte) 0x80,
-};
-
-static final BitmapCharRec ch41 = new BitmapCharRec(6,22,-1,5,8,ch41data);
-
-/* char: 0x28 '(' */
-
-static final byte[] ch40data = {
-(byte) 0x4,(byte) 0x8,(byte) 0x10,(byte) 0x30,(byte) 0x20,(byte) 0x60,(byte) 0x60,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0x60,
-(byte) 0x60,(byte) 0x20,(byte) 0x30,(byte) 0x10,(byte) 0x8,(byte) 0x4,
-};
-
-static final BitmapCharRec ch40 = new BitmapCharRec(6,22,-1,5,8,ch40data);
-
-/* char: 0x27 ''' */
-
-static final byte[] ch39data = {
-(byte) 0xc0,(byte) 0x60,(byte) 0x20,(byte) 0xe0,(byte) 0xc0,
-};
-
-static final BitmapCharRec ch39 = new BitmapCharRec(3,5,-3,-12,8,ch39data);
-
-/* char: 0x26 '&' */
-
-static final byte[] ch38data = {
-(byte) 0x3c,(byte) 0x3c,(byte) 0x7f,(byte) 0x7e,(byte) 0xe1,(byte) 0xe1,(byte) 0xc0,(byte) 0xc0,(byte) 0xc1,(byte) 0xc0,(byte) 0xc1,(byte) 0xa0,(byte) 0x63,(byte) 0x20,(byte) 0x37,(byte) 0x10,
-(byte) 0x1e,(byte) 0x18,(byte) 0xe,(byte) 0x3e,(byte) 0xf,(byte) 0x0,(byte) 0x1d,(byte) 0x80,(byte) 0x18,(byte) 0xc0,(byte) 0x18,(byte) 0x40,(byte) 0x18,(byte) 0x40,(byte) 0xc,(byte) 0xc0,
-(byte) 0x7,(byte) 0x80,
-};
-
-static final BitmapCharRec ch38 = new BitmapCharRec(16,17,-1,0,18,ch38data);
-
-/* char: 0x25 '%' */
-
-static final byte[] ch37data = {
-(byte) 0x30,(byte) 0x3c,(byte) 0x0,(byte) 0x18,(byte) 0x72,(byte) 0x0,(byte) 0xc,(byte) 0x61,(byte) 0x0,(byte) 0x4,(byte) 0x60,(byte) 0x80,(byte) 0x6,(byte) 0x60,(byte) 0x80,(byte) 0x3,
-(byte) 0x30,(byte) 0x80,(byte) 0x1,(byte) 0x19,(byte) 0x80,(byte) 0x1,(byte) 0x8f,(byte) 0x0,(byte) 0x78,(byte) 0xc0,(byte) 0x0,(byte) 0xe4,(byte) 0x40,(byte) 0x0,(byte) 0xc2,(byte) 0x60,
-(byte) 0x0,(byte) 0xc1,(byte) 0x30,(byte) 0x0,(byte) 0xc1,(byte) 0x10,(byte) 0x0,(byte) 0x61,(byte) 0x18,(byte) 0x0,(byte) 0x33,(byte) 0xfc,(byte) 0x0,(byte) 0x1e,(byte) 0xc,(byte) 0x0,
-};
-
-static final BitmapCharRec ch37 = new BitmapCharRec(17,16,-1,0,19,ch37data);
-
-/* char: 0x24 '$' */
-
-static final byte[] ch36data = {
-(byte) 0x4,(byte) 0x0,(byte) 0x4,(byte) 0x0,(byte) 0x3f,(byte) 0x0,(byte) 0xe5,(byte) 0xc0,(byte) 0xc4,(byte) 0xc0,(byte) 0x84,(byte) 0x60,(byte) 0x84,(byte) 0x60,(byte) 0x4,(byte) 0x60,
-(byte) 0x4,(byte) 0xe0,(byte) 0x7,(byte) 0xc0,(byte) 0x7,(byte) 0x80,(byte) 0x1e,(byte) 0x0,(byte) 0x3c,(byte) 0x0,(byte) 0x74,(byte) 0x0,(byte) 0x64,(byte) 0x0,(byte) 0x64,(byte) 0x20,
-(byte) 0x64,(byte) 0x60,(byte) 0x34,(byte) 0xe0,(byte) 0x1f,(byte) 0x80,(byte) 0x4,(byte) 0x0,(byte) 0x4,(byte) 0x0,
-};
-
-static final BitmapCharRec ch36 = new BitmapCharRec(11,21,0,2,12,ch36data);
-
-/* char: 0x23 '#' */
-
-static final byte[] ch35data = {
-(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0x22,(byte) 0x0,(byte) 0xff,(byte) 0xc0,(byte) 0xff,(byte) 0xc0,(byte) 0x11,(byte) 0x0,
-(byte) 0x11,(byte) 0x0,(byte) 0x11,(byte) 0x0,(byte) 0x7f,(byte) 0xe0,(byte) 0x7f,(byte) 0xe0,(byte) 0x8,(byte) 0x80,(byte) 0x8,(byte) 0x80,(byte) 0x8,(byte) 0x80,(byte) 0x8,(byte) 0x80,
-(byte) 0x8,(byte) 0x80,
-};
-
-static final BitmapCharRec ch35 = new BitmapCharRec(11,17,-1,0,13,ch35data);
-
-/* char: 0x22 '"' */
-
-static final byte[] ch34data = {
-(byte) 0x88,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,(byte) 0xcc,
-};
-
-static final BitmapCharRec ch34 = new BitmapCharRec(6,5,-1,-12,10,ch34data);
-
-/* char: 0x21 '!' */
-
-static final byte[] ch33data = {
-(byte) 0xc0,(byte) 0xc0,(byte) 0x0,(byte) 0x0,(byte) 0x0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,(byte) 0xc0,
-(byte) 0xc0,
-};
-
-static final BitmapCharRec ch33 = new BitmapCharRec(2,17,-3,0,8,ch33data);
-
-/* char: 0x20 ' ' */
-
-static final BitmapCharRec ch32 = new BitmapCharRec(0,0,0,0,6,null);
-
-static final BitmapCharRec[] chars = {
-ch32,
-ch33,
-ch34,
-ch35,
-ch36,
-ch37,
-ch38,
-ch39,
-ch40,
-ch41,
-ch42,
-ch43,
-ch44,
-ch45,
-ch46,
-ch47,
-ch48,
-ch49,
-ch50,
-ch51,
-ch52,
-ch53,
-ch54,
-ch55,
-ch56,
-ch57,
-ch58,
-ch59,
-ch60,
-ch61,
-ch62,
-ch63,
-ch64,
-ch65,
-ch66,
-ch67,
-ch68,
-ch69,
-ch70,
-ch71,
-ch72,
-ch73,
-ch74,
-ch75,
-ch76,
-ch77,
-ch78,
-ch79,
-ch80,
-ch81,
-ch82,
-ch83,
-ch84,
-ch85,
-ch86,
-ch87,
-ch88,
-ch89,
-ch90,
-ch91,
-ch92,
-ch93,
-ch94,
-ch95,
-ch96,
-ch97,
-ch98,
-ch99,
-ch100,
-ch101,
-ch102,
-ch103,
-ch104,
-ch105,
-ch106,
-ch107,
-ch108,
-ch109,
-ch110,
-ch111,
-ch112,
-ch113,
-ch114,
-ch115,
-ch116,
-ch117,
-ch118,
-ch119,
-ch120,
-ch121,
-ch122,
-ch123,
-ch124,
-ch125,
-ch126,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-null,
-ch160,
-ch161,
-ch162,
-ch163,
-ch164,
-ch165,
-ch166,
-ch167,
-ch168,
-ch169,
-ch170,
-ch171,
-ch172,
-ch173,
-ch174,
-ch175,
-ch176,
-ch177,
-ch178,
-ch179,
-ch180,
-ch181,
-ch182,
-ch183,
-ch184,
-ch185,
-ch186,
-ch187,
-ch188,
-ch189,
-ch190,
-ch191,
-ch192,
-ch193,
-ch194,
-ch195,
-ch196,
-ch197,
-ch198,
-ch199,
-ch200,
-ch201,
-ch202,
-ch203,
-ch204,
-ch205,
-ch206,
-ch207,
-ch208,
-ch209,
-ch210,
-ch211,
-ch212,
-ch213,
-ch214,
-ch215,
-ch216,
-ch217,
-ch218,
-ch219,
-ch220,
-ch221,
-ch222,
-ch223,
-ch224,
-ch225,
-ch226,
-ch227,
-ch228,
-ch229,
-ch230,
-ch231,
-ch232,
-ch233,
-ch234,
-ch235,
-ch236,
-ch237,
-ch238,
-ch239,
-ch240,
-ch241,
-ch242,
-ch243,
-ch244,
-ch245,
-ch246,
-ch247,
-ch248,
-ch249,
-ch250,
-ch251,
-ch252,
-ch253,
-ch254,
-ch255,
-};
-
-  public static final BitmapFontRec glutBitmapTimesRoman24 = new BitmapFontRec("-adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1",
-                                                                        224,
-                                                                        32,
-                                                                        chars);
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeMonoRoman.java b/src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeMonoRoman.java
deleted file mode 100644
index 79e4b70f8..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeMonoRoman.java
+++ /dev/null
@@ -1,2491 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-class GLUTStrokeMonoRoman {
-
-/* GENERATED FILE -- DO NOT MODIFY */
-
-/* char: 33 '!' */
-
-static final CoordRec char33_stroke0[] = {
-    new CoordRec((float) 52.381, (float) 100 ),
-    new CoordRec((float) 52.381, (float) 33.3333 ),
-};
-
-static final CoordRec char33_stroke1[] = {
-    new CoordRec((float) 52.381, (float) 9.5238 ),
-    new CoordRec((float) 47.6191, (float) 4.7619 ),
-    new CoordRec((float) 52.381, (float) 0 ),
-    new CoordRec((float) 57.1429, (float) 4.7619 ),
-    new CoordRec((float) 52.381, (float) 9.5238 ),
-};
-
-static final StrokeRec char33[] = {
-   new StrokeRec( 2, char33_stroke0 ),
-   new StrokeRec( 5, char33_stroke1 ),
-};
-
-/* char: 34 '"' */
-
-static final CoordRec char34_stroke0[] = {
-    new CoordRec((float) 33.3334, (float) 100 ),
-    new CoordRec((float) 33.3334, (float) 66.6667 ),
-};
-
-static final CoordRec char34_stroke1[] = {
-    new CoordRec((float) 71.4286, (float) 100 ),
-    new CoordRec((float) 71.4286, (float) 66.6667 ),
-};
-
-static final StrokeRec char34[] = {
-   new StrokeRec( 2, char34_stroke0 ),
-   new StrokeRec( 2, char34_stroke1 ),
-};
-
-/* char: 35 '#' */
-
-static final CoordRec char35_stroke0[] = {
-    new CoordRec((float) 54.7619, (float) 119.048 ),
-    new CoordRec((float) 21.4286, (float) -33.3333 ),
-};
-
-static final CoordRec char35_stroke1[] = {
-    new CoordRec((float) 83.3334, (float) 119.048 ),
-    new CoordRec((float) 50, (float) -33.3333 ),
-};
-
-static final CoordRec char35_stroke2[] = {
-    new CoordRec((float) 21.4286, (float) 57.1429 ),
-    new CoordRec((float) 88.0952, (float) 57.1429 ),
-};
-
-static final CoordRec char35_stroke3[] = {
-    new CoordRec((float) 16.6667, (float) 28.5714 ),
-    new CoordRec((float) 83.3334, (float) 28.5714 ),
-};
-
-static final StrokeRec char35[] = {
-   new StrokeRec( 2, char35_stroke0 ),
-   new StrokeRec( 2, char35_stroke1 ),
-   new StrokeRec( 2, char35_stroke2 ),
-   new StrokeRec( 2, char35_stroke3 ),
-};
-
-/* char: 36 '$' */
-
-static final CoordRec char36_stroke0[] = {
-    new CoordRec((float) 42.8571, (float) 119.048 ),
-    new CoordRec((float) 42.8571, (float) -19.0476 ),
-};
-
-static final CoordRec char36_stroke1[] = {
-    new CoordRec((float) 61.9047, (float) 119.048 ),
-    new CoordRec((float) 61.9047, (float) -19.0476 ),
-};
-
-static final CoordRec char36_stroke2[] = {
-    new CoordRec((float) 85.7143, (float) 85.7143 ),
-    new CoordRec((float) 76.1905, (float) 95.2381 ),
-    new CoordRec((float) 61.9047, (float) 100 ),
-    new CoordRec((float) 42.8571, (float) 100 ),
-    new CoordRec((float) 28.5714, (float) 95.2381 ),
-    new CoordRec((float) 19.0476, (float) 85.7143 ),
-    new CoordRec((float) 19.0476, (float) 76.1905 ),
-    new CoordRec((float) 23.8095, (float) 66.6667 ),
-    new CoordRec((float) 28.5714, (float) 61.9048 ),
-    new CoordRec((float) 38.0952, (float) 57.1429 ),
-    new CoordRec((float) 66.6666, (float) 47.619 ),
-    new CoordRec((float) 76.1905, (float) 42.8571 ),
-    new CoordRec((float) 80.9524, (float) 38.0952 ),
-    new CoordRec((float) 85.7143, (float) 28.5714 ),
-    new CoordRec((float) 85.7143, (float) 14.2857 ),
-    new CoordRec((float) 76.1905, (float) 4.7619 ),
-    new CoordRec((float) 61.9047, (float) 0 ),
-    new CoordRec((float) 42.8571, (float) 0 ),
-    new CoordRec((float) 28.5714, (float) 4.7619 ),
-    new CoordRec((float) 19.0476, (float) 14.2857 ),
-};
-
-static final StrokeRec char36[] = {
-   new StrokeRec( 2, char36_stroke0 ),
-   new StrokeRec( 2, char36_stroke1 ),
-   new StrokeRec( 20, char36_stroke2 ),
-};
-
-/* char: 37 '%' */
-
-static final CoordRec char37_stroke0[] = {
-    new CoordRec((float) 95.2381, (float) 100 ),
-    new CoordRec((float) 9.5238, (float) 0 ),
-};
-
-static final CoordRec char37_stroke1[] = {
-    new CoordRec((float) 33.3333, (float) 100 ),
-    new CoordRec((float) 42.8571, (float) 90.4762 ),
-    new CoordRec((float) 42.8571, (float) 80.9524 ),
-    new CoordRec((float) 38.0952, (float) 71.4286 ),
-    new CoordRec((float) 28.5714, (float) 66.6667 ),
-    new CoordRec((float) 19.0476, (float) 66.6667 ),
-    new CoordRec((float) 9.5238, (float) 76.1905 ),
-    new CoordRec((float) 9.5238, (float) 85.7143 ),
-    new CoordRec((float) 14.2857, (float) 95.2381 ),
-    new CoordRec((float) 23.8095, (float) 100 ),
-    new CoordRec((float) 33.3333, (float) 100 ),
-    new CoordRec((float) 42.8571, (float) 95.2381 ),
-    new CoordRec((float) 57.1428, (float) 90.4762 ),
-    new CoordRec((float) 71.4286, (float) 90.4762 ),
-    new CoordRec((float) 85.7143, (float) 95.2381 ),
-    new CoordRec((float) 95.2381, (float) 100 ),
-};
-
-static final CoordRec char37_stroke2[] = {
-    new CoordRec((float) 76.1905, (float) 33.3333 ),
-    new CoordRec((float) 66.6667, (float) 28.5714 ),
-    new CoordRec((float) 61.9048, (float) 19.0476 ),
-    new CoordRec((float) 61.9048, (float) 9.5238 ),
-    new CoordRec((float) 71.4286, (float) 0 ),
-    new CoordRec((float) 80.9524, (float) 0 ),
-    new CoordRec((float) 90.4762, (float) 4.7619 ),
-    new CoordRec((float) 95.2381, (float) 14.2857 ),
-    new CoordRec((float) 95.2381, (float) 23.8095 ),
-    new CoordRec((float) 85.7143, (float) 33.3333 ),
-    new CoordRec((float) 76.1905, (float) 33.3333 ),
-};
-
-static final StrokeRec char37[] = {
-   new StrokeRec( 2, char37_stroke0 ),
-   new StrokeRec( 16, char37_stroke1 ),
-   new StrokeRec( 11, char37_stroke2 ),
-};
-
-/* char: 38 '&' */
-
-static final CoordRec char38_stroke0[] = {
-    new CoordRec((float) 100, (float) 57.1429 ),
-    new CoordRec((float) 100, (float) 61.9048 ),
-    new CoordRec((float) 95.2381, (float) 66.6667 ),
-    new CoordRec((float) 90.4762, (float) 66.6667 ),
-    new CoordRec((float) 85.7143, (float) 61.9048 ),
-    new CoordRec((float) 80.9524, (float) 52.381 ),
-    new CoordRec((float) 71.4286, (float) 28.5714 ),
-    new CoordRec((float) 61.9048, (float) 14.2857 ),
-    new CoordRec((float) 52.3809, (float) 4.7619 ),
-    new CoordRec((float) 42.8571, (float) 0 ),
-    new CoordRec((float) 23.8095, (float) 0 ),
-    new CoordRec((float) 14.2857, (float) 4.7619 ),
-    new CoordRec((float) 9.5238, (float) 9.5238 ),
-    new CoordRec((float) 4.7619, (float) 19.0476 ),
-    new CoordRec((float) 4.7619, (float) 28.5714 ),
-    new CoordRec((float) 9.5238, (float) 38.0952 ),
-    new CoordRec((float) 14.2857, (float) 42.8571 ),
-    new CoordRec((float) 47.619, (float) 61.9048 ),
-    new CoordRec((float) 52.3809, (float) 66.6667 ),
-    new CoordRec((float) 57.1429, (float) 76.1905 ),
-    new CoordRec((float) 57.1429, (float) 85.7143 ),
-    new CoordRec((float) 52.3809, (float) 95.2381 ),
-    new CoordRec((float) 42.8571, (float) 100 ),
-    new CoordRec((float) 33.3333, (float) 95.2381 ),
-    new CoordRec((float) 28.5714, (float) 85.7143 ),
-    new CoordRec((float) 28.5714, (float) 76.1905 ),
-    new CoordRec((float) 33.3333, (float) 61.9048 ),
-    new CoordRec((float) 42.8571, (float) 47.619 ),
-    new CoordRec((float) 66.6667, (float) 14.2857 ),
-    new CoordRec((float) 76.1905, (float) 4.7619 ),
-    new CoordRec((float) 85.7143, (float) 0 ),
-    new CoordRec((float) 95.2381, (float) 0 ),
-    new CoordRec((float) 100, (float) 4.7619 ),
-    new CoordRec((float) 100, (float) 9.5238 ),
-};
-
-static final StrokeRec char38[] = {
-   new StrokeRec( 34, char38_stroke0 ),
-};
-
-/* char: 39 ''' */
-
-static final CoordRec char39_stroke0[] = {
-    new CoordRec((float) 52.381, (float) 100 ),
-    new CoordRec((float) 52.381, (float) 66.6667 ),
-};
-
-static final StrokeRec char39[] = {
-   new StrokeRec( 2, char39_stroke0 ),
-};
-
-/* char: 40 '(' */
-
-static final CoordRec char40_stroke0[] = {
-    new CoordRec((float) 69.0476, (float) 119.048 ),
-    new CoordRec((float) 59.5238, (float) 109.524 ),
-    new CoordRec((float) 50, (float) 95.2381 ),
-    new CoordRec((float) 40.4762, (float) 76.1905 ),
-    new CoordRec((float) 35.7143, (float) 52.381 ),
-    new CoordRec((float) 35.7143, (float) 33.3333 ),
-    new CoordRec((float) 40.4762, (float) 9.5238 ),
-    new CoordRec((float) 50, (float) -9.5238 ),
-    new CoordRec((float) 59.5238, (float) -23.8095 ),
-    new CoordRec((float) 69.0476, (float) -33.3333 ),
-};
-
-static final StrokeRec char40[] = {
-   new StrokeRec( 10, char40_stroke0 ),
-};
-
-/* char: 41 ')' */
-
-static final CoordRec char41_stroke0[] = {
-    new CoordRec((float) 35.7143, (float) 119.048 ),
-    new CoordRec((float) 45.2381, (float) 109.524 ),
-    new CoordRec((float) 54.7619, (float) 95.2381 ),
-    new CoordRec((float) 64.2857, (float) 76.1905 ),
-    new CoordRec((float) 69.0476, (float) 52.381 ),
-    new CoordRec((float) 69.0476, (float) 33.3333 ),
-    new CoordRec((float) 64.2857, (float) 9.5238 ),
-    new CoordRec((float) 54.7619, (float) -9.5238 ),
-    new CoordRec((float) 45.2381, (float) -23.8095 ),
-    new CoordRec((float) 35.7143, (float) -33.3333 ),
-};
-
-static final StrokeRec char41[] = {
-   new StrokeRec( 10, char41_stroke0 ),
-};
-
-/* char: 42 '*' */
-
-static final CoordRec char42_stroke0[] = {
-    new CoordRec((float) 52.381, (float) 71.4286 ),
-    new CoordRec((float) 52.381, (float) 14.2857 ),
-};
-
-static final CoordRec char42_stroke1[] = {
-    new CoordRec((float) 28.5715, (float) 57.1429 ),
-    new CoordRec((float) 76.1905, (float) 28.5714 ),
-};
-
-static final CoordRec char42_stroke2[] = {
-    new CoordRec((float) 76.1905, (float) 57.1429 ),
-    new CoordRec((float) 28.5715, (float) 28.5714 ),
-};
-
-static final StrokeRec char42[] = {
-   new StrokeRec( 2, char42_stroke0 ),
-   new StrokeRec( 2, char42_stroke1 ),
-   new StrokeRec( 2, char42_stroke2 ),
-};
-
-/* char: 43 '+' */
-
-static final CoordRec char43_stroke0[] = {
-    new CoordRec((float) 52.3809, (float) 85.7143 ),
-    new CoordRec((float) 52.3809, (float) 0 ),
-};
-
-static final CoordRec char43_stroke1[] = {
-    new CoordRec((float) 9.5238, (float) 42.8571 ),
-    new CoordRec((float) 95.2381, (float) 42.8571 ),
-};
-
-static final StrokeRec char43[] = {
-   new StrokeRec( 2, char43_stroke0 ),
-   new StrokeRec( 2, char43_stroke1 ),
-};
-
-/* char: 44 ',' */
-
-static final CoordRec char44_stroke0[] = {
-    new CoordRec((float) 57.1429, (float) 4.7619 ),
-    new CoordRec((float) 52.381, (float) 0 ),
-    new CoordRec((float) 47.6191, (float) 4.7619 ),
-    new CoordRec((float) 52.381, (float) 9.5238 ),
-    new CoordRec((float) 57.1429, (float) 4.7619 ),
-    new CoordRec((float) 57.1429, (float) -4.7619 ),
-    new CoordRec((float) 52.381, (float) -14.2857 ),
-    new CoordRec((float) 47.6191, (float) -19.0476 ),
-};
-
-static final StrokeRec char44[] = {
-   new StrokeRec( 8, char44_stroke0 ),
-};
-
-/* char: 45 '-' */
-
-static final CoordRec char45_stroke0[] = {
-    new CoordRec((float) 9.5238, (float) 42.8571 ),
-    new CoordRec((float) 95.2381, (float) 42.8571 ),
-};
-
-static final StrokeRec char45[] = {
-   new StrokeRec( 2, char45_stroke0 ),
-};
-
-/* char: 46 '.' */
-
-static final CoordRec char46_stroke0[] = {
-    new CoordRec((float) 52.381, (float) 9.5238 ),
-    new CoordRec((float) 47.6191, (float) 4.7619 ),
-    new CoordRec((float) 52.381, (float) 0 ),
-    new CoordRec((float) 57.1429, (float) 4.7619 ),
-    new CoordRec((float) 52.381, (float) 9.5238 ),
-};
-
-static final StrokeRec char46[] = {
-   new StrokeRec( 5, char46_stroke0 ),
-};
-
-/* char: 47 '/' */
-
-static final CoordRec char47_stroke0[] = {
-    new CoordRec((float) 19.0476, (float) -14.2857 ),
-    new CoordRec((float) 85.7143, (float) 100 ),
-};
-
-static final StrokeRec char47[] = {
-   new StrokeRec( 2, char47_stroke0 ),
-};
-
-/* char: 48 '0' */
-
-static final CoordRec char48_stroke0[] = {
-    new CoordRec((float) 47.619, (float) 100 ),
-    new CoordRec((float) 33.3333, (float) 95.2381 ),
-    new CoordRec((float) 23.8095, (float) 80.9524 ),
-    new CoordRec((float) 19.0476, (float) 57.1429 ),
-    new CoordRec((float) 19.0476, (float) 42.8571 ),
-    new CoordRec((float) 23.8095, (float) 19.0476 ),
-    new CoordRec((float) 33.3333, (float) 4.7619 ),
-    new CoordRec((float) 47.619, (float) 0 ),
-    new CoordRec((float) 57.1428, (float) 0 ),
-    new CoordRec((float) 71.4286, (float) 4.7619 ),
-    new CoordRec((float) 80.9524, (float) 19.0476 ),
-    new CoordRec((float) 85.7143, (float) 42.8571 ),
-    new CoordRec((float) 85.7143, (float) 57.1429 ),
-    new CoordRec((float) 80.9524, (float) 80.9524 ),
-    new CoordRec((float) 71.4286, (float) 95.2381 ),
-    new CoordRec((float) 57.1428, (float) 100 ),
-    new CoordRec((float) 47.619, (float) 100 ),
-};
-
-static final StrokeRec char48[] = {
-   new StrokeRec( 17, char48_stroke0 ),
-};
-
-/* char: 49 '1' */
-
-static final CoordRec char49_stroke0[] = {
-    new CoordRec((float) 40.4762, (float) 80.9524 ),
-    new CoordRec((float) 50, (float) 85.7143 ),
-    new CoordRec((float) 64.2857, (float) 100 ),
-    new CoordRec((float) 64.2857, (float) 0 ),
-};
-
-static final StrokeRec char49[] = {
-   new StrokeRec( 4, char49_stroke0 ),
-};
-
-/* char: 50 '2' */
-
-static final CoordRec char50_stroke0[] = {
-    new CoordRec((float) 23.8095, (float) 76.1905 ),
-    new CoordRec((float) 23.8095, (float) 80.9524 ),
-    new CoordRec((float) 28.5714, (float) 90.4762 ),
-    new CoordRec((float) 33.3333, (float) 95.2381 ),
-    new CoordRec((float) 42.8571, (float) 100 ),
-    new CoordRec((float) 61.9047, (float) 100 ),
-    new CoordRec((float) 71.4286, (float) 95.2381 ),
-    new CoordRec((float) 76.1905, (float) 90.4762 ),
-    new CoordRec((float) 80.9524, (float) 80.9524 ),
-    new CoordRec((float) 80.9524, (float) 71.4286 ),
-    new CoordRec((float) 76.1905, (float) 61.9048 ),
-    new CoordRec((float) 66.6666, (float) 47.619 ),
-    new CoordRec((float) 19.0476, (float) 0 ),
-    new CoordRec((float) 85.7143, (float) 0 ),
-};
-
-static final StrokeRec char50[] = {
-   new StrokeRec( 14, char50_stroke0 ),
-};
-
-/* char: 51 '3' */
-
-static final CoordRec char51_stroke0[] = {
-    new CoordRec((float) 28.5714, (float) 100 ),
-    new CoordRec((float) 80.9524, (float) 100 ),
-    new CoordRec((float) 52.3809, (float) 61.9048 ),
-    new CoordRec((float) 66.6666, (float) 61.9048 ),
-    new CoordRec((float) 76.1905, (float) 57.1429 ),
-    new CoordRec((float) 80.9524, (float) 52.381 ),
-    new CoordRec((float) 85.7143, (float) 38.0952 ),
-    new CoordRec((float) 85.7143, (float) 28.5714 ),
-    new CoordRec((float) 80.9524, (float) 14.2857 ),
-    new CoordRec((float) 71.4286, (float) 4.7619 ),
-    new CoordRec((float) 57.1428, (float) 0 ),
-    new CoordRec((float) 42.8571, (float) 0 ),
-    new CoordRec((float) 28.5714, (float) 4.7619 ),
-    new CoordRec((float) 23.8095, (float) 9.5238 ),
-    new CoordRec((float) 19.0476, (float) 19.0476 ),
-};
-
-static final StrokeRec char51[] = {
-   new StrokeRec( 15, char51_stroke0 ),
-};
-
-/* char: 52 '4' */
-
-static final CoordRec char52_stroke0[] = {
-    new CoordRec((float) 64.2857, (float) 100 ),
-    new CoordRec((float) 16.6667, (float) 33.3333 ),
-    new CoordRec((float) 88.0952, (float) 33.3333 ),
-};
-
-static final CoordRec char52_stroke1[] = {
-    new CoordRec((float) 64.2857, (float) 100 ),
-    new CoordRec((float) 64.2857, (float) 0 ),
-};
-
-static final StrokeRec char52[] = {
-   new StrokeRec( 3, char52_stroke0 ),
-   new StrokeRec( 2, char52_stroke1 ),
-};
-
-/* char: 53 '5' */
-
-static final CoordRec char53_stroke0[] = {
-    new CoordRec((float) 76.1905, (float) 100 ),
-    new CoordRec((float) 28.5714, (float) 100 ),
-    new CoordRec((float) 23.8095, (float) 57.1429 ),
-    new CoordRec((float) 28.5714, (float) 61.9048 ),
-    new CoordRec((float) 42.8571, (float) 66.6667 ),
-    new CoordRec((float) 57.1428, (float) 66.6667 ),
-    new CoordRec((float) 71.4286, (float) 61.9048 ),
-    new CoordRec((float) 80.9524, (float) 52.381 ),
-    new CoordRec((float) 85.7143, (float) 38.0952 ),
-    new CoordRec((float) 85.7143, (float) 28.5714 ),
-    new CoordRec((float) 80.9524, (float) 14.2857 ),
-    new CoordRec((float) 71.4286, (float) 4.7619 ),
-    new CoordRec((float) 57.1428, (float) 0 ),
-    new CoordRec((float) 42.8571, (float) 0 ),
-    new CoordRec((float) 28.5714, (float) 4.7619 ),
-    new CoordRec((float) 23.8095, (float) 9.5238 ),
-    new CoordRec((float) 19.0476, (float) 19.0476 ),
-};
-
-static final StrokeRec char53[] = {
-   new StrokeRec( 17, char53_stroke0 ),
-};
-
-/* char: 54 '6' */
-
-static final CoordRec char54_stroke0[] = {
-    new CoordRec((float) 78.5714, (float) 85.7143 ),
-    new CoordRec((float) 73.8096, (float) 95.2381 ),
-    new CoordRec((float) 59.5238, (float) 100 ),
-    new CoordRec((float) 50, (float) 100 ),
-    new CoordRec((float) 35.7143, (float) 95.2381 ),
-    new CoordRec((float) 26.1905, (float) 80.9524 ),
-    new CoordRec((float) 21.4286, (float) 57.1429 ),
-    new CoordRec((float) 21.4286, (float) 33.3333 ),
-    new CoordRec((float) 26.1905, (float) 14.2857 ),
-    new CoordRec((float) 35.7143, (float) 4.7619 ),
-    new CoordRec((float) 50, (float) 0 ),
-    new CoordRec((float) 54.7619, (float) 0 ),
-    new CoordRec((float) 69.0476, (float) 4.7619 ),
-    new CoordRec((float) 78.5714, (float) 14.2857 ),
-    new CoordRec((float) 83.3334, (float) 28.5714 ),
-    new CoordRec((float) 83.3334, (float) 33.3333 ),
-    new CoordRec((float) 78.5714, (float) 47.619 ),
-    new CoordRec((float) 69.0476, (float) 57.1429 ),
-    new CoordRec((float) 54.7619, (float) 61.9048 ),
-    new CoordRec((float) 50, (float) 61.9048 ),
-    new CoordRec((float) 35.7143, (float) 57.1429 ),
-    new CoordRec((float) 26.1905, (float) 47.619 ),
-    new CoordRec((float) 21.4286, (float) 33.3333 ),
-};
-
-static final StrokeRec char54[] = {
-   new StrokeRec( 23, char54_stroke0 ),
-};
-
-/* char: 55 '7' */
-
-static final CoordRec char55_stroke0[] = {
-    new CoordRec((float) 85.7143, (float) 100 ),
-    new CoordRec((float) 38.0952, (float) 0 ),
-};
-
-static final CoordRec char55_stroke1[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 85.7143, (float) 100 ),
-};
-
-static final StrokeRec char55[] = {
-   new StrokeRec( 2, char55_stroke0 ),
-   new StrokeRec( 2, char55_stroke1 ),
-};
-
-/* char: 56 '8' */
-
-static final CoordRec char56_stroke0[] = {
-    new CoordRec((float) 42.8571, (float) 100 ),
-    new CoordRec((float) 28.5714, (float) 95.2381 ),
-    new CoordRec((float) 23.8095, (float) 85.7143 ),
-    new CoordRec((float) 23.8095, (float) 76.1905 ),
-    new CoordRec((float) 28.5714, (float) 66.6667 ),
-    new CoordRec((float) 38.0952, (float) 61.9048 ),
-    new CoordRec((float) 57.1428, (float) 57.1429 ),
-    new CoordRec((float) 71.4286, (float) 52.381 ),
-    new CoordRec((float) 80.9524, (float) 42.8571 ),
-    new CoordRec((float) 85.7143, (float) 33.3333 ),
-    new CoordRec((float) 85.7143, (float) 19.0476 ),
-    new CoordRec((float) 80.9524, (float) 9.5238 ),
-    new CoordRec((float) 76.1905, (float) 4.7619 ),
-    new CoordRec((float) 61.9047, (float) 0 ),
-    new CoordRec((float) 42.8571, (float) 0 ),
-    new CoordRec((float) 28.5714, (float) 4.7619 ),
-    new CoordRec((float) 23.8095, (float) 9.5238 ),
-    new CoordRec((float) 19.0476, (float) 19.0476 ),
-    new CoordRec((float) 19.0476, (float) 33.3333 ),
-    new CoordRec((float) 23.8095, (float) 42.8571 ),
-    new CoordRec((float) 33.3333, (float) 52.381 ),
-    new CoordRec((float) 47.619, (float) 57.1429 ),
-    new CoordRec((float) 66.6666, (float) 61.9048 ),
-    new CoordRec((float) 76.1905, (float) 66.6667 ),
-    new CoordRec((float) 80.9524, (float) 76.1905 ),
-    new CoordRec((float) 80.9524, (float) 85.7143 ),
-    new CoordRec((float) 76.1905, (float) 95.2381 ),
-    new CoordRec((float) 61.9047, (float) 100 ),
-    new CoordRec((float) 42.8571, (float) 100 ),
-};
-
-static final StrokeRec char56[] = {
-   new StrokeRec( 29, char56_stroke0 ),
-};
-
-/* char: 57 '9' */
-
-static final CoordRec char57_stroke0[] = {
-    new CoordRec((float) 83.3334, (float) 66.6667 ),
-    new CoordRec((float) 78.5714, (float) 52.381 ),
-    new CoordRec((float) 69.0476, (float) 42.8571 ),
-    new CoordRec((float) 54.7619, (float) 38.0952 ),
-    new CoordRec((float) 50, (float) 38.0952 ),
-    new CoordRec((float) 35.7143, (float) 42.8571 ),
-    new CoordRec((float) 26.1905, (float) 52.381 ),
-    new CoordRec((float) 21.4286, (float) 66.6667 ),
-    new CoordRec((float) 21.4286, (float) 71.4286 ),
-    new CoordRec((float) 26.1905, (float) 85.7143 ),
-    new CoordRec((float) 35.7143, (float) 95.2381 ),
-    new CoordRec((float) 50, (float) 100 ),
-    new CoordRec((float) 54.7619, (float) 100 ),
-    new CoordRec((float) 69.0476, (float) 95.2381 ),
-    new CoordRec((float) 78.5714, (float) 85.7143 ),
-    new CoordRec((float) 83.3334, (float) 66.6667 ),
-    new CoordRec((float) 83.3334, (float) 42.8571 ),
-    new CoordRec((float) 78.5714, (float) 19.0476 ),
-    new CoordRec((float) 69.0476, (float) 4.7619 ),
-    new CoordRec((float) 54.7619, (float) 0 ),
-    new CoordRec((float) 45.2381, (float) 0 ),
-    new CoordRec((float) 30.9524, (float) 4.7619 ),
-    new CoordRec((float) 26.1905, (float) 14.2857 ),
-};
-
-static final StrokeRec char57[] = {
-   new StrokeRec( 23, char57_stroke0 ),
-};
-
-/* char: 58 ':' */
-
-static final CoordRec char58_stroke0[] = {
-    new CoordRec((float) 52.381, (float) 66.6667 ),
-    new CoordRec((float) 47.6191, (float) 61.9048 ),
-    new CoordRec((float) 52.381, (float) 57.1429 ),
-    new CoordRec((float) 57.1429, (float) 61.9048 ),
-    new CoordRec((float) 52.381, (float) 66.6667 ),
-};
-
-static final CoordRec char58_stroke1[] = {
-    new CoordRec((float) 52.381, (float) 9.5238 ),
-    new CoordRec((float) 47.6191, (float) 4.7619 ),
-    new CoordRec((float) 52.381, (float) 0 ),
-    new CoordRec((float) 57.1429, (float) 4.7619 ),
-    new CoordRec((float) 52.381, (float) 9.5238 ),
-};
-
-static final StrokeRec char58[] = {
-   new StrokeRec( 5, char58_stroke0 ),
-   new StrokeRec( 5, char58_stroke1 ),
-};
-
-/* char: 59 ';' */
-
-static final CoordRec char59_stroke0[] = {
-    new CoordRec((float) 52.381, (float) 66.6667 ),
-    new CoordRec((float) 47.6191, (float) 61.9048 ),
-    new CoordRec((float) 52.381, (float) 57.1429 ),
-    new CoordRec((float) 57.1429, (float) 61.9048 ),
-    new CoordRec((float) 52.381, (float) 66.6667 ),
-};
-
-static final CoordRec char59_stroke1[] = {
-    new CoordRec((float) 57.1429, (float) 4.7619 ),
-    new CoordRec((float) 52.381, (float) 0 ),
-    new CoordRec((float) 47.6191, (float) 4.7619 ),
-    new CoordRec((float) 52.381, (float) 9.5238 ),
-    new CoordRec((float) 57.1429, (float) 4.7619 ),
-    new CoordRec((float) 57.1429, (float) -4.7619 ),
-    new CoordRec((float) 52.381, (float) -14.2857 ),
-    new CoordRec((float) 47.6191, (float) -19.0476 ),
-};
-
-static final StrokeRec char59[] = {
-   new StrokeRec( 5, char59_stroke0 ),
-   new StrokeRec( 8, char59_stroke1 ),
-};
-
-/* char: 60 '<' */
-
-static final CoordRec char60_stroke0[] = {
-    new CoordRec((float) 90.4762, (float) 85.7143 ),
-    new CoordRec((float) 14.2857, (float) 42.8571 ),
-    new CoordRec((float) 90.4762, (float) 0 ),
-};
-
-static final StrokeRec char60[] = {
-   new StrokeRec( 3, char60_stroke0 ),
-};
-
-/* char: 61 '=' */
-
-static final CoordRec char61_stroke0[] = {
-    new CoordRec((float) 9.5238, (float) 57.1429 ),
-    new CoordRec((float) 95.2381, (float) 57.1429 ),
-};
-
-static final CoordRec char61_stroke1[] = {
-    new CoordRec((float) 9.5238, (float) 28.5714 ),
-    new CoordRec((float) 95.2381, (float) 28.5714 ),
-};
-
-static final StrokeRec char61[] = {
-   new StrokeRec( 2, char61_stroke0 ),
-   new StrokeRec( 2, char61_stroke1 ),
-};
-
-/* char: 62 '>' */
-
-static final CoordRec char62_stroke0[] = {
-    new CoordRec((float) 14.2857, (float) 85.7143 ),
-    new CoordRec((float) 90.4762, (float) 42.8571 ),
-    new CoordRec((float) 14.2857, (float) 0 ),
-};
-
-static final StrokeRec char62[] = {
-   new StrokeRec( 3, char62_stroke0 ),
-};
-
-/* char: 63 '?' */
-
-static final CoordRec char63_stroke0[] = {
-    new CoordRec((float) 23.8095, (float) 76.1905 ),
-    new CoordRec((float) 23.8095, (float) 80.9524 ),
-    new CoordRec((float) 28.5714, (float) 90.4762 ),
-    new CoordRec((float) 33.3333, (float) 95.2381 ),
-    new CoordRec((float) 42.8571, (float) 100 ),
-    new CoordRec((float) 61.9047, (float) 100 ),
-    new CoordRec((float) 71.4285, (float) 95.2381 ),
-    new CoordRec((float) 76.1905, (float) 90.4762 ),
-    new CoordRec((float) 80.9524, (float) 80.9524 ),
-    new CoordRec((float) 80.9524, (float) 71.4286 ),
-    new CoordRec((float) 76.1905, (float) 61.9048 ),
-    new CoordRec((float) 71.4285, (float) 57.1429 ),
-    new CoordRec((float) 52.3809, (float) 47.619 ),
-    new CoordRec((float) 52.3809, (float) 33.3333 ),
-};
-
-static final CoordRec char63_stroke1[] = {
-    new CoordRec((float) 52.3809, (float) 9.5238 ),
-    new CoordRec((float) 47.619, (float) 4.7619 ),
-    new CoordRec((float) 52.3809, (float) 0 ),
-    new CoordRec((float) 57.1428, (float) 4.7619 ),
-    new CoordRec((float) 52.3809, (float) 9.5238 ),
-};
-
-static final StrokeRec char63[] = {
-   new StrokeRec( 14, char63_stroke0 ),
-   new StrokeRec( 5, char63_stroke1 ),
-};
-
-/* char: 64 '@' */
-
-static final CoordRec char64_stroke0[] = {
-    new CoordRec((float) 64.2857, (float) 52.381 ),
-    new CoordRec((float) 54.7619, (float) 57.1429 ),
-    new CoordRec((float) 45.2381, (float) 57.1429 ),
-    new CoordRec((float) 40.4762, (float) 47.619 ),
-    new CoordRec((float) 40.4762, (float) 42.8571 ),
-    new CoordRec((float) 45.2381, (float) 33.3333 ),
-    new CoordRec((float) 54.7619, (float) 33.3333 ),
-    new CoordRec((float) 64.2857, (float) 38.0952 ),
-};
-
-static final CoordRec char64_stroke1[] = {
-    new CoordRec((float) 64.2857, (float) 57.1429 ),
-    new CoordRec((float) 64.2857, (float) 38.0952 ),
-    new CoordRec((float) 69.0476, (float) 33.3333 ),
-    new CoordRec((float) 78.5714, (float) 33.3333 ),
-    new CoordRec((float) 83.3334, (float) 42.8571 ),
-    new CoordRec((float) 83.3334, (float) 47.619 ),
-    new CoordRec((float) 78.5714, (float) 61.9048 ),
-    new CoordRec((float) 69.0476, (float) 71.4286 ),
-    new CoordRec((float) 54.7619, (float) 76.1905 ),
-    new CoordRec((float) 50, (float) 76.1905 ),
-    new CoordRec((float) 35.7143, (float) 71.4286 ),
-    new CoordRec((float) 26.1905, (float) 61.9048 ),
-    new CoordRec((float) 21.4286, (float) 47.619 ),
-    new CoordRec((float) 21.4286, (float) 42.8571 ),
-    new CoordRec((float) 26.1905, (float) 28.5714 ),
-    new CoordRec((float) 35.7143, (float) 19.0476 ),
-    new CoordRec((float) 50, (float) 14.2857 ),
-    new CoordRec((float) 54.7619, (float) 14.2857 ),
-    new CoordRec((float) 69.0476, (float) 19.0476 ),
-};
-
-static final StrokeRec char64[] = {
-   new StrokeRec( 8, char64_stroke0 ),
-   new StrokeRec( 19, char64_stroke1 ),
-};
-
-/* char: 65 'A' */
-
-static final CoordRec char65_stroke0[] = {
-    new CoordRec((float) 52.3809, (float) 100 ),
-    new CoordRec((float) 14.2857, (float) 0 ),
-};
-
-static final CoordRec char65_stroke1[] = {
-    new CoordRec((float) 52.3809, (float) 100 ),
-    new CoordRec((float) 90.4762, (float) 0 ),
-};
-
-static final CoordRec char65_stroke2[] = {
-    new CoordRec((float) 28.5714, (float) 33.3333 ),
-    new CoordRec((float) 76.1905, (float) 33.3333 ),
-};
-
-static final StrokeRec char65[] = {
-   new StrokeRec( 2, char65_stroke0 ),
-   new StrokeRec( 2, char65_stroke1 ),
-   new StrokeRec( 2, char65_stroke2 ),
-};
-
-/* char: 66 'B' */
-
-static final CoordRec char66_stroke0[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 19.0476, (float) 0 ),
-};
-
-static final CoordRec char66_stroke1[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 61.9047, (float) 100 ),
-    new CoordRec((float) 76.1905, (float) 95.2381 ),
-    new CoordRec((float) 80.9524, (float) 90.4762 ),
-    new CoordRec((float) 85.7143, (float) 80.9524 ),
-    new CoordRec((float) 85.7143, (float) 71.4286 ),
-    new CoordRec((float) 80.9524, (float) 61.9048 ),
-    new CoordRec((float) 76.1905, (float) 57.1429 ),
-    new CoordRec((float) 61.9047, (float) 52.381 ),
-};
-
-static final CoordRec char66_stroke2[] = {
-    new CoordRec((float) 19.0476, (float) 52.381 ),
-    new CoordRec((float) 61.9047, (float) 52.381 ),
-    new CoordRec((float) 76.1905, (float) 47.619 ),
-    new CoordRec((float) 80.9524, (float) 42.8571 ),
-    new CoordRec((float) 85.7143, (float) 33.3333 ),
-    new CoordRec((float) 85.7143, (float) 19.0476 ),
-    new CoordRec((float) 80.9524, (float) 9.5238 ),
-    new CoordRec((float) 76.1905, (float) 4.7619 ),
-    new CoordRec((float) 61.9047, (float) 0 ),
-    new CoordRec((float) 19.0476, (float) 0 ),
-};
-
-static final StrokeRec char66[] = {
-   new StrokeRec( 2, char66_stroke0 ),
-   new StrokeRec( 9, char66_stroke1 ),
-   new StrokeRec( 10, char66_stroke2 ),
-};
-
-/* char: 67 'C' */
-
-static final CoordRec char67_stroke0[] = {
-    new CoordRec((float) 88.0952, (float) 76.1905 ),
-    new CoordRec((float) 83.3334, (float) 85.7143 ),
-    new CoordRec((float) 73.8096, (float) 95.2381 ),
-    new CoordRec((float) 64.2857, (float) 100 ),
-    new CoordRec((float) 45.2381, (float) 100 ),
-    new CoordRec((float) 35.7143, (float) 95.2381 ),
-    new CoordRec((float) 26.1905, (float) 85.7143 ),
-    new CoordRec((float) 21.4286, (float) 76.1905 ),
-    new CoordRec((float) 16.6667, (float) 61.9048 ),
-    new CoordRec((float) 16.6667, (float) 38.0952 ),
-    new CoordRec((float) 21.4286, (float) 23.8095 ),
-    new CoordRec((float) 26.1905, (float) 14.2857 ),
-    new CoordRec((float) 35.7143, (float) 4.7619 ),
-    new CoordRec((float) 45.2381, (float) 0 ),
-    new CoordRec((float) 64.2857, (float) 0 ),
-    new CoordRec((float) 73.8096, (float) 4.7619 ),
-    new CoordRec((float) 83.3334, (float) 14.2857 ),
-    new CoordRec((float) 88.0952, (float) 23.8095 ),
-};
-
-static final StrokeRec char67[] = {
-   new StrokeRec( 18, char67_stroke0 ),
-};
-
-/* char: 68 'D' */
-
-static final CoordRec char68_stroke0[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 19.0476, (float) 0 ),
-};
-
-static final CoordRec char68_stroke1[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 52.3809, (float) 100 ),
-    new CoordRec((float) 66.6666, (float) 95.2381 ),
-    new CoordRec((float) 76.1905, (float) 85.7143 ),
-    new CoordRec((float) 80.9524, (float) 76.1905 ),
-    new CoordRec((float) 85.7143, (float) 61.9048 ),
-    new CoordRec((float) 85.7143, (float) 38.0952 ),
-    new CoordRec((float) 80.9524, (float) 23.8095 ),
-    new CoordRec((float) 76.1905, (float) 14.2857 ),
-    new CoordRec((float) 66.6666, (float) 4.7619 ),
-    new CoordRec((float) 52.3809, (float) 0 ),
-    new CoordRec((float) 19.0476, (float) 0 ),
-};
-
-static final StrokeRec char68[] = {
-   new StrokeRec( 2, char68_stroke0 ),
-   new StrokeRec( 12, char68_stroke1 ),
-};
-
-/* char: 69 'E' */
-
-static final CoordRec char69_stroke0[] = {
-    new CoordRec((float) 21.4286, (float) 100 ),
-    new CoordRec((float) 21.4286, (float) 0 ),
-};
-
-static final CoordRec char69_stroke1[] = {
-    new CoordRec((float) 21.4286, (float) 100 ),
-    new CoordRec((float) 83.3334, (float) 100 ),
-};
-
-static final CoordRec char69_stroke2[] = {
-    new CoordRec((float) 21.4286, (float) 52.381 ),
-    new CoordRec((float) 59.5238, (float) 52.381 ),
-};
-
-static final CoordRec char69_stroke3[] = {
-    new CoordRec((float) 21.4286, (float) 0 ),
-    new CoordRec((float) 83.3334, (float) 0 ),
-};
-
-static final StrokeRec char69[] = {
-   new StrokeRec( 2, char69_stroke0 ),
-   new StrokeRec( 2, char69_stroke1 ),
-   new StrokeRec( 2, char69_stroke2 ),
-   new StrokeRec( 2, char69_stroke3 ),
-};
-
-/* char: 70 'F' */
-
-static final CoordRec char70_stroke0[] = {
-    new CoordRec((float) 21.4286, (float) 100 ),
-    new CoordRec((float) 21.4286, (float) 0 ),
-};
-
-static final CoordRec char70_stroke1[] = {
-    new CoordRec((float) 21.4286, (float) 100 ),
-    new CoordRec((float) 83.3334, (float) 100 ),
-};
-
-static final CoordRec char70_stroke2[] = {
-    new CoordRec((float) 21.4286, (float) 52.381 ),
-    new CoordRec((float) 59.5238, (float) 52.381 ),
-};
-
-static final StrokeRec char70[] = {
-   new StrokeRec( 2, char70_stroke0 ),
-   new StrokeRec( 2, char70_stroke1 ),
-   new StrokeRec( 2, char70_stroke2 ),
-};
-
-/* char: 71 'G' */
-
-static final CoordRec char71_stroke0[] = {
-    new CoordRec((float) 88.0952, (float) 76.1905 ),
-    new CoordRec((float) 83.3334, (float) 85.7143 ),
-    new CoordRec((float) 73.8096, (float) 95.2381 ),
-    new CoordRec((float) 64.2857, (float) 100 ),
-    new CoordRec((float) 45.2381, (float) 100 ),
-    new CoordRec((float) 35.7143, (float) 95.2381 ),
-    new CoordRec((float) 26.1905, (float) 85.7143 ),
-    new CoordRec((float) 21.4286, (float) 76.1905 ),
-    new CoordRec((float) 16.6667, (float) 61.9048 ),
-    new CoordRec((float) 16.6667, (float) 38.0952 ),
-    new CoordRec((float) 21.4286, (float) 23.8095 ),
-    new CoordRec((float) 26.1905, (float) 14.2857 ),
-    new CoordRec((float) 35.7143, (float) 4.7619 ),
-    new CoordRec((float) 45.2381, (float) 0 ),
-    new CoordRec((float) 64.2857, (float) 0 ),
-    new CoordRec((float) 73.8096, (float) 4.7619 ),
-    new CoordRec((float) 83.3334, (float) 14.2857 ),
-    new CoordRec((float) 88.0952, (float) 23.8095 ),
-    new CoordRec((float) 88.0952, (float) 38.0952 ),
-};
-
-static final CoordRec char71_stroke1[] = {
-    new CoordRec((float) 64.2857, (float) 38.0952 ),
-    new CoordRec((float) 88.0952, (float) 38.0952 ),
-};
-
-static final StrokeRec char71[] = {
-   new StrokeRec( 19, char71_stroke0 ),
-   new StrokeRec( 2, char71_stroke1 ),
-};
-
-/* char: 72 'H' */
-
-static final CoordRec char72_stroke0[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 19.0476, (float) 0 ),
-};
-
-static final CoordRec char72_stroke1[] = {
-    new CoordRec((float) 85.7143, (float) 100 ),
-    new CoordRec((float) 85.7143, (float) 0 ),
-};
-
-static final CoordRec char72_stroke2[] = {
-    new CoordRec((float) 19.0476, (float) 52.381 ),
-    new CoordRec((float) 85.7143, (float) 52.381 ),
-};
-
-static final StrokeRec char72[] = {
-   new StrokeRec( 2, char72_stroke0 ),
-   new StrokeRec( 2, char72_stroke1 ),
-   new StrokeRec( 2, char72_stroke2 ),
-};
-
-/* char: 73 'I' */
-
-static final CoordRec char73_stroke0[] = {
-    new CoordRec((float) 52.381, (float) 100 ),
-    new CoordRec((float) 52.381, (float) 0 ),
-};
-
-static final StrokeRec char73[] = {
-   new StrokeRec( 2, char73_stroke0 ),
-};
-
-/* char: 74 'J' */
-
-static final CoordRec char74_stroke0[] = {
-    new CoordRec((float) 76.1905, (float) 100 ),
-    new CoordRec((float) 76.1905, (float) 23.8095 ),
-    new CoordRec((float) 71.4286, (float) 9.5238 ),
-    new CoordRec((float) 66.6667, (float) 4.7619 ),
-    new CoordRec((float) 57.1429, (float) 0 ),
-    new CoordRec((float) 47.6191, (float) 0 ),
-    new CoordRec((float) 38.0953, (float) 4.7619 ),
-    new CoordRec((float) 33.3334, (float) 9.5238 ),
-    new CoordRec((float) 28.5715, (float) 23.8095 ),
-    new CoordRec((float) 28.5715, (float) 33.3333 ),
-};
-
-static final StrokeRec char74[] = {
-   new StrokeRec( 10, char74_stroke0 ),
-};
-
-/* char: 75 'K' */
-
-static final CoordRec char75_stroke0[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 19.0476, (float) 0 ),
-};
-
-static final CoordRec char75_stroke1[] = {
-    new CoordRec((float) 85.7143, (float) 100 ),
-    new CoordRec((float) 19.0476, (float) 33.3333 ),
-};
-
-static final CoordRec char75_stroke2[] = {
-    new CoordRec((float) 42.8571, (float) 57.1429 ),
-    new CoordRec((float) 85.7143, (float) 0 ),
-};
-
-static final StrokeRec char75[] = {
-   new StrokeRec( 2, char75_stroke0 ),
-   new StrokeRec( 2, char75_stroke1 ),
-   new StrokeRec( 2, char75_stroke2 ),
-};
-
-/* char: 76 'L' */
-
-static final CoordRec char76_stroke0[] = {
-    new CoordRec((float) 23.8095, (float) 100 ),
-    new CoordRec((float) 23.8095, (float) 0 ),
-};
-
-static final CoordRec char76_stroke1[] = {
-    new CoordRec((float) 23.8095, (float) 0 ),
-    new CoordRec((float) 80.9524, (float) 0 ),
-};
-
-static final StrokeRec char76[] = {
-   new StrokeRec( 2, char76_stroke0 ),
-   new StrokeRec( 2, char76_stroke1 ),
-};
-
-/* char: 77 'M' */
-
-static final CoordRec char77_stroke0[] = {
-    new CoordRec((float) 14.2857, (float) 100 ),
-    new CoordRec((float) 14.2857, (float) 0 ),
-};
-
-static final CoordRec char77_stroke1[] = {
-    new CoordRec((float) 14.2857, (float) 100 ),
-    new CoordRec((float) 52.3809, (float) 0 ),
-};
-
-static final CoordRec char77_stroke2[] = {
-    new CoordRec((float) 90.4762, (float) 100 ),
-    new CoordRec((float) 52.3809, (float) 0 ),
-};
-
-static final CoordRec char77_stroke3[] = {
-    new CoordRec((float) 90.4762, (float) 100 ),
-    new CoordRec((float) 90.4762, (float) 0 ),
-};
-
-static final StrokeRec char77[] = {
-   new StrokeRec( 2, char77_stroke0 ),
-   new StrokeRec( 2, char77_stroke1 ),
-   new StrokeRec( 2, char77_stroke2 ),
-   new StrokeRec( 2, char77_stroke3 ),
-};
-
-/* char: 78 'N' */
-
-static final CoordRec char78_stroke0[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 19.0476, (float) 0 ),
-};
-
-static final CoordRec char78_stroke1[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 85.7143, (float) 0 ),
-};
-
-static final CoordRec char78_stroke2[] = {
-    new CoordRec((float) 85.7143, (float) 100 ),
-    new CoordRec((float) 85.7143, (float) 0 ),
-};
-
-static final StrokeRec char78[] = {
-   new StrokeRec( 2, char78_stroke0 ),
-   new StrokeRec( 2, char78_stroke1 ),
-   new StrokeRec( 2, char78_stroke2 ),
-};
-
-/* char: 79 'O' */
-
-static final CoordRec char79_stroke0[] = {
-    new CoordRec((float) 42.8571, (float) 100 ),
-    new CoordRec((float) 33.3333, (float) 95.2381 ),
-    new CoordRec((float) 23.8095, (float) 85.7143 ),
-    new CoordRec((float) 19.0476, (float) 76.1905 ),
-    new CoordRec((float) 14.2857, (float) 61.9048 ),
-    new CoordRec((float) 14.2857, (float) 38.0952 ),
-    new CoordRec((float) 19.0476, (float) 23.8095 ),
-    new CoordRec((float) 23.8095, (float) 14.2857 ),
-    new CoordRec((float) 33.3333, (float) 4.7619 ),
-    new CoordRec((float) 42.8571, (float) 0 ),
-    new CoordRec((float) 61.9047, (float) 0 ),
-    new CoordRec((float) 71.4286, (float) 4.7619 ),
-    new CoordRec((float) 80.9524, (float) 14.2857 ),
-    new CoordRec((float) 85.7143, (float) 23.8095 ),
-    new CoordRec((float) 90.4762, (float) 38.0952 ),
-    new CoordRec((float) 90.4762, (float) 61.9048 ),
-    new CoordRec((float) 85.7143, (float) 76.1905 ),
-    new CoordRec((float) 80.9524, (float) 85.7143 ),
-    new CoordRec((float) 71.4286, (float) 95.2381 ),
-    new CoordRec((float) 61.9047, (float) 100 ),
-    new CoordRec((float) 42.8571, (float) 100 ),
-};
-
-static final StrokeRec char79[] = {
-   new StrokeRec( 21, char79_stroke0 ),
-};
-
-/* char: 80 'P' */
-
-static final CoordRec char80_stroke0[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 19.0476, (float) 0 ),
-};
-
-static final CoordRec char80_stroke1[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 61.9047, (float) 100 ),
-    new CoordRec((float) 76.1905, (float) 95.2381 ),
-    new CoordRec((float) 80.9524, (float) 90.4762 ),
-    new CoordRec((float) 85.7143, (float) 80.9524 ),
-    new CoordRec((float) 85.7143, (float) 66.6667 ),
-    new CoordRec((float) 80.9524, (float) 57.1429 ),
-    new CoordRec((float) 76.1905, (float) 52.381 ),
-    new CoordRec((float) 61.9047, (float) 47.619 ),
-    new CoordRec((float) 19.0476, (float) 47.619 ),
-};
-
-static final StrokeRec char80[] = {
-   new StrokeRec( 2, char80_stroke0 ),
-   new StrokeRec( 10, char80_stroke1 ),
-};
-
-/* char: 81 'Q' */
-
-static final CoordRec char81_stroke0[] = {
-    new CoordRec((float) 42.8571, (float) 100 ),
-    new CoordRec((float) 33.3333, (float) 95.2381 ),
-    new CoordRec((float) 23.8095, (float) 85.7143 ),
-    new CoordRec((float) 19.0476, (float) 76.1905 ),
-    new CoordRec((float) 14.2857, (float) 61.9048 ),
-    new CoordRec((float) 14.2857, (float) 38.0952 ),
-    new CoordRec((float) 19.0476, (float) 23.8095 ),
-    new CoordRec((float) 23.8095, (float) 14.2857 ),
-    new CoordRec((float) 33.3333, (float) 4.7619 ),
-    new CoordRec((float) 42.8571, (float) 0 ),
-    new CoordRec((float) 61.9047, (float) 0 ),
-    new CoordRec((float) 71.4286, (float) 4.7619 ),
-    new CoordRec((float) 80.9524, (float) 14.2857 ),
-    new CoordRec((float) 85.7143, (float) 23.8095 ),
-    new CoordRec((float) 90.4762, (float) 38.0952 ),
-    new CoordRec((float) 90.4762, (float) 61.9048 ),
-    new CoordRec((float) 85.7143, (float) 76.1905 ),
-    new CoordRec((float) 80.9524, (float) 85.7143 ),
-    new CoordRec((float) 71.4286, (float) 95.2381 ),
-    new CoordRec((float) 61.9047, (float) 100 ),
-    new CoordRec((float) 42.8571, (float) 100 ),
-};
-
-static final CoordRec char81_stroke1[] = {
-    new CoordRec((float) 57.1428, (float) 19.0476 ),
-    new CoordRec((float) 85.7143, (float) -9.5238 ),
-};
-
-static final StrokeRec char81[] = {
-   new StrokeRec( 21, char81_stroke0 ),
-   new StrokeRec( 2, char81_stroke1 ),
-};
-
-/* char: 82 'R' */
-
-static final CoordRec char82_stroke0[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 19.0476, (float) 0 ),
-};
-
-static final CoordRec char82_stroke1[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 61.9047, (float) 100 ),
-    new CoordRec((float) 76.1905, (float) 95.2381 ),
-    new CoordRec((float) 80.9524, (float) 90.4762 ),
-    new CoordRec((float) 85.7143, (float) 80.9524 ),
-    new CoordRec((float) 85.7143, (float) 71.4286 ),
-    new CoordRec((float) 80.9524, (float) 61.9048 ),
-    new CoordRec((float) 76.1905, (float) 57.1429 ),
-    new CoordRec((float) 61.9047, (float) 52.381 ),
-    new CoordRec((float) 19.0476, (float) 52.381 ),
-};
-
-static final CoordRec char82_stroke2[] = {
-    new CoordRec((float) 52.3809, (float) 52.381 ),
-    new CoordRec((float) 85.7143, (float) 0 ),
-};
-
-static final StrokeRec char82[] = {
-   new StrokeRec( 2, char82_stroke0 ),
-   new StrokeRec( 10, char82_stroke1 ),
-   new StrokeRec( 2, char82_stroke2 ),
-};
-
-/* char: 83 'S' */
-
-static final CoordRec char83_stroke0[] = {
-    new CoordRec((float) 85.7143, (float) 85.7143 ),
-    new CoordRec((float) 76.1905, (float) 95.2381 ),
-    new CoordRec((float) 61.9047, (float) 100 ),
-    new CoordRec((float) 42.8571, (float) 100 ),
-    new CoordRec((float) 28.5714, (float) 95.2381 ),
-    new CoordRec((float) 19.0476, (float) 85.7143 ),
-    new CoordRec((float) 19.0476, (float) 76.1905 ),
-    new CoordRec((float) 23.8095, (float) 66.6667 ),
-    new CoordRec((float) 28.5714, (float) 61.9048 ),
-    new CoordRec((float) 38.0952, (float) 57.1429 ),
-    new CoordRec((float) 66.6666, (float) 47.619 ),
-    new CoordRec((float) 76.1905, (float) 42.8571 ),
-    new CoordRec((float) 80.9524, (float) 38.0952 ),
-    new CoordRec((float) 85.7143, (float) 28.5714 ),
-    new CoordRec((float) 85.7143, (float) 14.2857 ),
-    new CoordRec((float) 76.1905, (float) 4.7619 ),
-    new CoordRec((float) 61.9047, (float) 0 ),
-    new CoordRec((float) 42.8571, (float) 0 ),
-    new CoordRec((float) 28.5714, (float) 4.7619 ),
-    new CoordRec((float) 19.0476, (float) 14.2857 ),
-};
-
-static final StrokeRec char83[] = {
-   new StrokeRec( 20, char83_stroke0 ),
-};
-
-/* char: 84 'T' */
-
-static final CoordRec char84_stroke0[] = {
-    new CoordRec((float) 52.3809, (float) 100 ),
-    new CoordRec((float) 52.3809, (float) 0 ),
-};
-
-static final CoordRec char84_stroke1[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 85.7143, (float) 100 ),
-};
-
-static final StrokeRec char84[] = {
-   new StrokeRec( 2, char84_stroke0 ),
-   new StrokeRec( 2, char84_stroke1 ),
-};
-
-/* char: 85 'U' */
-
-static final CoordRec char85_stroke0[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 19.0476, (float) 28.5714 ),
-    new CoordRec((float) 23.8095, (float) 14.2857 ),
-    new CoordRec((float) 33.3333, (float) 4.7619 ),
-    new CoordRec((float) 47.619, (float) 0 ),
-    new CoordRec((float) 57.1428, (float) 0 ),
-    new CoordRec((float) 71.4286, (float) 4.7619 ),
-    new CoordRec((float) 80.9524, (float) 14.2857 ),
-    new CoordRec((float) 85.7143, (float) 28.5714 ),
-    new CoordRec((float) 85.7143, (float) 100 ),
-};
-
-static final StrokeRec char85[] = {
-   new StrokeRec( 10, char85_stroke0 ),
-};
-
-/* char: 86 'V' */
-
-static final CoordRec char86_stroke0[] = {
-    new CoordRec((float) 14.2857, (float) 100 ),
-    new CoordRec((float) 52.3809, (float) 0 ),
-};
-
-static final CoordRec char86_stroke1[] = {
-    new CoordRec((float) 90.4762, (float) 100 ),
-    new CoordRec((float) 52.3809, (float) 0 ),
-};
-
-static final StrokeRec char86[] = {
-   new StrokeRec( 2, char86_stroke0 ),
-   new StrokeRec( 2, char86_stroke1 ),
-};
-
-/* char: 87 'W' */
-
-static final CoordRec char87_stroke0[] = {
-    new CoordRec((float) 4.7619, (float) 100 ),
-    new CoordRec((float) 28.5714, (float) 0 ),
-};
-
-static final CoordRec char87_stroke1[] = {
-    new CoordRec((float) 52.3809, (float) 100 ),
-    new CoordRec((float) 28.5714, (float) 0 ),
-};
-
-static final CoordRec char87_stroke2[] = {
-    new CoordRec((float) 52.3809, (float) 100 ),
-    new CoordRec((float) 76.1905, (float) 0 ),
-};
-
-static final CoordRec char87_stroke3[] = {
-    new CoordRec((float) 100, (float) 100 ),
-    new CoordRec((float) 76.1905, (float) 0 ),
-};
-
-static final StrokeRec char87[] = {
-   new StrokeRec( 2, char87_stroke0 ),
-   new StrokeRec( 2, char87_stroke1 ),
-   new StrokeRec( 2, char87_stroke2 ),
-   new StrokeRec( 2, char87_stroke3 ),
-};
-
-/* char: 88 'X' */
-
-static final CoordRec char88_stroke0[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 85.7143, (float) 0 ),
-};
-
-static final CoordRec char88_stroke1[] = {
-    new CoordRec((float) 85.7143, (float) 100 ),
-    new CoordRec((float) 19.0476, (float) 0 ),
-};
-
-static final StrokeRec char88[] = {
-   new StrokeRec( 2, char88_stroke0 ),
-   new StrokeRec( 2, char88_stroke1 ),
-};
-
-/* char: 89 'Y' */
-
-static final CoordRec char89_stroke0[] = {
-    new CoordRec((float) 14.2857, (float) 100 ),
-    new CoordRec((float) 52.3809, (float) 52.381 ),
-    new CoordRec((float) 52.3809, (float) 0 ),
-};
-
-static final CoordRec char89_stroke1[] = {
-    new CoordRec((float) 90.4762, (float) 100 ),
-    new CoordRec((float) 52.3809, (float) 52.381 ),
-};
-
-static final StrokeRec char89[] = {
-   new StrokeRec( 3, char89_stroke0 ),
-   new StrokeRec( 2, char89_stroke1 ),
-};
-
-/* char: 90 'Z' */
-
-static final CoordRec char90_stroke0[] = {
-    new CoordRec((float) 85.7143, (float) 100 ),
-    new CoordRec((float) 19.0476, (float) 0 ),
-};
-
-static final CoordRec char90_stroke1[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 85.7143, (float) 100 ),
-};
-
-static final CoordRec char90_stroke2[] = {
-    new CoordRec((float) 19.0476, (float) 0 ),
-    new CoordRec((float) 85.7143, (float) 0 ),
-};
-
-static final StrokeRec char90[] = {
-   new StrokeRec( 2, char90_stroke0 ),
-   new StrokeRec( 2, char90_stroke1 ),
-   new StrokeRec( 2, char90_stroke2 ),
-};
-
-/* char: 91 '[' */
-
-static final CoordRec char91_stroke0[] = {
-    new CoordRec((float) 35.7143, (float) 119.048 ),
-    new CoordRec((float) 35.7143, (float) -33.3333 ),
-};
-
-static final CoordRec char91_stroke1[] = {
-    new CoordRec((float) 40.4762, (float) 119.048 ),
-    new CoordRec((float) 40.4762, (float) -33.3333 ),
-};
-
-static final CoordRec char91_stroke2[] = {
-    new CoordRec((float) 35.7143, (float) 119.048 ),
-    new CoordRec((float) 69.0476, (float) 119.048 ),
-};
-
-static final CoordRec char91_stroke3[] = {
-    new CoordRec((float) 35.7143, (float) -33.3333 ),
-    new CoordRec((float) 69.0476, (float) -33.3333 ),
-};
-
-static final StrokeRec char91[] = {
-   new StrokeRec( 2, char91_stroke0 ),
-   new StrokeRec( 2, char91_stroke1 ),
-   new StrokeRec( 2, char91_stroke2 ),
-   new StrokeRec( 2, char91_stroke3 ),
-};
-
-/* char: 92 '\' */
-
-static final CoordRec char92_stroke0[] = {
-    new CoordRec((float) 19.0476, (float) 100 ),
-    new CoordRec((float) 85.7143, (float) -14.2857 ),
-};
-
-static final StrokeRec char92[] = {
-   new StrokeRec( 2, char92_stroke0 ),
-};
-
-/* char: 93 ']' */
-
-static final CoordRec char93_stroke0[] = {
-    new CoordRec((float) 64.2857, (float) 119.048 ),
-    new CoordRec((float) 64.2857, (float) -33.3333 ),
-};
-
-static final CoordRec char93_stroke1[] = {
-    new CoordRec((float) 69.0476, (float) 119.048 ),
-    new CoordRec((float) 69.0476, (float) -33.3333 ),
-};
-
-static final CoordRec char93_stroke2[] = {
-    new CoordRec((float) 35.7143, (float) 119.048 ),
-    new CoordRec((float) 69.0476, (float) 119.048 ),
-};
-
-static final CoordRec char93_stroke3[] = {
-    new CoordRec((float) 35.7143, (float) -33.3333 ),
-    new CoordRec((float) 69.0476, (float) -33.3333 ),
-};
-
-static final StrokeRec char93[] = {
-   new StrokeRec( 2, char93_stroke0 ),
-   new StrokeRec( 2, char93_stroke1 ),
-   new StrokeRec( 2, char93_stroke2 ),
-   new StrokeRec( 2, char93_stroke3 ),
-};
-
-/* char: 94 '^' */
-
-static final CoordRec char94_stroke0[] = {
-    new CoordRec((float) 52.3809, (float) 109.524 ),
-    new CoordRec((float) 14.2857, (float) 42.8571 ),
-};
-
-static final CoordRec char94_stroke1[] = {
-    new CoordRec((float) 52.3809, (float) 109.524 ),
-    new CoordRec((float) 90.4762, (float) 42.8571 ),
-};
-
-static final StrokeRec char94[] = {
-   new StrokeRec( 2, char94_stroke0 ),
-   new StrokeRec( 2, char94_stroke1 ),
-};
-
-/* char: 95 '_' */
-
-static final CoordRec char95_stroke0[] = {
-    new CoordRec((float) 0, (float) -33.3333 ),
-    new CoordRec((float) 104.762, (float) -33.3333 ),
-    new CoordRec((float) 104.762, (float) -28.5714 ),
-    new CoordRec((float) 0, (float) -28.5714 ),
-    new CoordRec((float) 0, (float) -33.3333 ),
-};
-
-static final StrokeRec char95[] = {
-   new StrokeRec( 5, char95_stroke0 ),
-};
-
-/* char: 96 '`' */
-
-static final CoordRec char96_stroke0[] = {
-    new CoordRec((float) 42.8572, (float) 100 ),
-    new CoordRec((float) 66.6667, (float) 71.4286 ),
-};
-
-static final CoordRec char96_stroke1[] = {
-    new CoordRec((float) 42.8572, (float) 100 ),
-    new CoordRec((float) 38.0953, (float) 95.2381 ),
-    new CoordRec((float) 66.6667, (float) 71.4286 ),
-};
-
-static final StrokeRec char96[] = {
-   new StrokeRec( 2, char96_stroke0 ),
-   new StrokeRec( 3, char96_stroke1 ),
-};
-
-/* char: 97 'a' */
-
-static final CoordRec char97_stroke0[] = {
-    new CoordRec((float) 80.9524, (float) 66.6667 ),
-    new CoordRec((float) 80.9524, (float) 0 ),
-};
-
-static final CoordRec char97_stroke1[] = {
-    new CoordRec((float) 80.9524, (float) 52.381 ),
-    new CoordRec((float) 71.4285, (float) 61.9048 ),
-    new CoordRec((float) 61.9047, (float) 66.6667 ),
-    new CoordRec((float) 47.619, (float) 66.6667 ),
-    new CoordRec((float) 38.0952, (float) 61.9048 ),
-    new CoordRec((float) 28.5714, (float) 52.381 ),
-    new CoordRec((float) 23.8095, (float) 38.0952 ),
-    new CoordRec((float) 23.8095, (float) 28.5714 ),
-    new CoordRec((float) 28.5714, (float) 14.2857 ),
-    new CoordRec((float) 38.0952, (float) 4.7619 ),
-    new CoordRec((float) 47.619, (float) 0 ),
-    new CoordRec((float) 61.9047, (float) 0 ),
-    new CoordRec((float) 71.4285, (float) 4.7619 ),
-    new CoordRec((float) 80.9524, (float) 14.2857 ),
-};
-
-static final StrokeRec char97[] = {
-   new StrokeRec( 2, char97_stroke0 ),
-   new StrokeRec( 14, char97_stroke1 ),
-};
-
-/* char: 98 'b' */
-
-static final CoordRec char98_stroke0[] = {
-    new CoordRec((float) 23.8095, (float) 100 ),
-    new CoordRec((float) 23.8095, (float) 0 ),
-};
-
-static final CoordRec char98_stroke1[] = {
-    new CoordRec((float) 23.8095, (float) 52.381 ),
-    new CoordRec((float) 33.3333, (float) 61.9048 ),
-    new CoordRec((float) 42.8571, (float) 66.6667 ),
-    new CoordRec((float) 57.1428, (float) 66.6667 ),
-    new CoordRec((float) 66.6666, (float) 61.9048 ),
-    new CoordRec((float) 76.1905, (float) 52.381 ),
-    new CoordRec((float) 80.9524, (float) 38.0952 ),
-    new CoordRec((float) 80.9524, (float) 28.5714 ),
-    new CoordRec((float) 76.1905, (float) 14.2857 ),
-    new CoordRec((float) 66.6666, (float) 4.7619 ),
-    new CoordRec((float) 57.1428, (float) 0 ),
-    new CoordRec((float) 42.8571, (float) 0 ),
-    new CoordRec((float) 33.3333, (float) 4.7619 ),
-    new CoordRec((float) 23.8095, (float) 14.2857 ),
-};
-
-static final StrokeRec char98[] = {
-   new StrokeRec( 2, char98_stroke0 ),
-   new StrokeRec( 14, char98_stroke1 ),
-};
-
-/* char: 99 'c' */
-
-static final CoordRec char99_stroke0[] = {
-    new CoordRec((float) 80.9524, (float) 52.381 ),
-    new CoordRec((float) 71.4285, (float) 61.9048 ),
-    new CoordRec((float) 61.9047, (float) 66.6667 ),
-    new CoordRec((float) 47.619, (float) 66.6667 ),
-    new CoordRec((float) 38.0952, (float) 61.9048 ),
-    new CoordRec((float) 28.5714, (float) 52.381 ),
-    new CoordRec((float) 23.8095, (float) 38.0952 ),
-    new CoordRec((float) 23.8095, (float) 28.5714 ),
-    new CoordRec((float) 28.5714, (float) 14.2857 ),
-    new CoordRec((float) 38.0952, (float) 4.7619 ),
-    new CoordRec((float) 47.619, (float) 0 ),
-    new CoordRec((float) 61.9047, (float) 0 ),
-    new CoordRec((float) 71.4285, (float) 4.7619 ),
-    new CoordRec((float) 80.9524, (float) 14.2857 ),
-};
-
-static final StrokeRec char99[] = {
-   new StrokeRec( 14, char99_stroke0 ),
-};
-
-/* char: 100 'd' */
-
-static final CoordRec char100_stroke0[] = {
-    new CoordRec((float) 80.9524, (float) 100 ),
-    new CoordRec((float) 80.9524, (float) 0 ),
-};
-
-static final CoordRec char100_stroke1[] = {
-    new CoordRec((float) 80.9524, (float) 52.381 ),
-    new CoordRec((float) 71.4285, (float) 61.9048 ),
-    new CoordRec((float) 61.9047, (float) 66.6667 ),
-    new CoordRec((float) 47.619, (float) 66.6667 ),
-    new CoordRec((float) 38.0952, (float) 61.9048 ),
-    new CoordRec((float) 28.5714, (float) 52.381 ),
-    new CoordRec((float) 23.8095, (float) 38.0952 ),
-    new CoordRec((float) 23.8095, (float) 28.5714 ),
-    new CoordRec((float) 28.5714, (float) 14.2857 ),
-    new CoordRec((float) 38.0952, (float) 4.7619 ),
-    new CoordRec((float) 47.619, (float) 0 ),
-    new CoordRec((float) 61.9047, (float) 0 ),
-    new CoordRec((float) 71.4285, (float) 4.7619 ),
-    new CoordRec((float) 80.9524, (float) 14.2857 ),
-};
-
-static final StrokeRec char100[] = {
-   new StrokeRec( 2, char100_stroke0 ),
-   new StrokeRec( 14, char100_stroke1 ),
-};
-
-/* char: 101 'e' */
-
-static final CoordRec char101_stroke0[] = {
-    new CoordRec((float) 23.8095, (float) 38.0952 ),
-    new CoordRec((float) 80.9524, (float) 38.0952 ),
-    new CoordRec((float) 80.9524, (float) 47.619 ),
-    new CoordRec((float) 76.1905, (float) 57.1429 ),
-    new CoordRec((float) 71.4285, (float) 61.9048 ),
-    new CoordRec((float) 61.9047, (float) 66.6667 ),
-    new CoordRec((float) 47.619, (float) 66.6667 ),
-    new CoordRec((float) 38.0952, (float) 61.9048 ),
-    new CoordRec((float) 28.5714, (float) 52.381 ),
-    new CoordRec((float) 23.8095, (float) 38.0952 ),
-    new CoordRec((float) 23.8095, (float) 28.5714 ),
-    new CoordRec((float) 28.5714, (float) 14.2857 ),
-    new CoordRec((float) 38.0952, (float) 4.7619 ),
-    new CoordRec((float) 47.619, (float) 0 ),
-    new CoordRec((float) 61.9047, (float) 0 ),
-    new CoordRec((float) 71.4285, (float) 4.7619 ),
-    new CoordRec((float) 80.9524, (float) 14.2857 ),
-};
-
-static final StrokeRec char101[] = {
-   new StrokeRec( 17, char101_stroke0 ),
-};
-
-/* char: 102 'f' */
-
-static final CoordRec char102_stroke0[] = {
-    new CoordRec((float) 71.4286, (float) 100 ),
-    new CoordRec((float) 61.9048, (float) 100 ),
-    new CoordRec((float) 52.381, (float) 95.2381 ),
-    new CoordRec((float) 47.6191, (float) 80.9524 ),
-    new CoordRec((float) 47.6191, (float) 0 ),
-};
-
-static final CoordRec char102_stroke1[] = {
-    new CoordRec((float) 33.3334, (float) 66.6667 ),
-    new CoordRec((float) 66.6667, (float) 66.6667 ),
-};
-
-static final StrokeRec char102[] = {
-   new StrokeRec( 5, char102_stroke0 ),
-   new StrokeRec( 2, char102_stroke1 ),
-};
-
-/* char: 103 'g' */
-
-static final CoordRec char103_stroke0[] = {
-    new CoordRec((float) 80.9524, (float) 66.6667 ),
-    new CoordRec((float) 80.9524, (float) -9.5238 ),
-    new CoordRec((float) 76.1905, (float) -23.8095 ),
-    new CoordRec((float) 71.4285, (float) -28.5714 ),
-    new CoordRec((float) 61.9047, (float) -33.3333 ),
-    new CoordRec((float) 47.619, (float) -33.3333 ),
-    new CoordRec((float) 38.0952, (float) -28.5714 ),
-};
-
-static final CoordRec char103_stroke1[] = {
-    new CoordRec((float) 80.9524, (float) 52.381 ),
-    new CoordRec((float) 71.4285, (float) 61.9048 ),
-    new CoordRec((float) 61.9047, (float) 66.6667 ),
-    new CoordRec((float) 47.619, (float) 66.6667 ),
-    new CoordRec((float) 38.0952, (float) 61.9048 ),
-    new CoordRec((float) 28.5714, (float) 52.381 ),
-    new CoordRec((float) 23.8095, (float) 38.0952 ),
-    new CoordRec((float) 23.8095, (float) 28.5714 ),
-    new CoordRec((float) 28.5714, (float) 14.2857 ),
-    new CoordRec((float) 38.0952, (float) 4.7619 ),
-    new CoordRec((float) 47.619, (float) 0 ),
-    new CoordRec((float) 61.9047, (float) 0 ),
-    new CoordRec((float) 71.4285, (float) 4.7619 ),
-    new CoordRec((float) 80.9524, (float) 14.2857 ),
-};
-
-static final StrokeRec char103[] = {
-   new StrokeRec( 7, char103_stroke0 ),
-   new StrokeRec( 14, char103_stroke1 ),
-};
-
-/* char: 104 'h' */
-
-static final CoordRec char104_stroke0[] = {
-    new CoordRec((float) 26.1905, (float) 100 ),
-    new CoordRec((float) 26.1905, (float) 0 ),
-};
-
-static final CoordRec char104_stroke1[] = {
-    new CoordRec((float) 26.1905, (float) 47.619 ),
-    new CoordRec((float) 40.4762, (float) 61.9048 ),
-    new CoordRec((float) 50, (float) 66.6667 ),
-    new CoordRec((float) 64.2857, (float) 66.6667 ),
-    new CoordRec((float) 73.8095, (float) 61.9048 ),
-    new CoordRec((float) 78.5715, (float) 47.619 ),
-    new CoordRec((float) 78.5715, (float) 0 ),
-};
-
-static final StrokeRec char104[] = {
-   new StrokeRec( 2, char104_stroke0 ),
-   new StrokeRec( 7, char104_stroke1 ),
-};
-
-/* char: 105 'i' */
-
-static final CoordRec char105_stroke0[] = {
-    new CoordRec((float) 47.6191, (float) 100 ),
-    new CoordRec((float) 52.381, (float) 95.2381 ),
-    new CoordRec((float) 57.1429, (float) 100 ),
-    new CoordRec((float) 52.381, (float) 104.762 ),
-    new CoordRec((float) 47.6191, (float) 100 ),
-};
-
-static final CoordRec char105_stroke1[] = {
-    new CoordRec((float) 52.381, (float) 66.6667 ),
-    new CoordRec((float) 52.381, (float) 0 ),
-};
-
-static final StrokeRec char105[] = {
-   new StrokeRec( 5, char105_stroke0 ),
-   new StrokeRec( 2, char105_stroke1 ),
-};
-
-/* char: 106 'j' */
-
-static final CoordRec char106_stroke0[] = {
-    new CoordRec((float) 57.1429, (float) 100 ),
-    new CoordRec((float) 61.9048, (float) 95.2381 ),
-    new CoordRec((float) 66.6667, (float) 100 ),
-    new CoordRec((float) 61.9048, (float) 104.762 ),
-    new CoordRec((float) 57.1429, (float) 100 ),
-};
-
-static final CoordRec char106_stroke1[] = {
-    new CoordRec((float) 61.9048, (float) 66.6667 ),
-    new CoordRec((float) 61.9048, (float) -14.2857 ),
-    new CoordRec((float) 57.1429, (float) -28.5714 ),
-    new CoordRec((float) 47.6191, (float) -33.3333 ),
-    new CoordRec((float) 38.0953, (float) -33.3333 ),
-};
-
-static final StrokeRec char106[] = {
-   new StrokeRec( 5, char106_stroke0 ),
-   new StrokeRec( 5, char106_stroke1 ),
-};
-
-/* char: 107 'k' */
-
-static final CoordRec char107_stroke0[] = {
-    new CoordRec((float) 26.1905, (float) 100 ),
-    new CoordRec((float) 26.1905, (float) 0 ),
-};
-
-static final CoordRec char107_stroke1[] = {
-    new CoordRec((float) 73.8095, (float) 66.6667 ),
-    new CoordRec((float) 26.1905, (float) 19.0476 ),
-};
-
-static final CoordRec char107_stroke2[] = {
-    new CoordRec((float) 45.2381, (float) 38.0952 ),
-    new CoordRec((float) 78.5715, (float) 0 ),
-};
-
-static final StrokeRec char107[] = {
-   new StrokeRec( 2, char107_stroke0 ),
-   new StrokeRec( 2, char107_stroke1 ),
-   new StrokeRec( 2, char107_stroke2 ),
-};
-
-/* char: 108 'l' */
-
-static final CoordRec char108_stroke0[] = {
-    new CoordRec((float) 52.381, (float) 100 ),
-    new CoordRec((float) 52.381, (float) 0 ),
-};
-
-static final StrokeRec char108[] = {
-   new StrokeRec( 2, char108_stroke0 ),
-};
-
-/* char: 109 'm' */
-
-static final CoordRec char109_stroke0[] = {
-    new CoordRec((float) 0, (float) 66.6667 ),
-    new CoordRec((float) 0, (float) 0 ),
-};
-
-static final CoordRec char109_stroke1[] = {
-    new CoordRec((float) 0, (float) 47.619 ),
-    new CoordRec((float) 14.2857, (float) 61.9048 ),
-    new CoordRec((float) 23.8095, (float) 66.6667 ),
-    new CoordRec((float) 38.0952, (float) 66.6667 ),
-    new CoordRec((float) 47.619, (float) 61.9048 ),
-    new CoordRec((float) 52.381, (float) 47.619 ),
-    new CoordRec((float) 52.381, (float) 0 ),
-};
-
-static final CoordRec char109_stroke2[] = {
-    new CoordRec((float) 52.381, (float) 47.619 ),
-    new CoordRec((float) 66.6667, (float) 61.9048 ),
-    new CoordRec((float) 76.1905, (float) 66.6667 ),
-    new CoordRec((float) 90.4762, (float) 66.6667 ),
-    new CoordRec((float) 100, (float) 61.9048 ),
-    new CoordRec((float) 104.762, (float) 47.619 ),
-    new CoordRec((float) 104.762, (float) 0 ),
-};
-
-static final StrokeRec char109[] = {
-   new StrokeRec( 2, char109_stroke0 ),
-   new StrokeRec( 7, char109_stroke1 ),
-   new StrokeRec( 7, char109_stroke2 ),
-};
-
-/* char: 110 'n' */
-
-static final CoordRec char110_stroke0[] = {
-    new CoordRec((float) 26.1905, (float) 66.6667 ),
-    new CoordRec((float) 26.1905, (float) 0 ),
-};
-
-static final CoordRec char110_stroke1[] = {
-    new CoordRec((float) 26.1905, (float) 47.619 ),
-    new CoordRec((float) 40.4762, (float) 61.9048 ),
-    new CoordRec((float) 50, (float) 66.6667 ),
-    new CoordRec((float) 64.2857, (float) 66.6667 ),
-    new CoordRec((float) 73.8095, (float) 61.9048 ),
-    new CoordRec((float) 78.5715, (float) 47.619 ),
-    new CoordRec((float) 78.5715, (float) 0 ),
-};
-
-static final StrokeRec char110[] = {
-   new StrokeRec( 2, char110_stroke0 ),
-   new StrokeRec( 7, char110_stroke1 ),
-};
-
-/* char: 111 'o' */
-
-static final CoordRec char111_stroke0[] = {
-    new CoordRec((float) 45.2381, (float) 66.6667 ),
-    new CoordRec((float) 35.7143, (float) 61.9048 ),
-    new CoordRec((float) 26.1905, (float) 52.381 ),
-    new CoordRec((float) 21.4286, (float) 38.0952 ),
-    new CoordRec((float) 21.4286, (float) 28.5714 ),
-    new CoordRec((float) 26.1905, (float) 14.2857 ),
-    new CoordRec((float) 35.7143, (float) 4.7619 ),
-    new CoordRec((float) 45.2381, (float) 0 ),
-    new CoordRec((float) 59.5238, (float) 0 ),
-    new CoordRec((float) 69.0476, (float) 4.7619 ),
-    new CoordRec((float) 78.5714, (float) 14.2857 ),
-    new CoordRec((float) 83.3334, (float) 28.5714 ),
-    new CoordRec((float) 83.3334, (float) 38.0952 ),
-    new CoordRec((float) 78.5714, (float) 52.381 ),
-    new CoordRec((float) 69.0476, (float) 61.9048 ),
-    new CoordRec((float) 59.5238, (float) 66.6667 ),
-    new CoordRec((float) 45.2381, (float) 66.6667 ),
-};
-
-static final StrokeRec char111[] = {
-   new StrokeRec( 17, char111_stroke0 ),
-};
-
-/* char: 112 'p' */
-
-static final CoordRec char112_stroke0[] = {
-    new CoordRec((float) 23.8095, (float) 66.6667 ),
-    new CoordRec((float) 23.8095, (float) -33.3333 ),
-};
-
-static final CoordRec char112_stroke1[] = {
-    new CoordRec((float) 23.8095, (float) 52.381 ),
-    new CoordRec((float) 33.3333, (float) 61.9048 ),
-    new CoordRec((float) 42.8571, (float) 66.6667 ),
-    new CoordRec((float) 57.1428, (float) 66.6667 ),
-    new CoordRec((float) 66.6666, (float) 61.9048 ),
-    new CoordRec((float) 76.1905, (float) 52.381 ),
-    new CoordRec((float) 80.9524, (float) 38.0952 ),
-    new CoordRec((float) 80.9524, (float) 28.5714 ),
-    new CoordRec((float) 76.1905, (float) 14.2857 ),
-    new CoordRec((float) 66.6666, (float) 4.7619 ),
-    new CoordRec((float) 57.1428, (float) 0 ),
-    new CoordRec((float) 42.8571, (float) 0 ),
-    new CoordRec((float) 33.3333, (float) 4.7619 ),
-    new CoordRec((float) 23.8095, (float) 14.2857 ),
-};
-
-static final StrokeRec char112[] = {
-   new StrokeRec( 2, char112_stroke0 ),
-   new StrokeRec( 14, char112_stroke1 ),
-};
-
-/* char: 113 'q' */
-
-static final CoordRec char113_stroke0[] = {
-    new CoordRec((float) 80.9524, (float) 66.6667 ),
-    new CoordRec((float) 80.9524, (float) -33.3333 ),
-};
-
-static final CoordRec char113_stroke1[] = {
-    new CoordRec((float) 80.9524, (float) 52.381 ),
-    new CoordRec((float) 71.4285, (float) 61.9048 ),
-    new CoordRec((float) 61.9047, (float) 66.6667 ),
-    new CoordRec((float) 47.619, (float) 66.6667 ),
-    new CoordRec((float) 38.0952, (float) 61.9048 ),
-    new CoordRec((float) 28.5714, (float) 52.381 ),
-    new CoordRec((float) 23.8095, (float) 38.0952 ),
-    new CoordRec((float) 23.8095, (float) 28.5714 ),
-    new CoordRec((float) 28.5714, (float) 14.2857 ),
-    new CoordRec((float) 38.0952, (float) 4.7619 ),
-    new CoordRec((float) 47.619, (float) 0 ),
-    new CoordRec((float) 61.9047, (float) 0 ),
-    new CoordRec((float) 71.4285, (float) 4.7619 ),
-    new CoordRec((float) 80.9524, (float) 14.2857 ),
-};
-
-static final StrokeRec char113[] = {
-   new StrokeRec( 2, char113_stroke0 ),
-   new StrokeRec( 14, char113_stroke1 ),
-};
-
-/* char: 114 'r' */
-
-static final CoordRec char114_stroke0[] = {
-    new CoordRec((float) 33.3334, (float) 66.6667 ),
-    new CoordRec((float) 33.3334, (float) 0 ),
-};
-
-static final CoordRec char114_stroke1[] = {
-    new CoordRec((float) 33.3334, (float) 38.0952 ),
-    new CoordRec((float) 38.0953, (float) 52.381 ),
-    new CoordRec((float) 47.6191, (float) 61.9048 ),
-    new CoordRec((float) 57.1429, (float) 66.6667 ),
-    new CoordRec((float) 71.4286, (float) 66.6667 ),
-};
-
-static final StrokeRec char114[] = {
-   new StrokeRec( 2, char114_stroke0 ),
-   new StrokeRec( 5, char114_stroke1 ),
-};
-
-/* char: 115 's' */
-
-static final CoordRec char115_stroke0[] = {
-    new CoordRec((float) 78.5715, (float) 52.381 ),
-    new CoordRec((float) 73.8095, (float) 61.9048 ),
-    new CoordRec((float) 59.5238, (float) 66.6667 ),
-    new CoordRec((float) 45.2381, (float) 66.6667 ),
-    new CoordRec((float) 30.9524, (float) 61.9048 ),
-    new CoordRec((float) 26.1905, (float) 52.381 ),
-    new CoordRec((float) 30.9524, (float) 42.8571 ),
-    new CoordRec((float) 40.4762, (float) 38.0952 ),
-    new CoordRec((float) 64.2857, (float) 33.3333 ),
-    new CoordRec((float) 73.8095, (float) 28.5714 ),
-    new CoordRec((float) 78.5715, (float) 19.0476 ),
-    new CoordRec((float) 78.5715, (float) 14.2857 ),
-    new CoordRec((float) 73.8095, (float) 4.7619 ),
-    new CoordRec((float) 59.5238, (float) 0 ),
-    new CoordRec((float) 45.2381, (float) 0 ),
-    new CoordRec((float) 30.9524, (float) 4.7619 ),
-    new CoordRec((float) 26.1905, (float) 14.2857 ),
-};
-
-static final StrokeRec char115[] = {
-   new StrokeRec( 17, char115_stroke0 ),
-};
-
-/* char: 116 't' */
-
-static final CoordRec char116_stroke0[] = {
-    new CoordRec((float) 47.6191, (float) 100 ),
-    new CoordRec((float) 47.6191, (float) 19.0476 ),
-    new CoordRec((float) 52.381, (float) 4.7619 ),
-    new CoordRec((float) 61.9048, (float) 0 ),
-    new CoordRec((float) 71.4286, (float) 0 ),
-};
-
-static final CoordRec char116_stroke1[] = {
-    new CoordRec((float) 33.3334, (float) 66.6667 ),
-    new CoordRec((float) 66.6667, (float) 66.6667 ),
-};
-
-static final StrokeRec char116[] = {
-   new StrokeRec( 5, char116_stroke0 ),
-   new StrokeRec( 2, char116_stroke1 ),
-};
-
-/* char: 117 'u' */
-
-static final CoordRec char117_stroke0[] = {
-    new CoordRec((float) 26.1905, (float) 66.6667 ),
-    new CoordRec((float) 26.1905, (float) 19.0476 ),
-    new CoordRec((float) 30.9524, (float) 4.7619 ),
-    new CoordRec((float) 40.4762, (float) 0 ),
-    new CoordRec((float) 54.7619, (float) 0 ),
-    new CoordRec((float) 64.2857, (float) 4.7619 ),
-    new CoordRec((float) 78.5715, (float) 19.0476 ),
-};
-
-static final CoordRec char117_stroke1[] = {
-    new CoordRec((float) 78.5715, (float) 66.6667 ),
-    new CoordRec((float) 78.5715, (float) 0 ),
-};
-
-static final StrokeRec char117[] = {
-   new StrokeRec( 7, char117_stroke0 ),
-   new StrokeRec( 2, char117_stroke1 ),
-};
-
-/* char: 118 'v' */
-
-static final CoordRec char118_stroke0[] = {
-    new CoordRec((float) 23.8095, (float) 66.6667 ),
-    new CoordRec((float) 52.3809, (float) 0 ),
-};
-
-static final CoordRec char118_stroke1[] = {
-    new CoordRec((float) 80.9524, (float) 66.6667 ),
-    new CoordRec((float) 52.3809, (float) 0 ),
-};
-
-static final StrokeRec char118[] = {
-   new StrokeRec( 2, char118_stroke0 ),
-   new StrokeRec( 2, char118_stroke1 ),
-};
-
-/* char: 119 'w' */
-
-static final CoordRec char119_stroke0[] = {
-    new CoordRec((float) 14.2857, (float) 66.6667 ),
-    new CoordRec((float) 33.3333, (float) 0 ),
-};
-
-static final CoordRec char119_stroke1[] = {
-    new CoordRec((float) 52.3809, (float) 66.6667 ),
-    new CoordRec((float) 33.3333, (float) 0 ),
-};
-
-static final CoordRec char119_stroke2[] = {
-    new CoordRec((float) 52.3809, (float) 66.6667 ),
-    new CoordRec((float) 71.4286, (float) 0 ),
-};
-
-static final CoordRec char119_stroke3[] = {
-    new CoordRec((float) 90.4762, (float) 66.6667 ),
-    new CoordRec((float) 71.4286, (float) 0 ),
-};
-
-static final StrokeRec char119[] = {
-   new StrokeRec( 2, char119_stroke0 ),
-   new StrokeRec( 2, char119_stroke1 ),
-   new StrokeRec( 2, char119_stroke2 ),
-   new StrokeRec( 2, char119_stroke3 ),
-};
-
-/* char: 120 'x' */
-
-static final CoordRec char120_stroke0[] = {
-    new CoordRec((float) 26.1905, (float) 66.6667 ),
-    new CoordRec((float) 78.5715, (float) 0 ),
-};
-
-static final CoordRec char120_stroke1[] = {
-    new CoordRec((float) 78.5715, (float) 66.6667 ),
-    new CoordRec((float) 26.1905, (float) 0 ),
-};
-
-static final StrokeRec char120[] = {
-   new StrokeRec( 2, char120_stroke0 ),
-   new StrokeRec( 2, char120_stroke1 ),
-};
-
-/* char: 121 'y' */
-
-static final CoordRec char121_stroke0[] = {
-    new CoordRec((float) 26.1905, (float) 66.6667 ),
-    new CoordRec((float) 54.7619, (float) 0 ),
-};
-
-static final CoordRec char121_stroke1[] = {
-    new CoordRec((float) 83.3334, (float) 66.6667 ),
-    new CoordRec((float) 54.7619, (float) 0 ),
-    new CoordRec((float) 45.2381, (float) -19.0476 ),
-    new CoordRec((float) 35.7143, (float) -28.5714 ),
-    new CoordRec((float) 26.1905, (float) -33.3333 ),
-    new CoordRec((float) 21.4286, (float) -33.3333 ),
-};
-
-static final StrokeRec char121[] = {
-   new StrokeRec( 2, char121_stroke0 ),
-   new StrokeRec( 6, char121_stroke1 ),
-};
-
-/* char: 122 'z' */
-
-static final CoordRec char122_stroke0[] = {
-    new CoordRec((float) 78.5715, (float) 66.6667 ),
-    new CoordRec((float) 26.1905, (float) 0 ),
-};
-
-static final CoordRec char122_stroke1[] = {
-    new CoordRec((float) 26.1905, (float) 66.6667 ),
-    new CoordRec((float) 78.5715, (float) 66.6667 ),
-};
-
-static final CoordRec char122_stroke2[] = {
-    new CoordRec((float) 26.1905, (float) 0 ),
-    new CoordRec((float) 78.5715, (float) 0 ),
-};
-
-static final StrokeRec char122[] = {
-   new StrokeRec( 2, char122_stroke0 ),
-   new StrokeRec( 2, char122_stroke1 ),
-   new StrokeRec( 2, char122_stroke2 ),
-};
-
-/* char: 123 '{' */
-
-static final CoordRec char123_stroke0[] = {
-    new CoordRec((float) 64.2857, (float) 119.048 ),
-    new CoordRec((float) 54.7619, (float) 114.286 ),
-    new CoordRec((float) 50, (float) 109.524 ),
-    new CoordRec((float) 45.2381, (float) 100 ),
-    new CoordRec((float) 45.2381, (float) 90.4762 ),
-    new CoordRec((float) 50, (float) 80.9524 ),
-    new CoordRec((float) 54.7619, (float) 76.1905 ),
-    new CoordRec((float) 59.5238, (float) 66.6667 ),
-    new CoordRec((float) 59.5238, (float) 57.1429 ),
-    new CoordRec((float) 50, (float) 47.619 ),
-};
-
-static final CoordRec char123_stroke1[] = {
-    new CoordRec((float) 54.7619, (float) 114.286 ),
-    new CoordRec((float) 50, (float) 104.762 ),
-    new CoordRec((float) 50, (float) 95.2381 ),
-    new CoordRec((float) 54.7619, (float) 85.7143 ),
-    new CoordRec((float) 59.5238, (float) 80.9524 ),
-    new CoordRec((float) 64.2857, (float) 71.4286 ),
-    new CoordRec((float) 64.2857, (float) 61.9048 ),
-    new CoordRec((float) 59.5238, (float) 52.381 ),
-    new CoordRec((float) 40.4762, (float) 42.8571 ),
-    new CoordRec((float) 59.5238, (float) 33.3333 ),
-    new CoordRec((float) 64.2857, (float) 23.8095 ),
-    new CoordRec((float) 64.2857, (float) 14.2857 ),
-    new CoordRec((float) 59.5238, (float) 4.7619 ),
-    new CoordRec((float) 54.7619, (float) 0 ),
-    new CoordRec((float) 50, (float) -9.5238 ),
-    new CoordRec((float) 50, (float) -19.0476 ),
-    new CoordRec((float) 54.7619, (float) -28.5714 ),
-};
-
-static final CoordRec char123_stroke2[] = {
-    new CoordRec((float) 50, (float) 38.0952 ),
-    new CoordRec((float) 59.5238, (float) 28.5714 ),
-    new CoordRec((float) 59.5238, (float) 19.0476 ),
-    new CoordRec((float) 54.7619, (float) 9.5238 ),
-    new CoordRec((float) 50, (float) 4.7619 ),
-    new CoordRec((float) 45.2381, (float) -4.7619 ),
-    new CoordRec((float) 45.2381, (float) -14.2857 ),
-    new CoordRec((float) 50, (float) -23.8095 ),
-    new CoordRec((float) 54.7619, (float) -28.5714 ),
-    new CoordRec((float) 64.2857, (float) -33.3333 ),
-};
-
-static final StrokeRec char123[] = {
-   new StrokeRec( 10, char123_stroke0 ),
-   new StrokeRec( 17, char123_stroke1 ),
-   new StrokeRec( 10, char123_stroke2 ),
-};
-
-/* char: 124 '|' */
-
-static final CoordRec char124_stroke0[] = {
-    new CoordRec((float) 52.381, (float) 119.048 ),
-    new CoordRec((float) 52.381, (float) -33.3333 ),
-};
-
-static final StrokeRec char124[] = {
-   new StrokeRec( 2, char124_stroke0 ),
-};
-
-/* char: 125 '}' */
-
-static final CoordRec char125_stroke0[] = {
-    new CoordRec((float) 40.4762, (float) 119.048 ),
-    new CoordRec((float) 50, (float) 114.286 ),
-    new CoordRec((float) 54.7619, (float) 109.524 ),
-    new CoordRec((float) 59.5238, (float) 100 ),
-    new CoordRec((float) 59.5238, (float) 90.4762 ),
-    new CoordRec((float) 54.7619, (float) 80.9524 ),
-    new CoordRec((float) 50, (float) 76.1905 ),
-    new CoordRec((float) 45.2381, (float) 66.6667 ),
-    new CoordRec((float) 45.2381, (float) 57.1429 ),
-    new CoordRec((float) 54.7619, (float) 47.619 ),
-};
-
-static final CoordRec char125_stroke1[] = {
-    new CoordRec((float) 50, (float) 114.286 ),
-    new CoordRec((float) 54.7619, (float) 104.762 ),
-    new CoordRec((float) 54.7619, (float) 95.2381 ),
-    new CoordRec((float) 50, (float) 85.7143 ),
-    new CoordRec((float) 45.2381, (float) 80.9524 ),
-    new CoordRec((float) 40.4762, (float) 71.4286 ),
-    new CoordRec((float) 40.4762, (float) 61.9048 ),
-    new CoordRec((float) 45.2381, (float) 52.381 ),
-    new CoordRec((float) 64.2857, (float) 42.8571 ),
-    new CoordRec((float) 45.2381, (float) 33.3333 ),
-    new CoordRec((float) 40.4762, (float) 23.8095 ),
-    new CoordRec((float) 40.4762, (float) 14.2857 ),
-    new CoordRec((float) 45.2381, (float) 4.7619 ),
-    new CoordRec((float) 50, (float) 0 ),
-    new CoordRec((float) 54.7619, (float) -9.5238 ),
-    new CoordRec((float) 54.7619, (float) -19.0476 ),
-    new CoordRec((float) 50, (float) -28.5714 ),
-};
-
-static final CoordRec char125_stroke2[] = {
-    new CoordRec((float) 54.7619, (float) 38.0952 ),
-    new CoordRec((float) 45.2381, (float) 28.5714 ),
-    new CoordRec((float) 45.2381, (float) 19.0476 ),
-    new CoordRec((float) 50, (float) 9.5238 ),
-    new CoordRec((float) 54.7619, (float) 4.7619 ),
-    new CoordRec((float) 59.5238, (float) -4.7619 ),
-    new CoordRec((float) 59.5238, (float) -14.2857 ),
-    new CoordRec((float) 54.7619, (float) -23.8095 ),
-    new CoordRec((float) 50, (float) -28.5714 ),
-    new CoordRec((float) 40.4762, (float) -33.3333 ),
-};
-
-static final StrokeRec char125[] = {
-   new StrokeRec( 10, char125_stroke0 ),
-   new StrokeRec( 17, char125_stroke1 ),
-   new StrokeRec( 10, char125_stroke2 ),
-};
-
-/* char: 126 '~' */
-
-static final CoordRec char126_stroke0[] = {
-    new CoordRec((float) 9.5238, (float) 28.5714 ),
-    new CoordRec((float) 9.5238, (float) 38.0952 ),
-    new CoordRec((float) 14.2857, (float) 52.381 ),
-    new CoordRec((float) 23.8095, (float) 57.1429 ),
-    new CoordRec((float) 33.3333, (float) 57.1429 ),
-    new CoordRec((float) 42.8571, (float) 52.381 ),
-    new CoordRec((float) 61.9048, (float) 38.0952 ),
-    new CoordRec((float) 71.4286, (float) 33.3333 ),
-    new CoordRec((float) 80.9524, (float) 33.3333 ),
-    new CoordRec((float) 90.4762, (float) 38.0952 ),
-    new CoordRec((float) 95.2381, (float) 47.619 ),
-};
-
-static final CoordRec char126_stroke1[] = {
-    new CoordRec((float) 9.5238, (float) 38.0952 ),
-    new CoordRec((float) 14.2857, (float) 47.619 ),
-    new CoordRec((float) 23.8095, (float) 52.381 ),
-    new CoordRec((float) 33.3333, (float) 52.381 ),
-    new CoordRec((float) 42.8571, (float) 47.619 ),
-    new CoordRec((float) 61.9048, (float) 33.3333 ),
-    new CoordRec((float) 71.4286, (float) 28.5714 ),
-    new CoordRec((float) 80.9524, (float) 28.5714 ),
-    new CoordRec((float) 90.4762, (float) 33.3333 ),
-    new CoordRec((float) 95.2381, (float) 47.619 ),
-    new CoordRec((float) 95.2381, (float) 57.1429 ),
-};
-
-static final StrokeRec char126[] = {
-   new StrokeRec( 11, char126_stroke0 ),
-   new StrokeRec( 11, char126_stroke1 ),
-};
-
-/* char: 127 */
-
-static final CoordRec char127_stroke0[] = {
-    new CoordRec((float) 71.4286, (float) 100 ),
-    new CoordRec((float) 33.3333, (float) -33.3333 ),
-};
-
-static final CoordRec char127_stroke1[] = {
-    new CoordRec((float) 47.619, (float) 66.6667 ),
-    new CoordRec((float) 33.3333, (float) 61.9048 ),
-    new CoordRec((float) 23.8095, (float) 52.381 ),
-    new CoordRec((float) 19.0476, (float) 38.0952 ),
-    new CoordRec((float) 19.0476, (float) 23.8095 ),
-    new CoordRec((float) 23.8095, (float) 14.2857 ),
-    new CoordRec((float) 33.3333, (float) 4.7619 ),
-    new CoordRec((float) 47.619, (float) 0 ),
-    new CoordRec((float) 57.1428, (float) 0 ),
-    new CoordRec((float) 71.4286, (float) 4.7619 ),
-    new CoordRec((float) 80.9524, (float) 14.2857 ),
-    new CoordRec((float) 85.7143, (float) 28.5714 ),
-    new CoordRec((float) 85.7143, (float) 42.8571 ),
-    new CoordRec((float) 80.9524, (float) 52.381 ),
-    new CoordRec((float) 71.4286, (float) 61.9048 ),
-    new CoordRec((float) 57.1428, (float) 66.6667 ),
-    new CoordRec((float) 47.619, (float) 66.6667 ),
-};
-
-static final StrokeRec char127[] = {
-   new StrokeRec( 2, char127_stroke0 ),
-   new StrokeRec( 17, char127_stroke1 ),
-};
-
-static final StrokeCharRec chars[] = {
-    new StrokeCharRec(0, /* char0 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char1 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char2 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char3 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char4 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char5 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char6 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char7 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char8 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char9 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char10 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char11 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char12 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char13 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char14 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char15 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char16 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char17 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char18 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char19 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char20 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char21 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char22 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char23 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char24 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char25 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char26 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char27 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char28 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char29 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char30 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char31 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec(0, /* char32 */ null, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char33, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char34, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(4, char35, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char36, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char37, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char38, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char39, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char40, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char41, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char42, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char43, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char44, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char45, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char46, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char47, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char48, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char49, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char50, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char51, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char52, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char53, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char54, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char55, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char56, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char57, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char58, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char59, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char60, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char61, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char62, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char63, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char64, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char65, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char66, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char67, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char68, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(4, char69, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char70, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char71, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char72, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char73, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char74, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char75, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char76, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(4, char77, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char78, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char79, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char80, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char81, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char82, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char83, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char84, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char85, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char86, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(4, char87, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char88, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char89, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char90, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(4, char91, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char92, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(4, char93, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char94, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char95, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char96, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char97, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char98, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char99, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char100, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char101, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char102, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char103, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char104, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char105, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char106, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char107, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char108, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char109, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char110, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char111, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char112, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char113, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char114, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char115, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char116, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char117, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char118, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(4, char119, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char120, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char121, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char122, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char123, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(1, char124, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(3, char125, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char126, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec(2, char127, (float) 52.381, (float) 104.762 ),
-};
-
-public static final StrokeFontRec glutStrokeMonoRoman = new StrokeFontRec( "Roman", 128, chars, (float) 119.048, (float) -33.3333 );
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeRoman.java b/src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeRoman.java
deleted file mode 100644
index e960f155a..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeRoman.java
+++ /dev/null
@@ -1,2491 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-class GLUTStrokeRoman {
-
-/* GENERATED FILE -- DO NOT MODIFY */
-
-/* char: 33 '!' */
-
-static final CoordRec char33_stroke0[] = {
-    new CoordRec((float) 13.3819, (float) 100),
-    new CoordRec((float) 13.3819, (float) 33.3333),
-};
-
-static final CoordRec char33_stroke1[] = {
-    new CoordRec((float) 13.3819, (float) 9.5238),
-    new CoordRec((float) 8.62, (float) 4.7619),
-    new CoordRec((float) 13.3819, (float) 0),
-    new CoordRec((float) 18.1438, (float) 4.7619),
-    new CoordRec((float) 13.3819, (float) 9.5238),
-};
-
-static final StrokeRec char33[] = {
-   new StrokeRec(2, char33_stroke0),
-   new StrokeRec(5, char33_stroke1),
-};
-
-/* char: 34 '"' */
-
-static final CoordRec char34_stroke0[] = {
-    new CoordRec((float) 4.02, (float) 100),
-    new CoordRec((float) 4.02, (float) 66.6667),
-};
-
-static final CoordRec char34_stroke1[] = {
-    new CoordRec((float) 42.1152, (float) 100),
-    new CoordRec((float) 42.1152, (float) 66.6667),
-};
-
-static final StrokeRec char34[] = {
-   new StrokeRec(2, char34_stroke0),
-   new StrokeRec(2, char34_stroke1),
-};
-
-/* char: 35 '#' */
-
-static final CoordRec char35_stroke0[] = {
-    new CoordRec((float) 41.2952, (float) 119.048),
-    new CoordRec((float) 7.9619, (float) -33.3333),
-};
-
-static final CoordRec char35_stroke1[] = {
-    new CoordRec((float) 69.8667, (float) 119.048),
-    new CoordRec((float) 36.5333, (float) -33.3333),
-};
-
-static final CoordRec char35_stroke2[] = {
-    new CoordRec((float) 7.9619, (float) 57.1429),
-    new CoordRec((float) 74.6286, (float) 57.1429),
-};
-
-static final CoordRec char35_stroke3[] = {
-    new CoordRec((float) 3.2, (float) 28.5714),
-    new CoordRec((float) 69.8667, (float) 28.5714),
-};
-
-static final StrokeRec char35[] = {
-   new StrokeRec(2, char35_stroke0),
-   new StrokeRec(2, char35_stroke1),
-   new StrokeRec(2, char35_stroke2),
-   new StrokeRec(2, char35_stroke3),
-};
-
-/* char: 36 '$' */
-
-static final CoordRec char36_stroke0[] = {
-    new CoordRec((float) 28.6295, (float) 119.048),
-    new CoordRec((float) 28.6295, (float) -19.0476),
-};
-
-static final CoordRec char36_stroke1[] = {
-    new CoordRec((float) 47.6771, (float) 119.048),
-    new CoordRec((float) 47.6771, (float) -19.0476),
-};
-
-static final CoordRec char36_stroke2[] = {
-    new CoordRec((float) 71.4867, (float) 85.7143),
-    new CoordRec((float) 61.9629, (float) 95.2381),
-    new CoordRec((float) 47.6771, (float) 100),
-    new CoordRec((float) 28.6295, (float) 100),
-    new CoordRec((float) 14.3438, (float) 95.2381),
-    new CoordRec((float) 4.82, (float) 85.7143),
-    new CoordRec((float) 4.82, (float) 76.1905),
-    new CoordRec((float) 9.5819, (float) 66.6667),
-    new CoordRec((float) 14.3438, (float) 61.9048),
-    new CoordRec((float) 23.8676, (float) 57.1429),
-    new CoordRec((float) 52.439, (float) 47.619),
-    new CoordRec((float) 61.9629, (float) 42.8571),
-    new CoordRec((float) 66.7248, (float) 38.0952),
-    new CoordRec((float) 71.4867, (float) 28.5714),
-    new CoordRec((float) 71.4867, (float) 14.2857),
-    new CoordRec((float) 61.9629, (float) 4.7619),
-    new CoordRec((float) 47.6771, (float) 0),
-    new CoordRec((float) 28.6295, (float) 0),
-    new CoordRec((float) 14.3438, (float) 4.7619),
-    new CoordRec((float) 4.82, (float) 14.2857),
-};
-
-static final StrokeRec char36[] = {
-   new StrokeRec(2, char36_stroke0),
-   new StrokeRec(2, char36_stroke1),
-   new StrokeRec(20, char36_stroke2),
-};
-
-/* char: 37 '%' */
-
-static final CoordRec char37_stroke0[] = {
-    new CoordRec((float) 92.0743, (float) 100),
-    new CoordRec((float) 6.36, (float) 0),
-};
-
-static final CoordRec char37_stroke1[] = {
-    new CoordRec((float) 30.1695, (float) 100),
-    new CoordRec((float) 39.6933, (float) 90.4762),
-    new CoordRec((float) 39.6933, (float) 80.9524),
-    new CoordRec((float) 34.9314, (float) 71.4286),
-    new CoordRec((float) 25.4076, (float) 66.6667),
-    new CoordRec((float) 15.8838, (float) 66.6667),
-    new CoordRec((float) 6.36, (float) 76.1905),
-    new CoordRec((float) 6.36, (float) 85.7143),
-    new CoordRec((float) 11.1219, (float) 95.2381),
-    new CoordRec((float) 20.6457, (float) 100),
-    new CoordRec((float) 30.1695, (float) 100),
-    new CoordRec((float) 39.6933, (float) 95.2381),
-    new CoordRec((float) 53.979, (float) 90.4762),
-    new CoordRec((float) 68.2648, (float) 90.4762),
-    new CoordRec((float) 82.5505, (float) 95.2381),
-    new CoordRec((float) 92.0743, (float) 100),
-};
-
-static final CoordRec char37_stroke2[] = {
-    new CoordRec((float) 73.0267, (float) 33.3333),
-    new CoordRec((float) 63.5029, (float) 28.5714),
-    new CoordRec((float) 58.741, (float) 19.0476),
-    new CoordRec((float) 58.741, (float) 9.5238),
-    new CoordRec((float) 68.2648, (float) 0),
-    new CoordRec((float) 77.7886, (float) 0),
-    new CoordRec((float) 87.3124, (float) 4.7619),
-    new CoordRec((float) 92.0743, (float) 14.2857),
-    new CoordRec((float) 92.0743, (float) 23.8095),
-    new CoordRec((float) 82.5505, (float) 33.3333),
-    new CoordRec((float) 73.0267, (float) 33.3333),
-};
-
-static final StrokeRec char37[] = {
-   new StrokeRec(2, char37_stroke0),
-   new StrokeRec(16, char37_stroke1),
-   new StrokeRec(11, char37_stroke2),
-};
-
-/* char: 38 '&' */
-
-static final CoordRec char38_stroke0[] = {
-    new CoordRec((float) 101.218, (float) 57.1429),
-    new CoordRec((float) 101.218, (float) 61.9048),
-    new CoordRec((float) 96.4562, (float) 66.6667),
-    new CoordRec((float) 91.6943, (float) 66.6667),
-    new CoordRec((float) 86.9324, (float) 61.9048),
-    new CoordRec((float) 82.1705, (float) 52.381),
-    new CoordRec((float) 72.6467, (float) 28.5714),
-    new CoordRec((float) 63.1229, (float) 14.2857),
-    new CoordRec((float) 53.599, (float) 4.7619),
-    new CoordRec((float) 44.0752, (float) 0),
-    new CoordRec((float) 25.0276, (float) 0),
-    new CoordRec((float) 15.5038, (float) 4.7619),
-    new CoordRec((float) 10.7419, (float) 9.5238),
-    new CoordRec((float) 5.98, (float) 19.0476),
-    new CoordRec((float) 5.98, (float) 28.5714),
-    new CoordRec((float) 10.7419, (float) 38.0952),
-    new CoordRec((float) 15.5038, (float) 42.8571),
-    new CoordRec((float) 48.8371, (float) 61.9048),
-    new CoordRec((float) 53.599, (float) 66.6667),
-    new CoordRec((float) 58.361, (float) 76.1905),
-    new CoordRec((float) 58.361, (float) 85.7143),
-    new CoordRec((float) 53.599, (float) 95.2381),
-    new CoordRec((float) 44.0752, (float) 100),
-    new CoordRec((float) 34.5514, (float) 95.2381),
-    new CoordRec((float) 29.7895, (float) 85.7143),
-    new CoordRec((float) 29.7895, (float) 76.1905),
-    new CoordRec((float) 34.5514, (float) 61.9048),
-    new CoordRec((float) 44.0752, (float) 47.619),
-    new CoordRec((float) 67.8848, (float) 14.2857),
-    new CoordRec((float) 77.4086, (float) 4.7619),
-    new CoordRec((float) 86.9324, (float) 0),
-    new CoordRec((float) 96.4562, (float) 0),
-    new CoordRec((float) 101.218, (float) 4.7619),
-    new CoordRec((float) 101.218, (float) 9.5238),
-};
-
-static final StrokeRec char38[] = {
-   new StrokeRec(34, char38_stroke0),
-};
-
-/* char: 39 ''' */
-
-static final CoordRec char39_stroke0[] = {
-    new CoordRec((float) 4.44, (float) 100),
-    new CoordRec((float) 4.44, (float) 66.6667),
-};
-
-static final StrokeRec char39[] = {
-   new StrokeRec(2, char39_stroke0),
-};
-
-/* char: 40 '(' */
-
-static final CoordRec char40_stroke0[] = {
-    new CoordRec((float) 40.9133, (float) 119.048),
-    new CoordRec((float) 31.3895, (float) 109.524),
-    new CoordRec((float) 21.8657, (float) 95.2381),
-    new CoordRec((float) 12.3419, (float) 76.1905),
-    new CoordRec((float) 7.58, (float) 52.381),
-    new CoordRec((float) 7.58, (float) 33.3333),
-    new CoordRec((float) 12.3419, (float) 9.5238),
-    new CoordRec((float) 21.8657, (float) -9.5238),
-    new CoordRec((float) 31.3895, (float) -23.8095),
-    new CoordRec((float) 40.9133, (float) -33.3333),
-};
-
-static final StrokeRec char40[] = {
-   new StrokeRec(10, char40_stroke0),
-};
-
-/* char: 41 ')' */
-
-static final CoordRec char41_stroke0[] = {
-    new CoordRec((float) 5.28, (float) 119.048),
-    new CoordRec((float) 14.8038, (float) 109.524),
-    new CoordRec((float) 24.3276, (float) 95.2381),
-    new CoordRec((float) 33.8514, (float) 76.1905),
-    new CoordRec((float) 38.6133, (float) 52.381),
-    new CoordRec((float) 38.6133, (float) 33.3333),
-    new CoordRec((float) 33.8514, (float) 9.5238),
-    new CoordRec((float) 24.3276, (float) -9.5238),
-    new CoordRec((float) 14.8038, (float) -23.8095),
-    new CoordRec((float) 5.28, (float) -33.3333),
-};
-
-static final StrokeRec char41[] = {
-   new StrokeRec(10, char41_stroke0),
-};
-
-/* char: 42 '*' */
-
-static final CoordRec char42_stroke0[] = {
-    new CoordRec((float) 30.7695, (float) 71.4286),
-    new CoordRec((float) 30.7695, (float) 14.2857),
-};
-
-static final CoordRec char42_stroke1[] = {
-    new CoordRec((float) 6.96, (float) 57.1429),
-    new CoordRec((float) 54.579, (float) 28.5714),
-};
-
-static final CoordRec char42_stroke2[] = {
-    new CoordRec((float) 54.579, (float) 57.1429),
-    new CoordRec((float) 6.96, (float) 28.5714),
-};
-
-static final StrokeRec char42[] = {
-   new StrokeRec(2, char42_stroke0),
-   new StrokeRec(2, char42_stroke1),
-   new StrokeRec(2, char42_stroke2),
-};
-
-/* char: 43 '+' */
-
-static final CoordRec char43_stroke0[] = {
-    new CoordRec((float) 48.8371, (float) 85.7143),
-    new CoordRec((float) 48.8371, (float) 0),
-};
-
-static final CoordRec char43_stroke1[] = {
-    new CoordRec((float) 5.98, (float) 42.8571),
-    new CoordRec((float) 91.6943, (float) 42.8571),
-};
-
-static final StrokeRec char43[] = {
-   new StrokeRec(2, char43_stroke0),
-   new StrokeRec(2, char43_stroke1),
-};
-
-/* char: 44 ',' */
-
-static final CoordRec char44_stroke0[] = {
-    new CoordRec((float) 18.2838, (float) 4.7619),
-    new CoordRec((float) 13.5219, (float) 0),
-    new CoordRec((float) 8.76, (float) 4.7619),
-    new CoordRec((float) 13.5219, (float) 9.5238),
-    new CoordRec((float) 18.2838, (float) 4.7619),
-    new CoordRec((float) 18.2838, (float) -4.7619),
-    new CoordRec((float) 13.5219, (float) -14.2857),
-    new CoordRec((float) 8.76, (float) -19.0476),
-};
-
-static final StrokeRec char44[] = {
-   new StrokeRec(8, char44_stroke0),
-};
-
-/* char: 45 '-' */
-
-static final CoordRec char45_stroke0[] = {
-    new CoordRec((float) 7.38, (float) 42.8571),
-    new CoordRec((float) 93.0943, (float) 42.8571),
-};
-
-static final StrokeRec char45[] = {
-   new StrokeRec(2, char45_stroke0),
-};
-
-/* char: 46 '.' */
-
-static final CoordRec char46_stroke0[] = {
-    new CoordRec((float) 13.1019, (float) 9.5238),
-    new CoordRec((float) 8.34, (float) 4.7619),
-    new CoordRec((float) 13.1019, (float) 0),
-    new CoordRec((float) 17.8638, (float) 4.7619),
-    new CoordRec((float) 13.1019, (float) 9.5238),
-};
-
-static final StrokeRec char46[] = {
-   new StrokeRec(5, char46_stroke0),
-};
-
-/* char: 47 '/' */
-
-static final CoordRec char47_stroke0[] = {
-    new CoordRec((float) 7.24, (float) -14.2857),
-    new CoordRec((float) 73.9067, (float) 100),
-};
-
-static final StrokeRec char47[] = {
-   new StrokeRec(2, char47_stroke0),
-};
-
-/* char: 48 '0' */
-
-static final CoordRec char48_stroke0[] = {
-    new CoordRec((float) 33.5514, (float) 100),
-    new CoordRec((float) 19.2657, (float) 95.2381),
-    new CoordRec((float) 9.7419, (float) 80.9524),
-    new CoordRec((float) 4.98, (float) 57.1429),
-    new CoordRec((float) 4.98, (float) 42.8571),
-    new CoordRec((float) 9.7419, (float) 19.0476),
-    new CoordRec((float) 19.2657, (float) 4.7619),
-    new CoordRec((float) 33.5514, (float) 0),
-    new CoordRec((float) 43.0752, (float) 0),
-    new CoordRec((float) 57.361, (float) 4.7619),
-    new CoordRec((float) 66.8848, (float) 19.0476),
-    new CoordRec((float) 71.6467, (float) 42.8571),
-    new CoordRec((float) 71.6467, (float) 57.1429),
-    new CoordRec((float) 66.8848, (float) 80.9524),
-    new CoordRec((float) 57.361, (float) 95.2381),
-    new CoordRec((float) 43.0752, (float) 100),
-    new CoordRec((float) 33.5514, (float) 100),
-};
-
-static final StrokeRec char48[] = {
-   new StrokeRec(17, char48_stroke0),
-};
-
-/* char: 49 '1' */
-
-static final CoordRec char49_stroke0[] = {
-    new CoordRec((float) 11.82, (float) 80.9524),
-    new CoordRec((float) 21.3438, (float) 85.7143),
-    new CoordRec((float) 35.6295, (float) 100),
-    new CoordRec((float) 35.6295, (float) 0),
-};
-
-static final StrokeRec char49[] = {
-   new StrokeRec(4, char49_stroke0),
-};
-
-/* char: 50 '2' */
-
-static final CoordRec char50_stroke0[] = {
-    new CoordRec((float) 10.1819, (float) 76.1905),
-    new CoordRec((float) 10.1819, (float) 80.9524),
-    new CoordRec((float) 14.9438, (float) 90.4762),
-    new CoordRec((float) 19.7057, (float) 95.2381),
-    new CoordRec((float) 29.2295, (float) 100),
-    new CoordRec((float) 48.2771, (float) 100),
-    new CoordRec((float) 57.801, (float) 95.2381),
-    new CoordRec((float) 62.5629, (float) 90.4762),
-    new CoordRec((float) 67.3248, (float) 80.9524),
-    new CoordRec((float) 67.3248, (float) 71.4286),
-    new CoordRec((float) 62.5629, (float) 61.9048),
-    new CoordRec((float) 53.039, (float) 47.619),
-    new CoordRec((float) 5.42, (float) 0),
-    new CoordRec((float) 72.0867, (float) 0),
-};
-
-static final StrokeRec char50[] = {
-   new StrokeRec(14, char50_stroke0),
-};
-
-/* char: 51 '3' */
-
-static final CoordRec char51_stroke0[] = {
-    new CoordRec((float) 14.5238, (float) 100),
-    new CoordRec((float) 66.9048, (float) 100),
-    new CoordRec((float) 38.3333, (float) 61.9048),
-    new CoordRec((float) 52.619, (float) 61.9048),
-    new CoordRec((float) 62.1429, (float) 57.1429),
-    new CoordRec((float) 66.9048, (float) 52.381),
-    new CoordRec((float) 71.6667, (float) 38.0952),
-    new CoordRec((float) 71.6667, (float) 28.5714),
-    new CoordRec((float) 66.9048, (float) 14.2857),
-    new CoordRec((float) 57.381, (float) 4.7619),
-    new CoordRec((float) 43.0952, (float) 0),
-    new CoordRec((float) 28.8095, (float) 0),
-    new CoordRec((float) 14.5238, (float) 4.7619),
-    new CoordRec((float) 9.7619, (float) 9.5238),
-    new CoordRec((float) 5, (float) 19.0476),
-};
-
-static final StrokeRec char51[] = {
-   new StrokeRec(15, char51_stroke0),
-};
-
-/* char: 52 '4' */
-
-static final CoordRec char52_stroke0[] = {
-    new CoordRec((float) 51.499, (float) 100),
-    new CoordRec((float) 3.88, (float) 33.3333),
-    new CoordRec((float) 75.3086, (float) 33.3333),
-};
-
-static final CoordRec char52_stroke1[] = {
-    new CoordRec((float) 51.499, (float) 100),
-    new CoordRec((float) 51.499, (float) 0),
-};
-
-static final StrokeRec char52[] = {
-   new StrokeRec(3, char52_stroke0),
-   new StrokeRec(2, char52_stroke1),
-};
-
-/* char: 53 '5' */
-
-static final CoordRec char53_stroke0[] = {
-    new CoordRec((float) 62.0029, (float) 100),
-    new CoordRec((float) 14.3838, (float) 100),
-    new CoordRec((float) 9.6219, (float) 57.1429),
-    new CoordRec((float) 14.3838, (float) 61.9048),
-    new CoordRec((float) 28.6695, (float) 66.6667),
-    new CoordRec((float) 42.9552, (float) 66.6667),
-    new CoordRec((float) 57.241, (float) 61.9048),
-    new CoordRec((float) 66.7648, (float) 52.381),
-    new CoordRec((float) 71.5267, (float) 38.0952),
-    new CoordRec((float) 71.5267, (float) 28.5714),
-    new CoordRec((float) 66.7648, (float) 14.2857),
-    new CoordRec((float) 57.241, (float) 4.7619),
-    new CoordRec((float) 42.9552, (float) 0),
-    new CoordRec((float) 28.6695, (float) 0),
-    new CoordRec((float) 14.3838, (float) 4.7619),
-    new CoordRec((float) 9.6219, (float) 9.5238),
-    new CoordRec((float) 4.86, (float) 19.0476),
-};
-
-static final StrokeRec char53[] = {
-   new StrokeRec(17, char53_stroke0),
-};
-
-/* char: 54 '6' */
-
-static final CoordRec char54_stroke0[] = {
-    new CoordRec((float) 62.7229, (float) 85.7143),
-    new CoordRec((float) 57.961, (float) 95.2381),
-    new CoordRec((float) 43.6752, (float) 100),
-    new CoordRec((float) 34.1514, (float) 100),
-    new CoordRec((float) 19.8657, (float) 95.2381),
-    new CoordRec((float) 10.3419, (float) 80.9524),
-    new CoordRec((float) 5.58, (float) 57.1429),
-    new CoordRec((float) 5.58, (float) 33.3333),
-    new CoordRec((float) 10.3419, (float) 14.2857),
-    new CoordRec((float) 19.8657, (float) 4.7619),
-    new CoordRec((float) 34.1514, (float) 0),
-    new CoordRec((float) 38.9133, (float) 0),
-    new CoordRec((float) 53.199, (float) 4.7619),
-    new CoordRec((float) 62.7229, (float) 14.2857),
-    new CoordRec((float) 67.4848, (float) 28.5714),
-    new CoordRec((float) 67.4848, (float) 33.3333),
-    new CoordRec((float) 62.7229, (float) 47.619),
-    new CoordRec((float) 53.199, (float) 57.1429),
-    new CoordRec((float) 38.9133, (float) 61.9048),
-    new CoordRec((float) 34.1514, (float) 61.9048),
-    new CoordRec((float) 19.8657, (float) 57.1429),
-    new CoordRec((float) 10.3419, (float) 47.619),
-    new CoordRec((float) 5.58, (float) 33.3333),
-};
-
-static final StrokeRec char54[] = {
-   new StrokeRec(23, char54_stroke0),
-};
-
-/* char: 55 '7' */
-
-static final CoordRec char55_stroke0[] = {
-    new CoordRec((float) 72.2267, (float) 100),
-    new CoordRec((float) 24.6076, (float) 0),
-};
-
-static final CoordRec char55_stroke1[] = {
-    new CoordRec((float) 5.56, (float) 100),
-    new CoordRec((float) 72.2267, (float) 100),
-};
-
-static final StrokeRec char55[] = {
-   new StrokeRec(2, char55_stroke0),
-   new StrokeRec(2, char55_stroke1),
-};
-
-/* char: 56 '8' */
-
-static final CoordRec char56_stroke0[] = {
-    new CoordRec((float) 29.4095, (float) 100),
-    new CoordRec((float) 15.1238, (float) 95.2381),
-    new CoordRec((float) 10.3619, (float) 85.7143),
-    new CoordRec((float) 10.3619, (float) 76.1905),
-    new CoordRec((float) 15.1238, (float) 66.6667),
-    new CoordRec((float) 24.6476, (float) 61.9048),
-    new CoordRec((float) 43.6952, (float) 57.1429),
-    new CoordRec((float) 57.981, (float) 52.381),
-    new CoordRec((float) 67.5048, (float) 42.8571),
-    new CoordRec((float) 72.2667, (float) 33.3333),
-    new CoordRec((float) 72.2667, (float) 19.0476),
-    new CoordRec((float) 67.5048, (float) 9.5238),
-    new CoordRec((float) 62.7429, (float) 4.7619),
-    new CoordRec((float) 48.4571, (float) 0),
-    new CoordRec((float) 29.4095, (float) 0),
-    new CoordRec((float) 15.1238, (float) 4.7619),
-    new CoordRec((float) 10.3619, (float) 9.5238),
-    new CoordRec((float) 5.6, (float) 19.0476),
-    new CoordRec((float) 5.6, (float) 33.3333),
-    new CoordRec((float) 10.3619, (float) 42.8571),
-    new CoordRec((float) 19.8857, (float) 52.381),
-    new CoordRec((float) 34.1714, (float) 57.1429),
-    new CoordRec((float) 53.219, (float) 61.9048),
-    new CoordRec((float) 62.7429, (float) 66.6667),
-    new CoordRec((float) 67.5048, (float) 76.1905),
-    new CoordRec((float) 67.5048, (float) 85.7143),
-    new CoordRec((float) 62.7429, (float) 95.2381),
-    new CoordRec((float) 48.4571, (float) 100),
-    new CoordRec((float) 29.4095, (float) 100),
-};
-
-static final StrokeRec char56[] = {
-   new StrokeRec(29, char56_stroke0),
-};
-
-/* char: 57 '9' */
-
-static final CoordRec char57_stroke0[] = {
-    new CoordRec((float) 68.5048, (float) 66.6667),
-    new CoordRec((float) 63.7429, (float) 52.381),
-    new CoordRec((float) 54.219, (float) 42.8571),
-    new CoordRec((float) 39.9333, (float) 38.0952),
-    new CoordRec((float) 35.1714, (float) 38.0952),
-    new CoordRec((float) 20.8857, (float) 42.8571),
-    new CoordRec((float) 11.3619, (float) 52.381),
-    new CoordRec((float) 6.6, (float) 66.6667),
-    new CoordRec((float) 6.6, (float) 71.4286),
-    new CoordRec((float) 11.3619, (float) 85.7143),
-    new CoordRec((float) 20.8857, (float) 95.2381),
-    new CoordRec((float) 35.1714, (float) 100),
-    new CoordRec((float) 39.9333, (float) 100),
-    new CoordRec((float) 54.219, (float) 95.2381),
-    new CoordRec((float) 63.7429, (float) 85.7143),
-    new CoordRec((float) 68.5048, (float) 66.6667),
-    new CoordRec((float) 68.5048, (float) 42.8571),
-    new CoordRec((float) 63.7429, (float) 19.0476),
-    new CoordRec((float) 54.219, (float) 4.7619),
-    new CoordRec((float) 39.9333, (float) 0),
-    new CoordRec((float) 30.4095, (float) 0),
-    new CoordRec((float) 16.1238, (float) 4.7619),
-    new CoordRec((float) 11.3619, (float) 14.2857),
-};
-
-static final StrokeRec char57[] = {
-   new StrokeRec(23, char57_stroke0),
-};
-
-/* char: 58 ':' */
-
-static final CoordRec char58_stroke0[] = {
-    new CoordRec((float) 14.0819, (float) 66.6667),
-    new CoordRec((float) 9.32, (float) 61.9048),
-    new CoordRec((float) 14.0819, (float) 57.1429),
-    new CoordRec((float) 18.8438, (float) 61.9048),
-    new CoordRec((float) 14.0819, (float) 66.6667),
-};
-
-static final CoordRec char58_stroke1[] = {
-    new CoordRec((float) 14.0819, (float) 9.5238),
-    new CoordRec((float) 9.32, (float) 4.7619),
-    new CoordRec((float) 14.0819, (float) 0),
-    new CoordRec((float) 18.8438, (float) 4.7619),
-    new CoordRec((float) 14.0819, (float) 9.5238),
-};
-
-static final StrokeRec char58[] = {
-   new StrokeRec(5, char58_stroke0),
-   new StrokeRec(5, char58_stroke1),
-};
-
-/* char: 59 ';' */
-
-static final CoordRec char59_stroke0[] = {
-    new CoordRec((float) 12.9619, (float) 66.6667),
-    new CoordRec((float) 8.2, (float) 61.9048),
-    new CoordRec((float) 12.9619, (float) 57.1429),
-    new CoordRec((float) 17.7238, (float) 61.9048),
-    new CoordRec((float) 12.9619, (float) 66.6667),
-};
-
-static final CoordRec char59_stroke1[] = {
-    new CoordRec((float) 17.7238, (float) 4.7619),
-    new CoordRec((float) 12.9619, (float) 0),
-    new CoordRec((float) 8.2, (float) 4.7619),
-    new CoordRec((float) 12.9619, (float) 9.5238),
-    new CoordRec((float) 17.7238, (float) 4.7619),
-    new CoordRec((float) 17.7238, (float) -4.7619),
-    new CoordRec((float) 12.9619, (float) -14.2857),
-    new CoordRec((float) 8.2, (float) -19.0476),
-};
-
-static final StrokeRec char59[] = {
-   new StrokeRec(5, char59_stroke0),
-   new StrokeRec(8, char59_stroke1),
-};
-
-/* char: 60 '<' */
-
-static final CoordRec char60_stroke0[] = {
-    new CoordRec((float) 79.2505, (float) 85.7143),
-    new CoordRec((float) 3.06, (float) 42.8571),
-    new CoordRec((float) 79.2505, (float) 0),
-};
-
-static final StrokeRec char60[] = {
-   new StrokeRec(3, char60_stroke0),
-};
-
-/* char: 61 '=' */
-
-static final CoordRec char61_stroke0[] = {
-    new CoordRec((float) 5.7, (float) 57.1429),
-    new CoordRec((float) 91.4143, (float) 57.1429),
-};
-
-static final CoordRec char61_stroke1[] = {
-    new CoordRec((float) 5.7, (float) 28.5714),
-    new CoordRec((float) 91.4143, (float) 28.5714),
-};
-
-static final StrokeRec char61[] = {
-   new StrokeRec(2, char61_stroke0),
-   new StrokeRec(2, char61_stroke1),
-};
-
-/* char: 62 '>' */
-
-static final CoordRec char62_stroke0[] = {
-    new CoordRec((float) 2.78, (float) 85.7143),
-    new CoordRec((float) 78.9705, (float) 42.8571),
-    new CoordRec((float) 2.78, (float) 0),
-};
-
-static final StrokeRec char62[] = {
-   new StrokeRec(3, char62_stroke0),
-};
-
-/* char: 63 '?' */
-
-static final CoordRec char63_stroke0[] = {
-    new CoordRec((float) 8.42, (float) 76.1905),
-    new CoordRec((float) 8.42, (float) 80.9524),
-    new CoordRec((float) 13.1819, (float) 90.4762),
-    new CoordRec((float) 17.9438, (float) 95.2381),
-    new CoordRec((float) 27.4676, (float) 100),
-    new CoordRec((float) 46.5152, (float) 100),
-    new CoordRec((float) 56.039, (float) 95.2381),
-    new CoordRec((float) 60.801, (float) 90.4762),
-    new CoordRec((float) 65.5629, (float) 80.9524),
-    new CoordRec((float) 65.5629, (float) 71.4286),
-    new CoordRec((float) 60.801, (float) 61.9048),
-    new CoordRec((float) 56.039, (float) 57.1429),
-    new CoordRec((float) 36.9914, (float) 47.619),
-    new CoordRec((float) 36.9914, (float) 33.3333),
-};
-
-static final CoordRec char63_stroke1[] = {
-    new CoordRec((float) 36.9914, (float) 9.5238),
-    new CoordRec((float) 32.2295, (float) 4.7619),
-    new CoordRec((float) 36.9914, (float) 0),
-    new CoordRec((float) 41.7533, (float) 4.7619),
-    new CoordRec((float) 36.9914, (float) 9.5238),
-};
-
-static final StrokeRec char63[] = {
-   new StrokeRec(14, char63_stroke0),
-   new StrokeRec(5, char63_stroke1),
-};
-
-/* char: 64 '@' */
-
-static final CoordRec char64_stroke0[] = {
-    new CoordRec((float) 49.2171, (float) 52.381),
-    new CoordRec((float) 39.6933, (float) 57.1429),
-    new CoordRec((float) 30.1695, (float) 57.1429),
-    new CoordRec((float) 25.4076, (float) 47.619),
-    new CoordRec((float) 25.4076, (float) 42.8571),
-    new CoordRec((float) 30.1695, (float) 33.3333),
-    new CoordRec((float) 39.6933, (float) 33.3333),
-    new CoordRec((float) 49.2171, (float) 38.0952),
-};
-
-static final CoordRec char64_stroke1[] = {
-    new CoordRec((float) 49.2171, (float) 57.1429),
-    new CoordRec((float) 49.2171, (float) 38.0952),
-    new CoordRec((float) 53.979, (float) 33.3333),
-    new CoordRec((float) 63.5029, (float) 33.3333),
-    new CoordRec((float) 68.2648, (float) 42.8571),
-    new CoordRec((float) 68.2648, (float) 47.619),
-    new CoordRec((float) 63.5029, (float) 61.9048),
-    new CoordRec((float) 53.979, (float) 71.4286),
-    new CoordRec((float) 39.6933, (float) 76.1905),
-    new CoordRec((float) 34.9314, (float) 76.1905),
-    new CoordRec((float) 20.6457, (float) 71.4286),
-    new CoordRec((float) 11.1219, (float) 61.9048),
-    new CoordRec((float) 6.36, (float) 47.619),
-    new CoordRec((float) 6.36, (float) 42.8571),
-    new CoordRec((float) 11.1219, (float) 28.5714),
-    new CoordRec((float) 20.6457, (float) 19.0476),
-    new CoordRec((float) 34.9314, (float) 14.2857),
-    new CoordRec((float) 39.6933, (float) 14.2857),
-    new CoordRec((float) 53.979, (float) 19.0476),
-};
-
-static final StrokeRec char64[] = {
-   new StrokeRec(8, char64_stroke0),
-   new StrokeRec(19, char64_stroke1),
-};
-
-/* char: 65 'A' */
-
-static final CoordRec char65_stroke0[] = {
-    new CoordRec((float) 40.5952, (float) 100),
-    new CoordRec((float) 2.5, (float) 0),
-};
-
-static final CoordRec char65_stroke1[] = {
-    new CoordRec((float) 40.5952, (float) 100),
-    new CoordRec((float) 78.6905, (float) 0),
-};
-
-static final CoordRec char65_stroke2[] = {
-    new CoordRec((float) 16.7857, (float) 33.3333),
-    new CoordRec((float) 64.4048, (float) 33.3333),
-};
-
-static final StrokeRec char65[] = {
-   new StrokeRec(2, char65_stroke0),
-   new StrokeRec(2, char65_stroke1),
-   new StrokeRec(2, char65_stroke2),
-};
-
-/* char: 66 'B' */
-
-static final CoordRec char66_stroke0[] = {
-    new CoordRec((float) 11.42, (float) 100),
-    new CoordRec((float) 11.42, (float) 0),
-};
-
-static final CoordRec char66_stroke1[] = {
-    new CoordRec((float) 11.42, (float) 100),
-    new CoordRec((float) 54.2771, (float) 100),
-    new CoordRec((float) 68.5629, (float) 95.2381),
-    new CoordRec((float) 73.3248, (float) 90.4762),
-    new CoordRec((float) 78.0867, (float) 80.9524),
-    new CoordRec((float) 78.0867, (float) 71.4286),
-    new CoordRec((float) 73.3248, (float) 61.9048),
-    new CoordRec((float) 68.5629, (float) 57.1429),
-    new CoordRec((float) 54.2771, (float) 52.381),
-};
-
-static final CoordRec char66_stroke2[] = {
-    new CoordRec((float) 11.42, (float) 52.381),
-    new CoordRec((float) 54.2771, (float) 52.381),
-    new CoordRec((float) 68.5629, (float) 47.619),
-    new CoordRec((float) 73.3248, (float) 42.8571),
-    new CoordRec((float) 78.0867, (float) 33.3333),
-    new CoordRec((float) 78.0867, (float) 19.0476),
-    new CoordRec((float) 73.3248, (float) 9.5238),
-    new CoordRec((float) 68.5629, (float) 4.7619),
-    new CoordRec((float) 54.2771, (float) 0),
-    new CoordRec((float) 11.42, (float) 0),
-};
-
-static final StrokeRec char66[] = {
-   new StrokeRec(2, char66_stroke0),
-   new StrokeRec(9, char66_stroke1),
-   new StrokeRec(10, char66_stroke2),
-};
-
-/* char: 67 'C' */
-
-static final CoordRec char67_stroke0[] = {
-    new CoordRec((float) 78.0886, (float) 76.1905),
-    new CoordRec((float) 73.3267, (float) 85.7143),
-    new CoordRec((float) 63.8029, (float) 95.2381),
-    new CoordRec((float) 54.279, (float) 100),
-    new CoordRec((float) 35.2314, (float) 100),
-    new CoordRec((float) 25.7076, (float) 95.2381),
-    new CoordRec((float) 16.1838, (float) 85.7143),
-    new CoordRec((float) 11.4219, (float) 76.1905),
-    new CoordRec((float) 6.66, (float) 61.9048),
-    new CoordRec((float) 6.66, (float) 38.0952),
-    new CoordRec((float) 11.4219, (float) 23.8095),
-    new CoordRec((float) 16.1838, (float) 14.2857),
-    new CoordRec((float) 25.7076, (float) 4.7619),
-    new CoordRec((float) 35.2314, (float) 0),
-    new CoordRec((float) 54.279, (float) 0),
-    new CoordRec((float) 63.8029, (float) 4.7619),
-    new CoordRec((float) 73.3267, (float) 14.2857),
-    new CoordRec((float) 78.0886, (float) 23.8095),
-};
-
-static final StrokeRec char67[] = {
-   new StrokeRec(18, char67_stroke0),
-};
-
-/* char: 68 'D' */
-
-static final CoordRec char68_stroke0[] = {
-    new CoordRec((float) 11.96, (float) 100),
-    new CoordRec((float) 11.96, (float) 0),
-};
-
-static final CoordRec char68_stroke1[] = {
-    new CoordRec((float) 11.96, (float) 100),
-    new CoordRec((float) 45.2933, (float) 100),
-    new CoordRec((float) 59.579, (float) 95.2381),
-    new CoordRec((float) 69.1029, (float) 85.7143),
-    new CoordRec((float) 73.8648, (float) 76.1905),
-    new CoordRec((float) 78.6267, (float) 61.9048),
-    new CoordRec((float) 78.6267, (float) 38.0952),
-    new CoordRec((float) 73.8648, (float) 23.8095),
-    new CoordRec((float) 69.1029, (float) 14.2857),
-    new CoordRec((float) 59.579, (float) 4.7619),
-    new CoordRec((float) 45.2933, (float) 0),
-    new CoordRec((float) 11.96, (float) 0),
-};
-
-static final StrokeRec char68[] = {
-   new StrokeRec(2, char68_stroke0),
-   new StrokeRec(12, char68_stroke1),
-};
-
-/* char: 69 'E' */
-
-static final CoordRec char69_stroke0[] = {
-    new CoordRec((float) 11.42, (float) 100),
-    new CoordRec((float) 11.42, (float) 0),
-};
-
-static final CoordRec char69_stroke1[] = {
-    new CoordRec((float) 11.42, (float) 100),
-    new CoordRec((float) 73.3248, (float) 100),
-};
-
-static final CoordRec char69_stroke2[] = {
-    new CoordRec((float) 11.42, (float) 52.381),
-    new CoordRec((float) 49.5152, (float) 52.381),
-};
-
-static final CoordRec char69_stroke3[] = {
-    new CoordRec((float) 11.42, (float) 0),
-    new CoordRec((float) 73.3248, (float) 0),
-};
-
-static final StrokeRec char69[] = {
-   new StrokeRec(2, char69_stroke0),
-   new StrokeRec(2, char69_stroke1),
-   new StrokeRec(2, char69_stroke2),
-   new StrokeRec(2, char69_stroke3),
-};
-
-/* char: 70 'F' */
-
-static final CoordRec char70_stroke0[] = {
-    new CoordRec((float) 11.42, (float) 100),
-    new CoordRec((float) 11.42, (float) 0),
-};
-
-static final CoordRec char70_stroke1[] = {
-    new CoordRec((float) 11.42, (float) 100),
-    new CoordRec((float) 73.3248, (float) 100),
-};
-
-static final CoordRec char70_stroke2[] = {
-    new CoordRec((float) 11.42, (float) 52.381),
-    new CoordRec((float) 49.5152, (float) 52.381),
-};
-
-static final StrokeRec char70[] = {
-   new StrokeRec(2, char70_stroke0),
-   new StrokeRec(2, char70_stroke1),
-   new StrokeRec(2, char70_stroke2),
-};
-
-/* char: 71 'G' */
-
-static final CoordRec char71_stroke0[] = {
-    new CoordRec((float) 78.4886, (float) 76.1905),
-    new CoordRec((float) 73.7267, (float) 85.7143),
-    new CoordRec((float) 64.2029, (float) 95.2381),
-    new CoordRec((float) 54.679, (float) 100),
-    new CoordRec((float) 35.6314, (float) 100),
-    new CoordRec((float) 26.1076, (float) 95.2381),
-    new CoordRec((float) 16.5838, (float) 85.7143),
-    new CoordRec((float) 11.8219, (float) 76.1905),
-    new CoordRec((float) 7.06, (float) 61.9048),
-    new CoordRec((float) 7.06, (float) 38.0952),
-    new CoordRec((float) 11.8219, (float) 23.8095),
-    new CoordRec((float) 16.5838, (float) 14.2857),
-    new CoordRec((float) 26.1076, (float) 4.7619),
-    new CoordRec((float) 35.6314, (float) 0),
-    new CoordRec((float) 54.679, (float) 0),
-    new CoordRec((float) 64.2029, (float) 4.7619),
-    new CoordRec((float) 73.7267, (float) 14.2857),
-    new CoordRec((float) 78.4886, (float) 23.8095),
-    new CoordRec((float) 78.4886, (float) 38.0952),
-};
-
-static final CoordRec char71_stroke1[] = {
-    new CoordRec((float) 54.679, (float) 38.0952),
-    new CoordRec((float) 78.4886, (float) 38.0952),
-};
-
-static final StrokeRec char71[] = {
-   new StrokeRec(19, char71_stroke0),
-   new StrokeRec(2, char71_stroke1),
-};
-
-/* char: 72 'H' */
-
-static final CoordRec char72_stroke0[] = {
-    new CoordRec((float) 11.42, (float) 100),
-    new CoordRec((float) 11.42, (float) 0),
-};
-
-static final CoordRec char72_stroke1[] = {
-    new CoordRec((float) 78.0867, (float) 100),
-    new CoordRec((float) 78.0867, (float) 0),
-};
-
-static final CoordRec char72_stroke2[] = {
-    new CoordRec((float) 11.42, (float) 52.381),
-    new CoordRec((float) 78.0867, (float) 52.381),
-};
-
-static final StrokeRec char72[] = {
-   new StrokeRec(2, char72_stroke0),
-   new StrokeRec(2, char72_stroke1),
-   new StrokeRec(2, char72_stroke2),
-};
-
-/* char: 73 'I' */
-
-static final CoordRec char73_stroke0[] = {
-    new CoordRec((float) 10.86, (float) 100),
-    new CoordRec((float) 10.86, (float) 0),
-};
-
-static final StrokeRec char73[] = {
-   new StrokeRec(2, char73_stroke0),
-};
-
-/* char: 74 'J' */
-
-static final CoordRec char74_stroke0[] = {
-    new CoordRec((float) 50.119, (float) 100),
-    new CoordRec((float) 50.119, (float) 23.8095),
-    new CoordRec((float) 45.3571, (float) 9.5238),
-    new CoordRec((float) 40.5952, (float) 4.7619),
-    new CoordRec((float) 31.0714, (float) 0),
-    new CoordRec((float) 21.5476, (float) 0),
-    new CoordRec((float) 12.0238, (float) 4.7619),
-    new CoordRec((float) 7.2619, (float) 9.5238),
-    new CoordRec((float) 2.5, (float) 23.8095),
-    new CoordRec((float) 2.5, (float) 33.3333),
-};
-
-static final StrokeRec char74[] = {
-   new StrokeRec(10, char74_stroke0),
-};
-
-/* char: 75 'K' */
-
-static final CoordRec char75_stroke0[] = {
-    new CoordRec((float) 11.28, (float) 100),
-    new CoordRec((float) 11.28, (float) 0),
-};
-
-static final CoordRec char75_stroke1[] = {
-    new CoordRec((float) 77.9467, (float) 100),
-    new CoordRec((float) 11.28, (float) 33.3333),
-};
-
-static final CoordRec char75_stroke2[] = {
-    new CoordRec((float) 35.0895, (float) 57.1429),
-    new CoordRec((float) 77.9467, (float) 0),
-};
-
-static final StrokeRec char75[] = {
-   new StrokeRec(2, char75_stroke0),
-   new StrokeRec(2, char75_stroke1),
-   new StrokeRec(2, char75_stroke2),
-};
-
-/* char: 76 'L' */
-
-static final CoordRec char76_stroke0[] = {
-    new CoordRec((float) 11.68, (float) 100),
-    new CoordRec((float) 11.68, (float) 0),
-};
-
-static final CoordRec char76_stroke1[] = {
-    new CoordRec((float) 11.68, (float) 0),
-    new CoordRec((float) 68.8229, (float) 0),
-};
-
-static final StrokeRec char76[] = {
-   new StrokeRec(2, char76_stroke0),
-   new StrokeRec(2, char76_stroke1),
-};
-
-/* char: 77 'M' */
-
-static final CoordRec char77_stroke0[] = {
-    new CoordRec((float) 10.86, (float) 100),
-    new CoordRec((float) 10.86, (float) 0),
-};
-
-static final CoordRec char77_stroke1[] = {
-    new CoordRec((float) 10.86, (float) 100),
-    new CoordRec((float) 48.9552, (float) 0),
-};
-
-static final CoordRec char77_stroke2[] = {
-    new CoordRec((float) 87.0505, (float) 100),
-    new CoordRec((float) 48.9552, (float) 0),
-};
-
-static final CoordRec char77_stroke3[] = {
-    new CoordRec((float) 87.0505, (float) 100),
-    new CoordRec((float) 87.0505, (float) 0),
-};
-
-static final StrokeRec char77[] = {
-   new StrokeRec(2, char77_stroke0),
-   new StrokeRec(2, char77_stroke1),
-   new StrokeRec(2, char77_stroke2),
-   new StrokeRec(2, char77_stroke3),
-};
-
-/* char: 78 'N' */
-
-static final CoordRec char78_stroke0[] = {
-    new CoordRec((float) 11.14, (float) 100),
-    new CoordRec((float) 11.14, (float) 0),
-};
-
-static final CoordRec char78_stroke1[] = {
-    new CoordRec((float) 11.14, (float) 100),
-    new CoordRec((float) 77.8067, (float) 0),
-};
-
-static final CoordRec char78_stroke2[] = {
-    new CoordRec((float) 77.8067, (float) 100),
-    new CoordRec((float) 77.8067, (float) 0),
-};
-
-static final StrokeRec char78[] = {
-   new StrokeRec(2, char78_stroke0),
-   new StrokeRec(2, char78_stroke1),
-   new StrokeRec(2, char78_stroke2),
-};
-
-/* char: 79 'O' */
-
-static final CoordRec char79_stroke0[] = {
-    new CoordRec((float) 34.8114, (float) 100),
-    new CoordRec((float) 25.2876, (float) 95.2381),
-    new CoordRec((float) 15.7638, (float) 85.7143),
-    new CoordRec((float) 11.0019, (float) 76.1905),
-    new CoordRec((float) 6.24, (float) 61.9048),
-    new CoordRec((float) 6.24, (float) 38.0952),
-    new CoordRec((float) 11.0019, (float) 23.8095),
-    new CoordRec((float) 15.7638, (float) 14.2857),
-    new CoordRec((float) 25.2876, (float) 4.7619),
-    new CoordRec((float) 34.8114, (float) 0),
-    new CoordRec((float) 53.859, (float) 0),
-    new CoordRec((float) 63.3829, (float) 4.7619),
-    new CoordRec((float) 72.9067, (float) 14.2857),
-    new CoordRec((float) 77.6686, (float) 23.8095),
-    new CoordRec((float) 82.4305, (float) 38.0952),
-    new CoordRec((float) 82.4305, (float) 61.9048),
-    new CoordRec((float) 77.6686, (float) 76.1905),
-    new CoordRec((float) 72.9067, (float) 85.7143),
-    new CoordRec((float) 63.3829, (float) 95.2381),
-    new CoordRec((float) 53.859, (float) 100),
-    new CoordRec((float) 34.8114, (float) 100),
-};
-
-static final StrokeRec char79[] = {
-   new StrokeRec(21, char79_stroke0),
-};
-
-/* char: 80 'P' */
-
-static final CoordRec char80_stroke0[] = {
-    new CoordRec((float) 12.1, (float) 100),
-    new CoordRec((float) 12.1, (float) 0),
-};
-
-static final CoordRec char80_stroke1[] = {
-    new CoordRec((float) 12.1, (float) 100),
-    new CoordRec((float) 54.9571, (float) 100),
-    new CoordRec((float) 69.2429, (float) 95.2381),
-    new CoordRec((float) 74.0048, (float) 90.4762),
-    new CoordRec((float) 78.7667, (float) 80.9524),
-    new CoordRec((float) 78.7667, (float) 66.6667),
-    new CoordRec((float) 74.0048, (float) 57.1429),
-    new CoordRec((float) 69.2429, (float) 52.381),
-    new CoordRec((float) 54.9571, (float) 47.619),
-    new CoordRec((float) 12.1, (float) 47.619),
-};
-
-static final StrokeRec char80[] = {
-   new StrokeRec(2, char80_stroke0),
-   new StrokeRec(10, char80_stroke1),
-};
-
-/* char: 81 'Q' */
-
-static final CoordRec char81_stroke0[] = {
-    new CoordRec((float) 33.8714, (float) 100),
-    new CoordRec((float) 24.3476, (float) 95.2381),
-    new CoordRec((float) 14.8238, (float) 85.7143),
-    new CoordRec((float) 10.0619, (float) 76.1905),
-    new CoordRec((float) 5.3, (float) 61.9048),
-    new CoordRec((float) 5.3, (float) 38.0952),
-    new CoordRec((float) 10.0619, (float) 23.8095),
-    new CoordRec((float) 14.8238, (float) 14.2857),
-    new CoordRec((float) 24.3476, (float) 4.7619),
-    new CoordRec((float) 33.8714, (float) 0),
-    new CoordRec((float) 52.919, (float) 0),
-    new CoordRec((float) 62.4429, (float) 4.7619),
-    new CoordRec((float) 71.9667, (float) 14.2857),
-    new CoordRec((float) 76.7286, (float) 23.8095),
-    new CoordRec((float) 81.4905, (float) 38.0952),
-    new CoordRec((float) 81.4905, (float) 61.9048),
-    new CoordRec((float) 76.7286, (float) 76.1905),
-    new CoordRec((float) 71.9667, (float) 85.7143),
-    new CoordRec((float) 62.4429, (float) 95.2381),
-    new CoordRec((float) 52.919, (float) 100),
-    new CoordRec((float) 33.8714, (float) 100),
-};
-
-static final CoordRec char81_stroke1[] = {
-    new CoordRec((float) 48.1571, (float) 19.0476),
-    new CoordRec((float) 76.7286, (float) -9.5238),
-};
-
-static final StrokeRec char81[] = {
-   new StrokeRec(21, char81_stroke0),
-   new StrokeRec(2, char81_stroke1),
-};
-
-/* char: 82 'R' */
-
-static final CoordRec char82_stroke0[] = {
-    new CoordRec((float) 11.68, (float) 100),
-    new CoordRec((float) 11.68, (float) 0),
-};
-
-static final CoordRec char82_stroke1[] = {
-    new CoordRec((float) 11.68, (float) 100),
-    new CoordRec((float) 54.5371, (float) 100),
-    new CoordRec((float) 68.8229, (float) 95.2381),
-    new CoordRec((float) 73.5848, (float) 90.4762),
-    new CoordRec((float) 78.3467, (float) 80.9524),
-    new CoordRec((float) 78.3467, (float) 71.4286),
-    new CoordRec((float) 73.5848, (float) 61.9048),
-    new CoordRec((float) 68.8229, (float) 57.1429),
-    new CoordRec((float) 54.5371, (float) 52.381),
-    new CoordRec((float) 11.68, (float) 52.381),
-};
-
-static final CoordRec char82_stroke2[] = {
-    new CoordRec((float) 45.0133, (float) 52.381),
-    new CoordRec((float) 78.3467, (float) 0),
-};
-
-static final StrokeRec char82[] = {
-   new StrokeRec(2, char82_stroke0),
-   new StrokeRec(10, char82_stroke1),
-   new StrokeRec(2, char82_stroke2),
-};
-
-/* char: 83 'S' */
-
-static final CoordRec char83_stroke0[] = {
-    new CoordRec((float) 74.6667, (float) 85.7143),
-    new CoordRec((float) 65.1429, (float) 95.2381),
-    new CoordRec((float) 50.8571, (float) 100),
-    new CoordRec((float) 31.8095, (float) 100),
-    new CoordRec((float) 17.5238, (float) 95.2381),
-    new CoordRec((float) 8, (float) 85.7143),
-    new CoordRec((float) 8, (float) 76.1905),
-    new CoordRec((float) 12.7619, (float) 66.6667),
-    new CoordRec((float) 17.5238, (float) 61.9048),
-    new CoordRec((float) 27.0476, (float) 57.1429),
-    new CoordRec((float) 55.619, (float) 47.619),
-    new CoordRec((float) 65.1429, (float) 42.8571),
-    new CoordRec((float) 69.9048, (float) 38.0952),
-    new CoordRec((float) 74.6667, (float) 28.5714),
-    new CoordRec((float) 74.6667, (float) 14.2857),
-    new CoordRec((float) 65.1429, (float) 4.7619),
-    new CoordRec((float) 50.8571, (float) 0),
-    new CoordRec((float) 31.8095, (float) 0),
-    new CoordRec((float) 17.5238, (float) 4.7619),
-    new CoordRec((float) 8, (float) 14.2857),
-};
-
-static final StrokeRec char83[] = {
-   new StrokeRec(20, char83_stroke0),
-};
-
-/* char: 84 'T' */
-
-static final CoordRec char84_stroke0[] = {
-    new CoordRec((float) 35.6933, (float) 100),
-    new CoordRec((float) 35.6933, (float) 0),
-};
-
-static final CoordRec char84_stroke1[] = {
-    new CoordRec((float) 2.36, (float) 100),
-    new CoordRec((float) 69.0267, (float) 100),
-};
-
-static final StrokeRec char84[] = {
-   new StrokeRec(2, char84_stroke0),
-   new StrokeRec(2, char84_stroke1),
-};
-
-/* char: 85 'U' */
-
-static final CoordRec char85_stroke0[] = {
-    new CoordRec((float) 11.54, (float) 100),
-    new CoordRec((float) 11.54, (float) 28.5714),
-    new CoordRec((float) 16.3019, (float) 14.2857),
-    new CoordRec((float) 25.8257, (float) 4.7619),
-    new CoordRec((float) 40.1114, (float) 0),
-    new CoordRec((float) 49.6352, (float) 0),
-    new CoordRec((float) 63.921, (float) 4.7619),
-    new CoordRec((float) 73.4448, (float) 14.2857),
-    new CoordRec((float) 78.2067, (float) 28.5714),
-    new CoordRec((float) 78.2067, (float) 100),
-};
-
-static final StrokeRec char85[] = {
-   new StrokeRec(10, char85_stroke0),
-};
-
-/* char: 86 'V' */
-
-static final CoordRec char86_stroke0[] = {
-    new CoordRec((float) 2.36, (float) 100),
-    new CoordRec((float) 40.4552, (float) 0),
-};
-
-static final CoordRec char86_stroke1[] = {
-    new CoordRec((float) 78.5505, (float) 100),
-    new CoordRec((float) 40.4552, (float) 0),
-};
-
-static final StrokeRec char86[] = {
-   new StrokeRec(2, char86_stroke0),
-   new StrokeRec(2, char86_stroke1),
-};
-
-/* char: 87 'W' */
-
-static final CoordRec char87_stroke0[] = {
-    new CoordRec((float) 2.22, (float) 100),
-    new CoordRec((float) 26.0295, (float) 0),
-};
-
-static final CoordRec char87_stroke1[] = {
-    new CoordRec((float) 49.839, (float) 100),
-    new CoordRec((float) 26.0295, (float) 0),
-};
-
-static final CoordRec char87_stroke2[] = {
-    new CoordRec((float) 49.839, (float) 100),
-    new CoordRec((float) 73.6486, (float) 0),
-};
-
-static final CoordRec char87_stroke3[] = {
-    new CoordRec((float) 97.4581, (float) 100),
-    new CoordRec((float) 73.6486, (float) 0),
-};
-
-static final StrokeRec char87[] = {
-   new StrokeRec(2, char87_stroke0),
-   new StrokeRec(2, char87_stroke1),
-   new StrokeRec(2, char87_stroke2),
-   new StrokeRec(2, char87_stroke3),
-};
-
-/* char: 88 'X' */
-
-static final CoordRec char88_stroke0[] = {
-    new CoordRec((float) 2.5, (float) 100),
-    new CoordRec((float) 69.1667, (float) 0),
-};
-
-static final CoordRec char88_stroke1[] = {
-    new CoordRec((float) 69.1667, (float) 100),
-    new CoordRec((float) 2.5, (float) 0),
-};
-
-static final StrokeRec char88[] = {
-   new StrokeRec(2, char88_stroke0),
-   new StrokeRec(2, char88_stroke1),
-};
-
-/* char: 89 'Y' */
-
-static final CoordRec char89_stroke0[] = {
-    new CoordRec((float) 1.52, (float) 100),
-    new CoordRec((float) 39.6152, (float) 52.381),
-    new CoordRec((float) 39.6152, (float) 0),
-};
-
-static final CoordRec char89_stroke1[] = {
-    new CoordRec((float) 77.7105, (float) 100),
-    new CoordRec((float) 39.6152, (float) 52.381),
-};
-
-static final StrokeRec char89[] = {
-   new StrokeRec(3, char89_stroke0),
-   new StrokeRec(2, char89_stroke1),
-};
-
-/* char: 90 'Z' */
-
-static final CoordRec char90_stroke0[] = {
-    new CoordRec((float) 69.1667, (float) 100),
-    new CoordRec((float) 2.5, (float) 0),
-};
-
-static final CoordRec char90_stroke1[] = {
-    new CoordRec((float) 2.5, (float) 100),
-    new CoordRec((float) 69.1667, (float) 100),
-};
-
-static final CoordRec char90_stroke2[] = {
-    new CoordRec((float) 2.5, (float) 0),
-    new CoordRec((float) 69.1667, (float) 0),
-};
-
-static final StrokeRec char90[] = {
-   new StrokeRec(2, char90_stroke0),
-   new StrokeRec(2, char90_stroke1),
-   new StrokeRec(2, char90_stroke2),
-};
-
-/* char: 91 '[' */
-
-static final CoordRec char91_stroke0[] = {
-    new CoordRec((float) 7.78, (float) 119.048),
-    new CoordRec((float) 7.78, (float) -33.3333),
-};
-
-static final CoordRec char91_stroke1[] = {
-    new CoordRec((float) 12.5419, (float) 119.048),
-    new CoordRec((float) 12.5419, (float) -33.3333),
-};
-
-static final CoordRec char91_stroke2[] = {
-    new CoordRec((float) 7.78, (float) 119.048),
-    new CoordRec((float) 41.1133, (float) 119.048),
-};
-
-static final CoordRec char91_stroke3[] = {
-    new CoordRec((float) 7.78, (float) -33.3333),
-    new CoordRec((float) 41.1133, (float) -33.3333),
-};
-
-static final StrokeRec char91[] = {
-   new StrokeRec(2, char91_stroke0),
-   new StrokeRec(2, char91_stroke1),
-   new StrokeRec(2, char91_stroke2),
-   new StrokeRec(2, char91_stroke3),
-};
-
-/* char: 92 '\' */
-
-static final CoordRec char92_stroke0[] = {
-    new CoordRec((float) 5.84, (float) 100),
-    new CoordRec((float) 72.5067, (float) -14.2857),
-};
-
-static final StrokeRec char92[] = {
-   new StrokeRec(2, char92_stroke0),
-};
-
-/* char: 93 ']' */
-
-static final CoordRec char93_stroke0[] = {
-    new CoordRec((float) 33.0114, (float) 119.048),
-    new CoordRec((float) 33.0114, (float) -33.3333),
-};
-
-static final CoordRec char93_stroke1[] = {
-    new CoordRec((float) 37.7733, (float) 119.048),
-    new CoordRec((float) 37.7733, (float) -33.3333),
-};
-
-static final CoordRec char93_stroke2[] = {
-    new CoordRec((float) 4.44, (float) 119.048),
-    new CoordRec((float) 37.7733, (float) 119.048),
-};
-
-static final CoordRec char93_stroke3[] = {
-    new CoordRec((float) 4.44, (float) -33.3333),
-    new CoordRec((float) 37.7733, (float) -33.3333),
-};
-
-static final StrokeRec char93[] = {
-   new StrokeRec(2, char93_stroke0),
-   new StrokeRec(2, char93_stroke1),
-   new StrokeRec(2, char93_stroke2),
-   new StrokeRec(2, char93_stroke3),
-};
-
-/* char: 94 '^' */
-
-static final CoordRec char94_stroke0[] = {
-    new CoordRec((float) 44.0752, (float) 109.524),
-    new CoordRec((float) 5.98, (float) 42.8571),
-};
-
-static final CoordRec char94_stroke1[] = {
-    new CoordRec((float) 44.0752, (float) 109.524),
-    new CoordRec((float) 82.1705, (float) 42.8571),
-};
-
-static final StrokeRec char94[] = {
-   new StrokeRec(2, char94_stroke0),
-   new StrokeRec(2, char94_stroke1),
-};
-
-/* char: 95 '_' */
-
-static final CoordRec char95_stroke0[] = {
-    new CoordRec((float)-1.1, (float) -33.3333),
-    new CoordRec((float) 103.662, (float) -33.3333),
-    new CoordRec((float) 103.662, (float) -28.5714),
-    new CoordRec((float)-1.1, (float) -28.5714),
-    new CoordRec((float)-1.1, (float) -33.3333),
-};
-
-static final StrokeRec char95[] = {
-   new StrokeRec(5, char95_stroke0),
-};
-
-/* char: 96 '`' */
-
-static final CoordRec char96_stroke0[] = {
-    new CoordRec((float) 33.0219, (float) 100),
-    new CoordRec((float) 56.8314, (float) 71.4286),
-};
-
-static final CoordRec char96_stroke1[] = {
-    new CoordRec((float) 33.0219, (float) 100),
-    new CoordRec((float) 28.26, (float) 95.2381),
-    new CoordRec((float) 56.8314, (float) 71.4286),
-};
-
-static final StrokeRec char96[] = {
-   new StrokeRec(2, char96_stroke0),
-   new StrokeRec(3, char96_stroke1),
-};
-
-/* char: 97 'a' */
-
-static final CoordRec char97_stroke0[] = {
-    new CoordRec((float) 63.8229, (float) 66.6667),
-    new CoordRec((float) 63.8229, (float) 0),
-};
-
-static final CoordRec char97_stroke1[] = {
-    new CoordRec((float) 63.8229, (float) 52.381),
-    new CoordRec((float) 54.299, (float) 61.9048),
-    new CoordRec((float) 44.7752, (float) 66.6667),
-    new CoordRec((float) 30.4895, (float) 66.6667),
-    new CoordRec((float) 20.9657, (float) 61.9048),
-    new CoordRec((float) 11.4419, (float) 52.381),
-    new CoordRec((float) 6.68, (float) 38.0952),
-    new CoordRec((float) 6.68, (float) 28.5714),
-    new CoordRec((float) 11.4419, (float) 14.2857),
-    new CoordRec((float) 20.9657, (float) 4.7619),
-    new CoordRec((float) 30.4895, (float) 0),
-    new CoordRec((float) 44.7752, (float) 0),
-    new CoordRec((float) 54.299, (float) 4.7619),
-    new CoordRec((float) 63.8229, (float) 14.2857),
-};
-
-static final StrokeRec char97[] = {
-   new StrokeRec(2, char97_stroke0),
-   new StrokeRec(14, char97_stroke1),
-};
-
-/* char: 98 'b' */
-
-static final CoordRec char98_stroke0[] = {
-    new CoordRec((float) 8.76, (float) 100),
-    new CoordRec((float) 8.76, (float) 0),
-};
-
-static final CoordRec char98_stroke1[] = {
-    new CoordRec((float) 8.76, (float) 52.381),
-    new CoordRec((float) 18.2838, (float) 61.9048),
-    new CoordRec((float) 27.8076, (float) 66.6667),
-    new CoordRec((float) 42.0933, (float) 66.6667),
-    new CoordRec((float) 51.6171, (float) 61.9048),
-    new CoordRec((float) 61.141, (float) 52.381),
-    new CoordRec((float) 65.9029, (float) 38.0952),
-    new CoordRec((float) 65.9029, (float) 28.5714),
-    new CoordRec((float) 61.141, (float) 14.2857),
-    new CoordRec((float) 51.6171, (float) 4.7619),
-    new CoordRec((float) 42.0933, (float) 0),
-    new CoordRec((float) 27.8076, (float) 0),
-    new CoordRec((float) 18.2838, (float) 4.7619),
-    new CoordRec((float) 8.76, (float) 14.2857),
-};
-
-static final StrokeRec char98[] = {
-   new StrokeRec(2, char98_stroke0),
-   new StrokeRec(14, char98_stroke1),
-};
-
-/* char: 99 'c' */
-
-static final CoordRec char99_stroke0[] = {
-    new CoordRec((float) 62.6629, (float) 52.381),
-    new CoordRec((float) 53.139, (float) 61.9048),
-    new CoordRec((float) 43.6152, (float) 66.6667),
-    new CoordRec((float) 29.3295, (float) 66.6667),
-    new CoordRec((float) 19.8057, (float) 61.9048),
-    new CoordRec((float) 10.2819, (float) 52.381),
-    new CoordRec((float) 5.52, (float) 38.0952),
-    new CoordRec((float) 5.52, (float) 28.5714),
-    new CoordRec((float) 10.2819, (float) 14.2857),
-    new CoordRec((float) 19.8057, (float) 4.7619),
-    new CoordRec((float) 29.3295, (float) 0),
-    new CoordRec((float) 43.6152, (float) 0),
-    new CoordRec((float) 53.139, (float) 4.7619),
-    new CoordRec((float) 62.6629, (float) 14.2857),
-};
-
-static final StrokeRec char99[] = {
-   new StrokeRec(14, char99_stroke0),
-};
-
-/* char: 100 'd' */
-
-static final CoordRec char100_stroke0[] = {
-    new CoordRec((float) 61.7829, (float) 100),
-    new CoordRec((float) 61.7829, (float) 0),
-};
-
-static final CoordRec char100_stroke1[] = {
-    new CoordRec((float) 61.7829, (float) 52.381),
-    new CoordRec((float) 52.259, (float) 61.9048),
-    new CoordRec((float) 42.7352, (float) 66.6667),
-    new CoordRec((float) 28.4495, (float) 66.6667),
-    new CoordRec((float) 18.9257, (float) 61.9048),
-    new CoordRec((float) 9.4019, (float) 52.381),
-    new CoordRec((float) 4.64, (float) 38.0952),
-    new CoordRec((float) 4.64, (float) 28.5714),
-    new CoordRec((float) 9.4019, (float) 14.2857),
-    new CoordRec((float) 18.9257, (float) 4.7619),
-    new CoordRec((float) 28.4495, (float) 0),
-    new CoordRec((float) 42.7352, (float) 0),
-    new CoordRec((float) 52.259, (float) 4.7619),
-    new CoordRec((float) 61.7829, (float) 14.2857),
-};
-
-static final StrokeRec char100[] = {
-   new StrokeRec(2, char100_stroke0),
-   new StrokeRec(14, char100_stroke1),
-};
-
-/* char: 101 'e' */
-
-static final CoordRec char101_stroke0[] = {
-    new CoordRec((float) 5.72, (float) 38.0952),
-    new CoordRec((float) 62.8629, (float) 38.0952),
-    new CoordRec((float) 62.8629, (float) 47.619),
-    new CoordRec((float) 58.101, (float) 57.1429),
-    new CoordRec((float) 53.339, (float) 61.9048),
-    new CoordRec((float) 43.8152, (float) 66.6667),
-    new CoordRec((float) 29.5295, (float) 66.6667),
-    new CoordRec((float) 20.0057, (float) 61.9048),
-    new CoordRec((float) 10.4819, (float) 52.381),
-    new CoordRec((float) 5.72, (float) 38.0952),
-    new CoordRec((float) 5.72, (float) 28.5714),
-    new CoordRec((float) 10.4819, (float) 14.2857),
-    new CoordRec((float) 20.0057, (float) 4.7619),
-    new CoordRec((float) 29.5295, (float) 0),
-    new CoordRec((float) 43.8152, (float) 0),
-    new CoordRec((float) 53.339, (float) 4.7619),
-    new CoordRec((float) 62.8629, (float) 14.2857),
-};
-
-static final StrokeRec char101[] = {
-   new StrokeRec(17, char101_stroke0),
-};
-
-/* char: 102 'f' */
-
-static final CoordRec char102_stroke0[] = {
-    new CoordRec((float) 38.7752, (float) 100),
-    new CoordRec((float) 29.2514, (float) 100),
-    new CoordRec((float) 19.7276, (float) 95.2381),
-    new CoordRec((float) 14.9657, (float) 80.9524),
-    new CoordRec((float) 14.9657, (float) 0),
-};
-
-static final CoordRec char102_stroke1[] = {
-    new CoordRec((float) 0.68, (float) 66.6667),
-    new CoordRec((float) 34.0133, (float) 66.6667),
-};
-
-static final StrokeRec char102[] = {
-   new StrokeRec(5, char102_stroke0),
-   new StrokeRec(2, char102_stroke1),
-};
-
-/* char: 103 'g' */
-
-static final CoordRec char103_stroke0[] = {
-    new CoordRec((float) 62.5029, (float) 66.6667),
-    new CoordRec((float) 62.5029, (float) -9.5238),
-    new CoordRec((float) 57.741, (float) -23.8095),
-    new CoordRec((float) 52.979, (float) -28.5714),
-    new CoordRec((float) 43.4552, (float) -33.3333),
-    new CoordRec((float) 29.1695, (float) -33.3333),
-    new CoordRec((float) 19.6457, (float) -28.5714),
-};
-
-static final CoordRec char103_stroke1[] = {
-    new CoordRec((float) 62.5029, (float) 52.381),
-    new CoordRec((float) 52.979, (float) 61.9048),
-    new CoordRec((float) 43.4552, (float) 66.6667),
-    new CoordRec((float) 29.1695, (float) 66.6667),
-    new CoordRec((float) 19.6457, (float) 61.9048),
-    new CoordRec((float) 10.1219, (float) 52.381),
-    new CoordRec((float) 5.36, (float) 38.0952),
-    new CoordRec((float) 5.36, (float) 28.5714),
-    new CoordRec((float) 10.1219, (float) 14.2857),
-    new CoordRec((float) 19.6457, (float) 4.7619),
-    new CoordRec((float) 29.1695, (float) 0),
-    new CoordRec((float) 43.4552, (float) 0),
-    new CoordRec((float) 52.979, (float) 4.7619),
-    new CoordRec((float) 62.5029, (float) 14.2857),
-};
-
-static final StrokeRec char103[] = {
-   new StrokeRec(7, char103_stroke0),
-   new StrokeRec(14, char103_stroke1),
-};
-
-/* char: 104 'h' */
-
-static final CoordRec char104_stroke0[] = {
-    new CoordRec((float) 9.6, (float) 100),
-    new CoordRec((float) 9.6, (float) 0),
-};
-
-static final CoordRec char104_stroke1[] = {
-    new CoordRec((float) 9.6, (float) 47.619),
-    new CoordRec((float) 23.8857, (float) 61.9048),
-    new CoordRec((float) 33.4095, (float) 66.6667),
-    new CoordRec((float) 47.6952, (float) 66.6667),
-    new CoordRec((float) 57.219, (float) 61.9048),
-    new CoordRec((float) 61.981, (float) 47.619),
-    new CoordRec((float) 61.981, (float) 0),
-};
-
-static final StrokeRec char104[] = {
-   new StrokeRec(2, char104_stroke0),
-   new StrokeRec(7, char104_stroke1),
-};
-
-/* char: 105 'i' */
-
-static final CoordRec char105_stroke0[] = {
-    new CoordRec((float) 10.02, (float) 100),
-    new CoordRec((float) 14.7819, (float) 95.2381),
-    new CoordRec((float) 19.5438, (float) 100),
-    new CoordRec((float) 14.7819, (float) 104.762),
-    new CoordRec((float) 10.02, (float) 100),
-};
-
-static final CoordRec char105_stroke1[] = {
-    new CoordRec((float) 14.7819, (float) 66.6667),
-    new CoordRec((float) 14.7819, (float) 0),
-};
-
-static final StrokeRec char105[] = {
-   new StrokeRec(5, char105_stroke0),
-   new StrokeRec(2, char105_stroke1),
-};
-
-/* char: 106 'j' */
-
-static final CoordRec char106_stroke0[] = {
-    new CoordRec((float) 17.3876, (float) 100),
-    new CoordRec((float) 22.1495, (float) 95.2381),
-    new CoordRec((float) 26.9114, (float) 100),
-    new CoordRec((float) 22.1495, (float) 104.762),
-    new CoordRec((float) 17.3876, (float) 100),
-};
-
-static final CoordRec char106_stroke1[] = {
-    new CoordRec((float) 22.1495, (float) 66.6667),
-    new CoordRec((float) 22.1495, (float) -14.2857),
-    new CoordRec((float) 17.3876, (float) -28.5714),
-    new CoordRec((float) 7.8638, (float) -33.3333),
-    new CoordRec((float)-1.66, (float) -33.3333),
-};
-
-static final StrokeRec char106[] = {
-   new StrokeRec(5, char106_stroke0),
-   new StrokeRec(5, char106_stroke1),
-};
-
-/* char: 107 'k' */
-
-static final CoordRec char107_stroke0[] = {
-    new CoordRec((float) 9.6, (float) 100),
-    new CoordRec((float) 9.6, (float) 0),
-};
-
-static final CoordRec char107_stroke1[] = {
-    new CoordRec((float) 57.219, (float) 66.6667),
-    new CoordRec((float) 9.6, (float) 19.0476),
-};
-
-static final CoordRec char107_stroke2[] = {
-    new CoordRec((float) 28.6476, (float) 38.0952),
-    new CoordRec((float) 61.981, (float) 0),
-};
-
-static final StrokeRec char107[] = {
-   new StrokeRec(2, char107_stroke0),
-   new StrokeRec(2, char107_stroke1),
-   new StrokeRec(2, char107_stroke2),
-};
-
-/* char: 108 'l' */
-
-static final CoordRec char108_stroke0[] = {
-    new CoordRec((float) 10.02, (float) 100),
-    new CoordRec((float) 10.02, (float) 0),
-};
-
-static final StrokeRec char108[] = {
-   new StrokeRec(2, char108_stroke0),
-};
-
-/* char: 109 'm' */
-
-static final CoordRec char109_stroke0[] = {
-    new CoordRec((float) 9.6, (float) 66.6667),
-    new CoordRec((float) 9.6, (float) 0),
-};
-
-static final CoordRec char109_stroke1[] = {
-    new CoordRec((float) 9.6, (float) 47.619),
-    new CoordRec((float) 23.8857, (float) 61.9048),
-    new CoordRec((float) 33.4095, (float) 66.6667),
-    new CoordRec((float) 47.6952, (float) 66.6667),
-    new CoordRec((float) 57.219, (float) 61.9048),
-    new CoordRec((float) 61.981, (float) 47.619),
-    new CoordRec((float) 61.981, (float) 0),
-};
-
-static final CoordRec char109_stroke2[] = {
-    new CoordRec((float) 61.981, (float) 47.619),
-    new CoordRec((float) 76.2667, (float) 61.9048),
-    new CoordRec((float) 85.7905, (float) 66.6667),
-    new CoordRec((float) 100.076, (float) 66.6667),
-    new CoordRec((float) 109.6, (float) 61.9048),
-    new CoordRec((float) 114.362, (float) 47.619),
-    new CoordRec((float) 114.362, (float) 0),
-};
-
-static final StrokeRec char109[] = {
-   new StrokeRec(2, char109_stroke0),
-   new StrokeRec(7, char109_stroke1),
-   new StrokeRec(7, char109_stroke2),
-};
-
-/* char: 110 'n' */
-
-static final CoordRec char110_stroke0[] = {
-    new CoordRec((float) 9.18, (float) 66.6667),
-    new CoordRec((float) 9.18, (float) 0),
-};
-
-static final CoordRec char110_stroke1[] = {
-    new CoordRec((float) 9.18, (float) 47.619),
-    new CoordRec((float) 23.4657, (float) 61.9048),
-    new CoordRec((float) 32.9895, (float) 66.6667),
-    new CoordRec((float) 47.2752, (float) 66.6667),
-    new CoordRec((float) 56.799, (float) 61.9048),
-    new CoordRec((float) 61.561, (float) 47.619),
-    new CoordRec((float) 61.561, (float) 0),
-};
-
-static final StrokeRec char110[] = {
-   new StrokeRec(2, char110_stroke0),
-   new StrokeRec(7, char110_stroke1),
-};
-
-/* char: 111 'o' */
-
-static final CoordRec char111_stroke0[] = {
-    new CoordRec((float) 28.7895, (float) 66.6667),
-    new CoordRec((float) 19.2657, (float) 61.9048),
-    new CoordRec((float) 9.7419, (float) 52.381),
-    new CoordRec((float) 4.98, (float) 38.0952),
-    new CoordRec((float) 4.98, (float) 28.5714),
-    new CoordRec((float) 9.7419, (float) 14.2857),
-    new CoordRec((float) 19.2657, (float) 4.7619),
-    new CoordRec((float) 28.7895, (float) 0),
-    new CoordRec((float) 43.0752, (float) 0),
-    new CoordRec((float) 52.599, (float) 4.7619),
-    new CoordRec((float) 62.1229, (float) 14.2857),
-    new CoordRec((float) 66.8848, (float) 28.5714),
-    new CoordRec((float) 66.8848, (float) 38.0952),
-    new CoordRec((float) 62.1229, (float) 52.381),
-    new CoordRec((float) 52.599, (float) 61.9048),
-    new CoordRec((float) 43.0752, (float) 66.6667),
-    new CoordRec((float) 28.7895, (float) 66.6667),
-};
-
-static final StrokeRec char111[] = {
-   new StrokeRec(17, char111_stroke0),
-};
-
-/* char: 112 'p' */
-
-static final CoordRec char112_stroke0[] = {
-    new CoordRec((float) 9.46, (float) 66.6667),
-    new CoordRec((float) 9.46, (float) -33.3333),
-};
-
-static final CoordRec char112_stroke1[] = {
-    new CoordRec((float) 9.46, (float) 52.381),
-    new CoordRec((float) 18.9838, (float) 61.9048),
-    new CoordRec((float) 28.5076, (float) 66.6667),
-    new CoordRec((float) 42.7933, (float) 66.6667),
-    new CoordRec((float) 52.3171, (float) 61.9048),
-    new CoordRec((float) 61.841, (float) 52.381),
-    new CoordRec((float) 66.6029, (float) 38.0952),
-    new CoordRec((float) 66.6029, (float) 28.5714),
-    new CoordRec((float) 61.841, (float) 14.2857),
-    new CoordRec((float) 52.3171, (float) 4.7619),
-    new CoordRec((float) 42.7933, (float) 0),
-    new CoordRec((float) 28.5076, (float) 0),
-    new CoordRec((float) 18.9838, (float) 4.7619),
-    new CoordRec((float) 9.46, (float) 14.2857),
-};
-
-static final StrokeRec char112[] = {
-   new StrokeRec(2, char112_stroke0),
-   new StrokeRec(14, char112_stroke1),
-};
-
-/* char: 113 'q' */
-
-static final CoordRec char113_stroke0[] = {
-    new CoordRec((float) 61.9829, (float) 66.6667),
-    new CoordRec((float) 61.9829, (float) -33.3333),
-};
-
-static final CoordRec char113_stroke1[] = {
-    new CoordRec((float) 61.9829, (float) 52.381),
-    new CoordRec((float) 52.459, (float) 61.9048),
-    new CoordRec((float) 42.9352, (float) 66.6667),
-    new CoordRec((float) 28.6495, (float) 66.6667),
-    new CoordRec((float) 19.1257, (float) 61.9048),
-    new CoordRec((float) 9.6019, (float) 52.381),
-    new CoordRec((float) 4.84, (float) 38.0952),
-    new CoordRec((float) 4.84, (float) 28.5714),
-    new CoordRec((float) 9.6019, (float) 14.2857),
-    new CoordRec((float) 19.1257, (float) 4.7619),
-    new CoordRec((float) 28.6495, (float) 0),
-    new CoordRec((float) 42.9352, (float) 0),
-    new CoordRec((float) 52.459, (float) 4.7619),
-    new CoordRec((float) 61.9829, (float) 14.2857),
-};
-
-static final StrokeRec char113[] = {
-   new StrokeRec(2, char113_stroke0),
-   new StrokeRec(14, char113_stroke1),
-};
-
-/* char: 114 'r' */
-
-static final CoordRec char114_stroke0[] = {
-    new CoordRec((float) 9.46, (float) 66.6667),
-    new CoordRec((float) 9.46, (float) 0),
-};
-
-static final CoordRec char114_stroke1[] = {
-    new CoordRec((float) 9.46, (float) 38.0952),
-    new CoordRec((float) 14.2219, (float) 52.381),
-    new CoordRec((float) 23.7457, (float) 61.9048),
-    new CoordRec((float) 33.2695, (float) 66.6667),
-    new CoordRec((float) 47.5552, (float) 66.6667),
-};
-
-static final StrokeRec char114[] = {
-   new StrokeRec(2, char114_stroke0),
-   new StrokeRec(5, char114_stroke1),
-};
-
-/* char: 115 's' */
-
-static final CoordRec char115_stroke0[] = {
-    new CoordRec((float) 57.081, (float) 52.381),
-    new CoordRec((float) 52.319, (float) 61.9048),
-    new CoordRec((float) 38.0333, (float) 66.6667),
-    new CoordRec((float) 23.7476, (float) 66.6667),
-    new CoordRec((float) 9.4619, (float) 61.9048),
-    new CoordRec((float) 4.7, (float) 52.381),
-    new CoordRec((float) 9.4619, (float) 42.8571),
-    new CoordRec((float) 18.9857, (float) 38.0952),
-    new CoordRec((float) 42.7952, (float) 33.3333),
-    new CoordRec((float) 52.319, (float) 28.5714),
-    new CoordRec((float) 57.081, (float) 19.0476),
-    new CoordRec((float) 57.081, (float) 14.2857),
-    new CoordRec((float) 52.319, (float) 4.7619),
-    new CoordRec((float) 38.0333, (float) 0),
-    new CoordRec((float) 23.7476, (float) 0),
-    new CoordRec((float) 9.4619, (float) 4.7619),
-    new CoordRec((float) 4.7, (float) 14.2857),
-};
-
-static final StrokeRec char115[] = {
-   new StrokeRec(17, char115_stroke0),
-};
-
-/* char: 116 't' */
-
-static final CoordRec char116_stroke0[] = {
-    new CoordRec((float) 14.8257, (float) 100),
-    new CoordRec((float) 14.8257, (float) 19.0476),
-    new CoordRec((float) 19.5876, (float) 4.7619),
-    new CoordRec((float) 29.1114, (float) 0),
-    new CoordRec((float) 38.6352, (float) 0),
-};
-
-static final CoordRec char116_stroke1[] = {
-    new CoordRec((float) 0.54, (float) 66.6667),
-    new CoordRec((float) 33.8733, (float) 66.6667),
-};
-
-static final StrokeRec char116[] = {
-   new StrokeRec(5, char116_stroke0),
-   new StrokeRec(2, char116_stroke1),
-};
-
-/* char: 117 'u' */
-
-static final CoordRec char117_stroke0[] = {
-    new CoordRec((float) 9.46, (float) 66.6667),
-    new CoordRec((float) 9.46, (float) 19.0476),
-    new CoordRec((float) 14.2219, (float) 4.7619),
-    new CoordRec((float) 23.7457, (float) 0),
-    new CoordRec((float) 38.0314, (float) 0),
-    new CoordRec((float) 47.5552, (float) 4.7619),
-    new CoordRec((float) 61.841, (float) 19.0476),
-};
-
-static final CoordRec char117_stroke1[] = {
-    new CoordRec((float) 61.841, (float) 66.6667),
-    new CoordRec((float) 61.841, (float) 0),
-};
-
-static final StrokeRec char117[] = {
-   new StrokeRec(7, char117_stroke0),
-   new StrokeRec(2, char117_stroke1),
-};
-
-/* char: 118 'v' */
-
-static final CoordRec char118_stroke0[] = {
-    new CoordRec((float) 1.8, (float) 66.6667),
-    new CoordRec((float) 30.3714, (float) 0),
-};
-
-static final CoordRec char118_stroke1[] = {
-    new CoordRec((float) 58.9429, (float) 66.6667),
-    new CoordRec((float) 30.3714, (float) 0),
-};
-
-static final StrokeRec char118[] = {
-   new StrokeRec(2, char118_stroke0),
-   new StrokeRec(2, char118_stroke1),
-};
-
-/* char: 119 'w' */
-
-static final CoordRec char119_stroke0[] = {
-    new CoordRec((float) 2.5, (float) 66.6667),
-    new CoordRec((float) 21.5476, (float) 0),
-};
-
-static final CoordRec char119_stroke1[] = {
-    new CoordRec((float) 40.5952, (float) 66.6667),
-    new CoordRec((float) 21.5476, (float) 0),
-};
-
-static final CoordRec char119_stroke2[] = {
-    new CoordRec((float) 40.5952, (float) 66.6667),
-    new CoordRec((float) 59.6429, (float) 0),
-};
-
-static final CoordRec char119_stroke3[] = {
-    new CoordRec((float) 78.6905, (float) 66.6667),
-    new CoordRec((float) 59.6429, (float) 0),
-};
-
-static final StrokeRec char119[] = {
-   new StrokeRec(2, char119_stroke0),
-   new StrokeRec(2, char119_stroke1),
-   new StrokeRec(2, char119_stroke2),
-   new StrokeRec(2, char119_stroke3),
-};
-
-/* char: 120 'x' */
-
-static final CoordRec char120_stroke0[] = {
-    new CoordRec((float) 1.66, (float) 66.6667),
-    new CoordRec((float) 54.041, (float) 0),
-};
-
-static final CoordRec char120_stroke1[] = {
-    new CoordRec((float) 54.041, (float) 66.6667),
-    new CoordRec((float) 1.66, (float) 0),
-};
-
-static final StrokeRec char120[] = {
-   new StrokeRec(2, char120_stroke0),
-   new StrokeRec(2, char120_stroke1),
-};
-
-/* char: 121 'y' */
-
-static final CoordRec char121_stroke0[] = {
-    new CoordRec((float) 6.5619, (float) 66.6667),
-    new CoordRec((float) 35.1333, (float) 0),
-};
-
-static final CoordRec char121_stroke1[] = {
-    new CoordRec((float) 63.7048, (float) 66.6667),
-    new CoordRec((float) 35.1333, (float) 0),
-    new CoordRec((float) 25.6095, (float) -19.0476),
-    new CoordRec((float) 16.0857, (float) -28.5714),
-    new CoordRec((float) 6.5619, (float) -33.3333),
-    new CoordRec((float) 1.8, (float) -33.3333),
-};
-
-static final StrokeRec char121[] = {
-   new StrokeRec(2, char121_stroke0),
-   new StrokeRec(6, char121_stroke1),
-};
-
-/* char: 122 'z' */
-
-static final CoordRec char122_stroke0[] = {
-    new CoordRec((float) 56.821, (float) 66.6667),
-    new CoordRec((float) 4.44, (float) 0),
-};
-
-static final CoordRec char122_stroke1[] = {
-    new CoordRec((float) 4.44, (float) 66.6667),
-    new CoordRec((float) 56.821, (float) 66.6667),
-};
-
-static final CoordRec char122_stroke2[] = {
-    new CoordRec((float) 4.44, (float) 0),
-    new CoordRec((float) 56.821, (float) 0),
-};
-
-static final StrokeRec char122[] = {
-   new StrokeRec(2, char122_stroke0),
-   new StrokeRec(2, char122_stroke1),
-   new StrokeRec(2, char122_stroke2),
-};
-
-/* char: 123 '{' */
-
-static final CoordRec char123_stroke0[] = {
-    new CoordRec((float) 31.1895, (float) 119.048),
-    new CoordRec((float) 21.6657, (float) 114.286),
-    new CoordRec((float) 16.9038, (float) 109.524),
-    new CoordRec((float) 12.1419, (float) 100),
-    new CoordRec((float) 12.1419, (float) 90.4762),
-    new CoordRec((float) 16.9038, (float) 80.9524),
-    new CoordRec((float) 21.6657, (float) 76.1905),
-    new CoordRec((float) 26.4276, (float) 66.6667),
-    new CoordRec((float) 26.4276, (float) 57.1429),
-    new CoordRec((float) 16.9038, (float) 47.619),
-};
-
-static final CoordRec char123_stroke1[] = {
-    new CoordRec((float) 21.6657, (float) 114.286),
-    new CoordRec((float) 16.9038, (float) 104.762),
-    new CoordRec((float) 16.9038, (float) 95.2381),
-    new CoordRec((float) 21.6657, (float) 85.7143),
-    new CoordRec((float) 26.4276, (float) 80.9524),
-    new CoordRec((float) 31.1895, (float) 71.4286),
-    new CoordRec((float) 31.1895, (float) 61.9048),
-    new CoordRec((float) 26.4276, (float) 52.381),
-    new CoordRec((float) 7.38, (float) 42.8571),
-    new CoordRec((float) 26.4276, (float) 33.3333),
-    new CoordRec((float) 31.1895, (float) 23.8095),
-    new CoordRec((float) 31.1895, (float) 14.2857),
-    new CoordRec((float) 26.4276, (float) 4.7619),
-    new CoordRec((float) 21.6657, (float) 0),
-    new CoordRec((float) 16.9038, (float) -9.5238),
-    new CoordRec((float) 16.9038, (float) -19.0476),
-    new CoordRec((float) 21.6657, (float) -28.5714),
-};
-
-static final CoordRec char123_stroke2[] = {
-    new CoordRec((float) 16.9038, (float) 38.0952),
-    new CoordRec((float) 26.4276, (float) 28.5714),
-    new CoordRec((float) 26.4276, (float) 19.0476),
-    new CoordRec((float) 21.6657, (float) 9.5238),
-    new CoordRec((float) 16.9038, (float) 4.7619),
-    new CoordRec((float) 12.1419, (float) -4.7619),
-    new CoordRec((float) 12.1419, (float) -14.2857),
-    new CoordRec((float) 16.9038, (float) -23.8095),
-    new CoordRec((float) 21.6657, (float) -28.5714),
-    new CoordRec((float) 31.1895, (float) -33.3333),
-};
-
-static final StrokeRec char123[] = {
-   new StrokeRec(10, char123_stroke0),
-   new StrokeRec(17, char123_stroke1),
-   new StrokeRec(10, char123_stroke2),
-};
-
-/* char: 124 '|' */
-
-static final CoordRec char124_stroke0[] = {
-    new CoordRec((float) 11.54, (float) 119.048),
-    new CoordRec((float) 11.54, (float) -33.3333),
-};
-
-static final StrokeRec char124[] = {
-   new StrokeRec(2, char124_stroke0),
-};
-
-/* char: 125 '}' */
-
-static final CoordRec char125_stroke0[] = {
-    new CoordRec((float) 9.18, (float) 119.048),
-    new CoordRec((float) 18.7038, (float) 114.286),
-    new CoordRec((float) 23.4657, (float) 109.524),
-    new CoordRec((float) 28.2276, (float) 100),
-    new CoordRec((float) 28.2276, (float) 90.4762),
-    new CoordRec((float) 23.4657, (float) 80.9524),
-    new CoordRec((float) 18.7038, (float) 76.1905),
-    new CoordRec((float) 13.9419, (float) 66.6667),
-    new CoordRec((float) 13.9419, (float) 57.1429),
-    new CoordRec((float) 23.4657, (float) 47.619),
-};
-
-static final CoordRec char125_stroke1[] = {
-    new CoordRec((float) 18.7038, (float) 114.286),
-    new CoordRec((float) 23.4657, (float) 104.762),
-    new CoordRec((float) 23.4657, (float) 95.2381),
-    new CoordRec((float) 18.7038, (float) 85.7143),
-    new CoordRec((float) 13.9419, (float) 80.9524),
-    new CoordRec((float) 9.18, (float) 71.4286),
-    new CoordRec((float) 9.18, (float) 61.9048),
-    new CoordRec((float) 13.9419, (float) 52.381),
-    new CoordRec((float) 32.9895, (float) 42.8571),
-    new CoordRec((float) 13.9419, (float) 33.3333),
-    new CoordRec((float) 9.18, (float) 23.8095),
-    new CoordRec((float) 9.18, (float) 14.2857),
-    new CoordRec((float) 13.9419, (float) 4.7619),
-    new CoordRec((float) 18.7038, (float) 0),
-    new CoordRec((float) 23.4657, (float) -9.5238),
-    new CoordRec((float) 23.4657, (float) -19.0476),
-    new CoordRec((float) 18.7038, (float) -28.5714),
-};
-
-static final CoordRec char125_stroke2[] = {
-    new CoordRec((float) 23.4657, (float) 38.0952),
-    new CoordRec((float) 13.9419, (float) 28.5714),
-    new CoordRec((float) 13.9419, (float) 19.0476),
-    new CoordRec((float) 18.7038, (float) 9.5238),
-    new CoordRec((float) 23.4657, (float) 4.7619),
-    new CoordRec((float) 28.2276, (float) -4.7619),
-    new CoordRec((float) 28.2276, (float) -14.2857),
-    new CoordRec((float) 23.4657, (float) -23.8095),
-    new CoordRec((float) 18.7038, (float) -28.5714),
-    new CoordRec((float) 9.18, (float) -33.3333),
-};
-
-static final StrokeRec char125[] = {
-   new StrokeRec(10, char125_stroke0),
-   new StrokeRec(17, char125_stroke1),
-   new StrokeRec(10, char125_stroke2),
-};
-
-/* char: 126 '~' */
-
-static final CoordRec char126_stroke0[] = {
-    new CoordRec((float) 2.92, (float) 28.5714),
-    new CoordRec((float) 2.92, (float) 38.0952),
-    new CoordRec((float) 7.6819, (float) 52.381),
-    new CoordRec((float) 17.2057, (float) 57.1429),
-    new CoordRec((float) 26.7295, (float) 57.1429),
-    new CoordRec((float) 36.2533, (float) 52.381),
-    new CoordRec((float) 55.301, (float) 38.0952),
-    new CoordRec((float) 64.8248, (float) 33.3333),
-    new CoordRec((float) 74.3486, (float) 33.3333),
-    new CoordRec((float) 83.8724, (float) 38.0952),
-    new CoordRec((float) 88.6343, (float) 47.619),
-};
-
-static final CoordRec char126_stroke1[] = {
-    new CoordRec((float) 2.92, (float) 38.0952),
-    new CoordRec((float) 7.6819, (float) 47.619),
-    new CoordRec((float) 17.2057, (float) 52.381),
-    new CoordRec((float) 26.7295, (float) 52.381),
-    new CoordRec((float) 36.2533, (float) 47.619),
-    new CoordRec((float) 55.301, (float) 33.3333),
-    new CoordRec((float) 64.8248, (float) 28.5714),
-    new CoordRec((float) 74.3486, (float) 28.5714),
-    new CoordRec((float) 83.8724, (float) 33.3333),
-    new CoordRec((float) 88.6343, (float) 47.619),
-    new CoordRec((float) 88.6343, (float) 57.1429),
-};
-
-static final StrokeRec char126[] = {
-   new StrokeRec(11, char126_stroke0),
-   new StrokeRec(11, char126_stroke1),
-};
-
-/* char: 127 */
-
-static final CoordRec char127_stroke0[] = {
-    new CoordRec((float) 52.381, (float) 100),
-    new CoordRec((float) 14.2857, (float) -33.3333),
-};
-
-static final CoordRec char127_stroke1[] = {
-    new CoordRec((float) 28.5714, (float) 66.6667),
-    new CoordRec((float) 14.2857, (float) 61.9048),
-    new CoordRec((float) 4.7619, (float) 52.381),
-    new CoordRec((float) 0, (float) 38.0952),
-    new CoordRec((float) 0, (float) 23.8095),
-    new CoordRec((float) 4.7619, (float) 14.2857),
-    new CoordRec((float) 14.2857, (float) 4.7619),
-    new CoordRec((float) 28.5714, (float) 0),
-    new CoordRec((float) 38.0952, (float) 0),
-    new CoordRec((float) 52.381, (float) 4.7619),
-    new CoordRec((float) 61.9048, (float) 14.2857),
-    new CoordRec((float) 66.6667, (float) 28.5714),
-    new CoordRec((float) 66.6667, (float) 42.8571),
-    new CoordRec((float) 61.9048, (float) 52.381),
-    new CoordRec((float) 52.381, (float) 61.9048),
-    new CoordRec((float) 38.0952, (float) 66.6667),
-    new CoordRec((float) 28.5714, (float) 66.6667),
-};
-
-static final StrokeRec char127[] = {
-   new StrokeRec(2, char127_stroke0),
-   new StrokeRec(17, char127_stroke1),
-};
-
-static final StrokeCharRec chars[] = {
-    new StrokeCharRec( 0, /* char0 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char1 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char2 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char3 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char4 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char5 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char6 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char7 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char8 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char9 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char10 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char11 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char12 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char13 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char14 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char15 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char16 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char17 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char18 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char19 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char20 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char21 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char22 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char23 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char24 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char25 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char26 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char27 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char28 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char29 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char30 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char31 */ null, (float) 0, (float) 0 ),
-    new StrokeCharRec( 0, /* char32 */ null, (float) 52.381, (float) 104.762 ),
-    new StrokeCharRec( 2, char33, (float) 13.3819, (float) 26.6238 ),
-    new StrokeCharRec( 2, char34, (float) 23.0676, (float) 51.4352 ),
-    new StrokeCharRec( 4, char35, (float) 36.5333, (float) 79.4886 ),
-    new StrokeCharRec( 3, char36, (float) 38.1533, (float) 76.2067 ),
-    new StrokeCharRec( 3, char37, (float) 49.2171, (float) 96.5743 ),
-    new StrokeCharRec( 1, char38, (float) 53.599, (float) 101.758 ),
-    new StrokeCharRec( 1, char39, (float) 4.44, (float) 13.62 ),
-    new StrokeCharRec( 1, char40, (float) 21.8657, (float) 47.1733 ),
-    new StrokeCharRec( 1, char41, (float) 24.3276, (float) 47.5333 ),
-    new StrokeCharRec( 3, char42, (float) 30.7695, (float) 59.439 ),
-    new StrokeCharRec( 2, char43, (float) 48.8371, (float) 97.2543 ),
-    new StrokeCharRec( 1, char44, (float) 13.5219, (float) 26.0638 ),
-    new StrokeCharRec( 1, char45, (float) 50.2371, (float) 100.754 ),
-    new StrokeCharRec( 1, char46, (float) 13.1019, (float) 26.4838 ),
-    new StrokeCharRec( 1, char47, (float) 40.5733, (float) 82.1067 ),
-    new StrokeCharRec( 1, char48, (float) 38.3133, (float) 77.0667 ),
-    new StrokeCharRec( 1, char49, (float) 30.8676, (float) 66.5295 ),
-    new StrokeCharRec( 1, char50, (float) 38.7533, (float) 77.6467 ),
-    new StrokeCharRec( 1, char51, (float) 38.3333, (float) 77.0467 ),
-    new StrokeCharRec( 2, char52, (float) 37.2133, (float) 80.1686 ),
-    new StrokeCharRec( 1, char53, (float) 38.1933, (float) 77.6867 ),
-    new StrokeCharRec( 1, char54, (float) 34.1514, (float) 73.8048 ),
-    new StrokeCharRec( 2, char55, (float) 38.8933, (float) 77.2267 ),
-    new StrokeCharRec( 1, char56, (float) 38.9333, (float) 77.6667 ),
-    new StrokeCharRec( 1, char57, (float) 39.9333, (float) 74.0648 ),
-    new StrokeCharRec( 2, char58, (float) 14.0819, (float) 26.2238 ),
-    new StrokeCharRec( 2, char59, (float) 12.9619, (float) 26.3038 ),
-    new StrokeCharRec( 1, char60, (float) 41.1552, (float) 81.6105 ),
-    new StrokeCharRec( 2, char61, (float) 48.5571, (float) 97.2543 ),
-    new StrokeCharRec( 1, char62, (float) 40.8752, (float) 81.6105 ),
-    new StrokeCharRec( 2, char63, (float) 36.9914, (float) 73.9029 ),
-    new StrokeCharRec( 2, char64, (float) 34.9314, (float) 74.3648 ),
-    new StrokeCharRec( 3, char65, (float) 40.5952, (float) 80.4905 ),
-    new StrokeCharRec( 3, char66, (float) 44.7533, (float) 83.6267 ),
-    new StrokeCharRec( 1, char67, (float) 39.9933, (float) 84.4886 ),
-    new StrokeCharRec( 2, char68, (float) 45.2933, (float) 85.2867 ),
-    new StrokeCharRec( 4, char69, (float) 39.9914, (float) 78.1848 ),
-    new StrokeCharRec( 3, char70, (float) 39.9914, (float) 78.7448 ),
-    new StrokeCharRec( 2, char71, (float) 40.3933, (float) 89.7686 ),
-    new StrokeCharRec( 3, char72, (float) 44.7533, (float) 89.0867 ),
-    new StrokeCharRec( 1, char73, (float) 10.86, (float) 21.3 ),
-    new StrokeCharRec( 1, char74, (float) 31.0714, (float) 59.999 ),
-    new StrokeCharRec( 3, char75, (float) 44.6133, (float) 79.3267 ),
-    new StrokeCharRec( 2, char76, (float) 40.2514, (float) 71.3229 ),
-    new StrokeCharRec( 4, char77, (float) 48.9552, (float) 97.2105 ),
-    new StrokeCharRec( 3, char78, (float) 44.4733, (float) 88.8067 ),
-    new StrokeCharRec( 1, char79, (float) 44.3352, (float) 88.8305 ),
-    new StrokeCharRec( 2, char80, (float) 45.4333, (float) 85.6667 ),
-    new StrokeCharRec( 2, char81, (float) 43.3952, (float) 88.0905 ),
-    new StrokeCharRec( 3, char82, (float) 45.0133, (float) 82.3667 ),
-    new StrokeCharRec( 1, char83, (float) 41.3333, (float) 80.8267 ),
-    new StrokeCharRec( 2, char84, (float) 35.6933, (float) 71.9467 ),
-    new StrokeCharRec( 1, char85, (float) 44.8733, (float) 89.4867 ),
-    new StrokeCharRec( 2, char86, (float) 40.4552, (float) 81.6105 ),
-    new StrokeCharRec( 4, char87, (float) 49.839, (float) 100.518 ),
-    new StrokeCharRec( 2, char88, (float) 35.8333, (float) 72.3667 ),
-    new StrokeCharRec( 2, char89, (float) 39.6152, (float) 79.6505 ),
-    new StrokeCharRec( 3, char90, (float) 35.8333, (float) 73.7467 ),
-    new StrokeCharRec( 4, char91, (float) 22.0657, (float) 46.1133 ),
-    new StrokeCharRec( 1, char92, (float) 39.1733, (float) 78.2067 ),
-    new StrokeCharRec( 4, char93, (float) 23.4876, (float) 46.3933 ),
-    new StrokeCharRec( 2, char94, (float) 44.0752, (float) 90.2305 ),
-    new StrokeCharRec( 1, char95, (float) 51.281, (float) 104.062 ),
-    new StrokeCharRec( 2, char96, (float) 42.5457, (float) 83.5714 ),
-    new StrokeCharRec( 2, char97, (float) 35.2514, (float) 66.6029 ),
-    new StrokeCharRec( 2, char98, (float) 37.3314, (float) 70.4629 ),
-    new StrokeCharRec( 1, char99, (float) 34.0914, (float) 68.9229 ),
-    new StrokeCharRec( 2, char100, (float) 33.2114, (float) 70.2629 ),
-    new StrokeCharRec( 1, char101, (float) 34.2914, (float) 68.5229 ),
-    new StrokeCharRec( 2, char102, (float) 14.9657, (float) 38.6552 ),
-    new StrokeCharRec( 2, char103, (float) 33.9314, (float) 70.9829 ),
-    new StrokeCharRec( 2, char104, (float) 33.4095, (float) 71.021 ),
-    new StrokeCharRec( 2, char105, (float) 14.7819, (float) 28.8638 ),
-    new StrokeCharRec( 2, char106, (float) 17.3876, (float) 36.2314 ),
-    new StrokeCharRec( 3, char107, (float) 33.4095, (float) 62.521 ),
-    new StrokeCharRec( 1, char108, (float) 10.02, (float) 19.34 ),
-    new StrokeCharRec( 3, char109, (float) 61.981, (float) 123.962 ),
-    new StrokeCharRec( 2, char110, (float) 32.9895, (float) 70.881 ),
-    new StrokeCharRec( 1, char111, (float) 33.5514, (float) 71.7448 ),
-    new StrokeCharRec( 2, char112, (float) 38.0314, (float) 70.8029 ),
-    new StrokeCharRec( 2, char113, (float) 33.4114, (float) 70.7429 ),
-    new StrokeCharRec( 2, char114, (float) 23.7457, (float) 49.4952 ),
-    new StrokeCharRec( 1, char115, (float) 28.5095, (float) 62.321 ),
-    new StrokeCharRec( 2, char116, (float) 14.8257, (float) 39.3152 ),
-    new StrokeCharRec( 2, char117, (float) 33.2695, (float) 71.161 ),
-    new StrokeCharRec( 2, char118, (float) 30.3714, (float) 60.6029 ),
-    new StrokeCharRec( 4, char119, (float) 40.5952, (float) 80.4905 ),
-    new StrokeCharRec( 2, char120, (float) 25.4695, (float) 56.401 ),
-    new StrokeCharRec( 2, char121, (float) 35.1333, (float) 66.0648 ),
-    new StrokeCharRec( 3, char122, (float) 28.2495, (float) 61.821 ),
-    new StrokeCharRec( 3, char123, (float) 21.6657, (float) 41.6295 ),
-    new StrokeCharRec( 1, char124, (float) 11.54, (float) 23.78 ),
-    new StrokeCharRec( 3, char125, (float) 18.7038, (float) 41.4695 ),
-    new StrokeCharRec( 2, char126, (float) 45.7771, (float) 91.2743 ),
-    new StrokeCharRec( 2, char127, (float) 33.3333, (float) 66.6667 ),
-};
-
-public static final StrokeFontRec glutStrokeRoman = new StrokeFontRec( "Roman", 128, chars, (float) 119.048, (float) -33.3333 );
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/StrokeCharRec.java b/src/jogl/classes/com/sun/opengl/util/gl2/StrokeCharRec.java
deleted file mode 100644
index 1d5d3de63..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/StrokeCharRec.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
-
-/* This program is freely distributable without licensing fees 
-   and is provided without guarantee or warrantee expressed or 
-   implied. This program is -not- in the public domain. */
-
-class StrokeCharRec {
-  public int num_strokes;
-  public StrokeRec[] stroke;
-  public float center;
-  public float right;
-
-  public StrokeCharRec(int num_strokes,
-                StrokeRec[] stroke,
-                float center,
-                float right) {
-    this.num_strokes = num_strokes;
-    this.stroke = stroke;
-    this.center = center;
-    this.right = right;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/StrokeFontRec.java b/src/jogl/classes/com/sun/opengl/util/gl2/StrokeFontRec.java
deleted file mode 100644
index 0e6133a2d..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/StrokeFontRec.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
-
-/* This program is freely distributable without licensing fees 
-   and is provided without guarantee or warrantee expressed or 
-   implied. This program is -not- in the public domain. */
-
-class StrokeFontRec {
-  public String name;
-  public int num_chars;
-  public StrokeCharRec[] ch;
-  public float top;
-  public float bottom;
-
-  public StrokeFontRec(String name,
-                int num_chars,
-                StrokeCharRec[] ch,
-                float top,
-                float bottom) {
-    this.name = name;
-    this.num_chars = num_chars;
-    this.ch = ch;
-    this.top = top;
-    this.bottom = bottom;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/StrokeRec.java b/src/jogl/classes/com/sun/opengl/util/gl2/StrokeRec.java
deleted file mode 100644
index 91241ebc0..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/StrokeRec.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.gl2;
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
-
-/* This program is freely distributable without licensing fees 
-   and is provided without guarantee or warrantee expressed or 
-   implied. This program is -not- in the public domain. */
-
-class StrokeRec {
-  public int num_coords;
-  public CoordRec[] coord;
-  
-  public StrokeRec(int num_coords,
-            CoordRec[] coord) {
-    this.num_coords = num_coords;
-    this.coord = coord;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/TileRenderer.java b/src/jogl/classes/com/sun/opengl/util/gl2/TileRenderer.java
deleted file mode 100755
index a446b0928..000000000
--- a/src/jogl/classes/com/sun/opengl/util/gl2/TileRenderer.java
+++ /dev/null
@@ -1,601 +0,0 @@
-package com.sun.opengl.util.gl2;
-
-import java.awt.Dimension;
-import java.nio.Buffer;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-import javax.media.opengl.glu.gl2.*;
-
-/**
- * A fairly direct port of Brian Paul's tile rendering library, found
- * at <a href = "http://www.mesa3d.org/brianp/TR.html">
- * http://www.mesa3d.org/brianp/TR.html </a> . I've java-fied it, but
- * the functionality is the same.
- * 
- * Original code Copyright (C) 1997-2005 Brian Paul. Licensed under
- * BSD-compatible terms with permission of the author. See LICENSE.txt
- * for license information.
- * 
- * @author ryanm
- */
-public class TileRenderer
-{
-  private static final int DEFAULT_TILE_WIDTH = 256;
-
-  private static final int DEFAULT_TILE_HEIGHT = 256;
-
-  private static final int DEFAULT_TILE_BORDER = 0;
-
-  //
-  // Enumeration flags for accessing variables
-  //
-  // @author ryanm
-  //
-
-  /**
-   * The width of a tile
-   */
-  public static final int TR_TILE_WIDTH = 0;
-  /**
-   * The height of a tile
-   */
-  public static final int TR_TILE_HEIGHT = 1;
-  /**
-   * The width of the border around the tiles
-   */
-  public static final int TR_TILE_BORDER = 2;
-  /**
-   * The width of the final image
-   */
-  public static final int TR_IMAGE_WIDTH = 3;
-  /**
-   * The height of the final image
-   */
-  public static final int TR_IMAGE_HEIGHT = 4;
-  /**
-   * The number of rows of tiles
-   */
-  public static final int TR_ROWS = 5;
-  /**
-   * The number of columns of tiles
-   */
-  public static final int TR_COLUMNS = 6;
-  /**
-   * The current row number
-   */
-  public static final int TR_CURRENT_ROW = 7;
-  /**
-   * The current column number
-   */
-  public static final int TR_CURRENT_COLUMN = 8;
-  /**
-   * The width of the current tile
-   */
-  public static final int TR_CURRENT_TILE_WIDTH = 9;
-  /**
-   * The height of the current tile
-   */
-  public static final int TR_CURRENT_TILE_HEIGHT = 10;
-  /**
-   * The order that the rows are traversed
-   */
-  public static final int TR_ROW_ORDER = 11;
-
-
-  /**
-   * Indicates we are traversing rows from the top to the bottom
-   */
-  public static final int TR_TOP_TO_BOTTOM = 1;
-
-  /**
-   * Indicates we are traversing rows from the bottom to the top
-   */
-  public static final int TR_BOTTOM_TO_TOP = 2;
-
-  /* Final image parameters */
-  private Dimension imageSize = new Dimension();
-
-  private int imageFormat, imageType;
-
-  private Buffer imageBuffer;
-
-  /* Tile parameters */
-  private Dimension tileSize = new Dimension();
-
-  private Dimension tileSizeNB = new Dimension();
-
-  private int tileBorder;
-
-  private int tileFormat, tileType;
-
-  private Buffer tileBuffer;
-
-  /* Projection parameters */
-  private boolean perspective;
-
-  private double left;
-
-  private double right;
-
-  private double bottom;
-
-  private double top;
-
-  private double near;
-
-  private double far;
-
-  /* Misc */
-  private int rowOrder;
-
-  private int rows, columns;
-
-  private int currentTile;
-
-  private int currentTileWidth, currentTileHeight;
-
-  private int currentRow, currentColumn;
-
-  private int[] viewportSave = new int[ 4 ];
-
-  /**
-   * Creates a new TileRenderer object
-   */
-  public TileRenderer()
-  {
-    tileSize.width = DEFAULT_TILE_WIDTH;
-    tileSize.height = DEFAULT_TILE_HEIGHT;
-    tileBorder = DEFAULT_TILE_BORDER;
-    rowOrder = TR_BOTTOM_TO_TOP;
-    currentTile = -1;
-  }
-
-  /**
-   * Sets up the number of rows and columns needed
-   */
-  private void setup()
-  {
-    columns = ( imageSize.width + tileSizeNB.width - 1 ) / tileSizeNB.width;
-    rows = ( imageSize.height + tileSizeNB.height - 1 ) / tileSizeNB.height;
-    currentTile = 0;
-
-    assert columns >= 0;
-    assert rows >= 0;
-  }
-
-  /**
-   * Sets the size of the tiles to use in rendering. The actual
-   * effective size of the tile depends on the border size, ie (
-   * width - 2*border ) * ( height - 2 * border )
-   * 
-   * @param width
-   *           The width of the tiles. Must not be larger than the GL
-   *           context
-   * @param height
-   *           The height of the tiles. Must not be larger than the
-   *           GL context
-   * @param border
-   *           The width of the borders on each tile. This is needed
-   *           to avoid artifacts when rendering lines or points with
-   *           thickness > 1.
-   */
-  public void setTileSize( int width, int height, int border )
-  {
-    assert ( border >= 0 );
-    assert ( width >= 1 );
-    assert ( height >= 1 );
-    assert ( width >= 2 * border );
-    assert ( height >= 2 * border );
-
-    tileBorder = border;
-    tileSize.width = width;
-    tileSize.height = height;
-    tileSizeNB.width = width - 2 * border;
-    tileSizeNB.height = height - 2 * border;
-    setup();
-  }
-
-  /**
-   * Specify a buffer the tiles to be copied to. This is not
-   * necessary for the creation of the final image, but useful if you
-   * want to inspect each tile in turn.
-   * 
-   * @param format
-   *           Interpreted as in glReadPixels
-   * @param type
-   *           Interpreted as in glReadPixels
-   * @param image
-   *           The buffer itself. Must be large enough to contain a
-   *           tile, minus any borders
-   */
-  public void setTileBuffer( int format, int type, Buffer image )
-  {
-    tileFormat = format;
-    tileType = type;
-    tileBuffer = image;
-  }
-
-  /**
-   * Sets the desired size of the final image
-   * 
-   * @param width
-   *           The width of the final image
-   * @param height
-   *           The height of the final image
-   */
-  public void setImageSize( int width, int height )
-  {
-    imageSize.width = width;
-    imageSize.height = height;
-    setup();
-  }
-
-  /**
-   * Sets the buffer in which to store the final image
-   * 
-   * @param format
-   *           Interpreted as in glReadPixels
-   * @param type
-   *           Interpreted as in glReadPixels
-   * @param image
-   *           the buffer itself, must be large enough to hold the
-   *           final image
-   */
-  public void setImageBuffer( int format, int type, Buffer image )
-  {
-    imageFormat = format;
-    imageType = type;
-    imageBuffer = image;
-  }
-
-  /**
-   * Gets the parameters of this TileRenderer object
-   * 
-   * @param param
-   *           The parameter that is to be retrieved
-   * @return the value of the parameter
-   */
-  public int getParam( int param )
-  {
-    switch (param) {
-      case TR_TILE_WIDTH:
-        return tileSize.width;
-      case TR_TILE_HEIGHT:
-        return tileSize.height;
-      case TR_TILE_BORDER:
-        return tileBorder;
-      case TR_IMAGE_WIDTH:
-        return imageSize.width;
-      case TR_IMAGE_HEIGHT:
-        return imageSize.height;
-      case TR_ROWS:
-        return rows;
-      case TR_COLUMNS:
-        return columns;
-      case TR_CURRENT_ROW:
-        if( currentTile < 0 )
-          return -1;
-        else
-          return currentRow;
-      case TR_CURRENT_COLUMN:
-        if( currentTile < 0 )
-          return -1;
-        else
-          return currentColumn;
-      case TR_CURRENT_TILE_WIDTH:
-        return currentTileWidth;
-      case TR_CURRENT_TILE_HEIGHT:
-        return currentTileHeight;
-      case TR_ROW_ORDER:
-        return rowOrder;
-      default:
-        throw new IllegalArgumentException("Invalid enumerant as argument");
-    }
-  }
-
-  /**
-   * Sets the order of row traversal
-   * 
-   * @param order
-   *           The row traversal order, must be
-   *           eitherTR_TOP_TO_BOTTOM or TR_BOTTOM_TO_TOP
-   */
-  public void setRowOrder( int order )
-  {
-    if (order == TR_TOP_TO_BOTTOM || order == TR_BOTTOM_TO_TOP) {
-      rowOrder = order;
-    } else {
-      throw new IllegalArgumentException("Must pass TR_TOP_TO_BOTTOM or TR_BOTTOM_TO_TOP");
-    }
-  }
-
-  /**
-   * Sets the context to use an orthographic projection. Must be
-   * called before rendering the first tile
-   * 
-   * @param left
-   *           As in glOrtho
-   * @param right
-   *           As in glOrtho
-   * @param bottom
-   *           As in glOrtho
-   * @param top
-   *           As in glOrtho
-   * @param zNear
-   *           As in glOrtho
-   * @param zFar
-   *           As in glOrtho
-   */
-  public void trOrtho( double left, double right, double bottom, double top, double zNear,
-                       double zFar )
-  {
-    this.perspective = false;
-    this.left = left;
-    this.right = right;
-    this.bottom = bottom;
-    this.top = top;
-    this.near = zNear;
-    this.far = zFar;
-  }
-
-  /**
-   * Sets the perspective projection frustrum. Must be called before
-   * rendering the first tile
-   * 
-   * @param left
-   *           As in glFrustrum
-   * @param right
-   *           As in glFrustrum
-   * @param bottom
-   *           As in glFrustrum
-   * @param top
-   *           As in glFrustrum
-   * @param zNear
-   *           As in glFrustrum
-   * @param zFar
-   *           As in glFrustrum
-   */
-  public void trFrustum( double left, double right, double bottom, double top, double zNear,
-                         double zFar )
-  {
-    this.perspective = true;
-    this.left = left;
-    this.right = right;
-    this.bottom = bottom;
-    this.top = top;
-    this.near = zNear;
-    this.far = zFar;
-  }
-
-  /**
-   * Convenient way to specify a perspective projection
-   * 
-   * @param fovy
-   *           As in gluPerspective
-   * @param aspect
-   *           As in gluPerspective
-   * @param zNear
-   *           As in gluPerspective
-   * @param zFar
-   *           As in gluPerspective
-   */
-  public void trPerspective( double fovy, double aspect, double zNear, double zFar )
-  {
-    double xmin, xmax, ymin, ymax;
-    ymax = zNear * Math.tan( fovy * 3.14159265 / 360.0 );
-    ymin = -ymax;
-    xmin = ymin * aspect;
-    xmax = ymax * aspect;
-    trFrustum( xmin, xmax, ymin, ymax, zNear, zFar );
-  }
-
-  /**
-   * Begins rendering a tile. The projection matrix stack should be
-   * left alone after calling this
-   * 
-   * @param gl
-   *           The gl context
-   */
-  public void beginTile( GL2 gl )
-  {
-    if (currentTile <= 0) {
-      setup();
-      /*
-       * Save user's viewport, will be restored after last tile
-       * rendered
-       */
-      gl.glGetIntegerv( GL2.GL_VIEWPORT, viewportSave, 0 );
-    }
-
-    /* which tile (by row and column) we're about to render */
-    if (rowOrder == TR_BOTTOM_TO_TOP) {
-      currentRow = currentTile / columns;
-      currentColumn = currentTile % columns;
-    } else {
-      currentRow = rows - ( currentTile / columns ) - 1;
-      currentColumn = currentTile % columns;
-    }
-    assert ( currentRow < rows );
-    assert ( currentColumn < columns );
-
-    int border = tileBorder;
-
-    int th, tw;
-
-    /* Compute actual size of this tile with border */
-    if (currentRow < rows - 1) {
-      th = tileSize.height;
-    } else {
-      th = imageSize.height - ( rows - 1 ) * ( tileSizeNB.height  ) + 2 * border;
-    }
-
-    if (currentColumn < columns - 1) {
-      tw = tileSize.width;
-    } else {
-      tw = imageSize.width - ( columns - 1 ) * ( tileSizeNB.width  ) + 2 * border;
-    }
-
-    /* Save tile size, with border */
-    currentTileWidth = tw;
-    currentTileHeight = th;
-
-    gl.glViewport( 0, 0, tw, th );
-
-    /* save current matrix mode */
-    int[] matrixMode = new int[ 1 ];
-    gl.glGetIntegerv( GL2.GL_MATRIX_MODE, matrixMode, 0 );
-    gl.glMatrixMode( GL2.GL_PROJECTION );
-    gl.glLoadIdentity();
-
-    /* compute projection parameters */
-    double l =
-      left + ( right - left ) * ( currentColumn * tileSizeNB.width - border )
-      / imageSize.width;
-    double r = l + ( right - left ) * tw / imageSize.width;
-    double b =
-      bottom + ( top - bottom ) * ( currentRow * tileSizeNB.height - border )
-      / imageSize.height;
-    double t = b + ( top - bottom ) * th / imageSize.height;
-
-    if( perspective ) {
-      gl.glFrustum( l, r, b, t, near, far );
-    } else {
-      gl.glOrtho( l, r, b, t, near, far );
-    }
-
-    /* restore user's matrix mode */
-    gl.glMatrixMode( matrixMode[ 0 ] );
-  }
-
-  /**
-   * Must be called after rendering the scene
-   * 
-   * @param gl
-   *           the gl context
-   * @return true if there are more tiles to be rendered, false if
-   *         the final image is complete
-   */
-  public boolean endTile( GL2 gl )
-  {
-    int[] prevRowLength = new int[ 1 ], prevSkipRows = new int[ 1 ], prevSkipPixels = new int[ 1 ], prevAlignment =
-      new int[ 1 ];
-
-    assert ( currentTile >= 0 );
-
-    // be sure OpenGL rendering is finished
-    gl.glFlush();
-
-    // save current glPixelStore values
-    gl.glGetIntegerv( GL2.GL_PACK_ROW_LENGTH, prevRowLength, 0 );
-    gl.glGetIntegerv( GL2.GL_PACK_SKIP_ROWS, prevSkipRows, 0 );
-    gl.glGetIntegerv( GL2.GL_PACK_SKIP_PIXELS, prevSkipPixels, 0 );
-    gl.glGetIntegerv( GL2.GL_PACK_ALIGNMENT, prevAlignment, 0 );
-
-    if( tileBuffer != null ) {
-      int srcX = tileBorder;
-      int srcY = tileBorder;
-      int srcWidth = tileSizeNB.width;
-      int srcHeight = tileSizeNB.height;
-      gl.glReadPixels( srcX, srcY, srcWidth, srcHeight, tileFormat, tileType, tileBuffer );
-    }
-
-    if( imageBuffer != null ) {
-      int srcX = tileBorder;
-      int srcY = tileBorder;
-      int srcWidth = currentTileWidth - 2 * tileBorder;
-      int srcHeight = currentTileHeight - 2 * tileBorder;
-      int destX = tileSizeNB.width * currentColumn;
-      int destY = tileSizeNB.height * currentRow;
-
-      /* setup pixel store for glReadPixels */
-      gl.glPixelStorei( GL2.GL_PACK_ROW_LENGTH, imageSize.width );
-      gl.glPixelStorei( GL2.GL_PACK_SKIP_ROWS, destY );
-      gl.glPixelStorei( GL2.GL_PACK_SKIP_PIXELS, destX );
-      gl.glPixelStorei( GL2.GL_PACK_ALIGNMENT, 1 );
-
-      /* read the tile into the final image */
-      gl.glReadPixels( srcX, srcY, srcWidth, srcHeight, imageFormat, imageType, imageBuffer );
-    }
-
-    /* restore previous glPixelStore values */
-    gl.glPixelStorei( GL2.GL_PACK_ROW_LENGTH, prevRowLength[ 0 ] );
-    gl.glPixelStorei( GL2.GL_PACK_SKIP_ROWS, prevSkipRows[ 0 ] );
-    gl.glPixelStorei( GL2.GL_PACK_SKIP_PIXELS, prevSkipPixels[ 0 ] );
-    gl.glPixelStorei( GL2.GL_PACK_ALIGNMENT, prevAlignment[ 0 ] );
-
-    /* increment tile counter, return 1 if more tiles left to render */
-    currentTile++;
-    if( currentTile >= rows * columns ) {
-      /* restore user's viewport */
-      gl.glViewport( viewportSave[ 0 ], viewportSave[ 1 ], viewportSave[ 2 ], viewportSave[ 3 ] );
-      currentTile = -1; /* all done */
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  /**
-   * Tile rendering causes problems with using glRasterPos3f, so you
-   * should use this replacement instead
-   * 
-   * @param x
-   *           As in glRasterPos3f
-   * @param y
-   *           As in glRasterPos3f
-   * @param z
-   *           As in glRasterPos3f
-   * @param gl
-   *           The gl context
-   * @param glu
-   *           A GLUgl2 object
-   */
-  public void trRasterPos3f( float x, float y, float z, GL2 gl, GLUgl2 glu )
-  {
-    if (currentTile < 0) {
-      /* not doing tile rendering right now. Let OpenGL do this. */
-      gl.glRasterPos3f( x, y, z );
-    } else {
-      double[] modelview = new double[ 16 ], proj = new double[ 16 ];
-      int[] viewport = new int[ 4 ];
-      double[] win = new double[3];
-
-      /* Get modelview, projection and viewport */
-      gl.glGetDoublev( GL2.GL_MODELVIEW_MATRIX, modelview, 0 );
-      gl.glGetDoublev( GL2.GL_PROJECTION_MATRIX, proj, 0 );
-      viewport[ 0 ] = 0;
-      viewport[ 1 ] = 0;
-      viewport[ 2 ] = currentTileWidth;
-      viewport[ 3 ] = currentTileHeight;
-
-      /* Project object coord to window coordinate */
-      if( glu.gluProject( x, y, z, modelview, 0, proj, 0, viewport, 0, win, 0 ) ) {
-
-        /* set raster pos to window coord (0,0) */
-        gl.glMatrixMode( GL2.GL_MODELVIEW );
-        gl.glPushMatrix();
-        gl.glLoadIdentity();
-        gl.glMatrixMode( GL2.GL_PROJECTION );
-        gl.glPushMatrix();
-        gl.glLoadIdentity();
-        gl.glOrtho( 0.0, currentTileWidth, 0.0, currentTileHeight, 0.0, 1.0 );
-        gl.glRasterPos3d( 0.0, 0.0, -win[ 2 ] );
-
-        /*
-         * Now use empty bitmap to adjust raster position to
-         * (winX,winY)
-         */
-        {
-          byte[] bitmap = { 0 };
-          gl.glBitmap( 1, 1, 0.0f, 0.0f, ( float ) win[ 0 ], ( float ) win[ 1 ], bitmap , 0 );
-        }
-
-        /* restore original matrices */
-        gl.glPopMatrix(); /* proj */
-        gl.glMatrixMode( GL2.GL_MODELVIEW );
-        gl.glPopMatrix();
-      }
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/GLSLArrayHandler.java b/src/jogl/classes/com/sun/opengl/util/glsl/GLSLArrayHandler.java
deleted file mode 100644
index 1ef9874e4..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/GLSLArrayHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-
-package com.sun.opengl.util.glsl;
-
-import javax.media.opengl.*;
-import javax.media.opengl.fixedfunc.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.ShaderState;
-import java.nio.*;
-
-public class GLSLArrayHandler implements GLArrayHandler {
-  private GLArrayDataEditable ad;
-
-  public GLSLArrayHandler(GLArrayDataEditable ad) {
-    this.ad = ad;
-  }
-
-  protected final void passVertexAttribPointer(GL2ES2 gl, ShaderState st) {
-    st.glVertexAttribPointer(gl, ad);
-  }
-
-  public void enableBuffer(GL gl, boolean enable) {
-    if(!gl.isGL2ES2()) {
-        throw new GLException("GLSLArrayHandler expects a GL2ES2 implementation");
-    }
-    GL2ES2 glsl = gl.getGL2ES2();
-    ShaderState st = ShaderState.getCurrent();
-    if(null==st) {
-        throw new GLException("No ShaderState current");
-    }
-
-    if(enable) {
-        st.glEnableVertexAttribArray(glsl, ad.getName());
-
-        Buffer buffer = ad.getBuffer();
-
-        if(ad.isVBO()) {
-            // always bind and refresh the VBO mgr,
-            // in case more than one gl*Pointer objects are in use
-            glsl.glBindBuffer(GL.GL_ARRAY_BUFFER, ad.getVBOName());
-            if(!ad.isBufferWritten()) {
-                if(null!=buffer) {
-                    glsl.glBufferData(GL.GL_ARRAY_BUFFER, buffer.limit() * ad.getComponentSize(), buffer, ad.getBufferUsage());
-                }
-                ad.setBufferWritten(true);
-            }
-            passVertexAttribPointer(glsl, st);
-        } else if(null!=buffer) {
-            passVertexAttribPointer(glsl, st);
-            ad.setBufferWritten(true);
-        }
-    } else {
-        if(ad.isVBO()) {
-            glsl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0);
-        }
-        st.glDisableVertexAttribArray(glsl, ad.getName());
-    }
-  }
-
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderCode.java b/src/jogl/classes/com/sun/opengl/util/glsl/ShaderCode.java
deleted file mode 100644
index 606d2e1b5..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderCode.java
+++ /dev/null
@@ -1,347 +0,0 @@
-
-package com.sun.opengl.util.glsl;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.impl.Debug;
-
-import java.util.*;
-import java.nio.*;
-import java.io.*;
-import java.net.*;
-import java.security.*;
-
-public class ShaderCode {
-    public static final boolean DEBUG = Debug.debug("GLSLCode");
-    public static final boolean DEBUG_CODE = Debug.isPropertyDefined("jogl.debug.GLSLCode", true, AccessController.getContext());
-
-    public static final String SUFFIX_VERTEX_SOURCE   =  "vp" ;
-    public static final String SUFFIX_VERTEX_BINARY   = "bvp" ;
-    public static final String SUFFIX_FRAGMENT_SOURCE =  "fp" ;
-    public static final String SUFFIX_FRAGMENT_BINARY = "bfp" ;
-    
-    public static final String SUB_PATH_NVIDIA = "nvidia" ;
-
-    public ShaderCode(int type, int number, String[][] source) {
-        switch (type) {
-            case GL2ES2.GL_VERTEX_SHADER:
-            case GL2ES2.GL_FRAGMENT_SHADER:
-                break;
-            default:
-                throw new GLException("Unknown shader type: "+type);
-        }
-        shaderSource = source;
-        shaderBinaryFormat = -1;
-        shaderBinary = null;
-        shaderType   = type;
-        shader = BufferUtil.newIntBuffer(number);
-        id = getNextID();
-
-        if(DEBUG_CODE) {
-            System.out.println("Created: "+toString());
-            dumpShaderSource(System.out);
-        }
-    }
-
-    public ShaderCode(int type, int number, int binFormat, Buffer binary) {
-        switch (type) {
-            case GL2ES2.GL_VERTEX_SHADER:
-            case GL2ES2.GL_FRAGMENT_SHADER:
-                break;
-            default:
-                throw new GLException("Unknown shader type: "+type);
-        }
-        shaderSource = null;
-        shaderBinaryFormat = binFormat;
-        shaderBinary = binary;
-        shaderType   = type;
-        shader = BufferUtil.newIntBuffer(number);
-        id = getNextID();
-    }
-
-    public static ShaderCode create(GL2ES2 gl, int type, int number, Class context, String[] sourceFiles) {
-        if(!ShaderUtil.isShaderCompilerAvailable(gl)) return null;
-
-        String[][] shaderSources = null;
-        if(null!=sourceFiles) {
-            shaderSources = new String[sourceFiles.length][1];
-            for(int i=0; null!=shaderSources && i<sourceFiles.length; i++) {
-                shaderSources[i][0] = readShaderSource(context, sourceFiles[i]);
-                if(null == shaderSources[i][0]) {
-                    shaderSources = null;
-                }
-            }
-        }
-        if(null==shaderSources) {
-            return null;
-        }
-        return new ShaderCode(type, number, shaderSources);
-    }
-
-    public static ShaderCode create(int type, int number, Class context, int binFormat, String binaryFile) {
-        ByteBuffer shaderBinary = null;
-        if(null!=binaryFile && 0<=binFormat) {
-            shaderBinary = readShaderBinary(context, binaryFile);
-            if(null == shaderBinary) {
-                binFormat = -1;
-            }
-        }
-        if(null==shaderBinary) {
-            return null;
-        }
-        return new ShaderCode(type, number, binFormat, shaderBinary);
-    }
-
-    public static String getFileSuffix(boolean binary, int type) {
-        switch (type) {
-            case GL2ES2.GL_VERTEX_SHADER:
-                return binary?SUFFIX_VERTEX_BINARY:SUFFIX_VERTEX_SOURCE;
-            case GL2ES2.GL_FRAGMENT_SHADER:
-                return binary?SUFFIX_FRAGMENT_BINARY:SUFFIX_FRAGMENT_SOURCE;
-            default:
-                throw new GLException("illegal shader type: "+type);
-        }
-    }
-
-    public static String getBinarySubPath(int binFormat) {
-        switch (binFormat) {
-            case GLES2.GL_NVIDIA_PLATFORM_BINARY_NV:
-                return SUB_PATH_NVIDIA;
-            default:
-                throw new GLException("unsupported binary format: "+binFormat);
-        }
-    }
-
-    public static ShaderCode create(GL2ES2 gl, int type, int number, Class context, 
-                                    String srcRoot, String binRoot, String basename) {
-        ShaderCode res = null;
-        String srcFileName = null;
-        String binFileName = null;
-
-        if(ShaderUtil.isShaderCompilerAvailable(gl)) {
-            String srcPath[] = new String[1];
-            srcFileName = srcRoot + '/' + basename + "." + getFileSuffix(false, type);
-            srcPath[0] = srcFileName;
-            res = create(gl, type, number, context, srcPath);
-            if(null!=res) {
-                return res;
-            }
-        }
-        Set binFmts = ShaderUtil.getShaderBinaryFormats(gl);
-        for(Iterator iter=binFmts.iterator(); null==res && iter.hasNext(); ) {
-            int bFmt = ((Integer)(iter.next())).intValue();
-            String bFmtPath = getBinarySubPath(bFmt);
-            if(null==bFmtPath) continue;
-            binFileName = binRoot + '/' + bFmtPath + '/' + basename + "." + getFileSuffix(true, type);
-            res = create(type, number, context, bFmt, binFileName);
-        }
-
-        if(null==res) {
-            throw new GLException("No shader code found (source nor binary) for src: "+srcFileName+
-                                  ", bin: "+binFileName);
-        }
-
-        return res;
-    }
-
-    /**
-     * returns the uniq shader id as an integer
-     * @see #key()
-     */
-    public int        id() { return id.intValue(); }
-
-    /**
-     * returns the uniq shader id as an Integer
-     *
-     * @see #id()
-     */
-    public Integer    key() { return id; }
-
-    public int        shaderType() { return shaderType; }
-    public String     shaderTypeStr() { return shaderTypeStr(shaderType); }
-
-    public static String shaderTypeStr(int type) { 
-        switch (type) {
-            case GL2ES2.GL_VERTEX_SHADER:
-                return "VERTEX_SHADER";
-            case GL2ES2.GL_FRAGMENT_SHADER:
-                return "FRAGMENT_SHADER";
-        }
-        return "UNKNOWN_SHADER";
-    }
-
-    public int        shaderBinaryFormat() { return shaderBinaryFormat; }
-    public Buffer     shaderBinary() { return shaderBinary; }
-    public String[][] shaderSource() { return shaderSource; }
-
-    public boolean    isValid() { return valid; }
-
-    public IntBuffer  shader() { return shader; }
-
-    public boolean compile(GL2ES2 gl) {
-        return compile(gl, null);
-    }
-    public boolean compile(GL2ES2 gl, PrintStream verboseOut) {
-        if(isValid()) return true;
-
-        // Create & Compile the vertex/fragment shader objects
-        if(null!=shaderSource) {
-            valid=ShaderUtil.createAndCompileShader(gl, shader, shaderType,
-                                                    shaderSource, verboseOut);
-        } else if(null!=shaderBinary) {
-            valid=ShaderUtil.createAndLoadShader(gl, shader, shaderType,
-                                                 shaderBinaryFormat, shaderBinary, verboseOut);
-        } else {
-            throw new GLException("no code (source or binary)");
-        }
-        return valid;
-    }
-
-    public void destroy(GL2ES2 gl) {
-        if(isValid()) {
-            if(null!=gl) {
-                ShaderUtil.deleteShader(gl, shader());
-            }
-            valid=false;
-        }
-        if(null!=shaderBinary) {
-            shaderBinary.clear();
-            shaderBinary=null;
-        }
-        shaderSource=null;
-        shaderBinaryFormat=-1;
-        shaderType=-1;
-        id=null;
-    }
-
-    public boolean equals(Object obj) {
-        if(this==obj) return true;
-        if(obj instanceof ShaderCode) {
-            return id()==((ShaderCode)obj).id();
-        }
-        return false;
-    }
-    public int hashCode() {
-        return id.intValue();
-    }
-    public String toString() {
-        StringBuffer buf = new StringBuffer("ShaderCode [id="+id+", type="+shaderTypeStr()+", valid="+valid+", shader: ");
-        for(int i=0; i<shader.remaining(); i++) {
-            buf.append(" "+shader.get(i));
-        }
-        if(null!=shaderSource) {
-            buf.append(", source]");
-        } else if(null!=shaderBinary) {
-            buf.append(", binary "+shaderBinary+"]");
-        }
-        return buf.toString();
-    }
-
-    public void dumpShaderSource(PrintStream out) {
-        if(null==shaderSource) {
-            out.println("<no shader source>");
-            return;
-        }
-        int sourceNum = (null!=shaderSource)?shaderSource.length:0;
-        int shaderNum = (null!=shader)?shader.capacity():0;
-        for(int i=0; i<shaderNum; i++) {
-            out.println("");
-            out.println("Shader #"+i+"/"+shaderNum+" name "+shader.get(i));
-            out.println("--------------------------------------------------------------");
-            if(i>=sourceNum) {
-                out.println("<no shader source>");
-            } else {
-                String[] src = shaderSource[i];
-                for(int j=0; j<src.length; j++) {
-                    out.println("Segment "+j+"/"+src.length+" :");
-                    out.println(src[j]);
-                    out.println("");
-                }
-            }
-            out.println("--------------------------------------------------------------");
-        }
-    }
-
-    public static void readShaderSource(ClassLoader context, String path, URL url, StringBuffer result) {
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
-            String line = null;
-            while ((line = reader.readLine()) != null) {
-                if (line.startsWith("#include ")) {
-                    String includeFile = line.substring(9).trim();
-                    // Try relative path first
-                    String next = Locator.getRelativeOf(path, includeFile);
-                    URL nextURL = Locator.getResource(next, context);
-                    if (nextURL == null) {
-                        // Try absolute path
-                        next = includeFile;
-                        nextURL = Locator.getResource(next, context);
-                    }
-                    if (nextURL == null) {
-                        // Fail
-                        throw new FileNotFoundException("Can't find include file " + includeFile);
-                    }
-                    readShaderSource(context, next, nextURL, result);
-                } else {
-                    result.append(line + "\n");
-                }
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static String readShaderSource(Class context, String path) {
-        ClassLoader contextCL = (null!=context)?context.getClassLoader():null;
-        URL url = Locator.getResource(path, contextCL);
-        if (url == null && null!=context) {
-            // Try again by scoping the path within the class's package
-            String className = context.getName().replace('.', '/');
-            int lastSlash = className.lastIndexOf('/');
-            if (lastSlash >= 0) {
-                String tmpPath = className.substring(0, lastSlash + 1) + path;
-                url = Locator.getResource(tmpPath, contextCL);
-                if (url != null) {
-                    path = tmpPath;
-                }
-            }
-        }
-        if (url == null) {
-            return null;
-        }
-        StringBuffer result = new StringBuffer();
-        readShaderSource(contextCL, path, url, result);
-        return result.toString();
-    }
-
-    public static ByteBuffer readShaderBinary(Class context, String path) {
-        try {
-            URL url = Locator.getResource(context, path);
-            if (url == null) {
-                return null;
-            }
-            return StreamUtil.readAll2Buffer(new BufferedInputStream(url.openStream()));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    protected String[][] shaderSource = null;
-    protected Buffer     shaderBinary = null;
-    protected int        shaderBinaryFormat = -1;
-    protected IntBuffer  shader = null;
-    protected int        shaderType = -1;
-    protected Integer    id = null;
-
-    protected boolean valid=false;
-
-    private static synchronized Integer getNextID() {
-        return new Integer(nextID++);
-    }
-    protected static int nextID = 1;
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderProgram.java b/src/jogl/classes/com/sun/opengl/util/glsl/ShaderProgram.java
deleted file mode 100644
index c06eae383..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderProgram.java
+++ /dev/null
@@ -1,212 +0,0 @@
-
-package com.sun.opengl.util.glsl;
-
-import javax.media.opengl.*;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.nio.*;
-import java.io.PrintStream;
-
-public class ShaderProgram {
-    public ShaderProgram() {
-        id = getNextID();
-    }
-
-    public boolean linked() {
-        return programLinked;
-    }
-
-    public boolean inUse() {
-        return programInUse;
-    }
-
-    public int program() { return shaderProgram; }
-
-    /**
-     * returns the uniq shader id as an integer
-     * @see #key()
-     */
-    public int        id() { return id.intValue(); }
-
-    /**
-     * returns the uniq shader id as an Integer
-     *
-     * @see #id()
-     */
-    public Integer    key() { return id; }
-
-    /**
-     * Detaches all shader codes and deletes the program.
-     * Destroys the shader codes as well.
-     * Calls release(gl, true)
-     *
-     * @see #release(GL2ES2, boolean)
-     */
-    public synchronized void destroy(GL2ES2 gl) {
-        release(gl, true);
-    }
-
-    /**
-     * Detaches all shader codes and deletes the program.
-     * Calls release(gl, false)
-     *
-     * @see #release(GL2ES2, boolean)
-     */
-    public synchronized void release(GL2ES2 gl) {
-        release(gl, false);
-    }
-
-    /**
-     * Detaches all shader codes and deletes the program.
-     * If releaseShaderToo is true, destroys the shader codes as well.
-     */
-    public synchronized void release(GL2ES2 gl, boolean releaseShaderToo) {
-        glUseProgram(gl, false);
-        for(Iterator iter=shaderMap.values().iterator(); iter.hasNext(); ) {
-            ShaderCode shaderCode = (ShaderCode) iter.next();
-            ShaderUtil.detachShader(gl, shaderProgram, shaderCode.shader());
-            if(releaseShaderToo) {
-                shaderCode.destroy(gl);
-            }
-        }
-        shaderMap.clear();
-        gl.glDeleteProgram(shaderProgram);
-        shaderProgram=-1;
-    }
-
-    //
-    // ShaderCode handling
-    //
-
-    /**
-     * Adds a new shader to a this non running program.
-     *
-     * @return false if the program is in use, or the shader already exist,
-     *         otherwise true.
-     */
-    public synchronized boolean add(ShaderCode shaderCode) {
-        if(shaderMap.containsKey(shaderCode.key())) return false;
-        shaderMap.put(shaderCode.key(), shaderCode);
-        return true;
-    }
-
-    public synchronized ShaderCode getShader(int id) {
-        return (ShaderCode) shaderMap.get(new Integer(id));
-    }
-
-    //
-    // Program handling
-    //
-
-    /**
-     * Replace a shader in a 'running' program.
-     * Refetches all previously bin/get attribute names
-     * and resets all attribute data as well
-     *
-     * @see getAttribLocation
-     * @param gl 
-     * @param oldShaderID the to be replace Shader
-     * @param newShader   the new ShaderCode
-     * @param verboseOut  the optional verbose outputstream
-     * @throws GLException is the program is not linked
-     *
-     * @see #glRefetchAttribLocations
-     * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
-     */
-    public synchronized boolean glReplaceShader(GL2ES2 gl, int oldShaderID, ShaderCode newShader, PrintStream verboseOut) {
-        if(!programLinked) throw new GLException("Program is not linked");
-        boolean shaderWasInUse = programInUse;
-        glUseProgram(gl, false);
-        if(!newShader.compile(gl, verboseOut)) {
-            return false;
-        } 
-        if(oldShaderID>=0) {
-            ShaderCode oldShader = (ShaderCode) shaderMap.remove(new Integer(oldShaderID));
-            if(null!=oldShader) {
-                ShaderUtil.detachShader(gl, shaderProgram, oldShader.shader());
-            }
-        }
-        add(newShader);
-
-        ShaderUtil.attachShader(gl, shaderProgram, newShader.shader());
-        gl.glLinkProgram(shaderProgram);
-        if ( ! ShaderUtil.isProgramValid(gl, shaderProgram, System.err) )  {
-            return false;
-        }
-
-        if(shaderWasInUse) {
-            glUseProgram(gl, true);
-        }
-        return true;
-    }
-
-    public synchronized boolean link(GL2ES2 gl, PrintStream verboseOut) {
-        if(programLinked) throw new GLException("Program is already linked");
-
-        if(0>shaderProgram) {
-            shaderProgram = gl.glCreateProgram();
-        }
-
-        for(Iterator iter=shaderMap.values().iterator(); iter.hasNext(); ) {
-            ShaderCode shaderCode = (ShaderCode) iter.next();
-            if(!shaderCode.compile(gl, verboseOut)) {
-                return false;
-            }
-            ShaderUtil.attachShader(gl, shaderProgram, shaderCode.shader());
-        }
-
-        // Link the program
-        gl.glLinkProgram(shaderProgram);
-
-        programLinked = ShaderUtil.isProgramValid(gl, shaderProgram, System.err);
-
-        return programLinked;
-    }
-
-    public boolean equals(Object obj) {
-        if(this==obj) return true;
-        if(obj instanceof ShaderCode) {
-            return id()==((ShaderCode)obj).id();
-        }
-        return false;
-    }
-    public int hashCode() {
-        return id.intValue();
-    }
-    public String toString() {
-        StringBuffer buf = new StringBuffer();
-        buf.append("ShaderProgram[id="+id);
-        buf.append(", linked="+programLinked+", inUse="+programInUse+", program: "+shaderProgram+", [");
-        for(Iterator iter=shaderMap.values().iterator(); iter.hasNext(); ) {
-            buf.append((ShaderCode) iter.next());
-            buf.append(" ");
-        }
-        buf.append("]");
-        return buf.toString();
-    }
-
-    protected synchronized void glUseProgram(GL2ES2 gl, boolean on) {
-        if(!programLinked) throw new GLException("Program is not linked");
-        if(programInUse==on) return;
-        gl.glUseProgram(on?shaderProgram:0);
-        programInUse = on;
-
-        //Throwable tX = new Throwable("Info: ShaderProgram.glUseProgram: "+on);
-        //tX.printStackTrace();
-
-    }
-
-    protected boolean programLinked = false;
-    protected boolean programInUse = false;
-    protected int shaderProgram=-1;
-    protected HashMap shaderMap = new HashMap();
-    protected Integer    id = null;
-
-    private static synchronized Integer getNextID() {
-        return new Integer(nextID++);
-    }
-    protected static int nextID = 1;
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderState.java b/src/jogl/classes/com/sun/opengl/util/glsl/ShaderState.java
deleted file mode 100644
index 8712ac7e2..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderState.java
+++ /dev/null
@@ -1,652 +0,0 @@
-
-package com.sun.opengl.util.glsl;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.impl.Debug;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.nio.*;
-import java.io.PrintStream;
-import java.security.*;
-
-public class ShaderState {
-    public static final boolean DEBUG = Debug.isPropertyDefined("jogl.debug.GLSLState", true, AccessController.getContext());
-
-    public ShaderState() {
-    }
-
-    public boolean verbose() { return verbose; }
-
-    public void setVerbose(boolean v) { verbose=v; }
-
-    /**
-     * Fetches the current shader state from the thread local storage (TLS)
-     *
-     * @see javax.media.opengl.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
-     * @see javax.media.opengl.glsl.ShaderState#getCurrent()
-     */
-    public static synchronized ShaderState getCurrent() { 
-        GLContext current = GLContext.getCurrent();
-        if(null==current) {
-            throw new GLException("No context is current on this thread");
-        }
-        return (ShaderState) current.getAttachedObject(ShaderState.class.getName());
-    }
-
-    /**
-     * Turns the shader program on or off.<br>
-     * Puts this ShaderState to to the thread local storage (TLS),
-     * if <code>on</code> is <code>true</code>.
-     *
-     * @see javax.media.opengl.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
-     * @see javax.media.opengl.glsl.ShaderState#getCurrent()
-     */
-    public synchronized void glUseProgram(GL2ES2 gl, boolean on) {
-        if(on) {
-            if(null!=shaderProgram) {
-                shaderProgram.glUseProgram(gl, true);
-            } else {
-                throw new GLException("No program is attached");
-            }
-            // update the current ShaderState to the TLS ..
-            gl.getContext().putAttachedObject(ShaderState.class.getName(), this);
-        } else if(null!=shaderProgram) {
-            shaderProgram.glUseProgram(gl, false);
-        }
-    }
-
-    public boolean linked() {
-        return (null!=shaderProgram)?shaderProgram.linked():false;
-    }
-
-    public boolean inUse() {
-        return (null!=shaderProgram)?shaderProgram.inUse():false;
-    }
-
-    /**
-     * Attach or switch a shader program
-     *
-     * Attaching a shader program the first time, 
-     * as well as switching to another program on the fly,
-     * while managing all attribute and uniform data.
-     */
-    public synchronized void attachShaderProgram(GL2ES2 gl, ShaderProgram prog) {
-        boolean prgInUse = false; // earmarked state
-
-        if(DEBUG) {
-            int curId = (null!=shaderProgram)?shaderProgram.id():-1;
-            int newId = (null!=prog)?prog.id():-1;
-            System.err.println("Info: attachShaderProgram: "+curId+" -> "+newId+"\n\t"+shaderProgram+"\n\t"+prog);
-            if(verbose) {
-                Throwable tX = new Throwable("Info: attachShaderProgram: Trace");
-                tX.printStackTrace();
-            }
-        }
-        if(null!=shaderProgram) {
-            if(shaderProgram.equals(prog)) {
-                // nothing to do ..
-                if(DEBUG) {
-                    System.err.println("Info: attachShaderProgram: NOP: equal id: "+shaderProgram.id());
-                }
-                return;
-            }
-            prgInUse = shaderProgram.inUse();
-            shaderProgram.glUseProgram(gl, false);
-        }
-
-        // register new one
-        shaderProgram = prog;
-
-        if(null!=shaderProgram) {
-            // reinstall all data ..
-            shaderProgram.glUseProgram(gl, true);
-            glResetAllVertexAttributes(gl);
-            glResetAllUniforms(gl);
-            if(!prgInUse) {
-                shaderProgram.glUseProgram(gl, false);
-            }
-        }
-        if(DEBUG) {
-            System.err.println("Info: attachShaderProgram: END");
-        }
-    }
-
-    public ShaderProgram shaderProgram() { return shaderProgram; }
-
-    /**
-     * Calls release(gl, true, true)
-     *
-     * @see #glReleaseAllVertexAttributes
-     * @see #glReleaseAllUniforms
-     * @see #release(GL2ES2, boolean, boolean)
-     */
-    public synchronized void destroy(GL2ES2 gl) {
-        release(gl, true, true);
-    }
-
-    /**
-     * Calls release(gl, false, false)
-     *
-     * @see #glReleaseAllVertexAttributes
-     * @see #glReleaseAllUniforms
-     * @see #release(GL2ES2, boolean, boolean)
-     */
-    public synchronized void releaseAllData(GL2ES2 gl) {
-        release(gl, false, false);
-    }
-
-    /**
-     * @see #glReleaseAllVertexAttributes
-     * @see #glReleaseAllUniforms
-     * @see ShaderProgram#release(GL2ES2, boolean)
-     */
-    public synchronized void release(GL2ES2 gl, boolean releaseProgramToo, boolean releaseShaderToo) {
-        boolean prgInUse = false;
-        if(null!=shaderProgram) {
-            prgInUse = shaderProgram.inUse();
-            if(!prgInUse) {
-                shaderProgram.glUseProgram(gl, true);
-            }
-        }
-        glReleaseAllVertexAttributes(gl);
-        glReleaseAllUniforms(gl);
-        if(null!=shaderProgram) {
-            if(releaseProgramToo) {
-                shaderProgram.release(gl, releaseShaderToo);
-            } else if(!prgInUse) {
-                shaderProgram.glUseProgram(gl, false);
-            }
-        }
-    }
-
-    //
-    // Shader attribute handling
-    //
-
-    /**
-     * Binds an attribute to the shader.
-     * This must be done before the program is linked !
-     * n name - 1 idx, where name is a uniq key
-     *
-     * @throws GLException is the program is already linked
-     *
-     * @see #glBindAttribLocation
-     * @see javax.media.opengl.GL2ES2#glBindAttribLocation
-     * @see #glGetAttribLocation
-     * @see javax.media.opengl.GL2ES2#glGetAttribLocation
-     * @see #getAttribLocation
-     * @see #glReplaceShader
-     */
-    public void glBindAttribLocation(GL2ES2 gl, int index, String name) {
-        if(null==shaderProgram) throw new GLException("No program is attached");
-        if(shaderProgram.linked()) throw new GLException("Program is already linked");
-        Integer idx = new Integer(index);
-        if(!attribMap2Idx.containsKey(name)) {
-            attribMap2Idx.put(name, idx);
-            gl.glBindAttribLocation(shaderProgram.program(), index, name);
-        }
-    }
-
-    /**
-     * Gets the index of a shader attribute.
-     * This must be done after the program is linked !
-     *
-     * @return -1 if there is no such attribute available, 
-     *         otherwise >= 0
-     * @throws GLException is the program is not linked
-     *
-     * @see #glBindAttribLocation
-     * @see javax.media.opengl.GL2ES2#glBindAttribLocation
-     * @see #glGetAttribLocation
-     * @see javax.media.opengl.GL2ES2#glGetAttribLocation
-     * @see #getAttribLocation
-     * @see #glReplaceShader
-     */
-    public int glGetAttribLocation(GL2ES2 gl, String name) {
-        if(!shaderProgram.linked()) throw new GLException("Program is not linked");
-        int index = getAttribLocation(name);
-        if(0>index) {
-            index = gl.glGetAttribLocation(shaderProgram.program(), name);
-            if(0<=index) {
-                Integer idx = new Integer(index);
-                attribMap2Idx.put(name, idx);
-                if(DEBUG) {
-                    System.err.println("Info: glGetAttribLocation: "+name+", loc: "+index);
-                }
-            } else if(verbose) {
-                Throwable tX = new Throwable("Info: glGetAttribLocation failed, no location for: "+name+", index: "+index);
-                tX.printStackTrace();
-            }
-        }
-        return index;
-    }
-
-    protected int getAttribLocation(String name) {
-        Integer idx = (Integer) attribMap2Idx.get(name);
-        return (null!=idx)?idx.intValue():-1;
-    }
-
-
-    //
-    // Enabled Vertex Arrays and its data
-    //
-
-    /**
-     * Enable a vertex attribute array
-     *
-     * Even if the attribute is not found in the current shader,
-     * it is stored in this state.
-     *
-     * @returns false, if the name is not found, otherwise true
-     *
-     * @throws GLException if the program is not in use
-     *
-     * @see #glEnableVertexAttribArray
-     * @see #glDisableVertexAttribArray
-     * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
-     * @see #glReleaseAllVertexAttributes
-     * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
-     */
-    public boolean glEnableVertexAttribArray(GL2ES2 gl, String name) {
-        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
-        enabledVertexAttribArraySet.add(name);
-        int index = glGetAttribLocation(gl, name);
-        if(0>index) {
-            if(verbose) {
-                Throwable tX = new Throwable("Info: glEnableVertexAttribArray failed, no index for: "+name);
-                tX.printStackTrace();
-            }
-            return false;
-        }
-        if(DEBUG) {
-            System.err.println("Info: glEnableVertexAttribArray: "+name+", loc: "+index);
-        }
-        gl.glEnableVertexAttribArray(index);
-        return true;
-    }
-
-    public boolean isVertexAttribArrayEnabled(String name) {
-        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
-        return enabledVertexAttribArraySet.contains(name);
-    }
-
-    /**
-     * Disables a vertex attribute array
-     *
-     * Even if the attribute is not found in the current shader,
-     * it is removed from this state.
-     *
-     * @returns false, if the name is not found, otherwise true
-     *
-     * @throws GLException if the program is not in use
-     *
-     * @see #glEnableVertexAttribArray
-     * @see #glDisableVertexAttribArray
-     * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
-     * @see #glReleaseAllVertexAttributes
-     * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
-     */
-    public boolean glDisableVertexAttribArray(GL2ES2 gl, String name) {
-        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
-        enabledVertexAttribArraySet.remove(name);
-        int index = glGetAttribLocation(gl, name);
-        if(0>index) {
-            if(verbose) {
-                Throwable tX = new Throwable("Info: glDisableVertexAttribArray failed, no index for: "+name);
-                tX.printStackTrace();
-            }
-            return false;
-        }
-        if(DEBUG) {
-            System.err.println("Info: glDisableVertexAttribArray: "+name);
-        }
-        gl.glDisableVertexAttribArray(index);
-        return true;
-    }
-
-    /**
-     * Set the vertex attribute data.
-     * Enable the attribute, if it is not enabled yet.
-     *
-     * Even if the attribute is not found in the current shader,
-     * it is stored in this state.
-     *
-     * @param data the GLArrayData's name must match the attributes one,
-     *      it's index will be set with the attribute's location,
-     *      if found.
-     *
-     * @returns false, if the name is not found, otherwise true
-     *
-     * @throws GLException if the program is not in use
-     *
-     * @see #glEnableVertexAttribArray
-     * @see #glDisableVertexAttribArray
-     * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
-     * @see #glReleaseAllVertexAttributes
-     * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
-     */
-    public boolean glVertexAttribPointer(GL2ES2 gl, GLArrayData data) {
-        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
-        if(!enabledVertexAttribArraySet.contains(data.getName())) {
-            if(!glEnableVertexAttribArray(gl, data.getName())) {
-                if(verbose) {
-                    Throwable tX = new Throwable("Info: glVertexAttribPointer: couldn't enable: "+data);
-                    tX.printStackTrace();
-                }
-            }
-        }
-        int index = getAttribLocation(data.getName());
-        if(0>index) {
-            if(verbose) {
-                Throwable tX = new Throwable("Info: glVertexAttribPointer failed, no index for: "+data);
-                tX.printStackTrace();
-            }
-        }
-        data.setLocation(index);
-        vertexAttribMap2Data.put(data.getName(), data);
-        if(0<=index) {
-            // only pass the data, if the attribute exists in the current shader
-            if(DEBUG) {
-                System.err.println("Info: glVertexAttribPointer: "+data);
-            }
-            gl.glVertexAttribPointer(data);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get the vertex attribute data, previously set.
-     *
-     * @returns the GLArrayData object, null if not previously set.
-     *
-     * @see #glEnableVertexAttribArray
-     * @see #glDisableVertexAttribArray
-     * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
-     * @see #glReleaseAllVertexAttributes
-     * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
-     */
-    public GLArrayData getVertexAttribPointer(String name) {
-        return (GLArrayData) vertexAttribMap2Data.get(name);
-    }
-
-    /**
-     * Releases all mapped vertex attribute data,
-     * disables all enabled attributes and loses all indices
-     *
-     * @throws GLException is the program is not in use but the shaderProgram is set
-     *
-     * @see #glEnableVertexAttribArray
-     * @see #glDisableVertexAttribArray
-     * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
-     * @see #glReleaseAllVertexAttributes
-     * @see #glResetAllVertexAttributes
-     * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
-     */
-    public void glReleaseAllVertexAttributes(GL2ES2 gl) {
-        if(null!=shaderProgram) {
-            if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
-            for(Iterator iter = vertexAttribMap2Data.keySet().iterator(); iter.hasNext(); ) {
-                if(!glDisableVertexAttribArray(gl, (String) iter.next())) {
-                    throw new GLException("Internal Error: mapped vertex attribute couldn't be disabled");
-                }
-            }
-            for(Iterator iter = enabledVertexAttribArraySet.iterator(); iter.hasNext(); ) {
-                if(!glDisableVertexAttribArray(gl, (String) iter.next())) {
-                    throw new GLException("Internal Error: prev enabled vertex attribute couldn't be disabled");
-                }
-            }
-        }
-        vertexAttribMap2Data.clear();
-        enabledVertexAttribArraySet.clear();
-        attribMap2Idx.clear();
-    }
-        
-    /**
-     * Disables all vertex attribute arrays.
-     *
-     * Their enabled stated will be removed from this state only
-     * if 'removeFromState' is true.
-     *
-     * This method purpose is more for debugging. 
-     *
-     * @throws GLException is the program is not in use but the shaderProgram is set
-     *
-     * @see #glEnableVertexAttribArray
-     * @see #glDisableVertexAttribArray
-     * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
-     * @see #glReleaseAllVertexAttributes
-     * @see #glResetAllVertexAttributes
-     * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
-     */
-    public void glDisableAllVertexAttributeArrays(GL2ES2 gl, boolean removeFromState) {
-        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
-
-        for(Iterator iter = enabledVertexAttribArraySet.iterator(); iter.hasNext(); ) {
-            String name = (String) iter.next();
-            if(removeFromState) {
-                enabledVertexAttribArraySet.remove(name);
-            }
-            int index = glGetAttribLocation(gl, name);
-            if(0<=index) {
-                gl.glDisableVertexAttribArray(index);
-            }
-        }
-    }
-
-    /**
-     * Reset all previously enabled mapped vertex attribute data,
-     * incl enabling them
-     *
-     * @throws GLException is the program is not in use
-     *
-     * @see #glEnableVertexAttribArray
-     * @see #glDisableVertexAttribArray
-     * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
-     * @see #glReleaseAllVertexAttributes
-     * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
-     */
-    public void glResetAllVertexAttributes(GL2ES2 gl) {
-        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
-        attribMap2Idx.clear();
-
-        /**
-         *
-        for(Iterator iter = enabledVertexAttribArraySet.iterator(); iter.hasNext(); ) {
-            glEnableVertexAttribArray(gl, (String) iter.next());
-        }
-        for(Iterator iter = vertexAttribMap2Data.values().iterator(); iter.hasNext(); ) {
-            GLArrayData data = (GLArrayData) iter.next();
-
-            ...
-        } */
-
-        for(Iterator iter = enabledVertexAttribArraySet.iterator(); iter.hasNext(); ) {
-            // get new location ..
-            String name = (String) iter.next();
-            int loc = glGetAttribLocation(gl, name);
-
-            // get & update data ..
-            GLArrayData data = getVertexAttribPointer(name);
-            data.setLocation(loc);
-            vertexAttribMap2Data.put(name, data);
-
-            if(0>loc) {
-                // not used in shader
-                continue;
-            }
-
-            // enable attrib, VBO and pass location/data
-            gl.glEnableVertexAttribArray(loc);
-
-            if( data.isVBO() ) {
-                gl.glBindBuffer(GL.GL_ARRAY_BUFFER, data.getVBOName());
-            } 
-
-            gl.glVertexAttribPointer(data);
-        }
-    }
-
-    //
-    // Shader Uniform handling
-    //
-
-    /**
-     * Gets the index of a shader uniform.
-     * This must be done when the program is in use !
-     *
-     * @return -1 if there is no such attribute available,
-     *         otherwise >= 0
-
-     * @throws GLException is the program is not linked
-     *
-     * @see #glGetUniformLocation
-     * @see javax.media.opengl.GL2ES2#glGetUniformLocation
-     * @see #getUniformLocation
-     * @see #glReplaceShader
-     */
-    protected int glGetUniformLocation(GL2ES2 gl, String name) {
-        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
-        int index = getUniformLocation(name);
-        if(0>index) {
-            index = gl.glGetUniformLocation(shaderProgram.program(), name);
-            if(0<=index) {
-                Integer idx = new Integer(index);
-                uniformMap2Idx.put(name, idx);
-            } else if(verbose) {
-                Throwable tX = new Throwable("Info: glUniform failed, no location for: "+name+", index: "+index);
-                tX.printStackTrace();
-            }
-        }
-        return index;
-    }
-
-    protected int getUniformLocation(String name) {
-        Integer idx = (Integer) uniformMap2Idx.get(name);
-        return (null!=idx)?idx.intValue():-1;
-    }
-
-    /**
-     * Set the uniform data.
-     *
-     * Even if the uniform is not found in the current shader,
-     * it is stored in this state.
-     *
-     * @param data the GLUniforms's name must match the uniform one,
-     *      it's index will be set with the uniforms's location,
-     *      if found.
-     *
-     *
-     * @returns false, if the name is not found, otherwise true
-     *
-     * @throws GLException if the program is not in use
-     *
-     * @see #glGetUniformLocation
-     * @see javax.media.opengl.GL2ES2#glGetUniformLocation
-     * @see #getUniformLocation
-     * @see #glReplaceShader
-     */
-    public boolean glUniform(GL2ES2 gl, GLUniformData data) {
-        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
-        int location = glGetUniformLocation(gl, data.getName());
-        data.setLocation(location);
-        uniformMap2Data.put(data.getName(), data);
-        if(0<=location) {
-            // only pass the data, if the uniform exists in the current shader
-            if(DEBUG) {
-                System.err.println("Info: glUniform: "+data);
-            }
-            gl.glUniform(data);
-        }
-        return true;
-    }
-
-    /**
-     * Get the uniform data, previously set.
-     *
-     * @returns the GLUniformData object, null if not previously set.
-     */
-    public GLUniformData getUniform(String name) {
-        return (GLUniformData) uniformMap2Data.get(name);
-    }
-
-    /**
-     * Releases all mapped uniform data
-     * and loses all indices
-     *
-     * @throws GLException is the program is not in use
-     */
-    public void glReleaseAllUniforms(GL2ES2 gl) {
-        uniformMap2Data.clear();
-        uniformMap2Idx.clear();
-    }
-        
-    /**
-     * Reset all previously mapped uniform data
-     *
-     * @throws GLException is the program is not in use
-     */
-    public void glResetAllUniforms(GL2ES2 gl) {
-        if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
-        uniformMap2Idx.clear();
-        for(Iterator iter = uniformMap2Data.values().iterator(); iter.hasNext(); ) {
-            glUniform(gl, (GLUniformData) iter.next());
-        }
-    }
-
-    public String toString() {
-        StringBuffer buf = new StringBuffer();
-        buf.append("ShaderState[");
-        buf.append(shaderProgram.toString());
-        buf.append(",EnabledStates: [");
-        for(Iterator iter = enabledVertexAttribArraySet.iterator(); iter.hasNext(); ) {
-            buf.append("\n  ");
-            buf.append((String)iter.next());
-        }
-        buf.append("], [");
-        for(Iterator iter = vertexAttribMap2Data.values().iterator(); iter.hasNext(); ) {
-            GLArrayData data = (GLArrayData) iter.next();
-            if(data.getLocation()>=0) {
-                buf.append("\n  ");
-                buf.append(data);
-            }
-        }
-        buf.append("], [");
-        for(Iterator iter=uniformMap2Data.values().iterator(); iter.hasNext(); ) {
-            GLUniformData data = (GLUniformData) iter.next();
-            if(data.getLocation()>=0) {
-                buf.append("\n  ");
-                buf.append(data);
-            }
-        }
-        buf.append("]");
-        return buf.toString();
-    }
-
-    protected boolean verbose = false;
-    protected ShaderProgram shaderProgram=null;
-    protected HashMap attribMap2Idx = new HashMap();
-    protected HashSet enabledVertexAttribArraySet = new HashSet();
-    protected HashMap vertexAttribMap2Data = new HashMap();
-    protected HashMap uniformMap2Idx = new HashMap();
-    protected HashMap uniformMap2Data = new HashMap();
-
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderUtil.java b/src/jogl/classes/com/sun/opengl/util/glsl/ShaderUtil.java
deleted file mode 100644
index 390fb27c7..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderUtil.java
+++ /dev/null
@@ -1,476 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.opengl.util.glsl;
-
-import java.io.PrintStream;
-import java.nio.*;
-import java.util.*;
-
-import javax.media.opengl.*;
-
-public class ShaderUtil {
-    static abstract class Impl {
-        public abstract String getShaderInfoLog(GL gl, int shaderObj);
-        public abstract String getProgramInfoLog(GL gl, int programObj);
-        public abstract boolean isShaderStatusValid(GL gl, int shaderObj, int name);
-        public abstract boolean isShaderStatusValid(GL gl, int shaderObj, int name, PrintStream verboseOut);
-        public abstract boolean isShaderStatusValid(GL gl, IntBuffer shaders, int name);
-        public abstract boolean isShaderStatusValid(GL gl, IntBuffer shaders, int name, PrintStream verboseOut);
-        public abstract boolean isProgramStatusValid(GL gl, int programObj, int name);
-        public abstract boolean isProgramValid(GL gl, int programObj);
-        public abstract boolean isProgramValid(GL gl, int programObj, PrintStream verboseOut);
-        public abstract void createShader(GL gl, int type, IntBuffer shaders);
-        public abstract Set getShaderBinaryFormats(GL gl);
-        public abstract boolean isShaderCompilerAvailable(GL gl);
-        public abstract void shaderSource(GL gl, int shader, java.lang.String[] source);
-        public abstract void shaderSource(GL gl, IntBuffer shaders, java.lang.String[][] sources);
-        public abstract void shaderBinary(GL gl, IntBuffer shaders, int binFormat, java.nio.Buffer bin);
-        public abstract void compileShader(GL gl, IntBuffer shaders);
-        public abstract void attachShader(GL gl, int program, IntBuffer shaders);
-        public abstract void detachShader(GL gl, int program, IntBuffer shaders);
-        public abstract void deleteShader(GL gl, IntBuffer shaders);
-
-        public abstract boolean createAndLoadShader(GL gl, IntBuffer shader, int shaderType,
-                                                    int binFormat, java.nio.Buffer bin,
-                                                    PrintStream verboseOut);
-
-        public abstract boolean createAndCompileShader(GL gl, IntBuffer shader, int shaderType,
-                                                       java.lang.String[][] sources, 
-                                                       PrintStream verboseOut);
-    }
-
-    static class GL2ES2Impl extends Impl {
-        public String getShaderInfoLog(GL _gl, int shaderObj) {
-            GL2ES2 gl = _gl.getGL2ES2();
-            int[] infoLogLength=new int[1];
-            gl.glGetShaderiv(shaderObj, gl.GL_INFO_LOG_LENGTH, infoLogLength, 0);
-
-            if(infoLogLength[0]==0) {
-                return "(no info log)";
-            }
-            int[] charsWritten=new int[1];
-            byte[] infoLogBytes = new byte[infoLogLength[0]];
-            gl.glGetShaderInfoLog(shaderObj, infoLogLength[0], charsWritten, 0, infoLogBytes, 0);
-
-            return new String(infoLogBytes, 0, charsWritten[0]);
-        }
-
-        public String getProgramInfoLog(GL _gl, int programObj) {
-            GL2ES2 gl = _gl.getGL2ES2();
-            int[] infoLogLength=new int[1];
-            gl.glGetProgramiv(programObj, gl.GL_INFO_LOG_LENGTH, infoLogLength, 0);
-
-            if(infoLogLength[0]==0) {
-                return "(no info log)";
-            }
-            int[] charsWritten=new int[1];
-            byte[] infoLogBytes = new byte[infoLogLength[0]];
-            gl.glGetProgramInfoLog(programObj, infoLogLength[0], charsWritten, 0, infoLogBytes, 0);
-
-            return new String(infoLogBytes, 0, charsWritten[0]);
-        }
-
-        public boolean isShaderStatusValid(GL _gl, int shaderObj, int name) {
-            return isShaderStatusValid(_gl, shaderObj, name, null);
-        }
-
-        public boolean isShaderStatusValid(GL _gl, int shaderObj, int name, PrintStream verboseOut) {
-            GL2ES2 gl = _gl.getGL2ES2();
-            int[] ires = new int[1];
-            gl.glGetShaderiv(shaderObj, name, ires, 0);
-
-            boolean res = ires[0]==1;
-            if(!res && null!=verboseOut) {
-                verboseOut.println("Shader status invalid: "+ getShaderInfoLog(gl, shaderObj));
-            }
-            return res;
-        }
-
-        public boolean isShaderStatusValid(GL _gl, IntBuffer shaders, int name) {
-            return isShaderStatusValid(_gl, shaders, name, null);
-        }
-
-        public boolean isShaderStatusValid(GL _gl, IntBuffer shaders, int name, PrintStream verboseOut) {
-            boolean res = true;
-            for (int i = shaders.position(); i < shaders.limit(); i++) {
-                res = isShaderStatusValid(_gl, shaders.get(i), name, verboseOut) && res;
-            }
-            return res;
-        }
-
-        public boolean isProgramStatusValid(GL _gl, int programObj, int name) {
-            GL2ES2 gl = _gl.getGL2ES2();
-            int[] ires = new int[1];
-            gl.glGetProgramiv(programObj, name, ires, 0);
-
-            return ires[0]==1;
-        }
-
-        public boolean isProgramValid(GL _gl, int programObj) {
-            return isProgramValid(_gl, programObj, null);
-        }
-
-        public boolean isProgramValid(GL _gl, int programObj, PrintStream verboseOut) {
-            GL2ES2 gl = _gl.getGL2ES2();
-            int[] ires = new int[1];
-            if(!gl.glIsProgram(programObj)) {
-                if(null!=verboseOut) {
-                    verboseOut.println("Program name invalid: "+programObj);
-                }
-                return false;
-            }
-            if(!isProgramStatusValid(gl, programObj, gl.GL_LINK_STATUS)) {
-                if(null!=verboseOut) {
-                    verboseOut.println("Program link failed: "+programObj+"\n\t"+ getProgramInfoLog(gl, programObj));
-                }
-                return false;
-            }
-            if ( !gl.isGLES2() || isShaderCompilerAvailable(gl) ) {
-                // failed on APX2500 (ES2.0, no compiler) for valid programs
-                gl.glValidateProgram(programObj);
-                if(!isProgramStatusValid(gl, programObj, gl.GL_VALIDATE_STATUS)) {
-                    if(null!=verboseOut) {
-                        verboseOut.println("Program validation failed: "+programObj+"\n\t"+ getProgramInfoLog(gl, programObj));
-                    }
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public void createShader(GL _gl, int type, IntBuffer shaders) {
-            GL2ES2 gl = _gl.getGL2ES2();
-            for (int i = shaders.position(); i < shaders.limit(); i++) {
-                shaders.put(i, gl.glCreateShader(type));
-            }
-        }
-
-        private Boolean shaderCompilerAvailable = null;
-        private Set shaderBinaryFormats = null;
-
-        public Set getShaderBinaryFormats(GL _gl) {
-            GL2ES2 gl = _gl.getGL2ES2();
-            if(null==shaderBinaryFormats) {
-                if(gl.getContext()!=GLContext.getCurrent()) {
-                    return new HashSet(0); // bail out
-                }
-
-                int[] param = new int[1];
-                shaderBinaryFormats = new HashSet();
-
-                if (gl.isGLES2()) {
-                    gl.glGetIntegerv(GL2ES2.GL_NUM_SHADER_BINARY_FORMATS, param, 0);
-                    int numFormats = param[0];
-                    if(numFormats>0) {
-                        int[] formats = new int[numFormats];
-                        gl.glGetIntegerv(GL2ES2.GL_SHADER_BINARY_FORMATS, formats, 0);
-                        for(int i=0; i<numFormats; i++) {
-                            shaderBinaryFormats.add(new Integer(formats[i]));
-                        }
-                    }
-                }
-            }
-            return shaderBinaryFormats;
-        }
-
-
-        public boolean isShaderCompilerAvailable(GL _gl) {
-            GL2ES2 gl = _gl.getGL2ES2();
-            if(null==shaderCompilerAvailable) {
-                if(gl.getContext()!=GLContext.getCurrent()) {
-                    return false; // bail out
-                }
-                Set bfs = getShaderBinaryFormats(gl);
-                if(gl.isGLES2()) {
-                    byte[] param = new byte[1];
-                    gl.glGetBooleanv(GL2ES2.GL_SHADER_COMPILER, param, 0);
-                    boolean v = param[0]!=(byte)0x00;
-                    if(!v && bfs.size()==0) {
-                        // no supported binary formats, hence a compiler must be available!
-                        v = true;
-                    }
-                    shaderCompilerAvailable = new Boolean(v);
-                } else if( gl.isGL2() || gl.isGL2ES2() ) {
-                    shaderCompilerAvailable = new Boolean(true);
-                } else {
-                    throw new GLException("Invalid OpenGL profile");
-                }
-            }
-            return shaderCompilerAvailable.booleanValue();
-        }
-
-        public void shaderSource(GL _gl, int shader, java.lang.String[] source)
-        {
-            GL2ES2 gl = _gl.getGL2ES2();
-            if(!isShaderCompilerAvailable(_gl)) {
-                throw new GLException("No compiler is available");
-            }
-
-            int count = (null!=source)?source.length:0;
-            if(count==0) {
-                throw new GLException("No sources specified");
-            }
-
-            int[] lengths = new int[count];
-            for(int i=0; i<count; i++) {
-                lengths[i] = source[i].length();
-            }
-            gl.glShaderSource(shader, count, source, lengths, 0);
-        }
-
-        public void shaderSource(GL _gl, IntBuffer shaders, java.lang.String[][] sources)
-        {
-            int sourceNum = (null!=sources)?sources.length:0;
-            int shaderNum = (null!=shaders)?shaders.remaining():0;
-            if(shaderNum<=0 || sourceNum<=0 || shaderNum!=sourceNum) {
-                throw new GLException("Invalid number of shaders and/or sources: shaders="+
-                                      shaderNum+", sources="+sourceNum);
-            }
-            for(int i=0; i<sourceNum; i++) {
-                shaderSource(_gl, shaders.get(shaders.position() + i), sources[i]);
-            }
-        }
-
-        public void shaderBinary(GL _gl, IntBuffer shaders, int binFormat, java.nio.Buffer bin)
-        {
-            GL2ES2 gl = _gl.getGL2ES2();
-            if(getShaderBinaryFormats(gl).size()<=0) {
-                throw new GLException("No binary formats are supported");
-            }
-
-            int shaderNum = shaders.remaining();
-            if(shaderNum<=0) {
-                throw new GLException("No shaders specified");
-            }
-            if(null==bin) {
-                throw new GLException("Null shader binary");
-            }
-            int binLength = bin.remaining();
-            if(0>=binLength) {
-                throw new GLException("Empty shader binary (remaining == 0)");
-            }
-            gl.glShaderBinary(shaderNum, shaders, binFormat, bin, binLength);
-        }
-
-        public void compileShader(GL _gl, IntBuffer shaders)
-        {
-            GL2ES2 gl = _gl.getGL2ES2();
-            for (int i = shaders.position(); i < shaders.limit(); i++) {
-                gl.glCompileShader(shaders.get(i));
-            }
-        }
-
-        public void attachShader(GL _gl, int program, IntBuffer shaders)
-        {
-            GL2ES2 gl = _gl.getGL2ES2();
-            for (int i = shaders.position(); i < shaders.limit(); i++) {
-                gl.glAttachShader(program, shaders.get(i));
-            }
-        }
-
-        public void detachShader(GL _gl, int program, IntBuffer shaders)
-        {
-            GL2ES2 gl = _gl.getGL2ES2();
-            for (int i = shaders.position(); i < shaders.limit(); i++) {
-                gl.glDetachShader(program, shaders.get(i));
-            }
-        }
-
-        public void deleteShader(GL _gl, IntBuffer shaders)
-        {
-            GL2ES2 gl = _gl.getGL2ES2();
-            for (int i = shaders.position(); i < shaders.limit(); i++) {
-                gl.glDeleteShader(shaders.get(i));
-
-            }
-        }
-
-        public boolean createAndLoadShader(GL _gl, IntBuffer shader, int shaderType,
-                                           int binFormat, java.nio.Buffer bin,
-                                           PrintStream verboseOut)
-        {
-            GL2ES2 gl = _gl.getGL2ES2();
-            int err = gl.glGetError(); // flush previous errors ..
-            if(err!=GL.GL_NO_ERROR && null!=verboseOut) {
-                verboseOut.println("createAndLoadShader: Pre GL Error: 0x"+Integer.toHexString(err));
-            }
-
-            createShader(gl, shaderType, shader);
-            err = gl.glGetError(); 
-            if(err!=GL.GL_NO_ERROR) {
-                throw new GLException("createAndLoadShader: CreateShader failed, GL Error: 0x"+Integer.toHexString(err));
-            }
-
-
-            shaderBinary(gl, shader, binFormat, bin);
-
-            err = gl.glGetError();
-            if(err!=GL.GL_NO_ERROR && null!=verboseOut) {
-                verboseOut.println("createAndLoadShader: ShaderBinary failed, GL Error: 0x"+Integer.toHexString(err));
-            }
-            return err == GL.GL_NO_ERROR;
-        }
-
-        public boolean createAndCompileShader(GL _gl, IntBuffer shader, int shaderType,
-                                              java.lang.String[][] sources, 
-                                              PrintStream verboseOut)
-        {
-            GL2ES2 gl = _gl.getGL2ES2();
-            int err = gl.glGetError(); // flush previous errors ..
-            if(err!=GL.GL_NO_ERROR && null!=verboseOut) {
-                verboseOut.println("createAndCompileShader: Pre GL Error: 0x"+Integer.toHexString(err));
-            }
-
-            createShader(gl, shaderType, shader);
-            err = gl.glGetError(); 
-            if(err!=GL.GL_NO_ERROR) {
-                throw new GLException("createAndCompileShader: CreateShader failed, GL Error: 0x"+Integer.toHexString(err));
-            }
-
-            shaderSource(gl, shader, sources);
-            err = gl.glGetError(); 
-            if(err!=GL.GL_NO_ERROR) {
-                throw new GLException("createAndCompileShader: ShaderSource failed, GL Error: 0x"+Integer.toHexString(err));
-            }
-
-            compileShader(gl, shader);
-            err = gl.glGetError(); 
-            if(err!=GL.GL_NO_ERROR && null!=verboseOut) {
-                verboseOut.println("createAndCompileShader: CompileShader failed, GL Error: 0x"+Integer.toHexString(err));
-            }
-
-            return isShaderStatusValid(gl, shader, gl.GL_COMPILE_STATUS, verboseOut) && err == GL.GL_NO_ERROR;
-        }
-
-    }
-
-    public static String getShaderInfoLog(GL gl, int shaderObj) {
-        return getImpl(gl).getShaderInfoLog(gl, shaderObj);
-    }
-
-    public static String getProgramInfoLog(GL gl, int programObj) {
-        return getImpl(gl).getProgramInfoLog(gl, programObj);
-    }
-
-    public static boolean isShaderStatusValid(GL gl, int shaderObj, int name) {
-        return getImpl(gl).isShaderStatusValid(gl, shaderObj, name);
-    }
-
-    public static boolean isShaderStatusValid(GL gl, int shaderObj, int name, PrintStream verboseOut) {
-        return getImpl(gl).isShaderStatusValid(gl, shaderObj, name, verboseOut);
-    }
-
-    public static boolean isShaderStatusValid(GL gl, IntBuffer shaders, int name) {
-        return getImpl(gl).isShaderStatusValid(gl, shaders, name);
-    }
-
-    public static boolean isShaderStatusValid(GL gl, IntBuffer shaders, int name, PrintStream verboseOut) {
-        return getImpl(gl).isShaderStatusValid(gl, shaders, name, verboseOut);
-    }
-
-    public static boolean isProgramStatusValid(GL gl, int programObj, int name) {
-        return getImpl(gl).isProgramStatusValid(gl, programObj, name);
-    }
-
-    public static boolean isProgramValid(GL gl, int programObj) {
-        return getImpl(gl).isProgramValid(gl, programObj);
-    }
-
-    public static boolean isProgramValid(GL gl, int programObj, PrintStream verboseOut) {
-        return getImpl(gl).isProgramValid(gl, programObj, verboseOut);
-    }
-
-    public static void createShader(GL gl, int type, IntBuffer shaders) {
-        getImpl(gl).createShader(gl, type, shaders);
-    }
-
-    public static Set getShaderBinaryFormats(GL gl) {
-        return getImpl(gl).getShaderBinaryFormats(gl);
-    }
-
-    public static boolean isShaderCompilerAvailable(GL gl) {
-        return getImpl(gl).isShaderCompilerAvailable(gl);
-    }
-
-    public static void shaderSource(GL gl, int shader, java.lang.String[] source) {
-        getImpl(gl).shaderSource(gl, shader, source);
-    }
-
-    public static void shaderSource(GL gl, IntBuffer shaders, java.lang.String[][] sources) {
-        getImpl(gl).shaderSource(gl, shaders, sources);
-    }
-
-    public static void shaderBinary(GL gl, IntBuffer shaders, int binFormat, java.nio.Buffer bin) {
-        getImpl(gl).shaderBinary(gl, shaders, binFormat, bin);
-    }
-
-    public static void compileShader(GL gl, IntBuffer shaders) {
-        getImpl(gl).compileShader(gl, shaders);
-    }
-
-    public static void attachShader(GL gl, int program, IntBuffer shaders) {
-        getImpl(gl).attachShader(gl, program, shaders);
-    }
-
-    public static void detachShader(GL gl, int program, IntBuffer shaders) {
-        getImpl(gl).detachShader(gl, program, shaders);
-    }
-
-    public static void deleteShader(GL gl, IntBuffer shaders) {
-        getImpl(gl).deleteShader(gl, shaders);
-    }
-
-    public static boolean createAndLoadShader(GL gl, IntBuffer shader, int shaderType,
-                                              int binFormat, java.nio.Buffer bin,
-                                              PrintStream verboseOut) {
-        return getImpl(gl).createAndLoadShader(gl, shader, shaderType, binFormat, bin, verboseOut);
-    }
-
-    public static boolean createAndCompileShader(GL gl, IntBuffer shader, int shaderType,
-                                                 java.lang.String[][] sources, 
-                                                 PrintStream verboseOut) {
-        return getImpl(gl).createAndCompileShader(gl, shader, shaderType, sources, verboseOut);
-    }
-
-    private static Impl getImpl(GL _gl) {
-        GL2ES2 gl = _gl.getGL2ES2();
-        GLContext context = gl.getContext();
-        Impl impl = (Impl) context.getAttachedObject(ShaderUtil.class.getName());
-        if (impl == null) {
-            impl = new GL2ES2Impl();
-            context.putAttachedObject(ShaderUtil.class.getName(), impl);
-        }
-        return impl;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
deleted file mode 100644
index 4149aec69..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
- */
-
-package com.sun.opengl.util.glsl.fixedfunc;
-
-import javax.media.opengl.*;
-import javax.media.opengl.fixedfunc.*;
-
-import com.sun.opengl.util.glsl.fixedfunc.impl.*;
-
-/**
- * Tool to pipeline GL2ES2 into a fixed function emulation implementing GL2ES1.
- */
-public class FixedFuncUtil {
-    /**
-     * @return If gl is a GL2ES1 and force is false, return the type cast object,
-     *         otherwise create a fixed function emulation pipeline with the GL2ES2 impl.
-     * @throws GLException if the GL object is neither GL2ES1 nor GL2ES2
-     */
-    public static final GL2ES1 getFixedFuncImpl(GL gl, boolean force) {
-        if(!force && gl.isGL2ES1()) {
-            return gl.getGL2ES1();
-        } else if(gl.isGL2ES2()) {
-            GL2ES2 es2 = gl.getGL2ES2();
-            FixedFuncHook hook = new FixedFuncHook(es2);
-            FixedFuncImpl impl = new FixedFuncImpl(es2, hook);
-            gl.getContext().setGL(impl);
-            return impl;
-        }
-        throw new GLException("GL Object is neither GL2ES1 nor GL2ES2");
-    }
-
-    /**
-     * @return If gl is a GL2ES1, return the type cast object,
-     *         otherwise create a fixed function emulation pipeline with the GL2ES2 impl.
-     * @throws GLException if the GL object is neither GL2ES1 nor GL2ES2
-     */
-    public static final GL2ES1 getFixedFuncImpl(GL gl) {
-        return getFixedFuncImpl(gl, false);
-    }
-
-    /**
-     * Mapping fixed function (client) array indices to 
-     * GLSL array attribute names.
-     *
-     * Useful for uniq mapping of canonical array index names as listed.
-     * 
-     * @see #mgl_Vertex
-     * @see javax.media.opengl.fixedfunc.GLPointerFunc#GL_VERTEX_ARRAY
-     * @see #mgl_Normal
-     * @see javax.media.opengl.fixedfunc.GLPointerFunc#GL_NORMAL_ARRAY
-     * @see #mgl_Color
-     * @see javax.media.opengl.fixedfunc.GLPointerFunc#GL_COLOR_ARRAY
-     * @see #mgl_MultiTexCoord
-     * @see javax.media.opengl.fixedfunc.GLPointerFunc#GL_TEXTURE_COORD_ARRAY
-     * @see javax.media.opengl.fixedfunc.GLPointerFunc#glEnableClientState
-     * @see javax.media.opengl.fixedfunc.GLPointerFunc#glVertexPointer
-     * @see javax.media.opengl.fixedfunc.GLPointerFunc#glColorPointer
-     * @see javax.media.opengl.fixedfunc.GLPointerFunc#glNormalPointer
-     * @see javax.media.opengl.fixedfunc.GLPointerFunc#glTexCoordPointer
-     */
-    public static String getPredefinedArrayIndexName(int glArrayIndex) {
-        return FixedFuncPipeline.getPredefinedArrayIndexName(glArrayIndex);
-    }
-
-    /**
-     * String name for
-     * @see javax.media.opengl.GL#GL_VERTEX_ARRAY
-     */
-    public static final String mgl_Vertex = FixedFuncPipeline.mgl_Vertex;
-
-    /**
-     * String name for
-     * @see javax.media.opengl.GL#GL_NORMAL_ARRAY
-     */
-    public static final String mgl_Normal = FixedFuncPipeline.mgl_Normal;
-
-    /**
-     * String name for
-     * @see javax.media.opengl.GL#GL_COLOR_ARRAY
-     */
-    public static final String mgl_Color = FixedFuncPipeline.mgl_Color;
-
-    /**
-     * String name for
-     * @see javax.media.opengl.GL#GL_TEXTURE_COORD_ARRAY
-     */
-    public static final String mgl_MultiTexCoord = FixedFuncPipeline.mgl_MultiTexCoord;
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
deleted file mode 100755
index a702332cd..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
- */
-
-package com.sun.opengl.util.glsl.fixedfunc.impl;
-
-import javax.media.opengl.*;
-import javax.media.opengl.fixedfunc.*;
-import javax.media.opengl.glu.*;
-import com.jogamp.gluegen.runtime.BufferFactory;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.*;
-import java.nio.*;
-
-public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFunc {
-    public static final int MAX_TEXTURE_UNITS = 8;
-
-    protected FixedFuncPipeline fixedFunction=null;
-    protected PMVMatrix pmvMatrix=null;
-    protected GL2ES2 gl=null;
-
-    public FixedFuncHook (GL2ES2 gl) {
-        this(gl, null);
-    }
-
-    public FixedFuncHook (GL2ES2 gl, PMVMatrix matrix) {
-        this.gl = gl;
-        pmvMatrix = (null!=matrix)?matrix:new PMVMatrix();
-
-        fixedFunction = new FixedFuncPipeline(gl, pmvMatrix);
-    }
-
-    public FixedFuncHook(GL2ES2 gl, PMVMatrix matrix, 
-                       Class shaderRootClass, String shaderSrcRoot, String shaderBinRoot, 
-                       String vertexColorFile,
-                       String vertexColorLightFile,
-                       String fragmentColorFile,
-                       String fragmentColorTextureFile) {
-        this.gl = gl;
-        pmvMatrix = matrix;
-
-        fixedFunction = new FixedFuncPipeline(gl, pmvMatrix,
-                                              shaderRootClass, shaderSrcRoot, shaderBinRoot, 
-                                              vertexColorFile, vertexColorLightFile, fragmentColorFile, fragmentColorTextureFile);
-    }
-
-    public void destroy() {
-        fixedFunction.destroy(gl);
-        fixedFunction = null;
-    }
-
-    public PMVMatrix getMatrix() { return pmvMatrix; }
-
-    //
-    // FixedFuncHookIf - hooks 
-    //
-    public void glDrawArrays(int mode, int first, int count) {
-        fixedFunction.validate(gl); 
-        gl.glDrawArrays(mode, first, count);
-    }
-    public void glDrawElements(int mode, int count, int type, java.nio.Buffer indices) {
-        fixedFunction.validate(gl); 
-        gl.glDrawElements(mode, count, type, indices);
-    }
-    public void glDrawElements(int mode, int count, int type, long indices_buffer_offset) {
-        fixedFunction.validate(gl); 
-        gl.glDrawElements(mode, count, type, indices_buffer_offset);
-    }
-
-    public void glActiveTexture(int texture) {
-        fixedFunction.glActiveTexture(gl, texture);
-        gl.glActiveTexture(texture);
-    }
-    public void glEnable(int cap) {
-        if(fixedFunction.glEnable(gl, cap, true)) {
-            gl.glEnable(cap);
-        }
-    }
-    public void glDisable(int cap) {
-        if(fixedFunction.glEnable(gl, cap, false)) {
-            gl.glDisable(cap);
-        }
-    }
-    public void glCullFace(int faceName) {
-        fixedFunction.glCullFace(gl, faceName);
-        gl.glCullFace(faceName);
-    }
-
-    public void glGetFloatv(int pname, java.nio.FloatBuffer params) {
-        if(pmvMatrix.isMatrixGetName(pname)) {
-            pmvMatrix.glGetFloatv(pname, params);
-            return;
-        }
-        gl.glGetFloatv(pname, params);
-    }
-    public void glGetFloatv(int pname, float[] params, int params_offset) {
-        if(pmvMatrix.isMatrixGetName(pname)) {
-            pmvMatrix.glGetFloatv(pname, params, params_offset);
-            return;
-        }
-        gl.glGetFloatv(pname, params, params_offset);
-    }
-    public void glGetIntegerv(int pname, IntBuffer params) {
-        if(pmvMatrix.isMatrixGetName(pname)) {
-            pmvMatrix.glGetIntegerv(pname, params);
-            return;
-        }
-        gl.glGetIntegerv(pname, params);
-    }
-    public void glGetIntegerv(int pname, int[] params, int params_offset) {
-        if(pmvMatrix.isMatrixGetName(pname)) {
-            pmvMatrix.glGetIntegerv(pname, params, params_offset);
-            return;
-        }
-        gl.glGetIntegerv(pname, params, params_offset);
-    }
-
-    // 
-    // MatrixIf
-    //
-    public int  glGetMatrixMode() {
-        return pmvMatrix.glGetMatrixMode();
-    }
-    public void glMatrixMode(int mode) {
-        pmvMatrix.glMatrixMode(mode);
-    }
-    public void glLoadMatrixf(java.nio.FloatBuffer m) {
-        pmvMatrix.glLoadMatrixf(m);
-    }
-    public void glLoadMatrixf(float[] m, int m_offset) {
-        glLoadMatrixf(BufferUtil.newFloatBuffer(m, m_offset));
-    }
-    public void glPopMatrix() {
-        pmvMatrix.glPopMatrix();
-    }
-    public void glPushMatrix() {
-        pmvMatrix.glPushMatrix();
-    }
-    public void glLoadIdentity() {
-        pmvMatrix.glLoadIdentity();
-    }
-    public void glMultMatrixf(java.nio.FloatBuffer m) {
-        pmvMatrix.glMultMatrixf(m);
-    }
-    public void glMultMatrixf(float[] m, int m_offset) {
-        glMultMatrixf(BufferUtil.newFloatBuffer(m, m_offset));
-    }
-    public void glTranslatef(float x, float y, float z) {
-        pmvMatrix.glTranslatef(x, y, z);
-    }
-    public void glRotatef(float angdeg, float x, float y, float z) {
-        pmvMatrix.glRotatef(angdeg, x, y, z);
-    }
-    public void glScalef(float x, float y, float z) {
-        pmvMatrix.glScalef(x, y, z);
-    }
-    public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) {
-        pmvMatrix.glOrthof(left, right, bottom, top, zNear, zFar);
-    }
-    public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar) {
-        pmvMatrix.glFrustumf(left, right, bottom, top, zNear, zFar);
-    }
-
-    // 
-    // LightingIf
-    //
-    public void glColor4f(float red, float green, float blue, float alpha) {
-      fixedFunction.glColor4fv(gl, BufferUtil.newFloatBuffer(new float[] { red, green, blue, alpha })); 
-    }
-
-    public void glLightfv(int light, int pname, java.nio.FloatBuffer params) {
-      fixedFunction.glLightfv(gl, light, pname, params);
-    }
-    public void glLightfv(int light, int pname, float[] params, int params_offset) {
-        glLightfv(light, pname, BufferUtil.newFloatBuffer(params, params_offset));
-    }
-    public void glMaterialfv(int face, int pname, java.nio.FloatBuffer params) {
-      fixedFunction.glMaterialfv(gl, face, pname, params);
-    }
-    public void glMaterialfv(int face, int pname, float[] params, int params_offset) {
-        glMaterialfv(face, pname, BufferUtil.newFloatBuffer(params, params_offset));
-    }
-    public void glMaterialf(int face, int pname, float param) {
-        glMaterialfv(face, pname, BufferUtil.newFloatBuffer(new float[] { param }));
-    }
-    public void glShadeModel(int mode) {
-      fixedFunction.glShadeModel(gl, mode);
-    }
-
-    //
-    // PointerIf
-    //
-    public void glEnableClientState(int glArrayIndex) {
-      fixedFunction.glEnableClientState(gl, glArrayIndex);
-    }
-    public void glDisableClientState(int glArrayIndex) {
-      fixedFunction.glDisableClientState(gl, glArrayIndex);
-    }
-
-    public void glVertexPointer(GLArrayData array) {
-      if(array.isVBO()) {
-          if(!gl.glIsVBOArrayEnabled()) {
-            throw new GLException("VBO array is not enabled: "+array);
-          }
-      } else {
-          if(gl.glIsVBOArrayEnabled()) {
-            throw new GLException("VBO array is not disabled: "+array);
-          }
-          BufferFactory.rangeCheck(array.getBuffer(), 1);
-          if (!BufferFactory.isDirect(array.getBuffer())) {
-            throw new GLException("Argument \"pointer\" was not a direct buffer"); }
-      }
-      fixedFunction.glVertexPointer(gl, array);
-    }
-
-    public void glVertexPointer(int size, int type, int stride, java.nio.Buffer pointer) {
-      glVertexPointer(GLArrayDataWrapper.createFixed(gl, GL_VERTEX_ARRAY, size, type, false, stride, pointer, 0, 0));
-    }
-    public void glVertexPointer(int size, int type, int stride, long pointer_buffer_offset) {
-      int vboName = gl.glGetBoundBuffer(GL.GL_ARRAY_BUFFER);
-      if(vboName==0) {
-        throw new GLException("no GL_ARRAY_BUFFER VBO bound");
-      }
-      glVertexPointer(GLArrayDataWrapper.createFixed(gl, GL_VERTEX_ARRAY, size, type, false, 
-                                                     stride, null, vboName, pointer_buffer_offset));
-    }
-
-    public void glColorPointer(GLArrayData array) {
-      if(array.isVBO()) {
-          if(!gl.glIsVBOArrayEnabled()) {
-            throw new GLException("VBO array is not enabled: "+array);
-          }
-      } else {
-          if(gl.glIsVBOArrayEnabled()) {
-            throw new GLException("VBO array is not disabled: "+array);
-          }
-          BufferFactory.rangeCheck(array.getBuffer(), 1);
-          if (!BufferFactory.isDirect(array.getBuffer())) {
-            throw new GLException("Argument \"pointer\" was not a direct buffer"); }
-      }
-      fixedFunction.glColorPointer(gl, array);
-    }
-    public void glColorPointer(int size, int type, int stride, java.nio.Buffer pointer) {
-      glColorPointer(GLArrayDataWrapper.createFixed(gl, GL_COLOR_ARRAY, size, type, false, 
-                                                    stride, pointer, 0, 0));
-    }
-    public void glColorPointer(int size, int type, int stride, long pointer_buffer_offset) {
-      int vboName = gl.glGetBoundBuffer(GL.GL_ARRAY_BUFFER);
-      if(vboName==0) {
-        throw new GLException("no GL_ARRAY_BUFFER VBO bound");
-      }
-      glColorPointer(GLArrayDataWrapper.createFixed(gl, GL_COLOR_ARRAY, size, type, false, 
-                                                   stride, null, vboName, pointer_buffer_offset));
-    }
-
-    public void glNormalPointer(GLArrayData array) {
-      if(array.getComponentNumber()!=3) {
-        throw new GLException("Only 3 components per normal allowed");
-      }
-      if(array.isVBO()) {
-          if(!gl.glIsVBOArrayEnabled()) {
-            throw new GLException("VBO array is not enabled: "+array);
-          }
-      } else {
-          if(gl.glIsVBOArrayEnabled()) {
-            throw new GLException("VBO array is not disabled: "+array);
-          }
-          BufferFactory.rangeCheck(array.getBuffer(), 1);
-          if (!BufferFactory.isDirect(array.getBuffer())) {
-            throw new GLException("Argument \"pointer\" was not a direct buffer"); }
-      }
-      fixedFunction.glNormalPointer(gl, array);
-    }
-    public void glNormalPointer(int type, int stride, java.nio.Buffer pointer) {
-      glNormalPointer(GLArrayDataWrapper.createFixed(gl, GL_NORMAL_ARRAY, 3, type, false, 
-                                                     stride, pointer, 0, 0));
-    }
-    public void glNormalPointer(int type, int stride, long pointer_buffer_offset) {
-      int vboName = gl.glGetBoundBuffer(GL.GL_ARRAY_BUFFER);
-      if(vboName==0) {
-        throw new GLException("no GL_ARRAY_BUFFER VBO bound");
-      }
-      glNormalPointer(GLArrayDataWrapper.createFixed(gl, GL_NORMAL_ARRAY, 3, type, false, 
-                                                     stride, null, vboName, pointer_buffer_offset));
-    }
-
-    public void glTexCoordPointer(GLArrayData array) {
-      if(array.isVBO()) {
-          if(!gl.glIsVBOArrayEnabled()) {
-            throw new GLException("VBO array is not enabled: "+array);
-          }
-      } else {
-          if(gl.glIsVBOArrayEnabled()) {
-            throw new GLException("VBO array is not disabled: "+array);
-          }
-          BufferFactory.rangeCheck(array.getBuffer(), 1);
-          if (!BufferFactory.isDirect(array.getBuffer())) {
-            throw new GLException("Argument \"pointer\" was not a direct buffer"); }
-      }
-      fixedFunction.glTexCoordPointer(gl, array);
-    }
-    public void glTexCoordPointer(int size, int type, int stride, java.nio.Buffer pointer) {
-      glTexCoordPointer(
-        GLArrayDataWrapper.createFixed(gl, GL_TEXTURE_COORD_ARRAY, size, type, false, stride, pointer, 0,0));
-    }
-    public void glTexCoordPointer(int size, int type, int stride, long pointer_buffer_offset) {
-      int vboName = gl.glGetBoundBuffer(GL.GL_ARRAY_BUFFER);
-      if(vboName==0) {
-        throw new GLException("no GL_ARRAY_BUFFER VBO bound");
-      }
-      glTexCoordPointer(
-        GLArrayDataWrapper.createFixed(gl, GL_TEXTURE_COORD_ARRAY, size, type, false, 
-                                       stride, null, vboName, pointer_buffer_offset) );
-    }
-
-    public final String toString() {
-          StringBuffer buf = new StringBuffer();
-          buf.append(getClass().getName()+" (");
-          if(null!=pmvMatrix) {
-              buf.append(", matrixDirty: "+pmvMatrix.isDirty());
-          }
-          buf.append("\n\t, FixedFunction: "+fixedFunction);
-          buf.append(gl);
-          buf.append(" )");
-
-          return buf.toString();
-    }
-
-}
-
-
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
deleted file mode 100644
index 1b8dd1f11..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
+++ /dev/null
@@ -1,554 +0,0 @@
-
-package com.sun.opengl.util.glsl.fixedfunc.impl;
-
-import javax.media.opengl.*;
-import javax.media.opengl.fixedfunc.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
-import java.nio.*;
-
-public class FixedFuncPipeline {
-    public static final int MAX_TEXTURE_UNITS = 8;
-    public static final int MAX_LIGHTS        = 8;
-
-    // We can't have any dependencies on the FixedFuncUtil class for build bootstrapping reasons
-    public static final String mgl_Vertex = "mgl_Vertex";
-    public static final String mgl_Normal = "mgl_Normal";
-    public static final String mgl_Color = "mgl_Color";
-    public static final String mgl_MultiTexCoord = "mgl_MultiTexCoord" ;
-
-    public static String getPredefinedArrayIndexName(int glArrayIndex) {
-        switch(glArrayIndex) {
-            case GLPointerFunc.GL_VERTEX_ARRAY:
-                return mgl_Vertex;
-            case GLPointerFunc.GL_NORMAL_ARRAY:
-                return mgl_Normal;
-            case GLPointerFunc.GL_COLOR_ARRAY:
-                return mgl_Color;
-            case GLPointerFunc.GL_TEXTURE_COORD_ARRAY:
-                return mgl_MultiTexCoord;
-        }
-        return null;
-    }
-
-    public FixedFuncPipeline(GL2ES2 gl, PMVMatrix pmvMatrix) {
-        init(gl, pmvMatrix, FixedFuncPipeline.class, shaderSrcRootDef, shaderBinRootDef, 
-             vertexColorFileDef, vertexColorLightFileDef, fragmentColorFileDef, fragmentColorTextureFileDef);
-    }
-    public FixedFuncPipeline(GL2ES2 gl, PMVMatrix pmvMatrix, Class shaderRootClass, String shaderSrcRoot, String shaderBinRoot, 
-                       String vertexColorFile,
-                       String vertexColorLightFile,
-                       String fragmentColorFile,
-                       String fragmentColorTextureFile) {
-        init(gl, pmvMatrix, shaderRootClass, shaderSrcRoot, shaderBinRoot, 
-             vertexColorFile, vertexColorLightFile, fragmentColorFile, fragmentColorTextureFile);
-    }
-
-    public boolean verbose() { return verbose; }
-
-    public void setVerbose(boolean v) { verbose=v; }
-
-    public boolean isValid() {
-        return shaderState.linked();
-    }
-
-    public ShaderState getShaderState() {
-        return shaderState;
-    }
-
-    public int getActiveTextureUnit() {
-        return activeTextureUnit;
-    }
-
-    public String getArrayIndexName(int glArrayIndex) {
-      String name = getPredefinedArrayIndexName(glArrayIndex); 
-      switch(glArrayIndex) {
-          case GLPointerFunc.GL_VERTEX_ARRAY:
-          case GLPointerFunc.GL_NORMAL_ARRAY:
-          case GLPointerFunc.GL_COLOR_ARRAY:
-              break;
-          case GLPointerFunc.GL_TEXTURE_COORD_ARRAY:
-              name = name + activeTextureUnit;
-      }
-      return name;
-    }
-
-    public void destroy(GL2ES2 gl) {
-        shaderProgramColor.release(gl, true);
-        shaderProgramColorLight.release(gl, true);
-        shaderProgramColorTexture.release(gl, true);
-        shaderProgramColorTextureLight.release(gl, true);
-        shaderState.destroy(gl);
-    }
-
-    public void glEnableClientState(GL2ES2 gl, int glArrayIndex) {
-        shaderState.glUseProgram(gl, true);
-
-        shaderState.glEnableVertexAttribArray(gl, getArrayIndexName(glArrayIndex));
-        // textureCoordsEnabled |=  (1 << activeTextureUnit);
-        if ( textureCoordsEnabled.get(activeTextureUnit) != 1 ) {
-            textureCoordsEnabled.put(activeTextureUnit, 1);
-            textureCoordsEnabledDirty = true;
-        }
-    }
-
-    public void glDisableClientState(GL2ES2 gl, int glArrayIndex) {
-        shaderState.glUseProgram(gl, true);
-
-        shaderState.glDisableVertexAttribArray(gl, getArrayIndexName(glArrayIndex));
-        // textureCoordsEnabled &= ~(1 << activeTextureUnit);
-        if ( textureCoordsEnabled.get(activeTextureUnit) != 0 ) {
-            textureCoordsEnabled.put(activeTextureUnit, 0);
-            textureCoordsEnabledDirty = true;
-        }
-    }
-
-    public void glVertexPointer(GL2ES2 gl, GLArrayData data) {
-        shaderState.glUseProgram(gl, true);
-        shaderState.glVertexAttribPointer(gl, data);
-    }
-
-    public void glColorPointer(GL2ES2 gl, GLArrayData data) {
-        shaderState.glUseProgram(gl, true);
-        shaderState.glVertexAttribPointer(gl, data);
-    }
-
-    public void glColor4fv(GL2ES2 gl, FloatBuffer data ) {
-        shaderState.glUseProgram(gl, true);
-        GLUniformData ud = shaderState.getUniform(mgl_ColorStatic);
-        if(null!=ud) {
-            ud.setData(data);
-            shaderState.glUniform(gl, ud);
-        }
-    }
-
-    public void glNormalPointer(GL2ES2 gl, GLArrayData data) {
-        shaderState.glUseProgram(gl, true);
-        shaderState.glVertexAttribPointer(gl, data);
-    }
-
-    public void glTexCoordPointer(GL2ES2 gl, GLArrayData data) {
-        shaderState.glUseProgram(gl, true);
-        data.setName( getArrayIndexName(data.getIndex()) );
-        shaderState.glVertexAttribPointer(gl, data);
-    }
-
-    public void glLightfv(GL2ES2 gl, int light, int pname, java.nio.FloatBuffer params) {
-        shaderState.glUseProgram(gl, true);
-        light -=GLLightingFunc.GL_LIGHT0;
-        if(0 <= light && light < MAX_LIGHTS) {
-            GLUniformData ud = null;
-            switch(pname) {
-                case  GLLightingFunc.GL_AMBIENT:
-                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].ambient");
-                    break;
-                case  GLLightingFunc.GL_DIFFUSE:
-                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].diffuse");
-                    break;
-                case  GLLightingFunc.GL_SPECULAR:
-                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].specular");
-                    break;
-                case GLLightingFunc.GL_POSITION:
-                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].position");
-                    break;
-                case GLLightingFunc.GL_SPOT_DIRECTION:
-                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].spotDirection");
-                    break;
-                case GLLightingFunc.GL_SPOT_EXPONENT:
-                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].spotExponent");
-                    break;
-                case GLLightingFunc.GL_SPOT_CUTOFF:
-                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].spotCutoff");
-                    break;
-                case GLLightingFunc.GL_CONSTANT_ATTENUATION:
-                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].constantAttenuation");
-                    break;
-                case GLLightingFunc.GL_LINEAR_ATTENUATION:
-                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].linearAttenuation");
-                    break;
-                case GLLightingFunc.GL_QUADRATIC_ATTENUATION:
-                    ud = shaderState.getUniform(mgl_LightSource+"["+light+"].quadraticAttenuation");
-                    break;
-                default:
-                    if(verbose) {
-                        System.err.println("glLightfv pname not within [GL_AMBIENT GL_DIFFUSE GL_SPECULAR GL_POSITION GL_SPOT_DIRECTION]: "+pname);
-                    }
-                    return;
-            }
-            if(null!=ud) {
-                ud.setData(params);
-                shaderState.glUniform(gl, ud);
-            }
-        } else if(verbose) {
-            System.err.println("glLightfv light not within [0.."+MAX_LIGHTS+"]: "+light);
-        }
-    }
-
-    public void glMaterialfv(GL2ES2 gl, int face, int pname, java.nio.FloatBuffer params) {
-        shaderState.glUseProgram(gl, true);
-
-        switch (face) {
-            case GL.GL_FRONT:
-            case GL.GL_FRONT_AND_BACK:
-                break;
-            case GL.GL_BACK:
-                if(verbose) {
-                    System.err.println("glMaterialfv face GL_BACK currently not supported");
-                }
-                break;
-            default:
-        }
-
-        GLUniformData ud = null;
-        switch(pname) {
-            case  GLLightingFunc.GL_AMBIENT:
-                ud = shaderState.getUniform(mgl_FrontMaterial+".ambient");
-                break;
-            case  GLLightingFunc.GL_AMBIENT_AND_DIFFUSE:
-                glMaterialfv(gl, face, GLLightingFunc.GL_AMBIENT, params);
-                // fall through intended ..
-            case  GLLightingFunc.GL_DIFFUSE:
-                ud = shaderState.getUniform(mgl_FrontMaterial+".diffuse");
-                break;
-            case  GLLightingFunc.GL_SPECULAR:
-                ud = shaderState.getUniform(mgl_FrontMaterial+".specular");
-                break;
-            case  GLLightingFunc.GL_EMISSION:
-                ud = shaderState.getUniform(mgl_FrontMaterial+".emission");
-                break;
-            case  GLLightingFunc.GL_SHININESS:
-                ud = shaderState.getUniform(mgl_FrontMaterial+".shininess");
-                break;
-            default:
-                if(verbose) {
-                    System.err.println("glMaterialfv pname not within [GL_AMBIENT GL_DIFFUSE GL_SPECULAR GL_EMISSION GL_SHININESS]: "+pname);
-                }
-                return;
-        }
-        if(null!=ud) {
-            ud.setData(params);
-            shaderState.glUniform(gl, ud);
-        }
-    }
-
-    public void glShadeModel(GL2ES2 gl, int mode) {
-        shaderState.glUseProgram(gl, true);
-        GLUniformData ud = shaderState.getUniform(mgl_ShadeModel);
-        if(null!=ud) {
-            ud.setData(mode);
-            shaderState.glUniform(gl, ud);
-        }
-    }
-
-    public void glActiveTexture(GL2ES2 gl, int textureUnit) {
-        textureUnit -= GL.GL_TEXTURE0;
-        if(0 <= textureUnit && textureUnit<MAX_TEXTURE_UNITS) {
-            shaderState.glUseProgram(gl, true);
-            GLUniformData ud;
-            ud = shaderState.getUniform(mgl_ActiveTexture);
-            if(null!=ud) {
-                ud.setData(textureUnit);
-                shaderState.glUniform(gl, ud);
-            }
-            ud = shaderState.getUniform(mgl_ActiveTextureIdx);
-            if(null!=ud) {
-                ud.setData(textureUnit);
-                shaderState.glUniform(gl, ud);
-            }
-            activeTextureUnit = textureUnit;
-        } else {
-            throw new GLException("glActivateTexture textureUnit not within GL_TEXTURE0 + [0.."+MAX_TEXTURE_UNITS+"]: "+textureUnit);
-        }
-    }
-
-    /**
-     * @return false if digested in regard to GL2ES2 spec, 
-     *         eg this call must not be passed to an underlying ES2 implementation.
-     *         true if this call shall be passed to an underlying GL2ES2/ES2 implementation as well.
-     */
-    public boolean glEnable(GL2ES2 gl, int cap, boolean enable) {
-        switch(cap) {
-            case GL.GL_TEXTURE_2D:
-                textureEnabled=enable;
-                return true;
-            case GLLightingFunc.GL_LIGHTING:
-                lightingEnabled=enable;
-                return false;
-            case GL.GL_CULL_FACE:
-                cullFace=Math.abs(cullFace);
-                if(!enable) {
-                    cullFace*=-1;
-                }
-                return true;
-        }
-
-        int light = cap - GLLightingFunc.GL_LIGHT0;
-        if(0 <= light && light < MAX_LIGHTS) {
-            if ( (lightsEnabled.get(light)==1) != enable ) {
-                lightsEnabled.put(light, enable?1:0);
-                lightsEnabledDirty = true;
-                return false;
-            }
-        }
-        return true; // pass it on ..
-    }
-
-    public void glCullFace(GL2ES2 gl, int faceName) {
-        switch(faceName) {
-            case GL.GL_FRONT:
-                faceName = 1; break;
-            case GL.GL_BACK:
-                faceName = 2; break;
-            case GL.GL_FRONT_AND_BACK:
-                faceName = 3; break;
-        }
-        if(0>cullFace) {
-            faceName *= -1;
-        }
-        cullFace = faceName;
-    }
-
-    public void validate(GL2ES2 gl) {
-        shaderState.glUseProgram(gl, true);
-        GLUniformData ud;
-        if(pmvMatrix.update()) {
-            ud = shaderState.getUniform(mgl_PMVMatrix);
-            if(null!=ud) {
-                // same data object ..
-                shaderState.glUniform(gl, ud);
-            } else {
-                throw new GLException("Failed to update: mgl_PMVMatrix");
-            }
-            ud = shaderState.getUniform(mgl_NormalMatrix);
-            if(null!=ud) {
-                // same data object ..
-                shaderState.glUniform(gl, ud);
-            }
-        }
-        ud = shaderState.getUniform(mgl_ColorEnabled);
-        if(null!=ud) {
-            int ca = (shaderState.isVertexAttribArrayEnabled(mgl_Color)==true)?1:0;
-            if(ca!=ud.intValue()) {
-                ud.setData(ca);
-                shaderState.glUniform(gl, ud);
-            }
-        }
-        ud = shaderState.getUniform(mgl_CullFace);
-        if(null!=ud) {
-            if(cullFace!=ud.intValue()) {
-                ud.setData(cullFace);
-                shaderState.glUniform(gl, ud);
-            }
-        }
-
-        if(lightsEnabledDirty) {
-            ud = shaderState.getUniform(mgl_LightsEnabled);
-            if(null!=ud) {
-                // same data object 
-                shaderState.glUniform(gl, ud);
-            }
-            lightsEnabledDirty=false;
-        }
-
-        if(textureCoordsEnabledDirty) {
-            ud = shaderState.getUniform(mgl_TexCoordEnabled);
-            if(null!=ud) {
-                // same data object 
-                shaderState.glUniform(gl, ud);
-            }
-            textureCoordsEnabledDirty=false;
-        }
-
-        if(textureEnabled) {
-            if(lightingEnabled) {
-                shaderState.attachShaderProgram(gl, shaderProgramColorTextureLight);
-            } else {
-                shaderState.attachShaderProgram(gl, shaderProgramColorTexture);
-            }
-        } else {
-            if(lightingEnabled) {
-                shaderState.attachShaderProgram(gl, shaderProgramColorLight);
-            } else {
-                shaderState.attachShaderProgram(gl, shaderProgramColor);
-            }
-        }
-        if(DEBUG) {
-            System.err.println("validate: "+this);
-        }
-    }
-
-    public String toString() {
-        return "FixedFuncPipeline[pmv: "+pmvMatrix+
-               ", textureEnabled: "+textureEnabled+
-               ", textureCoordsEnabled: "+textureCoordsEnabled+
-               ", lightingEnabled: "+lightingEnabled+
-               ", lightsEnabled: "+lightsEnabled+
-               "\n\t, shaderProgramColor: "+shaderProgramColor+
-               "\n\t, shaderProgramColorTexture: "+shaderProgramColorTexture+
-               "\n\t, shaderProgramColorLight: "+shaderProgramColorLight+
-               "\n\t, shaderProgramColorTextureLight: "+shaderProgramColorTextureLight+
-               "\n\t, ShaderState: "+shaderState+
-               "]";
-    }
-
-    protected void init(GL2ES2 gl, PMVMatrix pmvMatrix, Class shaderRootClass, String shaderSrcRoot, String shaderBinRoot, 
-                       String vertexColorFile,
-                       String vertexColorLightFile,
-                       String fragmentColorFile,
-                       String fragmentColorTextureFile) 
-   {
-        if(null==pmvMatrix) {
-            throw new GLException("PMVMatrix is null");
-        }
-        this.pmvMatrix=pmvMatrix;
-        this.shaderState=new ShaderState();
-        this.shaderState.setVerbose(verbose);
-        ShaderCode vertexColor, vertexColorLight, fragmentColor, fragmentColorTexture;
-
-        vertexColor = ShaderCode.create( gl, gl.GL_VERTEX_SHADER, 1, shaderRootClass,
-                                         shaderSrcRoot, shaderBinRoot, vertexColorFile);
-
-        vertexColorLight = ShaderCode.create( gl, gl.GL_VERTEX_SHADER, 1, shaderRootClass,
-                                           shaderSrcRoot, shaderBinRoot, vertexColorLightFile);
-
-        fragmentColor = ShaderCode.create( gl, gl.GL_FRAGMENT_SHADER, 1, shaderRootClass,
-                                           shaderSrcRoot, shaderBinRoot, fragmentColorFile);
-
-        fragmentColorTexture = ShaderCode.create( gl, gl.GL_FRAGMENT_SHADER, 1, shaderRootClass,
-                                                  shaderSrcRoot, shaderBinRoot, fragmentColorTextureFile);
-
-        shaderProgramColor = new ShaderProgram();
-        shaderProgramColor.add(vertexColor);
-        shaderProgramColor.add(fragmentColor);
-        if(!shaderProgramColor.link(gl, System.err)) {
-            throw new GLException("Couldn't link VertexColor program: "+shaderProgramColor);
-        }
-
-        shaderProgramColorTexture = new ShaderProgram();
-        shaderProgramColorTexture.add(vertexColor);
-        shaderProgramColorTexture.add(fragmentColorTexture);
-        if(!shaderProgramColorTexture.link(gl, System.err)) {
-            throw new GLException("Couldn't link VertexColorTexture program: "+shaderProgramColorTexture);
-        }
-
-        shaderProgramColorLight = new ShaderProgram();
-        shaderProgramColorLight.add(vertexColorLight);
-        shaderProgramColorLight.add(fragmentColor);
-        if(!shaderProgramColorLight.link(gl, System.err)) {
-            throw new GLException("Couldn't link VertexColorLight program: "+shaderProgramColorLight);
-        }
-
-        shaderProgramColorTextureLight = new ShaderProgram();
-        shaderProgramColorTextureLight.add(vertexColorLight);
-        shaderProgramColorTextureLight.add(fragmentColorTexture);
-        if(!shaderProgramColorTextureLight.link(gl, System.err)) {
-            throw new GLException("Couldn't link VertexColorLight program: "+shaderProgramColorTextureLight);
-        }
-
-        shaderState.attachShaderProgram(gl, shaderProgramColor);
-        shaderState.glUseProgram(gl, true);
-
-        // mandatory ..
-        if(!shaderState.glUniform(gl, new GLUniformData(mgl_PMVMatrix, 4, 4, pmvMatrix.glGetPMvMviMatrixf()))) {
-            throw new GLException("Error setting PMVMatrix in shader: "+this);
-        }
-
-        // optional parameter ..
-        shaderState.glUniform(gl, new GLUniformData(mgl_NormalMatrix, 3, 3, pmvMatrix.glGetNormalMatrixf()));
-
-        shaderState.glUniform(gl, new GLUniformData(mgl_ColorEnabled,  0));
-        shaderState.glUniform(gl, new GLUniformData(mgl_ColorStatic, 4, zero4f));
-        shaderState.glUniform(gl, new GLUniformData(mgl_TexCoordEnabled,  1, textureCoordsEnabled));
-        shaderState.glUniform(gl, new GLUniformData(mgl_ActiveTexture, activeTextureUnit));
-        shaderState.glUniform(gl, new GLUniformData(mgl_ActiveTextureIdx, activeTextureUnit));
-        shaderState.glUniform(gl, new GLUniformData(mgl_ShadeModel, 0));
-        shaderState.glUniform(gl, new GLUniformData(mgl_CullFace, cullFace));
-        for(int i=0; i<MAX_LIGHTS; i++) {
-            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].ambient", 4, defAmbient));
-            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].diffuse", 4, defDiffuse));
-            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].specular", 4, defSpecular));
-            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].position", 4, defPosition));
-            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].spotDirection", 3, defSpotDir));
-            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].spotExponent", defSpotExponent));
-            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].spotCutoff", defSpotCutoff));
-            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].constantAttenuation", defConstantAtten));
-            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].linearAttenuation", defLinearAtten));
-            shaderState.glUniform(gl, new GLUniformData(mgl_LightSource+"["+i+"].quadraticAttenuation", defQuadraticAtten));
-        }
-        shaderState.glUniform(gl, new GLUniformData(mgl_LightsEnabled,  1, lightsEnabled));
-        shaderState.glUniform(gl, new GLUniformData(mgl_FrontMaterial+".ambient", 4, defMatAmbient));
-        shaderState.glUniform(gl, new GLUniformData(mgl_FrontMaterial+".diffuse", 4, defMatDiffuse));
-        shaderState.glUniform(gl, new GLUniformData(mgl_FrontMaterial+".specular", 4, defMatSpecular));
-        shaderState.glUniform(gl, new GLUniformData(mgl_FrontMaterial+".emission", 4, defMatEmission));
-        shaderState.glUniform(gl, new GLUniformData(mgl_FrontMaterial+".shininess", defMatShininess));
-
-        shaderState.glUseProgram(gl, false);
-    }
-
-    protected static final boolean DEBUG=false;
-    protected boolean verbose=false;
-
-    protected boolean textureEnabled=false;
-    protected IntBuffer textureCoordsEnabled = BufferUtil.newIntBuffer(new int[] { 0, 0, 0, 0, 0, 0, 0, 0 });
-    protected boolean textureCoordsEnabledDirty = false;
-    protected int     activeTextureUnit=0;
-
-    protected int cullFace=-2; // <=0 disabled, 1: front, 2: back (default, but disabled), 3: front & back
-
-    protected boolean lightingEnabled=false;
-    protected IntBuffer lightsEnabled = BufferUtil.newIntBuffer(new int[] { 0, 0, 0, 0, 0, 0, 0, 0 });
-    protected boolean   lightsEnabledDirty = false;
-
-    protected PMVMatrix pmvMatrix;
-    protected ShaderState shaderState;
-    protected ShaderProgram shaderProgramColor;
-    protected ShaderProgram shaderProgramColorTexture;
-    protected ShaderProgram shaderProgramColorLight;
-    protected ShaderProgram shaderProgramColorTextureLight;
-
-    // uniforms ..
-    protected static final String mgl_PMVMatrix        = "mgl_PMVMatrix";       // m4fv[3]
-    protected static final String mgl_NormalMatrix     = "mgl_NormalMatrix";    // m4fv
-    protected static final String mgl_ColorEnabled     = "mgl_ColorEnabled";    //  1i
-    protected static final String mgl_ColorStatic      = "mgl_ColorStatic";     //  4fv
-
-    protected static final String mgl_LightSource      = "mgl_LightSource";     //  struct mgl_LightSourceParameters[MAX_LIGHTS]
-    protected static final String mgl_FrontMaterial    = "mgl_FrontMaterial";   //  struct mgl_MaterialParameters
-    protected static final String mgl_LightsEnabled    = "mgl_LightsEnabled";   //  int mgl_LightsEnabled[MAX_LIGHTS];
-
-    protected static final String mgl_ShadeModel       = "mgl_ShadeModel";      //  1i
-
-    protected static final String mgl_TexCoordEnabled  = "mgl_TexCoordEnabled"; //  int mgl_TexCoordEnabled[MAX_TEXTURE_UNITS];
-    protected static final String mgl_ActiveTexture    = "mgl_ActiveTexture";   //  1i
-    protected static final String mgl_ActiveTextureIdx = "mgl_ActiveTextureIdx";//  1i
-
-    protected static final String mgl_CullFace         = "mgl_CullFace";   //  1i
-
-    protected static final FloatBuffer zero4f     = BufferUtil.newFloatBuffer(new float[] { 0.0f, 0.0f, 0.0f, 0.0f });
-
-    public static final FloatBuffer defAmbient = BufferUtil.newFloatBuffer(new float[] { 0f, 0f, 0f, 1f });
-    public static final FloatBuffer defDiffuse = zero4f;
-    public static final FloatBuffer defSpecular= zero4f;
-    public static final FloatBuffer defPosition= BufferUtil.newFloatBuffer(new float[] { 0f, 0f, 1f, 0f });
-    public static final FloatBuffer defSpotDir = BufferUtil.newFloatBuffer(new float[] { 0f, 0f, -1f });
-    public static final float defSpotExponent  = 0f;
-    public static final float defSpotCutoff    = 180f;
-    public static final float defConstantAtten = 1f;
-    public static final float defLinearAtten   = 0f;
-    public static final float defQuadraticAtten= 0f;
-
-    public static final FloatBuffer defMatAmbient = BufferUtil.newFloatBuffer(new float[] { 0.2f, 0.2f, 0.2f, 1.0f });
-    public static final FloatBuffer defMatDiffuse = BufferUtil.newFloatBuffer(new float[] { 0.8f, 0.8f, 0.8f, 1.0f });
-    public static final FloatBuffer defMatSpecular= BufferUtil.newFloatBuffer(new float[] { 0f, 0f, 0f, 1f});
-    public static final FloatBuffer defMatEmission= BufferUtil.newFloatBuffer(new float[] { 0f, 0f, 0f, 1f});
-    public static final float       defMatShininess = 0f;
-
-    protected static final String vertexColorFileDef          = "FixedFuncColor";
-    protected static final String vertexColorLightFileDef    = "FixedFuncColorLight";
-    protected static final String fragmentColorFileDef        = "FixedFuncColor";
-    protected static final String fragmentColorTextureFileDef = "FixedFuncColorTexture";
-    protected static final String shaderSrcRootDef = "shaders" ;
-    protected static final String shaderBinRootDef = "shaders/bin" ;
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp
deleted file mode 100644
index 408ff7251..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include es_precision.glsl
-
-#include mgl_uniform.glsl
-#include mgl_varying.glsl
-
-void main (void)
-{
-  if( mgl_CullFace > 0 && 
-      ( ( mgl_CullFace == 1 && gl_FrontFacing ) ||
-        ( mgl_CullFace == 2 && !gl_FrontFacing ) ||
-        ( mgl_CullFace == 3 ) ) ) {
-    discard;
-  }
-  gl_FragColor = frontColor;
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp
deleted file mode 100644
index 346e40196..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include es_precision.glsl
-
-#include mgl_const.glsl
-#include mgl_uniform.glsl
-#include mgl_attribute.glsl
-#include mgl_varying.glsl
-
-#include mgl_settexcoord.vp
-
-void main(void)
-{
-  if(mgl_ColorEnabled>0) {
-    frontColor=mgl_Color;
-  } else {
-    frontColor=mgl_ColorStatic;
-  }
-
-  gl_Position = mgl_PMVMatrix[0] * mgl_PMVMatrix[1] * mgl_Vertex;
-
-  setTexCoord(gl_Position);
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp
deleted file mode 100644
index ce203cfb9..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include es_precision.glsl
-#include mgl_lightdef.glsl
-
-#include mgl_const.glsl
-#include mgl_uniform.glsl
-#include mgl_uniform_light.glsl
-#include mgl_attribute.glsl
-#include mgl_varying.glsl
-
-#include mgl_settexcoord.vp
-
-void main(void)
-{
-  vec4 position;
-  vec3 normal, lightDir, cameraDir, halfDir;
-  vec4 ambient, diffuse, specular;
-  float NdotL, NdotHV, dist, attenuation;
-  int i;
-
-  position  = mgl_PMVMatrix[1] * mgl_Vertex; // vertex eye position 
-
-  normal = normalize(mgl_NormalMatrix * mgl_Normal); 
-  // cameraPosition:      (mgl_PMVMatrix[2] * vec4(0,0,0,1.0)).xyz                   
-  cameraDir  = normalize( (mgl_PMVMatrix[2] * vec4(0,0,0,1.0)).xyz - mgl_Vertex.xyz ); 
-
-  ambient = vec4(0,0,0,0);
-  diffuse = vec4(0,0,0,0);
-  specular = vec4(0,0,0,0);
-
-  bool lightEnabled = false;
-
-  for(i=0; i<MAX_LIGHTS; i++) {
-    if( 0!= mgl_LightsEnabled[i] ) {
-      lightEnabled = true;
-      ambient += mgl_LightSource[i].ambient;
-      lightDir = mgl_LightSource[i].position.xyz - position.xyz;
-      dist     = length(lightDir);
-      lightDir = normalize(lightDir);
-      attenuation = 1.0 / ( 
-                       mgl_LightSource[i].constantAttenuation+ 
-                       mgl_LightSource[i].linearAttenuation    * dist +   
-                       mgl_LightSource[i].quadraticAttenuation * dist * dist );
-      NdotL = max(0.0, dot(normal, lightDir));
-      diffuse += mgl_LightSource[i].diffuse * NdotL * attenuation;
-      if (NdotL != 0.0) {
-        halfDir  = normalize (lightDir + cameraDir); 
-        NdotHV   = max(0.0, dot(normal, halfDir));
-        specular += mgl_LightSource[i].specular * 
-                    pow(NdotHV,mgl_FrontMaterial.shininess) * attenuation;
-      }
-    }
-  }
-  ambient  += mgl_FrontMaterial.ambient;
-  diffuse  *= mgl_FrontMaterial.diffuse;
-  specular *= mgl_FrontMaterial.specular;
-
-  if(mgl_ColorEnabled>0) {
-    frontColor=mgl_Color;
-  } else {
-    frontColor=mgl_ColorStatic;
-  }
-  if( lightEnabled ) {
-    frontColor *= ambient + diffuse + specular;
-  }
-
-  gl_Position  = mgl_PMVMatrix[0] * position;
-
-  setTexCoord(gl_Position);
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp
deleted file mode 100644
index 86e6ace73..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-#include es_precision.glsl
-#include mgl_lightdef.glsl
-
-#include mgl_const.glsl
-#include mgl_uniform.glsl
-#include mgl_varying.glsl
-
-vec4 getTexColor(in sampler2D tex, in int idx) {
-    vec4 coord;
-    if(idx==0) {
-        coord= mgl_TexCoords[0];
-    } else if(idx==1) {
-        coord= mgl_TexCoords[1];
-    } else if(idx==2) {
-        coord= mgl_TexCoords[2];
-    } else if(idx==3) {
-        coord= mgl_TexCoords[3];
-    } else if(idx==4) {
-        coord= mgl_TexCoords[4];
-    } else if(idx==5) {
-        coord= mgl_TexCoords[5];
-    } else if(idx==6) {
-        coord= mgl_TexCoords[6];
-    } else {
-        coord= mgl_TexCoords[7];
-    }
-    return texture2D(tex, coord.st);
-}
-
-void main (void)
-{
-  if( mgl_CullFace > 0 && 
-      ( ( mgl_CullFace == 1 && gl_FrontFacing ) ||
-        ( mgl_CullFace == 2 && !gl_FrontFacing ) ||
-        ( mgl_CullFace == 3 ) ) ) {
-    discard;
-  }
-
-  vec4 texColor = getTexColor(mgl_ActiveTexture,mgl_ActiveTextureIdx);
-
-  if(length(texColor.rgb)>0.0) {
-    gl_FragColor = vec4(frontColor.rgb*texColor.rgb, frontColor.a) ;
-  } else {
-    gl_FragColor = frontColor;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp
deleted file mode 100755
index 3ebaaee1d..000000000
Binary files a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp and /dev/null differ
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp
deleted file mode 100755
index 279ef72c7..000000000
Binary files a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp and /dev/null differ
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp
deleted file mode 100755
index 5a9deea71..000000000
Binary files a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp and /dev/null differ
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp
deleted file mode 100755
index ce1397fe1..000000000
Binary files a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp and /dev/null differ
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl
deleted file mode 100644
index fd6abe54e..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef es_precision_glsl
-#define es_precision_glsl
-
-#ifdef GL_ES
-  #define MEDIUMP mediump
-  #define HIGHP highp
-  #define LOWP  lowp
-#else
-  #define MEDIUMP
-  #define HIGHP
-  #define LOWP
-#endif
-
-#endif // es_precision_glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl
deleted file mode 100644
index b09bdb05a..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#ifndef mgl_attribute_glsl
-#define mgl_attribute_glsl
-
-#include es_precision.glsl
-
-attribute HIGHP vec4    mgl_Vertex;
-attribute HIGHP vec3    mgl_Normal;
-attribute HIGHP vec4    mgl_Color;
-attribute HIGHP vec4    mgl_MultiTexCoord0;
-attribute HIGHP vec4    mgl_MultiTexCoord1;
-attribute HIGHP vec4    mgl_MultiTexCoord2;
-attribute HIGHP vec4    mgl_MultiTexCoord3;
-attribute HIGHP vec4    mgl_MultiTexCoord4;
-attribute HIGHP vec4    mgl_MultiTexCoord5;
-attribute HIGHP vec4    mgl_MultiTexCoord6;
-attribute HIGHP vec4    mgl_MultiTexCoord7;
-
-#endif // mgl_attribute_glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl
deleted file mode 100644
index 1a464a1cb..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#ifndef mgl_const_glsl
-#define mgl_const_glsl
-
-#include es_precision.glsl
-
-const   LOWP int     MAX_TEXTURE_UNITS = 8; // <=gl_MaxTextureImageUnits 
-const   LOWP int     MAX_LIGHTS = 8; 
-
-#endif // mgl_const_glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl
deleted file mode 100644
index 98e214139..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef mgl_lightdef_glsl
-#define mgl_lightdef_glsl
-
-struct mgl_LightSourceParameters {
-   vec4 ambient; 
-   vec4 diffuse; 
-   vec4 specular; 
-   vec4 position; 
-   // vec4 halfVector; // is computed here
-   vec3 spotDirection; 
-   float spotExponent; 
-   float spotCutoff; // (range: [0.0,90.0], 180.0)
-   //float spotCosCutoff; // (range: [1.0,0.0],-1.0)
-   float constantAttenuation; 
-   float linearAttenuation; 
-   float quadraticAttenuation; 
-};
-struct mgl_MaterialParameters {
-   vec4 ambient;    
-   vec4 diffuse;    
-   vec4 specular;   
-   vec4 emission;   
-   float shininess; 
-};
-
-#endif // mgl_lightdef_glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp
deleted file mode 100644
index 1efe328d0..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef mgl_settexcoord_vp
-#define mgl_settexcoord_vp
-
-#include es_precision.glsl
-
-#include mgl_const.glsl
-#include mgl_uniform.glsl
-#include mgl_attribute.glsl
-#include mgl_varying.glsl
-
-void setTexCoord(in vec4 defpos) {
-  /**
-   * bitwise operator not supported on APX 2500 ES 2.0
-   *
-  mgl_TexCoords[0] = ( 0 != (mgl_TexCoordEnabled &   1) ) ? mgl_MultiTexCoord0 : defpos;
-  mgl_TexCoords[1] = ( 0 != (mgl_TexCoordEnabled &   2) ) ? mgl_MultiTexCoord1 : defpos;
-  mgl_TexCoords[2] = ( 0 != (mgl_TexCoordEnabled &   4) ) ? mgl_MultiTexCoord2 : defpos;
-  mgl_TexCoords[3] = ( 0 != (mgl_TexCoordEnabled &   8) ) ? mgl_MultiTexCoord3 : defpos;
-  mgl_TexCoords[4] = ( 0 != (mgl_TexCoordEnabled &  16) ) ? mgl_MultiTexCoord4 : defpos;
-  mgl_TexCoords[5] = ( 0 != (mgl_TexCoordEnabled &  32) ) ? mgl_MultiTexCoord5 : defpos;
-  mgl_TexCoords[6] = ( 0 != (mgl_TexCoordEnabled &  64) ) ? mgl_MultiTexCoord6 : defpos;
-  mgl_TexCoords[7] = ( 0 != (mgl_TexCoordEnabled & 128) ) ? mgl_MultiTexCoord7 : defpos;
-   */
-  
-  mgl_TexCoords[0] = ( 0 != mgl_TexCoordEnabled[0] ) ? mgl_MultiTexCoord0 : defpos;
-  mgl_TexCoords[1] = ( 0 != mgl_TexCoordEnabled[1] ) ? mgl_MultiTexCoord1 : defpos;
-  mgl_TexCoords[2] = ( 0 != mgl_TexCoordEnabled[2] ) ? mgl_MultiTexCoord2 : defpos;
-  mgl_TexCoords[3] = ( 0 != mgl_TexCoordEnabled[3] ) ? mgl_MultiTexCoord3 : defpos;
-  mgl_TexCoords[4] = ( 0 != mgl_TexCoordEnabled[4] ) ? mgl_MultiTexCoord4 : defpos;
-  mgl_TexCoords[5] = ( 0 != mgl_TexCoordEnabled[5] ) ? mgl_MultiTexCoord5 : defpos;
-  mgl_TexCoords[6] = ( 0 != mgl_TexCoordEnabled[6] ) ? mgl_MultiTexCoord6 : defpos;
-  mgl_TexCoords[7] = ( 0 != mgl_TexCoordEnabled[7] ) ? mgl_MultiTexCoord7 : defpos;
-}
-
-#endif // mgl_settexcoord_vp
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl
deleted file mode 100644
index d8b3c7f95..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#ifndef mgl_uniform_glsl
-#define mgl_uniform_glsl
-
-#include es_precision.glsl
-
-#include mgl_const.glsl
-
-uniform   HIGHP mat4    mgl_PMVMatrix[3]; // P, Mv, and Mvi
-uniform   HIGHP mat3    mgl_NormalMatrix; // transpose(inverse(ModelView)).3x3
-uniform LOWP    int     mgl_ColorEnabled;
-uniform HIGHP   vec4    mgl_ColorStatic;
-uniform LOWP    int     mgl_TexCoordEnabled[MAX_TEXTURE_UNITS];
-uniform       sampler2D mgl_ActiveTexture;
-uniform LOWP    int     mgl_ActiveTextureIdx;
-uniform LOWP    int     mgl_CullFace;
-
-#endif // mgl_uniform_glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl
deleted file mode 100644
index 0dedb5d5d..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#ifndef mgl_uniform_light_glsl
-#define mgl_uniform_light_glsl
-
-#include es_precision.glsl
-
-#include mgl_const.glsl
-#include mgl_lightdef.glsl
-
-uniform LOWP    int     mgl_LightsEnabled[MAX_LIGHTS];
-
-uniform mgl_LightSourceParameters mgl_LightSource[MAX_LIGHTS];
-uniform mgl_MaterialParameters    mgl_FrontMaterial;
-
-#endif // mgl_uniform_light_glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl
deleted file mode 100644
index fc9f735d1..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#ifndef mgl_varying_glsl
-#define mgl_varying_glsl
-
-#include es_precision.glsl
-
-#include mgl_const.glsl
-
-varying   vec4    frontColor;
-varying   vec4    mgl_TexCoords[MAX_TEXTURE_UNITS];
-
-#endif // mgl_varying_glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat
deleted file mode 100755
index 002dca8ef..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-REM 
-REM You have to call it from the 'shaders' directory, e.g.:
-REM   scripts\nvidia-apx\glslc-ff.bat 
-REM
-IF !"%JOGLDIR%"==""! GOTO YESPATH
-set JOGLDIR=..\lib
-:YESPATH
-   
-java -cp %JOGLDIR%\jogl.core.jar;%JOGLDIR%\jogl.gles2.jar;%JOGLDIR%\jogl.fixed.jar;%JOGLDIR%\jogl.sdk.jar com.sun.opengl.util.glsl.sdk.CompileShaderNVidia FixedFuncColor.fp FixedFuncColorTexture.fp FixedFuncColorLight.vp FixedFuncColor.vp
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat
deleted file mode 100755
index 9b5a4b39c..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-REM 
-REM You have to call it from the 'shaders' directory, e.g.:
-REM   scripts\nvidia-apx\glslc.bat <FileName>
-REM
-IF !"%JOGLDIR%"==""! GOTO YESPATH
-set JOGLDIR=..\lib
-:YESPATH
-
-java -cp %JOGLDIR%\jogl.core.jar;%JOGLDIR%\jogl.gles2.jar;%JOGLDIR%\jogl.fixed.jar;%JOGLDIR%\jogl.sdk.jar com.sun.opengl.util.glsl.sdk.CompileShaderNVidia %1
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShader.java b/src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShader.java
deleted file mode 100755
index f18005feb..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShader.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.sun.opengl.util.glsl.sdk;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.*;
-
-import java.io.*;
-import java.net.*;
-
-/** Precompiles a shader into a vendor binary format. Input is the
-    resource name of the shader, such as
-    "com/sun/opengl/impl/glsl/fixed/shader/a.fp".
-    Output is "com/sun/opengl/impl/glsl/fixed/shader/bin/nvidia/a.bfp". 
-
-    All path and suffixes are determined by the ShaderCode class,
-    which ensures runtime compatibility.
-
-    @see javax.media.opengl.glsl.ShaderCode
-  */
-
-public abstract class CompileShader {
-
-    public abstract int getBinaryFormat();
-
-    public abstract File getSDKCompilerDir();
-
-    public abstract String getVertexShaderCompiler();
-
-    public abstract String getFragmentShaderCompiler();
-
-    public void processOneShader(String resourceName)
-        throws IOException, UnsupportedEncodingException, InterruptedException
-    {
-        int type = -1;
-        String outName=null;
-        int suffixLen = -1;
-        if(resourceName.endsWith(ShaderCode.getFileSuffix(false, GL2ES2.GL_FRAGMENT_SHADER))) {
-            suffixLen = 2;
-            type = GL2ES2.GL_FRAGMENT_SHADER;
-        } else if(resourceName.endsWith(".frag")) {
-            suffixLen = 4;
-            type = GL2ES2.GL_FRAGMENT_SHADER;
-        } else if(resourceName.endsWith(ShaderCode.getFileSuffix(false, GL2ES2.GL_VERTEX_SHADER))) {
-            suffixLen = 2;
-            type = GL2ES2.GL_VERTEX_SHADER;
-        } else if(resourceName.endsWith(".vert")) {
-            suffixLen = 4;
-            type = GL2ES2.GL_VERTEX_SHADER;
-        }
-        String justName = basename(resourceName);
-        outName = justName.substring(0, justName.length() - suffixLen) +
-                  ShaderCode.getFileSuffix(true, type);
-        URL resourceURL = Locator.getResource(null, resourceName);
-        String dirName = dirname(resourceURL.getPath());
-
-        outName = dirName + File.separator + "bin" + File.separator + 
-                  ShaderCode.getBinarySubPath(getBinaryFormat()) + File.separator + 
-                  outName;
-        processOneShader(resourceName, outName, type);
-    }
-
-    public void processOneShader(String resourceName, String outName, int type)
-        throws IOException, UnsupportedEncodingException, InterruptedException
-    {
-        URL resourceURL = Locator.getResource(null, resourceName);
-        String dirName = dirname(resourceURL.getPath());
-
-        String shader = ShaderCode.readShaderSource(null, resourceName);
-        if(null==shader) {
-            System.err.println("Can't find shader source " + resourceName + " - ignored");
-            return;
-        }
-        System.err.println("Preprocessing: "+ resourceName+", in dir: "+dirName);
-        String justName = basename(resourceName);
-        String processor;
-        switch (type) {
-            case GL2ES2.GL_VERTEX_SHADER:
-                processor = getVertexShaderCompiler();
-                break;
-            case GL2ES2.GL_FRAGMENT_SHADER:
-                processor = getFragmentShaderCompiler();
-                break;
-            default:
-                throw new GLException("Unknown shader type: "+type);
-        }
-        File outputFile = new File(outName);
-
-        // Write shader to a file in java.io.tmpdir
-        File tmpDir = new File(dirName+File.separator+"tmp");
-        tmpDir.mkdirs();
-        File tmpFile = new File(tmpDir, justName);
-        Writer writer = new BufferedWriter(new FileWriter(tmpFile));
-        writer.write(shader, 0, shader.length());
-        writer.flush();
-        writer.close();
-        System.err.println("Preprocessed: "+ tmpFile.getAbsolutePath());
-
-        File processorDir = getSDKCompilerDir();
-
-        System.err.println("SDK: "+ processorDir.getAbsolutePath() + ", compiler: "+processor);
-
-        System.err.println("Output: "+ outputFile.getAbsolutePath());
-
-        // Run the tool
-        Process process = Runtime.getRuntime().exec(new String[] {
-                processorDir.getAbsolutePath() + File.separator + processor,
-                tmpFile.getAbsolutePath(),
-                outputFile.getAbsolutePath()
-            }); // , null, processorDir);
-        new StreamMonitor(process.getInputStream());
-        new StreamMonitor(process.getErrorStream());
-        process.waitFor();
-        // Delete the temporary file
-        // tmpFile.delete();
-    }
-
-    protected static String basename(String path) {
-        int lastSlash = path.lastIndexOf("/");
-        if (lastSlash < 0) {
-            lastSlash = path.lastIndexOf("\\");
-        }
-        String basename;
-        if (lastSlash < 0) {
-            basename = path;
-        } else {
-            basename = path.substring(lastSlash + 1);
-        }
-        return basename;
-    }
-
-    protected static String dirname(String path) {
-        int lastSlash = path.lastIndexOf("/");
-        if (lastSlash < 0) {
-            lastSlash = path.lastIndexOf("\\");
-        }
-        String dirname;
-        if (lastSlash < 0) {
-            dirname = new String();
-        } else {
-            dirname = path.substring(0, lastSlash + 1);
-        }
-        return dirname;
-    }
-
-    public void run(String[] args) {
-        try {
-            for (int i = 0; i < args.length; i++) {
-                processOneShader(args[i]);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static class StreamMonitor implements Runnable {
-        private InputStream istream;
-        public StreamMonitor(InputStream stream) {
-            istream = stream;
-            new Thread(this, "Output Reader Thread").start();
-        }
-
-        public void run()
-        {
-            byte[] buffer = new byte[4096];
-            try {
-                int numRead = 0;
-                do {
-                    numRead = istream.read(buffer);
-                    if (numRead > 0) {
-                        System.out.write(buffer, 0, numRead);
-                        System.out.flush();
-                    }
-                } while (numRead >= 0);
-            }
-            catch (IOException e) {
-                try {
-                    istream.close();
-                } catch (IOException e2) {
-                }
-                // Should allow clean exit when process shuts down
-            }
-        }
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShaderNVidia.java b/src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShaderNVidia.java
deleted file mode 100755
index 387ccf732..000000000
--- a/src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShaderNVidia.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.sun.opengl.util.glsl.sdk;
-
-import javax.media.opengl.*;
-
-import java.io.*;
-
-/** Precompiles a shader into NVidia binary format. Input is the
-    resource name of the shader, such as
-    "com/sun/opengl/impl/glsl/fixed/shader/a.fp".
-    Output is "com/sun/opengl/impl/glsl/fixed/shader/bin/nvidia/a.bfp". */
-
-public class CompileShaderNVidia extends CompileShader {
-    private static final String NVAPSDK;
-
-    static {
-        String nvapSDKProp = System.getProperty("NVAPSDK");
-        if (nvapSDKProp != null) {
-            NVAPSDK = nvapSDKProp;
-        } else {
-            NVAPSDK = "C:\\nvap_sdk_0_3_x";
-        }
-    }
-
-    public int getBinaryFormat() {
-        return GLES2.GL_NVIDIA_PLATFORM_BINARY_NV;
-    }
-
-    public File getSDKCompilerDir() {
-        File compilerDir = new File( NVAPSDK + File.separator + "tools" + File.separator );
-        File compilerFile = new File( compilerDir, getVertexShaderCompiler());
-        if(!compilerFile.exists()) {
-            compilerDir = new File( NVAPSDK );
-            compilerFile = new File( compilerDir, getVertexShaderCompiler());
-        }
-        if(!compilerFile.exists()) {
-            throw new GLException("Can't find compiler: "+getVertexShaderCompiler() + " in : " +
-                                  NVAPSDK+", "+NVAPSDK + File.separator + "tools");
-        }
-        return compilerDir;
-    }
-
-    public String getVertexShaderCompiler() {
-        return "glslv.bat";
-    }
-
-    public String getFragmentShaderCompiler() {
-        return "glslf.bat";
-    }
-
-    public static void main(String[] args) {
-        new CompileShaderNVidia().run(args);
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/BackingStoreManager.java b/src/jogl/classes/com/sun/opengl/util/packrect/BackingStoreManager.java
deleted file mode 100755
index 754ba2757..000000000
--- a/src/jogl/classes/com/sun/opengl/util/packrect/BackingStoreManager.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.packrect;
-
-/** This interface must be implemented by the end user and is called
-    in response to events like addition of rectangles into the
-    RectanglePacker. It is used both when a full re-layout must be
-    done as well as when the data in the backing store must be copied
-    to a new one. */
-
-public interface BackingStoreManager {
-  public Object allocateBackingStore(int w, int h);
-  public void   deleteBackingStore(Object backingStore);
-
-  /** Indication whether this BackingStoreManager supports compaction;
-      in other words, the allocation of a new backing store and
-      movement of the contents of the backing store from the old to
-      the new one. If it does not, then RectanglePacker.add() may
-      throw an exception if additionFailed() can not make enough room
-      available. If an implementation returns false, this also implies
-      that the backing store can not grow, so that preExpand() will
-      never be called. */
-  public boolean canCompact();
-
-  /** Notification that expansion of the backing store is about to be
-      done due to addition of the given rectangle. Gives the manager a
-      chance to do some compaction and potentially remove old entries
-      from the backing store, if it acts like a least-recently-used
-      cache. This method receives as argument the number of attempts
-      so far to add the given rectangle. Manager should return true if
-      the RectanglePacker should retry the addition (which may result
-      in this method being called again, with an increased attempt
-      number) or false if the RectanglePacker should just expand the
-      backing store. The caller should not call RectanglePacker.add()
-      in its preExpand() method. */
-  public boolean preExpand(Rect cause, int attemptNumber);
-
-  /** Notification that addition of the given Rect failed because a
-      maximum size was set in the RectanglePacker and the backing
-      store could not be expanded, or because compaction (and,
-      therefore, implicitly expansion) was not supported. Should
-      return false if the manager can do nothing more to handle the
-      failed addition, which will cause a RuntimeException to be
-      thrown from the RectanglePacker. */
-  public boolean additionFailed(Rect cause, int attemptNumber);
-
-  /** Notification that movement is starting. */
-  public void beginMovement(Object oldBackingStore, Object newBackingStore);
-
-  /** Tells the manager to move the contents of the given rect from
-      the old location on the old backing store to the new location on
-      the new backing store. The backing stores can be identical in
-      the case of compacting the existing backing store instead of
-      reallocating it. */
-  public void move(Object oldBackingStore,
-                   Rect   oldLocation,
-                   Object newBackingStore,
-                   Rect   newLocation);
-
-  /** Notification that movement is ending. */
-  public void endMovement(Object oldBackingStore, Object newBackingStore);
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/Level.java b/src/jogl/classes/com/sun/opengl/util/packrect/Level.java
deleted file mode 100755
index 3dae4301d..000000000
--- a/src/jogl/classes/com/sun/opengl/util/packrect/Level.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.packrect;
-
-import java.util.*;
-
-public class Level {
-  private int width;
-  private int height;
-  private int yPos;
-  private LevelSet holder;
-
-  private List/*<Rect>*/ rects = new ArrayList/*<Rect>*/();
-  private List/*<Rect>*/ freeList;
-  private int nextAddX;
-
-  static class RectXComparator implements Comparator {
-    public int compare(Object o1, Object o2) {
-      Rect r1 = (Rect) o1;
-      Rect r2 = (Rect) o2;
-      return r1.x() - r2.x();
-    }
-
-    public boolean equals(Object obj) {
-      return this == obj;
-    }
-  }
-  private static final Comparator rectXComparator = new RectXComparator();
-
-  public Level(int width, int height, int yPos, LevelSet holder) {
-    this.width = width;
-    this.height = height;
-    this.yPos = yPos;
-    this.holder = holder;
-  }
-
-  public int w()    { return width;  }
-  public int h()    { return height; }
-  public int yPos() { return yPos;   }
-
-  /** Tries to add the given rectangle to this level only allowing
-      non-disruptive changes like trivial expansion of the last level
-      in the RectanglePacker and allocation from the free list. More
-      disruptive changes like compaction of the level must be
-      requested explicitly. */
-  public boolean add(Rect rect) {
-    if (rect.h() > height) {
-      // See whether it's worth trying to expand vertically
-      if (nextAddX + rect.w() > width) {
-        return false;
-      }
-
-      // See whether we're the last level and can expand
-      if (!holder.canExpand(this, rect.h())) {
-        return false;
-      }
-
-      // Trivially expand and try the allocation
-      holder.expand(this, height, rect.h());
-      height = rect.h();
-    }
-
-    // See whether we can add at the end
-    if (nextAddX + rect.w() <= width) {
-      rect.setPosition(nextAddX, yPos);
-      rects.add(rect);
-      nextAddX += rect.w();
-      return true;
-    }
-
-    // See whether we can add from the free list
-    if (freeList != null) {
-      Rect candidate = null;
-      for (Iterator iter = freeList.iterator(); iter.hasNext(); ) {
-        Rect cur = (Rect) iter.next();
-        if (cur.canContain(rect)) {
-          candidate = cur;
-          break;
-        }
-      }
-
-      if (candidate != null) {
-        // Remove the candidate from the free list
-        freeList.remove(candidate);
-        // Set up and add the real rect
-        rect.setPosition(candidate.x(), candidate.y());
-        rects.add(rect);
-        // Re-add any remaining free space
-        if (candidate.w() > rect.w()) {
-          candidate.setPosition(candidate.x() + rect.w(), candidate.y());
-          candidate.setSize(candidate.w() - rect.w(), height);
-          freeList.add(candidate);
-        }
-        
-        coalesceFreeList();
-
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  /** Removes the given Rect from this Level. */
-  public boolean remove(Rect rect) {
-    if (!rects.remove(rect))
-      return false;
-
-    // If this is the rightmost rectangle, instead of adding its space
-    // to the free list, we can just decrease the nextAddX
-    if (rect.maxX() + 1 == nextAddX) {
-      nextAddX -= rect.w();
-    } else {
-      if (freeList == null) {
-        freeList = new ArrayList/*<Rect>*/();
-      }
-      freeList.add(new Rect(rect.x(), rect.y(), rect.w(), height, null));
-      coalesceFreeList();
-    }
-
-    return true;
-  }
-
-  /** Indicates whether this Level contains no rectangles. */
-  public boolean isEmpty() {
-    return rects.isEmpty();
-  }
-
-  /** Indicates whether this Level could satisfy an allocation request
-      if it were compacted. */
-  public boolean couldAllocateIfCompacted(Rect rect) {
-    if (rect.h() > height)
-      return false;
-    if (freeList == null)
-      return false;
-    int freeListWidth = 0;
-    for (Iterator iter = freeList.iterator(); iter.hasNext(); ) {
-      Rect cur = (Rect) iter.next();
-      freeListWidth += cur.w();
-    }
-    // Add on the remaining space at the end
-    freeListWidth += (width - nextAddX);
-    return (freeListWidth >= rect.w());
-  }
-
-  public void compact(Object backingStore, BackingStoreManager manager) {
-    Collections.sort(rects, rectXComparator);
-    int nextCompactionDest = 0;
-    manager.beginMovement(backingStore, backingStore);
-    for (Iterator iter = rects.iterator(); iter.hasNext(); ) {
-      Rect cur = (Rect) iter.next();
-      if (cur.x() != nextCompactionDest) {
-        manager.move(backingStore, cur,
-                     backingStore, new Rect(nextCompactionDest, cur.y(), cur.w(), cur.h(), null));
-        cur.setPosition(nextCompactionDest, cur.y());
-      }
-      nextCompactionDest += cur.w();
-    }
-    nextAddX = nextCompactionDest;
-    freeList.clear();
-    manager.endMovement(backingStore, backingStore);
-  }
-
-  public Iterator iterator() {
-    return rects.iterator();
-  }
-
-  /** Visits all Rects contained in this Level. */
-  public void visit(RectVisitor visitor) {
-    for (Iterator iter = rects.iterator(); iter.hasNext(); ) {
-      Rect rect = (Rect) iter.next();
-      visitor.visit(rect);
-    }
-  }
-
-  /** Updates the references to the Rect objects in this Level with
-      the "next locations" of those Rects. This is actually used to
-      update the new Rects in a newly laid-out LevelSet with the
-      original Rects. */
-  public void updateRectangleReferences() {
-    for (int i = 0; i < rects.size(); i++) {
-      Rect cur = (Rect) rects.get(i);
-      Rect next = cur.getNextLocation();
-      next.setPosition(cur.x(), cur.y());
-      if (cur.w() != next.w() || cur.h() != next.h())
-        throw new RuntimeException("Unexpected disparity in rectangle sizes during updateRectangleReferences");
-      rects.set(i, next);
-    }
-  }
-
-  private void coalesceFreeList() {
-    if (freeList == null)
-      return;
-    if (freeList.isEmpty())
-      return;
-
-    // Try to coalesce adjacent free blocks in the free list
-    Collections.sort(freeList, rectXComparator);
-    int i = 0;
-    while (i < freeList.size() - 1) {
-      Rect r1 = (Rect) freeList.get(i);
-      Rect r2 = (Rect) freeList.get(i+1);
-      if (r1.maxX() + 1 == r2.x()) {
-        // Coalesce r1 and r2 into one block
-        freeList.remove(i+1);
-        r1.setSize(r1.w() + r2.w(), r1.h());
-      } else {
-        ++i;
-      }
-    }
-    // See whether the last block bumps up against the addition point
-    Rect last = (Rect) freeList.get(freeList.size() - 1);
-    if (last.maxX() + 1 == nextAddX) {
-      nextAddX -= last.w();
-      freeList.remove(freeList.size() - 1);
-    }
-    if (freeList.isEmpty()) {
-      freeList = null;
-    }
-  }
-
-  //----------------------------------------------------------------------
-  // Debugging functionality
-  //
-
-  public void dumpFreeSpace() {
-    int freeListWidth = 0;
-    for (Iterator iter = freeList.iterator(); iter.hasNext(); ) {
-      Rect cur = (Rect) iter.next();
-      System.err.println(" Free rectangle at " + cur);
-      freeListWidth += cur.w();
-    }
-    // Add on the remaining space at the end
-    System.err.println(" Remaining free space " + (width - nextAddX));
-    freeListWidth += (width - nextAddX);
-    System.err.println(" Total free space " + freeListWidth);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/LevelSet.java b/src/jogl/classes/com/sun/opengl/util/packrect/LevelSet.java
deleted file mode 100755
index 973980fdc..000000000
--- a/src/jogl/classes/com/sun/opengl/util/packrect/LevelSet.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.packrect;
-
-import java.util.*;
-
-/** Manages a list of Levels; this is the core data structure
-    contained within the RectanglePacker and encompasses the storage
-    algorithm for the contained Rects. */
-
-public class LevelSet {
-  // Maintained in sorted order by increasing Y coordinate
-  private List/*<Level>*/ levels = new ArrayList/*<Level>*/();
-  private int nextAddY;
-  private int w;
-  private int h;
-
-  /** A LevelSet manages all of the backing store for a region of a
-      specified width and height. */
-  public LevelSet(int w, int h) {
-    this.w = w;
-    this.h = h;
-  }
-
-  public int w() { return w; }
-  public int h() { return h; }
-
-  /** Returns true if the given rectangle was successfully added to
-      the LevelSet given its current dimensions, false if not. Caller
-      is responsible for performing compaction, expansion, etc. as a
-      consequence. */
-  public boolean add(Rect rect) {
-    if (rect.w() > w)
-      return false;
-
-    // Go in reverse order through the levels seeing whether we can
-    // trivially satisfy the allocation request
-    for (int i = levels.size() - 1; i >= 0; --i) {
-      Level level = (Level) levels.get(i);
-      if (level.add(rect))
-        return true;
-    }
-
-    // See whether compaction could satisfy this allocation. This
-    // increases the computational complexity of the addition process,
-    // but prevents us from expanding unnecessarily.
-    for (int i = levels.size() - 1; i >= 0; --i) {
-      Level level = (Level) levels.get(i);
-      if (level.couldAllocateIfCompacted(rect))
-        return false;
-    }
-
-    // OK, we need to either add a new Level or expand the backing
-    // store. Try to add a new Level.
-    if (nextAddY + rect.h() > h)
-      return false;
-
-    Level newLevel = new Level(w, rect.h(), nextAddY, this);
-    levels.add(newLevel);
-    nextAddY += rect.h();
-    boolean res = newLevel.add(rect);
-    if (!res)
-      throw new RuntimeException("Unexpected failure in addition to new Level");
-    return true;
-  }
-
-  /** Removes the given Rect from this LevelSet. */
-  public boolean remove(Rect rect) {
-    for (int i = levels.size() - 1; i >= 0; --i) {
-      Level level = (Level) levels.get(i);
-      if (level.remove(rect))
-        return true;
-    }
-    
-    return false;
-  }
-
-  /** Allocates the given Rectangle, performing compaction of a Level
-      if necessary. This is the correct fallback path to {@link
-      #add(Rect)} above. Returns true if allocated successfully, false
-      otherwise (indicating the need to expand the backing store). */
-  public boolean compactAndAdd(Rect rect,
-                               Object backingStore,
-                               BackingStoreManager manager) {
-    for (int i = levels.size() - 1; i >= 0; --i) {
-      Level level = (Level) levels.get(i);
-      if (level.couldAllocateIfCompacted(rect)) {
-        level.compact(backingStore, manager);
-        boolean res = level.add(rect);
-        if (!res)
-          throw new RuntimeException("Unexpected failure to add after compaction");
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  /** Indicates whether it's legal to trivially increase the height of
-      the given Level. This is only possible if it's the last Level
-      added and there's enough room in the backing store. */
-  public boolean canExpand(Level level, int height) {
-    if (levels.isEmpty())
-      return false; // Should not happen
-    if (levels.get(levels.size() - 1) == level &&
-        (h - nextAddY >= height - level.h()))
-      return true;
-    return false;
-  }
-
-  public void expand(Level level, int oldHeight, int newHeight) {
-    nextAddY += (newHeight - oldHeight);
-  }
-
-  /** Gets the used height of the levels in this LevelSet. */
-  public int getUsedHeight() {
-    return nextAddY;
-  }
-
-  /** Sets the height of this LevelSet. It is only legal to reduce the
-      height to greater than or equal to the currently used height. */
-  public void setHeight(int height) throws IllegalArgumentException {
-    if (height < getUsedHeight()) {
-      throw new IllegalArgumentException("May not reduce height below currently used height");
-    }
-    h = height;
-  }
-
-  /** Returns the vertical fragmentation ratio of this LevelSet. This
-      is defined as the ratio of the sum of the heights of all
-      completely empty Levels divided by the overall used height of
-      the LevelSet. A high vertical fragmentation ratio indicates that
-      it may be profitable to perform a compaction. */
-  public float verticalFragmentationRatio() {
-    int freeHeight = 0;
-    int usedHeight = getUsedHeight();
-    if (usedHeight == 0)
-      return 0.0f;
-    for (Iterator iter = iterator(); iter.hasNext(); ) {
-      Level level = (Level) iter.next();
-      if (level.isEmpty()) {
-        freeHeight += level.h();
-      }
-    }
-    return (float) freeHeight / (float) usedHeight;
-  }
-
-  public Iterator iterator() {
-    return levels.iterator();
-  }
-
-  /** Visits all Rects contained in this LevelSet. */
-  public void visit(RectVisitor visitor) {
-    for (Iterator iter = levels.iterator(); iter.hasNext(); ) {
-      Level level = (Level) iter.next();
-      level.visit(visitor);
-    }
-  }
-
-  /** Updates the references to the Rect objects in this LevelSet with
-      the "next locations" of those Rects. This is actually used to
-      update the new Rects in a newly laid-out LevelSet with the
-      original Rects. */
-  public void updateRectangleReferences() {
-    for (Iterator iter = levels.iterator(); iter.hasNext(); ) {
-      Level level = (Level) iter.next();
-      level.updateRectangleReferences();
-    }
-  }
-
-  /** Clears out all Levels stored in this LevelSet. */
-  public void clear() {
-    levels.clear();
-    nextAddY = 0;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/Rect.java b/src/jogl/classes/com/sun/opengl/util/packrect/Rect.java
deleted file mode 100755
index 2f12981a6..000000000
--- a/src/jogl/classes/com/sun/opengl/util/packrect/Rect.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.packrect;
-
-/** Represents a rectangular region on the backing store. The edges of
-    the rectangle are the infinitely thin region between adjacent
-    pixels on the screen. The origin of the rectangle is its
-    upper-left corner. It is inclusive of the pixels on the top and
-    left edges and exclusive of the pixels on the bottom and right
-    edges. For example, a rect at position (0, 0) and of size (1, 1)
-    would include only the pixel at (0, 0). <P>
-
-    Negative coordinates and sizes are not supported, since they make
-    no sense in the context of the packer, which deals only with
-    positively sized regions. <P>
-
-    This class contains a user data field for efficient hookup to
-    external data structures as well as enough other hooks to
-    efficiently plug into the rectangle packer. */
-
-public class Rect {
-  private int x;
-  private int y;
-  private int w;
-  private int h;
-
-  // The level we're currently installed in in the parent
-  // RectanglePacker, or null if not hooked in to the table yet
-  private Level level;
-
-  // The user's object this rectangle represents.
-  private Object userData;
-
-  // Used transiently during re-layout of the backing store (when
-  // there is no room left due either to fragmentation or just being
-  // out of space)
-  private Rect nextLocation;
-  
-  public Rect() {
-    this(null);
-  }
-
-  public Rect(Object userData) {
-    this(0, 0, 0, 0, userData);
-  }
-
-  public Rect(int x, int y, int w, int h, Object userData) {
-    setPosition(x, y);
-    setSize(w, h);
-    setUserData(userData);
-  }
-
-  public int x() { return x; }
-  public int y() { return y; }
-  public int w() { return w; }
-  public int h() { return h; }
-  public Object getUserData() { return userData; }
-  public Rect getNextLocation() { return nextLocation; }
-
-  public void setPosition(int x, int y) {
-    if (x < 0)
-      throw new IllegalArgumentException("Negative x");
-    if (y < 0)
-      throw new IllegalArgumentException("Negative y");
-    this.x = x;
-    this.y = y;
-  }
-
-  public void setSize(int w, int h) throws IllegalArgumentException {
-    if (w < 0)
-      throw new IllegalArgumentException("Negative width");
-    if (h < 0)
-      throw new IllegalArgumentException("Negative height");
-    this.w = w;
-    this.h = h;
-  }
-
-  public void setUserData(Object obj) { userData = obj; }
-  public void setNextLocation(Rect nextLocation) { this.nextLocation = nextLocation; }
-
-  // Helpers for computations.
-
-  /** Returns the maximum x-coordinate contained within this
-      rectangle. Note that this returns a different result than Java
-      2D's rectangles; for a rectangle of position (0, 0) and size (1,
-      1) this will return 0, not 1. Returns -1 if the width of this
-      rectangle is 0. */
-  public int maxX() {
-    if (w() < 1)
-      return -1;
-    return x() + w() - 1;
-  }
-
-  /** Returns the maximum y-coordinate contained within this
-      rectangle. Note that this returns a different result than Java
-      2D's rectangles; for a rectangle of position (0, 0) and size (1,
-      1) this will return 0, not 1. Returns -1 if the height of this
-      rectangle is 0. */
-  public int maxY() {
-    if (h() < 1)
-      return -1;
-    return y() + h() - 1;
-  }
-
-  public boolean canContain(Rect other) {
-    return (w() >= other.w() &&
-            h() >= other.h());
-  }
-
-  public String toString() {
-    return "[Rect x: " + x() + " y: " + y() + " w: " + w() + " h: " + h() + "]";
-  }
-
-  // Unclear whether it's a good idea to override hashCode and equals
-  // for these objects
-  /*
-  public boolean equals(Object other) {
-    if (other == null || (!(other instanceof Rect))) {
-      return false;
-    }
-
-    Rect r = (Rect) other;
-    return (this.x() == r.x() &&
-            this.y() == r.y() &&
-            this.w() == r.w() &&
-            this.h() == r.h());
-  }
-
-  public int hashCode() {
-    return (x + y * 13 + w * 17 + h * 23);
-  }
-  */
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/RectVisitor.java b/src/jogl/classes/com/sun/opengl/util/packrect/RectVisitor.java
deleted file mode 100755
index 8f395ed99..000000000
--- a/src/jogl/classes/com/sun/opengl/util/packrect/RectVisitor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.packrect;
-
-/** Iteration construct without exposing the internals of the
-    RectanglePacker and without implementing a complex Iterator. */
-
-public interface RectVisitor {
-  public void visit(Rect rect);
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/RectanglePacker.java b/src/jogl/classes/com/sun/opengl/util/packrect/RectanglePacker.java
deleted file mode 100755
index 51e6842c0..000000000
--- a/src/jogl/classes/com/sun/opengl/util/packrect/RectanglePacker.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.packrect;
-
-import java.util.*;
-
-/** Packs rectangles supplied by the user (typically representing
-    image regions) into a larger backing store rectangle (typically
-    representing a large texture). Supports automatic compaction of
-    the space on the backing store, and automatic expansion of the
-    backing store, when necessary. */
-
-public class RectanglePacker {
-  private BackingStoreManager manager;
-  private Object backingStore;
-  private LevelSet levels;
-  private float EXPANSION_FACTOR = 0.5f;
-  private float SHRINK_FACTOR = 0.3f;
-
-  private int initialWidth;
-  private int initialHeight;
-
-  private int maxWidth  = -1;
-  private int maxHeight = -1;
-
-  static class RectHComparator implements Comparator {
-    public int compare(Object o1, Object o2) {
-      Rect r1 = (Rect) o1;
-      Rect r2 = (Rect) o2;
-      return r2.h() - r1.h();
-    }
-
-    public boolean equals(Object obj) {
-      return this == obj;
-    }
-  }
-  private static final Comparator rectHComparator = new RectHComparator();
-
-  public RectanglePacker(BackingStoreManager manager,
-                         int initialWidth,
-                         int initialHeight) {
-    this.manager = manager;
-    levels = new LevelSet(initialWidth, initialHeight);
-    this.initialWidth = initialWidth;
-    this.initialHeight = initialHeight;
-  }
-
-  public Object getBackingStore() {
-    if (backingStore == null) {
-      backingStore = manager.allocateBackingStore(levels.w(), levels.h());
-    }
-
-    return backingStore;
-  }
-
-  /** Sets up a maximum width and height for the backing store. These
-      are optional and if not specified the backing store will grow as
-      necessary. Setting up a maximum width and height introduces the
-      possibility that additions will fail; these are handled with the
-      BackingStoreManager's allocationFailed notification. */
-  public void setMaxSize(int maxWidth, int maxHeight) {
-    this.maxWidth  = maxWidth;
-    this.maxHeight = maxHeight;
-  }
-
-  /** Decides upon an (x, y) position for the given rectangle (leaving
-      its width and height unchanged) and places it on the backing
-      store. May provoke re-layout of other Rects already added. If
-      the BackingStoreManager does not support compaction, and {@link
-      BackingStoreManager#preExpand BackingStoreManager.preExpand}
-      does not clear enough space for the incoming rectangle, then
-      this method will throw a RuntimeException. */
-  public void add(Rect rect) throws RuntimeException {
-    // Allocate backing store if we don't have any yet
-    if (backingStore == null)
-      backingStore = manager.allocateBackingStore(levels.w(), levels.h());
-
-    int attemptNumber = 0;
-    boolean tryAgain = false;
-
-    do {
-      // Try to allocate
-      if (levels.add(rect))
-        return;
-
-      if (manager.canCompact()) {
-        // Try to allocate with horizontal compaction
-        if (levels.compactAndAdd(rect, backingStore, manager))
-          return;
-        // Let the manager have a chance at potentially evicting some entries
-        tryAgain = manager.preExpand(rect, attemptNumber++);
-      } else {
-        tryAgain = manager.additionFailed(rect, attemptNumber++);
-      }
-    } while (tryAgain);
-
-    if (!manager.canCompact()) {
-      throw new RuntimeException("BackingStoreManager does not support compaction or expansion, and didn't clear space for new rectangle");
-    }
-
-    compactImpl(rect);
-
-    // Retry the addition of the incoming rectangle
-    add(rect);
-    // Done
-  }
-
-  /** Removes the given rectangle from this RectanglePacker. */
-  public void remove(Rect rect) {
-    levels.remove(rect);
-  }
-
-  /** Visits all Rects contained in this RectanglePacker. */
-  public void visit(RectVisitor visitor) {
-    levels.visit(visitor);
-  }
-
-  /** Returns the vertical fragmentation ratio of this
-      RectanglePacker. This is defined as the ratio of the sum of the
-      heights of all completely empty Levels divided by the overall
-      used height of the LevelSet. A high vertical fragmentation ratio
-      indicates that it may be profitable to perform a compaction. */
-  public float verticalFragmentationRatio() {
-    return levels.verticalFragmentationRatio();
-  }
-
-  /** Forces a compaction cycle, which typically results in allocating
-      a new backing store and copying all entries to it. */
-  public void compact() {
-    compactImpl(null);
-  }
-
-  // The "cause" rect may be null
-  private void compactImpl(Rect cause) {
-    // Have to either expand, compact or both. Need to figure out what
-    // direction to go. Prefer to expand vertically. Expand
-    // horizontally only if rectangle being added is too wide. FIXME:
-    // may want to consider rebalancing the width and height to be
-    // more equal if it turns out we keep expanding in the vertical
-    // direction.
-    boolean done = false;
-    int newWidth = levels.w();
-    int newHeight = levels.h();
-    LevelSet nextLevelSet = null;
-    int attemptNumber = 0;
-    boolean needAdditionFailureNotification = false;
-
-    while (!done) {
-      if (cause != null) {
-        if (cause.w() > newWidth) {
-          newWidth = cause.w();
-        } else {
-          newHeight = (int) (newHeight * (1.0f + EXPANSION_FACTOR));
-        }
-      }
-
-      // Clamp to maximum values
-      needAdditionFailureNotification = false;
-      if (maxWidth > 0 && newWidth > maxWidth) {
-        newWidth = maxWidth;
-        needAdditionFailureNotification = true;
-      }
-      if (maxHeight > 0 && newHeight > maxHeight) {
-        newHeight = maxHeight;
-        needAdditionFailureNotification = true;
-      }
-
-      nextLevelSet = new LevelSet(newWidth, newHeight);
-      
-      // Make copies of all existing rectangles
-      List/*<Rect>*/ newRects = new ArrayList/*<Rect>*/();
-      for (Iterator i1 = levels.iterator(); i1.hasNext(); ) {
-        Level level = (Level) i1.next();
-        for (Iterator i2 = level.iterator(); i2.hasNext(); ) {
-          Rect cur = (Rect) i2.next();
-          Rect newRect = new Rect(0, 0, cur.w(), cur.h(), null);
-          cur.setNextLocation(newRect);
-          // Hook up the reverse mapping too for easier replacement
-          newRect.setNextLocation(cur);
-          newRects.add(newRect);
-        }
-      }
-      // Sort them by decreasing height (note: this isn't really
-      // guaranteed to improve the chances of a successful layout)
-      Collections.sort(newRects, rectHComparator);
-      // Try putting all of these rectangles into the new level set
-      done = true;
-      for (Iterator iter = newRects.iterator(); iter.hasNext(); ) {
-        if (!nextLevelSet.add((Rect) iter.next())) {
-          done = false;
-          break;
-        }
-      }
-
-      if (done && cause != null) {
-        // Try to add the new rectangle as well
-        if (nextLevelSet.add(cause)) {
-          // We're OK
-        } else {
-          done = false;
-        }
-      }
-
-      // Don't send addition failure notifications if we're only doing
-      // a compaction
-      if (!done && needAdditionFailureNotification && cause != null) {
-        manager.additionFailed(cause, attemptNumber);
-      }
-      ++attemptNumber;
-    }
-
-    // See whether the implicit compaction that just occurred has
-    // yielded excess empty space.
-    if (nextLevelSet.getUsedHeight() > 0 &&
-        nextLevelSet.getUsedHeight() < nextLevelSet.h() * SHRINK_FACTOR) {
-      int shrunkHeight = Math.max(initialHeight,
-                                  (int) (nextLevelSet.getUsedHeight() * (1.0f + EXPANSION_FACTOR)));
-      if (maxHeight > 0 && shrunkHeight > maxHeight) {
-        shrunkHeight = maxHeight;
-      }
-      nextLevelSet.setHeight(shrunkHeight);
-    }
-
-    // If we temporarily added the new rectangle to the new LevelSet,
-    // take it out since we don't "really" add it here but in add(), above
-    if (cause != null) {
-      nextLevelSet.remove(cause);
-    }
-
-    // OK, now we have a new layout and a mapping from the old to the
-    // new locations of rectangles on the backing store. Allocate a
-    // new backing store, move the contents over and deallocate the
-    // old one.
-    Object newBackingStore = manager.allocateBackingStore(nextLevelSet.w(),
-                                                          nextLevelSet.h());
-    manager.beginMovement(backingStore, newBackingStore);
-    for (Iterator i1 = levels.iterator(); i1.hasNext(); ) {
-      Level level = (Level) i1.next();
-      for (Iterator i2 = level.iterator(); i2.hasNext(); ) {
-        Rect cur = (Rect) i2.next();
-        manager.move(backingStore, cur,
-                     newBackingStore, cur.getNextLocation());
-      }
-    }
-    // Replace references to temporary rectangles with original ones
-    nextLevelSet.updateRectangleReferences();
-    manager.endMovement(backingStore, newBackingStore);
-    // Now delete the old backing store
-    manager.deleteBackingStore(backingStore);
-    // Update to new versions of backing store and LevelSet
-    backingStore = newBackingStore;
-    levels = nextLevelSet;
-  }
-
-  /** Clears all Rects contained in this RectanglePacker. */
-  public void clear() {
-    levels.clear();
-  }
-
-  /** Disposes the backing store allocated by the
-      BackingStoreManager. This RectanglePacker may no longer be used
-      after calling this method. */
-  public void dispose() {
-    if (backingStore != null)
-      manager.deleteBackingStore(backingStore);
-    backingStore = null;
-    levels = null;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/package.html b/src/jogl/classes/com/sun/opengl/util/packrect/package.html
deleted file mode 100755
index c1c5db477..000000000
--- a/src/jogl/classes/com/sun/opengl/util/packrect/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<BODY>
-This package implements a rectangle packing algorithm suitable for
-tracking the placement of multiple rectangles inside a larger one. It
-is useful for cases such as placing the contents of multiple windows
-on a larger backing store texture for a compositing window manager;
-placing multiple rasterized strings in a texture map for quick
-rendering to the screen; and many other situations where it is useful
-to carve up a larger texture into smaller pieces dynamically. <P>
-</BODY>
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/Texture.java b/src/jogl/classes/com/sun/opengl/util/texture/Texture.java
deleted file mode 100755
index 3a2799cf3..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/Texture.java
+++ /dev/null
@@ -1,1120 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.opengl.util.texture;
-
-import java.nio.*;
-import java.security.*;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-import javax.media.nativewindow.NativeWindowFactory;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.util.texture.*;
-import com.sun.opengl.util.texture.spi.*;
-
-/**
- * Represents an OpenGL texture object. Contains convenience routines
- * for enabling/disabling OpenGL texture state, binding this texture,
- * and computing texture coordinates for both the entire image as well
- * as a sub-image. 
- * 
- * <p><a name="nonpow2"><b>Non-power-of-two restrictions</b></a>
- * <br> When creating an OpenGL texture object, the Texture class will
- * attempt to leverage the <a
- * href="http://www.opengl.org/registry/specs/ARB/texture_non_power_of_two.txt">GL_ARB_texture_non_power_of_two</a>
- * and <a
- * href="http://www.opengl.org/registry/specs/ARB/texture_rectangle.txt">GL_ARB_texture_rectangle</a>
- * extensions (in that order) whenever possible.  If neither extension
- * is available, the Texture class will simply upload a non-pow2-sized
- * image into a standard pow2-sized texture (without any special
- * scaling).  Since the choice of extension (or whether one is used at
- * all) depends on the user's machine configuration, developers are
- * recommended to use {@link #getImageTexCoords} and {@link
- * #getSubImageTexCoords}, as those methods will calculate the
- * appropriate texture coordinates for the situation.
- *
- * <p>One caveat in this approach is that certain texture wrap modes
- * (e.g.  <code>GL_REPEAT</code>) are not legal when the GL_ARB_texture_rectangle
- * extension is in use.  Another issue to be aware of is that in the
- * default pow2 scenario, if the original image does not have pow2
- * dimensions, then wrapping may not work as one might expect since
- * the image does not extend to the edges of the pow2 texture.  If
- * texture wrapping is important, it is recommended to use only
- * pow2-sized images with the Texture class.
- *
- * <p><a name="perftips"><b>Performance Tips</b></a>
- * <br> For best performance, try to avoid calling {@link #enable} /
- * {@link #bind} / {@link #disable} any more than necessary. For
- * example, applications using many Texture objects in the same scene
- * may want to reduce the number of calls to both {@link #enable} and
- * {@link #disable}. To do this it is necessary to call {@link
- * #getTarget} to make sure the OpenGL texture target is the same for
- * all of the Texture objects in use; non-power-of-two textures using
- * the GL_ARB_texture_rectangle extension use a different target than
- * power-of-two textures using the GL_TEXTURE_2D target. Note that
- * when switching between textures it is necessary to call {@link
- * #bind}, but when drawing many triangles all using the same texture,
- * for best performance only one call to {@link #bind} should be made.
- *
- * <p><a name="premult"><b>Alpha premultiplication and blending</b></a>
- * <br> The mathematically correct way to perform blending in OpenGL
- * (with the SrcOver "source over destination" mode, or any other
- * Porter-Duff rule) is to use "premultiplied color components", which
- * means the R/G/ B color components have already been multiplied by
- * the alpha value.  To make things easier for developers, the Texture
- * class will automatically convert non-premultiplied image data into
- * premultiplied data when storing it into an OpenGL texture.  As a
- * result, it is important to use the correct blending function; for
- * example, the SrcOver rule is expressed as:
-<pre>
-    gl.glBlendFunc(GL.GL_ONE, GL.GL_ONE_MINUS_SRC_ALPHA);
-</pre>
- * Also, when using a texture function like <code>GL_MODULATE</code> where
- * the current color plays a role, it is important to remember to make
- * sure that the color is specified in a premultiplied form, for
- * example:
-<pre>
-    float a = ...;
-    float r = r * a;
-    float g = g * a;
-    float b = b * a;
-    gl.glColor4f(r, g, b, a);
-</pre> 
- *
- * For reference, here is a list of the Porter-Duff compositing rules
- * and the associated OpenGL blend functions (source and destination
- * factors) to use in the face of premultiplied alpha:
- *
-<CENTER>
-<TABLE WIDTH="75%">
-<TR> <TD> Rule     <TD> Source                  <TD> Dest
-<TR> <TD> Clear    <TD> GL_ZERO                 <TD> GL_ZERO
-<TR> <TD> Src      <TD> GL_ONE                  <TD> GL_ZERO
-<TR> <TD> SrcOver  <TD> GL_ONE                  <TD> GL_ONE_MINUS_SRC_ALPHA
-<TR> <TD> DstOver  <TD> GL_ONE_MINUS_DST_ALPHA  <TD> GL_ONE
-<TR> <TD> SrcIn    <TD> GL_DST_ALPHA            <TD> GL_ZERO
-<TR> <TD> DstIn    <TD> GL_ZERO                 <TD> GL_SRC_ALPHA
-<TR> <TD> SrcOut   <TD> GL_ONE_MINUS_DST_ALPHA  <TD> GL_ZERO
-<TR> <TD> DstOut   <TD> GL_ZERO                 <TD> GL_ONE_MINUS_SRC_ALPHA
-<TR> <TD> Dst      <TD> GL_ZERO                 <TD> GL_ONE
-<TR> <TD> SrcAtop  <TD> GL_DST_ALPHA            <TD> GL_ONE_MINUS_SRC_ALPHA
-<TR> <TD> DstAtop  <TD> GL_ONE_MINUS_DST_ALPHA  <TD> GL_SRC_ALPHA
-<TR> <TD> AlphaXor <TD> GL_ONE_MINUS_DST_ALPHA  <TD> GL_ONE_MINUS_SRC_ALPHA
-</TABLE>
-</CENTER>
- *
- * @author Chris Campbell
- * @author Kenneth Russell
- */
-public class Texture {
-    /** The GL target type. */
-    private int target;
-    /** The GL texture ID. */
-    private int texID;
-    /** The width of the texture. */
-    private int texWidth;
-    /** The height of the texture. */
-    private int texHeight;
-    /** The width of the image. */
-    private int imgWidth;
-    /** The height of the image. */
-    private int imgHeight;
-    /** The original aspect ratio of the image, before any rescaling
-        that might have occurred due to using the GLU mipmap routines. */
-    private float aspectRatio;
-    /** Indicates whether the TextureData requires a vertical flip of
-        the texture coords. */
-    private boolean mustFlipVertically;
-    /** Indicates whether we're using automatic mipmap generation
-        support (GL_GENERATE_MIPMAP). */
-    private boolean usingAutoMipmapGeneration;
-
-    /** The texture coordinates corresponding to the entire image. */
-    private TextureCoords coords;
-
-    /** An estimate of the amount of texture memory this texture consumes. */
-    private int estimatedMemorySize;
-
-    private static final AccessControlContext localACC = AccessController.getContext();
-
-    private static final boolean DEBUG = Debug.debug("Texture");
-    private static final boolean VERBOSE = Debug.verbose();
-
-    // For testing alternate code paths on more capable hardware
-    private static final boolean disableNPOT    = Debug.isPropertyDefined("jogl.texture.nonpot", true, localACC);
-    private static final boolean disableTexRect = Debug.isPropertyDefined("jogl.texture.notexrect", true, localACC);
-
-    public Texture(TextureData data) throws GLException {
-        texID = 0;
-        updateImage(data);
-    }
-
-    // Constructor for use when creating e.g. cube maps, where there is
-    // no initial texture data
-    public Texture(int target) throws GLException {
-        texID = 0;
-        this.target = target;
-    }
-
-    // Package-private constructor for creating a texture object which wraps
-    // an existing texture ID from another package
-    Texture(int textureID,
-	    int target,
-	    int texWidth,
-	    int texHeight,
-	    int imgWidth,
-	    int imgHeight,
-	    boolean mustFlipVertically) {
-	this.texID = textureID;
-	this.target = target;
-	this.mustFlipVertically = mustFlipVertically;
-	this.texWidth = texWidth;
-	this.texHeight = texHeight;
-	setImageSize(imgWidth, imgHeight, target);
-    }
-
-    /**
-     * Enables this texture's target (e.g., GL_TEXTURE_2D) in the
-     * current GL context's state. This method is a shorthand equivalent
-     * of the following OpenGL code:
-     <pre>
-     gl.glEnable(texture.getTarget());
-     </pre>
-     *
-     * See the <a href="#perftips">performance tips</a> above for hints
-     * on how to maximize performance when using many Texture objects.
-     *
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void enable() throws GLException {
-        GLContext.getCurrentGL().glEnable(target);
-    }
-
-    /**
-     * Disables this texture's target (e.g., GL_TEXTURE_2D) in the
-     * current GL context's state. This method is a shorthand equivalent
-     * of the following OpenGL code:
-     <pre>
-     gl.glDisable(texture.getTarget());
-     </pre>
-     *
-     * See the <a href="#perftips">performance tips</a> above for hints
-     * on how to maximize performance when using many Texture objects.
-     *
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void disable() throws GLException {
-        GLContext.getCurrentGL().glDisable(target); 
-    }
-
-    /**
-     * Binds this texture to the current GL context. This method is a
-     * shorthand equivalent of the following OpenGL code:
-     <pre>
-     gl.glBindTexture(texture.getTarget(), texture.getTextureObject());
-     </pre>
-     *
-     * See the <a href="#perftips">performance tips</a> above for hints
-     * on how to maximize performance when using many Texture objects.
-     *
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void bind() throws GLException {
-        validateTexID(null, true);
-        GLContext.getCurrentGL().glBindTexture(target, texID); 
-    }
-
-    /**
-     * Disposes the native resources used by this texture object.
-     *
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     * @deprecated use destroy(GL)
-     */
-    public void dispose() throws GLException {
-        destroy(GLContext.getCurrentGL());
-    }
-
-    /**
-     * Disposes the native resources used by this texture object.
-     *
-     * @throws GLException if any OpenGL-related errors occurred
-     * @deprecated use destroy(GL)
-     */
-    public void dispose(GL gl) throws GLException {
-        destroy(gl);
-    }
-
-    /**
-     * Destroys the native resources used by this texture object.
-     *
-     * @throws GLException if any OpenGL-related errors occurred
-     */
-    public void destroy(GL gl) throws GLException {
-        if(0<texID) {
-            gl.glDeleteTextures(1, new int[] {texID}, 0);
-            texID = 0;
-        }
-    }
-
-    /**
-     * Returns the OpenGL "target" of this texture.
-     *
-     * @return the OpenGL target of this texture
-     * @see javax.media.opengl.GL#GL_TEXTURE_2D
-     * @see javax.media.opengl.GL2#GL_TEXTURE_RECTANGLE_ARB
-     */
-    public int getTarget() {
-        return target;
-    }
-
-    /**
-     * Returns the width of the allocated OpenGL texture in pixels.
-     * Note that the texture width will be greater than or equal to the
-     * width of the image contained within.
-     *
-     * @return the width of the texture
-     */
-    public int getWidth() {
-        return texWidth;
-    }
-    
-    /**
-     * Returns the height of the allocated OpenGL texture in pixels.
-     * Note that the texture height will be greater than or equal to the
-     * height of the image contained within.
-     *
-     * @return the height of the texture
-     */
-    public int getHeight() {
-        return texHeight;
-    }   
-    
-    /** 
-     * Returns the width of the image contained within this texture.
-     * Note that for non-power-of-two textures in particular this may
-     * not be equal to the result of {@link #getWidth}. It is
-     * recommended that applications call {@link #getImageTexCoords} and
-     * {@link #getSubImageTexCoords} rather than using this API
-     * directly.
-     *
-     * @return the width of the image
-     */
-    public int getImageWidth() {
-        return imgWidth;
-    }
-
-    /**
-     * Returns the height of the image contained within this texture.
-     * Note that for non-power-of-two textures in particular this may
-     * not be equal to the result of {@link #getHeight}. It is
-     * recommended that applications call {@link #getImageTexCoords} and
-     * {@link #getSubImageTexCoords} rather than using this API
-     * directly.
-     *
-     * @return the height of the image
-     */
-    public int getImageHeight() {
-        return imgHeight;
-    }
-
-    /**
-     * Returns the original aspect ratio of the image, defined as (image
-     * width) / (image height), before any scaling that might have
-     * occurred as a result of using the GLU mipmap routines.
-     */
-    public float getAspectRatio() {
-        return aspectRatio;
-    }
-
-    /**
-     * Returns the set of texture coordinates corresponding to the
-     * entire image. If the TextureData indicated that the texture
-     * coordinates must be flipped vertically, the returned
-     * TextureCoords will take that into account.
-     * 
-     * @return the texture coordinates corresponding to the entire image
-     */
-    public TextureCoords getImageTexCoords() {
-        return coords;
-    }
-
-    /**
-     * Returns the set of texture coordinates corresponding to the
-     * specified sub-image. The (x1, y1) and (x2, y2) points are
-     * specified in terms of pixels starting from the lower-left of the
-     * image. (x1, y1) should specify the lower-left corner of the
-     * sub-image and (x2, y2) the upper-right corner of the sub-image.
-     * If the TextureData indicated that the texture coordinates must be
-     * flipped vertically, the returned TextureCoords will take that
-     * into account; this should not be handled by the end user in the
-     * specification of the y1 and y2 coordinates.
-     * 
-     * @return the texture coordinates corresponding to the specified sub-image
-     */
-    public TextureCoords getSubImageTexCoords(int x1, int y1, int x2, int y2) {
-        if (target == GL2.GL_TEXTURE_RECTANGLE_ARB) {
-            if (mustFlipVertically) {
-                return new TextureCoords(x1, texHeight - y1, x2, texHeight - y2);
-            } else {
-                return new TextureCoords(x1, y1, x2, y2);
-            }
-        } else {
-            float tx1 = (float)x1 / (float)texWidth;
-            float ty1 = (float)y1 / (float)texHeight;
-            float tx2 = (float)x2 / (float)texWidth;
-            float ty2 = (float)y2 / (float)texHeight;
-            if (mustFlipVertically) {
-                float yMax = (float) imgHeight / (float) texHeight;
-                return new TextureCoords(tx1, yMax - ty1, tx2, yMax - ty2);
-            } else {
-                return new TextureCoords(tx1, ty1, tx2, ty2);
-            }
-        }
-    }
-
-    /**
-     * Updates the entire content area of this texture using the data in
-     * the given image.
-     * 
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void updateImage(TextureData data) throws GLException {
-        updateImage(data, 0);
-    }
-
-    /**
-     * Indicates whether this texture's texture coordinates must be
-     * flipped vertically in order to properly display the texture. This
-     * is handled automatically by {@link #getImageTexCoords
-     * getImageTexCoords} and {@link #getSubImageTexCoords
-     * getSubImageTexCoords}, but applications may generate or otherwise
-     * produce texture coordinates which must be corrected.
-     */
-    public boolean getMustFlipVertically() {
-        return mustFlipVertically;
-    }
-
-    /**
-     * Updates the content area of the specified target of this texture
-     * using the data in the given image. In general this is intended
-     * for construction of cube maps.
-     * 
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void updateImage(TextureData data, int target) throws GLException {
-        GL gl = GLContext.getCurrentGL();
-        validateTexID(gl, true);
-
-        imgWidth = data.getWidth();
-        imgHeight = data.getHeight();
-        aspectRatio = (float) imgWidth / (float) imgHeight;
-        mustFlipVertically = data.getMustFlipVertically();
-
-        int texTarget = 0;
-        int texParamTarget = this.target;
-
-        // See whether we have automatic mipmap generation support
-        boolean haveAutoMipmapGeneration =
-            (gl.isExtensionAvailable("GL_VERSION_1_4") ||
-             gl.isExtensionAvailable("GL_SGIS_generate_mipmap"));
-
-        // Indicate to the TextureData what functionality is available
-        data.setHaveEXTABGR(gl.isExtensionAvailable("GL_EXT_abgr"));
-        data.setHaveGL12(gl.isExtensionAvailable("GL_VERSION_1_2"));
-
-        // Indicates whether both width and height are power of two
-        boolean isPOT = isPowerOfTwo(imgWidth) && isPowerOfTwo(imgHeight);
-
-        // Note that automatic mipmap generation doesn't work for
-        // GL_ARB_texture_rectangle
-        if (!isPOT && !haveNPOT(gl)) {
-            haveAutoMipmapGeneration = false;
-        }
-
-        boolean expandingCompressedTexture = false;
-        boolean done = false;
-        if (data.getMipmap() && !haveAutoMipmapGeneration) {
-            // GLU always scales the texture's dimensions to be powers of
-            // two. It also doesn't really matter exactly what the texture
-            // width and height are because the texture coords are always
-            // between 0.0 and 1.0.
-            imgWidth = nextPowerOfTwo(imgWidth);
-            imgHeight = nextPowerOfTwo(imgHeight);
-            texWidth = imgWidth;
-            texHeight = imgHeight;
-            texTarget = GL.GL_TEXTURE_2D;
-            done = true;
-        }
-
-        if (!done && preferTexRect(gl) && !isPOT &&
-            haveTexRect(gl) && !data.isDataCompressed() && gl.isGL2()) {
-            // GL_ARB_texture_rectangle does not work for compressed textures
-            if (DEBUG) {
-                System.err.println("Using GL_ARB_texture_rectangle preferentially on this hardware");
-            }
-
-            texWidth = imgWidth;
-            texHeight = imgHeight;
-            texTarget = GL2.GL_TEXTURE_RECTANGLE_ARB;
-            done = true;
-        }
-
-        if (!done && (isPOT || haveNPOT(gl))) {
-            if (DEBUG) {
-                if (isPOT) {
-                    System.err.println("Power-of-two texture");
-                } else {
-                    System.err.println("Using GL_ARB_texture_non_power_of_two");
-                }
-            }
-
-            texWidth = imgWidth;
-            texHeight = imgHeight;
-            texTarget = GL.GL_TEXTURE_2D;
-            done = true;
-        }
-
-        if (!done && haveTexRect(gl) && !data.isDataCompressed() && gl.isGL2()) {
-            // GL_ARB_texture_rectangle does not work for compressed textures
-            if (DEBUG) {
-                System.err.println("Using GL_ARB_texture_rectangle");
-            }
-
-            texWidth = imgWidth;
-            texHeight = imgHeight;
-            texTarget = GL2.GL_TEXTURE_RECTANGLE_ARB;
-            done = true;
-        }
-
-        if (!done) {
-            // If we receive non-power-of-two compressed texture data and
-            // don't have true hardware support for compressed textures, we
-            // can fake this support by producing an empty "compressed"
-            // texture image, using glCompressedTexImage2D with that to
-            // allocate the texture, and glCompressedTexSubImage2D with the
-            // incoming data.
-            if (data.isDataCompressed()) {
-                if (data.getMipmapData() != null) {
-
-                    // We don't currently support expanding of compressed,
-                    // mipmapped non-power-of-two textures to the nearest power
-                    // of two; the obvious port of the non-mipmapped code didn't
-                    // work
-                    throw new GLException("Mipmapped non-power-of-two compressed textures only supported on OpenGL 2.0 hardware (GL_ARB_texture_non_power_of_two)");
-                }
-
-                expandingCompressedTexture = true;
-            }
-
-            if (DEBUG) {
-                System.err.println("Expanding texture to power-of-two dimensions");
-            }
-
-            if (data.getBorder() != 0) {
-                throw new RuntimeException("Scaling up a non-power-of-two texture which has a border won't work");
-            }
-            texWidth = nextPowerOfTwo(imgWidth);
-            texHeight = nextPowerOfTwo(imgHeight);
-            texTarget = GL.GL_TEXTURE_2D;
-        }
-
-        texParamTarget = texTarget;
-        setImageSize(imgWidth, imgHeight, texTarget);
-
-        if (target != 0) {
-            // Allow user to override auto detection and skip bind step (for
-            // cubemap construction)
-            texTarget = target;
-            if (this.target == 0) {
-                throw new GLException("Override of target failed; no target specified yet");
-            }
-            texParamTarget = this.target;
-            gl.glBindTexture(texParamTarget, texID);
-        } else {
-            gl.glBindTexture(texTarget, texID);
-        }
-
-        if (data.getMipmap() && !haveAutoMipmapGeneration) {
-            int[] align = new int[1];
-            gl.glGetIntegerv(GL.GL_UNPACK_ALIGNMENT, align, 0); // save alignment
-            gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, data.getAlignment());
-
-            if (data.isDataCompressed()) {
-                throw new GLException("May not request mipmap generation for compressed textures");
-            }
-
-            try {
-                // FIXME: may need check for GLUnsupportedException
-                GLU glu = GLU.createGLU(gl);
-                glu.gluBuild2DMipmaps(texTarget, data.getInternalFormat(),
-                                      data.getWidth(), data.getHeight(),
-                                      data.getPixelFormat(), data.getPixelType(), data.getBuffer());
-            } finally {
-                gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, align[0]); // restore alignment
-            }
-        } else {
-            checkCompressedTextureExtensions(data);
-            Buffer[] mipmapData = data.getMipmapData();
-            if (mipmapData != null) {
-                int width = texWidth;
-                int height = texHeight;
-                for (int i = 0; i < mipmapData.length; i++) {
-                    if (data.isDataCompressed()) {
-                        // Need to use glCompressedTexImage2D directly to allocate and fill this image
-                        // Avoid spurious memory allocation when possible
-                        gl.glCompressedTexImage2D(texTarget, i, data.getInternalFormat(),
-                                                  width, height, data.getBorder(),
-                                                  mipmapData[i].remaining(), mipmapData[i]);
-                    } else {
-                        // Allocate texture image at this level
-                        gl.glTexImage2D(texTarget, i, data.getInternalFormat(),
-                                        width, height, data.getBorder(),
-                                        data.getPixelFormat(), data.getPixelType(), null);
-                        updateSubImageImpl(data, texTarget, i, 0, 0, 0, 0, data.getWidth(), data.getHeight());
-                    }
-
-                    width = Math.max(width / 2, 1);
-                    height = Math.max(height / 2, 1);
-                }
-            } else {
-                if (data.isDataCompressed()) {
-                    if (!expandingCompressedTexture) {
-                        // Need to use glCompressedTexImage2D directly to allocate and fill this image
-                        // Avoid spurious memory allocation when possible
-                        gl.glCompressedTexImage2D(texTarget, 0, data.getInternalFormat(),
-                                                  texWidth, texHeight, data.getBorder(),
-                                                  data.getBuffer().capacity(), data.getBuffer());
-                    } else {
-                        ByteBuffer buf = DDSImage.allocateBlankBuffer(texWidth,
-                                                                      texHeight,
-                                                                      data.getInternalFormat());
-                        gl.glCompressedTexImage2D(texTarget, 0, data.getInternalFormat(),
-                                                  texWidth, texHeight, data.getBorder(),
-                                                  buf.capacity(), buf);
-                        updateSubImageImpl(data, texTarget, 0, 0, 0, 0, 0, data.getWidth(), data.getHeight());
-                    }
-                } else {
-                    if (data.getMipmap() && haveAutoMipmapGeneration && gl.isGL2ES1()) {
-                        // For now, only use hardware mipmapping for uncompressed 2D
-                        // textures where the user hasn't explicitly specified
-                        // mipmap data; don't know about interactions between
-                        // GL_GENERATE_MIPMAP and glCompressedTexImage2D
-                        gl.glTexParameteri(texParamTarget, GL2ES1.GL_GENERATE_MIPMAP, GL.GL_TRUE);
-                        usingAutoMipmapGeneration = true;
-                    }
-
-                    gl.glTexImage2D(texTarget, 0, data.getInternalFormat(),
-                                    texWidth, texHeight, data.getBorder(),
-                                    data.getPixelFormat(), data.getPixelType(), null);
-                    updateSubImageImpl(data, texTarget, 0, 0, 0, 0, 0, data.getWidth(), data.getHeight());
-                }
-            }
-        }
-
-        int minFilter = (data.getMipmap() ? GL.GL_LINEAR_MIPMAP_LINEAR : GL.GL_LINEAR);
-        int magFilter = GL.GL_LINEAR;
-        int wrapMode = (gl.isExtensionAvailable("GL_VERSION_1_2") || !gl.isGL2()) ? GL.GL_CLAMP_TO_EDGE : GL2.GL_CLAMP;
-
-        // REMIND: figure out what to do for GL_TEXTURE_RECTANGLE_ARB
-        if (texTarget != GL2.GL_TEXTURE_RECTANGLE_ARB) {
-            gl.glTexParameteri(texParamTarget, GL.GL_TEXTURE_MIN_FILTER, minFilter);
-            gl.glTexParameteri(texParamTarget, GL.GL_TEXTURE_MAG_FILTER, magFilter);
-            gl.glTexParameteri(texParamTarget, GL.GL_TEXTURE_WRAP_S, wrapMode);
-            gl.glTexParameteri(texParamTarget, GL.GL_TEXTURE_WRAP_T, wrapMode);
-            if (this.target == GL2.GL_TEXTURE_CUBE_MAP) {
-                gl.glTexParameteri(texParamTarget, GL2.GL_TEXTURE_WRAP_R, wrapMode);
-            }
-        }
-
-        // Don't overwrite target if we're loading e.g. faces of a cube
-        // map
-        if ((this.target == 0) ||
-            (this.target == GL.GL_TEXTURE_2D) ||
-            (this.target == GL2.GL_TEXTURE_RECTANGLE_ARB)) {
-            this.target = texTarget;
-        }
-
-        // This estimate will be wrong for cube maps
-        estimatedMemorySize = data.getEstimatedMemorySize();
-    }
-
-    /**
-     * Updates a subregion of the content area of this texture using the
-     * given data. If automatic mipmap generation is in use (see {@link
-     * #isUsingAutoMipmapGeneration isUsingAutoMipmapGeneration}),
-     * updates to the base (level 0) mipmap will cause the lower-level
-     * mipmaps to be regenerated, and updates to other mipmap levels
-     * will be ignored. Otherwise, if automatic mipmap generation is not
-     * in use, only updates the specified mipmap level and does not
-     * re-generate mipmaps if they were originally produced or loaded.
-     *
-     * @param data the image data to be uploaded to this texture
-     * @param mipmapLevel the mipmap level of the texture to set. If
-     * this is non-zero and the TextureData contains mipmap data, the
-     * appropriate mipmap level will be selected.
-     * @param x the x offset (in pixels) relative to the lower-left corner
-     * of this texture
-     * @param y the y offset (in pixels) relative to the lower-left corner
-     * of this texture
-     *
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void updateSubImage(TextureData data, int mipmapLevel, int x, int y) throws GLException {
-        if (usingAutoMipmapGeneration && mipmapLevel != 0) {
-            // When we're using mipmap generation via GL_GENERATE_MIPMAP, we
-            // don't need to update other mipmap levels
-            return;
-        }
-        bind();
-        updateSubImageImpl(data, target, mipmapLevel, x, y, 0, 0, data.getWidth(), data.getHeight());
-    }
-
-    /**
-     * Updates a subregion of the content area of this texture using the
-     * specified sub-region of the given data.  If automatic mipmap
-     * generation is in use (see {@link #isUsingAutoMipmapGeneration
-     * isUsingAutoMipmapGeneration}), updates to the base (level 0)
-     * mipmap will cause the lower-level mipmaps to be regenerated, and
-     * updates to other mipmap levels will be ignored. Otherwise, if
-     * automatic mipmap generation is not in use, only updates the
-     * specified mipmap level and does not re-generate mipmaps if they
-     * were originally produced or loaded. This method is only supported
-     * for uncompressed TextureData sources.
-     *
-     * @param data the image data to be uploaded to this texture
-     * @param mipmapLevel the mipmap level of the texture to set. If
-     * this is non-zero and the TextureData contains mipmap data, the
-     * appropriate mipmap level will be selected.
-     * @param dstx the x offset (in pixels) relative to the lower-left corner
-     * of this texture where the update will be applied
-     * @param dsty the y offset (in pixels) relative to the lower-left corner
-     * of this texture where the update will be applied
-     * @param srcx the x offset (in pixels) relative to the lower-left corner
-     * of the supplied TextureData from which to fetch the update rectangle
-     * @param srcy the y offset (in pixels) relative to the lower-left corner
-     * of the supplied TextureData from which to fetch the update rectangle
-     * @param width the width (in pixels) of the rectangle to be updated
-     * @param height the height (in pixels) of the rectangle to be updated
-     *
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void updateSubImage(TextureData data, int mipmapLevel,
-                               int dstx, int dsty,
-                               int srcx, int srcy,
-                               int width, int height) throws GLException {
-        if (data.isDataCompressed()) {
-            throw new GLException("updateSubImage specifying a sub-rectangle is not supported for compressed TextureData");
-        }
-        if (usingAutoMipmapGeneration && mipmapLevel != 0) {
-            // When we're using mipmap generation via GL_GENERATE_MIPMAP, we
-            // don't need to update other mipmap levels
-            return;
-        }
-        bind();
-        updateSubImageImpl(data, target, mipmapLevel, dstx, dsty, srcx, srcy, width, height);
-    }
-
-    /**
-     * Sets the OpenGL floating-point texture parameter for the
-     * texture's target. This gives control over parameters such as
-     * GL_TEXTURE_MAX_ANISOTROPY_EXT. Causes this texture to be bound to
-     * the current texture state.
-     * 
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void setTexParameterf(int parameterName,
-                                 float value) {
-        bind();
-        GL gl = GLContext.getCurrentGL();
-        gl.glTexParameterf(target, parameterName, value);
-    }
-
-    /**
-     * Sets the OpenGL multi-floating-point texture parameter for the
-     * texture's target. Causes this texture to be bound to the current
-     * texture state.
-     * 
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void setTexParameterfv(int parameterName,
-                                  FloatBuffer params) {
-        bind();
-        GL gl = GLContext.getCurrentGL();
-        gl.glTexParameterfv(target, parameterName, params);
-    }
-
-    /**
-     * Sets the OpenGL multi-floating-point texture parameter for the
-     * texture's target. Causes this texture to be bound to the current
-     * texture state.
-     * 
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void setTexParameterfv(int parameterName,
-                                  float[] params, int params_offset) {
-        bind();
-        GL gl = GLContext.getCurrentGL();
-        gl.glTexParameterfv(target, parameterName, params, params_offset);
-    }
-
-    /**
-     * Sets the OpenGL integer texture parameter for the texture's
-     * target. This gives control over parameters such as
-     * GL_TEXTURE_WRAP_S and GL_TEXTURE_WRAP_T, which by default are set
-     * to GL_CLAMP_TO_EDGE if OpenGL 1.2 is supported on the current
-     * platform and GL_CLAMP if not. Causes this texture to be bound to
-     * the current texture state.
-     * 
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void setTexParameteri(int parameterName,
-                                 int value) {
-        bind();
-        GL gl = GLContext.getCurrentGL();
-        gl.glTexParameteri(target, parameterName, value);
-    }
-
-    /**
-     * Sets the OpenGL multi-integer texture parameter for the texture's
-     * target. Causes this texture to be bound to the current texture
-     * state.
-     * 
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void setTexParameteriv(int parameterName,
-                                  IntBuffer params) {
-        bind();
-        GL gl = GLContext.getCurrentGL();
-        gl.glTexParameteriv(target, parameterName, params);
-    }
-
-    /**
-     * Sets the OpenGL multi-integer texture parameter for the texture's
-     * target. Causes this texture to be bound to the current texture
-     * state.
-     * 
-     * @throws GLException if no OpenGL context was current or if any
-     * OpenGL-related errors occurred
-     */
-    public void setTexParameteriv(int parameterName,
-                                  int[] params, int params_offset) {
-        bind();
-        GL gl = GLContext.getCurrentGL();
-        gl.glTexParameteriv(target, parameterName, params, params_offset);
-    }
-
-    /**
-     * Returns the underlying OpenGL texture object for this texture.
-     * Most applications will not need to access this, since it is
-     * handled automatically by the bind() and dispose() APIs.
-     */
-    public int getTextureObject() {
-        validateTexID(null, false);
-        return texID;
-    }
-
-    /** Returns an estimate of the amount of texture memory in bytes
-        this Texture consumes. It should only be treated as an estimate;
-        most applications should not need to query this but instead let
-        the OpenGL implementation page textures in and out as
-        necessary. */
-    public int getEstimatedMemorySize() {
-        return estimatedMemorySize;
-    }
-
-    /** Indicates whether this Texture is using automatic mipmap
-        generation (via the OpenGL texture parameter
-        GL_GENERATE_MIPMAP). This will automatically be used when
-        mipmapping is requested via the TextureData and either OpenGL
-        1.4 or the GL_SGIS_generate_mipmap extension is available. If
-        so, updates to the base image (mipmap level 0) will
-        automatically propagate down to the lower mipmap levels. Manual
-        updates of the mipmap data at these lower levels will be
-        ignored. */
-    public boolean isUsingAutoMipmapGeneration() {
-        return usingAutoMipmapGeneration;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    /**
-     * Returns true if the given value is a power of two.
-     *
-     * @return true if the given value is a power of two, false otherwise
-     */
-    private static boolean isPowerOfTwo(int val) {
-        return ((val & (val - 1)) == 0);
-    }
-
-    /**
-     * Returns the nearest power of two that is larger than the given value.
-     * If the given value is already a power of two, this method will simply
-     * return that value.
-     *
-     * @param val the value
-     * @return the next power of two
-     */
-    private static int nextPowerOfTwo(int val) {
-        int ret = 1;
-        while (ret < val) {
-            ret <<= 1;
-        }
-        return ret;
-    }
-
-    /**
-     * Updates the actual image dimensions; usually only called from
-     * <code>updateImage</code>.
-     */
-    private void setImageSize(int width, int height, int target) {
-        imgWidth = width;
-        imgHeight = height;
-        if (target == GL2.GL_TEXTURE_RECTANGLE_ARB) {
-            if (mustFlipVertically) {
-                coords = new TextureCoords(0, imgHeight, imgWidth, 0);
-            } else {
-                coords = new TextureCoords(0, 0, imgWidth, imgHeight);
-            }
-        } else {
-            if (mustFlipVertically) {
-                coords = new TextureCoords(0, (float) imgHeight / (float) texHeight,
-                                           (float) imgWidth / (float) texWidth, 0);
-            } else {
-                coords = new TextureCoords(0, 0,
-                                           (float) imgWidth / (float) texWidth,
-                                           (float) imgHeight / (float) texHeight);
-            }
-        }
-    }
-
-    private void updateSubImageImpl(TextureData data, int newTarget, int mipmapLevel,
-                                    int dstx, int dsty,
-                                    int srcx, int srcy, int width, int height) throws GLException {
-        GL gl = GLContext.getCurrentGL();
-        data.setHaveEXTABGR(gl.isExtensionAvailable("GL_EXT_abgr"));
-        data.setHaveGL12(gl.isExtensionAvailable("GL_VERSION_1_2"));
-
-        Buffer buffer = data.getBuffer();
-        if (buffer == null && data.getMipmapData() == null) {
-            // Assume user just wanted to get the Texture object allocated
-            return;
-        }
-
-        int rowlen = data.getRowLength();
-        int dataWidth = data.getWidth();
-        int dataHeight = data.getHeight();
-        if (data.getMipmapData() != null) {
-            // Compute the width, height and row length at the specified mipmap level
-            // Note we do not support specification of the row length for
-            // mipmapped textures at this point
-            for (int i = 0; i < mipmapLevel; i++) {
-                width = Math.max(width / 2, 1);
-                height = Math.max(height / 2, 1);
-
-                dataWidth = Math.max(dataWidth / 2, 1);
-                dataHeight = Math.max(dataHeight / 2, 1);
-            }
-            rowlen = 0;
-            buffer = data.getMipmapData()[mipmapLevel];
-        }
-
-        // Clip incoming rectangles to what is available both on this
-        // texture and in the incoming TextureData
-        if (srcx < 0) {
-            width += srcx;
-            srcx = 0;
-        }
-        if (srcy < 0) {
-            height += srcy;
-            srcy = 0;
-        }
-        // NOTE: not sure whether the following two are the correct thing to do
-        if (dstx < 0) {
-            width += dstx;
-            dstx = 0;
-        }
-        if (dsty < 0) {
-            height += dsty;
-            dsty = 0;
-        }
-
-        if (srcx + width > dataWidth) {
-            width = dataWidth - srcx;
-        }
-        if (srcy + height > dataHeight) {
-            height = dataHeight - srcy;
-        }
-        if (dstx + width > texWidth) {
-            width = texWidth - dstx;
-        }
-        if (dsty + height > texHeight) {
-            height = texHeight - dsty;
-        }
-
-        checkCompressedTextureExtensions(data);
-
-        if (data.isDataCompressed()) {
-            gl.glCompressedTexSubImage2D(newTarget, mipmapLevel,
-                                         dstx, dsty, width, height,
-                                         data.getInternalFormat(),
-                                         buffer.remaining(), buffer);
-        } else {
-            int[] align = { 0 };
-            int[] rowLength = { 0 };
-            int[] skipRows = { 0 };
-            int[] skipPixels = { 0 };
-            gl.glGetIntegerv(GL.GL_UNPACK_ALIGNMENT,   align,      0); // save alignment
-            if(gl.isGL2()) {
-                gl.glGetIntegerv(GL2.GL_UNPACK_ROW_LENGTH,  rowLength,  0); // save row length
-                gl.glGetIntegerv(GL2.GL_UNPACK_SKIP_ROWS,   skipRows,   0); // save skipped rows
-                gl.glGetIntegerv(GL2.GL_UNPACK_SKIP_PIXELS, skipPixels, 0); // save skipped pixels
-            }
-            gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, data.getAlignment());
-            if (DEBUG && VERBOSE) {
-                System.out.println("Row length  = " + rowlen);
-                System.out.println("skip pixels = " + srcx);
-                System.out.println("skip rows   = " + srcy);
-                System.out.println("dstx        = " + dstx);
-                System.out.println("dsty        = " + dsty);
-                System.out.println("width       = " + width);
-                System.out.println("height      = " + height);
-            }
-            if(gl.isGL2()) {
-                gl.glPixelStorei(GL2.GL_UNPACK_ROW_LENGTH, rowlen);
-                gl.glPixelStorei(GL2.GL_UNPACK_SKIP_ROWS, srcy);
-                gl.glPixelStorei(GL2.GL_UNPACK_SKIP_PIXELS, srcx);
-            } else {
-                if ( rowlen!=0 && rowlen!=width &&
-                     srcy!=0 && srcx!=0 ) {
-                    throw new GLException("rowlen and/or x/y offset only available for GL2");
-                }
-            }
-
-            gl.glTexSubImage2D(newTarget, mipmapLevel,
-                               dstx, dsty, width, height,
-                               data.getPixelFormat(), data.getPixelType(),
-                               buffer);
-            gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT,   align[0]);      // restore alignment
-            if(gl.isGL2()) {
-                gl.glPixelStorei(GL2.GL_UNPACK_ROW_LENGTH,  rowLength[0]);  // restore row length
-                gl.glPixelStorei(GL2.GL_UNPACK_SKIP_ROWS,   skipRows[0]);   // restore skipped rows
-                gl.glPixelStorei(GL2.GL_UNPACK_SKIP_PIXELS, skipPixels[0]); // restore skipped pixels
-            }
-        }
-    }
-
-    private void checkCompressedTextureExtensions(TextureData data) {
-        GL gl = GLContext.getCurrentGL();
-        if (data.isDataCompressed()) {
-            switch (data.getInternalFormat()) {
-            case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-            case GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-            case GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-            case GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-                if (!gl.isExtensionAvailable("GL_EXT_texture_compression_s3tc") &&
-                    !gl.isExtensionAvailable("GL_NV_texture_compression_vtc")) {
-                    throw new GLException("DXTn compressed textures not supported by this graphics card");
-                }
-                break;
-            default:
-                // FI1027GXME: should test availability of more texture
-                // compression extensions here
-                break;
-            }
-        }
-    }
-
-    private void validateTexID(GL gl, boolean throwException) {
-        if( 0 < texID ) return;
-        if(null==gl) {
-            GLContext ctx = GLContext.getCurrent();
-            if(null!=ctx) {
-                gl = ctx.getGL();
-            } else if(throwException) {
-                throw new GLException("No context current, can't create texture ID");
-            }
-        }
-
-        if(null!=gl) {
-            int[] tmp = new int[1];
-            gl.glGenTextures(1, tmp, 0);
-            texID = tmp[0];
-        }
-    }
-
-    // Helper routines for disabling certain codepaths
-    private static boolean haveNPOT(GL gl) {
-        return (!disableNPOT &&
-                ( gl.isGLES2() ||
-                  gl.isExtensionAvailable("GL_ARB_texture_non_power_of_two") ) );
-    }
-
-    private static boolean haveTexRect(GL gl) {
-        return (!disableTexRect &&
-                TextureIO.isTexRectEnabled() &&
-                gl.isExtensionAvailable("GL_ARB_texture_rectangle"));
-    }
-
-    private static boolean preferTexRect(GL gl) {
-        // Prefer GL_ARB_texture_rectangle on ATI hardware on Mac OS X
-        // due to software fallbacks
-
-        if (NativeWindowFactory.TYPE_MACOSX.equals(NativeWindowFactory.getNativeWindowType(false))) {
-            String vendor = gl.glGetString(GL.GL_VENDOR);
-            if (vendor != null && vendor.startsWith("ATI")) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/TextureCoords.java b/src/jogl/classes/com/sun/opengl/util/texture/TextureCoords.java
deleted file mode 100755
index 51710e077..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/TextureCoords.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.opengl.util.texture;
-
-/** Specifies texture coordinates for a rectangular area of a
-    texture. Note that some textures are inherently flipped vertically
-    from OpenGL's standard coordinate system. This class takes care of
-    this vertical flip so that the "bottom" and "top" coordinates may
-    sometimes be reversed. From the point of view of code rendering
-    textured polygons, it can always map the bottom and left texture
-    coordinates from the TextureCoords to the lower left point of the
-    textured polygon and achieve correct results. */
-
-public class TextureCoords {
-    // These represent the lower-left point
-    private float left;
-    private float bottom;
-    // These represent the upper-right point
-    private float right;
-    private float top;
-
-    public TextureCoords(float left, float bottom,
-                         float right, float top) {
-        this.left = left;
-        this.bottom = bottom;
-        this.right = right;
-        this.top = top;
-    }
-
-    /** Returns the leftmost (x) texture coordinate of this
-        rectangle. */
-    public float left() { return left; }
-
-    /** Returns the rightmost (x) texture coordinate of this
-        rectangle. */
-    public float right() { return right; }
-
-    /** Returns the bottommost (y) texture coordinate of this
-        rectangle. */
-    public float bottom() { return bottom; }
-
-    /** Returns the topmost (y) texture coordinate of this
-        rectangle. */
-    public float top() { return top; }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java b/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java
deleted file mode 100755
index 7899a2395..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.opengl.util.texture;
-
-import java.nio.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-
-/**
- * Represents the data for an OpenGL texture. This is separated from
- * the notion of a Texture to support things like streaming in of
- * textures in a background thread without requiring an OpenGL context
- * to be current on that thread.
- *
- * @author Chris Campbell
- * @author Kenneth Russell
- * @author Sven Gothel
- */
-
-public class TextureData {
-    protected int width;
-    protected int height;
-    private int border;
-    protected int pixelFormat;
-    protected int pixelType;
-    protected int internalFormat; // perhaps inferred from pixelFormat?
-    protected boolean mipmap; // indicates whether mipmaps should be generated
-    // (ignored if mipmaps are supplied from the file)
-    private boolean dataIsCompressed;
-    protected boolean mustFlipVertically; // Must flip texture coordinates
-    // vertically to get OpenGL output
-    // to look correct
-    protected Buffer buffer; // the actual data...
-    private Buffer[] mipmapData; // ...or a series of mipmaps
-    private Flusher flusher;
-    protected int rowLength;
-    protected int alignment; // 1, 2, or 4 bytes
-    protected int estimatedMemorySize;
-
-    // These booleans are a concession to the AWTTextureData subclass
-    protected boolean haveEXTABGR;
-    protected boolean haveGL12;
-    protected GLProfile glProfile;
-
-    /** 
-     * Constructs a new TextureData object with the specified parameters
-     * and data contained in the given Buffer. The optional Flusher can
-     * be used to clean up native resources associated with this
-     * TextureData when processing is complete; for example, closing of
-     * memory-mapped files that might otherwise require a garbage
-     * collection to reclaim and close.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param internalFormat the OpenGL internal format for the
-     *                       resulting texture; must be specified, may
-     *                       not be 0
-     * @param width          the width in pixels of the texture
-     * @param height         the height in pixels of the texture
-     * @param border         the number of pixels of border this texture
-     *                       data has (0 or 1)
-     * @param pixelFormat    the OpenGL pixel format for the
-     *                       resulting texture; must be specified, may
-     *                       not be 0
-     * @param pixelType      the OpenGL type of the pixels of the texture
-     * @param mipmap         indicates whether mipmaps should be
-     *                       autogenerated (using GLU) for the resulting
-     *                       texture. Currently if mipmap is true then
-     *                       dataIsCompressed may not be true.
-     * @param dataIsCompressed indicates whether the texture data is in
-     *                       compressed form
-     *                       (e.g. GL_COMPRESSED_RGB_S3TC_DXT1_EXT)
-     * @param mustFlipVertically indicates whether the texture
-     *                           coordinates must be flipped vertically
-     *                           in order to properly display the
-     *                           texture
-     * @param buffer         the buffer containing the texture data
-     * @param flusher        optional flusher to perform cleanup tasks
-     *                       upon call to flush()
-     *
-     * @throws IllegalArgumentException if any parameters of the texture
-     *   data were invalid, such as requesting mipmap generation for a
-     *   compressed texture
-     */
-    public TextureData(GLProfile glp, 
-                       int internalFormat,
-                       int width,
-                       int height,
-                       int border,
-                       int pixelFormat,
-                       int pixelType,
-                       boolean mipmap,
-                       boolean dataIsCompressed,
-                       boolean mustFlipVertically,
-                       Buffer buffer,
-                       Flusher flusher) throws IllegalArgumentException {
-        if (mipmap && dataIsCompressed) {
-            throw new IllegalArgumentException("Can not generate mipmaps for compressed textures");
-        }
-
-        this.glProfile = glp;
-        this.width = width;
-        this.height = height;
-        this.border = border;
-        this.pixelFormat = pixelFormat;
-        this.pixelType = pixelType;
-        this.internalFormat = internalFormat;
-        this.mipmap = mipmap;
-        this.dataIsCompressed = dataIsCompressed;
-        this.mustFlipVertically = mustFlipVertically;
-        this.buffer = buffer;
-        this.flusher = flusher;
-        alignment = 1;  // FIXME: is this correct enough in all situations?
-        estimatedMemorySize = estimatedMemorySize(buffer);
-    }
-
-    /** 
-     * Constructs a new TextureData object with the specified parameters
-     * and data for multiple mipmap levels contained in the given array
-     * of Buffers. The optional Flusher can be used to clean up native
-     * resources associated with this TextureData when processing is
-     * complete; for example, closing of memory-mapped files that might
-     * otherwise require a garbage collection to reclaim and close.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param internalFormat the OpenGL internal format for the
-     *                       resulting texture; must be specified, may
-     *                       not be 0
-     * @param width          the width in pixels of the topmost mipmap
-     *                       level of the texture
-     * @param height         the height in pixels of the topmost mipmap
-     *                       level of the texture
-     * @param border         the number of pixels of border this texture
-     *                       data has (0 or 1)
-     * @param pixelFormat    the OpenGL pixel format for the
-     *                       resulting texture; must be specified, may
-     *                       not be 0
-     * @param pixelType      the OpenGL type of the pixels of the texture
-     * @param dataIsCompressed indicates whether the texture data is in
-     *                       compressed form
-     *                       (e.g. GL_COMPRESSED_RGB_S3TC_DXT1_EXT)
-     * @param mustFlipVertically indicates whether the texture
-     *                           coordinates must be flipped vertically
-     *                           in order to properly display the
-     *                           texture
-     * @param mipmapData     the buffers containing all mipmap levels
-     *                       of the texture's data
-     * @param flusher        optional flusher to perform cleanup tasks
-     *                       upon call to flush()
-     *
-     * @throws IllegalArgumentException if any parameters of the texture
-     *   data were invalid, such as requesting mipmap generation for a
-     *   compressed texture
-     */
-    public TextureData(GLProfile glp,
-                       int internalFormat,
-                       int width,
-                       int height,
-                       int border,
-                       int pixelFormat,
-                       int pixelType,
-                       boolean dataIsCompressed,
-                       boolean mustFlipVertically,
-                       Buffer[] mipmapData,
-                       Flusher flusher) throws IllegalArgumentException {
-        this.glProfile = glp;
-        this.width = width;
-        this.height = height;
-        this.border = border;
-        this.pixelFormat = pixelFormat;
-        this.pixelType = pixelType;
-        this.internalFormat = internalFormat;
-        this.dataIsCompressed = dataIsCompressed;
-        this.mustFlipVertically = mustFlipVertically;
-        this.mipmapData = (Buffer[]) mipmapData.clone();
-        this.flusher = flusher;
-        alignment = 1;  // FIXME: is this correct enough in all situations?
-        for (int i = 0; i < mipmapData.length; i++) {
-            estimatedMemorySize += estimatedMemorySize(mipmapData[i]);
-        }
-    }
-
-    /** Used only by subclasses */
-    protected TextureData(GLProfile glp) { this.glProfile = glp; }
-
-    /** Returns the width in pixels of the texture data. */
-    public int getWidth() { return width; }
-    /** Returns the height in pixels of the texture data. */
-    public int getHeight() { return height; }
-    /** Returns the border in pixels of the texture data. */
-    public int getBorder() { 
-        return border; 
-    }
-    /** Returns the intended OpenGL pixel format of the texture data. */
-    public int getPixelFormat() {
-        return pixelFormat;
-    }
-    /** Returns the intended OpenGL pixel type of the texture data. */
-    public int getPixelType() {
-        return pixelType;
-    }
-    /** Returns the intended OpenGL internal format of the texture data. */
-    public int getInternalFormat() { 
-        return internalFormat; 
-    }
-    /** Returns whether mipmaps should be generated for the texture data. */
-    public boolean getMipmap() { 
-        return mipmap; 
-    }
-    /** Indicates whether the texture data is in compressed form. */
-    public boolean isDataCompressed() { 
-        return dataIsCompressed; 
-    }
-    /** Indicates whether the texture coordinates must be flipped
-        vertically for proper display. */
-    public boolean getMustFlipVertically() { 
-        return mustFlipVertically; 
-    }
-    /** Returns the texture data, or null if it is specified as a set of mipmaps. */
-    public Buffer getBuffer() {
-        return buffer;
-    }
-    /** Returns all mipmap levels for the texture data, or null if it is
-        specified as a single image. */
-    public Buffer[] getMipmapData() { 
-        return mipmapData; 
-    }
-    /** Returns the required byte alignment for the texture data. */
-    public int getAlignment() { 
-        return alignment; 
-    }
-    /** Returns the row length needed for correct GL_UNPACK_ROW_LENGTH
-        specification. This is currently only supported for
-        non-mipmapped, non-compressed textures. */
-    public int getRowLength() { 
-        return rowLength; 
-    }
-
-    /** Sets the width in pixels of the texture data. */
-    public void setWidth(int width) { this.width = width; }
-    /** Sets the height in pixels of the texture data. */
-    public void setHeight(int height) { this.height = height; }
-    /** Sets the border in pixels of the texture data. */
-    public void setBorder(int border) { this.border = border; }
-    /** Sets the intended OpenGL pixel format of the texture data. */
-    public void setPixelFormat(int pixelFormat) { this.pixelFormat = pixelFormat; }
-    /** Sets the intended OpenGL pixel type of the texture data. */
-    public void setPixelType(int pixelType) { this.pixelType = pixelType; }
-    /** Sets the intended OpenGL internal format of the texture data. */
-    public void setInternalFormat(int internalFormat) { this.internalFormat = internalFormat; }
-    /** Sets whether mipmaps should be generated for the texture data. */
-    public void setMipmap(boolean mipmap) { this.mipmap = mipmap; }
-    /** Sets whether the texture data is in compressed form. */
-    public void setIsDataCompressed(boolean compressed) { this.dataIsCompressed = compressed; }
-    /** Sets whether the texture coordinates must be flipped vertically
-        for proper display. */
-    public void setMustFlipVertically(boolean mustFlipVertically) { this.mustFlipVertically = mustFlipVertically; }
-    /** Sets the texture data. */
-    public void setBuffer(Buffer buffer) {
-        this.buffer = buffer;
-        estimatedMemorySize = estimatedMemorySize(buffer);
-    }
-    /** Sets the required byte alignment for the texture data. */
-    public void setAlignment(int alignment) { this.alignment = alignment; }
-    /** Sets the row length needed for correct GL_UNPACK_ROW_LENGTH
-        specification. This is currently only supported for
-        non-mipmapped, non-compressed textures. */
-    public void setRowLength(int rowLength) { this.rowLength = rowLength; }
-    /** Indicates to this TextureData whether the GL_EXT_abgr extension
-        is available. Used for optimization along some code paths to
-        avoid data copies. */
-    public void setHaveEXTABGR(boolean haveEXTABGR) {
-        this.haveEXTABGR = haveEXTABGR;
-    }
-    /** Indicates to this TextureData whether OpenGL version 1.2 is
-        available. If not, falls back to relatively inefficient code
-        paths for several input data types (several kinds of packed
-        pixel formats, in particular). */
-    public void setHaveGL12(boolean haveGL12) {
-        this.haveGL12 = haveGL12;
-    }
-
-    /** Returns the GLProfile this texture data is intended and created for. */
-    public GLProfile getGLProfile() { return glProfile; }
-
-    /** Returns an estimate of the amount of memory in bytes this
-        TextureData will consume once uploaded to the graphics card. It
-        should only be treated as an estimate; most applications should
-        not need to query this but instead let the OpenGL implementation
-        page textures in and out as necessary. */
-    public int getEstimatedMemorySize() {
-        return estimatedMemorySize;
-    }
-
-    /** Flushes resources associated with this TextureData by calling
-        Flusher.flush(). */
-    public void flush() {
-        if (flusher != null) {
-            flusher.flush();
-            flusher = null;
-        }
-    }
-
-    /** Calls flush()
-     * @see #flush()
-     */
-    public void destroy() {
-        flush();
-    }
-
-    /** Defines a callback mechanism to allow the user to explicitly
-        deallocate native resources (memory-mapped files, etc.)
-        associated with a particular TextureData. */
-    public static interface Flusher {
-        /** Flushes any native resources associated with this
-            TextureData. */
-        public void flush();
-    }
-
-    public String toString() {
-        return "TextureData["+width+"x"+height+", internFormat "+internalFormat+", pixelFormat "+pixelFormat+", pixelType "+pixelType+", border "+border+", estSize "+estimatedMemorySize+", alignment "+alignment+", rowlen "+rowLength;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    protected static int estimatedMemorySize(Buffer buffer) {
-        if (buffer == null) {
-            return 0;
-        }
-        return buffer.capacity() * BufferUtil.sizeOfBufferElem(buffer);
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp b/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp
deleted file mode 100755
index 5c64806fc..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp
+++ /dev/null
@@ -1,1256 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture;
-
-import java.io.*;
-import java.net.*;
-import java.nio.*;
-import java.util.*;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-import com.sun.opengl.impl.Debug;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.spi.*;
-
-/** <P> Provides input and output facilities for both loading OpenGL
-    textures from disk and streams as well as writing textures already
-    in memory back to disk. </P>
-
-    <P> The TextureIO class supports an arbitrary number of plug-in
-    readers and writers via TextureProviders and TextureWriters.
-    TextureProviders know how to produce TextureData objects from
-    files, InputStreams and URLs. TextureWriters know how to write
-    TextureData objects to disk in various file formats. The
-    TextureData class represents the raw data of the texture before it
-    has been converted to an OpenGL texture object. The Texture class
-    represents the OpenGL texture object and provides easy facilities
-    for using the texture. </P>
-
-    <P> There are several built-in TextureProviders and TextureWriters
-    supplied with the TextureIO implementation. The most basic
-    provider uses the platform's Image I/O facilities to read in a
-    BufferedImage and convert it to a texture. This is the baseline
-    provider and is registered so that it is the last one consulted.
-    All others are asked first to open a given file. </P>
-
-    <P> There are three other providers registered by default as of
-    the time of this writing. One handles SGI RGB (".sgi", ".rgb")
-    images from both files and streams. One handles DirectDraw Surface
-    (".dds") images read from files, though can not read these images
-    from streams. One handles Targa (".tga") images read from both
-    files and streams. These providers are executed in an arbitrary
-    order. Some of these providers require the file's suffix to either
-    be specified via the newTextureData methods or for the file to be
-    named with the appropriate suffix. In general a file suffix should
-    be provided to the newTexture and newTextureData methods if at all
-    possible. </P>
-
-    <P> Note that additional TextureProviders, if reading images from
-    InputStreams, must use the mark()/reset() methods on InputStream
-    when probing for e.g. magic numbers at the head of the file to
-    make sure not to disturb the state of the InputStream for
-    downstream TextureProviders. </P>
-
-    <P> There are analogous TextureWriters provided for writing
-    textures back to disk if desired. As of this writing, there are
-    four TextureWriters registered by default: one for Targa files,
-    one for SGI RGB files, one for DirectDraw surface (.dds) files,
-    and one for ImageIO-supplied formats such as .jpg and .png.  Some
-    of these writers have certain limitations such as only being able
-    to write out textures stored in GL_RGB or GL_RGBA format. The DDS
-    writer supports fetching and writing to disk of texture data in
-    DXTn compressed format. Whether this will occur is dependent on
-    whether the texture's internal format is one of the DXTn
-    compressed formats and whether the target file is .dds format.
-*/
-
-public class TextureIO {
-    /** Constant which can be used as a file suffix to indicate a
-        DirectDraw Surface file. */
-    public static final String DDS     = "dds";
-
-    /** Constant which can be used as a file suffix to indicate an SGI
-        RGB file. */
-    public static final String SGI     = "sgi";
-
-    /** Constant which can be used as a file suffix to indicate an SGI
-        RGB file. */
-    public static final String SGI_RGB = "rgb";
-
-    /** Constant which can be used as a file suffix to indicate a GIF
-        file. */
-    public static final String GIF     = "gif";
-
-    /** Constant which can be used as a file suffix to indicate a JPEG
-        file. */
-    public static final String JPG     = "jpg";
-
-    /** Constant which can be used as a file suffix to indicate a PNG
-        file. */
-    public static final String PNG     = "png";
-
-    /** Constant which can be used as a file suffix to indicate a Targa
-        file. */
-    public static final String TGA     = "tga";
-
-    /** Constant which can be used as a file suffix to indicate a TIFF
-        file. */
-    public static final String TIFF    = "tiff";
-
-    private static final boolean DEBUG = Debug.debug("TextureIO");
-
-    // For manually disabling the use of the texture rectangle
-    // extensions so you know the texture target is GL_TEXTURE_2D; this
-    // is useful for shader writers (thanks to Chris Campbell for this
-    // observation)
-    private static boolean texRectEnabled = true;
-
-    //----------------------------------------------------------------------
-    // methods that *do not* require a current context
-    // These methods assume RGB or RGBA textures.
-    // Some texture providers may not recognize the file format unless
-    // the fileSuffix is specified, so it is strongly recommended to
-    // specify it wherever it is known.
-    // Some texture providers may also only support one kind of input,
-    // i.e., reading from a file as opposed to a stream.
-
-    /**
-     * Creates a TextureData from the given file. Does no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param file the file from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the file, or null if none of the
-     *         registered texture providers could read the file
-     * @throws IOException if an error occurred while reading the file
-     */
-    public static TextureData newTextureData(GLProfile glp, File file,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException {
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(file);
-        }
-        return newTextureDataImpl(glp, file, 0, 0, mipmap, fileSuffix);
-    }
-
-    /**
-     * Creates a TextureData from the given stream. Does no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param stream the stream from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the stream, or null if none of the
-     *         registered texture providers could read the stream
-     * @throws IOException if an error occurred while reading the stream
-     */
-    public static TextureData newTextureData(GLProfile glp, InputStream stream,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException {
-        return newTextureDataImpl(glp, stream, 0, 0, mipmap, fileSuffix);
-    }
-
-    /**
-     * Creates a TextureData from the given URL. Does no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param url the URL from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the URL, or null if none of the
-     *         registered texture providers could read the URL
-     * @throws IOException if an error occurred while reading the URL
-     */
-    public static TextureData newTextureData(GLProfile glp, URL url,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException {
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(url.getPath());
-        }
-        return newTextureDataImpl(glp, url, 0, 0, mipmap, fileSuffix);
-    }
-
-    //----------------------------------------------------------------------
-    // These methods make no assumption about the OpenGL internal format
-    // or pixel format of the texture; they must be specified by the
-    // user. It is not allowed to supply 0 (indicating no preference)
-    // for either the internalFormat or the pixelFormat;
-    // IllegalArgumentException will be thrown in this case.
-
-    /**
-     * Creates a TextureData from the given file, using the specified
-     * OpenGL internal format and pixel format for the texture which
-     * will eventually result. The internalFormat and pixelFormat must
-     * be specified and may not be zero; to use default values, use the
-     * variant of this method which does not take these arguments. Does
-     * no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param file the file from which to read the texture data
-     * @param internalFormat the OpenGL internal format of the texture
-     *                   which will eventually result from the TextureData
-     * @param pixelFormat the OpenGL pixel format of the texture
-     *                    which will eventually result from the TextureData
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the file, or null if none of the
-     *         registered texture providers could read the file
-     * @throws IllegalArgumentException if either internalFormat or
-     *                                  pixelFormat was 0
-     * @throws IOException if an error occurred while reading the file
-     */
-    public static TextureData newTextureData(GLProfile glp, File file,
-                                             int internalFormat,
-                                             int pixelFormat,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException, IllegalArgumentException {
-        if ((internalFormat == 0) || (pixelFormat == 0)) {
-            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
-        }
-
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(file);
-        }
-
-        return newTextureDataImpl(glp, file, internalFormat, pixelFormat, mipmap, fileSuffix);
-    }
-
-    /**
-     * Creates a TextureData from the given stream, using the specified
-     * OpenGL internal format and pixel format for the texture which
-     * will eventually result. The internalFormat and pixelFormat must
-     * be specified and may not be zero; to use default values, use the
-     * variant of this method which does not take these arguments. Does
-     * no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param stream the stream from which to read the texture data
-     * @param internalFormat the OpenGL internal format of the texture
-     *                   which will eventually result from the TextureData
-     * @param pixelFormat the OpenGL pixel format of the texture
-     *                    which will eventually result from the TextureData
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the stream, or null if none of the
-     *         registered texture providers could read the stream
-     * @throws IllegalArgumentException if either internalFormat or
-     *                                  pixelFormat was 0
-     * @throws IOException if an error occurred while reading the stream
-     */
-    public static TextureData newTextureData(GLProfile glp, InputStream stream,
-                                             int internalFormat,
-                                             int pixelFormat,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException, IllegalArgumentException {
-        if ((internalFormat == 0) || (pixelFormat == 0)) {
-            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
-        }
-
-        return newTextureDataImpl(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
-    }
-
-    /**
-     * Creates a TextureData from the given URL, using the specified
-     * OpenGL internal format and pixel format for the texture which
-     * will eventually result. The internalFormat and pixelFormat must
-     * be specified and may not be zero; to use default values, use the
-     * variant of this method which does not take these arguments. Does
-     * no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param url the URL from which to read the texture data
-     * @param internalFormat the OpenGL internal format of the texture
-     *                   which will eventually result from the TextureData
-     * @param pixelFormat the OpenGL pixel format of the texture
-     *                    which will eventually result from the TextureData
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the URL, or null if none of the
-     *         registered texture providers could read the URL
-     * @throws IllegalArgumentException if either internalFormat or
-     *                                  pixelFormat was 0
-     * @throws IOException if an error occurred while reading the URL
-     */
-    public static TextureData newTextureData(GLProfile glp, URL url,
-                                             int internalFormat,
-                                             int pixelFormat,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException, IllegalArgumentException {
-        if ((internalFormat == 0) || (pixelFormat == 0)) {
-            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
-        }
-
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(url.getPath());
-        }
-
-        return newTextureDataImpl(glp, url, internalFormat, pixelFormat, mipmap, fileSuffix);
-    }
-
-    //----------------------------------------------------------------------
-    // methods that *do* require a current context
-    //
-
-    /** 
-     * Creates an OpenGL texture object from the specified TextureData
-     * using the current OpenGL context.
-     *
-     * @param data the texture data to turn into an OpenGL texture
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     * @throws IllegalArgumentException if the passed TextureData was null
-     */
-    public static Texture newTexture(TextureData data) throws GLException, IllegalArgumentException {
-        if (data == null) {
-            throw new IllegalArgumentException("Null TextureData");
-        }
-        return new Texture(data);
-    }
-
-    /** 
-     * Creates an OpenGL texture object from the specified file using
-     * the current OpenGL context.
-     *
-     * @param file the file from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @throws IOException if an error occurred while reading the file
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(File file, boolean mipmap) throws IOException, GLException {
-        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
-        TextureData data = newTextureData(glp, file, mipmap, FileUtil.getFileSuffix(file));
-        Texture texture = newTexture(data);
-        data.flush();
-        return texture;
-    }
-
-    /** 
-     * Creates an OpenGL texture object from the specified stream using
-     * the current OpenGL context.
-     *
-     * @param stream the stream from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @throws IOException if an error occurred while reading the stream
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(InputStream stream, boolean mipmap, String fileSuffix) throws IOException, GLException {
-        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
-        TextureData data = newTextureData(glp, stream, mipmap, fileSuffix);
-        Texture texture = newTexture(data);
-        data.flush();
-        return texture;
-    }
-
-    /** 
-     * Creates an OpenGL texture object from the specified URL using the
-     * current OpenGL context.
-     *
-     * @param url the URL from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @throws IOException if an error occurred while reading the URL
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(URL url, boolean mipmap, String fileSuffix) throws IOException, GLException {
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(url.getPath());
-        }
-        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
-        TextureData data = newTextureData(glp, url, mipmap, fileSuffix);
-        Texture texture = newTexture(data);
-        data.flush();
-        return texture;
-    }
-
-    /** 
-     * Creates an OpenGL texture object associated with the given OpenGL
-     * texture target using the current OpenGL context. The texture has
-     * no initial data. This is used, for example, to construct cube
-     * maps out of multiple TextureData objects.
-     *
-     * @param target the OpenGL target type, eg GL.GL_TEXTURE_2D, 
-     *               GL.GL_TEXTURE_RECTANGLE_ARB
-     *
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(int target) throws GLException {
-        return new Texture(target);
-    }
-
-    /**
-     * Wraps an OpenGL texture ID from an external library and allows
-     * some of the base methods from the Texture class, such as
-     * binding and querying of texture coordinates, to be used with
-     * it. Attempts to update such textures' contents will yield
-     * undefined results.
-     *
-     * @param textureID the OpenGL texture object to wrap
-     * @param target the OpenGL texture target, eg GL.GL_TEXTURE_2D, 
-     *               GL2.GL_TEXTURE_RECTANGLE
-     * @param texWidth the width of the texture in pixels
-     * @param texHeight the height of the texture in pixels
-     * @param imgWidth the width of the image within the texture in
-     *          pixels (if the content is a sub-rectangle in the upper
-     *          left corner); otherwise, pass in texWidth
-     * @param imgHeight the height of the image within the texture in
-     *          pixels (if the content is a sub-rectangle in the upper
-     *          left corner); otherwise, pass in texHeight
-     * @param mustFlipVertically indicates whether the texture
-     *                           coordinates must be flipped vertically
-     *                           in order to properly display the
-     *                           texture
-     */
-    public static Texture newTexture(int textureID,
-				     int target,
-				     int texWidth,
-				     int texHeight,
-				     int imgWidth,
-				     int imgHeight,
-				     boolean mustFlipVertically) {
-	return new Texture(textureID,
-			   target,
-			   texWidth,
-			   texHeight,
-			   imgWidth,
-			   imgHeight,
-			   mustFlipVertically);
-    }
-
-    /**
-     * Writes the given texture to a file. The type of the file is
-     * inferred from its suffix. An OpenGL context must be current in
-     * order to fetch the texture data back from the OpenGL pipeline.
-     * This method causes the specified Texture to be bound to the
-     * GL_TEXTURE_2D state. If no suitable writer for the requested file
-     * format was found, throws an IOException. <P>
-     *
-     * Reasonable attempts are made to produce good results in the
-     * resulting images. The Targa, SGI and ImageIO writers produce
-     * results in the correct vertical orientation for those file
-     * formats. The DDS writer performs no vertical flip of the data,
-     * even in uncompressed mode. (It is impossible to perform such a
-     * vertical flip with compressed data.) Applications should keep
-     * this in mind when using this routine to save textures to disk for
-     * later re-loading. <P>
-     *
-     * Any mipmaps for the specified texture are currently discarded
-     * when it is written to disk, regardless of whether the underlying
-     * file format supports multiple mipmaps in a given file.
-     *
-     * @throws IOException if an error occurred during writing or no
-     *   suitable writer was found
-     * @throws GLException if no OpenGL context was current or an
-     *   OpenGL-related error occurred
-     */
-    public static void write(Texture texture, File file) throws IOException, GLException {
-        if (texture.getTarget() != GL.GL_TEXTURE_2D) {
-            throw new GLException("Only GL_TEXTURE_2D textures are supported");
-        }
-
-        // First fetch the texture data
-        GL _gl = GLContext.getCurrentGL();
-        if (!_gl.isGL2()) {
-            throw new GLException("Only GL2 supports fetching compressed images, GL: " + _gl);
-        }
-        GL2 gl = _gl.getGL2();
-
-        texture.bind();
-        int internalFormat = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_INTERNAL_FORMAT);
-        int width  = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_WIDTH);
-        int height = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_HEIGHT);
-        int border = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_BORDER);
-        TextureData data = null;
-        if (internalFormat == GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT ||
-            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ||
-            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ||
-            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT) {
-            // Fetch using glGetCompressedTexImage
-            int size   = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_COMPRESSED_IMAGE_SIZE);
-            ByteBuffer res = ByteBuffer.wrap(new byte[size]);
-            gl.glGetCompressedTexImage(GL.GL_TEXTURE_2D, 0, res);
-            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, internalFormat, GL.GL_UNSIGNED_BYTE,
-                                   false, true, true, res, null);
-        } else {
-            int bytesPerPixel = 0;
-            int fetchedFormat = 0;
-            switch (internalFormat) {
-            case GL.GL_RGB:
-            case GL2.GL_BGR:
-            case GL.GL_RGB8:
-                bytesPerPixel = 3;
-                fetchedFormat = GL.GL_RGB;
-                break;
-            case GL.GL_RGBA:
-            case GL2.GL_BGRA:
-            case GL2.GL_ABGR_EXT:
-            case GL.GL_RGBA8:
-                bytesPerPixel = 4;
-                fetchedFormat = GL.GL_RGBA;
-                break;
-            default:
-                throw new IOException("Unsupported texture internal format 0x" + Integer.toHexString(internalFormat));
-            }
-
-            // Fetch using glGetTexImage
-            int packAlignment  = glGetInteger(GL.GL_PACK_ALIGNMENT);
-            int packRowLength  = glGetInteger(GL2.GL_PACK_ROW_LENGTH);
-            int packSkipRows   = glGetInteger(GL2.GL_PACK_SKIP_ROWS);
-            int packSkipPixels = glGetInteger(GL2.GL_PACK_SKIP_PIXELS);
-            int packSwapBytes  = glGetInteger(GL2.GL_PACK_SWAP_BYTES);
-
-            gl.glPixelStorei(GL.GL_PACK_ALIGNMENT, 1);
-            gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, 0);
-            gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, 0);
-            gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, 0);
-            gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, 0);
-
-            ByteBuffer res = ByteBuffer.wrap(new byte[(width + (2 * border)) *
-                                                      (height + (2 * border)) *
-                                                      bytesPerPixel]);
-            if (DEBUG) {
-                System.out.println("Allocated buffer of size " + res.remaining() + " for fetched image (" +
-                                   ((fetchedFormat == GL.GL_RGB) ? "GL_RGB" : "GL_RGBA") + ")");
-            }
-            gl.glGetTexImage(GL.GL_TEXTURE_2D, 0, fetchedFormat, GL.GL_UNSIGNED_BYTE, res);
-
-            gl.glPixelStorei(GL.GL_PACK_ALIGNMENT, packAlignment);
-            gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, packRowLength);
-            gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, packSkipRows);
-            gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, packSkipPixels);
-            gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, packSwapBytes);
-      
-            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, fetchedFormat, GL.GL_UNSIGNED_BYTE,
-                                   false, false, false, res, null);
-
-            if (DEBUG) {
-                System.out.println("data.getPixelFormat() = " +
-                                   ((data.getPixelFormat() == GL.GL_RGB) ? "GL_RGB" : "GL_RGBA"));
-            }
-        }
-
-        write(data, file);
-    }
-  
-    public static void write(TextureData data, File file) throws IOException, GLException {
-        for (Iterator iter = textureWriters.iterator(); iter.hasNext(); ) {
-            TextureWriter writer = (TextureWriter) iter.next();
-            if (writer.write(file, data)) {
-                return;
-            }
-        }
-
-        throw new IOException("No suitable texture writer found for "+file.getAbsolutePath());
-    }
-
-    //----------------------------------------------------------------------
-    // SPI support
-    //
-
-    /** Adds a TextureProvider to support reading of a new file
-        format. */
-    public static void addTextureProvider(TextureProvider provider) {
-        // Must always add at the front so the ImageIO provider is last,
-        // so we don't accidentally use it instead of a user's possibly
-        // more optimal provider
-        textureProviders.add(0, provider);
-    }
-
-    /** Adds a TextureWriter to support writing of a new file
-        format. */
-    public static void addTextureWriter(TextureWriter writer) {
-        // Must always add at the front so the ImageIO writer is last,
-        // so we don't accidentally use it instead of a user's possibly
-        // more optimal writer
-        textureWriters.add(0, writer);
-    }
-
-    //---------------------------------------------------------------------------
-    // Global disabling of texture rectangle extension
-    //
-
-    /** Toggles the use of the GL_ARB_texture_rectangle extension by the
-        TextureIO classes. By default, on hardware supporting this
-        extension, the TextureIO classes may use the
-        GL_ARB_texture_rectangle extension for non-power-of-two
-        textures. (If the hardware supports the
-        GL_ARB_texture_non_power_of_two extension, that one is
-        preferred.) In some situations, for example when writing
-        shaders, it is advantageous to force the texture target to
-        always be GL_TEXTURE_2D in order to have one version of the
-        shader, even at the expense of texture memory in the case where
-        NPOT textures are not supported. This method allows the use of
-        the GL_ARB_texture_rectangle extension to be turned off globally
-        for this purpose. The default is that the use of the extension
-        is enabled. */
-    public static void setTexRectEnabled(boolean enabled) {
-        texRectEnabled = enabled;
-    }
-
-    /** Indicates whether the GL_ARB_texture_rectangle extension is
-        allowed to be used for non-power-of-two textures; see {@link
-        #setTexRectEnabled setTexRectEnabled}. */
-    public static boolean isTexRectEnabled() {
-        return texRectEnabled;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    private static List/*<TextureProvider>*/ textureProviders = new ArrayList/*<TextureProvider>*/();
-    private static List/*<TextureWriter>*/   textureWriters   = new ArrayList/*<TextureWriter>*/();
-
-    static {
-        /*
-        if(GLProfile.isAWTJOGLAvailable()) {
-            // ImageIO provider, the fall-back, must be the first one added
-            try {
-                // Use reflection to avoid compile-time dependencies on AWT-related classes
-                TextureProvider provider = (TextureProvider)
-                    Class.forName("com.sun.opengl.util.texture.spi.awt.IIOTextureProvider").newInstance();
-                addTextureProvider(provider);
-            } catch (Exception e) {
-                if (DEBUG) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        */
-
-        // Other special-case providers
-        addTextureProvider(new DDSTextureProvider());
-        addTextureProvider(new SGITextureProvider());
-        addTextureProvider(new TGATextureProvider());
-
-        /*
-        // ImageIO writer, the fall-back, must be the first one added
-        if(GLProfile.isAWTJOGLAvailable()) {
-            try {
-                // Use reflection to avoid compile-time dependencies on AWT-related classes
-                TextureWriter writer = (TextureWriter)
-                    Class.forName("com.sun.opengl.util.texture.spi.awt.IIOTextureWriter").newInstance();
-                addTextureWriter(writer);
-            } catch (Exception e) {
-                if (DEBUG) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        */
-
-        // Other special-case writers
-        addTextureWriter(new DDSTextureWriter());
-        addTextureWriter(new SGITextureWriter());
-        addTextureWriter(new TGATextureWriter());
-        addTextureWriter(new NetPbmTextureWriter());
-    }
-
-    // Implementation methods
-    private static TextureData newTextureDataImpl(GLProfile glp, File file,
-                                                  int internalFormat,
-                                                  int pixelFormat,
-                                                  boolean mipmap,
-                                                  String fileSuffix) throws IOException {
-        if (file == null) {
-            throw new IOException("File was null");
-        }
-
-        fileSuffix = toLowerCase(fileSuffix);
-
-        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
-            TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(glp, file,
-                                                       internalFormat,
-                                                       pixelFormat,
-                                                       mipmap,
-                                                       fileSuffix);
-            if (data != null) {
-                return data;
-            }
-        }
-
-        throw new IOException("No suitable reader for given file "+file.getAbsolutePath());
-    }
-
-    private static TextureData newTextureDataImpl(GLProfile glp, InputStream stream,
-                                                  int internalFormat,
-                                                  int pixelFormat,
-                                                  boolean mipmap,
-                                                  String fileSuffix) throws IOException {
-        if (stream == null) {
-            throw new IOException("Stream was null");
-        }
-
-        fileSuffix = toLowerCase(fileSuffix);
-
-        // Note: use of BufferedInputStream works around 4764639/4892246
-        if (!(stream instanceof BufferedInputStream)) {
-            stream = new BufferedInputStream(stream);
-        }
-
-        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
-            TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(glp, stream,
-                                                       internalFormat,
-                                                       pixelFormat,
-                                                       mipmap,
-                                                       fileSuffix);
-            if (data != null) {
-                return data;
-            }
-        }
-
-        throw new IOException("No suitable reader for given stream");
-    }
-
-    private static TextureData newTextureDataImpl(GLProfile glp, URL url,
-                                                  int internalFormat,
-                                                  int pixelFormat,
-                                                  boolean mipmap,
-                                                  String fileSuffix) throws IOException {
-        if (url == null) {
-            throw new IOException("URL was null");
-        }
-
-        fileSuffix = toLowerCase(fileSuffix);
-
-        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
-            TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(glp, url,
-                                                       internalFormat,
-                                                       pixelFormat,
-                                                       mipmap,
-                                                       fileSuffix);
-            if (data != null) {
-                return data;
-            }
-        }
-
-        throw new IOException("No suitable reader for given URL "+url);
-    }
-
-    //----------------------------------------------------------------------
-    // DDS provider -- supports files only for now
-    static class DDSTextureProvider implements TextureProvider {
-        public TextureData newTextureData(GLProfile glp, File file,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            if (DDS.equals(fileSuffix) ||
-                DDS.equals(FileUtil.getFileSuffix(file))) {
-                DDSImage image = DDSImage.read(file);
-                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
-            }
-
-            return null;
-        }
-
-        public TextureData newTextureData(GLProfile glp, InputStream stream,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            if (DDS.equals(fileSuffix) ||
-                DDSImage.isDDSImage(stream)) {
-                DDSImage image = DDSImage.read(stream);
-                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
-            }
-
-            return null;
-        }
-
-        public TextureData newTextureData(GLProfile glp, URL url,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            InputStream stream = new BufferedInputStream(url.openStream());
-            try {
-                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
-            } finally {
-                stream.close();
-            }
-        }
-
-        private TextureData newTextureData(GLProfile glp, final DDSImage image,
-                                           int internalFormat,
-                                           int pixelFormat,
-                                           boolean mipmap) {
-            DDSImage.ImageInfo info = image.getMipMap(0);
-            if (pixelFormat == 0) {
-                switch (image.getPixelFormat()) {
-                case DDSImage.D3DFMT_R8G8B8:
-                    pixelFormat = GL.GL_RGB;
-                    break;
-                default:
-                    pixelFormat = GL.GL_RGBA;
-                    break;
-                }
-            }
-            if (info.isCompressed()) {
-                switch (info.getCompressionFormat()) {
-                case DDSImage.D3DFMT_DXT1:
-                    internalFormat = GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
-                    break;
-                case DDSImage.D3DFMT_DXT3:
-                    internalFormat = GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-                    break;
-                case DDSImage.D3DFMT_DXT5:
-                    internalFormat = GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-                    break;
-                default:
-                    throw new RuntimeException("Unsupported DDS compression format \"" +
-                                               DDSImage.getCompressionFormatName(info.getCompressionFormat()) + "\"");
-                }
-            }
-            if (internalFormat == 0) {
-                switch (image.getPixelFormat()) {
-                case DDSImage.D3DFMT_R8G8B8:
-                    pixelFormat = GL.GL_RGB;
-                    break;
-                default:
-                    pixelFormat = GL.GL_RGBA;
-                    break;
-                }
-            }
-            TextureData.Flusher flusher = new TextureData.Flusher() {
-                    public void flush() {
-                        image.close();
-                    }
-                };
-            TextureData data;
-            if (mipmap && image.getNumMipMaps() > 0) {
-                Buffer[] mipmapData = new Buffer[image.getNumMipMaps()];
-                for (int i = 0; i < image.getNumMipMaps(); i++) {
-                    mipmapData[i] = image.getMipMap(i).getData();
-                }
-                data = new TextureData(glp, internalFormat,
-                                       info.getWidth(),
-                                       info.getHeight(),
-                                       0,
-                                       pixelFormat,
-                                       GL.GL_UNSIGNED_BYTE,
-                                       info.isCompressed(),
-                                       true,
-                                       mipmapData,
-                                       flusher);
-            } else {
-                // Fix this up for the end user because we can't generate
-                // mipmaps for compressed textures
-                mipmap = false;
-                data = new TextureData(glp, internalFormat,
-                                       info.getWidth(),
-                                       info.getHeight(),
-                                       0,
-                                       pixelFormat,
-                                       GL.GL_UNSIGNED_BYTE,
-                                       mipmap,
-                                       info.isCompressed(),
-                                       true,
-                                       info.getData(),
-                                       flusher);
-            }
-            return data;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // Base class for SGI RGB and TGA image providers
-    static abstract class StreamBasedTextureProvider implements TextureProvider {
-        public TextureData newTextureData(GLProfile glp, File file,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            InputStream inStream = new BufferedInputStream(new FileInputStream(file));
-            try {
-                // The SGIImage and TGAImage implementations use InputStreams
-                // anyway so there isn't much point in having a separate code
-                // path for files
-                return newTextureData(glp, inStream,
-                                      internalFormat,
-                                      pixelFormat,
-                                      mipmap,
-                                      ((fileSuffix != null) ? fileSuffix : FileUtil.getFileSuffix(file)));
-            } finally {
-                inStream.close();
-            }
-        }
-
-        public TextureData newTextureData(GLProfile glp, URL url,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            InputStream stream = new BufferedInputStream(url.openStream());
-            try {
-                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
-            } finally {
-                stream.close();
-            }
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // SGI RGB image provider
-    static class SGITextureProvider extends StreamBasedTextureProvider {
-        public TextureData newTextureData(GLProfile glp, InputStream stream,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            if (SGI.equals(fileSuffix) ||
-                SGI_RGB.equals(fileSuffix) ||
-                SGIImage.isSGIImage(stream)) {
-                SGIImage image = SGIImage.read(stream);
-                if (pixelFormat == 0) {
-                    pixelFormat = image.getFormat();
-                }
-                if (internalFormat == 0) {
-                    internalFormat = image.getFormat();
-                }
-                return new TextureData(glp, internalFormat,
-                                       image.getWidth(),
-                                       image.getHeight(),
-                                       0,
-                                       pixelFormat,
-                                       GL.GL_UNSIGNED_BYTE,
-                                       mipmap,
-                                       false,
-                                       false,
-                                       ByteBuffer.wrap(image.getData()),
-                                       null);
-            }
-
-            return null;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // TGA (Targa) image provider
-    static class TGATextureProvider extends StreamBasedTextureProvider {
-        public TextureData newTextureData(GLProfile glp, InputStream stream,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            if (TGA.equals(fileSuffix)) {
-                TGAImage image = TGAImage.read(stream);
-                if (pixelFormat == 0) {
-                    pixelFormat = image.getGLFormat();
-                }
-                if (internalFormat == 0) {
-                    GL gl = GLContext.getCurrentGL();
-                    if(gl.isGL2()) {
-                        internalFormat = GL.GL_RGBA8;
-                    } else {
-                        internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB;
-                    }
-                }
-                return new TextureData(glp, internalFormat,
-                                       image.getWidth(),
-                                       image.getHeight(),
-                                       0,
-                                       pixelFormat,
-                                       GL.GL_UNSIGNED_BYTE,
-                                       mipmap,
-                                       false,
-                                       false,
-                                       image.getData(),
-                                       null);
-            }
-
-            return null;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // DDS texture writer
-    //
-    static class DDSTextureWriter implements TextureWriter {
-        public boolean write(File file,
-                             TextureData data) throws IOException {
-            if (DDS.equals(FileUtil.getFileSuffix(file))) {
-                // See whether the DDS writer can handle this TextureData
-                int pixelFormat = data.getPixelFormat();
-                int pixelType   = data.getPixelType();
-                if (pixelType != GL.GL_BYTE &&
-                    pixelType != GL.GL_UNSIGNED_BYTE) {
-                    throw new IOException("DDS writer only supports byte / unsigned byte textures");
-                }
-
-                int d3dFormat = 0;
-                // FIXME: some of these are probably not completely correct and would require swizzling
-                switch (pixelFormat) {
-                case GL.GL_RGB:                        d3dFormat = DDSImage.D3DFMT_R8G8B8; break;
-                case GL.GL_RGBA:                       d3dFormat = DDSImage.D3DFMT_A8R8G8B8; break;
-                case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:  d3dFormat = DDSImage.D3DFMT_DXT1; break;
-                case GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: throw new IOException("RGBA DXT1 not yet supported");
-                case GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: d3dFormat = DDSImage.D3DFMT_DXT3; break;
-                case GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: d3dFormat = DDSImage.D3DFMT_DXT5; break;
-                default: throw new IOException("Unsupported pixel format 0x" + Integer.toHexString(pixelFormat) + " by DDS writer");
-                }
-        
-                ByteBuffer[] mipmaps = null;
-                if (data.getMipmapData() != null) {
-                    mipmaps = new ByteBuffer[data.getMipmapData().length];
-                    for (int i = 0; i < mipmaps.length; i++) {
-                        mipmaps[i] = (ByteBuffer) data.getMipmapData()[i];
-                    }
-                } else {
-                    mipmaps = new ByteBuffer[] { (ByteBuffer) data.getBuffer() };
-                }
-
-                DDSImage image = DDSImage.createFromData(d3dFormat,
-                                                         data.getWidth(),
-                                                         data.getHeight(),
-                                                         mipmaps);
-                image.write(file);
-                return true;
-            }
-
-            return false;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // SGI (rgb) texture writer
-    //
-    static class SGITextureWriter implements TextureWriter {
-        public boolean write(File file,
-                             TextureData data) throws IOException {
-            String fileSuffix = FileUtil.getFileSuffix(file);
-            if (SGI.equals(fileSuffix) ||
-                SGI_RGB.equals(fileSuffix)) {
-                // See whether the SGI writer can handle this TextureData
-                int pixelFormat = data.getPixelFormat();
-                int pixelType   = data.getPixelType();
-                if ((pixelFormat == GL.GL_RGB ||
-                     pixelFormat == GL.GL_RGBA) &&
-                    (pixelType == GL.GL_BYTE ||
-                     pixelType == GL.GL_UNSIGNED_BYTE)) {
-                    ByteBuffer buf = ((data.getBuffer() != null) ?
-                                      (ByteBuffer) data.getBuffer() :
-                                      (ByteBuffer) data.getMipmapData()[0]);
-                    byte[] bytes;
-                    if (buf.hasArray()) {
-                        bytes = buf.array();
-                    } else {
-                        buf.rewind();
-                        bytes = new byte[buf.remaining()];
-                        buf.get(bytes);
-                        buf.rewind();
-                    }
-
-                    SGIImage image = SGIImage.createFromData(data.getWidth(),
-                                                             data.getHeight(),
-                                                             (pixelFormat == GL.GL_RGBA),
-                                                             bytes);
-                    image.write(file, false);
-                    return true;
-                }
-
-                throw new IOException("SGI writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
-            }
-
-            return false;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // TGA (Targa) texture writer
-  
-    static class TGATextureWriter implements TextureWriter {
-        public boolean write(File file,
-                             TextureData data) throws IOException {
-            if (TGA.equals(FileUtil.getFileSuffix(file))) {
-                // See whether the TGA writer can handle this TextureData
-                int pixelFormat = data.getPixelFormat();
-                int pixelType   = data.getPixelType();
-                if ((pixelFormat == GL.GL_RGB ||
-                     pixelFormat == GL.GL_RGBA) &&
-                    (pixelType == GL.GL_BYTE ||
-                     pixelType == GL.GL_UNSIGNED_BYTE)) {
-                    ByteBuffer buf = ((data.getBuffer() != null) ?
-                                      (ByteBuffer) data.getBuffer() :
-                                      (ByteBuffer) data.getMipmapData()[0]);
-                    // Must reverse order of red and blue channels to get correct results
-                    int skip = ((pixelFormat == GL.GL_RGB) ? 3 : 4);
-                    for (int i = 0; i < buf.remaining(); i += skip) {
-                        byte red  = buf.get(i + 0);
-                        byte blue = buf.get(i + 2);
-                        buf.put(i + 0, blue);
-                        buf.put(i + 2, red);
-                    }
-
-                    TGAImage image = TGAImage.createFromData(data.getWidth(),
-                                                             data.getHeight(),
-                                                             (pixelFormat == GL.GL_RGBA),
-                                                             false,
-                                                             ((data.getBuffer() != null) ?
-                                                              (ByteBuffer) data.getBuffer() :
-                                                              (ByteBuffer) data.getMipmapData()[0]));
-                    image.write(file);
-                    return true;
-                }
-
-                throw new IOException("TGA writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
-            }
-
-            return false;
-        }    
-    }
-
-    //----------------------------------------------------------------------
-    // Helper routines
-    //
-
-    private static int glGetInteger(int pname) {
-        int[] tmp = new int[1];
-        GL gl = GLContext.getCurrentGL();
-        gl.glGetIntegerv(pname, tmp, 0);
-        return tmp[0];
-    }
-
-    private static int glGetTexLevelParameteri(GL2 gl, int target, int level, int pname) {
-        int[] tmp = new int[1];
-        gl.glGetTexLevelParameteriv(target, 0, pname, tmp, 0);
-        return tmp[0];
-    }
-
-    private static String toLowerCase(String arg) {
-        if (arg == null) {
-            return null;
-        }
-
-        return arg.toLowerCase();
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase b/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase
deleted file mode 100755
index 034a850bd..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase
+++ /dev/null
@@ -1,1258 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture;
-
-import java.io.*;
-import java.net.*;
-import java.nio.*;
-import java.util.*;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-import com.sun.opengl.impl.Debug;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.spi.*;
-
-/** <P> Provides input and output facilities for both loading OpenGL
-    textures from disk and streams as well as writing textures already
-    in memory back to disk. </P>
-
-    <P> The TextureIO class supports an arbitrary number of plug-in
-    readers and writers via TextureProviders and TextureWriters.
-    TextureProviders know how to produce TextureData objects from
-    files, InputStreams and URLs. TextureWriters know how to write
-    TextureData objects to disk in various file formats. The
-    TextureData class represents the raw data of the texture before it
-    has been converted to an OpenGL texture object. The Texture class
-    represents the OpenGL texture object and provides easy facilities
-    for using the texture. </P>
-
-    <P> There are several built-in TextureProviders and TextureWriters
-    supplied with the TextureIO implementation. The most basic
-    provider uses the platform's Image I/O facilities to read in a
-    BufferedImage and convert it to a texture. This is the baseline
-    provider and is registered so that it is the last one consulted.
-    All others are asked first to open a given file. </P>
-
-    <P> There are three other providers registered by default as of
-    the time of this writing. One handles SGI RGB (".sgi", ".rgb")
-    images from both files and streams. One handles DirectDraw Surface
-    (".dds") images read from files, though can not read these images
-    from streams. One handles Targa (".tga") images read from both
-    files and streams. These providers are executed in an arbitrary
-    order. Some of these providers require the file's suffix to either
-    be specified via the newTextureData methods or for the file to be
-    named with the appropriate suffix. In general a file suffix should
-    be provided to the newTexture and newTextureData methods if at all
-    possible. </P>
-
-    <P> Note that additional TextureProviders, if reading images from
-    InputStreams, must use the mark()/reset() methods on InputStream
-    when probing for e.g. magic numbers at the head of the file to
-    make sure not to disturb the state of the InputStream for
-    downstream TextureProviders. </P>
-
-    <P> There are analogous TextureWriters provided for writing
-    textures back to disk if desired. As of this writing, there are
-    four TextureWriters registered by default: one for Targa files,
-    one for SGI RGB files, one for DirectDraw surface (.dds) files,
-    and one for ImageIO-supplied formats such as .jpg and .png.  Some
-    of these writers have certain limitations such as only being able
-    to write out textures stored in GL_RGB or GL_RGBA format. The DDS
-    writer supports fetching and writing to disk of texture data in
-    DXTn compressed format. Whether this will occur is dependent on
-    whether the texture's internal format is one of the DXTn
-    compressed formats and whether the target file is .dds format.
-*/
-
-public class TextureIO {
-    /** Constant which can be used as a file suffix to indicate a
-        DirectDraw Surface file. */
-    public static final String DDS     = "dds";
-
-    /** Constant which can be used as a file suffix to indicate an SGI
-        RGB file. */
-    public static final String SGI     = "sgi";
-
-    /** Constant which can be used as a file suffix to indicate an SGI
-        RGB file. */
-    public static final String SGI_RGB = "rgb";
-
-    /** Constant which can be used as a file suffix to indicate a GIF
-        file. */
-    public static final String GIF     = "gif";
-
-    /** Constant which can be used as a file suffix to indicate a JPEG
-        file. */
-    public static final String JPG     = "jpg";
-
-    /** Constant which can be used as a file suffix to indicate a PNG
-        file. */
-    public static final String PNG     = "png";
-
-    /** Constant which can be used as a file suffix to indicate a Targa
-        file. */
-    public static final String TGA     = "tga";
-
-    /** Constant which can be used as a file suffix to indicate a TIFF
-        file. */
-    public static final String TIFF    = "tiff";
-
-    private static final boolean DEBUG = Debug.debug("TextureIO");
-
-    // For manually disabling the use of the texture rectangle
-    // extensions so you know the texture target is GL_TEXTURE_2D; this
-    // is useful for shader writers (thanks to Chris Campbell for this
-    // observation)
-    private static boolean texRectEnabled = true;
-
-    //----------------------------------------------------------------------
-    // methods that *do not* require a current context
-    // These methods assume RGB or RGBA textures.
-    // Some texture providers may not recognize the file format unless
-    // the fileSuffix is specified, so it is strongly recommended to
-    // specify it wherever it is known.
-    // Some texture providers may also only support one kind of input,
-    // i.e., reading from a file as opposed to a stream.
-
-    /**
-     * Creates a TextureData from the given file. Does no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param file the file from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the file, or null if none of the
-     *         registered texture providers could read the file
-     * @throws IOException if an error occurred while reading the file
-     */
-    public static TextureData newTextureData(GLProfile glp, File file,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException {
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(file);
-        }
-        return newTextureDataImpl(glp, file, 0, 0, mipmap, fileSuffix);
-    }
-
-    /**
-     * Creates a TextureData from the given stream. Does no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param stream the stream from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the stream, or null if none of the
-     *         registered texture providers could read the stream
-     * @throws IOException if an error occurred while reading the stream
-     */
-    public static TextureData newTextureData(GLProfile glp, InputStream stream,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException {
-        return newTextureDataImpl(glp, stream, 0, 0, mipmap, fileSuffix);
-    }
-
-    /**
-     * Creates a TextureData from the given URL. Does no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param url the URL from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the URL, or null if none of the
-     *         registered texture providers could read the URL
-     * @throws IOException if an error occurred while reading the URL
-     */
-    public static TextureData newTextureData(GLProfile glp, URL url,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException {
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(url.getPath());
-        }
-        return newTextureDataImpl(glp, url, 0, 0, mipmap, fileSuffix);
-    }
-
-    //----------------------------------------------------------------------
-    // These methods make no assumption about the OpenGL internal format
-    // or pixel format of the texture; they must be specified by the
-    // user. It is not allowed to supply 0 (indicating no preference)
-    // for either the internalFormat or the pixelFormat;
-    // IllegalArgumentException will be thrown in this case.
-
-    /**
-     * Creates a TextureData from the given file, using the specified
-     * OpenGL internal format and pixel format for the texture which
-     * will eventually result. The internalFormat and pixelFormat must
-     * be specified and may not be zero; to use default values, use the
-     * variant of this method which does not take these arguments. Does
-     * no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param file the file from which to read the texture data
-     * @param internalFormat the OpenGL internal format of the texture
-     *                   which will eventually result from the TextureData
-     * @param pixelFormat the OpenGL pixel format of the texture
-     *                    which will eventually result from the TextureData
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the file, or null if none of the
-     *         registered texture providers could read the file
-     * @throws IllegalArgumentException if either internalFormat or
-     *                                  pixelFormat was 0
-     * @throws IOException if an error occurred while reading the file
-     */
-    public static TextureData newTextureData(GLProfile glp, File file,
-                                             int internalFormat,
-                                             int pixelFormat,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException, IllegalArgumentException {
-        if ((internalFormat == 0) || (pixelFormat == 0)) {
-            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
-        }
-
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(file);
-        }
-
-        return newTextureDataImpl(glp, file, internalFormat, pixelFormat, mipmap, fileSuffix);
-    }
-
-    /**
-     * Creates a TextureData from the given stream, using the specified
-     * OpenGL internal format and pixel format for the texture which
-     * will eventually result. The internalFormat and pixelFormat must
-     * be specified and may not be zero; to use default values, use the
-     * variant of this method which does not take these arguments. Does
-     * no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param stream the stream from which to read the texture data
-     * @param internalFormat the OpenGL internal format of the texture
-     *                   which will eventually result from the TextureData
-     * @param pixelFormat the OpenGL pixel format of the texture
-     *                    which will eventually result from the TextureData
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the stream, or null if none of the
-     *         registered texture providers could read the stream
-     * @throws IllegalArgumentException if either internalFormat or
-     *                                  pixelFormat was 0
-     * @throws IOException if an error occurred while reading the stream
-     */
-    public static TextureData newTextureData(GLProfile glp, InputStream stream,
-                                             int internalFormat,
-                                             int pixelFormat,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException, IllegalArgumentException {
-        if ((internalFormat == 0) || (pixelFormat == 0)) {
-            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
-        }
-
-        return newTextureDataImpl(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
-    }
-
-    /**
-     * Creates a TextureData from the given URL, using the specified
-     * OpenGL internal format and pixel format for the texture which
-     * will eventually result. The internalFormat and pixelFormat must
-     * be specified and may not be zero; to use default values, use the
-     * variant of this method which does not take these arguments. Does
-     * no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param url the URL from which to read the texture data
-     * @param internalFormat the OpenGL internal format of the texture
-     *                   which will eventually result from the TextureData
-     * @param pixelFormat the OpenGL pixel format of the texture
-     *                    which will eventually result from the TextureData
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the URL, or null if none of the
-     *         registered texture providers could read the URL
-     * @throws IllegalArgumentException if either internalFormat or
-     *                                  pixelFormat was 0
-     * @throws IOException if an error occurred while reading the URL
-     */
-    public static TextureData newTextureData(GLProfile glp, URL url,
-                                             int internalFormat,
-                                             int pixelFormat,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException, IllegalArgumentException {
-        if ((internalFormat == 0) || (pixelFormat == 0)) {
-            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
-        }
-
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(url.getPath());
-        }
-
-        return newTextureDataImpl(glp, url, internalFormat, pixelFormat, mipmap, fileSuffix);
-    }
-
-    //----------------------------------------------------------------------
-    // methods that *do* require a current context
-    //
-
-    /** 
-     * Creates an OpenGL texture object from the specified TextureData
-     * using the current OpenGL context.
-     *
-     * @param data the texture data to turn into an OpenGL texture
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     * @throws IllegalArgumentException if the passed TextureData was null
-     */
-    public static Texture newTexture(TextureData data) throws GLException, IllegalArgumentException {
-        if (data == null) {
-            throw new IllegalArgumentException("Null TextureData");
-        }
-        return new Texture(data);
-    }
-
-    /** 
-     * Creates an OpenGL texture object from the specified file using
-     * the current OpenGL context.
-     *
-     * @param file the file from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @throws IOException if an error occurred while reading the file
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(File file, boolean mipmap) throws IOException, GLException {
-        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
-        TextureData data = newTextureData(glp, file, mipmap, FileUtil.getFileSuffix(file));
-        Texture texture = newTexture(data);
-        data.flush();
-        return texture;
-    }
-
-    /** 
-     * Creates an OpenGL texture object from the specified stream using
-     * the current OpenGL context.
-     *
-     * @param stream the stream from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @throws IOException if an error occurred while reading the stream
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(InputStream stream, boolean mipmap, String fileSuffix) throws IOException, GLException {
-        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
-        TextureData data = newTextureData(glp, stream, mipmap, fileSuffix);
-        Texture texture = newTexture(data);
-        data.flush();
-        return texture;
-    }
-
-    /** 
-     * Creates an OpenGL texture object from the specified URL using the
-     * current OpenGL context.
-     *
-     * @param url the URL from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @throws IOException if an error occurred while reading the URL
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(URL url, boolean mipmap, String fileSuffix) throws IOException, GLException {
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(url.getPath());
-        }
-        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
-        TextureData data = newTextureData(glp, url, mipmap, fileSuffix);
-        Texture texture = newTexture(data);
-        data.flush();
-        return texture;
-    }
-
-    /** 
-     * Creates an OpenGL texture object associated with the given OpenGL
-     * texture target using the current OpenGL context. The texture has
-     * no initial data. This is used, for example, to construct cube
-     * maps out of multiple TextureData objects.
-     *
-     * @param target the OpenGL target type, eg GL.GL_TEXTURE_2D, 
-     *               GL.GL_TEXTURE_RECTANGLE_ARB
-     *
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(int target) throws GLException {
-        return new Texture(target);
-    }
-
-    /**
-     * Wraps an OpenGL texture ID from an external library and allows
-     * some of the base methods from the Texture class, such as
-     * binding and querying of texture coordinates, to be used with
-     * it. Attempts to update such textures' contents will yield
-     * undefined results.
-     *
-     * @param textureID the OpenGL texture object to wrap
-     * @param target the OpenGL texture target, eg GL.GL_TEXTURE_2D, 
-     *               GL2.GL_TEXTURE_RECTANGLE
-     * @param texWidth the width of the texture in pixels
-     * @param texHeight the height of the texture in pixels
-     * @param imgWidth the width of the image within the texture in
-     *          pixels (if the content is a sub-rectangle in the upper
-     *          left corner); otherwise, pass in texWidth
-     * @param imgHeight the height of the image within the texture in
-     *          pixels (if the content is a sub-rectangle in the upper
-     *          left corner); otherwise, pass in texHeight
-     * @param mustFlipVertically indicates whether the texture
-     *                           coordinates must be flipped vertically
-     *                           in order to properly display the
-     *                           texture
-     */
-    public static Texture newTexture(int textureID,
-				     int target,
-				     int texWidth,
-				     int texHeight,
-				     int imgWidth,
-				     int imgHeight,
-				     boolean mustFlipVertically) {
-	return new Texture(textureID,
-			   target,
-			   texWidth,
-			   texHeight,
-			   imgWidth,
-			   imgHeight,
-			   mustFlipVertically);
-    }
-
-    /**
-     * Writes the given texture to a file. The type of the file is
-     * inferred from its suffix. An OpenGL context must be current in
-     * order to fetch the texture data back from the OpenGL pipeline.
-     * This method causes the specified Texture to be bound to the
-     * GL_TEXTURE_2D state. If no suitable writer for the requested file
-     * format was found, throws an IOException. <P>
-     *
-     * Reasonable attempts are made to produce good results in the
-     * resulting images. The Targa, SGI and ImageIO writers produce
-     * results in the correct vertical orientation for those file
-     * formats. The DDS writer performs no vertical flip of the data,
-     * even in uncompressed mode. (It is impossible to perform such a
-     * vertical flip with compressed data.) Applications should keep
-     * this in mind when using this routine to save textures to disk for
-     * later re-loading. <P>
-     *
-     * Any mipmaps for the specified texture are currently discarded
-     * when it is written to disk, regardless of whether the underlying
-     * file format supports multiple mipmaps in a given file.
-     *
-     * @throws IOException if an error occurred during writing or no
-     *   suitable writer was found
-     * @throws GLException if no OpenGL context was current or an
-     *   OpenGL-related error occurred
-     */
-    public static void write(Texture texture, File file) throws IOException, GLException {
-        if (texture.getTarget() != GL.GL_TEXTURE_2D) {
-            throw new GLException("Only GL_TEXTURE_2D textures are supported");
-        }
-
-        // First fetch the texture data
-        GL _gl = GLContext.getCurrentGL();
-        if (!_gl.isGL2()) {
-            throw new GLException("Only GL2 supports fetching compressed images, GL: " + _gl);
-        }
-        GL2 gl = _gl.getGL2();
-
-        texture.bind();
-        int internalFormat = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_INTERNAL_FORMAT);
-        int width  = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_WIDTH);
-        int height = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_HEIGHT);
-        int border = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_BORDER);
-        TextureData data = null;
-        if (internalFormat == GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT ||
-            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ||
-            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ||
-            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT) {
-            // Fetch using glGetCompressedTexImage
-            int size   = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_COMPRESSED_IMAGE_SIZE);
-            ByteBuffer res = ByteBuffer.allocate(size);
-            gl.glGetCompressedTexImage(GL.GL_TEXTURE_2D, 0, res);
-            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, internalFormat, GL.GL_UNSIGNED_BYTE,
-                                   false, true, true, res, null);
-        } else {
-            int bytesPerPixel = 0;
-            int fetchedFormat = 0;
-            switch (internalFormat) {
-            case GL.GL_RGB:
-            case GL2.GL_BGR:
-            case GL.GL_RGB8:
-                bytesPerPixel = 3;
-                fetchedFormat = GL.GL_RGB;
-                break;
-            case GL.GL_RGBA:
-            case GL2.GL_BGRA:
-            case GL2.GL_ABGR_EXT:
-            case GL.GL_RGBA8:
-                bytesPerPixel = 4;
-                fetchedFormat = GL.GL_RGBA;
-                break;
-            default:
-                throw new IOException("Unsupported texture internal format 0x" + Integer.toHexString(internalFormat));
-            }
-
-            // Fetch using glGetTexImage
-            int packAlignment  = glGetInteger(GL.GL_PACK_ALIGNMENT);
-            int packRowLength  = glGetInteger(GL2.GL_PACK_ROW_LENGTH);
-            int packSkipRows   = glGetInteger(GL2.GL_PACK_SKIP_ROWS);
-            int packSkipPixels = glGetInteger(GL2.GL_PACK_SKIP_PIXELS);
-            int packSwapBytes  = glGetInteger(GL2.GL_PACK_SWAP_BYTES);
-
-            gl.glPixelStorei(GL.GL_PACK_ALIGNMENT, 1);
-            gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, 0);
-            gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, 0);
-            gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, 0);
-            gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, 0);
-
-            ByteBuffer res = ByteBuffer.allocate((width + (2 * border)) *
-                                                 (height + (2 * border)) *
-                                                 bytesPerPixel);
-            if (DEBUG) {
-                System.out.println("Allocated buffer of size " + res.remaining() + " for fetched image (" +
-                                   ((fetchedFormat == GL.GL_RGB) ? "GL_RGB" : "GL_RGBA") + ")");
-            }
-            gl.glGetTexImage(GL.GL_TEXTURE_2D, 0, fetchedFormat, GL.GL_UNSIGNED_BYTE, res);
-
-            gl.glPixelStorei(GL.GL_PACK_ALIGNMENT, packAlignment);
-            gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, packRowLength);
-            gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, packSkipRows);
-            gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, packSkipPixels);
-            gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, packSwapBytes);
-      
-            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, fetchedFormat, GL.GL_UNSIGNED_BYTE,
-                                   false, false, false, res, null);
-
-            if (DEBUG) {
-                System.out.println("data.getPixelFormat() = " +
-                                   ((data.getPixelFormat() == GL.GL_RGB) ? "GL_RGB" : "GL_RGBA"));
-            }
-        }
-
-        write(data, file);
-    }
-  
-    public static void write(TextureData data, File file) throws IOException, GLException {
-        for (Iterator iter = textureWriters.iterator(); iter.hasNext(); ) {
-            TextureWriter writer = (TextureWriter) iter.next();
-            if (writer.write(file, data)) {
-                return;
-            }
-        }
-
-        throw new IOException("No suitable texture writer found for "+file.getAbsolutePath());
-    }
-  
-    //----------------------------------------------------------------------
-    // SPI support
-    //
-
-    /** Adds a TextureProvider to support reading of a new file
-        format. */
-    public static void addTextureProvider(TextureProvider provider) {
-        // Must always add at the front so the ImageIO provider is last,
-        // so we don't accidentally use it instead of a user's possibly
-        // more optimal provider
-        textureProviders.add(0, provider);
-    }
-
-    /** Adds a TextureWriter to support writing of a new file
-        format. */
-    public static void addTextureWriter(TextureWriter writer) {
-        // Must always add at the front so the ImageIO writer is last,
-        // so we don't accidentally use it instead of a user's possibly
-        // more optimal writer
-        textureWriters.add(0, writer);
-    }
-
-    //---------------------------------------------------------------------------
-    // Global disabling of texture rectangle extension
-    //
-
-    /** Toggles the use of the GL_ARB_texture_rectangle extension by the
-        TextureIO classes. By default, on hardware supporting this
-        extension, the TextureIO classes may use the
-        GL_ARB_texture_rectangle extension for non-power-of-two
-        textures. (If the hardware supports the
-        GL_ARB_texture_non_power_of_two extension, that one is
-        preferred.) In some situations, for example when writing
-        shaders, it is advantageous to force the texture target to
-        always be GL_TEXTURE_2D in order to have one version of the
-        shader, even at the expense of texture memory in the case where
-        NPOT textures are not supported. This method allows the use of
-        the GL_ARB_texture_rectangle extension to be turned off globally
-        for this purpose. The default is that the use of the extension
-        is enabled. */
-    public static void setTexRectEnabled(boolean enabled) {
-        texRectEnabled = enabled;
-    }
-
-    /** Indicates whether the GL_ARB_texture_rectangle extension is
-        allowed to be used for non-power-of-two textures; see {@link
-        #setTexRectEnabled setTexRectEnabled}. */
-    public static boolean isTexRectEnabled() {
-        return texRectEnabled;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    private static List/*<TextureProvider>*/ textureProviders = new ArrayList/*<TextureProvider>*/();
-    private static List/*<TextureWriter>*/   textureWriters   = new ArrayList/*<TextureWriter>*/();
-
-    static {
-        // ImageIO provider, the fall-back, must be the first one added
-        if(GLProfile.isAWTJOGLAvailable()) {
-            try {
-                // Use reflection to avoid compile-time dependencies on AWT-related classes
-                TextureProvider provider = (TextureProvider)
-                    Class.forName("com.sun.opengl.util.texture.spi.awt.IIOTextureProvider").newInstance();
-                addTextureProvider(provider);
-            } catch (Exception e) {
-                if (DEBUG) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        // Other special-case providers
-        addTextureProvider(new DDSTextureProvider());
-        addTextureProvider(new SGITextureProvider());
-        addTextureProvider(new TGATextureProvider());
-
-        // ImageIO writer, the fall-back, must be the first one added
-        if(GLProfile.isAWTJOGLAvailable()) {
-            try {
-                // Use reflection to avoid compile-time dependencies on AWT-related classes
-                TextureWriter writer = (TextureWriter)
-                    Class.forName("com.sun.opengl.util.texture.spi.awt.IIOTextureWriter").newInstance();
-                addTextureWriter(writer);
-            } catch (Exception e) {
-                if (DEBUG) {
-                    e.printStackTrace();
-                }
-            } catch (Error e) {
-                if (DEBUG) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        // Other special-case writers
-        addTextureWriter(new DDSTextureWriter());
-        addTextureWriter(new SGITextureWriter());
-        addTextureWriter(new TGATextureWriter());
-        addTextureWriter(new NetPbmTextureWriter());
-    }
-
-    // Implementation methods
-    private static TextureData newTextureDataImpl(GLProfile glp, File file,
-                                                  int internalFormat,
-                                                  int pixelFormat,
-                                                  boolean mipmap,
-                                                  String fileSuffix) throws IOException {
-        if (file == null) {
-            throw new IOException("File was null");
-        }
-
-        fileSuffix = toLowerCase(fileSuffix);
-
-        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
-            TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(glp, file,
-                                                       internalFormat,
-                                                       pixelFormat,
-                                                       mipmap,
-                                                       fileSuffix);
-            if (data != null) {
-                return data;
-            }
-        }
-
-        throw new IOException("No suitable reader for given file "+file.getAbsolutePath());
-    }
-
-    private static TextureData newTextureDataImpl(GLProfile glp, InputStream stream,
-                                                  int internalFormat,
-                                                  int pixelFormat,
-                                                  boolean mipmap,
-                                                  String fileSuffix) throws IOException {
-        if (stream == null) {
-            throw new IOException("Stream was null");
-        }
-
-        fileSuffix = toLowerCase(fileSuffix);
-
-        // Note: use of BufferedInputStream works around 4764639/4892246
-        if (!(stream instanceof BufferedInputStream)) {
-            stream = new BufferedInputStream(stream);
-        }
-
-        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
-            TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(glp, stream,
-                                                       internalFormat,
-                                                       pixelFormat,
-                                                       mipmap,
-                                                       fileSuffix);
-            if (data != null) {
-                return data;
-            }
-        }
-
-        throw new IOException("No suitable reader for given stream");
-    }
-
-    private static TextureData newTextureDataImpl(GLProfile glp, URL url,
-                                                  int internalFormat,
-                                                  int pixelFormat,
-                                                  boolean mipmap,
-                                                  String fileSuffix) throws IOException {
-        if (url == null) {
-            throw new IOException("URL was null");
-        }
-
-        fileSuffix = toLowerCase(fileSuffix);
-
-        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
-            TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(glp, url,
-                                                       internalFormat,
-                                                       pixelFormat,
-                                                       mipmap,
-                                                       fileSuffix);
-            if (data != null) {
-                return data;
-            }
-        }
-
-        throw new IOException("No suitable reader for given URL "+url);
-    }
-
-    //----------------------------------------------------------------------
-    // DDS provider -- supports files only for now
-    static class DDSTextureProvider implements TextureProvider {
-        public TextureData newTextureData(GLProfile glp, File file,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            if (DDS.equals(fileSuffix) ||
-                DDS.equals(FileUtil.getFileSuffix(file))) {
-                DDSImage image = DDSImage.read(file);
-                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
-            }
-
-            return null;
-        }
-
-        public TextureData newTextureData(GLProfile glp, InputStream stream,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            if (DDS.equals(fileSuffix) ||
-                DDSImage.isDDSImage(stream)) {
-                byte[] data = StreamUtil.readAll2Array(stream);
-                ByteBuffer buf = ByteBuffer.wrap(data);
-                DDSImage image = DDSImage.read(buf);
-                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
-            }
-
-            return null;
-        }
-
-        public TextureData newTextureData(GLProfile glp, URL url,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            InputStream stream = new BufferedInputStream(url.openStream());
-            try {
-                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
-            } finally {
-                stream.close();
-            }
-        }
-
-        private TextureData newTextureData(GLProfile glp, final DDSImage image,
-                                           int internalFormat,
-                                           int pixelFormat,
-                                           boolean mipmap) {
-            DDSImage.ImageInfo info = image.getMipMap(0);
-            if (pixelFormat == 0) {
-                switch (image.getPixelFormat()) {
-                case DDSImage.D3DFMT_R8G8B8:
-                    pixelFormat = GL.GL_RGB;
-                    break;
-                default:
-                    pixelFormat = GL.GL_RGBA;
-                    break;
-                }
-            }
-            if (info.isCompressed()) {
-                switch (info.getCompressionFormat()) {
-                case DDSImage.D3DFMT_DXT1:
-                    internalFormat = GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
-                    break;
-                case DDSImage.D3DFMT_DXT3:
-                    internalFormat = GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-                    break;
-                case DDSImage.D3DFMT_DXT5:
-                    internalFormat = GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-                    break;
-                default:
-                    throw new RuntimeException("Unsupported DDS compression format \"" +
-                                               DDSImage.getCompressionFormatName(info.getCompressionFormat()) + "\"");
-                }
-            }
-            if (internalFormat == 0) {
-                switch (image.getPixelFormat()) {
-                case DDSImage.D3DFMT_R8G8B8:
-                    pixelFormat = GL.GL_RGB;
-                    break;
-                default:
-                    pixelFormat = GL.GL_RGBA;
-                    break;
-                }
-            }
-            TextureData.Flusher flusher = new TextureData.Flusher() {
-                    public void flush() {
-                        image.close();
-                    }
-                };
-            TextureData data;
-            if (mipmap && image.getNumMipMaps() > 0) {
-                Buffer[] mipmapData = new Buffer[image.getNumMipMaps()];
-                for (int i = 0; i < image.getNumMipMaps(); i++) {
-                    mipmapData[i] = image.getMipMap(i).getData();
-                }
-                data = new TextureData(glp, internalFormat,
-                                       info.getWidth(),
-                                       info.getHeight(),
-                                       0,
-                                       pixelFormat,
-                                       GL.GL_UNSIGNED_BYTE,
-                                       info.isCompressed(),
-                                       true,
-                                       mipmapData,
-                                       flusher);
-            } else {
-                // Fix this up for the end user because we can't generate
-                // mipmaps for compressed textures
-                mipmap = false;
-                data = new TextureData(glp, internalFormat,
-                                       info.getWidth(),
-                                       info.getHeight(),
-                                       0,
-                                       pixelFormat,
-                                       GL.GL_UNSIGNED_BYTE,
-                                       mipmap,
-                                       info.isCompressed(),
-                                       true,
-                                       info.getData(),
-                                       flusher);
-            }
-            return data;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // Base class for SGI RGB and TGA image providers
-    static abstract class StreamBasedTextureProvider implements TextureProvider {
-        public TextureData newTextureData(GLProfile glp, File file,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            InputStream inStream = new BufferedInputStream(new FileInputStream(file));
-            try {
-                // The SGIImage and TGAImage implementations use InputStreams
-                // anyway so there isn't much point in having a separate code
-                // path for files
-                return newTextureData(glp, inStream,
-                                      internalFormat,
-                                      pixelFormat,
-                                      mipmap,
-                                      ((fileSuffix != null) ? fileSuffix : FileUtil.getFileSuffix(file)));
-            } finally {
-                inStream.close();
-            }
-        }
-
-        public TextureData newTextureData(GLProfile glp, URL url,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            InputStream stream = new BufferedInputStream(url.openStream());
-            try {
-                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
-            } finally {
-                stream.close();
-            }
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // SGI RGB image provider
-    static class SGITextureProvider extends StreamBasedTextureProvider {
-        public TextureData newTextureData(GLProfile glp, InputStream stream,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            if (SGI.equals(fileSuffix) ||
-                SGI_RGB.equals(fileSuffix) ||
-                SGIImage.isSGIImage(stream)) {
-                SGIImage image = SGIImage.read(stream);
-                if (pixelFormat == 0) {
-                    pixelFormat = image.getFormat();
-                }
-                if (internalFormat == 0) {
-                    internalFormat = image.getFormat();
-                }
-                return new TextureData(glp, internalFormat,
-                                       image.getWidth(),
-                                       image.getHeight(),
-                                       0,
-                                       pixelFormat,
-                                       GL.GL_UNSIGNED_BYTE,
-                                       mipmap,
-                                       false,
-                                       false,
-                                       ByteBuffer.wrap(image.getData()),
-                                       null);
-            }
-
-            return null;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // TGA (Targa) image provider
-    static class TGATextureProvider extends StreamBasedTextureProvider {
-        public TextureData newTextureData(GLProfile glp, InputStream stream,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            if (TGA.equals(fileSuffix)) {
-                TGAImage image = TGAImage.read(stream);
-                if (pixelFormat == 0) {
-                    pixelFormat = image.getGLFormat();
-                }
-                if (internalFormat == 0) {
-                    GL gl = GLContext.getCurrentGL();
-                    if(gl.isGL2()) {
-                        internalFormat = GL.GL_RGBA8;
-                    } else {
-                        internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB;
-                    }
-                }
-                return new TextureData(glp, internalFormat,
-                                       image.getWidth(),
-                                       image.getHeight(),
-                                       0,
-                                       pixelFormat,
-                                       GL.GL_UNSIGNED_BYTE,
-                                       mipmap,
-                                       false,
-                                       false,
-                                       image.getData(),
-                                       null);
-            }
-
-            return null;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // DDS texture writer
-    //
-    static class DDSTextureWriter implements TextureWriter {
-        public boolean write(File file,
-                             TextureData data) throws IOException {
-            if (DDS.equals(FileUtil.getFileSuffix(file))) {
-                // See whether the DDS writer can handle this TextureData
-                int pixelFormat = data.getPixelFormat();
-                int pixelType   = data.getPixelType();
-                if (pixelType != GL.GL_BYTE &&
-                    pixelType != GL.GL_UNSIGNED_BYTE) {
-                    throw new IOException("DDS writer only supports byte / unsigned byte textures");
-                }
-
-                int d3dFormat = 0;
-                // FIXME: some of these are probably not completely correct and would require swizzling
-                switch (pixelFormat) {
-                case GL.GL_RGB:                        d3dFormat = DDSImage.D3DFMT_R8G8B8; break;
-                case GL.GL_RGBA:                       d3dFormat = DDSImage.D3DFMT_A8R8G8B8; break;
-                case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:  d3dFormat = DDSImage.D3DFMT_DXT1; break;
-                case GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: throw new IOException("RGBA DXT1 not yet supported");
-                case GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: d3dFormat = DDSImage.D3DFMT_DXT3; break;
-                case GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: d3dFormat = DDSImage.D3DFMT_DXT5; break;
-                default: throw new IOException("Unsupported pixel format 0x" + Integer.toHexString(pixelFormat) + " by DDS writer");
-                }
-        
-                ByteBuffer[] mipmaps = null;
-                if (data.getMipmapData() != null) {
-                    mipmaps = new ByteBuffer[data.getMipmapData().length];
-                    for (int i = 0; i < mipmaps.length; i++) {
-                        mipmaps[i] = (ByteBuffer) data.getMipmapData()[i];
-                    }
-                } else {
-                    mipmaps = new ByteBuffer[] { (ByteBuffer) data.getBuffer() };
-                }
-
-                DDSImage image = DDSImage.createFromData(d3dFormat,
-                                                         data.getWidth(),
-                                                         data.getHeight(),
-                                                         mipmaps);
-                image.write(file);
-                return true;
-            }
-
-            return false;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // SGI (rgb) texture writer
-    //
-    static class SGITextureWriter implements TextureWriter {
-        public boolean write(File file,
-                             TextureData data) throws IOException {
-            String fileSuffix = FileUtil.getFileSuffix(file);
-            if (SGI.equals(fileSuffix) ||
-                SGI_RGB.equals(fileSuffix)) {
-                // See whether the SGI writer can handle this TextureData
-                int pixelFormat = data.getPixelFormat();
-                int pixelType   = data.getPixelType();
-                if ((pixelFormat == GL.GL_RGB ||
-                     pixelFormat == GL.GL_RGBA) &&
-                    (pixelType == GL.GL_BYTE ||
-                     pixelType == GL.GL_UNSIGNED_BYTE)) {
-                    ByteBuffer buf = ((data.getBuffer() != null) ?
-                                      (ByteBuffer) data.getBuffer() :
-                                      (ByteBuffer) data.getMipmapData()[0]);
-                    byte[] bytes;
-                    if (buf.hasArray()) {
-                        bytes = buf.array();
-                    } else {
-                        buf.rewind();
-                        bytes = new byte[buf.remaining()];
-                        buf.get(bytes);
-                        buf.rewind();
-                    }
-
-                    SGIImage image = SGIImage.createFromData(data.getWidth(),
-                                                             data.getHeight(),
-                                                             (pixelFormat == GL.GL_RGBA),
-                                                             bytes);
-                    image.write(file, false);
-                    return true;
-                }
-
-                throw new IOException("SGI writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
-            }
-
-            return false;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // TGA (Targa) texture writer
-  
-    static class TGATextureWriter implements TextureWriter {
-        public boolean write(File file,
-                             TextureData data) throws IOException {
-            if (TGA.equals(FileUtil.getFileSuffix(file))) {
-                // See whether the TGA writer can handle this TextureData
-                int pixelFormat = data.getPixelFormat();
-                int pixelType   = data.getPixelType();
-                if ((pixelFormat == GL.GL_RGB ||
-                     pixelFormat == GL.GL_RGBA) &&
-                    (pixelType == GL.GL_BYTE ||
-                     pixelType == GL.GL_UNSIGNED_BYTE)) {
-                    ByteBuffer buf = ((data.getBuffer() != null) ?
-                                      (ByteBuffer) data.getBuffer() :
-                                      (ByteBuffer) data.getMipmapData()[0]);
-                    // Must reverse order of red and blue channels to get correct results
-                    int skip = ((pixelFormat == GL.GL_RGB) ? 3 : 4);
-                    for (int i = 0; i < buf.remaining(); i += skip) {
-                        byte red  = buf.get(i + 0);
-                        byte blue = buf.get(i + 2);
-                        buf.put(i + 0, blue);
-                        buf.put(i + 2, red);
-                    }
-
-                    TGAImage image = TGAImage.createFromData(data.getWidth(),
-                                                             data.getHeight(),
-                                                             (pixelFormat == GL.GL_RGBA),
-                                                             false,
-                                                             ((data.getBuffer() != null) ?
-                                                              (ByteBuffer) data.getBuffer() :
-                                                              (ByteBuffer) data.getMipmapData()[0]));
-                    image.write(file);
-                    return true;
-                }
-
-                throw new IOException("TGA writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
-            }
-
-            return false;
-        }    
-    }
-
-    //----------------------------------------------------------------------
-    // Helper routines
-    //
-
-    private static int glGetInteger(int pname) {
-        int[] tmp = new int[1];
-        GL gl = GLContext.getCurrentGL();
-        gl.glGetIntegerv(pname, tmp, 0);
-        return tmp[0];
-    }
-
-    private static int glGetTexLevelParameteri(GL2 gl, int target, int level, int pname) {
-        int[] tmp = new int[1];
-        gl.glGetTexLevelParameteriv(target, 0, pname, tmp, 0);
-        return tmp[0];
-    }
-
-    private static String toLowerCase(String arg) {
-        if (arg == null) {
-            return null;
-        }
-
-        return arg.toLowerCase();
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java b/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java
deleted file mode 100755
index f98feb8e9..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.opengl.util.texture.awt;
-
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Transparency;
-import java.awt.color.*;
-import java.awt.image.*;
-import java.nio.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.texture.*;
-
-public class AWTTextureData extends TextureData {
-    // Mechanism for lazily converting input BufferedImages with custom
-    // ColorModels to standard ones for uploading to OpenGL, as well as
-    // backing off from the optimizations of hoping that either
-    // GL_EXT_abgr or OpenGL 1.2 are present
-    private BufferedImage imageForLazyCustomConversion;
-    private boolean expectingEXTABGR;
-    private boolean expectingGL12;
-
-    private static final ColorModel rgbaColorModel =
-        new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
-                                new int[] {8, 8, 8, 8}, true, true, 
-                                Transparency.TRANSLUCENT,
-                                DataBuffer.TYPE_BYTE);
-    private static final ColorModel rgbColorModel =
-        new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
-                                new int[] {8, 8, 8, 0}, false, false,
-                                Transparency.OPAQUE,
-                                DataBuffer.TYPE_BYTE);
-
-
-    /** 
-     * Constructs a new TextureData object with the specified parameters
-     * and data contained in the given BufferedImage. The resulting
-     * TextureData "wraps" the contents of the BufferedImage, so if a
-     * modification is made to the BufferedImage between the time the
-     * TextureData is constructed and when a Texture is made from the
-     * TextureData, that modification will be visible in the resulting
-     * Texture.
-     *
-     * @param glp      the OpenGL Profile this texture data should be
-     *                       created for.
-     * @param internalFormat the OpenGL internal format for the
-     *                       resulting texture; may be 0, in which case
-     *                       it is inferred from the image's type
-     * @param pixelFormat    the OpenGL internal format for the
-     *                       resulting texture; may be 0, in which case
-     *                       it is inferred from the image's type (note:
-     *                       this argument is currently always ignored)
-     * @param mipmap         indicates whether mipmaps should be
-     *                       autogenerated (using GLU) for the resulting
-     *                       texture
-     * @param image          the image containing the texture data
-     */
-    public AWTTextureData(GLProfile glp, 
-                          int internalFormat,
-                          int pixelFormat,
-                          boolean mipmap,
-                          BufferedImage image) {
-        super(glp);
-        if (internalFormat == 0) {
-            this.internalFormat = image.getColorModel().hasAlpha() ? GL.GL_RGBA : GL.GL_RGB;
-        } else {
-            this.internalFormat = internalFormat;
-        }
-        createFromImage(glp, image);
-        this.mipmap = mipmap;
-        if (buffer != null) {
-            estimatedMemorySize = estimatedMemorySize(buffer);
-        } else {
-            // In the lazy custom conversion case we don't yet have a buffer
-            if (imageForLazyCustomConversion != null) {
-                estimatedMemorySize = estimatedMemorySize(wrapImageDataBuffer(imageForLazyCustomConversion));
-            }
-        }
-    }
-
-    /** Returns the intended OpenGL pixel format of the texture data. */
-    public int getPixelFormat() {
-        if (imageForLazyCustomConversion != null) {
-            if (!((expectingEXTABGR && haveEXTABGR) ||
-                  (expectingGL12    && haveGL12))) {
-                revertPixelFormatAndType();
-            }
-        }
-        return pixelFormat;
-    }
-    /** Returns the intended OpenGL pixel type of the texture data. */
-    public int getPixelType() {
-        if (imageForLazyCustomConversion != null) {
-            if (!((expectingEXTABGR && haveEXTABGR) ||
-                  (expectingGL12    && haveGL12))) {
-                revertPixelFormatAndType();
-            }
-        }
-        return pixelType;
-    }
-
-    /** Returns the texture data, or null if it is specified as a set of mipmaps. */
-    public Buffer getBuffer() {
-        if (imageForLazyCustomConversion != null) {
-            if (!((expectingEXTABGR && haveEXTABGR) ||
-                  (expectingGL12    && haveGL12))) {
-                revertPixelFormatAndType();
-                // Must present the illusion to the end user that we are simply
-                // wrapping the input BufferedImage
-                createFromCustom(imageForLazyCustomConversion);
-            }
-        }
-        return buffer;
-    }
-
-    private void createFromImage(GLProfile glp, BufferedImage image) {
-        pixelType = 0; // Determine from image
-        mustFlipVertically = true;
-
-        width = image.getWidth();
-        height = image.getHeight();
-
-        int scanlineStride;
-
-        SampleModel sm = image.getRaster().getSampleModel();
-        if (sm instanceof SinglePixelPackedSampleModel) {
-            scanlineStride =
-                ((SinglePixelPackedSampleModel)sm).getScanlineStride();
-        } else if (sm instanceof MultiPixelPackedSampleModel) {
-            scanlineStride =
-                ((MultiPixelPackedSampleModel)sm).getScanlineStride();
-        } else if (sm instanceof ComponentSampleModel) {
-            scanlineStride =
-                ((ComponentSampleModel)sm).getScanlineStride();
-        } else {
-            // This will only happen for TYPE_CUSTOM anyway
-            setupLazyCustomConversion(image);
-            return;
-        }
-
-        width = image.getWidth();
-        height = image.getHeight();
-
-        if (glp.isGL2GL3()) {
-            switch (image.getType()) {
-                case BufferedImage.TYPE_INT_RGB:
-                    pixelFormat = GL2GL3.GL_BGRA;
-                    pixelType = GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV;
-                    rowLength = scanlineStride;
-                    alignment = 4;
-                    expectingGL12 = true;
-                    setupLazyCustomConversion(image);
-                    break;
-                case BufferedImage.TYPE_INT_ARGB_PRE:
-                    pixelFormat = GL2GL3.GL_BGRA;
-                    pixelType = GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV;
-                    rowLength = scanlineStride;
-                    alignment = 4;
-                    expectingGL12 = true;
-                    setupLazyCustomConversion(image);
-                    break;
-                case BufferedImage.TYPE_INT_BGR:
-                    pixelFormat = GL.GL_RGBA;
-                    pixelType = GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV;
-                    rowLength = scanlineStride;
-                    alignment = 4;
-                    expectingGL12 = true;
-                    setupLazyCustomConversion(image);
-                    break;
-                case BufferedImage.TYPE_3BYTE_BGR:
-                    {
-                        // we can pass the image data directly to OpenGL only if
-                        // we have an integral number of pixels in each scanline
-                        if ((scanlineStride % 3) == 0) {
-                            pixelFormat = GL2GL3.GL_BGR;
-                            pixelType = GL.GL_UNSIGNED_BYTE;
-                            rowLength = scanlineStride / 3;
-                            alignment = 1;
-                        } else {
-                            setupLazyCustomConversion(image);
-                            return;
-                        }
-                    }
-                    break;
-                case BufferedImage.TYPE_4BYTE_ABGR_PRE:
-                    {
-                        // we can pass the image data directly to OpenGL only if
-                        // we have an integral number of pixels in each scanline
-                        // and only if the GL_EXT_abgr extension is present
-    
-                        // NOTE: disabling this code path for now as it appears it's
-                        // buggy at least on some NVidia drivers and doesn't perform
-                        // the necessary byte swapping (FIXME: needs more
-                        // investigation)
-                        if ((scanlineStride % 4) == 0 && glp.isGL2() && false) {
-                            pixelFormat = GL2.GL_ABGR_EXT;
-                            pixelType = GL.GL_UNSIGNED_BYTE;
-                            rowLength = scanlineStride / 4;
-                            alignment = 4;
-    
-                            // Store a reference to the original image for later in
-                            // case it turns out that we don't have GL_EXT_abgr at the
-                            // time we're going to do the texture upload to OpenGL
-                            setupLazyCustomConversion(image);
-                            expectingEXTABGR = true;
-                            break;
-                        } else {
-                            setupLazyCustomConversion(image);
-                            return;
-                        }
-                    }
-                case BufferedImage.TYPE_USHORT_565_RGB:
-                    pixelFormat = GL.GL_RGB;
-                    pixelType = GL.GL_UNSIGNED_SHORT_5_6_5;
-                    rowLength = scanlineStride;
-                    alignment = 2;
-                    expectingGL12 = true;
-                    setupLazyCustomConversion(image);
-                    break;
-                case BufferedImage.TYPE_USHORT_555_RGB:
-                    pixelFormat = GL2GL3.GL_BGRA;
-                    pixelType = GL2GL3.GL_UNSIGNED_SHORT_1_5_5_5_REV;
-                    rowLength = scanlineStride;
-                    alignment = 2;
-                    expectingGL12 = true;
-                    setupLazyCustomConversion(image);
-                    break;
-                case BufferedImage.TYPE_BYTE_GRAY:
-                    pixelFormat = GL.GL_LUMINANCE;
-                    pixelType = GL.GL_UNSIGNED_BYTE;
-                    rowLength = scanlineStride;
-                    alignment = 1;
-                    break;
-                case BufferedImage.TYPE_USHORT_GRAY:
-                    pixelFormat = GL.GL_LUMINANCE;
-                    pixelType = GL.GL_UNSIGNED_SHORT;
-                    rowLength = scanlineStride;
-                    alignment = 2;
-                    break;
-                    // Note: TYPE_INT_ARGB and TYPE_4BYTE_ABGR images go down the
-                    // custom code path to satisfy the invariant that images with an
-                    // alpha channel always go down with premultiplied alpha.
-                case BufferedImage.TYPE_INT_ARGB:
-                case BufferedImage.TYPE_4BYTE_ABGR:
-                case BufferedImage.TYPE_BYTE_BINARY:
-                case BufferedImage.TYPE_BYTE_INDEXED:
-                case BufferedImage.TYPE_CUSTOM:
-                default:
-                    ColorModel cm = image.getColorModel();
-                    if (cm.equals(rgbColorModel)) {
-                        pixelFormat = GL.GL_RGB;
-                        pixelType = GL.GL_UNSIGNED_BYTE;
-                        rowLength = scanlineStride / 3;
-                        alignment = 1;
-                    } else if (cm.equals(rgbaColorModel)) {
-                        pixelFormat = GL.GL_RGBA;
-                        pixelType = GL.GL_UNSIGNED_BYTE;
-                        rowLength = scanlineStride / 4; // FIXME: correct?
-                        alignment = 4;
-                    } else {
-                        setupLazyCustomConversion(image);
-                        return;
-                    }
-                    break;
-            }
-        } else {
-            switch (image.getType()) {
-                case BufferedImage.TYPE_INT_RGB:
-                    pixelFormat = GL.GL_RGB;
-                    pixelType = GL.GL_UNSIGNED_BYTE;
-                    rowLength = scanlineStride;
-                    alignment = 3;
-                    expectingGL12 = true;
-                    setupLazyCustomConversion(image);
-                    break;
-                case BufferedImage.TYPE_INT_ARGB_PRE:
-                    throw new GLException("INT_ARGB_PRE n.a.");
-                case BufferedImage.TYPE_INT_BGR:
-                    throw new GLException("INT_BGR n.a.");
-                case BufferedImage.TYPE_3BYTE_BGR:
-                    throw new GLException("INT_BGR n.a.");
-                case BufferedImage.TYPE_4BYTE_ABGR_PRE:
-                    throw new GLException("INT_BGR n.a.");
-                case BufferedImage.TYPE_USHORT_565_RGB:
-                    pixelFormat = GL.GL_RGB;
-                    pixelType = GL.GL_UNSIGNED_SHORT_5_6_5;
-                    rowLength = scanlineStride;
-                    alignment = 2;
-                    expectingGL12 = true;
-                    setupLazyCustomConversion(image);
-                    break;
-                case BufferedImage.TYPE_USHORT_555_RGB:
-                    pixelFormat = GL.GL_RGBA;
-                    pixelType = GL.GL_UNSIGNED_SHORT_5_5_5_1;
-                    rowLength = scanlineStride;
-                    alignment = 2;
-                    expectingGL12 = true;
-                    setupLazyCustomConversion(image);
-                    break;
-                case BufferedImage.TYPE_BYTE_GRAY:
-                    pixelFormat = GL.GL_LUMINANCE;
-                    pixelType = GL.GL_UNSIGNED_BYTE;
-                    rowLength = scanlineStride;
-                    alignment = 1;
-                    break;
-                case BufferedImage.TYPE_USHORT_GRAY:
-                    throw new GLException("USHORT_GRAY n.a.");
-                    // Note: TYPE_INT_ARGB and TYPE_4BYTE_ABGR images go down the
-                    // custom code path to satisfy the invariant that images with an
-                    // alpha channel always go down with premultiplied alpha.
-                case BufferedImage.TYPE_INT_ARGB:
-                case BufferedImage.TYPE_4BYTE_ABGR:
-                case BufferedImage.TYPE_BYTE_BINARY:
-                case BufferedImage.TYPE_BYTE_INDEXED:
-                case BufferedImage.TYPE_CUSTOM:
-                default:
-                    ColorModel cm = image.getColorModel();
-                    if (cm.equals(rgbColorModel)) {
-                        pixelFormat = GL.GL_RGB;
-                        pixelType = GL.GL_UNSIGNED_BYTE;
-                        rowLength = scanlineStride / 3;
-                        alignment = 1;
-                    } else if (cm.equals(rgbaColorModel)) {
-                        pixelFormat = GL.GL_RGBA;
-                        pixelType = GL.GL_UNSIGNED_BYTE;
-                        rowLength = scanlineStride / 4; // FIXME: correct?
-                        alignment = 4;
-                    } else {
-                        setupLazyCustomConversion(image);
-                        return;
-                    }
-                    break;
-            }
-        }
-
-        createNIOBufferFromImage(image);
-    }
-
-    private void setupLazyCustomConversion(BufferedImage image) {
-        imageForLazyCustomConversion = image;
-        boolean hasAlpha = image.getColorModel().hasAlpha();
-        if (pixelFormat == 0) {
-            pixelFormat = hasAlpha ? GL.GL_RGBA : GL.GL_RGB;
-        }
-        alignment = 1; // FIXME: do we need better?
-        rowLength = width; // FIXME: correct in all cases?
-
-        // Allow previously-selected pixelType (if any) to override that
-        // we can infer from the DataBuffer
-        DataBuffer data = image.getRaster().getDataBuffer();
-        if (data instanceof DataBufferByte || isPackedInt(image)) {
-            // Don't use GL_UNSIGNED_INT for BufferedImage packed int images
-            if (pixelType == 0) pixelType = GL.GL_UNSIGNED_BYTE;
-        } else if (data instanceof DataBufferDouble) {
-            throw new RuntimeException("DataBufferDouble rasters not supported by OpenGL");
-        } else if (data instanceof DataBufferFloat) {
-            if (pixelType == 0) pixelType = GL.GL_FLOAT;
-        } else if (data instanceof DataBufferInt) {
-            // FIXME: should we support signed ints?
-            if (pixelType == 0) pixelType = GL2GL3.GL_UNSIGNED_INT;
-        } else if (data instanceof DataBufferShort) {
-            if (pixelType == 0) pixelType = GL.GL_SHORT;
-        } else if (data instanceof DataBufferUShort) {
-            if (pixelType == 0) pixelType = GL.GL_UNSIGNED_SHORT;
-        } else {
-            throw new RuntimeException("Unexpected DataBuffer type?");
-        }
-    }
-
-    private void createFromCustom(BufferedImage image) {
-        int width = image.getWidth();
-        int height = image.getHeight();
-
-        // create a temporary image that is compatible with OpenGL
-        boolean hasAlpha = image.getColorModel().hasAlpha();
-        ColorModel cm = null;
-        int dataBufferType = image.getRaster().getDataBuffer().getDataType();
-        // Don't use integer components for packed int images
-        if (isPackedInt(image)) {
-            dataBufferType = DataBuffer.TYPE_BYTE;
-        }
-        if (dataBufferType == DataBuffer.TYPE_BYTE) {
-            cm = hasAlpha ? rgbaColorModel : rgbColorModel;
-        } else {
-            if (hasAlpha) {
-                cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
-                                             null, true, true,
-                                             Transparency.TRANSLUCENT,
-                                             dataBufferType);
-            } else {
-                cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
-                                             null, false, false,
-                                             Transparency.OPAQUE,
-                                             dataBufferType);
-            }
-        }
-
-        boolean premult = cm.isAlphaPremultiplied();
-        WritableRaster raster =
-            cm.createCompatibleWritableRaster(width, height);
-        BufferedImage texImage = new BufferedImage(cm, raster, premult, null);
-
-        // copy the source image into the temporary image
-        Graphics2D g = texImage.createGraphics();
-        g.setComposite(AlphaComposite.Src);
-        g.drawImage(image, 0, 0, null);
-        g.dispose();
-
-        // Wrap the buffer from the temporary image
-        createNIOBufferFromImage(texImage);
-    }
-
-    private boolean isPackedInt(BufferedImage image) {
-        int imgType = image.getType();
-        return (imgType == BufferedImage.TYPE_INT_RGB ||
-                imgType == BufferedImage.TYPE_INT_BGR ||
-                imgType == BufferedImage.TYPE_INT_ARGB ||
-                imgType == BufferedImage.TYPE_INT_ARGB_PRE);
-    }
-
-    private void revertPixelFormatAndType() {
-        // Knowing we don't have e.g. OpenGL 1.2 functionality available,
-        // and knowing we're in the process of doing the fallback code
-        // path, re-infer a vanilla pixel format and type compatible with
-        // OpenGL 1.1
-        pixelFormat = 0;
-        pixelType = 0;
-        setupLazyCustomConversion(imageForLazyCustomConversion);
-    }
-
-    private void createNIOBufferFromImage(BufferedImage image) {
-        buffer = wrapImageDataBuffer(image);
-    }
-
-    private Buffer wrapImageDataBuffer(BufferedImage image) {
-        //
-        // Note: Grabbing the DataBuffer will defeat Java2D's image
-        // management mechanism (as of JDK 5/6, at least).  This shouldn't
-        // be a problem for most JOGL apps, but those that try to upload
-        // the image into an OpenGL texture and then use the same image in
-        // Java2D rendering might find the 2D rendering is not as fast as
-        // it could be.
-        //
-
-        DataBuffer data = image.getRaster().getDataBuffer();
-        if (data instanceof DataBufferByte) {
-            return ByteBuffer.wrap(((DataBufferByte) data).getData());
-        } else if (data instanceof DataBufferDouble) {
-            throw new RuntimeException("DataBufferDouble rasters not supported by OpenGL");
-        } else if (data instanceof DataBufferFloat) {
-            return FloatBuffer.wrap(((DataBufferFloat) data).getData());
-        } else if (data instanceof DataBufferInt) {
-            return IntBuffer.wrap(((DataBufferInt) data).getData());
-        } else if (data instanceof DataBufferShort) {
-            return ShortBuffer.wrap(((DataBufferShort) data).getData());
-        } else if (data instanceof DataBufferUShort) {
-            return ShortBuffer.wrap(((DataBufferUShort) data).getData());
-        } else {
-            throw new RuntimeException("Unexpected DataBuffer type?");
-        }
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureIO.java b/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureIO.java
deleted file mode 100644
index 182810174..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureIO.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.awt;
-
-import java.awt.image.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.texture.*;
-
-public class AWTTextureIO extends TextureIO {
-    /**
-     * Creates a TextureData from the given BufferedImage. Does no
-     * OpenGL work.
-     * We assume a desktop GLProfile GL2GL3, otherwise use the other factory.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param image the BufferedImage containing the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture by autogenerating them
-     * @return the texture data from the image
-     *
-     * @see #newTextureData(GLProfile, BufferedImage, boolean)
-     */
-    public static TextureData newTextureData(GLProfile glp, BufferedImage image,
-                                             boolean mipmap) {
-        return newTextureDataImpl(glp, image, 0, 0, mipmap);
-    }
-
-    /**
-     * Creates a TextureData from the given BufferedImage, using the
-     * specified OpenGL internal format and pixel format for the texture
-     * which will eventually result. The internalFormat and pixelFormat
-     * must be specified and may not be zero; to use default values, use
-     * the variant of this method which does not take these
-     * arguments. Does no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param image the BufferedImage containing the texture data
-     * @param internalFormat the OpenGL internal format of the texture
-     *                   which will eventually result from the TextureData
-     * @param pixelFormat the OpenGL pixel format of the texture
-     *                    which will eventually result from the TextureData
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @return the texture data from the image
-     * @throws IllegalArgumentException if either internalFormat or
-     *                                  pixelFormat was 0
-     */
-    public static TextureData newTextureData(GLProfile glp, BufferedImage image,
-                                             int internalFormat,
-                                             int pixelFormat,
-                                             boolean mipmap) throws IllegalArgumentException {
-        if ((internalFormat == 0) || (pixelFormat == 0)) {
-            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
-        }
-
-        return newTextureDataImpl(glp, image, internalFormat, pixelFormat, mipmap);
-    }
-
-    /** 
-     * Creates an OpenGL texture object from the specified BufferedImage
-     * using the current OpenGL context.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param image the BufferedImage from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture by autogenerating them
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(GLProfile glp, BufferedImage image, boolean mipmap) throws GLException {
-        TextureData data = newTextureData(glp, image, mipmap);
-        Texture texture = newTexture(data);
-        data.flush();
-        return texture;
-    }
-
-    private static TextureData newTextureDataImpl(GLProfile glp, 
-                                                  BufferedImage image,
-                                                  int internalFormat,
-                                                  int pixelFormat,
-                                                  boolean mipmap) {
-        return new AWTTextureData(glp, internalFormat, pixelFormat, mipmap, image);
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp b/src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
deleted file mode 100755
index ce3d97733..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
+++ /dev/null
@@ -1,889 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.spi;
-
-import java.io.*;
-import java.nio.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.*;
-
-/** A reader and writer for DirectDraw Surface (.dds) files, which are
-    used to describe textures. These files can contain multiple mipmap
-    levels in one file. This class is currently minimal and does not
-    support all of the possible file formats. */
-
-public class DDSImage {
-
-    /** Simple class describing images and data; does not encapsulate
-        image format information. User is responsible for transmitting
-        that information in another way. */
-
-    public static class ImageInfo {
-        private ByteBuffer data;
-        private int width;
-        private int height;
-        private boolean isCompressed;
-        private int compressionFormat;
-
-        public ImageInfo(ByteBuffer data, int width, int height, boolean compressed, int compressionFormat) {
-            this.data = data; this.width = width; this.height = height;
-            this.isCompressed = compressed; this.compressionFormat = compressionFormat;
-        }
-        public int        getWidth()  { return width;  }
-        public int        getHeight() { return height; }
-        public ByteBuffer getData()   { return data;   }
-        public boolean    isCompressed() { return isCompressed; }
-        public int        getCompressionFormat() {
-            if (!isCompressed())
-                throw new RuntimeException("Should not call unless compressed");
-            return compressionFormat;
-        }
-    }
-
-    private ByteBuffer buf;
-    private Header header;
-
-    //
-    // Selected bits in header flags
-    //
-
-    public static final int DDSD_CAPS            = 0x00000001; // Capacities are valid
-    public static final int DDSD_HEIGHT          = 0x00000002; // Height is valid
-    public static final int DDSD_WIDTH           = 0x00000004; // Width is valid
-    public static final int DDSD_PITCH           = 0x00000008; // Pitch is valid
-    public static final int DDSD_BACKBUFFERCOUNT = 0x00000020; // Back buffer count is valid
-    public static final int DDSD_ZBUFFERBITDEPTH = 0x00000040; // Z-buffer bit depth is valid (shouldn't be used in DDSURFACEDESC2)
-    public static final int DDSD_ALPHABITDEPTH   = 0x00000080; // Alpha bit depth is valid
-    public static final int DDSD_LPSURFACE       = 0x00000800; // lpSurface is valid
-    public static final int DDSD_PIXELFORMAT     = 0x00001000; // ddpfPixelFormat is valid
-    public static final int DDSD_MIPMAPCOUNT     = 0x00020000; // Mip map count is valid
-    public static final int DDSD_LINEARSIZE      = 0x00080000; // dwLinearSize is valid
-    public static final int DDSD_DEPTH           = 0x00800000; // dwDepth is valid
-
-    public static final int DDPF_ALPHAPIXELS     = 0x00000001; // Alpha channel is present
-    public static final int DDPF_ALPHA           = 0x00000002; // Only contains alpha information
-    public static final int DDPF_FOURCC          = 0x00000004; // FourCC code is valid
-    public static final int DDPF_PALETTEINDEXED4 = 0x00000008; // Surface is 4-bit color indexed
-    public static final int DDPF_PALETTEINDEXEDTO8 = 0x00000010; // Surface is indexed into a palette which stores indices
-    // into the destination surface's 8-bit palette
-    public static final int DDPF_PALETTEINDEXED8 = 0x00000020; // Surface is 8-bit color indexed
-    public static final int DDPF_RGB             = 0x00000040; // RGB data is present
-    public static final int DDPF_COMPRESSED      = 0x00000080; // Surface will accept pixel data in the format specified
-    // and compress it during the write
-    public static final int DDPF_RGBTOYUV        = 0x00000100; // Surface will accept RGB data and translate it during
-    // the write to YUV data. The format of the data to be written
-    // will be contained in the pixel format structure. The DDPF_RGB
-    // flag will be set.
-    public static final int DDPF_YUV             = 0x00000200; // Pixel format is YUV - YUV data in pixel format struct is valid
-    public static final int DDPF_ZBUFFER         = 0x00000400; // Pixel format is a z buffer only surface
-    public static final int DDPF_PALETTEINDEXED1 = 0x00000800; // Surface is 1-bit color indexed
-    public static final int DDPF_PALETTEINDEXED2 = 0x00001000; // Surface is 2-bit color indexed
-    public static final int DDPF_ZPIXELS         = 0x00002000; // Surface contains Z information in the pixels
-
-    // Selected bits in DDS capabilities flags
-    public static final int DDSCAPS_TEXTURE      = 0x00001000; // Can be used as a texture
-    public static final int DDSCAPS_MIPMAP       = 0x00400000; // Is one level of a mip-map
-    public static final int DDSCAPS_COMPLEX      = 0x00000008; // Complex surface structure, such as a cube map
-
-    // Selected bits in DDS extended capabilities flags
-    public static final int DDSCAPS2_CUBEMAP           = 0x00000200;
-    public static final int DDSCAPS2_CUBEMAP_POSITIVEX = 0x00000400;
-    public static final int DDSCAPS2_CUBEMAP_NEGATIVEX = 0x00000800;
-    public static final int DDSCAPS2_CUBEMAP_POSITIVEY = 0x00001000;
-    public static final int DDSCAPS2_CUBEMAP_NEGATIVEY = 0x00002000;
-    public static final int DDSCAPS2_CUBEMAP_POSITIVEZ = 0x00004000;
-    public static final int DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x00008000;
-
-    // Known pixel formats
-    public static final int D3DFMT_UNKNOWN   =  0;
-    public static final int D3DFMT_R8G8B8    =  20;
-    public static final int D3DFMT_A8R8G8B8  =  21;
-    public static final int D3DFMT_X8R8G8B8  =  22;
-    // The following are also valid FourCC codes
-    public static final int D3DFMT_DXT1      =  0x31545844;
-    public static final int D3DFMT_DXT2      =  0x32545844;
-    public static final int D3DFMT_DXT3      =  0x33545844;
-    public static final int D3DFMT_DXT4      =  0x34545844;
-    public static final int D3DFMT_DXT5      =  0x35545844;
-
-    /** Reads a DirectDraw surface from the specified file name,
-        returning the resulting DDSImage.
-
-        @param filename File name
-        @return DDS image object
-        @throws java.io.IOException if an I/O exception occurred
-    */
-    public static DDSImage read(String filename) throws IOException {
-        return read(new File(filename));
-    }
-  
-    /** Reads a DirectDraw surface from the specified file, returning
-        the resulting DDSImage.
-
-        @param file File object
-        @return DDS image object
-        @throws java.io.IOException if an I/O exception occurred
-    */
-    public static DDSImage read(File file) throws IOException {
-        DDSImage image = new DDSImage();
-        image.readFromFile(file);
-        return image;
-    }
-
-    /** Reads a DirectDraw surface from the specified InputStream, returning
-        the resulting DDSImage.
-
-        @param input Input stream
-        @return DDS image object
-        @throws java.io.IOException if an I/O exception occurred
-    */
-    public static DDSImage read(InputStream input) throws IOException {
-        DDSImage image = new DDSImage();
-        image.readFromStream(input);
-        return image;
-    }
-
-    /** Closes open files and resources associated with the open
-        DDSImage. No other methods may be called on this object once
-        this is called. */
-    public void close() {
-    }
-
-    /** 
-     * Creates a new DDSImage from data supplied by the user. The
-     * resulting DDSImage can be written to disk using the write()
-     * method.
-     *
-     * @param d3dFormat the D3DFMT_ constant describing the data; it is
-     *                  assumed that it is packed tightly
-     * @param width  the width in pixels of the topmost mipmap image
-     * @param height the height in pixels of the topmost mipmap image
-     * @param mipmapData the data for each mipmap level of the resulting
-     *                   DDSImage; either only one mipmap level should
-     *                   be specified, or they all must be
-     * @throws IllegalArgumentException if the data does not match the
-     *   specified arguments
-     * @return DDS image object
-     */
-    public static DDSImage createFromData(int d3dFormat,
-                                          int width,
-                                          int height,
-                                          ByteBuffer[] mipmapData) throws IllegalArgumentException {
-        DDSImage image = new DDSImage();
-        image.initFromData(d3dFormat, width, height, mipmapData);
-        return image;
-    }
-
-    /** Determines from the magic number whether the given InputStream
-        points to a DDS image. The given InputStream must return true
-        from markSupported() and support a minimum of four bytes of
-        read-ahead.
-
-        @param in Stream to check
-        @return true if input stream is DDS image or false otherwise
-        @throws java.io.IOException if an I/O exception occurred
-    */
-    public static boolean isDDSImage(InputStream in) throws IOException {
-        if (!(in instanceof BufferedInputStream)) {
-            in = new BufferedInputStream(in);
-        }
-        if (!in.markSupported()) {
-            throw new IOException("Can not test non-destructively whether given InputStream is a DDS image");
-        }
-        in.mark(4);
-        int magic = 0;
-        for (int i = 0; i < 4; i++) {
-            int tmp = in.read();
-            if (tmp < 0) {
-                in.reset();
-                return false;
-            }
-            magic = ((magic >>> 8) | (tmp << 24));
-        }
-        in.reset();
-        return (magic == MAGIC);
-    }
-
-    /**
-     * Writes this DDSImage to the specified file name.
-     * @param filename File name to write to
-     * @throws java.io.IOException if an I/O exception occurred
-     */
-    public void write(String filename) throws IOException {
-        write(new File(filename));
-    }
-
-    /**
-     * Writes this DDSImage to the specified file name.
-     * @param file File object to write to
-     * @throws java.io.IOException if an I/O exception occurred
-     */
-    public void write(File file) throws IOException {
-        LEDataOutputStream output =
-            new LEDataOutputStream(new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file))));
-        header.write(output);
-        output.write(buf.array());
-        output.close();
-    }
-
-    /** Test for presence/absence of surface description flags (DDSD_*)
-     * @param flag DDSD_* flags set to test
-     * @return true if flag present or false otherwise
-     */
-    public boolean isSurfaceDescFlagSet(int flag) {
-        return ((header.flags & flag) != 0);
-    }
-
-    /** Test for presence/absence of pixel format flags (DDPF_*) */
-    public boolean isPixelFormatFlagSet(int flag) {
-        return ((header.pfFlags & flag) != 0);
-    }
-
-    /** Gets the pixel format of this texture (D3DFMT_*) based on some
-        heuristics. Returns D3DFMT_UNKNOWN if could not recognize the
-        pixel format. */
-    public int getPixelFormat() {
-        if (isCompressed()) {
-            return getCompressionFormat();
-        } else if (isPixelFormatFlagSet(DDPF_RGB)) {
-            if (isPixelFormatFlagSet(DDPF_ALPHAPIXELS)) {
-                if (getDepth() == 32 &&
-                    header.pfRBitMask == 0x00FF0000 &&
-                    header.pfGBitMask == 0x0000FF00 &&
-                    header.pfBBitMask == 0x000000FF &&
-                    header.pfABitMask == 0xFF000000) {
-                    return D3DFMT_A8R8G8B8;
-                }
-            } else {
-                if (getDepth() == 24 &&
-                    header.pfRBitMask == 0x00FF0000 &&
-                    header.pfGBitMask == 0x0000FF00 &&
-                    header.pfBBitMask == 0x000000FF) {
-                    return D3DFMT_R8G8B8;
-                } else if (getDepth() == 32 &&
-                           header.pfRBitMask == 0x00FF0000 &&
-                           header.pfGBitMask == 0x0000FF00 &&
-                           header.pfBBitMask == 0x000000FF) {
-                    return D3DFMT_X8R8G8B8;
-                }
-            }
-        }
-
-        return D3DFMT_UNKNOWN;
-    }
-
-    /**
-     * Indicates whether this texture is cubemap
-     * @return true if cubemap or false otherwise
-     */
-    public boolean isCubemap() {
-        return ((header.ddsCaps1 & DDSCAPS_COMPLEX) != 0) && ((header.ddsCaps2 & DDSCAPS2_CUBEMAP) != 0);
-    }
-
-    /**
-     * Indicates whethe this cubemap side present
-     * @param side Side to test
-     * @return true if side present or false otherwise
-     */
-    public boolean isCubemapSidePresent(int side) {
-        return isCubemap() && (header.ddsCaps2 & side) != 0;
-    }
-
-    /** Indicates whether this texture is compressed. */
-    public boolean isCompressed() {
-        return (isPixelFormatFlagSet(DDPF_FOURCC));
-    }
-
-    /** If this surface is compressed, returns the kind of compression
-        used (DXT1..DXT5). */
-    public int getCompressionFormat() {
-        return header.pfFourCC;
-    }
-
-    /** Width of the texture (or the top-most mipmap if mipmaps are
-        present) */
-    public int getWidth() {
-        return header.width;
-    }
-
-    /** Height of the texture (or the top-most mipmap if mipmaps are
-        present) */
-    public int getHeight() {
-        return header.height;
-    }
-
-    /** Total number of bits per pixel. Only valid if DDPF_RGB is
-        present. For A8R8G8B8, would be 32. */
-    public int getDepth() {
-        return header.pfRGBBitCount;
-    }
-
-    /** Number of mip maps in the texture */
-    public int getNumMipMaps() {
-        if (!isSurfaceDescFlagSet(DDSD_MIPMAPCOUNT)) {
-            return 0;
-        }
-        return header.mipMapCountOrAux;
-    }
-
-    /** Gets the <i>i</i>th mipmap data (0..getNumMipMaps() - 1)
-     * @param map Mipmap index
-     * @return Image object
-     */
-    public ImageInfo getMipMap(int map) {
-        return getMipMap( 0, map );
-    }
-
-    /**
-     * Gets the <i>i</i>th mipmap data (0..getNumMipMaps() - 1)
-     * @param side Cubemap side or 0 for 2D texture
-     * @param map Mipmap index
-     * @return Image object
-     */
-    public ImageInfo getMipMap(int side, int map) {
-        if (!isCubemap() && (side != 0)) {
-            throw new RuntimeException( "Illegal side for 2D texture: " + side );
-        }
-        if (isCubemap() && !isCubemapSidePresent(side)) {
-            throw new RuntimeException( "Illegal side, side not present: " + side );
-        }
-        if (getNumMipMaps() > 0 &&
-            ((map < 0) || (map >= getNumMipMaps()))) {
-            throw new RuntimeException("Illegal mipmap number " + map + " (0.." + (getNumMipMaps() - 1) + ")");
-        }
-
-        // Figure out how far to seek
-        int seek = 0;
-        if (isCubemap()) {
-            seek += sideShiftInBytes(side);
-        }
-        for (int i = 0; i < map; i++) {
-            seek += mipMapSizeInBytes(i);
-        }
-        buf.limit(seek + mipMapSizeInBytes(map));
-        buf.position(seek);
-        ByteBuffer next = buf.slice();
-        buf.position(0);
-        buf.limit(buf.capacity());
-        return new ImageInfo(next, mipMapWidth(map), mipMapHeight(map), isCompressed(), getCompressionFormat());
-    }
-
-    /** Returns an array of ImageInfos corresponding to all mipmap
-        levels of this DDS file.
-        @return Mipmap image objects set
-    */
-    public ImageInfo[] getAllMipMaps() {
-        return getAllMipMaps(0);
-    }
-
-    /**
-     * Returns an array of ImageInfos corresponding to all mipmap
-     * levels of this DDS file.
-     * @param side Cubemap side or 0 for 2D texture
-     * @return Mipmap image objects set
-     */
-    public ImageInfo[] getAllMipMaps( int side ) {
-        int numLevels = getNumMipMaps();
-        if (numLevels == 0) {
-            numLevels = 1;
-        }
-        ImageInfo[] result = new ImageInfo[numLevels];
-        for (int i = 0; i < numLevels; i++) {
-            result[i] = getMipMap(side, i);
-        }
-        return result;
-    }
-
-    /** Converts e.g. DXT1 compression format constant (see {@link
-        #getCompressionFormat}) into "DXT1".
-        @param compressionFormat Compression format constant
-        @return String format code
-    */
-    public static String getCompressionFormatName(int compressionFormat) {
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < 4; i++) {
-            char c = (char) (compressionFormat & 0xFF);
-            buf.append(c);
-            compressionFormat = compressionFormat >> 8;
-        }
-        return buf.toString();
-    }
-
-    /** Allocates a temporary, empty ByteBuffer suitable for use in a
-        call to glCompressedTexImage2D. This is used by the Texture
-        class to expand non-power-of-two DDS compressed textures to
-        power-of-two sizes on hardware not supporting OpenGL 2.0 and the
-        NPOT texture extension. The specified OpenGL internal format
-        must be one of GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
-        GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
-        GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, or
-        GL_COMPRESSED_RGBA_S3TC_DXT5_EXT.
-    */
-    public static ByteBuffer allocateBlankBuffer(int width,
-                                                 int height,
-                                                 int openGLInternalFormat) {
-        int size = width * height;
-        switch (openGLInternalFormat) {
-        case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-        case GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-            size /= 2;
-            break;
-
-        case GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-        case GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-            break;
-
-        default:
-            throw new IllegalArgumentException("Illegal OpenGL texture internal format " +
-                                               openGLInternalFormat);
-        }
-        if (size == 0)
-            size = 1;
-        return BufferUtil.newByteBuffer(size);
-    }
-
-    public void debugPrint() {
-        PrintStream tty = System.err;
-        tty.println("Compressed texture: " + isCompressed());
-        if (isCompressed()) {
-            int fmt = getCompressionFormat();
-            String name = getCompressionFormatName(fmt);
-            tty.println("Compression format: 0x" + Integer.toHexString(fmt) + " (" + name + ")");
-        }
-        tty.println("Width: " + header.width + " Height: " + header.height);
-        tty.println("header.pitchOrLinearSize: " + header.pitchOrLinearSize);
-        tty.println("header.pfRBitMask: 0x" + Integer.toHexString(header.pfRBitMask));
-        tty.println("header.pfGBitMask: 0x" + Integer.toHexString(header.pfGBitMask));
-        tty.println("header.pfBBitMask: 0x" + Integer.toHexString(header.pfBBitMask));
-        tty.println("SurfaceDesc flags:");
-        boolean recognizedAny = false;
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_CAPS, "DDSD_CAPS");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_HEIGHT, "DDSD_HEIGHT");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_WIDTH, "DDSD_WIDTH");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_PITCH, "DDSD_PITCH");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_BACKBUFFERCOUNT, "DDSD_BACKBUFFERCOUNT");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_ZBUFFERBITDEPTH, "DDSD_ZBUFFERBITDEPTH");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_ALPHABITDEPTH, "DDSD_ALPHABITDEPTH");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_LPSURFACE, "DDSD_LPSURFACE");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_PIXELFORMAT, "DDSD_PIXELFORMAT");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_MIPMAPCOUNT, "DDSD_MIPMAPCOUNT");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_LINEARSIZE, "DDSD_LINEARSIZE");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_DEPTH, "DDSD_DEPTH");
-        if (!recognizedAny) {
-            tty.println("(none)");
-        }
-        tty.println("Raw SurfaceDesc flags: 0x" + Integer.toHexString(header.flags));
-        tty.println("Pixel format flags:");
-        recognizedAny = false;
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ALPHAPIXELS, "DDPF_ALPHAPIXELS");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ALPHA, "DDPF_ALPHA");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_FOURCC, "DDPF_FOURCC");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED4, "DDPF_PALETTEINDEXED4");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXEDTO8, "DDPF_PALETTEINDEXEDTO8");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED8, "DDPF_PALETTEINDEXED8");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_RGB, "DDPF_RGB");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_COMPRESSED, "DDPF_COMPRESSED");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_RGBTOYUV, "DDPF_RGBTOYUV");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_YUV, "DDPF_YUV");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ZBUFFER, "DDPF_ZBUFFER");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED1, "DDPF_PALETTEINDEXED1");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED2, "DDPF_PALETTEINDEXED2");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ZPIXELS, "DDPF_ZPIXELS");
-        if (!recognizedAny) {
-            tty.println("(none)");
-        }
-        tty.println("Raw pixel format flags: 0x" + Integer.toHexString(header.pfFlags));
-        tty.println("Depth: " + getDepth());
-        tty.println("Number of mip maps: " + getNumMipMaps());
-        int fmt = getPixelFormat();
-        tty.print("Pixel format: ");
-        switch (fmt) {
-        case D3DFMT_R8G8B8:   tty.println("D3DFMT_R8G8B8"); break;
-        case D3DFMT_A8R8G8B8: tty.println("D3DFMT_A8R8G8B8"); break;
-        case D3DFMT_X8R8G8B8: tty.println("D3DFMT_X8R8G8B8"); break;
-        case D3DFMT_DXT1:     tty.println("D3DFMT_DXT1"); break;
-        case D3DFMT_DXT2:     tty.println("D3DFMT_DXT2"); break;
-        case D3DFMT_DXT3:     tty.println("D3DFMT_DXT3"); break;
-        case D3DFMT_DXT4:     tty.println("D3DFMT_DXT4"); break;
-        case D3DFMT_DXT5:     tty.println("D3DFMT_DXT5"); break;
-        case D3DFMT_UNKNOWN:  tty.println("D3DFMT_UNKNOWN"); break;
-        default:              tty.println("(unknown pixel format " + fmt + ")"); break;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    private static final int MAGIC = 0x20534444;
-
-    static class Header {
-        int size;                 // size of the DDSURFACEDESC structure
-        int flags;                // determines what fields are valid
-        int height;               // height of surface to be created
-        int width;                // width of input surface
-        int pitchOrLinearSize;
-        int backBufferCountOrDepth;
-        int mipMapCountOrAux;     // number of mip-map levels requested (in this context)
-        int alphaBitDepth;        // depth of alpha buffer requested
-        int reserved1;            // reserved
-        int surface;              // pointer to the associated surface memory
-        // NOTE: following two entries are from DDCOLORKEY data structure
-        // Are overlaid with color for empty cubemap faces (unused in this reader)
-        int colorSpaceLowValue;
-        int colorSpaceHighValue;
-        int destBltColorSpaceLowValue;
-        int destBltColorSpaceHighValue;
-        int srcOverlayColorSpaceLowValue;
-        int srcOverlayColorSpaceHighValue;
-        int srcBltColorSpaceLowValue;
-        int srcBltColorSpaceHighValue;
-        // NOTE: following entries are from DDPIXELFORMAT data structure
-        // Are overlaid with flexible vertex format description of vertex
-        // buffers (unused in this reader)
-        int pfSize;                 // size of DDPIXELFORMAT structure
-        int pfFlags;                // pixel format flags
-        int pfFourCC;               // (FOURCC code)
-        // Following five entries have multiple interpretations, not just
-        // RGBA (but that's all we support right now)
-        int pfRGBBitCount;          // how many bits per pixel
-        int pfRBitMask;             // mask for red bits
-        int pfGBitMask;             // mask for green bits
-        int pfBBitMask;             // mask for blue bits
-        int pfABitMask;             // mask for alpha channel
-        int ddsCaps1;               // Texture and mip-map flags
-        int ddsCaps2;               // Advanced capabilities including cubemap support
-        int ddsCapsReserved1;
-        int ddsCapsReserved2;
-        int textureStage;           // stage in multitexture cascade
-
-        void read(LEDataInputStream input) throws IOException {
-            int magic                     = input.readInt();
-            if (magic != MAGIC) {
-                throw new IOException("Incorrect magic number 0x" +
-                                      Integer.toHexString(magic) +
-                                      " (expected " + MAGIC + ")");
-            }
-
-            size                          = input.readInt();
-            flags                         = input.readInt();
-            height                        = input.readInt();
-            width                         = input.readInt();
-            pitchOrLinearSize             = input.readInt();
-            backBufferCountOrDepth        = input.readInt();
-            mipMapCountOrAux              = input.readInt();
-            alphaBitDepth                 = input.readInt();
-            reserved1                     = input.readInt();
-            surface                       = input.readInt();
-            colorSpaceLowValue            = input.readInt();
-            colorSpaceHighValue           = input.readInt();
-            destBltColorSpaceLowValue     = input.readInt();
-            destBltColorSpaceHighValue    = input.readInt();
-            srcOverlayColorSpaceLowValue  = input.readInt();
-            srcOverlayColorSpaceHighValue = input.readInt();
-            srcBltColorSpaceLowValue      = input.readInt();
-            srcBltColorSpaceHighValue     = input.readInt();
-            pfSize                        = input.readInt();
-            pfFlags                       = input.readInt();
-            pfFourCC                      = input.readInt();
-            pfRGBBitCount                 = input.readInt();
-            pfRBitMask                    = input.readInt();
-            pfGBitMask                    = input.readInt();
-            pfBBitMask                    = input.readInt();
-            pfABitMask                    = input.readInt();
-            ddsCaps1                      = input.readInt();
-            ddsCaps2                      = input.readInt();
-            ddsCapsReserved1              = input.readInt();
-            ddsCapsReserved2              = input.readInt();
-            textureStage                  = input.readInt();
-        }
-
-        // buf must be in little-endian byte order
-        void write(LEDataOutputStream output) throws IOException {
-            output.writeInt(MAGIC);
-            output.writeInt(size);
-            output.writeInt(flags);
-            output.writeInt(height);
-            output.writeInt(width);
-            output.writeInt(pitchOrLinearSize);
-            output.writeInt(backBufferCountOrDepth);
-            output.writeInt(mipMapCountOrAux);
-            output.writeInt(alphaBitDepth);
-            output.writeInt(reserved1);
-            output.writeInt(surface);
-            output.writeInt(colorSpaceLowValue);
-            output.writeInt(colorSpaceHighValue);
-            output.writeInt(destBltColorSpaceLowValue);
-            output.writeInt(destBltColorSpaceHighValue);
-            output.writeInt(srcOverlayColorSpaceLowValue);
-            output.writeInt(srcOverlayColorSpaceHighValue);
-            output.writeInt(srcBltColorSpaceLowValue);
-            output.writeInt(srcBltColorSpaceHighValue);
-            output.writeInt(pfSize);
-            output.writeInt(pfFlags);
-            output.writeInt(pfFourCC);
-            output.writeInt(pfRGBBitCount);
-            output.writeInt(pfRBitMask);
-            output.writeInt(pfGBitMask);
-            output.writeInt(pfBBitMask);
-            output.writeInt(pfABitMask);
-            output.writeInt(ddsCaps1);
-            output.writeInt(ddsCaps2);
-            output.writeInt(ddsCapsReserved1);
-            output.writeInt(ddsCapsReserved2);
-            output.writeInt(textureStage);
-        }
-
-        private static int size() {
-            return 124;
-        }
-
-        private static int pfSize() {
-            return 32;
-        }
-
-        private static int writtenSize() {
-            return 128;
-        }
-    }
-
-    private DDSImage() {
-    }
-
-    private void readFromFile(File file) throws IOException {
-        readFromStream(new BufferedInputStream(new FileInputStream(file)));
-    }
-
-    private void readFromStream(InputStream input) throws IOException {
-        LEDataInputStream leInput = new LEDataInputStream(input);
-        header = new Header();
-        header.read(leInput);
-        fixupHeader();
-        buf = StreamUtil.readAll2Buffer(input);
-    }
-
-    private void initFromData(int d3dFormat,
-                              int width,
-                              int height,
-                              ByteBuffer[] mipmapData) throws IllegalArgumentException {
-        // Check size of mipmap data compared against format, width and
-        // height
-        int topmostMipmapSize = width * height;
-        int pitchOrLinearSize = width;
-        boolean isCompressed = false;
-        switch (d3dFormat) {
-        case D3DFMT_R8G8B8:   topmostMipmapSize *= 3; pitchOrLinearSize *= 3; break;
-        case D3DFMT_A8R8G8B8: topmostMipmapSize *= 4; pitchOrLinearSize *= 4; break;
-        case D3DFMT_X8R8G8B8: topmostMipmapSize *= 4; pitchOrLinearSize *= 4; break;
-        case D3DFMT_DXT1:
-        case D3DFMT_DXT2:
-        case D3DFMT_DXT3:
-        case D3DFMT_DXT4:
-        case D3DFMT_DXT5:
-            topmostMipmapSize = computeCompressedBlockSize(width, height, 1, d3dFormat);
-            pitchOrLinearSize = topmostMipmapSize;
-            isCompressed = true;
-            break;
-        default:
-            throw new IllegalArgumentException("d3dFormat must be one of the known formats");
-        }
-    
-        // Now check the mipmaps against this size
-        int curSize = topmostMipmapSize;
-        int totalSize = 0;
-        for (int i = 0; i < mipmapData.length; i++) {
-            if (mipmapData[i].remaining() != curSize) {
-                throw new IllegalArgumentException("Mipmap level " + i +
-                                                   " didn't match expected data size (expected " + curSize + ", got " +
-                                                   mipmapData[i].remaining() + ")");
-            }
-            curSize /= 4;
-            totalSize += mipmapData[i].remaining();
-        }
-
-        // OK, create one large byte array to hold all of the mipmap data
-        byte[] data = new byte[totalSize];
-        ByteBuffer buf = ByteBuffer.wrap(data);
-        for (int i = 0; i < mipmapData.length; i++) {
-            buf.put(mipmapData[i]);
-        }
-        this.buf = buf;
-    
-        // Allocate and initialize a Header
-        header = new Header();
-        header.size = Header.size();
-        header.flags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT;
-        if (mipmapData.length > 1) {
-            header.flags |= DDSD_MIPMAPCOUNT;
-            header.mipMapCountOrAux = mipmapData.length;
-        }
-        header.width = width;
-        header.height = height;
-        if (isCompressed) {
-            header.flags |= DDSD_LINEARSIZE;
-            header.pfFlags |= DDPF_FOURCC;
-            header.pfFourCC = d3dFormat;
-        } else {
-            header.flags |= DDSD_PITCH;
-            // Figure out the various settings from the pixel format
-            header.pfFlags |= DDPF_RGB;
-            switch (d3dFormat) {
-            case D3DFMT_R8G8B8:   header.pfRGBBitCount = 24; break;
-            case D3DFMT_A8R8G8B8: header.pfRGBBitCount = 32; header.pfFlags |= DDPF_ALPHAPIXELS; break;
-            case D3DFMT_X8R8G8B8: header.pfRGBBitCount = 32; break;
-            }
-            header.pfRBitMask = 0x00FF0000;
-            header.pfGBitMask = 0x0000FF00;
-            header.pfBBitMask = 0x000000FF;
-            if (d3dFormat == D3DFMT_A8R8G8B8) {
-                header.pfABitMask = 0xFF000000;
-            }
-        }
-        header.pitchOrLinearSize = pitchOrLinearSize;
-        header.pfSize = Header.pfSize();
-        // Not sure whether we can get away with leaving the rest of the
-        // header blank
-    }
-
-    // Microsoft doesn't follow their own specifications and the
-    // simplest conversion using the DxTex tool to e.g. a DXT3 texture
-    // results in an illegal .dds file without either DDSD_PITCH or
-    // DDSD_LINEARSIZE set in the header's flags. This code, adapted
-    // from the DevIL library, fixes up the header in these situations.
-    private void fixupHeader() {
-        if (isCompressed() && !isSurfaceDescFlagSet(DDSD_LINEARSIZE)) {
-            // Figure out how big the linear size should be
-            int depth = header.backBufferCountOrDepth;
-            if (depth == 0) {
-                depth = 1;
-            }
-
-            header.pitchOrLinearSize = computeCompressedBlockSize(getWidth(), getHeight(), depth, getCompressionFormat());
-            header.flags |= DDSD_LINEARSIZE;
-        }
-    }
-
-    private static int computeCompressedBlockSize(int width,
-                                                  int height,
-                                                  int depth,
-                                                  int compressionFormat) {
-        int blockSize = ((width + 3)/4) * ((height + 3)/4) * ((depth + 3)/4);
-        switch (compressionFormat) {
-        case D3DFMT_DXT1:  blockSize *=  8; break;
-        default:           blockSize *= 16; break;
-        }
-        return blockSize;
-    }
-
-    private int mipMapWidth(int map) {
-        int width = getWidth();
-        for (int i = 0; i < map; i++) {
-            width >>= 1;
-        }
-        return Math.max(width, 1);
-    }
-
-    private int mipMapHeight(int map) {
-        int height = getHeight();
-        for (int i = 0; i < map; i++) {
-            height >>= 1;
-        }
-        return Math.max(height, 1);
-    }
-
-    private int mipMapSizeInBytes(int map) {
-        int width  = mipMapWidth(map);
-        int height = mipMapHeight(map);
-        if (isCompressed()) {
-            int blockSize = (getCompressionFormat() == D3DFMT_DXT1 ? 8 : 16);
-            return ((width+3)/4)*((height+3)/4)*blockSize;
-        } else {
-            return width * height * (getDepth() / 8);
-        }
-    }
-
-    private int sideSizeInBytes() {
-        int numLevels = getNumMipMaps();
-        if (numLevels == 0) {
-            numLevels = 1;
-        }
-
-        int size = 0;
-        for (int i = 0; i < numLevels; i++) {
-            size += mipMapSizeInBytes(i);
-        }
-
-        return size;
-    }
-
-    private int sideShiftInBytes(int side) {
-        int[] sides = {
-            DDSCAPS2_CUBEMAP_POSITIVEX,
-            DDSCAPS2_CUBEMAP_NEGATIVEX,
-            DDSCAPS2_CUBEMAP_POSITIVEY,
-            DDSCAPS2_CUBEMAP_NEGATIVEY,
-            DDSCAPS2_CUBEMAP_POSITIVEZ,
-            DDSCAPS2_CUBEMAP_NEGATIVEZ
-        };
-
-        int shift = 0;
-        int sideSize = sideSizeInBytes();
-        for (int i = 0; i < sides.length; i++) {
-            int temp = sides[i];
-            if ((temp & side) != 0) {
-                return shift;
-            }
-
-            shift += sideSize;
-        }
-
-        throw new RuntimeException("Illegal side: " + side);
-    }
-
-    private boolean printIfRecognized(PrintStream tty, int flags, int flag, String what) {
-        if ((flags & flag) != 0) {
-            tty.println(what);
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javase b/src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javase
deleted file mode 100755
index 8a3e1c4be..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javase
+++ /dev/null
@@ -1,919 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.spi;
-
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.*;
-
-/** A reader and writer for DirectDraw Surface (.dds) files, which are
-    used to describe textures. These files can contain multiple mipmap
-    levels in one file. This class is currently minimal and does not
-    support all of the possible file formats. */
-
-public class DDSImage {
-
-    /** Simple class describing images and data; does not encapsulate
-        image format information. User is responsible for transmitting
-        that information in another way. */
-
-    public static class ImageInfo {
-        private ByteBuffer data;
-        private int width;
-        private int height;
-        private boolean isCompressed;
-        private int compressionFormat;
-
-        public ImageInfo(ByteBuffer data, int width, int height, boolean compressed, int compressionFormat) {
-            this.data = data; this.width = width; this.height = height;
-            this.isCompressed = compressed; this.compressionFormat = compressionFormat;
-        }
-        public int        getWidth()  { return width;  }
-        public int        getHeight() { return height; }
-        public ByteBuffer getData()   { return data;   }
-        public boolean    isCompressed() { return isCompressed; }
-        public int        getCompressionFormat() {
-            if (!isCompressed())
-                throw new RuntimeException("Should not call unless compressed");
-            return compressionFormat;
-        }
-    }
-
-    private FileInputStream fis;
-    private FileChannel     chan;
-    private ByteBuffer buf;
-    private Header header;
-
-    //
-    // Selected bits in header flags
-    //
-
-    public static final int DDSD_CAPS            = 0x00000001; // Capacities are valid
-    public static final int DDSD_HEIGHT          = 0x00000002; // Height is valid
-    public static final int DDSD_WIDTH           = 0x00000004; // Width is valid
-    public static final int DDSD_PITCH           = 0x00000008; // Pitch is valid
-    public static final int DDSD_BACKBUFFERCOUNT = 0x00000020; // Back buffer count is valid
-    public static final int DDSD_ZBUFFERBITDEPTH = 0x00000040; // Z-buffer bit depth is valid (shouldn't be used in DDSURFACEDESC2)
-    public static final int DDSD_ALPHABITDEPTH   = 0x00000080; // Alpha bit depth is valid
-    public static final int DDSD_LPSURFACE       = 0x00000800; // lpSurface is valid
-    public static final int DDSD_PIXELFORMAT     = 0x00001000; // ddpfPixelFormat is valid
-    public static final int DDSD_MIPMAPCOUNT     = 0x00020000; // Mip map count is valid
-    public static final int DDSD_LINEARSIZE      = 0x00080000; // dwLinearSize is valid
-    public static final int DDSD_DEPTH           = 0x00800000; // dwDepth is valid
-
-    public static final int DDPF_ALPHAPIXELS     = 0x00000001; // Alpha channel is present
-    public static final int DDPF_ALPHA           = 0x00000002; // Only contains alpha information
-    public static final int DDPF_FOURCC          = 0x00000004; // FourCC code is valid
-    public static final int DDPF_PALETTEINDEXED4 = 0x00000008; // Surface is 4-bit color indexed
-    public static final int DDPF_PALETTEINDEXEDTO8 = 0x00000010; // Surface is indexed into a palette which stores indices
-    // into the destination surface's 8-bit palette
-    public static final int DDPF_PALETTEINDEXED8 = 0x00000020; // Surface is 8-bit color indexed
-    public static final int DDPF_RGB             = 0x00000040; // RGB data is present
-    public static final int DDPF_COMPRESSED      = 0x00000080; // Surface will accept pixel data in the format specified
-    // and compress it during the write
-    public static final int DDPF_RGBTOYUV        = 0x00000100; // Surface will accept RGB data and translate it during
-    // the write to YUV data. The format of the data to be written
-    // will be contained in the pixel format structure. The DDPF_RGB
-    // flag will be set.
-    public static final int DDPF_YUV             = 0x00000200; // Pixel format is YUV - YUV data in pixel format struct is valid
-    public static final int DDPF_ZBUFFER         = 0x00000400; // Pixel format is a z buffer only surface
-    public static final int DDPF_PALETTEINDEXED1 = 0x00000800; // Surface is 1-bit color indexed
-    public static final int DDPF_PALETTEINDEXED2 = 0x00001000; // Surface is 2-bit color indexed
-    public static final int DDPF_ZPIXELS         = 0x00002000; // Surface contains Z information in the pixels
-
-    // Selected bits in DDS capabilities flags
-    public static final int DDSCAPS_TEXTURE      = 0x00001000; // Can be used as a texture
-    public static final int DDSCAPS_MIPMAP       = 0x00400000; // Is one level of a mip-map
-    public static final int DDSCAPS_COMPLEX      = 0x00000008; // Complex surface structure, such as a cube map
-
-    // Selected bits in DDS extended capabilities flags
-    public static final int DDSCAPS2_CUBEMAP           = 0x00000200;
-    public static final int DDSCAPS2_CUBEMAP_POSITIVEX = 0x00000400;
-    public static final int DDSCAPS2_CUBEMAP_NEGATIVEX = 0x00000800;
-    public static final int DDSCAPS2_CUBEMAP_POSITIVEY = 0x00001000;
-    public static final int DDSCAPS2_CUBEMAP_NEGATIVEY = 0x00002000;
-    public static final int DDSCAPS2_CUBEMAP_POSITIVEZ = 0x00004000;
-    public static final int DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x00008000;
-
-    // Known pixel formats
-    public static final int D3DFMT_UNKNOWN   =  0;
-    public static final int D3DFMT_R8G8B8    =  20;
-    public static final int D3DFMT_A8R8G8B8  =  21;
-    public static final int D3DFMT_X8R8G8B8  =  22;
-    // The following are also valid FourCC codes
-    public static final int D3DFMT_DXT1      =  0x31545844;
-    public static final int D3DFMT_DXT2      =  0x32545844;
-    public static final int D3DFMT_DXT3      =  0x33545844;
-    public static final int D3DFMT_DXT4      =  0x34545844;
-    public static final int D3DFMT_DXT5      =  0x35545844;
-
-    /** Reads a DirectDraw surface from the specified file name,
-        returning the resulting DDSImage.
-
-        @param filename File name
-        @return DDS image object
-        @throws java.io.IOException if an I/O exception occurred
-    */
-    public static DDSImage read(String filename) throws IOException {
-        return read(new File(filename));
-    }
-  
-    /** Reads a DirectDraw surface from the specified file, returning
-        the resulting DDSImage.
-
-        @param file File object
-        @return DDS image object
-        @throws java.io.IOException if an I/O exception occurred
-    */
-    public static DDSImage read(File file) throws IOException {
-        DDSImage image = new DDSImage();
-        image.readFromFile(file);
-        return image;
-    }
-
-    /** Reads a DirectDraw surface from the specified ByteBuffer, returning
-        the resulting DDSImage.
-
-        @param buf Input data
-        @return DDS image object
-        @throws java.io.IOException if an I/O exception occurred
-    */
-    public static DDSImage read(ByteBuffer buf) throws IOException {
-        DDSImage image = new DDSImage();
-        image.readFromBuffer(buf);
-        return image;
-    }
-
-    /** Closes open files and resources associated with the open
-        DDSImage. No other methods may be called on this object once
-        this is called. */
-    public void close() {
-        try {
-            if (chan != null) {
-                chan.close();
-                chan = null;
-            }
-            if (fis != null) {
-                fis.close();
-                fis = null;
-            }
-            buf = null;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /** 
-     * Creates a new DDSImage from data supplied by the user. The
-     * resulting DDSImage can be written to disk using the write()
-     * method.
-     *
-     * @param d3dFormat the D3DFMT_ constant describing the data; it is
-     *                  assumed that it is packed tightly
-     * @param width  the width in pixels of the topmost mipmap image
-     * @param height the height in pixels of the topmost mipmap image
-     * @param mipmapData the data for each mipmap level of the resulting
-     *                   DDSImage; either only one mipmap level should
-     *                   be specified, or they all must be
-     * @throws IllegalArgumentException if the data does not match the
-     *   specified arguments
-     * @return DDS image object
-     */
-    public static DDSImage createFromData(int d3dFormat,
-                                          int width,
-                                          int height,
-                                          ByteBuffer[] mipmapData) throws IllegalArgumentException {
-        DDSImage image = new DDSImage();
-        image.initFromData(d3dFormat, width, height, mipmapData);
-        return image;
-    }
-
-    /** Determines from the magic number whether the given InputStream
-        points to a DDS image. The given InputStream must return true
-        from markSupported() and support a minimum of four bytes of
-        read-ahead.
-
-        @param in Stream to check
-        @return true if input stream is DDS image or false otherwise
-        @throws java.io.IOException if an I/O exception occurred
-    */
-    public static boolean isDDSImage(InputStream in) throws IOException {
-        if (!(in instanceof BufferedInputStream)) {
-            in = new BufferedInputStream(in);
-        }
-        if (!in.markSupported()) {
-            throw new IOException("Can not test non-destructively whether given InputStream is a DDS image");
-        }
-        in.mark(4);
-        int magic = 0;
-        for (int i = 0; i < 4; i++) {
-            int tmp = in.read();
-            if (tmp < 0) {
-                in.reset();
-                return false;
-            }
-            magic = ((magic >>> 8) | (tmp << 24));
-        }
-        in.reset();
-        return (magic == MAGIC);
-    }
-
-    /**
-     * Writes this DDSImage to the specified file name.
-     * @param filename File name to write to
-     * @throws java.io.IOException if an I/O exception occurred
-     */
-    public void write(String filename) throws IOException {
-        write(new File(filename));
-    }
-
-    /**
-     * Writes this DDSImage to the specified file name.
-     * @param file File object to write to
-     * @throws java.io.IOException if an I/O exception occurred
-     */
-    public void write(File file) throws IOException {
-        FileOutputStream stream = new FileOutputStream(file);
-        FileChannel chan = stream.getChannel();
-        // Create ByteBuffer for header in case the start of our
-        // ByteBuffer isn't actually memory-mapped
-        ByteBuffer hdr = ByteBuffer.allocate(Header.writtenSize());
-        hdr.order(ByteOrder.LITTLE_ENDIAN);
-        header.write(hdr);
-        hdr.rewind();
-        chan.write(hdr);
-        buf.position(Header.writtenSize());
-        chan.write(buf);
-        chan.force(true);
-        chan.close();
-        stream.close();
-    }
-
-    /** Test for presence/absence of surface description flags (DDSD_*)
-     * @param flag DDSD_* flags set to test
-     * @return true if flag present or false otherwise
-     */
-    public boolean isSurfaceDescFlagSet(int flag) {
-        return ((header.flags & flag) != 0);
-    }
-
-    /** Test for presence/absence of pixel format flags (DDPF_*) */
-    public boolean isPixelFormatFlagSet(int flag) {
-        return ((header.pfFlags & flag) != 0);
-    }
-
-    /** Gets the pixel format of this texture (D3DFMT_*) based on some
-        heuristics. Returns D3DFMT_UNKNOWN if could not recognize the
-        pixel format. */
-    public int getPixelFormat() {
-        if (isCompressed()) {
-            return getCompressionFormat();
-        } else if (isPixelFormatFlagSet(DDPF_RGB)) {
-            if (isPixelFormatFlagSet(DDPF_ALPHAPIXELS)) {
-                if (getDepth() == 32 &&
-                    header.pfRBitMask == 0x00FF0000 &&
-                    header.pfGBitMask == 0x0000FF00 &&
-                    header.pfBBitMask == 0x000000FF &&
-                    header.pfABitMask == 0xFF000000) {
-                    return D3DFMT_A8R8G8B8;
-                }
-            } else {
-                if (getDepth() == 24 &&
-                    header.pfRBitMask == 0x00FF0000 &&
-                    header.pfGBitMask == 0x0000FF00 &&
-                    header.pfBBitMask == 0x000000FF) {
-                    return D3DFMT_R8G8B8;
-                } else if (getDepth() == 32 &&
-                           header.pfRBitMask == 0x00FF0000 &&
-                           header.pfGBitMask == 0x0000FF00 &&
-                           header.pfBBitMask == 0x000000FF) {
-                    return D3DFMT_X8R8G8B8;
-                }
-            }
-        }
-
-        return D3DFMT_UNKNOWN;
-    }
-
-    /**
-     * Indicates whether this texture is cubemap
-     * @return true if cubemap or false otherwise
-     */
-    public boolean isCubemap() {
-        return ((header.ddsCaps1 & DDSCAPS_COMPLEX) != 0) && ((header.ddsCaps2 & DDSCAPS2_CUBEMAP) != 0);
-    }
-
-    /**
-     * Indicates whethe this cubemap side present
-     * @param side Side to test
-     * @return true if side present or false otherwise
-     */
-    public boolean isCubemapSidePresent(int side) {
-        return isCubemap() && (header.ddsCaps2 & side) != 0;
-    }
-
-    /** Indicates whether this texture is compressed. */
-    public boolean isCompressed() {
-        return (isPixelFormatFlagSet(DDPF_FOURCC));
-    }
-
-    /** If this surface is compressed, returns the kind of compression
-        used (DXT1..DXT5). */
-    public int getCompressionFormat() {
-        return header.pfFourCC;
-    }
-
-    /** Width of the texture (or the top-most mipmap if mipmaps are
-        present) */
-    public int getWidth() {
-        return header.width;
-    }
-
-    /** Height of the texture (or the top-most mipmap if mipmaps are
-        present) */
-    public int getHeight() {
-        return header.height;
-    }
-
-    /** Total number of bits per pixel. Only valid if DDPF_RGB is
-        present. For A8R8G8B8, would be 32. */
-    public int getDepth() {
-        return header.pfRGBBitCount;
-    }
-
-    /** Number of mip maps in the texture */
-    public int getNumMipMaps() {
-        if (!isSurfaceDescFlagSet(DDSD_MIPMAPCOUNT)) {
-            return 0;
-        }
-        return header.mipMapCountOrAux;
-    }
-
-    /** Gets the <i>i</i>th mipmap data (0..getNumMipMaps() - 1)
-     * @param map Mipmap index
-     * @return Image object
-     */
-    public ImageInfo getMipMap(int map) {
-        return getMipMap( 0, map );
-    }
-
-    /**
-     * Gets the <i>i</i>th mipmap data (0..getNumMipMaps() - 1)
-     * @param side Cubemap side or 0 for 2D texture
-     * @param map Mipmap index
-     * @return Image object
-     */
-    public ImageInfo getMipMap(int side, int map) {
-        if (!isCubemap() && (side != 0)) {
-            throw new RuntimeException( "Illegal side for 2D texture: " + side );
-        }
-        if (isCubemap() && !isCubemapSidePresent(side)) {
-            throw new RuntimeException( "Illegal side, side not present: " + side );
-        }
-        if (getNumMipMaps() > 0 &&
-            ((map < 0) || (map >= getNumMipMaps()))) {
-            throw new RuntimeException("Illegal mipmap number " + map + " (0.." + (getNumMipMaps() - 1) + ")");
-        }
-
-        // Figure out how far to seek
-        int seek = Header.writtenSize();
-        if (isCubemap()) {
-            seek += sideShiftInBytes(side);
-        }
-        for (int i = 0; i < map; i++) {
-            seek += mipMapSizeInBytes(i);
-        }
-        buf.limit(seek + mipMapSizeInBytes(map));
-        buf.position(seek);
-        ByteBuffer next = buf.slice();
-        buf.position(0);
-        buf.limit(buf.capacity());
-        return new ImageInfo(next, mipMapWidth(map), mipMapHeight(map), isCompressed(), getCompressionFormat());
-    }
-
-    /** Returns an array of ImageInfos corresponding to all mipmap
-        levels of this DDS file.
-        @return Mipmap image objects set
-    */
-    public ImageInfo[] getAllMipMaps() {
-        return getAllMipMaps(0);
-    }
-
-    /**
-     * Returns an array of ImageInfos corresponding to all mipmap
-     * levels of this DDS file.
-     * @param side Cubemap side or 0 for 2D texture
-     * @return Mipmap image objects set
-     */
-    public ImageInfo[] getAllMipMaps( int side ) {
-        int numLevels = getNumMipMaps();
-        if (numLevels == 0) {
-            numLevels = 1;
-        }
-        ImageInfo[] result = new ImageInfo[numLevels];
-        for (int i = 0; i < numLevels; i++) {
-            result[i] = getMipMap(side, i);
-        }
-        return result;
-    }
-
-    /** Converts e.g. DXT1 compression format constant (see {@link
-        #getCompressionFormat}) into "DXT1".
-        @param compressionFormat Compression format constant
-        @return String format code
-    */
-    public static String getCompressionFormatName(int compressionFormat) {
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < 4; i++) {
-            char c = (char) (compressionFormat & 0xFF);
-            buf.append(c);
-            compressionFormat = compressionFormat >> 8;
-        }
-        return buf.toString();
-    }
-
-    /** Allocates a temporary, empty ByteBuffer suitable for use in a
-        call to glCompressedTexImage2D. This is used by the Texture
-        class to expand non-power-of-two DDS compressed textures to
-        power-of-two sizes on hardware not supporting OpenGL 2.0 and the
-        NPOT texture extension. The specified OpenGL internal format
-        must be one of GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
-        GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
-        GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, or
-        GL_COMPRESSED_RGBA_S3TC_DXT5_EXT.
-    */
-    public static ByteBuffer allocateBlankBuffer(int width,
-                                                 int height,
-                                                 int openGLInternalFormat) {
-        int size = width * height;
-        switch (openGLInternalFormat) {
-        case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-        case GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-            size /= 2;
-            break;
-
-        case GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-        case GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-            break;
-
-        default:
-            throw new IllegalArgumentException("Illegal OpenGL texture internal format " +
-                                               openGLInternalFormat);
-        }
-        if (size == 0)
-            size = 1;
-        return BufferUtil.newByteBuffer(size);
-    }
-
-    public void debugPrint() {
-        PrintStream tty = System.err;
-        tty.println("Compressed texture: " + isCompressed());
-        if (isCompressed()) {
-            int fmt = getCompressionFormat();
-            String name = getCompressionFormatName(fmt);
-            tty.println("Compression format: 0x" + Integer.toHexString(fmt) + " (" + name + ")");
-        }
-        tty.println("Width: " + header.width + " Height: " + header.height);
-        tty.println("header.pitchOrLinearSize: " + header.pitchOrLinearSize);
-        tty.println("header.pfRBitMask: 0x" + Integer.toHexString(header.pfRBitMask));
-        tty.println("header.pfGBitMask: 0x" + Integer.toHexString(header.pfGBitMask));
-        tty.println("header.pfBBitMask: 0x" + Integer.toHexString(header.pfBBitMask));
-        tty.println("SurfaceDesc flags:");
-        boolean recognizedAny = false;
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_CAPS, "DDSD_CAPS");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_HEIGHT, "DDSD_HEIGHT");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_WIDTH, "DDSD_WIDTH");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_PITCH, "DDSD_PITCH");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_BACKBUFFERCOUNT, "DDSD_BACKBUFFERCOUNT");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_ZBUFFERBITDEPTH, "DDSD_ZBUFFERBITDEPTH");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_ALPHABITDEPTH, "DDSD_ALPHABITDEPTH");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_LPSURFACE, "DDSD_LPSURFACE");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_PIXELFORMAT, "DDSD_PIXELFORMAT");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_MIPMAPCOUNT, "DDSD_MIPMAPCOUNT");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_LINEARSIZE, "DDSD_LINEARSIZE");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_DEPTH, "DDSD_DEPTH");
-        if (!recognizedAny) {
-            tty.println("(none)");
-        }
-        tty.println("Raw SurfaceDesc flags: 0x" + Integer.toHexString(header.flags));
-        tty.println("Pixel format flags:");
-        recognizedAny = false;
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ALPHAPIXELS, "DDPF_ALPHAPIXELS");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ALPHA, "DDPF_ALPHA");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_FOURCC, "DDPF_FOURCC");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED4, "DDPF_PALETTEINDEXED4");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXEDTO8, "DDPF_PALETTEINDEXEDTO8");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED8, "DDPF_PALETTEINDEXED8");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_RGB, "DDPF_RGB");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_COMPRESSED, "DDPF_COMPRESSED");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_RGBTOYUV, "DDPF_RGBTOYUV");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_YUV, "DDPF_YUV");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ZBUFFER, "DDPF_ZBUFFER");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED1, "DDPF_PALETTEINDEXED1");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED2, "DDPF_PALETTEINDEXED2");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ZPIXELS, "DDPF_ZPIXELS");
-        if (!recognizedAny) {
-            tty.println("(none)");
-        }
-        tty.println("Raw pixel format flags: 0x" + Integer.toHexString(header.pfFlags));
-        tty.println("Depth: " + getDepth());
-        tty.println("Number of mip maps: " + getNumMipMaps());
-        int fmt = getPixelFormat();
-        tty.print("Pixel format: ");
-        switch (fmt) {
-        case D3DFMT_R8G8B8:   tty.println("D3DFMT_R8G8B8"); break;
-        case D3DFMT_A8R8G8B8: tty.println("D3DFMT_A8R8G8B8"); break;
-        case D3DFMT_X8R8G8B8: tty.println("D3DFMT_X8R8G8B8"); break;
-        case D3DFMT_DXT1:     tty.println("D3DFMT_DXT1"); break;
-        case D3DFMT_DXT2:     tty.println("D3DFMT_DXT2"); break;
-        case D3DFMT_DXT3:     tty.println("D3DFMT_DXT3"); break;
-        case D3DFMT_DXT4:     tty.println("D3DFMT_DXT4"); break;
-        case D3DFMT_DXT5:     tty.println("D3DFMT_DXT5"); break;
-        case D3DFMT_UNKNOWN:  tty.println("D3DFMT_UNKNOWN"); break;
-        default:              tty.println("(unknown pixel format " + fmt + ")"); break;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    private static final int MAGIC = 0x20534444;
-
-    static class Header {
-        int size;                 // size of the DDSURFACEDESC structure
-        int flags;                // determines what fields are valid
-        int height;               // height of surface to be created
-        int width;                // width of input surface
-        int pitchOrLinearSize;
-        int backBufferCountOrDepth;
-        int mipMapCountOrAux;     // number of mip-map levels requested (in this context)
-        int alphaBitDepth;        // depth of alpha buffer requested
-        int reserved1;            // reserved
-        int surface;              // pointer to the associated surface memory
-        // NOTE: following two entries are from DDCOLORKEY data structure
-        // Are overlaid with color for empty cubemap faces (unused in this reader)
-        int colorSpaceLowValue;
-        int colorSpaceHighValue;
-        int destBltColorSpaceLowValue;
-        int destBltColorSpaceHighValue;
-        int srcOverlayColorSpaceLowValue;
-        int srcOverlayColorSpaceHighValue;
-        int srcBltColorSpaceLowValue;
-        int srcBltColorSpaceHighValue;
-        // NOTE: following entries are from DDPIXELFORMAT data structure
-        // Are overlaid with flexible vertex format description of vertex
-        // buffers (unused in this reader)
-        int pfSize;                 // size of DDPIXELFORMAT structure
-        int pfFlags;                // pixel format flags
-        int pfFourCC;               // (FOURCC code)
-        // Following five entries have multiple interpretations, not just
-        // RGBA (but that's all we support right now)
-        int pfRGBBitCount;          // how many bits per pixel
-        int pfRBitMask;             // mask for red bits
-        int pfGBitMask;             // mask for green bits
-        int pfBBitMask;             // mask for blue bits
-        int pfABitMask;             // mask for alpha channel
-        int ddsCaps1;               // Texture and mip-map flags
-        int ddsCaps2;               // Advanced capabilities including cubemap support
-        int ddsCapsReserved1;
-        int ddsCapsReserved2;
-        int textureStage;           // stage in multitexture cascade
-
-        void read(ByteBuffer buf) throws IOException {
-            int magic                     = buf.getInt();
-            if (magic != MAGIC) {
-                throw new IOException("Incorrect magic number 0x" +
-                                      Integer.toHexString(magic) +
-                                      " (expected " + MAGIC + ")");
-            }
-
-            size                          = buf.getInt();
-            flags                         = buf.getInt();
-            height                        = buf.getInt();
-            width                         = buf.getInt();
-            pitchOrLinearSize             = buf.getInt();
-            backBufferCountOrDepth        = buf.getInt();
-            mipMapCountOrAux              = buf.getInt();
-            alphaBitDepth                 = buf.getInt();
-            reserved1                     = buf.getInt();
-            surface                       = buf.getInt();
-            colorSpaceLowValue            = buf.getInt();
-            colorSpaceHighValue           = buf.getInt();
-            destBltColorSpaceLowValue     = buf.getInt();
-            destBltColorSpaceHighValue    = buf.getInt();
-            srcOverlayColorSpaceLowValue  = buf.getInt();
-            srcOverlayColorSpaceHighValue = buf.getInt();
-            srcBltColorSpaceLowValue      = buf.getInt();
-            srcBltColorSpaceHighValue     = buf.getInt();
-            pfSize                        = buf.getInt();
-            pfFlags                       = buf.getInt();
-            pfFourCC                      = buf.getInt();
-            pfRGBBitCount                 = buf.getInt();
-            pfRBitMask                    = buf.getInt();
-            pfGBitMask                    = buf.getInt();
-            pfBBitMask                    = buf.getInt();
-            pfABitMask                    = buf.getInt();
-            ddsCaps1                      = buf.getInt();
-            ddsCaps2                      = buf.getInt();
-            ddsCapsReserved1              = buf.getInt();
-            ddsCapsReserved2              = buf.getInt();
-            textureStage                  = buf.getInt();
-        }
-
-        // buf must be in little-endian byte order
-        void write(ByteBuffer buf) {
-            buf.putInt(MAGIC);
-            buf.putInt(size);
-            buf.putInt(flags);
-            buf.putInt(height);
-            buf.putInt(width);
-            buf.putInt(pitchOrLinearSize);
-            buf.putInt(backBufferCountOrDepth);
-            buf.putInt(mipMapCountOrAux);
-            buf.putInt(alphaBitDepth);
-            buf.putInt(reserved1);
-            buf.putInt(surface);
-            buf.putInt(colorSpaceLowValue);
-            buf.putInt(colorSpaceHighValue);
-            buf.putInt(destBltColorSpaceLowValue);
-            buf.putInt(destBltColorSpaceHighValue);
-            buf.putInt(srcOverlayColorSpaceLowValue);
-            buf.putInt(srcOverlayColorSpaceHighValue);
-            buf.putInt(srcBltColorSpaceLowValue);
-            buf.putInt(srcBltColorSpaceHighValue);
-            buf.putInt(pfSize);
-            buf.putInt(pfFlags);
-            buf.putInt(pfFourCC);
-            buf.putInt(pfRGBBitCount);
-            buf.putInt(pfRBitMask);
-            buf.putInt(pfGBitMask);
-            buf.putInt(pfBBitMask);
-            buf.putInt(pfABitMask);
-            buf.putInt(ddsCaps1);
-            buf.putInt(ddsCaps2);
-            buf.putInt(ddsCapsReserved1);
-            buf.putInt(ddsCapsReserved2);
-            buf.putInt(textureStage);
-        }
-
-        private static int size() {
-            return 124;
-        }
-
-        private static int pfSize() {
-            return 32;
-        }
-
-        private static int writtenSize() {
-            return 128;
-        }
-    }
-
-    private DDSImage() {
-    }
-
-    private void readFromFile(File file) throws IOException {
-        fis = new FileInputStream(file);
-        chan = fis.getChannel();
-        ByteBuffer buf = chan.map(FileChannel.MapMode.READ_ONLY,
-                                  0, (int) file.length());
-        readFromBuffer(buf);
-    }
-
-    private void readFromBuffer(ByteBuffer buf) throws IOException {
-        this.buf = buf;
-        buf.order(ByteOrder.LITTLE_ENDIAN);
-        header = new Header();
-        header.read(buf);
-        fixupHeader();
-    }
-
-    private void initFromData(int d3dFormat,
-                              int width,
-                              int height,
-                              ByteBuffer[] mipmapData) throws IllegalArgumentException {
-        // Check size of mipmap data compared against format, width and
-        // height
-        int topmostMipmapSize = width * height;
-        int pitchOrLinearSize = width;
-        boolean isCompressed = false;
-        switch (d3dFormat) {
-        case D3DFMT_R8G8B8:   topmostMipmapSize *= 3; pitchOrLinearSize *= 3; break;
-        case D3DFMT_A8R8G8B8: topmostMipmapSize *= 4; pitchOrLinearSize *= 4; break;
-        case D3DFMT_X8R8G8B8: topmostMipmapSize *= 4; pitchOrLinearSize *= 4; break;
-        case D3DFMT_DXT1:
-        case D3DFMT_DXT2:
-        case D3DFMT_DXT3:
-        case D3DFMT_DXT4:
-        case D3DFMT_DXT5:
-            topmostMipmapSize = computeCompressedBlockSize(width, height, 1, d3dFormat);
-            pitchOrLinearSize = topmostMipmapSize;
-            isCompressed = true;
-            break;
-        default:
-            throw new IllegalArgumentException("d3dFormat must be one of the known formats");
-        }
-    
-        // Now check the mipmaps against this size
-        int curSize = topmostMipmapSize;
-        int totalSize = 0;
-        for (int i = 0; i < mipmapData.length; i++) {
-            if (mipmapData[i].remaining() != curSize) {
-                throw new IllegalArgumentException("Mipmap level " + i +
-                                                   " didn't match expected data size (expected " + curSize + ", got " +
-                                                   mipmapData[i].remaining() + ")");
-            }
-            curSize /= 4;
-            totalSize += mipmapData[i].remaining();
-        }
-
-        // OK, create one large ByteBuffer to hold all of the mipmap data
-        totalSize += Header.writtenSize();
-        ByteBuffer buf = ByteBuffer.allocate(totalSize);
-        buf.position(Header.writtenSize());
-        for (int i = 0; i < mipmapData.length; i++) {
-            buf.put(mipmapData[i]);
-        }
-        this.buf = buf;
-    
-        // Allocate and initialize a Header
-        header = new Header();
-        header.size = Header.size();
-        header.flags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT;
-        if (mipmapData.length > 1) {
-            header.flags |= DDSD_MIPMAPCOUNT;
-            header.mipMapCountOrAux = mipmapData.length;
-        }
-        header.width = width;
-        header.height = height;
-        if (isCompressed) {
-            header.flags |= DDSD_LINEARSIZE;
-            header.pfFlags |= DDPF_FOURCC;
-            header.pfFourCC = d3dFormat;
-        } else {
-            header.flags |= DDSD_PITCH;
-            // Figure out the various settings from the pixel format
-            header.pfFlags |= DDPF_RGB;
-            switch (d3dFormat) {
-            case D3DFMT_R8G8B8:   header.pfRGBBitCount = 24; break;
-            case D3DFMT_A8R8G8B8: header.pfRGBBitCount = 32; header.pfFlags |= DDPF_ALPHAPIXELS; break;
-            case D3DFMT_X8R8G8B8: header.pfRGBBitCount = 32; break;
-            }
-            header.pfRBitMask = 0x00FF0000;
-            header.pfGBitMask = 0x0000FF00;
-            header.pfBBitMask = 0x000000FF;
-            if (d3dFormat == D3DFMT_A8R8G8B8) {
-                header.pfABitMask = 0xFF000000;
-            }
-        }
-        header.pitchOrLinearSize = pitchOrLinearSize;
-        header.pfSize = Header.pfSize();
-        // Not sure whether we can get away with leaving the rest of the
-        // header blank
-    }
-
-    // Microsoft doesn't follow their own specifications and the
-    // simplest conversion using the DxTex tool to e.g. a DXT3 texture
-    // results in an illegal .dds file without either DDSD_PITCH or
-    // DDSD_LINEARSIZE set in the header's flags. This code, adapted
-    // from the DevIL library, fixes up the header in these situations.
-    private void fixupHeader() {
-        if (isCompressed() && !isSurfaceDescFlagSet(DDSD_LINEARSIZE)) {
-            // Figure out how big the linear size should be
-            int depth = header.backBufferCountOrDepth;
-            if (depth == 0) {
-                depth = 1;
-            }
-
-            header.pitchOrLinearSize = computeCompressedBlockSize(getWidth(), getHeight(), depth, getCompressionFormat());
-            header.flags |= DDSD_LINEARSIZE;
-        }
-    }
-
-    private static int computeCompressedBlockSize(int width,
-                                                  int height,
-                                                  int depth,
-                                                  int compressionFormat) {
-        int blockSize = ((width + 3)/4) * ((height + 3)/4) * ((depth + 3)/4);
-        switch (compressionFormat) {
-        case D3DFMT_DXT1:  blockSize *=  8; break;
-        default:           blockSize *= 16; break;
-        }
-        return blockSize;
-    }
-
-    private int mipMapWidth(int map) {
-        int width = getWidth();
-        for (int i = 0; i < map; i++) {
-            width >>= 1;
-        }
-        return Math.max(width, 1);
-    }
-
-    private int mipMapHeight(int map) {
-        int height = getHeight();
-        for (int i = 0; i < map; i++) {
-            height >>= 1;
-        }
-        return Math.max(height, 1);
-    }
-
-    private int mipMapSizeInBytes(int map) {
-        int width  = mipMapWidth(map);
-        int height = mipMapHeight(map);
-        if (isCompressed()) {
-            int blockSize = (getCompressionFormat() == D3DFMT_DXT1 ? 8 : 16);
-            return ((width+3)/4)*((height+3)/4)*blockSize;
-        } else {
-            return width * height * (getDepth() / 8);
-        }
-    }
-
-    private int sideSizeInBytes() {
-        int numLevels = getNumMipMaps();
-        if (numLevels == 0) {
-            numLevels = 1;
-        }
-
-        int size = 0;
-        for (int i = 0; i < numLevels; i++) {
-            size += mipMapSizeInBytes(i);
-        }
-
-        return size;
-    }
-
-    private int sideShiftInBytes(int side) {
-        int[] sides = {
-            DDSCAPS2_CUBEMAP_POSITIVEX,
-            DDSCAPS2_CUBEMAP_NEGATIVEX,
-            DDSCAPS2_CUBEMAP_POSITIVEY,
-            DDSCAPS2_CUBEMAP_NEGATIVEY,
-            DDSCAPS2_CUBEMAP_POSITIVEZ,
-            DDSCAPS2_CUBEMAP_NEGATIVEZ
-        };
-
-        int shift = 0;
-        int sideSize = sideSizeInBytes();
-        for (int i = 0; i < sides.length; i++) {
-            int temp = sides[i];
-            if ((temp & side) != 0) {
-                return shift;
-            }
-
-            shift += sideSize;
-        }
-
-        throw new RuntimeException("Illegal side: " + side);
-    }
-
-    private boolean printIfRecognized(PrintStream tty, int flags, int flag, String what) {
-        if ((flags & flag) != 0) {
-            tty.println(what);
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataInputStream.java b/src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataInputStream.java
deleted file mode 100755
index b2b1226bd..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataInputStream.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package	com.sun.opengl.util.texture.spi;
-
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.FilterInputStream;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.EOFException;
-import java.io.IOException;
-
-/**
- * Little Endian Data Input Stream.
- *
- * This class implements an input stream filter to allow reading
- * of java native datatypes from an input stream which has those
- * native datatypes stored in a little endian byte order.<p>
- *
- * This is the sister class of the DataInputStream which allows
- * for reading of java native datatypes from an input stream with
- * the datatypes stored in big endian byte order.<p>
- *
- * This class implements the minimum required and calls DataInputStream
- * for some of the required methods for DataInput.<p>
- *
- * Not all methods are implemented due to lack of immediatte requirement
- * for that functionality. It is not clear if it is ever going to be
- * functionally required to be able to read UTF data in a LittleEndianManner<p>
- *
- * @author	Robin Luiten
- * @version	1.1	15/Dec/1997
- */
-public class LEDataInputStream extends FilterInputStream implements DataInput
-{
-    /**
-     * To reuse	some of	the	non	endian dependent methods from
-     * DataInputStreams	methods.
-     */
-    DataInputStream	dataIn;
-
-    public LEDataInputStream(InputStream in)
-    {
-        super(in);
-        dataIn = new DataInputStream(in);
-    }
-
-    public void close() throws IOException
-    {
-        dataIn.close();		// better close as we create it.
-        // this will close underlying as well.
-    }
-
-    public synchronized	final int read(byte	b[]) throws	IOException
-    {
-        return dataIn.read(b, 0, b.length);
-    }
-
-    public synchronized	final int read(byte	b[], int off, int len) throws IOException
-    {
-        int	rl = dataIn.read(b,	off, len);
-        return rl;
-    }
-
-    public final void readFully(byte b[]) throws IOException
-    {
-        dataIn.readFully(b,	0, b.length);
-    }
-
-    public final void readFully(byte b[], int off, int len)	throws IOException
-    {
-        dataIn.readFully(b,	off, len);
-    }
-
-    public final int skipBytes(int n) throws IOException
-    {
-        return dataIn.skipBytes(n);
-    }
-
-    public final boolean readBoolean() throws IOException
-    {
-        int	ch = dataIn.read();
-        if (ch < 0)
-            throw new EOFException();
-        return (ch != 0);
-    }
-
-    public final byte readByte() throws	IOException
-    {
-        int	ch = dataIn.read();
-        if (ch < 0)
-            throw new EOFException();
-        return (byte)(ch);
-    }
-
-    public final int readUnsignedByte()	throws IOException
-    {
-        int	ch = dataIn.read();
-        if (ch < 0)
-            throw new EOFException();
-        return ch;
-    }
-
-    public final short readShort() throws IOException
-    {
-        int	ch1	= dataIn.read();
-        int	ch2	= dataIn.read();
-        if ((ch1 | ch2)	< 0)
-            throw new EOFException();
-        return (short)((ch1	<< 0) +	(ch2 <<	8));
-    }
-
-    public final int readUnsignedShort() throws	IOException
-    { 
-        int	ch1	= dataIn.read();
-        int	ch2	= dataIn.read();
-        if ((ch1 | ch2)	< 0)
-            throw new EOFException();
-        return (ch1	<< 0) +	(ch2 <<	8);
-    }
-
-    public final char readChar() throws	IOException
-    {
-        int	ch1	= dataIn.read();
-        int	ch2	= dataIn.read();
-        if ((ch1 | ch2)	< 0)
-            throw new EOFException();
-        return (char)((ch1 << 0) + (ch2	<< 8));
-    }
-
-    public final int readInt() throws IOException
-    {
-        int	ch1	= dataIn.read();
-        int	ch2	= dataIn.read();
-        int	ch3	= dataIn.read();
-        int	ch4	= dataIn.read();
-        if ((ch1 | ch2 | ch3 | ch4)	< 0)
-            throw new EOFException();
-        return ((ch1 <<	0) + (ch2 << 8)	+ (ch3 << 16) +	(ch4 <<	24));
-    }
-
-    public final long readLong() throws	IOException
-    {
-        int	i1 = readInt();
-        int	i2 = readInt();
-        return ((long)(i1) & 0xFFFFFFFFL) +	(i2	<< 32);
-    }
-
-    public final float readFloat() throws IOException
-    {
-        return Float.intBitsToFloat(readInt());
-    }
-
-    public final double	readDouble() throws	IOException
-    {
-        return Double.longBitsToDouble(readLong());
-    }
-
-    /**
-     * dont call this it is not implemented.
-     * @return empty new string 
-     **/
-    public final String	readLine() throws IOException
-    {
-        return new String();
-    }
-
-    /**
-     * dont call this it is not implemented
-     * @return empty new string 
-     **/
-    public final String	readUTF() throws IOException
-    {
-        return new String();
-    }
-
-    /**
-     * dont call this it is not implemented
-     * @return empty new string 
-     **/
-    public final static	String readUTF(DataInput in) throws	IOException
-    {
-        return new String();
-    }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataOutputStream.java b/src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataOutputStream.java
deleted file mode 100755
index 730ec0dbd..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataOutputStream.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.spi;
-
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.FilterOutputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-
-/**
- * Little Endian Data Output Stream.
- *
- * This class implements an output stream filter to allow writing
- * of java native datatypes to an output stream which has those
- * native datatypes stored in a little endian byte order.<p>
- *
- * This is the sister class of the DataOutputStream which allows
- * for writing of java native datatypes to an output stream with
- * the datatypes stored in big endian byte order.<p>
- *
- * This class implements the minimum required and calls DataOutputStream
- * for some of the required methods for DataOutput.<p>
- *
- * Not all methods are implemented due to lack of immediate requirement
- * for that functionality. It is not clear if it is ever going to be
- * functionally required to be able to read UTF data in a LittleEndianManner<p>
- *
- */
-public class LEDataOutputStream extends FilterOutputStream implements DataOutput
-{
-    /**
-     * To reuse some of the non endian dependent methods from
-     * DataOutputStream's methods.
-     */
-    DataOutputStream dataOut;
-
-    public LEDataOutputStream(OutputStream out)
-    {
-        super(out);
-        dataOut = new DataOutputStream(out);
-    }
-
-    public void close() throws IOException
-    {
-        dataOut.close(); // better close as we create it.
-        // this will close underlying as well.
-    }
-
-    public synchronized final void write(byte b[]) throws IOException
-    {
-        dataOut.write(b, 0, b.length);
-    }
-
-    public synchronized final void write(byte b[], int off, int len) throws IOException
-    {
-        dataOut.write(b, off, len);
-    }
-
-    public final void write(int b) throws IOException
-    {
-        dataOut.write(b);
-    }
-
-    public final void writeBoolean(boolean v) throws IOException
-    {
-        dataOut.writeBoolean(v);
-    }
-
-    public final void writeByte(int v) throws IOException
-    {
-        dataOut.writeByte(v);
-    }
-
-    /** Don't call this -- not implemented */
-    public final void writeBytes(String s) throws IOException
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    public final void writeChar(int v) throws IOException
-    {
-        dataOut.writeChar(((v >> 8) & 0xff) |
-                          ((v & 0xff) << 8));
-    }
-
-    /** Don't call this -- not implemented */
-    public final void writeChars(String s) throws IOException
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    public final void writeDouble(double v) throws IOException
-    {
-        writeLong(Double.doubleToRawLongBits(v));
-    }
-
-    public final void writeFloat(float v) throws IOException
-    {
-        writeInt(Float.floatToRawIntBits(v));
-    }
-
-    public final void writeInt(int v) throws IOException
-    {
-        dataOut.writeInt((v >>> 24) |
-                         ((v >>> 8) & 0xff00) |
-                         ((v << 8)  & 0x00ff00) |
-                         (v << 24));
-    }
-
-    public final void writeLong(long v) throws IOException
-    {
-        writeInt((int) v);
-        writeInt((int) (v >>> 32));
-    }
-
-    public final void writeShort(int v) throws IOException
-    {
-        dataOut.writeShort(((v >> 8) & 0xff) |
-                           ((v & 0xff) << 8));
-    }
-
-    /** Don't call this -- not implemented */
-    public final void writeUTF(String s) throws IOException
-    {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/NetPbmTextureWriter.java b/src/jogl/classes/com/sun/opengl/util/texture/spi/NetPbmTextureWriter.java
deleted file mode 100644
index 18df1dc55..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/NetPbmTextureWriter.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.spi;
-
-import java.io.*;
-import java.net.*;
-import java.nio.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.*;
-import com.sun.opengl.util.texture.spi.*;
-
-public class NetPbmTextureWriter implements TextureWriter {
-    int magic;
-
-    public NetPbmTextureWriter() {
-        this(0); // auto
-    }
-
-    /**
-     * supported magic values are:<br>
-     * <pre>
-     *   magic 0 - detect by file suffix (TextureIO compliant)
-     *   magic 6 - PPM binary RGB
-     *   magic 7 - PAM binary RGB or RGBA
-     * </pre>
-     */
-    public NetPbmTextureWriter(int magic) {
-        switch(magic) {
-            case 0:
-            case 6:
-            case 7:
-                break;
-            default:
-                throw new GLException("Unsupported magic: "+magic+", should be 0 (auto), 6 (PPM) or 7 (PAM)");
-        }
-        this.magic = magic;
-    }
-
-    public int getMagic() { return magic; }
-
-    public static final String PPM     = "ppm";
-    public static final String PAM     = "pam";
-
-    public String getSuffix() { return (magic==6)?PPM:PAM; }
-
-    public boolean write(File file,
-                         TextureData data) throws IOException {
-
-        // file suffix selection 
-        if (0==magic) {
-            if (PPM.equals(FileUtil.getFileSuffix(file))) {
-                magic = 6;
-            } else if (PAM.equals(FileUtil.getFileSuffix(file))) {
-                magic = 7;
-            } else {
-                return false;
-            }
-        }
-
-        int pixelFormat = data.getPixelFormat();
-        int pixelType   = data.getPixelType();
-        if ((pixelFormat == GL.GL_RGB ||
-             pixelFormat == GL.GL_RGBA) &&
-            (pixelType == GL.GL_BYTE ||
-             pixelType == GL.GL_UNSIGNED_BYTE)) {
-    
-            int comps = ( pixelFormat == GL.GL_RGBA ) ? 4 : 3 ;
-
-            if(magic==6 && comps==4) {
-                throw new IOException("NetPbmTextureWriter magic 6 (PPM) doesn't RGBA pixel format, use magic 7 (PAM)");
-            }
-
-            FileOutputStream fos = new FileOutputStream(file);
-
-            StringBuffer header = new StringBuffer();
-            header.append("P");
-            header.append(magic);
-            header.append("\n");
-            if(7==magic) {
-                header.append("WIDTH ");
-            }
-            header.append(data.getWidth());
-            if(7==magic) {
-                header.append("\nHEIGHT ");
-            } else {
-                header.append(" ");
-            }
-            header.append(data.getHeight());
-            if(7==magic) {
-                header.append("\nDEPTH ");
-                header.append(comps);
-                header.append("\nMAXVAL 255\nTUPLTYPE ");
-                if(pixelFormat == GL.GL_RGBA) {
-                    header.append("RGB_ALPHA");
-                } else {
-                    header.append("RGB");
-                }
-                header.append("\nENDHDR\n");
-            } else {
-                header.append("\n255\n");
-            }
-
-            fos.write(header.toString().getBytes());
-                
-            ByteBuffer buf = (ByteBuffer) data.getBuffer();
-            if (buf == null) {
-                buf = (ByteBuffer) data.getMipmapData()[0];
-            }
-            buf.rewind();
-
-            byte[] bufArray = null;
-
-            try {
-                bufArray = buf.array();
-            } catch (Throwable t) {}
-            if(null==bufArray) {
-                bufArray = new byte[data.getWidth()*data.getHeight()*comps];
-                buf.get(bufArray);
-                buf.rewind();
-            }
-
-            fos.write(bufArray);
-            fos.close();
-
-            return true;
-        }
-      
-        throw new IOException("NetPbmTextureWriter writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/SGIImage.java b/src/jogl/classes/com/sun/opengl/util/texture/spi/SGIImage.java
deleted file mode 100755
index 284fa64bd..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/SGIImage.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/*
- * Portions Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.spi;
-
-import java.io.*;
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-
-/** <p> Reads and writes SGI RGB/RGBA images. </p>
-
-    <p> Written from <a href =
-    "http://astronomy.swin.edu.au/~pbourke/dataformats/sgirgb/">Paul
-    Bourke's adaptation</a> of the <a href =
-    "http://astronomy.swin.edu.au/~pbourke/dataformats/sgirgb/sgiversion.html">SGI
-    specification</a>. </p>
-*/
-
-public class SGIImage {
-    private Header header;
-    private int    format;
-    private byte[] data;
-    // Used for decoding RLE-compressed images
-    private int[]  rowStart;
-    private int[]  rowSize;
-    private int    rleEnd;
-    private byte[] tmpData;
-    private byte[] tmpRead;
-
-    private static final int MAGIC = 474;
-
-    static class Header {
-        short magic;        // IRIS image file magic number
-        // This should be decimal 474
-        byte  storage;      // Storage format
-        // 0 for uncompressed
-        // 1 for RLE compression
-        byte  bpc;          // Number of bytes per pixel channel 
-        // Legally 1 or 2
-        short dimension;    // Number of dimensions
-        // Legally 1, 2, or 3
-        // 1 means a single row, XSIZE long
-        // 2 means a single 2D image
-        // 3 means multiple 2D images
-        short xsize;        // X size in pixels 
-        short ysize;        // Y size in pixels 
-        short zsize;        // Number of channels
-        // 1 indicates greyscale
-        // 3 indicates RGB
-        // 4 indicates RGB and Alpha
-        int pixmin;         // Minimum pixel value
-        // This is the lowest pixel value in the image
-        int pixmax;         // Maximum pixel value
-        // This is the highest pixel value in the image
-        int dummy;          // Ignored
-        // Normally set to 0
-        String imagename;   // Image name; 80 bytes long
-        // Must be null terminated, therefore at most 79 bytes
-        int colormap;       // Colormap ID
-        // 0 - normal mode
-        // 1 - dithered, 3 mits for red and green, 2 for blue, obsolete
-        // 2 - index colour, obsolete
-        // 3 - not an image but a colourmap
-        // 404 bytes  char    DUMMY      Ignored
-        // Should be set to 0, makes the header 512 bytes.
-
-        Header() {
-            magic = MAGIC;
-        }
-
-        Header(DataInputStream in) throws IOException {
-            magic      = in.readShort();
-            storage    = in.readByte();
-            bpc        = in.readByte();
-            dimension  = in.readShort();
-            xsize      = in.readShort();
-            ysize      = in.readShort();
-            zsize      = in.readShort();
-            pixmin     = in.readInt();
-            pixmax     = in.readInt();
-            dummy      = in.readInt();
-            byte[] tmpname = new byte[80];
-            in.read(tmpname);
-            int numChars = 0;
-            while (tmpname[numChars++] != 0);
-            imagename  = new String(tmpname, 0, numChars);
-            colormap   = in.readInt();
-            byte[] tmp = new byte[404];
-            in.read(tmp);
-        }
-
-        public String toString() {
-            return ("magic: " + magic +
-                    " storage: " + (int) storage +
-                    " bpc: " + (int) bpc +
-                    " dimension: " + dimension +
-                    " xsize: " + xsize +
-                    " ysize: " + ysize +
-                    " zsize: " + zsize +
-                    " pixmin: " + pixmin +
-                    " pixmax: " + pixmax +
-                    " imagename: " + imagename +
-                    " colormap: " + colormap);
-        }
-    }
-
-    private SGIImage(Header header) {
-        this.header = header;
-    }
-
-    /** Reads an SGI image from the specified file. */
-    public static SGIImage read(String filename) throws IOException {
-        return read(new FileInputStream(filename));
-    }
-
-    /** Reads an SGI image from the specified InputStream. */
-    public static SGIImage read(InputStream in) throws IOException {
-        DataInputStream dIn = new DataInputStream(new BufferedInputStream(in));
-
-        Header header = new Header(dIn);
-        SGIImage res = new SGIImage(header);
-        res.decodeImage(dIn);
-        return res;
-    }
-
-    /** Writes this SGIImage to the specified file name. If
-        flipVertically is set, outputs the scanlines from top to bottom
-        rather than the default bottom to top order. */
-    public void write(String filename, boolean flipVertically) throws IOException {
-        write(new File(filename), flipVertically);
-    }
-
-    /** Writes this SGIImage to the specified file. If flipVertically is
-        set, outputs the scanlines from top to bottom rather than the
-        default bottom to top order. */
-    public void write(File file, boolean flipVertically) throws IOException {
-        writeImage(file, data, header.xsize, header.ysize, header.zsize, flipVertically);
-    }
-
-    /** Creates an SGIImage from the specified data in either RGB or
-        RGBA format. */
-    public static SGIImage createFromData(int width,
-                                          int height,
-                                          boolean hasAlpha,
-                                          byte[] data) {
-        Header header = new Header();
-        header.xsize = (short) width;
-        header.ysize = (short) height;
-        header.zsize = (short) (hasAlpha ? 4 : 3);
-        SGIImage image = new SGIImage(header);
-        image.data = data;
-        return image;
-    }
-
-    /** Determines from the magic number whether the given InputStream
-        points to an SGI RGB image. The given InputStream must return
-        true from markSupported() and support a minimum of two bytes
-        of read-ahead. */
-    public static boolean isSGIImage(InputStream in) throws IOException {
-        if (!(in instanceof BufferedInputStream)) {
-            in = new BufferedInputStream(in);
-        }
-        if (!in.markSupported()) {
-            throw new IOException("Can not test non-destructively whether given InputStream is an SGI RGB image");
-        }
-        DataInputStream dIn = new DataInputStream(in);
-        dIn.mark(4);
-        short magic = dIn.readShort();
-        dIn.reset();
-        return (magic == MAGIC);
-    }
-
-    /** Returns the width of the image. */
-    public int getWidth() {
-        return header.xsize;
-    }
-
-    /** Returns the height of the image. */
-    public int getHeight() {
-        return header.ysize;
-    }
-
-    /** Returns the OpenGL format for this texture; e.g. GL.GL_RGB or GL.GL_RGBA. */
-    public int getFormat() {
-        return format;
-    }
-
-    /** Returns the raw data for this texture in the correct
-        (bottom-to-top) order for calls to glTexImage2D. */
-    public byte[] getData()  { return data; }
-
-    public String toString() {
-        return header.toString();
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-  
-    private void decodeImage(DataInputStream in) throws IOException {
-        if (header.storage == 1) {
-            // Read RLE compression data; row starts and sizes
-            int x = header.ysize * header.zsize;
-            rowStart = new int[x];
-            rowSize  = new int[x];
-            rleEnd   = 4 * 2 * x + 512;
-            for (int i = 0; i < x; i++) {
-                rowStart[i] = in.readInt();
-            }
-            for (int i = 0; i < x; i++) {
-                rowSize[i] = in.readInt();
-            }
-            tmpRead = new byte[header.xsize * 256];
-        }
-        tmpData = readAll(in);
-
-        int xsize = header.xsize;
-        int ysize = header.ysize;
-        int zsize = header.zsize;
-        int lptr  = 0;
-
-        data = new byte[xsize * ysize * 4];
-        byte[] rbuf = new byte[xsize];
-        byte[] gbuf = new byte[xsize];
-        byte[] bbuf = new byte[xsize];
-        byte[] abuf = new byte[xsize];
-        for (int y = 0; y < ysize; y++) {
-            if (zsize >= 4) {
-                getRow(rbuf, y, 0);
-                getRow(gbuf, y, 1);
-                getRow(bbuf, y, 2);
-                getRow(abuf, y, 3);
-                rgbatorgba(rbuf, gbuf, bbuf, abuf, data, lptr);
-            } else if (zsize == 3) {
-                getRow(rbuf, y, 0);
-                getRow(gbuf, y, 1);
-                getRow(bbuf, y, 2);
-                rgbtorgba(rbuf, gbuf, bbuf, data, lptr);
-            } else if (zsize == 2) {
-                getRow(rbuf, y, 0);
-                getRow(abuf, y, 1);
-                latorgba(rbuf, abuf, data, lptr);
-            } else {
-                getRow(rbuf, y, 0);
-                bwtorgba(rbuf, data, lptr);
-            }
-            lptr += 4 * xsize;
-        }
-        rowStart = null;
-        rowSize  = null;
-        tmpData  = null;
-        tmpRead  = null;
-        format   = GL.GL_RGBA;
-        header.zsize = 4;
-    }
-
-    private void getRow(byte[] buf, int y, int z) {
-        if (header.storage == 1) {
-            int offs = rowStart[y + z * header.ysize] - rleEnd;
-            System.arraycopy(tmpData, offs, tmpRead, 0, rowSize[y + z * header.ysize]);
-            int iPtr = 0;
-            int oPtr = 0;
-            for (;;) {
-                byte pixel = tmpRead[iPtr++];
-                int count = (int) (pixel & 0x7F);
-                if (count == 0) {
-                    return;
-                }
-                if ((pixel & 0x80) != 0) {
-                    while ((count--) > 0) {
-                        buf[oPtr++] = tmpRead[iPtr++];
-                    }
-                } else {
-                    pixel = tmpRead[iPtr++];
-                    while ((count--) > 0) {
-                        buf[oPtr++] = pixel;
-                    }
-                }
-            }
-        } else {
-            int offs = (y * header.xsize) + (z * header.xsize * header.ysize);
-            System.arraycopy(tmpData, offs, buf, 0, header.xsize);
-        }
-    }
-
-    private void bwtorgba(byte[] b, byte[] dest, int lptr) {
-        for (int i = 0; i < b.length; i++) {
-            dest[4 * i + lptr + 0] = b[i];
-            dest[4 * i + lptr + 1] = b[i];
-            dest[4 * i + lptr + 2] = b[i];
-            dest[4 * i + lptr + 3] = (byte) 0xFF;
-        }
-    }
-
-    private void latorgba(byte[] b, byte[] a, byte[] dest, int lptr) {
-        for (int i = 0; i < b.length; i++) {
-            dest[4 * i + lptr + 0] = b[i];
-            dest[4 * i + lptr + 1] = b[i];
-            dest[4 * i + lptr + 2] = b[i];
-            dest[4 * i + lptr + 3] = a[i];
-        }
-    }
-
-    private void rgbtorgba(byte[] r, byte[] g, byte[] b, byte[] dest, int lptr) {
-        for (int i = 0; i < b.length; i++) {
-            dest[4 * i + lptr + 0] = r[i];
-            dest[4 * i + lptr + 1] = g[i];
-            dest[4 * i + lptr + 2] = b[i];
-            dest[4 * i + lptr + 3] = (byte) 0xFF;
-        }
-    }
-
-    private void rgbatorgba(byte[] r, byte[] g, byte[] b, byte[] a, byte[] dest, int lptr) {
-        for (int i = 0; i < b.length; i++) {
-            dest[4 * i + lptr + 0] = r[i];
-            dest[4 * i + lptr + 1] = g[i];
-            dest[4 * i + lptr + 2] = b[i];
-            dest[4 * i + lptr + 3] = a[i];
-        }
-    }
-
-    private static byte imgref(byte[] i,
-                               int x,
-                               int y,
-                               int z,
-                               int xs,
-                               int ys,
-                               int zs) {
-        return i[(xs*ys*z)+(xs*y)+x];
-    }
-
-
-    private void writeHeader(DataOutputStream stream,
-                             int xsize, int ysize, int zsize, boolean rle) throws IOException {
-        // effects: outputs the 512-byte IRIS RGB header to STREAM, using xsize,
-        //          ysize, and depth as the dimensions of the image. NOTE that
-        //          the following defaults are used:
-        //              STORAGE = 1     (storage format = RLE)
-        //              BPC = 1         (# bytes/channel)
-        //              DIMENSION = 3
-        //              PIXMIN = 0
-        //              PIXMAX = 255
-        //              IMAGENAME = <80 nulls>
-        //              COLORMAP = 0
-        //          See ftp://ftp.sgi.com/pub/sgi/SGIIMAGESPEC for more details.
-
-        // write out MAGIC, STORAGE, BPC
-        stream.writeShort(474);
-        stream.write((rle ? 1 : 0));
-        stream.write(1);
-
-        // write out DIMENSION
-        stream.writeShort(3);
-
-        // write XSIZE, YSIZE, ZSIZE
-        stream.writeShort(xsize);
-        stream.writeShort(ysize);
-        stream.writeShort(zsize);
-
-        // write PIXMIN, PIXMAX
-        stream.writeInt(0);
-        stream.writeInt(255);
-
-        // write DUMMY
-        stream.writeInt(0);
-
-        // write IMAGENAME
-        for (int i = 0; i < 80; i++)
-            stream.write(0);
-
-        // write COLORMAP
-        stream.writeInt(0);
-
-        // write DUMMY (404 bytes)
-        for (int i = 0; i < 404; i++)
-            stream.write(0);
-    }
-
-    private void writeImage(File file,
-                            byte[] data,
-                            int xsize,
-                            int ysize,
-                            int zsize,
-                            boolean yflip) throws IOException {
-        // Input data is in RGBRGBRGB or RGBARGBARGBA format; first unswizzle it
-        byte[] tmpData = new byte[xsize * ysize * zsize];
-        int dest = 0;
-        for (int i = 0; i < zsize; i++) {
-            for (int j = i; j < (xsize * ysize * zsize); j += zsize) {
-                tmpData[dest++] = data[j];
-            }
-        }
-        data = tmpData;
-
-        // requires: DATA must be an array of size XSIZE * YSIZE * ZSIZE,
-        //           indexed in the following manner:
-        //             data[0]    ...data[xsize-1] == first row of first channel
-        //             data[xsize]...data[2*xsize-1]   == second row of first channel
-        //         ... data[(ysize - 1) * xsize]...data[(ysize * xsize) - 1] ==
-        //                                            last row of first channel
-        //           Later channels follow the same format.
-        //           *** NOTE that "first row" is defined by the BOTTOM ROW of
-        //           the image. That is, the origin is in the lower left corner.
-        // effects: writes out an SGI image to FILE, RLE-compressed, INCLUDING
-        //          header, of dimensions (xsize, ysize, zsize), and containing
-        //          the data in DATA. If YFLIP is set, outputs the data in DATA
-        //          in reverse order vertically (equivalent to a flip about the
-        //          x axis).
-
-        // Build the offset tables
-        int[] starttab  = new int[ysize * zsize];
-        int[] lengthtab = new int[ysize * zsize];
-
-        // Temporary buffer for holding RLE data.
-        // Note that this makes the assumption that RLE-compressed data will
-        // never exceed twice the size of the input data.
-        // There are surely formal proofs about how big the RLE buffer should
-        // be, as well as what the optimal look-ahead size is (i.e. don't switch
-        // copy/repeat modes for less than N repeats). However, I'm going from
-        // empirical evidence here; the break-even point seems to be a look-
-        // ahead of 3. (That is, if the three values following this one are all
-        // the same as the current value, switch to repeat mode.)
-        int lookahead = 3;
-        byte[] rlebuf = new byte[2 * xsize * ysize * zsize];
-
-        int cur_loc = 0;   // current offset location.
-        int ptr = 0;
-        int total_size = 0;
-        int ystart = 0;
-        int yincr = 1;
-        int yend = ysize;
-
-        if (yflip) {
-            ystart = ysize - 1;
-            yend = -1;
-            yincr = -1;
-        }
-
-        boolean DEBUG = false;
-
-        for (int z = 0; z < zsize; z++) {
-            for (int y = ystart; y != yend; y += yincr) {
-                // RLE-compress each row.
-	  
-                int x = 0;
-                byte count = 0;
-                boolean repeat_mode = false;
-                boolean should_switch = false;
-                int start_ptr = ptr;
-                int num_ptr = ptr++;
-                byte repeat_val = 0;
-	  
-                while (x < xsize) {
-                    // see if we should switch modes
-                    should_switch = false;
-                    if (repeat_mode) {
-                        if (imgref(data, x, y, z, xsize, ysize, zsize) != repeat_val) {
-                            should_switch = true;
-                        }
-                    } else {
-                        // look ahead to see if we should switch to repeat mode.
-                        // stay within the scanline for the lookahead
-                        if ((x + lookahead) < xsize) {
-                            should_switch = true;
-                            for (int i = 1; i <= lookahead; i++) {
-                                if (DEBUG)
-                                    System.err.println("left side was " + ((int) imgref(data, x, y, z, xsize, ysize, zsize)) +
-                                                       ", right side was " + (int)imgref(data, x+i, y, z, xsize, ysize, zsize));
-			  
-                                if (imgref(data, x, y, z, xsize, ysize, zsize) !=
-                                    imgref(data, x+i, y, z, xsize, ysize, zsize))
-                                    should_switch = false;
-                            }
-                        }
-                    }
-
-                    if (should_switch || (count == 127)) {
-                        // update the number of elements we repeated/copied
-                        if (x > 0) {
-                            if (repeat_mode)
-                                rlebuf[num_ptr] = count;
-                            else
-                                rlebuf[num_ptr] = (byte) (count | 0x80);
-                        }
-                        // perform mode switch if necessary; output repeat_val if
-                        // switching FROM repeat mode, and set it if switching
-                        // TO repeat mode.
-                        if (repeat_mode) {
-                            if (should_switch)
-                                repeat_mode = false;
-                            rlebuf[ptr++] = repeat_val;
-                        } else {
-                            if (should_switch)
-                                repeat_mode = true;
-                            repeat_val = imgref(data, x, y, z, xsize, ysize, zsize);
-                        }
-		  
-                        if (x > 0) {
-                            // reset the number pointer
-                            num_ptr = ptr++;
-                            // reset number of bytes copied
-                            count = 0;
-                        }
-                    }
-		    
-                    // if not in repeat mode, copy element to ptr
-                    if (!repeat_mode) {
-                        rlebuf[ptr++] = imgref(data, x, y, z, xsize, ysize, zsize);
-                    }
-                    count++;
-
-                    if (x == xsize - 1) {
-                        // Need to store the number of pixels we copied/repeated.
-                        if (repeat_mode) {
-                            rlebuf[num_ptr] = count;
-                            // If we ended the row in repeat mode, store the
-                            // repeated value
-                            rlebuf[ptr++] = repeat_val;
-                        }
-                        else
-                            rlebuf[num_ptr] = (byte) (count | 0x80);
-
-                        // output zero counter for the last value in the row
-                        rlebuf[ptr++] = 0;
-                    }
-
-                    x++;
-                }
-                // output this row's length into the length table
-                int rowlen = ptr - start_ptr;
-                if (yflip)
-                    lengthtab[ysize*z+(ysize-y-1)] = rowlen;
-                else
-                    lengthtab[ysize*z+y] = rowlen;
-                // add to the start table, and update the current offset
-                if (yflip)
-                    starttab[ysize*z+(ysize-y-1)] = cur_loc;
-                else
-                    starttab[ysize*z+y] = cur_loc;
-                cur_loc += rowlen;
-            }
-        }
-
-        // Now we have the offset tables computed, as well as the RLE data.
-        // Output this information to the file.
-        total_size = ptr;
-  
-        if (DEBUG) 
-            System.err.println("total_size was " + total_size);
-
-        DataOutputStream stream = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file)));
-
-        writeHeader(stream, xsize, ysize, zsize, true);
-
-        int SIZEOF_INT = 4;
-        for (int i = 0; i < (ysize * zsize); i++)
-            stream.writeInt(starttab[i] + 512 + (2 * ysize * zsize * SIZEOF_INT));
-        for (int i = 0; i < (ysize * zsize); i++)
-            stream.writeInt(lengthtab[i]);
-        for (int i = 0; i < total_size; i++)
-            stream.write(rlebuf[i]);
-
-        stream.close();
-    }
-
-    private byte[] readAll(DataInputStream in) throws IOException {
-        byte[] dest = new byte[16384];
-        int pos = 0;
-        int numRead = 0;
-    
-        boolean done = false;
-
-        do {
-            numRead = in.read(dest, pos, dest.length - pos);
-            if (pos == dest.length) {
-                // Resize destination buffer
-                byte[] newDest = new byte[2 * dest.length];
-                System.arraycopy(dest, 0, newDest, 0, pos);
-                dest = newDest;
-            }
-            if (numRead > 0) {
-                pos += numRead;
-            }
-
-            done = ((numRead == -1) || (in.available() == 0));
-        } while (!done);
-
-        // Trim destination buffer
-        if (pos != dest.length) {
-            byte[] finalDest = new byte[pos];
-            System.arraycopy(dest, 0, finalDest, 0, pos);
-            dest = finalDest;
-        }
-
-        return dest;
-    }
-
-    // Test case
-    /*
-      import java.awt.image.*;
-      import javax.swing.*;
-
-      public static void main(String[] args) {
-      for (int i = 0; i < args.length; i++) {
-      try {
-      System.out.println(args[i] + ":");
-      SGIImage image = SGIImage.read(args[i]);
-      System.out.println(image);
-      BufferedImage img = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_4BYTE_ABGR);
-      WritableRaster raster = img.getRaster();
-      DataBufferByte db = (DataBufferByte) raster.getDataBuffer();
-      byte[] src  = image.getData();
-      byte[] dest = db.getData();
-      for (int j = 0; j < src.length; j += 4) {
-      dest[j + 0] = src[j + 3];
-      dest[j + 1] = src[j + 2];
-      dest[j + 2] = src[j + 1];
-      dest[j + 3] = src[j + 0];
-      }
-      // System.arraycopy(src, 0, dest, 0, src.length);
-      ImageIcon icon = new ImageIcon(img);
-      JLabel label = new JLabel();
-      label.setIcon(icon);
-      JFrame frame = new JFrame(args[i]);
-      frame.getContentPane().add(label);
-      frame.pack();
-      frame.show();
-      } catch (IOException e) {
-      e.printStackTrace();
-      }
-      }
-      }
-    */
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp b/src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
deleted file mode 100755
index c54713a5e..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.spi;
-
-import java.io.*;
-import java.nio.*;
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.spi.*;
-import com.sun.opengl.util.texture.*;
-
-/**
- * Targa image reader and writer adapted from sources of the <a href =
- * "http://java.sun.com/products/jimi/">Jimi</a> image I/O class library.
- *
- * <P>
- *
- * Image decoder for image data stored in TGA file format.
- * Currently only the original TGA file format is supported. This is
- * because the new TGA format has data at the end of the file, getting
- * to the end of a file in an InputStream orient environment presents
- * several difficulties which are avoided at the moment.
- *
- * <P>
- *
- * This is a simple decoder and is only setup to load a single image
- * from the input stream
- *
- * <P>
- *
- * @author    Robin Luiten
- * @author    Kenneth Russell
- * @version    $Revision: 1768 $
- */
-
-public class TGAImage {
-    private Header header;
-    private int    format;
-    private int    bpp;
-    private ByteBuffer data;
-
-    private TGAImage(Header header) {
-        this.header = header;
-    }
-
-    /**
-     * This class reads in all of the TGA image header in addition it also
-     * reads in the imageID field as it is convenient to handle that here.
-     *
-     * @author    Robin Luiten
-     * @version   1.1
-     */
-    public static class Header {
-        /** Set of possible file format TGA types */
-        public final static int TYPE_NEW = 0;
-        public final static int TYPE_OLD = 1;
-        public final static int TYPE_UNK = 2;               // cant rewind stream so unknown for now.
-
-        /**  Set of possible image types in TGA file */
-        public final static int NO_IMAGE = 0;               // no image data
-        public final static int UCOLORMAPPED = 1;           // uncompressed color mapped image
-        public final static int UTRUECOLOR = 2;             // uncompressed true color image
-        public final static int UBLACKWHITE = 3;            // uncompressed black and white image
-        public final static int COLORMAPPED = 9;            // compressed color mapped image
-        public final static int TRUECOLOR = 10;             // compressed true color image
-        public final static int BLACKWHITE = 11;            // compressed black and white image
-
-        /** Field image descriptor bitfield values definitions */
-        public final static int ID_ATTRIBPERPIXEL = 0xF;
-        public final static int ID_RIGHTTOLEFT = 0x10;
-        public final static int ID_TOPTOBOTTOM = 0x20;
-        public final static int ID_INTERLEAVE  = 0xC0;
-
-        /** Field image descriptor / interleave values */
-        public final static int I_NOTINTERLEAVED = 0;
-        public final static int I_TWOWAY = 1;
-        public final static int I_FOURWAY = 2;
-
-        /** Type of this TGA file format */
-        private int tgaType;
-
-        /** initial TGA image data fields */
-        private int idLength;         // byte value
-        private int colorMapType;     // byte value
-        private int imageType;        // byte value
-
-        /** TGA image colour map fields */
-        private int firstEntryIndex;
-        private int colorMapLength;
-        private byte colorMapEntrySize;
-
-        /** TGA image specification fields */
-        private int xOrigin;
-        private int yOrigin;
-        private int width;
-        private int height;
-        private byte pixelDepth;
-        private byte imageDescriptor;
-
-        private byte[] imageIDbuf;
-        private String imageID;
-
-        // For construction from user data
-        Header() {
-            tgaType = TYPE_OLD; // dont try and get footer.
-        }
-
-        Header(LEDataInputStream in) throws IOException {
-            int ret;
-
-            tgaType = TYPE_OLD; // dont try and get footer.
-
-            // initial header fields
-            idLength = in.readUnsignedByte();    
-            colorMapType = in.readUnsignedByte();
-            imageType = in.readUnsignedByte();    
-
-            // color map header fields
-            firstEntryIndex = in.readUnsignedShort();
-            colorMapLength = in.readUnsignedShort();
-            colorMapEntrySize = in.readByte();
-
-            // TGA image specification fields
-            xOrigin = in.readUnsignedShort();
-            yOrigin = in.readUnsignedShort();
-            width = in.readUnsignedShort();
-            height = in.readUnsignedShort();
-            pixelDepth = in.readByte();
-            imageDescriptor = in.readByte();
-
-            if (idLength > 0) {
-                imageIDbuf = new byte[idLength];
-                in.read(imageIDbuf, 0, idLength);
-                imageID = new String(imageIDbuf, "US-ASCII");
-            }
-        }
-
-        public int tgaType()                 { return tgaType; }
-
-        /** initial TGA image data fields */
-        public int idLength()                { return idLength; }
-        public int colorMapType()            { return colorMapType; }
-        public int imageType()               { return imageType; }
-
-        /** TGA image colour map fields */
-        public int firstEntryIndex()         { return firstEntryIndex; }
-        public int colorMapLength()          { return colorMapLength; }
-        public byte colorMapEntrySize()      { return colorMapEntrySize; }
-
-        /** TGA image specification fields */
-        public int xOrigin()                 { return xOrigin; }
-        public int yOrigin()                 { return yOrigin; }
-        public int width()                   { return width; }
-        public int height()                  { return height; }
-        public byte pixelDepth()             { return pixelDepth; }
-        public byte imageDescriptor()        { return imageDescriptor; }
-
-        /** bitfields in imageDescriptor */
-        public byte attribPerPixel()         { return (byte)(imageDescriptor & ID_ATTRIBPERPIXEL); }
-        public boolean rightToLeft()         { return ((imageDescriptor & ID_RIGHTTOLEFT) != 0); }
-        public boolean topToBottom()         { return ((imageDescriptor & ID_TOPTOBOTTOM) != 0); }
-        public byte interleave()             { return (byte)((imageDescriptor & ID_INTERLEAVE) >> 6); }
-
-        public byte[] imageIDbuf()           { return imageIDbuf; }
-        public String imageID()              { return imageID; }
-
-        public String toString() {
-            return "TGA Header " +
-                " id length: " + idLength +
-                " color map type: "+ colorMapType +
-                " image type: "+ imageType +
-                " first entry index: " + firstEntryIndex +
-                " color map length: " + colorMapLength +
-                " color map entry size: " + colorMapEntrySize +
-                " x Origin: " + xOrigin +
-                " y Origin: " + yOrigin +
-                " width: "+ width +
-                " height: "+ height +
-                " pixel depth: "+ pixelDepth +
-                " image descriptor: "+ imageDescriptor +
-                (imageIDbuf == null ? "" : (" ID String: " + imageID));
-        }
-
-        public int size() { return 18 + idLength; }
-
-        private void write(LEDataOutputStream output) throws IOException {
-            output.write(idLength);
-            output.write(colorMapType);
-            output.write(imageType);
-            output.writeShort(firstEntryIndex);
-            output.writeShort(colorMapLength);
-            output.write(colorMapEntrySize);
-            output.writeShort(xOrigin);
-            output.writeShort(yOrigin);
-            output.writeShort(width);
-            output.writeShort(height);
-            output.write(pixelDepth);
-            output.write(imageDescriptor);
-            if (idLength > 0) {
-                try {
-                    byte[] chars = imageID.getBytes("US-ASCII");
-                    output.write(chars);
-                } catch (UnsupportedEncodingException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Identifies the image type of the tga image data and loads
-     * it into the JimiImage structure. This was taken from the
-     * prototype and modified for the new Jimi structure
-     */
-    private void decodeImage(LEDataInputStream dIn) throws IOException {
-        switch (header.imageType()) {
-        case Header.UCOLORMAPPED:
-            throw new IOException("TGADecoder Uncompressed Colormapped images not supported");
-
-        case Header.UTRUECOLOR:    // pixelDepth 15, 16, 24 and 32
-            switch (header.pixelDepth) {
-            case 16:
-                throw new IOException("TGADecoder Compressed 16-bit True Color images not supported");
-
-            case 24:
-            case 32:
-                decodeRGBImageU24_32(dIn);
-                break;
-            }
-            break;
-
-        case Header.UBLACKWHITE:
-            throw new IOException("TGADecoder Uncompressed Grayscale images not supported");
-
-        case Header.COLORMAPPED:
-            throw new IOException("TGADecoder Compressed Colormapped images not supported");
-
-        case Header.TRUECOLOR:
-            throw new IOException("TGADecoder Compressed True Color images not supported");
-
-        case Header.BLACKWHITE:
-            throw new IOException("TGADecoder Compressed Grayscale images not supported");
-        }
-    }
-  
-    /**
-     * This assumes that the body is for a 24 bit or 32 bit for a
-     * RGB or ARGB image respectively.
-     */
-    private void decodeRGBImageU24_32(LEDataInputStream dIn) throws IOException {
-        int i;    // row index
-        int j;    // column index
-        int y;    // output row index
-        int raw;  // index through the raw input buffer
-        int rawWidth = header.width() * (header.pixelDepth() / 8);
-        byte[] rawBuf = new byte[rawWidth];
-        byte[] tmpData = new byte[rawWidth * header.height()];
-
-        for (i = 0; i < header.height(); ++i) {
-            dIn.readFully(rawBuf, 0, rawWidth);
-
-            if (header.topToBottom())
-                y = header.height - i - 1; // range 0 to (header.height - 1)
-            else
-                y = i;
-
-            System.arraycopy(rawBuf, 0, tmpData, y * rawWidth, rawBuf.length);
-        }
-
-        GL gl = GLContext.getCurrentGL();
-        if (header.pixelDepth() == 24) {
-            bpp=3;
-            if(gl.isGL2()) {
-                format = GL2.GL_BGR;
-            } else {
-                format = GL.GL_RGB;
-                swapBGR(tmpData, rawWidth, header.height(), bpp);
-            }
-        } else {
-            assert header.pixelDepth() == 32;
-            bpp=4;
-
-            if(gl.isGL2()) {
-                format = GL2.GL_BGRA;
-            } else {
-                format = GL.GL_RGBA;
-                swapBGR(tmpData, rawWidth, header.height(), bpp);
-            }
-        }
-
-        data = ByteBuffer.wrap(tmpData);
-    }
-
-    private static void swapBGR(byte[] data, int bWidth, int height, int bpp) {
-        byte r,b;
-        int k;
-        for(int i=0; i<height; ++i) {
-            for(int j=0; j<bWidth; j+=bpp) {
-                k=i*bWidth+j;
-                b=data[k+0];
-                r=data[k+2];
-                data[k+0]=r;
-                data[k+2]=b;
-            }
-        }
-    }
-
-    /** Returns the width of the image. */
-    public int getWidth()    { return header.width(); }
-
-    /** Returns the height of the image. */
-    public int getHeight()   { return header.height(); }
-
-    /** Returns the OpenGL format for this texture; e.g. GL.GL_BGR or GL.GL_BGRA. */
-    public int getGLFormat() { return format; }
-
-    /** Returns the bytes per pixel */
-    public int getBytesPerPixel() { return bpp; }
-
-    /** Returns the raw data for this texture in the correct
-        (bottom-to-top) order for calls to glTexImage2D. */
-    public ByteBuffer getData()  { return data; }
-
-    /** Reads a Targa image from the specified file. */
-    public static TGAImage read(String filename) throws IOException {
-        return read(new FileInputStream(filename));
-    }
-
-    /** Reads a Targa image from the specified InputStream. */
-    public static TGAImage read(InputStream in) throws IOException {
-        LEDataInputStream dIn = new LEDataInputStream(new BufferedInputStream(in));
-
-        Header header = new Header(dIn);
-        TGAImage res = new TGAImage(header);
-        res.decodeImage(dIn);
-        return res;
-    }
-
-    /** Writes the image in Targa format to the specified file name. */
-    public void write(String filename) throws IOException {
-        write(new File(filename));
-    }
-
-    /** Writes the image in Targa format to the specified file. */
-    public void write(File file) throws IOException {
-        LEDataOutputStream output =
-            new LEDataOutputStream(new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file))));
-        header.write(output);
-        if (!data.isDirect()) {
-            output.write(data.array());
-        } else {
-            for (int i = 0; i < data.limit(); i++) {
-                output.write(data.get(i));
-            }
-        }
-        output.close();
-    }
-
-    /** Creates a TGAImage from data supplied by the end user. Shares
-        data with the passed ByteBuffer. Assumes the data is already in
-        the correct byte order for writing to disk, i.e., BGR or
-        BGRA. */
-    public static TGAImage createFromData(int width,
-                                          int height,
-                                          boolean hasAlpha,
-                                          boolean topToBottom,
-                                          ByteBuffer data) {
-        Header header = new Header();
-        header.imageType = Header.UTRUECOLOR;
-        header.width = width;
-        header.height = height;
-        header.pixelDepth = (byte) (hasAlpha ? 32 : 24);
-        header.imageDescriptor = (byte) (topToBottom ? Header.ID_TOPTOBOTTOM : 0);
-        // Note ID not supported
-        TGAImage ret = new TGAImage(header);
-        ret.data = data;
-        return ret;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javase b/src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javase
deleted file mode 100755
index 1e78ef20d..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javase
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.spi;
-
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.spi.*;
-import com.sun.opengl.util.texture.*;
-
-/**
- * Targa image reader and writer adapted from sources of the <a href =
- * "http://java.sun.com/products/jimi/">Jimi</a> image I/O class library.
- *
- * <P>
- *
- * Image decoder for image data stored in TGA file format.
- * Currently only the original TGA file format is supported. This is
- * because the new TGA format has data at the end of the file, getting
- * to the end of a file in an InputStream orient environment presents
- * several difficulties which are avoided at the moment.
- *
- * <P>
- *
- * This is a simple decoder and is only setup to load a single image
- * from the input stream
- *
- * <P>
- *
- * @author    Robin Luiten
- * @author    Kenneth Russell
- * @version    $Revision: 1768 $
- */
-
-public class TGAImage {
-    private Header header;
-    private int    format;
-    private int    bpp;
-    private ByteBuffer data;
-
-    private TGAImage(Header header) {
-        this.header = header;
-    }
-
-    /**
-     * This class reads in all of the TGA image header in addition it also
-     * reads in the imageID field as it is convenient to handle that here.
-     *
-     * @author    Robin Luiten
-     * @version   1.1
-     */
-    public static class Header {
-        /** Set of possible file format TGA types */
-        public final static int TYPE_NEW = 0;
-        public final static int TYPE_OLD = 1;
-        public final static int TYPE_UNK = 2;               // cant rewind stream so unknown for now.
-
-        /**  Set of possible image types in TGA file */
-        public final static int NO_IMAGE = 0;               // no image data
-        public final static int UCOLORMAPPED = 1;           // uncompressed color mapped image
-        public final static int UTRUECOLOR = 2;             // uncompressed true color image
-        public final static int UBLACKWHITE = 3;            // uncompressed black and white image
-        public final static int COLORMAPPED = 9;            // compressed color mapped image
-        public final static int TRUECOLOR = 10;             // compressed true color image
-        public final static int BLACKWHITE = 11;            // compressed black and white image
-
-        /** Field image descriptor bitfield values definitions */
-        public final static int ID_ATTRIBPERPIXEL = 0xF;
-        public final static int ID_RIGHTTOLEFT = 0x10;
-        public final static int ID_TOPTOBOTTOM = 0x20;
-        public final static int ID_INTERLEAVE  = 0xC0;
-
-        /** Field image descriptor / interleave values */
-        public final static int I_NOTINTERLEAVED = 0;
-        public final static int I_TWOWAY = 1;
-        public final static int I_FOURWAY = 2;
-
-        /** Type of this TGA file format */
-        private int tgaType;
-
-        /** initial TGA image data fields */
-        private int idLength;         // byte value
-        private int colorMapType;     // byte value
-        private int imageType;        // byte value
-
-        /** TGA image colour map fields */
-        private int firstEntryIndex;
-        private int colorMapLength;
-        private byte colorMapEntrySize;
-
-        /** TGA image specification fields */
-        private int xOrigin;
-        private int yOrigin;
-        private int width;
-        private int height;
-        private byte pixelDepth;
-        private byte imageDescriptor;
-
-        private byte[] imageIDbuf;
-        private String imageID;
-
-        // For construction from user data
-        Header() {
-            tgaType = TYPE_OLD; // dont try and get footer.
-        }
-
-        Header(LEDataInputStream in) throws IOException {
-            int ret;
-
-            tgaType = TYPE_OLD; // dont try and get footer.
-
-            // initial header fields
-            idLength = in.readUnsignedByte();    
-            colorMapType = in.readUnsignedByte();
-            imageType = in.readUnsignedByte();    
-
-            // color map header fields
-            firstEntryIndex = in.readUnsignedShort();
-            colorMapLength = in.readUnsignedShort();
-            colorMapEntrySize = in.readByte();
-
-            // TGA image specification fields
-            xOrigin = in.readUnsignedShort();
-            yOrigin = in.readUnsignedShort();
-            width = in.readUnsignedShort();
-            height = in.readUnsignedShort();
-            pixelDepth = in.readByte();
-            imageDescriptor = in.readByte();
-
-            if (idLength > 0) {
-                imageIDbuf = new byte[idLength];
-                in.read(imageIDbuf, 0, idLength);
-                imageID = new String(imageIDbuf, "US-ASCII");
-            }
-        }
-
-        public int tgaType()                 { return tgaType; }
-
-        /** initial TGA image data fields */
-        public int idLength()                { return idLength; }
-        public int colorMapType()            { return colorMapType; }
-        public int imageType()               { return imageType; }
-
-        /** TGA image colour map fields */
-        public int firstEntryIndex()         { return firstEntryIndex; }
-        public int colorMapLength()          { return colorMapLength; }
-        public byte colorMapEntrySize()      { return colorMapEntrySize; }
-
-        /** TGA image specification fields */
-        public int xOrigin()                 { return xOrigin; }
-        public int yOrigin()                 { return yOrigin; }
-        public int width()                   { return width; }
-        public int height()                  { return height; }
-        public byte pixelDepth()             { return pixelDepth; }
-        public byte imageDescriptor()        { return imageDescriptor; }
-
-        /** bitfields in imageDescriptor */
-        public byte attribPerPixel()         { return (byte)(imageDescriptor & ID_ATTRIBPERPIXEL); }
-        public boolean rightToLeft()         { return ((imageDescriptor & ID_RIGHTTOLEFT) != 0); }
-        public boolean topToBottom()         { return ((imageDescriptor & ID_TOPTOBOTTOM) != 0); }
-        public byte interleave()             { return (byte)((imageDescriptor & ID_INTERLEAVE) >> 6); }
-
-        public byte[] imageIDbuf()           { return imageIDbuf; }
-        public String imageID()              { return imageID; }
-
-        public String toString() {
-            return "TGA Header " +
-                " id length: " + idLength +
-                " color map type: "+ colorMapType +
-                " image type: "+ imageType +
-                " first entry index: " + firstEntryIndex +
-                " color map length: " + colorMapLength +
-                " color map entry size: " + colorMapEntrySize +
-                " x Origin: " + xOrigin +
-                " y Origin: " + yOrigin +
-                " width: "+ width +
-                " height: "+ height +
-                " pixel depth: "+ pixelDepth +
-                " image descriptor: "+ imageDescriptor +
-                (imageIDbuf == null ? "" : (" ID String: " + imageID));
-        }
-
-        public int size() { return 18 + idLength; }
-
-        // buf must be in little-endian byte order
-        private void write(ByteBuffer buf) {
-            buf.put((byte) idLength);
-            buf.put((byte) colorMapType);
-            buf.put((byte) imageType);
-            buf.putShort((short) firstEntryIndex);
-            buf.putShort((short) colorMapLength);
-            buf.put((byte) colorMapEntrySize);
-            buf.putShort((short) xOrigin);
-            buf.putShort((short) yOrigin);
-            buf.putShort((short) width);
-            buf.putShort((short) height);
-            buf.put((byte) pixelDepth);
-            buf.put((byte) imageDescriptor);
-            if (idLength > 0) {
-                try {
-                    byte[] chars = imageID.getBytes("US-ASCII");
-                    buf.put(chars);
-                } catch (UnsupportedEncodingException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Identifies the image type of the tga image data and loads
-     * it into the JimiImage structure. This was taken from the
-     * prototype and modified for the new Jimi structure
-     */
-    private void decodeImage(LEDataInputStream dIn) throws IOException {
-        switch (header.imageType()) {
-        case Header.UCOLORMAPPED:
-            throw new IOException("TGADecoder Uncompressed Colormapped images not supported");
-
-        case Header.UTRUECOLOR:    // pixelDepth 15, 16, 24 and 32
-            switch (header.pixelDepth) {
-            case 16:
-                throw new IOException("TGADecoder Compressed 16-bit True Color images not supported");
-
-            case 24:
-            case 32:
-                decodeRGBImageU24_32(dIn);
-                break;
-            }
-            break;
-
-        case Header.UBLACKWHITE:
-            throw new IOException("TGADecoder Uncompressed Grayscale images not supported");
-
-        case Header.COLORMAPPED:
-            throw new IOException("TGADecoder Compressed Colormapped images not supported");
-
-        case Header.TRUECOLOR:
-            throw new IOException("TGADecoder Compressed True Color images not supported");
-
-        case Header.BLACKWHITE:
-            throw new IOException("TGADecoder Compressed Grayscale images not supported");
-        }
-    }
-  
-    /**
-     * This assumes that the body is for a 24 bit or 32 bit for a
-     * RGB or ARGB image respectively.
-     */
-    private void decodeRGBImageU24_32(LEDataInputStream dIn) throws IOException {
-        int i;    // row index
-        int j;    // column index
-        int y;    // output row index
-        int raw;  // index through the raw input buffer
-        int rawWidth = header.width() * (header.pixelDepth() / 8);
-        byte[] rawBuf = new byte[rawWidth];
-        byte[] tmpData = new byte[rawWidth * header.height()];
-
-        for (i = 0; i < header.height(); ++i) {
-            dIn.readFully(rawBuf, 0, rawWidth);
-
-            if (header.topToBottom())
-                y = header.height - i - 1; // range 0 to (header.height - 1)
-            else
-                y = i;
-
-            System.arraycopy(rawBuf, 0, tmpData, y * rawWidth, rawBuf.length);
-        }
-
-        GL gl = GLContext.getCurrentGL();
-        if (header.pixelDepth() == 24) {
-            bpp=3;
-            if(gl.isGL2()) {
-                format = GL2.GL_BGR;
-            } else {
-                format = GL.GL_RGB;
-                swapBGR(tmpData, rawWidth, header.height(), bpp);
-            }
-        } else {
-            assert header.pixelDepth() == 32;
-            bpp=4;
-
-            if(gl.isGL2()) {
-                format = GL2.GL_BGRA;
-            } else {
-                format = GL.GL_RGBA;
-                swapBGR(tmpData, rawWidth, header.height(), bpp);
-            }
-        }
-
-        data = ByteBuffer.wrap(tmpData);
-    }
-
-    private static void swapBGR(byte[] data, int bWidth, int height, int bpp) {
-        byte r,b;
-        int k;
-        for(int i=0; i<height; ++i) {
-            for(int j=0; j<bWidth; j+=bpp) {
-                k=i*bWidth+j;
-                b=data[k+0];
-                r=data[k+2];
-                data[k+0]=r;
-                data[k+2]=b;
-            }
-        }
-    }
-
-    /** Returns the width of the image. */
-    public int getWidth()    { return header.width(); }
-
-    /** Returns the height of the image. */
-    public int getHeight()   { return header.height(); }
-
-    /** Returns the OpenGL format for this texture; e.g. GL.GL_BGR or GL.GL_BGRA. */
-    public int getGLFormat() { return format; }
-
-    /** Returns the bytes per pixel */
-    public int getBytesPerPixel() { return bpp; }
-
-    /** Returns the raw data for this texture in the correct
-        (bottom-to-top) order for calls to glTexImage2D. */
-    public ByteBuffer getData()  { return data; }
-
-    /** Reads a Targa image from the specified file. */
-    public static TGAImage read(String filename) throws IOException {
-        return read(new FileInputStream(filename));
-    }
-
-    /** Reads a Targa image from the specified InputStream. */
-    public static TGAImage read(InputStream in) throws IOException {
-        LEDataInputStream dIn = new LEDataInputStream(new BufferedInputStream(in));
-
-        Header header = new Header(dIn);
-        TGAImage res = new TGAImage(header);
-        res.decodeImage(dIn);
-        return res;
-    }
-
-    /** Writes the image in Targa format to the specified file name. */
-    public void write(String filename) throws IOException {
-        write(new File(filename));
-    }
-
-    /** Writes the image in Targa format to the specified file. */
-    public void write(File file) throws IOException {
-        FileOutputStream stream = new FileOutputStream(file);
-        FileChannel chan = stream.getChannel();
-        ByteBuffer buf = ByteBuffer.allocate(header.size());
-        buf.order(ByteOrder.LITTLE_ENDIAN);
-        header.write(buf);
-        buf.rewind();
-        chan.write(buf);
-        chan.write(data);
-        data.rewind();
-        chan.force(true);
-        chan.close();
-        stream.close();
-    }
-
-    /** Creates a TGAImage from data supplied by the end user. Shares
-        data with the passed ByteBuffer. Assumes the data is already in
-        the correct byte order for writing to disk, i.e., BGR or
-        BGRA. */
-    public static TGAImage createFromData(int width,
-                                          int height,
-                                          boolean hasAlpha,
-                                          boolean topToBottom,
-                                          ByteBuffer data) {
-        Header header = new Header();
-        header.imageType = Header.UTRUECOLOR;
-        header.width = width;
-        header.height = height;
-        header.pixelDepth = (byte) (hasAlpha ? 32 : 24);
-        header.imageDescriptor = (byte) (topToBottom ? Header.ID_TOPTOBOTTOM : 0);
-        // Note ID not supported
-        TGAImage ret = new TGAImage(header);
-        ret.data = data;
-        return ret;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureProvider.java b/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureProvider.java
deleted file mode 100755
index afc6a998e..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureProvider.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.spi;
-
-import java.io.*;
-import java.net.*;
-import javax.media.opengl.GLProfile;
-
-import com.sun.opengl.util.texture.*;
-
-/** Plug-in interface to TextureIO to support reading OpenGL textures
-    from new file formats. For all methods, either internalFormat or
-    pixelFormat may be 0 in which case they must be inferred as
-    e.g. RGB or RGBA depending on the file contents.
-*/
-
-public interface TextureProvider {
-
-    /**
-     * Produces a TextureData object from a file, or returns null if the
-     * file format was not supported by this TextureProvider. Does not
-     * do any OpenGL-related work. The resulting TextureData can be
-     * converted into an OpenGL texture in a later step.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param file         the file from which to read the texture data
-     *
-     * @param internalFormat the OpenGL internal format to be used for
-     *                       the texture, or 0 if it should be inferred
-     *                       from the file's contents
-     *
-     * @param pixelFormat    the OpenGL pixel format to be used for
-     *                       the texture, or 0 if it should be inferred
-     *                       from the file's contents
-     *
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     *
-     * @param fileSuffix     the file suffix to be used as a hint to the
-     *                       provider to more quickly decide whether it
-     *                       can handle the file, or null if the
-     *                       provider should infer the type from the
-     *                       file's contents
-     *
-     * @throws IOException if an error occurred while reading the file
-     */
-    public TextureData newTextureData(GLProfile glp, File file,
-                                      int internalFormat,
-                                      int pixelFormat,
-                                      boolean mipmap,
-                                      String fileSuffix) throws IOException;
-
-    /**
-     * Produces a TextureData object from a stream, or returns null if
-     * the file format was not supported by this TextureProvider. Does
-     * not do any OpenGL-related work. The resulting TextureData can be
-     * converted into an OpenGL texture in a later step.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param stream       the stream from which to read the texture data
-     *
-     * @param internalFormat the OpenGL internal format to be used for
-     *                       the texture, or 0 if it should be inferred
-     *                       from the file's contents
-     *
-     * @param pixelFormat    the OpenGL pixel format to be used for
-     *                       the texture, or 0 if it should be inferred
-     *                       from the file's contents
-     *
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     *
-     * @param fileSuffix     the file suffix to be used as a hint to the
-     *                       provider to more quickly decide whether it
-     *                       can handle the file, or null if the
-     *                       provider should infer the type from the
-     *                       file's contents
-     *
-     * @throws IOException if an error occurred while reading the stream
-     */
-    public TextureData newTextureData(GLProfile glp, InputStream stream,
-                                      int internalFormat,
-                                      int pixelFormat,
-                                      boolean mipmap,
-                                      String fileSuffix) throws IOException;
-
-    /**
-     * Produces a TextureData object from a URL, or returns null if the
-     * file format was not supported by this TextureProvider. Does not
-     * do any OpenGL-related work. The resulting TextureData can be
-     * converted into an OpenGL texture in a later step.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param url          the URL from which to read the texture data
-     *
-     * @param internalFormat the OpenGL internal format to be used for
-     *                       the texture, or 0 if it should be inferred
-     *                       from the file's contents
-     *
-     * @param pixelFormat    the OpenGL pixel format to be used for
-     *                       the texture, or 0 if it should be inferred
-     *                       from the file's contents
-     *
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     *
-     * @param fileSuffix     the file suffix to be used as a hint to the
-     *                       provider to more quickly decide whether it
-     *                       can handle the file, or null if the
-     *                       provider should infer the type from the
-     *                       file's contents
-     *
-     * @throws IOException if an error occurred while reading the URL
-     */
-    public TextureData newTextureData(GLProfile glp, URL url,
-                                      int internalFormat,
-                                      int pixelFormat,
-                                      boolean mipmap,
-                                      String fileSuffix) throws IOException;
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureWriter.java b/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureWriter.java
deleted file mode 100755
index cdad15bb2..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureWriter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.spi;
-
-import java.io.*;
-
-import com.sun.opengl.util.texture.*;
-
-/** Plug-in interface to TextureIO to support writing OpenGL textures
-    to new file formats. */
-
-public interface TextureWriter {
-    /** Writes the given TextureData to the passed file. Returns true if
-        this TextureWriter successfully handled the writing of the file,
-        otherwise false. May throw IOException if either this writer did
-        not support certain parameters of the TextureData or if an I/O
-        error occurred. */
-    public boolean write(File file,
-                         TextureData data) throws IOException;
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureProvider.java b/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureProvider.java
deleted file mode 100644
index f025ba591..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureProvider.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.spi.awt;
-
-import java.awt.Graphics;
-import java.awt.image.*;
-import java.io.*;
-import java.net.*;
-import javax.imageio.*;
-import javax.media.opengl.GLProfile;
-
-import com.sun.opengl.impl.Debug;
-import com.sun.opengl.util.texture.*;
-import com.sun.opengl.util.texture.awt.*;
-import com.sun.opengl.util.texture.spi.*;
-
-public class IIOTextureProvider implements TextureProvider {
-    private static final boolean DEBUG = Debug.debug("TextureIO");
-
-    public TextureData newTextureData(GLProfile glp, File file,
-                                      int internalFormat,
-                                      int pixelFormat,
-                                      boolean mipmap,
-                                      String fileSuffix) throws IOException {
-        BufferedImage img = ImageIO.read(file);
-        if (img == null) {
-            return null;
-        }
-        if (DEBUG) {
-            System.out.println("TextureIO.newTextureData(): BufferedImage type for " + file + " = " +
-                               img.getType());
-        }
-        return new AWTTextureData(glp, internalFormat, pixelFormat, mipmap, img);
-    }
-
-    public TextureData newTextureData(GLProfile glp, InputStream stream,
-                                      int internalFormat,
-                                      int pixelFormat,
-                                      boolean mipmap,
-                                      String fileSuffix) throws IOException {
-        BufferedImage img = ImageIO.read(stream);
-        if (img == null) {
-            return null;
-        }
-        if (DEBUG) {
-            System.out.println("TextureIO.newTextureData(): BufferedImage type for stream = " +
-                               img.getType());
-        }
-        return new AWTTextureData(glp, internalFormat, pixelFormat, mipmap, img);
-    }
-
-    public TextureData newTextureData(GLProfile glp, URL url,
-                                      int internalFormat,
-                                      int pixelFormat,
-                                      boolean mipmap,
-                                      String fileSuffix) throws IOException {
-        InputStream stream = url.openStream();
-        try {
-            return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
-        } finally {
-            stream.close();
-        }
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureWriter.java b/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureWriter.java
deleted file mode 100644
index db77572bf..000000000
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureWriter.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.spi.awt;
-
-import java.awt.Graphics;
-import java.awt.image.*;
-import java.io.*;
-import java.net.*;
-import java.nio.*;
-import javax.imageio.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.awt.*;
-import com.sun.opengl.util.texture.*;
-import com.sun.opengl.util.texture.spi.*;
-
-public class IIOTextureWriter implements TextureWriter {
-    public boolean write(File file,
-                         TextureData data) throws IOException {
-        int pixelFormat = data.getPixelFormat();
-        int pixelType   = data.getPixelType();
-        if ((pixelFormat == GL.GL_RGB ||
-             pixelFormat == GL.GL_RGBA) &&
-            (pixelType == GL.GL_BYTE ||
-             pixelType == GL.GL_UNSIGNED_BYTE)) {
-            // Convert TextureData to appropriate BufferedImage
-            // FIXME: almost certainly not obeying correct pixel order
-            BufferedImage image = new BufferedImage(data.getWidth(), data.getHeight(),
-                                                    (pixelFormat == GL.GL_RGB) ?
-                                                    BufferedImage.TYPE_3BYTE_BGR :
-                                                    BufferedImage.TYPE_4BYTE_ABGR);
-            byte[] imageData = ((DataBufferByte) image.getRaster().getDataBuffer()).getData();
-            ByteBuffer buf = (ByteBuffer) data.getBuffer();
-            if (buf == null) {
-                buf = (ByteBuffer) data.getMipmapData()[0];
-            }
-            buf.rewind();
-            buf.get(imageData);
-            buf.rewind();
-
-            // Swizzle image components to be correct
-            if (pixelFormat == GL.GL_RGB) {
-                for (int i = 0; i < imageData.length; i += 3) {
-                    byte red  = imageData[i + 0];
-                    byte blue = imageData[i + 2];
-                    imageData[i + 0] = blue;
-                    imageData[i + 2] = red;
-                }
-            } else {
-                for (int i = 0; i < imageData.length; i += 4) {
-                    byte red   = imageData[i + 0];
-                    byte green = imageData[i + 1];
-                    byte blue  = imageData[i + 2];
-                    byte alpha = imageData[i + 3];
-                    imageData[i + 0] = alpha;
-                    imageData[i + 1] = blue;
-                    imageData[i + 2] = green;
-                    imageData[i + 3] = red;
-                }
-            }
-
-            // Flip image vertically for the user's convenience
-            ImageUtil.flipImageVertically(image);
-
-            // Happened to notice that writing RGBA images to JPEGS is broken
-            if (TextureIO.JPG.equals(FileUtil.getFileSuffix(file)) &&
-                image.getType() == BufferedImage.TYPE_4BYTE_ABGR) {
-                BufferedImage tmpImage = new BufferedImage(image.getWidth(), image.getHeight(),
-                                                           BufferedImage.TYPE_3BYTE_BGR);
-                Graphics g = tmpImage.getGraphics();
-                g.drawImage(image, 0, 0, null);
-                g.dispose();
-                image = tmpImage;
-            }
-
-            return ImageIO.write(image, FileUtil.getFileSuffix(file), file);
-        }
-      
-        throw new IOException("ImageIO writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
-    }
-}
diff --git a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
index 5450e400b..8603c7184 100644
--- a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
+++ b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
@@ -41,7 +41,7 @@ package javax.media.opengl;
 
 import javax.media.nativewindow.Capabilities;
 import javax.media.nativewindow.NativeWindowException;
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.impl.Debug;
 
 /** <P> The default implementation of the {@link
     GLCapabilitiesChooser} interface, which provides consistent visual
diff --git a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java
index a94c14f33..7342369d9 100644
--- a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java
+++ b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java
@@ -40,7 +40,7 @@
 package javax.media.opengl;
 
 import javax.media.opengl.glu.*;
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.impl.Debug;
 import java.security.*;
 
 /** A higher-level abstraction than {@link GLDrawable} which supplies
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index b7c81cbed..ca6bc9051 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -41,9 +41,8 @@ package javax.media.opengl;
 
 import javax.media.nativewindow.*;
 
-import java.lang.reflect.*;
 import java.security.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
 import com.sun.nativewindow.impl.NWReflection;
 
 /** <P> Provides a virtual machine- and operating system-independent
@@ -88,8 +87,8 @@ public abstract class GLDrawableFactory {
   private static final GLDrawableFactory eglFactory;
   private static final GLDrawableFactory nativeOSFactory;
   private static final String nativeOSType;
-  static final String macosxFactoryClassNameCGL = "com.sun.opengl.impl.macosx.cgl.MacOSXCGLDrawableFactory";
-  static final String macosxFactoryClassNameAWTCGL = "com.sun.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory";
+  static final String macosxFactoryClassNameCGL = "com.jogamp.opengl.impl.macosx.cgl.MacOSXCGLDrawableFactory";
+  static final String macosxFactoryClassNameAWTCGL = "com.jogamp.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory";
 
   /**
    * Instantiate singleton factories if available, EGLES1, EGLES2 and the OS native ones.
@@ -97,7 +96,7 @@ public abstract class GLDrawableFactory {
   static {
     GLDrawableFactory tmp = null;
     try {
-        tmp = (GLDrawableFactory) NWReflection.createInstance("com.sun.opengl.impl.egl.EGLDrawableFactory");
+        tmp = (GLDrawableFactory) NWReflection.createInstance("com.jogamp.opengl.impl.egl.EGLDrawableFactory");
     } catch (Throwable t) {
         if (GLProfile.DEBUG) {
             System.err.println("GLDrawableFactory.static - EGLDrawableFactory - not available");
@@ -114,9 +113,9 @@ public abstract class GLDrawableFactory {
         factoryClassName = Debug.getProperty("jogl.gldrawablefactory.class.name", true, AccessController.getContext());
         if (null == factoryClassName) {
             if ( nativeOSType.equals(NativeWindowFactory.TYPE_X11) ) {
-              factoryClassName = "com.sun.opengl.impl.x11.glx.X11GLXDrawableFactory";
+              factoryClassName = "com.jogamp.opengl.impl.x11.glx.X11GLXDrawableFactory";
             } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_WINDOWS) ) {
-              factoryClassName = "com.sun.opengl.impl.windows.wgl.WindowsWGLDrawableFactory";
+              factoryClassName = "com.jogamp.opengl.impl.windows.wgl.WindowsWGLDrawableFactory";
             } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_MACOSX) ) {
                 if(NWReflection.isClassAvailable(macosxFactoryClassNameAWTCGL)) {
                     factoryClassName = macosxFactoryClassNameAWTCGL;
diff --git a/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java b/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java
index 63b50cb3c..352545849 100644
--- a/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java
@@ -39,7 +39,7 @@ package javax.media.opengl;
 import java.lang.reflect.*;
 import java.util.StringTokenizer;
 
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
 
 /**
  * Factory for pipelining GL instances
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 69cdd3f24..6719a76a2 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -36,13 +36,15 @@
 
 package javax.media.opengl;
 
-import javax.media.opengl.fixedfunc.*;
-import java.lang.reflect.*;
-import java.util.HashMap;
-import java.security.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.DRIHack;
+import com.jogamp.opengl.impl.Debug;
+import com.jogamp.opengl.impl.NativeLibLoader;
 import com.sun.nativewindow.impl.NWReflection;
 import com.sun.nativewindow.impl.jvm.JVMUtil;
+import java.util.HashMap;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import javax.media.opengl.fixedfunc.GLPointerFunc;
 
 /**
  * Specifies the the OpenGL profile.
@@ -192,17 +194,17 @@ public class GLProfile implements Cloneable {
 
     private static final String getGLImplBaseClassName(String profileImpl) {
         if(GL3bc.equals(profileImpl)) {
-            return "com.sun.opengl.impl.gl3.GL3bc";
+            return "com.jogamp.opengl.impl.gl3.GL3bc";
         } else if(GL3.equals(profileImpl)) {
-            return "com.sun.opengl.impl.gl3.GL3";
+            return "com.jogamp.opengl.impl.gl3.GL3";
         } else if(GL2.equals(profileImpl)) {
-            return "com.sun.opengl.impl.gl2.GL2";
+            return "com.jogamp.opengl.impl.gl2.GL2";
         } else if(GL2ES12.equals(profileImpl)) {
-            return "com.sun.opengl.impl.gl2es12.GL2ES12";
+            return "com.jogamp.opengl.impl.gl2es12.GL2ES12";
         } else if(GLES1.equals(profileImpl) || GL2ES1.equals(profileImpl)) {
-            return "com.sun.opengl.impl.es1.GLES1";
+            return "com.jogamp.opengl.impl.es1.GLES1";
         } else if(GLES2.equals(profileImpl) || GL2ES2.equals(profileImpl)) {
-            return "com.sun.opengl.impl.es2.GLES2";
+            return "com.jogamp.opengl.impl.es2.GLES2";
         } else {
             throw new GLException("unsupported profile \"" + profileImpl + "\"");
         }
@@ -715,22 +717,22 @@ public class GLProfile implements Cloneable {
         }
 
         // FIXME: check for real GL3 availability .. ?
-        hasGL3bcImpl   = hasDesktopGL && NWReflection.isClassAvailable("com.sun.opengl.impl.gl3.GL3bcImpl");
-        hasGL3Impl     = hasDesktopGL && NWReflection.isClassAvailable("com.sun.opengl.impl.gl3.GL3Impl");
-        hasGL2Impl     = hasDesktopGL && NWReflection.isClassAvailable("com.sun.opengl.impl.gl2.GL2Impl");
+        hasGL3bcImpl   = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl3.GL3bcImpl");
+        hasGL3Impl     = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl3.GL3Impl");
+        hasGL2Impl     = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl2.GL2Impl");
 
-        hasGL2ES12Impl = hasDesktopGLES12 && NWReflection.isClassAvailable("com.sun.opengl.impl.gl2es12.GL2ES12Impl");
+        hasGL2ES12Impl = hasDesktopGLES12 && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl2es12.GL2ES12Impl");
 
         boolean btest = false;
 
-        boolean hasEGLDynLookup = NWReflection.isClassAvailable("com.sun.opengl.impl.egl.EGLDynamicLookupHelper");
+        boolean hasEGLDynLookup = NWReflection.isClassAvailable("com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper");
         boolean hasEGLDrawableFactory = false;
         try {
             if(hasEGLDynLookup) {
                 hasEGLDrawableFactory = null!=GLDrawableFactory.getFactoryImpl(GLES2);
                 btest = hasEGLDrawableFactory &&
-                        NWReflection.isClassAvailable("com.sun.opengl.impl.es2.GLES2Impl") &&
-                        null!=com.sun.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(2);
+                        NWReflection.isClassAvailable("com.jogamp.opengl.impl.es2.GLES2Impl") &&
+                        null!=com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(2);
             }
         } catch (Throwable t) {
             if (DEBUG) {
@@ -744,8 +746,8 @@ public class GLProfile implements Cloneable {
         try {
             if(hasEGLDynLookup) {
                 btest = hasEGLDrawableFactory &&
-                        NWReflection.isClassAvailable("com.sun.opengl.impl.es1.GLES1Impl") &&
-                        null!=com.sun.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(1);
+                        NWReflection.isClassAvailable("com.jogamp.opengl.impl.es1.GLES1Impl") &&
+                        null!=com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(1);
             }
         } catch (Throwable t) {
             if (DEBUG) {
diff --git a/src/jogl/classes/javax/media/opengl/Threading.java b/src/jogl/classes/javax/media/opengl/Threading.java
index fecf6c78b..e58792b8f 100755
--- a/src/jogl/classes/javax/media/opengl/Threading.java
+++ b/src/jogl/classes/javax/media/opengl/Threading.java
@@ -39,7 +39,7 @@
 
 package javax.media.opengl;
 
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
 
 /** This API provides access to the threading model for the implementation of 
     the classes in this package.
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index 038d6d280..53e79b8d9 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -43,7 +43,7 @@ import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.awt.*;
 
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
 
 import java.awt.Canvas;
 import java.awt.Color;
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
index e4758211e..43b2e1e1d 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
@@ -41,20 +41,17 @@ package javax.media.opengl.awt;
 
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
-import javax.media.nativewindow.awt.*;
 
 import java.awt.*;
 import java.awt.geom.*;
 import java.awt.image.*;
 import java.beans.*;
-import javax.swing.*;
 import java.nio.*;
 import java.security.*;
-import javax.swing.JComponent;
 import javax.swing.JPanel;
-import com.sun.opengl.util.FBObject;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.awt.*;
+import com.jogamp.opengl.util.FBObject;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.awt.*;
 
 // FIXME: Subclasses need to call resetGLFunctionAvailability() on their
 // context whenever the displayChanged() function is called on their
@@ -1429,7 +1426,7 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable {
                 System.err.println("-- Created External Context: "+j2dContext);
               }
               if (DEBUG) {
-                j2dContext.setGL(new DebugGL2(j2dContext.getGL().getGL2()));
+//                j2dContext.setGL(new DebugGL2(j2dContext.getGL().getGL2()));
               }
 
               // Check to see whether we can support the requested
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java b/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java
index d5a7a11f3..49451a34b 100755
--- a/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java
@@ -1,7 +1,7 @@
 package javax.media.opengl.glu;
 
 import javax.media.opengl.GL;
-import com.sun.opengl.util.ImmModeSink;
+import com.jogamp.opengl.util.ImmModeSink;
 
 /**
  * Wrapper for a GLU quadric object.
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
index 971991519..72ad68ceb 100755
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
@@ -352,5 +352,5 @@ public interface GLUtessellatorCallback {
    */
   public void errorData(int errnum, Object polygonData);
 
-  //void mesh(com.sun.opengl.impl.tessellator.GLUmesh mesh);
+  //void mesh(com.jogamp.opengl.impl.tessellator.GLUmesh mesh);
 }
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
index 7845ac254..f380f4698 100755
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
@@ -68,7 +68,7 @@ public class GLUtessellatorCallbackAdapter implements GLUtessellatorCallback {
     public void edgeFlag(boolean boundaryEdge) {}
     public void vertex(Object vertexData) {}
     public void end() {}
-//  public void mesh(com.sun.opengl.impl.tessellator.GLUmesh mesh) {}
+//  public void mesh(com.jogamp.opengl.impl.tessellator.GLUmesh mesh) {}
     public void error(int errnum) {}
     public void combine(double[] coords, Object[] data,
                             float[] weight, Object[] outData) {}
-- 
cgit v1.2.3


From 6258a3e657cee513663fd50825b72b83aa878f6f Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sat, 27 Mar 2010 23:26:19 +0100
Subject: refactoring part 2 (glu package): renamed com.sun.opengl ->
 com.jogamp.opengl.

---
 .../com/jogamp/opengl/impl/glu/GLUquadricImpl.java | 1212 ++++++++++
 .../classes/com/jogamp/opengl/impl/glu/Glue.java   |  114 +
 .../com/jogamp/opengl/impl/glu/error/Error.java    |  100 +
 .../opengl/impl/glu/gl2/nurbs/GL2Backend.java      |   49 +
 .../impl/glu/gl2/nurbs/GL2CurveEvaluator.java      |  205 ++
 .../impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java    |  217 ++
 .../opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java |  862 +++++++
 .../jogamp/opengl/impl/glu/mipmap/BuildMipmap.java | 1598 +++++++++++++
 .../com/jogamp/opengl/impl/glu/mipmap/Extract.java |   56 +
 .../opengl/impl/glu/mipmap/Extract1010102.java     |   97 +
 .../opengl/impl/glu/mipmap/Extract1555rev.java     |   97 +
 .../opengl/impl/glu/mipmap/Extract2101010rev.java  |   97 +
 .../opengl/impl/glu/mipmap/Extract233rev.java      |   85 +
 .../jogamp/opengl/impl/glu/mipmap/Extract332.java  |   84 +
 .../jogamp/opengl/impl/glu/mipmap/Extract4444.java |   96 +
 .../opengl/impl/glu/mipmap/Extract4444rev.java     |   97 +
 .../jogamp/opengl/impl/glu/mipmap/Extract5551.java |   97 +
 .../jogamp/opengl/impl/glu/mipmap/Extract565.java  |   92 +
 .../opengl/impl/glu/mipmap/Extract565rev.java      |   92 +
 .../jogamp/opengl/impl/glu/mipmap/Extract8888.java |   97 +
 .../opengl/impl/glu/mipmap/Extract8888rev.java     |   97 +
 .../opengl/impl/glu/mipmap/ExtractFloat.java       |   74 +
 .../opengl/impl/glu/mipmap/ExtractPrimitive.java   |   56 +
 .../opengl/impl/glu/mipmap/ExtractSByte.java       |   69 +
 .../jogamp/opengl/impl/glu/mipmap/ExtractSInt.java |   76 +
 .../opengl/impl/glu/mipmap/ExtractSShort.java      |   76 +
 .../opengl/impl/glu/mipmap/ExtractUByte.java       |   70 +
 .../jogamp/opengl/impl/glu/mipmap/ExtractUInt.java |   76 +
 .../opengl/impl/glu/mipmap/ExtractUShort.java      |   76 +
 .../jogamp/opengl/impl/glu/mipmap/HalveImage.java  | 1533 ++++++++++++
 .../com/jogamp/opengl/impl/glu/mipmap/Image.java   | 1413 +++++++++++
 .../com/jogamp/opengl/impl/glu/mipmap/Mipmap.java  |  867 +++++++
 .../opengl/impl/glu/mipmap/PixelStorageModes.java  |  426 ++++
 .../opengl/impl/glu/mipmap/ScaleInternal.java      | 2447 ++++++++++++++++++++
 .../jogamp/opengl/impl/glu/mipmap/Type_Widget.java |  224 ++
 .../com/jogamp/opengl/impl/glu/nurbs/Arc.java      |  258 +++
 .../opengl/impl/glu/nurbs/ArcSdirSorter.java       |   63 +
 .../opengl/impl/glu/nurbs/ArcTdirSorter.java       |   60 +
 .../opengl/impl/glu/nurbs/ArcTesselator.java       |   90 +
 .../com/jogamp/opengl/impl/glu/nurbs/Backend.java  |  217 ++
 .../jogamp/opengl/impl/glu/nurbs/BezierArc.java    |   44 +
 .../com/jogamp/opengl/impl/glu/nurbs/Bin.java      |  155 ++
 .../com/jogamp/opengl/impl/glu/nurbs/Breakpt.java  |   59 +
 .../jogamp/opengl/impl/glu/nurbs/CArrayOfArcs.java |  194 ++
 .../opengl/impl/glu/nurbs/CArrayOfBreakpts.java    |  130 ++
 .../opengl/impl/glu/nurbs/CArrayOfFloats.java      |  195 ++
 .../opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java  |  160 ++
 .../com/jogamp/opengl/impl/glu/nurbs/Curve.java    |  238 ++
 .../opengl/impl/glu/nurbs/CurveEvaluator.java      |   86 +
 .../jogamp/opengl/impl/glu/nurbs/Curvelist.java    |  121 +
 .../jogamp/opengl/impl/glu/nurbs/DisplayList.java  |   56 +
 .../com/jogamp/opengl/impl/glu/nurbs/Flist.java    |  130 ++
 .../com/jogamp/opengl/impl/glu/nurbs/Knotspec.java |  557 +++++
 .../jogamp/opengl/impl/glu/nurbs/Knotvector.java   |  179 ++
 .../com/jogamp/opengl/impl/glu/nurbs/Mapdesc.java  |  442 ++++
 .../com/jogamp/opengl/impl/glu/nurbs/Maplist.java  |  122 +
 .../jogamp/opengl/impl/glu/nurbs/NurbsConsts.java  |  184 ++
 .../com/jogamp/opengl/impl/glu/nurbs/O_curve.java  |   63 +
 .../jogamp/opengl/impl/glu/nurbs/O_nurbscurve.java |   80 +
 .../opengl/impl/glu/nurbs/O_nurbssurface.java      |   79 +
 .../jogamp/opengl/impl/glu/nurbs/O_pwlcurve.java   |   44 +
 .../jogamp/opengl/impl/glu/nurbs/O_surface.java    |   52 +
 .../com/jogamp/opengl/impl/glu/nurbs/O_trim.java   |   44 +
 .../com/jogamp/opengl/impl/glu/nurbs/Patch.java    |   54 +
 .../jogamp/opengl/impl/glu/nurbs/Patchlist.java    |  145 ++
 .../com/jogamp/opengl/impl/glu/nurbs/Property.java |   75 +
 .../com/jogamp/opengl/impl/glu/nurbs/Pspec.java    |   47 +
 .../com/jogamp/opengl/impl/glu/nurbs/PwlArc.java   |   71 +
 .../com/jogamp/opengl/impl/glu/nurbs/Quilt.java    |  282 +++
 .../jogamp/opengl/impl/glu/nurbs/Quiltspec.java    |   85 +
 .../com/jogamp/opengl/impl/glu/nurbs/README.txt    |   59 +
 .../jogamp/opengl/impl/glu/nurbs/Renderhints.java  |  128 +
 .../jogamp/opengl/impl/glu/nurbs/Splinespec.java   |  204 ++
 .../jogamp/opengl/impl/glu/nurbs/Subdivider.java   | 1167 ++++++++++
 .../opengl/impl/glu/nurbs/SurfaceEvaluator.java    |  111 +
 .../jogamp/opengl/impl/glu/nurbs/TrimVertex.java   |   56 +
 .../jogamp/opengl/impl/glu/registry/Registry.java  |   79 +
 .../opengl/impl/glu/tessellator/ActiveRegion.java  |   69 +
 .../opengl/impl/glu/tessellator/CachedVertex.java  |   58 +
 .../jogamp/opengl/impl/glu/tessellator/Dict.java   |  140 ++
 .../opengl/impl/glu/tessellator/DictNode.java      |   59 +
 .../opengl/impl/glu/tessellator/GLUface.java       |   65 +
 .../opengl/impl/glu/tessellator/GLUhalfEdge.java   |   71 +
 .../opengl/impl/glu/tessellator/GLUmesh.java       |   60 +
 .../impl/glu/tessellator/GLUtessellatorImpl.java   |  646 ++++++
 .../opengl/impl/glu/tessellator/GLUvertex.java     |   65 +
 .../jogamp/opengl/impl/glu/tessellator/Geom.java   |  338 +++
 .../jogamp/opengl/impl/glu/tessellator/Mesh.java   |  734 ++++++
 .../jogamp/opengl/impl/glu/tessellator/Normal.java |  288 +++
 .../opengl/impl/glu/tessellator/PriorityQ.java     |  100 +
 .../opengl/impl/glu/tessellator/PriorityQHeap.java |  262 +++
 .../opengl/impl/glu/tessellator/PriorityQSort.java |  278 +++
 .../jogamp/opengl/impl/glu/tessellator/Render.java |  557 +++++
 .../jogamp/opengl/impl/glu/tessellator/Sweep.java  | 1353 +++++++++++
 .../opengl/impl/glu/tessellator/TessMono.java      |  241 ++
 .../opengl/impl/glu/tessellator/TessState.java     |   59 +
 .../com/sun/opengl/impl/glu/GLUquadricImpl.java    | 1212 ----------
 src/jogl/classes/com/sun/opengl/impl/glu/Glue.java |  114 -
 .../com/sun/opengl/impl/glu/error/Error.java       |  100 -
 .../sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java  |   49 -
 .../impl/glu/gl2/nurbs/GL2CurveEvaluator.java      |  205 --
 .../impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java    |  217 --
 .../opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java |  862 -------
 .../sun/opengl/impl/glu/mipmap/BuildMipmap.java    | 1598 -------------
 .../com/sun/opengl/impl/glu/mipmap/Extract.java    |   56 -
 .../sun/opengl/impl/glu/mipmap/Extract1010102.java |   97 -
 .../sun/opengl/impl/glu/mipmap/Extract1555rev.java |   97 -
 .../opengl/impl/glu/mipmap/Extract2101010rev.java  |   97 -
 .../sun/opengl/impl/glu/mipmap/Extract233rev.java  |   85 -
 .../com/sun/opengl/impl/glu/mipmap/Extract332.java |   84 -
 .../sun/opengl/impl/glu/mipmap/Extract4444.java    |   96 -
 .../sun/opengl/impl/glu/mipmap/Extract4444rev.java |   97 -
 .../sun/opengl/impl/glu/mipmap/Extract5551.java    |   97 -
 .../com/sun/opengl/impl/glu/mipmap/Extract565.java |   92 -
 .../sun/opengl/impl/glu/mipmap/Extract565rev.java  |   92 -
 .../sun/opengl/impl/glu/mipmap/Extract8888.java    |   97 -
 .../sun/opengl/impl/glu/mipmap/Extract8888rev.java |   97 -
 .../sun/opengl/impl/glu/mipmap/ExtractFloat.java   |   74 -
 .../opengl/impl/glu/mipmap/ExtractPrimitive.java   |   56 -
 .../sun/opengl/impl/glu/mipmap/ExtractSByte.java   |   69 -
 .../sun/opengl/impl/glu/mipmap/ExtractSInt.java    |   76 -
 .../sun/opengl/impl/glu/mipmap/ExtractSShort.java  |   76 -
 .../sun/opengl/impl/glu/mipmap/ExtractUByte.java   |   70 -
 .../sun/opengl/impl/glu/mipmap/ExtractUInt.java    |   76 -
 .../sun/opengl/impl/glu/mipmap/ExtractUShort.java  |   76 -
 .../com/sun/opengl/impl/glu/mipmap/HalveImage.java | 1533 ------------
 .../com/sun/opengl/impl/glu/mipmap/Image.java      | 1413 -----------
 .../com/sun/opengl/impl/glu/mipmap/Mipmap.java     |  867 -------
 .../opengl/impl/glu/mipmap/PixelStorageModes.java  |  426 ----
 .../sun/opengl/impl/glu/mipmap/ScaleInternal.java  | 2447 --------------------
 .../sun/opengl/impl/glu/mipmap/Type_Widget.java    |  224 --
 .../classes/com/sun/opengl/impl/glu/nurbs/Arc.java |  258 ---
 .../sun/opengl/impl/glu/nurbs/ArcSdirSorter.java   |   63 -
 .../sun/opengl/impl/glu/nurbs/ArcTdirSorter.java   |   60 -
 .../sun/opengl/impl/glu/nurbs/ArcTesselator.java   |   90 -
 .../com/sun/opengl/impl/glu/nurbs/Backend.java     |  217 --
 .../com/sun/opengl/impl/glu/nurbs/BezierArc.java   |   44 -
 .../classes/com/sun/opengl/impl/glu/nurbs/Bin.java |  155 --
 .../com/sun/opengl/impl/glu/nurbs/Breakpt.java     |   59 -
 .../sun/opengl/impl/glu/nurbs/CArrayOfArcs.java    |  194 --
 .../opengl/impl/glu/nurbs/CArrayOfBreakpts.java    |  130 --
 .../sun/opengl/impl/glu/nurbs/CArrayOfFloats.java  |  195 --
 .../opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java  |  160 --
 .../com/sun/opengl/impl/glu/nurbs/Curve.java       |  238 --
 .../sun/opengl/impl/glu/nurbs/CurveEvaluator.java  |   86 -
 .../com/sun/opengl/impl/glu/nurbs/Curvelist.java   |  121 -
 .../com/sun/opengl/impl/glu/nurbs/DisplayList.java |   56 -
 .../com/sun/opengl/impl/glu/nurbs/Flist.java       |  130 --
 .../com/sun/opengl/impl/glu/nurbs/Knotspec.java    |  557 -----
 .../com/sun/opengl/impl/glu/nurbs/Knotvector.java  |  179 --
 .../com/sun/opengl/impl/glu/nurbs/Mapdesc.java     |  442 ----
 .../com/sun/opengl/impl/glu/nurbs/Maplist.java     |  122 -
 .../com/sun/opengl/impl/glu/nurbs/NurbsConsts.java |  184 --
 .../com/sun/opengl/impl/glu/nurbs/O_curve.java     |   63 -
 .../sun/opengl/impl/glu/nurbs/O_nurbscurve.java    |   80 -
 .../sun/opengl/impl/glu/nurbs/O_nurbssurface.java  |   79 -
 .../com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java  |   44 -
 .../com/sun/opengl/impl/glu/nurbs/O_surface.java   |   52 -
 .../com/sun/opengl/impl/glu/nurbs/O_trim.java      |   44 -
 .../com/sun/opengl/impl/glu/nurbs/Patch.java       |   54 -
 .../com/sun/opengl/impl/glu/nurbs/Patchlist.java   |  145 --
 .../com/sun/opengl/impl/glu/nurbs/Property.java    |   75 -
 .../com/sun/opengl/impl/glu/nurbs/Pspec.java       |   47 -
 .../com/sun/opengl/impl/glu/nurbs/PwlArc.java      |   71 -
 .../com/sun/opengl/impl/glu/nurbs/Quilt.java       |  282 ---
 .../com/sun/opengl/impl/glu/nurbs/Quiltspec.java   |   85 -
 .../com/sun/opengl/impl/glu/nurbs/README.txt       |   59 -
 .../com/sun/opengl/impl/glu/nurbs/Renderhints.java |  128 -
 .../com/sun/opengl/impl/glu/nurbs/Splinespec.java  |  204 --
 .../com/sun/opengl/impl/glu/nurbs/Subdivider.java  | 1167 ----------
 .../opengl/impl/glu/nurbs/SurfaceEvaluator.java    |  111 -
 .../com/sun/opengl/impl/glu/nurbs/TrimVertex.java  |   56 -
 .../com/sun/opengl/impl/glu/registry/Registry.java |   79 -
 .../opengl/impl/glu/tessellator/ActiveRegion.java  |   69 -
 .../opengl/impl/glu/tessellator/CachedVertex.java  |   58 -
 .../com/sun/opengl/impl/glu/tessellator/Dict.java  |  140 --
 .../sun/opengl/impl/glu/tessellator/DictNode.java  |   59 -
 .../sun/opengl/impl/glu/tessellator/GLUface.java   |   65 -
 .../opengl/impl/glu/tessellator/GLUhalfEdge.java   |   71 -
 .../sun/opengl/impl/glu/tessellator/GLUmesh.java   |   60 -
 .../impl/glu/tessellator/GLUtessellatorImpl.java   |  646 ------
 .../sun/opengl/impl/glu/tessellator/GLUvertex.java |   65 -
 .../com/sun/opengl/impl/glu/tessellator/Geom.java  |  338 ---
 .../com/sun/opengl/impl/glu/tessellator/Mesh.java  |  734 ------
 .../sun/opengl/impl/glu/tessellator/Normal.java    |  288 ---
 .../sun/opengl/impl/glu/tessellator/PriorityQ.java |  100 -
 .../opengl/impl/glu/tessellator/PriorityQHeap.java |  262 ---
 .../opengl/impl/glu/tessellator/PriorityQSort.java |  278 ---
 .../sun/opengl/impl/glu/tessellator/Render.java    |  557 -----
 .../com/sun/opengl/impl/glu/tessellator/Sweep.java | 1353 -----------
 .../sun/opengl/impl/glu/tessellator/TessMono.java  |  241 --
 .../sun/opengl/impl/glu/tessellator/TessState.java |   59 -
 192 files changed, 25132 insertions(+), 25132 deletions(-)
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/GLUquadricImpl.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/Glue.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/error/Error.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2Backend.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/BuildMipmap.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1010102.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1555rev.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract2101010rev.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract233rev.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract332.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444rev.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract5551.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565rev.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888rev.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractFloat.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractPrimitive.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSByte.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSInt.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSShort.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUByte.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUInt.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUShort.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/HalveImage.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Image.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/PixelStorageModes.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ScaleInternal.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Arc.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcSdirSorter.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTdirSorter.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTesselator.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Backend.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/BezierArc.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Bin.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Breakpt.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfArcs.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfBreakpts.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfFloats.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curve.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CurveEvaluator.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curvelist.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/DisplayList.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Flist.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotspec.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotvector.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Mapdesc.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Maplist.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/NurbsConsts.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_curve.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbscurve.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbssurface.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_pwlcurve.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_surface.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_trim.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patch.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patchlist.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Property.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Pspec.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/PwlArc.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quilt.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quiltspec.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/README.txt
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Renderhints.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Splinespec.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Subdivider.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/SurfaceEvaluator.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/TrimVertex.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/registry/Registry.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/ActiveRegion.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/CachedVertex.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Dict.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/DictNode.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUface.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUhalfEdge.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUmesh.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUvertex.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Geom.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Mesh.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Normal.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQ.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQHeap.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQSort.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Render.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Sweep.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessMono.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessState.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/GLUquadricImpl.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/Glue.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/error/Error.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/BuildMipmap.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1010102.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1555rev.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract2101010rev.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract233rev.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract332.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444rev.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract5551.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565rev.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888rev.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractFloat.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractPrimitive.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSByte.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSInt.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSShort.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUByte.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUInt.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUShort.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/HalveImage.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Image.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/PixelStorageModes.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ScaleInternal.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Type_Widget.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Arc.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcSdirSorter.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTdirSorter.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTesselator.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Backend.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/BezierArc.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Bin.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Breakpt.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfArcs.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfBreakpts.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfFloats.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curve.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CurveEvaluator.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curvelist.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/DisplayList.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Flist.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotspec.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotvector.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Mapdesc.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Maplist.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/NurbsConsts.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_curve.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbscurve.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbssurface.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_surface.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_trim.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patch.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patchlist.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Property.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Pspec.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/PwlArc.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quilt.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quiltspec.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/README.txt
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Renderhints.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Splinespec.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Subdivider.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/SurfaceEvaluator.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/glu/nurbs/TrimVertex.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/registry/Registry.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/ActiveRegion.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/CachedVertex.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Dict.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/DictNode.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUface.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUhalfEdge.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUmesh.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUvertex.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Geom.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Mesh.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Normal.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQ.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQHeap.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQSort.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Render.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Sweep.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessMono.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessState.java

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/GLUquadricImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/GLUquadricImpl.java
new file mode 100644
index 000000000..d7e6a23c1
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/GLUquadricImpl.java
@@ -0,0 +1,1212 @@
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** $Date: 2009-03-04 17:23:34 -0800 (Wed, 04 Mar 2009) $ $Revision: 1856 $
+** $Header$
+*/
+
+/* 
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are 
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright 
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of 
+ *   its contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.opengl.impl.glu;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+import com.jogamp.opengl.util.ImmModeSink;
+import java.nio.*;
+
+/**
+ * GLUquadricImpl.java
+ * 
+ * 
+ * Created 22-dec-2003 (originally Quadric.java)
+ * @author Erik Duijs
+ * @author Kenneth Russell, Sven Gothel
+ */
+
+public class GLUquadricImpl implements GLUquadric {
+  private boolean useGLSL;
+  private int drawStyle;
+  private int orientation;
+  private boolean textureFlag;
+  private int normals;
+  private boolean immModeSinkEnabled;
+  private boolean immModeSinkImmediate;
+  public int normalType;
+  public GL gl;
+
+  public static final boolean USE_NORM = true;
+  public static final boolean USE_TEXT = false;
+
+  private ImmModeSink immModeSink=null;
+
+  public GLUquadricImpl(GL gl, boolean useGLSL) {
+    this.gl=gl;
+    this.useGLSL = useGLSL;
+    drawStyle = GLU.GLU_FILL;
+    orientation = GLU.GLU_OUTSIDE;
+    textureFlag = false;
+    normals = GLU.GLU_SMOOTH;
+    normalType = gl.isGLES1()?GL.GL_BYTE:GL.GL_FLOAT;
+    immModeSinkImmediate=true;
+    immModeSinkEnabled=!gl.isGL2();
+    replaceImmModeSink();
+  }
+
+  public void enableImmModeSink(boolean val) {
+    if(gl.isGL2()) {
+        immModeSinkEnabled=val;
+    } else {
+        immModeSinkEnabled=true;
+    }
+    if(null==immModeSink && immModeSinkEnabled) {
+      replaceImmModeSink();
+    }
+  }
+
+  public boolean isImmModeSinkEnabled() {
+    return immModeSinkEnabled;
+  }
+
+  public void setImmMode(boolean val) {
+    if(immModeSinkEnabled) {
+        immModeSinkImmediate=val;
+    } else {
+        immModeSinkImmediate=true;
+    }
+  }
+
+  public boolean getImmMode() {
+    return immModeSinkImmediate;
+  }
+
+  public ImmModeSink replaceImmModeSink() {
+    if(!immModeSinkEnabled) return null;
+
+    ImmModeSink res = immModeSink;
+    if(useGLSL) {
+        immModeSink = ImmModeSink.createGLSL (gl, GL.GL_STATIC_DRAW, 32, 
+                                              3, GL.GL_FLOAT,  // vertex
+                                              0, GL.GL_FLOAT,  // color
+                                              USE_NORM?3:0, normalType,// normal
+                                              USE_TEXT?2:0, GL.GL_FLOAT); // texture
+    } else {
+        immModeSink = ImmModeSink.createFixed(gl, GL.GL_STATIC_DRAW, 32, 
+                                              3, GL.GL_FLOAT,  // vertex
+                                              0, GL.GL_FLOAT,  // color
+                                              USE_NORM?3:0, normalType,// normal
+                                              USE_TEXT?2:0, GL.GL_FLOAT); // texture
+    }
+    return res;
+  }
+
+  public void resetImmModeSink(GL gl) {
+    if(immModeSinkEnabled) {
+        immModeSink.reset(gl);
+    }
+  }
+
+  /**
+   * specifies the draw style for quadrics.  
+   *
+   * The legal values are as follows:
+   *
+   * GLU.FILL:       Quadrics are rendered with polygon primitives. The polygons
+   *                 are drawn in a counterclockwise fashion with respect to
+   *                 their normals (as defined with glu.quadricOrientation).
+   *
+   * GLU.LINE:       Quadrics are rendered as a set of lines.
+   *
+   * GLU.SILHOUETTE: Quadrics are rendered as a set of lines, except that edges
+   * 		   separating coplanar faces will not be drawn.
+   *
+   * GLU.POINT:       Quadrics are rendered as a set of points.
+   * 
+   * @param drawStyle The drawStyle to set
+   */
+  public void setDrawStyle(int drawStyle) {
+    this.drawStyle = drawStyle;
+  }
+
+  /**
+   * specifies what kind	of normals are desired for quadrics.
+   * The legal values	are as follows:
+   *
+   * GLU.NONE:     No normals are generated.
+   *
+   * GLU.FLAT:     One normal is generated for every facet of a quadric.
+   *
+   * GLU.SMOOTH:   One normal is generated for every vertex of a quadric.  This
+   *               is the default.
+   * 
+   * @param normals The normals to set
+   */
+  public void setNormals(int normals) {
+    this.normals = normals;
+  }
+
+  /**
+   * specifies what kind of orientation is desired for.
+   * The orientation	values are as follows:
+   *
+   * GLU.OUTSIDE:  Quadrics are drawn with normals pointing outward.
+   *
+   * GLU.INSIDE:   Normals point inward. The default is GLU.OUTSIDE.
+   *
+   * Note that the interpretation of outward and inward depends on the quadric
+   * being drawn.
+   * 
+   * @param orientation The orientation to set
+   */
+  public void setOrientation(int orientation) {
+    this.orientation = orientation;
+  }
+
+  /**
+   * specifies if texture coordinates should be generated for
+   * quadrics rendered with qobj. If the value of textureCoords is true,
+   * then texture coordinates are generated, and if textureCoords is false,
+   * they are not.. The default is false.
+   *
+   * The manner in which texture coordinates are generated depends upon the
+   * specific quadric rendered.
+   * 
+   * @param textureFlag The textureFlag to set
+   */
+  public void setTextureFlag(boolean textureFlag) {
+    this.textureFlag = textureFlag;
+  }
+
+  /**
+   * Returns the drawStyle.
+   * @return int
+   */
+  public int getDrawStyle() {
+    return drawStyle;
+  }
+
+  /**
+   * Returns the normals.
+   * @return int
+   */
+  public int getNormals() {
+    return normals;
+  }
+
+  /**
+   * Returns the orientation.
+   * @return int
+   */
+  public int getOrientation() {
+    return orientation;
+  }
+
+  /**
+   * Returns the textureFlag.
+   * @return boolean
+   */
+  public boolean getTextureFlag() {
+    return textureFlag;
+  }
+
+
+  /**
+   * draws a cylinder oriented along the z axis. The base of the
+   * cylinder is placed at z = 0, and the top at z=height. Like a sphere, a
+   * cylinder is subdivided around the z axis into slices, and along the z axis
+   * into stacks.
+   *
+   * Note that if topRadius is set to zero, then this routine will generate a
+   * cone.
+   *
+   * If the orientation is set to GLU.OUTSIDE (with glu.quadricOrientation), then
+   * any generated normals point away from the z axis. Otherwise, they point
+   * toward the z axis.
+   *
+   * If texturing is turned on (with glu.quadricTexture), then texture
+   * coordinates are generated so that t ranges linearly from 0.0 at z = 0 to
+   * 1.0 at z = height, and s ranges from 0.0 at the +y axis, to 0.25 at the +x
+   * axis, to 0.5 at the -y axis, to 0.75 at the -x axis, and back to 1.0 at the
+   * +y axis.
+   *
+   * @param baseRadius  Specifies the radius of the cylinder at z = 0.
+   * @param topRadius   Specifies the radius of the cylinder at z = height.
+   * @param height      Specifies the height of the cylinder.
+   * @param slices      Specifies the number of subdivisions around the z axis.
+   * @param stacks      Specifies the number of subdivisions along the z axis.
+   */
+  public void drawCylinder(GL gl, float baseRadius, float topRadius, float height, int slices, int stacks) {
+
+    float da, r, dr, dz;
+    float x, y, z, nz, nsign;
+    int i, j;
+
+    if (orientation == GLU.GLU_INSIDE) {
+      nsign = -1.0f;
+    } else {
+      nsign = 1.0f;
+    }
+
+    da = 2.0f * PI / slices;
+    dr = (topRadius - baseRadius) / stacks;
+    dz = height / stacks;
+    nz = (baseRadius - topRadius) / height;
+    // Z component of normal vectors
+
+    if (drawStyle == GLU.GLU_POINT) {
+      glBegin(gl, GL.GL_POINTS);
+      for (i = 0; i < slices; i++) {
+        x = cos((i * da));
+        y = sin((i * da));
+        normal3f(gl, x * nsign, y * nsign, nz * nsign);
+
+        z = 0.0f;
+        r = baseRadius;
+        for (j = 0; j <= stacks; j++) {
+          glVertex3f(gl, (x * r), (y * r), z);
+          z += dz;
+          r += dr;
+        }
+      }
+      glEnd(gl);
+    } else if (drawStyle == GLU.GLU_LINE || drawStyle == GLU.GLU_SILHOUETTE) {
+      // Draw rings
+      if (drawStyle == GLU.GLU_LINE) {
+        z = 0.0f;
+        r = baseRadius;
+        for (j = 0; j <= stacks; j++) {
+          glBegin(gl, GL.GL_LINE_LOOP);
+          for (i = 0; i < slices; i++) {
+            x = cos((i * da));
+            y = sin((i * da));
+            normal3f(gl, x * nsign, y * nsign, nz * nsign);
+            glVertex3f(gl, (x * r), (y * r), z);
+          }
+          glEnd(gl);
+          z += dz;
+          r += dr;
+        }
+      } else {
+        // draw one ring at each end
+        if (baseRadius != 0.0) {
+          glBegin(gl, GL.GL_LINE_LOOP);
+          for (i = 0; i < slices; i++) {
+            x = cos((i * da));
+            y = sin((i * da));
+            normal3f(gl, x * nsign, y * nsign, nz * nsign);
+            glVertex3f(gl, (x * baseRadius), (y * baseRadius), 0.0f);
+          }
+          glEnd(gl);
+          glBegin(gl, GL.GL_LINE_LOOP);
+          for (i = 0; i < slices; i++) {
+            x = cos((i * da));
+            y = sin((i * da));
+            normal3f(gl, x * nsign, y * nsign, nz * nsign);
+            glVertex3f(gl, (x * topRadius), (y * topRadius), height);
+          }
+          glEnd(gl);
+        }
+      }
+      // draw length lines
+      glBegin(gl, GL.GL_LINES);
+      for (i = 0; i < slices; i++) {
+        x = cos((i * da));
+        y = sin((i * da));
+        normal3f(gl, x * nsign, y * nsign, nz * nsign);
+        glVertex3f(gl, (x * baseRadius), (y * baseRadius), 0.0f);
+        glVertex3f(gl, (x * topRadius), (y * topRadius), (height));
+      }
+      glEnd(gl);
+    } else if (drawStyle == GLU.GLU_FILL) {
+      float ds = 1.0f / slices;
+      float dt = 1.0f / stacks;
+      float t = 0.0f;
+      z = 0.0f;
+      r = baseRadius;
+      for (j = 0; j < stacks; j++) {
+        float s = 0.0f;
+        glBegin(gl, immModeSink.GL_QUAD_STRIP);
+        for (i = 0; i <= slices; i++) {
+          if (i == slices) {
+            x = sin(0.0f);
+            y = cos(0.0f);
+          } else {
+            x = sin((i * da));
+            y = cos((i * da));
+          }
+          if (nsign == 1.0f) {
+            normal3f(gl, (x * nsign), (y * nsign), (nz * nsign));
+            TXTR_COORD(gl, s, t);
+            glVertex3f(gl, (x * r), (y * r), z);
+            normal3f(gl, (x * nsign), (y * nsign), (nz * nsign));
+            TXTR_COORD(gl, s, t + dt);
+            glVertex3f(gl, (x * (r + dr)), (y * (r + dr)), (z + dz));
+          } else {
+            normal3f(gl, x * nsign, y * nsign, nz * nsign);
+            TXTR_COORD(gl, s, t);
+            glVertex3f(gl, (x * r), (y * r), z);
+            normal3f(gl, x * nsign, y * nsign, nz * nsign);
+            TXTR_COORD(gl, s, t + dt);
+            glVertex3f(gl, (x * (r + dr)), (y * (r + dr)), (z + dz));
+          }
+          s += ds;
+        } // for slices
+        glEnd(gl);
+        r += dr;
+        t += dt;
+        z += dz;
+      } // for stacks
+    }
+  }
+
+  /**
+   * renders a disk on the z = 0  plane.  The disk has a radius of
+   * outerRadius, and contains a concentric circular hole with a radius of
+   * innerRadius. If innerRadius is 0, then no hole is generated. The disk is
+   * subdivided around the z axis into slices (like pizza slices), and also
+   * about the z axis into rings (as specified by slices and loops,
+   * respectively).
+   *
+   * With respect to orientation, the +z side of the disk is considered to be
+   * "outside" (see glu.quadricOrientation).  This means that if the orientation
+   * is set to GLU.OUTSIDE, then any normals generated point along the +z axis.
+   * Otherwise, they point along the -z axis.
+   *
+   * If texturing is turned on (with glu.quadricTexture), texture coordinates are
+   * generated linearly such that where r=outerRadius, the value at (r, 0, 0) is
+   * (1, 0.5), at (0, r, 0) it is (0.5, 1), at (-r, 0, 0) it is (0, 0.5), and at
+   * (0, -r, 0) it is (0.5, 0).
+   */
+  public void drawDisk(GL gl, float innerRadius, float outerRadius, int slices, int loops)
+  {
+    float da, dr;
+
+    /* Normal vectors */
+    if (normals != GLU.GLU_NONE) {
+      if (orientation == GLU.GLU_OUTSIDE) {
+        glNormal3f(gl, 0.0f, 0.0f, +1.0f);
+      }
+      else {
+        glNormal3f(gl, 0.0f, 0.0f, -1.0f);
+      }
+    }
+	
+    da = 2.0f * PI / slices;
+    dr = (outerRadius - innerRadius) /  loops;
+	
+    switch (drawStyle) {
+    case GLU.GLU_FILL:
+      {
+        /* texture of a gluDisk is a cut out of the texture unit square
+         * x, y in [-outerRadius, +outerRadius]; s, t in [0, 1]
+         * (linear mapping)
+         */
+        float dtc = 2.0f * outerRadius;
+        float sa, ca;
+        float r1 = innerRadius;
+        int l;
+        for (l = 0; l < loops; l++) {
+          float r2 = r1 + dr;
+          if (orientation == GLU.GLU_OUTSIDE) {
+            int s;
+            glBegin(gl, immModeSink.GL_QUAD_STRIP);
+            for (s = 0; s <= slices; s++) {
+              float a;
+              if (s == slices)
+                a = 0.0f;
+              else
+                a = s * da;
+              sa = sin(a);
+              ca = cos(a);
+              TXTR_COORD(gl, 0.5f + sa * r2 / dtc, 0.5f + ca * r2 / dtc);
+              glVertex2f(gl, r2 * sa, r2 * ca);
+              TXTR_COORD(gl, 0.5f + sa * r1 / dtc, 0.5f + ca * r1 / dtc);
+              glVertex2f(gl, r1 * sa, r1 * ca);
+            }
+            glEnd(gl);
+          }
+          else {
+            int s;
+            glBegin(gl, immModeSink.GL_QUAD_STRIP);
+            for (s = slices; s >= 0; s--) {
+              float a;
+              if (s == slices)
+                a = 0.0f;
+              else
+                a = s * da;
+              sa = sin(a);
+              ca = cos(a);
+              TXTR_COORD(gl, 0.5f - sa * r2 / dtc, 0.5f + ca * r2 / dtc);
+              glVertex2f(gl, r2 * sa, r2 * ca);
+              TXTR_COORD(gl, 0.5f - sa * r1 / dtc, 0.5f + ca * r1 / dtc);
+              glVertex2f(gl, r1 * sa, r1 * ca);
+            }
+            glEnd(gl);
+          }
+          r1 = r2;
+        }
+        break;
+      }
+    case GLU.GLU_LINE:
+      {
+        int l, s;
+        /* draw loops */
+        for (l = 0; l <= loops; l++) {
+          float r = innerRadius + l * dr;
+          glBegin(gl, GL.GL_LINE_LOOP);
+          for (s = 0; s < slices; s++) {
+            float a = s * da;
+            glVertex2f(gl, r * sin(a), r * cos(a));
+          }
+          glEnd(gl);
+        }
+        /* draw spokes */
+        for (s = 0; s < slices; s++) {
+          float a = s * da;
+          float x = sin(a);
+          float y = cos(a);
+          glBegin(gl, GL.GL_LINE_STRIP);
+          for (l = 0; l <= loops; l++) {
+            float r = innerRadius + l * dr;
+            glVertex2f(gl, r * x, r * y);
+          }
+          glEnd(gl);
+        }
+        break;
+      }
+    case GLU.GLU_POINT:
+      {
+        int s;
+        glBegin(gl, GL.GL_POINTS);
+        for (s = 0; s < slices; s++) {
+          float a = s * da;
+          float x = sin(a);
+          float y = cos(a);
+          int l;
+          for (l = 0; l <= loops; l++) {
+            float r = innerRadius * l * dr;
+            glVertex2f(gl, r * x, r * y);
+          }
+        }
+        glEnd(gl);
+        break;
+      }
+    case GLU.GLU_SILHOUETTE:
+      {
+        if (innerRadius != 0.0) {
+          float a;
+          glBegin(gl, GL.GL_LINE_LOOP);
+          for (a = 0.0f; a < 2.0 * PI; a += da) {
+            float x = innerRadius * sin(a);
+            float y = innerRadius * cos(a);
+            glVertex2f(gl, x, y);
+          }
+          glEnd(gl);
+        }
+        {
+          float a;
+          glBegin(gl, GL.GL_LINE_LOOP);
+          for (a = 0; a < 2.0f * PI; a += da) {
+            float x = outerRadius * sin(a);
+            float y = outerRadius * cos(a);
+            glVertex2f(gl, x, y);
+          }
+          glEnd(gl);
+        }
+        break;
+      }
+    default:
+      return;
+    }
+  }
+
+  /**
+   * renders a partial disk on the z=0 plane. A partial disk is similar to a
+   * full disk, except that only the subset of the disk from startAngle
+   * through startAngle + sweepAngle is included (where 0 degrees is along
+   * the +y axis, 90 degrees along the +x axis, 180 along the -y axis, and
+   * 270 along the -x axis).
+   * 
+   * The partial disk has a radius of outerRadius, and contains a concentric
+   * circular hole with a radius of innerRadius. If innerRadius is zero, then
+   * no hole is generated. The partial disk is subdivided around the z axis
+   * into slices (like pizza slices), and also about the z axis into rings
+   * (as specified by slices and loops, respectively).
+   * 
+   * With respect to orientation, the +z side of the partial disk is
+   * considered to be outside (see gluQuadricOrientation). This means that if
+   * the orientation is set to GLU.GLU_OUTSIDE, then any normals generated point
+   * along the +z axis. Otherwise, they point along the -z axis.
+   * 
+   * If texturing is turned on (with gluQuadricTexture), texture coordinates
+   * are generated linearly such that where r=outerRadius, the value at (r, 0, 0)
+   * is (1, 0.5), at (0, r, 0) it is (0.5, 1), at (-r, 0, 0) it is (0, 0.5),
+   * and at (0, -r, 0) it is (0.5, 0).
+   */
+  public void drawPartialDisk(GL gl,
+                              float innerRadius,
+                              float outerRadius,
+                              int slices,
+                              int loops,
+                              float startAngle,
+                              float sweepAngle) {
+    int i, j, max;
+    float[] sinCache = new float[CACHE_SIZE];
+    float[] cosCache = new float[CACHE_SIZE];
+    float angle;
+    float x, y;
+    float sintemp, costemp;
+    float deltaRadius;
+    float radiusLow, radiusHigh;
+    float texLow = 0, texHigh = 0;
+    float angleOffset;
+    int slices2;
+    int finish;
+
+    if (slices >= CACHE_SIZE)
+      slices = CACHE_SIZE - 1;
+    if (slices < 2
+        || loops < 1
+        || outerRadius <= 0.0f
+        || innerRadius < 0.0f
+        || innerRadius > outerRadius) {
+      //gluQuadricError(qobj, GLU.GLU_INVALID_VALUE);
+      System.err.println("PartialDisk: GLU_INVALID_VALUE");
+      return;
+    }
+
+    if (sweepAngle < -360.0f)
+      sweepAngle = 360.0f;
+    if (sweepAngle > 360.0f)
+      sweepAngle = 360.0f;
+    if (sweepAngle < 0) {
+      startAngle += sweepAngle;
+      sweepAngle = -sweepAngle;
+    }
+
+    if (sweepAngle == 360.0f) {
+      slices2 = slices;
+    } else {
+      slices2 = slices + 1;
+    }
+
+    /* Compute length (needed for normal calculations) */
+    deltaRadius = outerRadius - innerRadius;
+
+    /* Cache is the vertex locations cache */
+
+    angleOffset = startAngle / 180.0f * PI;
+    for (i = 0; i <= slices; i++) {
+      angle = angleOffset + ((PI * sweepAngle) / 180.0f) * i / slices;
+      sinCache[i] = sin(angle);
+      cosCache[i] = cos(angle);
+    }
+
+    if (sweepAngle == 360.0f) {
+      sinCache[slices] = sinCache[0];
+      cosCache[slices] = cosCache[0];
+    }
+
+    switch (normals) {
+    case GLU.GLU_FLAT :
+    case GLU.GLU_SMOOTH :
+      if (orientation == GLU.GLU_OUTSIDE) {
+        glNormal3f(gl, 0.0f, 0.0f, 1.0f);
+      } else {
+        glNormal3f(gl, 0.0f, 0.0f, -1.0f);
+      }
+      break;
+    default :
+    case GLU.GLU_NONE :
+      break;
+    }
+
+    switch (drawStyle) {
+    case GLU.GLU_FILL :
+      if (innerRadius == .0f) {
+        finish = loops - 1;
+        /* Triangle strip for inner polygons */
+        glBegin(gl, GL.GL_TRIANGLE_FAN);
+        if (textureFlag) {
+          glTexCoord2f(gl, 0.5f, 0.5f);
+        }
+        glVertex3f(gl, 0.0f, 0.0f, 0.0f);
+        radiusLow = outerRadius - deltaRadius * ((float) (loops - 1) / loops);
+        if (textureFlag) {
+          texLow = radiusLow / outerRadius / 2;
+        }
+
+        if (orientation == GLU.GLU_OUTSIDE) {
+          for (i = slices; i >= 0; i--) {
+            if (textureFlag) {
+              glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
+                              texLow * cosCache[i] + 0.5f);
+            }
+            glVertex3f(gl, radiusLow * sinCache[i], radiusLow * cosCache[i], 0.0f);
+          }
+        } else {
+          for (i = 0; i <= slices; i++) {
+            if (textureFlag) {
+              glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
+                              texLow * cosCache[i] + 0.5f);
+            }
+            glVertex3f(gl, radiusLow * sinCache[i], radiusLow * cosCache[i], 0.0f);
+          }
+        }
+        glEnd(gl);
+      } else {
+        finish = loops;
+      }
+      for (j = 0; j < finish; j++) {
+        radiusLow = outerRadius - deltaRadius * ((float) j / loops);
+        radiusHigh = outerRadius - deltaRadius * ((float) (j + 1) / loops);
+        if (textureFlag) {
+          texLow = radiusLow / outerRadius / 2;
+          texHigh = radiusHigh / outerRadius / 2;
+        }
+
+        glBegin(gl, immModeSink.GL_QUAD_STRIP);
+        for (i = 0; i <= slices; i++) {
+          if (orientation == GLU.GLU_OUTSIDE) {
+            if (textureFlag) {
+              glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
+                              texLow * cosCache[i] + 0.5f);
+            }
+            glVertex3f(gl, radiusLow * sinCache[i], radiusLow * cosCache[i], 0.0f);
+
+            if (textureFlag) {
+              glTexCoord2f(gl, texHigh * sinCache[i] + 0.5f,
+                              texHigh * cosCache[i] + 0.5f);
+            }
+            glVertex3f(gl, radiusHigh * sinCache[i],
+                          radiusHigh * cosCache[i],
+                          0.0f);
+          } else {
+            if (textureFlag) {
+              glTexCoord2f(gl, texHigh * sinCache[i] + 0.5f,
+                              texHigh * cosCache[i] + 0.5f);
+            }
+            glVertex3f(gl, radiusHigh * sinCache[i],
+                          radiusHigh * cosCache[i],
+                          0.0f);
+
+            if (textureFlag) {
+              glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
+                              texLow * cosCache[i] + 0.5f);
+            }
+            glVertex3f(gl, radiusLow * sinCache[i], radiusLow * cosCache[i], 0.0f);
+          }
+        }
+        glEnd(gl);
+      }
+      break;
+    case GLU.GLU_POINT :
+      glBegin(gl, GL.GL_POINTS);
+      for (i = 0; i < slices2; i++) {
+        sintemp = sinCache[i];
+        costemp = cosCache[i];
+        for (j = 0; j <= loops; j++) {
+          radiusLow = outerRadius - deltaRadius * ((float) j / loops);
+
+          if (textureFlag) {
+            texLow = radiusLow / outerRadius / 2;
+
+            glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
+                            texLow * cosCache[i] + 0.5f);
+          }
+          glVertex3f(gl, radiusLow * sintemp, radiusLow * costemp, 0.0f);
+        }
+      }
+      glEnd(gl);
+      break;
+    case GLU.GLU_LINE :
+      if (innerRadius == outerRadius) {
+        glBegin(gl, GL.GL_LINE_STRIP);
+
+        for (i = 0; i <= slices; i++) {
+          if (textureFlag) {
+            glTexCoord2f(gl, sinCache[i] / 2 + 0.5f, cosCache[i] / 2 + 0.5f);
+          }
+          glVertex3f(gl, innerRadius * sinCache[i], innerRadius * cosCache[i], 0.0f);
+        }
+        glEnd(gl);
+        break;
+      }
+      for (j = 0; j <= loops; j++) {
+        radiusLow = outerRadius - deltaRadius * ((float) j / loops);
+        if (textureFlag) {
+          texLow = radiusLow / outerRadius / 2;
+        }
+
+        glBegin(gl, GL.GL_LINE_STRIP);
+        for (i = 0; i <= slices; i++) {
+          if (textureFlag) {
+            glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
+                            texLow * cosCache[i] + 0.5f);
+          }
+          glVertex3f(gl, radiusLow * sinCache[i], radiusLow * cosCache[i], 0.0f);
+        }
+        glEnd(gl);
+      }
+      for (i = 0; i < slices2; i++) {
+        sintemp = sinCache[i];
+        costemp = cosCache[i];
+        glBegin(gl, GL.GL_LINE_STRIP);
+        for (j = 0; j <= loops; j++) {
+          radiusLow = outerRadius - deltaRadius * ((float) j / loops);
+          if (textureFlag) {
+            texLow = radiusLow / outerRadius / 2;
+          }
+
+          if (textureFlag) {
+            glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
+                            texLow * cosCache[i] + 0.5f);
+          }
+          glVertex3f(gl, radiusLow * sintemp, radiusLow * costemp, 0.0f);
+        }
+        glEnd(gl);
+      }
+      break;
+    case GLU.GLU_SILHOUETTE :
+      if (sweepAngle < 360.0f) {
+        for (i = 0; i <= slices; i += slices) {
+          sintemp = sinCache[i];
+          costemp = cosCache[i];
+          glBegin(gl, GL.GL_LINE_STRIP);
+          for (j = 0; j <= loops; j++) {
+            radiusLow = outerRadius - deltaRadius * ((float) j / loops);
+
+            if (textureFlag) {
+              texLow = radiusLow / outerRadius / 2;
+              glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
+                              texLow * cosCache[i] + 0.5f);
+            }
+            glVertex3f(gl, radiusLow * sintemp, radiusLow * costemp, 0.0f);
+          }
+          glEnd(gl);
+        }
+      }
+      for (j = 0; j <= loops; j += loops) {
+        radiusLow = outerRadius - deltaRadius * ((float) j / loops);
+        if (textureFlag) {
+          texLow = radiusLow / outerRadius / 2;
+        }
+
+        glBegin(gl, GL.GL_LINE_STRIP);
+        for (i = 0; i <= slices; i++) {
+          if (textureFlag) {
+            glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
+                            texLow * cosCache[i] + 0.5f);
+          }
+          glVertex3f(gl, radiusLow * sinCache[i], radiusLow * cosCache[i], 0.0f);
+        }
+        glEnd(gl);
+        if (innerRadius == outerRadius)
+          break;
+      }
+      break;
+    default :
+      break;
+    }
+  }
+
+  /**
+   * draws a sphere of the given	radius centered	around the origin.
+   * The sphere is subdivided around the z axis into slices and along the z axis
+   * into stacks (similar to lines of longitude and latitude).
+   *
+   * If the orientation is set to GLU.OUTSIDE (with glu.quadricOrientation), then
+   * any normals generated point away from the center of the sphere. Otherwise,
+   * they point toward the center of the sphere.
+
+   * If texturing is turned on (with glu.quadricTexture), then texture
+   * coordinates are generated so that t ranges from 0.0 at z=-radius to 1.0 at
+   * z=radius (t increases linearly along longitudinal lines), and s ranges from
+   * 0.0 at the +y axis, to 0.25 at the +x axis, to 0.5 at the -y axis, to 0.75
+   * at the -x axis, and back to 1.0 at the +y axis.
+   */
+  public void drawSphere(GL gl, float radius, int slices, int stacks) {
+    // TODO
+
+    float rho, drho, theta, dtheta;
+    float x, y, z;
+    float s, t, ds, dt;
+    int i, j, imin, imax;
+    boolean normals;
+    float nsign;
+
+    normals = (this.normals != GLU.GLU_NONE);
+
+    if (orientation == GLU.GLU_INSIDE) {
+      nsign = -1.0f;
+    } else {
+      nsign = 1.0f;
+    }
+
+    drho = PI / stacks;
+    dtheta = 2.0f * PI / slices;
+
+    if (drawStyle == GLU.GLU_FILL) {
+      if (!textureFlag) {
+        // draw +Z end as a triangle fan
+        glBegin(gl, GL.GL_TRIANGLE_FAN);
+        glNormal3f(gl, 0.0f, 0.0f, 1.0f);
+        glVertex3f(gl, 0.0f, 0.0f, nsign * radius);
+        for (j = 0; j <= slices; j++) {
+          theta = (j == slices) ? 0.0f : j * dtheta;
+          x = -sin(theta) * sin(drho);
+          y = cos(theta) * sin(drho);
+          z = nsign * cos(drho);
+          if (normals) {
+            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
+          }
+          glVertex3f(gl, x * radius, y * radius, z * radius);
+        }
+        glEnd(gl);
+      }
+
+      ds = 1.0f / slices;
+      dt = 1.0f / stacks;
+      t = 1.0f; // because loop now runs from 0
+      if (textureFlag) {
+        imin = 0;
+        imax = stacks;
+      } else {
+        imin = 1;
+        imax = stacks - 1;
+      }
+
+      // draw intermediate stacks as quad strips
+      for (i = imin; i < imax; i++) {
+        rho = i * drho;
+        glBegin(gl, immModeSink.GL_QUAD_STRIP);
+        s = 0.0f;
+        for (j = 0; j <= slices; j++) {
+          theta = (j == slices) ? 0.0f : j * dtheta;
+          x = -sin(theta) * sin(rho);
+          y = cos(theta) * sin(rho);
+          z = nsign * cos(rho);
+          if (normals) {
+            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
+          }
+          TXTR_COORD(gl, s, t);
+          glVertex3f(gl, x * radius, y * radius, z * radius);
+          x = -sin(theta) * sin(rho + drho);
+          y = cos(theta) * sin(rho + drho);
+          z = nsign * cos(rho + drho);
+          if (normals) {
+            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
+          }
+          TXTR_COORD(gl, s, t - dt);
+          s += ds;
+          glVertex3f(gl, x * radius, y * radius, z * radius);
+        }
+        glEnd(gl);
+        t -= dt;
+      }
+
+      if (!textureFlag) {
+        // draw -Z end as a triangle fan
+        glBegin(gl, GL.GL_TRIANGLE_FAN);
+        glNormal3f(gl, 0.0f, 0.0f, -1.0f);
+        glVertex3f(gl, 0.0f, 0.0f, -radius * nsign);
+        rho = PI - drho;
+        s = 1.0f;
+        for (j = slices; j >= 0; j--) {
+          theta = (j == slices) ? 0.0f : j * dtheta;
+          x = -sin(theta) * sin(rho);
+          y = cos(theta) * sin(rho);
+          z = nsign * cos(rho);
+          if (normals)
+            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
+          s -= ds;
+          glVertex3f(gl, x * radius, y * radius, z * radius);
+        }
+        glEnd(gl);
+      }
+    } else if (
+               drawStyle == GLU.GLU_LINE
+               || drawStyle == GLU.GLU_SILHOUETTE) {
+      // draw stack lines
+      for (i = 1;
+           i < stacks;
+           i++) { // stack line at i==stacks-1 was missing here
+        rho = i * drho;
+        glBegin(gl, GL.GL_LINE_LOOP);
+        for (j = 0; j < slices; j++) {
+          theta = j * dtheta;
+          x = cos(theta) * sin(rho);
+          y = sin(theta) * sin(rho);
+          z = cos(rho);
+          if (normals)
+            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
+          glVertex3f(gl, x * radius, y * radius, z * radius);
+        }
+        glEnd(gl);
+      }
+      // draw slice lines
+      for (j = 0; j < slices; j++) {
+        theta = j * dtheta;
+        glBegin(gl, GL.GL_LINE_STRIP);
+        for (i = 0; i <= stacks; i++) {
+          rho = i * drho;
+          x = cos(theta) * sin(rho);
+          y = sin(theta) * sin(rho);
+          z = cos(rho);
+          if (normals)
+            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
+          glVertex3f(gl, x * radius, y * radius, z * radius);
+        }
+        glEnd(gl);
+      }
+    } else if (drawStyle == GLU.GLU_POINT) {
+      // top and bottom-most points
+      glBegin(gl, GL.GL_POINTS);
+      if (normals)
+        glNormal3f(gl, 0.0f, 0.0f, nsign);
+      glVertex3f(gl, 0.0f, 0.0f, radius);
+      if (normals)
+        glNormal3f(gl, 0.0f, 0.0f, -nsign);
+      glVertex3f(gl, 0.0f, 0.0f, -radius);
+
+      // loop over stacks
+      for (i = 1; i < stacks - 1; i++) {
+        rho = i * drho;
+        for (j = 0; j < slices; j++) {
+          theta = j * dtheta;
+          x = cos(theta) * sin(rho);
+          y = sin(theta) * sin(rho);
+          z = cos(rho);
+          if (normals)
+            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
+          glVertex3f(gl, x * radius, y * radius, z * radius);
+        }
+      }
+      glEnd(gl);
+    }
+  }
+
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  private static final float PI = (float)Math.PI;
+  private static final int CACHE_SIZE = 240;
+
+  private final void glBegin(GL gl, int mode) {
+      if(immModeSinkEnabled) {
+          immModeSink.glBegin(mode);
+      } else {
+          gl.getGL2().glBegin(mode);
+      }
+  }
+
+  private final void glEnd(GL gl) {
+      if(immModeSinkEnabled) {
+          immModeSink.glEnd(gl, immModeSinkImmediate);
+      } else {
+          gl.getGL2().glEnd();
+      }
+  }
+
+  private final void glVertex2f(GL gl, float x, float y) {
+      if(immModeSinkEnabled) {
+          immModeSink.glVertex2f(x, y);
+      } else {
+          gl.getGL2().glVertex2f(x, y);
+      }
+  }
+
+  private final void glVertex3f(GL gl, float x, float y, float z) {
+      if(immModeSinkEnabled) {
+          immModeSink.glVertex3f(x, y, z);
+      } else {
+          gl.getGL2().glVertex3f(x, y, z);
+      }
+  }
+
+  private final void glNormal3f_s(GL gl, float x, float y, float z) {
+      short a=(short)(x*0xFFFF);
+      short b=(short)(y*0xFFFF);
+      short c=(short)(z*0xFFFF);
+      if(immModeSinkEnabled) {
+          immModeSink.glNormal3s(a, b, c);
+      } else {
+          gl.getGL2().glNormal3s(a, b, c);
+      }
+  }
+
+  private final void glNormal3f_b(GL gl, float x, float y, float z) {
+      byte a=(byte)(x*0xFF);
+      byte b=(byte)(y*0xFF);
+      byte c=(byte)(z*0xFF);
+      if(immModeSinkEnabled) {
+          immModeSink.glNormal3b(a, b, c);
+      } else {
+          gl.getGL2().glNormal3b(a, b, c);
+      }
+  }
+
+  private final void glNormal3f(GL gl, float x, float y, float z) {
+    switch(normalType) {
+        case GL.GL_FLOAT:
+            if(immModeSinkEnabled) {
+                immModeSink.glNormal3f(x,y,z);
+            } else {
+                gl.getGL2().glNormal3f(x,y,z);
+            }
+            break;
+        case GL.GL_SHORT:
+            glNormal3f_s(gl, x, y, z);
+            break;
+        case GL.GL_BYTE:
+            glNormal3f_b(gl, x, y, z);
+            break;
+    }
+  }
+
+  private final void glTexCoord2f(GL gl, float x, float y) {
+      if(immModeSinkEnabled) {
+          immModeSink.glTexCoord2f(x, y);
+      } else {
+          gl.getGL2().glTexCoord2f(x, y);
+      }
+  }
+
+  /**
+   * Call glNormal3f after scaling normal to unit length.
+   *
+   * @param x
+   * @param y
+   * @param z
+   */
+  private void normal3f(GL gl, float x, float y, float z) {
+    float mag;
+	
+    mag = (float)Math.sqrt(x * x + y * y + z * z);
+    if (mag > 0.00001F) {
+      x /= mag;
+      y /= mag;
+      z /= mag;
+    }
+    glNormal3f(gl, x, y, z);
+  }
+
+  private final void TXTR_COORD(GL gl, float x, float y) {
+    if (textureFlag) glTexCoord2f(gl, x,y);
+  }
+
+  private float sin(float r) {
+    return (float)Math.sin(r);
+  }
+
+  private float cos(float r) {
+    return (float)Math.cos(r);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/Glue.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/Glue.java
new file mode 100755
index 000000000..7c360c574
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/Glue.java
@@ -0,0 +1,114 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu;
+
+/**
+ *
+ * @author  Administrator
+ */
+public class Glue {
+  private static String[] __gluNurbsErrors = {
+    " ",
+    "spline order un-supported",
+    "too few knots",
+    "valid knot range is empty",
+    "decreasing knot sequence knot",
+    "knot multiplicity greater than order of spline",
+    "gluEndCurve() must follow gluBeginCurve()",
+    "gluBeginCurve() must precede gluEndCurve()",
+    "missing or extra geometric data",
+    "can't draw piecewise linear trimming curves",
+    "missing or extra domain data",
+    "missing or extra domain data",
+    "gluEndTrim() must precede gluEndSurface()",
+    "gluBeginSurface() must precede gluEndSurface()",
+    "curve of improper type passed as trim curve",
+    "gluBeginSurface() must precede gluBeginTrim()",
+    "gluEndTrim() must follow gluBeginTrim()",
+    "gluBeginTrim() must follow gluEndTrim()",
+    "invalid or missing trim curve",
+    "gluBeginTrim() must precede gluPwlCurve()",
+    "piecewise linear trimming curve referenced twice",
+    "piecewise linear trimming curve and nurbs curve mixed",
+    "improper usage of trim data type",
+    "nurbs curve referenced twice",
+    "nurbs curve and piecewise linear trimming curve mixed",
+    "nurbs surface referenced twice",
+    "invalid property",
+    "gluEndSurface() must follow gluBeginSurface()",
+    "intersecting or misoriented trim curve",
+    "intersecting trim curves",
+    "UNUSED",
+    "inconnected trim curves",
+    "unknown knot error",
+    "negative vertex count encountered",
+    "negative byte-stride encountered",
+    "unknown type descriptor",
+    "null control point reference",
+    "duplicate point on piecewise linear trimming curve"
+  } ;
+  
+  /** Creates a new instance of Glue */
+  public Glue() {
+  }
+  
+  public static String __gluNURBSErrorString( int errno ) {
+    return( __gluNurbsErrors[ errno ] );
+  }
+  
+  private static String[] __gluTessErrors = {
+    " ",
+    "gluTessBeginPolygon() must precede a gluTessEndPolygon",
+    "gluTessBeginContour() must precede a gluTessEndContour()",
+    "gluTessEndPolygon() must follow a gluTessBeginPolygon()",
+    "gluTessEndContour() must follow a gluTessBeginContour()",
+    "a coordinate is too large",
+    "need combine callback"
+  };
+  
+  public static String __gluTessErrorString( int errno ) {
+    return( __gluTessErrors[ errno ] );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/error/Error.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/error/Error.java
new file mode 100644
index 000000000..7c7e6b0d8
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/error/Error.java
@@ -0,0 +1,100 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ *
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ * 
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.error;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.impl.glu.Glue;
+
+/**
+ *
+ * @author  Administrator
+ */
+public class Error {
+  
+  private static String[] glErrorStrings = {
+    "invalid enumerant",
+    "invalid value",
+    "invalid operation",
+    "stack overflow",
+    "stack underflow",
+    "out of memory",
+    "invalid framebuffer operation"
+  };
+  
+  private static String[] gluErrorStrings = {
+    "invalid enumerant",
+    "invalid value",
+    "out of memory",
+    "",
+    "invalid operation"
+  };
+  
+  /** Creates a new instance of Error */
+  public Error() {
+  }
+  
+  public static String gluErrorString( int errorCode ) {
+    if( errorCode == 0 ) {
+      return( "no error" );
+    }
+    if( (errorCode >= GL.GL_INVALID_ENUM) && (errorCode <= GL.GL_INVALID_FRAMEBUFFER_OPERATION) ) {
+      return( glErrorStrings[ errorCode - GL.GL_INVALID_ENUM ] );
+    }
+    if( errorCode == 0x8031 /* GL.GL_TABLE_TOO_LARGE */ ) {
+      return( "table too large" );
+    }
+    if( (errorCode >= GLU.GLU_INVALID_ENUM) && (errorCode <= GLU.GLU_INVALID_OPERATION) ) {
+      return( gluErrorStrings[ errorCode - GLU.GLU_INVALID_ENUM ] );
+    }
+//    if( (errorCode >= GLU.GLU_NURBS_ERROR1) && (errorCode <= GLU.GLU_NURBS_ERROR37) ) {
+//      return( gluErrorStrings[ errorCode - (GLU.GLU_NURBS_ERROR1 - 1) ] );
+//    }
+    if( (errorCode >= GLU.GLU_TESS_ERROR1) && (errorCode <= GLU.GLU_TESS_ERROR8) ) {
+        return( Glue.__gluTessErrorString(errorCode - (GLU.GLU_TESS_ERROR1 - 1)) );
+    }
+    return( "error ("+errorCode+")" );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2Backend.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2Backend.java
new file mode 100755
index 000000000..42ddeea50
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2Backend.java
@@ -0,0 +1,49 @@
+package com.jogamp.opengl.impl.glu.gl2.nurbs;
+import com.jogamp.opengl.impl.glu.nurbs.*;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class responsible for rendering
+ * @author Tomas Hrasky
+ *
+ */
+public class GL2Backend extends Backend {
+  public GL2Backend() {
+    super();
+    curveEvaluator = new GL2CurveEvaluator();
+    surfaceEvaluator = new GL2SurfaceEvaluator();
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
new file mode 100755
index 000000000..adb8c51d8
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
@@ -0,0 +1,205 @@
+package com.jogamp.opengl.impl.glu.gl2.nurbs;
+import com.jogamp.opengl.impl.glu.nurbs.*;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
+import javax.media.opengl.glu.GLU;
+import javax.media.opengl.glu.gl2.GLUgl2;
+
+/**
+ * Class rendering curves with OpenGL
+ * @author Tomáš Hráský
+ *
+ */
+class GL2CurveEvaluator implements CurveEvaluator {
+
+  /**
+   * Output triangles (for callback) or render curve 
+   */
+  private boolean output_triangles;
+
+  /**
+   * OpenGL object
+   */
+  private GL2 gl;
+
+  /**
+   * Not used
+   */
+  private int vertex_flag;
+
+  /**
+   * Not used
+   */
+  private int normal_flag;
+
+  /**
+   * Not used
+   */
+  private int color_flag;
+
+  /**
+   * Not used
+   */
+  private int texcoord_flag;
+
+  /**
+   * Number of bezier arc - used for color distinguishing of arcs forming NURBS curve
+   */
+  private int poradi;
+
+  /**
+   * Makes new Evaluator
+   */
+  public GL2CurveEvaluator() {
+    gl = GLUgl2.getCurrentGL2();
+  }
+
+  /**
+   * Pushes eval bit
+   */
+  public void bgnmap1f() {
+    // DONE
+    if (output_triangles) {
+      vertex_flag = 0;
+      normal_flag = 0;
+      color_flag = 0;
+      texcoord_flag = 0;
+    } else {
+      gl.glPushAttrib(GL2.GL_EVAL_BIT);
+    }
+
+  }
+
+  /**
+   * Pops all OpenGL attributes
+   */
+  public void endmap1f() {
+    // DONE
+    if (output_triangles) {
+
+    } else {
+      gl.glPopAttrib();
+    }
+
+  }
+
+  /**
+   * Initializes opengl evaluator
+   * @param type curve type
+   * @param ulo lowest u
+   * @param uhi highest u
+   * @param stride control point coords
+   * @param order curve order
+   * @param ps control points
+   */
+  public void map1f(int type, float ulo, float uhi, int stride, int order,
+                    CArrayOfFloats ps) {
+    if (output_triangles) {
+      // TODO code for callback (output_triangles probably indicates callback)
+      //				System.out.println("TODO curveevaluator.map1f-output_triangles");
+    } else {
+      gl.glMap1f(type, ulo, uhi, stride, order, ps.getArray(), ps
+                 .getPointer());
+
+      // DEBUG - drawing bézier control points
+      // gl.glColor3d(.5,.5,.5);
+      // gl.glPointSize(5);
+      // gl.glBegin(GL2.GL_POINTS);
+      // float[] ctrlpoints=ps.getArray();
+      // for(int i=ps.getPointer();i<ps.getPointer()+order;i++){
+      // gl.glVertex3d(ctrlpoints[i * 4], ctrlpoints[i * 4 + 1],0);
+      // }
+      // gl.glEnd();
+    }
+
+  }
+
+  /**
+   * Calls opengl enable
+   * @param type what to enable
+   */
+  public void enable(int type) {
+    // DONE
+    gl.glEnable(type);
+  }
+
+  /**
+   * Calls glMapGrid1f
+   * @param nu steps
+   * @param u1 low u
+   * @param u2 high u
+   */
+  public void mapgrid1f(int nu, float u1, float u2) {
+    if (output_triangles) {
+      //				System.out.println("TODO curveevaluator.mapgrid1f");
+    } else
+      gl.glMapGrid1f(nu, u1, u2);
+    //			// System.out.println("upravit NU");
+    // gl.glMapGrid1f(50,u1,u2);
+  }
+
+  /**
+   * Evaluates a curve using glEvalMesh1f
+   * @param style Backend.N_MESHFILL/N_MESHLINE/N_MESHPOINT
+   * @param from lowest param
+   * @param to highest param
+   */
+  public void mapmesh1f(int style, int from, int to) {
+    /* //DEBUG drawing control points
+       this.poradi++;
+       if (poradi % 2 == 0)
+       gl.glColor3f(1, 0, 0);
+       else
+       gl.glColor3f(0, 1, 0);
+    */
+    if (output_triangles) {
+      // TODO code for callback
+      //			System.out.println("TODO openglcurveevaluator.mapmesh1f output_triangles");
+    } else {
+      switch (style) {
+      case Backend.N_MESHFILL:
+      case Backend.N_MESHLINE:
+        gl.glEvalMesh1(GL2.GL_LINE, from, to);
+        break;
+      case Backend.N_MESHPOINT:
+        gl.glEvalMesh1(GL2.GL_POINT, from, to);
+        break;
+      }
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
new file mode 100755
index 000000000..393601ff7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
@@ -0,0 +1,217 @@
+package com.jogamp.opengl.impl.glu.gl2.nurbs;
+import com.jogamp.opengl.impl.glu.nurbs.*;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
+import javax.media.opengl.glu.GLU;
+import javax.media.opengl.glu.gl2.GLUgl2;
+
+/**
+ * Class rendering surfaces with OpenGL
+ * @author Tomas Hrasky
+ *
+ */
+class GL2SurfaceEvaluator implements SurfaceEvaluator {
+
+  /**
+   * JOGL OpenGL object
+   */
+  private GL2 gl;
+
+  /**
+   * Output triangles (callback)
+   */
+  private boolean output_triangles;
+
+  /**
+   * Number of patch - used for distinguishing bezier plates forming NURBS surface with different colors
+   */
+  private int poradi;
+
+  /**
+   * Creates new evaluator
+   */
+  public GL2SurfaceEvaluator() {
+    gl = GLUgl2.getCurrentGL2();
+  }
+
+  /**
+   * Pushes eval bit
+   */
+  public void bgnmap2f() {
+
+    if (output_triangles) {
+      // TODO outp triangles surfaceevaluator bgnmap2f
+      //			System.out.println("TODO surfaceevaluator.bgnmap2f output triangles");
+    } else {
+      gl.glPushAttrib(GL2.GL_EVAL_BIT);
+      //				System.out.println("TODO surfaceevaluator.bgnmap2f glgetintegerv");
+    }
+
+  }
+
+  /**
+   * Sets  glPolygonMode
+   * @param style polygon mode (N_MESHFILL/N_MESHLINE/N_MESHPOINT)
+   */
+  public void polymode(int style) {
+    if (!output_triangles) {
+      switch (style) {
+      default:
+      case NurbsConsts.N_MESHFILL:
+        gl.glPolygonMode(GL2.GL_FRONT_AND_BACK, GL2.GL_FILL);
+        break;
+      case NurbsConsts.N_MESHLINE:
+        gl.glPolygonMode(GL2.GL_FRONT_AND_BACK, GL2.GL_LINE);
+        break;
+      case NurbsConsts.N_MESHPOINT:
+        gl.glPolygonMode(GL2.GL_FRONT_AND_BACK, GL2.GL_POINT);
+        break;
+      }
+    }
+
+  }
+
+  /**
+   * Pops all attributes
+   */
+  public void endmap2f() {
+    // TODO Auto-generated method stub
+    if (output_triangles) {
+      //			System.out.println("TODO surfaceevaluator.endmap2f output triangles");
+    } else {
+      gl.glPopAttrib();
+      // TODO use LOD
+    }
+  }
+
+  /**
+   * Empty method
+   * @param ulo
+   * @param uhi
+   * @param vlo
+   * @param vhi
+   */
+  public void domain2f(float ulo, float uhi, float vlo, float vhi) {
+    // DONE
+  }
+
+  /**
+   * Defines 2D mesh
+   * @param nu number of steps in u direction
+   * @param u0 lowest u
+   * @param u1 highest u
+   * @param nv number of steps in v direction
+   * @param v0 lowest v
+   * @param v1 highest v
+   */
+  public void mapgrid2f(int nu, float u0, float u1, int nv, float v0, float v1) {
+
+    if (output_triangles) {
+      //			System.out.println("TODO openglsurfaceavaluator.mapgrid2f output_triangles");
+    } else {
+      gl.glMapGrid2d(nu, u0, u1, nv, v0, v1);
+    }
+
+  }
+
+  /**
+   * Evaluates surface
+   * @param style surface style
+   * @param umin minimum U
+   * @param umax maximum U
+   * @param vmin minimum V
+   * @param vmax maximum V
+   */
+  public void mapmesh2f(int style, int umin, int umax, int vmin, int vmax) {
+    if (output_triangles) {
+      //			System.out.println("TODO openglsurfaceavaluator.mapmesh2f output_triangles");
+    } else {
+      /* //DEBUG - draw control points
+         this.poradi++;
+         if (poradi % 2 == 0)
+         gl.glColor3f(1, 0, 0);
+         else if (poradi % 2 == 1)
+         gl.glColor3f(0, 1, 0);
+      */
+      switch (style) {
+      case NurbsConsts.N_MESHFILL:
+        gl.glEvalMesh2(GL2.GL_FILL, umin, umax, vmin, vmax);
+        break;
+      case NurbsConsts.N_MESHLINE:
+        gl.glEvalMesh2(GL2.GL_LINE, umin, umax, vmin, vmax);
+        break;
+      case NurbsConsts.N_MESHPOINT:
+        gl.glEvalMesh2(GL2.GL_POINT, umin, umax, vmin, vmax);
+        break;
+      }
+    }
+  }
+
+  /**
+   * Initializes evaluator
+   * @param type surface type
+   * @param ulo lowest u
+   * @param uhi highest u
+   * @param ustride number of objects between control points in u direction
+   * @param uorder surface order in u direction
+   * @param vlo lowest v
+   * @param vhi highest v
+   * @param vstride number of control points' coords
+   * @param vorder surface order in v direction
+   * @param pts control points
+   */
+  public void map2f(int type, float ulo, float uhi, int ustride, int uorder,
+                    float vlo, float vhi, int vstride, int vorder, CArrayOfFloats pts) {
+    // TODO Auto-generated method stub
+    if (output_triangles) {
+      //			System.out.println("TODO openglsurfaceevaluator.map2f output_triangles");
+    } else {
+      gl.glMap2f(type, ulo, uhi, ustride, uorder, vlo, vhi, vstride,
+                 vorder, pts.getArray(), pts.getPointer());
+    }
+  }
+
+  /**
+   * Calls opengl enable
+   * @param type what to enable
+   */
+  public void enable(int type) {
+    //DONE
+    gl.glEnable(type);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
new file mode 100755
index 000000000..13b68138c
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
@@ -0,0 +1,862 @@
+package com.jogamp.opengl.impl.glu.gl2.nurbs;
+import com.jogamp.opengl.impl.glu.nurbs.*;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+import java.lang.reflect.Method;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
+import javax.media.opengl.glu.GLUnurbs;
+
+/**
+ * Base object for working with NURBS curves and surfaces
+ * 
+ * @author Tomas Hrasky
+ * 
+ */
+public class GLUgl2nurbsImpl implements GLUnurbs {
+
+  /**
+   * Curve type - no type
+   */
+  public static final int CT_NONE = 0;
+
+  /**
+   * Curve type - NURBS curve
+   */
+  public static final int CT_NURBSCURVE = 1;
+
+  /**
+   * Curve type - picewise linear curve
+   */
+  public static final int CT_NPWLCURVE = 2;
+
+  /**
+   * Matrixes autoloading
+   */
+  private boolean autoloadmode;
+
+  /**
+   * Using callback
+   */
+  private int callBackFlag;
+
+  /**
+   * Object for error call backs
+   */
+  private Object errorCallback;
+
+  /**
+   * List of map definitions
+   */
+  Maplist maplist;
+
+  /**
+   * Indicates validity of data
+   */
+  private int isDataValid;
+
+  /**
+   * Are we in the middle of curve processing
+   */
+  private int inCurve;
+
+  /**
+   * Current curve
+   */
+  private O_curve currentCurve;
+
+  /**
+   * Are we in trim
+   */
+  private boolean inTrim;
+
+  /**
+   * Are we playbacking curve/surface rendering
+   */
+  private boolean playBack;
+
+  /**
+   * Next curve in linked list
+   */
+  private O_curve nextCurve;
+
+  /**
+   * Is curve modified
+   */
+  private int isCurveModified;
+
+  /**
+   * Object holding rendering settings
+   */
+  private Renderhints renderhints;
+
+  /**
+   * Display list
+   */
+  private DisplayList dl;
+
+  /**
+   * Object for subdividing curves and surfaces
+   */
+  private Subdivider subdivider;
+
+  /**
+   * Object responsible for rendering
+   */
+  private Backend backend;
+
+  /**
+   * Next picewise linear curve in linked list
+   */
+  private O_pwlcurve nextPwlcurve;
+
+  /**
+   * Next trimming NURBS curve in linked list
+   */
+  private O_nurbscurve nextNurbscurve;
+
+  /**
+   * Are we in the middle of surface processing
+   */
+  private int inSurface;
+
+  /**
+   * Are there any changes in trimming
+   */
+  private boolean isTrimModified;
+
+  /**
+   * Are there any changes in surface data
+   */
+  private boolean isDataSurfaceModified;
+
+  /**
+   * Nurber of trmims of processed surface
+   */
+  private int numTrims;
+
+  /**
+   * Current processed surface
+   */
+  private O_surface currentSurface;
+
+  /**
+   * Next trimming curve
+   */
+  private O_trim nextTrim;
+
+  /**
+   * Nextr surface in linked list
+   */
+  private O_nurbssurface nextNurbssurface;
+
+  /**
+   * Are there any changes in surface
+   */
+  private boolean isSurfaceModified;
+
+  /**
+   * Initializes default GLUgl2nurbs object
+   */
+  public GLUgl2nurbsImpl() {
+    // DONE
+    maplist = new Maplist(backend);
+    renderhints = new Renderhints();
+    subdivider = new Subdivider();
+    // original code
+
+    redefineMaps();
+
+    defineMap(GL2.GL_MAP2_NORMAL, 0, 3);
+    defineMap(GL2.GL_MAP1_NORMAL, 0, 3);
+    defineMap(GL2.GL_MAP2_TEXTURE_COORD_1, 0, 1);
+    defineMap(GL2.GL_MAP1_TEXTURE_COORD_1, 0, 1);
+    defineMap(GL2.GL_MAP2_TEXTURE_COORD_2, 0, 2);
+    defineMap(GL2.GL_MAP1_TEXTURE_COORD_2, 0, 2);
+    defineMap(GL2.GL_MAP2_TEXTURE_COORD_3, 0, 3);
+    defineMap(GL2.GL_MAP1_TEXTURE_COORD_3, 0, 3);
+    defineMap(GL2.GL_MAP2_TEXTURE_COORD_4, 1, 4);
+    defineMap(GL2.GL_MAP1_TEXTURE_COORD_4, 1, 4);
+    defineMap(GL2.GL_MAP2_VERTEX_4, 1, 4);
+    defineMap(GL2.GL_MAP1_VERTEX_4, 1, 4);
+    defineMap(GL2.GL_MAP2_VERTEX_3, 0, 3);
+    defineMap(GL2.GL_MAP1_VERTEX_3, 0, 3);
+    defineMap(GL2.GL_MAP2_COLOR_4, 0, 4);
+    defineMap(GL2.GL_MAP1_COLOR_4, 0, 4);
+    defineMap(GL2.GL_MAP2_INDEX, 0, 1);
+    defineMap(GL2.GL_MAP1_INDEX, 0, 1);
+
+    setnurbsproperty(GL2.GL_MAP1_VERTEX_3, NurbsConsts.N_SAMPLINGMETHOD,
+                     (float) NurbsConsts.N_PATHLENGTH);
+    setnurbsproperty(GL2.GL_MAP1_VERTEX_4, NurbsConsts.N_SAMPLINGMETHOD,
+                     (float) NurbsConsts.N_PATHLENGTH);
+    setnurbsproperty(GL2.GL_MAP2_VERTEX_3, NurbsConsts.N_SAMPLINGMETHOD,
+                     (float) NurbsConsts.N_PATHLENGTH);
+    setnurbsproperty(GL2.GL_MAP2_VERTEX_4, NurbsConsts.N_SAMPLINGMETHOD,
+                     (float) NurbsConsts.N_PATHLENGTH);
+
+    setnurbsproperty(GL2.GL_MAP1_VERTEX_3, NurbsConsts.N_PIXEL_TOLERANCE,
+                     (float) 50.0);
+    setnurbsproperty(GL2.GL_MAP1_VERTEX_4, NurbsConsts.N_PIXEL_TOLERANCE,
+                     (float) 50.0);
+    setnurbsproperty(GL2.GL_MAP2_VERTEX_3, NurbsConsts.N_PIXEL_TOLERANCE,
+                     (float) 50.0);
+    setnurbsproperty(GL2.GL_MAP2_VERTEX_4, NurbsConsts.N_PIXEL_TOLERANCE,
+                     (float) 50.0);
+
+    setnurbsproperty(GL2.GL_MAP1_VERTEX_3, NurbsConsts.N_ERROR_TOLERANCE,
+                     (float) 0.50);
+    setnurbsproperty(GL2.GL_MAP1_VERTEX_4, NurbsConsts.N_ERROR_TOLERANCE,
+                     (float) 0.50);
+    setnurbsproperty(GL2.GL_MAP2_VERTEX_3, NurbsConsts.N_ERROR_TOLERANCE,
+                     (float) 0.50);
+    setnurbsproperty(GL2.GL_MAP2_VERTEX_4, NurbsConsts.N_ERROR_TOLERANCE,
+                     (float) 0.50);
+
+    setnurbsproperty(GL2.GL_MAP1_VERTEX_3, NurbsConsts.N_S_STEPS,
+                     (float) 100.0);
+    setnurbsproperty(GL2.GL_MAP1_VERTEX_4, NurbsConsts.N_S_STEPS,
+                     (float) 100.0);
+    setnurbsproperty(GL2.GL_MAP2_VERTEX_3, NurbsConsts.N_S_STEPS,
+                     (float) 100.0);
+    setnurbsproperty(GL2.GL_MAP2_VERTEX_4, NurbsConsts.N_S_STEPS,
+                     (float) 100.0);
+
+    setnurbsproperty(GL2.GL_MAP1_VERTEX_3, NurbsConsts.N_SAMPLINGMETHOD,
+                     NurbsConsts.N_PATHLENGTH);
+
+    set_domain_distance_u_rate(100.0);
+    set_domain_distance_v_rate(100.0);
+    set_is_domain_distance_sampling(0);
+
+    this.autoloadmode = true;
+
+    this.callBackFlag = 0;
+
+    this.errorCallback = null;
+  }
+
+  /**
+   * Sets domain distance for dom.dist. sampling in u direction
+   * 
+   * @param d
+   *            distance
+   */
+  private void set_domain_distance_u_rate(double d) {
+    // DONE
+    subdivider.set_domain_distance_u_rate(d);
+  }
+
+  /**
+   * Sets domain distance for dom.dist. sampling in v direction
+   * 
+   * @param d
+   *            distance
+   */
+  private void set_domain_distance_v_rate(double d) {
+    // DONE
+    subdivider.set_domain_distance_v_rate(d);
+  }
+
+  /**
+   * Begins new NURBS curve
+   */
+  public void bgncurve() {
+    // DONE
+    O_curve o_curve = new O_curve();
+    thread("do_bgncurve", o_curve);
+  }
+
+  /**
+   * Calls a method with given name and passes argumet
+   * 
+   * @param name
+   *            name of a method to be called
+   * @param arg
+   *            parameter to be passed to called method
+   */
+  private void thread(String name, Object arg) {
+    // DONE
+    Class partype[] = new Class[1];
+    partype[0] = arg.getClass();
+    Method m;
+    try {
+      m = this.getClass().getMethod(name, partype);
+      if (dl != null) {
+        dl.append(this, m, arg);
+      } else {
+        m.invoke(this, new Object[] { arg });
+      }
+    } catch (Throwable e) {
+      e.printStackTrace();
+    }
+
+  }
+
+  /**
+   * Calls a method with given name
+   * 
+   * @param name
+   *            name of a method to be called
+   */
+  private void thread2(String name) {
+    // DONE
+    try {
+      Method m = this.getClass().getMethod(name, (Class[]) null);
+      if (dl != null) {
+        dl.append(this, m, null);
+      } else {
+        m.invoke(this, (Object[]) null);
+      }
+    } catch (Throwable e) {
+      e.printStackTrace();
+    }
+  }
+
+  /**
+   * Begins a NURBS curve
+   * 
+   * @param o_curve
+   *            curve object
+   */
+  public void do_bgncurve(O_curve o_curve) {
+    if (inCurve > 0) {
+      do_nurbserror(6);
+      endcurve();
+    }
+    inCurve = 1;
+    currentCurve = o_curve;
+
+    currentCurve.curvetype = CT_NONE;
+
+    if (inTrim) {
+      if (!nextCurve.equals(o_curve)) {
+        isCurveModified = 1;
+        nextCurve = o_curve;
+      }
+    } else {
+      if (!playBack)
+        bgnrender();
+      isDataValid = 1;
+    }
+    nextCurve = o_curve.next;
+    // kind of solution of union
+    nextPwlcurve = o_curve.o_pwlcurve;
+    nextNurbscurve = o_curve.o_nurbscurve;
+  }
+
+  /**
+   * Begins new surface
+   * 
+   * @param o_surface
+   *            surface object
+   */
+  public void do_bgnsurface(O_surface o_surface) {
+    // DONE
+    if (inSurface > 0) {
+      do_nurbserror(27);
+      endsurface();
+    }
+    inSurface = 1;
+    if (!playBack)
+      bgnrender();
+
+    isTrimModified = false;
+    isDataSurfaceModified = false;
+    isDataValid = 1;
+    numTrims = 0;
+    currentSurface = o_surface;
+    nextTrim = o_surface.o_trim;
+    nextNurbssurface = o_surface.o_nurbssurface;
+  }
+
+  /**
+   * End a curve
+   */
+  public void endcurve() {
+    // DONE
+    thread2("do_endcurve");
+  }
+
+  /**
+   * Ends surface
+   */
+  public void do_endsurface() {
+    // DONE
+    if (inTrim) {
+      do_nurbserror(12);
+      endtrim();
+    }
+
+    if (inSurface <= 0) {
+      do_nurbserror(13);
+      return;
+    }
+
+    inSurface = 0;
+
+    nextNurbssurface = null;
+
+    if (isDataValid <= 0) {
+      return;
+    }
+
+    if (nextTrim != null) {
+      isTrimModified = true;
+      nextTrim = null;
+    }
+
+    // TODO errval ??
+    if (numTrims > 0) {
+      //				System.out.println("TODO glunurbs.do_endsurface - numtrims > 0");
+    }
+
+    subdivider.beginQuilts(new GL2Backend());
+    for (O_nurbssurface n = currentSurface.o_nurbssurface; n != null; n = n.next) {
+      subdivider.addQuilt(n.bezier_patches);
+    }
+    subdivider.endQuilts();
+    subdivider.drawSurfaces();
+    if (!playBack)
+      endrender();
+
+  }
+
+  /**
+   * Ends a curve
+   */
+  public void do_endcurve() {
+    // DONE
+    //			// System.out.println("do_endcurve");
+    if (inCurve <= 0) {
+      do_nurbserror(7);
+      return;
+    }
+    inCurve = 0;
+
+    nextCurve = null;
+
+    if (currentCurve.curvetype == CT_NURBSCURVE) {
+      // nextNurbscurve = null;
+      // currentCurve.o_nurbscurve=null;
+    } else {
+      // nextPwlcurve = null;
+      // currentCurve.o_pwlcurve=null;
+    }
+    if (!inTrim) {
+      if (isDataValid <= 0) {
+        return;
+      }
+      // TODO errval?
+      if (currentCurve.curvetype == CT_NURBSCURVE) {
+        subdivider.beginQuilts(new GL2Backend());
+
+        for (O_nurbscurve n = currentCurve.o_nurbscurve; n != null; n = n.next)
+          subdivider.addQuilt(n.bezier_curves);
+
+        subdivider.endQuilts();
+        subdivider.drawCurves();
+        if (!playBack)
+          endrender();
+      } else {
+        if (!playBack)
+          endrender();
+        do_nurbserror(9);
+      }
+    }
+
+  }
+
+  /**
+   * Method for handling error codes
+   * 
+   * @param i
+   *            error code
+   */
+  private void do_nurbserror(int i) {
+    // TODO nurberror
+    //			System.out.println("TODO nurbserror " + i);
+  }
+
+  /**
+   * Begin rendering
+   */
+  private void bgnrender() {
+    // DONE
+    if (autoloadmode) {
+      loadGLMatrices();
+    }
+  }
+
+  /**
+   * Load matrices from OpenGL state machine
+   */
+  private void loadGLMatrices() {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO glunurbs.loadGLMatrices");
+  }
+
+  /**
+   * End rendering
+   */
+  private void endrender() {
+    // DONE
+  }
+
+  /**
+   * Make a NURBS curve
+   * 
+   * @param nknots
+   *            number of knots in knot vector
+   * @param knot
+   *            knot vector
+   * @param stride
+   *            number of control points coordinates
+   * @param ctlarray
+   *            control points
+   * @param order
+   *            order of the curve
+   * @param realType
+   *            type of the curve
+   */
+  public void nurbscurve(int nknots, float[] knot, int stride,
+                         float[] ctlarray, int order, int realType) {
+    // DONE
+    Mapdesc mapdesc = maplist.locate(realType);
+    if (mapdesc == null) {
+      do_nurbserror(35);
+      isDataValid = 0;
+      return;
+    }
+    if (ctlarray == null) {
+      do_nurbserror(36);
+      isDataValid = 0;
+      return;
+    }
+    if (stride < 0) {
+      do_nurbserror(34);
+      isDataValid = 0;
+      return;
+    }
+    Knotvector knots = new Knotvector(nknots, stride, order, knot);
+
+    if (!do_check_knots(knots, "curve"))
+      return;
+
+    O_nurbscurve o_nurbscurve = new O_nurbscurve(realType);
+    o_nurbscurve.bezier_curves = new Quilt(mapdesc);
+    CArrayOfFloats ctrlcarr = new CArrayOfFloats(ctlarray);
+    o_nurbscurve.bezier_curves.toBezier(knots, ctrlcarr, mapdesc
+                                        .getNCoords());
+    thread("do_nurbscurve", o_nurbscurve);
+  }
+
+  /**
+   * Check knot vector specification
+   * 
+   * @param knots
+   *            knot vector
+   * @param msg
+   *            error message
+   * @return knot vector is / is not valid
+   */
+  public boolean do_check_knots(Knotvector knots, String msg) {
+    // DONE
+    int status = knots.validate();
+    if (status > 0) {
+      do_nurbserror(status);
+      if (renderhints.errorchecking != NurbsConsts.N_NOMSG)
+        knots.show(msg);
+    }
+    return (status > 0) ? false : true;
+  }
+
+  /**
+   * Draw a curve
+   * 
+   * @param o_nurbscurve
+   *            NURBS curve object
+   */
+  public void do_nurbscurve(O_nurbscurve o_nurbscurve) {
+    // DONE
+
+    if (inCurve <= 0) {
+      bgncurve();
+      inCurve = 2;
+    }
+
+    if (o_nurbscurve.used) {
+      do_nurbserror(23);
+      isDataValid = 0;
+      return;
+    } else
+      o_nurbscurve.used = true;
+
+    if (currentCurve.curvetype == CT_NONE) {
+      currentCurve.curvetype = CT_NURBSCURVE;
+    } else if (currentCurve.curvetype != CT_NURBSCURVE) {
+      do_nurbserror(24);
+      isDataValid = 0;
+      return;
+    }
+
+    // it was necessary to overcome problem with pointer to pointer here
+
+    // if(!o_nurbscurve.equals(nextNurbscurve)){
+    if (!o_nurbscurve.equals(currentCurve.o_nurbscurve)) {
+      isCurveModified = 1;
+      currentCurve.o_nurbscurve = o_nurbscurve;
+      // nextNurbscurve=o_nurbscurve;
+
+    }
+
+    nextNurbscurve = o_nurbscurve.next;
+
+    if (!currentCurve.equals(o_nurbscurve.owner)) {
+      isCurveModified = 1;
+      o_nurbscurve.owner = currentCurve;
+    }
+
+    if (o_nurbscurve.owner == null)
+      isCurveModified = 1;
+
+    if (inCurve == 2)
+      endcurve();
+  }
+
+  /**
+   * Draw NURBS surface
+   * 
+   * @param o_nurbssurface
+   *            NURBS surface object
+   */
+  public void do_nurbssurface(O_nurbssurface o_nurbssurface) {
+    // DONE
+    if (inSurface <= 0) {
+      bgnsurface();
+      inSurface = 2;
+    }
+    if (o_nurbssurface.used) {
+      do_nurbserror(25);
+      isDataValid = 0;
+      return;
+    } else
+      o_nurbssurface.used = true;
+
+    if (!o_nurbssurface.equals(nextNurbscurve)) {
+      isSurfaceModified = true;
+      // nextNurbssurface=o_nurbssurface;
+      currentSurface.o_nurbssurface = o_nurbssurface;
+    }
+
+    if (!currentSurface.equals(o_nurbssurface.owner)) {
+      isSurfaceModified = true;
+      o_nurbssurface.owner = currentSurface;
+    }
+
+    nextNurbssurface = o_nurbssurface.next;
+
+    if (inSurface == 2)
+      endsurface();
+  }
+
+  /**
+   * (Re)Inicialize maps
+   */
+  public void redefineMaps() {
+    // DONE
+    maplist.initialize();
+  }
+
+  /**
+   * Define a map of given properties
+   * 
+   * @param type
+   *            map type
+   * @param rational
+   *            is rational
+   * @param ncoords
+   *            number of control point coordinates
+   */
+  public void defineMap(int type, int rational, int ncoords) {
+    // DONE
+    maplist.define(type, rational, ncoords);
+  }
+
+  /**
+   * Set NURBS property
+   * 
+   * @param type
+   *            property type
+   * @param tag
+   *            property tag
+   * @param value
+   *            property value
+   */
+  public void setnurbsproperty(int type, int tag, float value) {
+    // DONE
+    Mapdesc mapdesc = maplist.locate(type);
+    if (mapdesc == null) {
+      do_nurbserror(35);
+      return;
+    }
+    if (!mapdesc.isProperty(tag)) {
+      do_nurbserror(26);
+      return;
+    }
+    Property prop = new Property(type, tag, value);
+    thread("do_setnurbsproperty2", prop);
+  }
+
+  /**
+   * Set parameters of existing property
+   * 
+   * @param prop
+   *            property
+   */
+  public void do_setnurbsproperty2(Property prop) {
+    Mapdesc mapdesc = maplist.find(prop.type);
+    mapdesc.setProperty(prop.tag, prop.value);
+  }
+
+  /**
+   * Set given property to rendering hints
+   * 
+   * @param prop
+   *            property to be set
+   */
+  public void do_setnurbsproperty(Property prop) {
+    // DONE
+    renderhints.setProperty(prop);
+    // TODO freeproperty?
+  }
+
+  /**
+   * Sets wheteher we use domain distance sampling
+   * 
+   * @param i
+   *            domain distance sampling flag
+   */
+  public void set_is_domain_distance_sampling(int i) {
+    // DONE
+    subdivider.set_is_domain_distance_sampling(i);
+  }
+
+  /**
+   * Begin new surface
+   */
+  public void bgnsurface() {
+    // DONE
+    O_surface o_surface = new O_surface();
+    // TODO nuid
+    //			System.out.println("TODO glunurbs.bgnsurface nuid");
+    thread("do_bgnsurface", o_surface);
+  }
+
+  /**
+   * End current surface
+   */
+  public void endsurface() {
+    // DONE
+    thread2("do_endsurface");
+  }
+
+  /**
+   * End surface trimming
+   */
+  private void endtrim() {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO glunurbs.endtrim");
+  }
+
+  /**
+   * Make NURBS surface
+   * 
+   * @param sknot_count
+   *            number of knots in s direction
+   * @param sknot
+   *            knot vector in s direction
+   * @param tknot_count
+   *            number of knots in t direction
+   * @param tknot
+   *            knot vector in t direction
+   * @param s_stride
+   *            number of coords of control points in s direction
+   * @param t_stride
+   *            number of coords of control points in t direction
+   * @param ctlarray
+   *            control points
+   * @param sorder
+   *            order of curve in s direction
+   * @param torder
+   *            order of curve in t direction
+   * @param type
+   *            NURBS surface type (rational,...)
+   */
+  public void nurbssurface(int sknot_count, float[] sknot, int tknot_count,
+                           float[] tknot, int s_stride, int t_stride, float[] ctlarray,
+                           int sorder, int torder, int type) {
+    // DONE
+    Mapdesc mapdesc = maplist.locate(type);
+    if (mapdesc == null) {
+      do_nurbserror(35);
+      isDataValid = 0;
+      return;
+    }
+    if (s_stride < 0 || t_stride < 0) {
+      do_nurbserror(34);
+      isDataValid = 0;
+      return;
+    }
+    Knotvector sknotvector = new Knotvector(sknot_count, s_stride, sorder,
+                                            sknot);
+    if (!do_check_knots(sknotvector, "surface"))
+      return;
+    Knotvector tknotvector = new Knotvector(tknot_count, t_stride, torder,
+                                            tknot);
+    if (!do_check_knots(tknotvector, "surface"))
+      return;
+
+    O_nurbssurface o_nurbssurface = new O_nurbssurface(type);
+    o_nurbssurface.bezier_patches = new Quilt(mapdesc);
+
+    CArrayOfFloats ctrlarr = new CArrayOfFloats(ctlarray);
+    o_nurbssurface.bezier_patches.toBezier(sknotvector, tknotvector,
+                                           ctrlarr, mapdesc.getNCoords());
+    thread("do_nurbssurface", o_nurbssurface);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/BuildMipmap.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/BuildMipmap.java
new file mode 100644
index 000000000..501f5f585
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/BuildMipmap.java
@@ -0,0 +1,1598 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
+import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.impl.Debug;
+import com.jogamp.opengl.impl.InternalBufferUtil;
+import java.nio.*;
+import java.io.*;
+
+/**
+ *
+ * @author  Administrator
+ */
+public class BuildMipmap {
+
+  private static final boolean DEBUG = Debug.debug("BuildMipmap");
+  private static final boolean VERBOSE = Debug.verbose();
+
+  /** Creates a new instance of BuildMipmap */
+  public BuildMipmap() {
+  }
+  
+  public static int gluBuild1DMipmapLevelsCore( GL gl, int target, int internalFormat,
+                  int width, int widthPowerOf2, int format, int type, int userLevel,
+                  int baseLevel, int maxLevel, ByteBuffer data ) {
+    int newwidth;
+    int level, levels;
+    ShortBuffer newImage = null;
+    int newImage_width;
+    ShortBuffer otherImage = null;
+    ShortBuffer imageTemp = null;
+    int memReq;
+    int maxsize;
+    int cmpts;
+    PixelStorageModes psm = new PixelStorageModes();
+    
+    assert( Mipmap.checkMipmapArgs( internalFormat, format, type ) == 0 );
+    assert( width >= 1 );
+    
+    newwidth = widthPowerOf2;
+    levels = Mipmap.computeLog( newwidth );
+    
+    levels += userLevel;
+    
+    Mipmap.retrieveStoreModes( gl, psm );
+    try {
+      newImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( Mipmap.image_size( width, 1, format, 
+            GL2.GL_UNSIGNED_SHORT ) )).asShortBuffer();
+    } catch( OutOfMemoryError ome ) {
+      return( GLU.GLU_OUT_OF_MEMORY );
+    }
+    newImage_width = width;
+    
+    Image.fill_image( psm, width, 1, format, type, Mipmap.is_index( format ), data, newImage );
+    cmpts = Mipmap.elements_per_group( format, type );
+    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, 2 );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, 0 );
+    
+    // if swap_bytes was set, swapping occurred in fill_image
+    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, GL2.GL_FALSE );
+    
+    for( level = userLevel; level <= levels; level++ ) {
+      if( newImage_width == newwidth ) {
+        // user newimage for this level
+        if( baseLevel <= level && level <= maxLevel ) {
+          gl.getGL2().glTexImage1D( target, level, internalFormat, newImage_width, 0, format,
+                        GL2.GL_UNSIGNED_SHORT, newImage );
+        }
+      } else {
+        if( otherImage == null ) {
+          memReq = Mipmap.image_size( newwidth, 1, format, GL2.GL_UNSIGNED_SHORT );
+          try {
+            otherImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq )).asShortBuffer();
+          } catch( OutOfMemoryError ome ) {
+            gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+            gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+            gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+            gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+            gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
+            return( GLU.GLU_OUT_OF_MEMORY );
+          }
+        }
+        ScaleInternal.scale_internal( cmpts, newImage_width, 1, newImage, newwidth, 1, otherImage );
+        // swap newImage and otherImage
+        imageTemp = otherImage;
+        otherImage = newImage;
+        newImage = imageTemp;
+        
+        newImage_width = newwidth;
+        if( baseLevel <= level && level <= maxLevel ) {
+          gl.getGL2().glTexImage1D( target, level, internalFormat, newImage_width, 0, 
+                            format, GL2.GL_UNSIGNED_SHORT, newImage );
+        }
+      }
+      if( newwidth > 1 ) {
+        newwidth /= 2;
+      }
+    }
+    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
+    
+    return( 0 );
+  }
+  
+  public static int bitmapBuild2DMipmaps( GL gl, int target, int internalFormat,
+            int width, int height, int format, int type, ByteBuffer data ) {
+    int newwidth[] = new int[1];
+    int newheight[] = new int[1];
+    int level, levels;
+    ShortBuffer newImage = null;
+    int newImage_width;
+    int newImage_height;
+    ShortBuffer otherImage = null;
+    ShortBuffer tempImage = null;
+    int memReq;
+    int maxsize;
+    int cmpts;
+    PixelStorageModes psm = new PixelStorageModes();
+    
+    Mipmap.retrieveStoreModes( gl, psm );
+    
+    Mipmap.closestFit( gl, target, width, height, internalFormat, format, type, newwidth, newheight );
+    
+    levels = Mipmap.computeLog( newwidth[0] );
+    level = Mipmap.computeLog( newheight[0] );
+    if( level > levels ) {
+      levels = level;
+    }
+    
+    try {
+      newImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( Mipmap.image_size( width, height, 
+            format, GL2.GL_UNSIGNED_SHORT ) )).asShortBuffer();
+    } catch( OutOfMemoryError ome ) {
+      return( GLU.GLU_OUT_OF_MEMORY );
+    }
+    newImage_width = width;
+    newImage_height = height;
+    
+    Image.fill_image( psm, width, height, format, type, Mipmap.is_index( format ), data, newImage );
+    
+    cmpts = Mipmap.elements_per_group( format, type );
+    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, 2 );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, 0 );
+    
+    // if swap_bytes is set, swapping occurred in fill_image
+    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, GL2.GL_FALSE );
+    
+    for( level = 0; level < levels; level++ ) {
+      if( newImage_width == newwidth[0] && newImage_height == newheight[0] ) {
+        newImage.rewind();
+        gl.glTexImage2D( target, level, internalFormat, newImage_width,
+            newImage_height, 0, format, GL2.GL_UNSIGNED_SHORT, newImage );
+      } else {
+        if( otherImage == null ) {
+          memReq = Mipmap.image_size( newwidth[0], newheight[0], format, GL2.GL_UNSIGNED_SHORT );
+          try {
+            otherImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq )).asShortBuffer();
+          } catch( OutOfMemoryError ome ) {
+            gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+            gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+            gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+            gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+            gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
+            return( GLU.GLU_OUT_OF_MEMORY );
+          }
+        }
+        ScaleInternal.scale_internal( cmpts, newImage_width, newImage_height, 
+                              newImage, newwidth[0], newheight[0], otherImage );
+        // swap newImage and otherImage
+        tempImage = otherImage;
+        otherImage = newImage;
+        newImage = tempImage;
+        
+        newImage_width = newwidth[0];
+        newImage_height = newheight[0];
+        newImage.rewind();
+        gl.glTexImage2D( target, level, internalFormat, newImage_width, newImage_height,
+                                    0, format, GL2.GL_UNSIGNED_SHORT, newImage );
+      }
+      if( newheight[0] > 1 ) {
+        newwidth[0] /= 2;
+      }
+      if( newheight[0] > 1 ) {
+        newheight[0] /= 2;
+      }
+    }
+    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
+    
+    return( 0 );
+  }
+  
+  public static int gluBuild2DMipmapLevelsCore( GL gl, int target, int internalFormat,
+                int width, int height, int widthPowerOf2, int heightPowerOf2,
+                int format, int type, int userLevel, int baseLevel, int maxLevel,
+                ByteBuffer data ) { // PointerWrapper data
+    int newwidth;
+    int newheight;
+    int level, levels;
+    int usersImage;
+    ByteBuffer srcImage = null;
+    ByteBuffer dstImage = null;
+    ByteBuffer tempImage = null;
+    int newImage_width;
+    int newImage_height;
+    short[] SWAP_IMAGE = null;
+    int memReq;
+    int maxsize;
+    int cmpts;
+    int mark=-1;
+    
+    boolean myswap_bytes;
+    int groups_per_line, element_size, group_size;
+    int rowsize, padding;
+    PixelStorageModes psm = new PixelStorageModes();
+    
+    assert( Mipmap.checkMipmapArgs( internalFormat, format, type ) == 0 );
+    assert( width >= 1 && height >= 1 );
+    
+    if( type == GL2.GL_BITMAP ) {
+      return( bitmapBuild2DMipmaps( gl, target, internalFormat, width, height, format, type, data ) );
+    }
+    
+    newwidth = widthPowerOf2;
+    newheight = heightPowerOf2;
+    levels = Mipmap.computeLog( newwidth );
+    level = Mipmap.computeLog( newheight );
+    if( level > levels ) {
+      levels = level;
+    }
+    
+    levels += userLevel;
+    
+    Mipmap.retrieveStoreModes( gl, psm );
+    myswap_bytes = psm.getUnpackSwapBytes();
+    cmpts = Mipmap.elements_per_group( format, type );
+    if( psm.getUnpackRowLength() > 0 ) {
+      groups_per_line = psm.getUnpackRowLength();
+    } else {
+      groups_per_line = width;
+    }
+    
+    element_size = Mipmap.bytes_per_element( type );
+    group_size = element_size * cmpts;
+    if( element_size == 1 ) {
+      myswap_bytes = false;
+    }
+    
+    rowsize = groups_per_line * group_size;
+    padding = ( rowsize % psm.getUnpackAlignment() );
+    if( padding != 0 ) {
+      rowsize += psm.getUnpackAlignment() - padding;
+    }
+    
+    mark = psm.getUnpackSkipRows() * rowsize + psm.getUnpackSkipPixels() * group_size;
+    data.position( mark );
+    
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, 0 );
+    
+    level = userLevel;
+    
+    // already power of two square
+    if( width == newwidth && height == newheight ) {
+      // use usersImage for level userLevel
+      if( baseLevel <= level && level <= maxLevel ) {
+        data.rewind();
+        gl.glTexImage2D( target, level, internalFormat, width, height, 0, format, type, data );
+      }
+      if( levels == 0 ) { /* we're done. clean up and return */
+        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
+        return( 0 );
+      }
+      int nextWidth = newwidth / 2;
+      int nextHeight = newheight / 2;
+      
+      // clamp to 1
+      if( nextWidth < 1 ) {
+        nextWidth = 1;
+      }
+      if( nextHeight < 1 ) {
+        nextHeight = 1;
+      }
+      memReq = Mipmap.image_size( nextWidth, nextHeight, format, type );
+      
+      try {
+        switch( type ) {
+          case( GL2.GL_UNSIGNED_BYTE ):
+          case( GL2.GL_BYTE ):
+          case( GL2.GL_UNSIGNED_SHORT ):
+          case( GL2.GL_SHORT ):
+          case( GL2.GL_UNSIGNED_INT ):
+          case( GL2.GL_INT ):
+          case( GL2.GL_FLOAT ):
+          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+            dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
+            break;
+          default:
+            return( GLU.GLU_INVALID_ENUM );
+        }
+      } catch( OutOfMemoryError ome ) {
+        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
+        return( GLU.GLU_OUT_OF_MEMORY );
+      }
+      if( dstImage != null ) {
+        switch( type ) {
+          case( GL2.GL_UNSIGNED_BYTE ):
+            HalveImage.halveImage_ubyte( cmpts, width, height, data, dstImage, element_size, rowsize, group_size );
+            break;
+          case( GL2.GL_BYTE ):
+            HalveImage.halveImage_byte( cmpts, width, height, data, dstImage, element_size, rowsize, group_size );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT ):
+            HalveImage.halveImage_ushort( cmpts, width, height, data, dstImage.asShortBuffer(), element_size, rowsize, group_size, myswap_bytes );
+            break;
+          case( GL2.GL_SHORT ):
+            HalveImage.halveImage_short( cmpts, width, height, data, dstImage.asShortBuffer(), element_size, rowsize, group_size, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_INT ):
+            HalveImage.halveImage_uint( cmpts, width, height, data, dstImage.asIntBuffer(), element_size, rowsize, group_size, myswap_bytes );
+            break;
+          case( GL2.GL_INT ):
+            HalveImage.halveImage_int( cmpts, width, height, data, dstImage.asIntBuffer(), element_size, rowsize, group_size, myswap_bytes );
+            break;
+          case( GL2.GL_FLOAT ):
+            HalveImage.halveImage_float( cmpts, width, height, data, dstImage.asFloatBuffer(), element_size, rowsize, group_size, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+            assert( format == GL2.GL_RGB );
+            HalveImage.halveImagePackedPixel( 3, new Extract332(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+            assert( format == GL2.GL_RGB );
+            HalveImage.halveImagePackedPixel( 3, new Extract233rev(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+            HalveImage.halveImagePackedPixel( 3, new Extract565(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+            HalveImage.halveImagePackedPixel( 3, new Extract565rev(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+            HalveImage.halveImagePackedPixel( 4, new Extract4444(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+            HalveImage.halveImagePackedPixel( 4, new Extract4444rev(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+            HalveImage.halveImagePackedPixel( 4, new Extract5551(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+            HalveImage.halveImagePackedPixel( 4, new Extract1555rev(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+            HalveImage.halveImagePackedPixel( 4, new Extract8888(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+            HalveImage.halveImagePackedPixel( 4, new Extract8888rev(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+            HalveImage.halveImagePackedPixel( 4, new Extract1010102(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+            HalveImage.halveImagePackedPixel( 4, new Extract2101010rev(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+          default:
+            assert( false );
+            break;
+        }
+      }
+      newwidth = width / 2;
+      newheight = height / 2;
+      // clamp to 1
+      if( newwidth < 1 ) {
+        newwidth = 1;
+      }
+      if( newheight < 1 ) {
+        newheight = 1;
+      }
+      
+      myswap_bytes = false;
+      rowsize = newwidth * group_size;
+      memReq = Mipmap.image_size( newwidth, newheight, format, type );
+      // swap srcImage and dstImage
+      tempImage = srcImage;
+      srcImage = dstImage;
+      dstImage = tempImage;
+      try {
+        switch( type ) {
+          case( GL2.GL_UNSIGNED_BYTE ):
+          case( GL2.GL_BYTE ):
+          case( GL2.GL_UNSIGNED_SHORT ):
+          case( GL2.GL_SHORT ):
+          case( GL2.GL_UNSIGNED_INT ):
+          case( GL2.GL_INT ):
+          case( GL2.GL_FLOAT ):
+          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+            dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
+            break;
+          default:
+            return( GLU.GLU_INVALID_ENUM );
+        }
+      } catch( OutOfMemoryError ome ) {
+        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
+        return( GLU.GLU_OUT_OF_MEMORY );
+      }
+      // level userLevel+1 is in srcImage; level userLevel already saved
+      level = userLevel + 1;
+    } else { // user's image is not nice powerof2 size square
+      memReq = Mipmap.image_size( newwidth, newheight, format, type );
+      try { 
+        switch( type ) {
+          case( GL2.GL_UNSIGNED_BYTE ):
+          case( GL2.GL_BYTE ):
+          case( GL2.GL_UNSIGNED_SHORT ):
+          case( GL2.GL_SHORT ):
+          case( GL2.GL_UNSIGNED_INT ):
+          case( GL2.GL_INT ):
+          case( GL2.GL_FLOAT ):
+          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+            dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
+            break;
+          default:
+            return( GLU.GLU_INVALID_ENUM );
+        }
+      } catch( OutOfMemoryError ome ) {
+        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
+        return( GLU.GLU_OUT_OF_MEMORY );
+      }
+      data.position( mark );
+      switch( type ) {
+        case( GL2.GL_UNSIGNED_BYTE ):
+          ScaleInternal.scale_internal_ubyte( cmpts, width, height, data, 
+                newwidth, newheight, dstImage, element_size, rowsize, group_size );
+          break;
+        case( GL2.GL_BYTE ):
+          ScaleInternal.scale_internal_byte( cmpts, width, height, data, newwidth, 
+                  newheight, dstImage, element_size, rowsize, group_size );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT ):
+          ScaleInternal.scale_internal_ushort( cmpts, width, height, data, newwidth, 
+                  newheight, dstImage.asShortBuffer(), element_size, rowsize, group_size, myswap_bytes );
+          break;
+        case( GL2.GL_SHORT ):
+          ScaleInternal.scale_internal_ushort( cmpts, width, height, data, newwidth,
+                  newheight, dstImage.asShortBuffer(), element_size, rowsize, group_size, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_INT ):
+          ScaleInternal.scale_internal_uint( cmpts, width, height, data, newwidth,
+                  newheight, dstImage.asIntBuffer(), element_size, rowsize, group_size, myswap_bytes );
+          break;
+        case( GL2.GL_INT ):
+          ScaleInternal.scale_internal_int( cmpts, width, height, data, newwidth,
+                  newheight, dstImage.asIntBuffer(), element_size, rowsize, group_size, myswap_bytes );
+          break;
+        case( GL2.GL_FLOAT ):
+          ScaleInternal.scale_internal_float( cmpts, width, height, data, newwidth,
+                  newheight, dstImage.asFloatBuffer(), element_size, rowsize, group_size, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+          ScaleInternal.scaleInternalPackedPixel( 3, new Extract332(), width, height, data, newwidth,
+              newheight, dstImage, element_size, rowsize, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+          ScaleInternal.scaleInternalPackedPixel( 3, new Extract233rev(), width, height, data, newwidth,
+              newheight, dstImage, element_size, rowsize, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+          ScaleInternal.scaleInternalPackedPixel( 3, new Extract565(), width, height, data, newwidth,
+              newheight, dstImage, element_size, rowsize, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+          ScaleInternal.scaleInternalPackedPixel( 3, new Extract565rev(), width, height, data, newwidth,
+              newheight, dstImage, element_size, rowsize, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+          ScaleInternal.scaleInternalPackedPixel( 4, new Extract4444(), width, height, data, newwidth,
+              newheight, dstImage, element_size, rowsize, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+          ScaleInternal.scaleInternalPackedPixel( 4, new Extract4444rev(), width, height, data, newwidth,
+              newheight, dstImage, element_size, rowsize, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+          ScaleInternal.scaleInternalPackedPixel( 4, new Extract5551(), width, height, data, newwidth,
+              newheight, dstImage, element_size, rowsize, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+          ScaleInternal.scaleInternalPackedPixel( 4, new Extract1555rev(), width, height, data, newwidth,
+              newheight, dstImage, element_size, rowsize, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+          ScaleInternal.scaleInternalPackedPixel( 4, new Extract8888(), width, height, data, newwidth,
+              newheight, dstImage, element_size, rowsize, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+          ScaleInternal.scaleInternalPackedPixel( 4, new Extract8888rev(), width, height, data, newwidth,
+              newheight, dstImage, element_size, rowsize, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+          ScaleInternal.scaleInternalPackedPixel( 4, new Extract1010102(), width, height, data, newwidth,
+              newheight, dstImage, element_size, rowsize, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+          ScaleInternal.scaleInternalPackedPixel( 4, new Extract2101010rev(), width, height, data, newwidth,
+              newheight, dstImage, element_size, rowsize, myswap_bytes );
+          break;
+        default:
+          assert( false );
+          break;
+      }
+      myswap_bytes = false;
+      rowsize = newwidth * group_size;
+      // swap dstImage and srcImage
+      tempImage = srcImage;
+      srcImage = dstImage;
+      dstImage = tempImage;
+      
+      if( levels != 0 ) { // use as little memory as possible
+        int nextWidth = newwidth / 2;
+        int nextHeight = newheight / 2;
+        if( nextWidth < 1 ) {
+          nextWidth = 1;
+        }
+        if( nextHeight < 1 ) {
+          nextHeight = 1;
+        }
+        
+        memReq = Mipmap.image_size( nextWidth, nextHeight, format, type );
+        try {
+          switch( type ) {
+            case( GL2.GL_UNSIGNED_BYTE ):
+            case( GL2.GL_BYTE ):
+            case( GL2.GL_UNSIGNED_SHORT ):
+            case( GL2.GL_SHORT ):
+            case( GL2.GL_UNSIGNED_INT ):
+            case( GL2.GL_INT ):
+            case( GL2.GL_FLOAT ):
+            case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+            case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+            case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+            case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+            case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+            case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+            case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+            case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+            case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+            case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+              dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
+              break;
+            default:
+              return( GLU.GLU_INVALID_ENUM );
+          }
+        } catch( OutOfMemoryError ome ) {
+          gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+          gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+          gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
+          return( GLU.GLU_OUT_OF_MEMORY );
+        }
+      }
+      // level userLevel is in srcImage; nothing saved yet
+      level = userLevel;
+    }
+    
+    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, GL2.GL_FALSE );
+    if( baseLevel <= level && level <= maxLevel ) {
+      srcImage.rewind();
+      gl.glTexImage2D( target, level, internalFormat, newwidth, newheight, 0, format, type, srcImage );
+      if (DEBUG) {
+        System.err.println("GL Error(" + level + "): " + gl.glGetError() );
+        if (VERBOSE) {
+          srcImage.limit( Mipmap.image_size( newwidth, newheight, format, type ) );
+          writeTargaFile("glu2DMipmapJ" + level + ".tga",
+                         srcImage, newwidth, newheight);
+          srcImage.clear();
+        }
+      }
+    }
+    
+    level++;  // update current level for the loop
+    for( ; level <= levels; level++ ) {
+      srcImage.rewind();
+      dstImage.rewind();
+      switch( type ) {
+        case( GL2.GL_UNSIGNED_BYTE ):
+          HalveImage.halveImage_ubyte( cmpts, newwidth, newheight, srcImage, dstImage, element_size, rowsize, group_size );
+          break;
+        case( GL2.GL_BYTE ):
+          HalveImage.halveImage_byte( cmpts, newwidth, newheight, srcImage, dstImage, element_size, rowsize, group_size );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT ):
+          HalveImage.halveImage_ushort( cmpts, newwidth, newheight, srcImage, dstImage.asShortBuffer(), element_size, rowsize, group_size, myswap_bytes );
+          break;
+        case( GL2.GL_SHORT ):
+          HalveImage.halveImage_short( cmpts, newwidth, newheight, srcImage, dstImage.asShortBuffer(), element_size, rowsize, group_size, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_INT ):
+          HalveImage.halveImage_uint( cmpts, newwidth, newheight, srcImage, dstImage.asIntBuffer(), element_size, rowsize, group_size, myswap_bytes );
+          break;
+        case( GL2.GL_INT ):
+          HalveImage.halveImage_int( cmpts, newwidth, newheight, srcImage, dstImage.asIntBuffer(), element_size, rowsize, group_size, myswap_bytes );
+          break;
+        case( GL2.GL_FLOAT ):
+          HalveImage.halveImage_float( cmpts, newwidth, newheight, srcImage, dstImage.asFloatBuffer(), element_size, rowsize, group_size, myswap_bytes );
+          break;
+        case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+          assert( format == GL2.GL_RGB );
+          HalveImage.halveImagePackedPixel( 3, new Extract332(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+        case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+          assert( format == GL2.GL_RGB );
+          HalveImage.halveImagePackedPixel( 3, new Extract233rev(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+        case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+          HalveImage.halveImagePackedPixel( 3, new Extract565(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+        case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+          HalveImage.halveImagePackedPixel( 3, new Extract565rev(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+        case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+          HalveImage.halveImagePackedPixel( 4, new Extract4444(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+        case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+          HalveImage.halveImagePackedPixel( 4, new Extract4444rev(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+        case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+          HalveImage.halveImagePackedPixel( 4, new Extract5551(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+        case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+          HalveImage.halveImagePackedPixel( 4, new Extract1555rev(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+        case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+          HalveImage.halveImagePackedPixel( 4, new Extract8888(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+        case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+          HalveImage.halveImagePackedPixel( 4, new Extract8888rev(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+        case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+          HalveImage.halveImagePackedPixel( 4, new Extract1010102(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+        case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+          HalveImage.halveImagePackedPixel( 4, new Extract2101010rev(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
+            break;
+        default:
+          assert( false );
+          break;
+      }
+      
+      // swap dstImage and srcImage
+      tempImage = srcImage;
+      srcImage = dstImage;
+      dstImage = tempImage;
+      
+      if( newwidth > 1 ) {
+        newwidth /= 2;
+        rowsize /= 2;
+      }
+      if( newheight > 1 ) {
+        newheight /= 2;
+      }
+      // compute amount to pad per row if any
+      int rowPad = rowsize % psm.getUnpackAlignment();
+      
+      // should row be padded
+      if( rowPad == 0 ) {
+        // call teximage with srcImage untouched since its not padded
+        if( baseLevel <= level && level <= maxLevel ) {
+          srcImage.rewind();
+          gl.glTexImage2D( target, level, internalFormat, newwidth, newheight, 0, format, type, srcImage );
+          if (DEBUG) {
+            System.err.println("GL Error(" + level + "): " + gl.glGetError() );
+            if (VERBOSE) {
+              srcImage.limit( Mipmap.image_size( newwidth, newheight, format, type ) );
+              writeTargaFile("glu2DMipmapJ" + level + ".tga",
+                             srcImage, newwidth, newheight);
+              srcImage.clear();
+            }
+          }
+        }
+      } else {
+        // compute length of new row in bytes, including padding
+        int newRowLength = rowsize + psm.getUnpackAlignment() - rowPad;
+        int ii, jj;
+        int dstTrav;
+        int srcTrav;
+        
+        // allocate new image for mipmap of size newRowLength x newheight
+        ByteBuffer newMipmapImage = null;
+        try {
+          newMipmapImage = ByteBuffer.allocateDirect( newRowLength * newheight );
+        } catch( OutOfMemoryError ome ) {
+          gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+          gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+          gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
+          return( GLU.GLU_OUT_OF_MEMORY );
+        }
+        srcImage.rewind();
+        // copy image from srcImage into newMipmapImage by rows
+        for( ii = 0; ii < newheight; ii++ ) {
+          newMipmapImage.position(newRowLength * ii);
+          for( jj = 0; jj < rowsize; jj++ ) {
+            newMipmapImage.put( srcImage.get() );
+          }
+        }
+        
+        // and use this new image for mipmapping instead
+        if( baseLevel <= level && level <= maxLevel ) {
+          newMipmapImage.rewind();
+          gl.glTexImage2D( target, level, internalFormat, newwidth, newheight, 0, format, type, newMipmapImage );
+          if (DEBUG) {
+            System.err.println("GL Error(" + level + " padded): " + gl.glGetError() );
+            if (VERBOSE) {
+              writeTargaFile("glu2DMipmapJ" + level + ".tga",
+                             newMipmapImage, newwidth, newheight);
+            }
+          }
+        }
+      }
+    }
+    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
+    
+    return( 0 );
+  }
+  
+  public static int fastBuild2DMipmaps( GL gl, PixelStorageModes psm, int target,
+          int components, int width, int height, int format, int type, ByteBuffer data ) {
+    int[] newwidth = new int[1];
+    int[] newheight = new int[1];
+    int level, levels;
+    ByteBuffer newImage;
+    int newImage_width;
+    int newImage_height;
+    ByteBuffer otherImage;
+    ByteBuffer imageTemp;
+    int memReq;
+    int maxsize;
+    int cmpts;
+    
+    Mipmap.closestFit( gl, target, width, height, components, format, type, newwidth, 
+            newheight );
+    
+    levels = Mipmap.computeLog( newwidth[0] );
+    level = Mipmap.computeLog( newheight[0] );
+    if( level > levels ) {
+      levels = level;
+    }
+    
+    cmpts = Mipmap.elements_per_group( format, type );
+    
+    otherImage = null;
+    //  No need to copy the user data if its packed correctly.
+    //  Make sure that later routines don't change that data.
+    
+    if( psm.getUnpackSkipRows() == 0 && psm.getUnpackSkipPixels() == 0 ) {
+      newImage = data;
+      newImage_width = width;
+      newImage_height = height;
+    } else {
+      int rowsize;
+      int group_per_line;
+      int elements_per_line;
+      int start;
+      int iter;
+      int iter2;
+      int i, j;
+      
+      try {
+        newImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( Mipmap.image_size( 
+              width, height, format, GL2.GL_UNSIGNED_BYTE ) ));
+      } catch( OutOfMemoryError err ) {
+        return( GLU.GLU_OUT_OF_MEMORY );
+      }
+      newImage_width = width;
+      newImage_height = height;
+
+      // Abbreviated version of fill_image for the restricted case.
+      if( psm.getUnpackRowLength() > 0 ) {
+        group_per_line = psm.getUnpackRowLength();
+      } else {
+        group_per_line = width;
+      }
+      rowsize = group_per_line * cmpts;
+      elements_per_line = width * cmpts;
+      start = psm.getUnpackSkipRows() * rowsize + psm.getUnpackSkipPixels() * cmpts;
+      
+      for( i = 0; i < height; i++ ) {
+        iter = start;
+        data.position( iter );
+        for( j = 0; j < elements_per_line; j++ ) {
+          newImage.put( data.get() );
+        }
+        start += rowsize;
+      }
+    }
+    
+    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, 1 );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, GL2.GL_FALSE );
+    
+    for( level = 0; level <= levels; level++ ) {
+      if( newImage_width == newwidth[0] && newImage_height == newheight[0] ) {
+        // use newImage for this level
+        newImage.rewind();
+        gl.glTexImage2D( target, level, components, newImage_width, newImage_height,
+                0, format, GL2.GL_UNSIGNED_BYTE, newImage );
+      } else {
+        if( otherImage == null ) {
+          memReq = Mipmap.image_size( newwidth[0], newheight[0], format, GL2.GL_UNSIGNED_BYTE );
+          try {
+            otherImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
+          } catch( OutOfMemoryError err ) {
+            gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+            gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+            gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+            gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+            gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, ( psm.getUnpackSwapBytes() ? 1 : 0 ) ) ;
+            return( GLU.GLU_OUT_OF_MEMORY );
+          }
+        }
+        // swap newImage and otherImage
+        imageTemp = otherImage;
+        otherImage = newImage;
+        newImage = imageTemp;
+        
+        newImage_width = newwidth[0];
+        newImage_height = newheight[0];
+        newImage.rewind();
+        gl.glTexImage2D( target, level, components, newImage_width, newImage_height,
+                0, format, GL2.GL_UNSIGNED_BYTE, newImage );
+      }
+      if( newwidth[0] > 1 ) {
+        newwidth[0] /= 2;
+      }
+      if( newheight[0] > 1 ) {
+        newheight[0] /= 2;
+      }
+    }
+    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, ( psm.getUnpackSwapBytes() ? 1 : 0 ) ) ;
+    
+    return( 0 );
+  }
+  
+  public static int gluBuild3DMipmapLevelsCore( GL gl, int target, int internalFormat,
+          int width, int height, int depth, int widthPowerOf2, int heightPowerOf2,
+          int depthPowerOf2, int format, int type, int userLevel, int baseLevel,
+          int maxLevel, ByteBuffer data ) {
+    int newWidth;
+    int newHeight;
+    int newDepth;
+    int level, levels;
+    ByteBuffer usersImage;
+    ByteBuffer srcImage, dstImage, tempImage;
+    int newImageWidth;
+    int newImageHeight;
+    int newImageDepth;
+    int memReq;
+    int maxSize;
+    int cmpts;
+    int mark=-1;
+    
+    boolean myswapBytes;
+    int groupsPerLine, elementSize, groupSize;
+    int rowsPerImage, imageSize;
+    int rowSize, padding;
+    PixelStorageModes psm = new PixelStorageModes();
+    
+    assert( Mipmap.checkMipmapArgs( internalFormat, format, type ) == 0 );
+    assert( width >= 1 && height >= 1 && depth >= 1 );
+    assert( type != GL2.GL_BITMAP );
+    
+    srcImage = dstImage = null;
+    
+    newWidth = widthPowerOf2;
+    newHeight = heightPowerOf2;
+    newDepth = depthPowerOf2;
+    levels = Mipmap.computeLog( newWidth );
+    level = Mipmap.computeLog( newHeight );
+    if( level > levels ) {
+      levels = level;
+    }
+    level = Mipmap.computeLog( newDepth );
+    if( level > levels ) {
+      levels = level;
+    }
+    
+    levels += userLevel;
+    
+    Mipmap.retrieveStoreModes3D( gl, psm );
+    myswapBytes = psm.getUnpackSwapBytes();
+    cmpts = Mipmap.elements_per_group( format, type );
+    if( psm.getUnpackRowLength() > 0 ) {
+      groupsPerLine = psm.getUnpackRowLength();
+    } else {
+      groupsPerLine = width;
+    }
+    
+    elementSize = Mipmap.bytes_per_element( type );
+    groupSize = elementSize * cmpts;
+    if( elementSize == 1 ) {
+      myswapBytes = false;
+    }
+    
+    // 3dstuff
+    if( psm.getUnpackImageHeight() > 0 ) {
+      rowsPerImage = psm.getUnpackImageHeight();
+    } else {
+      rowsPerImage = height;
+    }
+    
+    rowSize = groupsPerLine * groupSize;
+    padding = ( rowSize % psm.getUnpackAlignment() );
+    if( padding != 0 ) {
+      rowSize += psm.getUnpackAlignment() - padding;
+    }
+    
+    imageSize = rowsPerImage * rowSize;
+    
+    usersImage = ByteBuffer.wrap(data.array());
+    mark = psm.getUnpackSkipRows() * rowSize +
+           psm.getUnpackSkipPixels() * groupSize +
+           psm.getUnpackSkipImages() * imageSize;
+    usersImage.position( mark );
+    
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, 0 );
+    
+    level = userLevel;
+    
+    if( width == newWidth && height == newHeight && depth == newDepth ) {
+      // use usersImage for level userlevel
+      if( baseLevel <= level && level <= maxLevel ) {
+        gl.getGL2().glTexImage3D( target, level, internalFormat, width, height, depth,
+                0, format, type, usersImage );
+      }
+      if( levels == 0 ) { /* we're done. clean up and return */
+        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, psm.getUnpackSwapBytes() ? 1 : 0 );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, psm.getUnpackSkipImages() );
+        gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, psm.getUnpackImageHeight() );
+        return( 0 );
+      }
+      int nextWidth = newWidth / 2;
+      int nextHeight = newHeight / 2;
+      int nextDepth = newDepth / 2;
+      
+      // clamp to one
+      if( nextWidth < 1 ) {
+        nextWidth = 1;
+      }
+      if( nextHeight < 1 ) {
+        nextHeight = 1;
+      }
+      if( nextDepth < 1 ) {
+        nextDepth = 1;
+      }
+      memReq = Mipmap.imageSize3D( nextWidth, nextHeight, nextDepth, format, type );
+      try {
+        switch( type ) {
+          case( GL2.GL_UNSIGNED_BYTE ):
+          case( GL2.GL_BYTE ):
+          case( GL2.GL_UNSIGNED_SHORT ):
+          case( GL2.GL_SHORT ):
+          case( GL2.GL_UNSIGNED_INT ):
+          case( GL2.GL_INT ):
+          case( GL2.GL_FLOAT ):
+          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+            dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
+            break;
+          default:
+            return( GLU.GLU_INVALID_ENUM );
+        }
+      } catch( OutOfMemoryError err ) {
+        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, psm.getUnpackSwapBytes() ? 1 : 0 );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, psm.getUnpackSkipImages() );
+        gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, psm.getUnpackImageHeight() );
+        return( GLU.GLU_OUT_OF_MEMORY );
+      }
+      
+      if( dstImage != null ) {
+        switch( type ) {
+          case( GL2.GL_UNSIGNED_BYTE ):
+            if( depth > 1 ) {
+              HalveImage.halveImage3D( cmpts, new ExtractUByte(), width, height, depth,
+                      usersImage, dstImage, elementSize, 
+                      groupSize, rowSize, imageSize, myswapBytes );
+            } else {
+              HalveImage.halveImage_ubyte( cmpts, width, height, usersImage,
+                      dstImage, elementSize, rowSize, groupSize );
+            }
+            break;
+          case( GL2.GL_BYTE ):
+            if( depth > 1 ) {
+              HalveImage.halveImage3D( cmpts, new ExtractSByte(), width, height, depth,
+                      usersImage, dstImage, elementSize, groupSize, rowSize,
+                      imageSize, myswapBytes );
+            } else {
+              HalveImage.halveImage_byte( cmpts, width, height, usersImage,
+                      dstImage, elementSize, rowSize, groupSize );
+            }
+            break;
+          case( GL2.GL_UNSIGNED_SHORT ):
+            if( depth > 1 ) {
+              HalveImage.halveImage3D( cmpts, new ExtractUShort(), width, height, depth,
+                      usersImage, dstImage, elementSize, groupSize, rowSize,
+                      imageSize, myswapBytes );
+            } else {
+              HalveImage.halveImage_ushort( cmpts, width, height, usersImage, 
+                      dstImage.asShortBuffer(), elementSize, rowSize, groupSize, myswapBytes );
+            }
+            break;
+          case( GL2.GL_SHORT ):
+            if( depth > 1 ) {
+              HalveImage.halveImage3D( cmpts, new ExtractSShort(), width, height, depth,
+                      usersImage, dstImage, elementSize, groupSize, rowSize,
+                      imageSize, myswapBytes );
+            } else {
+              HalveImage.halveImage_short( cmpts, width, height, usersImage,
+                      dstImage.asShortBuffer(), elementSize, rowSize, groupSize, myswapBytes );
+            }
+            break;
+          case( GL2.GL_UNSIGNED_INT ):
+            if( depth > 1 ) {
+              HalveImage.halveImage3D( cmpts, new ExtractUInt(), width, height, depth,
+                      usersImage, dstImage, elementSize, groupSize, rowSize,
+                      imageSize, myswapBytes );
+            } else {
+              HalveImage.halveImage_uint( cmpts, width, height, usersImage,
+                      dstImage.asIntBuffer(), elementSize, rowSize, groupSize, myswapBytes );
+            }
+            break;
+          case( GL2.GL_INT ):
+            if( depth > 1 ) {
+              HalveImage.halveImage3D( cmpts, new ExtractSInt(), width, height, depth,
+                      usersImage, dstImage, elementSize, groupSize, rowSize,
+                      imageSize, myswapBytes );
+            } else {
+              HalveImage.halveImage_int( cmpts, width, height, usersImage,
+                      dstImage.asIntBuffer(), elementSize, rowSize, groupSize, myswapBytes );
+            }
+            break;
+          case( GL2.GL_FLOAT ):
+            if( depth > 1 ) {
+              HalveImage.halveImage3D( cmpts, new ExtractFloat(), width, height, depth,
+                      usersImage, dstImage, elementSize, groupSize, rowSize,
+                      imageSize, myswapBytes );
+            } else {
+              HalveImage.halveImage_float( cmpts, width, height, usersImage,
+                      dstImage.asFloatBuffer(), elementSize, rowSize, groupSize, myswapBytes );
+            }
+            break;
+          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+            assert( format == GL2.GL_RGB );
+            HalveImage.halveImagePackedPixel3D( 3, new Extract332(), width, height, depth, usersImage,
+                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
+            break;
+          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+            assert( format == GL2.GL_RGB );
+            HalveImage.halveImagePackedPixel3D( 3, new Extract233rev(), width, height, depth, usersImage,
+                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+            HalveImage.halveImagePackedPixel3D( 3, new Extract565(), width, height, depth, usersImage,
+                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+            HalveImage.halveImagePackedPixel3D( 3, new Extract565rev(), width, height, depth, usersImage,
+                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+            HalveImage.halveImagePackedPixel3D( 4, new Extract4444(), width, height, depth, usersImage,
+                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+            HalveImage.halveImagePackedPixel3D( 4, new Extract4444rev(), width, height, depth, usersImage,
+                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+            HalveImage.halveImagePackedPixel3D( 4, new Extract5551(), width, height, depth, usersImage,
+                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
+            break;
+          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+            HalveImage.halveImagePackedPixel3D( 4, new Extract1555rev(), width, height, depth, usersImage,
+                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
+            break;
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+            HalveImage.halveImagePackedPixel3D( 4, new Extract8888(), width, height, depth, usersImage,
+                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
+            break;
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+            HalveImage.halveImagePackedPixel3D( 4, new Extract8888rev(), width, height, depth, usersImage,
+                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
+            break;
+          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+            HalveImage.halveImagePackedPixel3D( 4, new Extract1010102(), width, height, depth, usersImage,
+                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
+            break;
+          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+            HalveImage.halveImagePackedPixel3D( 4, new Extract2101010rev(), width, height, depth, usersImage,
+                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
+            break;
+          default:
+            assert( false );
+            break;
+        }
+      }
+      newWidth = width / 2;
+      newHeight = height / 2;
+      newDepth = depth / 2;
+      // clamp to 1
+      if( newWidth < 1 ) {
+        newWidth = 1;
+      }
+      if( newHeight < 1 ) {
+        newHeight = 1;
+      }
+      if( newDepth < 1 ) {
+        newDepth = 1;
+      }
+      
+      myswapBytes = false;
+      rowSize = newWidth * groupSize;
+      imageSize = rowSize * newHeight;
+      memReq = Mipmap.imageSize3D( newWidth, newHeight, newDepth, format, type );
+      // swap srcImage and dstImage
+      tempImage = srcImage;
+      srcImage = dstImage;
+      dstImage = tempImage;
+      try {
+        switch( type ) {
+          case( GL2.GL_UNSIGNED_BYTE ):
+          case( GL2.GL_BYTE ):
+          case( GL2.GL_UNSIGNED_SHORT ):
+          case( GL2.GL_SHORT ):
+          case( GL2.GL_UNSIGNED_INT ):
+          case( GL2.GL_INT ):
+          case( GL2.GL_FLOAT ):
+          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+            dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
+            break;
+          default:
+            return( GLU.GLU_INVALID_ENUM );
+        }
+      } catch( OutOfMemoryError err ) {
+        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, psm.getUnpackSwapBytes() ? 1 : 0 );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, psm.getUnpackSkipImages() );
+        gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, psm.getUnpackImageHeight() );
+        return( GLU.GLU_OUT_OF_MEMORY );
+      }
+      
+      // level userLevel + 1 is in srcImage; level userLevel already saved
+      level = userLevel + 1;
+    } else {
+      memReq = Mipmap.imageSize3D( newWidth, newHeight, newDepth, format, type );
+      try {
+        switch( type ) {
+          case( GL2.GL_UNSIGNED_BYTE ):
+          case( GL2.GL_BYTE ):
+          case( GL2.GL_UNSIGNED_SHORT ):
+          case( GL2.GL_SHORT ):
+          case( GL2.GL_UNSIGNED_INT ):
+          case( GL2.GL_INT ):
+          case( GL2.GL_FLOAT ):
+          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+            dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
+            break;
+          default:
+            return( GLU.GLU_INVALID_ENUM );
+        }
+      } catch( OutOfMemoryError err ) {
+        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, psm.getUnpackSwapBytes() ? 1 : 0 );
+        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, psm.getUnpackSkipImages() );
+        gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, psm.getUnpackImageHeight() );
+        return( GLU.GLU_OUT_OF_MEMORY );
+      }
+      
+      ScaleInternal.gluScaleImage3D( gl, format, width, height, depth, type,
+              usersImage, newWidth, newHeight, newDepth, type, dstImage );
+      
+      myswapBytes = false;
+      rowSize = newWidth * groupSize;
+      imageSize = rowSize * newHeight;
+      // swap dstImage and srcImage
+      tempImage = srcImage;
+      srcImage = dstImage;
+      dstImage = tempImage;
+      
+      if( levels != 0 ) {
+        int nextWidth = newWidth / 2;
+        int nextHeight = newHeight / 2;
+        int nextDepth = newDepth / 2;
+        if( nextWidth < 1 ) {
+          nextWidth = 1;
+        }
+        if( nextHeight < 1 ) {
+          nextHeight = 1;
+        }
+        if( nextDepth < 1 ) {
+          nextDepth = 1;
+        }
+        memReq = Mipmap.imageSize3D( nextWidth, nextHeight, nextDepth, format, type );
+        try {
+          switch( type ) {
+            case( GL2.GL_UNSIGNED_BYTE ):
+            case( GL2.GL_BYTE ):
+            case( GL2.GL_UNSIGNED_SHORT ):
+            case( GL2.GL_SHORT ):
+            case( GL2.GL_UNSIGNED_INT ):
+            case( GL2.GL_INT ):
+            case( GL2.GL_FLOAT ):
+            case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+            case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+            case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+            case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+            case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+            case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+            case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+            case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+            case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+            case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+              dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
+              break;
+            default:
+              return( GLU.GLU_INVALID_ENUM );
+          }
+        } catch( OutOfMemoryError err ) {
+          gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+          gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+          gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, psm.getUnpackSwapBytes() ? 1 : 0 );
+          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, psm.getUnpackSkipImages() );
+          gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, psm.getUnpackImageHeight() );
+          return( GLU.GLU_OUT_OF_MEMORY );
+        }
+      }
+      // level userLevel is in srcImage; nothing saved yet
+      level = userLevel;
+    }
+    
+    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, GL2.GL_FALSE );
+    if( baseLevel <= level && level <= maxLevel ) {
+      usersImage.position( mark );
+      gl.getGL2().glTexImage3D( target, level, internalFormat, width, height, depth,
+              0, format, type, usersImage );
+    }
+    level++;
+    for( ; level <= levels; level++ ) {
+      switch( type ) {
+        case( GL2.GL_UNSIGNED_BYTE ):
+          if( depth > 1 ) {
+            HalveImage.halveImage3D( cmpts, new ExtractUByte(), width, height, depth,
+                    usersImage, dstImage, elementSize, groupSize, rowSize,
+                    imageSize, myswapBytes );
+          } else {
+            HalveImage.halveImage_ubyte( cmpts, width, height, usersImage,
+                    dstImage, elementSize, rowSize, groupSize );
+          }
+          break;
+        case( GL2.GL_BYTE ):
+          if( depth > 1 ) {
+            HalveImage.halveImage3D( cmpts, new ExtractSByte(), width, height, depth,
+                    usersImage, dstImage, elementSize, groupSize, rowSize,
+                    imageSize, myswapBytes );
+          } else {
+            HalveImage.halveImage_byte( cmpts, width, height, usersImage,
+                    dstImage, elementSize, rowSize, groupSize );
+          }
+          break;
+        case( GL2.GL_UNSIGNED_SHORT ):
+          if( depth > 1 ) {
+            HalveImage.halveImage3D( cmpts, new ExtractUShort(), width, height, depth,
+                    usersImage, dstImage, elementSize, groupSize, rowSize,
+                    imageSize, myswapBytes );
+          } else {
+            HalveImage.halveImage_ushort( cmpts, width, height, usersImage,
+                    dstImage.asShortBuffer(), elementSize, rowSize, groupSize, myswapBytes );
+          }
+          break;
+        case( GL2.GL_SHORT ):
+          if( depth > 1 ) {
+            HalveImage.halveImage3D( cmpts, new ExtractSShort(), width, height, depth,
+                    usersImage, dstImage, elementSize, groupSize, rowSize,
+                    imageSize, myswapBytes );
+          } else {
+            HalveImage.halveImage_short( cmpts, width, height, usersImage,
+                    dstImage.asShortBuffer(), elementSize, rowSize, groupSize, myswapBytes );
+          }
+          break;
+        case( GL2.GL_UNSIGNED_INT ):
+          if( depth > 1 ) {
+            HalveImage.halveImage3D( cmpts, new ExtractUInt(), width, height, depth,
+                    usersImage, dstImage, elementSize, groupSize, rowSize,
+                    imageSize, myswapBytes );
+          } else {
+            HalveImage.halveImage_uint( cmpts, width, height, usersImage,
+                    dstImage.asIntBuffer(), elementSize, rowSize, groupSize, myswapBytes );
+          }
+          break;
+        case( GL2.GL_INT ):
+          if( depth > 1 ) {
+            HalveImage.halveImage3D( cmpts, new ExtractSInt(), width, height, depth,
+                    usersImage, dstImage, elementSize, groupSize, rowSize,
+                    imageSize, myswapBytes );
+          } else {
+            HalveImage.halveImage_int( cmpts, width, height, usersImage,
+                    dstImage.asIntBuffer(), elementSize, rowSize, groupSize, myswapBytes );
+          }
+          break;
+        case( GL2.GL_FLOAT ):
+          if( depth > 1 ) {
+            HalveImage.halveImage3D( cmpts, new ExtractFloat(), width, height, depth,
+                    usersImage, dstImage, elementSize, groupSize, rowSize,
+                    imageSize, myswapBytes );
+          } else {
+            HalveImage.halveImage_float( cmpts, width, height, usersImage,
+                    dstImage.asFloatBuffer(), elementSize, rowSize, groupSize, myswapBytes );
+          }
+          break;
+        case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+          HalveImage.halveImagePackedPixel3D( 3, new Extract332(), width, height, depth, usersImage,
+                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
+          break;
+        case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+          HalveImage.halveImagePackedPixel3D( 3, new Extract233rev(), width, height, depth, usersImage,
+                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+          HalveImage.halveImagePackedPixel3D( 3, new Extract565(), width, height, depth, usersImage,
+                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+          HalveImage.halveImagePackedPixel3D( 3, new Extract565rev(), width, height, depth, usersImage,
+                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+          HalveImage.halveImagePackedPixel3D( 4, new Extract4444(), width, height, depth, usersImage,
+                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+          HalveImage.halveImagePackedPixel3D( 4, new Extract4444rev(), width, height, depth, usersImage,
+                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+          HalveImage.halveImagePackedPixel3D( 4, new Extract5551(), width, height, depth, usersImage,
+                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
+          break;
+        case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+          HalveImage.halveImagePackedPixel3D( 4, new Extract1555rev(), width, height, depth, usersImage,
+                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
+          break;
+        case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+          HalveImage.halveImagePackedPixel3D( 4, new Extract8888(), width, height, depth, usersImage,
+                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
+          break;
+        case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+          HalveImage.halveImagePackedPixel3D( 4, new Extract8888rev(), width, height, depth, usersImage,
+                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
+          break;
+        case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+          HalveImage.halveImagePackedPixel3D( 4, new Extract1010102(), width, height, depth, usersImage,
+                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
+          break;
+        case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+          HalveImage.halveImagePackedPixel3D( 4, new Extract2101010rev(), width, height, depth, usersImage,
+                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
+          break;
+        default:
+          assert( false );
+          break;
+      }
+      
+      tempImage = srcImage;
+      srcImage = dstImage;
+      dstImage = tempImage;
+      
+      if( newWidth > 1 ) {
+        newWidth /= 2;
+        rowSize /= 2;
+      }
+      if( newHeight > 1 ) {
+        newHeight /= 2;
+        imageSize = rowSize * newHeight;
+      }
+      if( newDepth > 1 ) {
+        newDepth /= 2;
+      }
+      if( baseLevel <= level && level <= maxLevel ) {
+        usersImage.position( mark );
+        gl.getGL2().glTexImage3D( target, level, internalFormat, width, height, depth,
+                0, format, type, usersImage );
+      }
+    }
+    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
+    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
+    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, psm.getUnpackSwapBytes() ? 1 : 0 );
+    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, psm.getUnpackSkipImages() );
+    gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, psm.getUnpackImageHeight() );
+    return( 0 );
+  }
+
+  private static final int TARGA_HEADER_SIZE = 18;
+  private static void writeTargaFile(String filename, ByteBuffer data,
+                                     int width, int height) {
+    try {
+      FileOutputStream fos = new FileOutputStream(new File(filename));
+      ByteBuffer header = ByteBuffer.allocateDirect(TARGA_HEADER_SIZE);
+      header.put(0, (byte) 0).put(1, (byte) 0);
+      header.put(2, (byte) 2); // uncompressed type
+      header.put(12, (byte) (width & 0xFF)); // width
+      header.put(13, (byte) (width >> 8)); // width
+      header.put(14, (byte) (height & 0xFF)); // height
+      header.put(15, (byte) (height >> 8)); // height
+      header.put(16, (byte) 24); // pixel size
+      fos.write(header.array());
+      fos.write(data.array());
+      data.clear();
+      fos.close();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract.java
new file mode 100644
index 000000000..be86585e7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract.java
@@ -0,0 +1,56 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.ByteBuffer;
+
+/**
+ *
+ * @author Administrator
+ */
+public interface Extract {
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents );
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel );
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1010102.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1010102.java
new file mode 100644
index 000000000..7e172b1ce
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1010102.java
@@ -0,0 +1,97 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.ByteBuffer;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Extract1010102 implements Extract {
+  
+  /** Creates a new instance of Extract1010102 */
+  public Extract1010102() {
+  }
+  
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
+    long uint = 0;
+    
+    if( isSwap ) {
+      uint = 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( packedPixel.getInt() );
+    } else {
+      uint = 0x00000000FFFFFFFF & packedPixel.getInt();
+    }
+    
+    // 11111111,11000000,00000000,00000000 == 0xFFC00000
+    // 00000000,00111111,11110000,00000000 == 0x003F0000
+    // 00000000,00000000,00001111,11111100 == 0x00000FFC
+    // 00000000,00000000,00000000,00000011 == 0x00000003
+    
+    extractComponents[0] = (float)( ( uint & 0xFFC00000 ) >> 22 ) / 1023.0f;
+    extractComponents[1] = (float)( ( uint & 0x003FF000 ) >> 12 ) / 1023.0f;
+    extractComponents[2] = (float)( ( uint & 0x00000FFC ) >>  2 ) / 1023.0f;
+    extractComponents[3] = (float)( ( uint & 0x00000003 )       ) / 3.0f;
+  }
+  
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
+    // 11110000,00000000 == 0xF000
+    // 00001111,00000000 == 0x0F00
+    // 00000000,11110000 == 0x00F0
+    // 00000000,00001111 == 0x000F
+    
+    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
+    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
+    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
+    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
+    
+    // due to limited precision, need to round before shoving
+    long uint = (((int)((shoveComponents[0] * 1023) + 0.5f) << 22) & 0xFFC00000 );
+    uint |= (((int)((shoveComponents[1] * 1023) + 0.5f) <<   12) & 0x003FF000 );
+    uint |= (((int)((shoveComponents[2] * 1023) + 0.5f) <<    2) & 0x00000FFC );
+    uint |= (((int)((shoveComponents[3] *    3) + 0.5f)        ) & 0x00000003 );
+    packedPixel.asIntBuffer().put( index, (int)uint );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1555rev.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1555rev.java
new file mode 100644
index 000000000..37895096e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1555rev.java
@@ -0,0 +1,97 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.ByteBuffer;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Extract1555rev implements Extract {
+  
+  /** Creates a new instance of Extract1555rev */
+  public Extract1555rev() {
+  }
+  
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
+    int ushort = 0;
+    
+    if( isSwap ) {
+      ushort = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( packedPixel.getShort() );
+    } else {
+      ushort = 0x0000FFFF & packedPixel.getShort();
+    }
+    
+    // 00000000,00011111 == 0x001F
+    // 00000011,11100000 == 0x03E0
+    // 01111100,00000000 == 0x7C00
+    // 10000000,00000000 == 0x8000
+    
+    extractComponents[0] = (float)( ( ushort & 0x001F )       ) / 31.0f;
+    extractComponents[1] = (float)( ( ushort & 0x003E ) >>  5 ) / 31.0f;
+    extractComponents[2] = (float)( ( ushort & 0x7C00 ) >>  10) / 31.0f;
+    extractComponents[3] = (float)( ( ushort & 0x8000 ) >>  15);
+  }
+  
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
+    // 00000000,00011111 == 0x001F
+    // 00000011,11100000 == 0x03E0
+    // 01111100,00000000 == 0x7C00
+    // 10000000,00000000 == 0x8000
+    
+    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
+    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
+    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
+    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
+    
+    // due to limited precision, need to round before shoving
+    int ushort = (((int)((shoveComponents[0] * 31) + 0.5f)   ) & 0x0000001F );
+    ushort |= (((int)((shoveComponents[1] * 31) + 0.5f) <<  5) & 0x000003E0 );
+    ushort |= (((int)((shoveComponents[2] * 31) + 0.5f) << 10) & 0x00007C00 );
+    ushort |= (((int)((shoveComponents[3]) + 0.5f)      << 15) & 0x00008000 );
+    packedPixel.asShortBuffer().put( index, (short)ushort );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract2101010rev.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract2101010rev.java
new file mode 100644
index 000000000..077f3037b
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract2101010rev.java
@@ -0,0 +1,97 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.ByteBuffer;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Extract2101010rev implements Extract {
+  
+  /** Creates a new instance of Extract2101010 */
+  public Extract2101010rev() {
+  }
+  
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
+    long uint = 0;
+    
+    if( isSwap ) {
+      uint = 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( packedPixel.getInt() );
+    } else {
+      uint = 0x00000000FFFFFFFF & packedPixel.getInt();
+    }
+    
+    // 11111111,11000000,00000000,00000000 == 0xFFC00000
+    // 00000000,00111111,11110000,00000000 == 0x003F0000
+    // 00000000,00000000,00001111,11111100 == 0x00000FFC
+    // 00000000,00000000,00000000,00000011 == 0x00000003
+    
+    extractComponents[0] = (float)( ( uint & 0x000003FF )       ) / 1023.0f;
+    extractComponents[1] = (float)( ( uint & 0x000FFC00 ) >> 10 ) / 1023.0f;
+    extractComponents[2] = (float)( ( uint & 0x3FF00000 ) >> 20 ) / 1023.0f;
+    extractComponents[3] = (float)( ( uint & 0xC0000000 ) >> 30 ) / 3.0f;
+  }
+  
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
+    // 11110000,00000000 == 0xF000
+    // 00001111,00000000 == 0x0F00
+    // 00000000,11110000 == 0x00F0
+    // 00000000,00001111 == 0x000F
+    
+    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
+    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
+    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
+    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
+    
+    // due to limited precision, need to round before shoving
+    long uint = (((int)((shoveComponents[0] * 1023) + 0.5f)    ) & 0x000003FF );
+    uint |= (((int)((shoveComponents[1] * 1023) + 0.5f) <<   10) & 0x000FFC00 );
+    uint |= (((int)((shoveComponents[2] * 1023) + 0.5f) <<   20) & 0x3FF00000 );
+    uint |= (((int)((shoveComponents[3] *    3) + 0.5f) <<   30) & 0xC0000000 );
+    packedPixel.asIntBuffer().put( index, (int)uint );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract233rev.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract233rev.java
new file mode 100644
index 000000000..fa35c6fbc
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract233rev.java
@@ -0,0 +1,85 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.ByteBuffer;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Extract233rev implements Extract {
+  
+  /** Creates a new instance of Extract223rev */
+  public Extract233rev() {
+  }
+  
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
+    // 11100000 == 0xe0
+    // 00011100 == 0x1c
+    // 00000011 == 0x03
+    byte ubyte = packedPixel.get();
+    extractComponents[0] = (float)((ubyte & 0x07) ) / 7.0f;
+    extractComponents[1] = (float)((ubyte & 0x38) >> 3) / 7.0f;
+    extractComponents[2] = (float)((ubyte & 0xC0) >> 6) / 3.0f;
+  }
+  
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
+    // 11100000 == 0xE0
+    // 00011100 == 0x1C
+    // 00000011 == 0x03
+    
+    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
+    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
+    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
+    
+    // due to limited precision, need to round before shoving
+    byte b = (byte)( ( (int)( ( shoveComponents[0] * 7 ) + 0.5f ) ) & 0x07 );
+    b |= (byte)( ( (int)( ( shoveComponents[1] * 7 ) + 0.5f ) << 3 ) & 0x38 );
+    b |= (byte)( ( (int)( ( shoveComponents[2] * 3 ) + 0.5f ) << 6 ) & 0xC0 );
+    packedPixel.position( index );
+    packedPixel.put( b );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract332.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract332.java
new file mode 100644
index 000000000..35936466c
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract332.java
@@ -0,0 +1,84 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.ByteBuffer;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Extract332 implements Extract {
+  
+  /** Creates a new instance of Extract332 */
+  public Extract332() {
+  }
+  
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
+    // 11100000 == 0xe0
+    // 00011100 == 0x1c
+    // 00000011 == 0x03
+    byte ubyte = packedPixel.get();
+    extractComponents[0] = (float)((ubyte & 0xe0) >> 5) / 7.0f;
+    extractComponents[1] = (float)((ubyte & 0x1c) >> 2) / 7.0f;
+    extractComponents[2] = (float)((ubyte & 0x03)) / 3.0f;
+  }
+  
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
+    // 11100000 == 0xE0
+    // 00011100 == 0x1C
+    // 00000011 == 0x03
+    
+    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
+    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
+    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
+    
+    // due to limited precision, need to round before shoving
+    byte b = (byte)( ( (int)( ( shoveComponents[0] * 7 ) + 0.5f ) << 5 ) & 0xE0 );
+    b |= (byte)( ( (int)( ( shoveComponents[1] * 7 ) + 0.5f ) << 2 ) & 0x1C );
+    b |= (byte)( ( (int)( ( shoveComponents[2] * 3 ) + 0.5f ) ) & 0x03 );
+    packedPixel.put( index, b );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444.java
new file mode 100644
index 000000000..bac4f57aa
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444.java
@@ -0,0 +1,96 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Extract4444 implements Extract {
+  
+  /** Creates a new instance of Extract4444 */
+  public Extract4444() {
+  }
+  
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
+    int ushort = 0;
+    
+    if( isSwap ) {
+      ushort = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( packedPixel.getShort() );
+    } else {
+      ushort = 0x0000FFFF & packedPixel.getShort();
+    }
+    
+    // 11110000,00000000 == 0xF000
+    // 00001111,00000000 == 0x0F00
+    // 00000000,11110000 == 0x00F0
+    // 00000000,00001111 == 0x000F
+    
+    extractComponents[0] = (float)( ( ushort & 0xF000 ) >> 12 ) / 15.0f;
+    extractComponents[1] = (float)( ( ushort & 0x0F00 ) >> 8  ) / 15.0f;
+    extractComponents[2] = (float)( ( ushort & 0x00F0 ) >> 4  ) / 15.0f;
+    extractComponents[3] = (float)( ( ushort & 0x000F )       ) / 15.0f;
+  }
+  
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
+    // 11110000,00000000 == 0xF000
+    // 00001111,00000000 == 0x0F00
+    // 00000000,11110000 == 0x00F0
+    // 00000000,00001111 == 0x000F
+    
+    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
+    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
+    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
+    
+    // due to limited precision, need to round before shoving
+    int ushort = (((int)((shoveComponents[0] * 15) + 0.5f) << 12) & 0x0000F000 );
+    ushort |= (((int)((shoveComponents[1] * 15) + 0.5f) << 8) & 0x00000F00 );
+    ushort |= (((int)((shoveComponents[2] * 15) + 0.5f) << 4) & 0x000000F0 );
+    ushort |= (((int)((shoveComponents[3] * 15) + 0.5f)     ) & 0x0000000F );
+    packedPixel.asShortBuffer().put( index, (short)ushort );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444rev.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444rev.java
new file mode 100644
index 000000000..b1bea75e1
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444rev.java
@@ -0,0 +1,97 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Extract4444rev implements Extract {
+  
+  /** Creates a new instance of Extract4444rev */
+  public Extract4444rev() {
+  }
+  
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
+    int ushort = 0;
+    
+    if( isSwap ) {
+      ushort = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( packedPixel.getShort() );
+    } else {
+      ushort = 0x0000FFFF & packedPixel.getShort();
+    }
+    
+    // 00000000,00001111 == 0x000F
+    // 00000000,11110000 == 0x00F0
+    // 00001111,00000000 == 0x0F00
+    // 11110000,00000000 == 0xF000
+    
+    extractComponents[0] = (float)( ( ushort & 0x000F )       ) / 15.0f;
+    extractComponents[1] = (float)( ( ushort & 0x00F0 ) >> 4  ) / 15.0f;
+    extractComponents[2] = (float)( ( ushort & 0x0F00 ) >> 8  ) / 15.0f;
+    extractComponents[3] = (float)( ( ushort & 0xF000 ) >> 12 ) / 15.0f;
+  }
+  
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
+    // 11110000,00000000 == 0xF000
+    // 00001111,00000000 == 0x0F00
+    // 00000000,11110000 == 0x00F0
+    // 00000000,00001111 == 0x000F
+    
+    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
+    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
+    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
+    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
+    
+    // due to limited precision, need to round before shoving
+    int ushort = (((int)((shoveComponents[0] * 15) + 0.5f)   ) & 0x0000000F );
+    ushort |= (((int)((shoveComponents[1] * 15) + 0.5f) <<  4) & 0x000000F0 );
+    ushort |= (((int)((shoveComponents[2] * 15) + 0.5f) <<  8) & 0x00000F00 );
+    ushort |= (((int)((shoveComponents[3] * 15) + 0.5f) << 12) & 0x0000F000 );
+    packedPixel.asShortBuffer().put( index, (short)ushort );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract5551.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract5551.java
new file mode 100644
index 000000000..a6247844f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract5551.java
@@ -0,0 +1,97 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Extract5551 implements Extract {
+  
+  /** Creates a new instance of Extract5551 */
+  public Extract5551() {
+  }
+  
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
+    int ushort = 0;
+    
+    if( isSwap ) {
+      ushort = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( packedPixel.getShort() );
+    } else {
+      ushort = 0x0000FFFF & packedPixel.getShort();
+    }
+    
+    // 11111000,00000000 == 0xF800
+    // 00000111,11000000 == 0x07C0
+    // 00000000,00111110 == 0x003E
+    // 00000000,00000001 == 0x0001
+    
+    extractComponents[0] = (float)( ( ushort & 0xF800 ) >> 11 ) / 31.0f;
+    extractComponents[1] = (float)( ( ushort & 0x00F0 ) >>  6 ) / 31.0f;
+    extractComponents[2] = (float)( ( ushort & 0x0F00 ) >>  1 ) / 31.0f;
+    extractComponents[3] = (float)( ( ushort & 0xF000 )       );
+  }
+  
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
+    // 11110000,00000000 == 0xF000
+    // 00001111,00000000 == 0x0F00
+    // 00000000,11110000 == 0x00F0
+    // 00000000,00001111 == 0x000F
+    
+    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
+    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
+    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
+    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
+    
+    // due to limited precision, need to round before shoving
+    int ushort = (((int)((shoveComponents[0] * 31) + 0.5f) << 11) & 0x0000F800 );
+    ushort |= (((int)((shoveComponents[1] * 31) + 0.5f) <<  6) & 0x000007C0 );
+    ushort |= (((int)((shoveComponents[2] * 31) + 0.5f) <<  1) & 0x0000003E );
+    ushort |= (((int)((shoveComponents[3]) + 0.5f)) & 0x00000001 );
+    packedPixel.asShortBuffer().put( index, (short)ushort );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565.java
new file mode 100644
index 000000000..624a4f3f2
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565.java
@@ -0,0 +1,92 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Extract565 implements Extract {
+  
+  /** Creates a new instance of Extract565 */
+  public Extract565() {
+  }
+  
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
+    int ushort = 0;
+    
+    if( isSwap ) {
+      ushort = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( packedPixel.getShort() );
+    } else {
+      ushort = 0x0000FFFF & packedPixel.getShort();
+    }
+    
+    // 11111000,00000000 == 0xF800
+    // 00000111,11100000 == 0x07E0
+    // 00000000,00111111 == 0x001F
+    
+    extractComponents[0] = (float)( ( ushort & 0xF800 ) >> 11 ) / 31.0f;
+    extractComponents[1] = (float)( ( ushort & 0x07E0 ) >> 5 ) / 63.0f;
+    extractComponents[2] = (float)( ( ushort & 0x001F ) ) / 31.0f;
+  }
+  
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
+    // 11111000,00000000 == 0xF800
+    // 00000111,11100000 == 0x07E0
+    // 00000000,00111111 == 0x001F
+    
+    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
+    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
+    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
+    
+    // due to limited precision, need to round before shoving
+    int ushort = (((int)((shoveComponents[0] * 31) + 0.5f) << 11) & 0x0000F800 );
+    ushort |= (((int)((shoveComponents[1] * 63) + 0.5f) << 5) & 0x000007E0 );
+    ushort |= (((int)((shoveComponents[2] * 31) + 0.5f) ) & 0x0000001F );
+    packedPixel.asShortBuffer().put( index, (short)ushort );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565rev.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565rev.java
new file mode 100644
index 000000000..4ab6d7e98
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565rev.java
@@ -0,0 +1,92 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Extract565rev implements Extract {
+  
+  /** Creates a new instance of Extract565rev */
+  public Extract565rev() {
+  }
+  
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
+    int ushort = 0;
+    
+    if( isSwap ) {
+      ushort = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( packedPixel.getShort() );
+    } else {
+      ushort = 0x0000FFFF & packedPixel.getShort();
+    }
+    
+    // 00000000,00011111 == 0x001F
+    // 00000111,11100000 == 0x07E0
+    // 11111000,00000000 == 0xF800
+    
+    extractComponents[0] = (float)( ( ushort & 0x001F ) ) / 31.0f;
+    extractComponents[1] = (float)( ( ushort & 0x07E0 ) >> 5 ) / 63.0f;
+    extractComponents[2] = (float)( ( ushort & 0xF800 ) >> 11 ) / 31.0f;
+  }
+  
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
+    // 00000000,00111111 == 0x001F
+    // 00000111,11100000 == 0x07E0
+    // 11111000,00000000 == 0xF800
+    
+    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
+    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
+    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
+    
+    // due to limited precision, need to round before shoving
+    int ushort = (((int)((shoveComponents[0] * 31) + 0.5f) ) & 0x0000001F );
+    ushort |= (((int)((shoveComponents[1] * 63) + 0.5f) << 5) & 0x000007E0 );
+    ushort |= (((int)((shoveComponents[2] * 31) + 0.5f) << 11) & 0x0000F800 );
+    packedPixel.asShortBuffer().put( index, (short)ushort );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888.java
new file mode 100644
index 000000000..90d7e57c9
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888.java
@@ -0,0 +1,97 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Extract8888 implements Extract {
+  
+  /** Creates a new instance of Extract8888 */
+  public Extract8888() {
+  }
+  
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
+    long uint = 0;
+    
+    if( isSwap ) {
+      uint = 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( packedPixel.getInt() );
+    } else {
+      uint = 0x00000000FFFFFFFF & packedPixel.getInt();
+    }
+    
+    // 11111000,00000000 == 0xF800
+    // 00000111,11000000 == 0x07C0
+    // 00000000,00111110 == 0x003E
+    // 00000000,00000001 == 0x0001
+    
+    extractComponents[0] = (float)( ( uint & 0xFF000000 ) >> 24 ) / 255.0f;
+    extractComponents[1] = (float)( ( uint & 0x00FF0000 ) >> 16 ) / 255.0f;
+    extractComponents[2] = (float)( ( uint & 0x0000FF00 ) >>  8 ) / 255.0f;
+    extractComponents[3] = (float)( ( uint & 0x000000FF )       ) / 255.0f;
+  }
+  
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
+    // 11110000,00000000 == 0xF000
+    // 00001111,00000000 == 0x0F00
+    // 00000000,11110000 == 0x00F0
+    // 00000000,00001111 == 0x000F
+    
+    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
+    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
+    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
+    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
+    
+    // due to limited precision, need to round before shoving
+    long uint = (((int)((shoveComponents[0] * 255) + 0.5f) << 24) & 0xFF000000 );
+    uint |= (((int)((shoveComponents[1] * 255) + 0.5f) <<   16) & 0x00FF0000 );
+    uint |= (((int)((shoveComponents[2] * 255) + 0.5f) <<    8) & 0x0000FF00 );
+    uint |= (((int)((shoveComponents[3] * 255) + 0.5f)        ) & 0x000000FF );
+    packedPixel.asIntBuffer().put( index, (int)uint );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888rev.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888rev.java
new file mode 100644
index 000000000..10970573b
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888rev.java
@@ -0,0 +1,97 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Extract8888rev implements Extract {
+  
+  /** Creates a new instance of Extract8888rev */
+  public Extract8888rev() {
+  }
+  
+  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
+    long uint = 0;
+    
+    if( isSwap ) {
+      uint = 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( packedPixel.getInt() );
+    } else {
+      uint = 0x00000000FFFFFFFF & packedPixel.getInt();
+    }
+    
+    // 11111000,00000000 == 0xF800
+    // 00000111,11000000 == 0x07C0
+    // 00000000,00111110 == 0x003E
+    // 00000000,00000001 == 0x0001
+    
+    extractComponents[0] = (float)( ( uint & 0x000000FF )       ) / 255.0f;
+    extractComponents[1] = (float)( ( uint & 0x0000FF00 ) >>  8 ) / 255.0f;
+    extractComponents[2] = (float)( ( uint & 0x00FF0000 ) >> 16 ) / 255.0f;
+    extractComponents[3] = (float)( ( uint & 0xFF000000 ) >> 24 ) / 255.0f;
+  }
+  
+  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
+    // 11110000,00000000 == 0xF000
+    // 00001111,00000000 == 0x0F00
+    // 00000000,11110000 == 0x00F0
+    // 00000000,00001111 == 0x000F
+    
+    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
+    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
+    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
+    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
+    
+    // due to limited precision, need to round before shoving
+    long uint = (((int)((shoveComponents[0] * 255) + 0.5f)    ) & 0x000000FF );
+    uint |= (((int)((shoveComponents[1] * 255) + 0.5f) <<    8) & 0x0000FF00 );
+    uint |= (((int)((shoveComponents[2] * 255) + 0.5f) <<   16) & 0x00FF0000 );
+    uint |= (((int)((shoveComponents[3] * 255) + 0.5f) <<   24) & 0xFF000000 );
+    packedPixel.asIntBuffer().put( index, (int)uint );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractFloat.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractFloat.java
new file mode 100644
index 000000000..c42799470
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractFloat.java
@@ -0,0 +1,74 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author Administrator
+ */
+public class ExtractFloat implements ExtractPrimitive {
+  
+  /** Creates a new instance of ExtractFloat */
+  public ExtractFloat() {
+  }
+  
+  public double extract( boolean isSwap, ByteBuffer data ) {
+    float f = 0;
+    if( isSwap ) {
+      f = Mipmap.GLU_SWAP_4_BYTES( data.getInt() );
+    } else {
+      f = data.getInt();
+    }
+    assert( f <= 1.0f );
+    return( f );
+  }
+  
+  public void shove( double value, int index, ByteBuffer data ) {
+    assert(0.0 <= value && value < 1.0);
+    data.asFloatBuffer().put( index, (float)value );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractPrimitive.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractPrimitive.java
new file mode 100644
index 000000000..8b986d6d0
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractPrimitive.java
@@ -0,0 +1,56 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.ByteBuffer;
+
+/**
+ *
+ * @author Administrator
+ */
+public interface ExtractPrimitive {
+  public double extract( boolean isSwap, ByteBuffer pointer );
+  public void shove( double value, int index, ByteBuffer pointer );
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSByte.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSByte.java
new file mode 100644
index 000000000..4f61015f4
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSByte.java
@@ -0,0 +1,69 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.ByteBuffer;
+
+/**
+ *
+ * @author Administrator
+ */
+public class ExtractSByte implements ExtractPrimitive {
+  
+  /** Creates a new instance of ExtractUByte */
+  public ExtractSByte() {
+  }
+  
+  public double extract( boolean isSwap, ByteBuffer sbyte ) {
+    byte b = sbyte.get();
+    assert( b <= 127 );
+    return( b );
+  }
+  
+  public void shove( double value, int index, ByteBuffer data ) {
+    data.position( index );
+    data.put( (byte)value );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSInt.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSInt.java
new file mode 100644
index 000000000..2d5ac5329
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSInt.java
@@ -0,0 +1,76 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author Administrator
+ */
+public class ExtractSInt implements ExtractPrimitive {
+  
+  /** Creates a new instance of ExtractSInt */
+  public ExtractSInt() {
+  }
+  
+  public double extract( boolean isSwap, ByteBuffer uint ) {
+    int i = 0;
+    if( isSwap ) {
+      i = Mipmap.GLU_SWAP_4_BYTES( uint.getInt() );
+    } else {
+      i = uint.getInt();
+    }
+    assert( i <= 0x7FFFFFFF );
+    return( i );
+  }
+  
+  public void shove( double value, int index, ByteBuffer data ) {
+    assert(0.0 <= value && value < Integer.MAX_VALUE);
+    IntBuffer ib = data.asIntBuffer();
+    ib.position( index );
+    ib.put( (int)value );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSShort.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSShort.java
new file mode 100644
index 000000000..8b8d50cbf
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSShort.java
@@ -0,0 +1,76 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author Administrator
+ */
+public class ExtractSShort implements ExtractPrimitive {
+  
+  /** Creates a new instance of ExtractSShort */
+  public ExtractSShort() {
+  }
+  
+  public double extract( boolean isSwap, ByteBuffer ushort ) {
+    short s = 0;
+    if( isSwap ) {
+      s = Mipmap.GLU_SWAP_2_BYTES( ushort.getShort() );
+    } else {
+      s = ushort.getShort();
+    }
+    assert( s <= 32767 );
+    return( s );
+  }
+  
+  public void shove( double value, int index, ByteBuffer data ) {
+    assert(0.0 <= value && value < 32768.0);
+    ShortBuffer sb = data.asShortBuffer();
+    sb.position( index );
+    sb.put( (short)value );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUByte.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUByte.java
new file mode 100644
index 000000000..d33213f89
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUByte.java
@@ -0,0 +1,70 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.ByteBuffer;
+
+/**
+ *
+ * @author Administrator
+ */
+public class ExtractUByte implements ExtractPrimitive {
+  
+  /** Creates a new instance of ExtractUByte */
+  public ExtractUByte() {
+  }
+  
+  public double extract( boolean isSwap, ByteBuffer ubyte ) {
+    int i = 0x000000FF & ubyte.get();
+    assert( i <= 255 );
+    return( i );
+  }
+  
+  public void shove( double value, int index, ByteBuffer data ) {
+    assert(0.0 <= value && value < 256.0);
+    data.position( index );
+    data.put( (byte)value );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUInt.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUInt.java
new file mode 100644
index 000000000..873668a43
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUInt.java
@@ -0,0 +1,76 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author Administrator
+ */
+public class ExtractUInt implements ExtractPrimitive {
+  
+  /** Creates a new instance of ExtractUInt */
+  public ExtractUInt() {
+  }
+  
+  public double extract( boolean isSwap, ByteBuffer uint ) {
+    long i = 0;
+    if( isSwap ) {
+      i = 0xFFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( uint.getInt() );
+    } else {
+      i = 0xFFFFFFFF & uint.getInt();
+    }
+    assert( i <= 0xFFFFFFFF );
+    return( i );
+  }
+  
+  public void shove( double value, int index, ByteBuffer data ) {
+    assert(0.0 <= value && value < 0xFFFFFFFF);
+    IntBuffer ib = data.asIntBuffer();
+    ib.position( index );
+    ib.put( (int)value );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUShort.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUShort.java
new file mode 100644
index 000000000..86bbb95f1
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUShort.java
@@ -0,0 +1,76 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author Administrator
+ */
+public class ExtractUShort implements ExtractPrimitive {
+  
+  /** Creates a new instance of ExtracUShort */
+  public ExtractUShort() {
+  }
+  
+  public double extract( boolean isSwap, ByteBuffer ushort ) {
+    int i = 0;
+    if( isSwap ) {
+      i = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( ushort.getShort() );
+    } else {
+      i = 0x0000FFFF & ushort.getShort();
+    }
+    assert( i <= 65535 );
+    return( i );
+  }
+  
+  public void shove( double value, int index, ByteBuffer data ) {
+    assert(0.0 <= value && value < 65536.0);
+    ShortBuffer sb = data.asShortBuffer();
+    sb.position( index );
+    sb.put( (short)value );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/HalveImage.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/HalveImage.java
new file mode 100644
index 000000000..893d33c66
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/HalveImage.java
@@ -0,0 +1,1533 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import javax.media.opengl.GL;
+import java.nio.*;
+
+/**
+ *
+ * @author  Administrator
+ */
+public class HalveImage {
+  
+  private static final int BOX2 = 2;
+  private static final int BOX4 = 4;
+  private static final int BOX8 = 8;
+  
+  public static void halveImage( int components, int width, int height,
+          ShortBuffer datain, ShortBuffer dataout ) {
+    int i, j, k;
+    int newwidth, newheight;
+    int delta;
+    int t = 0;
+    short temp = 0;
+    
+    newwidth = width / 2;
+    newheight = height /2;
+    delta = width * components;
+    
+    // Piece of cake
+    for( i = 0; i < newheight; i++ ) {
+      for( j = 0; j < newwidth; j++ ) {
+        for( k = 0; k < components; k++ ) {
+          datain.position( t );
+          temp = datain.get();
+          datain.position( t + components );
+          temp += datain.get();
+          datain.position( t + delta );
+          temp += datain.get();
+          datain.position( t + delta + components );
+          temp +=datain.get();
+          temp += 2;
+          temp /= 4;
+          dataout.put( temp );
+          t++;
+        }
+        t += components;
+      }
+      t += delta;
+    }
+  }
+  
+  public static void halveImage_ubyte( int components, int width, int height,
+                                      ByteBuffer datain, ByteBuffer dataout,
+                                      int element_size, int ysize, int group_size ) {
+    int i, j, k;
+    int newwidth, newheight;
+    int s;
+    int t;
+    
+    // Handle case where there is only 1 column/row
+    if( width == 1 || height == 1 ) {
+      assert( !( width == 1 && height == 1 ) ); // can't be 1x1
+      halve1Dimage_ubyte( components, width, height, datain, dataout, element_size, ysize, group_size );
+      return;
+    }
+    
+    newwidth = width / 2;
+    newheight = height / 2;
+    s = 0;
+    t = 0;
+    
+    int temp = 0;
+    // piece of cake
+    for( i = 0; i < newheight; i++ ) {
+      for( j = 0; j < newwidth; j++ ) {
+        for( k = 0; k < components; k++ ) {
+          datain.position( t );
+          temp = ( 0x000000FF & datain.get() );
+          datain.position( t + group_size );
+          temp += ( 0x000000FF & datain.get() );
+          datain.position( t + ysize );
+          temp += ( 0x000000FF & datain.get() );
+          datain.position( t + ysize + group_size );
+          temp += ( 0x000000FF & datain.get() ) + 2;
+          dataout.put( (byte)(temp / 4) );
+          t += element_size;
+        }
+        t += group_size;
+      }
+      t += ysize;
+    }
+  }
+  
+  public static void halve1Dimage_ubyte( int components, int width, int height,
+                      ByteBuffer datain, ByteBuffer dataout, 
+                      int element_size, int ysize, int group_size ) {
+    int halfWidth = width / 2;
+    int halfHeight = height / 2;
+    int src = 0;
+    int dest = 0;
+    int jj;
+    int temp = 0;
+    
+    assert( width == 1 || height == 1 ); // Must be 1D
+    assert( width != height ); // can't be square
+    
+    if( height == 1 ) { // 1 row
+      assert( width != 1 ); // widthxheight can't be 1x1
+      halfHeight = 1;
+      
+      for( jj = 0; jj < halfWidth; jj++ ) {
+        int kk;
+        for( kk = 0; kk < components; kk++ ) {
+          datain.position( src );
+          temp = ( 0x000000FF & datain.get() );
+          datain.position( src + group_size );
+          temp += ( 0x000000FF & datain.get() );
+          temp /= 2;
+          dataout.put( (byte)temp );
+          /*
+          dataout.setByte( (byte)(((0x000000FF & datain.setIndexInBytes(src).getByte()) + 
+                    (0x000000FF & datain.setIndexInBytes( src + group_size ).getByte())) / 2 ) );
+           */
+          src += element_size;
+          //dataout.plusPlus();
+          dest++;
+        }
+        src += group_size; // skip to next 2
+      }
+      int padBytes = ysize - ( width * group_size );
+      src += padBytes; // for assertion only
+    } else if( width == 1 ) { // 1 column
+      int padBytes = ysize - ( width * group_size );
+      assert( height != 1 );
+      halfWidth = 1;
+      // one vertical column with possible pad bytes per row
+      // average two at a time
+      for( jj = 0; jj < halfHeight; jj++ ) {
+        int kk;
+        for( kk = 0; kk < components; kk++ ) {
+          datain.position( src );
+          temp = ( 0x000000FF & datain.get() );
+          datain.position( src + ysize );
+          temp += ( 0x000000FF & datain.get() );
+          temp /= 2;
+          dataout.put( (byte)temp );
+          /*
+          dataout.setByte( (byte)(((0x000000FF & datain.setIndexInBytes(src).getByte()) + 
+                    (0x000000FF & datain.setIndexInBytes(src + ysize).getByte()) ) / 2 ) );
+           */
+          src += element_size;
+          //dataout.plusPlus();
+          dest++;
+        }
+        src += padBytes; // add pad bytes, if any, to get to end of row
+        src += ysize;
+      }
+    }
+    assert( src == ysize * height );
+    assert( dest == components * element_size * halfWidth * halfHeight );
+  }
+  
+  public static void halveImage_byte( int components, int width, int height,
+                    ByteBuffer datain, ByteBuffer dataout, int element_size,
+                    int ysize, int group_size ) {
+    int i, j, k;
+    int newwidth, newheight;
+    int s = 0;
+    int t = 0;
+    byte temp = (byte)0;
+    
+    // handle case where there is only 1 column
+    if( width == 1 || height == 1 ) {
+      assert( !( width == 1 && height == 1 ) );
+      halve1Dimage_byte( components, width, height, datain, dataout, element_size,
+                                                            ysize, group_size );
+      return;
+    }
+    
+    newwidth = width / 2;
+    newheight = height / 2;
+    
+    for( i = 0; i < newheight; i++ ) {
+      for( j = 0; j < newwidth; j++ ) {
+        for( k = 0; k < components; k++ ) {
+          datain.position( t );
+          temp = datain.get();
+          datain.position( t + group_size );
+          temp += datain.get();
+          datain.position( t + ysize );
+          temp += datain.get();
+          datain.position( t + ysize + group_size );
+          temp += datain.get();
+          temp += 2;
+          temp /= 4;
+          dataout.put( temp );
+          t += element_size;
+        }
+        t += group_size;
+      }
+      t += ysize;
+    }
+  }
+  
+  public static void halve1Dimage_byte( int components, int width, int height,
+                      ByteBuffer datain, ByteBuffer dataout,
+                      int element_size, int ysize, int group_size ) {
+    int halfWidth = width / 2;
+    int halfHeight = width / 2;
+    int src = 0;
+    int dest = 0;
+    int jj;
+    byte temp = (byte)0;
+    
+    assert( width == 1 || height == 1 ); // must be 1D
+    assert( width != height ); // can't be square
+    
+    if( height == 1 ) { // 1 row
+      assert( width != 1 ); // widthxheight can't be 1
+      halfHeight = 1;
+      
+      for( jj = 0; jj < halfWidth; jj++ ) {
+        int kk;
+        for( kk = 0; kk < components; kk++ ) {
+          datain.position( src );
+          temp = datain.get();
+          datain.position( src + group_size );
+          temp += datain.get();
+          temp /= 2;
+          dataout.put( temp );
+          src += element_size;
+          dest++;
+        }
+        src += group_size; // skip to next 2
+      }
+      int padBytes = ysize - ( width * group_size );
+      src += padBytes; // for assert only
+    } else if( width == 1 ) { // 1 column
+      int padBytes = ysize - ( width * group_size );
+      assert( height != 1 ); // widthxheight can't be 1
+      halfWidth = 1;
+      // one vertical column with possible pad bytes per row
+      // average two at a time
+      
+      for( jj = 0; jj < halfHeight; jj++ ) {
+        int kk;
+        for( kk = 0; kk < components; kk++ ) {
+          datain.position( src );
+          temp = datain.get();
+          datain.position( src + ysize );
+          temp += datain.get();
+          temp /= 2;
+          src += element_size;
+          dest++;
+        }
+        src += padBytes; // add pad bytes, if any, to get to end of row
+        src += ysize;
+      }
+      assert( src == ysize * height );
+    }
+    assert( dest == components * element_size * halfWidth * halfHeight );
+  }
+  
+  public static void halveImage_ushort( int components, int width, int height,
+                          ByteBuffer datain, ShortBuffer dataout, int element_size,
+                          int ysize, int group_size, boolean myswap_bytes ) {
+    int i, j, k, l;
+    int newwidth, newheight;
+    int s = 0;
+    int t = 0;
+    int temp = 0;
+    // handle case where there is only 1 column/row
+    if( width == 1 || height == 1 ) {
+      assert( !( width == 1 && height == 1 ) ); // can't be 1x1
+      halve1Dimage_ushort( components, width, height, datain, dataout, element_size,
+                                ysize, group_size, myswap_bytes );
+      return;
+    }
+    
+    newwidth = width / 2;
+    newheight = height / 2;
+    
+    // Piece of cake
+    if( !myswap_bytes ) {
+      for( i = 0; i < newheight; i++ ) {
+        for( j = 0; j < newwidth; j++ ) {
+          for( k = 0; k < components; k++ ) {
+            datain.position( t );
+            temp = ( 0x0000FFFF & datain.getShort() );
+            datain.position( t + group_size );
+            temp += ( 0x0000FFFF & datain.getShort() );
+            datain.position( t + ysize );
+            temp += ( 0x0000FFFF & datain.getShort() );
+            datain.position( t + ysize + group_size );
+            temp += ( 0x0000FFFF & datain.getShort() );
+            dataout.put( (short)( ( temp + 2 ) / 4 ) );
+            t += element_size;
+          }
+          t += group_size;
+        }
+        t += ysize;
+      }
+    } else {
+      for( i = 0; i < newheight; i++ ) {
+        for( j = 0; j < newwidth; j++ ) {
+          for( k = 0; k < components; k++ ) {
+            datain.position( t );
+            temp = ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
+            datain.position( t + group_size );
+            temp += ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
+            datain.position( t + ysize );
+            temp += ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
+            datain.position( t + ysize + group_size );
+            temp += ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
+            dataout.put( (short)( ( temp + 2 ) / 4 ) );
+            t += element_size;
+          }
+          t += group_size;
+        }
+        t += ysize;
+      }
+    }
+  }
+  
+  public static void halve1Dimage_ushort( int components, int width, int height,
+                      ByteBuffer datain, ShortBuffer dataout, int element_size,
+                      int ysize, int group_size, boolean myswap_bytes ) {
+    int halfWidth = width / 2;
+    int halfHeight = height / 2;
+    int src = 0;
+    int dest = 0;
+    int jj;
+    
+    assert( width == 1 || height == 1 ); // must be 1D
+    assert( width != height ); // can't be square
+    
+    if( height == 1 ) { // 1 row
+      assert( width != 1 ); // widthxheight can't be 1
+      halfHeight = 1;
+      
+      for( jj = 0; jj < halfWidth; jj++ ) {
+        int kk;
+        for( kk = 0; kk < halfHeight; kk++ ) {
+          int[] ushort = new int[BOX2];
+          if( myswap_bytes ) {
+            datain.position( src );
+            ushort[0] = ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
+            datain.position( src + group_size );
+            ushort[1] = (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
+          } else {
+            datain.position( src );
+            ushort[0] = (0x0000FFFF & datain.getShort() );
+            datain.position( src + group_size );
+            ushort[1] = (0x0000FFFF & datain.getShort() );
+          }
+          dataout.put( (short)( (ushort[0] + ushort[1]) / 2 ) );
+          src += element_size;
+          dest += 2;
+        }
+        src += group_size; // skip to next 2
+      }
+      int padBytes = ysize - ( width * group_size );
+      src += padBytes; // for assertion only
+    } else if( width == 1 ) { // 1 column
+      int padBytes = ysize - ( width * group_size );
+      assert( height != 1 ); // widthxheight can't be 1
+      halfWidth = 1;
+      // one vertical column with possible pad bytes per row
+      // average two at a time
+      
+      for( jj = 0; jj < halfHeight; jj++ ) {
+        int kk;
+        for( kk = 0; kk < components; kk++ ) {
+          int[] ushort = new int[BOX2];
+          if( myswap_bytes ) {
+            datain.position( src );
+            ushort[0] = ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
+            datain.position( src + ysize );
+            ushort[0] = ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
+          } else {
+            datain.position( src );
+            ushort[0] = ( 0x0000FFFF & datain.getShort() );
+            datain.position( src + ysize );
+            ushort[1] = ( 0x0000FFFF & datain.getShort() );
+          }
+          dataout.put( (short)((ushort[0] + ushort[1]) / 2) );
+          src += element_size;
+          dest += 2;
+        }
+        src += padBytes; // add pad bytes, if any, to get to end of row
+        src += ysize;
+      }
+      assert( src == ysize * height );
+    }
+    assert( dest == components * element_size * halfWidth * halfHeight );
+  }
+  
+  public static void halveImage_short( int components, int width, int height,
+                        ByteBuffer datain, ShortBuffer dataout, int element_size,
+                        int ysize, int group_size, boolean myswap_bytes ) {
+    int i, j, k, l;
+    int newwidth, newheight;
+    int s = 0;
+    int t = 0;
+    short temp = (short)0;
+    // handle case where there is only 1 column/row
+    if( width == 1 || height == 1 ) {
+      assert( !( width == 1 && height == 1 ) ); // can't be 1x1
+      halve1Dimage_short( components, width, height, datain, dataout, element_size,
+                            ysize, group_size, myswap_bytes );
+      return;
+    }
+    
+    newwidth = width / 2;
+    newheight = height / 2;
+    
+    // Piece of cake
+    if( !myswap_bytes ) {
+      for( i = 0; i < newheight; i++ ) {
+        for( j = 0; j < newwidth; j++ ) {
+          for( k = 0; k < components; k++ ) {
+            datain.position( t );
+            temp = datain.getShort();
+            datain.position( t + group_size );
+            temp += datain.getShort();
+            datain.position( t + ysize );
+            temp += datain.getShort();
+            datain.position( t + ysize + group_size );
+            temp += datain.getShort();
+            temp += 2;
+            temp /= 4;
+            dataout.put( (short)temp );
+            t += element_size;
+          }
+          t += group_size;
+        }
+        t += ysize;
+      }
+    } else {
+      for( i = 0; i < newheight; i++ ) {
+        for( j = 0; j < newwidth; j++ ) {
+          for( k = 0; k < components; k++ ) {
+            short b;
+            int buf;
+            datain.position( t );
+            temp = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+            datain.position( t + group_size );
+            temp += Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+            datain.position( t + ysize );
+            temp += Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+            datain.position( t + ysize + group_size );
+            temp += Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+            temp += 2;
+            temp /= 4;
+            dataout.put( temp );
+            t += element_size;
+          }
+          t += group_size;
+        }
+        t += ysize;
+      }
+    }
+  }
+  
+  public static void halve1Dimage_short( int components, int width, int height,
+              ByteBuffer datain, ShortBuffer dataout, int element_size, int ysize,
+              int group_size, boolean myswap_bytes ) {
+    int halfWidth = width / 2;
+    int halfHeight = height / 2;
+    int src = 0;
+    int dest = 0;
+    int jj;
+    
+    assert( width == 1 || height == 1 ); // must be 1D
+    assert( width != height ); // can't be square
+    
+    if( height == 1 ) { // 1 row
+      assert( width != 1 ); // can't be 1x1
+      halfHeight = 1;
+      
+      for( jj = 0; jj < halfWidth; jj++ ) {
+        int kk;
+        for( kk = 0; kk < components; kk++ ) {
+          short[] sshort = new short[BOX2];
+          if( myswap_bytes ) {
+            datain.position( src );
+            sshort[0] = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+            datain.position( src + group_size );
+            sshort[1] = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+          } else {
+            datain.position( src );
+            sshort[0] = datain.getShort();
+            datain.position( src + group_size );
+            sshort[1] = datain.getShort();
+          }
+          dataout.put( (short)(( sshort[0] + sshort[1] ) / 2) );
+          src += element_size;
+          dest += 2;
+        }
+        src += group_size; // skip to next 2
+      }
+      int padBytes = ysize - ( width * group_size );
+      src += padBytes; // for assertion only
+    } else if( width == 1 ) {
+      int padBytes = ysize - ( width * group_size );
+      assert( height != 1 );
+      halfWidth = 1;
+      // one vertical column with possible pad bytes per row
+      // average two at a time
+      
+      for( jj = 0; jj < halfHeight; jj++ ) {
+        int kk;
+        for( kk = 0; kk < components; kk++ ) {
+          short[] sshort = new short[BOX2];
+          if( myswap_bytes ) {
+            datain.position( src );
+            sshort[0] = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+            datain.position( src + ysize );
+            sshort[1] = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+          } else {
+            datain.position( src );
+            sshort[0] = datain.getShort();
+            datain.position( src + ysize );
+            sshort[1] = datain.getShort();
+          }
+          dataout.put( (short)(( sshort[0] + sshort[1] ) / 2) );
+          src += element_size;
+          dest += 2;
+        }
+        src += padBytes; // add pad bytes, if any, to get to end of row
+        src += ysize;
+      }
+      assert( src == ysize * height );
+    }
+    assert( dest == ( components * element_size * halfWidth * halfHeight ) );
+  }
+  
+  public static void halveImage_uint( int components, int width, int height,
+                          ByteBuffer datain, IntBuffer dataout, int element_size,
+                          int ysize, int group_size, boolean myswap_bytes ) {
+    int i, j, k, l;
+    int newwidth, newheight;
+    int s = 0;
+    int t = 0;
+    double temp = 0;
+    
+    // handle case where there is only 1 column/row
+    if( width == 1 || height == 1 ) {
+      assert( !( width == 1 && height == 1 ) ); // can't be 1x1
+      halve1Dimage_uint( components, width, height, datain, dataout, element_size,
+                                ysize, group_size, myswap_bytes );
+      return;
+    }
+    
+    newwidth = width / 2;
+    newheight = height / 2;
+    
+    // Piece of cake
+    if( !myswap_bytes ) {
+      for( i = 0; i < newheight; i++ ) {
+        for( j = 0; j < newwidth; j++ ) {
+          for( k = 0; k < components; k++ ) {
+            datain.position( t );
+            temp = (0x000000007FFFFFFFL & datain.getInt() );
+            datain.position( t + group_size );
+            temp += (0x000000007FFFFFFFL & datain.getInt() );
+            datain.position( t + ysize );
+            temp += (0x000000007FFFFFFFL & datain.getInt() );
+            datain.position( t + ysize + group_size );
+            temp += (0x000000007FFFFFFFL & datain.getInt() );
+            dataout.put( (int)( ( temp / 4 ) + 0.5 ) );
+            t += element_size;
+          }
+          t += group_size;
+        }
+        t += ysize;
+      }
+    } else {
+      for( i = 0; i < newheight; i++ ) {
+        for( j = 0; j < newwidth; j++ ) {
+          for( k = 0; k < components; k++ ) {
+            // need to cast to double to hold large unsigned ints
+            double buf;
+            datain.position( t );
+            buf = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+            datain.position( t + group_size );
+            buf += ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+            datain.position( t + ysize );
+            buf += ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+            datain.position( t + ysize + group_size );
+            buf += ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+            temp /= 4;
+            temp += 0.5;
+            dataout.put( (int)temp );
+            t += element_size;
+          }
+          t += group_size;
+        }
+        t += ysize;
+      }
+    }
+  }
+  
+  public static void halve1Dimage_uint( int components, int width, int height,
+                      ByteBuffer datain, IntBuffer dataout, int element_size, int ysize,
+                      int group_size, boolean myswap_bytes ) {
+    int halfWidth = width / 2;
+    int halfHeight = height / 2;
+    int src = 0;
+    int dest = 0;
+    int jj;
+    
+    assert( width == 1 || height == 1 ); // must be 1D
+    assert( width != height ); // can't be square
+    
+    if( height == 1 ) { // 1 row
+      assert( width != 1 ); // widthxheight can't be 1
+      halfHeight = 1;
+      
+      for( jj = 0; jj < halfWidth; jj++ ) {
+        int kk;
+        for( kk = 0; kk < halfHeight; kk++ ) {
+          long[] uint = new long[BOX2];
+          if( myswap_bytes ) {
+            datain.position( src );
+            uint[0] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+            datain.position( src + group_size );
+            uint[1] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+          } else {
+            datain.position( src );
+            uint[0] = ( 0x00000000FFFFFFFF & datain.getInt() );
+            datain.position( src + group_size );
+            uint[1] = (0x00000000FFFFFFFF & datain.getInt() );
+          }
+          dataout.put( (int)( ( uint[0] + uint[1] ) / 2.0 ) );
+          src += element_size;
+          dest += 4;
+        }
+        src += group_size; // skip to next 2
+      }
+      int padBytes = ysize - ( width * group_size );
+      src += padBytes; // for assertion only
+    } else if( width == 1 ) { // 1 column
+      int padBytes = ysize - ( width * group_size );
+      assert( height != 1 ); // widthxheight can't be 1
+      halfWidth = 1;
+      // one vertical column with possible pad bytes per row
+      // average two at a time
+      
+      for( jj = 0; jj < halfHeight; jj++ ) {
+        int kk;
+        for( kk = 0; kk < components; kk++ ) {
+          long[] uint = new long[BOX2];
+          if( myswap_bytes ) {
+            datain.position( src );
+            uint[0] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+            datain.position( src + group_size );
+            uint[0] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+          } else {
+            datain.position( src );
+            uint[0] = ( 0x00000000FFFFFFFF & datain.getInt() );
+            datain.position( src + ysize );
+            uint[1] = ( 0x00000000FFFFFFFF & datain.getInt() );
+          }
+          dataout.put( (int)( ( uint[0] + uint[1] ) / 2.0 ) );
+          src += element_size;
+          dest += 4;
+        }
+        src += padBytes; // add pad bytes, if any, to get to end of row
+        src += ysize;
+      }
+      assert( src == ysize * height );
+    }
+    assert( dest == components * element_size * halfWidth * halfHeight );
+  }
+  
+  public static void halveImage_int( int components, int width, int height,
+                        ByteBuffer datain, IntBuffer dataout, int element_size,
+                        int ysize, int group_size, boolean myswap_bytes ) {
+    int i, j, k, l;
+    int newwidth, newheight;
+    int s = 0;
+    int t = 0;
+    int temp = 0;
+    
+    // handle case where there is only 1 column/row
+    if( width == 1 || height == 1 ) {
+      assert( !( width == 1 && height == 1 ) ); // can't be 1x1
+      halve1Dimage_int( components, width, height, datain, dataout, element_size,
+                            ysize, group_size, myswap_bytes );
+      return;
+    }
+    
+    newwidth = width / 2;
+    newheight = height / 2;
+    
+    // Piece of cake
+    if( !myswap_bytes ) {
+      for( i = 0; i < newheight; i++ ) {
+        for( j = 0; j < newwidth; j++ ) {
+          for( k = 0; k < components; k++ ) {
+            datain.position( t );
+            temp = datain.getInt();
+            datain.position( t + group_size );
+            temp += datain.getInt();
+            datain.position( t + ysize );
+            temp += datain.getInt();
+            datain.position( t + ysize + group_size );
+            temp += datain.getInt();
+            temp = (int)( ( temp / 4.0f ) + 0.5f );
+            dataout.put( temp );
+            t += element_size;
+          }
+          t += group_size;
+        }
+        t += ysize;
+      }
+    } else {
+      for( i = 0; i < newheight; i++ ) {
+        for( j = 0; j < newwidth; j++ ) {
+          for( k = 0; k < components; k++ ) {
+            long b;
+            float buf;
+            datain.position( t );
+            b = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+            buf = b;
+            datain.position( t + group_size );
+            b = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+            buf += b;
+            datain.position( t + ysize );
+            b = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+            buf += b;
+            datain.position( t + ysize + group_size );
+            b = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+            buf += b;
+            dataout.put( (int)( ( buf / 4.0f ) + 0.5f ) );
+            t += element_size;
+          }
+          t += group_size;
+        }
+        t += ysize;
+      }
+    }
+  }
+  
+  public static void halve1Dimage_int( int components, int width, int height,
+              ByteBuffer datain, IntBuffer dataout, int element_size, int ysize,
+              int group_size, boolean myswap_bytes ) {
+    int halfWidth = width / 2;
+    int halfHeight = height / 2;
+    int src = 0;
+    int dest = 0;
+    int jj;
+    
+    assert( width == 1 || height == 1 ); // must be 1D
+    assert( width != height ); // can't be square
+    
+    if( height == 1 ) { // 1 row
+      assert( width != 1 ); // can't be 1x1
+      halfHeight = 1;
+      
+      for( jj = 0; jj < halfWidth; jj++ ) {
+        int kk;
+        for( kk = 0; kk < components; kk++ ) {
+          long[] uint = new long[BOX2];
+          if( myswap_bytes ) {
+            datain.position( src );
+            uint[0] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+            datain.position( src + group_size );
+            uint[1] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+          } else {
+            datain.position( src );
+            uint[0] = ( 0x00000000FFFFFFFF & datain.getInt() );
+            datain.position( src + group_size );
+            uint[1] = ( 0x00000000FFFFFFFF & datain.getInt() );
+          }
+          dataout.put( (int)( ( (float)uint[0] + (float)uint[1] ) / 2.0f) );
+          src += element_size;
+          dest += 4;
+        }
+        src += group_size; // skip to next 2
+      }
+      int padBytes = ysize - ( width * group_size );
+      src += padBytes; // for assertion only
+    } else if( width == 1 ) {
+      int padBytes = ysize - ( width * group_size );
+      assert( height != 1 );
+      halfWidth = 1;
+      // one vertical column with possible pad bytes per row
+      // average two at a time
+      
+      for( jj = 0; jj < halfHeight; jj++ ) {
+        int kk;
+        for( kk = 0; kk < components; kk++ ) {
+          long[] uint = new long[BOX2];
+          if( myswap_bytes ) {
+            datain.position( src );
+            uint[0] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+            datain.position( src + ysize );
+            uint[1] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
+          } else {
+            datain.position( src );
+            uint[0] = ( 0x00000000FFFFFFFF & datain.getInt() );
+            datain.position( src + ysize );
+            uint[1] = ( 0x00000000FFFFFFFF & datain.getInt() );
+          }
+          dataout.put( (int)(( (float)uint[0] + (float)uint[1] ) / 2.0f) );
+          src += element_size;
+          dest += 4;
+        }
+        src += padBytes; // add pad bytes, if any, to get to end of row
+        src += ysize;
+      }
+      assert( src == ysize * height );
+    }
+    assert( dest == ( components * element_size * halfWidth * halfHeight ) );
+  }
+  
+  public static void halveImage_float( int components, int width, int height,
+                    ByteBuffer datain, FloatBuffer dataout, int element_size,
+                    int ysize, int group_size, boolean myswap_bytes ) {
+    int i, j, k, l;
+    int newwidth, newheight;
+    int s = 0;
+    int t = 0;
+    float temp = 0.0f;
+    // handle case where there is only 1 column/row
+    if( width == 1 || height == 1 ) {
+      assert( !( width == 1 && height == 1 ) ); // can't be 1x1
+      halve1Dimage_float( components, width, height, datain, dataout, element_size,
+                                              ysize, group_size, myswap_bytes );
+      return;
+    }
+    
+    newwidth = width / 2;
+    newheight = height / 2;
+    
+    // Piece of cake
+    if( !myswap_bytes ) {
+      for( i = 0; i < newheight; i++ ) {
+        for( j = 0; j < newwidth; j++ ) {
+          for( k = 0; k < components; k++ ) {
+            datain.position( t );
+            temp = datain.getFloat();
+            datain.position( t + group_size );
+            temp += datain.getFloat();
+            datain.position( t + ysize );
+            temp += datain.getFloat();
+            datain.position( t + ysize + group_size );
+            temp /= 4.0f;
+            dataout.put( temp );
+            t += element_size;
+          }
+          t += group_size;
+        }
+        t += ysize;
+      }
+    } else {
+      for( i = 0; i < newheight; i++ ) {
+        for( j = 0; j < newwidth; j++ ) {
+          for( k = 0; k < components; k++ ) {
+            float buf;
+            datain.position( t );
+            buf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+            datain.position( t + group_size );
+            buf += Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+            datain.position( t + ysize );
+            buf += Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+            datain.position( t + ysize + group_size );
+            buf += Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+            dataout.put( buf / 4.0f );
+            t += element_size;
+          }
+          t += group_size;
+        }
+        t += ysize;
+      }
+    }
+  }
+  
+  public static void halve1Dimage_float( int components, int width, int height,
+              ByteBuffer datain, FloatBuffer dataout, int element_size, int ysize,
+              int group_size, boolean myswap_bytes ) {
+    int halfWidth = width / 2;
+    int halfHeight = height / 2;
+    int src = 0;
+    int dest = 0;
+    int jj;
+    
+    assert( width == 1 || height == 1 ); // must be 1D
+    assert( width != height ); // can't be square
+    
+    if( height == 1 ) { // 1 row
+      assert( width != 1 ); // can't be 1x1
+      halfHeight = 1;
+      
+      for( jj = 0; jj < halfWidth; jj++ ) {
+        int kk;
+        for( kk = 0; kk < components; kk++ ) {
+          float[] sfloat = new float[BOX2];
+          if( myswap_bytes ) {
+            datain.position( src );
+            sfloat[0] = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+            datain.position( src + group_size );
+            sfloat[1] = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+          } else {
+            datain.position( src );
+            sfloat[0] = datain.getFloat();
+            datain.position( src + group_size );
+            sfloat[1] = datain.getFloat();
+          }
+          dataout.put( (sfloat[0] + sfloat[1]) / 2.0f );
+          src += element_size;
+          dest += 4;
+        }
+        src += group_size; // skip to next 2
+      }
+      int padBytes = ysize - ( width * group_size );
+      src += padBytes; // for assertion only
+    } else if( width == 1 ) {
+      int padBytes = ysize - ( width * group_size );
+      assert( height != 1 );
+      halfWidth = 1;
+      // one vertical column with possible pad bytes per row
+      // average two at a time
+      
+      for( jj = 0; jj < halfHeight; jj++ ) {
+        int kk;
+        for( kk = 0; kk < components; kk++ ) {
+          float[] sfloat = new float[BOX2];
+          if( myswap_bytes ) {
+            datain.position( src );
+            sfloat[0] = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+            datain.position( src + ysize );
+            sfloat[1] = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+          } else {
+            datain.position( src );
+            sfloat[0] = datain.getFloat();
+            datain.position( src + ysize );
+            sfloat[1] = datain.getFloat();
+          }
+          dataout.put( ( sfloat[0] + sfloat[1] ) / 2.0f );
+          src += element_size;
+          dest += 4;
+        }
+        src += padBytes; // add pad bytes, if any, to get to end of row
+        src += ysize;
+      }
+      assert( src == ysize * height );
+    }
+    assert( dest == ( components * element_size * halfWidth * halfHeight ) );
+  }
+  
+  public static void halveImagePackedPixel( int components, Extract extract, int width, 
+          int height, ByteBuffer datain, ByteBuffer dataout, 
+          int pixelSizeInBytes, int rowSizeInBytes, boolean isSwap ) {
+    if( width == 1 || height == 1 ) {
+      assert( !( width == 1 && height == 1 ) );
+      halve1DimagePackedPixel( components, extract, width, height, datain, dataout,
+                          pixelSizeInBytes, rowSizeInBytes, isSwap );
+      return;
+    }
+    int ii, jj;
+    
+    int halfWidth = width / 2;
+    int halfHeight = height / 2;
+    int src = 0;
+    int padBytes = rowSizeInBytes - ( width * pixelSizeInBytes );
+    int outIndex = 0;
+    
+    for( ii = 0; ii < halfHeight; ii++ ) {
+      for( jj = 0; jj < halfWidth; jj++ ) {
+        float totals[] = new float[4];
+        float extractTotals[][] = new float[BOX4][4];
+        int cc;
+        
+        datain.position( src );
+        extract.extract( isSwap, datain, extractTotals[0] );
+        datain.position( src + pixelSizeInBytes );
+        extract.extract( isSwap, datain, extractTotals[1] );
+        datain.position( src + rowSizeInBytes );
+        extract.extract( isSwap, datain, extractTotals[2] );
+        datain.position( src + rowSizeInBytes + pixelSizeInBytes );
+        extract.extract( isSwap, datain, extractTotals[3] );
+        for( cc = 0; cc < components; cc++ ) {
+          int kk = 0;
+          // grab 4 pixels to average
+          totals[cc] = 0.0f;
+          for( kk = 0; kk < BOX4; kk++ ) {
+            totals[cc] += extractTotals[kk][cc];
+          }
+          totals[cc] /= BOX4;
+        }
+        extract.shove( totals, outIndex, dataout );
+        outIndex++;
+        src += pixelSizeInBytes + pixelSizeInBytes;
+      }
+      // skip past pad bytes, if any, to get to next row
+      src += padBytes;
+      src += rowSizeInBytes;
+    }
+    assert( src == rowSizeInBytes * height );
+    assert( outIndex == halfWidth * halfHeight );
+  }
+  
+  public static void halve1DimagePackedPixel( int components, Extract extract, int width,
+              int height, ByteBuffer datain, ByteBuffer dataout,
+              int pixelSizeInBytes, int rowSizeInBytes, boolean isSwap ) {
+    int halfWidth = width / 2;
+    int halfHeight = height / 2;
+    int src = 0;
+    int jj;
+    
+    assert( width == 1 || height == 1 );
+    assert( width != height );
+    
+    if( height == 1 ) {
+      int outIndex = 0;
+      
+      assert( width != 1 );
+      halfHeight = 1;
+      
+      // one horizontal row with possible pad bytes
+      
+      for( jj = 0; jj < halfWidth; jj++ ) {
+        float[] totals = new float[4];
+        float[][] extractTotals = new float[BOX2][4];
+        int cc;
+        
+        datain.position( src );
+        extract.extract( isSwap, datain, extractTotals[0] );
+        datain.position( src + pixelSizeInBytes );
+        extract.extract( isSwap, datain, extractTotals[1] );
+        for( cc = 0; cc < components; cc++ ) {
+          int kk = 0;
+          // grab 4 pixels to average
+          totals[cc] = 0.0f;
+          for( kk = 0; kk < BOX2; kk++ ) {
+            totals[cc] += extractTotals[kk][cc];
+          }
+          totals[cc] /= BOX2;
+        }
+        extract.shove( totals, outIndex, dataout );
+        outIndex++;
+        // skip over to next group of 2
+        src += pixelSizeInBytes + pixelSizeInBytes;
+      }
+      int padBytes = rowSizeInBytes - ( width * pixelSizeInBytes );
+      src += padBytes;
+      
+      assert( src == rowSizeInBytes );
+      assert( outIndex == halfWidth * halfHeight );
+    } else if( width == 1 ) {
+      int outIndex = 0;
+      
+      assert( height != 1 );
+      halfWidth = 1;
+      // one vertical volumn with possible pad bytes per row
+      // average two at a time
+      
+      for( jj = 0; jj < halfHeight; jj++ ) {
+        float[] totals = new float[4];
+        float[][] extractTotals = new float[BOX2][4];
+        int cc;
+        // average two at a time, instead of four
+        datain.position( src );
+        extract.extract( isSwap, datain, extractTotals[0] );
+        datain.position( src + rowSizeInBytes );
+        extract.extract( isSwap, datain, extractTotals[1] );
+        for( cc = 0; cc < components; cc++ ) {
+          int kk = 0;
+          // grab 4 pixels to average
+          totals[cc] = 0.0f;
+          for( kk = 0; kk < BOX2; kk++ ) {
+            totals[cc] += extractTotals[kk][cc];
+          }
+          totals[cc] /= BOX2;
+        }
+        extract.shove( totals, outIndex, dataout );
+        outIndex++;
+        // skip over to next group of 2
+        src += rowSizeInBytes + rowSizeInBytes;
+      }
+      assert( src == rowSizeInBytes );
+      assert( outIndex == halfWidth * halfHeight );
+    }
+  }
+  
+  public static void halveImagePackedPixelSlice( int components, Extract extract,
+          int width, int height, int depth, ByteBuffer dataIn,
+          ByteBuffer dataOut, int pixelSizeInBytes, int rowSizeInBytes,
+          int imageSizeInBytes, boolean isSwap ) {
+    int ii, jj;
+    int halfWidth = width / 2;
+    int halfHeight = height / 2;
+    int halfDepth = depth / 2;
+    int src = 0;
+    int padBytes = rowSizeInBytes - ( width * pixelSizeInBytes );
+    int outIndex = 0;
+    
+    assert( (width == 1 || height == 1) && depth >= 2 );
+    
+    if( width == height ) {
+      assert( width == 1 && height == 1 );
+      assert( depth >= 2 );
+      
+      for( ii = 0; ii < halfDepth; ii++ ) {
+        float totals[] = new float[4];
+        float extractTotals[][] = new float[BOX2][4];
+        int cc;
+        
+        dataIn.position( src );
+        extract.extract( isSwap, dataIn, extractTotals[0] );
+        dataIn.position( src + imageSizeInBytes );
+        extract.extract( isSwap, dataIn, extractTotals[1] );
+        
+        for( cc = 0; cc < components; cc++ ) {
+          int kk;
+          
+          // average only 2 pixels since a column
+          totals[cc]= 0.0f;
+          for( kk = 0; kk < BOX2; kk++ ) {
+            totals[cc] += extractTotals[kk][cc];
+          }
+          totals[cc] /= BOX2;
+        } // for cc
+        
+        extract.shove( totals, outIndex, dataOut );
+        outIndex++;
+        // skip over to next group of 2
+        src += imageSizeInBytes + imageSizeInBytes;
+      } // for ii
+    } else if( height == 1 ) {
+      assert( width != 1 );
+      
+      for( ii = 0; ii < halfDepth; ii++ ) {
+        for( jj = 0; jj < halfWidth; jj++ ) {
+          float totals[] = new float[4];
+          float extractTotals[][] = new float[BOX4][4];
+          int cc;
+          
+          dataIn.position( src );
+          extract.extract( isSwap, dataIn, extractTotals[0] );
+          dataIn.position( src + pixelSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[1] );
+          dataIn.position( src + imageSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[2] );
+          dataIn.position( src + pixelSizeInBytes + imageSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[3] );
+          
+          for( cc = 0; cc < components; cc++ ) {
+            int kk;
+            
+            // grab 4 pixels to average
+            totals[cc] = 0.0f;
+            for( kk = 0; kk < BOX4; kk++ ) {
+              totals[cc]+= extractTotals[kk][cc];
+            }
+            totals[cc]/= (float)BOX4;
+          }
+          extract.shove( totals, outIndex, dataOut );
+          outIndex++;
+          // skip over to next horizontal square of 4
+          src += imageSizeInBytes + imageSizeInBytes;
+        }
+      }
+    } else if( width == 1 ) {
+      assert( height != 1 );
+      
+      for( ii = 0; ii < halfDepth; ii++ ) {
+        for( jj = 0; jj < halfWidth; jj++ ) {
+          float totals[] = new float[4];
+          float extractTotals[][] = new float[BOX4][4];
+          int cc;
+          
+          dataIn.position( src );
+          extract.extract( isSwap, dataIn, extractTotals[0] );
+          dataIn.position( src + rowSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[1] );
+          dataIn.position( src + imageSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[2] );
+          dataIn.position( src + rowSizeInBytes + imageSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[3] );
+          
+          for( cc = 0; cc < components; cc++ ) {
+            int kk;
+            
+            // grab 4 pixels to average
+            totals[cc] = 0.0f;
+            for( kk = 0; kk < BOX4; kk++ ) {
+              totals[cc]+= extractTotals[kk][cc];
+            }
+            totals[cc]/= (float)BOX4;
+          }
+          extract.shove( totals, outIndex, dataOut );
+          outIndex++;
+          // skip over to next horizontal square of 4
+          src += imageSizeInBytes + imageSizeInBytes;
+        }
+      }
+    }
+  }
+  
+  public static void halveImageSlice( int components, ExtractPrimitive extract, int width,
+          int height, int depth, ByteBuffer dataIn, ByteBuffer dataOut,
+          int elementSizeInBytes, int groupSizeInBytes, int rowSizeInBytes,
+          int imageSizeInBytes, boolean isSwap ) {
+    int ii, jj;
+    int halfWidth = width / 2;
+    int halfHeight = height / 2;
+    int halfDepth = depth / 2;
+    int src = 0;
+    int padBytes = rowSizeInBytes - ( width * groupSizeInBytes );
+    int outIndex = 0;
+    
+    assert( (width == 1 || height == 1) && depth >= 2 );
+    
+    if( width == height ) {
+      assert( width == 1 && height == 1 );
+      assert( depth >= 2 );
+      
+      for( ii = 0; ii < halfDepth; ii++ ) {
+        int cc;
+        for( cc = 0; cc < components; cc++ ) {
+          double[] totals = new double[4];
+          double[][] extractTotals = new double[BOX2][4];
+          int kk;
+          
+          dataIn.position( src );
+          extractTotals[0][cc] = extract.extract( isSwap, dataIn );
+          dataIn.position( src + imageSizeInBytes );
+          extractTotals[1][cc] = extract.extract( isSwap, dataIn );
+          
+          // average 2 pixels since only a column
+          totals[cc] = 0.0f;
+          // totals[red] = extractTotals[0][red] + extractTotals[1][red];
+          // totals[red] = red / 2;
+          for( kk = 0; kk < BOX2; kk++ ) {
+            totals[cc] += extractTotals[kk][cc];
+          }
+          totals[cc] /= (double)BOX2;
+          
+          extract.shove( totals[cc], outIndex, dataOut );
+          outIndex++;
+          src += elementSizeInBytes;
+        } // for cc
+        // skip over next group of 2
+        src += rowSizeInBytes;
+      } // for ii
+      
+      assert( src == rowSizeInBytes * height * depth );
+      assert( outIndex == halfDepth * components );
+    } else if( height == 1 ) {
+      assert( width != 1 );
+      
+      for( ii = 0; ii < halfDepth; ii++ ) {
+        for( jj = 0; jj < halfWidth; jj++ ) {
+          int cc;
+          for( cc = 0; cc < components; cc++ ) {
+            int kk;
+            double totals[] = new double[4];
+            double extractTotals[][] = new double[BOX4][4];
+            
+            dataIn.position( src );
+            extractTotals[0][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + groupSizeInBytes );
+            extractTotals[1][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + imageSizeInBytes );
+            extractTotals[2][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + imageSizeInBytes + groupSizeInBytes );
+            extractTotals[3][cc] = extract.extract( isSwap, dataIn );
+            
+            // grab 4 pixels to average
+            totals[cc] = 0.0f;
+            // totals[red] = extractTotals[0][red] + extractTotals[1][red] +
+            //               extractTotals[2][red] + extractTotals[3][red];
+            // totals[red] /= (double)BOX4;
+            for( kk = 0; kk < BOX4; kk++ ) {
+              totals[cc] += extractTotals[kk][cc];
+            }
+            totals[cc] /= (double)BOX4;
+            
+            extract.shove( totals[cc], outIndex, dataOut );
+            outIndex++;
+            src += elementSizeInBytes;
+          } // for cc
+          // skip over to next horizontal square of 4
+          src += elementSizeInBytes;
+        } // for jj
+        src += padBytes;
+        src += rowSizeInBytes;
+      } // for ii
+      assert( src == rowSizeInBytes * height * depth );
+      assert( outIndex == halfWidth * halfDepth * components );
+    } else if( width == 1 ) {
+      assert( height != 1 );
+      
+      for( ii = 0; ii < halfDepth; ii++ ) {
+        for( jj = 0; jj < halfHeight; jj++ ) {
+          int cc;
+          for( cc = 0; cc < components; cc++ ) {
+            int kk;
+            double totals[] = new double[4];
+            double extractTotals[][] = new double[BOX4][4];
+            
+            dataIn.position( src );
+            extractTotals[0][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + rowSizeInBytes );
+            extractTotals[1][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + imageSizeInBytes );
+            extractTotals[2][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + imageSizeInBytes + groupSizeInBytes );
+            extractTotals[3][cc] = extract.extract( isSwap, dataIn );
+            
+            
+            // grab 4 pixels to average
+            totals[cc] = 0.0f;
+            // totals[red] = extractTotals[0][red] + extractTotals[1][red] +
+            //               extractTotals[2][red] + extractTotals[3][red];
+            // totals[red] /= (double)BOX4;
+            for( kk = 0; kk < BOX4; kk++ ) {
+              totals[cc] += extractTotals[kk][cc];
+            }
+            totals[cc] /= (double)BOX4;
+            
+            extract.shove( totals[cc], outIndex, dataOut );
+            outIndex++;
+            src += elementSizeInBytes;
+          } // for cc
+          // skip over to next horizontal square of 4
+          src += padBytes;
+          src += rowSizeInBytes;
+        } // for jj
+        src += imageSizeInBytes;
+      } // for ii
+      assert( src == rowSizeInBytes * height * depth );
+      assert( outIndex == halfWidth * halfDepth * components );
+    }
+  }
+  
+  public static void halveImage3D( int components, ExtractPrimitive extract,
+          int width, int height, int depth, ByteBuffer dataIn, ByteBuffer dataOut,
+          int elementSizeInBytes, int groupSizeInBytes, int rowSizeInBytes,
+          int imageSizeInBytes, boolean isSwap ) {
+    assert( depth > 1 );
+    
+    // horizontal/vertical/onecolumn slice viewed from top
+    if( width == 1 || height == 1 ) {
+      assert( 1 <= depth );
+      
+      halveImageSlice( components, extract, width, height, depth, dataIn, dataOut,
+              elementSizeInBytes, groupSizeInBytes, rowSizeInBytes, imageSizeInBytes,
+              isSwap );
+      return;
+    }
+    
+    int ii, jj, dd;
+    
+    int halfWidth = width / 2;
+    int halfHeight = height / 2;
+    int halfDepth = depth / 2;
+    int src = 0;
+    int padBytes = rowSizeInBytes - ( width * groupSizeInBytes );
+    int outIndex = 0;
+    
+    for( dd = 0; dd < halfDepth; dd++ ) {
+      for( ii = 0; ii < halfHeight; ii++ ) {
+        for( jj = 0; jj < halfWidth; jj++ ) {
+          int cc;
+          for( cc = 0; cc < components; cc++ ) {
+            int kk;
+            double totals[] = new double[4];
+            double extractTotals[][] = new double[BOX8][4];
+            
+            dataIn.position( src );
+            extractTotals[0][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + groupSizeInBytes );
+            extractTotals[1][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + rowSizeInBytes );
+            extractTotals[2][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + rowSizeInBytes + groupSizeInBytes );
+            extractTotals[3][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + imageSizeInBytes );
+            extractTotals[4][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + groupSizeInBytes + imageSizeInBytes );
+            extractTotals[5][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + rowSizeInBytes + imageSizeInBytes );
+            extractTotals[6][cc] = extract.extract( isSwap, dataIn );
+            dataIn.position( src + rowSizeInBytes + imageSizeInBytes + groupSizeInBytes );
+            extractTotals[7][cc] = extract.extract( isSwap, dataIn );
+            
+            totals[cc] = 0.0f;
+            
+            for( kk = 0; kk < BOX8; kk++ ) {
+              totals[cc] += extractTotals[kk][cc];
+            }
+            totals[cc] /= (double)BOX8;
+            
+            extract.shove( totals[cc], outIndex, dataOut );
+            outIndex++;
+            
+            src += elementSizeInBytes;
+          } // for cc
+          // skip over to next square of 4
+          src += groupSizeInBytes;
+        } // for jj
+        // skip past pad bytes, if any, to get to next row
+        src += padBytes;
+        src += rowSizeInBytes;
+      } // for ii
+      src += imageSizeInBytes;
+    } // for dd
+    assert( src == rowSizeInBytes * height * depth );
+    assert( outIndex == halfWidth * halfHeight * halfDepth * components );
+  }
+  
+  public static void halveImagePackedPixel3D( int components, Extract extract,
+          int width, int height, int depth, ByteBuffer dataIn, 
+          ByteBuffer dataOut, int pixelSizeInBytes, int rowSizeInBytes,
+          int imageSizeInBytes, boolean isSwap ) {
+    if( depth == 1 ) {
+      assert( 1 <= width && 1 <= height );
+      
+      halveImagePackedPixel( components, extract, width, height, dataIn, dataOut,
+              pixelSizeInBytes, rowSizeInBytes, isSwap );
+      return;
+    } else if( width == 1 || height == 1 ) { // a horizontal or vertical slice viewed from top
+      assert( 1 <= depth );
+      
+      halveImagePackedPixelSlice( components, extract, width, height, depth, dataIn,
+              dataOut, pixelSizeInBytes, rowSizeInBytes, imageSizeInBytes, isSwap );
+      return;
+    }
+    int ii, jj, dd;
+    
+    int halfWidth = width / 2;
+    int halfHeight = height / 2;
+    int halfDepth = depth / 2;
+    int src = 0;
+    int padBytes = rowSizeInBytes - ( width * pixelSizeInBytes );
+    int outIndex = 0;
+    
+    for( dd = 0; dd < halfDepth; dd++ ) {
+      for( ii = 0; ii < halfHeight; ii++ ) {
+        for( jj = 0; jj < halfWidth; jj++ ) {
+          float totals[] = new float[4]; // 4 is max components
+          float extractTotals[][] = new float[BOX8][4];
+          int cc;
+          
+          dataIn.position( src );
+          extract.extract( isSwap, dataIn, extractTotals[0] );
+          dataIn.position( src + pixelSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[1] );
+          dataIn.position( src + rowSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[2] );
+          dataIn.position( src + rowSizeInBytes + pixelSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[3] );
+          dataIn.position( src + imageSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[4] );
+          dataIn.position( src + pixelSizeInBytes + imageSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[5] );
+          dataIn.position( src + rowSizeInBytes + imageSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[6] );
+          dataIn.position( src + rowSizeInBytes + pixelSizeInBytes + imageSizeInBytes );
+          extract.extract( isSwap, dataIn, extractTotals[7] );
+          
+          for( cc = 0; cc < components; cc++ ) {
+            int kk;
+            // grab 8 pixels to average
+            totals[cc] = 0.0f;
+            for( kk = 0; kk < BOX8; kk++ ) {
+              totals[cc] += extractTotals[kk][cc];
+            }
+            totals[cc] /= (float)BOX8;
+          }
+          extract.shove( totals, outIndex, dataOut );
+          outIndex++;
+          // skip over to next square of 4
+          src += pixelSizeInBytes + pixelSizeInBytes;
+        }
+        // skip past pad bytes, if any, to get to next row
+        src += padBytes;
+        src += rowSizeInBytes;
+      }
+      src += imageSizeInBytes;
+    }
+    assert( src == rowSizeInBytes * height * depth );
+    assert( outIndex == halfWidth * halfHeight * halfDepth );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Image.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Image.java
new file mode 100644
index 000000000..b2aaad2f7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Image.java
@@ -0,0 +1,1413 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
+import java.nio.*;
+
+/**
+ *
+ * @author  Administrator
+ */
+public class Image {
+  
+  /** Creates a new instance of Image */
+  public Image() {
+  }
+  
+  public static short getShortFromByteArray( byte[] array, int index ) {
+    short s;
+    s = (short)(array[index] << 8 );
+    s |= (short)(0x00FF & array[index+1]);
+    return( s );
+  }
+  
+  public static int getIntFromByteArray( byte[] array, int index ) {
+    int i;
+    i = ( array[index] << 24 ) & 0xFF000000;
+    i |= ( array[index+1] << 16 ) & 0x00FF0000;
+    i |= ( array[index+2] << 8 ) & 0x0000FF00;
+    i |= ( array[index+3] ) & 0x000000FF;
+    return( i );
+  }
+  
+  public static float getFloatFromByteArray( byte[] array, int index ) {
+    int i = getIntFromByteArray( array, index );
+    return( Float.intBitsToFloat(i) );
+  }
+  
+  /*
+   *  Extract array from user's data applying all pixel store modes.
+   *  The internal format used is an array of unsigned shorts.
+   */
+  public static void fill_image( PixelStorageModes psm, int width, int height,
+                  int format, int type, boolean index_format, ByteBuffer userdata,
+                  ShortBuffer newimage ) {
+    int components;
+    int element_size;
+    int rowsize;
+    int padding;
+    int groups_per_line;
+    int group_size;
+    int elements_per_line;
+    int start;
+    int iter = 0;
+    int iter2;
+    int i, j, k;
+    boolean myswap_bytes;
+    
+    // Create a Extract interface object
+    Extract extract = null;
+    switch( type ) {
+      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+        extract = new Extract332();
+        break;
+      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+        extract = new Extract233rev();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+        extract = new Extract565();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+        extract = new Extract565rev();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+        extract = new Extract4444();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+        extract = new Extract4444rev();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+        extract = new Extract5551();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+        extract = new Extract1555rev();
+        break;
+      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+        extract = new Extract8888();
+        break;
+      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+        extract = new Extract8888rev();
+        break;
+      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+        extract = new Extract1010102();
+        break;
+      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+        extract = new Extract2101010rev();
+        break;
+    }
+    
+    myswap_bytes = psm.getUnpackSwapBytes();
+    components = Mipmap.elements_per_group( format, type );
+    if( psm.getUnpackRowLength() > 0 ) {
+      groups_per_line = psm.getUnpackRowLength();
+    } else {
+      groups_per_line = width;
+    }
+    
+    // All formats except GL_BITMAP fall out trivially
+    if( type == GL2.GL_BITMAP ) {
+      int bit_offset;
+      int current_bit;
+      
+      rowsize = ( groups_per_line * components + 7 ) / 8;
+      padding = ( rowsize % psm.getUnpackAlignment() );
+      if( padding != 0 ) {
+        rowsize += psm.getUnpackAlignment() - padding;
+      }
+      start = psm.getUnpackSkipRows() * rowsize + ( psm.getUnpackSkipPixels() * components / 8 );
+      elements_per_line = width * components;
+      iter2 = 0;
+      for( i = 0; i < height; i++ ) {
+        iter = start;
+        userdata.position( iter ); // ****************************************
+        bit_offset = (psm.getUnpackSkipPixels() * components) % 8;
+        for( j = 0; j < elements_per_line; j++ ) {
+          // retrieve bit
+          if( psm.getUnpackLsbFirst() ) {
+            userdata.position( iter );
+            current_bit = ( userdata.get() & 0x000000FF ) & ( 1 << bit_offset );//userdata[iter] & ( 1 << bit_offset );
+          } else {
+            current_bit = ( userdata.get() & 0x000000FF ) & ( 1 << ( 7 - bit_offset ) );
+          }
+          if( current_bit != 0 ) {
+            if( index_format ) {
+              newimage.position( iter2 );
+              newimage.put( (short)1 );
+            } else {
+              newimage.position( iter2 );
+              newimage.put( (short)65535 );
+            }
+          } else {
+            newimage.position( iter2 );
+            newimage.put( (short)0 );
+          }
+          bit_offset++;
+          if( bit_offset == 8 ) {
+            bit_offset = 0;
+            iter++;
+          }
+          iter2++;
+        }
+        start += rowsize;
+      }
+    } else {
+      element_size = Mipmap.bytes_per_element( type );
+      group_size = element_size * components;
+      if( element_size == 1 ) {
+        myswap_bytes = false;
+      }
+      
+      rowsize = groups_per_line * group_size;
+      padding = ( rowsize % psm.getUnpackAlignment() );
+      if( padding != 0 ) {
+        rowsize += psm.getUnpackAlignment() - padding;
+      }
+      start = psm.getUnpackSkipRows() * rowsize + psm.getUnpackSkipPixels() * group_size;
+      elements_per_line = width * components;
+      
+      iter2 = 0;
+      for( i = 0; i < height; i++ ) {
+        iter = start;
+        userdata.position( iter ); //***************************************
+        for( j = 0; j < elements_per_line; j++ ) {
+          Type_Widget widget = new Type_Widget();
+          float[] extractComponents = new float[4];
+          userdata.position( iter );
+          switch( type ) {
+            case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+              extract.extract( false, userdata /*userdata[iter]*/, extractComponents );
+              for( k = 0; k < 3; k++ ) {
+                newimage.put( iter2++, (short)(extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+              extract.extract( false, userdata /*userdata[iter]*/, extractComponents );
+              for( k = 0; k < 3; k++ ) {
+                newimage.put( iter2++, (short)(extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_BYTE ):
+              if( index_format ) {
+                newimage.put( iter2++, (short)( 0x000000FF & userdata.get() ) );//userdata[iter];
+              } else {
+                newimage.put( iter2++, (short)( 0x000000FF & userdata.get()/*userdata[iter]*/ * 257 ) );
+              }
+              break;
+            case( GL2.GL_BYTE ):
+              if( index_format ) {
+                newimage.put( iter2++, userdata.get() ); //userdata[iter];
+              } else {
+                newimage.put( iter2++, (short)(userdata.get()/*userdata[iter]*/ * 516 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+              extract.extract( myswap_bytes, userdata/*userdata[iter]*/, extractComponents );
+              for( k = 0; k < 3; k++ ) {
+                newimage.put( iter2++, (short)(extractComponents[k] * 65535) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+              extract.extract( myswap_bytes, userdata, extractComponents );
+              for( k = 0; k < 3; k++ ) {
+                newimage.put( iter2++, (short)(extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+              extract.extract( myswap_bytes, userdata, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newimage.put( iter2++, (short)(extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+              extract.extract( myswap_bytes, userdata, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newimage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+              extract.extract( myswap_bytes, userdata, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newimage.put( iter2++, (short)(extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+              extract.extract( myswap_bytes, userdata, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newimage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT ):
+            case( GL2.GL_SHORT ):
+              if( myswap_bytes ) {
+                widget.setUB1( userdata.get() );
+                widget.setUB0( userdata.get() );
+              } else {
+                widget.setUB0( userdata.get() );
+                widget.setUB1( userdata.get() );
+              }
+              if( type == GL2.GL_SHORT ) {
+                if( index_format ) {
+                  newimage.put( iter2++, widget.getS0() );
+                } else {
+                  newimage.put( iter2++, (short)(widget.getS0() * 2) );
+                }
+              } else {
+                newimage.put( iter2++, widget.getUS0() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+              extract.extract( myswap_bytes, userdata, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newimage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+              extract.extract( myswap_bytes, userdata, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newimage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+              extract.extract( myswap_bytes, userdata, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newimage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+              extract.extract( myswap_bytes, userdata, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newimage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_INT ):
+            case( GL2.GL_UNSIGNED_INT ):
+            case( GL2.GL_FLOAT ):
+              if( myswap_bytes ) {
+                widget.setUB3( userdata.get() );
+                widget.setUB2( userdata.get() );
+                widget.setUB1( userdata.get() );
+                widget.setUB0( userdata.get() );
+              } else {
+                widget.setUB0( userdata.get() );
+                widget.setUB1( userdata.get() );
+                widget.setUB2( userdata.get() );
+                widget.setUB3( userdata.get() );
+              }
+              if( type == GL2.GL_FLOAT ) {
+                if( index_format ) {
+                  newimage.put( iter2++, (short)widget.getF() );
+                } else {
+                  newimage.put( iter2++, (short)(widget.getF() * 65535 ) );
+                }
+              } else if( type == GL2.GL_UNSIGNED_INT ) {
+                if( index_format ) {
+                  newimage.put( iter2++, (short)( widget.getUI() ) );
+                } else {
+                  newimage.put( iter2++, (short)( widget.getUI() >> 16 ) );
+                }
+              } else {
+                if( index_format ) {
+                  newimage.put( iter2++, (short)( widget.getI() ) );
+                } else {
+                  newimage.put( iter2++, (short)( widget.getI() >> 15 ) );
+                }
+              }
+              break;
+          }
+          iter += element_size;
+        }  // for j
+        start += rowsize;
+        // want iter pointing at start, not within, row for assertion purposes
+        iter = start;
+      } // for i
+      
+      // iterators should be one byte past end
+      if( !Mipmap.isTypePackedPixel( type ) ) {
+        assert( iter2 == ( width * height * components ) );
+      } else {
+        assert( iter2 == ( width * height * Mipmap.elements_per_group( format, 0 ) ) );
+      }
+      assert( iter == ( rowsize * height + psm.getUnpackSkipRows() * rowsize + psm.getUnpackSkipPixels() * group_size ) );
+    }
+  }
+  
+  /*
+   *  Insert array into user's data applying all pixel store modes.
+   *  Theinternal format is an array of unsigned shorts.
+   *  empty_image() because it is the opposet of fill_image().
+   */
+  public static void empty_image( PixelStorageModes psm, int width, int height, 
+                                  int format, int type, boolean index_format, 
+                                  ShortBuffer oldimage, ByteBuffer userdata ) {
+    
+    int components;
+    int element_size;
+    int rowsize;
+    int padding;
+    int groups_per_line;
+    int group_size;
+    int elements_per_line;
+    int start;
+    int iter = 0;
+    int iter2;
+    int i, j, k;
+    boolean myswap_bytes;
+    
+    // Create a Extract interface object
+    Extract extract = null;
+    switch( type ) {
+      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+        extract = new Extract332();
+        break;
+      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+        extract = new Extract233rev();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+        extract = new Extract565();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+        extract = new Extract565rev();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+        extract = new Extract4444();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+        extract = new Extract4444rev();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+        extract = new Extract5551();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+        extract = new Extract1555rev();
+        break;
+      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+        extract = new Extract8888();
+        break;
+      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+        extract = new Extract8888rev();
+        break;
+      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+        extract = new Extract1010102();
+        break;
+      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+        extract = new Extract2101010rev();
+        break;
+    }
+    
+    myswap_bytes = psm.getPackSwapBytes();
+    components = Mipmap.elements_per_group( format, type );
+    if( psm.getPackRowLength() > 0 ) {
+      groups_per_line = psm.getPackRowLength();
+    } else {
+      groups_per_line = width;
+    }
+    
+    // all formats except GL_BITMAP fall out trivially
+    if( type == GL2.GL_BITMAP ) {
+      int bit_offset;
+      int current_bit;
+      
+      rowsize = ( groups_per_line * components + 7 ) / 8;
+      padding = ( rowsize % psm.getPackAlignment() );
+      if( padding != 0 ) {
+        rowsize += psm.getPackAlignment() - padding;
+      }
+      start = psm.getPackSkipRows() * rowsize + psm.getPackSkipPixels() * components / 8;
+      elements_per_line = width * components;
+      iter2 = 0;
+      for( i = 0; i < height; i++ ) {
+        iter = start;
+        bit_offset = ( psm.getPackSkipPixels() * components ) % 8;
+        for( j = 0; j < elements_per_line; j++ ) {
+          if( index_format ) {
+            current_bit = oldimage.get( iter2 ) & 1;
+          } else {
+            if( oldimage.get( iter2 ) < 0 ) { // must check for negative rather than 32767
+              current_bit = 1;
+            } else {
+              current_bit = 0;
+            }
+          }
+          
+          if( current_bit != 0 ) {
+            if( psm.getPackLsbFirst() ) {
+              userdata.put( iter, (byte)( ( userdata.get( iter ) | ( 1 << bit_offset ) ) ) );
+            } else {
+              userdata.put( iter, (byte)( ( userdata.get( iter ) | ( 7 - bit_offset ) ) ) );
+            }
+          } else {
+            if( psm.getPackLsbFirst() ) {
+              //userdata[iter] &= ~( 1 << bit_offset );
+              userdata.put( iter, (byte)( ( userdata.get( iter ) & ~( 1 << bit_offset ) ) ) );
+            } else {
+              //userdata[iter] &= ~( 1 << ( 7 - bit_offset ) );
+              userdata.put( iter, (byte)( ( userdata.get( iter ) & ~( 7 - bit_offset ) ) ) );
+            }
+          }
+          
+          bit_offset++;
+          if( bit_offset == 8 ) {
+            bit_offset = 0;
+            iter++;
+          }
+          iter2++;
+        }
+        start += rowsize;
+      }
+    } else {
+      float shoveComponents[] = new float[4];
+      
+      element_size = Mipmap.bytes_per_element( type );
+      group_size = element_size * components;
+      if( element_size == 1 ) {
+        myswap_bytes = false;
+      }
+      
+      rowsize = groups_per_line * group_size;
+      padding = ( rowsize % psm.getPackAlignment() );
+      if( padding != 0 ) {
+        rowsize += psm.getPackAlignment() - padding;
+      }
+      start = psm.getPackSkipRows() * rowsize + psm.getPackSkipPixels() * group_size;
+      elements_per_line = width * components;
+      
+      iter2 = 0;
+      for( i = 0; i < height; i++ ) {
+        iter = start;
+        for( j = 0; j < elements_per_line; j++ ) {
+          Type_Widget widget = new Type_Widget();
+          
+          switch( type ) {
+            case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+              for( k = 0; k < 3; k++ ) {
+                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, userdata );
+              break;
+            case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+              for( k = 0; k < 3; k++ ) {
+                shoveComponents[k] = oldimage.get(iter2++) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, userdata );
+              break;
+            case( GL2.GL_UNSIGNED_BYTE ):
+              if( index_format ) {
+                //userdata[iter] = (byte)oldimage[iter2++];
+                userdata.put( iter, (byte)oldimage.get(iter2++) );
+              } else {
+                //userdata[iter] = (byte)( oldimage[iter2++] >> 8 );
+                userdata.put( iter, (byte)( oldimage.get(iter2++) ) );
+              }
+              break;
+            case( GL2.GL_BYTE ):
+              if( index_format ) {
+                //userdata[iter] = (byte)oldimage[iter2++];
+                userdata.put( iter, (byte)oldimage.get(iter2++) );
+              } else {
+                //userdata[iter] = (byte)( oldimage[iter2++] >> 9 );
+                userdata.put( iter, (byte)( oldimage.get(iter2++) ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+              for( k = 0; k < 3; k++ ) {
+                shoveComponents[k] = oldimage.get(iter2++) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswap_bytes ) {
+                //userdata[iter] = widget.getUB1();
+                //userdata[iter+1] = widget.getUB0();
+                userdata.put( iter, widget.getUB1() );
+                userdata.put( iter + 1,widget.getUB0() );
+              } else {
+                //userdata[iter] = widget.getUB0();
+                //userdata[iter+1] = widget.getUB1();
+                userdata.put( iter, widget.getUB0() );
+                userdata.put( iter + 1, widget.getUB1() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+              for( k = 0; k < 3; k++ ) {
+                shoveComponents[k] = oldimage.get(iter2++) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswap_bytes ) {
+                //userdata[iter] = widget.getUB1();
+                //userdata[iter+1] = widget.getUB0();
+                userdata.put( iter, widget.getUB1() );
+                userdata.put( iter + 1, widget.getUB0() );
+              } else {
+                //userdata[iter] = widget.getUB0();
+                //userdata[iter+1] = widget.getUB1();
+                userdata.put( iter, widget.getUB0() );
+                userdata.put( iter, widget.getUB1() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldimage.get(iter2++) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswap_bytes ) {
+                //userdata[iter] = widget.getUB1();
+                //userdata[iter+1] = widget.getUB0();
+                userdata.put( iter, widget.getUB1() );
+                userdata.put( iter + 1, widget.getUB0() );
+              } else {
+                //userdata[iter] = widget.getUB0();
+                //userdata[iter+1] = widget.getUB1();
+                userdata.put( iter, widget.getUB0() );
+                userdata.put( iter + 1, widget.getUB1() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswap_bytes ) {
+                //userdata[iter] = widget.getUB1();
+                //userdata[iter+1] = widget.getUB0();
+                userdata.put( iter, widget.getUB1() );
+                userdata.put( iter + 1, widget.getUB0() );
+              } else {
+                //userdata[iter] = widget.getUB0();
+                //userdata[iter+1] = widget.getUB1();
+                userdata.put( iter, widget.getUB0() );
+                userdata.put( iter + 1, widget.getUB1() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswap_bytes ) {
+                //userdata[iter] = widget.getUB1();
+                //userdata[iter+1] = widget.getUB0();
+                userdata.put( iter, widget.getUB1() );
+                userdata.put( iter + 1, widget.getUB0() );
+              } else {
+                //userdata[iter] = widget.getUB0();
+                //userdata[iter+1] = widget.getUB1();
+                userdata.put( iter, widget.getUB0() );
+                userdata.put( iter + 1, widget.getUB1() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswap_bytes ) {
+                //userdata[iter] = widget.getUB1();
+                //userdata[iter+1] = widget.getUB0();
+                userdata.put( iter, widget.getUB1() );
+                userdata.put( iter + 1, widget.getUB0() );
+              } else {
+                //userdata[iter] = widget.getUB0();
+                //userdata[iter+1] = widget.getUB1();
+                userdata.put( iter, widget.getUB0() );
+                userdata.put( iter + 1, widget.getUB1() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT ):
+            case( GL2.GL_SHORT ):
+              if( type == GL2.GL_SHORT ) {
+                if( index_format ) {
+                  widget.setS0( oldimage.get( iter2++ ) );
+                } else {
+                  widget.setS0( (short)(oldimage.get( iter2++ ) >> 1) );
+                }
+              } else {
+                widget.setUS0( oldimage.get( iter2++ ) );
+              }
+              if( myswap_bytes ) {
+                //userdata[iter] = widget.getUB1();
+                //userdata[iter+1] = widget.getUB0();
+                userdata.put( iter, widget.getUB1() );
+                userdata.put( iter + 1, widget.getUB0() );
+              } else {
+                //userdata[iter] = widget.getUB0();
+                //userdata[iter] = widget.getUB1();
+                userdata.put( iter, widget.getUB0() );
+                userdata.put( iter + 1, widget.getUB1() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswap_bytes ) {
+                //userdata[iter+3] = widget.getUB0();
+                //userdata[iter+2] = widget.getUB1();
+                //userdata[iter+1] = widget.getUB2();
+                //userdata[iter  ] = widget.getUB3();
+                userdata.put( iter + 3, widget.getUB0() );
+                userdata.put( iter + 2, widget.getUB1() );
+                userdata.put( iter + 1, widget.getUB2() );
+                userdata.put( iter    , widget.getUB3() );
+              } else {
+                userdata.putInt( iter, widget.getUI() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswap_bytes ) {
+                //userdata[iter+3] = widget.getUB0();
+                //userdata[iter+2] = widget.getUB1();
+                //userdata[iter+1] = widget.getUB2();
+                //userdata[iter  ] = widget.getUB3();
+                userdata.put( iter + 3, widget.getUB0() );
+                userdata.put( iter + 2, widget.getUB1() );
+                userdata.put( iter + 2, widget.getUB2() );
+                userdata.put( iter    , widget.getUB3() );
+              } else {
+                userdata.putInt( iter, widget.getUI() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswap_bytes ) {
+                //userdata[iter+3] = widget.getUB0();
+                //userdata[iter+2] = widget.getUB1();
+                //userdata[iter+1] = widget.getUB2();
+                //userdata[iter  ] = widget.getUB3();
+                userdata.put( iter + 3, widget.getUB0() );
+                userdata.put( iter + 2, widget.getUB1() );
+                userdata.put( iter + 1, widget.getUB2() );
+                userdata.put( iter    , widget.getUB3() );
+              } else {
+                userdata.putInt( iter, widget.getUI() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswap_bytes ) {
+                //userdata[iter+3] = widget.getUB0();
+                //userdata[iter+2] = widget.getUB1();
+                //userdata[iter+1] = widget.getUB2();
+                //userdata[iter  ] = widget.getUB3();
+                userdata.put( iter + 3, widget.getUB0() );
+                userdata.put( iter + 2, widget.getUB1() );
+                userdata.put( iter + 1, widget.getUB2() );
+                userdata.put( iter    , widget.getUB3() );
+              } else {
+                userdata.putInt( iter, widget.getUI() );
+              }
+              break;
+            case( GL2.GL_INT ):
+            case( GL2.GL_UNSIGNED_INT ):
+            case( GL2.GL_FLOAT ):
+              if( type == GL2.GL_FLOAT ) {
+                if( index_format ) {
+                  widget.setF( oldimage.get( iter2++ ) );
+                } else {
+                  widget.setF( oldimage.get( iter2++ ) / 65535.0f );
+                }
+              } else if( type == GL2.GL_UNSIGNED_INT ) {
+                if( index_format ) {
+                  widget.setUI( oldimage.get( iter2++ ) );
+                } else {
+                  widget.setUI( oldimage.get( iter2++ ) * 65537 );
+                }
+              } else {
+                if( index_format ) {
+                  widget.setI( oldimage.get( iter2++ ) );
+                } else {
+                  widget.setI( (oldimage.get( iter2++ ) * 65537) / 2 );
+                }
+              }
+              if( myswap_bytes ) {
+                userdata.put( iter + 3, widget.getUB0() );
+                userdata.put( iter + 2, widget.getUB1() );
+                userdata.put( iter + 1, widget.getUB2() );
+                userdata.put( iter    , widget.getUB3() );
+              } else {
+                userdata.put( iter    , widget.getUB0() );
+                userdata.put( iter + 1, widget.getUB1() );
+                userdata.put( iter + 2, widget.getUB2() );
+                userdata.put( iter + 3, widget.getUB3() );
+              }
+              break;
+          }
+          iter += element_size;
+        } // for j
+        start += rowsize;
+        // want iter pointing at start, not within, row for assertion purposes
+        iter = start;
+      } // for i
+      // iterators should be one byte past end
+      if( !Mipmap.isTypePackedPixel( type ) ) {
+        assert( iter2 == width * height * components );
+      } else {
+        assert( iter2 == width * height * Mipmap.elements_per_group( format, 0 ) );
+      }
+      assert( iter == rowsize * height + psm.getPackSkipRows() * rowsize + psm.getPackSkipPixels() * group_size );
+    }
+  }
+  
+  public static void fillImage3D( PixelStorageModes psm, int width, int height,
+          int depth, int format, int type, boolean indexFormat, ByteBuffer userImage,
+          ShortBuffer newImage ) {
+    boolean myswapBytes;
+    int components;
+    int groupsPerLine;
+    int elementSize;
+    int groupSize;
+    int rowSize;
+    int padding;
+    int elementsPerLine;
+    int rowsPerImage;
+    int imageSize;
+    int start, rowStart;
+    int iter = 0;
+    int iter2 = 0;
+    int ww, hh, dd, k;
+    Type_Widget widget = new Type_Widget();
+    float extractComponents[] = new float[4];
+    
+    // Create a Extract interface object
+    Extract extract = null;
+    switch( type ) {
+      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+        extract = new Extract332();
+        break;
+      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+        extract = new Extract233rev();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+        extract = new Extract565();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+        extract = new Extract565rev();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+        extract = new Extract4444();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+        extract = new Extract4444rev();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+        extract = new Extract5551();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+        extract = new Extract1555rev();
+        break;
+      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+        extract = new Extract8888();
+        break;
+      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+        extract = new Extract8888rev();
+        break;
+      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+        extract = new Extract1010102();
+        break;
+      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+        extract = new Extract2101010rev();
+        break;
+    }
+    
+    myswapBytes = psm.getUnpackSwapBytes();
+    components = Mipmap.elements_per_group( format, type );
+    if( psm.getUnpackRowLength() > 0 ) {
+      groupsPerLine = psm.getUnpackRowLength();
+    } else {
+      groupsPerLine = width;
+    }
+    elementSize = Mipmap.bytes_per_element( type );
+    groupSize = elementSize * components;
+    if( elementSize == 1 ) {
+      myswapBytes = false;
+    }
+    
+    // 3dstuff begin
+    if( psm.getUnpackImageHeight() > 0 ) {
+      rowsPerImage = psm.getUnpackImageHeight();
+    } else {
+      rowsPerImage = height;
+    }
+    // 3dstuff end
+    
+    rowSize = groupsPerLine * groupSize;
+    padding = rowSize % psm.getUnpackAlignment();
+    if( padding != 0 ) {
+      rowSize += psm.getUnpackAlignment() - padding;
+    }
+    
+    imageSize = rowsPerImage * rowSize; // 3dstuff
+    
+    start = psm.getUnpackSkipRows() * rowSize + 
+            psm.getUnpackSkipPixels() * groupSize + 
+            psm.getUnpackSkipImages() * imageSize;
+    elementsPerLine = width * components;
+    
+    iter2 = 0;
+    for( dd = 0; dd < depth; dd++ ) {
+      rowStart = start;
+      for( hh = 0; hh < height; hh++ ) {
+        iter = rowStart;
+        for( ww = 0; ww < elementsPerLine; ww++ ) {
+          
+          switch( type ) {
+            case( GL2.GL_UNSIGNED_BYTE ):
+              if( indexFormat ) {
+                newImage.put( iter2++, (short)(0x000000FF & userImage.get( iter ) ) );
+              } else {
+                newImage.put( iter2++, (short)((0x000000FF & userImage.get( iter ) ) * 257 ) );
+              }
+              break;
+            case( GL2.GL_BYTE ):
+              if( indexFormat ) {
+                newImage.put( iter2++, userImage.get( iter ) );
+              } else {
+                newImage.put( iter2++, (short)(userImage.get( iter ) * 516 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+              userImage.position( iter );
+              extract.extract( false, userImage, extractComponents );
+              for( k = 0; k < 3; k++ ) {
+                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+              userImage.position( iter );
+              extract.extract( false, userImage, extractComponents );
+              for( k = 0; k < 3; k++ ) {
+                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+              userImage.position( iter );
+              extract.extract( myswapBytes, userImage, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+              userImage.position( iter );
+              extract.extract( myswapBytes, userImage, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+              userImage.position( iter );
+              extract.extract( myswapBytes, userImage, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+              userImage.position( iter );
+              extract.extract( myswapBytes, userImage, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+              userImage.position( iter );
+              extract.extract( myswapBytes, userImage, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+              userImage.position( iter );
+              extract.extract( myswapBytes, userImage, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT ):
+            case( GL2.GL_SHORT ):
+              if( myswapBytes ) {
+                widget.setUB0( userImage.get( iter + 1 ) );
+                widget.setUB1( userImage.get( iter ) );
+              } else {
+                widget.setUB0( userImage.get( iter ) );
+                widget.setUB1( userImage.get( iter + 1 ) );
+              }
+              if( type == GL2.GL_SHORT ) {
+                if( indexFormat ) {
+                  newImage.put( iter2++, widget.getUS0() );
+                } else {
+                  newImage.put( iter2++, (short)(widget.getUS0() * 2) );
+                }
+              } else {
+                newImage.put( iter2++, widget.getUS0() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+              userImage.position( iter );
+              extract.extract( myswapBytes, userImage, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newImage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+              userImage.position( iter );
+              extract.extract( myswapBytes, userImage, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newImage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+              userImage.position( iter );
+              extract.extract( myswapBytes, userImage, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newImage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+              extract.extract( myswapBytes, userImage, extractComponents );
+              for( k = 0; k < 4; k++ ) {
+                newImage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
+              }
+              break;
+            case( GL2.GL_INT ):
+            case( GL2.GL_UNSIGNED_INT ):
+            case( GL2.GL_FLOAT ):
+              if( myswapBytes ) {
+                widget.setUB0( userImage.get( iter + 3 ) );
+                widget.setUB1( userImage.get( iter + 2 ) );
+                widget.setUB2( userImage.get( iter + 1 ) );
+                widget.setUB3( userImage.get( iter     ) );
+              } else {
+                widget.setUB0( userImage.get( iter     ) );
+                widget.setUB1( userImage.get( iter + 1 ) );
+                widget.setUB2( userImage.get( iter + 2 ) );
+                widget.setUB3( userImage.get( iter + 3 ) );
+              }
+              if( type == GL2.GL_FLOAT ) {
+                if( indexFormat ) {
+                  newImage.put( iter2++, (short)widget.getF() );
+                } else {
+                  newImage.put( iter2++, (short)( widget.getF() * 65535.0f ) );
+                }
+              } else if( type == GL2.GL_UNSIGNED_INT ) {
+                if( indexFormat ) {
+                  newImage.put( iter2++, (short)widget.getUI() );
+                } else {
+                  newImage.put( iter2++, (short)(widget.getUI() >> 16) );
+                }
+              } else {
+                if( indexFormat ) {
+                  newImage.put( iter2++, (short)widget.getI() );
+                } else {
+                  newImage.put( iter2++, (short)(widget.getI() >> 15) );
+                }
+              }
+              break;
+            default:
+              assert( false );
+          }
+          iter += elementSize;
+        } // for ww
+        rowStart += rowSize;
+        iter = rowStart; // for assert
+      } // for hh
+      start += imageSize;
+    }// for dd
+    
+    // iterators should be one byte past end
+    if( !Mipmap.isTypePackedPixel( type ) ) {
+      assert( iter2 == width * height * depth * components );
+    } else {
+      assert( iter2 == width * height * depth * Mipmap.elements_per_group( format, 0 ) );
+    }
+    assert( iter == rowSize * height * depth + psm.getUnpackSkipRows() * rowSize + 
+            psm.getUnpackSkipPixels() * groupSize +
+            psm.getUnpackSkipImages() * imageSize );
+  }
+  
+  public static void emptyImage3D( PixelStorageModes psm, int width, int height, int depth,
+          int format, int type, boolean indexFormat, ShortBuffer oldImage, ByteBuffer userImage ) {
+    boolean myswapBytes;
+    int components;
+    int groupsPerLine;
+    int elementSize;
+    int groupSize;
+    int rowSize;
+    int padding;
+    int start, rowStart, iter;
+    int elementsPerLine;
+    int iter2;
+    int ii, jj, dd, k;
+    int rowsPerImage;
+    int imageSize;
+    Type_Widget widget = new Type_Widget();
+    float[] shoveComponents = new float[4];
+    
+    // Create a Extract interface object
+    Extract extract = null;
+    switch( type ) {
+      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+        extract = new Extract332();
+        break;
+      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+        extract = new Extract233rev();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+        extract = new Extract565();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+        extract = new Extract565rev();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+        extract = new Extract4444();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+        extract = new Extract4444rev();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+        extract = new Extract5551();
+        break;
+      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+        extract = new Extract1555rev();
+        break;
+      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+        extract = new Extract8888();
+        break;
+      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+        extract = new Extract8888rev();
+        break;
+      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+        extract = new Extract1010102();
+        break;
+      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+        extract = new Extract2101010rev();
+        break;
+    }
+    
+    iter = 0;
+    
+    myswapBytes = psm.getPackSwapBytes();
+    components = Mipmap.elements_per_group( format, type );
+    if( psm.getPackRowLength() > 0 ) {
+      groupsPerLine = psm.getPackRowLength();
+    } else {
+      groupsPerLine = width;
+    }
+    
+    elementSize = Mipmap.bytes_per_element( type );
+    groupSize = elementSize * components;
+    if( elementSize == 1 ) {
+      myswapBytes = false;
+    }
+    
+    // 3dstuff begin
+    if( psm.getPackImageHeight() > 0 ) {
+      rowsPerImage = psm.getPackImageHeight();
+    } else {
+      rowsPerImage = height;
+    }
+    
+    // 3dstuff end
+    
+    rowSize = groupsPerLine * groupSize;
+    padding = rowSize % psm.getPackAlignment();
+    if( padding != 0 ) {
+      rowSize += psm.getPackAlignment() - padding;
+    }
+    
+    imageSize = rowsPerImage * rowSize;
+    
+    start = psm.getPackSkipRows() * rowSize +
+            psm.getPackSkipPixels() * groupSize +
+            psm.getPackSkipImages() * imageSize;
+    elementsPerLine = width * components;
+    
+    iter2 = 0;
+    for( dd = 0; dd < depth; dd++ ) {
+      rowStart = start;
+      
+      for( ii = 0; ii < height; ii++ ) {
+        iter = rowStart;
+        
+        for( jj = 0; jj < elementsPerLine; jj++ ) {
+          
+          switch( type ) {
+            case( GL2.GL_UNSIGNED_BYTE ):
+              if( indexFormat ) {
+                userImage.put( iter, (byte)(oldImage.get( iter2++ ) ) );
+              } else {
+                userImage.put( iter, (byte)(oldImage.get( iter2++ ) >> 8 ) );
+              }
+              break;
+            case( GL2.GL_BYTE ):
+              if( indexFormat ) {
+                userImage.put( iter, (byte)(oldImage.get(iter2++) ) );
+              } else {
+                userImage.put( iter, (byte)(oldImage.get(iter2++) >> 9) );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+              for( k = 0; k < 3; k++ ) {
+                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, userImage );
+              break;
+            case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+              for( k = 0; k < 3; k++ ) {
+                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, userImage );
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswapBytes ) {
+                userImage.putShort( iter, widget.getUB1() );
+                userImage.putShort( iter + 1, widget.getUB0() );
+              } else {
+                userImage.putShort( iter, widget.getUS0() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswapBytes ) {
+                userImage.put( iter, widget.getUB1() );
+                userImage.put( iter + 1, widget.getUB0() );
+              } else {
+                userImage.putShort( iter, widget.getUS0() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswapBytes ) {
+                userImage.put( iter, widget.getUB1() );
+                userImage.put( iter + 1, widget.getUB0() );
+              } else {
+                userImage.putShort( iter, widget.getUS0() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswapBytes ) {
+                userImage.put( iter, widget.getUB1() );
+                userImage.put( iter + 1, widget.getUB0() );
+              } else {
+                userImage.putShort( iter, widget.getUS0() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswapBytes ) {
+                userImage.put( iter, widget.getUB1() );
+                userImage.put( iter + 1, widget.getUB0() );
+              } else {
+                userImage.putShort( iter, widget.getUS0() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswapBytes ) {
+                userImage.put( iter, widget.getUB1() );
+                userImage.put( iter + 1, widget.getUB0() );
+              } else {
+                userImage.putShort( iter, widget.getUS0() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_SHORT ):
+            case( GL2.GL_SHORT ):
+              if( type == GL2.GL_SHORT ) {
+                if( indexFormat ) {
+                  widget.setS0( (short)oldImage.get( iter2++ ) );
+                } else {
+                  widget.setS0( (short)(oldImage.get( iter2++ ) >> 1) );
+                }
+              } else {
+                widget.setUS0( (short)oldImage.get( iter2++ ) );
+              }
+              if( myswapBytes ) {
+                userImage.put( iter, widget.getUB1() );
+                userImage.put( iter + 1, widget.getUB0() );
+              } else {
+                userImage.put( iter, widget.getUB0() );
+                userImage.put( iter + 1, widget.getUB1() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswapBytes ) {
+                userImage.put( iter + 3, widget.getUB0() );
+                userImage.put( iter + 2, widget.getUB1() );
+                userImage.put( iter + 1, widget.getUB2() );
+                userImage.put( iter    , widget.getUB3() );
+              } else {
+                userImage.putInt( iter, widget.getUI() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswapBytes ) {
+                userImage.put( iter + 3, widget.getUB0() );
+                userImage.put( iter + 2, widget.getUB1() );
+                userImage.put( iter + 1, widget.getUB2() );
+                userImage.put( iter    , widget.getUB3() );
+              } else {
+                userImage.putInt( iter, widget.getUI() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswapBytes ) {
+                userImage.put( iter + 3, widget.getUB0() );
+                userImage.put( iter + 2, widget.getUB1() );
+                userImage.put( iter + 1, widget.getUB2() );
+                userImage.put( iter    ,widget.getUB3() );
+              } else {
+                userImage.putInt( iter, widget.getUI() );
+              }
+              break;
+            case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+              for( k = 0; k < 4; k++ ) {
+                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
+              }
+              extract.shove( shoveComponents, 0, widget.getBuffer() );
+              if( myswapBytes ) {
+                userImage.put( iter + 3, widget.getUB0() );
+                userImage.put( iter + 2, widget.getUB2() );
+                userImage.put( iter + 1, widget.getUB1() );
+                userImage.put( iter    , widget.getUB0() );
+              } else {
+                userImage.putInt( iter, widget.getUI() );
+              }
+              break;
+            case( GL2.GL_INT ):
+            case( GL2.GL_UNSIGNED_INT ):
+            case( GL2.GL_FLOAT ):
+              if( type == GL2.GL_FLOAT ) {
+                if( indexFormat ) {
+                  widget.setF( oldImage.get( iter2++ ) );
+                } else {
+                  widget.setF( oldImage.get( iter2++ ) / 65535.0f );
+                }
+              } else if( type == GL2.GL_UNSIGNED_INT ) {
+                if( indexFormat ) {
+                  widget.setUI( oldImage.get( iter2++ ) );
+                } else {
+                  widget.setUI( oldImage.get( iter2++ ) * 65537 );
+                }
+              } else {
+                if( indexFormat ) {
+                  widget.setI( oldImage.get( iter2++ ) );
+                } else {
+                  widget.setI( ( oldImage.get( iter2++ ) * 65535 ) / 2 );
+                }
+              }
+              if( myswapBytes ) {
+                userImage.put( iter + 3, widget.getUB0() );
+                userImage.put( iter + 2, widget.getUB1() );
+                userImage.put( iter + 1, widget.getUB2() );
+                userImage.put( iter    , widget.getUB3() );
+              } else {
+                userImage.put( iter    , widget.getUB0() );
+                userImage.put( iter + 1, widget.getUB1() );
+                userImage.put( iter + 2, widget.getUB2() );
+                userImage.put( iter + 3, widget.getUB3() );
+              }
+              break;
+            default:
+              assert( false );
+          }
+          
+          iter += elementSize;
+        } // for jj
+        rowStart += rowSize;
+      } // for ii
+      start += imageSize;
+    } // for dd
+    
+    if( !Mipmap.isTypePackedPixel( type ) ) {
+      assert( iter2 == width * height * depth * components );
+    } else {
+      assert( iter2 == width * height * depth * Mipmap.elements_per_group( format, 0 ) );
+    }
+    assert( iter == rowSize * height * depth + 
+                    psm.getUnpackSkipRows() * rowSize +
+                    psm.getUnpackSkipPixels() * groupSize +
+                    psm.getUnpackSkipImages() * imageSize );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java
new file mode 100644
index 000000000..2c3f60d32
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java
@@ -0,0 +1,867 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
+import javax.media.opengl.glu.GLU;
+import javax.media.opengl.GLException;
+import java.nio.*;
+import com.jogamp.opengl.impl.InternalBufferUtil;
+
+/**
+ *
+ * @author  Administrator
+ */
+public class Mipmap {
+  
+  /** Creates a new instance of Mipmap */
+  public Mipmap() {
+  }
+  
+  public static int computeLog( int value ) {
+    int i = 0;
+    // Error
+    if( value == 0 ) {
+      return( -1 );
+    }
+    for( ;; ) {
+      if( (value & 1) >= 1 ) {
+        if( value != 1 ) {
+          return( -1 );
+        }
+        return( i );
+      }
+      value = value >> 1;
+      i++;
+    }
+  }
+  
+  /* Compute the nearest power of 2 number.  This algorithm is a little strange
+   * but it works quite well.
+   */
+  public static int nearestPower( int value ) {
+    int i = 1;
+    // Error!
+    if( value == 0 ) {
+      return( -1 );
+    }
+    for( ;; ) {
+      if( value == 1 ) {
+        return( i );
+      } else if( value == 3 ) {
+        return( i * 4 );
+      }
+      value = value >> 1;
+      i *= 2;
+    }
+  }
+  
+  public static short GLU_SWAP_2_BYTES( short s ) {
+    byte b = 0;
+    b = (byte)( s >>> 8 );
+    s = (short)( s << 8 );
+    s = (short)( s | (0x00FF & b) );
+    return( s );
+  }
+  
+  public static int GLU_SWAP_4_BYTES( int i ) {
+    int t = i << 24;
+    t |= 0x00FF0000 & ( i << 8 );
+    t |= 0x0000FF00 & ( i >>> 8 );
+    t |= 0x000000FF & ( i >>> 24 );
+    return( t );
+  }
+  
+  public static float GLU_SWAP_4_BYTES( float f ) {
+    int i = Float.floatToRawIntBits( f );
+    float temp = Float.intBitsToFloat( i );
+    return( temp );
+  }
+  
+  public static int checkMipmapArgs( int internalFormat, int format, int type ) {
+    if( !legalFormat( format ) || !legalType( type ) ) {
+      return( GLU.GLU_INVALID_ENUM );
+    }
+    if( format == GL2.GL_STENCIL_INDEX ) {
+      return( GLU.GLU_INVALID_ENUM );
+    }
+    if( !isLegalFormatForPackedPixelType( format, type ) ) {
+      return( GLU.GLU_INVALID_OPERATION );
+    }
+    return( 0 );
+  }
+  
+  public static boolean legalFormat( int format ) {
+    switch( format ) {
+      case( GL2.GL_COLOR_INDEX ):
+      case( GL2.GL_STENCIL_INDEX ):
+      case( GL2.GL_DEPTH_COMPONENT ):
+      case( GL2.GL_RED ):
+      case( GL2.GL_GREEN ):
+      case( GL2.GL_BLUE ):
+      case( GL2.GL_ALPHA ):
+      case( GL2.GL_RGB ):
+      case( GL2.GL_RGBA ):
+      case( GL2.GL_LUMINANCE ):
+      case( GL2.GL_LUMINANCE_ALPHA ):
+      case( GL2.GL_BGR ):
+      case( GL2.GL_BGRA ):
+        return( true );
+      default:
+        return( false );
+    }
+  }
+  
+  public static boolean legalType( int type ) {
+    switch( type ) {
+      case( GL2.GL_BITMAP ):
+      case( GL2.GL_BYTE ):
+      case( GL2.GL_UNSIGNED_BYTE ):
+      case( GL2.GL_SHORT ):
+      case( GL2.GL_UNSIGNED_SHORT ):
+      case( GL2.GL_INT ):
+      case( GL2.GL_UNSIGNED_INT ):
+      case( GL2.GL_FLOAT ):
+      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+        return( true );
+      default:
+        return( false );
+    }
+  }
+  
+  public static boolean isTypePackedPixel( int type ) {
+    assert( legalType( type ) );
+    
+    if( type == GL2.GL_UNSIGNED_BYTE_3_3_2 ||
+        type == GL2.GL_UNSIGNED_BYTE_2_3_3_REV ||
+        type == GL2.GL_UNSIGNED_SHORT_5_6_5 ||
+        type == GL2.GL_UNSIGNED_SHORT_5_6_5_REV ||
+        type == GL2.GL_UNSIGNED_SHORT_4_4_4_4 ||
+        type == GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ||
+        type == GL2.GL_UNSIGNED_SHORT_5_5_5_1 ||
+        type == GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ||
+        type == GL2.GL_UNSIGNED_INT_8_8_8_8 ||
+        type == GL2.GL_UNSIGNED_INT_8_8_8_8_REV ||
+        type == GL2.GL_UNSIGNED_INT_10_10_10_2 ||
+        type == GL2.GL_UNSIGNED_INT_2_10_10_10_REV ) {
+          return( true );
+    }
+    return( false );
+  }
+  
+  public static boolean isLegalFormatForPackedPixelType( int format, int type ) {
+    // if not a packed pixel type then return true
+    if( isTypePackedPixel( type ) ) {
+      return( true );
+    }
+    
+    // 3_3_2/2_3_3_REV & 5_6_5/5_6_5_REV are only compatible with RGB
+    if( (type == GL2.GL_UNSIGNED_BYTE_3_3_2 || type == GL2.GL_UNSIGNED_BYTE_2_3_3_REV ||
+        type == GL2.GL_UNSIGNED_SHORT_5_6_5 || type == GL2.GL_UNSIGNED_SHORT_5_6_5_REV )
+        & format != GL2.GL_RGB ) {
+          return( false );
+    }
+    
+    // 4_4_4_4/4_4_4_4_REV & 5_5_5_1/1_5_5_5_REV & 8_8_8_8/8_8_8_8_REV &
+    // 10_10_10_2/2_10_10_10_REV are only campatible with RGBA, BGRA & ARGB_EXT
+    if( ( type == GL2.GL_UNSIGNED_SHORT_4_4_4_4 ||
+          type == GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ||
+          type == GL2.GL_UNSIGNED_SHORT_5_5_5_1 ||
+          type == GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ||
+          type == GL2.GL_UNSIGNED_INT_8_8_8_8 ||
+          type == GL2.GL_UNSIGNED_INT_8_8_8_8_REV ||
+          type == GL2.GL_UNSIGNED_INT_10_10_10_2 ||
+          type == GL2.GL_UNSIGNED_INT_2_10_10_10_REV ) &&
+          (format != GL2.GL_RGBA && format != GL2.GL_BGRA) ) {
+            return( false );
+    }
+    return( true );
+  }
+  
+  public static boolean isLegalLevels( int userLevel, int baseLevel, int maxLevel,
+                                            int totalLevels ) {
+    if( (baseLevel < 0) || (baseLevel < userLevel) || (maxLevel < baseLevel) ||
+                                                  (totalLevels < maxLevel) ) {
+      return( false );
+    }
+    return( true );
+  }
+  
+  /* Given user requested textures size, determine if it fits. If it doesn't then
+   * halve both sides and make the determination again until it does fit ( for
+   * IR only ).
+   * Note that proxy textures are not implemented in RE* even though they
+   * advertise the texture extension.
+   * Note that proxy textures are implemented but not according to spec in IMPACT*
+   */
+  public static void closestFit( GL gl, int target, int width, int height, int internalFormat,
+                                int format, int type, int[] newWidth, int[] newHeight ) {
+    // Use proxy textures if OpenGL version >= 1.1
+    if( Double.parseDouble( gl.glGetString( GL.GL_VERSION ).trim().substring( 0, 3 ) ) >= 1.1 ) {
+      int widthPowerOf2 = nearestPower( width );
+      int heightPowerOf2 = nearestPower( height );
+      int[] proxyWidth = new int[1];
+      boolean noProxyTextures = false;
+      
+      // Some drivers (in particular, ATI's) seem to set a GL error
+      // when proxy textures are used even though this is in violation
+      // of the spec. Guard against this and interactions with the
+      // DebugGL by watching for GLException.
+      try {
+        do {
+          // compute level 1 width & height, clamping each at 1
+          int widthAtLevelOne = ( ( width > 1 ) ? (widthPowerOf2 >> 1) : widthPowerOf2 );
+          int heightAtLevelOne = ( ( height > 1 ) ? (heightPowerOf2 >> 1) : heightPowerOf2 );
+          int proxyTarget;
+        
+          assert( widthAtLevelOne > 0 );
+          assert( heightAtLevelOne > 0 );
+        
+          // does width x height at level 1 & all their mipmaps fit?
+          if( target == GL2.GL_TEXTURE_2D || target == GL2.GL_PROXY_TEXTURE_2D ) {
+            proxyTarget = GL2.GL_PROXY_TEXTURE_2D;
+            gl.glTexImage2D( proxyTarget, 1, internalFormat, widthAtLevelOne,
+                             heightAtLevelOne, 0, format, type, null );
+          } else if( (target == GL2.GL_TEXTURE_CUBE_MAP_POSITIVE_X) || 
+                     (target == GL2.GL_TEXTURE_CUBE_MAP_NEGATIVE_X) || 
+                     (target == GL2.GL_TEXTURE_CUBE_MAP_POSITIVE_Y) || 
+                     (target == GL2.GL_TEXTURE_CUBE_MAP_NEGATIVE_Y) || 
+                     (target == GL2.GL_TEXTURE_CUBE_MAP_POSITIVE_Z) || 
+                     (target == GL2.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z) ) {
+            proxyTarget = GL2.GL_PROXY_TEXTURE_CUBE_MAP;
+            gl.glTexImage2D( proxyTarget, 1, internalFormat, widthAtLevelOne,
+                             heightAtLevelOne, 0, format, type, null );
+          } else {
+            assert( target == GL2.GL_TEXTURE_1D || target == GL2.GL_PROXY_TEXTURE_1D );
+            proxyTarget = GL2.GL_PROXY_TEXTURE_1D;
+            gl.getGL2().glTexImage1D( proxyTarget, 1, internalFormat, widthAtLevelOne, 
+                             0, format, type, null );
+          }
+          if(gl.isGL2()) {
+            gl.getGL2().glGetTexLevelParameteriv( proxyTarget, 1, GL2.GL_TEXTURE_WIDTH, proxyWidth, 0 );
+          } else {
+            proxyWidth[0] = 0;
+          }
+          // does it fit?
+          if( proxyWidth[0] == 0 ) { // nope, so try again with theses sizes
+            if( widthPowerOf2 == 1 && heightPowerOf2 == 1 ) {
+              /* A 1x1 texture couldn't fit for some reason so break out.  This
+               * should never happen.  But things happen.  The disadvantage with
+               * this if-statement is that we will never be aware of when this
+               * happens since it will silently branch out.
+               */
+              noProxyTextures = true;
+              break;
+            }
+            widthPowerOf2 = widthAtLevelOne;
+            heightPowerOf2 = heightAtLevelOne;
+          }
+          // else it does fit
+        } while( proxyWidth[0] == 0 );
+      } catch (GLException e) {
+        noProxyTextures = true;
+      }
+      // loop must terminate
+      // return the width & height at level 0 that fits
+      if( !noProxyTextures ) {
+        newWidth[0] = widthPowerOf2;
+        newHeight[0] = heightPowerOf2;
+        return;
+      }
+    }
+    int[] maxsize = new int[1];
+    gl.glGetIntegerv( GL2.GL_MAX_TEXTURE_SIZE, maxsize , 0);
+    // clamp user's texture sizes to maximum sizes, if necessary
+    newWidth[0] = nearestPower( width );
+    if( newWidth[0] > maxsize[0] ) {
+      newWidth[0] = maxsize[0];
+    }
+    newHeight[0] = nearestPower( height );
+    if( newHeight[0] > maxsize[0] ) {
+      newHeight[0] = maxsize[0];
+    }
+  }
+  
+  public static void closestFit3D( GL gl, int target, int width, int height, int depth, 
+          int internalFormat, int format, int type, int[] newWidth, int[] newHeight,
+          int[] newDepth ) {
+    int widthPowerOf2 = nearestPower( width );
+    int heightPowerOf2 = nearestPower( height );
+    int depthPowerOf2 = nearestPower( depth );
+    int[] proxyWidth = new int[1];
+    
+    do {
+      // compute level 1 width & height & depth, clamping each at 1
+      int widthAtLevelOne = (widthPowerOf2 > 1) ? widthPowerOf2 >> 1 : widthPowerOf2;
+      int heightAtLevelOne = (heightPowerOf2 > 1) ? heightPowerOf2 >> 1 : heightPowerOf2;
+      int depthAtLevelOne = (depthPowerOf2 > 1) ? depthPowerOf2 >> 1 : depthPowerOf2;
+      int proxyTarget = 0;
+      assert( widthAtLevelOne > 0 );
+      assert( heightAtLevelOne > 0 );
+      assert( depthAtLevelOne > 0 );
+      
+      // does width x height x depth at level 1 & all their mipmaps fit?
+      if( target == GL2.GL_TEXTURE_3D || target == GL2.GL_PROXY_TEXTURE_3D ) {
+        proxyTarget = GL2.GL_PROXY_TEXTURE_3D;
+        gl.getGL2().glTexImage3D( proxyTarget, 1, internalFormat, widthAtLevelOne,
+                heightAtLevelOne, depthAtLevelOne, 0, format, type, null );
+      }
+      if(gl.isGL2()) {
+        gl.getGL2().glGetTexLevelParameteriv( proxyTarget, 1, GL2.GL_TEXTURE_WIDTH, proxyWidth, 0 );
+      } else {
+        proxyWidth[0] = 0;
+      }
+      // does it fit
+      if( proxyWidth[0] == 0 ) {
+        if( widthPowerOf2 == 1 && heightPowerOf2 == 1 && depthPowerOf2 == 1 ) {
+          newWidth[0] = newHeight[0] = newDepth[0] = 1;
+          return;
+        }
+        widthPowerOf2 = widthAtLevelOne;
+        heightPowerOf2 = heightAtLevelOne;
+        depthPowerOf2 = depthAtLevelOne;
+      }
+    } while( proxyWidth[0] == 0 );
+    // loop must terminate
+    
+    // return the width & height at level 0 that fits
+    newWidth[0] = widthPowerOf2;
+    newHeight[0] = heightPowerOf2;
+    newDepth[0] = depthPowerOf2;
+  }
+  
+  public static int elements_per_group( int format, int type ) {
+    // Return the number of elements per grtoup of a specified gromat
+    
+    // If the type is packedpixels then answer is 1
+    if( type == GL2.GL_UNSIGNED_BYTE_3_3_2 ||
+        type == GL2.GL_UNSIGNED_BYTE_2_3_3_REV ||
+        type == GL2.GL_UNSIGNED_SHORT_5_6_5 ||
+        type == GL2.GL_UNSIGNED_SHORT_5_6_5_REV ||
+        type == GL2.GL_UNSIGNED_SHORT_4_4_4_4 ||
+        type == GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ||
+        type == GL2.GL_UNSIGNED_SHORT_5_5_5_1 ||
+        type == GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ||
+        type == GL2.GL_UNSIGNED_INT_8_8_8_8 ||
+        type == GL2.GL_UNSIGNED_INT_8_8_8_8_REV ||
+        type == GL2.GL_UNSIGNED_INT_10_10_10_2 ||
+        type == GL2.GL_UNSIGNED_INT_2_10_10_10_REV ) {
+          return( 1 );
+    }
+    
+    // Types are not packed pixels so get elements per group
+    switch( format ) {
+      case( GL2.GL_RGB ):
+      case( GL2.GL_BGR ):
+        return( 3 );
+      case( GL2.GL_LUMINANCE_ALPHA ):
+        return( 2 );
+      case( GL2.GL_RGBA ):
+      case( GL2.GL_BGRA ):
+        return( 4 );
+      default:
+        return( 1 );
+    }
+  }
+  
+  public static int bytes_per_element( int type ) {
+    // return the number of bytes per element, based on the element type
+    
+    switch( type ) {
+      case( GL2.GL_BITMAP ):
+      case( GL2.GL_BYTE ):
+      case( GL2.GL_UNSIGNED_BYTE ):
+      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
+      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+        return( 1 );
+      case( GL2.GL_SHORT ):
+      case( GL2.GL_UNSIGNED_SHORT ):
+      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
+      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
+      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
+      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
+      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+        return( 2 );
+      case( GL2.GL_INT ):
+      case( GL2.GL_UNSIGNED_INT ):
+      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
+      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
+      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
+      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+      case( GL2.GL_FLOAT ):
+        return( 4 );
+      default:
+        return( 4 );
+    }
+  }
+  
+  public static boolean is_index( int format ) {
+    return( format == GL2.GL_COLOR_INDEX || format == GL2.GL_STENCIL_INDEX );
+  }
+  
+  /* Compute memory required for internal packed array of data of given type and format. */
+  
+  public static int image_size( int width, int height, int format, int type ) {
+    int bytes_per_row;
+    int components;
+    
+    assert( width > 0 );
+    assert( height > 0 );
+    components = elements_per_group( format, type );
+    if( type == GL2.GL_BITMAP ) {
+      bytes_per_row = (width + 7) / 8;
+    } else {
+      bytes_per_row = bytes_per_element( type ) * width;
+    }
+    return( bytes_per_row * height * components );
+  }
+  
+  public static int imageSize3D( int width, int height, int depth, int format, int type ) {
+    int components = elements_per_group( format, type );
+    int bytes_per_row = bytes_per_element( type ) * width;
+    
+    assert( width > 0 && height > 0 && depth > 0 );
+    assert( type != GL2.GL_BITMAP );
+    
+    return( bytes_per_row * height * depth * components );
+  }
+  
+  public static void retrieveStoreModes( GL gl, PixelStorageModes psm ) {
+    int[] a = new int[1];
+    gl.glGetIntegerv( GL2.GL_UNPACK_ALIGNMENT, a, 0);
+    psm.setUnpackAlignment( a[0] );
+    gl.glGetIntegerv( GL2.GL_UNPACK_ROW_LENGTH, a, 0);
+    psm.setUnpackRowLength( a[0] );
+    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_ROWS, a, 0);
+    psm.setUnpackSkipRows( a[0] );
+    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_PIXELS, a, 0);
+    psm.setUnpackSkipPixels( a[0] );
+    gl.glGetIntegerv( GL2.GL_UNPACK_LSB_FIRST, a, 0);
+    psm.setUnpackLsbFirst( ( a[0] == 1 ) );
+    gl.glGetIntegerv( GL2.GL_UNPACK_SWAP_BYTES, a, 0);
+    psm.setUnpackSwapBytes( ( a[0] == 1 ) );
+    
+    gl.glGetIntegerv( GL2.GL_PACK_ALIGNMENT, a, 0);
+    psm.setPackAlignment( a[0] );
+    gl.glGetIntegerv( GL2.GL_PACK_ROW_LENGTH, a, 0);
+    psm.setPackRowLength( a[0] );
+    gl.glGetIntegerv( GL2.GL_PACK_SKIP_ROWS, a, 0);
+    psm.setPackSkipRows( a[0] );
+    gl.glGetIntegerv( GL2.GL_PACK_SKIP_PIXELS, a, 0);
+    psm.setPackSkipPixels( a[0] );
+    gl.glGetIntegerv( GL2.GL_PACK_LSB_FIRST, a, 0);
+    psm.setPackLsbFirst( ( a[0] == 1 ) );
+    gl.glGetIntegerv( GL2.GL_PACK_SWAP_BYTES, a, 0);
+    psm.setPackSwapBytes( ( a[0] == 1 ) );
+  }
+  
+  public static void retrieveStoreModes3D( GL gl, PixelStorageModes psm ) {
+    int[] a = new int[1];
+    gl.glGetIntegerv( GL2.GL_UNPACK_ALIGNMENT, a, 0);
+    psm.setUnpackAlignment( a[0] );
+    gl.glGetIntegerv( GL2.GL_UNPACK_ROW_LENGTH, a, 0);
+    psm.setUnpackRowLength( a[0] );
+    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_ROWS, a, 0);
+    psm.setUnpackSkipRows( a[0] );
+    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_PIXELS, a, 0);
+    psm.setUnpackSkipPixels( a[0] );
+    gl.glGetIntegerv( GL2.GL_UNPACK_LSB_FIRST, a, 0);
+    psm.setUnpackLsbFirst( ( a[0] == 1 ) );
+    gl.glGetIntegerv( GL2.GL_UNPACK_SWAP_BYTES, a, 0);
+    psm.setUnpackSwapBytes( ( a[0] == 1 ) );
+    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_IMAGES, a, 0);
+    psm.setUnpackSkipImages( a[0] );
+    gl.glGetIntegerv( GL2.GL_UNPACK_IMAGE_HEIGHT, a, 0);
+    psm.setUnpackImageHeight( a[0] );
+    
+    gl.glGetIntegerv( GL2.GL_PACK_ALIGNMENT, a, 0);
+    psm.setPackAlignment( a[0] );
+    gl.glGetIntegerv( GL2.GL_PACK_ROW_LENGTH, a, 0);
+    psm.setPackRowLength( a[0] );
+    gl.glGetIntegerv( GL2.GL_PACK_SKIP_ROWS, a, 0);
+    psm.setPackSkipRows( a[0] );
+    gl.glGetIntegerv( GL2.GL_PACK_SKIP_PIXELS, a, 0 );
+    psm.setPackSkipPixels( a[0] );
+    gl.glGetIntegerv( GL2.GL_PACK_LSB_FIRST, a, 0 );
+    psm.setPackLsbFirst( ( a[0] == 1 ) );
+    gl.glGetIntegerv( GL2.GL_PACK_SWAP_BYTES, a, 0 );
+    psm.setPackSwapBytes( ( a[0] == 1 ) );
+    gl.glGetIntegerv( GL2.GL_PACK_SKIP_IMAGES, a, 0 );
+    psm.setPackSkipImages( a[0] );
+    gl.glGetIntegerv( GL2.GL_PACK_IMAGE_HEIGHT, a, 0 );
+    psm.setPackImageHeight( a[0] );
+  }
+  
+  public static int gluScaleImage( GL gl, int format, int widthin, int heightin, 
+          int typein, ByteBuffer datain, int widthout, int heightout, 
+          int typeout, ByteBuffer dataout ) {
+    int datainPos = datain.position();
+    int dataoutPos = dataout.position();
+    try {
+
+      int components;
+      ByteBuffer beforeimage;
+      ByteBuffer afterimage;
+      PixelStorageModes psm = new PixelStorageModes();
+    
+      if( (widthin == 0)  || (heightin == 0) || (widthout == 0) || (heightout == 0) ) {
+        return( 0 );
+      }
+      if( (widthin < 0) || (heightin < 0) || (widthout < 0) || (heightout < 0) ) {
+        return( GLU.GLU_INVALID_VALUE );
+      }
+      if( !legalFormat( format ) || !legalType( typein ) || !legalType( typeout ) ) {
+        return( GLU.GLU_INVALID_ENUM );
+      }
+      if( !isLegalFormatForPackedPixelType( format, typein ) ) {
+        return( GLU.GLU_INVALID_OPERATION );
+      }
+      if( !isLegalFormatForPackedPixelType( format, typeout ) ) {
+        return( GLU.GLU_INVALID_OPERATION );
+      }
+      beforeimage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( image_size( widthin, heightin, format, GL2.GL_UNSIGNED_SHORT ) ));
+      afterimage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( image_size( widthout, heightout, format, GL2.GL_UNSIGNED_SHORT ) ));
+      if( beforeimage == null || afterimage == null ) {
+        return( GLU.GLU_OUT_OF_MEMORY );
+      }
+    
+      retrieveStoreModes( gl, psm );
+      Image.fill_image( psm, widthin, heightin, format, typein, is_index( format ), datain, beforeimage.asShortBuffer() );
+      components = elements_per_group( format, 0 );
+      ScaleInternal.scale_internal( components, widthin, heightin, beforeimage.asShortBuffer(), widthout, heightout, afterimage.asShortBuffer() );
+      Image.empty_image( psm, widthout, heightout, format, typeout, is_index( format ), afterimage.asShortBuffer(), dataout );
+    
+      return( 0 );
+    } finally {
+      datain.position(datainPos);
+      dataout.position(dataoutPos);
+    }
+  }
+  
+  public static int gluBuild1DMipmapLevels( GL gl, int target, int internalFormat,
+                          int width, int format, int type, int userLevel, int baseLevel,
+                          int maxLevel, ByteBuffer data ) {
+    int dataPos = data.position();
+    try {
+
+      int levels;
+    
+      int rc = checkMipmapArgs( internalFormat, format, type );
+      if( rc != 0 ) {
+        return( rc );
+      }
+    
+      if( width < 1 ) {
+        return( GLU.GLU_INVALID_VALUE );
+      }
+    
+      levels = computeLog( width );
+    
+      levels += userLevel;
+      if( !isLegalLevels( userLevel, baseLevel, maxLevel, levels ) ) {
+        return( GLU.GLU_INVALID_VALUE );
+      }
+    
+      return( BuildMipmap.gluBuild1DMipmapLevelsCore( gl, target, internalFormat, width,
+              width, format, type, userLevel, baseLevel, maxLevel, data ) );
+    } finally {
+      data.position(dataPos);
+    }
+  }
+  
+  public static int gluBuild1DMipmaps( GL gl, int target, int internalFormat, int width,
+              int format, int type, ByteBuffer data ) {
+    int dataPos = data.position();
+
+    try {
+      int[] widthPowerOf2 = new int[1];
+      int levels;
+      int[] dummy = new int[1];
+    
+      int rc = checkMipmapArgs( internalFormat, format, type );
+      if( rc != 0 ) {
+        return( rc );
+      }
+    
+      if( width < 1 ) {
+        return( GLU.GLU_INVALID_VALUE );
+      }
+    
+      closestFit( gl, target, width, 1, internalFormat, format, type, widthPowerOf2, dummy );
+      levels = computeLog( widthPowerOf2[0] );
+    
+      return( BuildMipmap.gluBuild1DMipmapLevelsCore( gl, target, internalFormat, 
+                    width, widthPowerOf2[0], format, type, 0, 0, levels, data ) );
+    } finally {
+      data.position(dataPos);
+    }
+  }
+
+ 
+  public static int gluBuild2DMipmapLevels( GL gl, int target, int internalFormat,
+          int width, int height, int format, int type, int userLevel,
+          int baseLevel, int maxLevel, Object data ) {
+    int dataPos = 0;
+
+    int level, levels;
+    
+    int rc = checkMipmapArgs( internalFormat, format, type );
+    if( rc != 0 ) {
+      return( rc );
+    }
+    
+    if( width < 1 || height < 1 ) {
+      return( GLU.GLU_INVALID_VALUE );
+    }
+    
+    levels = computeLog( width );
+    level = computeLog( height );
+    if( level > levels ) {
+      levels = level;
+    }
+    
+    levels += userLevel;
+    if( !isLegalLevels( userLevel, baseLevel, maxLevel, levels ) ) {
+      return( GLU.GLU_INVALID_VALUE );
+    }
+    
+    //PointerWrapper pointer = PointerWrapperFactory.getPointerWrapper( data );
+    ByteBuffer buffer = null;
+    if( data instanceof ByteBuffer ) {
+        buffer = (ByteBuffer)data;
+        dataPos = buffer.position();
+    } else if( data instanceof byte[] ) {
+      byte[] array = (byte[])data;
+      buffer = ByteBuffer.allocateDirect(array.length);
+      buffer.put(array);
+    } else if( data instanceof short[] ) {
+        short[] array = (short[])data;
+        buffer = ByteBuffer.allocateDirect( array.length * 2 );
+        ShortBuffer sb = buffer.asShortBuffer();
+        sb.put( array );
+    } else if( data instanceof int[] ) {
+        int[] array = (int[])data;
+        buffer = ByteBuffer.allocateDirect( array.length * 4 );
+        IntBuffer ib = buffer.asIntBuffer();
+        ib.put( array );
+    } else if( data instanceof float[] ) {
+        float[] array = (float[])data;
+        buffer = ByteBuffer.allocateDirect( array.length * 4 );
+        FloatBuffer fb = buffer.asFloatBuffer();
+        fb.put( array );
+    }
+    
+    try {
+      return( BuildMipmap.gluBuild2DMipmapLevelsCore( gl, target, internalFormat,
+              width, height, width, height, format, type, userLevel, baseLevel,
+              maxLevel, buffer ) );
+    } finally {
+      buffer.position(dataPos);
+    }
+  }
+
+ 
+  public static int gluBuild2DMipmaps( GL gl, int target, int internalFormat,
+          int width, int height, int format, int type, Object data ) {
+    int dataPos = 0;
+
+    int[] widthPowerOf2 = new int[1];
+    int[] heightPowerOf2 = new int[1];
+    int level, levels;
+    
+    int rc = checkMipmapArgs( internalFormat, format, type );
+    if( rc != 0 ) {
+      return( rc );
+    }
+    
+    if( width < 1 || height < 1 ) {
+      return( GLU.GLU_INVALID_VALUE );
+    }
+    
+    closestFit( gl, target, width, height, internalFormat, format, type, 
+            widthPowerOf2, heightPowerOf2 );
+    
+    levels = computeLog( widthPowerOf2[0] );
+    level = computeLog( heightPowerOf2[0] );
+    if( level > levels ) {
+      levels = level;
+    }
+    
+    //PointerWrapper pointer = PointerWrapperFactory.getPointerWrapper( data );
+    ByteBuffer buffer = null;
+    if( data instanceof ByteBuffer ) {
+        buffer = (ByteBuffer)data;
+        dataPos = buffer.position();
+    } else if( data instanceof byte[] ) {
+      byte[] array = (byte[])data;
+      buffer = ByteBuffer.allocateDirect(array.length);
+      buffer.put(array);
+    } else if( data instanceof short[] ) {
+        short[] array = (short[])data;
+        buffer = ByteBuffer.allocateDirect( array.length * 2 );
+        ShortBuffer sb = buffer.asShortBuffer();
+        sb.put( array );
+    } else if( data instanceof int[] ) {
+        int[] array = (int[])data;
+        buffer = ByteBuffer.allocateDirect( array.length * 4 );
+        IntBuffer ib = buffer.asIntBuffer();
+        ib.put( array );
+    } else if( data instanceof float[] ) {
+        float[] array = (float[])data;
+        buffer = ByteBuffer.allocateDirect( array.length * 4 );
+        FloatBuffer fb = buffer.asFloatBuffer();
+        fb.put( array );
+    }
+    
+    try {
+      return( BuildMipmap.gluBuild2DMipmapLevelsCore( gl, target, internalFormat, 
+              width, height, widthPowerOf2[0], heightPowerOf2[0], format, type, 0, 
+              0, levels, buffer ) );
+    } finally {
+      buffer.position(dataPos);
+    }
+  }
+ 
+ 
+  public static int gluBuild3DMipmaps( GL gl, int target, int internalFormat,
+          int width, int height, int depth, int format, int type, ByteBuffer data ) {
+    int dataPos = data.position();
+    try {
+
+      int[] widthPowerOf2 = new int[1];
+      int[] heightPowerOf2 = new int[1];
+      int[] depthPowerOf2 = new int[1];
+      int level, levels;
+    
+      int rc = checkMipmapArgs( internalFormat, format, type );
+      if( rc != 0 ) {
+        return( rc );
+      }
+    
+      if( width < 1 || height < 1 || depth < 1 ) {
+        return( GLU.GLU_INVALID_VALUE );
+      }
+    
+      if( type == GL2.GL_BITMAP ) {
+        return( GLU.GLU_INVALID_ENUM );
+      }
+    
+      closestFit3D( gl, target, width, height, depth, internalFormat, format,
+                    type, widthPowerOf2, heightPowerOf2, depthPowerOf2 );
+    
+      levels = computeLog( widthPowerOf2[0] );
+      level = computeLog( heightPowerOf2[0] );
+      if( level > levels ) {
+        levels = level;
+      }
+      level = computeLog( depthPowerOf2[0] );
+      if( level > levels ) {
+        levels = level;
+      }
+    
+      return( BuildMipmap.gluBuild3DMipmapLevelsCore( gl, target, internalFormat, width,
+              height, depth, widthPowerOf2[0], heightPowerOf2[0], depthPowerOf2[0],
+              format, type, 0, 0, levels, data ) );
+    } finally {
+      data.position(dataPos);
+    }
+  }
+  
+  public static int gluBuild3DMipmapLevels( GL gl, int target, int internalFormat,
+          int width, int height, int depth, int format, int type, int userLevel,
+          int baseLevel, int maxLevel, ByteBuffer data ) {
+    int dataPos = data.position();
+    try {
+      int level, levels;
+    
+      int rc = checkMipmapArgs( internalFormat, format, type );
+      if( rc != 0 ) {
+        return( rc );
+      }
+    
+      if( width < 1 || height < 1 || depth < 1 ) {
+        return( GLU.GLU_INVALID_VALUE );
+      }
+    
+      if( type == GL2.GL_BITMAP ) {
+        return( GLU.GLU_INVALID_ENUM );
+      }
+    
+      levels = computeLog( width );
+      level = computeLog( height );
+      if( level > levels ) {
+        levels = level;
+      }
+      level = computeLog( depth );
+      if( level > levels ) {
+        levels = level;
+      }
+    
+      levels += userLevel;
+      if( !isLegalLevels( userLevel, baseLevel, maxLevel, levels ) ) {
+        return( GLU.GLU_INVALID_VALUE );
+      }
+    
+      return( BuildMipmap.gluBuild3DMipmapLevelsCore( gl, target, internalFormat, width,
+              height, depth, width, height, depth, format, type, userLevel,
+              baseLevel, maxLevel, data ) );
+    } finally {
+      data.position(dataPos);
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/PixelStorageModes.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/PixelStorageModes.java
new file mode 100644
index 000000000..43b5c5691
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/PixelStorageModes.java
@@ -0,0 +1,426 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+/**
+ *
+ * @author  Administrator
+ */
+public class PixelStorageModes {
+
+  /**
+   * Holds value of property packAlignment.
+   */
+  private int packAlignment;
+
+  /**
+   * Holds value of property packRowLength.
+   */
+  private int packRowLength;
+
+  /**
+   * Holds value of property packSkipRows.
+   */
+  private int packSkipRows;
+
+  /**
+   * Holds value of property packSkipPixels.
+   */
+  private int packSkipPixels;
+
+  /**
+   * Holds value of property packLsbFirst.
+   */
+  private boolean packLsbFirst;
+
+  /**
+   * Holds value of property packSwapBytes.
+   */
+  private boolean packSwapBytes;
+
+  /**
+   * Holds value of property packSkipImages.
+   */
+  private int packSkipImages;
+
+  /**
+   * Holds value of property packImageHeight.
+   */
+  private int packImageHeight;
+
+  /**
+   * Holds value of property unpackAlignment.
+   */
+  private int unpackAlignment;
+
+  /**
+   * Holds value of property unpackRowLength.
+   */
+  private int unpackRowLength;
+
+  /**
+   * Holds value of property unpackSkipRows.
+   */
+  private int unpackSkipRows;
+
+  /**
+   * Holds value of property unpackSkipPixels.
+   */
+  private int unpackSkipPixels;
+
+  /**
+   * Holds value of property unpackLsbFirst.
+   */
+  private boolean unpackLsbFirst;
+
+  /**
+   * Holds value of property unpackSwapBytes.
+   */
+  private boolean unpackSwapBytes;
+
+  /**
+   * Holds value of property unpackSkipImages.
+   */
+  private int unpackSkipImages;
+
+  /**
+   * Holds value of property unpackImageHeight.
+   */
+  private int unpackImageHeight;
+  
+  /** Creates a new instance of PixelStorageModes */
+  public PixelStorageModes() {
+  }
+
+  /**
+   * Getter for property packAlignment.
+   * @return Value of property packAlignment.
+   */
+  public int getPackAlignment() {
+
+    return this.packAlignment;
+  }
+
+  /**
+   * Setter for property packAlignment.
+   * @param packAlignment New value of property packAlignment.
+   */
+  public void setPackAlignment(int packAlignment) {
+
+    this.packAlignment = packAlignment;
+  }
+
+  /**
+   * Getter for property packRowLength.
+   * @return Value of property packRowLength.
+   */
+  public int getPackRowLength() {
+
+    return this.packRowLength;
+  }
+
+  /**
+   * Setter for property packRowLength.
+   * @param packRowLength New value of property packRowLength.
+   */
+  public void setPackRowLength(int packRowLength) {
+
+    this.packRowLength = packRowLength;
+  }
+
+  /**
+   * Getter for property packSkipRows.
+   * @return Value of property packSkipRows.
+   */
+  public int getPackSkipRows() {
+
+    return this.packSkipRows;
+  }
+
+  /**
+   * Setter for property packSkipRows.
+   * @param packSkipRows New value of property packSkipRows.
+   */
+  public void setPackSkipRows(int packSkipRows) {
+
+    this.packSkipRows = packSkipRows;
+  }
+
+  /**
+   * Getter for property packSkipPixels.
+   * @return Value of property packSkipPixels.
+   */
+  public int getPackSkipPixels() {
+
+    return this.packSkipPixels;
+  }
+
+  /**
+   * Setter for property packSkipPixels.
+   * @param packSkipPixels New value of property packSkipPixels.
+   */
+  public void setPackSkipPixels(int packSkipPixels) {
+
+    this.packSkipPixels = packSkipPixels;
+  }
+
+  /**
+   * Getter for property packLsbFirst.
+   * @return Value of property packLsbFirst.
+   */
+  public boolean getPackLsbFirst() {
+
+    return this.packLsbFirst;
+  }
+
+  /**
+   * Setter for property packLsbFirst.
+   * @param packLsbFirst New value of property packLsbFirst.
+   */
+  public void setPackLsbFirst(boolean packLsbFirst) {
+
+    this.packLsbFirst = packLsbFirst;
+  }
+
+  /**
+   * Getter for property packSwapBytes.
+   * @return Value of property packSwapBytes.
+   */
+  public boolean getPackSwapBytes() {
+
+    return this.packSwapBytes;
+  }
+
+  /**
+   * Setter for property packSwapBytes.
+   * @param packSwapBytes New value of property packSwapBytes.
+   */
+  public void setPackSwapBytes(boolean packSwapBytes) {
+
+    this.packSwapBytes = packSwapBytes;
+  }
+
+  /**
+   * Getter for property packSkipImages.
+   * @return Value of property packSkipImages.
+   */
+  public int getPackSkipImages() {
+
+    return this.packSkipImages;
+  }
+
+  /**
+   * Setter for property packSkipImages.
+   * @param packSkipImages New value of property packSkipImages.
+   */
+  public void setPackSkipImages(int packSkipImages) {
+
+    this.packSkipImages = packSkipImages;
+  }
+
+  /**
+   * Getter for property packImageHeight.
+   * @return Value of property packImageHeight.
+   */
+  public int getPackImageHeight() {
+
+    return this.packImageHeight;
+  }
+
+  /**
+   * Setter for property packImageHeight.
+   * @param packImageHeight New value of property packImageHeight.
+   */
+  public void setPackImageHeight(int packImageHeight) {
+
+    this.packImageHeight = packImageHeight;
+  }
+
+  /**
+   * Getter for property unpackAlignment.
+   * @return Value of property unpackAlignment.
+   */
+  public int getUnpackAlignment() {
+
+    return this.unpackAlignment;
+  }
+
+  /**
+   * Setter for property unpackAlignment.
+   * @param unpackAlignment New value of property unpackAlignment.
+   */
+  public void setUnpackAlignment(int unpackAlignment) {
+
+    this.unpackAlignment = unpackAlignment;
+  }
+
+  /**
+   * Getter for property unpackRowLength.
+   * @return Value of property unpackRowLength.
+   */
+  public int getUnpackRowLength() {
+
+    return this.unpackRowLength;
+  }
+
+  /**
+   * Setter for property unpackRowLength.
+   * @param unpackRowLength New value of property unpackRowLength.
+   */
+  public void setUnpackRowLength(int unpackRowLength) {
+
+    this.unpackRowLength = unpackRowLength;
+  }
+
+  /**
+   * Getter for property unpackSkipRows.
+   * @return Value of property unpackSkipRows.
+   */
+  public int getUnpackSkipRows() {
+
+    return this.unpackSkipRows;
+  }
+
+  /**
+   * Setter for property unpackSkipRows.
+   * @param unpackSkipRows New value of property unpackSkipRows.
+   */
+  public void setUnpackSkipRows(int unpackSkipRows) {
+
+    this.unpackSkipRows = unpackSkipRows;
+  }
+
+  /**
+   * Getter for property unpackSkipPixels.
+   * @return Value of property unpackSkipPixels.
+   */
+  public int getUnpackSkipPixels() {
+
+    return this.unpackSkipPixels;
+  }
+
+  /**
+   * Setter for property unpackSkipPixels.
+   * @param unpackSkipPixels New value of property unpackSkipPixels.
+   */
+  public void setUnpackSkipPixels(int unpackSkipPixels) {
+
+    this.unpackSkipPixels = unpackSkipPixels;
+  }
+
+  /**
+   * Getter for property unpackLsbFirst.
+   * @return Value of property unpackLsbFirst.
+   */
+  public boolean getUnpackLsbFirst() {
+
+    return this.unpackLsbFirst;
+  }
+
+  /**
+   * Setter for property unpackLsbFirst.
+   * @param unpackLsbFirst New value of property unpackLsbFirst.
+   */
+  public void setUnpackLsbFirst(boolean unpackLsbFirst) {
+
+    this.unpackLsbFirst = unpackLsbFirst;
+  }
+
+  /**
+   * Getter for property unpackSwapBytes.
+   * @return Value of property unpackSwapBytes.
+   */
+  public boolean getUnpackSwapBytes() {
+
+    return this.unpackSwapBytes;
+  }
+
+  /**
+   * Setter for property unpackSwapBytes.
+   * @param unpackSwapBytes New value of property unpackSwapBytes.
+   */
+  public void setUnpackSwapBytes(boolean unpackSwapBytes) {
+
+    this.unpackSwapBytes = unpackSwapBytes;
+  }
+
+  /**
+   * Getter for property unpackSkipImages.
+   * @return Value of property unpackSkipImages.
+   */
+  public int getUnpackSkipImages() {
+
+    return this.unpackSkipImages;
+  }
+
+  /**
+   * Setter for property unpackSkipImages.
+   * @param unpackSkipImages New value of property unpackSkipImages.
+   */
+  public void setUnpackSkipImages(int unpackSkipImages) {
+
+    this.unpackSkipImages = unpackSkipImages;
+  }
+
+  /**
+   * Getter for property unpackImageHeight.
+   * @return Value of property unpackImageHeight.
+   */
+  public int getUnpackImageHeight() {
+
+    return this.unpackImageHeight;
+  }
+
+  /**
+   * Setter for property unpackImageHeight.
+   * @param unpackImageHeight New value of property unpackImageHeight.
+   */
+  public void setUnpackImageHeight(int unpackImageHeight) {
+
+    this.unpackImageHeight = unpackImageHeight;
+  }
+  
+  
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ScaleInternal.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ScaleInternal.java
new file mode 100644
index 000000000..f0bb7fb33
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ScaleInternal.java
@@ -0,0 +1,2447 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
+import javax.media.opengl.glu.GLU;
+import java.nio.*;
+import com.jogamp.opengl.impl.InternalBufferUtil;
+
+/**
+ *
+ * @author  Administrator
+ */
+public class ScaleInternal {
+  
+  public static final float UINT_MAX = (float)(0x00000000FFFFFFFF);
+  
+  public static void scale_internal( int components, int widthin, int heightin,
+          ShortBuffer datain, int widthout, int heightout, ShortBuffer dataout ) {
+    float x, lowx, highx, convx, halfconvx;
+    float y, lowy, highy, convy, halfconvy;
+    float xpercent, ypercent;
+    float percent;
+    // Max components in a format is 4, so...
+    float[] totals = new float[4];
+    float area;
+    int i, j, k, yint, xint, xindex, yindex;
+    int temp;
+    
+    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
+      HalveImage.halveImage( components, widthin, heightin, datain, dataout );
+      return;
+    }
+    convy = (float)heightin / heightout;
+    convx = (float)widthin / widthout;
+    halfconvx = convx / 2;
+    halfconvy = convy / 2;
+    for( i = 0; i < heightout; i++ ) {
+      y = convy * ( i + 0.5f );
+      if( heightin > heightout ) {
+        highy = y + halfconvy;
+        lowy = y - halfconvy;
+      } else {
+        highy = y + 0.5f;
+        lowy = y - 0.5f;
+      }
+      for( j = 0; j < widthout; j++ ) {
+        x = convx * ( j + 0.5f );
+        if( widthin > widthout ) {
+          highx = x + halfconvx;
+          lowx = x - halfconvx;
+        } else {
+          highx = x + 0.5f;
+          lowx = x - 0.5f;
+        }
+        // Ok, now apply box filter to box that goes from (lowx, lowy)
+        // to (highx, highy) on input data into this pixel on output
+        // data.
+        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
+        area = 0.0f;
+        
+        y = lowy;
+        yint = (int)Math.floor( y );
+        while( y < highy ) {
+          yindex = ( yint + heightin ) % heightin;
+          if( highy < yint + 1 ) {
+            ypercent = highy - y;
+          } else {
+            ypercent = yint + 1 - y;
+          }
+          
+          x = lowx;
+          xint = (int)Math.floor( x );
+          
+          while( x < highx ) {
+            xindex = ( xint + widthin ) % widthin;
+            if( highx < xint + 1 ) {
+              xpercent = highx -x;
+            } else {
+              xpercent = xint + 1 - x;
+            }
+            
+            percent = xpercent * ypercent;
+            area += percent;
+            temp = ( xindex + ( yindex * widthin) ) * components;
+            for( k = 0; k < components; k++ ) {
+              totals[k] += datain.get( temp + k ) * percent; 
+            }
+            
+            xint++;
+            x = xint;
+          }
+          yint++;
+          y = yint;
+        }
+        
+        temp = ( j + ( i * widthout ) ) * components;
+        for( k = 0; k < components; k++ ) {
+          // totals[] should be rounded in the case of enlarging an RGB
+          // ramp when the type is 332 or 4444
+          dataout.put(  temp + k, (short)((totals[k] + 0.5f) / area) );
+        }
+      }
+    }
+  }
+  
+  public static void scale_internal_ubyte( int components, int widthin, int heightin,
+                              ByteBuffer datain, int widthout, int heightout, 
+                              ByteBuffer dataout, int element_size, int ysize, int group_size ) {
+    float x, convx;
+    float y, convy;
+    float percent;
+    // Max components in a format is 4, so...
+    float[] totals = new float[4];
+    float area;
+    int i, j, k, xindex;
+    
+    int temp, temp0;
+    int temp_index;
+    int outindex;
+    
+    int lowx_int, highx_int, lowy_int, highy_int;
+    float x_percent, y_percent;
+    float lowx_float, highx_float, lowy_float, highy_float;
+    float convy_float, convx_float;
+    int convy_int, convx_int;
+    int l, m;
+    int left, right;
+    
+    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
+      HalveImage.halveImage_ubyte( components, widthin, heightin, datain, dataout, 
+                        element_size, ysize, group_size );
+      return;
+    }
+    convy = (float)heightin / heightout;
+    convx = (float)widthin / widthout;
+    convy_int = (int)Math.floor( convy );
+    convy_float = convy - convy_int;
+    convx_int = (int)Math.floor( convx );
+    convx_float = convx - convx_int;
+    
+    area = convx * convy;
+    
+    lowy_int = 0;
+    lowy_float = 0.0f;
+    highy_int = convy_int;
+    highy_float = convy_float;
+    
+    for( i = 0; i < heightout; i++ ) {
+      // Clamp here to be sure we don't read beyond input buffer.
+      if (highy_int >= heightin)
+        highy_int = heightin - 1;
+      lowx_int = 0;
+      lowx_float = 0.0f;
+      highx_int = convx_int;
+      highx_float = convx_float;
+      
+      for( j = 0; j < widthout; j++ ) {
+        
+        // Ok, now apply box filter to box that goes from (lowx, lowy)
+        // to (highx, highy) on input data into this pixel on output
+        // data.
+        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
+        
+        // caulate the value for pixels in the 1st row
+        xindex = lowx_int * group_size;
+
+        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
+          
+          y_percent = 1 - lowy_float;
+          temp = xindex + lowy_int * ysize;
+          percent = y_percent * ( 1 - lowx_float );
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += ( 0x000000FF & datain.get() ) * percent;
+          }
+          left = temp;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              totals[k] += ( 0x000000FF & datain.get() ) * y_percent;
+            }
+          }
+          temp += group_size;
+          right = temp;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += ( 0x000000FF & datain.get() ) * percent;
+          }
+          
+          // calculate the value for pixels in the last row
+          y_percent = highy_float;
+          percent = y_percent * ( 1 - lowx_float );
+          temp = xindex + highy_int * ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += ( 0x000000FF & datain.get() ) * percent;
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              totals[k] += ( 0x000000FF & datain.get() ) * y_percent;
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += ( 0x000000FF & datain.get() ) * percent;
+          }
+          
+          // calculate the value for the pixels in the 1st and last column
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            left += ysize;
+            right += ysize;
+            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
+              float f = 0.0f;
+              datain.position( left );
+              f = ( 0x000000FF & datain.get() ) * ( 1.0f - lowx_float );
+              datain.position( right );
+              f += ( 0x000000FF & datain.get() ) * highx_float;
+              totals[k] += f;
+            }
+          }
+        } else if( highy_int > lowy_int ) {
+          x_percent = highx_float - lowx_float;
+          percent = ( 1 - lowy_float) * x_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += ( 0x000000FF & datain.get() ) * percent;
+          }
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            temp += ysize;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              totals[k] += ( 0x000000FF & datain.get() ) * x_percent;
+            }
+          }
+          percent = x_percent * highy_float;
+          temp += ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += ( 0x000000FF & datain.get() ) * percent;
+          }
+        } else if( highx_int > lowx_int ) {
+          y_percent = highy_float - lowy_float;
+          percent = ( 1 - lowx_float ) * y_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += ( 0x000000FF & datain.get() ) * percent;
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              totals[k] += ( 0x000000FF & datain.get() ) * y_percent;
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += ( 0x000000FF & datain.get() ) * percent;
+          }
+        } else {
+          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += ( 0x000000FF & datain.get() ) * percent;
+          }
+        }
+
+        // this is for the pixels in the body
+        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
+        for( m = lowy_int + 1; m < highy_int; m++ ) {
+          temp = temp0;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              totals[k] += ( 0x000000FF & datain.get() );
+            }
+            temp += group_size;
+          }
+          temp0 += ysize;
+        }
+        
+        outindex = ( j + ( i * widthout ) ) * components;
+        for( k = 0; k < components; k++ ) {
+          dataout.position( outindex + k );
+          dataout.put( (byte)(totals[k] / area) );
+        }
+        lowx_int = highx_int;
+        lowx_float = highx_float;
+        highx_int += convx_int;
+        highx_float += convx_float;
+        if( highx_float > 1.0f ) {
+          highx_float -= 1.0f;
+          highx_int++;
+        }
+
+        // Clamp to make sure we don't run off the right edge
+        if (highx_int > widthin - 1) {
+          int delta = (highx_int - widthin + 1);
+          lowx_int -= delta;
+          highx_int -= delta;
+        }
+      }
+      lowy_int = highy_int;
+      lowy_float = highy_float;
+      highy_int += convy_int;
+      highy_float += convy_float;
+      if( highy_float > 1.0f ) {
+        highy_float -= 1.0f;
+        highy_int++;
+      }
+    }
+  }
+  
+  public static void scale_internal_byte( int components, int widthin, int heightin,
+                              ByteBuffer datain, int widthout, int heightout, 
+                              ByteBuffer dataout, int element_size, int ysize,
+                              int group_size ) {
+    float x, convx;
+    float y, convy;
+    float percent;
+    // Max components in a format is 4, so...
+    float[] totals = new float[4];
+    float area;
+    int i, j, k, xindex;
+    
+    int temp, temp0;
+    int temp_index;
+    int outindex;
+    
+    int lowx_int, highx_int, lowy_int, highy_int;
+    float x_percent, y_percent;
+    float lowx_float, highx_float, lowy_float, highy_float;
+    float convy_float, convx_float;
+    int convy_int, convx_int;
+    int l, m;
+    int left, right;
+    
+    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
+      HalveImage.halveImage_byte( components, widthin, heightin, datain, dataout, 
+                        element_size, ysize, group_size );
+      return;
+    }
+    convy = (float)heightin / heightout;
+    convx = (float)widthin / widthout;
+    convy_int = (int)Math.floor( convy );
+    convy_float = convy - convy_int;
+    convx_int = (int)Math.floor( convx );
+    convx_float = convx - convx_int;
+    
+    area = convx * convy;
+    
+    lowy_int = 0;
+    lowy_float = 0.0f;
+    highy_int = convy_int;
+    highy_float = convy_float;
+    
+    for( i = 0; i < heightout; i++ ) {
+      // Clamp here to be sure we don't read beyond input buffer.
+      if (highy_int >= heightin)
+        highy_int = heightin - 1;
+      lowx_int = 0;
+      lowx_float = 0.0f;
+      highx_int = convx_int;
+      highx_float = convx_float;
+      
+      for( j = 0; j < widthout; j++ ) {
+        
+        // Ok, now apply box filter to box that goes from (lowx, lowy)
+        // to (highx, highy) on input data into this pixel on output
+        // data.
+        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
+        
+        // caulate the value for pixels in the 1st row
+        xindex = lowx_int * group_size;
+        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
+          
+          y_percent = 1 - lowy_float;
+          temp = xindex + lowy_int * ysize;
+          percent = y_percent * ( 1 - lowx_float );
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += datain.get() * percent;
+          }
+          left = temp;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              totals[k] += datain.get() * y_percent;
+            }
+          }
+          temp += group_size;
+          right = temp;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += datain.get() * percent;
+          }
+          
+          // calculate the value for pixels in the last row
+          y_percent = highy_float;
+          percent = y_percent * ( 1 - lowx_float );
+          temp = xindex + highy_int * ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += datain.get() * percent;
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              totals[k] += datain.get() * y_percent;
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += datain.get() * percent;
+          }
+          
+          // calculate the value for the pixels in the 1st and last column
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            left += ysize;
+            right += ysize;
+            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
+              float f = 0.0f;
+              datain.position( left );
+              f = datain.get() * ( 1 - lowx_float );
+              datain.position( right );
+              f += datain.get() * highx_float;
+              totals[k] += f;
+            }
+          }
+        } else if( highy_int > lowy_int ) {
+          x_percent = highx_float - lowx_float;
+          percent = ( 1 - lowy_float) * x_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += datain.get() * percent;
+          }
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            temp += ysize;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              totals[k] += datain.get() * x_percent;
+            }
+          }
+          percent = x_percent * highy_float;
+          temp += ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += datain.get() * percent;
+          }
+        } else if( highx_int > lowx_int ) {
+          y_percent = highy_float - lowy_float;
+          percent = ( 1 - lowx_float ) * y_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += datain.get() * percent;
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              totals[k] += datain.get() * y_percent;
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += datain.get() * percent;
+          }
+        } else {
+          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            totals[k] += datain.get() * percent;
+          }
+        }
+        
+        // this is for the pixels in the body
+        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
+        for( m = lowy_int + 1; m < highy_int; m++ ) {
+          temp = temp0;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              totals[k] += datain.get();
+            }
+            temp += group_size;
+          }
+          temp0 += ysize;
+        }
+        
+        outindex = ( j + ( i * widthout ) ) * components;
+        for( k = 0; k < components; k++ ) {
+          dataout.position( outindex + k );
+          dataout.put( (byte)(totals[k] / area) );
+        }
+        lowx_int = highx_int;
+        lowx_float = highx_float;
+        highx_int += convx_int;
+        highx_float += convx_float;
+        if( highx_float > 1.0f ) {
+          highx_float -= 1.0f;
+          highx_int++;
+        }
+
+        // Clamp to make sure we don't run off the right edge
+        if (highx_int > widthin - 1) {
+          int delta = (highx_int - widthin + 1);
+          lowx_int -= delta;
+          highx_int -= delta;
+        }
+      }
+      lowy_int = highy_int;
+      lowy_float = highy_float;
+      highy_int += convy_int;
+      highy_float += convy_float;
+      if( highy_float > 1.0f ) {
+        highy_float -= 1.0f;
+        highy_int++;
+      }
+    }
+  }
+  
+  public static void scale_internal_ushort( int components, int widthin, int heightin,
+                              ByteBuffer datain, int widthout, int heightout, 
+                              ShortBuffer dataout, int element_size, int ysize, 
+                              int group_size, boolean myswap_bytes ) {
+    float x, convx;
+    float y, convy;
+    float percent;
+    // Max components in a format is 4, so...
+    float[] totals = new float[4];
+    float area;
+    int i, j, k, xindex;
+    
+    int temp, temp0;
+    int temp_index;
+    int outindex;
+    
+    int lowx_int, highx_int, lowy_int, highy_int;
+    float x_percent, y_percent;
+    float lowx_float, highx_float, lowy_float, highy_float;
+    float convy_float, convx_float;
+    int convy_int, convx_int;
+    int l, m;
+    int left, right;
+    
+    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
+      HalveImage.halveImage_ushort( components, widthin, heightin, datain, dataout, 
+                        element_size, ysize, group_size, myswap_bytes );
+      return;
+    }
+    convy = (float)heightin / heightout;
+    convx = (float)widthin / widthout;
+    convy_int = (int)Math.floor( convy );
+    convy_float = convy - convy_int;
+    convx_int = (int)Math.floor( convx );
+    convx_float = convx - convx_int;
+    
+    area = convx * convy;
+    
+    lowy_int = 0;
+    lowy_float = 0.0f;
+    highy_int = convy_int;
+    highy_float = convy_float;
+    
+    for( i = 0; i < heightout; i++ ) {
+      // Clamp here to be sure we don't read beyond input buffer.
+      if (highy_int >= heightin)
+        highy_int = heightin - 1;
+      lowx_int = 0;
+      lowx_float = 0.0f;
+      highx_int = convx_int;
+      highx_float = convx_float;
+      
+      for( j = 0; j < widthout; j++ ) {
+        
+        // Ok, now apply box filter to box that goes from (lowx, lowy)
+        // to (highx, highy) on input data into this pixel on output
+        // data.
+        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
+        
+        // caulate the value for pixels in the 1st row
+        xindex = lowx_int * group_size;
+        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
+          
+          y_percent = 1 - lowy_float;
+          temp = xindex + lowy_int * ysize;
+          percent = y_percent * ( 1 - lowx_float );
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += ( 0x0000FFFF & ((int)Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ))) * percent;
+            } else {
+              totals[k] += ( 0x0000FFFF & datain.getShort() ) * percent;
+            }
+          }
+          left = temp;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                totals[k] += ( 0x0000FFFF & ((int)Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ))) * y_percent;
+              } else {
+                totals[k] += ( 0x0000FFFF & datain.getShort()) * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          right = temp;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += ( 0x0000FFFF & (Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ))) * percent;
+            } else {
+              totals[k] += ( 0x0000FFFF & datain.getShort()) * percent;
+            }
+          }
+          
+          // calculate the value for pixels in the last row
+          y_percent = highy_float;
+          percent = y_percent * ( 1 - lowx_float );
+          temp = xindex + highy_int * ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * percent;
+            } else {
+              totals[k] += ( 0x0000FFFF & datain.getShort() ) * percent;
+            }
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                totals[k] += ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * y_percent;
+              } else {
+                totals[k] += ( 0x0000FFFF & datain.getShort()) * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * percent;
+            } else {
+              totals[k] += ( 0x0000FFFF & datain.getShort()) * percent;
+            }
+          }
+          
+          // calculate the value for the pixels in the 1st and last column
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            left += ysize;
+            right += ysize;
+            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
+              if( myswap_bytes ) {
+                datain.position( left );
+                float f = (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES(datain.getShort())) * ( 1 - lowx_float );
+                datain.position( right );
+                f += ((0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES(datain.getShort())) * highx_float);
+                totals[k] += f;
+              } else {
+                datain.position( left );
+                float f = ((0x0000FFFF & datain.getShort()) * ( 1 - lowx_float ));
+                datain.position( right );
+                f += ((0x0000FFFF & datain.getShort()) * highx_float);
+                totals[k] += f;
+              }
+            }
+          }
+        } else if( highy_int > lowy_int ) {
+          x_percent = highx_float - lowx_float;
+          percent = ( 1 - lowy_float) * x_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() )) * percent;
+            } else {
+              totals[k] += (0x0000FFFF & datain.getShort()) * percent;
+            }
+          }
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            temp += ysize;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * x_percent;
+              } else {
+                totals[k] += (0x0000FFFF & datain.getShort()) * x_percent;
+              }
+            }
+          }
+          percent = x_percent * highy_float;
+          temp += ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() )) * percent;
+            } else {
+              totals[k] += (0x0000FFFF & datain.getShort()) * percent;
+            }
+          }
+        } else if( highx_int > lowx_int ) {
+          y_percent = highy_float - lowy_float;
+          percent = ( 1 - lowx_float ) * y_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * percent;
+            } else {
+              totals[k] += (0x0000FFFF & datain.getShort()) * percent;
+            }
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * y_percent;
+              } else {
+                totals[k] += (0x0000FFFF & datain.getShort()) * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * percent;
+            } else {
+              totals[k] += (0x0000FFFF & datain.getShort()) * percent;
+            }
+          }
+        } else {
+          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * percent;
+            } else {
+              totals[k] += (0x0000FFFF & datain.getShort()) * percent;
+            }
+          }
+        }
+        
+        // this is for the pixels in the body
+        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
+        for( m = lowy_int + 1; m < highy_int; m++ ) {
+          temp = temp0;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()));
+              } else {
+                totals[k] += (0x0000FFFF & datain.getShort());
+              }
+            }
+            temp += group_size;
+          }
+          temp0 += ysize;
+        }
+        
+        outindex = ( j + ( i * widthout ) ) * components;
+        for( k = 0; k < components; k++ ) {
+          dataout.position( outindex + k );
+          dataout.put( (short)(totals[k] / area) );
+        }
+        lowx_int = highx_int;
+        lowx_float = highx_float;
+        highx_int += convx_int;
+        highx_float += convx_float;
+        if( highx_float > 1.0f ) {
+          highx_float -= 1.0f;
+          highx_int++;
+        }
+
+        // Clamp to make sure we don't run off the right edge
+        if (highx_int > widthin - 1) {
+          int delta = (highx_int - widthin + 1);
+          lowx_int -= delta;
+          highx_int -= delta;
+        }
+      }
+      lowy_int = highy_int;
+      lowy_float = highy_float;
+      highy_int += convy_int;
+      highy_float += convy_float;
+      if( highy_float > 1.0f ) {
+        highy_float -= 1.0f;
+        highy_int++;
+      }
+    }
+  }
+  
+  public static void scale_internal_short( int components, int widthin, int heightin,
+                              ByteBuffer datain, int widthout, int heightout,
+                              ShortBuffer dataout, int element_size, int ysize, 
+                              int group_size, boolean myswap_bytes ) {
+    float x, convx;
+    float y, convy;
+    float percent;
+    // Max components in a format is 4, so...
+    float[] totals = new float[4];
+    float area;
+    int i, j, k, xindex;
+    
+    int temp, temp0;
+    int temp_index;
+    int outindex;
+    
+    int lowx_int, highx_int, lowy_int, highy_int;
+    float x_percent, y_percent;
+    float lowx_float, highx_float, lowy_float, highy_float;
+    float convy_float, convx_float;
+    int convy_int, convx_int;
+    int l, m;
+    int left, right;
+    
+    int swapbuf; // unsigned buffer
+    
+    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
+      HalveImage.halveImage_short( components, widthin, heightin, datain, dataout, 
+                        element_size, ysize, group_size, myswap_bytes );
+      return;
+    }
+    convy = (float)heightin / heightout;
+    convx = (float)widthin / widthout;
+    convy_int = (int)Math.floor( convy );
+    convy_float = convy - convy_int;
+    convx_int = (int)Math.floor( convx );
+    convx_float = convx - convx_int;
+    
+    area = convx * convy;
+    
+    lowy_int = 0;
+    lowy_float = 0.0f;
+    highy_int = convy_int;
+    highy_float = convy_float;
+    
+    for( i = 0; i < heightout; i++ ) {
+      // Clamp here to be sure we don't read beyond input buffer.
+      if (highy_int >= heightin)
+        highy_int = heightin - 1;
+      lowx_int = 0;
+      lowx_float = 0.0f;
+      highx_int = convx_int;
+      highx_float = convx_float;
+      
+      for( j = 0; j < widthout; j++ ) {
+        
+        // Ok, now apply box filter to box that goes from (lowx, lowy)
+        // to (highx, highy) on input data into this pixel on output
+        // data.
+        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
+        
+        // caulate the value for pixels in the 1st row
+        xindex = lowx_int * group_size;
+        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
+          
+          y_percent = 1 - lowy_float;
+          temp = xindex + lowy_int * ysize;
+          percent = y_percent * ( 1 - lowx_float );
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getShort() * percent;
+            }
+          }
+          left = temp;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+                totals[k] += swapbuf * y_percent;
+              } else {
+                totals[k] += datain.getShort() * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          right = temp;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getShort() * percent;
+            }
+          }
+          
+          // calculate the value for pixels in the last row
+          y_percent = highy_float;
+          percent = y_percent * ( 1 - lowx_float );
+          temp = xindex + highy_int * ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getShort() * percent;
+            }
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+                totals[k] += swapbuf * y_percent;
+              } else {
+                totals[k] += datain.getShort() * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getShort() * percent;
+            }
+          }
+          
+          // calculate the value for the pixels in the 1st and last column
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            left += ysize;
+            right += ysize;
+            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
+              if( myswap_bytes ) {
+                datain.position( left );
+                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+                totals[k] += swapbuf * ( 1 - lowx_float );
+                datain.position( right );
+                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+                totals[k] += swapbuf * highx_float;
+              } else {
+                datain.position( left );
+                totals[k] += datain.getShort() * ( 1 - lowx_float );
+                datain.position( right );
+                totals[k] += datain.getShort() * highx_float;
+              }
+            }
+          }
+        } else if( highy_int > lowy_int ) {
+          x_percent = highx_float - lowx_float;
+          percent = ( 1 - lowy_float) * x_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getShort() * percent;
+            }
+          }
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            temp += ysize;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort());
+                totals[k] += swapbuf * x_percent;
+              } else {
+                totals[k] += datain.getShort() * x_percent;
+              }
+            }
+          }
+          percent = x_percent * highy_float;
+          temp += ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getShort() * percent;
+            }
+          }
+        } else if( highx_int > lowx_int ) {
+          y_percent = highy_float - lowy_float;
+          percent = ( 1 - lowx_float ) * y_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getShort() * percent;
+            }
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+                totals[k] += swapbuf * y_percent;
+              } else {
+                totals[k] += datain.getShort() * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getShort() * percent;
+            }
+          }
+        } else {
+          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getShort() * percent;
+            }
+          }
+        }
+        
+        // this is for the pixels in the body
+        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
+        for( m = lowy_int + 1; m < highy_int; m++ ) {
+          temp = temp0;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
+                totals[k] += swapbuf;
+              } else {
+                totals[k] += datain.getShort();
+              }
+            }
+            temp += group_size;
+          }
+          temp0 += ysize;
+        }
+        
+        outindex = ( j + ( i * widthout ) ) * components;
+        for( k = 0; k < components; k++ ) {
+          dataout.position( outindex + k );
+          dataout.put( (short)(totals[k] / area) );
+        }
+        lowx_int = highx_int;
+        lowx_float = highx_float;
+        highx_int += convx_int;
+        highx_float += convx_float;
+        if( highx_float > 1.0f ) {
+          highx_float -= 1.0f;
+          highx_int++;
+        }
+
+        // Clamp to make sure we don't run off the right edge
+        if (highx_int > widthin - 1) {
+          int delta = (highx_int - widthin + 1);
+          lowx_int -= delta;
+          highx_int -= delta;
+        }
+      }
+      lowy_int = highy_int;
+      lowy_float = highy_float;
+      highy_int += convy_int;
+      highy_float += convy_float;
+      if( highy_float > 1.0f ) {
+        highy_float -= 1.0f;
+        highy_int++;
+      }
+    }
+  }
+  
+  public static void scale_internal_uint( int components, int widthin, int heightin,
+                              ByteBuffer datain, int widthout, int heightout, 
+                              IntBuffer dataout, int element_size, int ysize, 
+                              int group_size, boolean myswap_bytes ) {
+    float x, convx;
+    float y, convy;
+    float percent;
+    // Max components in a format is 4, so...
+    float[] totals = new float[4];
+    float area;
+    int i, j, k, xindex;
+    
+    int temp, temp0;
+    int temp_index;
+    int outindex;
+    
+    int lowx_int, highx_int, lowy_int, highy_int;
+    float x_percent, y_percent;
+    float lowx_float, highx_float, lowy_float, highy_float;
+    float convy_float, convx_float;
+    int convy_int, convx_int;
+    int l, m;
+    int left, right;
+    
+    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
+      HalveImage.halveImage_uint( components, widthin, heightin, datain, dataout, 
+                        element_size, ysize, group_size, myswap_bytes );
+      return;
+    }
+    convy = (float)heightin / heightout;
+    convx = (float)widthin / widthout;
+    convy_int = (int)Math.floor( convy );
+    convy_float = convy - convy_int;
+    convx_int = (int)Math.floor( convx );
+    convx_float = convx - convx_int;
+    
+    area = convx * convy;
+    
+    lowy_int = 0;
+    lowy_float = 0.0f;
+    highy_int = convy_int;
+    highy_float = convy_float;
+    
+    for( i = 0; i < heightout; i++ ) {
+      // Clamp here to be sure we don't read beyond input buffer.
+      if (highy_int >= heightin)
+        highy_int = heightin - 1;
+      lowx_int = 0;
+      lowx_float = 0.0f;
+      highx_int = convx_int;
+      highx_float = convx_float;
+      
+      for( j = 0; j < widthout; j++ ) {
+        
+        // Ok, now apply box filter to box that goes from (lowx, lowy)
+        // to (highx, highy) on input data into this pixel on output
+        // data.
+        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
+        
+        // caulate the value for pixels in the 1st row
+        xindex = lowx_int * group_size;
+        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
+          
+          y_percent = 1 - lowy_float;
+          temp = xindex + lowy_int * ysize;
+          percent = y_percent * ( 1 - lowx_float );
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()) ) * percent;
+            } else {
+              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
+            }
+          }
+          left = temp;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()) ) * y_percent;
+              } else {
+                totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          right = temp;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()) ) * percent;
+            } else {
+              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
+            }
+          }
+          
+          // calculate the value for pixels in the last row
+          y_percent = highy_float;
+          percent = y_percent * ( 1 - lowx_float );
+          temp = xindex + highy_int * ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()) ) * percent;
+            } else {
+              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
+            }
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()) ) * y_percent;
+              } else {
+                totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()) ) * percent;
+            } else {
+              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
+            }
+          }
+          
+          // calculate the value for the pixels in the 1st and last column
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            left += ysize;
+            right += ysize;
+            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
+              if( myswap_bytes ) {
+                datain.position( left );
+                totals[k] += ((0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES(datain.getInt())) * ( 1 - lowx_float ));
+                datain.position( right );
+                totals[k] += ((0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES(datain.getInt())) * highx_float);
+              } else {
+                datain.position( left );
+                totals[k] += ((0x00000000FFFFFFFF & datain.getInt()) * ( 1 - lowx_float ));
+                datain.position( right );
+                totals[k] += ((0x00000000FFFFFFFF & datain.getInt()) * highx_float);
+              }
+            }
+          }
+        } else if( highy_int > lowy_int ) {
+          x_percent = highx_float - lowx_float;
+          percent = ( 1 - lowy_float) * x_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * percent;
+            } else {
+              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
+            }
+          }
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            temp += ysize;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * x_percent;
+              } else {
+                totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * x_percent;
+              }
+            }
+          }
+          percent = x_percent * highy_float;
+          temp += ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * percent;
+            } else {
+              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
+            }
+          }
+        } else if( highx_int > lowx_int ) {
+          y_percent = highy_float - lowy_float;
+          percent = ( 1 - lowx_float ) * y_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * percent;
+            } else {
+              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
+            }
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * y_percent;
+              } else {
+                totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * percent;
+            } else {
+              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
+            }
+          }
+        } else {
+          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            long tempInt0 = ( 0xFFFFFFFFL & datain.getInt( temp_index ) );
+            datain.position( temp_index );
+            long tempInt1 = ( 0xFFFFFFFFL & datain.getInt() );
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * percent;
+            } else {
+              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
+            }
+          }
+        }
+        
+        // this is for the pixels in the body
+        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
+        for( m = lowy_int + 1; m < highy_int; m++ ) {
+          temp = temp0;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()));
+              } else {
+                totals[k] += (0x00000000FFFFFFFF & datain.getInt());
+              }
+            }
+            temp += group_size;
+          }
+          temp0 += ysize;
+        }
+        
+        outindex = ( j + ( i * widthout ) ) * components;
+        float value = 0.0f;
+        for( k = 0; k < components; k++ ) {
+          value = totals[k] / area;
+          dataout.position( outindex + k );
+          if( value >= UINT_MAX ) {
+            dataout.put( (int)value );
+          } else {
+            dataout.put( (int)(totals[k] / area) );
+          }
+        }
+        lowx_int = highx_int;
+        lowx_float = highx_float;
+        highx_int += convx_int;
+        highx_float += convx_float;
+        if( highx_float > 1.0f ) {
+          highx_float -= 1.0f;
+          highx_int++;
+        }
+
+        // Clamp to make sure we don't run off the right edge
+        if (highx_int > widthin - 1) {
+          int delta = (highx_int - widthin + 1);
+          lowx_int -= delta;
+          highx_int -= delta;
+        }
+      }
+      lowy_int = highy_int;
+      lowy_float = highy_float;
+      highy_int += convy_int;
+      highy_float += convy_float;
+      if( highy_float > 1.0f ) {
+        highy_float -= 1.0f;
+        highy_int++;
+      }
+    }
+  }
+  
+  public static void scale_internal_int( int components, int widthin, int heightin,
+                              ByteBuffer datain, int widthout, int heightout, 
+                              IntBuffer dataout, int element_size, int ysize, 
+                              int group_size, boolean myswap_bytes ) {
+    float x, convx;
+    float y, convy;
+    float percent;
+    // Max components in a format is 4, so...
+    float[] totals = new float[4];
+    float area;
+    int i, j, k, xindex;
+    
+    int temp, temp0;
+    int temp_index;
+    int outindex;
+    
+    int lowx_int, highx_int, lowy_int, highy_int;
+    float x_percent, y_percent;
+    float lowx_float, highx_float, lowy_float, highy_float;
+    float convy_float, convx_float;
+    int convy_int, convx_int;
+    int l, m;
+    int left, right;
+    
+    long swapbuf; // unsigned buffer
+    
+    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
+      HalveImage.halveImage_int( components, widthin, heightin, datain, dataout, 
+                        element_size, ysize, group_size, myswap_bytes );
+      return;
+    }
+    convy = (float)heightin / heightout;
+    convx = (float)widthin / widthout;
+    convy_int = (int)Math.floor( convy );
+    convy_float = convy - convy_int;
+    convx_int = (int)Math.floor( convx );
+    convx_float = convx - convx_int;
+    
+    area = convx * convy;
+    
+    lowy_int = 0;
+    lowy_float = 0.0f;
+    highy_int = convy_int;
+    highy_float = convy_float;
+    
+    for( i = 0; i < heightout; i++ ) {
+      // Clamp here to be sure we don't read beyond input buffer.
+      if (highy_int >= heightin)
+        highy_int = heightin - 1;
+      lowx_int = 0;
+      lowx_float = 0.0f;
+      highx_int = convx_int;
+      highx_float = convx_float;
+      
+      for( j = 0; j < widthout; j++ ) {
+        
+        // Ok, now apply box filter to box that goes from (lowx, lowy)
+        // to (highx, highy) on input data into this pixel on output
+        // data.
+        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
+        
+        // caulate the value for pixels in the 1st row
+        xindex = lowx_int * group_size;
+        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
+          
+          y_percent = 1 - lowy_float;
+          temp = xindex + lowy_int * ysize;
+          percent = y_percent * ( 1 - lowx_float );
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getInt() * percent;
+            }
+          }
+          left = temp;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+                totals[k] += swapbuf * y_percent;
+              } else {
+                totals[k] += datain.getInt() * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          right = temp;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getInt() * percent;
+            }
+          }
+          
+          // calculate the value for pixels in the last row
+          y_percent = highy_float;
+          percent = y_percent * ( 1 - lowx_float );
+          temp = xindex + highy_int * ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getInt() * percent;
+            }
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+                totals[k] += swapbuf * y_percent;
+              } else {
+                totals[k] += datain.getInt() * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getInt() * percent;
+            }
+          }
+          
+          // calculate the value for the pixels in the 1st and last column
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            left += ysize;
+            right += ysize;
+            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
+              if( myswap_bytes ) {
+                datain.position( left );
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+                totals[k] += swapbuf * ( 1 - lowx_float );
+                datain.position( right );
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+                totals[k] += swapbuf * highx_float;
+              } else {
+                datain.position( left );
+                totals[k] += (datain.getInt() * ( 1 - lowx_float ));
+                datain.position( right );
+                totals[k] += (datain.getInt() * highx_float);
+              }
+            }
+          }
+        } else if( highy_int > lowy_int ) {
+          x_percent = highx_float - lowx_float;
+          percent = ( 1 - lowy_float) * x_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getInt() * percent;
+            }
+          }
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            temp += ysize;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+                totals[k] += swapbuf * x_percent;
+              } else {
+                totals[k] += datain.getInt() * x_percent;
+              }
+            }
+          }
+          percent = x_percent * highy_float;
+          temp += ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getInt() * percent;
+            }
+          }
+        } else if( highx_int > lowx_int ) {
+          y_percent = highy_float - lowy_float;
+          percent = ( 1 - lowx_float ) * y_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getInt() * percent;
+            }
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+                totals[k] += swapbuf * y_percent;
+              } else {
+                totals[k] += datain.getInt() * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getInt() * percent;
+            }
+          }
+        } else {
+          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getInt() * percent;
+            }
+          }
+        }
+        
+        // this is for the pixels in the body
+        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
+        for( m = lowy_int + 1; m < highy_int; m++ ) {
+          temp = temp0;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
+                totals[k] += swapbuf;
+              } else {
+                totals[k] += datain.getInt();
+              }
+            }
+            temp += group_size;
+          }
+          temp0 += ysize;
+        }
+        
+        outindex = ( j + ( i * widthout ) ) * components;
+        for( k = 0; k < components; k++ ) {
+          dataout.position( outindex + k );
+          dataout.put( (int)(totals[k] / area) );
+        }
+        lowx_int = highx_int;
+        lowx_float = highx_float;
+        highx_int += convx_int;
+        highx_float += convx_float;
+        if( highx_float > 1.0f ) {
+          highx_float -= 1.0f;
+          highx_int++;
+        }
+
+        // Clamp to make sure we don't run off the right edge
+        if (highx_int > widthin - 1) {
+          int delta = (highx_int - widthin + 1);
+          lowx_int -= delta;
+          highx_int -= delta;
+        }
+      }
+      lowy_int = highy_int;
+      lowy_float = highy_float;
+      highy_int += convy_int;
+      highy_float += convy_float;
+      if( highy_float > 1.0f ) {
+        highy_float -= 1.0f;
+        highy_int++;
+      }
+    }
+  }
+  
+  public static void scale_internal_float( int components, int widthin, int heightin,
+                              ByteBuffer datain, int widthout, int heightout, 
+                              FloatBuffer dataout, int element_size, int ysize, 
+                              int group_size, boolean myswap_bytes ) {
+    float x, convx;
+    float y, convy;
+    float percent;
+    // Max components in a format is 4, so...
+    float[] totals = new float[4];
+    float area;
+    int i, j, k, xindex;
+    
+    int temp, temp0;
+    int temp_index;
+    int outindex;
+    
+    int lowx_int, highx_int, lowy_int, highy_int;
+    float x_percent, y_percent;
+    float lowx_float, highx_float, lowy_float, highy_float;
+    float convy_float, convx_float;
+    int convy_int, convx_int;
+    int l, m;
+    int left, right;
+    
+    float swapbuf; // unsigned buffer
+    
+    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
+      HalveImage.halveImage_float( components, widthin, heightin, datain, dataout, 
+                        element_size, ysize, group_size, myswap_bytes );
+      return;
+    }
+    convy = (float)heightin / heightout;
+    convx = (float)widthin / widthout;
+    convy_int = (int)Math.floor( convy );
+    convy_float = convy - convy_int;
+    convx_int = (int)Math.floor( convx );
+    convx_float = convx - convx_int;
+    
+    area = convx * convy;
+    
+    lowy_int = 0;
+    lowy_float = 0.0f;
+    highy_int = convy_int;
+    highy_float = convy_float;
+    
+    for( i = 0; i < heightout; i++ ) {
+      // Clamp here to be sure we don't read beyond input buffer.
+      if (highy_int >= heightin)
+        highy_int = heightin - 1;
+      lowx_int = 0;
+      lowx_float = 0.0f;
+      highx_int = convx_int;
+      highx_float = convx_float;
+      
+      for( j = 0; j < widthout; j++ ) {
+        
+        // Ok, now apply box filter to box that goes from (lowx, lowy)
+        // to (highx, highy) on input data into this pixel on output
+        // data.
+        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
+        
+        // caulate the value for pixels in the 1st row
+        xindex = lowx_int * group_size;
+        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
+          
+          y_percent = 1 - lowy_float;
+          temp = xindex + lowy_int * ysize;
+          percent = y_percent * ( 1 - lowx_float );
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getFloat() * percent;
+            }
+          }
+          left = temp;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+                totals[k] += swapbuf * y_percent;
+              } else {
+                totals[k] += datain.getFloat() * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          right = temp;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getFloat() * percent;
+            }
+          }
+          
+          // calculate the value for pixels in the last row
+          y_percent = highy_float;
+          percent = y_percent * ( 1 - lowx_float );
+          temp = xindex + highy_int * ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getFloat() * percent;
+            }
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+                totals[k] += swapbuf * y_percent;
+              } else {
+                totals[k] += datain.getFloat() * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getFloat() * percent;
+            }
+          }
+          
+          // calculate the value for the pixels in the 1st and last column
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            left += ysize;
+            right += ysize;
+            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
+              if( myswap_bytes ) {
+                datain.position( left );
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+                totals[k] += swapbuf * ( 1 - lowx_float );
+                datain.position( right );
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+                totals[k] += swapbuf * highx_float;
+              } else {
+                datain.position( left );
+                totals[k] += (datain.getFloat() * ( 1 - lowx_float ));
+                datain.position( right );
+                totals[k] += (datain.getFloat() * highx_float);
+              }
+            }
+          }
+        } else if( highy_int > lowy_int ) {
+          x_percent = highx_float - lowx_float;
+          percent = ( 1 - lowy_float) * x_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getFloat() * percent;
+            }
+          }
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            temp += ysize;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+                totals[k] += swapbuf * x_percent;
+              } else {
+                totals[k] += datain.getFloat() * x_percent;
+              }
+            }
+          }
+          percent = x_percent * highy_float;
+          temp += ysize;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getFloat() * percent;
+            }
+          }
+        } else if( highx_int > lowx_int ) {
+          y_percent = highy_float - lowy_float;
+          percent = ( 1 - lowx_float ) * y_percent;
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getFloat() * percent;
+            }
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += group_size;
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+                totals[k] += swapbuf * y_percent;
+              } else {
+                totals[k] += datain.getFloat() * y_percent;
+              }
+            }
+          }
+          temp += group_size;
+          percent = y_percent * highx_float;
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getFloat() * percent;
+            }
+          }
+        } else {
+          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
+          temp = xindex + (lowy_int * ysize);
+          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+            datain.position( temp_index );
+            if( myswap_bytes ) {
+              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+              totals[k] += swapbuf * percent;
+            } else {
+              totals[k] += datain.getFloat() * percent;
+            }
+          }
+        }
+        
+        // this is for the pixels in the body
+        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
+        for( m = lowy_int + 1; m < highy_int; m++ ) {
+          temp = temp0;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
+              datain.position( temp_index );
+              if( myswap_bytes ) {
+                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
+                totals[k] += swapbuf;
+              } else {
+                totals[k] += datain.getFloat();
+              }
+            }
+            temp += group_size;
+          }
+          temp0 += ysize;
+        }
+        
+        outindex = ( j + ( i * widthout ) ) * components;
+        for( k = 0; k < components; k++ ) {
+          dataout.position( outindex + k );
+          dataout.put( (totals[k] / area) );
+        }
+        lowx_int = highx_int;
+        lowx_float = highx_float;
+        highx_int += convx_int;
+        highx_float += convx_float;
+        if( highx_float > 1.0f ) {
+          highx_float -= 1.0f;
+          highx_int++;
+        }
+
+        // Clamp to make sure we don't run off the right edge
+        if (highx_int > widthin - 1) {
+          int delta = (highx_int - widthin + 1);
+          lowx_int -= delta;
+          highx_int -= delta;
+        }
+      }
+      lowy_int = highy_int;
+      lowy_float = highy_float;
+      highy_int += convy_int;
+      highy_float += convy_float;
+      if( highy_float > 1.0f ) {
+        highy_float -= 1.0f;
+        highy_int++;
+      }
+    }
+  }
+  
+  public static void scaleInternalPackedPixel( int components, Extract extract, 
+              int widthIn, int heightIn, ByteBuffer dataIn, int widthOut,
+              int heightOut, ByteBuffer dataOut, int pixelSizeInBytes,
+              int rowSizeInBytes, boolean isSwap ) {
+    float x, convx;
+    float y, convy;
+    float percent;
+    
+    // max components in a format is 4, so
+    float[] totals = new float[4];
+    float[] extractTotals = new float[4];
+    float[] extractMoreTotals = new float[4];
+    float[] shoveTotals = new float[4];
+    
+    float area;
+    int i, j, k, xindex;
+    
+    int temp, temp0;
+    int temp_index;
+    int outIndex = 0;
+    
+    int lowx_int, highx_int, lowy_int, highy_int;
+    float x_percent, y_percent;
+    float lowx_float, highx_float, lowy_float, highy_float;
+    float convy_float, convx_float;
+    int convy_int, convx_int;
+    int l, m;
+    int left, right;
+    
+    if( widthIn == widthOut * 2 && heightIn == heightOut * 2 ) {
+      HalveImage.halveImagePackedPixel( components, extract, widthIn, heightIn, dataIn, dataOut,
+                              pixelSizeInBytes, rowSizeInBytes, isSwap );
+      return;
+    }
+    convy = (float)heightIn / (float)heightOut;
+    convx = (float)widthIn / (float)widthOut;
+    convy_int = (int)Math.floor( convy );
+    convy_float = convy - convy_int;
+    convx_int = (int)Math.floor( convx );
+    convx_float = convx - convx_int;
+    
+    area = convx * convy;
+    
+    lowy_int = 0;
+    lowy_float = 0.0f;
+    highy_int = convy_int;
+    highy_float = convx_float;
+    
+    for( i = 0; i < heightOut; i++ ) {
+      // Clamp here to be sure we don't read beyond input buffer.
+      if (highy_int >= heightIn)
+        highy_int = heightIn - 1;
+      lowx_int = 0;
+      lowx_float = 0.0f;
+      highx_int = convx_int;
+      highx_float = convx_float;
+      
+      for( j = 0; j < widthOut; j++ ) {
+        // ok now apply box filter to box that goes from( lowx, lowy )
+        // to ( highx, highy ) on input data into this pixel on output data
+        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
+        
+        // calculate that value for pixels in the 1st row
+        xindex = lowx_int * pixelSizeInBytes;
+        if( (highy_int > lowy_int) && (highx_int > lowx_int) ) {
+          
+          y_percent = 1 - lowy_float;
+          temp = xindex + lowy_int * rowSizeInBytes;
+          percent = y_percent * ( 1 - lowx_float );
+          dataIn.position( temp );
+          extract.extract( isSwap, dataIn, extractTotals );
+          for( k = 0; k < components; k++ ) {
+            totals[k] += extractTotals[k] * percent;
+          }
+          left = temp;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += pixelSizeInBytes;
+            dataIn.position( temp );
+            extract.extract( isSwap, dataIn, extractTotals );
+            for( k = 0; k < components; k++ ) {
+              totals[k] += extractTotals[k] * y_percent;
+            }
+          }
+          temp += pixelSizeInBytes;
+          right = temp;
+          percent = y_percent * highx_float;
+          dataIn.position( temp );
+          extract.extract( isSwap, dataIn, extractTotals );
+          for( k = 0; k < components; k++ ) {
+            totals[k] += extractTotals[k] * percent;
+          }
+          // calculate the value for pixels in the last row
+          
+          y_percent = highy_float;
+          percent = y_percent * ( 1 - lowx_float );
+          temp = xindex + highy_int * rowSizeInBytes;
+          dataIn.position( temp );
+          extract.extract( isSwap, dataIn, extractTotals );
+          for( k = 0; k < components; k++ ) {
+            totals[k] += extractTotals[k] * percent;
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += pixelSizeInBytes;
+            dataIn.position( temp );
+            extract.extract( isSwap, dataIn, extractTotals );
+            for( k = 0; k < components; k++ ) {
+              totals[k] += extractTotals[k] * y_percent;
+            }
+          }
+          temp += pixelSizeInBytes;
+          percent = y_percent * highx_float;
+          dataIn.position( temp );
+          for( k = 0; k < components; k++ ) {
+            totals[k] += extractTotals[k] * percent;
+          }
+          
+          // calculate the value for pixels in the 1st and last column
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            left += rowSizeInBytes;
+            right += rowSizeInBytes;
+            dataIn.position( left );
+            extract.extract( isSwap, dataIn, extractTotals );
+            dataIn.position( right );
+            extract.extract( isSwap, dataIn, extractMoreTotals );
+            for( k = 0; k < components; k++ ) {
+              totals[k] += ( extractTotals[k] * ( 1 - lowx_float ) + extractMoreTotals[k] * highx_float );
+            }
+          }
+        } else if( highy_int > lowy_int ) {
+          x_percent = highx_float - lowx_float;
+          percent = ( 1 - lowy_float ) * x_percent;
+          temp = xindex + lowy_int * rowSizeInBytes;
+          dataIn.position( temp );
+          extract.extract( isSwap, dataIn, extractTotals );
+          for( k = 0; k < components; k++ ) {
+            totals[k] += extractTotals[k] * percent;
+          }
+          for( m = lowy_int + 1; m < highy_int; m++ ) {
+            temp += rowSizeInBytes;
+            dataIn.position( temp );
+            extract.extract( isSwap, dataIn, extractTotals );
+            for( k = 0; k < components; k++ ) {
+              totals[k] += extractTotals[k] * x_percent;
+            }
+          }
+          percent = x_percent * highy_float;
+          temp += rowSizeInBytes;
+          dataIn.position( temp );
+          extract.extract( isSwap, dataIn, extractTotals );
+          for( k = 0; k < components; k++ ) {
+            totals[k] += extractTotals[k] * percent;
+          }
+        } else if( highx_int > lowx_int ) {
+          y_percent = highy_float - lowy_float;
+          percent = ( 1 - lowx_float ) * y_percent;
+          temp = xindex + lowy_int * rowSizeInBytes;
+          dataIn.position( temp );
+          extract.extract( isSwap, dataIn, extractTotals );
+          for( k = 0; k < components; k++ ) {
+            totals[k] += extractTotals[k] * percent;
+          }
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            temp += pixelSizeInBytes;
+            dataIn.position( temp );
+            extract.extract( isSwap, dataIn, extractTotals );
+            for( k = 0; k < components; k++ ) {
+              totals[k] += extractTotals[k] * y_percent;
+            }
+          }
+          temp += pixelSizeInBytes;
+          percent = y_percent * highx_float;
+          dataIn.position( temp );
+          extract.extract( isSwap, dataIn, extractTotals );
+          for( k = 0; k < components; k++ ) {
+            totals[k] += extractTotals[k] * percent;
+          }
+        } else {
+          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
+          temp = xindex + lowy_int * rowSizeInBytes;
+          dataIn.position( temp );
+          extract.extract( isSwap, dataIn, extractTotals );
+          for( k = 0; k < components; k++ ) {
+            totals[k] += extractTotals[k] * percent;
+          }
+        }
+        
+        // this is for the pixels in the body
+        temp0 = xindex + pixelSizeInBytes + ( lowy_int + 1 ) * rowSizeInBytes;
+        for( m = lowy_int + 1; m < highy_int; m++ ) {
+          temp = temp0;
+          for( l = lowx_int + 1; l < highx_int; l++ ) {
+            dataIn.position( temp );
+            extract.extract( isSwap, dataIn, extractTotals );
+            for( k = 0; k < components; k++ ) {
+              totals[k] += extractTotals[k] * percent;
+            }
+            temp += pixelSizeInBytes;
+          }
+          temp0 += rowSizeInBytes;
+        }
+        
+        outIndex = ( j + ( i * widthOut ) );
+        for( k = 0; k < components; k++ ) {
+          shoveTotals[k] = totals[k] / area;
+        }
+        extract.shove( shoveTotals, outIndex, dataOut );
+        lowx_int = highx_int;
+        lowx_float = highx_float;
+        highx_int += convx_int;
+        highx_float += convx_float;
+        if( highx_float > 1.0f ) {
+          highx_float -= 1.0f;
+          highx_int++;
+        }
+
+        // Clamp to make sure we don't run off the right edge
+        if (highx_int > widthIn - 1) {
+          int delta = (highx_int - widthIn + 1);
+          lowx_int -= delta;
+          highx_int -= delta;
+        }
+      }
+      lowy_int = highy_int;
+      lowy_float = highy_float;
+      highy_int += convy_int;
+      highy_float += convy_float;
+      if( highy_float > 1.0f ) {
+        highy_float -= 1.0f;
+        highy_int++;
+      }
+    }
+    assert( outIndex == ( widthOut * heightOut - 1) );
+  }
+  
+  public static void scaleInternal3D( int components, int widthIn, int heightIn,
+          int depthIn, ShortBuffer dataIn, int widthOut, int heightOut,
+          int depthOut, ShortBuffer dataOut ) {
+    float x, lowx, highx, convx, halfconvx;
+    float y, lowy, highy, convy, halfconvy;
+    float z, lowz, highz, convz, halfconvz;
+    float xpercent, ypercent, zpercent;
+    float percent;
+    // max compnents in a format is 4
+    float[] totals = new float[4];
+    float volume;
+    int i, j, d, k, zint, yint, xint, xindex, yindex, zindex;
+    int temp;
+    
+    lowy = highy = lowx = highx = 0.0f;
+    
+    convz = (float)depthIn / depthOut;
+    convy = (float)heightIn / heightOut;
+    convx = (float)widthIn / widthOut;
+    halfconvz = convz / 2.0f;
+    halfconvy = convy / 2.0f;
+    halfconvx = convx / 2.0f;
+    for( d = 0; d < depthOut; d++ ) {
+      z = convz * ( d + 0.5f );
+      if( depthIn > depthOut ) {
+        highz = z + halfconvz;
+        lowz = z - halfconvz;
+      } else {
+        highz = z + 0.5f;
+        lowz = z - 0.5f;
+      }
+      for( i = 0; i < heightOut; i++ ) {
+        y = convy * ( i + 0.5f );
+        if( heightIn > heightOut ) {
+          highz = y + halfconvy;
+          lowz = y - halfconvy;
+        } else {
+          highz = y + 0.5f;
+          lowz = y - 0.5f;
+        }
+        for( j = 0; j < widthOut; j++ ) {
+          x = convx * ( j + 0.5f );
+          if( depthIn > depthOut ) {
+            highz = x + halfconvx;
+            lowz = x - halfconvx;
+          } else {
+            highz = x + 0.5f;
+            lowz = x - 0.5f;
+          }
+          
+          // Ok, now apply box filter to box that goes from ( lowx, lowy, lowz )
+          // to ( highx, highy, highz ) on input data into this pixel on output data
+          
+          totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
+          volume = 0.0f;
+          
+          z = lowz;
+          zint = (int)(Math.floor( z ) );
+          while( z < highz ) {
+            zindex = ( zint + depthIn ) % depthIn;
+            if( highz < zint + 1 ) {
+              zpercent = highz - z;
+            } else {
+              zpercent = zint + 1 - z;
+            }
+            
+            y = lowy;
+            yint = (int)(Math.floor( y ) );
+            while( y < highy ) {
+              yindex = ( yint + heightIn ) % heightIn;
+              if( highy < yint + 1 ) {
+                ypercent = highy - y;
+              } else {
+                ypercent = yint + 1 - y;
+              }
+              
+              x = lowx;
+              xint = (int)(Math.floor( x ) );
+              
+              while( x < highx ) {
+                xindex = (xint + widthIn ) % widthIn;
+                if( highx < xint + 1 ) {
+                  xpercent = highx - x;
+                } else {
+                  xpercent = xint + 1 - x;
+                }
+                
+                percent = xpercent * ypercent * zpercent;
+                volume += percent;
+                
+                temp = (xindex + ( yindex *widthIn) + (zindex * widthIn *heightIn)) * components;
+                for( k = 0; k < components; k++ ) {
+                  assert( 0 <= (temp+k) && (temp+k) < (widthIn * heightIn * depthIn * components) );
+                  totals[k] += dataIn.get( temp + k ) * percent;
+                }
+                xint++;
+                x = xint;
+              } // while x
+              yint++;
+              y = yint;
+            } // while y
+            zint++;
+            z = zint;
+          } // while z
+          
+          temp = ( j + ( i * widthOut ) + (d * widthOut * heightOut ) ) * components;
+          for( k = 0; k < components; k++ ) {
+            // totals should be rounded in the case of enlarging an rgb ramp when the type is 332 or 4444
+            assert( 0 <= ( temp + k ) && ( temp + k ) < (widthOut * heightOut* depthOut * components) );
+            dataOut.put( temp + k, (short)((totals[k] + 0.5f) / volume ) );
+          }
+        }
+      }
+    }
+  }
+  
+  public static int gluScaleImage3D( GL gl, int format, int widthIn, int heightIn, 
+          int depthIn, int typeIn, ByteBuffer dataIn, int widthOut, int heightOut, 
+          int depthOut, int typeOut, ByteBuffer dataOut ) {
+    int components;
+    ShortBuffer beforeImage, afterImage;
+    PixelStorageModes psm = new PixelStorageModes();
+    
+    if( widthIn == 0 || heightIn == 0 || depthIn == 0 ||
+            widthOut == 0 || heightOut == 0 || depthOut == 0 ) {
+      return( 0 );
+    }
+    
+    if( widthIn < 0 || heightIn < 0 || depthIn < 0 ||
+            widthOut < 0 || heightOut < 0 || depthOut < 0 ) {
+      return( GLU.GLU_INVALID_VALUE );
+    }
+    
+    if( !Mipmap.legalFormat(format) || !Mipmap.legalType(typeIn) || 
+            !Mipmap.legalType(typeOut) || typeIn == GL2.GL_BITMAP ||
+            typeOut == GL2.GL_BITMAP ) {
+      return( GLU.GLU_INVALID_ENUM );
+    }
+    
+    if( !Mipmap.isLegalFormatForPackedPixelType( format, typeIn ) ) {
+      return( GLU.GLU_INVALID_OPERATION );
+    }
+    
+    if( !Mipmap.isLegalFormatForPackedPixelType( format, typeOut ) ) {
+      return( GLU.GLU_INVALID_OPERATION );
+    }
+    
+    try {
+    beforeImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( Mipmap.imageSize3D( widthIn, 
+            heightIn, depthIn, format, GL2.GL_UNSIGNED_SHORT ) )).asShortBuffer();
+    afterImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( Mipmap.imageSize3D( widthIn, 
+            heightIn, depthIn, format, GL2.GL_UNSIGNED_SHORT ) )).asShortBuffer();
+    } catch( OutOfMemoryError err ) {
+      return( GLU.GLU_OUT_OF_MEMORY );
+    }
+    Mipmap.retrieveStoreModes3D( gl, psm );
+    
+    Image.fillImage3D( psm, widthIn, heightIn, depthIn, format, typeIn,
+            Mipmap.is_index( format ), dataIn, beforeImage );
+    components = Mipmap.elements_per_group( format, 0 );
+    ScaleInternal.scaleInternal3D( components, widthIn, heightIn, depthIn,
+            beforeImage, widthOut, heightOut, depthOut, afterImage );
+    Image.emptyImage3D( psm, widthOut, heightOut, depthOut, format, typeOut,
+            Mipmap.is_index( format ), afterImage, dataOut );
+    
+    return( 0 );
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java
new file mode 100644
index 000000000..b329840ef
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java
@@ -0,0 +1,224 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.mipmap;
+
+import java.nio.*;
+
+/**
+ *
+ * @author  Administrator
+ */
+public class Type_Widget {
+  
+  ByteBuffer buffer;
+  
+  /** Creates a new instance of Type_Widget */
+  public Type_Widget() {
+    buffer = ByteBuffer.allocateDirect( 4 );
+  }
+  
+  public void setUB0( byte b ) {
+    buffer.position( 0 );
+    buffer.put( b );
+  }
+  
+  public byte getUB0() {
+    buffer.position( 0 );
+    return( buffer.get() );
+  }
+  
+  public void setUB1( byte b ) {
+    buffer.position( 1 );
+    buffer.put( b );
+  }
+  
+  public byte getUB1() {
+    buffer.position( 1 );
+    return( buffer.get() );
+  }
+  
+  public void setUB2( byte b ) {
+    buffer.position( 2 );
+    buffer.put( b );
+  }
+  
+  public byte getUB2() {
+    buffer.position( 2 );
+    return( buffer.get() );
+  }
+  
+  public void setUB3( byte b ) {
+    buffer.position( 3 );
+    buffer.put( b );
+  }
+  
+  public byte getUB3() {
+    buffer.position( 3 );
+    return( buffer.get() );
+  }
+  
+  public void setUS0( short s ) {
+    buffer.position( 0 );
+    buffer.putShort( s );
+  }
+  
+  public short getUS0() {
+    buffer.position( 0 );
+    return( buffer.getShort() );
+  }
+  
+  public void setUS1( short s ) {
+    buffer.position( 2 );
+    buffer.putShort( s );
+  }
+  
+  public short getUS1() {
+   buffer.position( 2 );
+   return( buffer.getShort() );
+  }
+  
+  public void setUI( int i ) {
+    buffer.position( 0 );
+    buffer.putInt( i );
+  }
+  
+  public int getUI() {
+    buffer.position( 0 );
+    return( buffer.getInt() );
+  }
+  
+  public void setB0( byte b ) {
+    buffer.position( 0 );
+    buffer.put( b );
+  }
+  
+  public byte getB0() {
+    buffer.position( 0 );
+    return( buffer.get() );
+  }
+  
+  public void setB1( byte b ) {
+    buffer.position( 1 );
+    buffer.put( b );
+  }
+  
+  public byte getB1() {
+    buffer.position( 1 );
+    return( buffer.get() );
+  }
+  
+  public void setB2( byte b ) {
+    buffer.position( 2 );
+    buffer.put( b );
+  }
+  
+  public byte getB2() {
+    buffer.position( 2 );
+    return( buffer.get() );
+  }
+  
+  public void setB3( byte b ) {
+    buffer.position( 3 );
+    buffer.put( b );
+  }
+  
+  public byte getB3() {
+    buffer.position( 3 );
+    return( buffer.get() );
+  }
+  
+  public void setS0( short s ) {
+    buffer.position( 0 );
+    buffer.putShort( s );
+  }
+  
+  public short getS0() {
+    buffer.position( 0 );
+    return( buffer.getShort() );
+  }
+  
+  public void setS1( short s ) {
+    buffer.position( 2 );
+    buffer.putShort( s );
+  }
+  
+  public short getS1() {
+    buffer.position( 2 );
+    return( buffer.getShort() );
+  }
+  
+  public void setI( int i ) {
+    buffer.position( 0 );
+    buffer.putInt( i );
+  }
+  
+  public int getI() {
+    buffer.position( 0 );
+    return( buffer.getInt() );
+  }
+  
+  public void setF( float f ) {
+    buffer.position( 0 );
+    buffer.putFloat( f );
+  }
+  
+  public float getF() {
+    buffer.position( 0 );
+    return( buffer.getFloat() );
+  }
+  
+  public ByteBuffer getBuffer() {
+    buffer.rewind();
+    return( buffer );
+  }
+  
+  public static void main( String args[] ) {
+    Type_Widget t = new Type_Widget();
+    t.setI( 1000000 );
+    
+    System.out.println("int: " + Integer.toHexString( t.getI() ) );
+    
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Arc.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Arc.java
new file mode 100755
index 000000000..9ee2494a1
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Arc.java
@@ -0,0 +1,258 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+*/
+
+/**
+ * Trimming arc
+ * @author Tomas Hrasky
+ *
+ */
+public class Arc {
+  /**
+   * Corresponding picewise-linear arc
+   */
+  public PwlArc pwlArc;
+
+  /**
+   * Arc type
+   */
+  private long type;
+
+  /**
+   * Arc link in linked list
+   */
+  public Arc link;
+
+  /**
+   * Previous arc
+   */
+  Arc prev;
+
+  /**
+   * Next arc
+   */
+  Arc next;
+
+  /**
+   * Corresponding berizer type arc
+   */
+  private BezierArc bezierArc;
+
+  /**
+   * Makes new arc at specified side
+   * 
+   * @param side
+   *            which side doeas this arc form
+   */
+  public Arc(int side) {
+    bezierArc = null;
+    pwlArc = null;
+    type = 0;
+    setside(side);
+    // nuid=_nuid
+  }
+
+  /**
+   * Sets side the arc is at
+   * 
+   * @param side
+   *            arc side
+   */
+  private void setside(int side) {
+    // DONE
+    clearside();
+    type |= side << 8;
+  }
+
+  /**
+   * Unsets side
+   */
+  private void clearside() {
+    // DONE
+    type &= ~(0x7 << 8);
+  }
+
+  // this one replaces enum arc_side 
+  /**
+   * Side not specified
+   */
+  public static final int ARC_NONE = 0;
+
+  /**
+   * Arc on right
+   */
+  public static final int ARC_RIGHT = 1;
+
+  /**
+   * Arc on top
+   */
+  public static final int ARC_TOP = 2;
+
+  /**
+   * Arc on left
+   */
+  public static final int ARC_LEFT = 3;
+
+  /**
+   * Arc on bottom
+   */
+  public static final int ARC_BOTTOM = 4;
+
+  /**
+   * Bezier type flag
+   */
+  private static final long BEZIER_TAG = 1 << 13;
+
+  /**
+   * Arc type flag
+   */
+  private static final long ARC_TAG = 1 << 3;
+
+  /**
+   * Tail type tag
+   */
+  private static final long TAIL_TAG = 1 << 6;
+
+  /**
+   * Appends arc to the list
+   * 
+   * @param jarc
+   *            arc to be append
+   * @return this
+   */
+  public Arc append(Arc jarc) {
+    // DONE
+    if (jarc != null) {
+      next = jarc.next;
+      prev = jarc;
+      next.prev = this;
+      prev.next = this;
+    } else {
+      next = this;
+      prev = this;
+    }
+
+    return this;
+  }
+
+  /**
+   * Unused
+   * 
+   * @return true
+   */
+  public boolean check() {
+    return true;
+  }
+
+  /**
+   * Sets bezier type flag
+   */
+  public void setbezier() {
+    // DONE
+    type |= BEZIER_TAG;
+
+  }
+
+  /**
+   * Returns tail of linked list coords
+   * 
+   * @return tail coords
+   */
+  public float[] tail() {
+    // DONE
+    return pwlArc.pts[0].param;
+  }
+
+  /**
+   * Returns head of linked list coords
+   * 
+   * @return head coords
+   */
+  public float[] head() {
+    // DONE
+    return next.pwlArc.pts[0].param;
+  }
+
+  /**
+   * Returns whether arc is marked with arc_tag
+   * 
+   * @return is arc marked with arc_tag
+   */
+  public boolean ismarked() {
+    // DONE
+    return ((type & ARC_TAG) > 0) ? true : false;
+  }
+
+  /**
+   * Cleans arc_tag flag
+   */
+  public void clearmark() {
+    // DONE
+    type &= (~ARC_TAG);
+  }
+
+  /**
+   * Sets arc_tag flag
+   */
+  public void setmark() {
+    // DONE
+    type |= ARC_TAG;
+  }
+
+  /**
+   * sets tail tag
+   */
+  public void setitail() {
+    // DONE
+    type |= TAIL_TAG;
+  }
+
+  /**
+   * Returns whether arc is marked tail
+   * 
+   * @return is tail
+   */
+  public boolean getitail() {
+    return false;
+  }
+
+  /**
+   * Unsets tail tag
+   */
+  public void clearitail() {
+    // DONE
+    type &= (~TAIL_TAG);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcSdirSorter.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcSdirSorter.java
new file mode 100755
index 000000000..3955e3176
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcSdirSorter.java
@@ -0,0 +1,63 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class for sorting list of Arcs
+ * @author Tomas Hrasky
+ *
+ */
+public class ArcSdirSorter {
+
+  /**
+   * Makes new ArcSdirSorter with Subdivider
+   * @param subdivider subdivider
+   */ 
+  public ArcSdirSorter(Subdivider subdivider) {
+    //TODO
+    //			System.out.println("TODO arcsdirsorter.constructor");
+  }
+
+  /**
+   * Sorts list of arcs
+   * @param list  arc list to be sorted
+   * @param count size of list
+   */
+  public void qsort(CArrayOfArcs list, int count) {
+    // TODO
+    //			System.out.println("TODO arcsdirsorter.qsort");
+  }
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTdirSorter.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTdirSorter.java
new file mode 100755
index 000000000..098ba97b7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTdirSorter.java
@@ -0,0 +1,60 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class for sorting list of Arcs
+ * @author Tomas Hrasky
+ *
+ */
+public class ArcTdirSorter {
+  /**
+   * Makes new ArcSdirSorter with Subdivider
+   * @param subdivider subdivider
+   */ 
+  public ArcTdirSorter(Subdivider subdivider) {
+    // TODO Auto-generated constructor stub
+    //			System.out.println("TODO arcTsorter.konstruktor");
+  }
+  /**
+   * Sorts list of arcs
+   * @param list  arc list to be sorted
+   * @param count size of list
+   */
+  public void qsort(CArrayOfArcs list, int count) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO arcTsorter.qsort");
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTesselator.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTesselator.java
new file mode 100755
index 000000000..edfb8905f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTesselator.java
@@ -0,0 +1,90 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class for arc tesselation
+ * @author Tomas Hrasky
+ *
+ */
+public class ArcTesselator {
+
+  /**
+   * Makes given arc an bezier arc
+   * @param arc arc to work with
+   * @param s1 minimum s param
+   * @param s2 maximum s param
+   * @param t1 minimum t param
+   * @param t2 maximum s param
+   */
+  public void bezier(Arc arc, float s1, float s2, float t1, float t2) {
+    // DONE
+    TrimVertex[] p = new TrimVertex[2];
+    p[0] = new TrimVertex();
+    p[1] = new TrimVertex();
+    arc.pwlArc = new PwlArc(2, p);
+    p[0].param[0] = s1;
+    p[0].param[1] = s2;
+    p[1].param[0] = t1;
+    p[1].param[1] = t2;
+    arc.setbezier();
+  }
+
+  /**
+   * Empty method
+   * @param newright arc to work with
+   * @param s first tail
+   * @param t2 second tail
+   * @param t1 third tail
+   * @param f stepsize
+   */
+  public void pwl_right(Arc newright, float s, float t1, float t2, float f) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO arctesselator.pwl_right");
+  }
+
+  /**
+   * Empty method
+   * @param newright arc to work with
+   * @param s first tail
+   * @param t2 second tail
+   * @param t1 third tail
+   * @param f stepsize
+   */
+  public void pwl_left(Arc newright, float s, float t2, float t1, float f) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO arctesselator.pwl_left");
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Backend.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Backend.java
new file mode 100755
index 000000000..39097720c
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Backend.java
@@ -0,0 +1,217 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class responsible for rendering
+ * @author Tomas Hrasky
+ *
+ */
+public abstract class Backend {
+
+  /**
+   * Fill surface
+   */
+  public static final int N_MESHFILL = 0;
+
+  /**
+   * Draw surface as wire model
+   */
+  public static final int N_MESHLINE = 1;
+
+  /**
+   * Draw surface with points
+   */
+  public static final int N_MESHPOINT = 2;
+
+  /**
+   * Object rendering curves
+   */
+  protected CurveEvaluator curveEvaluator;
+
+  /**
+   * Object rendering surfaces
+   */
+  protected SurfaceEvaluator surfaceEvaluator;
+
+  /**
+   * Makes new backend 
+   */
+  public Backend() {
+    // curveEvaluator = new OpenGLCurveEvaluator();
+    // surfaceEvaluator = new OpenGLSurfaceEvaluator();
+  }
+
+  /**
+   * Begin a curve
+   */
+  public void bgncurv() {
+    // DONE
+    curveEvaluator.bgnmap1f();
+
+  }
+
+  /**
+   * End a curve
+   */
+  public void endcurv() {
+    // DONE
+    curveEvaluator.endmap1f();
+
+  }
+
+  /**
+   * Make cuve with given parameters
+   * @param type curve type
+   * @param ps control points
+   * @param stride control points coordinates number
+   * @param order order of curve
+   * @param ulo smallest u
+   * @param uhi highest u
+   */
+  public void curvpts(int type, CArrayOfFloats ps, int stride, int order,
+                      float ulo, float uhi) {
+    // DONE
+    curveEvaluator.map1f(type, ulo, uhi, stride, order, ps);
+    curveEvaluator.enable(type);
+  }
+
+  /**
+   * Draw curve
+   * @param u1 smallest u
+   * @param u2 highest u
+   * @param nu number of pieces
+   */
+  public void curvgrid(float u1, float u2, int nu) {
+    // DONE
+    curveEvaluator.mapgrid1f(nu, u1, u2);
+
+  }
+
+  /**
+   * Evaluates curve mesh
+   * @param from low param
+   * @param n step
+   */
+  public void curvmesh(int from, int n) {
+    // DONE
+    curveEvaluator.mapmesh1f(N_MESHFILL, from, from + n);
+  }
+
+  /**
+   * Begin surface
+   * @param wiretris use triangles
+   * @param wirequads use quads
+   */
+  public void bgnsurf(int wiretris, int wirequads) {
+    // DONE
+    surfaceEvaluator.bgnmap2f();
+
+    if (wiretris > 0)
+      surfaceEvaluator.polymode(NurbsConsts.N_MESHLINE);
+    else
+      surfaceEvaluator.polymode(NurbsConsts.N_MESHFILL);
+  }
+
+  /**
+   * End surface
+   */
+  public void endsurf() {
+    // DONE
+    surfaceEvaluator.endmap2f();
+  }
+
+  /**
+   * Empty method
+   * @param ulo low u param
+   * @param uhi hig u param
+   * @param vlo low v param
+   * @param vhi high v param
+   */
+  public void patch(float ulo, float uhi, float vlo, float vhi) {
+    // DONE
+    surfaceEvaluator.domain2f(ulo, uhi, vlo, vhi);
+  }
+
+  /**
+   * Draw surface
+   * @param u0 lowest u
+   * @param u1 highest u
+   * @param nu number of pieces in u direction
+   * @param v0 lowest v
+   * @param v1 highest v
+   * @param nv number of pieces in v direction
+   */
+  public void surfgrid(float u0, float u1, int nu, float v0, float v1, int nv) {
+    // DONE
+    surfaceEvaluator.mapgrid2f(nu, u0, u1, nv, v0, v1);
+
+  }
+
+  /**
+   * Evaluates surface mesh
+   * @param u u param
+   * @param v v param
+   * @param n step in u direction
+   * @param m step in v direction
+   */
+  public void surfmesh(int u, int v, int n, int m) {
+    //			System.out.println("TODO backend.surfmesh wireframequads");
+    // TODO wireframequads
+    surfaceEvaluator.mapmesh2f(NurbsConsts.N_MESHFILL, u, u + n, v, v + m);
+  }
+
+  /**
+   * Make surface
+   * @param type surface type
+   * @param pts control points
+   * @param ustride control points coordinates in u direction
+   * @param vstride control points coordinates in v direction
+   * @param uorder surface order in u direction
+   * @param vorder surface order in v direction
+   * @param ulo lowest u
+   * @param uhi hightest u
+   * @param vlo lowest v
+   * @param vhi hightest v
+   */
+  public void surfpts(int type, CArrayOfFloats pts, int ustride, int vstride,
+                      int uorder, int vorder, float ulo, float uhi, float vlo, float vhi) {
+    // DONE
+    surfaceEvaluator.map2f(type, ulo, uhi, ustride, uorder, vlo, vhi,
+                           vstride, vorder, pts);
+    surfaceEvaluator.enable(type);
+
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/BezierArc.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/BezierArc.java
new file mode 100755
index 000000000..d9b390b67
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/BezierArc.java
@@ -0,0 +1,44 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Empty class
+ * @author Tomas Hrasky
+ *
+ */
+public class BezierArc {
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Bin.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Bin.java
new file mode 100755
index 000000000..61316f348
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Bin.java
@@ -0,0 +1,155 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class holding trimming arcs
+ * @author Tomas Hrasky
+ *
+ */
+public class Bin {
+
+  /**
+   * Head of linked list of arcs
+   */
+  private Arc head;
+
+  /**
+   * Current arc
+   */
+  private Arc current;
+
+  /**
+   * Indicates whether there are any Arcs in linked list
+   * @return true if there are any Arcs in linked list
+   */
+  public boolean isnonempty() {
+    // DONE
+    return this.head != null ? true : false;
+  }
+
+  /**
+   * Adds and arc to linked list
+   * @param jarc added arc
+   */
+  public void addarc(Arc jarc) {
+    // DONE
+    // if (head == null)
+    // head = jarc;
+    // else {
+    jarc.link = head;
+    head = jarc;
+    // }
+
+  }
+
+  /**
+   * Returns number of arcs in linked list
+   * @return number of arcs
+   */
+  public int numarcs() {
+    // DONE
+    int count = 0;
+    for (Arc jarc = firstarc(); jarc != null; jarc = nextarc())
+      count++;
+    return count;
+  }
+
+  /**
+   * Removes first arc in list
+   * @return new linked list head
+   */
+  public Arc removearc() {
+    // DONE
+    Arc jarc = head;
+    if (jarc != null)
+      head = jarc.link;
+    return jarc;
+
+  }
+
+  /**
+   * Consolidates linked list
+   */
+  public void adopt() {
+    // DONE
+    markall();
+
+    Arc orphan;
+    while ((orphan = removearc()) != null) {
+      for (Arc parent = orphan.next; !parent.equals(orphan); parent = parent.next) {
+        if (!parent.ismarked()) {
+          orphan.link = parent.link;
+          parent.link = orphan;
+          orphan.clearmark();
+          break;
+        }
+      }
+    }
+
+  }
+
+  /**
+   * Marks all arc in linked list
+   */
+  private void markall() {
+    // DONE
+    for (Arc jarc = firstarc(); jarc != null; jarc = nextarc())
+      jarc.setmark();
+  }
+
+  /**
+   * Returns first arc in linked list
+   * @return first arc in linked list
+   */
+  private Arc firstarc() {
+    // DONE
+    current = head;
+    return nextarc();
+  }
+
+  /**
+   * Returns next arc in linked list
+   * @return next arc
+   * 
+   */
+  private Arc nextarc() {
+    // DONE
+    Arc jarc = current;
+    if (jarc != null)
+      current = jarc.link;
+    return jarc;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Breakpt.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Breakpt.java
new file mode 100755
index 000000000..b5b88ad96
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Breakpt.java
@@ -0,0 +1,59 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class holding break point parameters
+ * 
+ * @author Tomas Hrasky
+ * 
+ */
+public class Breakpt {
+
+  /**
+   * Breakpoint multiplicity
+   */
+  public int multi;
+
+  /**
+   * Breakpint value
+   */
+  public float value;
+
+  /**
+   * Breakpoint deficit (how many times it has to be added)
+   */
+  public int def;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfArcs.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfArcs.java
new file mode 100755
index 000000000..0646e1d9f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfArcs.java
@@ -0,0 +1,194 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/**
+ * Class replacing C language pointer
+ * 
+ * @author Tomas Hrasky
+ * 
+ */
+public class CArrayOfArcs {
+  /**
+   * Underlaying array
+   */
+  private Arc[] array;
+
+  /**
+   * Pointer to array member
+   */
+  private int pointer;
+
+  /**
+   * Don't check for array borders?
+   */
+  private boolean noCheck = true;
+
+  /**
+   * Makes new CArray
+   * 
+   * @param array
+   *            underlaying array
+   * @param pointer
+   *            pointer (index) to array
+   */
+  public CArrayOfArcs(Arc[] array, int pointer) {
+    this.array = array;
+    // this.pointer=pointer;
+    setPointer(pointer);
+  }
+
+  /**
+   * Makes new CArray from other CArray
+   * 
+   * @param carray
+   *            reference array
+   */
+  public CArrayOfArcs(CArrayOfArcs carray) {
+    this.array = carray.array;
+    // this.pointer=carray.pointer;
+    setPointer(carray.pointer);
+  }
+
+  /**
+   * Makes new CArray with pointer set to 0
+   * 
+   * @param ctlarray
+   *            underlaying array
+   */
+  public CArrayOfArcs(Arc[] ctlarray) {
+    this.array = ctlarray;
+    this.pointer = 0;
+  }
+
+  /**
+   * Returns element at pointer
+   * 
+   * @return element at pointer
+   */
+  public Arc get() {
+    return array[pointer];
+  }
+
+  /**
+   * Increases pointer by one (++)
+   */
+  public void pp() {
+    // pointer++;
+    setPointer(pointer + 1);
+  }
+
+  /**
+   * Sets element at pointer
+   * 
+   * @param f
+   *            desired value
+   */
+  public void set(Arc f) {
+    array[pointer] = f;
+
+  }
+
+  /**
+   * Returns array element at specified index
+   * 
+   * @param i
+   *            array index
+   * @return element at index
+   */
+  public Arc get(int i) {
+    return array[i];
+  }
+
+  /**
+   * Returns array element at specified index relatively to pointer
+   * 
+   * @param i
+   *            relative index
+   * @return element at relative index
+   */
+  public Arc getRelative(int i) {
+    return array[pointer + i];
+  }
+
+  /**
+   * Sets value of element at specified index relatively to pointer
+   * 
+   * @param i
+   *            relative index
+   * @param value
+   *            value to be set
+   */
+  public void setRelative(int i, Arc value) {
+    array[pointer + i] = value;
+  }
+
+  /**
+   * Lessens pointer by value
+   * 
+   * @param i
+   *            lessen by
+   */
+  public void lessenPointerBy(int i) {
+    // pointer-=i;
+    setPointer(pointer - i);
+  }
+
+  /**
+   * Returns pointer value
+   * 
+   * @return pointer value
+   */
+  public int getPointer() {
+    return pointer;
+  }
+
+  /**
+   * Sets ponter value
+   * 
+   * @param pointer
+   *            pointer value to be set
+   */
+  public void setPointer(int pointer) {
+    if (!noCheck && pointer > array.length)
+      throw new IllegalArgumentException("Pointer " + pointer
+                                         + " out of bounds " + array.length);
+    this.pointer = pointer;
+  }
+
+  /**
+   * Raises pointer by value
+   * 
+   * @param i
+   *            raise by
+   */
+  public void raisePointerBy(int i) {
+    // pointer+=i;
+    setPointer(pointer + i);
+  }
+
+  /**
+   * Lessens ponter by one (--)
+   */
+  public void mm() {
+    // pointer--;
+    setPointer(pointer - 1);
+  }
+
+  /**
+   * Returns underlaying array
+   * 
+   * @return underlaying array
+   */
+  public Arc[] getArray() {
+    return array;
+  }
+
+  /**
+   * Sets underlaying array
+   * 
+   * @param array
+   *            underlaying array
+   */
+  public void setArray(Arc[] array) {
+    this.array = array;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfBreakpts.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfBreakpts.java
new file mode 100755
index 000000000..e47fdf966
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfBreakpts.java
@@ -0,0 +1,130 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/**
+ * Class replacing C language pointer
+ * 
+ * @author Tomas Hrasky
+ * 
+ */
+public class CArrayOfBreakpts {
+  /**
+   * Underlaying array
+   */
+  private Breakpt[] pole;
+
+  /**
+   * Pointer to array member
+   */
+  private int pointer;
+
+  /**
+   * Makes new CArray
+   * 
+   * @param array
+   *            underlaying array
+   * @param pointer
+   *            pointer (index) to array
+   */
+  public CArrayOfBreakpts(Breakpt[] array, int pointer) {
+    this.pole = array;
+    this.pointer = pointer;
+  }
+
+  /**
+   * Makes new CArray from other CArray
+   * 
+   * @param carray
+   *            reference array
+   */
+  public CArrayOfBreakpts(CArrayOfBreakpts carray) {
+    this.pole = carray.pole;
+    this.pointer = carray.pointer;
+  }
+
+  /**
+   * Returns element at pointer
+   * 
+   * @return element at pointer
+   */
+  public Breakpt get() {
+    return pole[pointer];
+  }
+
+  /**
+   * Increases pointer by one (++)
+   */
+  public void pp() {
+    pointer++;
+  }
+
+  /**
+   * Sets element at pointer
+   * 
+   * @param f
+   *            desired value
+   */
+  public void set(Breakpt f) {
+    pole[pointer] = f;
+
+  }
+
+  /**
+   * Returns array element at specified index
+   * 
+   * @param i
+   *            array index
+   * @return element at index
+   */
+  public Breakpt get(int i) {
+    return pole[i];
+  }
+
+  /**
+   * Lessens pointer by value
+   * 
+   * @param i
+   *            lessen by
+   */
+  public void lessenPointerBy(int i) {
+    pointer -= i;
+
+  }
+
+  /**
+   * Returns pointer value
+   * 
+   * @return pointer value
+   */
+  public int getPointer() {
+    return pointer;
+  }
+
+  /**
+   * Sets ponter value
+   * 
+   * @param pointer
+   *            pointer value to be set
+   */
+  public void setPointer(int pointer) {
+    this.pointer = pointer;
+  }
+
+  /**
+   * Raises pointer by value
+   * 
+   * @param i
+   *            raise by
+   */
+  public void raisePointerBy(int i) {
+    pointer += i;
+
+  }
+
+  /**
+   * Lessens ponter by one (--)
+   */
+  public void mm() {
+    pointer--;
+
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfFloats.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfFloats.java
new file mode 100755
index 000000000..60cef9919
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfFloats.java
@@ -0,0 +1,195 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/**
+ * Class replacing C language pointer
+ * 
+ * @author Tomas Hrasky
+ * 
+ */
+public class CArrayOfFloats {
+
+  /**
+   * Underlaying array
+   */
+  private float[] array;
+
+  /**
+   * Pointer to array member
+   */
+  private int pointer;
+
+  /**
+   * Don't check for array borders?
+   */
+  private boolean noCheck = true;
+
+  /**
+   * Makes new CArray
+   * 
+   * @param array
+   *            underlaying array
+   * @param pointer
+   *            pointer (index) to array
+   */
+  public CArrayOfFloats(float[] array, int pointer) {
+    this.array = array;
+    // this.pointer=pointer;
+    setPointer(pointer);
+  }
+
+  /**
+   * Makes new CArray from other CArray
+   * 
+   * @param carray
+   *            reference array
+   */
+  public CArrayOfFloats(CArrayOfFloats carray) {
+    this.array = carray.array;
+    // this.pointer=carray.pointer;
+    setPointer(carray.pointer);
+  }
+
+  /**
+   * Makes new CArray with pointer set to 0
+   * 
+   * @param ctlarray
+   *            underlaying array
+   */
+  public CArrayOfFloats(float[] ctlarray) {
+    this.array = ctlarray;
+    this.pointer = 0;
+  }
+
+  /**
+   * Returns element at pointer
+   * 
+   * @return element at pointer
+   */
+  public float get() {
+    return array[pointer];
+  }
+
+  /**
+   * Increases pointer by one (++)
+   */
+  public void pp() {
+    // pointer++;
+    setPointer(pointer + 1);
+  }
+
+  /**
+   * Sets element at pointer
+   * 
+   * @param f
+   *            desired value
+   */
+  public void set(float f) {
+    array[pointer] = f;
+
+  }
+
+  /**
+   * Returns array element at specified index
+   * 
+   * @param i
+   *            array index
+   * @return element at index
+   */
+  public float get(int i) {
+    return array[i];
+  }
+
+  /**
+   * Returns array element at specified index relatively to pointer
+   * 
+   * @param i
+   *            relative index
+   * @return element at relative index
+   */
+  public float getRelative(int i) {
+    return array[pointer + i];
+  }
+
+  /**
+   * Sets value of element at specified index relatively to pointer
+   * 
+   * @param i
+   *            relative index
+   * @param value
+   *            value to be set
+   */
+  public void setRelative(int i, float value) {
+    array[pointer + i] = value;
+  }
+
+  /**
+   * Lessens pointer by value
+   * 
+   * @param i
+   *            lessen by
+   */
+  public void lessenPointerBy(int i) {
+    // pointer-=i;
+    setPointer(pointer - i);
+  }
+
+  /**
+   * Returns pointer value
+   * 
+   * @return pointer value
+   */
+  public int getPointer() {
+    return pointer;
+  }
+
+  /**
+   * Sets ponter value
+   * 
+   * @param pointer
+   *            pointer value to be set
+   */
+  public void setPointer(int pointer) {
+    if (!noCheck && pointer > array.length)
+      throw new IllegalArgumentException("Pointer " + pointer
+                                         + " out of bounds " + array.length);
+    this.pointer = pointer;
+  }
+
+  /**
+   * Raises pointer by value
+   * 
+   * @param i
+   *            raise by
+   */
+  public void raisePointerBy(int i) {
+    // pointer+=i;
+    setPointer(pointer + i);
+  }
+
+  /**
+   * Lessens ponter by one (--)
+   */
+  public void mm() {
+    // pointer--;
+    setPointer(pointer - 1);
+  }
+
+  /**
+   * Returns underlaying array
+   * 
+   * @return underlaying array
+   */
+  public float[] getArray() {
+    return array;
+  }
+
+  /**
+   * Sets underlaying array
+   * 
+   * @param array
+   *            underlaying array
+   */
+  public void setArray(float[] array) {
+    this.array = array;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java
new file mode 100755
index 000000000..ef16a8204
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java
@@ -0,0 +1,160 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/**
+ * Class replacing C language pointer
+ * 
+ * @author Tomas Hrasky
+ * 
+ */
+public class CArrayOfQuiltspecs {
+  /**
+   * Underlaying array
+   */
+  private Quiltspec[] array;
+
+  /**
+   * Pointer to array member
+   */
+  private int pointer;
+
+  /**
+   * Makes new CArray
+   * 
+   * @param array
+   *            underlaying array
+   * @param pointer
+   *            pointer (index) to array
+   */
+  public CArrayOfQuiltspecs(Quiltspec[] array, int pointer) {
+    this.array = array;
+    this.pointer = pointer;
+  }
+
+  /**
+   * Makes new CArray from other CArray
+   * 
+   * @param carray
+   *            reference array
+   */
+  public CArrayOfQuiltspecs(CArrayOfQuiltspecs carray) {
+    this.array = carray.array;
+    this.pointer = carray.pointer;
+  }
+
+  /**
+   * Makes new CArray with pointer set to 0
+   * 
+   * @param array
+   *            underlaying array
+   */
+  public CArrayOfQuiltspecs(Quiltspec[] array) {
+    this.array = array;
+    this.pointer = 0;
+  }
+
+  /**
+   * Returns element at pointer
+   * 
+   * @return element at pointer
+   */
+  public Quiltspec get() {
+    return array[pointer];
+  }
+
+  /**
+   * Increases pointer by one (++)
+   */
+  public void pp() {
+    pointer++;
+  }
+
+  /**
+   * Sets element at pointer
+   * 
+   * @param f
+   *            desired value
+   */
+  public void set(Quiltspec f) {
+    array[pointer] = f;
+
+  }
+
+  /**
+   * Returns array element at specified index
+   * 
+   * @param i
+   *            array index
+   * @return element at index
+   */
+  public Quiltspec get(int i) {
+    return array[i];
+  }
+
+  /**
+   * Lessens pointer by value
+   * 
+   * @param i
+   *            lessen by
+   */
+  public void lessenPointerBy(int i) {
+    pointer -= i;
+
+  }
+
+  /**
+   * Returns pointer value
+   * 
+   * @return pointer value
+   */
+  public int getPointer() {
+    return pointer;
+  }
+
+  /**
+   * Sets ponter value
+   * 
+   * @param pointer
+   *            pointer value to be set
+   */
+  public void setPointer(int pointer) {
+    this.pointer = pointer;
+  }
+
+  /**
+   * Raises pointer by value
+   * 
+   * @param i
+   *            raise by
+   */
+  public void raisePointerBy(int i) {
+    pointer += i;
+
+  }
+
+  /**
+   * Lessens ponter by one (--)
+   */
+  public void mm() {
+    pointer--;
+
+  }
+
+  /**
+   * Returns underlaying array
+   * 
+   * @return underlaying array
+   */
+  public Quiltspec[] getArray() {
+    return array;
+  }
+
+  /**
+   * Sets underlaying array
+   * 
+   * @param array
+   *            underlaying array
+   */
+  public void setArray(Quiltspec[] array) {
+    this.array = array;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curve.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curve.java
new file mode 100755
index 000000000..fb1a5acea
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curve.java
@@ -0,0 +1,238 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class holding curve definition
+ * @author Tomáš Hráský
+ *
+ */
+public class Curve {
+
+  /**
+   * Maximum coordinates per control point
+   */
+  private static final int MAXCOORDS = 5;
+
+  /**
+   * Max curve order
+   */
+  private static final int MAXORDER = 24;
+
+  /**
+   * Next curve in linked list
+   */
+  public Curve next;
+
+  /**
+   * OpenGL maps
+   */
+  private Mapdesc mapdesc;
+
+  /**
+   * Does the curve need sampling
+   */
+  private boolean needsSampling;
+
+  /**
+   * Culling
+   */
+  private int cullval;
+
+  /**
+   * Number of coords
+   */
+  private int stride;
+
+  /**
+   * Curve order
+   */
+  private int order;
+
+  /**
+   * Holds conversion range borders
+   */
+  private float[] range;
+
+  /**
+   * Subdivision stepsize
+   */
+  public float stepsize;
+
+  /**
+   * Minimal subdivision stepsize
+   */
+  private float minstepsize;
+
+  /**
+   * Sampling points
+   */
+  float[] spts;
+
+  /**
+   * Makes new Curve
+   * 
+   * @param geo
+   * @param pta
+   * @param ptb
+   * @param c
+   *            next curve in linked list
+   */
+  public Curve(Quilt geo, float[] pta, float[] ptb, Curve c) {
+
+    spts = new float[MAXORDER * MAXCOORDS];
+
+    mapdesc = geo.mapdesc;
+
+    next = c;
+    needsSampling = mapdesc.isRangeSampling() ? true : false;
+
+    cullval = mapdesc.isCulling() ? Subdivider.CULL_ACCEPT
+      : Subdivider.CULL_TRIVIAL_REJECT;
+    order = geo.qspec.get(0).order;
+    stride = MAXCOORDS;
+
+    // CArrayOfFloats ps = geo.cpts;
+    CArrayOfFloats ps = new CArrayOfFloats(geo.cpts.getArray(), 0);
+    CArrayOfQuiltspecs qs = geo.qspec;
+    ps.raisePointerBy(qs.get().offset);
+    ps.raisePointerBy(qs.get().index * qs.get().order * qs.get().stride);
+
+    if (needsSampling) {
+      mapdesc.xformSampling(ps, qs.get().order, qs.get().stride, spts,
+                            stride);
+    }
+    if (cullval == Subdivider.CULL_ACCEPT) {
+      //				System.out.println("TODO curve.Curve-cullval");
+      // mapdesc.xformCulling(ps,qs.get().order,qs.get().stride,cpts,stride);
+    }
+
+    range = new float[3];
+    range[0] = qs.get().breakpoints[qs.get().index];
+    range[1] = qs.get().breakpoints[qs.get().index + 1];
+    range[2] = range[1] - range[0];
+    // TODO it is necessary to solve problem with "this" pointer here 
+    if (range[0] != pta[0]) {
+      //				System.out.println("TODO curve.Curve-range0");
+      // Curve lower=new Curve(this,pta,0);
+      // lower.next=next;
+      // this=lower;
+    }
+    if (range[1] != ptb[0]) {
+      //				System.out.println("TODO curve.Curve-range1");
+      // Curve lower=new Curve(this,ptb,0);
+    }
+  }
+
+  /**
+   * Checks culling type
+   * @return Subdivider.CULL_ACCEPT
+   */
+  public int cullCheck() {
+    if (cullval == Subdivider.CULL_ACCEPT) {
+      //				System.out.println("TODO curve.cullval");
+      // cullval=mapdesc.cullCheck(cpts,order,stride);
+    }
+    // TODO compute cullval and return the computed value
+    // return cullval;
+    return Subdivider.CULL_ACCEPT;
+  }
+
+  /**
+   * Computes subdivision step size
+   */
+  public void getStepSize() {
+    minstepsize = 0;
+    if (mapdesc.isConstantSampling()) {
+      setstepsize(mapdesc.maxrate);
+    } else if (mapdesc.isDomainSampling()) {
+      setstepsize(mapdesc.maxrate * range[2]);
+    } else {
+      assert (order <= MAXORDER);
+
+      float tmp[][] = new float[MAXORDER][MAXCOORDS];
+
+      int tstride = (MAXORDER);
+
+      int val = 0;
+      // mapdesc.project(spts,stride,tmp,tstride,order);
+
+      //				System.out.println("TODO curve.getsptepsize mapdesc.project");
+
+      if (val == 0) {
+        setstepsize(mapdesc.maxrate);
+      } else {
+        float t = mapdesc.getProperty(NurbsConsts.N_PIXEL_TOLERANCE);
+        if (mapdesc.isParametricDistanceSampling()) {
+          //						System.out.println("TODO curve.getstepsize - parametric");
+        } else if (mapdesc.isPathLengthSampling()) {
+          //						System.out.println("TODO curve.getstepsize - pathlength");
+        } else {
+          setstepsize(mapdesc.maxrate);
+        }
+      }
+
+    }
+
+  }
+
+  /**
+   * Sets maximum subdivision step size
+   * @param max maximum subdivision step size
+   */
+  private void setstepsize(float max) {
+    // DONE
+    stepsize = (max >= 1) ? (range[2] / max) : range[2];
+    minstepsize = stepsize;
+  }
+
+  /**
+   * Clamps the curve
+   */
+  public void clamp() {
+    // DONE
+    if (stepsize < minstepsize)
+      stepsize = mapdesc.clampfactor * minstepsize;
+  }
+
+  /**
+   * Tells whether curve needs subdivision
+   * 
+   * @return curve needs subdivison
+   */
+  public boolean needsSamplingSubdivision() {
+    return (stepsize < minstepsize);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CurveEvaluator.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CurveEvaluator.java
new file mode 100755
index 000000000..c27ffd4c4
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CurveEvaluator.java
@@ -0,0 +1,86 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class rendering curves with OpenGL
+ * @author Tomáš Hráský
+ *
+ */
+public interface CurveEvaluator {
+  /**
+   * Pushes eval bit
+   */
+  public void bgnmap1f();
+
+  /**
+   * Pops all OpenGL attributes
+   */
+  public void endmap1f() ;
+
+  /**
+   * Initializes opengl evaluator
+   * @param type curve type
+   * @param ulo lowest u
+   * @param uhi highest u
+   * @param stride control point coords
+   * @param order curve order
+   * @param ps control points
+   */
+  public void map1f(int type, float ulo, float uhi, int stride, int order,
+                    CArrayOfFloats ps) ;
+
+  /**
+   * Calls opengl enable
+   * @param type what to enable
+   */
+  public void enable(int type) ;
+
+  /**
+   * Calls glMapGrid1f
+   * @param nu steps
+   * @param u1 low u
+   * @param u2 high u
+   */
+  public void mapgrid1f(int nu, float u1, float u2) ;
+
+  /**
+   * Evaluates a curve using glEvalMesh1f
+   * @param style Backend.N_MESHFILL/N_MESHLINE/N_MESHPOINT
+   * @param from lowest param
+   * @param to highest param
+   */
+  public void mapmesh1f(int style, int from, int to) ;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curvelist.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curvelist.java
new file mode 100755
index 000000000..fc3018833
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curvelist.java
@@ -0,0 +1,121 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class for woking with linked list of curves
+ * @author Tomas Hrasky
+ *
+ */
+public class Curvelist {
+
+  /**
+   * Head of linked list
+   */
+  private Curve curve;
+
+  /**
+   * Holds conversion range borders
+   */
+  float[] range;
+
+  /**
+   * Subdivision step size
+   */
+  public float stepsize;
+
+  /**
+   * Do curves need subdivision?
+   */
+  private boolean needsSubdivision;
+
+  /**
+   * Makes new instance on top of specified lis of Quilts
+   * @param qlist underlaying list of quilts
+   * @param pta range start
+   * @param ptb range end
+   */
+  public Curvelist(Quilt qlist, float[] pta, float[] ptb) {
+    // DONE
+    curve = null;
+    range = new float[3];
+
+    for (Quilt q = qlist; q != null; q = q.next) {
+      curve = new Curve(q, pta, ptb, curve);
+    }
+    range[0] = pta[0];
+    range[1] = ptb[0];
+    range[2] = range[1] - range[0];
+  }
+
+  /**
+   * Compute step size
+   */
+  public void getstepsize() {
+    // DONE
+    stepsize = range[2];
+    Curve c;
+    for (c = curve; c != null; c = c.next) {
+      c.getStepSize();
+      c.clamp();
+      stepsize = (c.stepsize < stepsize) ? c.stepsize : stepsize;
+      if (c.needsSamplingSubdivision())
+        break;
+    }
+    needsSubdivision = (c != null) ? true : false;
+
+  }
+
+  /**
+   * Indicates whether curves need subdivision
+   * @return curves need subdivision
+   */
+  public boolean needsSamplingSubdivision() {
+    // DONE
+    return needsSubdivision;
+  }
+
+  /**
+   * Checks for culling
+   * @return Subdivider.CULL_TRIVIAL_REJECT or Subdivider.CULL_ACCEPT
+   */
+  public int cullCheck() {
+    // DONE
+    for (Curve c = curve; c != null; c = c.next)
+      if (c.cullCheck() == Subdivider.CULL_TRIVIAL_REJECT)
+        return Subdivider.CULL_TRIVIAL_REJECT;
+    return Subdivider.CULL_ACCEPT;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/DisplayList.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/DisplayList.java
new file mode 100755
index 000000000..39a3a28f4
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/DisplayList.java
@@ -0,0 +1,56 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+import java.lang.reflect.Method;
+
+/**
+ * Display list
+ * @author Tomas Hrasky
+ *
+ */
+public class DisplayList {
+
+  /**
+   * Append action to the display list
+   * @param src source object to invoke method on
+   * @param m invoked method
+   * @param arg method argument
+   */
+  public void append(Object src, Method m, Object arg) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO displaylist append");
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Flist.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Flist.java
new file mode 100755
index 000000000..00757ed7e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Flist.java
@@ -0,0 +1,130 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+import java.util.Arrays;
+
+/**
+ * List of breakpoints
+ * @author Tomas Hrasky
+ *
+ */
+public class Flist {
+
+  /**
+   * Data elements end index
+   * 
+   */
+  public int end;
+
+  /**
+   *Data elements start index 
+   */
+  public int start;
+
+  /**
+   * Breakpoint values
+   */
+  public float[] pts;
+
+  /**
+   * Number of array fields
+   */
+  private int npts;
+
+  /**
+   * Grows list
+   * @param maxpts maximum desired size
+   */
+  public void grow(int maxpts) {
+    // DONE
+    if (npts < maxpts) {
+      // npts=2*maxpts;
+      npts = maxpts;
+      pts = new float[npts];
+    }
+    start = 0;
+    end = 0;
+  }
+
+  /**
+   * Removes duplicate array elemnts 
+   */
+  public void filter() {
+    // INFO the aim of this method is to remove duplicates from array
+
+    Arrays.sort(pts);
+
+    start = 0;
+
+    int j = 0;
+
+    for (int i = 1; i < end; i++) {
+      if (pts[i] == pts[i - j - 1])
+        j++;
+      pts[i - j] = pts[i];
+    }
+
+    end -= j;
+
+  }
+
+  /**
+   * Sets start and and to real start and end of array elements
+   * @param from start from
+   * @param to end at
+   */
+  public void taper(float from, float to) {
+    // DONE
+
+    while (pts[start] != from) {
+      start++;
+    }
+
+    while (pts[end - 1] != to) {
+      end--;
+    }
+
+  }
+
+  /**
+   * Adds breakpoint value
+   * @param f value
+   */
+  public void add(float f) {
+    //DONE
+    pts[end++] = f;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotspec.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotspec.java
new file mode 100755
index 000000000..9251aa231
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotspec.java
@@ -0,0 +1,557 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Knot vector specification
+ * 
+ * @author Tomas Hrasky
+ * 
+ */
+public class Knotspec {
+
+  /**
+   * Begin of input knots
+   */
+  public CArrayOfFloats inkbegin;
+
+  /**
+   * End of input knots
+   */
+  public CArrayOfFloats inkend;
+
+  /**
+   * Stride before knot operations
+   */
+  public int prestride;
+
+  /**
+   * Curve order
+   */
+  public int order;
+
+  /**
+   * Next knot specification in linked list (used in surfaces)
+   */
+  public Knotspec next;
+
+  /**
+   * Last knot
+   */
+  public CArrayOfFloats klast;
+
+  /**
+   * First knot
+   */
+  CArrayOfFloats kfirst;
+
+  /**
+   * Beginning of breakpoints
+   */
+  CArrayOfBreakpts bbegin;
+
+  /**
+   * End of breakpoints
+   */
+  CArrayOfBreakpts bend;
+
+  /**
+   * Considered left end knot
+   */
+  CArrayOfFloats kleft;
+
+  /**
+   * Considered right end knot
+   */
+  CArrayOfFloats kright;
+
+  /**
+   * Offset before knot operations
+   */
+  int preoffset;
+
+  /**
+   * Control points array Length after knot operations
+   */
+  int postwidth;
+
+  /**
+   * Beginning of coeficients array
+   */
+  private CArrayOfFloats sbegin;
+
+  /**
+   * Beginning of output knots
+   */
+  private CArrayOfFloats outkbegin;
+
+  /**
+   * End of output knots
+   */
+  private CArrayOfFloats outkend;
+
+  /**
+   * Control points aray length before knot operations
+   */
+  int prewidth;
+
+  /**
+   * Offset after knot operations
+   */
+  int postoffset;
+
+  /**
+   * Number of control points' coordinates after knot operations
+   */
+  public int poststride;
+
+  /**
+   * Number of control points' coordinates
+   */
+  public int ncoords;
+
+  /**
+   * Tell whether knotspec has already benn transformed
+   */
+  public boolean istransformed;
+
+  /**
+   * Knotspec to be transformed
+   */
+  public Knotspec kspectotrans;
+
+  /**
+   * Finds knot border of knot insertion and required multiplicities
+   */
+  public void preselect() {
+    // DONE
+    float kval;
+
+    klast = new CArrayOfFloats(inkend);
+    klast.lessenPointerBy(order);
+    for (kval = klast.get(); klast.getPointer() != inkend.getPointer(); klast
+           .pp()) {
+      if (!Knotvector.identical(klast.get(), kval))
+        break;
+    }
+
+    kfirst = new CArrayOfFloats(inkbegin);
+    kfirst.raisePointerBy(order - 1);
+    for (kval = kfirst.get(); kfirst.getPointer() != inkend.getPointer(); kfirst
+           .pp()) {
+      if (!Knotvector.identical(kfirst.get(), kval))
+        break;
+    }
+
+    CArrayOfFloats k = new CArrayOfFloats(kfirst);
+    k.mm();
+
+    for (; k.getPointer() >= inkbegin.getPointer(); k.mm())
+      if (!Knotvector.identical(kval, k.get()))
+        break;
+    k.pp();
+
+    Breakpt[] bbeginArray = new Breakpt[(klast.getPointer() - kfirst
+                                         .getPointer()) + 1];
+    for (int i = 0; i < bbeginArray.length; i++)
+      bbeginArray[i] = new Breakpt();
+    bbegin = new CArrayOfBreakpts(bbeginArray, 0);
+    bbegin.get().multi = kfirst.getPointer() - k.getPointer();
+    bbegin.get().value = kval;
+
+    bend = new CArrayOfBreakpts(bbegin);
+    kleft = new CArrayOfFloats(kfirst);
+    kright = new CArrayOfFloats(kfirst);
+
+  }
+
+  /**
+   * Perpares knotspec for transformation
+   */
+  public void select() {
+    // DONE
+    breakpoints();
+    knots();
+    factors();
+
+    preoffset = kleft.getPointer() - (inkbegin.getPointer() + order);
+    postwidth = ((bend.getPointer() - bbegin.getPointer()) * order);
+    prewidth = (outkend.getPointer() - outkbegin.getPointer()) - order;
+    postoffset = (bbegin.get().def > 1) ? (bbegin.get().def - 1) : 0;
+
+  }
+
+  /**
+   * Computes alpha factors for computing new control points
+   */
+  private void factors() {
+    // DONE
+    CArrayOfFloats mid = new CArrayOfFloats(outkend.getArray(), (outkend
+                                                                 .getPointer() - 1)
+                                            - order + bend.get().multi);
+
+    CArrayOfFloats fptr = null;
+    if (sbegin != null)
+      fptr = new CArrayOfFloats(sbegin);
+
+    for (CArrayOfBreakpts bpt = new CArrayOfBreakpts(bend); bpt
+           .getPointer() >= bbegin.getPointer(); bpt.mm()) {
+      mid.lessenPointerBy(bpt.get().multi);
+      int def = bpt.get().def - 1;
+      if (def < 0)
+        continue;
+      float kv = bpt.get().value;
+
+      CArrayOfFloats kf = new CArrayOfFloats(mid.getArray(), (mid
+                                                              .getPointer() - def)
+                                             + (order - 1));
+      for (CArrayOfFloats kl = new CArrayOfFloats(kf.getArray(), kf
+                                                  .getPointer()
+                                                  + def); kl.getPointer() != kf.getPointer(); kl.mm()) {
+        CArrayOfFloats kh, kt;
+        for (kt = new CArrayOfFloats(kl), kh = new CArrayOfFloats(mid); kt
+               .getPointer() != kf.getPointer(); kh.mm(), kt.mm()) {
+          fptr.set((kv - kh.get()) / (kt.get() - kh.get()));
+          fptr.pp();
+        }
+        kl.set(kv);
+      }
+    }
+
+  }
+
+  /**
+   * Makes new knot vector
+   */
+  private void knots() {
+    // DONE
+    CArrayOfFloats inkpt = new CArrayOfFloats(kleft.getArray(), kleft
+                                              .getPointer()
+                                              - order);
+    CArrayOfFloats inkend = new CArrayOfFloats(kright.getArray(), kright
+                                               .getPointer()
+                                               + bend.get().def);
+
+    outkbegin = new CArrayOfFloats(new float[inkend.getPointer()
+                                             - inkpt.getPointer()], 0);
+    CArrayOfFloats outkpt;
+    for (outkpt = new CArrayOfFloats(outkbegin); inkpt.getPointer() != inkend
+           .getPointer(); inkpt.pp(), outkpt.pp()) {
+      outkpt.set(inkpt.get());
+    }
+    outkend = new CArrayOfFloats(outkpt);
+  }
+
+  /**
+   * Analyzes breakpoints
+   */
+  private void breakpoints() {
+    // DONE
+    CArrayOfBreakpts ubpt = new CArrayOfBreakpts(bbegin);
+    CArrayOfBreakpts ubend = new CArrayOfBreakpts(bend);
+    int nfactors = 0;
+
+    ubpt.get().value = ubend.get().value;
+    ubpt.get().multi = ubend.get().multi;
+
+    kleft = new CArrayOfFloats(kright);
+
+    for (; kright.getPointer() != klast.getPointer(); kright.pp()) {
+      if (Knotvector.identical(kright.get(), ubpt.get().value)) {
+        ubpt.get().multi++;
+      } else {
+        ubpt.get().def = order - ubpt.get().multi;
+        nfactors += (ubpt.get().def * (ubpt.get().def - 1)) / 2;
+        ubpt.pp();
+        ubpt.get().value = kright.get();
+        ubpt.get().multi = 1;
+      }
+    }
+    ubpt.get().def = order - ubpt.get().multi;
+    nfactors += (ubpt.get().def * (ubpt.get().def - 1)) / 2;
+
+    bend = new CArrayOfBreakpts(ubpt);
+
+    if (nfactors > 0) {
+      sbegin = new CArrayOfFloats(new float[nfactors], 0);
+    } else {
+      sbegin = null;
+    }
+
+  }
+
+  /**
+   * Copies control points
+   * 
+   * @param _inpt
+   *            input control points
+   * @param _outpt
+   *            output control points
+   */
+  public void copy(CArrayOfFloats _inpt, CArrayOfFloats _outpt) {
+    CArrayOfFloats inpt = new CArrayOfFloats(_inpt);
+    CArrayOfFloats outpt = new CArrayOfFloats(_outpt);
+
+    inpt.raisePointerBy(preoffset);
+    if (next != null) {
+      for (CArrayOfFloats lpt = new CArrayOfFloats(outpt.getArray(),
+                                                   outpt.getPointer() + prewidth); outpt.getPointer() != lpt
+             .getPointer(); outpt.raisePointerBy(poststride)) {
+        next.copy(inpt, outpt);
+        inpt.raisePointerBy(prestride);
+      }
+
+    } else {
+      for (CArrayOfFloats lpt = new CArrayOfFloats(outpt.getArray(),
+                                                   outpt.getPointer() + prewidth); outpt.getPointer() != lpt
+             .getPointer(); outpt.raisePointerBy(poststride)) {
+        pt_io_copy(outpt, inpt);
+        inpt.raisePointerBy(prestride);
+      }
+    }
+
+  }
+
+  /**
+   * Copies one control point to other
+   * 
+   * @param topt
+   *            source control point
+   * @param frompt
+   *            destination control point
+   */
+  private void pt_io_copy(CArrayOfFloats topt, CArrayOfFloats frompt) {
+    // DONE
+    switch (ncoords) {
+    case 4:
+      topt.setRelative(3, frompt.getRelative(3));
+    case 3:
+      topt.setRelative(2, frompt.getRelative(2));
+    case 2:
+      topt.setRelative(1, frompt.getRelative(1));
+    case 1:
+      topt.set(frompt.get());
+      break;
+    default:
+      // TODO break with copying in general case
+      //				System.out.println("TODO knotspec.pt_io_copy");
+      break;
+    }
+
+  }
+
+  /**
+   * Inserts a knot
+   * 
+   * @param _p
+   *            inserted knot
+   */
+  public void transform(CArrayOfFloats _p) {
+    CArrayOfFloats p = new CArrayOfFloats(_p);
+    // DONE
+    if (next != null) {//surface code
+      if (this.equals(kspectotrans)) {
+        next.transform(p);
+      } else {
+        if (istransformed) {
+          p.raisePointerBy(postoffset);
+          for (CArrayOfFloats pend = new CArrayOfFloats(p.getArray(),
+							p.getPointer() + postwidth); p.getPointer() != pend
+                 .getPointer(); p.raisePointerBy(poststride))
+            next.transform(p);
+
+        } else {
+          CArrayOfFloats pend = new CArrayOfFloats(p.getArray(), p
+                                                   .getPointer()
+                                                   + prewidth);
+          for (; p.getPointer() != pend.getPointer(); p
+                 .raisePointerBy(poststride))
+            next.transform(p);
+        }
+      }
+
+    } else {//code for curve 
+      if (this.equals(kspectotrans)) {
+        insert(p);
+      } else {
+        if (istransformed) {
+          p.raisePointerBy(postoffset);
+          for (CArrayOfFloats pend = new CArrayOfFloats(p.getArray(),
+							p.getPointer() + postwidth); p.getPointer() != pend
+                 .getPointer(); p.raisePointerBy(poststride)) {
+            kspectotrans.insert(p);
+          }
+        } else {
+          CArrayOfFloats pend = new CArrayOfFloats(p.getArray(), p
+                                                   .getPointer()
+                                                   + prewidth);
+          for (; p.getPointer() != pend.getPointer(); p
+                 .raisePointerBy(poststride))
+            kspectotrans.insert(p);
+        }
+      }
+    }
+
+  }
+
+  /**
+   * Inserts a knot and computes new control points
+   * 
+   * @param p
+   *            inserted knot
+   */
+  private void insert(CArrayOfFloats p) {
+    // DONE
+    CArrayOfFloats fptr = null;
+    if (sbegin != null)
+      fptr = new CArrayOfFloats(sbegin);
+    CArrayOfFloats srcpt = new CArrayOfFloats(p.getArray(), p.getPointer()
+                                              + prewidth - poststride);
+    // CArrayOfFloats srcpt = new CArrayOfFloats(p.getArray(), prewidth -
+    // poststride);
+    CArrayOfFloats dstpt = new CArrayOfFloats(p.getArray(), p.getPointer()
+                                              + postwidth + postoffset - poststride);
+    // CArrayOfFloats dstpt = new CArrayOfFloats(p.getArray(), postwidth +
+    // postoffset - poststride);
+    CArrayOfBreakpts bpt = new CArrayOfBreakpts(bend);
+
+    for (CArrayOfFloats pend = new CArrayOfFloats(srcpt.getArray(), srcpt
+                                                  .getPointer()
+                                                  - poststride * bpt.get().def); srcpt.getPointer() != pend
+           .getPointer(); pend.raisePointerBy(poststride)) {
+      CArrayOfFloats p1 = new CArrayOfFloats(srcpt);
+      for (CArrayOfFloats p2 = new CArrayOfFloats(srcpt.getArray(), srcpt
+                                                  .getPointer()
+                                                  - poststride); p2.getPointer() != pend.getPointer(); p1
+             .setPointer(p2.getPointer()), p2
+             .lessenPointerBy(poststride)) {
+        pt_oo_sum(p1, p1, p2, fptr.get(), 1.0 - fptr.get());
+        fptr.pp();
+      }
+    }
+    bpt.mm();
+    for (; bpt.getPointer() >= bbegin.getPointer(); bpt.mm()) {
+
+      for (int multi = bpt.get().multi; multi > 0; multi--) {
+        pt_oo_copy(dstpt, srcpt);
+        dstpt.lessenPointerBy(poststride);
+        srcpt.lessenPointerBy(poststride);
+      }
+      for (CArrayOfFloats pend = new CArrayOfFloats(srcpt.getArray(),
+                                                    srcpt.getPointer() - poststride * bpt.get().def); srcpt
+             .getPointer() != pend.getPointer(); pend
+             .raisePointerBy(poststride), dstpt
+             .lessenPointerBy(poststride)) {
+        pt_oo_copy(dstpt, srcpt);
+        CArrayOfFloats p1 = new CArrayOfFloats(srcpt);
+
+        for (CArrayOfFloats p2 = new CArrayOfFloats(srcpt.getArray(),
+                                                    srcpt.getPointer() - poststride); p2.getPointer() != pend
+               .getPointer(); p1.setPointer(p2.getPointer()), p2
+               .lessenPointerBy(poststride)) {
+          pt_oo_sum(p1, p1, p2, fptr.get(), 1.0 - fptr.get());
+          fptr.pp();
+        }
+      }
+    }
+  }
+
+  /**
+   * Copies one control point to another
+   * 
+   * @param topt
+   *            source ctrl point
+   * @param frompt
+   *            distance ctrl point
+   */
+  private void pt_oo_copy(CArrayOfFloats topt, CArrayOfFloats frompt) {
+    // DONE
+    // this is a "trick" with case - "break" is omitted so it comes through all cases
+    switch (ncoords) {
+    case 4:
+      topt.setRelative(3, frompt.getRelative(3));
+    case 3:
+      topt.setRelative(2, frompt.getRelative(2));
+    case 2:
+      topt.setRelative(1, frompt.getRelative(1));
+    case 1:
+      topt.setRelative(0, frompt.getRelative(0));
+      break;
+    default:
+      // default uses memcpy but it is not needed (we probably won't have more than 4 coords)
+      // TODO not sure about it
+      break;
+    }
+
+  }
+
+  /**
+   * Computes new control point
+   * 
+   * @param x
+   *            first point
+   * @param y
+   *            second point
+   * @param z
+   *            third pont
+   * @param a
+   *            alpha
+   * @param b
+   *            1 - alpha
+   */
+  private void pt_oo_sum(CArrayOfFloats x, CArrayOfFloats y,
+                         CArrayOfFloats z, float a, double b) {
+    // DONE
+    switch (ncoords) {
+    case 4:
+      x.setRelative(3, (float) (a * y.getRelative(3) + b
+                                * z.getRelative(3)));
+    case 3:
+      x.setRelative(2, (float) (a * y.getRelative(2) + b
+                                * z.getRelative(2)));
+    case 2:
+      x.setRelative(1, (float) (a * y.getRelative(1) + b
+                                * z.getRelative(1)));
+    case 1:
+      x.setRelative(0, (float) (a * y.getRelative(0) + b
+                                * z.getRelative(0)));
+      break;
+    default:
+      //no need of default - see previous method and its case statement				
+      //				System.out.println("TODO pt_oo_sum default");
+      break;
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotvector.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotvector.java
new file mode 100755
index 000000000..658a1cbda
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotvector.java
@@ -0,0 +1,179 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Knot vector used in curve specification
+ * 
+ * @author Tomas Hrasky
+ * 
+ */
+public class Knotvector {
+
+  /**
+   * Tolerance used when comparing knots - when difference is smaller, knots
+   * are considered equal
+   */
+  public static final float TOLERANCE = 1.0e-5f;
+
+  /**
+   * Maximum curve order
+   */
+  private static final int MAXORDER = 24;
+
+  /**
+   * Number of knots
+   */
+  int knotcount;
+
+  /**
+   * Number of control points' coordinates
+   */
+  int stride;
+
+  /**
+   * Curve order
+   */
+  int order;
+
+  /**
+   * Knots
+   */
+  float[] knotlist;
+
+  /**
+   * Makes new knotvector
+   * 
+   * @param nknots
+   *            number of knots
+   * @param stride
+   *            number of ctrl points' corrdinates
+   * @param order
+   *            curve order
+   * @param knot
+   *            knots
+   */
+  public Knotvector(int nknots, int stride, int order, float[] knot) {
+    // DONE
+    init(nknots, stride, order, knot);
+  }
+
+  /**
+   * Initializes knotvector
+   * 
+   * @param nknots
+   *            number of knots
+   * @param stride
+   *            number of ctrl points' corrdinates
+   * @param order
+   *            curve order
+   * @param knot
+   *            knots
+   */
+  public void init(int nknots, int stride, int order, float[] knot) {
+    // DONE
+    this.knotcount = nknots;
+    this.stride = stride;
+    this.order = order;
+    this.knotlist = new float[nknots];
+    for (int i = 0; i < nknots; i++) {
+      this.knotlist[i] = knot[i];
+    }
+
+  }
+
+  /**
+   * Validates knot vector parameters
+   * 
+   * @return knot vector validity
+   */
+  public int validate() {
+    int kindex = knotcount - 1;
+    if (order < 1 || order > MAXORDER) {
+      return 1;
+    }
+    if (knotcount < 2 * order) {
+      return 2;
+    }
+    if (identical(knotlist[kindex - (order - 1)], knotlist[order - 1])) {
+      return 3;
+    }
+    for (int i = 0; i < kindex; i++) {
+      if (knotlist[i] > knotlist[i + 1])
+        return 4;
+    }
+    int multi = 1;
+    for (; kindex >= 1; kindex--) {
+      if (knotlist[kindex] - knotlist[kindex - 1] < TOLERANCE) {
+        multi++;
+        continue;
+      }
+      if (multi > order) {
+        return 5;
+      }
+      multi = 1;
+    }
+    if (multi > order) {
+      return 5;
+    }
+
+    return 0;
+  }
+
+  /**
+   * Show specified message
+   * 
+   * @param msg
+   *            message to be shown
+   */
+  public void show(String msg) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO knotvector.show");
+
+  }
+
+  /**
+   * Compares two knots for equality
+   * 
+   * @param a
+   *            first knot
+   * @param b
+   *            second knot
+   * @return knots are/are not equal
+   */
+  public static boolean identical(float a, float b) {
+    return ((a - b) < TOLERANCE) ? true : false;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Mapdesc.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Mapdesc.java
new file mode 100755
index 000000000..568eddc51
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Mapdesc.java
@@ -0,0 +1,442 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class holding properties of OpenGL map
+ * @author Tomas Hrasky
+ *
+ */
+public class Mapdesc {
+
+  /**
+   * Maximum control point coords
+   */
+  private static final int MAXCOORDS = 5;
+
+  /**
+   * Next description in list
+   */
+  public Mapdesc next;
+
+  /**
+   * Is map rational
+   */
+  public int isrational;
+
+  /**
+   * Number of control point coords
+   */
+  public int ncoords;
+
+  /**
+   * Map type
+   */
+  private int type;
+
+  /**
+   * Number of homogenous coords
+   */
+  private int hcoords;
+
+  /**
+   * Number of inhomogenous coords
+   */
+  private int inhcoords;
+
+  /**
+   * Not used
+   */
+  private int mask;
+
+  /**
+   * Value of N_PIXEL_TOLERANCE property
+   */
+  private float pixel_tolerance;
+
+  /**
+   * Value of N_ERROR_TOLERANCE property
+   */
+  private float error_tolerance;
+
+  /**
+   * Value of N_BBOX_SUBDIVIDING property
+   */
+  private float bbox_subdividing;
+
+  /**
+   * Value of N_CULLING property
+   */
+  private float culling_method;
+
+  /**
+   * Value of N_SAMPLINGMETHOD property
+   */
+  private float sampling_method;
+
+  /**
+   * Value of N_CLAMPFACTOR property
+   */
+  float clampfactor;
+
+  /**
+   * Value of N_MINSAVINGS property 
+   */
+  private float minsavings;
+
+  /**
+   * Steps in u direction
+   */
+  private float s_steps;
+
+  /**
+   * Steps in v direction
+   */
+  private float t_steps;
+
+  /**
+   * Maximal step
+   */
+  float maxrate;
+
+  /**
+   * Maximal u direction step
+   */
+  private float maxsrate;
+
+  /**
+   * Maximal v direction step
+   */
+  private float maxtrate;
+
+  /**
+   * Not used
+   */
+  private float[][] bmat;
+
+  /**
+   * Sampling matrix
+   */
+  private float[][] smat;
+
+  /**
+   * Not used
+   */
+  private float[][] cmat;
+
+  /**
+   * Not used
+   */
+  private float[] bboxsize;
+
+  /**
+   * Makes new mapdesc 
+   * @param type map type
+   * @param rational is rational
+   * @param ncoords number of control points coords
+   * @param backend backend object
+   */
+  public Mapdesc(int type, int rational, int ncoords, Backend backend) {
+    // DONE
+    this.type = type;
+    this.isrational = rational;
+    this.ncoords = ncoords;
+    this.hcoords = ncoords + (isrational > 0 ? 0 : 1);
+    this.inhcoords = ncoords - (isrational > 0 ? 1 : 0);
+    this.mask = ((1 << (inhcoords * 2)) - 1);
+    next = null;
+
+    assert (hcoords <= MAXCOORDS);
+    assert (inhcoords >= 1);
+
+    pixel_tolerance = 1f;
+    error_tolerance = 1f;
+    bbox_subdividing = NurbsConsts.N_NOBBOXSUBDIVISION;
+    culling_method = NurbsConsts.N_NOCULLING;
+    sampling_method = NurbsConsts.N_NOSAMPLING;
+    clampfactor = NurbsConsts.N_NOCLAMPING;
+    minsavings = NurbsConsts.N_NOSAVINGSSUBDIVISION;
+    s_steps = 0f;
+    t_steps = 0f;
+
+    maxrate = (s_steps < 0) ? 0 : s_steps;
+    maxsrate = (s_steps < 0) ? 0 : s_steps;
+    maxtrate = (t_steps < 0) ? 0 : t_steps;
+    bmat = new float[MAXCOORDS][MAXCOORDS];
+    cmat = new float[MAXCOORDS][MAXCOORDS];
+    smat = new float[MAXCOORDS][MAXCOORDS];
+
+    identify(bmat);
+    identify(cmat);
+    identify(smat);
+    bboxsize = new float[MAXCOORDS];
+    for (int i = 0; i < inhcoords; i++)
+      bboxsize[i] = 1;
+  }
+
+  /**
+   * Make matrix identity matrix
+   * @param arr matrix
+   */
+  private void identify(float[][] arr) {
+    // DONE
+    for (int i = 0; i < MAXCOORDS; i++)
+      for (int j = 0; j < MAXCOORDS; j++)
+        arr[i][j] = 0;
+    for (int i = 0; i < MAXCOORDS; i++)
+      arr[i][i] = 1;
+
+  }
+
+  /**
+   * Tells whether tag is property tag
+   * @param tag property tag
+   * @return is/is not property
+   */
+  public boolean isProperty(int tag) {
+    boolean ret;
+    switch (tag) {
+    case NurbsConsts.N_PIXEL_TOLERANCE:
+    case NurbsConsts.N_ERROR_TOLERANCE:
+    case NurbsConsts.N_CULLING:
+    case NurbsConsts.N_BBOX_SUBDIVIDING:
+    case NurbsConsts.N_S_STEPS:
+    case NurbsConsts.N_T_STEPS:
+    case NurbsConsts.N_SAMPLINGMETHOD:
+    case NurbsConsts.N_CLAMPFACTOR:
+    case NurbsConsts.N_MINSAVINGS:
+      ret = true;
+      break;
+    default:
+      ret = false;
+      break;
+    }
+    return ret;
+  }
+
+  /**
+   * Returns number of control points' coords
+   * @return number of control points' coords
+   */
+  public int getNCoords() {
+    return ncoords;
+  }
+
+  /**
+   * Returns map type
+   * @return map type
+   */
+  public int getType() {
+    return type;
+  }
+
+  /**
+   * Tells whether map is range sampling
+   * @return is map range sampling
+   */
+  public boolean isRangeSampling() {
+    // DONE
+    return (isParametricDistanceSampling() || isPathLengthSampling()
+            || isSurfaceAreaSampling() || isObjectSpaceParaSampling() || isObjectSpacePathSampling());
+  }
+
+  /**
+   * Tells whether map is object space sampling
+   * @return is map object space sampling
+   */
+  private boolean isObjectSpacePathSampling() {
+    // DONE
+    return sampling_method == NurbsConsts.N_OBJECTSPACE_PATH;
+  }
+
+  /**
+   * Tells whether map is object space parasampling
+   * @return is map object space parasampling
+   */
+  private boolean isObjectSpaceParaSampling() {
+    // DONE
+    return sampling_method == NurbsConsts.N_OBJECTSPACE_PARA;
+  }
+
+  /**
+   * Tells whether map is area sampling surface
+   * @return is map area sampling surface
+   */
+  private boolean isSurfaceAreaSampling() {
+    // DONE
+    return sampling_method == NurbsConsts.N_SURFACEAREA;
+  }
+
+  /**
+   * Tells whether map is path length sampling
+   * @return is map path length sampling
+   */
+  boolean isPathLengthSampling() {
+    // DONE
+    return sampling_method == NurbsConsts.N_PATHLENGTH;
+  }
+
+  /**
+   * Tells whether map is parametric distance sampling
+   * @return is map parametric distance sampling
+   */
+  boolean isParametricDistanceSampling() {
+    // DONE
+    return sampling_method == NurbsConsts.N_PARAMETRICDISTANCE;
+  }
+
+  /**
+   * Tells whether map is culling 
+   * @return is map culling
+   */
+  public boolean isCulling() {
+    // DONE
+    return culling_method != NurbsConsts.N_NOCULLING ? true : false;
+  }
+
+  /**
+   * Tells whether map is constantly sampling 
+   * @return is map constant sampling
+   */
+  public boolean isConstantSampling() {
+    return (sampling_method == NurbsConsts.N_FIXEDRATE) ? true : false;
+  }
+
+  /**
+   * Tells whether map is domain sampling 
+   * @return is map domain sampling
+   */
+  public boolean isDomainSampling() {
+    return (sampling_method == NurbsConsts.N_DOMAINDISTANCE) ? true : false;
+  }
+
+  /**
+   * Returns property of specified tag value 
+   * @param tag property tag
+   * @return property value
+   */
+  public float getProperty(int tag) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO mapdesc.getproperty");
+    return 0;
+  }
+
+  /**
+   * Sets property with given tag
+   * @param tag property tag
+   * @param value desired value
+   */
+  public void setProperty(int tag, float value) {
+    // TODO Auto-generated method stub
+    switch (tag) {
+    case NurbsConsts.N_PIXEL_TOLERANCE:
+      pixel_tolerance = value;
+      break;
+    case NurbsConsts.N_ERROR_TOLERANCE:
+      error_tolerance = value;
+      break;
+    case NurbsConsts.N_CULLING:
+      culling_method = value;
+      break;
+    case NurbsConsts.N_BBOX_SUBDIVIDING:
+      if (value <= 0)
+        value = NurbsConsts.N_NOBBOXSUBDIVISION;
+      bbox_subdividing = value;
+      break;
+    case NurbsConsts.N_S_STEPS:
+      if (value < 0)
+        value = 0;
+      s_steps = value;
+      maxrate = value;
+      maxsrate = value;
+      break;
+    case NurbsConsts.N_T_STEPS:
+      if (value < 0)
+        value = 0;
+      t_steps = value;
+      maxtrate = value;
+      break;
+    case NurbsConsts.N_SAMPLINGMETHOD:
+      sampling_method = value;
+      break;
+    case NurbsConsts.N_CLAMPFACTOR:
+      if (value < 0)
+        value = 0;
+      clampfactor = value;
+      break;
+    case NurbsConsts.N_MINSAVINGS:
+      if (value <= 0)
+        value = NurbsConsts.N_NOSAVINGSSUBDIVISION;
+      minsavings = value;
+      break;
+    }
+  }
+
+  /**
+   * Samples curve
+   * @param pts control points
+   * @param order curve order
+   * @param stride number of control points' coordinates
+   * @param sp breakpoints
+   * @param outstride output number of control points' coordinates
+   */
+  public void xformSampling(CArrayOfFloats pts, int order, int stride,
+                            float[] sp, int outstride) {
+    // DONE
+    xFormMat(smat, pts, order, stride, sp, outstride);
+  }
+
+  /**
+   * Empty method
+   * @param mat sampling matrix
+   * @param pts ontrol points
+   * @param order curve order
+   * @param stride number of control points' coordinates
+   * @param cp breakpoints
+   * @param outstride output number of control points' coordinates
+   */
+  private void xFormMat(float[][] mat, CArrayOfFloats pts, int order,
+			int stride, float[] cp, int outstride) {
+    // TODO Auto-generated method stub
+
+    //		System.out.println("TODO mapdsc.xformmat ; change cp from float[] to carrayoffloats");
+
+    if (isrational > 0) {
+
+    } else {
+
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Maplist.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Maplist.java
new file mode 100755
index 000000000..b23a1f665
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Maplist.java
@@ -0,0 +1,122 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class holding list of Mapdescs
+ * @author Tomáš Hráský
+ *
+ */
+public class Maplist {
+  /**
+   * Head of linked list
+   */
+  private Mapdesc maps;
+
+  /**
+   * Backend class
+   */
+  private Backend backend;
+
+  /**
+   * Makes new Maplist
+   * @param backend Backend class
+   */
+  public Maplist(Backend backend) {
+    this.backend = backend;
+  }
+
+  /**
+   * Sets linked list beginning to null
+   */
+  public void initialize() {
+    // TODO mapdespool.clear ?
+    maps = null;
+  }
+
+  /**
+   * Defines new Mapdesc if it is not defined and appends it to linked list
+   * @param type map type
+   * @param rational is map rational
+   * @param ncoords number of coords
+   */
+  public void define(int type, int rational, int ncoords) {
+    // DONE
+    Mapdesc m = locate(type);
+    assert (m == null || (m.isrational == rational && m.ncoords == ncoords));
+    add(type, rational, ncoords);
+
+  }
+
+  /**
+   * Adds new Mapdesc to linked list
+   * @param type map type
+   * @param rational is map rational
+   * @param ncoords number of coords
+   */
+  private void add(int type, int rational, int ncoords) {
+    // DONE
+    Mapdesc map = new Mapdesc(type, rational, ncoords, backend);
+    if (maps == null) {
+      maps = map;
+    } else {
+      map.next = maps;
+      maps = map;
+    }
+  }
+
+  /**
+   * Tries to find Mapdesc in linked list
+   * @param type map type
+   * @return Mapdesc of type or null if there is no such map
+   */
+  public Mapdesc locate(int type) {
+    // DONE
+    Mapdesc m = null;
+    for (m = maps; m != null; m = m.next)
+      if (m.getType() == type)
+        break;
+    return m;
+  }
+
+  /**
+   * Alias for locate
+   * @param type maptype
+   * @return Mapdesc of type or null if there is no such map
+   */
+  public Mapdesc find(int type) {
+    return locate(type);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/NurbsConsts.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/NurbsConsts.java
new file mode 100755
index 000000000..ee7f3b31b
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/NurbsConsts.java
@@ -0,0 +1,184 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class hodling NURBS constants as seen in OpenGL GLU documentation
+ * @author JOGL project
+ *
+ */
+public class NurbsConsts {
+  /*
+   * NURBS Properties - one set per map, each takes a single INREAL arg
+   */
+  public static final int N_SAMPLING_TOLERANCE = 1;
+
+  public static final int N_S_RATE = 6;
+
+  public static final int N_T_RATE = 7;
+
+  public static final int N_CLAMPFACTOR = 13;
+
+  public static final float N_NOCLAMPING = 0.0f;
+
+  public static final int N_MINSAVINGS = 14;
+
+  public static final float N_NOSAVINGSSUBDIVISION = 0.0f;
+
+  /*
+   * NURBS Properties - one set per map, each takes an enumerated value
+   */
+  public static final int N_CULLING = 2;
+
+  public static final float N_NOCULLING = 0.0f;
+
+  public static final float N_CULLINGON = 1.0f;
+
+  public static final int N_SAMPLINGMETHOD = 10;
+
+  public static final float N_NOSAMPLING = 0.0f;
+
+  public static final float N_FIXEDRATE = 3.0f;
+
+  public static final float N_DOMAINDISTANCE = 2.0f;
+
+  public static final float N_PARAMETRICDISTANCE = 5.0f;
+
+  public static final float N_PATHLENGTH = 6.0f;
+
+  public static final float N_SURFACEAREA = 7.0f;
+
+  public static final float N_OBJECTSPACE_PARA = 8.0f;
+
+  public static final float N_OBJECTSPACE_PATH = 9.0f;
+
+  public static final int N_BBOX_SUBDIVIDING = 17;
+
+  public static final float N_NOBBOXSUBDIVISION = 0.0f;
+
+  public static final float N_BBOXTIGHT = 1.0f;
+
+  public static final float N_BBOXROUND = 2.0f;
+
+  /*
+   * NURBS Rendering Properties - one set per renderer each takes an
+   * enumerated value
+   */
+  public static final int N_DISPLAY = 3;
+
+  public static final int N_FILL = 1;
+
+  public static final int N_OUTLINE_POLY = 2;
+
+  public static final int N_OUTLINE_TRI = 3;
+
+  public static final int N_OUTLINE_QUAD = 4;
+
+  public static final int N_OUTLINE_PATCH = 5;
+
+  public static final int N_OUTLINE_PARAM = 6;
+
+  public static final int N_OUTLINE_PARAM_S = 7;
+
+  public static final int N_OUTLINE_PARAM_ST = 8;
+
+  public static final int N_OUTLINE_SUBDIV = 9;
+
+  public static final int N_OUTLINE_SUBDIV_S = 10;
+
+  public static final int N_OUTLINE_SUBDIV_ST = 11;
+
+  public static final int N_ISOLINE_S = 12;
+
+  public static final int N_ERRORCHECKING = 4;
+
+  public static final int N_NOMSG = 0;
+
+  public static final int N_MSG = 1;
+
+  /* GL 4.0 propeties not defined above */
+
+  public static final int N_PIXEL_TOLERANCE = N_SAMPLING_TOLERANCE;
+
+  public static final int N_ERROR_TOLERANCE = 20;
+
+  public static final int N_SUBDIVISIONS = 5;
+
+  public static final int N_TILES = 8;
+
+  public static final int N_TMP1 = 9;
+
+  public static final int N_TMP2 = N_SAMPLINGMETHOD;
+
+  public static final int N_TMP3 = 11;
+
+  public static final int N_TMP4 = 12;
+
+  public static final int N_TMP5 = N_CLAMPFACTOR;
+
+  public static final int N_TMP6 = N_MINSAVINGS;
+
+  public static final int N_S_STEPS = N_S_RATE;
+
+  public static final int N_T_STEPS = N_T_RATE;
+
+  /*
+   * NURBS Rendering Properties - one set per map, each takes an INREAL matrix
+   * argument
+   */
+  public static final int N_CULLINGMATRIX = 1;
+
+  public static final int N_SAMPLINGMATRIX = 2;
+
+  public static final int N_BBOXMATRIX = 3;
+
+  /*
+   * NURBS Rendering Properties - one set per map, each takes an INREAL vector
+   * argument
+   */
+  public static final int N_BBOXSIZE = 4;
+
+  /* type argument for trimming curves */
+
+  public static final int N_P2D = 0x8;
+
+  public static final int N_P2DR = 0xd;
+
+  public static final int N_MESHLINE = 1;
+
+  public static final int N_MESHFILL = 0;
+
+  public static final int N_MESHPOINT = 2;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_curve.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_curve.java
new file mode 100755
index 000000000..900f8e56f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_curve.java
@@ -0,0 +1,63 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Struct holding curve links
+ * @author Tomáš Hráský
+ *
+ */
+public class O_curve {
+
+  /**
+   * Curve type
+   */
+  public int curvetype;
+
+  /**
+   * Next curve in linked list
+   */
+  public O_curve next;
+
+  /**
+   * Curve of picewiselinear type
+   */
+  public O_pwlcurve o_pwlcurve;
+
+  /**
+   * NURBS curve
+   */
+  public O_nurbscurve o_nurbscurve;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbscurve.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbscurve.java
new file mode 100755
index 000000000..81110813f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbscurve.java
@@ -0,0 +1,80 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * NURBS curve object
+ * @author Tomáš Hráský
+ *
+ */
+public class O_nurbscurve {
+
+  /**
+   * List of bezier curves
+   */
+  public Quilt bezier_curves;
+
+  /**
+   * Curve type
+   */
+  public int type;
+
+  /**
+   * Was curve used ?
+   */
+  public boolean used;
+
+  /**
+   * Parent curve
+   */
+  public O_curve owner;
+
+  /**
+   * Next curve in list
+   */
+  public O_nurbscurve next;
+
+  /**
+   * Makes new O_nurbscurve
+   * @param realType type of curve 
+   */
+  public O_nurbscurve(int realType) {
+    // DONE
+    this.type = realType;
+    this.owner = null;
+    this.next = null;
+    this.used = false;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbssurface.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbssurface.java
new file mode 100755
index 000000000..b598f525d
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbssurface.java
@@ -0,0 +1,79 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * NURBS surface object
+ * @author Tomáš Hráský
+ *
+ */
+public class O_nurbssurface {
+
+  /**
+   * List of bezier patches forming NURBS surface
+   */
+  public Quilt bezier_patches;
+
+  /**
+   * Was surface used
+   */
+  public boolean used;
+
+  /**
+   * Parent O_surface
+   */
+  public O_surface owner;
+
+  /**
+   * Next surface in list
+   */
+  public O_nurbssurface next;
+
+  /**
+   * Surface type
+   */
+  private int type;
+
+  /**
+   * Makes new O_nurbssurface of type
+   * @param type surface type
+   */
+  public O_nurbssurface(int type) {
+    this.type = type;
+    this.owner = null;
+    this.next = null;
+    this.used = false;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_pwlcurve.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_pwlcurve.java
new file mode 100755
index 000000000..e50f41d81
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_pwlcurve.java
@@ -0,0 +1,44 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Empty class
+ * @author Tomáš Hráský
+ *
+ */
+public class O_pwlcurve {
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_surface.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_surface.java
new file mode 100755
index 000000000..76ac79f0a
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_surface.java
@@ -0,0 +1,52 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Surface object
+ * @author Tomáš Hráský
+ *
+ */
+public class O_surface {
+  /**
+   * NURBS surface
+   */
+  public O_nurbssurface o_nurbssurface;
+
+  /**
+   * Trims
+   */
+  public O_trim o_trim;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_trim.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_trim.java
new file mode 100755
index 000000000..17e5002df
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_trim.java
@@ -0,0 +1,44 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Empty class
+ * @author Tomáš Hráský
+ *
+ */
+public class O_trim {
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patch.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patch.java
new file mode 100755
index 000000000..d3066cc84
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patch.java
@@ -0,0 +1,54 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Empty class
+ * @author Tomas Hrasky
+ *
+ */
+public class Patch {
+
+  /**
+   * Empty constructor
+   * @param q
+   * @param pta
+   * @param ptb
+   * @param patch
+   */
+  public Patch(Quilt q, float[] pta, float[] ptb, Patch patch) {
+    //			System.out.println("TODO patch.constructor");
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patchlist.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patchlist.java
new file mode 100755
index 000000000..8b439a02f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patchlist.java
@@ -0,0 +1,145 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * List of patches
+ * @author Tomáš Hráský
+ *
+ */
+public class Patchlist {
+
+  /**
+   * Array of ranges
+   */
+  public Pspec[] pspec;
+
+  /**
+   * head of list of patches
+   */
+  private Patch patch;
+
+  /**
+   * Makes new list of patches 
+   * @param quilts list of quilts
+   * @param pta low border
+   * @param ptb high border
+   */
+  public Patchlist(Quilt quilts, float[] pta, float[] ptb) {
+    // DONE
+    patch = null;
+
+    for (Quilt q = quilts; q != null; q = q.next)
+      patch = new Patch(q, pta, ptb, patch);
+    pspec[0] = new Pspec();
+    pspec[0].range[0] = pta[0];
+    pspec[0].range[1] = ptb[0];
+    pspec[0].range[2] = ptb[0] - pta[0];
+    pspec[1] = new Pspec();
+    pspec[1].range[0] = pta[1];
+    pspec[1].range[1] = ptb[1];
+    pspec[1].range[2] = ptb[1] - pta[1];
+
+  }
+
+  /**
+   * Empty constructor
+   * @param patchlist
+   * @param param
+   * @param mid
+   */
+  public Patchlist(Patchlist patchlist, int param, float mid) {
+    // TODO Auto-generated constructor stub
+    //			System.out.println("TODO patchlist.konstruktor 2");
+  }
+
+  /**
+   * Empty method
+   * @return 0
+   */
+  public int cullCheck() {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO patchlist.cullcheck");
+    return 0;
+  }
+
+  /**
+   * Empty method
+   */
+  public void getstepsize() {
+    //			System.out.println("TODO patchlist.getsptepsize");
+    // TODO Auto-generated method stub
+
+  }
+
+  /**
+   * Empty method
+   * @return false
+   */
+  public boolean needsSamplingSubdivision() {
+    // TODO Auto-generated method stub
+    //			System.out.println("patchlist.needsSamplingSubdivision");
+    return false;
+  }
+
+  /**
+   * Empty method
+   * @param i
+   * @return false
+   */
+  public boolean needsSubdivision(int i) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO patchlist.needsSubdivision");
+    return false;
+  }
+
+  /**
+   * Empty method
+   * @return false
+   */
+  public boolean needsNonSamplingSubdivision() {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO patchlist.needsNonSamplingSubdivision");
+    return false;
+  }
+
+  /**
+   * Empty method
+   */
+  public void bbox() {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO patchlist.bbox");
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Property.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Property.java
new file mode 100755
index 000000000..b486a0ead
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Property.java
@@ -0,0 +1,75 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class representing property
+ * 
+ * @author Tomas Hrasky
+ * 
+ */
+public class Property {
+
+  /**
+   * Property type
+   */
+  public int type;
+
+  /**
+   * Property id
+   */
+  public int tag;
+
+  /**
+   * Property value
+   */
+  public float value;
+
+  /**
+   * Makes new property with given parameters
+   * 
+   * @param type
+   *            property type
+   * @param tag
+   *            property id
+   * @param value
+   *            property value
+   */
+  public Property(int type, int tag, float value) {
+    this.type = type;
+    this.tag = tag;
+    this.value = value;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Pspec.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Pspec.java
new file mode 100755
index 000000000..1e60ed335
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Pspec.java
@@ -0,0 +1,47 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class holding range
+ * @author Tomáš Hráský
+ *
+ */
+public class Pspec {
+  /**
+   * Range
+   */
+  public float[] range;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/PwlArc.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/PwlArc.java
new file mode 100755
index 000000000..0c9eca91e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/PwlArc.java
@@ -0,0 +1,71 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Picewiselinar trimming arc
+ * @author Tomáš Hráský
+ *
+ */
+public class PwlArc {
+
+  /**
+   * Number of points
+   */
+  private int npts;
+
+  /**
+   * Vertexes
+   */
+  public TrimVertex[] pts;
+
+  /**
+   * Arc type
+   */
+  private int type;
+
+  /**
+   * Makes new trimming arc
+   * @param i num ber of vertexes
+   * @param p trimming vertexes array
+   */
+  public PwlArc(int i, TrimVertex[] p) {
+    // DONE
+    this.npts = i;
+    this.pts = p;
+    type = NurbsConsts.N_P2D;
+
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quilt.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quilt.java
new file mode 100755
index 000000000..03e809d23
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quilt.java
@@ -0,0 +1,282 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class for converting NURBS curves and surfaces to list of bezier arcs or patches repectively
+ * @author Tomáš Hráský
+ *
+ */
+public class Quilt {
+  /**
+   * Maximum quilt dimension
+   */
+  private static final int MAXDIM = 2;
+
+  /**
+   * List of map descriptions
+   */
+  Mapdesc mapdesc;
+
+  /**
+   *  Array of quiltspecs pointer
+   */
+  public CArrayOfQuiltspecs qspec;
+
+  /**
+   * End array of quilt specs pointer
+   */
+  public CArrayOfQuiltspecs eqspec;
+
+  /**
+   * Control points
+   */
+  public CArrayOfFloats cpts;
+
+  /**
+   * Next quilt in list
+   */
+  public Quilt next;
+
+  /**
+   * Makes new quilt with mapdesc
+   * @param mapdesc map description
+   */
+  public Quilt(Mapdesc mapdesc) {
+    // DONE
+    this.mapdesc = mapdesc;
+    Quiltspec[] tmpquilts = new Quiltspec[MAXDIM];
+    for (int i = 0; i < tmpquilts.length; i++)
+      tmpquilts[i] = new Quiltspec();
+    this.qspec = new CArrayOfQuiltspecs(tmpquilts);
+
+  }
+
+  /**
+   * Converts NURBS surface to bezier patches
+   * @param sknotvector knots in u direction
+   * @param tknotvector knots in v direction
+   * @param ctrlarr control points
+   * @param coords control points coords
+   */
+  public void toBezier(Knotvector sknotvector, Knotvector tknotvector,
+                       CArrayOfFloats ctrlarr, int coords) {
+    Splinespec spline = new Splinespec(2);
+    spline.kspecinit(sknotvector, tknotvector);
+    spline.select();
+    spline.layout(coords);
+    spline.setupquilt(this);
+    spline.copy(ctrlarr);
+    spline.transform();
+  }
+
+  /**
+   * Converts NURBS curve to list of bezier curves
+   * @param knots knot vector
+   * @param ctlarray control points
+   * @param ncoords number of coordinates
+   */
+  public void toBezier(Knotvector knots, CArrayOfFloats ctlarray, int ncoords) {
+    // DONE
+    Splinespec spline = new Splinespec(1);
+    spline.kspecinit(knots);
+    spline.select();
+    spline.layout(ncoords);
+    spline.setupquilt(this);
+    spline.copy(ctlarray);
+    spline.transform();
+  }
+
+  /**
+   * Walks thru all arcs/patches
+   * @param pta low border
+   * @param ptb high border
+   * @param backend Backend
+   */
+  public void downloadAll(float[] pta, float[] ptb, Backend backend) {
+    // DONE
+    for (Quilt m = this; m != null; m = m.next) {
+      m.select(pta, ptb);
+      m.download(backend);
+    }
+
+  }
+
+  /**
+   * Renders arcs/patches
+   * @param backend Backend for rendering
+   */
+  private void download(Backend backend) {
+    // DONE
+    if (getDimension() == 2) {
+
+      CArrayOfFloats ps = new CArrayOfFloats(cpts);
+      ps.raisePointerBy(qspec.get(0).offset);
+      ps.raisePointerBy(qspec.get(1).offset);
+      ps.raisePointerBy(qspec.get(0).index * qspec.get(0).order
+                        * qspec.get(0).stride);
+      ps.raisePointerBy(qspec.get(1).index * qspec.get(1).order
+                        * qspec.get(1).stride);
+
+      backend.surfpts(mapdesc.getType(), ps, qspec.get(0).stride, qspec
+                      .get(1).stride, qspec.get(0).order, qspec.get(1).order,
+                      qspec.get(0).breakpoints[qspec.get(0).index],
+                      qspec.get(0).breakpoints[qspec.get(0).index + 1], qspec
+                      .get(1).breakpoints[qspec.get(1).index], qspec
+                      .get(1).breakpoints[qspec.get(1).index + 1]);
+
+    } else {// code for curves
+      // CArrayOfFloats ps=new CArrayOfFloats(cpts);
+      CArrayOfFloats ps = new CArrayOfFloats(cpts.getArray(), 0);
+      ps.raisePointerBy(qspec.get(0).offset);
+      ps.raisePointerBy(qspec.get(0).index * qspec.get(0).order
+                        * qspec.get(0).stride);
+      backend.curvpts(mapdesc.getType(), ps, qspec.get(0).stride, qspec
+                      .get(0).order,
+                      qspec.get(0).breakpoints[qspec.get(0).index],
+                      qspec.get(0).breakpoints[qspec.get(0).index + 1]);
+    }
+
+  }
+
+  /**
+   * Returns quilt dimension
+   * @return quilt dimesion
+   */
+  private int getDimension() {
+    // DONE
+    return eqspec.getPointer() - qspec.getPointer();
+  }
+
+  /**
+   * Finds Quiltspec.index
+   * @param pta range
+   * @param ptb range
+   */
+  private void select(float[] pta, float[] ptb) {
+    // DONE
+    int dim = eqspec.getPointer() - qspec.getPointer();
+    int i, j;
+    for (i = 0; i < dim; i++) {
+      for (j = qspec.get(i).width - 1; j >= 0; j--)
+        if (qspec.get(i).breakpoints[j] <= pta[i]
+            && ptb[i] <= qspec.get(i).breakpoints[j + 1])
+          break;
+      assert (j != -1);
+      qspec.get(i).index = j;
+    }
+  }
+
+  /**
+   * Find range according to breakpoints
+   * @param from low param
+   * @param to high param
+   * @param bpts breakpoints
+   */
+  public void getRange(float[] from, float[] to, Flist bpts) {
+    // DONE
+    getRange(from, to, 0, bpts);
+
+  }
+
+  /**
+   * Find range according to breakpoints
+   * @param from low param
+   * @param to high param
+   * @param i from/to array index
+   * @param list breakpoints
+   */
+  private void getRange(float[] from, float[] to, int i, Flist list) {
+    // DONE
+    Quilt maps = this;
+    from[i] = maps.qspec.get(i).breakpoints[0];
+    to[i] = maps.qspec.get(i).breakpoints[maps.qspec.get(i).width];
+    int maxpts = 0;
+    Quilt m;
+    for (m = maps; m != null; m = m.next) {
+      if (m.qspec.get(i).breakpoints[0] > from[i])
+        from[i] = m.qspec.get(i).breakpoints[0];
+      if (m.qspec.get(i).breakpoints[m.qspec.get(i).width] < to[i])
+        to[i] = m.qspec.get(i).breakpoints[m.qspec.get(i).width];
+      maxpts += m.qspec.get(i).width + 1;
+    }
+    list.grow(maxpts);
+    for (m = maps; m != null; m = m.next) {
+      for (int j = 0; j <= m.qspec.get(i).width; j++) {
+        list.add(m.qspec.get(i).breakpoints[j]);
+      }
+    }
+    list.filter();
+    list.taper(from[i], to[i]);
+  }
+
+  /**
+   * Is this quilt culled
+   * @return 0 or Subdivider.CULL_ACCEPT
+   */
+  public int isCulled() {
+    if (mapdesc.isCulling()) {
+      //				System.out.println("TODO quilt.isculled mapdesc.isculling");
+      return 0;
+    } else {
+      return Subdivider.CULL_ACCEPT;
+    }
+  }
+
+  /**
+   * Finds range for surface
+   * @param from low param
+   * @param to high param
+   * @param slist u direction breakpoints
+   * @param tlist v direction breakpoints
+   */
+  public void getRange(float[] from, float[] to, Flist slist, Flist tlist) {
+    // DONE
+    getRange(from, to, 0, slist);
+    getRange(from, to, 1, tlist);
+
+  }
+
+  /**
+   * Empty method
+   * @param sbrkpts
+   * @param tbrkpts
+   * @param rate
+   */
+  public void findRates(Flist sbrkpts, Flist tbrkpts, float[] rate) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO quilt.findrates");
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quiltspec.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quiltspec.java
new file mode 100755
index 000000000..6c8e55e06
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quiltspec.java
@@ -0,0 +1,85 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Quilt definition
+ * @author Tomas Hrasky
+ *
+ */
+public class Quiltspec {
+
+  /**
+   * Stride between control points
+   */
+  public int stride;
+
+  /**
+   * Quilt width in breakpoints
+   */
+  public int width;
+
+  /**
+   * Quilt order
+   */
+  public int order;
+
+  /**
+   * Start offset
+   */
+  public int offset;
+
+  /**
+   * Breakpoint index
+   */
+  public int index;
+
+  /**
+   * Boundary
+   */
+  public int[] bdry;
+
+  /**
+   * Breakpoints
+   */
+  public float[] breakpoints;
+
+  /**
+   * Makes new quiltspec
+   */
+  public Quiltspec() {
+    this.bdry = new int[2];
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/README.txt b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/README.txt
new file mode 100755
index 000000000..89630c71e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/README.txt
@@ -0,0 +1,59 @@
+Unimplemented functionality
+	- tesselation and callbacks
+	- trimming
+	- setting NURBS properties (-> sampling etc.)
+Differences from C++ source
+	- no pooling
+	- pointers to arrays are replaced by CArrayOf... classes and their methods
+Unimplemented or incomplete "calltree top" methods (according to glu.def in Mesa 6.5)
+	gluBeginTrim
+	gluDeleteNurbsRenderer - won't be needed
+	gluEndTrim
+	gluGetNurbsProperty
+	gluLoadSamplingMatrices
+	gluNurbsCallback
+	gluNurbsCallbackData
+	gluNurbsCallbackDataEXT
+	gluNurbsCurve - TODO type switch
+	gluNurbsProperty
+	gluPwlCurve
+	gluQuadricCallback - not a NURBS method
+As of files
+	- Arc[ST]dirSorter.java - unimplemented (part of tesselation)
+	- Backend.java:194 - wireframe quads - part of tesselation/callback
+	- Curve.java:141-204 - culling
+	- DisplayList.java:57 - append to DL - not sure whether it will be needed
+	- GLUnurbs.java	:443,484 - error values
+			:445 - trimming
+			:512 - error handling (callback)
+			:530 - loadGLmatrices
+			:786 - nuid - nurbs object id - won't be needed I think
+			:803 - end trim
+	- GLUwNURBS.java:68,176 - NUBRS properties
+	- Knotspec.java	:371 - copying in general case (more than 4 coords)
+			:517 - copying with more than 4 coords
+			:556 - pt_oo_sum default
+	- Knotvector.java:165 - show method (probably debugging)
+	- Mapdesc.java	:354 - get property
+			:435 - xFormMat - change param cp to CArrayOfFloats; probably sampling functionality
+	- Maplist.java:68 - clear ?
+	- OpenGLCurveEvaluator.java	:132 - tess./callback code
+					:168 - mapgrid1f
+					:190 - tess./callback code (output triangles)
+	- OpenGLSurfaceEvaluator.java	:77 . tess./callback code
+					:81 - glGetIntegerValue
+					:114 - tess./callback code
+					:117 - Level of detail
+					:144,161,201 - tess./callback code - output triangles
+	- Patch.java:55 - constructor stuff ?
+	- Patchlist.java:55 - constructor stuff ?
+			:97 - cull check
+			:105 - step size
+			:115 - need of sampling subdivision
+			:126 - need of subdivision
+			:137 - need of non sampling subd.
+			:146 - bbox (??)
+	-Quilt.java	:254 - culling
+			:282 - rates
+	-Subdivider.java - all TODOs - it's stuff about trimming probably
+			 :545 - jumpbuffer - not sure purpose it exactly served in original source
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Renderhints.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Renderhints.java
new file mode 100755
index 000000000..d1a23fbab
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Renderhints.java
@@ -0,0 +1,128 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class holding rendering params 
+ * @author Tomas Hrasky
+ *
+ */
+public class Renderhints {
+
+  /**
+   * Check for errors
+   */
+  public int errorchecking;
+
+  /**
+   * Maximum subdivisions
+   */
+  public int maxsubdivisions;
+
+  /**
+   * Number of subdivisions
+   */
+  private int subdivisions;
+
+  /**
+   * Display method
+   */
+  int display_method;
+
+  /**
+   * Output triangles
+   */
+  int wiretris;
+
+  /**
+   * Output quads
+   */
+  int wirequads;
+
+  /**
+   * Makes new Renderinghints
+   */
+  public Renderhints() {
+    display_method = NurbsConsts.N_FILL;
+    errorchecking = NurbsConsts.N_MSG;
+    subdivisions = 6;
+    // tmp1=0;
+  }
+
+  /**
+   * Set property value
+   * @param prop property
+   */
+  public void setProperty(Property prop) {
+    switch (prop.type) {
+    case NurbsConsts.N_DISPLAY:
+      display_method = (int) prop.value;
+      break;
+    case NurbsConsts.N_ERRORCHECKING:
+      errorchecking = (int) prop.value;
+      break;
+    case NurbsConsts.N_SUBDIVISIONS:
+      subdivisions = (int) prop.value;
+      break;
+    default:
+      // abort - end program
+      break;
+    }
+  }
+
+  /**
+   * Initialization
+   */
+  public void init() {
+    // DONE
+    maxsubdivisions = subdivisions;
+    if (maxsubdivisions < 0)
+      maxsubdivisions = 0;
+
+    if (display_method == NurbsConsts.N_FILL) {
+      wiretris = 0;
+      wirequads = 0;
+    } else if (display_method == NurbsConsts.N_OUTLINE_TRI) {
+      wiretris = 1;
+      wirequads = 0;
+    } else if (display_method == NurbsConsts.N_OUTLINE_QUAD) {
+      wiretris = 0;
+      wirequads = 1;
+    } else {
+      wiretris = 1;
+      wirequads = 1;
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Splinespec.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Splinespec.java
new file mode 100755
index 000000000..487b47f2d
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Splinespec.java
@@ -0,0 +1,204 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * NURBS definition
+ * @author Tomas Hrasky
+ *
+ */
+public class Splinespec {
+
+  /**
+   * Dimension
+   */
+  private int dim;
+
+  /**
+   * Knot vector specs
+   */
+  private Knotspec kspec;
+
+  /**
+   * Control points after conversion
+   */
+  private CArrayOfFloats outcpts;
+
+  /**
+   * Makes new Splinespec with given dimension
+   * @param i dimension
+   */
+  public Splinespec(int i) {
+    // DONE
+    this.dim = i;
+  }
+
+  /**
+   * Initializes knotspec according to knotvector
+   * @param knotvector basic knotvector
+   */
+  public void kspecinit(Knotvector knotvector) {
+    // DONE
+    this.kspec = new Knotspec();
+    kspec.inkbegin = new CArrayOfFloats(knotvector.knotlist, 0);
+    kspec.inkend = new CArrayOfFloats(knotvector.knotlist,
+                                      knotvector.knotcount);
+    kspec.prestride = knotvector.stride;
+    kspec.order = knotvector.order;
+    kspec.next = null;
+  }
+
+  /**
+   * Initializes knotspec according to knotvector - SURFACE
+   * @param sknotvector knotvector in u dir
+   * @param tknotvector knotvector in v dir
+   */
+  public void kspecinit(Knotvector sknotvector, Knotvector tknotvector) {
+    // DONE
+    this.kspec = new Knotspec();
+    Knotspec tkspec = new Knotspec();
+
+    kspec.inkbegin = new CArrayOfFloats(sknotvector.knotlist, 0);
+    kspec.inkend = new CArrayOfFloats(sknotvector.knotlist,
+                                      sknotvector.knotcount);
+    kspec.prestride = sknotvector.stride;
+    kspec.order = sknotvector.order;
+    kspec.next = tkspec;
+
+    tkspec.inkbegin = new CArrayOfFloats(tknotvector.knotlist, 0);
+    tkspec.inkend = new CArrayOfFloats(tknotvector.knotlist,
+                                       tknotvector.knotcount);
+    tkspec.prestride = tknotvector.stride;
+    tkspec.order = tknotvector.order;
+    tkspec.next = null;
+  }
+
+  /**
+   * Preselect and select knotspecs
+   */
+  public void select() {
+    // DONE
+    for (Knotspec knotspec = kspec; knotspec != null; knotspec = knotspec.next) {
+      knotspec.preselect();
+      knotspec.select();
+    }
+
+  }
+
+  /**
+   * Prepares for conversion
+   * @param ncoords number of coords
+   */
+  public void layout(int ncoords) {
+    // DONE
+    int stride = ncoords;
+    for (Knotspec knotspec = kspec; knotspec != null; knotspec = knotspec.next) {
+      knotspec.poststride = stride;
+      stride *= (knotspec.bend.getPointer() - knotspec.bbegin
+                 .getPointer())
+        * knotspec.order + knotspec.postoffset;
+      knotspec.preoffset *= knotspec.prestride;
+      knotspec.prewidth *= knotspec.poststride;
+      knotspec.postwidth *= knotspec.poststride;
+      knotspec.postoffset *= knotspec.poststride;
+      knotspec.ncoords = ncoords;
+    }
+    outcpts = new CArrayOfFloats(new float[stride]);
+
+  }
+
+  /**
+   * Prepares quilt for conversion
+   * @param quilt quilt to work with
+   */
+  public void setupquilt(Quilt quilt) {
+    // DONE
+    CArrayOfQuiltspecs qspec = new CArrayOfQuiltspecs(quilt.qspec);
+    quilt.eqspec = new CArrayOfQuiltspecs(qspec.getArray(), dim);
+    for (Knotspec knotspec = kspec; knotspec != null;) {
+      qspec.get().stride = knotspec.poststride;
+      qspec.get().width = knotspec.bend.getPointer()
+        - knotspec.bbegin.getPointer();
+      qspec.get().order = knotspec.order;
+      qspec.get().offset = knotspec.postoffset;
+      qspec.get().index = 0;
+      qspec.get().bdry[0] = (knotspec.kleft.getPointer() == knotspec.kfirst
+                             .getPointer()) ? 1 : 0;
+      qspec.get().bdry[1] = (knotspec.kright.getPointer() == knotspec.klast
+                             .getPointer()) ? 1 : 0;
+      qspec.get().breakpoints = new float[qspec.get().width + 1];
+      CArrayOfFloats k = new CArrayOfFloats(qspec.get().breakpoints, 0);
+      for (CArrayOfBreakpts bk = new CArrayOfBreakpts(knotspec.bbegin); bk
+             .getPointer() <= knotspec.bend.getPointer(); bk.pp()) {
+        k.set(bk.get().value);
+        k.pp();
+      }
+      knotspec = knotspec.next;
+      if (knotspec != null)
+        qspec.pp();
+    }
+    quilt.cpts = new CArrayOfFloats(outcpts);
+    quilt.next = null;
+  }
+
+  /**
+   * Copies array of control points to output array
+   * @param ctlarray control points array
+   */
+  public void copy(CArrayOfFloats ctlarray) {
+    // DONE
+    kspec.copy(ctlarray, outcpts);
+
+  }
+
+  /**
+   * Transforms knotspecs - conversion
+   */
+  public void transform() {
+    // DONE
+    Knotspec knotspec;
+    outcpts.setPointer(0);
+    for (knotspec = kspec; knotspec != null; knotspec = knotspec.next)
+      knotspec.istransformed = false;
+
+    for (knotspec = kspec; knotspec != null; knotspec = knotspec.next) {
+      for (Knotspec kspec2 = kspec; kspec2 != null; kspec2 = kspec2.next)
+        kspec2.kspectotrans = knotspec;
+      kspec.transform(outcpts);
+      knotspec.istransformed = true;
+    }
+
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Subdivider.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Subdivider.java
new file mode 100755
index 000000000..99c1b740b
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Subdivider.java
@@ -0,0 +1,1167 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class working with curves and surfaces
+ * @author Tomas Hrasky
+ *
+ */
+public class Subdivider {
+  /**
+   * Cull type 
+   */
+  public static final int CULL_TRIVIAL_REJECT = 0;
+
+  /**
+   * Cull type
+   */
+  public static final int CULL_ACCEPT = 1;
+
+  /**
+   * Maximum trimming arcs
+   */
+  private static final int MAXARCS = 10;
+
+  /**
+   * Linked list of Quilts
+   */
+  Quilt qlist;
+
+  /**
+   * Object holding rendering honts information
+   */
+  private Renderhints renderhints;
+
+  /**
+   * Backend object
+   */
+  private Backend backend;
+
+  /**
+   * Number of subdivisions
+   */
+  private int subdivisions;
+
+  /**
+   * U step when using domain distance sampling 
+   */
+  private float domain_distance_u_rate;
+
+  /**
+   * Use domain distance sampling
+   */
+  private int is_domain_distance_sampling;
+
+  /**
+   * Initial class holding trimming arcs
+   */
+  private Bin initialbin;
+
+  /**
+   * Not used
+   */
+  private boolean showDegenerate;
+
+  /**
+   * Is triming arc type bezier arc
+   */
+  private boolean isArcTypeBezier;
+
+  /**
+   * Breakpoints in v direction
+   */
+  private Flist tpbrkpts;
+
+  /**
+   * Breakpoints in u direction
+   */
+  private Flist spbrkpts;
+
+  /**
+   * Unused
+   */
+  private int s_index;
+
+  /**
+   * Head of linked list of trimming arcs
+   */
+  private Arc pjarc;
+
+  /**
+   * Class tesselating trimming arcs
+   */
+  private ArcTesselator arctesselator;
+
+  /**
+   * Unused
+   */
+  private int t_index;
+
+  /**
+   * Breakpoints
+   */
+  private Flist smbrkpts;
+
+  /**
+   * Not used
+   */
+  private float[] stepsizes;
+
+  /**
+   * Domain distance in V direction
+   */
+  private float domain_distance_v_rate;
+
+  /**
+   * Initializes quilt list
+   */
+  public void beginQuilts(Backend backend) {
+    // DONE
+    qlist = null;
+    renderhints = new Renderhints();
+    this.backend = backend;
+
+    initialbin = new Bin();
+    arctesselator = new ArcTesselator();
+  }
+
+  /**
+   * Adds quilt to linked list
+   * @param quilt added quilt
+   */
+  public void addQuilt(Quilt quilt) {
+    // DONE
+    if (qlist == null)
+      qlist = quilt;
+    else {
+      quilt.next = qlist;
+      qlist = quilt;
+    }
+
+  }
+
+  /**
+   * Empty method
+   */
+  public void endQuilts() {
+    // DONE
+  }
+
+  /**
+   * Draws a surface
+   */
+  public void drawSurfaces() {
+    renderhints.init();
+
+    if (qlist == null) {
+      //				System.out.println("qlist is null");
+      return;
+    }
+
+    for (Quilt q = qlist; q != null; q = q.next) {
+      if (q.isCulled() == CULL_TRIVIAL_REJECT) {
+        freejarcs(initialbin);
+        return;
+      }
+    }
+
+    float[] from = new float[2];
+    float[] to = new float[2];
+
+    spbrkpts = new Flist();
+    tpbrkpts = new Flist();
+    qlist.getRange(from, to, spbrkpts, tpbrkpts);
+
+    boolean optimize = (is_domain_distance_sampling > 0 && (renderhints.display_method != NurbsConsts.N_OUTLINE_PATCH));
+
+    // TODO decide whether to optimize (when there is gluNurbsProperty implemented)
+    optimize = true;
+
+    if (!initialbin.isnonempty()) {
+      if (!optimize) {
+        makeBorderTrim(from, to);
+      }
+    } else {
+      float[] rate = new float[2];
+      qlist.findRates(spbrkpts, tpbrkpts, rate);
+      //				System.out.println("subdivider.drawsurfaces decompose");
+    }
+
+    backend.bgnsurf(renderhints.wiretris, renderhints.wirequads);
+
+    // TODO partition test
+
+    if (!initialbin.isnonempty() && optimize) {
+
+      int i, j;
+      int num_u_steps;
+      int num_v_steps;
+      for (i = spbrkpts.start; i < spbrkpts.end - 1; i++) {
+        for (j = tpbrkpts.start; j < tpbrkpts.end - 1; j++) {
+          float[] pta = new float[2];
+          float[] ptb = new float[2];
+
+          pta[0] = spbrkpts.pts[i];
+          ptb[0] = spbrkpts.pts[i + 1];
+          pta[1] = tpbrkpts.pts[j];
+          ptb[1] = tpbrkpts.pts[j + 1];
+          qlist.downloadAll(pta, ptb, backend);
+
+          num_u_steps = (int) (domain_distance_u_rate * (ptb[0] - pta[0]));
+          num_v_steps = (int) (domain_distance_v_rate * (ptb[1] - pta[1]));
+
+          if (num_u_steps <= 0)
+            num_u_steps = 1;
+          if (num_v_steps <= 0)
+            num_v_steps = 1;
+
+          backend.surfgrid(pta[0], ptb[0], num_u_steps, ptb[1],
+                           pta[1], num_v_steps);
+          backend.surfmesh(0, 0, num_u_steps, num_v_steps);
+
+        }
+      }
+
+    } else
+
+      subdivideInS(initialbin);
+
+    backend.endsurf();
+  }
+
+  /**
+   * Empty method
+   * @param initialbin2
+   */
+  private void freejarcs(Bin initialbin2) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.freejarcs");
+  }
+
+  /**
+   * Subdivide in U direction
+   * @param source Trimming arcs source
+   */
+  private void subdivideInS(Bin source) {
+    // DONE
+    if (renderhints.display_method == NurbsConsts.N_OUTLINE_PARAM) {
+      outline(source);
+      freejarcs(source);
+    } else {
+      setArcTypeBezier();
+      setNonDegenerate();
+      splitInS(source, spbrkpts.start, spbrkpts.end);
+    }
+
+  }
+
+  /**
+   * Split in U direction
+   * @param source Trimming arcs source
+   * @param start breakpoints start
+   * @param end breakpoints end
+   */
+  private void splitInS(Bin source, int start, int end) {
+    // DONE
+    if (source.isnonempty()) {
+      if (start != end) {
+        int i = start + (end - start) / 2;
+        Bin left = new Bin();
+        Bin right = new Bin();
+
+        split(source, left, right, 0, spbrkpts.pts[i]);
+        splitInS(left, start, i);
+        splitInS(right, i + 1, end);
+      } else {
+        if (start == spbrkpts.start || start == spbrkpts.end) {
+          freejarcs(source);
+        } else if (renderhints.display_method == NurbsConsts.N_OUTLINE_PARAM_S) {
+          outline(source);
+          freejarcs(source);
+        } else {
+          setArcTypeBezier();
+          setNonDegenerate();
+          s_index = start;
+          splitInT(source, tpbrkpts.start, tpbrkpts.end);
+        }
+      }
+    } else{
+      //				System.out.println("Source is empty - subdivider.splitins");
+    }
+  }
+
+  /**
+   * Split in V direction
+   * @param source
+   * @param start
+   * @param end
+   */
+  private void splitInT(Bin source, int start, int end) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.splitint");
+
+    if (source.isnonempty()) {
+      if (start != end) {
+        int i = start + (end - start) / 2;
+        Bin left = new Bin();
+        Bin right = new Bin();
+        split(source, left, right, 1, tpbrkpts.pts[i + 1]);
+        splitInT(left, start, i);
+        splitInT(right, i + 1, end);
+      } else {
+        if (start == tpbrkpts.start || start == tpbrkpts.end) {
+          freejarcs(source);
+        } else if (renderhints.display_method == NurbsConsts.N_OUTLINE_PARAM_ST) {
+          outline(source);
+          freejarcs(source);
+        } else {
+          t_index = start;
+          setArcTypeBezier();
+          setDegenerate();
+
+          float[] pta = new float[2];
+          float[] ptb = new float[2];
+
+          pta[0] = spbrkpts.pts[s_index - 1];
+          pta[1] = tpbrkpts.pts[t_index - 1];
+
+          ptb[0] = spbrkpts.pts[s_index];
+          ptb[1] = tpbrkpts.pts[t_index];
+          qlist.downloadAll(pta, ptb, backend);
+
+          Patchlist patchlist = new Patchlist(qlist, pta, ptb);
+
+          samplingSplit(source, patchlist,
+                        renderhints.maxsubdivisions, 0);
+          setNonDegenerate();
+          setArcTypeBezier();
+        }
+      }
+    }
+
+  }
+
+  /**
+   * Sample 
+   * @param source
+   * @param patchlist
+   * @param subdivisions
+   * @param param
+   */
+  private void samplingSplit(Bin source, Patchlist patchlist,
+                             int subdivisions, int param) {
+    // DONE
+    if (!source.isnonempty())
+      return;
+    if (patchlist.cullCheck() == CULL_TRIVIAL_REJECT) {
+      freejarcs(source);
+      return;
+    }
+
+    patchlist.getstepsize();
+    if (renderhints.display_method == NurbsConsts.N_OUTLINE_PATCH) {
+      tesselation(source, patchlist);
+      outline(source);
+      freejarcs(source);
+      return;
+    }
+
+    tesselation(source, patchlist);
+    if (patchlist.needsSamplingSubdivision() && subdivisions > 0) {
+      if (!patchlist.needsSubdivision(0)) {
+        param = 1;
+      } else if (patchlist.needsSubdivision(1))
+        param = 0;
+      else
+        param = 1 - param;
+
+      Bin left = new Bin();
+      Bin right = new Bin();
+
+      float mid = (float) ((patchlist.pspec[param].range[0] + patchlist.pspec[param].range[1]) * .5);
+
+      split(source, left, right, param, mid);
+      Patchlist subpatchlist = new Patchlist(patchlist, param, mid);
+      samplingSplit(left, subpatchlist, subdivisions - 1, param);
+      samplingSplit(right, subpatchlist, subdivisions - 1, param);
+    } else {
+      setArcTypePwl();
+      setDegenerate();
+      nonSamplingSplit(source, patchlist, subdivisions, param);
+      setDegenerate();
+      setArcTypeBezier();
+    }
+  }
+
+  /**
+   * Not used
+   * @param source
+   * @param patchlist
+   * @param subdivisions
+   * @param param
+   */
+  private void nonSamplingSplit(Bin source, Patchlist patchlist,
+                                int subdivisions, int param) {
+    // DONE
+    if (patchlist.needsNonSamplingSubdivision() && subdivisions > 0) {
+      param = 1 - param;
+
+      Bin left = new Bin();
+      Bin right = new Bin();
+
+      float mid = (float) ((patchlist.pspec[param].range[0] + patchlist.pspec[param].range[1]) * .5);
+      split(source, left, right, param, mid);
+      Patchlist subpatchlist = new Patchlist(patchlist, param, mid);
+      if (left.isnonempty()) {
+        if (subpatchlist.cullCheck() == CULL_TRIVIAL_REJECT)
+          freejarcs(left);
+        else
+          nonSamplingSplit(left, subpatchlist, subdivisions - 1,
+                           param);
+      }
+      if (right.isnonempty()) {
+        if (patchlist.cullCheck() == CULL_TRIVIAL_REJECT)
+          freejarcs(right);
+        else
+          nonSamplingSplit(right, subpatchlist, subdivisions - 1,
+                           param);
+      }
+    } else {
+      patchlist.bbox();
+      backend.patch(patchlist.pspec[0].range[0],
+                    patchlist.pspec[0].range[1], patchlist.pspec[1].range[0],
+                    patchlist.pspec[1].range[1]);
+      if (renderhints.display_method == NurbsConsts.N_OUTLINE_SUBDIV) {
+        outline(source);
+        freejarcs(source);
+      } else {
+        setArcTypePwl();
+        setDegenerate();
+        findIrregularS(source);
+        monosplitInS(source, smbrkpts.start, smbrkpts.end);
+      }
+    }
+
+  }
+
+  /**
+   * Not used
+   * @param source
+   * @param start
+   * @param end
+   */
+  private void monosplitInS(Bin source, int start, int end) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.monosplitins");
+  }
+
+  /**
+   * Not used
+   * @param source
+   */
+  private void findIrregularS(Bin source) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.findIrregularS");
+  }
+
+  /**
+   * Not used
+   */
+  private void setArcTypePwl() {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.setarctypepwl");
+  }
+
+  /**
+   * Not used
+   * @param source
+   * @param patchlist
+   */
+  private void tesselation(Bin source, Patchlist patchlist) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.tesselation");
+  }
+
+  /**
+   * Not used
+   */
+  private void setDegenerate() {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.setdegenerate");
+  }
+
+  /**
+   * Not used
+   * @param bin
+   * @param left
+   * @param right
+   * @param param
+   * @param value
+   */
+  private void split(Bin bin, Bin left, Bin right, int param, float value) {
+    // DONE
+    Bin intersections = new Bin();
+    Bin unknown = new Bin();
+
+    partition(bin, left, intersections, right, unknown, param, value);
+
+    int count = intersections.numarcs();
+    // TODO jumpbuffer ??
+
+    if (count % 2 == 0) {
+
+      Arc[] arclist = new Arc[MAXARCS];
+      CArrayOfArcs list;
+      if (count >= MAXARCS) {
+        list = new CArrayOfArcs(new Arc[count]);
+      } else {
+        list = new CArrayOfArcs(arclist);
+      }
+
+      CArrayOfArcs last, lptr;
+      Arc jarc;
+
+      for (last = new CArrayOfArcs(list); (jarc = intersections
+                                           .removearc()) != null; last.pp())
+        last.set(jarc);
+
+      if (param == 0) {// sort into incrasing t order
+        ArcSdirSorter sorter = new ArcSdirSorter(this);
+        sorter.qsort(list, count);
+
+        for (lptr = new CArrayOfArcs(list); lptr.getPointer() < last
+               .getPointer(); lptr.raisePointerBy(2))
+          check_s(lptr.get(), lptr.getRelative(1));
+        for (lptr = new CArrayOfArcs(list); lptr.getPointer() < last
+               .getPointer(); lptr.raisePointerBy(2))
+          join_s(left, right, lptr.get(), lptr.getRelative(1));
+        for (lptr = new CArrayOfArcs(list); lptr.getPointer() != last
+               .getPointer(); lptr.pp()) {
+          if (lptr.get().head()[0] <= value
+              && lptr.get().tail()[0] <= value)
+            left.addarc(lptr.get());
+          else
+            right.addarc(lptr.get());
+        }
+
+      } else {// sort into decreasing s order
+        ArcTdirSorter sorter = new ArcTdirSorter(this);
+        sorter.qsort(list, count);
+
+        for (lptr = new CArrayOfArcs(list); lptr.getPointer() < last
+               .getPointer(); lptr.raisePointerBy(2))
+          check_t(lptr.get(), lptr.getRelative(1));
+        for (lptr = new CArrayOfArcs(list); lptr.getPointer() < last
+               .getPointer(); lptr.raisePointerBy(2))
+          join_t(left, right, lptr.get(), lptr.getRelative(1));
+        for (lptr = new CArrayOfArcs(list); lptr.getPointer() != last
+               .getPointer(); lptr.raisePointerBy(2)) {
+          if (lptr.get().head()[0] <= value
+              && lptr.get().tail()[0] <= value)
+            left.addarc(lptr.get());
+          else
+            right.addarc(lptr.get());
+        }
+
+      }
+
+      unknown.adopt();
+    }
+  }
+
+  /**
+   * Not used
+   * @param left
+   * @param right
+   * @param arc
+   * @param relative
+   */
+  private void join_t(Bin left, Bin right, Arc arc, Arc relative) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.join_t");
+  }
+
+  /**
+   * Not used
+   * @param arc
+   * @param relative
+   */
+  private void check_t(Arc arc, Arc relative) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.check_t");
+  }
+
+  /**
+   * Not used
+   * @param left
+   * @param right
+   * @param jarc1
+   * @param jarc2
+   */
+  private void join_s(Bin left, Bin right, Arc jarc1, Arc jarc2) {
+    // DONE
+    if (!jarc1.getitail())
+      jarc1 = jarc1.next;
+    if (!jarc2.getitail())
+      jarc2 = jarc2.next;
+
+    float s = jarc1.tail()[0];
+    float t1 = jarc1.tail()[1];
+    float t2 = jarc2.tail()[1];
+
+    if (t1 == t2) {
+      simplelink(jarc1, jarc2);
+    } else {
+      Arc newright = new Arc(Arc.ARC_RIGHT);
+      Arc newleft = new Arc(Arc.ARC_LEFT);
+      if (isBezierArcType()) {
+        arctesselator.bezier(newright, s, s, t1, t2);
+        arctesselator.bezier(newleft, s, s, t2, t1);
+      } else {
+        arctesselator.pwl_right(newright, s, t1, t2, stepsizes[0]);
+        arctesselator.pwl_left(newright, s, t2, t1, stepsizes[2]);
+      }
+      link(jarc1, jarc2, newright, newleft);
+      left.addarc(newright);
+      right.addarc(newleft);
+    }
+
+  }
+
+  /**
+   * Not used
+   * @param jarc1
+   * @param jarc2
+   * @param newright
+   * @param newleft
+   */
+  private void link(Arc jarc1, Arc jarc2, Arc newright, Arc newleft) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.link");
+  }
+
+  /**
+   * Not used
+   * @return true
+   */
+  private boolean isBezierArcType() {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.isbezierarc");
+    return true;
+  }
+
+  /**
+   * Not used
+   * @param jarc1
+   * @param jarc2
+   */
+  private void simplelink(Arc jarc1, Arc jarc2) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.simplelink");
+  }
+
+  /**
+   * Not used
+   * @param arc
+   * @param relative
+   */
+  private void check_s(Arc arc, Arc relative) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.check_s");
+
+  }
+
+  /**
+   * Not used
+   * @param bin
+   * @param left
+   * @param intersections
+   * @param right
+   * @param unknown
+   * @param param
+   * @param value
+   */
+  private void partition(Bin bin, Bin left, Bin intersections, Bin right,
+                         Bin unknown, int param, float value) {
+
+    Bin headonleft = new Bin();
+    Bin headonright = new Bin();
+    Bin tailonleft = new Bin();
+    Bin tailonright = new Bin();
+
+    for (Arc jarc = bin.removearc(); jarc != null; jarc = bin.removearc()) {
+      float tdiff = jarc.tail()[param] - value;
+      float hdiff = jarc.head()[param] - value;
+
+      if (tdiff > 0) {
+        if (hdiff > 0) {
+          right.addarc(jarc);
+        } else if (hdiff == 0) {
+          tailonright.addarc(jarc);
+        } else {
+          Arc jtemp;
+          switch (arc_split(jarc, param, value, 0)) {
+          case 2:
+            tailonright.addarc(jarc);
+            headonleft.addarc(jarc.next);
+            break;
+            // TODO rest cases
+          default:
+            System.out
+              .println("TODO subdivider.partition rest cases");
+            break;
+          }
+        }
+      } else if (tdiff == 0) {
+        if (hdiff > 0) {
+          headonright.addarc(jarc);
+        } else if (hdiff == 0) {
+          unknown.addarc(jarc);
+        } else {
+          headonright.addarc(jarc);
+        }
+      } else {
+        if (hdiff > 0) {
+          // TODO rest
+          //						System.out.println("TODO subdivider.partition rest of else");
+        } else if (hdiff == 0) {
+          tailonleft.addarc(jarc);
+        } else {
+          left.addarc(jarc);
+        }
+      }
+
+    }
+    if (param == 0) {
+      classify_headonleft_s(headonleft, intersections, left, value);
+      classify_tailonleft_s(tailonleft, intersections, left, value);
+      classify_headonright_s(headonright, intersections, right, value);
+      classify_tailonright_s(tailonright, intersections, right, value);
+    } else {
+      classify_headonleft_t(headonleft, intersections, left, value);
+      classify_tailonleft_t(tailonleft, intersections, left, value);
+      classify_headonright_t(headonright, intersections, right, value);
+      classify_tailonright_t(tailonright, intersections, right, value);
+    }
+  }
+
+  /**
+   * Not used
+   * @param tailonright
+   * @param intersections
+   * @param right
+   * @param value
+   */
+  private void classify_tailonright_t(Bin tailonright, Bin intersections,
+                                      Bin right, float value) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.classify_tailonright_t");
+
+  }
+
+  /**
+   * Not used
+   * @param bin
+   * @param in
+   * @param out
+   * @param val
+   */
+  private void classify_tailonleft_s(Bin bin, Bin in, Bin out, float val) {
+
+    // DONE
+    Arc j;
+    while ((j = bin.removearc()) != null) {
+      j.clearitail();
+
+      float diff = j.next.head()[0] - val;
+      if (diff > 0) {
+        in.addarc(j);
+      } else if (diff < 0) {
+        if (ccwTurn_sl(j, j.next))
+          out.addarc(j);
+        else
+          in.addarc(j);
+      } else {
+        if (j.next.tail()[1] > j.next.head()[1])
+          in.addarc(j);
+        else
+          out.addarc(j);
+      }
+    }
+
+  }
+
+  /**
+   * Not used
+   * @param bin
+   * @param in
+   * @param out
+   * @param val
+   */
+  private void classify_headonright_s(Bin bin, Bin in, Bin out, float val) {
+    // DONE
+    Arc j;
+    while ((j = bin.removearc()) != null) {
+      j.setitail();
+
+      float diff = j.prev.tail()[0] - val;
+      if (diff > 0) {
+        if (ccwTurn_sr(j.prev, j))
+          out.addarc(j);
+        else
+          in.addarc(j);
+      } else if (diff < 0) {
+        out.addarc(j);
+      } else {
+        if (j.prev.tail()[1] > j.prev.head()[1])
+          out.addarc(j);
+        else
+          in.addarc(j);
+      }
+    }
+  }
+
+  /**
+   * Not used
+   * @param prev
+   * @param j
+   * @return false
+   */
+  private boolean ccwTurn_sr(Arc prev, Arc j) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO ccwTurn_sr");
+    return false;
+  }
+
+  /**
+   * Not used
+   * @param headonright
+   * @param intersections
+   * @param right
+   * @param value
+   */
+  private void classify_headonright_t(Bin headonright, Bin intersections,
+                                      Bin right, float value) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.classify_headonright_t");
+  }
+
+  /**
+   * Not used
+   * @param tailonleft
+   * @param intersections
+   * @param left
+   * @param value
+   */
+  private void classify_tailonleft_t(Bin tailonleft, Bin intersections,
+                                     Bin left, float value) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.classify_tailonleft_t");
+  }
+
+  /**
+   * Not used
+   * @param bin
+   * @param in
+   * @param out
+   * @param val
+   */
+  private void classify_headonleft_t(Bin bin, Bin in, Bin out, float val) {
+    // DONE
+    Arc j;
+    while ((j = bin.removearc()) != null) {
+      j.setitail();
+
+      float diff = j.prev.tail()[1] - val;
+      if (diff > 0) {
+        out.addarc(j);
+      } else if (diff < 0) {
+        if (ccwTurn_tl(j.prev, j))
+          out.addarc(j);
+        else
+          in.addarc(j);
+      } else {
+        if (j.prev.tail()[0] > j.prev.head()[0])
+          out.addarc(j);
+        else
+          in.addarc(j);
+      }
+    }
+  }
+
+  /**
+   * Not used
+   * @param prev
+   * @param j
+   * @return false
+   */
+  private boolean ccwTurn_tl(Arc prev, Arc j) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.ccwTurn_tl");
+    return false;
+  }
+
+  /**
+   * Not used
+   * @param bin
+   * @param in
+   * @param out
+   * @param val
+   */
+  private void classify_tailonright_s(Bin bin, Bin in, Bin out, float val) {
+    // DONE
+    Arc j;
+    while ((j = bin.removearc()) != null) {
+      j.clearitail();
+
+      float diff = j.next.head()[0] - val;
+      if (diff > 0) {
+        if (ccwTurn_sr(j, j.next))
+          out.addarc(j);
+        else
+          in.addarc(j);
+      } else if (diff < 0) {
+        in.addarc(j);
+      } else {
+        if (j.next.tail()[1] > j.next.head()[1])
+          out.addarc(j);
+        else
+          in.addarc(j);
+      }
+    }
+
+  }
+
+  /**
+   * Not used
+   * @param bin
+   * @param in
+   * @param out
+   * @param val
+   */
+  private void classify_headonleft_s(Bin bin, Bin in, Bin out, float val) {
+    // DONE
+    Arc j;
+    while ((j = bin.removearc()) != null) {
+      j.setitail();
+
+      float diff = j.prev.tail()[0] - val;
+      if (diff > 0) {
+        out.addarc(j);
+      } else if (diff < 0) {
+        if (ccwTurn_sl(j.prev, j))
+          out.addarc(j);
+        else
+          in.addarc(j);
+      } else {
+        if (j.prev.tail()[1] > j.prev.head()[1])
+          in.addarc(j);
+        else
+          out.addarc(j);
+      }
+    }
+
+  }
+
+  /**
+   * Not used
+   * @param prev
+   * @param j
+   * @return false
+   */
+  private boolean ccwTurn_sl(Arc prev, Arc j) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.ccwTurn_sl");
+    return false;
+  }
+
+  /**
+   * Not used
+   * @param jarc
+   * @param param
+   * @param value
+   * @param i
+   * @return 0
+   */
+  private int arc_split(Arc jarc, int param, float value, int i) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.arc_split");
+    return 0;
+  }
+
+  /**
+   * Not used
+   */
+  private void setNonDegenerate() {
+    // DONE
+    this.showDegenerate = false;
+
+  }
+
+  /**
+   * sets trimming arc default type to bezier
+   */
+  private void setArcTypeBezier() {
+    // DONE
+    isArcTypeBezier = true;
+  }
+
+  /**
+   * Not used
+   * @param source
+   */
+  private void outline(Bin source) {
+    // TODO Auto-generated method stub
+    //			System.out.println("TODO subdivider.outline");
+  }
+
+  /**
+   * Makes default trim along surface borders
+   * @param from range beginnings
+   * @param to range ends
+   */
+  private void makeBorderTrim(float[] from, float[] to) {
+    // DONE
+    float smin = from[0];
+    float smax = to[0];
+
+    float tmin = from[1];
+    float tmax = to[1];
+
+    pjarc = null;
+    Arc jarc = null;
+
+    jarc = new Arc(Arc.ARC_BOTTOM);
+    arctesselator.bezier(jarc, smin, smax, tmin, tmin);
+    initialbin.addarc(jarc);
+    pjarc = jarc.append(pjarc);
+
+    jarc = new Arc(Arc.ARC_RIGHT);
+    arctesselator.bezier(jarc, smax, smax, tmin, tmax);
+    initialbin.addarc(jarc);
+    pjarc = jarc.append(pjarc);
+
+    jarc = new Arc(Arc.ARC_TOP);
+    arctesselator.bezier(jarc, smax, smin, tmax, tmax);
+    initialbin.addarc(jarc);
+    pjarc = jarc.append(pjarc);
+
+    jarc = new Arc(Arc.ARC_LEFT);
+    arctesselator.bezier(jarc, smin, smin, tmax, tmin);
+    initialbin.addarc(jarc);
+    jarc = jarc.append(pjarc);
+
+    // assert (jarc.check() == true);
+  }
+
+  /**
+   * Draws NURBS curve
+   */
+  public void drawCurves() {
+    // DONE
+    float[] from = new float[1];
+    float[] to = new float[1];
+
+    Flist bpts = new Flist();
+    qlist.getRange(from, to, bpts);
+
+    renderhints.init();
+
+    backend.bgncurv();
+
+    for (int i = bpts.start; i < bpts.end - 1; i++) {
+      float[] pta = new float[1];
+      float[] ptb = new float[1];
+      pta[0] = bpts.pts[i];
+      ptb[0] = bpts.pts[i + 1];
+
+      qlist.downloadAll(pta, ptb, backend);
+      Curvelist curvelist = new Curvelist(qlist, pta, ptb);
+      samplingSplit(curvelist, renderhints.maxsubdivisions);
+    }
+    backend.endcurv();
+  }
+
+  /**
+   * Samples a curve in case of need, or sends curve to backend
+   * @param curvelist list of curves
+   * @param maxsubdivisions maximum number of subdivisions
+   */
+  private void samplingSplit(Curvelist curvelist, int maxsubdivisions) {
+    if (curvelist.cullCheck() == CULL_TRIVIAL_REJECT)
+      return;
+
+    curvelist.getstepsize();
+
+    if (curvelist.needsSamplingSubdivision() && (subdivisions > 0)) {
+      // TODO kód
+      //				System.out.println("TODO subdivider-needsSamplingSubdivision");
+    } else {
+      int nu = (int) (1 + curvelist.range[2] / curvelist.stepsize);
+      backend.curvgrid(curvelist.range[0], curvelist.range[1], nu);
+      backend.curvmesh(0, nu);
+    }
+
+  }
+
+  /**
+   * Sets new domain_distance_u_rate value
+   * @param d new domain_distance_u_rate value
+
+  */
+  public void set_domain_distance_u_rate(double d) {
+    // DONE
+    domain_distance_u_rate = (float) d;
+  }
+
+  /**
+   * Sets new domain_distance_v_rate value
+   * @param d new domain_distance_v_rate value
+   */
+  public void set_domain_distance_v_rate(double d) {
+    // DONE
+    domain_distance_v_rate = (float) d;
+  }
+
+  /**
+   * Sets new is_domain_distance_sampling value
+   * @param i new is_domain_distance_sampling value
+   */
+  public void set_is_domain_distance_sampling(int i) {
+    // DONE
+    this.is_domain_distance_sampling = i;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/SurfaceEvaluator.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/SurfaceEvaluator.java
new file mode 100755
index 000000000..fe23f9c08
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/SurfaceEvaluator.java
@@ -0,0 +1,111 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Class rendering surfaces with OpenGL
+ * @author Tomas Hrasky
+ *
+ */
+public interface SurfaceEvaluator {
+
+  /**
+   * Pushes eval bit
+   */
+  public void bgnmap2f() ;
+
+  /**
+   * Sets  glPolygonMode
+   * @param style polygon mode (N_MESHFILL/N_MESHLINE/N_MESHPOINT)
+   */
+  public void polymode(int style) ;
+
+  /**
+   * Pops all attributes
+   */
+  public void endmap2f() ;
+
+  /**
+   * Empty method
+   * @param ulo
+   * @param uhi
+   * @param vlo
+   * @param vhi
+   */
+  public void domain2f(float ulo, float uhi, float vlo, float vhi) ;
+
+  /**
+   * Defines 2D mesh
+   * @param nu number of steps in u direction
+   * @param u0 lowest u
+   * @param u1 highest u
+   * @param nv number of steps in v direction
+   * @param v0 lowest v
+   * @param v1 highest v
+   */
+  public void mapgrid2f(int nu, float u0, float u1, int nv, float v0, float v1) ;
+
+  /**
+   * Evaluates surface
+   * @param style surface style
+   * @param umin minimum U
+   * @param umax maximum U
+   * @param vmin minimum V
+   * @param vmax maximum V
+   */
+  public void mapmesh2f(int style, int umin, int umax, int vmin, int vmax) ;
+
+  /**
+   * Initializes evaluator
+   * @param type surface type
+   * @param ulo lowest u
+   * @param uhi highest u
+   * @param ustride number of objects between control points in u direction
+   * @param uorder surface order in u direction
+   * @param vlo lowest v
+   * @param vhi highest v
+   * @param vstride number of control points' coords
+   * @param vorder surface order in v direction
+   * @param pts control points
+   */
+  public void map2f(int type, float ulo, float uhi, int ustride, int uorder,
+                    float vlo, float vhi, int vstride, int vorder, CArrayOfFloats pts) ;
+
+  /**
+   * Calls opengl enable
+   * @param type what to enable
+   */
+  public void enable(int type) ;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/TrimVertex.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/TrimVertex.java
new file mode 100755
index 000000000..6608f8f40
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/TrimVertex.java
@@ -0,0 +1,56 @@
+package com.jogamp.opengl.impl.glu.nurbs;
+
+/*
+ ** License Applicability. Except to the extent portions of this file are
+ ** made subject to an alternative license as permitted in the SGI Free
+ ** Software License B, Version 2.0 (the "License"), the contents of this
+ ** file are subject only to the provisions of the License. You may not use
+ ** this file except in compliance with the License. You may obtain a copy
+ ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ **
+ ** http://oss.sgi.com/projects/FreeB
+ **
+ ** Note that, as provided in the License, the Software is distributed on an
+ ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ **
+ ** Original Code. The Original Code is: OpenGL Sample Implementation,
+ ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ ** Copyright in any portions created by third parties is as indicated
+ ** elsewhere herein. All Rights Reserved.
+ **
+ ** Additional Notice Provisions: The application programming interfaces
+ ** established by SGI in conjunction with the Original Code are The
+ ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ ** Window System(R) (Version 1.3), released October 19, 1998. This software
+ ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ ** published by SGI, but has not been independently verified as being
+ ** compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+/**
+ * Holds vertex used in trim
+ * 
+ * @author Tomas Hrasky
+ * 
+ */
+public class TrimVertex {
+
+  /**
+   * Trim vertex coords
+   */
+  public float[] param;
+
+  /**
+   * Makes new empty trim vertex
+   */
+  public TrimVertex() {
+    param = new float[2];
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/registry/Registry.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/registry/Registry.java
new file mode 100644
index 000000000..21b15f4d4
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/registry/Registry.java
@@ -0,0 +1,79 @@
+/*
+ * License Applicability. Except to the extent portions of this file are
+ * made subject to an alternative license as permitted in the SGI Free
+ * Software License B, Version 2.0 (the "License"), the contents of this
+ * file are subject only to the provisions of the License. You may not use
+ * this file except in compliance with the License. You may obtain a copy
+ * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * 
+ * http://oss.sgi.com/projects/FreeB
+ * 
+ * Note that, as provided in the License, the Software is distributed on an
+ * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ * 
+ * NOTE:  The Original Code (as defined below) has been licensed to Sun
+ * Microsystems, Inc. ("Sun") under the SGI Free Software License B
+ * (Version 1.1), shown above ("SGI License").   Pursuant to Section
+ * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+ * you under an alternative license ("Alternative License").  This
+ * Alternative License includes all of the provisions of the SGI License
+ * except that Section 2.2 and 11 are omitted.  Any differences between
+ * the Alternative License and the SGI License are offered solely by Sun
+ * and not by SGI.
+ *
+ * Original Code. The Original Code is: OpenGL Sample Implementation,
+ * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * Copyright in any portions created by third parties is as indicated
+ * elsewhere herein. All Rights Reserved.
+ * 
+ * Additional Notice Provisions: The application programming interfaces
+ * established by SGI in conjunction with the Original Code are The
+ * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+ * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+ * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+ * Window System(R) (Version 1.3), released October 19, 1998. This software
+ * was created using the OpenGL(R) version 1.2.1 Sample Implementation
+ * published by SGI, but has not been independently verified as being
+ * compliant with the OpenGL(R) version 1.2.1 Specification.
+ */
+
+package com.jogamp.opengl.impl.glu.registry;
+
+import javax.media.opengl.glu.GLU;
+
+/**
+ *
+ * @author  Administrator
+ */
+public class Registry {
+  
+  /** Creates a new instance of Registry */
+  public Registry() {
+  }
+  
+  public static String gluGetString(int name) {
+    if( name == GLU.GLU_VERSION ) {
+      return( "1.3" );
+    } else if( name == GLU.GLU_EXTENSIONS ) {
+      return( "GLU_EXT_nurbs_tessellator GLU_EXT_object_space_tess " );
+    }
+    return( null );
+  }
+  
+  public static boolean gluCheckExtension( String extName, String extString ) {
+    if( extName == null || extString == null ) {
+      return( false );
+    }
+    if ((extString.indexOf(extName + " ") >= 0) ||
+        extString.endsWith(extName) ||
+        extString.equals(extName)) {
+        return true;
+    }
+    return false;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/ActiveRegion.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/ActiveRegion.java
new file mode 100644
index 000000000..85397dd6a
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/ActiveRegion.java
@@ -0,0 +1,69 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+
+class ActiveRegion {
+    GLUhalfEdge eUp;		/* upper edge, directed right to left */
+    DictNode nodeUp;	/* dictionary node corresponding to eUp */
+    int windingNumber;	/* used to determine which regions are
+                                 * inside the polygon */
+    boolean inside;		/* is this region inside the polygon? */
+    boolean sentinel;	/* marks fake edges at t = +/-infinity */
+    boolean dirty;		/* marks regions where the upper or lower
+                                 * edge has changed, but we haven't checked
+                                 * whether they intersect yet */
+    boolean fixUpperEdge;	/* marks temporary edges introduced when
+                                 * we process a "right vertex" (one without
+                                 * any edges leaving to the right) */
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/CachedVertex.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/CachedVertex.java
new file mode 100644
index 000000000..8948acfec
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/CachedVertex.java
@@ -0,0 +1,58 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class CachedVertex {
+    public double[] coords = new double[3];
+    public Object data;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Dict.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Dict.java
new file mode 100644
index 000000000..d26948e7f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Dict.java
@@ -0,0 +1,140 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class Dict {
+    DictNode head;
+    Object frame;
+    DictLeq leq;
+
+    private Dict() {
+    }
+
+    static Dict dictNewDict(Object frame, DictLeq leq) {
+        Dict dict = new Dict();
+        dict.head = new DictNode();
+
+        dict.head.key = null;
+        dict.head.next = dict.head;
+        dict.head.prev = dict.head;
+
+        dict.frame = frame;
+        dict.leq = leq;
+
+        return dict;
+    }
+
+    static void dictDeleteDict(Dict dict) {
+        dict.head = null;
+        dict.frame = null;
+        dict.leq = null;
+    }
+
+    static DictNode dictInsert(Dict dict, Object key) {
+        return dictInsertBefore(dict, dict.head, key);
+    }
+
+    static DictNode dictInsertBefore(Dict dict, DictNode node, Object key) {
+        do {
+            node = node.prev;
+        } while (node.key != null && !dict.leq.leq(dict.frame, node.key, key));
+
+        DictNode newNode = new DictNode();
+        newNode.key = key;
+        newNode.next = node.next;
+        node.next.prev = newNode;
+        newNode.prev = node;
+        node.next = newNode;
+
+        return newNode;
+    }
+
+    static Object dictKey(DictNode aNode) {
+        return aNode.key;
+    }
+
+    static DictNode dictSucc(DictNode aNode) {
+        return aNode.next;
+    }
+
+    static DictNode dictPred(DictNode aNode) {
+        return aNode.prev;
+    }
+
+    static DictNode dictMin(Dict aDict) {
+        return aDict.head.next;
+    }
+
+    static DictNode dictMax(Dict aDict) {
+        return aDict.head.prev;
+    }
+
+    static void dictDelete(Dict dict, DictNode node) {
+        node.next.prev = node.prev;
+        node.prev.next = node.next;
+    }
+
+    static DictNode dictSearch(Dict dict, Object key) {
+        DictNode node = dict.head;
+
+        do {
+            node = node.next;
+        } while (node.key != null && !(dict.leq.leq(dict.frame, key, node.key)));
+
+        return node;
+    }
+
+    public interface DictLeq {
+        boolean leq(Object frame, Object key1, Object key2);
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/DictNode.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/DictNode.java
new file mode 100644
index 000000000..8864de127
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/DictNode.java
@@ -0,0 +1,59 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class DictNode {
+    Object key;
+    DictNode next;
+    DictNode prev;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUface.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUface.java
new file mode 100644
index 000000000..2ff4aae59
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUface.java
@@ -0,0 +1,65 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class GLUface {
+    public GLUface next;		/* next face (never NULL) */
+    public GLUface prev;		/* previous face (never NULL) */
+    public GLUhalfEdge anEdge;	/* a half edge with this left face */
+    public Object data;		/* room for client's data */
+
+    /* Internal data (keep hidden) */
+    public GLUface trail;		/* "stack" for conversion to strips */
+    public boolean marked;		/* flag for conversion to strips */
+    public boolean inside;		/* this face is in the polygon interior */
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUhalfEdge.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUhalfEdge.java
new file mode 100644
index 000000000..c2128b616
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUhalfEdge.java
@@ -0,0 +1,71 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class GLUhalfEdge {
+    public GLUhalfEdge next;		/* doubly-linked list (prev==Sym->next) */
+    public GLUhalfEdge Sym;		/* same edge, opposite direction */
+    public GLUhalfEdge Onext;		/* next edge CCW around origin */
+    public GLUhalfEdge Lnext;		/* next edge CCW around left face */
+    public GLUvertex Org;		/* origin vertex (Overtex too long) */
+    public com.jogamp.opengl.impl.glu.tessellator.GLUface Lface;		/* left face */
+
+    /* Internal data (keep hidden) */
+    public com.jogamp.opengl.impl.glu.tessellator.ActiveRegion activeRegion;	/* a region with this upper edge (sweep.c) */
+    public int winding;	/* change in winding number when crossing */
+    public boolean first;
+
+    public GLUhalfEdge(boolean first) {
+        this.first = first;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUmesh.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUmesh.java
new file mode 100644
index 000000000..493eb20f4
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUmesh.java
@@ -0,0 +1,60 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class GLUmesh {
+    GLUvertex vHead = new GLUvertex();		/* dummy header for vertex list */
+    com.jogamp.opengl.impl.glu.tessellator.GLUface fHead = new GLUface();		/* dummy header for face list */
+    com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eHead = new GLUhalfEdge(true);		/* dummy header for edge list */
+    com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eHeadSym = new GLUhalfEdge(false);	/* and its symmetric counterpart */
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUtessellatorImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
new file mode 100644
index 000000000..b21998355
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
@@ -0,0 +1,646 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+import com.jogamp.opengl.impl.glu.tessellator.*;
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+
+public class GLUtessellatorImpl implements GLUtessellator {
+    public static final int TESS_MAX_CACHE = 100;
+
+    private int state;		/* what begin/end calls have we seen? */
+
+    private GLUhalfEdge lastEdge;	/* lastEdge->Org is the most recent vertex */
+    GLUmesh mesh;		/* stores the input contours, and eventually
+                                   the tessellation itself */
+
+    /*** state needed for projecting onto the sweep plane ***/
+
+    double[] normal = new double[3];	/* user-specified normal (if provided) */
+    double[] sUnit = new double[3];	/* unit vector in s-direction (debugging) */
+    double[] tUnit = new double[3];	/* unit vector in t-direction (debugging) */
+
+    /*** state needed for the line sweep ***/
+
+    private double relTolerance;	/* tolerance for merging features */
+    int windingRule;	/* rule for determining polygon interior */
+    boolean fatalError;	/* fatal error: needed combine callback */
+
+    Dict dict;		/* edge dictionary for sweep line */
+    PriorityQ pq;		/* priority queue of vertex events */
+    GLUvertex event;		/* current sweep event being processed */
+
+    /*** state needed for rendering callbacks (see render.c) ***/
+
+    boolean flagBoundary;	/* mark boundary edges (use EdgeFlag) */
+    boolean boundaryOnly;	/* Extract contours, not triangles */
+    boolean avoidDegenerateTris; /* JOGL-specific hint to try to improve triangulation
+                                    by avoiding producing degenerate (zero-area) triangles;
+                                    has not been tested exhaustively and is therefore an option */
+
+    GLUface lonelyTriList;
+    /* list of triangles which could not be rendered as strips or fans */
+
+
+
+    /*** state needed to cache single-contour polygons for renderCache() */
+
+    private boolean flushCacheOnNextVertex;		/* empty cache on next vertex() call */
+    int cacheCount;		/* number of cached vertices */
+    CachedVertex[] cache = new CachedVertex[TESS_MAX_CACHE];	/* the vertex data */
+
+    /*** rendering callbacks that also pass polygon data  ***/
+    private Object polygonData;		/* client data for current polygon */
+
+    private GLUtessellatorCallback callBegin;
+    private GLUtessellatorCallback callEdgeFlag;
+    private GLUtessellatorCallback callVertex;
+    private GLUtessellatorCallback callEnd;
+//    private GLUtessellatorCallback callMesh;
+    private GLUtessellatorCallback callError;
+    private GLUtessellatorCallback callCombine;
+
+    private GLUtessellatorCallback callBeginData;
+    private GLUtessellatorCallback callEdgeFlagData;
+    private GLUtessellatorCallback callVertexData;
+    private GLUtessellatorCallback callEndData;
+//    private GLUtessellatorCallback callMeshData;
+    private GLUtessellatorCallback callErrorData;
+    private GLUtessellatorCallback callCombineData;
+
+    private static final double GLU_TESS_DEFAULT_TOLERANCE = 0.0;
+//    private static final int GLU_TESS_MESH = 100112;	/* void (*)(GLUmesh *mesh)	    */
+    private static GLUtessellatorCallback NULL_CB = new GLUtessellatorCallbackAdapter();
+
+//    #define MAX_FAST_ALLOC	(MAX(sizeof(EdgePair), \
+//                 MAX(sizeof(GLUvertex),sizeof(GLUface))))
+
+    private GLUtessellatorImpl() {
+        state = TessState.T_DORMANT;
+
+        normal[0] = 0;
+        normal[1] = 0;
+        normal[2] = 0;
+
+        relTolerance = GLU_TESS_DEFAULT_TOLERANCE;
+        windingRule = GLU.GLU_TESS_WINDING_ODD;
+        flagBoundary = false;
+        boundaryOnly = false;
+
+        callBegin = NULL_CB;
+        callEdgeFlag = NULL_CB;
+        callVertex = NULL_CB;
+        callEnd = NULL_CB;
+        callError = NULL_CB;
+        callCombine = NULL_CB;
+//        callMesh = NULL_CB;
+
+        callBeginData = NULL_CB;
+        callEdgeFlagData = NULL_CB;
+        callVertexData = NULL_CB;
+        callEndData = NULL_CB;
+        callErrorData = NULL_CB;
+        callCombineData = NULL_CB;
+
+        polygonData = null;
+
+        for (int i = 0; i < cache.length; i++) {
+            cache[i] = new CachedVertex();
+        }
+    }
+
+    static public GLUtessellator gluNewTess()
+    {
+        return new GLUtessellatorImpl();
+    }
+
+
+    private void makeDormant() {
+        /* Return the tessellator to its original dormant state. */
+
+        if (mesh != null) {
+            Mesh.__gl_meshDeleteMesh(mesh);
+        }
+        state = TessState.T_DORMANT;
+        lastEdge = null;
+        mesh = null;
+    }
+
+    private void requireState(int newState) {
+        if (state != newState) gotoState(newState);
+    }
+
+    private void gotoState(int newState) {
+        while (state != newState) {
+            /* We change the current state one level at a time, to get to
+             * the desired state.
+             */
+            if (state < newState) {
+                if (state == TessState.T_DORMANT) {
+                    callErrorOrErrorData(GLU.GLU_TESS_MISSING_BEGIN_POLYGON);
+                    gluTessBeginPolygon(null);
+                } else if (state == TessState.T_IN_POLYGON) {
+                    callErrorOrErrorData(GLU.GLU_TESS_MISSING_BEGIN_CONTOUR);
+                    gluTessBeginContour();
+                }
+            } else {
+                if (state == TessState.T_IN_CONTOUR) {
+                    callErrorOrErrorData(GLU.GLU_TESS_MISSING_END_CONTOUR);
+                    gluTessEndContour();
+                } else if (state == TessState.T_IN_POLYGON) {
+                    callErrorOrErrorData(GLU.GLU_TESS_MISSING_END_POLYGON);
+                    /* gluTessEndPolygon( tess ) is too much work! */
+                    makeDormant();
+                }
+            }
+        }
+    }
+
+    public void gluDeleteTess() {
+        requireState(TessState.T_DORMANT);
+    }
+
+    public void gluTessProperty(int which, double value) {
+        switch (which) {
+            case GLU.GLU_TESS_TOLERANCE:
+                if (value < 0.0 || value > 1.0) break;
+                relTolerance = value;
+                return;
+
+            case GLU.GLU_TESS_WINDING_RULE:
+                int windingRule = (int) value;
+                if (windingRule != value) break;	/* not an integer */
+
+                switch (windingRule) {
+                    case GLU.GLU_TESS_WINDING_ODD:
+                    case GLU.GLU_TESS_WINDING_NONZERO:
+                    case GLU.GLU_TESS_WINDING_POSITIVE:
+                    case GLU.GLU_TESS_WINDING_NEGATIVE:
+                    case GLU.GLU_TESS_WINDING_ABS_GEQ_TWO:
+                        this.windingRule = windingRule;
+                        return;
+                    default:
+                        break;
+                }
+
+            case GLU.GLU_TESS_BOUNDARY_ONLY:
+                boundaryOnly = (value != 0);
+                return;
+
+            case GLU.GLU_TESS_AVOID_DEGENERATE_TRIANGLES:
+                avoidDegenerateTris = (value != 0);
+                return;
+
+            default:
+                callErrorOrErrorData(GLU.GLU_INVALID_ENUM);
+                return;
+        }
+        callErrorOrErrorData(GLU.GLU_INVALID_VALUE);
+    }
+
+/* Returns tessellator property */
+    public void gluGetTessProperty(int which, double[] value, int value_offset) {
+        switch (which) {
+            case GLU.GLU_TESS_TOLERANCE:
+/* tolerance should be in range [0..1] */
+                assert (0.0 <= relTolerance && relTolerance <= 1.0);
+                value[value_offset] = relTolerance;
+                break;
+            case GLU.GLU_TESS_WINDING_RULE:
+                assert (windingRule == GLU.GLU_TESS_WINDING_ODD ||
+                        windingRule == GLU.GLU_TESS_WINDING_NONZERO ||
+                        windingRule == GLU.GLU_TESS_WINDING_POSITIVE ||
+                        windingRule == GLU.GLU_TESS_WINDING_NEGATIVE ||
+                        windingRule == GLU.GLU_TESS_WINDING_ABS_GEQ_TWO);
+                value[value_offset] = windingRule;
+                break;
+            case GLU.GLU_TESS_BOUNDARY_ONLY:
+                assert (boundaryOnly == true || boundaryOnly == false);
+                value[value_offset] = boundaryOnly ? 1 : 0;
+                break;
+            case GLU.GLU_TESS_AVOID_DEGENERATE_TRIANGLES:
+                value[value_offset] = avoidDegenerateTris ? 1 : 0;
+                break;
+            default:
+                value[value_offset] = 0.0;
+                callErrorOrErrorData(GLU.GLU_INVALID_ENUM);
+                break;
+        }
+    } /* gluGetTessProperty() */
+
+    public void gluTessNormal(double x, double y, double z) {
+        normal[0] = x;
+        normal[1] = y;
+        normal[2] = z;
+    }
+
+    public void gluTessCallback(int which, GLUtessellatorCallback aCallback) {
+        switch (which) {
+            case GLU.GLU_TESS_BEGIN:
+                callBegin = aCallback == null ? NULL_CB : aCallback;
+                return;
+            case GLU.GLU_TESS_BEGIN_DATA:
+                callBeginData = aCallback == null ? NULL_CB : aCallback;
+                return;
+            case GLU.GLU_TESS_EDGE_FLAG:
+                callEdgeFlag = aCallback == null ? NULL_CB : aCallback;
+/* If the client wants boundary edges to be flagged,
+ * we render everything as separate triangles (no strips or fans).
+ */
+                flagBoundary = aCallback != null;
+                return;
+            case GLU.GLU_TESS_EDGE_FLAG_DATA:
+                callEdgeFlagData = callBegin = aCallback == null ? NULL_CB : aCallback;
+/* If the client wants boundary edges to be flagged,
+ * we render everything as separate triangles (no strips or fans).
+ */
+                flagBoundary = (aCallback != null);
+                return;
+            case GLU.GLU_TESS_VERTEX:
+                callVertex = aCallback == null ? NULL_CB : aCallback;
+                return;
+            case GLU.GLU_TESS_VERTEX_DATA:
+                callVertexData = aCallback == null ? NULL_CB : aCallback;
+                return;
+            case GLU.GLU_TESS_END:
+                callEnd = aCallback == null ? NULL_CB : aCallback;
+                return;
+            case GLU.GLU_TESS_END_DATA:
+                callEndData = aCallback == null ? NULL_CB : aCallback;
+                return;
+            case GLU.GLU_TESS_ERROR:
+                callError = aCallback == null ? NULL_CB : aCallback;
+                return;
+            case GLU.GLU_TESS_ERROR_DATA:
+                callErrorData = aCallback == null ? NULL_CB : aCallback;
+                return;
+            case GLU.GLU_TESS_COMBINE:
+                callCombine = aCallback == null ? NULL_CB : aCallback;
+                return;
+            case GLU.GLU_TESS_COMBINE_DATA:
+                callCombineData = aCallback == null ? NULL_CB : aCallback;
+                return;
+//            case GLU_TESS_MESH:
+//                callMesh = aCallback == null ? NULL_CB : aCallback;
+//                return;
+            default:
+                callErrorOrErrorData(GLU.GLU_INVALID_ENUM);
+                return;
+        }
+    }
+
+    private boolean addVertex(double[] coords, Object vertexData) {
+        GLUhalfEdge e;
+
+        e = lastEdge;
+        if (e == null) {
+/* Make a self-loop (one vertex, one edge). */
+
+            e = Mesh.__gl_meshMakeEdge(mesh);
+            if (e == null) return false;
+            if (!Mesh.__gl_meshSplice(e, e.Sym)) return false;
+        } else {
+/* Create a new vertex and edge which immediately follow e
+ * in the ordering around the left face.
+ */
+            if (Mesh.__gl_meshSplitEdge(e) == null) return false;
+            e = e.Lnext;
+        }
+
+/* The new vertex is now e.Org. */
+        e.Org.data = vertexData;
+        e.Org.coords[0] = coords[0];
+        e.Org.coords[1] = coords[1];
+        e.Org.coords[2] = coords[2];
+
+/* The winding of an edge says how the winding number changes as we
+ * cross from the edge''s right face to its left face.  We add the
+ * vertices in such an order that a CCW contour will add +1 to
+ * the winding number of the region inside the contour.
+ */
+        e.winding = 1;
+        e.Sym.winding = -1;
+
+        lastEdge = e;
+
+        return true;
+    }
+
+    private void cacheVertex(double[] coords, Object vertexData) {
+        if (cache[cacheCount] == null) {
+            cache[cacheCount] = new CachedVertex();
+        }
+
+        CachedVertex v = cache[cacheCount];
+
+        v.data = vertexData;
+        v.coords[0] = coords[0];
+        v.coords[1] = coords[1];
+        v.coords[2] = coords[2];
+        ++cacheCount;
+    }
+
+
+    private boolean flushCache() {
+        CachedVertex[] v = cache;
+
+        mesh = Mesh.__gl_meshNewMesh();
+        if (mesh == null) return false;
+
+        for (int i = 0; i < cacheCount; i++) {
+            CachedVertex vertex = v[i];
+            if (!addVertex(vertex.coords, vertex.data)) return false;
+        }
+        cacheCount = 0;
+        flushCacheOnNextVertex = false;
+
+        return true;
+    }
+
+    public void gluTessVertex(double[] coords, int coords_offset, Object vertexData) {
+        int i;
+        boolean tooLarge = false;
+        double x;
+        double[] clamped = new double[3];
+
+        requireState(TessState.T_IN_CONTOUR);
+
+        if (flushCacheOnNextVertex) {
+            if (!flushCache()) {
+                callErrorOrErrorData(GLU.GLU_OUT_OF_MEMORY);
+                return;
+            }
+            lastEdge = null;
+        }
+        for (i = 0; i < 3; ++i) {
+            x = coords[i+coords_offset];
+            if (x < -GLU.GLU_TESS_MAX_COORD) {
+                x = -GLU.GLU_TESS_MAX_COORD;
+                tooLarge = true;
+            }
+            if (x > GLU.GLU_TESS_MAX_COORD) {
+                x = GLU.GLU_TESS_MAX_COORD;
+                tooLarge = true;
+            }
+            clamped[i] = x;
+        }
+        if (tooLarge) {
+            callErrorOrErrorData(GLU.GLU_TESS_COORD_TOO_LARGE);
+        }
+
+        if (mesh == null) {
+            if (cacheCount < TESS_MAX_CACHE) {
+                cacheVertex(clamped, vertexData);
+                return;
+            }
+            if (!flushCache()) {
+                callErrorOrErrorData(GLU.GLU_OUT_OF_MEMORY);
+                return;
+            }
+        }
+
+        if (!addVertex(clamped, vertexData)) {
+            callErrorOrErrorData(GLU.GLU_OUT_OF_MEMORY);
+        }
+    }
+
+
+    public void gluTessBeginPolygon(Object data) {
+        requireState(TessState.T_DORMANT);
+
+        state = TessState.T_IN_POLYGON;
+        cacheCount = 0;
+        flushCacheOnNextVertex = false;
+        mesh = null;
+
+        polygonData = data;
+    }
+
+
+    public void gluTessBeginContour() {
+        requireState(TessState.T_IN_POLYGON);
+
+        state = TessState.T_IN_CONTOUR;
+        lastEdge = null;
+        if (cacheCount > 0) {
+/* Just set a flag so we don't get confused by empty contours
+ * -- these can be generated accidentally with the obsolete
+ * NextContour() interface.
+ */
+            flushCacheOnNextVertex = true;
+        }
+    }
+
+
+    public void gluTessEndContour() {
+        requireState(TessState.T_IN_CONTOUR);
+        state = TessState.T_IN_POLYGON;
+    }
+
+    public void gluTessEndPolygon() {
+        GLUmesh mesh;
+
+        try {
+            requireState(TessState.T_IN_POLYGON);
+            state = TessState.T_DORMANT;
+
+            if (this.mesh == null) {
+                if (!flagBoundary /*&& callMesh == NULL_CB*/) {
+
+/* Try some special code to make the easy cases go quickly
+ * (eg. convex polygons).  This code does NOT handle multiple contours,
+ * intersections, edge flags, and of course it does not generate
+ * an explicit mesh either.
+ */
+                    if (Render.__gl_renderCache(this)) {
+                        polygonData = null;
+                        return;
+                    }
+                }
+                if (!flushCache()) throw new RuntimeException(); /* could've used a label*/
+            }
+
+/* Determine the polygon normal and project vertices onto the plane
+         * of the polygon.
+         */
+            Normal.__gl_projectPolygon(this);
+
+/* __gl_computeInterior( tess ) computes the planar arrangement specified
+ * by the given contours, and further subdivides this arrangement
+ * into regions.  Each region is marked "inside" if it belongs
+ * to the polygon, according to the rule given by windingRule.
+ * Each interior region is guaranteed be monotone.
+ */
+            if (!Sweep.__gl_computeInterior(this)) {
+                throw new RuntimeException();	/* could've used a label */
+            }
+
+            mesh = this.mesh;
+            if (!fatalError) {
+                boolean rc = true;
+
+/* If the user wants only the boundary contours, we throw away all edges
+ * except those which separate the interior from the exterior.
+ * Otherwise we tessellate all the regions marked "inside".
+ */
+                if (boundaryOnly) {
+                    rc = TessMono.__gl_meshSetWindingNumber(mesh, 1, true);
+                } else {
+                    rc = TessMono.__gl_meshTessellateInterior(mesh, avoidDegenerateTris);
+                }
+                if (!rc) throw new RuntimeException();	/* could've used a label */
+
+                Mesh.__gl_meshCheckMesh(mesh);
+
+                if (callBegin != NULL_CB || callEnd != NULL_CB
+                        || callVertex != NULL_CB || callEdgeFlag != NULL_CB
+                        || callBeginData != NULL_CB
+                        || callEndData != NULL_CB
+                        || callVertexData != NULL_CB
+                        || callEdgeFlagData != NULL_CB) {
+                    if (boundaryOnly) {
+                        Render.__gl_renderBoundary(this, mesh);  /* output boundary contours */
+                    } else {
+                        Render.__gl_renderMesh(this, mesh);	   /* output strips and fans */
+                    }
+                }
+//                if (callMesh != NULL_CB) {
+//
+///* Throw away the exterior faces, so that all faces are interior.
+//                 * This way the user doesn't have to check the "inside" flag,
+//                 * and we don't need to even reveal its existence.  It also leaves
+//                 * the freedom for an implementation to not generate the exterior
+//                 * faces in the first place.
+//                 */
+//                    TessMono.__gl_meshDiscardExterior(mesh);
+//                    callMesh.mesh(mesh);		/* user wants the mesh itself */
+//                    mesh = null;
+//                    polygonData = null;
+//                    return;
+//                }
+            }
+            Mesh.__gl_meshDeleteMesh(mesh);
+            polygonData = null;
+            mesh = null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            callErrorOrErrorData(GLU.GLU_OUT_OF_MEMORY);
+        }
+    }
+
+    /*******************************************************/
+
+/* Obsolete calls -- for backward compatibility */
+
+    public void gluBeginPolygon() {
+        gluTessBeginPolygon(null);
+        gluTessBeginContour();
+    }
+
+
+/*ARGSUSED*/
+    public void gluNextContour(int type) {
+        gluTessEndContour();
+        gluTessBeginContour();
+    }
+
+
+    public void gluEndPolygon() {
+        gluTessEndContour();
+        gluTessEndPolygon();
+    }
+
+    void callBeginOrBeginData(int a) {
+        if (callBeginData != NULL_CB)
+            callBeginData.beginData(a, polygonData);
+        else
+            callBegin.begin(a);
+    }
+
+    void callVertexOrVertexData(Object a) {
+        if (callVertexData != NULL_CB)
+            callVertexData.vertexData(a, polygonData);
+        else
+            callVertex.vertex(a);
+    }
+
+    void callEdgeFlagOrEdgeFlagData(boolean a) {
+        if (callEdgeFlagData != NULL_CB)
+            callEdgeFlagData.edgeFlagData(a, polygonData);
+        else
+            callEdgeFlag.edgeFlag(a);
+    }
+
+    void callEndOrEndData() {
+        if (callEndData != NULL_CB)
+            callEndData.endData(polygonData);
+        else
+            callEnd.end();
+    }
+
+    void callCombineOrCombineData(double[] coords, Object[] vertexData, float[] weights, Object[] outData) {
+        if (callCombineData != NULL_CB)
+            callCombineData.combineData(coords, vertexData, weights, outData, polygonData);
+        else
+            callCombine.combine(coords, vertexData, weights, outData);
+    }
+
+    void callErrorOrErrorData(int a) {
+        if (callErrorData != NULL_CB)
+            callErrorData.errorData(a, polygonData);
+        else
+            callError.error(a);
+    }
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUvertex.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUvertex.java
new file mode 100644
index 000000000..af294caad
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUvertex.java
@@ -0,0 +1,65 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class GLUvertex {
+    public GLUvertex next;		/* next vertex (never NULL) */
+    public GLUvertex prev;		/* previous vertex (never NULL) */
+    public com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge anEdge;	/* a half-edge with this origin */
+    public Object data;		/* client's data */
+
+    /* Internal data (keep hidden) */
+    public double[] coords = new double[3];	/* vertex location in 3D */
+    public double s, t;		/* projection onto the sweep plane */
+    public int pqHandle;	/* to allow deletion from priority queue */
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Geom.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Geom.java
new file mode 100644
index 000000000..2710346d1
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Geom.java
@@ -0,0 +1,338 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class Geom {
+    private Geom() {
+    }
+
+    /* Given three vertices u,v,w such that VertLeq(u,v) && VertLeq(v,w),
+     * evaluates the t-coord of the edge uw at the s-coord of the vertex v.
+     * Returns v->t - (uw)(v->s), ie. the signed distance from uw to v.
+     * If uw is vertical (and thus passes thru v), the result is zero.
+     *
+     * The calculation is extremely accurate and stable, even when v
+     * is very close to u or w.  In particular if we set v->t = 0 and
+     * let r be the negated result (this evaluates (uw)(v->s)), then
+     * r is guaranteed to satisfy MIN(u->t,w->t) <= r <= MAX(u->t,w->t).
+     */
+    static double EdgeEval(GLUvertex u, GLUvertex v, GLUvertex w) {
+        double gapL, gapR;
+
+        assert (VertLeq(u, v) && VertLeq(v, w));
+
+        gapL = v.s - u.s;
+        gapR = w.s - v.s;
+
+        if (gapL + gapR > 0) {
+            if (gapL < gapR) {
+                return (v.t - u.t) + (u.t - w.t) * (gapL / (gapL + gapR));
+            } else {
+                return (v.t - w.t) + (w.t - u.t) * (gapR / (gapL + gapR));
+            }
+        }
+        /* vertical line */
+        return 0;
+    }
+
+    static double EdgeSign(GLUvertex u, GLUvertex v, GLUvertex w) {
+        double gapL, gapR;
+
+        assert (VertLeq(u, v) && VertLeq(v, w));
+
+        gapL = v.s - u.s;
+        gapR = w.s - v.s;
+
+        if (gapL + gapR > 0) {
+            return (v.t - w.t) * gapL + (v.t - u.t) * gapR;
+        }
+        /* vertical line */
+        return 0;
+    }
+
+
+    /***********************************************************************
+     * Define versions of EdgeSign, EdgeEval with s and t transposed.
+     */
+
+    static double TransEval(GLUvertex u, GLUvertex v, GLUvertex w) {
+        /* Given three vertices u,v,w such that TransLeq(u,v) && TransLeq(v,w),
+         * evaluates the t-coord of the edge uw at the s-coord of the vertex v.
+         * Returns v->s - (uw)(v->t), ie. the signed distance from uw to v.
+         * If uw is vertical (and thus passes thru v), the result is zero.
+         *
+         * The calculation is extremely accurate and stable, even when v
+         * is very close to u or w.  In particular if we set v->s = 0 and
+         * let r be the negated result (this evaluates (uw)(v->t)), then
+         * r is guaranteed to satisfy MIN(u->s,w->s) <= r <= MAX(u->s,w->s).
+         */
+        double gapL, gapR;
+
+        assert (TransLeq(u, v) && TransLeq(v, w));
+
+        gapL = v.t - u.t;
+        gapR = w.t - v.t;
+
+        if (gapL + gapR > 0) {
+            if (gapL < gapR) {
+                return (v.s - u.s) + (u.s - w.s) * (gapL / (gapL + gapR));
+            } else {
+                return (v.s - w.s) + (w.s - u.s) * (gapR / (gapL + gapR));
+            }
+        }
+        /* vertical line */
+        return 0;
+    }
+
+    static double TransSign(GLUvertex u, GLUvertex v, GLUvertex w) {
+        /* Returns a number whose sign matches TransEval(u,v,w) but which
+         * is cheaper to evaluate.  Returns > 0, == 0 , or < 0
+         * as v is above, on, or below the edge uw.
+         */
+        double gapL, gapR;
+
+        assert (TransLeq(u, v) && TransLeq(v, w));
+
+        gapL = v.t - u.t;
+        gapR = w.t - v.t;
+
+        if (gapL + gapR > 0) {
+            return (v.s - w.s) * gapL + (v.s - u.s) * gapR;
+        }
+        /* vertical line */
+        return 0;
+    }
+
+
+    static boolean VertCCW(GLUvertex u, GLUvertex v, GLUvertex w) {
+        /* For almost-degenerate situations, the results are not reliable.
+         * Unless the floating-point arithmetic can be performed without
+         * rounding errors, *any* implementation will give incorrect results
+         * on some degenerate inputs, so the client must have some way to
+         * handle this situation.
+         */
+        return (u.s * (v.t - w.t) + v.s * (w.t - u.t) + w.s * (u.t - v.t)) >= 0;
+    }
+
+/* Given parameters a,x,b,y returns the value (b*x+a*y)/(a+b),
+ * or (x+y)/2 if a==b==0.  It requires that a,b >= 0, and enforces
+ * this in the rare case that one argument is slightly negative.
+ * The implementation is extremely stable numerically.
+ * In particular it guarantees that the result r satisfies
+ * MIN(x,y) <= r <= MAX(x,y), and the results are very accurate
+ * even when a and b differ greatly in magnitude.
+ */
+    static double Interpolate(double a, double x, double b, double y) {
+        a = (a < 0) ? 0 : a;
+        b = (b < 0) ? 0 : b;
+        if (a <= b) {
+            if (b == 0) {
+                return (x + y) / 2.0;
+            } else {
+                return (x + (y - x) * (a / (a + b)));
+            }
+        } else {
+            return (y + (x - y) * (b / (a + b)));
+        }
+    }
+
+    static void EdgeIntersect(GLUvertex o1, GLUvertex d1,
+                              GLUvertex o2, GLUvertex d2,
+                              GLUvertex v)
+/* Given edges (o1,d1) and (o2,d2), compute their point of intersection.
+ * The computed point is guaranteed to lie in the intersection of the
+ * bounding rectangles defined by each edge.
+ */ {
+        double z1, z2;
+
+        /* This is certainly not the most efficient way to find the intersection
+         * of two line segments, but it is very numerically stable.
+         *
+         * Strategy: find the two middle vertices in the VertLeq ordering,
+         * and interpolate the intersection s-value from these.  Then repeat
+         * using the TransLeq ordering to find the intersection t-value.
+         */
+
+        if (!VertLeq(o1, d1)) {
+            GLUvertex temp = o1;
+            o1 = d1;
+            d1 = temp;
+        }
+        if (!VertLeq(o2, d2)) {
+            GLUvertex temp = o2;
+            o2 = d2;
+            d2 = temp;
+        }
+        if (!VertLeq(o1, o2)) {
+            GLUvertex temp = o1;
+            o1 = o2;
+            o2 = temp;
+            temp = d1;
+            d1 = d2;
+            d2 = temp;
+        }
+
+        if (!VertLeq(o2, d1)) {
+            /* Technically, no intersection -- do our best */
+            v.s = (o2.s + d1.s) / 2.0;
+        } else if (VertLeq(d1, d2)) {
+            /* Interpolate between o2 and d1 */
+            z1 = EdgeEval(o1, o2, d1);
+            z2 = EdgeEval(o2, d1, d2);
+            if (z1 + z2 < 0) {
+                z1 = -z1;
+                z2 = -z2;
+            }
+            v.s = Interpolate(z1, o2.s, z2, d1.s);
+        } else {
+            /* Interpolate between o2 and d2 */
+            z1 = EdgeSign(o1, o2, d1);
+            z2 = -EdgeSign(o1, d2, d1);
+            if (z1 + z2 < 0) {
+                z1 = -z1;
+                z2 = -z2;
+            }
+            v.s = Interpolate(z1, o2.s, z2, d2.s);
+        }
+
+        /* Now repeat the process for t */
+
+        if (!TransLeq(o1, d1)) {
+            GLUvertex temp = o1;
+            o1 = d1;
+            d1 = temp;
+        }
+        if (!TransLeq(o2, d2)) {
+            GLUvertex temp = o2;
+            o2 = d2;
+            d2 = temp;
+        }
+        if (!TransLeq(o1, o2)) {
+            GLUvertex temp = o2;
+            o2 = o1;
+            o1 = temp;
+            temp = d2;
+            d2 = d1;
+            d1 = temp;
+        }
+
+        if (!TransLeq(o2, d1)) {
+            /* Technically, no intersection -- do our best */
+            v.t = (o2.t + d1.t) / 2.0;
+        } else if (TransLeq(d1, d2)) {
+            /* Interpolate between o2 and d1 */
+            z1 = TransEval(o1, o2, d1);
+            z2 = TransEval(o2, d1, d2);
+            if (z1 + z2 < 0) {
+                z1 = -z1;
+                z2 = -z2;
+            }
+            v.t = Interpolate(z1, o2.t, z2, d1.t);
+        } else {
+            /* Interpolate between o2 and d2 */
+            z1 = TransSign(o1, o2, d1);
+            z2 = -TransSign(o1, d2, d1);
+            if (z1 + z2 < 0) {
+                z1 = -z1;
+                z2 = -z2;
+            }
+            v.t = Interpolate(z1, o2.t, z2, d2.t);
+        }
+    }
+
+    static boolean VertEq(GLUvertex u, GLUvertex v) {
+        return u.s == v.s && u.t == v.t;
+    }
+
+    static boolean VertLeq(GLUvertex u, GLUvertex v) {
+        return u.s < v.s || (u.s == v.s && u.t <= v.t);
+    }
+
+/* Versions of VertLeq, EdgeSign, EdgeEval with s and t transposed. */
+
+    static boolean TransLeq(GLUvertex u, GLUvertex v) {
+        return u.t < v.t || (u.t == v.t && u.s <= v.s);
+    }
+
+    static boolean EdgeGoesLeft(GLUhalfEdge e) {
+        return VertLeq(e.Sym.Org, e.Org);
+    }
+
+    static boolean EdgeGoesRight(GLUhalfEdge e) {
+        return VertLeq(e.Org, e.Sym.Org);
+    }
+
+    static double VertL1dist(GLUvertex u, GLUvertex v) {
+        return Math.abs(u.s - v.s) + Math.abs(u.t - v.t);
+    }
+
+    /***********************************************************************/
+
+    // Compute the cosine of the angle between the edges between o and
+    // v1 and between o and v2
+    static double EdgeCos(GLUvertex o, GLUvertex v1, GLUvertex v2) {
+        double ov1s = v1.s - o.s;
+        double ov1t = v1.t - o.t;
+        double ov2s = v2.s - o.s;
+        double ov2t = v2.t - o.t;
+        double dotp = ov1s * ov2s + ov1t * ov2t;
+        double len = Math.sqrt(ov1s * ov1s + ov1t * ov1t) * Math.sqrt(ov2s * ov2s + ov2t * ov2t);
+        if (len > 0.0) {
+            dotp /= len;
+        }
+        return dotp;
+    }
+
+    static final double EPSILON = 1.0e-5;
+    static final double ONE_MINUS_EPSILON = 1.0 - EPSILON;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Mesh.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Mesh.java
new file mode 100644
index 000000000..b8be9f80f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Mesh.java
@@ -0,0 +1,734 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class Mesh {
+    private Mesh() {
+    }
+
+    /************************ Utility Routines ************************/
+/* MakeEdge creates a new pair of half-edges which form their own loop.
+ * No vertex or face structures are allocated, but these must be assigned
+ * before the current edge operation is completed.
+ */
+    static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge MakeEdge(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNext) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eSym;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge ePrev;
+
+//        EdgePair * pair = (EdgePair *)
+//        memAlloc(sizeof(EdgePair));
+//        if (pair == NULL) return NULL;
+//
+//        e = &pair - > e;
+        e = new com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge(true);
+//        eSym = &pair - > eSym;
+        eSym = new com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge(false);
+
+
+        /* Make sure eNext points to the first edge of the edge pair */
+        if (!eNext.first) {
+            eNext = eNext.Sym;
+        }
+
+        /* Insert in circular doubly-linked list before eNext.
+         * Note that the prev pointer is stored in Sym->next.
+         */
+        ePrev = eNext.Sym.next;
+        eSym.next = ePrev;
+        ePrev.Sym.next = e;
+        e.next = eNext;
+        eNext.Sym.next = eSym;
+
+        e.Sym = eSym;
+        e.Onext = e;
+        e.Lnext = eSym;
+        e.Org = null;
+        e.Lface = null;
+        e.winding = 0;
+        e.activeRegion = null;
+
+        eSym.Sym = e;
+        eSym.Onext = eSym;
+        eSym.Lnext = e;
+        eSym.Org = null;
+        eSym.Lface = null;
+        eSym.winding = 0;
+        eSym.activeRegion = null;
+
+        return e;
+    }
+
+/* Splice( a, b ) is best described by the Guibas/Stolfi paper or the
+ * CS348a notes (see mesh.h).  Basically it modifies the mesh so that
+ * a->Onext and b->Onext are exchanged.  This can have various effects
+ * depending on whether a and b belong to different face or vertex rings.
+ * For more explanation see __gl_meshSplice() below.
+ */
+    static void Splice(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge a, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge b) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge aOnext = a.Onext;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge bOnext = b.Onext;
+
+        aOnext.Sym.Lnext = b;
+        bOnext.Sym.Lnext = a;
+        a.Onext = bOnext;
+        b.Onext = aOnext;
+    }
+
+/* MakeVertex( newVertex, eOrig, vNext ) attaches a new vertex and makes it the
+ * origin of all edges in the vertex loop to which eOrig belongs. "vNext" gives
+ * a place to insert the new vertex in the global vertex list.  We insert
+ * the new vertex *before* vNext so that algorithms which walk the vertex
+ * list will not see the newly created vertices.
+ */
+    static void MakeVertex(com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex,
+                           com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig, com.jogamp.opengl.impl.glu.tessellator.GLUvertex vNext) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex vPrev;
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex vNew = newVertex;
+
+        assert (vNew != null);
+
+        /* insert in circular doubly-linked list before vNext */
+        vPrev = vNext.prev;
+        vNew.prev = vPrev;
+        vPrev.next = vNew;
+        vNew.next = vNext;
+        vNext.prev = vNew;
+
+        vNew.anEdge = eOrig;
+        vNew.data = null;
+        /* leave coords, s, t undefined */
+
+        /* fix other edges on this vertex loop */
+        e = eOrig;
+        do {
+            e.Org = vNew;
+            e = e.Onext;
+        } while (e != eOrig);
+    }
+
+/* MakeFace( newFace, eOrig, fNext ) attaches a new face and makes it the left
+ * face of all edges in the face loop to which eOrig belongs.  "fNext" gives
+ * a place to insert the new face in the global face list.  We insert
+ * the new face *before* fNext so that algorithms which walk the face
+ * list will not see the newly created faces.
+ */
+    static void MakeFace(com.jogamp.opengl.impl.glu.tessellator.GLUface newFace, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig, com.jogamp.opengl.impl.glu.tessellator.GLUface fNext) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+        com.jogamp.opengl.impl.glu.tessellator.GLUface fPrev;
+        com.jogamp.opengl.impl.glu.tessellator.GLUface fNew = newFace;
+
+        assert (fNew != null);
+
+        /* insert in circular doubly-linked list before fNext */
+        fPrev = fNext.prev;
+        fNew.prev = fPrev;
+        fPrev.next = fNew;
+        fNew.next = fNext;
+        fNext.prev = fNew;
+
+        fNew.anEdge = eOrig;
+        fNew.data = null;
+        fNew.trail = null;
+        fNew.marked = false;
+
+        /* The new face is marked "inside" if the old one was.  This is a
+         * convenience for the common case where a face has been split in two.
+         */
+        fNew.inside = fNext.inside;
+
+        /* fix other edges on this face loop */
+        e = eOrig;
+        do {
+            e.Lface = fNew;
+            e = e.Lnext;
+        } while (e != eOrig);
+    }
+
+/* KillEdge( eDel ) destroys an edge (the half-edges eDel and eDel->Sym),
+ * and removes from the global edge list.
+ */
+    static void KillEdge(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDel) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge ePrev, eNext;
+
+        /* Half-edges are allocated in pairs, see EdgePair above */
+        if (!eDel.first) {
+            eDel = eDel.Sym;
+        }
+
+        /* delete from circular doubly-linked list */
+        eNext = eDel.next;
+        ePrev = eDel.Sym.next;
+        eNext.Sym.next = ePrev;
+        ePrev.Sym.next = eNext;
+    }
+
+
+/* KillVertex( vDel ) destroys a vertex and removes it from the global
+ * vertex list.  It updates the vertex loop to point to a given new vertex.
+ */
+    static void KillVertex(com.jogamp.opengl.impl.glu.tessellator.GLUvertex vDel, com.jogamp.opengl.impl.glu.tessellator.GLUvertex newOrg) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eStart = vDel.anEdge;
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex vPrev, vNext;
+
+        /* change the origin of all affected edges */
+        e = eStart;
+        do {
+            e.Org = newOrg;
+            e = e.Onext;
+        } while (e != eStart);
+
+        /* delete from circular doubly-linked list */
+        vPrev = vDel.prev;
+        vNext = vDel.next;
+        vNext.prev = vPrev;
+        vPrev.next = vNext;
+    }
+
+/* KillFace( fDel ) destroys a face and removes it from the global face
+ * list.  It updates the face loop to point to a given new face.
+ */
+    static void KillFace(com.jogamp.opengl.impl.glu.tessellator.GLUface fDel, com.jogamp.opengl.impl.glu.tessellator.GLUface newLface) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eStart = fDel.anEdge;
+        com.jogamp.opengl.impl.glu.tessellator.GLUface fPrev, fNext;
+
+        /* change the left face of all affected edges */
+        e = eStart;
+        do {
+            e.Lface = newLface;
+            e = e.Lnext;
+        } while (e != eStart);
+
+        /* delete from circular doubly-linked list */
+        fPrev = fDel.prev;
+        fNext = fDel.next;
+        fNext.prev = fPrev;
+        fPrev.next = fNext;
+    }
+
+
+    /****************** Basic Edge Operations **********************/
+
+/* __gl_meshMakeEdge creates one edge, two vertices, and a loop (face).
+ * The loop consists of the two new half-edges.
+ */
+    public static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshMakeEdge(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex1 = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex();
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex2 = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex();
+        com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface();
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+
+        e = MakeEdge(mesh.eHead);
+        if (e == null) return null;
+
+        MakeVertex(newVertex1, e, mesh.vHead);
+        MakeVertex(newVertex2, e.Sym, mesh.vHead);
+        MakeFace(newFace, e, mesh.fHead);
+        return e;
+    }
+
+
+/* __gl_meshSplice( eOrg, eDst ) is the basic operation for changing the
+ * mesh connectivity and topology.  It changes the mesh so that
+ *	eOrg->Onext <- OLD( eDst->Onext )
+ *	eDst->Onext <- OLD( eOrg->Onext )
+ * where OLD(...) means the value before the meshSplice operation.
+ *
+ * This can have two effects on the vertex structure:
+ *  - if eOrg->Org != eDst->Org, the two vertices are merged together
+ *  - if eOrg->Org == eDst->Org, the origin is split into two vertices
+ * In both cases, eDst->Org is changed and eOrg->Org is untouched.
+ *
+ * Similarly (and independently) for the face structure,
+ *  - if eOrg->Lface == eDst->Lface, one loop is split into two
+ *  - if eOrg->Lface != eDst->Lface, two distinct loops are joined into one
+ * In both cases, eDst->Lface is changed and eOrg->Lface is unaffected.
+ *
+ * Some special cases:
+ * If eDst == eOrg, the operation has no effect.
+ * If eDst == eOrg->Lnext, the new face will have a single edge.
+ * If eDst == eOrg->Lprev, the old face will have a single edge.
+ * If eDst == eOrg->Onext, the new vertex will have a single edge.
+ * If eDst == eOrg->Oprev, the old vertex will have a single edge.
+ */
+    public static boolean __gl_meshSplice(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDst) {
+        boolean joiningLoops = false;
+        boolean joiningVertices = false;
+
+        if (eOrg == eDst) return true;
+
+        if (eDst.Org != eOrg.Org) {
+            /* We are merging two disjoint vertices -- destroy eDst->Org */
+            joiningVertices = true;
+            KillVertex(eDst.Org, eOrg.Org);
+        }
+        if (eDst.Lface != eOrg.Lface) {
+            /* We are connecting two disjoint loops -- destroy eDst.Lface */
+            joiningLoops = true;
+            KillFace(eDst.Lface, eOrg.Lface);
+        }
+
+        /* Change the edge structure */
+        Splice(eDst, eOrg);
+
+        if (!joiningVertices) {
+            com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex();
+
+            /* We split one vertex into two -- the new vertex is eDst.Org.
+             * Make sure the old vertex points to a valid half-edge.
+             */
+            MakeVertex(newVertex, eDst, eOrg.Org);
+            eOrg.Org.anEdge = eOrg;
+        }
+        if (!joiningLoops) {
+            com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface();
+
+            /* We split one loop into two -- the new loop is eDst.Lface.
+             * Make sure the old face points to a valid half-edge.
+             */
+            MakeFace(newFace, eDst, eOrg.Lface);
+            eOrg.Lface.anEdge = eOrg;
+        }
+
+        return true;
+    }
+
+
+/* __gl_meshDelete( eDel ) removes the edge eDel.  There are several cases:
+ * if (eDel.Lface != eDel.Rface), we join two loops into one; the loop
+ * eDel.Lface is deleted.  Otherwise, we are splitting one loop into two;
+ * the newly created loop will contain eDel.Dst.  If the deletion of eDel
+ * would create isolated vertices, those are deleted as well.
+ *
+ * This function could be implemented as two calls to __gl_meshSplice
+ * plus a few calls to memFree, but this would allocate and delete
+ * unnecessary vertices and faces.
+ */
+    static boolean __gl_meshDelete(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDel) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDelSym = eDel.Sym;
+        boolean joiningLoops = false;
+
+        /* First step: disconnect the origin vertex eDel.Org.  We make all
+         * changes to get a consistent mesh in this "intermediate" state.
+         */
+        if (eDel.Lface != eDel.Sym.Lface) {
+            /* We are joining two loops into one -- remove the left face */
+            joiningLoops = true;
+            KillFace(eDel.Lface, eDel.Sym.Lface);
+        }
+
+        if (eDel.Onext == eDel) {
+            KillVertex(eDel.Org, null);
+        } else {
+            /* Make sure that eDel.Org and eDel.Sym.Lface point to valid half-edges */
+            eDel.Sym.Lface.anEdge = eDel.Sym.Lnext;
+            eDel.Org.anEdge = eDel.Onext;
+
+            Splice(eDel, eDel.Sym.Lnext);
+            if (!joiningLoops) {
+                com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface();
+
+                /* We are splitting one loop into two -- create a new loop for eDel. */
+                MakeFace(newFace, eDel, eDel.Lface);
+            }
+        }
+
+        /* Claim: the mesh is now in a consistent state, except that eDel.Org
+         * may have been deleted.  Now we disconnect eDel.Dst.
+         */
+        if (eDelSym.Onext == eDelSym) {
+            KillVertex(eDelSym.Org, null);
+            KillFace(eDelSym.Lface, null);
+        } else {
+            /* Make sure that eDel.Dst and eDel.Lface point to valid half-edges */
+            eDel.Lface.anEdge = eDelSym.Sym.Lnext;
+            eDelSym.Org.anEdge = eDelSym.Onext;
+            Splice(eDelSym, eDelSym.Sym.Lnext);
+        }
+
+        /* Any isolated vertices or faces have already been freed. */
+        KillEdge(eDel);
+
+        return true;
+    }
+
+
+    /******************** Other Edge Operations **********************/
+
+/* All these routines can be implemented with the basic edge
+ * operations above.  They are provided for convenience and efficiency.
+ */
+
+
+/* __gl_meshAddEdgeVertex( eOrg ) creates a new edge eNew such that
+ * eNew == eOrg.Lnext, and eNew.Dst is a newly created vertex.
+ * eOrg and eNew will have the same left face.
+ */
+    static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshAddEdgeVertex(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNewSym;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg);
+
+        eNewSym = eNew.Sym;
+
+        /* Connect the new edge appropriately */
+        Splice(eNew, eOrg.Lnext);
+
+        /* Set the vertex and face information */
+        eNew.Org = eOrg.Sym.Org;
+        {
+            com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex();
+
+            MakeVertex(newVertex, eNewSym, eNew.Org);
+        }
+        eNew.Lface = eNewSym.Lface = eOrg.Lface;
+
+        return eNew;
+    }
+
+
+/* __gl_meshSplitEdge( eOrg ) splits eOrg into two edges eOrg and eNew,
+ * such that eNew == eOrg.Lnext.  The new vertex is eOrg.Sym.Org == eNew.Org.
+ * eOrg and eNew will have the same left face.
+ */
+    public static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshSplitEdge(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNew;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge tempHalfEdge = __gl_meshAddEdgeVertex(eOrg);
+
+        eNew = tempHalfEdge.Sym;
+
+        /* Disconnect eOrg from eOrg.Sym.Org and connect it to eNew.Org */
+        Splice(eOrg.Sym, eOrg.Sym.Sym.Lnext);
+        Splice(eOrg.Sym, eNew);
+
+        /* Set the vertex and face information */
+        eOrg.Sym.Org = eNew.Org;
+        eNew.Sym.Org.anEdge = eNew.Sym;	/* may have pointed to eOrg.Sym */
+        eNew.Sym.Lface = eOrg.Sym.Lface;
+        eNew.winding = eOrg.winding;	/* copy old winding information */
+        eNew.Sym.winding = eOrg.Sym.winding;
+
+        return eNew;
+    }
+
+
+/* __gl_meshConnect( eOrg, eDst ) creates a new edge from eOrg.Sym.Org
+ * to eDst.Org, and returns the corresponding half-edge eNew.
+ * If eOrg.Lface == eDst.Lface, this splits one loop into two,
+ * and the newly created loop is eNew.Lface.  Otherwise, two disjoint
+ * loops are merged into one, and the loop eDst.Lface is destroyed.
+ *
+ * If (eOrg == eDst), the new face will have only two edges.
+ * If (eOrg.Lnext == eDst), the old face is reduced to a single edge.
+ * If (eOrg.Lnext.Lnext == eDst), the old face is reduced to two edges.
+ */
+    static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshConnect(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDst) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNewSym;
+        boolean joiningLoops = false;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg);
+
+        eNewSym = eNew.Sym;
+
+        if (eDst.Lface != eOrg.Lface) {
+            /* We are connecting two disjoint loops -- destroy eDst.Lface */
+            joiningLoops = true;
+            KillFace(eDst.Lface, eOrg.Lface);
+        }
+
+        /* Connect the new edge appropriately */
+        Splice(eNew, eOrg.Lnext);
+        Splice(eNewSym, eDst);
+
+        /* Set the vertex and face information */
+        eNew.Org = eOrg.Sym.Org;
+        eNewSym.Org = eDst.Org;
+        eNew.Lface = eNewSym.Lface = eOrg.Lface;
+
+        /* Make sure the old face points to a valid half-edge */
+        eOrg.Lface.anEdge = eNewSym;
+
+        if (!joiningLoops) {
+            com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface();
+
+            /* We split one loop into two -- the new loop is eNew.Lface */
+            MakeFace(newFace, eNew, eOrg.Lface);
+        }
+        return eNew;
+    }
+
+
+    /******************** Other Operations **********************/
+
+/* __gl_meshZapFace( fZap ) destroys a face and removes it from the
+ * global face list.  All edges of fZap will have a null pointer as their
+ * left face.  Any edges which also have a null pointer as their right face
+ * are deleted entirely (along with any isolated vertices this produces).
+ * An entire mesh can be deleted by zapping its faces, one at a time,
+ * in any order.  Zapped faces cannot be used in further mesh operations!
+ */
+    static void __gl_meshZapFace(com.jogamp.opengl.impl.glu.tessellator.GLUface fZap) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eStart = fZap.anEdge;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eNext, eSym;
+        com.jogamp.opengl.impl.glu.tessellator.GLUface fPrev, fNext;
+
+        /* walk around face, deleting edges whose right face is also null */
+        eNext = eStart.Lnext;
+        do {
+            e = eNext;
+            eNext = e.Lnext;
+
+            e.Lface = null;
+            if (e.Sym.Lface == null) {
+                /* delete the edge -- see __gl_MeshDelete above */
+
+                if (e.Onext == e) {
+                    KillVertex(e.Org, null);
+                } else {
+                    /* Make sure that e.Org points to a valid half-edge */
+                    e.Org.anEdge = e.Onext;
+                    Splice(e, e.Sym.Lnext);
+                }
+                eSym = e.Sym;
+                if (eSym.Onext == eSym) {
+                    KillVertex(eSym.Org, null);
+                } else {
+                    /* Make sure that eSym.Org points to a valid half-edge */
+                    eSym.Org.anEdge = eSym.Onext;
+                    Splice(eSym, eSym.Sym.Lnext);
+                }
+                KillEdge(e);
+            }
+        } while (e != eStart);
+
+        /* delete from circular doubly-linked list */
+        fPrev = fZap.prev;
+        fNext = fZap.next;
+        fNext.prev = fPrev;
+        fPrev.next = fNext;
+    }
+
+
+/* __gl_meshNewMesh() creates a new mesh with no edges, no vertices,
+ * and no loops (what we usually call a "face").
+ */
+    public static com.jogamp.opengl.impl.glu.tessellator.GLUmesh __gl_meshNewMesh() {
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v;
+        com.jogamp.opengl.impl.glu.tessellator.GLUface f;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eSym;
+        com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh = new com.jogamp.opengl.impl.glu.tessellator.GLUmesh();
+
+        v = mesh.vHead;
+        f = mesh.fHead;
+        e = mesh.eHead;
+        eSym = mesh.eHeadSym;
+
+        v.next = v.prev = v;
+        v.anEdge = null;
+        v.data = null;
+
+        f.next = f.prev = f;
+        f.anEdge = null;
+        f.data = null;
+        f.trail = null;
+        f.marked = false;
+        f.inside = false;
+
+        e.next = e;
+        e.Sym = eSym;
+        e.Onext = null;
+        e.Lnext = null;
+        e.Org = null;
+        e.Lface = null;
+        e.winding = 0;
+        e.activeRegion = null;
+
+        eSym.next = eSym;
+        eSym.Sym = e;
+        eSym.Onext = null;
+        eSym.Lnext = null;
+        eSym.Org = null;
+        eSym.Lface = null;
+        eSym.winding = 0;
+        eSym.activeRegion = null;
+
+        return mesh;
+    }
+
+
+/* __gl_meshUnion( mesh1, mesh2 ) forms the union of all structures in
+ * both meshes, and returns the new mesh (the old meshes are destroyed).
+ */
+    static com.jogamp.opengl.impl.glu.tessellator.GLUmesh __gl_meshUnion(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh1, com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh2) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUface f1 = mesh1.fHead;
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v1 = mesh1.vHead;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e1 = mesh1.eHead;
+        com.jogamp.opengl.impl.glu.tessellator.GLUface f2 = mesh2.fHead;
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v2 = mesh2.vHead;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e2 = mesh2.eHead;
+
+        /* Add the faces, vertices, and edges of mesh2 to those of mesh1 */
+        if (f2.next != f2) {
+            f1.prev.next = f2.next;
+            f2.next.prev = f1.prev;
+            f2.prev.next = f1;
+            f1.prev = f2.prev;
+        }
+
+        if (v2.next != v2) {
+            v1.prev.next = v2.next;
+            v2.next.prev = v1.prev;
+            v2.prev.next = v1;
+            v1.prev = v2.prev;
+        }
+
+        if (e2.next != e2) {
+            e1.Sym.next.Sym.next = e2.next;
+            e2.next.Sym.next = e1.Sym.next;
+            e2.Sym.next.Sym.next = e1;
+            e1.Sym.next = e2.Sym.next;
+        }
+
+        return mesh1;
+    }
+
+
+/* __gl_meshDeleteMesh( mesh ) will free all storage for any valid mesh.
+ */
+    static void __gl_meshDeleteMeshZap(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUface fHead = mesh.fHead;
+
+        while (fHead.next != fHead) {
+            __gl_meshZapFace(fHead.next);
+        }
+        assert (mesh.vHead.next == mesh.vHead);
+    }
+
+/* __gl_meshDeleteMesh( mesh ) will free all storage for any valid mesh.
+ */
+    public static void __gl_meshDeleteMesh(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUface f, fNext;
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vNext;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eNext;
+
+        for (f = mesh.fHead.next; f != mesh.fHead; f = fNext) {
+            fNext = f.next;
+        }
+
+        for (v = mesh.vHead.next; v != mesh.vHead; v = vNext) {
+            vNext = v.next;
+        }
+
+        for (e = mesh.eHead.next; e != mesh.eHead; e = eNext) {
+            /* One call frees both e and e.Sym (see EdgePair above) */
+            eNext = e.next;
+        }
+    }
+
+/* __gl_meshCheckMesh( mesh ) checks a mesh for self-consistency.
+ */
+    public static void __gl_meshCheckMesh(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUface fHead = mesh.fHead;
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex vHead = mesh.vHead;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eHead = mesh.eHead;
+        com.jogamp.opengl.impl.glu.tessellator.GLUface f, fPrev;
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vPrev;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, ePrev;
+
+        fPrev = fHead;
+        for (fPrev = fHead; (f = fPrev.next) != fHead; fPrev = f) {
+            assert (f.prev == fPrev);
+            e = f.anEdge;
+            do {
+                assert (e.Sym != e);
+                assert (e.Sym.Sym == e);
+                assert (e.Lnext.Onext.Sym == e);
+                assert (e.Onext.Sym.Lnext == e);
+                assert (e.Lface == f);
+                e = e.Lnext;
+            } while (e != f.anEdge);
+        }
+        assert (f.prev == fPrev && f.anEdge == null && f.data == null);
+
+        vPrev = vHead;
+        for (vPrev = vHead; (v = vPrev.next) != vHead; vPrev = v) {
+            assert (v.prev == vPrev);
+            e = v.anEdge;
+            do {
+                assert (e.Sym != e);
+                assert (e.Sym.Sym == e);
+                assert (e.Lnext.Onext.Sym == e);
+                assert (e.Onext.Sym.Lnext == e);
+                assert (e.Org == v);
+                e = e.Onext;
+            } while (e != v.anEdge);
+        }
+        assert (v.prev == vPrev && v.anEdge == null && v.data == null);
+
+        ePrev = eHead;
+        for (ePrev = eHead; (e = ePrev.next) != eHead; ePrev = e) {
+            assert (e.Sym.next == ePrev.Sym);
+            assert (e.Sym != e);
+            assert (e.Sym.Sym == e);
+            assert (e.Org != null);
+            assert (e.Sym.Org != null);
+            assert (e.Lnext.Onext.Sym == e);
+            assert (e.Onext.Sym.Lnext == e);
+        }
+        assert (e.Sym.next == ePrev.Sym
+                && e.Sym == mesh.eHeadSym
+                && e.Sym.Sym == e
+                && e.Org == null && e.Sym.Org == null
+                && e.Lface == null && e.Sym.Lface == null);
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Normal.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Normal.java
new file mode 100644
index 000000000..fe1a20c49
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Normal.java
@@ -0,0 +1,288 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+
+class Normal {
+    private Normal() {
+    }
+
+    static boolean SLANTED_SWEEP = false;
+    static double S_UNIT_X;	/* Pre-normalized */
+    static double S_UNIT_Y;
+    private static final boolean TRUE_PROJECT = false;
+
+    static {
+        if (SLANTED_SWEEP) {
+/* The "feature merging" is not intended to be complete.  There are
+ * special cases where edges are nearly parallel to the sweep line
+ * which are not implemented.  The algorithm should still behave
+ * robustly (ie. produce a reasonable tesselation) in the presence
+ * of such edges, however it may miss features which could have been
+ * merged.  We could minimize this effect by choosing the sweep line
+ * direction to be something unusual (ie. not parallel to one of the
+ * coordinate axes).
+ */
+            S_UNIT_X = 0.50941539564955385;	/* Pre-normalized */
+            S_UNIT_Y = 0.86052074622010633;
+        } else {
+            S_UNIT_X = 1.0;
+            S_UNIT_Y = 0.0;
+        }
+    }
+
+    private static double Dot(double[] u, double[] v) {
+        return (u[0] * v[0] + u[1] * v[1] + u[2] * v[2]);
+    }
+
+    static void Normalize(double[] v) {
+        double len = v[0] * v[0] + v[1] * v[1] + v[2] * v[2];
+
+        assert (len > 0);
+        len = Math.sqrt(len);
+        v[0] /= len;
+        v[1] /= len;
+        v[2] /= len;
+    }
+
+    static int LongAxis(double[] v) {
+        int i = 0;
+
+        if (Math.abs(v[1]) > Math.abs(v[0])) {
+            i = 1;
+        }
+        if (Math.abs(v[2]) > Math.abs(v[i])) {
+            i = 2;
+        }
+        return i;
+    }
+
+    static void ComputeNormal(GLUtessellatorImpl tess, double[] norm) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, v1, v2;
+        double c, tLen2, maxLen2;
+        double[] maxVal, minVal, d1, d2, tNorm;
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex[] maxVert, minVert;
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex vHead = tess.mesh.vHead;
+        int i;
+
+        maxVal = new double[3];
+        minVal = new double[3];
+        minVert = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex[3];
+        maxVert = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex[3];
+        d1 = new double[3];
+        d2 = new double[3];
+        tNorm = new double[3];
+
+        maxVal[0] = maxVal[1] = maxVal[2] = -2 * GLU.GLU_TESS_MAX_COORD;
+        minVal[0] = minVal[1] = minVal[2] = 2 * GLU.GLU_TESS_MAX_COORD;
+
+        for (v = vHead.next; v != vHead; v = v.next) {
+            for (i = 0; i < 3; ++i) {
+                c = v.coords[i];
+                if (c < minVal[i]) {
+                    minVal[i] = c;
+                    minVert[i] = v;
+                }
+                if (c > maxVal[i]) {
+                    maxVal[i] = c;
+                    maxVert[i] = v;
+                }
+            }
+        }
+
+/* Find two vertices separated by at least 1/sqrt(3) of the maximum
+         * distance between any two vertices
+         */
+        i = 0;
+        if (maxVal[1] - minVal[1] > maxVal[0] - minVal[0]) {
+            i = 1;
+        }
+        if (maxVal[2] - minVal[2] > maxVal[i] - minVal[i]) {
+            i = 2;
+        }
+        if (minVal[i] >= maxVal[i]) {
+/* All vertices are the same -- normal doesn't matter */
+            norm[0] = 0;
+            norm[1] = 0;
+            norm[2] = 1;
+            return;
+        }
+
+/* Look for a third vertex which forms the triangle with maximum area
+         * (Length of normal == twice the triangle area)
+         */
+        maxLen2 = 0;
+        v1 = minVert[i];
+        v2 = maxVert[i];
+        d1[0] = v1.coords[0] - v2.coords[0];
+        d1[1] = v1.coords[1] - v2.coords[1];
+        d1[2] = v1.coords[2] - v2.coords[2];
+        for (v = vHead.next; v != vHead; v = v.next) {
+            d2[0] = v.coords[0] - v2.coords[0];
+            d2[1] = v.coords[1] - v2.coords[1];
+            d2[2] = v.coords[2] - v2.coords[2];
+            tNorm[0] = d1[1] * d2[2] - d1[2] * d2[1];
+            tNorm[1] = d1[2] * d2[0] - d1[0] * d2[2];
+            tNorm[2] = d1[0] * d2[1] - d1[1] * d2[0];
+            tLen2 = tNorm[0] * tNorm[0] + tNorm[1] * tNorm[1] + tNorm[2] * tNorm[2];
+            if (tLen2 > maxLen2) {
+                maxLen2 = tLen2;
+                norm[0] = tNorm[0];
+                norm[1] = tNorm[1];
+                norm[2] = tNorm[2];
+            }
+        }
+
+        if (maxLen2 <= 0) {
+/* All points lie on a single line -- any decent normal will do */
+            norm[0] = norm[1] = norm[2] = 0;
+            norm[LongAxis(d1)] = 1;
+        }
+    }
+
+    static void CheckOrientation(GLUtessellatorImpl tess) {
+        double area;
+        com.jogamp.opengl.impl.glu.tessellator.GLUface f, fHead = tess.mesh.fHead;
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+
+/* When we compute the normal automatically, we choose the orientation
+ * so that the the sum of the signed areas of all contours is non-negative.
+ */
+        area = 0;
+        for (f = fHead.next; f != fHead; f = f.next) {
+            e = f.anEdge;
+            if (e.winding <= 0) continue;
+            do {
+                area += (e.Org.s - e.Sym.Org.s) * (e.Org.t + e.Sym.Org.t);
+                e = e.Lnext;
+            } while (e != f.anEdge);
+        }
+        if (area < 0) {
+/* Reverse the orientation by flipping all the t-coordinates */
+            for (v = vHead.next; v != vHead; v = v.next) {
+                v.t = -v.t;
+            }
+            tess.tUnit[0] = -tess.tUnit[0];
+            tess.tUnit[1] = -tess.tUnit[1];
+            tess.tUnit[2] = -tess.tUnit[2];
+        }
+    }
+
+/* Determine the polygon normal and project vertices onto the plane
+ * of the polygon.
+ */
+    public static void __gl_projectPolygon(GLUtessellatorImpl tess) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead;
+        double w;
+        double[] norm = new double[3];
+        double[] sUnit, tUnit;
+        int i;
+        boolean computedNormal = false;
+
+        norm[0] = tess.normal[0];
+        norm[1] = tess.normal[1];
+        norm[2] = tess.normal[2];
+        if (norm[0] == 0 && norm[1] == 0 && norm[2] == 0) {
+            ComputeNormal(tess, norm);
+            computedNormal = true;
+        }
+        sUnit = tess.sUnit;
+        tUnit = tess.tUnit;
+        i = LongAxis(norm);
+
+        if (TRUE_PROJECT) {
+/* Choose the initial sUnit vector to be approximately perpendicular
+ * to the normal.
+ */
+            Normalize(norm);
+
+            sUnit[i] = 0;
+            sUnit[(i + 1) % 3] = S_UNIT_X;
+            sUnit[(i + 2) % 3] = S_UNIT_Y;
+
+/* Now make it exactly perpendicular */
+            w = Dot(sUnit, norm);
+            sUnit[0] -= w * norm[0];
+            sUnit[1] -= w * norm[1];
+            sUnit[2] -= w * norm[2];
+            Normalize(sUnit);
+
+/* Choose tUnit so that (sUnit,tUnit,norm) form a right-handed frame */
+            tUnit[0] = norm[1] * sUnit[2] - norm[2] * sUnit[1];
+            tUnit[1] = norm[2] * sUnit[0] - norm[0] * sUnit[2];
+            tUnit[2] = norm[0] * sUnit[1] - norm[1] * sUnit[0];
+            Normalize(tUnit);
+        } else {
+/* Project perpendicular to a coordinate axis -- better numerically */
+            sUnit[i] = 0;
+            sUnit[(i + 1) % 3] = S_UNIT_X;
+            sUnit[(i + 2) % 3] = S_UNIT_Y;
+
+            tUnit[i] = 0;
+            tUnit[(i + 1) % 3] = (norm[i] > 0) ? -S_UNIT_Y : S_UNIT_Y;
+            tUnit[(i + 2) % 3] = (norm[i] > 0) ? S_UNIT_X : -S_UNIT_X;
+        }
+
+/* Project the vertices onto the sweep plane */
+        for (v = vHead.next; v != vHead; v = v.next) {
+            v.s = Dot(v.coords, sUnit);
+            v.t = Dot(v.coords, tUnit);
+        }
+        if (computedNormal) {
+            CheckOrientation(tess);
+        }
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQ.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQ.java
new file mode 100644
index 000000000..b77305ae2
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQ.java
@@ -0,0 +1,100 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+abstract class PriorityQ {
+    public static final int INIT_SIZE = 32;
+
+    public static class PQnode {
+        int handle;
+    }
+
+    public static class PQhandleElem {
+        Object key;
+        int node;
+    }
+
+    public static interface Leq {
+        boolean leq(Object key1, Object key2);
+    }
+
+    //    #ifdef FOR_TRITE_TEST_PROGRAM
+//    private static boolean LEQ(PriorityQCommon.Leq leq, Object x,Object y) {
+//        return pq.leq.leq(x,y);
+//    }
+//    #else
+/* Violates modularity, but a little faster */
+//    #include "geom.h"
+    public static boolean LEQ(Leq leq, Object x, Object y) {
+        return com.jogamp.opengl.impl.glu.tessellator.Geom.VertLeq((com.jogamp.opengl.impl.glu.tessellator.GLUvertex) x, (com.jogamp.opengl.impl.glu.tessellator.GLUvertex) y);
+    }
+
+    static PriorityQ pqNewPriorityQ(Leq leq) {
+        return new PriorityQSort(leq);
+    }
+
+    abstract void pqDeletePriorityQ();
+
+    abstract boolean pqInit();
+
+    abstract int pqInsert(Object keyNew);
+
+    abstract Object pqExtractMin();
+
+    abstract void pqDelete(int hCurr);
+
+    abstract Object pqMinimum();
+
+    abstract boolean pqIsEmpty();
+//    #endif
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQHeap.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQHeap.java
new file mode 100644
index 000000000..61aa9574f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQHeap.java
@@ -0,0 +1,262 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
+    com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] nodes;
+    com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] handles;
+    int size, max;
+    int freeList;
+    boolean initialized;
+    com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq;
+
+/* really __gl_pqHeapNewPriorityQ */
+    public PriorityQHeap(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq) {
+        size = 0;
+        max = com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE;
+        nodes = new com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE + 1];
+        for (int i = 0; i < nodes.length; i++) {
+            nodes[i] = new PQnode();
+        }
+        handles = new com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE + 1];
+        for (int i = 0; i < handles.length; i++) {
+            handles[i] = new PQhandleElem();
+        }
+        initialized = false;
+        freeList = 0;
+        this.leq = leq;
+
+        nodes[1].handle = 1;	/* so that Minimum() returns NULL */
+        handles[1].key = null;
+    }
+
+/* really __gl_pqHeapDeletePriorityQ */
+    void pqDeletePriorityQ() {
+        handles = null;
+        nodes = null;
+    }
+
+    void FloatDown(int curr) {
+        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
+        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
+        int hCurr, hChild;
+        int child;
+
+        hCurr = n[curr].handle;
+        for (; ;) {
+            child = curr << 1;
+            if (child < size && LEQ(leq, h[n[child + 1].handle].key,
+                    h[n[child].handle].key)) {
+                ++child;
+            }
+
+            assert (child <= max);
+
+            hChild = n[child].handle;
+            if (child > size || LEQ(leq, h[hCurr].key, h[hChild].key)) {
+                n[curr].handle = hCurr;
+                h[hCurr].node = curr;
+                break;
+            }
+            n[curr].handle = hChild;
+            h[hChild].node = curr;
+            curr = child;
+        }
+    }
+
+
+    void FloatUp(int curr) {
+        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
+        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
+        int hCurr, hParent;
+        int parent;
+
+        hCurr = n[curr].handle;
+        for (; ;) {
+            parent = curr >> 1;
+            hParent = n[parent].handle;
+            if (parent == 0 || LEQ(leq, h[hParent].key, h[hCurr].key)) {
+                n[curr].handle = hCurr;
+                h[hCurr].node = curr;
+                break;
+            }
+            n[curr].handle = hParent;
+            h[hParent].node = curr;
+            curr = parent;
+        }
+    }
+
+/* really __gl_pqHeapInit */
+    boolean pqInit() {
+        int i;
+
+        /* This method of building a heap is O(n), rather than O(n lg n). */
+
+        for (i = size; i >= 1; --i) {
+            FloatDown(i);
+        }
+        initialized = true;
+
+        return true;
+    }
+
+/* really __gl_pqHeapInsert */
+/* returns LONG_MAX iff out of memory */
+    int pqInsert(Object keyNew) {
+        int curr;
+        int free;
+
+        curr = ++size;
+        if ((curr * 2) > max) {
+            com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] saveNodes = nodes;
+            com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] saveHandles = handles;
+
+            /* If the heap overflows, double its size. */
+            max <<= 1;
+//            pq->nodes = (PQnode *)memRealloc( pq->nodes, (size_t) ((pq->max + 1) * sizeof( pq->nodes[0] )));
+            PriorityQ.PQnode[] pqNodes = new PriorityQ.PQnode[max + 1];
+            System.arraycopy( nodes, 0, pqNodes, 0, nodes.length );
+            for (int i = nodes.length; i < pqNodes.length; i++) {
+                pqNodes[i] = new PQnode();
+            }
+            nodes = pqNodes;
+            if (nodes == null) {
+                nodes = saveNodes;	/* restore ptr to free upon return */
+                return Integer.MAX_VALUE;
+            }
+
+//            pq->handles = (PQhandleElem *)memRealloc( pq->handles,(size_t)((pq->max + 1) * sizeof( pq->handles[0] )));
+            PriorityQ.PQhandleElem[] pqHandles = new PriorityQ.PQhandleElem[max + 1];
+            System.arraycopy( handles, 0, pqHandles, 0, handles.length );
+            for (int i = handles.length; i < pqHandles.length; i++) {
+                pqHandles[i] = new PQhandleElem();
+            }
+            handles = pqHandles;
+            if (handles == null) {
+                handles = saveHandles; /* restore ptr to free upon return */
+                return Integer.MAX_VALUE;
+            }
+        }
+
+        if (freeList == 0) {
+            free = curr;
+        } else {
+            free = freeList;
+            freeList = handles[free].node;
+        }
+
+        nodes[curr].handle = free;
+        handles[free].node = curr;
+        handles[free].key = keyNew;
+
+        if (initialized) {
+            FloatUp(curr);
+        }
+        assert (free != Integer.MAX_VALUE);
+        return free;
+    }
+
+/* really __gl_pqHeapExtractMin */
+    Object pqExtractMin() {
+        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
+        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
+        int hMin = n[1].handle;
+        Object min = h[hMin].key;
+
+        if (size > 0) {
+            n[1].handle = n[size].handle;
+            h[n[1].handle].node = 1;
+
+            h[hMin].key = null;
+            h[hMin].node = freeList;
+            freeList = hMin;
+
+            if (--size > 0) {
+                FloatDown(1);
+            }
+        }
+        return min;
+    }
+
+/* really __gl_pqHeapDelete */
+    void pqDelete(int hCurr) {
+        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
+        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
+        int curr;
+
+        assert (hCurr >= 1 && hCurr <= max && h[hCurr].key != null);
+
+        curr = h[hCurr].node;
+        n[curr].handle = n[size].handle;
+        h[n[curr].handle].node = curr;
+
+        if (curr <= --size) {
+            if (curr <= 1 || LEQ(leq, h[n[curr >> 1].handle].key, h[n[curr].handle].key)) {
+                FloatDown(curr);
+            } else {
+                FloatUp(curr);
+            }
+        }
+        h[hCurr].key = null;
+        h[hCurr].node = freeList;
+        freeList = hCurr;
+    }
+
+    Object pqMinimum() {
+        return handles[nodes[1].handle].key;
+    }
+
+    boolean pqIsEmpty() {
+        return size == 0;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQSort.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQSort.java
new file mode 100644
index 000000000..f115b8f49
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQSort.java
@@ -0,0 +1,278 @@
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class PriorityQSort extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
+    com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap heap;
+    Object[] keys;
+
+    // JAVA: 'order' contains indices into the keys array.
+    // This simulates the indirect pointers used in the original C code
+    // (from Frank Suykens, Luciad.com).
+    int[] order;
+    int size, max;
+    boolean initialized;
+    com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq;
+
+    public PriorityQSort(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq) {
+        heap = new com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap(leq);
+
+        keys = new Object[com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE];
+
+        size = 0;
+        max = com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE;
+        initialized = false;
+        this.leq = leq;
+    }
+
+/* really __gl_pqSortDeletePriorityQ */
+    void pqDeletePriorityQ() {
+        if (heap != null) heap.pqDeletePriorityQ();
+        order = null;
+        keys = null;
+    }
+
+    private static boolean LT(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) {
+        return (!com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, y, x));
+    }
+
+    private static boolean GT(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) {
+        return (!com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, x, y));
+    }
+
+    private static void Swap(int[] array, int a, int b) {
+        if (true) {
+            int tmp = array[a];
+            array[a] = array[b];
+            array[b] = tmp;
+        } else {
+
+        }
+    }
+
+    private static class Stack {
+        int p, r;
+    }
+
+/* really __gl_pqSortInit */
+    boolean pqInit() {
+        int p, r, i, j;
+        int piv;
+        Stack[] stack = new Stack[50];
+        for (int k = 0; k < stack.length; k++) {
+            stack[k] = new Stack();
+        }
+        int top = 0;
+
+        int seed = 2016473283;
+
+        /* Create an array of indirect pointers to the keys, so that we
+         * the handles we have returned are still valid.
+         */
+        order = new int[size + 1];
+/* the previous line is a patch to compensate for the fact that IBM */
+/* machines return a null on a malloc of zero bytes (unlike SGI),   */
+/* so we have to put in this defense to guard against a memory      */
+/* fault four lines down. from fossum@austin.ibm.com.               */
+        p = 0;
+        r = size - 1;
+        for (piv = 0, i = p; i <= r; ++piv, ++i) {
+            // indirect pointers: keep an index into the keys array, not a direct pointer to its contents
+            order[i] = piv;
+        }
+
+        /* Sort the indirect pointers in descending order,
+         * using randomized Quicksort
+         */
+        stack[top].p = p;
+        stack[top].r = r;
+        ++top;
+        while (--top >= 0) {
+            p = stack[top].p;
+            r = stack[top].r;
+            while (r > p + 10) {
+                seed = Math.abs( seed * 1539415821 + 1 );
+                i = p + seed % (r - p + 1);
+                piv = order[i];
+                order[i] = order[p];
+                order[p] = piv;
+                i = p - 1;
+                j = r + 1;
+                do {
+                    do {
+                        ++i;
+                    } while (GT(leq, keys[order[i]], keys[piv]));
+                    do {
+                        --j;
+                    } while (LT(leq, keys[order[j]], keys[piv]));
+                    Swap(order, i, j);
+                } while (i < j);
+                Swap(order, i, j);	/* Undo last swap */
+                if (i - p < r - j) {
+                    stack[top].p = j + 1;
+                    stack[top].r = r;
+                    ++top;
+                    r = i - 1;
+                } else {
+                    stack[top].p = p;
+                    stack[top].r = i - 1;
+                    ++top;
+                    p = j + 1;
+                }
+            }
+            /* Insertion sort small lists */
+            for (i = p + 1; i <= r; ++i) {
+                piv = order[i];
+                for (j = i; j > p && LT(leq, keys[order[j - 1]], keys[piv]); --j) {
+                    order[j] = order[j - 1];
+                }
+                order[j] = piv;
+            }
+        }
+        max = size;
+        initialized = true;
+        heap.pqInit();	/* always succeeds */
+
+/*        #ifndef NDEBUG
+        p = order;
+        r = p + size - 1;
+        for (i = p; i < r; ++i) {
+            Assertion.doAssert(LEQ(     * * (i + 1), **i ));
+        }
+        #endif*/
+
+        return true;
+    }
+
+/* really __gl_pqSortInsert */
+/* returns LONG_MAX iff out of memory */
+    int pqInsert(Object keyNew) {
+        int curr;
+
+        if (initialized) {
+            return heap.pqInsert(keyNew);
+        }
+        curr = size;
+        if (++size >= max) {
+            Object[] saveKey = keys;
+
+            /* If the heap overflows, double its size. */
+            max <<= 1;
+//            pq->keys = (PQHeapKey *)memRealloc( pq->keys,(size_t)(pq->max * sizeof( pq->keys[0] )));
+            Object[] pqKeys = new Object[max];
+            System.arraycopy( keys, 0, pqKeys, 0, keys.length );
+            keys = pqKeys;
+            if (keys == null) {
+                keys = saveKey;	/* restore ptr to free upon return */
+                return Integer.MAX_VALUE;
+            }
+        }
+        assert curr != Integer.MAX_VALUE;
+        keys[curr] = keyNew;
+
+        /* Negative handles index the sorted array. */
+        return -(curr + 1);
+    }
+
+/* really __gl_pqSortExtractMin */
+    Object pqExtractMin() {
+        Object sortMin, heapMin;
+
+        if (size == 0) {
+            return heap.pqExtractMin();
+        }
+        sortMin = keys[order[size - 1]];
+        if (!heap.pqIsEmpty()) {
+            heapMin = heap.pqMinimum();
+            if (LEQ(leq, heapMin, sortMin)) {
+                return heap.pqExtractMin();
+            }
+        }
+        do {
+            --size;
+        } while (size > 0 && keys[order[size - 1]] == null);
+        return sortMin;
+    }
+
+/* really __gl_pqSortMinimum */
+    Object pqMinimum() {
+        Object sortMin, heapMin;
+
+        if (size == 0) {
+            return heap.pqMinimum();
+        }
+        sortMin = keys[order[size - 1]];
+        if (!heap.pqIsEmpty()) {
+            heapMin = heap.pqMinimum();
+            if (com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, heapMin, sortMin)) {
+                return heapMin;
+            }
+        }
+        return sortMin;
+    }
+
+/* really __gl_pqSortIsEmpty */
+    boolean pqIsEmpty() {
+        return (size == 0) && heap.pqIsEmpty();
+    }
+
+/* really __gl_pqSortDelete */
+    void pqDelete(int curr) {
+        if (curr >= 0) {
+            heap.pqDelete(curr);
+            return;
+        }
+        curr = -(curr + 1);
+        assert curr < max && keys[curr] != null;
+
+        keys[curr] = null;
+        while (size > 0 && keys[order[size - 1]] == null) {
+            --size;
+        }
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Render.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Render.java
new file mode 100644
index 000000000..9761200e0
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Render.java
@@ -0,0 +1,557 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+
+class Render {
+    private static final boolean USE_OPTIMIZED_CODE_PATH = false;
+
+    private Render() {
+    }
+
+    private static final RenderFan renderFan = new RenderFan();
+    private static final RenderStrip renderStrip = new RenderStrip();
+    private static final RenderTriangle renderTriangle = new RenderTriangle();
+
+/* This structure remembers the information we need about a primitive
+ * to be able to render it later, once we have determined which
+ * primitive is able to use the most triangles.
+ */
+    private static class FaceCount {
+        public FaceCount() {
+        }
+
+        public FaceCount(long size, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eStart, renderCallBack render) {
+            this.size = size;
+            this.eStart = eStart;
+            this.render = render;
+        }
+
+        long size;		/* number of triangles used */
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eStart;	/* edge where this primitive starts */
+        renderCallBack render;
+    };
+
+    private static interface renderCallBack {
+        void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size);
+    }
+
+    /************************ Strips and Fans decomposition ******************/
+
+/* __gl_renderMesh( tess, mesh ) takes a mesh and breaks it into triangle
+ * fans, strips, and separate triangles.  A substantial effort is made
+ * to use as few rendering primitives as possible (ie. to make the fans
+ * and strips as large as possible).
+ *
+ * The rendering output is provided as callbacks (see the api).
+ */
+    public static void __gl_renderMesh(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUface f;
+
+        /* Make a list of separate triangles so we can render them all at once */
+        tess.lonelyTriList = null;
+
+        for (f = mesh.fHead.next; f != mesh.fHead; f = f.next) {
+            f.marked = false;
+        }
+        for (f = mesh.fHead.next; f != mesh.fHead; f = f.next) {
+
+            /* We examine all faces in an arbitrary order.  Whenever we find
+             * an unprocessed face F, we output a group of faces including F
+             * whose size is maximum.
+             */
+            if (f.inside && !f.marked) {
+                RenderMaximumFaceGroup(tess, f);
+                assert (f.marked);
+            }
+        }
+        if (tess.lonelyTriList != null) {
+            RenderLonelyTriangles(tess, tess.lonelyTriList);
+            tess.lonelyTriList = null;
+        }
+    }
+
+
+    static void RenderMaximumFaceGroup(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUface fOrig) {
+        /* We want to find the largest triangle fan or strip of unmarked faces
+         * which includes the given face fOrig.  There are 3 possible fans
+         * passing through fOrig (one centered at each vertex), and 3 possible
+         * strips (one for each CCW permutation of the vertices).  Our strategy
+         * is to try all of these, and take the primitive which uses the most
+         * triangles (a greedy approach).
+         */
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e = fOrig.anEdge;
+        FaceCount max = new FaceCount();
+        FaceCount newFace = new FaceCount();
+
+        max.size = 1;
+        max.eStart = e;
+        max.render = renderTriangle;
+
+        if (!tess.flagBoundary) {
+            newFace = MaximumFan(e);
+            if (newFace.size > max.size) {
+                max = newFace;
+            }
+            newFace = MaximumFan(e.Lnext);
+            if (newFace.size > max.size) {
+                max = newFace;
+            }
+            newFace = MaximumFan(e.Onext.Sym);
+            if (newFace.size > max.size) {
+                max = newFace;
+            }
+
+            newFace = MaximumStrip(e);
+            if (newFace.size > max.size) {
+                max = newFace;
+            }
+            newFace = MaximumStrip(e.Lnext);
+            if (newFace.size > max.size) {
+                max = newFace;
+            }
+            newFace = MaximumStrip(e.Onext.Sym);
+            if (newFace.size > max.size) {
+                max = newFace;
+            }
+        }
+        max.render.render(tess, max.eStart, max.size);
+    }
+
+
+/* Macros which keep track of faces we have marked temporarily, and allow
+ * us to backtrack when necessary.  With triangle fans, this is not
+ * really necessary, since the only awkward case is a loop of triangles
+ * around a single origin vertex.  However with strips the situation is
+ * more complicated, and we need a general tracking method like the
+ * one here.
+ */
+    private static boolean Marked(com.jogamp.opengl.impl.glu.tessellator.GLUface f) {
+        return !f.inside || f.marked;
+    }
+
+    private static GLUface AddToTrail(com.jogamp.opengl.impl.glu.tessellator.GLUface f, com.jogamp.opengl.impl.glu.tessellator.GLUface t) {
+        f.trail = t;
+        f.marked = true;
+        return f;
+    }
+
+    private static void FreeTrail(com.jogamp.opengl.impl.glu.tessellator.GLUface t) {
+        if (true) {
+            while (t != null) {
+                t.marked = false;
+                t = t.trail;
+            }
+        } else {
+            /* absorb trailing semicolon */
+        }
+    }
+
+    static FaceCount MaximumFan(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig) {
+        /* eOrig.Lface is the face we want to render.  We want to find the size
+         * of a maximal fan around eOrig.Org.  To do this we just walk around
+         * the origin vertex as far as possible in both directions.
+         */
+        FaceCount newFace = new FaceCount(0, null, renderFan);
+        com.jogamp.opengl.impl.glu.tessellator.GLUface trail = null;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+
+        for (e = eOrig; !Marked(e.Lface); e = e.Onext) {
+            trail = AddToTrail(e.Lface, trail);
+            ++newFace.size;
+        }
+        for (e = eOrig; !Marked(e.Sym.Lface); e = e.Sym.Lnext) {
+            trail = AddToTrail(e.Sym.Lface, trail);
+            ++newFace.size;
+        }
+        newFace.eStart = e;
+        /*LINTED*/
+        FreeTrail(trail);
+        return newFace;
+    }
+
+
+    private static boolean IsEven(long n) {
+        return (n & 0x1L) == 0;
+    }
+
+    static FaceCount MaximumStrip(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig) {
+        /* Here we are looking for a maximal strip that contains the vertices
+         * eOrig.Org, eOrig.Dst, eOrig.Lnext.Dst (in that order or the
+         * reverse, such that all triangles are oriented CCW).
+         *
+         * Again we walk forward and backward as far as possible.  However for
+         * strips there is a twist: to get CCW orientations, there must be
+         * an *even* number of triangles in the strip on one side of eOrig.
+         * We walk the strip starting on a side with an even number of triangles;
+         * if both side have an odd number, we are forced to shorten one side.
+         */
+        FaceCount newFace = new FaceCount(0, null, renderStrip);
+        long headSize = 0, tailSize = 0;
+        com.jogamp.opengl.impl.glu.tessellator.GLUface trail = null;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eTail, eHead;
+
+        for (e = eOrig; !Marked(e.Lface); ++tailSize, e = e.Onext) {
+            trail = AddToTrail(e.Lface, trail);
+            ++tailSize;
+            e = e.Lnext.Sym;
+            if (Marked(e.Lface)) break;
+            trail = AddToTrail(e.Lface, trail);
+        }
+        eTail = e;
+
+        for (e = eOrig; !Marked(e.Sym.Lface); ++headSize, e = e.Sym.Onext.Sym) {
+            trail = AddToTrail(e.Sym.Lface, trail);
+            ++headSize;
+            e = e.Sym.Lnext;
+            if (Marked(e.Sym.Lface)) break;
+            trail = AddToTrail(e.Sym.Lface, trail);
+        }
+        eHead = e;
+
+        newFace.size = tailSize + headSize;
+        if (IsEven(tailSize)) {
+            newFace.eStart = eTail.Sym;
+        } else if (IsEven(headSize)) {
+            newFace.eStart = eHead;
+        } else {
+            /* Both sides have odd length, we must shorten one of them.  In fact,
+             * we must start from eHead to guarantee inclusion of eOrig.Lface.
+             */
+            --newFace.size;
+            newFace.eStart = eHead.Onext;
+        }
+        /*LINTED*/
+        FreeTrail(trail);
+        return newFace;
+    }
+
+    private static class RenderTriangle implements renderCallBack {
+        public void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
+            /* Just add the triangle to a triangle list, so we can render all
+             * the separate triangles at once.
+             */
+            assert (size == 1);
+            tess.lonelyTriList = AddToTrail(e.Lface, tess.lonelyTriList);
+        }
+    }
+
+
+    static void RenderLonelyTriangles(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUface f) {
+        /* Now we render all the separate triangles which could not be
+         * grouped into a triangle fan or strip.
+         */
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+        int newState;
+        int edgeState = -1;	/* force edge state output for first vertex */
+
+        tess.callBeginOrBeginData(GL.GL_TRIANGLES);
+
+        for (; f != null; f = f.trail) {
+            /* Loop once for each edge (there will always be 3 edges) */
+
+            e = f.anEdge;
+            do {
+                if (tess.flagBoundary) {
+                    /* Set the "edge state" to true just before we output the
+                     * first vertex of each edge on the polygon boundary.
+                     */
+                    newState = (!e.Sym.Lface.inside) ? 1 : 0;
+                    if (edgeState != newState) {
+                        edgeState = newState;
+                        tess.callEdgeFlagOrEdgeFlagData( edgeState != 0);
+                    }
+                }
+                tess.callVertexOrVertexData( e.Org.data);
+
+                e = e.Lnext;
+            } while (e != f.anEdge);
+        }
+        tess.callEndOrEndData();
+    }
+
+    private static class RenderFan implements renderCallBack {
+        public void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
+            /* Render as many CCW triangles as possible in a fan starting from
+             * edge "e".  The fan *should* contain exactly "size" triangles
+             * (otherwise we've goofed up somewhere).
+             */
+            tess.callBeginOrBeginData( GL.GL_TRIANGLE_FAN);
+            tess.callVertexOrVertexData( e.Org.data);
+            tess.callVertexOrVertexData( e.Sym.Org.data);
+
+            while (!Marked(e.Lface)) {
+                e.Lface.marked = true;
+                --size;
+                e = e.Onext;
+                tess.callVertexOrVertexData( e.Sym.Org.data);
+            }
+
+            assert (size == 0);
+            tess.callEndOrEndData();
+        }
+    }
+
+    private static class RenderStrip implements renderCallBack {
+        public void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
+            /* Render as many CCW triangles as possible in a strip starting from
+             * edge "e".  The strip *should* contain exactly "size" triangles
+             * (otherwise we've goofed up somewhere).
+             */
+            tess.callBeginOrBeginData( GL.GL_TRIANGLE_STRIP);
+            tess.callVertexOrVertexData( e.Org.data);
+            tess.callVertexOrVertexData( e.Sym.Org.data);
+
+            while (!Marked(e.Lface)) {
+                e.Lface.marked = true;
+                --size;
+                e = e.Lnext.Sym;
+                tess.callVertexOrVertexData( e.Org.data);
+                if (Marked(e.Lface)) break;
+
+                e.Lface.marked = true;
+                --size;
+                e = e.Onext;
+                tess.callVertexOrVertexData( e.Sym.Org.data);
+            }
+
+            assert (size == 0);
+            tess.callEndOrEndData();
+        }
+    }
+
+    /************************ Boundary contour decomposition ******************/
+
+/* __gl_renderBoundary( tess, mesh ) takes a mesh, and outputs one
+ * contour for each face marked "inside".  The rendering output is
+ * provided as callbacks (see the api).
+ */
+    public static void __gl_renderBoundary(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
+        com.jogamp.opengl.impl.glu.tessellator.GLUface f;
+        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+
+        for (f = mesh.fHead.next; f != mesh.fHead; f = f.next) {
+            if (f.inside) {
+                tess.callBeginOrBeginData( GL.GL_LINE_LOOP);
+                e = f.anEdge;
+                do {
+                    tess.callVertexOrVertexData( e.Org.data);
+                    e = e.Lnext;
+                } while (e != f.anEdge);
+                tess.callEndOrEndData();
+            }
+        }
+    }
+
+
+    /************************ Quick-and-dirty decomposition ******************/
+
+    private static final int SIGN_INCONSISTENT = 2;
+
+    static int ComputeNormal(GLUtessellatorImpl tess, double[] norm, boolean check)
+/*
+ * If check==false, we compute the polygon normal and place it in norm[].
+ * If check==true, we check that each triangle in the fan from v0 has a
+ * consistent orientation with respect to norm[].  If triangles are
+ * consistently oriented CCW, return 1; if CW, return -1; if all triangles
+ * are degenerate return 0; otherwise (no consistent orientation) return
+ * SIGN_INCONSISTENT.
+ */ {
+        com.jogamp.opengl.impl.glu.tessellator.CachedVertex[] v = tess.cache;
+//            CachedVertex vn = v0 + tess.cacheCount;
+        int vn = tess.cacheCount;
+//            CachedVertex vc;
+        int vc;
+        double dot, xc, yc, zc, xp, yp, zp;
+        double[] n = new double[3];
+        int sign = 0;
+
+        /* Find the polygon normal.  It is important to get a reasonable
+         * normal even when the polygon is self-intersecting (eg. a bowtie).
+         * Otherwise, the computed normal could be very tiny, but perpendicular
+         * to the true plane of the polygon due to numerical noise.  Then all
+         * the triangles would appear to be degenerate and we would incorrectly
+         * decompose the polygon as a fan (or simply not render it at all).
+         *
+         * We use a sum-of-triangles normal algorithm rather than the more
+         * efficient sum-of-trapezoids method (used in CheckOrientation()
+         * in normal.c).  This lets us explicitly reverse the signed area
+         * of some triangles to get a reasonable normal in the self-intersecting
+         * case.
+         */
+        if (!check) {
+            norm[0] = norm[1] = norm[2] = 0.0;
+        }
+
+        vc = 1;
+        xc = v[vc].coords[0] - v[0].coords[0];
+        yc = v[vc].coords[1] - v[0].coords[1];
+        zc = v[vc].coords[2] - v[0].coords[2];
+        while (++vc < vn) {
+            xp = xc;
+            yp = yc;
+            zp = zc;
+            xc = v[vc].coords[0] - v[0].coords[0];
+            yc = v[vc].coords[1] - v[0].coords[1];
+            zc = v[vc].coords[2] - v[0].coords[2];
+
+            /* Compute (vp - v0) cross (vc - v0) */
+            n[0] = yp * zc - zp * yc;
+            n[1] = zp * xc - xp * zc;
+            n[2] = xp * yc - yp * xc;
+
+            dot = n[0] * norm[0] + n[1] * norm[1] + n[2] * norm[2];
+            if (!check) {
+                /* Reverse the contribution of back-facing triangles to get
+                 * a reasonable normal for self-intersecting polygons (see above)
+                 */
+                if (dot >= 0) {
+                    norm[0] += n[0];
+                    norm[1] += n[1];
+                    norm[2] += n[2];
+                } else {
+                    norm[0] -= n[0];
+                    norm[1] -= n[1];
+                    norm[2] -= n[2];
+                }
+            } else if (dot != 0) {
+                /* Check the new orientation for consistency with previous triangles */
+                if (dot > 0) {
+                    if (sign < 0) return SIGN_INCONSISTENT;
+                    sign = 1;
+                } else {
+                    if (sign > 0) return SIGN_INCONSISTENT;
+                    sign = -1;
+                }
+            }
+        }
+        return sign;
+    }
+
+/* __gl_renderCache( tess ) takes a single contour and tries to render it
+ * as a triangle fan.  This handles convex polygons, as well as some
+ * non-convex polygons if we get lucky.
+ *
+ * Returns true if the polygon was successfully rendered.  The rendering
+ * output is provided as callbacks (see the api).
+ */
+    public static boolean __gl_renderCache(GLUtessellatorImpl tess) {
+        com.jogamp.opengl.impl.glu.tessellator.CachedVertex[] v = tess.cache;
+//            CachedVertex vn = v0 + tess.cacheCount;
+        int vn = tess.cacheCount;
+//            CachedVertex vc;
+        int vc;
+        double[] norm = new double[3];
+        int sign;
+
+        if (tess.cacheCount < 3) {
+            /* Degenerate contour -- no output */
+            return true;
+        }
+
+        norm[0] = tess.normal[0];
+        norm[1] = tess.normal[1];
+        norm[2] = tess.normal[2];
+        if (norm[0] == 0 && norm[1] == 0 && norm[2] == 0) {
+            ComputeNormal( tess, norm, false);
+        }
+
+        sign = ComputeNormal( tess, norm, true);
+        if (sign == SIGN_INCONSISTENT) {
+            /* Fan triangles did not have a consistent orientation */
+            return false;
+        }
+        if (sign == 0) {
+            /* All triangles were degenerate */
+            return true;
+        }
+
+        if ( !USE_OPTIMIZED_CODE_PATH ) {
+            return false;
+        } else {
+            /* Make sure we do the right thing for each winding rule */
+            switch (tess.windingRule) {
+                case GLU.GLU_TESS_WINDING_ODD:
+                case GLU.GLU_TESS_WINDING_NONZERO:
+                    break;
+                case GLU.GLU_TESS_WINDING_POSITIVE:
+                    if (sign < 0) return true;
+                    break;
+                case GLU.GLU_TESS_WINDING_NEGATIVE:
+                    if (sign > 0) return true;
+                    break;
+                case GLU.GLU_TESS_WINDING_ABS_GEQ_TWO:
+                    return true;
+            }
+
+            tess.callBeginOrBeginData( tess.boundaryOnly ? GL.GL_LINE_LOOP
+                    : (tess.cacheCount > 3) ? GL.GL_TRIANGLE_FAN
+                    : GL.GL_TRIANGLES);
+
+            tess.callVertexOrVertexData( v[0].data);
+            if (sign > 0) {
+                for (vc = 1; vc < vn; ++vc) {
+                    tess.callVertexOrVertexData( v[vc].data);
+                }
+            } else {
+                for (vc = vn - 1; vc > 0; --vc) {
+                    tess.callVertexOrVertexData( v[vc].data);
+                }
+            }
+            tess.callEndOrEndData();
+            return true;
+        }
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Sweep.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Sweep.java
new file mode 100644
index 000000000..8ffeadb67
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Sweep.java
@@ -0,0 +1,1353 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+
+class Sweep {
+    private Sweep() {
+    }
+
+//    #ifdef FOR_TRITE_TEST_PROGRAM
+//    extern void DebugEvent( GLUtessellator *tess );
+//    #else
+    private static void DebugEvent(GLUtessellatorImpl tess) {
+
+    }
+//    #endif
+
+/*
+ * Invariants for the Edge Dictionary.
+ * - each pair of adjacent edges e2=Succ(e1) satisfies EdgeLeq(e1,e2)
+ *   at any valid location of the sweep event
+ * - if EdgeLeq(e2,e1) as well (at any valid sweep event), then e1 and e2
+ *   share a common endpoint
+ * - for each e, e.Dst has been processed, but not e.Org
+ * - each edge e satisfies VertLeq(e.Dst,event) && VertLeq(event,e.Org)
+ *   where "event" is the current sweep line event.
+ * - no edge e has zero length
+ *
+ * Invariants for the Mesh (the processed portion).
+ * - the portion of the mesh left of the sweep line is a planar graph,
+ *   ie. there is *some* way to embed it in the plane
+ * - no processed edge has zero length
+ * - no two processed vertices have identical coordinates
+ * - each "inside" region is monotone, ie. can be broken into two chains
+ *   of monotonically increasing vertices according to VertLeq(v1,v2)
+ *   - a non-invariant: these chains may intersect (very slightly)
+ *
+ * Invariants for the Sweep.
+ * - if none of the edges incident to the event vertex have an activeRegion
+ *   (ie. none of these edges are in the edge dictionary), then the vertex
+ *   has only right-going edges.
+ * - if an edge is marked "fixUpperEdge" (it is a temporary edge introduced
+ *   by ConnectRightVertex), then it is the only right-going edge from
+ *   its associated vertex.  (This says that these edges exist only
+ *   when it is necessary.)
+ */
+
+/* When we merge two edges into one, we need to compute the combined
+ * winding of the new edge.
+ */
+    private static void AddWinding(GLUhalfEdge eDst, GLUhalfEdge eSrc) {
+        eDst.winding += eSrc.winding;
+        eDst.Sym.winding += eSrc.Sym.winding;
+    }
+
+
+    private static ActiveRegion RegionBelow(ActiveRegion r) {
+        return ((ActiveRegion) Dict.dictKey(Dict.dictPred(r.nodeUp)));
+    }
+
+    private static ActiveRegion RegionAbove(ActiveRegion r) {
+        return ((ActiveRegion) Dict.dictKey(Dict.dictSucc(r.nodeUp)));
+    }
+
+    static boolean EdgeLeq(GLUtessellatorImpl tess, ActiveRegion reg1, ActiveRegion reg2)
+/*
+ * Both edges must be directed from right to left (this is the canonical
+ * direction for the upper edge of each region).
+ *
+ * The strategy is to evaluate a "t" value for each edge at the
+ * current sweep line position, given by tess.event.  The calculations
+ * are designed to be very stable, but of course they are not perfect.
+ *
+ * Special case: if both edge destinations are at the sweep event,
+ * we sort the edges by slope (they would otherwise compare equally).
+ */ {
+        GLUvertex event = tess.event;
+        GLUhalfEdge e1, e2;
+        double t1, t2;
+
+        e1 = reg1.eUp;
+        e2 = reg2.eUp;
+
+        if (e1.Sym.Org == event) {
+            if (e2.Sym.Org == event) {
+                /* Two edges right of the sweep line which meet at the sweep event.
+                 * Sort them by slope.
+                 */
+                if (Geom.VertLeq(e1.Org, e2.Org)) {
+                    return Geom.EdgeSign(e2.Sym.Org, e1.Org, e2.Org) <= 0;
+                }
+                return Geom.EdgeSign(e1.Sym.Org, e2.Org, e1.Org) >= 0;
+            }
+            return Geom.EdgeSign(e2.Sym.Org, event, e2.Org) <= 0;
+        }
+        if (e2.Sym.Org == event) {
+            return Geom.EdgeSign(e1.Sym.Org, event, e1.Org) >= 0;
+        }
+
+        /* General case - compute signed distance *from* e1, e2 to event */
+        t1 = Geom.EdgeEval(e1.Sym.Org, event, e1.Org);
+        t2 = Geom.EdgeEval(e2.Sym.Org, event, e2.Org);
+        return (t1 >= t2);
+    }
+
+
+    static void DeleteRegion(GLUtessellatorImpl tess, ActiveRegion reg) {
+        if (reg.fixUpperEdge) {
+            /* It was created with zero winding number, so it better be
+             * deleted with zero winding number (ie. it better not get merged
+             * with a real edge).
+             */
+            assert (reg.eUp.winding == 0);
+        }
+        reg.eUp.activeRegion = null;
+        Dict.dictDelete(tess.dict, reg.nodeUp); /* __gl_dictListDelete */
+    }
+
+
+    static boolean FixUpperEdge(ActiveRegion reg, GLUhalfEdge newEdge)
+/*
+ * Replace an upper edge which needs fixing (see ConnectRightVertex).
+ */ {
+        assert (reg.fixUpperEdge);
+        if (!Mesh.__gl_meshDelete(reg.eUp)) return false;
+        reg.fixUpperEdge = false;
+        reg.eUp = newEdge;
+        newEdge.activeRegion = reg;
+
+        return true;
+    }
+
+    static ActiveRegion TopLeftRegion(ActiveRegion reg) {
+        GLUvertex org = reg.eUp.Org;
+        GLUhalfEdge e;
+
+        /* Find the region above the uppermost edge with the same origin */
+        do {
+            reg = RegionAbove(reg);
+        } while (reg.eUp.Org == org);
+
+        /* If the edge above was a temporary edge introduced by ConnectRightVertex,
+         * now is the time to fix it.
+         */
+        if (reg.fixUpperEdge) {
+            e = Mesh.__gl_meshConnect(RegionBelow(reg).eUp.Sym, reg.eUp.Lnext);
+            if (e == null) return null;
+            if (!FixUpperEdge(reg, e)) return null;
+            reg = RegionAbove(reg);
+        }
+        return reg;
+    }
+
+    static ActiveRegion TopRightRegion(ActiveRegion reg) {
+        GLUvertex dst = reg.eUp.Sym.Org;
+
+        /* Find the region above the uppermost edge with the same destination */
+        do {
+            reg = RegionAbove(reg);
+        } while (reg.eUp.Sym.Org == dst);
+        return reg;
+    }
+
+    static ActiveRegion AddRegionBelow(GLUtessellatorImpl tess,
+                                       ActiveRegion regAbove,
+                                       GLUhalfEdge eNewUp)
+/*
+ * Add a new active region to the sweep line, *somewhere* below "regAbove"
+ * (according to where the new edge belongs in the sweep-line dictionary).
+ * The upper edge of the new region will be "eNewUp".
+ * Winding number and "inside" flag are not updated.
+ */ {
+        ActiveRegion regNew = new ActiveRegion();
+        if (regNew == null) throw new RuntimeException();
+
+        regNew.eUp = eNewUp;
+        /* __gl_dictListInsertBefore */
+        regNew.nodeUp = Dict.dictInsertBefore(tess.dict, regAbove.nodeUp, regNew);
+        if (regNew.nodeUp == null) throw new RuntimeException();
+        regNew.fixUpperEdge = false;
+        regNew.sentinel = false;
+        regNew.dirty = false;
+
+        eNewUp.activeRegion = regNew;
+        return regNew;
+    }
+
+    static boolean IsWindingInside(GLUtessellatorImpl tess, int n) {
+        switch (tess.windingRule) {
+            case GLU.GLU_TESS_WINDING_ODD:
+                return (n & 1) != 0;
+            case GLU.GLU_TESS_WINDING_NONZERO:
+                return (n != 0);
+            case GLU.GLU_TESS_WINDING_POSITIVE:
+                return (n > 0);
+            case GLU.GLU_TESS_WINDING_NEGATIVE:
+                return (n < 0);
+            case GLU.GLU_TESS_WINDING_ABS_GEQ_TWO:
+                return (n >= 2) || (n <= -2);
+        }
+        /*LINTED*/
+//        assert (false);
+        throw new InternalError();
+        /*NOTREACHED*/
+    }
+
+
+    static void ComputeWinding(GLUtessellatorImpl tess, ActiveRegion reg) {
+        reg.windingNumber = RegionAbove(reg).windingNumber + reg.eUp.winding;
+        reg.inside = IsWindingInside(tess, reg.windingNumber);
+    }
+
+
+    static void FinishRegion(GLUtessellatorImpl tess, ActiveRegion reg)
+/*
+ * Delete a region from the sweep line.  This happens when the upper
+ * and lower chains of a region meet (at a vertex on the sweep line).
+ * The "inside" flag is copied to the appropriate mesh face (we could
+ * not do this before -- since the structure of the mesh is always
+ * changing, this face may not have even existed until now).
+ */ {
+        GLUhalfEdge e = reg.eUp;
+        GLUface f = e.Lface;
+
+        f.inside = reg.inside;
+        f.anEdge = e;   /* optimization for __gl_meshTessellateMonoRegion() */
+        DeleteRegion(tess, reg);
+    }
+
+
+    static GLUhalfEdge FinishLeftRegions(GLUtessellatorImpl tess,
+                                         ActiveRegion regFirst, ActiveRegion regLast)
+/*
+ * We are given a vertex with one or more left-going edges.  All affected
+ * edges should be in the edge dictionary.  Starting at regFirst.eUp,
+ * we walk down deleting all regions where both edges have the same
+ * origin vOrg.  At the same time we copy the "inside" flag from the
+ * active region to the face, since at this point each face will belong
+ * to at most one region (this was not necessarily true until this point
+ * in the sweep).  The walk stops at the region above regLast; if regLast
+ * is null we walk as far as possible.  At the same time we relink the
+ * mesh if necessary, so that the ordering of edges around vOrg is the
+ * same as in the dictionary.
+ */ {
+        ActiveRegion reg, regPrev;
+        GLUhalfEdge e, ePrev;
+
+        regPrev = regFirst;
+        ePrev = regFirst.eUp;
+        while (regPrev != regLast) {
+            regPrev.fixUpperEdge = false;	/* placement was OK */
+            reg = RegionBelow(regPrev);
+            e = reg.eUp;
+            if (e.Org != ePrev.Org) {
+                if (!reg.fixUpperEdge) {
+                    /* Remove the last left-going edge.  Even though there are no further
+                     * edges in the dictionary with this origin, there may be further
+                     * such edges in the mesh (if we are adding left edges to a vertex
+                     * that has already been processed).  Thus it is important to call
+                     * FinishRegion rather than just DeleteRegion.
+                     */
+                    FinishRegion(tess, regPrev);
+                    break;
+                }
+                /* If the edge below was a temporary edge introduced by
+                 * ConnectRightVertex, now is the time to fix it.
+                 */
+                e = Mesh.__gl_meshConnect(ePrev.Onext.Sym, e.Sym);
+                if (e == null) throw new RuntimeException();
+                if (!FixUpperEdge(reg, e)) throw new RuntimeException();
+            }
+
+            /* Relink edges so that ePrev.Onext == e */
+            if (ePrev.Onext != e) {
+                if (!Mesh.__gl_meshSplice(e.Sym.Lnext, e)) throw new RuntimeException();
+                if (!Mesh.__gl_meshSplice(ePrev, e)) throw new RuntimeException();
+            }
+            FinishRegion(tess, regPrev);	/* may change reg.eUp */
+            ePrev = reg.eUp;
+            regPrev = reg;
+        }
+        return ePrev;
+    }
+
+
+    static void AddRightEdges(GLUtessellatorImpl tess, ActiveRegion regUp,
+                              GLUhalfEdge eFirst, GLUhalfEdge eLast, GLUhalfEdge eTopLeft,
+                              boolean cleanUp)
+/*
+ * Purpose: insert right-going edges into the edge dictionary, and update
+ * winding numbers and mesh connectivity appropriately.  All right-going
+ * edges share a common origin vOrg.  Edges are inserted CCW starting at
+ * eFirst; the last edge inserted is eLast.Sym.Lnext.  If vOrg has any
+ * left-going edges already processed, then eTopLeft must be the edge
+ * such that an imaginary upward vertical segment from vOrg would be
+ * contained between eTopLeft.Sym.Lnext and eTopLeft; otherwise eTopLeft
+ * should be null.
+ */ {
+        ActiveRegion reg, regPrev;
+        GLUhalfEdge e, ePrev;
+        boolean firstTime = true;
+
+        /* Insert the new right-going edges in the dictionary */
+        e = eFirst;
+        do {
+            assert (Geom.VertLeq(e.Org, e.Sym.Org));
+            AddRegionBelow(tess, regUp, e.Sym);
+            e = e.Onext;
+        } while (e != eLast);
+
+        /* Walk *all* right-going edges from e.Org, in the dictionary order,
+         * updating the winding numbers of each region, and re-linking the mesh
+         * edges to match the dictionary ordering (if necessary).
+         */
+        if (eTopLeft == null) {
+            eTopLeft = RegionBelow(regUp).eUp.Sym.Onext;
+        }
+        regPrev = regUp;
+        ePrev = eTopLeft;
+        for (; ;) {
+            reg = RegionBelow(regPrev);
+            e = reg.eUp.Sym;
+            if (e.Org != ePrev.Org) break;
+
+            if (e.Onext != ePrev) {
+                /* Unlink e from its current position, and relink below ePrev */
+                if (!Mesh.__gl_meshSplice(e.Sym.Lnext, e)) throw new RuntimeException();
+                if (!Mesh.__gl_meshSplice(ePrev.Sym.Lnext, e)) throw new RuntimeException();
+            }
+            /* Compute the winding number and "inside" flag for the new regions */
+            reg.windingNumber = regPrev.windingNumber - e.winding;
+            reg.inside = IsWindingInside(tess, reg.windingNumber);
+
+            /* Check for two outgoing edges with same slope -- process these
+             * before any intersection tests (see example in __gl_computeInterior).
+             */
+            regPrev.dirty = true;
+            if (!firstTime && CheckForRightSplice(tess, regPrev)) {
+                AddWinding(e, ePrev);
+                DeleteRegion(tess, regPrev);
+                if (!Mesh.__gl_meshDelete(ePrev)) throw new RuntimeException();
+            }
+            firstTime = false;
+            regPrev = reg;
+            ePrev = e;
+        }
+        regPrev.dirty = true;
+        assert (regPrev.windingNumber - e.winding == reg.windingNumber);
+
+        if (cleanUp) {
+            /* Check for intersections between newly adjacent edges. */
+            WalkDirtyRegions(tess, regPrev);
+        }
+    }
+
+
+    static void CallCombine(GLUtessellatorImpl tess, GLUvertex isect,
+                            Object[] data, float[] weights, boolean needed) {
+        double[] coords = new double[3];
+
+        /* Copy coord data in case the callback changes it. */
+        coords[0] = isect.coords[0];
+        coords[1] = isect.coords[1];
+        coords[2] = isect.coords[2];
+
+        Object[] outData = new Object[1];
+        tess.callCombineOrCombineData(coords, data, weights, outData);
+        isect.data = outData[0];
+        if (isect.data == null) {
+            if (!needed) {
+                isect.data = data[0];
+            } else if (!tess.fatalError) {
+                /* The only way fatal error is when two edges are found to intersect,
+                 * but the user has not provided the callback necessary to handle
+                 * generated intersection points.
+                 */
+                tess.callErrorOrErrorData(GLU.GLU_TESS_NEED_COMBINE_CALLBACK);
+                tess.fatalError = true;
+            }
+        }
+    }
+
+    static void SpliceMergeVertices(GLUtessellatorImpl tess, GLUhalfEdge e1,
+                                    GLUhalfEdge e2)
+/*
+ * Two vertices with idential coordinates are combined into one.
+ * e1.Org is kept, while e2.Org is discarded.
+ */ {
+        Object[] data = new Object[4];
+        float[] weights = new float[]{0.5f, 0.5f, 0.0f, 0.0f};
+
+        data[0] = e1.Org.data;
+        data[1] = e2.Org.data;
+        CallCombine(tess, e1.Org, data, weights, false);
+        if (!Mesh.__gl_meshSplice(e1, e2)) throw new RuntimeException();
+    }
+
+    static void VertexWeights(GLUvertex isect, GLUvertex org, GLUvertex dst,
+                              float[] weights)
+/*
+ * Find some weights which describe how the intersection vertex is
+ * a linear combination of "org" and "dest".  Each of the two edges
+ * which generated "isect" is allocated 50% of the weight; each edge
+ * splits the weight between its org and dst according to the
+ * relative distance to "isect".
+ */ {
+        double t1 = Geom.VertL1dist(org, isect);
+        double t2 = Geom.VertL1dist(dst, isect);
+
+        weights[0] = (float) (0.5 * t2 / (t1 + t2));
+        weights[1] = (float) (0.5 * t1 / (t1 + t2));
+        isect.coords[0] += weights[0] * org.coords[0] + weights[1] * dst.coords[0];
+        isect.coords[1] += weights[0] * org.coords[1] + weights[1] * dst.coords[1];
+        isect.coords[2] += weights[0] * org.coords[2] + weights[1] * dst.coords[2];
+    }
+
+
+    static void GetIntersectData(GLUtessellatorImpl tess, GLUvertex isect,
+                                 GLUvertex orgUp, GLUvertex dstUp,
+                                 GLUvertex orgLo, GLUvertex dstLo)
+/*
+ * We've computed a new intersection point, now we need a "data" pointer
+ * from the user so that we can refer to this new vertex in the
+ * rendering callbacks.
+ */ {
+        Object[] data = new Object[4];
+        float[] weights = new float[4];
+        float[] weights1 = new float[2];
+        float[] weights2 = new float[2];
+
+        data[0] = orgUp.data;
+        data[1] = dstUp.data;
+        data[2] = orgLo.data;
+        data[3] = dstLo.data;
+
+        isect.coords[0] = isect.coords[1] = isect.coords[2] = 0;
+        VertexWeights(isect, orgUp, dstUp, weights1);
+        VertexWeights(isect, orgLo, dstLo, weights2);
+        System.arraycopy(weights1, 0, weights, 0, 2);
+        System.arraycopy(weights2, 0, weights, 2, 2);
+
+        CallCombine(tess, isect, data, weights, true);
+    }
+
+    static boolean CheckForRightSplice(GLUtessellatorImpl tess, ActiveRegion regUp)
+/*
+ * Check the upper and lower edge of "regUp", to make sure that the
+ * eUp.Org is above eLo, or eLo.Org is below eUp (depending on which
+ * origin is leftmost).
+ *
+ * The main purpose is to splice right-going edges with the same
+ * dest vertex and nearly identical slopes (ie. we can't distinguish
+ * the slopes numerically).  However the splicing can also help us
+ * to recover from numerical errors.  For example, suppose at one
+ * point we checked eUp and eLo, and decided that eUp.Org is barely
+ * above eLo.  Then later, we split eLo into two edges (eg. from
+ * a splice operation like this one).  This can change the result of
+ * our test so that now eUp.Org is incident to eLo, or barely below it.
+ * We must correct this condition to maintain the dictionary invariants.
+ *
+ * One possibility is to check these edges for intersection again
+ * (ie. CheckForIntersect).  This is what we do if possible.  However
+ * CheckForIntersect requires that tess.event lies between eUp and eLo,
+ * so that it has something to fall back on when the intersection
+ * calculation gives us an unusable answer.  So, for those cases where
+ * we can't check for intersection, this routine fixes the problem
+ * by just splicing the offending vertex into the other edge.
+ * This is a guaranteed solution, no matter how degenerate things get.
+ * Basically this is a combinatorial solution to a numerical problem.
+ */ {
+        ActiveRegion regLo = RegionBelow(regUp);
+        GLUhalfEdge eUp = regUp.eUp;
+        GLUhalfEdge eLo = regLo.eUp;
+
+        if (Geom.VertLeq(eUp.Org, eLo.Org)) {
+            if (Geom.EdgeSign(eLo.Sym.Org, eUp.Org, eLo.Org) > 0) return false;
+
+            /* eUp.Org appears to be below eLo */
+            if (!Geom.VertEq(eUp.Org, eLo.Org)) {
+                /* Splice eUp.Org into eLo */
+                if (Mesh.__gl_meshSplitEdge(eLo.Sym) == null) throw new RuntimeException();
+                if (!Mesh.__gl_meshSplice(eUp, eLo.Sym.Lnext)) throw new RuntimeException();
+                regUp.dirty = regLo.dirty = true;
+
+            } else if (eUp.Org != eLo.Org) {
+                /* merge the two vertices, discarding eUp.Org */
+                tess.pq.pqDelete(eUp.Org.pqHandle); /* __gl_pqSortDelete */
+                SpliceMergeVertices(tess, eLo.Sym.Lnext, eUp);
+            }
+        } else {
+            if (Geom.EdgeSign(eUp.Sym.Org, eLo.Org, eUp.Org) < 0) return false;
+
+            /* eLo.Org appears to be above eUp, so splice eLo.Org into eUp */
+            RegionAbove(regUp).dirty = regUp.dirty = true;
+            if (Mesh.__gl_meshSplitEdge(eUp.Sym) == null) throw new RuntimeException();
+            if (!Mesh.__gl_meshSplice(eLo.Sym.Lnext, eUp)) throw new RuntimeException();
+        }
+        return true;
+    }
+
+    static boolean CheckForLeftSplice(GLUtessellatorImpl tess, ActiveRegion regUp)
+/*
+ * Check the upper and lower edge of "regUp", to make sure that the
+ * eUp.Sym.Org is above eLo, or eLo.Sym.Org is below eUp (depending on which
+ * destination is rightmost).
+ *
+ * Theoretically, this should always be true.  However, splitting an edge
+ * into two pieces can change the results of previous tests.  For example,
+ * suppose at one point we checked eUp and eLo, and decided that eUp.Sym.Org
+ * is barely above eLo.  Then later, we split eLo into two edges (eg. from
+ * a splice operation like this one).  This can change the result of
+ * the test so that now eUp.Sym.Org is incident to eLo, or barely below it.
+ * We must correct this condition to maintain the dictionary invariants
+ * (otherwise new edges might get inserted in the wrong place in the
+ * dictionary, and bad stuff will happen).
+ *
+ * We fix the problem by just splicing the offending vertex into the
+ * other edge.
+ */ {
+        ActiveRegion regLo = RegionBelow(regUp);
+        GLUhalfEdge eUp = regUp.eUp;
+        GLUhalfEdge eLo = regLo.eUp;
+        GLUhalfEdge e;
+
+        assert (!Geom.VertEq(eUp.Sym.Org, eLo.Sym.Org));
+
+        if (Geom.VertLeq(eUp.Sym.Org, eLo.Sym.Org)) {
+            if (Geom.EdgeSign(eUp.Sym.Org, eLo.Sym.Org, eUp.Org) < 0) return false;
+
+            /* eLo.Sym.Org is above eUp, so splice eLo.Sym.Org into eUp */
+            RegionAbove(regUp).dirty = regUp.dirty = true;
+            e = Mesh.__gl_meshSplitEdge(eUp);
+            if (e == null) throw new RuntimeException();
+            if (!Mesh.__gl_meshSplice(eLo.Sym, e)) throw new RuntimeException();
+            e.Lface.inside = regUp.inside;
+        } else {
+            if (Geom.EdgeSign(eLo.Sym.Org, eUp.Sym.Org, eLo.Org) > 0) return false;
+
+            /* eUp.Sym.Org is below eLo, so splice eUp.Sym.Org into eLo */
+            regUp.dirty = regLo.dirty = true;
+            e = Mesh.__gl_meshSplitEdge(eLo);
+            if (e == null) throw new RuntimeException();
+            if (!Mesh.__gl_meshSplice(eUp.Lnext, eLo.Sym)) throw new RuntimeException();
+            e.Sym.Lface.inside = regUp.inside;
+        }
+        return true;
+    }
+
+
+    static boolean CheckForIntersect(GLUtessellatorImpl tess, ActiveRegion regUp)
+/*
+ * Check the upper and lower edges of the given region to see if
+ * they intersect.  If so, create the intersection and add it
+ * to the data structures.
+ *
+ * Returns true if adding the new intersection resulted in a recursive
+ * call to AddRightEdges(); in this case all "dirty" regions have been
+ * checked for intersections, and possibly regUp has been deleted.
+ */ {
+        ActiveRegion regLo = RegionBelow(regUp);
+        GLUhalfEdge eUp = regUp.eUp;
+        GLUhalfEdge eLo = regLo.eUp;
+        GLUvertex orgUp = eUp.Org;
+        GLUvertex orgLo = eLo.Org;
+        GLUvertex dstUp = eUp.Sym.Org;
+        GLUvertex dstLo = eLo.Sym.Org;
+        double tMinUp, tMaxLo;
+        GLUvertex isect = new GLUvertex();
+        GLUvertex orgMin;
+        GLUhalfEdge e;
+
+        assert (!Geom.VertEq(dstLo, dstUp));
+        assert (Geom.EdgeSign(dstUp, tess.event, orgUp) <= 0);
+        assert (Geom.EdgeSign(dstLo, tess.event, orgLo) >= 0);
+        assert (orgUp != tess.event && orgLo != tess.event);
+        assert (!regUp.fixUpperEdge && !regLo.fixUpperEdge);
+
+        if (orgUp == orgLo) return false;	/* right endpoints are the same */
+
+        tMinUp = Math.min(orgUp.t, dstUp.t);
+        tMaxLo = Math.max(orgLo.t, dstLo.t);
+        if (tMinUp > tMaxLo) return false;	/* t ranges do not overlap */
+
+        if (Geom.VertLeq(orgUp, orgLo)) {
+            if (Geom.EdgeSign(dstLo, orgUp, orgLo) > 0) return false;
+        } else {
+            if (Geom.EdgeSign(dstUp, orgLo, orgUp) < 0) return false;
+        }
+
+        /* At this point the edges intersect, at least marginally */
+        DebugEvent(tess);
+
+        Geom.EdgeIntersect(dstUp, orgUp, dstLo, orgLo, isect);
+        /* The following properties are guaranteed: */
+        assert (Math.min(orgUp.t, dstUp.t) <= isect.t);
+        assert (isect.t <= Math.max(orgLo.t, dstLo.t));
+        assert (Math.min(dstLo.s, dstUp.s) <= isect.s);
+        assert (isect.s <= Math.max(orgLo.s, orgUp.s));
+
+        if (Geom.VertLeq(isect, tess.event)) {
+            /* The intersection point lies slightly to the left of the sweep line,
+             * so move it until it''s slightly to the right of the sweep line.
+             * (If we had perfect numerical precision, this would never happen
+             * in the first place).  The easiest and safest thing to do is
+             * replace the intersection by tess.event.
+             */
+            isect.s = tess.event.s;
+            isect.t = tess.event.t;
+        }
+        /* Similarly, if the computed intersection lies to the right of the
+         * rightmost origin (which should rarely happen), it can cause
+         * unbelievable inefficiency on sufficiently degenerate inputs.
+         * (If you have the test program, try running test54.d with the
+         * "X zoom" option turned on).
+         */
+        orgMin = Geom.VertLeq(orgUp, orgLo) ? orgUp : orgLo;
+        if (Geom.VertLeq(orgMin, isect)) {
+            isect.s = orgMin.s;
+            isect.t = orgMin.t;
+        }
+
+        if (Geom.VertEq(isect, orgUp) || Geom.VertEq(isect, orgLo)) {
+            /* Easy case -- intersection at one of the right endpoints */
+            CheckForRightSplice(tess, regUp);
+            return false;
+        }
+
+        if ((!Geom.VertEq(dstUp, tess.event)
+                && Geom.EdgeSign(dstUp, tess.event, isect) >= 0)
+                || (!Geom.VertEq(dstLo, tess.event)
+                && Geom.EdgeSign(dstLo, tess.event, isect) <= 0)) {
+            /* Very unusual -- the new upper or lower edge would pass on the
+             * wrong side of the sweep event, or through it.  This can happen
+             * due to very small numerical errors in the intersection calculation.
+             */
+            if (dstLo == tess.event) {
+                /* Splice dstLo into eUp, and process the new region(s) */
+                if (Mesh.__gl_meshSplitEdge(eUp.Sym) == null) throw new RuntimeException();
+                if (!Mesh.__gl_meshSplice(eLo.Sym, eUp)) throw new RuntimeException();
+                regUp = TopLeftRegion(regUp);
+                if (regUp == null) throw new RuntimeException();
+                eUp = RegionBelow(regUp).eUp;
+                FinishLeftRegions(tess, RegionBelow(regUp), regLo);
+                AddRightEdges(tess, regUp, eUp.Sym.Lnext, eUp, eUp, true);
+                return true;
+            }
+            if (dstUp == tess.event) {
+                /* Splice dstUp into eLo, and process the new region(s) */
+                if (Mesh.__gl_meshSplitEdge(eLo.Sym) == null) throw new RuntimeException();
+                if (!Mesh.__gl_meshSplice(eUp.Lnext, eLo.Sym.Lnext)) throw new RuntimeException();
+                regLo = regUp;
+                regUp = TopRightRegion(regUp);
+                e = RegionBelow(regUp).eUp.Sym.Onext;
+                regLo.eUp = eLo.Sym.Lnext;
+                eLo = FinishLeftRegions(tess, regLo, null);
+                AddRightEdges(tess, regUp, eLo.Onext, eUp.Sym.Onext, e, true);
+                return true;
+            }
+            /* Special case: called from ConnectRightVertex.  If either
+             * edge passes on the wrong side of tess.event, split it
+             * (and wait for ConnectRightVertex to splice it appropriately).
+             */
+            if (Geom.EdgeSign(dstUp, tess.event, isect) >= 0) {
+                RegionAbove(regUp).dirty = regUp.dirty = true;
+                if (Mesh.__gl_meshSplitEdge(eUp.Sym) == null) throw new RuntimeException();
+                eUp.Org.s = tess.event.s;
+                eUp.Org.t = tess.event.t;
+            }
+            if (Geom.EdgeSign(dstLo, tess.event, isect) <= 0) {
+                regUp.dirty = regLo.dirty = true;
+                if (Mesh.__gl_meshSplitEdge(eLo.Sym) == null) throw new RuntimeException();
+                eLo.Org.s = tess.event.s;
+                eLo.Org.t = tess.event.t;
+            }
+            /* leave the rest for ConnectRightVertex */
+            return false;
+        }
+
+        /* General case -- split both edges, splice into new vertex.
+         * When we do the splice operation, the order of the arguments is
+         * arbitrary as far as correctness goes.  However, when the operation
+         * creates a new face, the work done is proportional to the size of
+         * the new face.  We expect the faces in the processed part of
+         * the mesh (ie. eUp.Lface) to be smaller than the faces in the
+         * unprocessed original contours (which will be eLo.Sym.Lnext.Lface).
+         */
+        if (Mesh.__gl_meshSplitEdge(eUp.Sym) == null) throw new RuntimeException();
+        if (Mesh.__gl_meshSplitEdge(eLo.Sym) == null) throw new RuntimeException();
+        if (!Mesh.__gl_meshSplice(eLo.Sym.Lnext, eUp)) throw new RuntimeException();
+        eUp.Org.s = isect.s;
+        eUp.Org.t = isect.t;
+        eUp.Org.pqHandle = tess.pq.pqInsert(eUp.Org); /* __gl_pqSortInsert */
+        if (eUp.Org.pqHandle == Long.MAX_VALUE) {
+            tess.pq.pqDeletePriorityQ();	/* __gl_pqSortDeletePriorityQ */
+            tess.pq = null;
+            throw new RuntimeException();
+        }
+        GetIntersectData(tess, eUp.Org, orgUp, dstUp, orgLo, dstLo);
+        RegionAbove(regUp).dirty = regUp.dirty = regLo.dirty = true;
+        return false;
+    }
+
+    static void WalkDirtyRegions(GLUtessellatorImpl tess, ActiveRegion regUp)
+/*
+ * When the upper or lower edge of any region changes, the region is
+ * marked "dirty".  This routine walks through all the dirty regions
+ * and makes sure that the dictionary invariants are satisfied
+ * (see the comments at the beginning of this file).  Of course
+ * new dirty regions can be created as we make changes to restore
+ * the invariants.
+ */ {
+        ActiveRegion regLo = RegionBelow(regUp);
+        GLUhalfEdge eUp, eLo;
+
+        for (; ;) {
+            /* Find the lowest dirty region (we walk from the bottom up). */
+            while (regLo.dirty) {
+                regUp = regLo;
+                regLo = RegionBelow(regLo);
+            }
+            if (!regUp.dirty) {
+                regLo = regUp;
+                regUp = RegionAbove(regUp);
+                if (regUp == null || !regUp.dirty) {
+                    /* We've walked all the dirty regions */
+                    return;
+                }
+            }
+            regUp.dirty = false;
+            eUp = regUp.eUp;
+            eLo = regLo.eUp;
+
+            if (eUp.Sym.Org != eLo.Sym.Org) {
+                /* Check that the edge ordering is obeyed at the Dst vertices. */
+                if (CheckForLeftSplice(tess, regUp)) {
+
+                    /* If the upper or lower edge was marked fixUpperEdge, then
+                     * we no longer need it (since these edges are needed only for
+                     * vertices which otherwise have no right-going edges).
+                     */
+                    if (regLo.fixUpperEdge) {
+                        DeleteRegion(tess, regLo);
+                        if (!Mesh.__gl_meshDelete(eLo)) throw new RuntimeException();
+                        regLo = RegionBelow(regUp);
+                        eLo = regLo.eUp;
+                    } else if (regUp.fixUpperEdge) {
+                        DeleteRegion(tess, regUp);
+                        if (!Mesh.__gl_meshDelete(eUp)) throw new RuntimeException();
+                        regUp = RegionAbove(regLo);
+                        eUp = regUp.eUp;
+                    }
+                }
+            }
+            if (eUp.Org != eLo.Org) {
+                if (eUp.Sym.Org != eLo.Sym.Org
+                        && !regUp.fixUpperEdge && !regLo.fixUpperEdge
+                        && (eUp.Sym.Org == tess.event || eLo.Sym.Org == tess.event)) {
+                    /* When all else fails in CheckForIntersect(), it uses tess.event
+                     * as the intersection location.  To make this possible, it requires
+                     * that tess.event lie between the upper and lower edges, and also
+                     * that neither of these is marked fixUpperEdge (since in the worst
+                     * case it might splice one of these edges into tess.event, and
+                     * violate the invariant that fixable edges are the only right-going
+                     * edge from their associated vertex).
+                         */
+                    if (CheckForIntersect(tess, regUp)) {
+                        /* WalkDirtyRegions() was called recursively; we're done */
+                        return;
+                    }
+                } else {
+                    /* Even though we can't use CheckForIntersect(), the Org vertices
+                     * may violate the dictionary edge ordering.  Check and correct this.
+                     */
+                    CheckForRightSplice(tess, regUp);
+                }
+            }
+            if (eUp.Org == eLo.Org && eUp.Sym.Org == eLo.Sym.Org) {
+                /* A degenerate loop consisting of only two edges -- delete it. */
+                AddWinding(eLo, eUp);
+                DeleteRegion(tess, regUp);
+                if (!Mesh.__gl_meshDelete(eUp)) throw new RuntimeException();
+                regUp = RegionAbove(regLo);
+            }
+        }
+    }
+
+
+    static void ConnectRightVertex(GLUtessellatorImpl tess, ActiveRegion regUp,
+                                   GLUhalfEdge eBottomLeft)
+/*
+ * Purpose: connect a "right" vertex vEvent (one where all edges go left)
+ * to the unprocessed portion of the mesh.  Since there are no right-going
+ * edges, two regions (one above vEvent and one below) are being merged
+ * into one.  "regUp" is the upper of these two regions.
+ *
+ * There are two reasons for doing this (adding a right-going edge):
+ *  - if the two regions being merged are "inside", we must add an edge
+ *    to keep them separated (the combined region would not be monotone).
+ *  - in any case, we must leave some record of vEvent in the dictionary,
+ *    so that we can merge vEvent with features that we have not seen yet.
+ *    For example, maybe there is a vertical edge which passes just to
+ *    the right of vEvent; we would like to splice vEvent into this edge.
+ *
+ * However, we don't want to connect vEvent to just any vertex.  We don''t
+ * want the new edge to cross any other edges; otherwise we will create
+ * intersection vertices even when the input data had no self-intersections.
+ * (This is a bad thing; if the user's input data has no intersections,
+ * we don't want to generate any false intersections ourselves.)
+ *
+ * Our eventual goal is to connect vEvent to the leftmost unprocessed
+ * vertex of the combined region (the union of regUp and regLo).
+ * But because of unseen vertices with all right-going edges, and also
+ * new vertices which may be created by edge intersections, we don''t
+ * know where that leftmost unprocessed vertex is.  In the meantime, we
+ * connect vEvent to the closest vertex of either chain, and mark the region
+ * as "fixUpperEdge".  This flag says to delete and reconnect this edge
+ * to the next processed vertex on the boundary of the combined region.
+ * Quite possibly the vertex we connected to will turn out to be the
+ * closest one, in which case we won''t need to make any changes.
+ */ {
+        GLUhalfEdge eNew;
+        GLUhalfEdge eTopLeft = eBottomLeft.Onext;
+        ActiveRegion regLo = RegionBelow(regUp);
+        GLUhalfEdge eUp = regUp.eUp;
+        GLUhalfEdge eLo = regLo.eUp;
+        boolean degenerate = false;
+
+        if (eUp.Sym.Org != eLo.Sym.Org) {
+            CheckForIntersect(tess, regUp);
+        }
+
+        /* Possible new degeneracies: upper or lower edge of regUp may pass
+         * through vEvent, or may coincide with new intersection vertex
+         */
+        if (Geom.VertEq(eUp.Org, tess.event)) {
+            if (!Mesh.__gl_meshSplice(eTopLeft.Sym.Lnext, eUp)) throw new RuntimeException();
+            regUp = TopLeftRegion(regUp);
+            if (regUp == null) throw new RuntimeException();
+            eTopLeft = RegionBelow(regUp).eUp;
+            FinishLeftRegions(tess, RegionBelow(regUp), regLo);
+            degenerate = true;
+        }
+        if (Geom.VertEq(eLo.Org, tess.event)) {
+            if (!Mesh.__gl_meshSplice(eBottomLeft, eLo.Sym.Lnext)) throw new RuntimeException();
+            eBottomLeft = FinishLeftRegions(tess, regLo, null);
+            degenerate = true;
+        }
+        if (degenerate) {
+            AddRightEdges(tess, regUp, eBottomLeft.Onext, eTopLeft, eTopLeft, true);
+            return;
+        }
+
+        /* Non-degenerate situation -- need to add a temporary, fixable edge.
+         * Connect to the closer of eLo.Org, eUp.Org.
+         */
+        if (Geom.VertLeq(eLo.Org, eUp.Org)) {
+            eNew = eLo.Sym.Lnext;
+        } else {
+            eNew = eUp;
+        }
+        eNew = Mesh.__gl_meshConnect(eBottomLeft.Onext.Sym, eNew);
+        if (eNew == null) throw new RuntimeException();
+
+        /* Prevent cleanup, otherwise eNew might disappear before we've even
+         * had a chance to mark it as a temporary edge.
+         */
+        AddRightEdges(tess, regUp, eNew, eNew.Onext, eNew.Onext, false);
+        eNew.Sym.activeRegion.fixUpperEdge = true;
+        WalkDirtyRegions(tess, regUp);
+    }
+
+/* Because vertices at exactly the same location are merged together
+ * before we process the sweep event, some degenerate cases can't occur.
+ * However if someone eventually makes the modifications required to
+ * merge features which are close together, the cases below marked
+ * TOLERANCE_NONZERO will be useful.  They were debugged before the
+ * code to merge identical vertices in the main loop was added.
+ */
+    private static final boolean TOLERANCE_NONZERO = false;
+
+    static void ConnectLeftDegenerate(GLUtessellatorImpl tess,
+                                      ActiveRegion regUp, GLUvertex vEvent)
+/*
+ * The event vertex lies exacty on an already-processed edge or vertex.
+ * Adding the new vertex involves splicing it into the already-processed
+ * part of the mesh.
+ */ {
+        GLUhalfEdge e, eTopLeft, eTopRight, eLast;
+        ActiveRegion reg;
+
+        e = regUp.eUp;
+        if (Geom.VertEq(e.Org, vEvent)) {
+            /* e.Org is an unprocessed vertex - just combine them, and wait
+             * for e.Org to be pulled from the queue
+             */
+            assert (TOLERANCE_NONZERO);
+            SpliceMergeVertices(tess, e, vEvent.anEdge);
+            return;
+        }
+
+        if (!Geom.VertEq(e.Sym.Org, vEvent)) {
+            /* General case -- splice vEvent into edge e which passes through it */
+            if (Mesh.__gl_meshSplitEdge(e.Sym) == null) throw new RuntimeException();
+            if (regUp.fixUpperEdge) {
+                /* This edge was fixable -- delete unused portion of original edge */
+                if (!Mesh.__gl_meshDelete(e.Onext)) throw new RuntimeException();
+                regUp.fixUpperEdge = false;
+            }
+            if (!Mesh.__gl_meshSplice(vEvent.anEdge, e)) throw new RuntimeException();
+            SweepEvent(tess, vEvent);	/* recurse */
+            return;
+        }
+
+        /* vEvent coincides with e.Sym.Org, which has already been processed.
+         * Splice in the additional right-going edges.
+         */
+        assert (TOLERANCE_NONZERO);
+        regUp = TopRightRegion(regUp);
+        reg = RegionBelow(regUp);
+        eTopRight = reg.eUp.Sym;
+        eTopLeft = eLast = eTopRight.Onext;
+        if (reg.fixUpperEdge) {
+            /* Here e.Sym.Org has only a single fixable edge going right.
+             * We can delete it since now we have some real right-going edges.
+             */
+            assert (eTopLeft != eTopRight);   /* there are some left edges too */
+            DeleteRegion(tess, reg);
+            if (!Mesh.__gl_meshDelete(eTopRight)) throw new RuntimeException();
+            eTopRight = eTopLeft.Sym.Lnext;
+        }
+        if (!Mesh.__gl_meshSplice(vEvent.anEdge, eTopRight)) throw new RuntimeException();
+        if (!Geom.EdgeGoesLeft(eTopLeft)) {
+            /* e.Sym.Org had no left-going edges -- indicate this to AddRightEdges() */
+            eTopLeft = null;
+        }
+        AddRightEdges(tess, regUp, eTopRight.Onext, eLast, eTopLeft, true);
+    }
+
+
+    static void ConnectLeftVertex(GLUtessellatorImpl tess, GLUvertex vEvent)
+/*
+ * Purpose: connect a "left" vertex (one where both edges go right)
+ * to the processed portion of the mesh.  Let R be the active region
+ * containing vEvent, and let U and L be the upper and lower edge
+ * chains of R.  There are two possibilities:
+ *
+ * - the normal case: split R into two regions, by connecting vEvent to
+ *   the rightmost vertex of U or L lying to the left of the sweep line
+ *
+ * - the degenerate case: if vEvent is close enough to U or L, we
+ *   merge vEvent into that edge chain.  The subcases are:
+ *	- merging with the rightmost vertex of U or L
+ *	- merging with the active edge of U or L
+ *	- merging with an already-processed portion of U or L
+ */ {
+        ActiveRegion regUp, regLo, reg;
+        GLUhalfEdge eUp, eLo, eNew;
+        ActiveRegion tmp = new ActiveRegion();
+
+        /* assert ( vEvent.anEdge.Onext.Onext == vEvent.anEdge ); */
+
+        /* Get a pointer to the active region containing vEvent */
+        tmp.eUp = vEvent.anEdge.Sym;
+        /* __GL_DICTLISTKEY */ /* __gl_dictListSearch */
+        regUp = (ActiveRegion) Dict.dictKey(Dict.dictSearch(tess.dict, tmp));
+        regLo = RegionBelow(regUp);
+        eUp = regUp.eUp;
+        eLo = regLo.eUp;
+
+        /* Try merging with U or L first */
+        if (Geom.EdgeSign(eUp.Sym.Org, vEvent, eUp.Org) == 0) {
+            ConnectLeftDegenerate(tess, regUp, vEvent);
+            return;
+        }
+
+        /* Connect vEvent to rightmost processed vertex of either chain.
+         * e.Sym.Org is the vertex that we will connect to vEvent.
+         */
+        reg = Geom.VertLeq(eLo.Sym.Org, eUp.Sym.Org) ? regUp : regLo;
+
+        if (regUp.inside || reg.fixUpperEdge) {
+            if (reg == regUp) {
+                eNew = Mesh.__gl_meshConnect(vEvent.anEdge.Sym, eUp.Lnext);
+                if (eNew == null) throw new RuntimeException();
+            } else {
+                GLUhalfEdge tempHalfEdge = Mesh.__gl_meshConnect(eLo.Sym.Onext.Sym, vEvent.anEdge);
+                if (tempHalfEdge == null) throw new RuntimeException();
+
+                eNew = tempHalfEdge.Sym;
+            }
+            if (reg.fixUpperEdge) {
+                if (!FixUpperEdge(reg, eNew)) throw new RuntimeException();
+            } else {
+                ComputeWinding(tess, AddRegionBelow(tess, regUp, eNew));
+            }
+            SweepEvent(tess, vEvent);
+        } else {
+            /* The new vertex is in a region which does not belong to the polygon.
+             * We don''t need to connect this vertex to the rest of the mesh.
+             */
+            AddRightEdges(tess, regUp, vEvent.anEdge, vEvent.anEdge, null, true);
+        }
+    }
+
+
+    static void SweepEvent(GLUtessellatorImpl tess, GLUvertex vEvent)
+/*
+ * Does everything necessary when the sweep line crosses a vertex.
+ * Updates the mesh and the edge dictionary.
+ */ {
+        ActiveRegion regUp, reg;
+        GLUhalfEdge e, eTopLeft, eBottomLeft;
+
+        tess.event = vEvent;		/* for access in EdgeLeq() */
+        DebugEvent(tess);
+
+        /* Check if this vertex is the right endpoint of an edge that is
+         * already in the dictionary.  In this case we don't need to waste
+         * time searching for the location to insert new edges.
+         */
+        e = vEvent.anEdge;
+        while (e.activeRegion == null) {
+            e = e.Onext;
+            if (e == vEvent.anEdge) {
+                /* All edges go right -- not incident to any processed edges */
+                ConnectLeftVertex(tess, vEvent);
+                return;
+            }
+        }
+
+        /* Processing consists of two phases: first we "finish" all the
+         * active regions where both the upper and lower edges terminate
+         * at vEvent (ie. vEvent is closing off these regions).
+         * We mark these faces "inside" or "outside" the polygon according
+         * to their winding number, and delete the edges from the dictionary.
+         * This takes care of all the left-going edges from vEvent.
+         */
+        regUp = TopLeftRegion(e.activeRegion);
+        if (regUp == null) throw new RuntimeException();
+        reg = RegionBelow(regUp);
+        eTopLeft = reg.eUp;
+        eBottomLeft = FinishLeftRegions(tess, reg, null);
+
+        /* Next we process all the right-going edges from vEvent.  This
+         * involves adding the edges to the dictionary, and creating the
+         * associated "active regions" which record information about the
+         * regions between adjacent dictionary edges.
+         */
+        if (eBottomLeft.Onext == eTopLeft) {
+            /* No right-going edges -- add a temporary "fixable" edge */
+            ConnectRightVertex(tess, regUp, eBottomLeft);
+        } else {
+            AddRightEdges(tess, regUp, eBottomLeft.Onext, eTopLeft, eTopLeft, true);
+        }
+    }
+
+
+/* Make the sentinel coordinates big enough that they will never be
+ * merged with real input features.  (Even with the largest possible
+ * input contour and the maximum tolerance of 1.0, no merging will be
+ * done with coordinates larger than 3 * GLU_TESS_MAX_COORD).
+ */
+    private static final double SENTINEL_COORD = (4.0 * GLU.GLU_TESS_MAX_COORD);
+
+    static void AddSentinel(GLUtessellatorImpl tess, double t)
+/*
+ * We add two sentinel edges above and below all other edges,
+ * to avoid special cases at the top and bottom.
+ */ {
+        GLUhalfEdge e;
+        ActiveRegion reg = new ActiveRegion();
+        if (reg == null) throw new RuntimeException();
+
+        e = Mesh.__gl_meshMakeEdge(tess.mesh);
+        if (e == null) throw new RuntimeException();
+
+        e.Org.s = SENTINEL_COORD;
+        e.Org.t = t;
+        e.Sym.Org.s = -SENTINEL_COORD;
+        e.Sym.Org.t = t;
+        tess.event = e.Sym.Org;		/* initialize it */
+
+        reg.eUp = e;
+        reg.windingNumber = 0;
+        reg.inside = false;
+        reg.fixUpperEdge = false;
+        reg.sentinel = true;
+        reg.dirty = false;
+        reg.nodeUp = Dict.dictInsert(tess.dict, reg); /* __gl_dictListInsertBefore */
+        if (reg.nodeUp == null) throw new RuntimeException();
+    }
+
+
+    static void InitEdgeDict(final GLUtessellatorImpl tess)
+/*
+ * We maintain an ordering of edge intersections with the sweep line.
+ * This order is maintained in a dynamic dictionary.
+ */ {
+        /* __gl_dictListNewDict */
+        tess.dict = Dict.dictNewDict(tess, new Dict.DictLeq() {
+            public boolean leq(Object frame, Object key1, Object key2) {
+                return EdgeLeq(tess, (ActiveRegion) key1, (ActiveRegion) key2);
+            }
+        });
+        if (tess.dict == null) throw new RuntimeException();
+
+        AddSentinel(tess, -SENTINEL_COORD);
+        AddSentinel(tess, SENTINEL_COORD);
+    }
+
+
+    static void DoneEdgeDict(GLUtessellatorImpl tess) {
+        ActiveRegion reg;
+        int fixedEdges = 0;
+
+        /* __GL_DICTLISTKEY */ /* __GL_DICTLISTMIN */
+        while ((reg = (ActiveRegion) Dict.dictKey(Dict.dictMin(tess.dict))) != null) {
+            /*
+             * At the end of all processing, the dictionary should contain
+             * only the two sentinel edges, plus at most one "fixable" edge
+             * created by ConnectRightVertex().
+             */
+            if (!reg.sentinel) {
+                assert (reg.fixUpperEdge);
+                assert (++fixedEdges == 1);
+            }
+            assert (reg.windingNumber == 0);
+            DeleteRegion(tess, reg);
+/*    __gl_meshDelete( reg.eUp );*/
+        }
+        Dict.dictDeleteDict(tess.dict);	/* __gl_dictListDeleteDict */
+    }
+
+
+    static void RemoveDegenerateEdges(GLUtessellatorImpl tess)
+/*
+ * Remove zero-length edges, and contours with fewer than 3 vertices.
+ */ {
+        GLUhalfEdge e, eNext, eLnext;
+        GLUhalfEdge eHead = tess.mesh.eHead;
+
+        /*LINTED*/
+        for (e = eHead.next; e != eHead; e = eNext) {
+            eNext = e.next;
+            eLnext = e.Lnext;
+
+            if (Geom.VertEq(e.Org, e.Sym.Org) && e.Lnext.Lnext != e) {
+                /* Zero-length edge, contour has at least 3 edges */
+
+                SpliceMergeVertices(tess, eLnext, e);	/* deletes e.Org */
+                if (!Mesh.__gl_meshDelete(e)) throw new RuntimeException(); /* e is a self-loop */
+                e = eLnext;
+                eLnext = e.Lnext;
+            }
+            if (eLnext.Lnext == e) {
+                /* Degenerate contour (one or two edges) */
+
+                if (eLnext != e) {
+                    if (eLnext == eNext || eLnext == eNext.Sym) {
+                        eNext = eNext.next;
+                    }
+                    if (!Mesh.__gl_meshDelete(eLnext)) throw new RuntimeException();
+                }
+                if (e == eNext || e == eNext.Sym) {
+                    eNext = eNext.next;
+                }
+                if (!Mesh.__gl_meshDelete(e)) throw new RuntimeException();
+            }
+        }
+    }
+
+    static boolean InitPriorityQ(GLUtessellatorImpl tess)
+/*
+ * Insert all vertices into the priority queue which determines the
+ * order in which vertices cross the sweep line.
+ */ {
+        PriorityQ pq;
+        GLUvertex v, vHead;
+
+        /* __gl_pqSortNewPriorityQ */
+        pq = tess.pq = PriorityQ.pqNewPriorityQ(new PriorityQ.Leq() {
+            public boolean leq(Object key1, Object key2) {
+                return Geom.VertLeq(((GLUvertex) key1), (GLUvertex) key2);
+            }
+        });
+        if (pq == null) return false;
+
+        vHead = tess.mesh.vHead;
+        for (v = vHead.next; v != vHead; v = v.next) {
+            v.pqHandle = pq.pqInsert(v); /* __gl_pqSortInsert */
+            if (v.pqHandle == Long.MAX_VALUE) break;
+        }
+        if (v != vHead || !pq.pqInit()) { /* __gl_pqSortInit */
+            tess.pq.pqDeletePriorityQ();	/* __gl_pqSortDeletePriorityQ */
+            tess.pq = null;
+            return false;
+        }
+
+        return true;
+    }
+
+
+    static void DonePriorityQ(GLUtessellatorImpl tess) {
+        tess.pq.pqDeletePriorityQ(); /* __gl_pqSortDeletePriorityQ */
+    }
+
+
+    static boolean RemoveDegenerateFaces(GLUmesh mesh)
+/*
+ * Delete any degenerate faces with only two edges.  WalkDirtyRegions()
+ * will catch almost all of these, but it won't catch degenerate faces
+ * produced by splice operations on already-processed edges.
+ * The two places this can happen are in FinishLeftRegions(), when
+ * we splice in a "temporary" edge produced by ConnectRightVertex(),
+ * and in CheckForLeftSplice(), where we splice already-processed
+ * edges to ensure that our dictionary invariants are not violated
+ * by numerical errors.
+ *
+ * In both these cases it is *very* dangerous to delete the offending
+ * edge at the time, since one of the routines further up the stack
+ * will sometimes be keeping a pointer to that edge.
+ */ {
+        GLUface f, fNext;
+        GLUhalfEdge e;
+
+        /*LINTED*/
+        for (f = mesh.fHead.next; f != mesh.fHead; f = fNext) {
+            fNext = f.next;
+            e = f.anEdge;
+            assert (e.Lnext != e);
+
+            if (e.Lnext.Lnext == e) {
+                /* A face with only two edges */
+                AddWinding(e.Onext, e);
+                if (!Mesh.__gl_meshDelete(e)) return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean __gl_computeInterior(GLUtessellatorImpl tess)
+/*
+ * __gl_computeInterior( tess ) computes the planar arrangement specified
+ * by the given contours, and further subdivides this arrangement
+ * into regions.  Each region is marked "inside" if it belongs
+ * to the polygon, according to the rule given by tess.windingRule.
+ * Each interior region is guaranteed be monotone.
+ */ {
+        GLUvertex v, vNext;
+
+        tess.fatalError = false;
+
+        /* Each vertex defines an event for our sweep line.  Start by inserting
+         * all the vertices in a priority queue.  Events are processed in
+         * lexicographic order, ie.
+         *
+         *	e1 < e2  iff  e1.x < e2.x || (e1.x == e2.x && e1.y < e2.y)
+         */
+        RemoveDegenerateEdges(tess);
+        if (!InitPriorityQ(tess)) return false; /* if error */
+        InitEdgeDict(tess);
+
+        /* __gl_pqSortExtractMin */
+        while ((v = (GLUvertex) tess.pq.pqExtractMin()) != null) {
+            for (; ;) {
+                vNext = (GLUvertex) tess.pq.pqMinimum(); /* __gl_pqSortMinimum */
+                if (vNext == null || !Geom.VertEq(vNext, v)) break;
+
+                /* Merge together all vertices at exactly the same location.
+                 * This is more efficient than processing them one at a time,
+                 * simplifies the code (see ConnectLeftDegenerate), and is also
+                 * important for correct handling of certain degenerate cases.
+                 * For example, suppose there are two identical edges A and B
+                 * that belong to different contours (so without this code they would
+                 * be processed by separate sweep events).  Suppose another edge C
+                 * crosses A and B from above.  When A is processed, we split it
+                 * at its intersection point with C.  However this also splits C,
+                 * so when we insert B we may compute a slightly different
+                 * intersection point.  This might leave two edges with a small
+                 * gap between them.  This kind of error is especially obvious
+                 * when using boundary extraction (GLU_TESS_BOUNDARY_ONLY).
+                 */
+                vNext = (GLUvertex) tess.pq.pqExtractMin(); /* __gl_pqSortExtractMin*/
+                SpliceMergeVertices(tess, v.anEdge, vNext.anEdge);
+            }
+            SweepEvent(tess, v);
+        }
+
+        /* Set tess.event for debugging purposes */
+        /* __GL_DICTLISTKEY */ /* __GL_DICTLISTMIN */
+        tess.event = ((ActiveRegion) Dict.dictKey(Dict.dictMin(tess.dict))).eUp.Org;
+        DebugEvent(tess);
+        DoneEdgeDict(tess);
+        DonePriorityQ(tess);
+
+        if (!RemoveDegenerateFaces(tess.mesh)) return false;
+        Mesh.__gl_meshCheckMesh(tess.mesh);
+
+        return true;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessMono.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessMono.java
new file mode 100644
index 000000000..ef89b1613
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessMono.java
@@ -0,0 +1,241 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class TessMono {
+/* __gl_meshTessellateMonoRegion( face ) tessellates a monotone region
+ * (what else would it do??)  The region must consist of a single
+ * loop of half-edges (see mesh.h) oriented CCW.  "Monotone" in this
+ * case means that any vertical line intersects the interior of the
+ * region in a single interval.
+ *
+ * Tessellation consists of adding interior edges (actually pairs of
+ * half-edges), to split the region into non-overlapping triangles.
+ *
+ * The basic idea is explained in Preparata and Shamos (which I don''t
+ * have handy right now), although their implementation is more
+ * complicated than this one.  The are two edge chains, an upper chain
+ * and a lower chain.  We process all vertices from both chains in order,
+ * from right to left.
+ *
+ * The algorithm ensures that the following invariant holds after each
+ * vertex is processed: the untessellated region consists of two
+ * chains, where one chain (say the upper) is a single edge, and
+ * the other chain is concave.  The left vertex of the single edge
+ * is always to the left of all vertices in the concave chain.
+ *
+ * Each step consists of adding the rightmost unprocessed vertex to one
+ * of the two chains, and forming a fan of triangles from the rightmost
+ * of two chain endpoints.  Determining whether we can add each triangle
+ * to the fan is a simple orientation test.  By making the fan as large
+ * as possible, we restore the invariant (check it yourself).
+ */
+    static boolean __gl_meshTessellateMonoRegion(GLUface face, boolean avoidDegenerateTris) {
+        GLUhalfEdge up, lo;
+
+        /* All edges are oriented CCW around the boundary of the region.
+         * First, find the half-edge whose origin vertex is rightmost.
+         * Since the sweep goes from left to right, face->anEdge should
+         * be close to the edge we want.
+         */
+        up = face.anEdge;
+        assert (up.Lnext != up && up.Lnext.Lnext != up);
+
+        for (; Geom.VertLeq(up.Sym.Org, up.Org); up = up.Onext.Sym)
+            ;
+        for (; Geom.VertLeq(up.Org, up.Sym.Org); up = up.Lnext)
+            ;
+        lo = up.Onext.Sym;
+
+        boolean mustConnect = false; // hack for avoidDegenerateTris
+
+        while (up.Lnext != lo) {
+            if (avoidDegenerateTris && !mustConnect) {
+                // Skip over regions where several vertices are collinear,
+                // to try to avoid producing degenerate (zero-area) triangles
+                //
+                // The "mustConnect" flag is a hack to try to avoid
+                // skipping too large regions and causing incorrect
+                // triangulations. This entire modification is overall
+                // not robust and needs more work
+                if (Geom.EdgeCos(lo.Lnext.Org, lo.Org, lo.Lnext.Lnext.Org) <= -Geom.ONE_MINUS_EPSILON) {
+                    // Lines around lo
+                    do {
+                        lo = lo.Onext.Sym;
+                        mustConnect = true;
+                    } while (up.Lnext != lo &&
+                             Geom.EdgeCos(lo.Lnext.Org, lo.Org, lo.Lnext.Lnext.Org) <= -Geom.ONE_MINUS_EPSILON);
+                } else if (Geom.EdgeCos(up.Onext.Sym.Org, up.Org, up.Onext.Sym.Onext.Sym.Org) <= -Geom.ONE_MINUS_EPSILON) {
+                    // Lines around up
+                    do {
+                        up = up.Lnext;
+                        mustConnect = true;
+                    } while (up.Lnext != lo &&
+                             Geom.EdgeCos(up.Onext.Sym.Org, up.Org, up.Onext.Sym.Onext.Sym.Org) <= -Geom.ONE_MINUS_EPSILON);
+                }
+
+                if (up.Lnext == lo)
+                    break;
+            }
+
+            if (Geom.VertLeq(up.Sym.Org, lo.Org)) {
+                /* up.Sym.Org is on the left.  It is safe to form triangles from lo.Org.
+                 * The EdgeGoesLeft test guarantees progress even when some triangles
+                 * are CW, given that the upper and lower chains are truly monotone.
+                 */
+                while (lo.Lnext != up && (Geom.EdgeGoesLeft(lo.Lnext)
+                        || Geom.EdgeSign(lo.Org, lo.Sym.Org, lo.Lnext.Sym.Org) <= 0)) {
+                    GLUhalfEdge tempHalfEdge = Mesh.__gl_meshConnect(lo.Lnext, lo);
+                    mustConnect = false;
+                    if (tempHalfEdge == null) return false;
+                    lo = tempHalfEdge.Sym;
+                }
+                lo = lo.Onext.Sym;
+            } else {
+                /* lo.Org is on the left.  We can make CCW triangles from up.Sym.Org. */
+                while (lo.Lnext != up && (Geom.EdgeGoesRight(up.Onext.Sym)
+                        || Geom.EdgeSign(up.Sym.Org, up.Org, up.Onext.Sym.Org) >= 0)) {
+                    GLUhalfEdge tempHalfEdge = Mesh.__gl_meshConnect(up, up.Onext.Sym);
+                    mustConnect = false;
+                    if (tempHalfEdge == null) return false;
+                    up = tempHalfEdge.Sym;
+                }
+                up = up.Lnext;
+            }
+        }
+
+        /* Now lo.Org == up.Sym.Org == the leftmost vertex.  The remaining region
+         * can be tessellated in a fan from this leftmost vertex.
+         */
+        assert (lo.Lnext != up);
+        while (lo.Lnext.Lnext != up) {
+            GLUhalfEdge tempHalfEdge = Mesh.__gl_meshConnect(lo.Lnext, lo);
+            if (tempHalfEdge == null) return false;
+            lo = tempHalfEdge.Sym;
+        }
+
+        return true;
+    }
+
+
+/* __gl_meshTessellateInterior( mesh ) tessellates each region of
+ * the mesh which is marked "inside" the polygon.  Each such region
+ * must be monotone.
+ */
+    public static boolean __gl_meshTessellateInterior(GLUmesh mesh, boolean avoidDegenerateTris) {
+        GLUface f, next;
+
+        /*LINTED*/
+        for (f = mesh.fHead.next; f != mesh.fHead; f = next) {
+            /* Make sure we don''t try to tessellate the new triangles. */
+            next = f.next;
+            if (f.inside) {
+                if (!__gl_meshTessellateMonoRegion(f, avoidDegenerateTris)) return false;
+            }
+        }
+
+        return true;
+    }
+
+
+/* __gl_meshDiscardExterior( mesh ) zaps (ie. sets to NULL) all faces
+ * which are not marked "inside" the polygon.  Since further mesh operations
+ * on NULL faces are not allowed, the main purpose is to clean up the
+ * mesh so that exterior loops are not represented in the data structure.
+ */
+    public static void __gl_meshDiscardExterior(GLUmesh mesh) {
+        GLUface f, next;
+
+        /*LINTED*/
+        for (f = mesh.fHead.next; f != mesh.fHead; f = next) {
+            /* Since f will be destroyed, save its next pointer. */
+            next = f.next;
+            if (!f.inside) {
+                Mesh.__gl_meshZapFace(f);
+            }
+        }
+    }
+
+    private static final int MARKED_FOR_DELETION = 0x7fffffff;
+
+/* __gl_meshSetWindingNumber( mesh, value, keepOnlyBoundary ) resets the
+ * winding numbers on all edges so that regions marked "inside" the
+ * polygon have a winding number of "value", and regions outside
+ * have a winding number of 0.
+ *
+ * If keepOnlyBoundary is TRUE, it also deletes all edges which do not
+ * separate an interior region from an exterior one.
+ */
+    public static boolean __gl_meshSetWindingNumber(GLUmesh mesh, int value, boolean keepOnlyBoundary) {
+        GLUhalfEdge e, eNext;
+
+        for (e = mesh.eHead.next; e != mesh.eHead; e = eNext) {
+            eNext = e.next;
+            if (e.Sym.Lface.inside != e.Lface.inside) {
+
+                /* This is a boundary edge (one side is interior, one is exterior). */
+                e.winding = (e.Lface.inside) ? value : -value;
+            } else {
+
+                /* Both regions are interior, or both are exterior. */
+                if (!keepOnlyBoundary) {
+                    e.winding = 0;
+                } else {
+                    if (!Mesh.__gl_meshDelete(e)) return false;
+                }
+            }
+        }
+        return true;
+    }
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessState.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessState.java
new file mode 100644
index 000000000..a8aa41d9f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessState.java
@@ -0,0 +1,59 @@
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package com.jogamp.opengl.impl.glu.tessellator;
+
+class TessState {
+    public static final int T_DORMANT = 0;
+    public static final int T_IN_POLYGON = 1;
+    public static final int T_IN_CONTOUR = 2;
+}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/GLUquadricImpl.java b/src/jogl/classes/com/sun/opengl/impl/glu/GLUquadricImpl.java
deleted file mode 100644
index cc0784199..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/GLUquadricImpl.java
+++ /dev/null
@@ -1,1212 +0,0 @@
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
-** http://oss.sgi.com/projects/FreeB
-** 
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-** 
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** $Date: 2009-03-04 17:23:34 -0800 (Wed, 04 Mar 2009) $ $Revision: 1856 $
-** $Header$
-*/
-
-/* 
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
- * met:
- * 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of 
- *   its contributors may be used to endorse or promote products derived 
- *   from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.opengl.impl.glu;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-import com.sun.opengl.util.ImmModeSink;
-import java.nio.*;
-
-/**
- * GLUquadricImpl.java
- * 
- * 
- * Created 22-dec-2003 (originally Quadric.java)
- * @author Erik Duijs
- * @author Kenneth Russell, Sven Gothel
- */
-
-public class GLUquadricImpl implements GLUquadric {
-  private boolean useGLSL;
-  private int drawStyle;
-  private int orientation;
-  private boolean textureFlag;
-  private int normals;
-  private boolean immModeSinkEnabled;
-  private boolean immModeSinkImmediate;
-  public int normalType;
-  public GL gl;
-
-  public static final boolean USE_NORM = true;
-  public static final boolean USE_TEXT = false;
-
-  private ImmModeSink immModeSink=null;
-
-  public GLUquadricImpl(GL gl, boolean useGLSL) {
-    this.gl=gl;
-    this.useGLSL = useGLSL;
-    drawStyle = GLU.GLU_FILL;
-    orientation = GLU.GLU_OUTSIDE;
-    textureFlag = false;
-    normals = GLU.GLU_SMOOTH;
-    normalType = gl.isGLES1()?GL.GL_BYTE:GL.GL_FLOAT;
-    immModeSinkImmediate=true;
-    immModeSinkEnabled=!gl.isGL2();
-    replaceImmModeSink();
-  }
-
-  public void enableImmModeSink(boolean val) {
-    if(gl.isGL2()) {
-        immModeSinkEnabled=val;
-    } else {
-        immModeSinkEnabled=true;
-    }
-    if(null==immModeSink && immModeSinkEnabled) {
-      replaceImmModeSink();
-    }
-  }
-
-  public boolean isImmModeSinkEnabled() {
-    return immModeSinkEnabled;
-  }
-
-  public void setImmMode(boolean val) {
-    if(immModeSinkEnabled) {
-        immModeSinkImmediate=val;
-    } else {
-        immModeSinkImmediate=true;
-    }
-  }
-
-  public boolean getImmMode() {
-    return immModeSinkImmediate;
-  }
-
-  public ImmModeSink replaceImmModeSink() {
-    if(!immModeSinkEnabled) return null;
-
-    ImmModeSink res = immModeSink;
-    if(useGLSL) {
-        immModeSink = ImmModeSink.createGLSL (gl, GL.GL_STATIC_DRAW, 32, 
-                                              3, GL.GL_FLOAT,  // vertex
-                                              0, GL.GL_FLOAT,  // color
-                                              USE_NORM?3:0, normalType,// normal
-                                              USE_TEXT?2:0, GL.GL_FLOAT); // texture
-    } else {
-        immModeSink = ImmModeSink.createFixed(gl, GL.GL_STATIC_DRAW, 32, 
-                                              3, GL.GL_FLOAT,  // vertex
-                                              0, GL.GL_FLOAT,  // color
-                                              USE_NORM?3:0, normalType,// normal
-                                              USE_TEXT?2:0, GL.GL_FLOAT); // texture
-    }
-    return res;
-  }
-
-  public void resetImmModeSink(GL gl) {
-    if(immModeSinkEnabled) {
-        immModeSink.reset(gl);
-    }
-  }
-
-  /**
-   * specifies the draw style for quadrics.  
-   *
-   * The legal values are as follows:
-   *
-   * GLU.FILL:       Quadrics are rendered with polygon primitives. The polygons
-   *                 are drawn in a counterclockwise fashion with respect to
-   *                 their normals (as defined with glu.quadricOrientation).
-   *
-   * GLU.LINE:       Quadrics are rendered as a set of lines.
-   *
-   * GLU.SILHOUETTE: Quadrics are rendered as a set of lines, except that edges
-   * 		   separating coplanar faces will not be drawn.
-   *
-   * GLU.POINT:       Quadrics are rendered as a set of points.
-   * 
-   * @param drawStyle The drawStyle to set
-   */
-  public void setDrawStyle(int drawStyle) {
-    this.drawStyle = drawStyle;
-  }
-
-  /**
-   * specifies what kind	of normals are desired for quadrics.
-   * The legal values	are as follows:
-   *
-   * GLU.NONE:     No normals are generated.
-   *
-   * GLU.FLAT:     One normal is generated for every facet of a quadric.
-   *
-   * GLU.SMOOTH:   One normal is generated for every vertex of a quadric.  This
-   *               is the default.
-   * 
-   * @param normals The normals to set
-   */
-  public void setNormals(int normals) {
-    this.normals = normals;
-  }
-
-  /**
-   * specifies what kind of orientation is desired for.
-   * The orientation	values are as follows:
-   *
-   * GLU.OUTSIDE:  Quadrics are drawn with normals pointing outward.
-   *
-   * GLU.INSIDE:   Normals point inward. The default is GLU.OUTSIDE.
-   *
-   * Note that the interpretation of outward and inward depends on the quadric
-   * being drawn.
-   * 
-   * @param orientation The orientation to set
-   */
-  public void setOrientation(int orientation) {
-    this.orientation = orientation;
-  }
-
-  /**
-   * specifies if texture coordinates should be generated for
-   * quadrics rendered with qobj. If the value of textureCoords is true,
-   * then texture coordinates are generated, and if textureCoords is false,
-   * they are not.. The default is false.
-   *
-   * The manner in which texture coordinates are generated depends upon the
-   * specific quadric rendered.
-   * 
-   * @param textureFlag The textureFlag to set
-   */
-  public void setTextureFlag(boolean textureFlag) {
-    this.textureFlag = textureFlag;
-  }
-
-  /**
-   * Returns the drawStyle.
-   * @return int
-   */
-  public int getDrawStyle() {
-    return drawStyle;
-  }
-
-  /**
-   * Returns the normals.
-   * @return int
-   */
-  public int getNormals() {
-    return normals;
-  }
-
-  /**
-   * Returns the orientation.
-   * @return int
-   */
-  public int getOrientation() {
-    return orientation;
-  }
-
-  /**
-   * Returns the textureFlag.
-   * @return boolean
-   */
-  public boolean getTextureFlag() {
-    return textureFlag;
-  }
-
-
-  /**
-   * draws a cylinder oriented along the z axis. The base of the
-   * cylinder is placed at z = 0, and the top at z=height. Like a sphere, a
-   * cylinder is subdivided around the z axis into slices, and along the z axis
-   * into stacks.
-   *
-   * Note that if topRadius is set to zero, then this routine will generate a
-   * cone.
-   *
-   * If the orientation is set to GLU.OUTSIDE (with glu.quadricOrientation), then
-   * any generated normals point away from the z axis. Otherwise, they point
-   * toward the z axis.
-   *
-   * If texturing is turned on (with glu.quadricTexture), then texture
-   * coordinates are generated so that t ranges linearly from 0.0 at z = 0 to
-   * 1.0 at z = height, and s ranges from 0.0 at the +y axis, to 0.25 at the +x
-   * axis, to 0.5 at the -y axis, to 0.75 at the -x axis, and back to 1.0 at the
-   * +y axis.
-   *
-   * @param baseRadius  Specifies the radius of the cylinder at z = 0.
-   * @param topRadius   Specifies the radius of the cylinder at z = height.
-   * @param height      Specifies the height of the cylinder.
-   * @param slices      Specifies the number of subdivisions around the z axis.
-   * @param stacks      Specifies the number of subdivisions along the z axis.
-   */
-  public void drawCylinder(GL gl, float baseRadius, float topRadius, float height, int slices, int stacks) {
-
-    float da, r, dr, dz;
-    float x, y, z, nz, nsign;
-    int i, j;
-
-    if (orientation == GLU.GLU_INSIDE) {
-      nsign = -1.0f;
-    } else {
-      nsign = 1.0f;
-    }
-
-    da = 2.0f * PI / slices;
-    dr = (topRadius - baseRadius) / stacks;
-    dz = height / stacks;
-    nz = (baseRadius - topRadius) / height;
-    // Z component of normal vectors
-
-    if (drawStyle == GLU.GLU_POINT) {
-      glBegin(gl, GL.GL_POINTS);
-      for (i = 0; i < slices; i++) {
-        x = cos((i * da));
-        y = sin((i * da));
-        normal3f(gl, x * nsign, y * nsign, nz * nsign);
-
-        z = 0.0f;
-        r = baseRadius;
-        for (j = 0; j <= stacks; j++) {
-          glVertex3f(gl, (x * r), (y * r), z);
-          z += dz;
-          r += dr;
-        }
-      }
-      glEnd(gl);
-    } else if (drawStyle == GLU.GLU_LINE || drawStyle == GLU.GLU_SILHOUETTE) {
-      // Draw rings
-      if (drawStyle == GLU.GLU_LINE) {
-        z = 0.0f;
-        r = baseRadius;
-        for (j = 0; j <= stacks; j++) {
-          glBegin(gl, GL.GL_LINE_LOOP);
-          for (i = 0; i < slices; i++) {
-            x = cos((i * da));
-            y = sin((i * da));
-            normal3f(gl, x * nsign, y * nsign, nz * nsign);
-            glVertex3f(gl, (x * r), (y * r), z);
-          }
-          glEnd(gl);
-          z += dz;
-          r += dr;
-        }
-      } else {
-        // draw one ring at each end
-        if (baseRadius != 0.0) {
-          glBegin(gl, GL.GL_LINE_LOOP);
-          for (i = 0; i < slices; i++) {
-            x = cos((i * da));
-            y = sin((i * da));
-            normal3f(gl, x * nsign, y * nsign, nz * nsign);
-            glVertex3f(gl, (x * baseRadius), (y * baseRadius), 0.0f);
-          }
-          glEnd(gl);
-          glBegin(gl, GL.GL_LINE_LOOP);
-          for (i = 0; i < slices; i++) {
-            x = cos((i * da));
-            y = sin((i * da));
-            normal3f(gl, x * nsign, y * nsign, nz * nsign);
-            glVertex3f(gl, (x * topRadius), (y * topRadius), height);
-          }
-          glEnd(gl);
-        }
-      }
-      // draw length lines
-      glBegin(gl, GL.GL_LINES);
-      for (i = 0; i < slices; i++) {
-        x = cos((i * da));
-        y = sin((i * da));
-        normal3f(gl, x * nsign, y * nsign, nz * nsign);
-        glVertex3f(gl, (x * baseRadius), (y * baseRadius), 0.0f);
-        glVertex3f(gl, (x * topRadius), (y * topRadius), (height));
-      }
-      glEnd(gl);
-    } else if (drawStyle == GLU.GLU_FILL) {
-      float ds = 1.0f / slices;
-      float dt = 1.0f / stacks;
-      float t = 0.0f;
-      z = 0.0f;
-      r = baseRadius;
-      for (j = 0; j < stacks; j++) {
-        float s = 0.0f;
-        glBegin(gl, immModeSink.GL_QUAD_STRIP);
-        for (i = 0; i <= slices; i++) {
-          if (i == slices) {
-            x = sin(0.0f);
-            y = cos(0.0f);
-          } else {
-            x = sin((i * da));
-            y = cos((i * da));
-          }
-          if (nsign == 1.0f) {
-            normal3f(gl, (x * nsign), (y * nsign), (nz * nsign));
-            TXTR_COORD(gl, s, t);
-            glVertex3f(gl, (x * r), (y * r), z);
-            normal3f(gl, (x * nsign), (y * nsign), (nz * nsign));
-            TXTR_COORD(gl, s, t + dt);
-            glVertex3f(gl, (x * (r + dr)), (y * (r + dr)), (z + dz));
-          } else {
-            normal3f(gl, x * nsign, y * nsign, nz * nsign);
-            TXTR_COORD(gl, s, t);
-            glVertex3f(gl, (x * r), (y * r), z);
-            normal3f(gl, x * nsign, y * nsign, nz * nsign);
-            TXTR_COORD(gl, s, t + dt);
-            glVertex3f(gl, (x * (r + dr)), (y * (r + dr)), (z + dz));
-          }
-          s += ds;
-        } // for slices
-        glEnd(gl);
-        r += dr;
-        t += dt;
-        z += dz;
-      } // for stacks
-    }
-  }
-
-  /**
-   * renders a disk on the z = 0  plane.  The disk has a radius of
-   * outerRadius, and contains a concentric circular hole with a radius of
-   * innerRadius. If innerRadius is 0, then no hole is generated. The disk is
-   * subdivided around the z axis into slices (like pizza slices), and also
-   * about the z axis into rings (as specified by slices and loops,
-   * respectively).
-   *
-   * With respect to orientation, the +z side of the disk is considered to be
-   * "outside" (see glu.quadricOrientation).  This means that if the orientation
-   * is set to GLU.OUTSIDE, then any normals generated point along the +z axis.
-   * Otherwise, they point along the -z axis.
-   *
-   * If texturing is turned on (with glu.quadricTexture), texture coordinates are
-   * generated linearly such that where r=outerRadius, the value at (r, 0, 0) is
-   * (1, 0.5), at (0, r, 0) it is (0.5, 1), at (-r, 0, 0) it is (0, 0.5), and at
-   * (0, -r, 0) it is (0.5, 0).
-   */
-  public void drawDisk(GL gl, float innerRadius, float outerRadius, int slices, int loops)
-  {
-    float da, dr;
-
-    /* Normal vectors */
-    if (normals != GLU.GLU_NONE) {
-      if (orientation == GLU.GLU_OUTSIDE) {
-        glNormal3f(gl, 0.0f, 0.0f, +1.0f);
-      }
-      else {
-        glNormal3f(gl, 0.0f, 0.0f, -1.0f);
-      }
-    }
-	
-    da = 2.0f * PI / slices;
-    dr = (outerRadius - innerRadius) /  loops;
-	
-    switch (drawStyle) {
-    case GLU.GLU_FILL:
-      {
-        /* texture of a gluDisk is a cut out of the texture unit square
-         * x, y in [-outerRadius, +outerRadius]; s, t in [0, 1]
-         * (linear mapping)
-         */
-        float dtc = 2.0f * outerRadius;
-        float sa, ca;
-        float r1 = innerRadius;
-        int l;
-        for (l = 0; l < loops; l++) {
-          float r2 = r1 + dr;
-          if (orientation == GLU.GLU_OUTSIDE) {
-            int s;
-            glBegin(gl, immModeSink.GL_QUAD_STRIP);
-            for (s = 0; s <= slices; s++) {
-              float a;
-              if (s == slices)
-                a = 0.0f;
-              else
-                a = s * da;
-              sa = sin(a);
-              ca = cos(a);
-              TXTR_COORD(gl, 0.5f + sa * r2 / dtc, 0.5f + ca * r2 / dtc);
-              glVertex2f(gl, r2 * sa, r2 * ca);
-              TXTR_COORD(gl, 0.5f + sa * r1 / dtc, 0.5f + ca * r1 / dtc);
-              glVertex2f(gl, r1 * sa, r1 * ca);
-            }
-            glEnd(gl);
-          }
-          else {
-            int s;
-            glBegin(gl, immModeSink.GL_QUAD_STRIP);
-            for (s = slices; s >= 0; s--) {
-              float a;
-              if (s == slices)
-                a = 0.0f;
-              else
-                a = s * da;
-              sa = sin(a);
-              ca = cos(a);
-              TXTR_COORD(gl, 0.5f - sa * r2 / dtc, 0.5f + ca * r2 / dtc);
-              glVertex2f(gl, r2 * sa, r2 * ca);
-              TXTR_COORD(gl, 0.5f - sa * r1 / dtc, 0.5f + ca * r1 / dtc);
-              glVertex2f(gl, r1 * sa, r1 * ca);
-            }
-            glEnd(gl);
-          }
-          r1 = r2;
-        }
-        break;
-      }
-    case GLU.GLU_LINE:
-      {
-        int l, s;
-        /* draw loops */
-        for (l = 0; l <= loops; l++) {
-          float r = innerRadius + l * dr;
-          glBegin(gl, GL.GL_LINE_LOOP);
-          for (s = 0; s < slices; s++) {
-            float a = s * da;
-            glVertex2f(gl, r * sin(a), r * cos(a));
-          }
-          glEnd(gl);
-        }
-        /* draw spokes */
-        for (s = 0; s < slices; s++) {
-          float a = s * da;
-          float x = sin(a);
-          float y = cos(a);
-          glBegin(gl, GL.GL_LINE_STRIP);
-          for (l = 0; l <= loops; l++) {
-            float r = innerRadius + l * dr;
-            glVertex2f(gl, r * x, r * y);
-          }
-          glEnd(gl);
-        }
-        break;
-      }
-    case GLU.GLU_POINT:
-      {
-        int s;
-        glBegin(gl, GL.GL_POINTS);
-        for (s = 0; s < slices; s++) {
-          float a = s * da;
-          float x = sin(a);
-          float y = cos(a);
-          int l;
-          for (l = 0; l <= loops; l++) {
-            float r = innerRadius * l * dr;
-            glVertex2f(gl, r * x, r * y);
-          }
-        }
-        glEnd(gl);
-        break;
-      }
-    case GLU.GLU_SILHOUETTE:
-      {
-        if (innerRadius != 0.0) {
-          float a;
-          glBegin(gl, GL.GL_LINE_LOOP);
-          for (a = 0.0f; a < 2.0 * PI; a += da) {
-            float x = innerRadius * sin(a);
-            float y = innerRadius * cos(a);
-            glVertex2f(gl, x, y);
-          }
-          glEnd(gl);
-        }
-        {
-          float a;
-          glBegin(gl, GL.GL_LINE_LOOP);
-          for (a = 0; a < 2.0f * PI; a += da) {
-            float x = outerRadius * sin(a);
-            float y = outerRadius * cos(a);
-            glVertex2f(gl, x, y);
-          }
-          glEnd(gl);
-        }
-        break;
-      }
-    default:
-      return;
-    }
-  }
-
-  /**
-   * renders a partial disk on the z=0 plane. A partial disk is similar to a
-   * full disk, except that only the subset of the disk from startAngle
-   * through startAngle + sweepAngle is included (where 0 degrees is along
-   * the +y axis, 90 degrees along the +x axis, 180 along the -y axis, and
-   * 270 along the -x axis).
-   * 
-   * The partial disk has a radius of outerRadius, and contains a concentric
-   * circular hole with a radius of innerRadius. If innerRadius is zero, then
-   * no hole is generated. The partial disk is subdivided around the z axis
-   * into slices (like pizza slices), and also about the z axis into rings
-   * (as specified by slices and loops, respectively).
-   * 
-   * With respect to orientation, the +z side of the partial disk is
-   * considered to be outside (see gluQuadricOrientation). This means that if
-   * the orientation is set to GLU.GLU_OUTSIDE, then any normals generated point
-   * along the +z axis. Otherwise, they point along the -z axis.
-   * 
-   * If texturing is turned on (with gluQuadricTexture), texture coordinates
-   * are generated linearly such that where r=outerRadius, the value at (r, 0, 0)
-   * is (1, 0.5), at (0, r, 0) it is (0.5, 1), at (-r, 0, 0) it is (0, 0.5),
-   * and at (0, -r, 0) it is (0.5, 0).
-   */
-  public void drawPartialDisk(GL gl,
-                              float innerRadius,
-                              float outerRadius,
-                              int slices,
-                              int loops,
-                              float startAngle,
-                              float sweepAngle) {
-    int i, j, max;
-    float[] sinCache = new float[CACHE_SIZE];
-    float[] cosCache = new float[CACHE_SIZE];
-    float angle;
-    float x, y;
-    float sintemp, costemp;
-    float deltaRadius;
-    float radiusLow, radiusHigh;
-    float texLow = 0, texHigh = 0;
-    float angleOffset;
-    int slices2;
-    int finish;
-
-    if (slices >= CACHE_SIZE)
-      slices = CACHE_SIZE - 1;
-    if (slices < 2
-        || loops < 1
-        || outerRadius <= 0.0f
-        || innerRadius < 0.0f
-        || innerRadius > outerRadius) {
-      //gluQuadricError(qobj, GLU.GLU_INVALID_VALUE);
-      System.err.println("PartialDisk: GLU_INVALID_VALUE");
-      return;
-    }
-
-    if (sweepAngle < -360.0f)
-      sweepAngle = 360.0f;
-    if (sweepAngle > 360.0f)
-      sweepAngle = 360.0f;
-    if (sweepAngle < 0) {
-      startAngle += sweepAngle;
-      sweepAngle = -sweepAngle;
-    }
-
-    if (sweepAngle == 360.0f) {
-      slices2 = slices;
-    } else {
-      slices2 = slices + 1;
-    }
-
-    /* Compute length (needed for normal calculations) */
-    deltaRadius = outerRadius - innerRadius;
-
-    /* Cache is the vertex locations cache */
-
-    angleOffset = startAngle / 180.0f * PI;
-    for (i = 0; i <= slices; i++) {
-      angle = angleOffset + ((PI * sweepAngle) / 180.0f) * i / slices;
-      sinCache[i] = sin(angle);
-      cosCache[i] = cos(angle);
-    }
-
-    if (sweepAngle == 360.0f) {
-      sinCache[slices] = sinCache[0];
-      cosCache[slices] = cosCache[0];
-    }
-
-    switch (normals) {
-    case GLU.GLU_FLAT :
-    case GLU.GLU_SMOOTH :
-      if (orientation == GLU.GLU_OUTSIDE) {
-        glNormal3f(gl, 0.0f, 0.0f, 1.0f);
-      } else {
-        glNormal3f(gl, 0.0f, 0.0f, -1.0f);
-      }
-      break;
-    default :
-    case GLU.GLU_NONE :
-      break;
-    }
-
-    switch (drawStyle) {
-    case GLU.GLU_FILL :
-      if (innerRadius == .0f) {
-        finish = loops - 1;
-        /* Triangle strip for inner polygons */
-        glBegin(gl, GL.GL_TRIANGLE_FAN);
-        if (textureFlag) {
-          glTexCoord2f(gl, 0.5f, 0.5f);
-        }
-        glVertex3f(gl, 0.0f, 0.0f, 0.0f);
-        radiusLow = outerRadius - deltaRadius * ((float) (loops - 1) / loops);
-        if (textureFlag) {
-          texLow = radiusLow / outerRadius / 2;
-        }
-
-        if (orientation == GLU.GLU_OUTSIDE) {
-          for (i = slices; i >= 0; i--) {
-            if (textureFlag) {
-              glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
-                              texLow * cosCache[i] + 0.5f);
-            }
-            glVertex3f(gl, radiusLow * sinCache[i], radiusLow * cosCache[i], 0.0f);
-          }
-        } else {
-          for (i = 0; i <= slices; i++) {
-            if (textureFlag) {
-              glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
-                              texLow * cosCache[i] + 0.5f);
-            }
-            glVertex3f(gl, radiusLow * sinCache[i], radiusLow * cosCache[i], 0.0f);
-          }
-        }
-        glEnd(gl);
-      } else {
-        finish = loops;
-      }
-      for (j = 0; j < finish; j++) {
-        radiusLow = outerRadius - deltaRadius * ((float) j / loops);
-        radiusHigh = outerRadius - deltaRadius * ((float) (j + 1) / loops);
-        if (textureFlag) {
-          texLow = radiusLow / outerRadius / 2;
-          texHigh = radiusHigh / outerRadius / 2;
-        }
-
-        glBegin(gl, immModeSink.GL_QUAD_STRIP);
-        for (i = 0; i <= slices; i++) {
-          if (orientation == GLU.GLU_OUTSIDE) {
-            if (textureFlag) {
-              glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
-                              texLow * cosCache[i] + 0.5f);
-            }
-            glVertex3f(gl, radiusLow * sinCache[i], radiusLow * cosCache[i], 0.0f);
-
-            if (textureFlag) {
-              glTexCoord2f(gl, texHigh * sinCache[i] + 0.5f,
-                              texHigh * cosCache[i] + 0.5f);
-            }
-            glVertex3f(gl, radiusHigh * sinCache[i],
-                          radiusHigh * cosCache[i],
-                          0.0f);
-          } else {
-            if (textureFlag) {
-              glTexCoord2f(gl, texHigh * sinCache[i] + 0.5f,
-                              texHigh * cosCache[i] + 0.5f);
-            }
-            glVertex3f(gl, radiusHigh * sinCache[i],
-                          radiusHigh * cosCache[i],
-                          0.0f);
-
-            if (textureFlag) {
-              glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
-                              texLow * cosCache[i] + 0.5f);
-            }
-            glVertex3f(gl, radiusLow * sinCache[i], radiusLow * cosCache[i], 0.0f);
-          }
-        }
-        glEnd(gl);
-      }
-      break;
-    case GLU.GLU_POINT :
-      glBegin(gl, GL.GL_POINTS);
-      for (i = 0; i < slices2; i++) {
-        sintemp = sinCache[i];
-        costemp = cosCache[i];
-        for (j = 0; j <= loops; j++) {
-          radiusLow = outerRadius - deltaRadius * ((float) j / loops);
-
-          if (textureFlag) {
-            texLow = radiusLow / outerRadius / 2;
-
-            glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
-                            texLow * cosCache[i] + 0.5f);
-          }
-          glVertex3f(gl, radiusLow * sintemp, radiusLow * costemp, 0.0f);
-        }
-      }
-      glEnd(gl);
-      break;
-    case GLU.GLU_LINE :
-      if (innerRadius == outerRadius) {
-        glBegin(gl, GL.GL_LINE_STRIP);
-
-        for (i = 0; i <= slices; i++) {
-          if (textureFlag) {
-            glTexCoord2f(gl, sinCache[i] / 2 + 0.5f, cosCache[i] / 2 + 0.5f);
-          }
-          glVertex3f(gl, innerRadius * sinCache[i], innerRadius * cosCache[i], 0.0f);
-        }
-        glEnd(gl);
-        break;
-      }
-      for (j = 0; j <= loops; j++) {
-        radiusLow = outerRadius - deltaRadius * ((float) j / loops);
-        if (textureFlag) {
-          texLow = radiusLow / outerRadius / 2;
-        }
-
-        glBegin(gl, GL.GL_LINE_STRIP);
-        for (i = 0; i <= slices; i++) {
-          if (textureFlag) {
-            glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
-                            texLow * cosCache[i] + 0.5f);
-          }
-          glVertex3f(gl, radiusLow * sinCache[i], radiusLow * cosCache[i], 0.0f);
-        }
-        glEnd(gl);
-      }
-      for (i = 0; i < slices2; i++) {
-        sintemp = sinCache[i];
-        costemp = cosCache[i];
-        glBegin(gl, GL.GL_LINE_STRIP);
-        for (j = 0; j <= loops; j++) {
-          radiusLow = outerRadius - deltaRadius * ((float) j / loops);
-          if (textureFlag) {
-            texLow = radiusLow / outerRadius / 2;
-          }
-
-          if (textureFlag) {
-            glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
-                            texLow * cosCache[i] + 0.5f);
-          }
-          glVertex3f(gl, radiusLow * sintemp, radiusLow * costemp, 0.0f);
-        }
-        glEnd(gl);
-      }
-      break;
-    case GLU.GLU_SILHOUETTE :
-      if (sweepAngle < 360.0f) {
-        for (i = 0; i <= slices; i += slices) {
-          sintemp = sinCache[i];
-          costemp = cosCache[i];
-          glBegin(gl, GL.GL_LINE_STRIP);
-          for (j = 0; j <= loops; j++) {
-            radiusLow = outerRadius - deltaRadius * ((float) j / loops);
-
-            if (textureFlag) {
-              texLow = radiusLow / outerRadius / 2;
-              glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
-                              texLow * cosCache[i] + 0.5f);
-            }
-            glVertex3f(gl, radiusLow * sintemp, radiusLow * costemp, 0.0f);
-          }
-          glEnd(gl);
-        }
-      }
-      for (j = 0; j <= loops; j += loops) {
-        radiusLow = outerRadius - deltaRadius * ((float) j / loops);
-        if (textureFlag) {
-          texLow = radiusLow / outerRadius / 2;
-        }
-
-        glBegin(gl, GL.GL_LINE_STRIP);
-        for (i = 0; i <= slices; i++) {
-          if (textureFlag) {
-            glTexCoord2f(gl, texLow * sinCache[i] + 0.5f,
-                            texLow * cosCache[i] + 0.5f);
-          }
-          glVertex3f(gl, radiusLow * sinCache[i], radiusLow * cosCache[i], 0.0f);
-        }
-        glEnd(gl);
-        if (innerRadius == outerRadius)
-          break;
-      }
-      break;
-    default :
-      break;
-    }
-  }
-
-  /**
-   * draws a sphere of the given	radius centered	around the origin.
-   * The sphere is subdivided around the z axis into slices and along the z axis
-   * into stacks (similar to lines of longitude and latitude).
-   *
-   * If the orientation is set to GLU.OUTSIDE (with glu.quadricOrientation), then
-   * any normals generated point away from the center of the sphere. Otherwise,
-   * they point toward the center of the sphere.
-
-   * If texturing is turned on (with glu.quadricTexture), then texture
-   * coordinates are generated so that t ranges from 0.0 at z=-radius to 1.0 at
-   * z=radius (t increases linearly along longitudinal lines), and s ranges from
-   * 0.0 at the +y axis, to 0.25 at the +x axis, to 0.5 at the -y axis, to 0.75
-   * at the -x axis, and back to 1.0 at the +y axis.
-   */
-  public void drawSphere(GL gl, float radius, int slices, int stacks) {
-    // TODO
-
-    float rho, drho, theta, dtheta;
-    float x, y, z;
-    float s, t, ds, dt;
-    int i, j, imin, imax;
-    boolean normals;
-    float nsign;
-
-    normals = (this.normals != GLU.GLU_NONE);
-
-    if (orientation == GLU.GLU_INSIDE) {
-      nsign = -1.0f;
-    } else {
-      nsign = 1.0f;
-    }
-
-    drho = PI / stacks;
-    dtheta = 2.0f * PI / slices;
-
-    if (drawStyle == GLU.GLU_FILL) {
-      if (!textureFlag) {
-        // draw +Z end as a triangle fan
-        glBegin(gl, GL.GL_TRIANGLE_FAN);
-        glNormal3f(gl, 0.0f, 0.0f, 1.0f);
-        glVertex3f(gl, 0.0f, 0.0f, nsign * radius);
-        for (j = 0; j <= slices; j++) {
-          theta = (j == slices) ? 0.0f : j * dtheta;
-          x = -sin(theta) * sin(drho);
-          y = cos(theta) * sin(drho);
-          z = nsign * cos(drho);
-          if (normals) {
-            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
-          }
-          glVertex3f(gl, x * radius, y * radius, z * radius);
-        }
-        glEnd(gl);
-      }
-
-      ds = 1.0f / slices;
-      dt = 1.0f / stacks;
-      t = 1.0f; // because loop now runs from 0
-      if (textureFlag) {
-        imin = 0;
-        imax = stacks;
-      } else {
-        imin = 1;
-        imax = stacks - 1;
-      }
-
-      // draw intermediate stacks as quad strips
-      for (i = imin; i < imax; i++) {
-        rho = i * drho;
-        glBegin(gl, immModeSink.GL_QUAD_STRIP);
-        s = 0.0f;
-        for (j = 0; j <= slices; j++) {
-          theta = (j == slices) ? 0.0f : j * dtheta;
-          x = -sin(theta) * sin(rho);
-          y = cos(theta) * sin(rho);
-          z = nsign * cos(rho);
-          if (normals) {
-            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
-          }
-          TXTR_COORD(gl, s, t);
-          glVertex3f(gl, x * radius, y * radius, z * radius);
-          x = -sin(theta) * sin(rho + drho);
-          y = cos(theta) * sin(rho + drho);
-          z = nsign * cos(rho + drho);
-          if (normals) {
-            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
-          }
-          TXTR_COORD(gl, s, t - dt);
-          s += ds;
-          glVertex3f(gl, x * radius, y * radius, z * radius);
-        }
-        glEnd(gl);
-        t -= dt;
-      }
-
-      if (!textureFlag) {
-        // draw -Z end as a triangle fan
-        glBegin(gl, GL.GL_TRIANGLE_FAN);
-        glNormal3f(gl, 0.0f, 0.0f, -1.0f);
-        glVertex3f(gl, 0.0f, 0.0f, -radius * nsign);
-        rho = PI - drho;
-        s = 1.0f;
-        for (j = slices; j >= 0; j--) {
-          theta = (j == slices) ? 0.0f : j * dtheta;
-          x = -sin(theta) * sin(rho);
-          y = cos(theta) * sin(rho);
-          z = nsign * cos(rho);
-          if (normals)
-            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
-          s -= ds;
-          glVertex3f(gl, x * radius, y * radius, z * radius);
-        }
-        glEnd(gl);
-      }
-    } else if (
-               drawStyle == GLU.GLU_LINE
-               || drawStyle == GLU.GLU_SILHOUETTE) {
-      // draw stack lines
-      for (i = 1;
-           i < stacks;
-           i++) { // stack line at i==stacks-1 was missing here
-        rho = i * drho;
-        glBegin(gl, GL.GL_LINE_LOOP);
-        for (j = 0; j < slices; j++) {
-          theta = j * dtheta;
-          x = cos(theta) * sin(rho);
-          y = sin(theta) * sin(rho);
-          z = cos(rho);
-          if (normals)
-            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
-          glVertex3f(gl, x * radius, y * radius, z * radius);
-        }
-        glEnd(gl);
-      }
-      // draw slice lines
-      for (j = 0; j < slices; j++) {
-        theta = j * dtheta;
-        glBegin(gl, GL.GL_LINE_STRIP);
-        for (i = 0; i <= stacks; i++) {
-          rho = i * drho;
-          x = cos(theta) * sin(rho);
-          y = sin(theta) * sin(rho);
-          z = cos(rho);
-          if (normals)
-            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
-          glVertex3f(gl, x * radius, y * radius, z * radius);
-        }
-        glEnd(gl);
-      }
-    } else if (drawStyle == GLU.GLU_POINT) {
-      // top and bottom-most points
-      glBegin(gl, GL.GL_POINTS);
-      if (normals)
-        glNormal3f(gl, 0.0f, 0.0f, nsign);
-      glVertex3f(gl, 0.0f, 0.0f, radius);
-      if (normals)
-        glNormal3f(gl, 0.0f, 0.0f, -nsign);
-      glVertex3f(gl, 0.0f, 0.0f, -radius);
-
-      // loop over stacks
-      for (i = 1; i < stacks - 1; i++) {
-        rho = i * drho;
-        for (j = 0; j < slices; j++) {
-          theta = j * dtheta;
-          x = cos(theta) * sin(rho);
-          y = sin(theta) * sin(rho);
-          z = cos(rho);
-          if (normals)
-            glNormal3f(gl, x * nsign, y * nsign, z * nsign);
-          glVertex3f(gl, x * radius, y * radius, z * radius);
-        }
-      }
-      glEnd(gl);
-    }
-  }
-
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  private static final float PI = (float)Math.PI;
-  private static final int CACHE_SIZE = 240;
-
-  private final void glBegin(GL gl, int mode) {
-      if(immModeSinkEnabled) {
-          immModeSink.glBegin(mode);
-      } else {
-          gl.getGL2().glBegin(mode);
-      }
-  }
-
-  private final void glEnd(GL gl) {
-      if(immModeSinkEnabled) {
-          immModeSink.glEnd(gl, immModeSinkImmediate);
-      } else {
-          gl.getGL2().glEnd();
-      }
-  }
-
-  private final void glVertex2f(GL gl, float x, float y) {
-      if(immModeSinkEnabled) {
-          immModeSink.glVertex2f(x, y);
-      } else {
-          gl.getGL2().glVertex2f(x, y);
-      }
-  }
-
-  private final void glVertex3f(GL gl, float x, float y, float z) {
-      if(immModeSinkEnabled) {
-          immModeSink.glVertex3f(x, y, z);
-      } else {
-          gl.getGL2().glVertex3f(x, y, z);
-      }
-  }
-
-  private final void glNormal3f_s(GL gl, float x, float y, float z) {
-      short a=(short)(x*0xFFFF);
-      short b=(short)(y*0xFFFF);
-      short c=(short)(z*0xFFFF);
-      if(immModeSinkEnabled) {
-          immModeSink.glNormal3s(a, b, c);
-      } else {
-          gl.getGL2().glNormal3s(a, b, c);
-      }
-  }
-
-  private final void glNormal3f_b(GL gl, float x, float y, float z) {
-      byte a=(byte)(x*0xFF);
-      byte b=(byte)(y*0xFF);
-      byte c=(byte)(z*0xFF);
-      if(immModeSinkEnabled) {
-          immModeSink.glNormal3b(a, b, c);
-      } else {
-          gl.getGL2().glNormal3b(a, b, c);
-      }
-  }
-
-  private final void glNormal3f(GL gl, float x, float y, float z) {
-    switch(normalType) {
-        case GL.GL_FLOAT:
-            if(immModeSinkEnabled) {
-                immModeSink.glNormal3f(x,y,z);
-            } else {
-                gl.getGL2().glNormal3f(x,y,z);
-            }
-            break;
-        case GL.GL_SHORT:
-            glNormal3f_s(gl, x, y, z);
-            break;
-        case GL.GL_BYTE:
-            glNormal3f_b(gl, x, y, z);
-            break;
-    }
-  }
-
-  private final void glTexCoord2f(GL gl, float x, float y) {
-      if(immModeSinkEnabled) {
-          immModeSink.glTexCoord2f(x, y);
-      } else {
-          gl.getGL2().glTexCoord2f(x, y);
-      }
-  }
-
-  /**
-   * Call glNormal3f after scaling normal to unit length.
-   *
-   * @param x
-   * @param y
-   * @param z
-   */
-  private void normal3f(GL gl, float x, float y, float z) {
-    float mag;
-	
-    mag = (float)Math.sqrt(x * x + y * y + z * z);
-    if (mag > 0.00001F) {
-      x /= mag;
-      y /= mag;
-      z /= mag;
-    }
-    glNormal3f(gl, x, y, z);
-  }
-
-  private final void TXTR_COORD(GL gl, float x, float y) {
-    if (textureFlag) glTexCoord2f(gl, x,y);
-  }
-
-  private float sin(float r) {
-    return (float)Math.sin(r);
-  }
-
-  private float cos(float r) {
-    return (float)Math.cos(r);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/Glue.java b/src/jogl/classes/com/sun/opengl/impl/glu/Glue.java
deleted file mode 100755
index 4613ae555..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/Glue.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu;
-
-/**
- *
- * @author  Administrator
- */
-public class Glue {
-  private static String[] __gluNurbsErrors = {
-    " ",
-    "spline order un-supported",
-    "too few knots",
-    "valid knot range is empty",
-    "decreasing knot sequence knot",
-    "knot multiplicity greater than order of spline",
-    "gluEndCurve() must follow gluBeginCurve()",
-    "gluBeginCurve() must precede gluEndCurve()",
-    "missing or extra geometric data",
-    "can't draw piecewise linear trimming curves",
-    "missing or extra domain data",
-    "missing or extra domain data",
-    "gluEndTrim() must precede gluEndSurface()",
-    "gluBeginSurface() must precede gluEndSurface()",
-    "curve of improper type passed as trim curve",
-    "gluBeginSurface() must precede gluBeginTrim()",
-    "gluEndTrim() must follow gluBeginTrim()",
-    "gluBeginTrim() must follow gluEndTrim()",
-    "invalid or missing trim curve",
-    "gluBeginTrim() must precede gluPwlCurve()",
-    "piecewise linear trimming curve referenced twice",
-    "piecewise linear trimming curve and nurbs curve mixed",
-    "improper usage of trim data type",
-    "nurbs curve referenced twice",
-    "nurbs curve and piecewise linear trimming curve mixed",
-    "nurbs surface referenced twice",
-    "invalid property",
-    "gluEndSurface() must follow gluBeginSurface()",
-    "intersecting or misoriented trim curve",
-    "intersecting trim curves",
-    "UNUSED",
-    "inconnected trim curves",
-    "unknown knot error",
-    "negative vertex count encountered",
-    "negative byte-stride encountered",
-    "unknown type descriptor",
-    "null control point reference",
-    "duplicate point on piecewise linear trimming curve"
-  } ;
-  
-  /** Creates a new instance of Glue */
-  public Glue() {
-  }
-  
-  public static String __gluNURBSErrorString( int errno ) {
-    return( __gluNurbsErrors[ errno ] );
-  }
-  
-  private static String[] __gluTessErrors = {
-    " ",
-    "gluTessBeginPolygon() must precede a gluTessEndPolygon",
-    "gluTessBeginContour() must precede a gluTessEndContour()",
-    "gluTessEndPolygon() must follow a gluTessBeginPolygon()",
-    "gluTessEndContour() must follow a gluTessBeginContour()",
-    "a coordinate is too large",
-    "need combine callback"
-  };
-  
-  public static String __gluTessErrorString( int errno ) {
-    return( __gluTessErrors[ errno ] );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/error/Error.java b/src/jogl/classes/com/sun/opengl/impl/glu/error/Error.java
deleted file mode 100644
index cdf28701c..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/error/Error.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- *
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- * 
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.error;
-
-import javax.media.opengl.GL;
-import javax.media.opengl.glu.GLU;
-import com.sun.opengl.impl.glu.Glue;
-
-/**
- *
- * @author  Administrator
- */
-public class Error {
-  
-  private static String[] glErrorStrings = {
-    "invalid enumerant",
-    "invalid value",
-    "invalid operation",
-    "stack overflow",
-    "stack underflow",
-    "out of memory",
-    "invalid framebuffer operation"
-  };
-  
-  private static String[] gluErrorStrings = {
-    "invalid enumerant",
-    "invalid value",
-    "out of memory",
-    "",
-    "invalid operation"
-  };
-  
-  /** Creates a new instance of Error */
-  public Error() {
-  }
-  
-  public static String gluErrorString( int errorCode ) {
-    if( errorCode == 0 ) {
-      return( "no error" );
-    }
-    if( (errorCode >= GL.GL_INVALID_ENUM) && (errorCode <= GL.GL_INVALID_FRAMEBUFFER_OPERATION) ) {
-      return( glErrorStrings[ errorCode - GL.GL_INVALID_ENUM ] );
-    }
-    if( errorCode == 0x8031 /* GL.GL_TABLE_TOO_LARGE */ ) {
-      return( "table too large" );
-    }
-    if( (errorCode >= GLU.GLU_INVALID_ENUM) && (errorCode <= GLU.GLU_INVALID_OPERATION) ) {
-      return( gluErrorStrings[ errorCode - GLU.GLU_INVALID_ENUM ] );
-    }
-//    if( (errorCode >= GLU.GLU_NURBS_ERROR1) && (errorCode <= GLU.GLU_NURBS_ERROR37) ) {
-//      return( gluErrorStrings[ errorCode - (GLU.GLU_NURBS_ERROR1 - 1) ] );
-//    }
-    if( (errorCode >= GLU.GLU_TESS_ERROR1) && (errorCode <= GLU.GLU_TESS_ERROR8) ) {
-        return( Glue.__gluTessErrorString(errorCode - (GLU.GLU_TESS_ERROR1 - 1)) );
-    }
-    return( "error ("+errorCode+")" );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java b/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java
deleted file mode 100755
index 4b78498c9..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.sun.opengl.impl.glu.gl2.nurbs;
-import com.sun.opengl.impl.glu.nurbs.*;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class responsible for rendering
- * @author Tomas Hrasky
- *
- */
-public class GL2Backend extends Backend {
-  public GL2Backend() {
-    super();
-    curveEvaluator = new GL2CurveEvaluator();
-    surfaceEvaluator = new GL2SurfaceEvaluator();
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java b/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
deleted file mode 100755
index 107ec9229..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package com.sun.opengl.impl.glu.gl2.nurbs;
-import com.sun.opengl.impl.glu.nurbs.*;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.gl2.GLUgl2;
-
-/**
- * Class rendering curves with OpenGL
- * @author Tomáš Hráský
- *
- */
-class GL2CurveEvaluator implements CurveEvaluator {
-
-  /**
-   * Output triangles (for callback) or render curve 
-   */
-  private boolean output_triangles;
-
-  /**
-   * OpenGL object
-   */
-  private GL2 gl;
-
-  /**
-   * Not used
-   */
-  private int vertex_flag;
-
-  /**
-   * Not used
-   */
-  private int normal_flag;
-
-  /**
-   * Not used
-   */
-  private int color_flag;
-
-  /**
-   * Not used
-   */
-  private int texcoord_flag;
-
-  /**
-   * Number of bezier arc - used for color distinguishing of arcs forming NURBS curve
-   */
-  private int poradi;
-
-  /**
-   * Makes new Evaluator
-   */
-  public GL2CurveEvaluator() {
-    gl = GLUgl2.getCurrentGL2();
-  }
-
-  /**
-   * Pushes eval bit
-   */
-  public void bgnmap1f() {
-    // DONE
-    if (output_triangles) {
-      vertex_flag = 0;
-      normal_flag = 0;
-      color_flag = 0;
-      texcoord_flag = 0;
-    } else {
-      gl.glPushAttrib(GL2.GL_EVAL_BIT);
-    }
-
-  }
-
-  /**
-   * Pops all OpenGL attributes
-   */
-  public void endmap1f() {
-    // DONE
-    if (output_triangles) {
-
-    } else {
-      gl.glPopAttrib();
-    }
-
-  }
-
-  /**
-   * Initializes opengl evaluator
-   * @param type curve type
-   * @param ulo lowest u
-   * @param uhi highest u
-   * @param stride control point coords
-   * @param order curve order
-   * @param ps control points
-   */
-  public void map1f(int type, float ulo, float uhi, int stride, int order,
-                    CArrayOfFloats ps) {
-    if (output_triangles) {
-      // TODO code for callback (output_triangles probably indicates callback)
-      //				System.out.println("TODO curveevaluator.map1f-output_triangles");
-    } else {
-      gl.glMap1f(type, ulo, uhi, stride, order, ps.getArray(), ps
-                 .getPointer());
-
-      // DEBUG - drawing bézier control points
-      // gl.glColor3d(.5,.5,.5);
-      // gl.glPointSize(5);
-      // gl.glBegin(GL2.GL_POINTS);
-      // float[] ctrlpoints=ps.getArray();
-      // for(int i=ps.getPointer();i<ps.getPointer()+order;i++){
-      // gl.glVertex3d(ctrlpoints[i * 4], ctrlpoints[i * 4 + 1],0);
-      // }
-      // gl.glEnd();
-    }
-
-  }
-
-  /**
-   * Calls opengl enable
-   * @param type what to enable
-   */
-  public void enable(int type) {
-    // DONE
-    gl.glEnable(type);
-  }
-
-  /**
-   * Calls glMapGrid1f
-   * @param nu steps
-   * @param u1 low u
-   * @param u2 high u
-   */
-  public void mapgrid1f(int nu, float u1, float u2) {
-    if (output_triangles) {
-      //				System.out.println("TODO curveevaluator.mapgrid1f");
-    } else
-      gl.glMapGrid1f(nu, u1, u2);
-    //			// System.out.println("upravit NU");
-    // gl.glMapGrid1f(50,u1,u2);
-  }
-
-  /**
-   * Evaluates a curve using glEvalMesh1f
-   * @param style Backend.N_MESHFILL/N_MESHLINE/N_MESHPOINT
-   * @param from lowest param
-   * @param to highest param
-   */
-  public void mapmesh1f(int style, int from, int to) {
-    /* //DEBUG drawing control points
-       this.poradi++;
-       if (poradi % 2 == 0)
-       gl.glColor3f(1, 0, 0);
-       else
-       gl.glColor3f(0, 1, 0);
-    */
-    if (output_triangles) {
-      // TODO code for callback
-      //			System.out.println("TODO openglcurveevaluator.mapmesh1f output_triangles");
-    } else {
-      switch (style) {
-      case Backend.N_MESHFILL:
-      case Backend.N_MESHLINE:
-        gl.glEvalMesh1(GL2.GL_LINE, from, to);
-        break;
-      case Backend.N_MESHPOINT:
-        gl.glEvalMesh1(GL2.GL_POINT, from, to);
-        break;
-      }
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java b/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
deleted file mode 100755
index 51fb83e6c..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.sun.opengl.impl.glu.gl2.nurbs;
-import com.sun.opengl.impl.glu.nurbs.*;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.gl2.GLUgl2;
-
-/**
- * Class rendering surfaces with OpenGL
- * @author Tomas Hrasky
- *
- */
-class GL2SurfaceEvaluator implements SurfaceEvaluator {
-
-  /**
-   * JOGL OpenGL object
-   */
-  private GL2 gl;
-
-  /**
-   * Output triangles (callback)
-   */
-  private boolean output_triangles;
-
-  /**
-   * Number of patch - used for distinguishing bezier plates forming NURBS surface with different colors
-   */
-  private int poradi;
-
-  /**
-   * Creates new evaluator
-   */
-  public GL2SurfaceEvaluator() {
-    gl = GLUgl2.getCurrentGL2();
-  }
-
-  /**
-   * Pushes eval bit
-   */
-  public void bgnmap2f() {
-
-    if (output_triangles) {
-      // TODO outp triangles surfaceevaluator bgnmap2f
-      //			System.out.println("TODO surfaceevaluator.bgnmap2f output triangles");
-    } else {
-      gl.glPushAttrib(GL2.GL_EVAL_BIT);
-      //				System.out.println("TODO surfaceevaluator.bgnmap2f glgetintegerv");
-    }
-
-  }
-
-  /**
-   * Sets  glPolygonMode
-   * @param style polygon mode (N_MESHFILL/N_MESHLINE/N_MESHPOINT)
-   */
-  public void polymode(int style) {
-    if (!output_triangles) {
-      switch (style) {
-      default:
-      case NurbsConsts.N_MESHFILL:
-        gl.glPolygonMode(GL2.GL_FRONT_AND_BACK, GL2.GL_FILL);
-        break;
-      case NurbsConsts.N_MESHLINE:
-        gl.glPolygonMode(GL2.GL_FRONT_AND_BACK, GL2.GL_LINE);
-        break;
-      case NurbsConsts.N_MESHPOINT:
-        gl.glPolygonMode(GL2.GL_FRONT_AND_BACK, GL2.GL_POINT);
-        break;
-      }
-    }
-
-  }
-
-  /**
-   * Pops all attributes
-   */
-  public void endmap2f() {
-    // TODO Auto-generated method stub
-    if (output_triangles) {
-      //			System.out.println("TODO surfaceevaluator.endmap2f output triangles");
-    } else {
-      gl.glPopAttrib();
-      // TODO use LOD
-    }
-  }
-
-  /**
-   * Empty method
-   * @param ulo
-   * @param uhi
-   * @param vlo
-   * @param vhi
-   */
-  public void domain2f(float ulo, float uhi, float vlo, float vhi) {
-    // DONE
-  }
-
-  /**
-   * Defines 2D mesh
-   * @param nu number of steps in u direction
-   * @param u0 lowest u
-   * @param u1 highest u
-   * @param nv number of steps in v direction
-   * @param v0 lowest v
-   * @param v1 highest v
-   */
-  public void mapgrid2f(int nu, float u0, float u1, int nv, float v0, float v1) {
-
-    if (output_triangles) {
-      //			System.out.println("TODO openglsurfaceavaluator.mapgrid2f output_triangles");
-    } else {
-      gl.glMapGrid2d(nu, u0, u1, nv, v0, v1);
-    }
-
-  }
-
-  /**
-   * Evaluates surface
-   * @param style surface style
-   * @param umin minimum U
-   * @param umax maximum U
-   * @param vmin minimum V
-   * @param vmax maximum V
-   */
-  public void mapmesh2f(int style, int umin, int umax, int vmin, int vmax) {
-    if (output_triangles) {
-      //			System.out.println("TODO openglsurfaceavaluator.mapmesh2f output_triangles");
-    } else {
-      /* //DEBUG - draw control points
-         this.poradi++;
-         if (poradi % 2 == 0)
-         gl.glColor3f(1, 0, 0);
-         else if (poradi % 2 == 1)
-         gl.glColor3f(0, 1, 0);
-      */
-      switch (style) {
-      case NurbsConsts.N_MESHFILL:
-        gl.glEvalMesh2(GL2.GL_FILL, umin, umax, vmin, vmax);
-        break;
-      case NurbsConsts.N_MESHLINE:
-        gl.glEvalMesh2(GL2.GL_LINE, umin, umax, vmin, vmax);
-        break;
-      case NurbsConsts.N_MESHPOINT:
-        gl.glEvalMesh2(GL2.GL_POINT, umin, umax, vmin, vmax);
-        break;
-      }
-    }
-  }
-
-  /**
-   * Initializes evaluator
-   * @param type surface type
-   * @param ulo lowest u
-   * @param uhi highest u
-   * @param ustride number of objects between control points in u direction
-   * @param uorder surface order in u direction
-   * @param vlo lowest v
-   * @param vhi highest v
-   * @param vstride number of control points' coords
-   * @param vorder surface order in v direction
-   * @param pts control points
-   */
-  public void map2f(int type, float ulo, float uhi, int ustride, int uorder,
-                    float vlo, float vhi, int vstride, int vorder, CArrayOfFloats pts) {
-    // TODO Auto-generated method stub
-    if (output_triangles) {
-      //			System.out.println("TODO openglsurfaceevaluator.map2f output_triangles");
-    } else {
-      gl.glMap2f(type, ulo, uhi, ustride, uorder, vlo, vhi, vstride,
-                 vorder, pts.getArray(), pts.getPointer());
-    }
-  }
-
-  /**
-   * Calls opengl enable
-   * @param type what to enable
-   */
-  public void enable(int type) {
-    //DONE
-    gl.glEnable(type);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java b/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
deleted file mode 100755
index 8e24ed4f0..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
+++ /dev/null
@@ -1,862 +0,0 @@
-package com.sun.opengl.impl.glu.gl2.nurbs;
-import com.sun.opengl.impl.glu.nurbs.*;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-import java.lang.reflect.Method;
-
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.glu.GLUnurbs;
-
-/**
- * Base object for working with NURBS curves and surfaces
- * 
- * @author Tomas Hrasky
- * 
- */
-public class GLUgl2nurbsImpl implements GLUnurbs {
-
-  /**
-   * Curve type - no type
-   */
-  public static final int CT_NONE = 0;
-
-  /**
-   * Curve type - NURBS curve
-   */
-  public static final int CT_NURBSCURVE = 1;
-
-  /**
-   * Curve type - picewise linear curve
-   */
-  public static final int CT_NPWLCURVE = 2;
-
-  /**
-   * Matrixes autoloading
-   */
-  private boolean autoloadmode;
-
-  /**
-   * Using callback
-   */
-  private int callBackFlag;
-
-  /**
-   * Object for error call backs
-   */
-  private Object errorCallback;
-
-  /**
-   * List of map definitions
-   */
-  Maplist maplist;
-
-  /**
-   * Indicates validity of data
-   */
-  private int isDataValid;
-
-  /**
-   * Are we in the middle of curve processing
-   */
-  private int inCurve;
-
-  /**
-   * Current curve
-   */
-  private O_curve currentCurve;
-
-  /**
-   * Are we in trim
-   */
-  private boolean inTrim;
-
-  /**
-   * Are we playbacking curve/surface rendering
-   */
-  private boolean playBack;
-
-  /**
-   * Next curve in linked list
-   */
-  private O_curve nextCurve;
-
-  /**
-   * Is curve modified
-   */
-  private int isCurveModified;
-
-  /**
-   * Object holding rendering settings
-   */
-  private Renderhints renderhints;
-
-  /**
-   * Display list
-   */
-  private DisplayList dl;
-
-  /**
-   * Object for subdividing curves and surfaces
-   */
-  private Subdivider subdivider;
-
-  /**
-   * Object responsible for rendering
-   */
-  private Backend backend;
-
-  /**
-   * Next picewise linear curve in linked list
-   */
-  private O_pwlcurve nextPwlcurve;
-
-  /**
-   * Next trimming NURBS curve in linked list
-   */
-  private O_nurbscurve nextNurbscurve;
-
-  /**
-   * Are we in the middle of surface processing
-   */
-  private int inSurface;
-
-  /**
-   * Are there any changes in trimming
-   */
-  private boolean isTrimModified;
-
-  /**
-   * Are there any changes in surface data
-   */
-  private boolean isDataSurfaceModified;
-
-  /**
-   * Nurber of trmims of processed surface
-   */
-  private int numTrims;
-
-  /**
-   * Current processed surface
-   */
-  private O_surface currentSurface;
-
-  /**
-   * Next trimming curve
-   */
-  private O_trim nextTrim;
-
-  /**
-   * Nextr surface in linked list
-   */
-  private O_nurbssurface nextNurbssurface;
-
-  /**
-   * Are there any changes in surface
-   */
-  private boolean isSurfaceModified;
-
-  /**
-   * Initializes default GLUgl2nurbs object
-   */
-  public GLUgl2nurbsImpl() {
-    // DONE
-    maplist = new Maplist(backend);
-    renderhints = new Renderhints();
-    subdivider = new Subdivider();
-    // original code
-
-    redefineMaps();
-
-    defineMap(GL2.GL_MAP2_NORMAL, 0, 3);
-    defineMap(GL2.GL_MAP1_NORMAL, 0, 3);
-    defineMap(GL2.GL_MAP2_TEXTURE_COORD_1, 0, 1);
-    defineMap(GL2.GL_MAP1_TEXTURE_COORD_1, 0, 1);
-    defineMap(GL2.GL_MAP2_TEXTURE_COORD_2, 0, 2);
-    defineMap(GL2.GL_MAP1_TEXTURE_COORD_2, 0, 2);
-    defineMap(GL2.GL_MAP2_TEXTURE_COORD_3, 0, 3);
-    defineMap(GL2.GL_MAP1_TEXTURE_COORD_3, 0, 3);
-    defineMap(GL2.GL_MAP2_TEXTURE_COORD_4, 1, 4);
-    defineMap(GL2.GL_MAP1_TEXTURE_COORD_4, 1, 4);
-    defineMap(GL2.GL_MAP2_VERTEX_4, 1, 4);
-    defineMap(GL2.GL_MAP1_VERTEX_4, 1, 4);
-    defineMap(GL2.GL_MAP2_VERTEX_3, 0, 3);
-    defineMap(GL2.GL_MAP1_VERTEX_3, 0, 3);
-    defineMap(GL2.GL_MAP2_COLOR_4, 0, 4);
-    defineMap(GL2.GL_MAP1_COLOR_4, 0, 4);
-    defineMap(GL2.GL_MAP2_INDEX, 0, 1);
-    defineMap(GL2.GL_MAP1_INDEX, 0, 1);
-
-    setnurbsproperty(GL2.GL_MAP1_VERTEX_3, NurbsConsts.N_SAMPLINGMETHOD,
-                     (float) NurbsConsts.N_PATHLENGTH);
-    setnurbsproperty(GL2.GL_MAP1_VERTEX_4, NurbsConsts.N_SAMPLINGMETHOD,
-                     (float) NurbsConsts.N_PATHLENGTH);
-    setnurbsproperty(GL2.GL_MAP2_VERTEX_3, NurbsConsts.N_SAMPLINGMETHOD,
-                     (float) NurbsConsts.N_PATHLENGTH);
-    setnurbsproperty(GL2.GL_MAP2_VERTEX_4, NurbsConsts.N_SAMPLINGMETHOD,
-                     (float) NurbsConsts.N_PATHLENGTH);
-
-    setnurbsproperty(GL2.GL_MAP1_VERTEX_3, NurbsConsts.N_PIXEL_TOLERANCE,
-                     (float) 50.0);
-    setnurbsproperty(GL2.GL_MAP1_VERTEX_4, NurbsConsts.N_PIXEL_TOLERANCE,
-                     (float) 50.0);
-    setnurbsproperty(GL2.GL_MAP2_VERTEX_3, NurbsConsts.N_PIXEL_TOLERANCE,
-                     (float) 50.0);
-    setnurbsproperty(GL2.GL_MAP2_VERTEX_4, NurbsConsts.N_PIXEL_TOLERANCE,
-                     (float) 50.0);
-
-    setnurbsproperty(GL2.GL_MAP1_VERTEX_3, NurbsConsts.N_ERROR_TOLERANCE,
-                     (float) 0.50);
-    setnurbsproperty(GL2.GL_MAP1_VERTEX_4, NurbsConsts.N_ERROR_TOLERANCE,
-                     (float) 0.50);
-    setnurbsproperty(GL2.GL_MAP2_VERTEX_3, NurbsConsts.N_ERROR_TOLERANCE,
-                     (float) 0.50);
-    setnurbsproperty(GL2.GL_MAP2_VERTEX_4, NurbsConsts.N_ERROR_TOLERANCE,
-                     (float) 0.50);
-
-    setnurbsproperty(GL2.GL_MAP1_VERTEX_3, NurbsConsts.N_S_STEPS,
-                     (float) 100.0);
-    setnurbsproperty(GL2.GL_MAP1_VERTEX_4, NurbsConsts.N_S_STEPS,
-                     (float) 100.0);
-    setnurbsproperty(GL2.GL_MAP2_VERTEX_3, NurbsConsts.N_S_STEPS,
-                     (float) 100.0);
-    setnurbsproperty(GL2.GL_MAP2_VERTEX_4, NurbsConsts.N_S_STEPS,
-                     (float) 100.0);
-
-    setnurbsproperty(GL2.GL_MAP1_VERTEX_3, NurbsConsts.N_SAMPLINGMETHOD,
-                     NurbsConsts.N_PATHLENGTH);
-
-    set_domain_distance_u_rate(100.0);
-    set_domain_distance_v_rate(100.0);
-    set_is_domain_distance_sampling(0);
-
-    this.autoloadmode = true;
-
-    this.callBackFlag = 0;
-
-    this.errorCallback = null;
-  }
-
-  /**
-   * Sets domain distance for dom.dist. sampling in u direction
-   * 
-   * @param d
-   *            distance
-   */
-  private void set_domain_distance_u_rate(double d) {
-    // DONE
-    subdivider.set_domain_distance_u_rate(d);
-  }
-
-  /**
-   * Sets domain distance for dom.dist. sampling in v direction
-   * 
-   * @param d
-   *            distance
-   */
-  private void set_domain_distance_v_rate(double d) {
-    // DONE
-    subdivider.set_domain_distance_v_rate(d);
-  }
-
-  /**
-   * Begins new NURBS curve
-   */
-  public void bgncurve() {
-    // DONE
-    O_curve o_curve = new O_curve();
-    thread("do_bgncurve", o_curve);
-  }
-
-  /**
-   * Calls a method with given name and passes argumet
-   * 
-   * @param name
-   *            name of a method to be called
-   * @param arg
-   *            parameter to be passed to called method
-   */
-  private void thread(String name, Object arg) {
-    // DONE
-    Class partype[] = new Class[1];
-    partype[0] = arg.getClass();
-    Method m;
-    try {
-      m = this.getClass().getMethod(name, partype);
-      if (dl != null) {
-        dl.append(this, m, arg);
-      } else {
-        m.invoke(this, new Object[] { arg });
-      }
-    } catch (Throwable e) {
-      e.printStackTrace();
-    }
-
-  }
-
-  /**
-   * Calls a method with given name
-   * 
-   * @param name
-   *            name of a method to be called
-   */
-  private void thread2(String name) {
-    // DONE
-    try {
-      Method m = this.getClass().getMethod(name, (Class[]) null);
-      if (dl != null) {
-        dl.append(this, m, null);
-      } else {
-        m.invoke(this, (Object[]) null);
-      }
-    } catch (Throwable e) {
-      e.printStackTrace();
-    }
-  }
-
-  /**
-   * Begins a NURBS curve
-   * 
-   * @param o_curve
-   *            curve object
-   */
-  public void do_bgncurve(O_curve o_curve) {
-    if (inCurve > 0) {
-      do_nurbserror(6);
-      endcurve();
-    }
-    inCurve = 1;
-    currentCurve = o_curve;
-
-    currentCurve.curvetype = CT_NONE;
-
-    if (inTrim) {
-      if (!nextCurve.equals(o_curve)) {
-        isCurveModified = 1;
-        nextCurve = o_curve;
-      }
-    } else {
-      if (!playBack)
-        bgnrender();
-      isDataValid = 1;
-    }
-    nextCurve = o_curve.next;
-    // kind of solution of union
-    nextPwlcurve = o_curve.o_pwlcurve;
-    nextNurbscurve = o_curve.o_nurbscurve;
-  }
-
-  /**
-   * Begins new surface
-   * 
-   * @param o_surface
-   *            surface object
-   */
-  public void do_bgnsurface(O_surface o_surface) {
-    // DONE
-    if (inSurface > 0) {
-      do_nurbserror(27);
-      endsurface();
-    }
-    inSurface = 1;
-    if (!playBack)
-      bgnrender();
-
-    isTrimModified = false;
-    isDataSurfaceModified = false;
-    isDataValid = 1;
-    numTrims = 0;
-    currentSurface = o_surface;
-    nextTrim = o_surface.o_trim;
-    nextNurbssurface = o_surface.o_nurbssurface;
-  }
-
-  /**
-   * End a curve
-   */
-  public void endcurve() {
-    // DONE
-    thread2("do_endcurve");
-  }
-
-  /**
-   * Ends surface
-   */
-  public void do_endsurface() {
-    // DONE
-    if (inTrim) {
-      do_nurbserror(12);
-      endtrim();
-    }
-
-    if (inSurface <= 0) {
-      do_nurbserror(13);
-      return;
-    }
-
-    inSurface = 0;
-
-    nextNurbssurface = null;
-
-    if (isDataValid <= 0) {
-      return;
-    }
-
-    if (nextTrim != null) {
-      isTrimModified = true;
-      nextTrim = null;
-    }
-
-    // TODO errval ??
-    if (numTrims > 0) {
-      //				System.out.println("TODO glunurbs.do_endsurface - numtrims > 0");
-    }
-
-    subdivider.beginQuilts(new GL2Backend());
-    for (O_nurbssurface n = currentSurface.o_nurbssurface; n != null; n = n.next) {
-      subdivider.addQuilt(n.bezier_patches);
-    }
-    subdivider.endQuilts();
-    subdivider.drawSurfaces();
-    if (!playBack)
-      endrender();
-
-  }
-
-  /**
-   * Ends a curve
-   */
-  public void do_endcurve() {
-    // DONE
-    //			// System.out.println("do_endcurve");
-    if (inCurve <= 0) {
-      do_nurbserror(7);
-      return;
-    }
-    inCurve = 0;
-
-    nextCurve = null;
-
-    if (currentCurve.curvetype == CT_NURBSCURVE) {
-      // nextNurbscurve = null;
-      // currentCurve.o_nurbscurve=null;
-    } else {
-      // nextPwlcurve = null;
-      // currentCurve.o_pwlcurve=null;
-    }
-    if (!inTrim) {
-      if (isDataValid <= 0) {
-        return;
-      }
-      // TODO errval?
-      if (currentCurve.curvetype == CT_NURBSCURVE) {
-        subdivider.beginQuilts(new GL2Backend());
-
-        for (O_nurbscurve n = currentCurve.o_nurbscurve; n != null; n = n.next)
-          subdivider.addQuilt(n.bezier_curves);
-
-        subdivider.endQuilts();
-        subdivider.drawCurves();
-        if (!playBack)
-          endrender();
-      } else {
-        if (!playBack)
-          endrender();
-        do_nurbserror(9);
-      }
-    }
-
-  }
-
-  /**
-   * Method for handling error codes
-   * 
-   * @param i
-   *            error code
-   */
-  private void do_nurbserror(int i) {
-    // TODO nurberror
-    //			System.out.println("TODO nurbserror " + i);
-  }
-
-  /**
-   * Begin rendering
-   */
-  private void bgnrender() {
-    // DONE
-    if (autoloadmode) {
-      loadGLMatrices();
-    }
-  }
-
-  /**
-   * Load matrices from OpenGL state machine
-   */
-  private void loadGLMatrices() {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO glunurbs.loadGLMatrices");
-  }
-
-  /**
-   * End rendering
-   */
-  private void endrender() {
-    // DONE
-  }
-
-  /**
-   * Make a NURBS curve
-   * 
-   * @param nknots
-   *            number of knots in knot vector
-   * @param knot
-   *            knot vector
-   * @param stride
-   *            number of control points coordinates
-   * @param ctlarray
-   *            control points
-   * @param order
-   *            order of the curve
-   * @param realType
-   *            type of the curve
-   */
-  public void nurbscurve(int nknots, float[] knot, int stride,
-                         float[] ctlarray, int order, int realType) {
-    // DONE
-    Mapdesc mapdesc = maplist.locate(realType);
-    if (mapdesc == null) {
-      do_nurbserror(35);
-      isDataValid = 0;
-      return;
-    }
-    if (ctlarray == null) {
-      do_nurbserror(36);
-      isDataValid = 0;
-      return;
-    }
-    if (stride < 0) {
-      do_nurbserror(34);
-      isDataValid = 0;
-      return;
-    }
-    Knotvector knots = new Knotvector(nknots, stride, order, knot);
-
-    if (!do_check_knots(knots, "curve"))
-      return;
-
-    O_nurbscurve o_nurbscurve = new O_nurbscurve(realType);
-    o_nurbscurve.bezier_curves = new Quilt(mapdesc);
-    CArrayOfFloats ctrlcarr = new CArrayOfFloats(ctlarray);
-    o_nurbscurve.bezier_curves.toBezier(knots, ctrlcarr, mapdesc
-                                        .getNCoords());
-    thread("do_nurbscurve", o_nurbscurve);
-  }
-
-  /**
-   * Check knot vector specification
-   * 
-   * @param knots
-   *            knot vector
-   * @param msg
-   *            error message
-   * @return knot vector is / is not valid
-   */
-  public boolean do_check_knots(Knotvector knots, String msg) {
-    // DONE
-    int status = knots.validate();
-    if (status > 0) {
-      do_nurbserror(status);
-      if (renderhints.errorchecking != NurbsConsts.N_NOMSG)
-        knots.show(msg);
-    }
-    return (status > 0) ? false : true;
-  }
-
-  /**
-   * Draw a curve
-   * 
-   * @param o_nurbscurve
-   *            NURBS curve object
-   */
-  public void do_nurbscurve(O_nurbscurve o_nurbscurve) {
-    // DONE
-
-    if (inCurve <= 0) {
-      bgncurve();
-      inCurve = 2;
-    }
-
-    if (o_nurbscurve.used) {
-      do_nurbserror(23);
-      isDataValid = 0;
-      return;
-    } else
-      o_nurbscurve.used = true;
-
-    if (currentCurve.curvetype == CT_NONE) {
-      currentCurve.curvetype = CT_NURBSCURVE;
-    } else if (currentCurve.curvetype != CT_NURBSCURVE) {
-      do_nurbserror(24);
-      isDataValid = 0;
-      return;
-    }
-
-    // it was necessary to overcome problem with pointer to pointer here
-
-    // if(!o_nurbscurve.equals(nextNurbscurve)){
-    if (!o_nurbscurve.equals(currentCurve.o_nurbscurve)) {
-      isCurveModified = 1;
-      currentCurve.o_nurbscurve = o_nurbscurve;
-      // nextNurbscurve=o_nurbscurve;
-
-    }
-
-    nextNurbscurve = o_nurbscurve.next;
-
-    if (!currentCurve.equals(o_nurbscurve.owner)) {
-      isCurveModified = 1;
-      o_nurbscurve.owner = currentCurve;
-    }
-
-    if (o_nurbscurve.owner == null)
-      isCurveModified = 1;
-
-    if (inCurve == 2)
-      endcurve();
-  }
-
-  /**
-   * Draw NURBS surface
-   * 
-   * @param o_nurbssurface
-   *            NURBS surface object
-   */
-  public void do_nurbssurface(O_nurbssurface o_nurbssurface) {
-    // DONE
-    if (inSurface <= 0) {
-      bgnsurface();
-      inSurface = 2;
-    }
-    if (o_nurbssurface.used) {
-      do_nurbserror(25);
-      isDataValid = 0;
-      return;
-    } else
-      o_nurbssurface.used = true;
-
-    if (!o_nurbssurface.equals(nextNurbscurve)) {
-      isSurfaceModified = true;
-      // nextNurbssurface=o_nurbssurface;
-      currentSurface.o_nurbssurface = o_nurbssurface;
-    }
-
-    if (!currentSurface.equals(o_nurbssurface.owner)) {
-      isSurfaceModified = true;
-      o_nurbssurface.owner = currentSurface;
-    }
-
-    nextNurbssurface = o_nurbssurface.next;
-
-    if (inSurface == 2)
-      endsurface();
-  }
-
-  /**
-   * (Re)Inicialize maps
-   */
-  public void redefineMaps() {
-    // DONE
-    maplist.initialize();
-  }
-
-  /**
-   * Define a map of given properties
-   * 
-   * @param type
-   *            map type
-   * @param rational
-   *            is rational
-   * @param ncoords
-   *            number of control point coordinates
-   */
-  public void defineMap(int type, int rational, int ncoords) {
-    // DONE
-    maplist.define(type, rational, ncoords);
-  }
-
-  /**
-   * Set NURBS property
-   * 
-   * @param type
-   *            property type
-   * @param tag
-   *            property tag
-   * @param value
-   *            property value
-   */
-  public void setnurbsproperty(int type, int tag, float value) {
-    // DONE
-    Mapdesc mapdesc = maplist.locate(type);
-    if (mapdesc == null) {
-      do_nurbserror(35);
-      return;
-    }
-    if (!mapdesc.isProperty(tag)) {
-      do_nurbserror(26);
-      return;
-    }
-    Property prop = new Property(type, tag, value);
-    thread("do_setnurbsproperty2", prop);
-  }
-
-  /**
-   * Set parameters of existing property
-   * 
-   * @param prop
-   *            property
-   */
-  public void do_setnurbsproperty2(Property prop) {
-    Mapdesc mapdesc = maplist.find(prop.type);
-    mapdesc.setProperty(prop.tag, prop.value);
-  }
-
-  /**
-   * Set given property to rendering hints
-   * 
-   * @param prop
-   *            property to be set
-   */
-  public void do_setnurbsproperty(Property prop) {
-    // DONE
-    renderhints.setProperty(prop);
-    // TODO freeproperty?
-  }
-
-  /**
-   * Sets wheteher we use domain distance sampling
-   * 
-   * @param i
-   *            domain distance sampling flag
-   */
-  public void set_is_domain_distance_sampling(int i) {
-    // DONE
-    subdivider.set_is_domain_distance_sampling(i);
-  }
-
-  /**
-   * Begin new surface
-   */
-  public void bgnsurface() {
-    // DONE
-    O_surface o_surface = new O_surface();
-    // TODO nuid
-    //			System.out.println("TODO glunurbs.bgnsurface nuid");
-    thread("do_bgnsurface", o_surface);
-  }
-
-  /**
-   * End current surface
-   */
-  public void endsurface() {
-    // DONE
-    thread2("do_endsurface");
-  }
-
-  /**
-   * End surface trimming
-   */
-  private void endtrim() {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO glunurbs.endtrim");
-  }
-
-  /**
-   * Make NURBS surface
-   * 
-   * @param sknot_count
-   *            number of knots in s direction
-   * @param sknot
-   *            knot vector in s direction
-   * @param tknot_count
-   *            number of knots in t direction
-   * @param tknot
-   *            knot vector in t direction
-   * @param s_stride
-   *            number of coords of control points in s direction
-   * @param t_stride
-   *            number of coords of control points in t direction
-   * @param ctlarray
-   *            control points
-   * @param sorder
-   *            order of curve in s direction
-   * @param torder
-   *            order of curve in t direction
-   * @param type
-   *            NURBS surface type (rational,...)
-   */
-  public void nurbssurface(int sknot_count, float[] sknot, int tknot_count,
-                           float[] tknot, int s_stride, int t_stride, float[] ctlarray,
-                           int sorder, int torder, int type) {
-    // DONE
-    Mapdesc mapdesc = maplist.locate(type);
-    if (mapdesc == null) {
-      do_nurbserror(35);
-      isDataValid = 0;
-      return;
-    }
-    if (s_stride < 0 || t_stride < 0) {
-      do_nurbserror(34);
-      isDataValid = 0;
-      return;
-    }
-    Knotvector sknotvector = new Knotvector(sknot_count, s_stride, sorder,
-                                            sknot);
-    if (!do_check_knots(sknotvector, "surface"))
-      return;
-    Knotvector tknotvector = new Knotvector(tknot_count, t_stride, torder,
-                                            tknot);
-    if (!do_check_knots(tknotvector, "surface"))
-      return;
-
-    O_nurbssurface o_nurbssurface = new O_nurbssurface(type);
-    o_nurbssurface.bezier_patches = new Quilt(mapdesc);
-
-    CArrayOfFloats ctrlarr = new CArrayOfFloats(ctlarray);
-    o_nurbssurface.bezier_patches.toBezier(sknotvector, tknotvector,
-                                           ctrlarr, mapdesc.getNCoords());
-    thread("do_nurbssurface", o_nurbssurface);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/BuildMipmap.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/BuildMipmap.java
deleted file mode 100644
index 41eb84bdb..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/BuildMipmap.java
+++ /dev/null
@@ -1,1598 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.glu.GLU;
-import com.sun.opengl.impl.Debug;
-import com.sun.opengl.impl.InternalBufferUtil;
-import java.nio.*;
-import java.io.*;
-
-/**
- *
- * @author  Administrator
- */
-public class BuildMipmap {
-
-  private static final boolean DEBUG = Debug.debug("BuildMipmap");
-  private static final boolean VERBOSE = Debug.verbose();
-
-  /** Creates a new instance of BuildMipmap */
-  public BuildMipmap() {
-  }
-  
-  public static int gluBuild1DMipmapLevelsCore( GL gl, int target, int internalFormat,
-                  int width, int widthPowerOf2, int format, int type, int userLevel,
-                  int baseLevel, int maxLevel, ByteBuffer data ) {
-    int newwidth;
-    int level, levels;
-    ShortBuffer newImage = null;
-    int newImage_width;
-    ShortBuffer otherImage = null;
-    ShortBuffer imageTemp = null;
-    int memReq;
-    int maxsize;
-    int cmpts;
-    PixelStorageModes psm = new PixelStorageModes();
-    
-    assert( Mipmap.checkMipmapArgs( internalFormat, format, type ) == 0 );
-    assert( width >= 1 );
-    
-    newwidth = widthPowerOf2;
-    levels = Mipmap.computeLog( newwidth );
-    
-    levels += userLevel;
-    
-    Mipmap.retrieveStoreModes( gl, psm );
-    try {
-      newImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( Mipmap.image_size( width, 1, format, 
-            GL2.GL_UNSIGNED_SHORT ) )).asShortBuffer();
-    } catch( OutOfMemoryError ome ) {
-      return( GLU.GLU_OUT_OF_MEMORY );
-    }
-    newImage_width = width;
-    
-    Image.fill_image( psm, width, 1, format, type, Mipmap.is_index( format ), data, newImage );
-    cmpts = Mipmap.elements_per_group( format, type );
-    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, 2 );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, 0 );
-    
-    // if swap_bytes was set, swapping occurred in fill_image
-    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, GL2.GL_FALSE );
-    
-    for( level = userLevel; level <= levels; level++ ) {
-      if( newImage_width == newwidth ) {
-        // user newimage for this level
-        if( baseLevel <= level && level <= maxLevel ) {
-          gl.getGL2().glTexImage1D( target, level, internalFormat, newImage_width, 0, format,
-                        GL2.GL_UNSIGNED_SHORT, newImage );
-        }
-      } else {
-        if( otherImage == null ) {
-          memReq = Mipmap.image_size( newwidth, 1, format, GL2.GL_UNSIGNED_SHORT );
-          try {
-            otherImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq )).asShortBuffer();
-          } catch( OutOfMemoryError ome ) {
-            gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-            gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-            gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-            gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-            gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
-            return( GLU.GLU_OUT_OF_MEMORY );
-          }
-        }
-        ScaleInternal.scale_internal( cmpts, newImage_width, 1, newImage, newwidth, 1, otherImage );
-        // swap newImage and otherImage
-        imageTemp = otherImage;
-        otherImage = newImage;
-        newImage = imageTemp;
-        
-        newImage_width = newwidth;
-        if( baseLevel <= level && level <= maxLevel ) {
-          gl.getGL2().glTexImage1D( target, level, internalFormat, newImage_width, 0, 
-                            format, GL2.GL_UNSIGNED_SHORT, newImage );
-        }
-      }
-      if( newwidth > 1 ) {
-        newwidth /= 2;
-      }
-    }
-    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
-    
-    return( 0 );
-  }
-  
-  public static int bitmapBuild2DMipmaps( GL gl, int target, int internalFormat,
-            int width, int height, int format, int type, ByteBuffer data ) {
-    int newwidth[] = new int[1];
-    int newheight[] = new int[1];
-    int level, levels;
-    ShortBuffer newImage = null;
-    int newImage_width;
-    int newImage_height;
-    ShortBuffer otherImage = null;
-    ShortBuffer tempImage = null;
-    int memReq;
-    int maxsize;
-    int cmpts;
-    PixelStorageModes psm = new PixelStorageModes();
-    
-    Mipmap.retrieveStoreModes( gl, psm );
-    
-    Mipmap.closestFit( gl, target, width, height, internalFormat, format, type, newwidth, newheight );
-    
-    levels = Mipmap.computeLog( newwidth[0] );
-    level = Mipmap.computeLog( newheight[0] );
-    if( level > levels ) {
-      levels = level;
-    }
-    
-    try {
-      newImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( Mipmap.image_size( width, height, 
-            format, GL2.GL_UNSIGNED_SHORT ) )).asShortBuffer();
-    } catch( OutOfMemoryError ome ) {
-      return( GLU.GLU_OUT_OF_MEMORY );
-    }
-    newImage_width = width;
-    newImage_height = height;
-    
-    Image.fill_image( psm, width, height, format, type, Mipmap.is_index( format ), data, newImage );
-    
-    cmpts = Mipmap.elements_per_group( format, type );
-    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, 2 );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, 0 );
-    
-    // if swap_bytes is set, swapping occurred in fill_image
-    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, GL2.GL_FALSE );
-    
-    for( level = 0; level < levels; level++ ) {
-      if( newImage_width == newwidth[0] && newImage_height == newheight[0] ) {
-        newImage.rewind();
-        gl.glTexImage2D( target, level, internalFormat, newImage_width,
-            newImage_height, 0, format, GL2.GL_UNSIGNED_SHORT, newImage );
-      } else {
-        if( otherImage == null ) {
-          memReq = Mipmap.image_size( newwidth[0], newheight[0], format, GL2.GL_UNSIGNED_SHORT );
-          try {
-            otherImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq )).asShortBuffer();
-          } catch( OutOfMemoryError ome ) {
-            gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-            gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-            gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-            gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-            gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
-            return( GLU.GLU_OUT_OF_MEMORY );
-          }
-        }
-        ScaleInternal.scale_internal( cmpts, newImage_width, newImage_height, 
-                              newImage, newwidth[0], newheight[0], otherImage );
-        // swap newImage and otherImage
-        tempImage = otherImage;
-        otherImage = newImage;
-        newImage = tempImage;
-        
-        newImage_width = newwidth[0];
-        newImage_height = newheight[0];
-        newImage.rewind();
-        gl.glTexImage2D( target, level, internalFormat, newImage_width, newImage_height,
-                                    0, format, GL2.GL_UNSIGNED_SHORT, newImage );
-      }
-      if( newheight[0] > 1 ) {
-        newwidth[0] /= 2;
-      }
-      if( newheight[0] > 1 ) {
-        newheight[0] /= 2;
-      }
-    }
-    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
-    
-    return( 0 );
-  }
-  
-  public static int gluBuild2DMipmapLevelsCore( GL gl, int target, int internalFormat,
-                int width, int height, int widthPowerOf2, int heightPowerOf2,
-                int format, int type, int userLevel, int baseLevel, int maxLevel,
-                ByteBuffer data ) { // PointerWrapper data
-    int newwidth;
-    int newheight;
-    int level, levels;
-    int usersImage;
-    ByteBuffer srcImage = null;
-    ByteBuffer dstImage = null;
-    ByteBuffer tempImage = null;
-    int newImage_width;
-    int newImage_height;
-    short[] SWAP_IMAGE = null;
-    int memReq;
-    int maxsize;
-    int cmpts;
-    int mark=-1;
-    
-    boolean myswap_bytes;
-    int groups_per_line, element_size, group_size;
-    int rowsize, padding;
-    PixelStorageModes psm = new PixelStorageModes();
-    
-    assert( Mipmap.checkMipmapArgs( internalFormat, format, type ) == 0 );
-    assert( width >= 1 && height >= 1 );
-    
-    if( type == GL2.GL_BITMAP ) {
-      return( bitmapBuild2DMipmaps( gl, target, internalFormat, width, height, format, type, data ) );
-    }
-    
-    newwidth = widthPowerOf2;
-    newheight = heightPowerOf2;
-    levels = Mipmap.computeLog( newwidth );
-    level = Mipmap.computeLog( newheight );
-    if( level > levels ) {
-      levels = level;
-    }
-    
-    levels += userLevel;
-    
-    Mipmap.retrieveStoreModes( gl, psm );
-    myswap_bytes = psm.getUnpackSwapBytes();
-    cmpts = Mipmap.elements_per_group( format, type );
-    if( psm.getUnpackRowLength() > 0 ) {
-      groups_per_line = psm.getUnpackRowLength();
-    } else {
-      groups_per_line = width;
-    }
-    
-    element_size = Mipmap.bytes_per_element( type );
-    group_size = element_size * cmpts;
-    if( element_size == 1 ) {
-      myswap_bytes = false;
-    }
-    
-    rowsize = groups_per_line * group_size;
-    padding = ( rowsize % psm.getUnpackAlignment() );
-    if( padding != 0 ) {
-      rowsize += psm.getUnpackAlignment() - padding;
-    }
-    
-    mark = psm.getUnpackSkipRows() * rowsize + psm.getUnpackSkipPixels() * group_size;
-    data.position( mark );
-    
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, 0 );
-    
-    level = userLevel;
-    
-    // already power of two square
-    if( width == newwidth && height == newheight ) {
-      // use usersImage for level userLevel
-      if( baseLevel <= level && level <= maxLevel ) {
-        data.rewind();
-        gl.glTexImage2D( target, level, internalFormat, width, height, 0, format, type, data );
-      }
-      if( levels == 0 ) { /* we're done. clean up and return */
-        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
-        return( 0 );
-      }
-      int nextWidth = newwidth / 2;
-      int nextHeight = newheight / 2;
-      
-      // clamp to 1
-      if( nextWidth < 1 ) {
-        nextWidth = 1;
-      }
-      if( nextHeight < 1 ) {
-        nextHeight = 1;
-      }
-      memReq = Mipmap.image_size( nextWidth, nextHeight, format, type );
-      
-      try {
-        switch( type ) {
-          case( GL2.GL_UNSIGNED_BYTE ):
-          case( GL2.GL_BYTE ):
-          case( GL2.GL_UNSIGNED_SHORT ):
-          case( GL2.GL_SHORT ):
-          case( GL2.GL_UNSIGNED_INT ):
-          case( GL2.GL_INT ):
-          case( GL2.GL_FLOAT ):
-          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-            dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
-            break;
-          default:
-            return( GLU.GLU_INVALID_ENUM );
-        }
-      } catch( OutOfMemoryError ome ) {
-        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
-        return( GLU.GLU_OUT_OF_MEMORY );
-      }
-      if( dstImage != null ) {
-        switch( type ) {
-          case( GL2.GL_UNSIGNED_BYTE ):
-            HalveImage.halveImage_ubyte( cmpts, width, height, data, dstImage, element_size, rowsize, group_size );
-            break;
-          case( GL2.GL_BYTE ):
-            HalveImage.halveImage_byte( cmpts, width, height, data, dstImage, element_size, rowsize, group_size );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT ):
-            HalveImage.halveImage_ushort( cmpts, width, height, data, dstImage.asShortBuffer(), element_size, rowsize, group_size, myswap_bytes );
-            break;
-          case( GL2.GL_SHORT ):
-            HalveImage.halveImage_short( cmpts, width, height, data, dstImage.asShortBuffer(), element_size, rowsize, group_size, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_INT ):
-            HalveImage.halveImage_uint( cmpts, width, height, data, dstImage.asIntBuffer(), element_size, rowsize, group_size, myswap_bytes );
-            break;
-          case( GL2.GL_INT ):
-            HalveImage.halveImage_int( cmpts, width, height, data, dstImage.asIntBuffer(), element_size, rowsize, group_size, myswap_bytes );
-            break;
-          case( GL2.GL_FLOAT ):
-            HalveImage.halveImage_float( cmpts, width, height, data, dstImage.asFloatBuffer(), element_size, rowsize, group_size, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-            assert( format == GL2.GL_RGB );
-            HalveImage.halveImagePackedPixel( 3, new Extract332(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-            assert( format == GL2.GL_RGB );
-            HalveImage.halveImagePackedPixel( 3, new Extract233rev(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-            HalveImage.halveImagePackedPixel( 3, new Extract565(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-            HalveImage.halveImagePackedPixel( 3, new Extract565rev(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-            HalveImage.halveImagePackedPixel( 4, new Extract4444(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-            HalveImage.halveImagePackedPixel( 4, new Extract4444rev(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-            HalveImage.halveImagePackedPixel( 4, new Extract5551(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-            HalveImage.halveImagePackedPixel( 4, new Extract1555rev(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-            HalveImage.halveImagePackedPixel( 4, new Extract8888(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-            HalveImage.halveImagePackedPixel( 4, new Extract8888rev(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-            HalveImage.halveImagePackedPixel( 4, new Extract1010102(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-            HalveImage.halveImagePackedPixel( 4, new Extract2101010rev(), width, height, data, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-          default:
-            assert( false );
-            break;
-        }
-      }
-      newwidth = width / 2;
-      newheight = height / 2;
-      // clamp to 1
-      if( newwidth < 1 ) {
-        newwidth = 1;
-      }
-      if( newheight < 1 ) {
-        newheight = 1;
-      }
-      
-      myswap_bytes = false;
-      rowsize = newwidth * group_size;
-      memReq = Mipmap.image_size( newwidth, newheight, format, type );
-      // swap srcImage and dstImage
-      tempImage = srcImage;
-      srcImage = dstImage;
-      dstImage = tempImage;
-      try {
-        switch( type ) {
-          case( GL2.GL_UNSIGNED_BYTE ):
-          case( GL2.GL_BYTE ):
-          case( GL2.GL_UNSIGNED_SHORT ):
-          case( GL2.GL_SHORT ):
-          case( GL2.GL_UNSIGNED_INT ):
-          case( GL2.GL_INT ):
-          case( GL2.GL_FLOAT ):
-          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-            dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
-            break;
-          default:
-            return( GLU.GLU_INVALID_ENUM );
-        }
-      } catch( OutOfMemoryError ome ) {
-        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
-        return( GLU.GLU_OUT_OF_MEMORY );
-      }
-      // level userLevel+1 is in srcImage; level userLevel already saved
-      level = userLevel + 1;
-    } else { // user's image is not nice powerof2 size square
-      memReq = Mipmap.image_size( newwidth, newheight, format, type );
-      try { 
-        switch( type ) {
-          case( GL2.GL_UNSIGNED_BYTE ):
-          case( GL2.GL_BYTE ):
-          case( GL2.GL_UNSIGNED_SHORT ):
-          case( GL2.GL_SHORT ):
-          case( GL2.GL_UNSIGNED_INT ):
-          case( GL2.GL_INT ):
-          case( GL2.GL_FLOAT ):
-          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-            dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
-            break;
-          default:
-            return( GLU.GLU_INVALID_ENUM );
-        }
-      } catch( OutOfMemoryError ome ) {
-        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
-        return( GLU.GLU_OUT_OF_MEMORY );
-      }
-      data.position( mark );
-      switch( type ) {
-        case( GL2.GL_UNSIGNED_BYTE ):
-          ScaleInternal.scale_internal_ubyte( cmpts, width, height, data, 
-                newwidth, newheight, dstImage, element_size, rowsize, group_size );
-          break;
-        case( GL2.GL_BYTE ):
-          ScaleInternal.scale_internal_byte( cmpts, width, height, data, newwidth, 
-                  newheight, dstImage, element_size, rowsize, group_size );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT ):
-          ScaleInternal.scale_internal_ushort( cmpts, width, height, data, newwidth, 
-                  newheight, dstImage.asShortBuffer(), element_size, rowsize, group_size, myswap_bytes );
-          break;
-        case( GL2.GL_SHORT ):
-          ScaleInternal.scale_internal_ushort( cmpts, width, height, data, newwidth,
-                  newheight, dstImage.asShortBuffer(), element_size, rowsize, group_size, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_INT ):
-          ScaleInternal.scale_internal_uint( cmpts, width, height, data, newwidth,
-                  newheight, dstImage.asIntBuffer(), element_size, rowsize, group_size, myswap_bytes );
-          break;
-        case( GL2.GL_INT ):
-          ScaleInternal.scale_internal_int( cmpts, width, height, data, newwidth,
-                  newheight, dstImage.asIntBuffer(), element_size, rowsize, group_size, myswap_bytes );
-          break;
-        case( GL2.GL_FLOAT ):
-          ScaleInternal.scale_internal_float( cmpts, width, height, data, newwidth,
-                  newheight, dstImage.asFloatBuffer(), element_size, rowsize, group_size, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-          ScaleInternal.scaleInternalPackedPixel( 3, new Extract332(), width, height, data, newwidth,
-              newheight, dstImage, element_size, rowsize, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-          ScaleInternal.scaleInternalPackedPixel( 3, new Extract233rev(), width, height, data, newwidth,
-              newheight, dstImage, element_size, rowsize, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-          ScaleInternal.scaleInternalPackedPixel( 3, new Extract565(), width, height, data, newwidth,
-              newheight, dstImage, element_size, rowsize, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-          ScaleInternal.scaleInternalPackedPixel( 3, new Extract565rev(), width, height, data, newwidth,
-              newheight, dstImage, element_size, rowsize, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-          ScaleInternal.scaleInternalPackedPixel( 4, new Extract4444(), width, height, data, newwidth,
-              newheight, dstImage, element_size, rowsize, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-          ScaleInternal.scaleInternalPackedPixel( 4, new Extract4444rev(), width, height, data, newwidth,
-              newheight, dstImage, element_size, rowsize, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-          ScaleInternal.scaleInternalPackedPixel( 4, new Extract5551(), width, height, data, newwidth,
-              newheight, dstImage, element_size, rowsize, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-          ScaleInternal.scaleInternalPackedPixel( 4, new Extract1555rev(), width, height, data, newwidth,
-              newheight, dstImage, element_size, rowsize, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-          ScaleInternal.scaleInternalPackedPixel( 4, new Extract8888(), width, height, data, newwidth,
-              newheight, dstImage, element_size, rowsize, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-          ScaleInternal.scaleInternalPackedPixel( 4, new Extract8888rev(), width, height, data, newwidth,
-              newheight, dstImage, element_size, rowsize, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-          ScaleInternal.scaleInternalPackedPixel( 4, new Extract1010102(), width, height, data, newwidth,
-              newheight, dstImage, element_size, rowsize, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-          ScaleInternal.scaleInternalPackedPixel( 4, new Extract2101010rev(), width, height, data, newwidth,
-              newheight, dstImage, element_size, rowsize, myswap_bytes );
-          break;
-        default:
-          assert( false );
-          break;
-      }
-      myswap_bytes = false;
-      rowsize = newwidth * group_size;
-      // swap dstImage and srcImage
-      tempImage = srcImage;
-      srcImage = dstImage;
-      dstImage = tempImage;
-      
-      if( levels != 0 ) { // use as little memory as possible
-        int nextWidth = newwidth / 2;
-        int nextHeight = newheight / 2;
-        if( nextWidth < 1 ) {
-          nextWidth = 1;
-        }
-        if( nextHeight < 1 ) {
-          nextHeight = 1;
-        }
-        
-        memReq = Mipmap.image_size( nextWidth, nextHeight, format, type );
-        try {
-          switch( type ) {
-            case( GL2.GL_UNSIGNED_BYTE ):
-            case( GL2.GL_BYTE ):
-            case( GL2.GL_UNSIGNED_SHORT ):
-            case( GL2.GL_SHORT ):
-            case( GL2.GL_UNSIGNED_INT ):
-            case( GL2.GL_INT ):
-            case( GL2.GL_FLOAT ):
-            case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-            case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-            case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-            case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-            case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-            case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-            case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-            case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-            case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-            case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-              dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
-              break;
-            default:
-              return( GLU.GLU_INVALID_ENUM );
-          }
-        } catch( OutOfMemoryError ome ) {
-          gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-          gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-          gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
-          return( GLU.GLU_OUT_OF_MEMORY );
-        }
-      }
-      // level userLevel is in srcImage; nothing saved yet
-      level = userLevel;
-    }
-    
-    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, GL2.GL_FALSE );
-    if( baseLevel <= level && level <= maxLevel ) {
-      srcImage.rewind();
-      gl.glTexImage2D( target, level, internalFormat, newwidth, newheight, 0, format, type, srcImage );
-      if (DEBUG) {
-        System.err.println("GL Error(" + level + "): " + gl.glGetError() );
-        if (VERBOSE) {
-          srcImage.limit( Mipmap.image_size( newwidth, newheight, format, type ) );
-          writeTargaFile("glu2DMipmapJ" + level + ".tga",
-                         srcImage, newwidth, newheight);
-          srcImage.clear();
-        }
-      }
-    }
-    
-    level++;  // update current level for the loop
-    for( ; level <= levels; level++ ) {
-      srcImage.rewind();
-      dstImage.rewind();
-      switch( type ) {
-        case( GL2.GL_UNSIGNED_BYTE ):
-          HalveImage.halveImage_ubyte( cmpts, newwidth, newheight, srcImage, dstImage, element_size, rowsize, group_size );
-          break;
-        case( GL2.GL_BYTE ):
-          HalveImage.halveImage_byte( cmpts, newwidth, newheight, srcImage, dstImage, element_size, rowsize, group_size );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT ):
-          HalveImage.halveImage_ushort( cmpts, newwidth, newheight, srcImage, dstImage.asShortBuffer(), element_size, rowsize, group_size, myswap_bytes );
-          break;
-        case( GL2.GL_SHORT ):
-          HalveImage.halveImage_short( cmpts, newwidth, newheight, srcImage, dstImage.asShortBuffer(), element_size, rowsize, group_size, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_INT ):
-          HalveImage.halveImage_uint( cmpts, newwidth, newheight, srcImage, dstImage.asIntBuffer(), element_size, rowsize, group_size, myswap_bytes );
-          break;
-        case( GL2.GL_INT ):
-          HalveImage.halveImage_int( cmpts, newwidth, newheight, srcImage, dstImage.asIntBuffer(), element_size, rowsize, group_size, myswap_bytes );
-          break;
-        case( GL2.GL_FLOAT ):
-          HalveImage.halveImage_float( cmpts, newwidth, newheight, srcImage, dstImage.asFloatBuffer(), element_size, rowsize, group_size, myswap_bytes );
-          break;
-        case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-          assert( format == GL2.GL_RGB );
-          HalveImage.halveImagePackedPixel( 3, new Extract332(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-        case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-          assert( format == GL2.GL_RGB );
-          HalveImage.halveImagePackedPixel( 3, new Extract233rev(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-        case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-          HalveImage.halveImagePackedPixel( 3, new Extract565(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-        case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-          HalveImage.halveImagePackedPixel( 3, new Extract565rev(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-        case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-          HalveImage.halveImagePackedPixel( 4, new Extract4444(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-        case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-          HalveImage.halveImagePackedPixel( 4, new Extract4444rev(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-        case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-          HalveImage.halveImagePackedPixel( 4, new Extract5551(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-        case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-          HalveImage.halveImagePackedPixel( 4, new Extract1555rev(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-        case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-          HalveImage.halveImagePackedPixel( 4, new Extract8888(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-        case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-          HalveImage.halveImagePackedPixel( 4, new Extract8888rev(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-        case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-          HalveImage.halveImagePackedPixel( 4, new Extract1010102(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-        case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-          HalveImage.halveImagePackedPixel( 4, new Extract2101010rev(), newwidth, newheight, srcImage, dstImage, element_size, rowsize, myswap_bytes );
-            break;
-        default:
-          assert( false );
-          break;
-      }
-      
-      // swap dstImage and srcImage
-      tempImage = srcImage;
-      srcImage = dstImage;
-      dstImage = tempImage;
-      
-      if( newwidth > 1 ) {
-        newwidth /= 2;
-        rowsize /= 2;
-      }
-      if( newheight > 1 ) {
-        newheight /= 2;
-      }
-      // compute amount to pad per row if any
-      int rowPad = rowsize % psm.getUnpackAlignment();
-      
-      // should row be padded
-      if( rowPad == 0 ) {
-        // call teximage with srcImage untouched since its not padded
-        if( baseLevel <= level && level <= maxLevel ) {
-          srcImage.rewind();
-          gl.glTexImage2D( target, level, internalFormat, newwidth, newheight, 0, format, type, srcImage );
-          if (DEBUG) {
-            System.err.println("GL Error(" + level + "): " + gl.glGetError() );
-            if (VERBOSE) {
-              srcImage.limit( Mipmap.image_size( newwidth, newheight, format, type ) );
-              writeTargaFile("glu2DMipmapJ" + level + ".tga",
-                             srcImage, newwidth, newheight);
-              srcImage.clear();
-            }
-          }
-        }
-      } else {
-        // compute length of new row in bytes, including padding
-        int newRowLength = rowsize + psm.getUnpackAlignment() - rowPad;
-        int ii, jj;
-        int dstTrav;
-        int srcTrav;
-        
-        // allocate new image for mipmap of size newRowLength x newheight
-        ByteBuffer newMipmapImage = null;
-        try {
-          newMipmapImage = ByteBuffer.allocateDirect( newRowLength * newheight );
-        } catch( OutOfMemoryError ome ) {
-          gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-          gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-          gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
-          return( GLU.GLU_OUT_OF_MEMORY );
-        }
-        srcImage.rewind();
-        // copy image from srcImage into newMipmapImage by rows
-        for( ii = 0; ii < newheight; ii++ ) {
-          newMipmapImage.position(newRowLength * ii);
-          for( jj = 0; jj < rowsize; jj++ ) {
-            newMipmapImage.put( srcImage.get() );
-          }
-        }
-        
-        // and use this new image for mipmapping instead
-        if( baseLevel <= level && level <= maxLevel ) {
-          newMipmapImage.rewind();
-          gl.glTexImage2D( target, level, internalFormat, newwidth, newheight, 0, format, type, newMipmapImage );
-          if (DEBUG) {
-            System.err.println("GL Error(" + level + " padded): " + gl.glGetError() );
-            if (VERBOSE) {
-              writeTargaFile("glu2DMipmapJ" + level + ".tga",
-                             newMipmapImage, newwidth, newheight);
-            }
-          }
-        }
-      }
-    }
-    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, (psm.getUnpackSwapBytes() ? 1 : 0) );
-    
-    return( 0 );
-  }
-  
-  public static int fastBuild2DMipmaps( GL gl, PixelStorageModes psm, int target,
-          int components, int width, int height, int format, int type, ByteBuffer data ) {
-    int[] newwidth = new int[1];
-    int[] newheight = new int[1];
-    int level, levels;
-    ByteBuffer newImage;
-    int newImage_width;
-    int newImage_height;
-    ByteBuffer otherImage;
-    ByteBuffer imageTemp;
-    int memReq;
-    int maxsize;
-    int cmpts;
-    
-    Mipmap.closestFit( gl, target, width, height, components, format, type, newwidth, 
-            newheight );
-    
-    levels = Mipmap.computeLog( newwidth[0] );
-    level = Mipmap.computeLog( newheight[0] );
-    if( level > levels ) {
-      levels = level;
-    }
-    
-    cmpts = Mipmap.elements_per_group( format, type );
-    
-    otherImage = null;
-    //  No need to copy the user data if its packed correctly.
-    //  Make sure that later routines don't change that data.
-    
-    if( psm.getUnpackSkipRows() == 0 && psm.getUnpackSkipPixels() == 0 ) {
-      newImage = data;
-      newImage_width = width;
-      newImage_height = height;
-    } else {
-      int rowsize;
-      int group_per_line;
-      int elements_per_line;
-      int start;
-      int iter;
-      int iter2;
-      int i, j;
-      
-      try {
-        newImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( Mipmap.image_size( 
-              width, height, format, GL2.GL_UNSIGNED_BYTE ) ));
-      } catch( OutOfMemoryError err ) {
-        return( GLU.GLU_OUT_OF_MEMORY );
-      }
-      newImage_width = width;
-      newImage_height = height;
-
-      // Abbreviated version of fill_image for the restricted case.
-      if( psm.getUnpackRowLength() > 0 ) {
-        group_per_line = psm.getUnpackRowLength();
-      } else {
-        group_per_line = width;
-      }
-      rowsize = group_per_line * cmpts;
-      elements_per_line = width * cmpts;
-      start = psm.getUnpackSkipRows() * rowsize + psm.getUnpackSkipPixels() * cmpts;
-      
-      for( i = 0; i < height; i++ ) {
-        iter = start;
-        data.position( iter );
-        for( j = 0; j < elements_per_line; j++ ) {
-          newImage.put( data.get() );
-        }
-        start += rowsize;
-      }
-    }
-    
-    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, 1 );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, GL2.GL_FALSE );
-    
-    for( level = 0; level <= levels; level++ ) {
-      if( newImage_width == newwidth[0] && newImage_height == newheight[0] ) {
-        // use newImage for this level
-        newImage.rewind();
-        gl.glTexImage2D( target, level, components, newImage_width, newImage_height,
-                0, format, GL2.GL_UNSIGNED_BYTE, newImage );
-      } else {
-        if( otherImage == null ) {
-          memReq = Mipmap.image_size( newwidth[0], newheight[0], format, GL2.GL_UNSIGNED_BYTE );
-          try {
-            otherImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
-          } catch( OutOfMemoryError err ) {
-            gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-            gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-            gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-            gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-            gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, ( psm.getUnpackSwapBytes() ? 1 : 0 ) ) ;
-            return( GLU.GLU_OUT_OF_MEMORY );
-          }
-        }
-        // swap newImage and otherImage
-        imageTemp = otherImage;
-        otherImage = newImage;
-        newImage = imageTemp;
-        
-        newImage_width = newwidth[0];
-        newImage_height = newheight[0];
-        newImage.rewind();
-        gl.glTexImage2D( target, level, components, newImage_width, newImage_height,
-                0, format, GL2.GL_UNSIGNED_BYTE, newImage );
-      }
-      if( newwidth[0] > 1 ) {
-        newwidth[0] /= 2;
-      }
-      if( newheight[0] > 1 ) {
-        newheight[0] /= 2;
-      }
-    }
-    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, ( psm.getUnpackSwapBytes() ? 1 : 0 ) ) ;
-    
-    return( 0 );
-  }
-  
-  public static int gluBuild3DMipmapLevelsCore( GL gl, int target, int internalFormat,
-          int width, int height, int depth, int widthPowerOf2, int heightPowerOf2,
-          int depthPowerOf2, int format, int type, int userLevel, int baseLevel,
-          int maxLevel, ByteBuffer data ) {
-    int newWidth;
-    int newHeight;
-    int newDepth;
-    int level, levels;
-    ByteBuffer usersImage;
-    ByteBuffer srcImage, dstImage, tempImage;
-    int newImageWidth;
-    int newImageHeight;
-    int newImageDepth;
-    int memReq;
-    int maxSize;
-    int cmpts;
-    int mark=-1;
-    
-    boolean myswapBytes;
-    int groupsPerLine, elementSize, groupSize;
-    int rowsPerImage, imageSize;
-    int rowSize, padding;
-    PixelStorageModes psm = new PixelStorageModes();
-    
-    assert( Mipmap.checkMipmapArgs( internalFormat, format, type ) == 0 );
-    assert( width >= 1 && height >= 1 && depth >= 1 );
-    assert( type != GL2.GL_BITMAP );
-    
-    srcImage = dstImage = null;
-    
-    newWidth = widthPowerOf2;
-    newHeight = heightPowerOf2;
-    newDepth = depthPowerOf2;
-    levels = Mipmap.computeLog( newWidth );
-    level = Mipmap.computeLog( newHeight );
-    if( level > levels ) {
-      levels = level;
-    }
-    level = Mipmap.computeLog( newDepth );
-    if( level > levels ) {
-      levels = level;
-    }
-    
-    levels += userLevel;
-    
-    Mipmap.retrieveStoreModes3D( gl, psm );
-    myswapBytes = psm.getUnpackSwapBytes();
-    cmpts = Mipmap.elements_per_group( format, type );
-    if( psm.getUnpackRowLength() > 0 ) {
-      groupsPerLine = psm.getUnpackRowLength();
-    } else {
-      groupsPerLine = width;
-    }
-    
-    elementSize = Mipmap.bytes_per_element( type );
-    groupSize = elementSize * cmpts;
-    if( elementSize == 1 ) {
-      myswapBytes = false;
-    }
-    
-    // 3dstuff
-    if( psm.getUnpackImageHeight() > 0 ) {
-      rowsPerImage = psm.getUnpackImageHeight();
-    } else {
-      rowsPerImage = height;
-    }
-    
-    rowSize = groupsPerLine * groupSize;
-    padding = ( rowSize % psm.getUnpackAlignment() );
-    if( padding != 0 ) {
-      rowSize += psm.getUnpackAlignment() - padding;
-    }
-    
-    imageSize = rowsPerImage * rowSize;
-    
-    usersImage = ByteBuffer.wrap(data.array());
-    mark = psm.getUnpackSkipRows() * rowSize +
-           psm.getUnpackSkipPixels() * groupSize +
-           psm.getUnpackSkipImages() * imageSize;
-    usersImage.position( mark );
-    
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, 0 );
-    
-    level = userLevel;
-    
-    if( width == newWidth && height == newHeight && depth == newDepth ) {
-      // use usersImage for level userlevel
-      if( baseLevel <= level && level <= maxLevel ) {
-        gl.getGL2().glTexImage3D( target, level, internalFormat, width, height, depth,
-                0, format, type, usersImage );
-      }
-      if( levels == 0 ) { /* we're done. clean up and return */
-        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, psm.getUnpackSwapBytes() ? 1 : 0 );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, psm.getUnpackSkipImages() );
-        gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, psm.getUnpackImageHeight() );
-        return( 0 );
-      }
-      int nextWidth = newWidth / 2;
-      int nextHeight = newHeight / 2;
-      int nextDepth = newDepth / 2;
-      
-      // clamp to one
-      if( nextWidth < 1 ) {
-        nextWidth = 1;
-      }
-      if( nextHeight < 1 ) {
-        nextHeight = 1;
-      }
-      if( nextDepth < 1 ) {
-        nextDepth = 1;
-      }
-      memReq = Mipmap.imageSize3D( nextWidth, nextHeight, nextDepth, format, type );
-      try {
-        switch( type ) {
-          case( GL2.GL_UNSIGNED_BYTE ):
-          case( GL2.GL_BYTE ):
-          case( GL2.GL_UNSIGNED_SHORT ):
-          case( GL2.GL_SHORT ):
-          case( GL2.GL_UNSIGNED_INT ):
-          case( GL2.GL_INT ):
-          case( GL2.GL_FLOAT ):
-          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-            dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
-            break;
-          default:
-            return( GLU.GLU_INVALID_ENUM );
-        }
-      } catch( OutOfMemoryError err ) {
-        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, psm.getUnpackSwapBytes() ? 1 : 0 );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, psm.getUnpackSkipImages() );
-        gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, psm.getUnpackImageHeight() );
-        return( GLU.GLU_OUT_OF_MEMORY );
-      }
-      
-      if( dstImage != null ) {
-        switch( type ) {
-          case( GL2.GL_UNSIGNED_BYTE ):
-            if( depth > 1 ) {
-              HalveImage.halveImage3D( cmpts, new ExtractUByte(), width, height, depth,
-                      usersImage, dstImage, elementSize, 
-                      groupSize, rowSize, imageSize, myswapBytes );
-            } else {
-              HalveImage.halveImage_ubyte( cmpts, width, height, usersImage,
-                      dstImage, elementSize, rowSize, groupSize );
-            }
-            break;
-          case( GL2.GL_BYTE ):
-            if( depth > 1 ) {
-              HalveImage.halveImage3D( cmpts, new ExtractSByte(), width, height, depth,
-                      usersImage, dstImage, elementSize, groupSize, rowSize,
-                      imageSize, myswapBytes );
-            } else {
-              HalveImage.halveImage_byte( cmpts, width, height, usersImage,
-                      dstImage, elementSize, rowSize, groupSize );
-            }
-            break;
-          case( GL2.GL_UNSIGNED_SHORT ):
-            if( depth > 1 ) {
-              HalveImage.halveImage3D( cmpts, new ExtractUShort(), width, height, depth,
-                      usersImage, dstImage, elementSize, groupSize, rowSize,
-                      imageSize, myswapBytes );
-            } else {
-              HalveImage.halveImage_ushort( cmpts, width, height, usersImage, 
-                      dstImage.asShortBuffer(), elementSize, rowSize, groupSize, myswapBytes );
-            }
-            break;
-          case( GL2.GL_SHORT ):
-            if( depth > 1 ) {
-              HalveImage.halveImage3D( cmpts, new ExtractSShort(), width, height, depth,
-                      usersImage, dstImage, elementSize, groupSize, rowSize,
-                      imageSize, myswapBytes );
-            } else {
-              HalveImage.halveImage_short( cmpts, width, height, usersImage,
-                      dstImage.asShortBuffer(), elementSize, rowSize, groupSize, myswapBytes );
-            }
-            break;
-          case( GL2.GL_UNSIGNED_INT ):
-            if( depth > 1 ) {
-              HalveImage.halveImage3D( cmpts, new ExtractUInt(), width, height, depth,
-                      usersImage, dstImage, elementSize, groupSize, rowSize,
-                      imageSize, myswapBytes );
-            } else {
-              HalveImage.halveImage_uint( cmpts, width, height, usersImage,
-                      dstImage.asIntBuffer(), elementSize, rowSize, groupSize, myswapBytes );
-            }
-            break;
-          case( GL2.GL_INT ):
-            if( depth > 1 ) {
-              HalveImage.halveImage3D( cmpts, new ExtractSInt(), width, height, depth,
-                      usersImage, dstImage, elementSize, groupSize, rowSize,
-                      imageSize, myswapBytes );
-            } else {
-              HalveImage.halveImage_int( cmpts, width, height, usersImage,
-                      dstImage.asIntBuffer(), elementSize, rowSize, groupSize, myswapBytes );
-            }
-            break;
-          case( GL2.GL_FLOAT ):
-            if( depth > 1 ) {
-              HalveImage.halveImage3D( cmpts, new ExtractFloat(), width, height, depth,
-                      usersImage, dstImage, elementSize, groupSize, rowSize,
-                      imageSize, myswapBytes );
-            } else {
-              HalveImage.halveImage_float( cmpts, width, height, usersImage,
-                      dstImage.asFloatBuffer(), elementSize, rowSize, groupSize, myswapBytes );
-            }
-            break;
-          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-            assert( format == GL2.GL_RGB );
-            HalveImage.halveImagePackedPixel3D( 3, new Extract332(), width, height, depth, usersImage,
-                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
-            break;
-          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-            assert( format == GL2.GL_RGB );
-            HalveImage.halveImagePackedPixel3D( 3, new Extract233rev(), width, height, depth, usersImage,
-                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-            HalveImage.halveImagePackedPixel3D( 3, new Extract565(), width, height, depth, usersImage,
-                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-            HalveImage.halveImagePackedPixel3D( 3, new Extract565rev(), width, height, depth, usersImage,
-                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-            HalveImage.halveImagePackedPixel3D( 4, new Extract4444(), width, height, depth, usersImage,
-                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-            HalveImage.halveImagePackedPixel3D( 4, new Extract4444rev(), width, height, depth, usersImage,
-                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-            HalveImage.halveImagePackedPixel3D( 4, new Extract5551(), width, height, depth, usersImage,
-                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
-            break;
-          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-            HalveImage.halveImagePackedPixel3D( 4, new Extract1555rev(), width, height, depth, usersImage,
-                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
-            break;
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-            HalveImage.halveImagePackedPixel3D( 4, new Extract8888(), width, height, depth, usersImage,
-                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
-            break;
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-            HalveImage.halveImagePackedPixel3D( 4, new Extract8888rev(), width, height, depth, usersImage,
-                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
-            break;
-          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-            HalveImage.halveImagePackedPixel3D( 4, new Extract1010102(), width, height, depth, usersImage,
-                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
-            break;
-          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-            HalveImage.halveImagePackedPixel3D( 4, new Extract2101010rev(), width, height, depth, usersImage,
-                    dstImage, elementSize, rowSize, imageSize, myswapBytes );
-            break;
-          default:
-            assert( false );
-            break;
-        }
-      }
-      newWidth = width / 2;
-      newHeight = height / 2;
-      newDepth = depth / 2;
-      // clamp to 1
-      if( newWidth < 1 ) {
-        newWidth = 1;
-      }
-      if( newHeight < 1 ) {
-        newHeight = 1;
-      }
-      if( newDepth < 1 ) {
-        newDepth = 1;
-      }
-      
-      myswapBytes = false;
-      rowSize = newWidth * groupSize;
-      imageSize = rowSize * newHeight;
-      memReq = Mipmap.imageSize3D( newWidth, newHeight, newDepth, format, type );
-      // swap srcImage and dstImage
-      tempImage = srcImage;
-      srcImage = dstImage;
-      dstImage = tempImage;
-      try {
-        switch( type ) {
-          case( GL2.GL_UNSIGNED_BYTE ):
-          case( GL2.GL_BYTE ):
-          case( GL2.GL_UNSIGNED_SHORT ):
-          case( GL2.GL_SHORT ):
-          case( GL2.GL_UNSIGNED_INT ):
-          case( GL2.GL_INT ):
-          case( GL2.GL_FLOAT ):
-          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-            dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
-            break;
-          default:
-            return( GLU.GLU_INVALID_ENUM );
-        }
-      } catch( OutOfMemoryError err ) {
-        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, psm.getUnpackSwapBytes() ? 1 : 0 );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, psm.getUnpackSkipImages() );
-        gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, psm.getUnpackImageHeight() );
-        return( GLU.GLU_OUT_OF_MEMORY );
-      }
-      
-      // level userLevel + 1 is in srcImage; level userLevel already saved
-      level = userLevel + 1;
-    } else {
-      memReq = Mipmap.imageSize3D( newWidth, newHeight, newDepth, format, type );
-      try {
-        switch( type ) {
-          case( GL2.GL_UNSIGNED_BYTE ):
-          case( GL2.GL_BYTE ):
-          case( GL2.GL_UNSIGNED_SHORT ):
-          case( GL2.GL_SHORT ):
-          case( GL2.GL_UNSIGNED_INT ):
-          case( GL2.GL_INT ):
-          case( GL2.GL_FLOAT ):
-          case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-          case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-          case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-          case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-          case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-          case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-          case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-          case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-          case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-            dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
-            break;
-          default:
-            return( GLU.GLU_INVALID_ENUM );
-        }
-      } catch( OutOfMemoryError err ) {
-        gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-        gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-        gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, psm.getUnpackSwapBytes() ? 1 : 0 );
-        gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, psm.getUnpackSkipImages() );
-        gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, psm.getUnpackImageHeight() );
-        return( GLU.GLU_OUT_OF_MEMORY );
-      }
-      
-      ScaleInternal.gluScaleImage3D( gl, format, width, height, depth, type,
-              usersImage, newWidth, newHeight, newDepth, type, dstImage );
-      
-      myswapBytes = false;
-      rowSize = newWidth * groupSize;
-      imageSize = rowSize * newHeight;
-      // swap dstImage and srcImage
-      tempImage = srcImage;
-      srcImage = dstImage;
-      dstImage = tempImage;
-      
-      if( levels != 0 ) {
-        int nextWidth = newWidth / 2;
-        int nextHeight = newHeight / 2;
-        int nextDepth = newDepth / 2;
-        if( nextWidth < 1 ) {
-          nextWidth = 1;
-        }
-        if( nextHeight < 1 ) {
-          nextHeight = 1;
-        }
-        if( nextDepth < 1 ) {
-          nextDepth = 1;
-        }
-        memReq = Mipmap.imageSize3D( nextWidth, nextHeight, nextDepth, format, type );
-        try {
-          switch( type ) {
-            case( GL2.GL_UNSIGNED_BYTE ):
-            case( GL2.GL_BYTE ):
-            case( GL2.GL_UNSIGNED_SHORT ):
-            case( GL2.GL_SHORT ):
-            case( GL2.GL_UNSIGNED_INT ):
-            case( GL2.GL_INT ):
-            case( GL2.GL_FLOAT ):
-            case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-            case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-            case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-            case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-            case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-            case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-            case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-            case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-            case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-            case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-              dstImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( memReq ));
-              break;
-            default:
-              return( GLU.GLU_INVALID_ENUM );
-          }
-        } catch( OutOfMemoryError err ) {
-          gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-          gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-          gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, psm.getUnpackSwapBytes() ? 1 : 0 );
-          gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, psm.getUnpackSkipImages() );
-          gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, psm.getUnpackImageHeight() );
-          return( GLU.GLU_OUT_OF_MEMORY );
-        }
-      }
-      // level userLevel is in srcImage; nothing saved yet
-      level = userLevel;
-    }
-    
-    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, GL2.GL_FALSE );
-    if( baseLevel <= level && level <= maxLevel ) {
-      usersImage.position( mark );
-      gl.getGL2().glTexImage3D( target, level, internalFormat, width, height, depth,
-              0, format, type, usersImage );
-    }
-    level++;
-    for( ; level <= levels; level++ ) {
-      switch( type ) {
-        case( GL2.GL_UNSIGNED_BYTE ):
-          if( depth > 1 ) {
-            HalveImage.halveImage3D( cmpts, new ExtractUByte(), width, height, depth,
-                    usersImage, dstImage, elementSize, groupSize, rowSize,
-                    imageSize, myswapBytes );
-          } else {
-            HalveImage.halveImage_ubyte( cmpts, width, height, usersImage,
-                    dstImage, elementSize, rowSize, groupSize );
-          }
-          break;
-        case( GL2.GL_BYTE ):
-          if( depth > 1 ) {
-            HalveImage.halveImage3D( cmpts, new ExtractSByte(), width, height, depth,
-                    usersImage, dstImage, elementSize, groupSize, rowSize,
-                    imageSize, myswapBytes );
-          } else {
-            HalveImage.halveImage_byte( cmpts, width, height, usersImage,
-                    dstImage, elementSize, rowSize, groupSize );
-          }
-          break;
-        case( GL2.GL_UNSIGNED_SHORT ):
-          if( depth > 1 ) {
-            HalveImage.halveImage3D( cmpts, new ExtractUShort(), width, height, depth,
-                    usersImage, dstImage, elementSize, groupSize, rowSize,
-                    imageSize, myswapBytes );
-          } else {
-            HalveImage.halveImage_ushort( cmpts, width, height, usersImage,
-                    dstImage.asShortBuffer(), elementSize, rowSize, groupSize, myswapBytes );
-          }
-          break;
-        case( GL2.GL_SHORT ):
-          if( depth > 1 ) {
-            HalveImage.halveImage3D( cmpts, new ExtractSShort(), width, height, depth,
-                    usersImage, dstImage, elementSize, groupSize, rowSize,
-                    imageSize, myswapBytes );
-          } else {
-            HalveImage.halveImage_short( cmpts, width, height, usersImage,
-                    dstImage.asShortBuffer(), elementSize, rowSize, groupSize, myswapBytes );
-          }
-          break;
-        case( GL2.GL_UNSIGNED_INT ):
-          if( depth > 1 ) {
-            HalveImage.halveImage3D( cmpts, new ExtractUInt(), width, height, depth,
-                    usersImage, dstImage, elementSize, groupSize, rowSize,
-                    imageSize, myswapBytes );
-          } else {
-            HalveImage.halveImage_uint( cmpts, width, height, usersImage,
-                    dstImage.asIntBuffer(), elementSize, rowSize, groupSize, myswapBytes );
-          }
-          break;
-        case( GL2.GL_INT ):
-          if( depth > 1 ) {
-            HalveImage.halveImage3D( cmpts, new ExtractSInt(), width, height, depth,
-                    usersImage, dstImage, elementSize, groupSize, rowSize,
-                    imageSize, myswapBytes );
-          } else {
-            HalveImage.halveImage_int( cmpts, width, height, usersImage,
-                    dstImage.asIntBuffer(), elementSize, rowSize, groupSize, myswapBytes );
-          }
-          break;
-        case( GL2.GL_FLOAT ):
-          if( depth > 1 ) {
-            HalveImage.halveImage3D( cmpts, new ExtractFloat(), width, height, depth,
-                    usersImage, dstImage, elementSize, groupSize, rowSize,
-                    imageSize, myswapBytes );
-          } else {
-            HalveImage.halveImage_float( cmpts, width, height, usersImage,
-                    dstImage.asFloatBuffer(), elementSize, rowSize, groupSize, myswapBytes );
-          }
-          break;
-        case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-          HalveImage.halveImagePackedPixel3D( 3, new Extract332(), width, height, depth, usersImage,
-                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
-          break;
-        case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-          HalveImage.halveImagePackedPixel3D( 3, new Extract233rev(), width, height, depth, usersImage,
-                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-          HalveImage.halveImagePackedPixel3D( 3, new Extract565(), width, height, depth, usersImage,
-                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-          HalveImage.halveImagePackedPixel3D( 3, new Extract565rev(), width, height, depth, usersImage,
-                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-          HalveImage.halveImagePackedPixel3D( 4, new Extract4444(), width, height, depth, usersImage,
-                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-          HalveImage.halveImagePackedPixel3D( 4, new Extract4444rev(), width, height, depth, usersImage,
-                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-          HalveImage.halveImagePackedPixel3D( 4, new Extract5551(), width, height, depth, usersImage,
-                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
-          break;
-        case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-          HalveImage.halveImagePackedPixel3D( 4, new Extract1555rev(), width, height, depth, usersImage,
-                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
-          break;
-        case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-          HalveImage.halveImagePackedPixel3D( 4, new Extract8888(), width, height, depth, usersImage,
-                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
-          break;
-        case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-          HalveImage.halveImagePackedPixel3D( 4, new Extract8888rev(), width, height, depth, usersImage,
-                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
-          break;
-        case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-          HalveImage.halveImagePackedPixel3D( 4, new Extract1010102(), width, height, depth, usersImage,
-                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
-          break;
-        case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-          HalveImage.halveImagePackedPixel3D( 4, new Extract2101010rev(), width, height, depth, usersImage,
-                  dstImage, elementSize, rowSize, imageSize, myswapBytes );
-          break;
-        default:
-          assert( false );
-          break;
-      }
-      
-      tempImage = srcImage;
-      srcImage = dstImage;
-      dstImage = tempImage;
-      
-      if( newWidth > 1 ) {
-        newWidth /= 2;
-        rowSize /= 2;
-      }
-      if( newHeight > 1 ) {
-        newHeight /= 2;
-        imageSize = rowSize * newHeight;
-      }
-      if( newDepth > 1 ) {
-        newDepth /= 2;
-      }
-      if( baseLevel <= level && level <= maxLevel ) {
-        usersImage.position( mark );
-        gl.getGL2().glTexImage3D( target, level, internalFormat, width, height, depth,
-                0, format, type, usersImage );
-      }
-    }
-    gl.glPixelStorei( GL2.GL_UNPACK_ALIGNMENT, psm.getUnpackAlignment() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_ROWS, psm.getUnpackSkipRows() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_PIXELS, psm.getUnpackSkipPixels() );
-    gl.glPixelStorei( GL2.GL_UNPACK_ROW_LENGTH, psm.getUnpackRowLength() );
-    gl.glPixelStorei( GL2.GL_UNPACK_SWAP_BYTES, psm.getUnpackSwapBytes() ? 1 : 0 );
-    gl.glPixelStorei( GL2.GL_UNPACK_SKIP_IMAGES, psm.getUnpackSkipImages() );
-    gl.glPixelStorei( GL2.GL_UNPACK_IMAGE_HEIGHT, psm.getUnpackImageHeight() );
-    return( 0 );
-  }
-
-  private static final int TARGA_HEADER_SIZE = 18;
-  private static void writeTargaFile(String filename, ByteBuffer data,
-                                     int width, int height) {
-    try {
-      FileOutputStream fos = new FileOutputStream(new File(filename));
-      ByteBuffer header = ByteBuffer.allocateDirect(TARGA_HEADER_SIZE);
-      header.put(0, (byte) 0).put(1, (byte) 0);
-      header.put(2, (byte) 2); // uncompressed type
-      header.put(12, (byte) (width & 0xFF)); // width
-      header.put(13, (byte) (width >> 8)); // width
-      header.put(14, (byte) (height & 0xFF)); // height
-      header.put(15, (byte) (height >> 8)); // height
-      header.put(16, (byte) 24); // pixel size
-      fos.write(header.array());
-      fos.write(data.array());
-      data.clear();
-      fos.close();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract.java
deleted file mode 100644
index 3f0fab51c..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.ByteBuffer;
-
-/**
- *
- * @author Administrator
- */
-public interface Extract {
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents );
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel );
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1010102.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1010102.java
deleted file mode 100644
index 38ca2e526..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1010102.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.ByteBuffer;
-
-/**
- *
- * @author Administrator
- */
-public class Extract1010102 implements Extract {
-  
-  /** Creates a new instance of Extract1010102 */
-  public Extract1010102() {
-  }
-  
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
-    long uint = 0;
-    
-    if( isSwap ) {
-      uint = 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( packedPixel.getInt() );
-    } else {
-      uint = 0x00000000FFFFFFFF & packedPixel.getInt();
-    }
-    
-    // 11111111,11000000,00000000,00000000 == 0xFFC00000
-    // 00000000,00111111,11110000,00000000 == 0x003F0000
-    // 00000000,00000000,00001111,11111100 == 0x00000FFC
-    // 00000000,00000000,00000000,00000011 == 0x00000003
-    
-    extractComponents[0] = (float)( ( uint & 0xFFC00000 ) >> 22 ) / 1023.0f;
-    extractComponents[1] = (float)( ( uint & 0x003FF000 ) >> 12 ) / 1023.0f;
-    extractComponents[2] = (float)( ( uint & 0x00000FFC ) >>  2 ) / 1023.0f;
-    extractComponents[3] = (float)( ( uint & 0x00000003 )       ) / 3.0f;
-  }
-  
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
-    // 11110000,00000000 == 0xF000
-    // 00001111,00000000 == 0x0F00
-    // 00000000,11110000 == 0x00F0
-    // 00000000,00001111 == 0x000F
-    
-    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
-    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
-    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
-    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
-    
-    // due to limited precision, need to round before shoving
-    long uint = (((int)((shoveComponents[0] * 1023) + 0.5f) << 22) & 0xFFC00000 );
-    uint |= (((int)((shoveComponents[1] * 1023) + 0.5f) <<   12) & 0x003FF000 );
-    uint |= (((int)((shoveComponents[2] * 1023) + 0.5f) <<    2) & 0x00000FFC );
-    uint |= (((int)((shoveComponents[3] *    3) + 0.5f)        ) & 0x00000003 );
-    packedPixel.asIntBuffer().put( index, (int)uint );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1555rev.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1555rev.java
deleted file mode 100644
index 5810b1ef6..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1555rev.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.ByteBuffer;
-
-/**
- *
- * @author Administrator
- */
-public class Extract1555rev implements Extract {
-  
-  /** Creates a new instance of Extract1555rev */
-  public Extract1555rev() {
-  }
-  
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
-    int ushort = 0;
-    
-    if( isSwap ) {
-      ushort = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( packedPixel.getShort() );
-    } else {
-      ushort = 0x0000FFFF & packedPixel.getShort();
-    }
-    
-    // 00000000,00011111 == 0x001F
-    // 00000011,11100000 == 0x03E0
-    // 01111100,00000000 == 0x7C00
-    // 10000000,00000000 == 0x8000
-    
-    extractComponents[0] = (float)( ( ushort & 0x001F )       ) / 31.0f;
-    extractComponents[1] = (float)( ( ushort & 0x003E ) >>  5 ) / 31.0f;
-    extractComponents[2] = (float)( ( ushort & 0x7C00 ) >>  10) / 31.0f;
-    extractComponents[3] = (float)( ( ushort & 0x8000 ) >>  15);
-  }
-  
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
-    // 00000000,00011111 == 0x001F
-    // 00000011,11100000 == 0x03E0
-    // 01111100,00000000 == 0x7C00
-    // 10000000,00000000 == 0x8000
-    
-    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
-    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
-    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
-    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
-    
-    // due to limited precision, need to round before shoving
-    int ushort = (((int)((shoveComponents[0] * 31) + 0.5f)   ) & 0x0000001F );
-    ushort |= (((int)((shoveComponents[1] * 31) + 0.5f) <<  5) & 0x000003E0 );
-    ushort |= (((int)((shoveComponents[2] * 31) + 0.5f) << 10) & 0x00007C00 );
-    ushort |= (((int)((shoveComponents[3]) + 0.5f)      << 15) & 0x00008000 );
-    packedPixel.asShortBuffer().put( index, (short)ushort );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract2101010rev.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract2101010rev.java
deleted file mode 100644
index 493f403e8..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract2101010rev.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.ByteBuffer;
-
-/**
- *
- * @author Administrator
- */
-public class Extract2101010rev implements Extract {
-  
-  /** Creates a new instance of Extract2101010 */
-  public Extract2101010rev() {
-  }
-  
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
-    long uint = 0;
-    
-    if( isSwap ) {
-      uint = 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( packedPixel.getInt() );
-    } else {
-      uint = 0x00000000FFFFFFFF & packedPixel.getInt();
-    }
-    
-    // 11111111,11000000,00000000,00000000 == 0xFFC00000
-    // 00000000,00111111,11110000,00000000 == 0x003F0000
-    // 00000000,00000000,00001111,11111100 == 0x00000FFC
-    // 00000000,00000000,00000000,00000011 == 0x00000003
-    
-    extractComponents[0] = (float)( ( uint & 0x000003FF )       ) / 1023.0f;
-    extractComponents[1] = (float)( ( uint & 0x000FFC00 ) >> 10 ) / 1023.0f;
-    extractComponents[2] = (float)( ( uint & 0x3FF00000 ) >> 20 ) / 1023.0f;
-    extractComponents[3] = (float)( ( uint & 0xC0000000 ) >> 30 ) / 3.0f;
-  }
-  
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
-    // 11110000,00000000 == 0xF000
-    // 00001111,00000000 == 0x0F00
-    // 00000000,11110000 == 0x00F0
-    // 00000000,00001111 == 0x000F
-    
-    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
-    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
-    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
-    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
-    
-    // due to limited precision, need to round before shoving
-    long uint = (((int)((shoveComponents[0] * 1023) + 0.5f)    ) & 0x000003FF );
-    uint |= (((int)((shoveComponents[1] * 1023) + 0.5f) <<   10) & 0x000FFC00 );
-    uint |= (((int)((shoveComponents[2] * 1023) + 0.5f) <<   20) & 0x3FF00000 );
-    uint |= (((int)((shoveComponents[3] *    3) + 0.5f) <<   30) & 0xC0000000 );
-    packedPixel.asIntBuffer().put( index, (int)uint );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract233rev.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract233rev.java
deleted file mode 100644
index b0a975307..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract233rev.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.ByteBuffer;
-
-/**
- *
- * @author Administrator
- */
-public class Extract233rev implements Extract {
-  
-  /** Creates a new instance of Extract223rev */
-  public Extract233rev() {
-  }
-  
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
-    // 11100000 == 0xe0
-    // 00011100 == 0x1c
-    // 00000011 == 0x03
-    byte ubyte = packedPixel.get();
-    extractComponents[0] = (float)((ubyte & 0x07) ) / 7.0f;
-    extractComponents[1] = (float)((ubyte & 0x38) >> 3) / 7.0f;
-    extractComponents[2] = (float)((ubyte & 0xC0) >> 6) / 3.0f;
-  }
-  
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
-    // 11100000 == 0xE0
-    // 00011100 == 0x1C
-    // 00000011 == 0x03
-    
-    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
-    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
-    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
-    
-    // due to limited precision, need to round before shoving
-    byte b = (byte)( ( (int)( ( shoveComponents[0] * 7 ) + 0.5f ) ) & 0x07 );
-    b |= (byte)( ( (int)( ( shoveComponents[1] * 7 ) + 0.5f ) << 3 ) & 0x38 );
-    b |= (byte)( ( (int)( ( shoveComponents[2] * 3 ) + 0.5f ) << 6 ) & 0xC0 );
-    packedPixel.position( index );
-    packedPixel.put( b );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract332.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract332.java
deleted file mode 100644
index 3c9594e9a..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract332.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.ByteBuffer;
-
-/**
- *
- * @author Administrator
- */
-public class Extract332 implements Extract {
-  
-  /** Creates a new instance of Extract332 */
-  public Extract332() {
-  }
-  
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
-    // 11100000 == 0xe0
-    // 00011100 == 0x1c
-    // 00000011 == 0x03
-    byte ubyte = packedPixel.get();
-    extractComponents[0] = (float)((ubyte & 0xe0) >> 5) / 7.0f;
-    extractComponents[1] = (float)((ubyte & 0x1c) >> 2) / 7.0f;
-    extractComponents[2] = (float)((ubyte & 0x03)) / 3.0f;
-  }
-  
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
-    // 11100000 == 0xE0
-    // 00011100 == 0x1C
-    // 00000011 == 0x03
-    
-    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
-    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
-    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
-    
-    // due to limited precision, need to round before shoving
-    byte b = (byte)( ( (int)( ( shoveComponents[0] * 7 ) + 0.5f ) << 5 ) & 0xE0 );
-    b |= (byte)( ( (int)( ( shoveComponents[1] * 7 ) + 0.5f ) << 2 ) & 0x1C );
-    b |= (byte)( ( (int)( ( shoveComponents[2] * 3 ) + 0.5f ) ) & 0x03 );
-    packedPixel.put( index, b );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444.java
deleted file mode 100644
index 03f74586d..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author Administrator
- */
-public class Extract4444 implements Extract {
-  
-  /** Creates a new instance of Extract4444 */
-  public Extract4444() {
-  }
-  
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
-    int ushort = 0;
-    
-    if( isSwap ) {
-      ushort = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( packedPixel.getShort() );
-    } else {
-      ushort = 0x0000FFFF & packedPixel.getShort();
-    }
-    
-    // 11110000,00000000 == 0xF000
-    // 00001111,00000000 == 0x0F00
-    // 00000000,11110000 == 0x00F0
-    // 00000000,00001111 == 0x000F
-    
-    extractComponents[0] = (float)( ( ushort & 0xF000 ) >> 12 ) / 15.0f;
-    extractComponents[1] = (float)( ( ushort & 0x0F00 ) >> 8  ) / 15.0f;
-    extractComponents[2] = (float)( ( ushort & 0x00F0 ) >> 4  ) / 15.0f;
-    extractComponents[3] = (float)( ( ushort & 0x000F )       ) / 15.0f;
-  }
-  
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
-    // 11110000,00000000 == 0xF000
-    // 00001111,00000000 == 0x0F00
-    // 00000000,11110000 == 0x00F0
-    // 00000000,00001111 == 0x000F
-    
-    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
-    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
-    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
-    
-    // due to limited precision, need to round before shoving
-    int ushort = (((int)((shoveComponents[0] * 15) + 0.5f) << 12) & 0x0000F000 );
-    ushort |= (((int)((shoveComponents[1] * 15) + 0.5f) << 8) & 0x00000F00 );
-    ushort |= (((int)((shoveComponents[2] * 15) + 0.5f) << 4) & 0x000000F0 );
-    ushort |= (((int)((shoveComponents[3] * 15) + 0.5f)     ) & 0x0000000F );
-    packedPixel.asShortBuffer().put( index, (short)ushort );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444rev.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444rev.java
deleted file mode 100644
index bf623e647..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444rev.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author Administrator
- */
-public class Extract4444rev implements Extract {
-  
-  /** Creates a new instance of Extract4444rev */
-  public Extract4444rev() {
-  }
-  
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
-    int ushort = 0;
-    
-    if( isSwap ) {
-      ushort = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( packedPixel.getShort() );
-    } else {
-      ushort = 0x0000FFFF & packedPixel.getShort();
-    }
-    
-    // 00000000,00001111 == 0x000F
-    // 00000000,11110000 == 0x00F0
-    // 00001111,00000000 == 0x0F00
-    // 11110000,00000000 == 0xF000
-    
-    extractComponents[0] = (float)( ( ushort & 0x000F )       ) / 15.0f;
-    extractComponents[1] = (float)( ( ushort & 0x00F0 ) >> 4  ) / 15.0f;
-    extractComponents[2] = (float)( ( ushort & 0x0F00 ) >> 8  ) / 15.0f;
-    extractComponents[3] = (float)( ( ushort & 0xF000 ) >> 12 ) / 15.0f;
-  }
-  
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
-    // 11110000,00000000 == 0xF000
-    // 00001111,00000000 == 0x0F00
-    // 00000000,11110000 == 0x00F0
-    // 00000000,00001111 == 0x000F
-    
-    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
-    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
-    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
-    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
-    
-    // due to limited precision, need to round before shoving
-    int ushort = (((int)((shoveComponents[0] * 15) + 0.5f)   ) & 0x0000000F );
-    ushort |= (((int)((shoveComponents[1] * 15) + 0.5f) <<  4) & 0x000000F0 );
-    ushort |= (((int)((shoveComponents[2] * 15) + 0.5f) <<  8) & 0x00000F00 );
-    ushort |= (((int)((shoveComponents[3] * 15) + 0.5f) << 12) & 0x0000F000 );
-    packedPixel.asShortBuffer().put( index, (short)ushort );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract5551.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract5551.java
deleted file mode 100644
index 81480f7ba..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract5551.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author Administrator
- */
-public class Extract5551 implements Extract {
-  
-  /** Creates a new instance of Extract5551 */
-  public Extract5551() {
-  }
-  
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
-    int ushort = 0;
-    
-    if( isSwap ) {
-      ushort = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( packedPixel.getShort() );
-    } else {
-      ushort = 0x0000FFFF & packedPixel.getShort();
-    }
-    
-    // 11111000,00000000 == 0xF800
-    // 00000111,11000000 == 0x07C0
-    // 00000000,00111110 == 0x003E
-    // 00000000,00000001 == 0x0001
-    
-    extractComponents[0] = (float)( ( ushort & 0xF800 ) >> 11 ) / 31.0f;
-    extractComponents[1] = (float)( ( ushort & 0x00F0 ) >>  6 ) / 31.0f;
-    extractComponents[2] = (float)( ( ushort & 0x0F00 ) >>  1 ) / 31.0f;
-    extractComponents[3] = (float)( ( ushort & 0xF000 )       );
-  }
-  
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
-    // 11110000,00000000 == 0xF000
-    // 00001111,00000000 == 0x0F00
-    // 00000000,11110000 == 0x00F0
-    // 00000000,00001111 == 0x000F
-    
-    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
-    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
-    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
-    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
-    
-    // due to limited precision, need to round before shoving
-    int ushort = (((int)((shoveComponents[0] * 31) + 0.5f) << 11) & 0x0000F800 );
-    ushort |= (((int)((shoveComponents[1] * 31) + 0.5f) <<  6) & 0x000007C0 );
-    ushort |= (((int)((shoveComponents[2] * 31) + 0.5f) <<  1) & 0x0000003E );
-    ushort |= (((int)((shoveComponents[3]) + 0.5f)) & 0x00000001 );
-    packedPixel.asShortBuffer().put( index, (short)ushort );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565.java
deleted file mode 100644
index cf5e79969..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author Administrator
- */
-public class Extract565 implements Extract {
-  
-  /** Creates a new instance of Extract565 */
-  public Extract565() {
-  }
-  
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
-    int ushort = 0;
-    
-    if( isSwap ) {
-      ushort = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( packedPixel.getShort() );
-    } else {
-      ushort = 0x0000FFFF & packedPixel.getShort();
-    }
-    
-    // 11111000,00000000 == 0xF800
-    // 00000111,11100000 == 0x07E0
-    // 00000000,00111111 == 0x001F
-    
-    extractComponents[0] = (float)( ( ushort & 0xF800 ) >> 11 ) / 31.0f;
-    extractComponents[1] = (float)( ( ushort & 0x07E0 ) >> 5 ) / 63.0f;
-    extractComponents[2] = (float)( ( ushort & 0x001F ) ) / 31.0f;
-  }
-  
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
-    // 11111000,00000000 == 0xF800
-    // 00000111,11100000 == 0x07E0
-    // 00000000,00111111 == 0x001F
-    
-    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
-    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
-    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
-    
-    // due to limited precision, need to round before shoving
-    int ushort = (((int)((shoveComponents[0] * 31) + 0.5f) << 11) & 0x0000F800 );
-    ushort |= (((int)((shoveComponents[1] * 63) + 0.5f) << 5) & 0x000007E0 );
-    ushort |= (((int)((shoveComponents[2] * 31) + 0.5f) ) & 0x0000001F );
-    packedPixel.asShortBuffer().put( index, (short)ushort );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565rev.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565rev.java
deleted file mode 100644
index a810d8708..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565rev.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author Administrator
- */
-public class Extract565rev implements Extract {
-  
-  /** Creates a new instance of Extract565rev */
-  public Extract565rev() {
-  }
-  
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
-    int ushort = 0;
-    
-    if( isSwap ) {
-      ushort = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( packedPixel.getShort() );
-    } else {
-      ushort = 0x0000FFFF & packedPixel.getShort();
-    }
-    
-    // 00000000,00011111 == 0x001F
-    // 00000111,11100000 == 0x07E0
-    // 11111000,00000000 == 0xF800
-    
-    extractComponents[0] = (float)( ( ushort & 0x001F ) ) / 31.0f;
-    extractComponents[1] = (float)( ( ushort & 0x07E0 ) >> 5 ) / 63.0f;
-    extractComponents[2] = (float)( ( ushort & 0xF800 ) >> 11 ) / 31.0f;
-  }
-  
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
-    // 00000000,00111111 == 0x001F
-    // 00000111,11100000 == 0x07E0
-    // 11111000,00000000 == 0xF800
-    
-    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
-    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
-    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
-    
-    // due to limited precision, need to round before shoving
-    int ushort = (((int)((shoveComponents[0] * 31) + 0.5f) ) & 0x0000001F );
-    ushort |= (((int)((shoveComponents[1] * 63) + 0.5f) << 5) & 0x000007E0 );
-    ushort |= (((int)((shoveComponents[2] * 31) + 0.5f) << 11) & 0x0000F800 );
-    packedPixel.asShortBuffer().put( index, (short)ushort );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888.java
deleted file mode 100644
index 0ae18ef13..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author Administrator
- */
-public class Extract8888 implements Extract {
-  
-  /** Creates a new instance of Extract8888 */
-  public Extract8888() {
-  }
-  
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
-    long uint = 0;
-    
-    if( isSwap ) {
-      uint = 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( packedPixel.getInt() );
-    } else {
-      uint = 0x00000000FFFFFFFF & packedPixel.getInt();
-    }
-    
-    // 11111000,00000000 == 0xF800
-    // 00000111,11000000 == 0x07C0
-    // 00000000,00111110 == 0x003E
-    // 00000000,00000001 == 0x0001
-    
-    extractComponents[0] = (float)( ( uint & 0xFF000000 ) >> 24 ) / 255.0f;
-    extractComponents[1] = (float)( ( uint & 0x00FF0000 ) >> 16 ) / 255.0f;
-    extractComponents[2] = (float)( ( uint & 0x0000FF00 ) >>  8 ) / 255.0f;
-    extractComponents[3] = (float)( ( uint & 0x000000FF )       ) / 255.0f;
-  }
-  
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
-    // 11110000,00000000 == 0xF000
-    // 00001111,00000000 == 0x0F00
-    // 00000000,11110000 == 0x00F0
-    // 00000000,00001111 == 0x000F
-    
-    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
-    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
-    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
-    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
-    
-    // due to limited precision, need to round before shoving
-    long uint = (((int)((shoveComponents[0] * 255) + 0.5f) << 24) & 0xFF000000 );
-    uint |= (((int)((shoveComponents[1] * 255) + 0.5f) <<   16) & 0x00FF0000 );
-    uint |= (((int)((shoveComponents[2] * 255) + 0.5f) <<    8) & 0x0000FF00 );
-    uint |= (((int)((shoveComponents[3] * 255) + 0.5f)        ) & 0x000000FF );
-    packedPixel.asIntBuffer().put( index, (int)uint );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888rev.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888rev.java
deleted file mode 100644
index 3b2286020..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888rev.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author Administrator
- */
-public class Extract8888rev implements Extract {
-  
-  /** Creates a new instance of Extract8888rev */
-  public Extract8888rev() {
-  }
-  
-  public void extract( boolean isSwap, ByteBuffer packedPixel, float[] extractComponents ) {
-    long uint = 0;
-    
-    if( isSwap ) {
-      uint = 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( packedPixel.getInt() );
-    } else {
-      uint = 0x00000000FFFFFFFF & packedPixel.getInt();
-    }
-    
-    // 11111000,00000000 == 0xF800
-    // 00000111,11000000 == 0x07C0
-    // 00000000,00111110 == 0x003E
-    // 00000000,00000001 == 0x0001
-    
-    extractComponents[0] = (float)( ( uint & 0x000000FF )       ) / 255.0f;
-    extractComponents[1] = (float)( ( uint & 0x0000FF00 ) >>  8 ) / 255.0f;
-    extractComponents[2] = (float)( ( uint & 0x00FF0000 ) >> 16 ) / 255.0f;
-    extractComponents[3] = (float)( ( uint & 0xFF000000 ) >> 24 ) / 255.0f;
-  }
-  
-  public void shove( float[] shoveComponents, int index, ByteBuffer packedPixel ) {
-    // 11110000,00000000 == 0xF000
-    // 00001111,00000000 == 0x0F00
-    // 00000000,11110000 == 0x00F0
-    // 00000000,00001111 == 0x000F
-    
-    assert( 0.0f <= shoveComponents[0] && shoveComponents[0] <= 1.0f );
-    assert( 0.0f <= shoveComponents[1] && shoveComponents[1] <= 1.0f );
-    assert( 0.0f <= shoveComponents[2] && shoveComponents[2] <= 1.0f );
-    assert( 0.0f <= shoveComponents[3] && shoveComponents[3] <= 1.0f );
-    
-    // due to limited precision, need to round before shoving
-    long uint = (((int)((shoveComponents[0] * 255) + 0.5f)    ) & 0x000000FF );
-    uint |= (((int)((shoveComponents[1] * 255) + 0.5f) <<    8) & 0x0000FF00 );
-    uint |= (((int)((shoveComponents[2] * 255) + 0.5f) <<   16) & 0x00FF0000 );
-    uint |= (((int)((shoveComponents[3] * 255) + 0.5f) <<   24) & 0xFF000000 );
-    packedPixel.asIntBuffer().put( index, (int)uint );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractFloat.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractFloat.java
deleted file mode 100644
index 3776b48b2..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractFloat.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author Administrator
- */
-public class ExtractFloat implements ExtractPrimitive {
-  
-  /** Creates a new instance of ExtractFloat */
-  public ExtractFloat() {
-  }
-  
-  public double extract( boolean isSwap, ByteBuffer data ) {
-    float f = 0;
-    if( isSwap ) {
-      f = Mipmap.GLU_SWAP_4_BYTES( data.getInt() );
-    } else {
-      f = data.getInt();
-    }
-    assert( f <= 1.0f );
-    return( f );
-  }
-  
-  public void shove( double value, int index, ByteBuffer data ) {
-    assert(0.0 <= value && value < 1.0);
-    data.asFloatBuffer().put( index, (float)value );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractPrimitive.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractPrimitive.java
deleted file mode 100644
index 35b2e513b..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractPrimitive.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.ByteBuffer;
-
-/**
- *
- * @author Administrator
- */
-public interface ExtractPrimitive {
-  public double extract( boolean isSwap, ByteBuffer pointer );
-  public void shove( double value, int index, ByteBuffer pointer );
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSByte.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSByte.java
deleted file mode 100644
index 08d966c0c..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSByte.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.ByteBuffer;
-
-/**
- *
- * @author Administrator
- */
-public class ExtractSByte implements ExtractPrimitive {
-  
-  /** Creates a new instance of ExtractUByte */
-  public ExtractSByte() {
-  }
-  
-  public double extract( boolean isSwap, ByteBuffer sbyte ) {
-    byte b = sbyte.get();
-    assert( b <= 127 );
-    return( b );
-  }
-  
-  public void shove( double value, int index, ByteBuffer data ) {
-    data.position( index );
-    data.put( (byte)value );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSInt.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSInt.java
deleted file mode 100644
index f7642f5dd..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSInt.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author Administrator
- */
-public class ExtractSInt implements ExtractPrimitive {
-  
-  /** Creates a new instance of ExtractSInt */
-  public ExtractSInt() {
-  }
-  
-  public double extract( boolean isSwap, ByteBuffer uint ) {
-    int i = 0;
-    if( isSwap ) {
-      i = Mipmap.GLU_SWAP_4_BYTES( uint.getInt() );
-    } else {
-      i = uint.getInt();
-    }
-    assert( i <= 0x7FFFFFFF );
-    return( i );
-  }
-  
-  public void shove( double value, int index, ByteBuffer data ) {
-    assert(0.0 <= value && value < Integer.MAX_VALUE);
-    IntBuffer ib = data.asIntBuffer();
-    ib.position( index );
-    ib.put( (int)value );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSShort.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSShort.java
deleted file mode 100644
index a20784c48..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSShort.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author Administrator
- */
-public class ExtractSShort implements ExtractPrimitive {
-  
-  /** Creates a new instance of ExtractSShort */
-  public ExtractSShort() {
-  }
-  
-  public double extract( boolean isSwap, ByteBuffer ushort ) {
-    short s = 0;
-    if( isSwap ) {
-      s = Mipmap.GLU_SWAP_2_BYTES( ushort.getShort() );
-    } else {
-      s = ushort.getShort();
-    }
-    assert( s <= 32767 );
-    return( s );
-  }
-  
-  public void shove( double value, int index, ByteBuffer data ) {
-    assert(0.0 <= value && value < 32768.0);
-    ShortBuffer sb = data.asShortBuffer();
-    sb.position( index );
-    sb.put( (short)value );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUByte.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUByte.java
deleted file mode 100644
index ed55ab1b6..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUByte.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.ByteBuffer;
-
-/**
- *
- * @author Administrator
- */
-public class ExtractUByte implements ExtractPrimitive {
-  
-  /** Creates a new instance of ExtractUByte */
-  public ExtractUByte() {
-  }
-  
-  public double extract( boolean isSwap, ByteBuffer ubyte ) {
-    int i = 0x000000FF & ubyte.get();
-    assert( i <= 255 );
-    return( i );
-  }
-  
-  public void shove( double value, int index, ByteBuffer data ) {
-    assert(0.0 <= value && value < 256.0);
-    data.position( index );
-    data.put( (byte)value );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUInt.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUInt.java
deleted file mode 100644
index 38c156f9c..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUInt.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author Administrator
- */
-public class ExtractUInt implements ExtractPrimitive {
-  
-  /** Creates a new instance of ExtractUInt */
-  public ExtractUInt() {
-  }
-  
-  public double extract( boolean isSwap, ByteBuffer uint ) {
-    long i = 0;
-    if( isSwap ) {
-      i = 0xFFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( uint.getInt() );
-    } else {
-      i = 0xFFFFFFFF & uint.getInt();
-    }
-    assert( i <= 0xFFFFFFFF );
-    return( i );
-  }
-  
-  public void shove( double value, int index, ByteBuffer data ) {
-    assert(0.0 <= value && value < 0xFFFFFFFF);
-    IntBuffer ib = data.asIntBuffer();
-    ib.position( index );
-    ib.put( (int)value );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUShort.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUShort.java
deleted file mode 100644
index 5aba2763f..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUShort.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author Administrator
- */
-public class ExtractUShort implements ExtractPrimitive {
-  
-  /** Creates a new instance of ExtracUShort */
-  public ExtractUShort() {
-  }
-  
-  public double extract( boolean isSwap, ByteBuffer ushort ) {
-    int i = 0;
-    if( isSwap ) {
-      i = 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( ushort.getShort() );
-    } else {
-      i = 0x0000FFFF & ushort.getShort();
-    }
-    assert( i <= 65535 );
-    return( i );
-  }
-  
-  public void shove( double value, int index, ByteBuffer data ) {
-    assert(0.0 <= value && value < 65536.0);
-    ShortBuffer sb = data.asShortBuffer();
-    sb.position( index );
-    sb.put( (short)value );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/HalveImage.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/HalveImage.java
deleted file mode 100644
index 40625ee07..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/HalveImage.java
+++ /dev/null
@@ -1,1533 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import javax.media.opengl.GL;
-import java.nio.*;
-
-/**
- *
- * @author  Administrator
- */
-public class HalveImage {
-  
-  private static final int BOX2 = 2;
-  private static final int BOX4 = 4;
-  private static final int BOX8 = 8;
-  
-  public static void halveImage( int components, int width, int height,
-          ShortBuffer datain, ShortBuffer dataout ) {
-    int i, j, k;
-    int newwidth, newheight;
-    int delta;
-    int t = 0;
-    short temp = 0;
-    
-    newwidth = width / 2;
-    newheight = height /2;
-    delta = width * components;
-    
-    // Piece of cake
-    for( i = 0; i < newheight; i++ ) {
-      for( j = 0; j < newwidth; j++ ) {
-        for( k = 0; k < components; k++ ) {
-          datain.position( t );
-          temp = datain.get();
-          datain.position( t + components );
-          temp += datain.get();
-          datain.position( t + delta );
-          temp += datain.get();
-          datain.position( t + delta + components );
-          temp +=datain.get();
-          temp += 2;
-          temp /= 4;
-          dataout.put( temp );
-          t++;
-        }
-        t += components;
-      }
-      t += delta;
-    }
-  }
-  
-  public static void halveImage_ubyte( int components, int width, int height,
-                                      ByteBuffer datain, ByteBuffer dataout,
-                                      int element_size, int ysize, int group_size ) {
-    int i, j, k;
-    int newwidth, newheight;
-    int s;
-    int t;
-    
-    // Handle case where there is only 1 column/row
-    if( width == 1 || height == 1 ) {
-      assert( !( width == 1 && height == 1 ) ); // can't be 1x1
-      halve1Dimage_ubyte( components, width, height, datain, dataout, element_size, ysize, group_size );
-      return;
-    }
-    
-    newwidth = width / 2;
-    newheight = height / 2;
-    s = 0;
-    t = 0;
-    
-    int temp = 0;
-    // piece of cake
-    for( i = 0; i < newheight; i++ ) {
-      for( j = 0; j < newwidth; j++ ) {
-        for( k = 0; k < components; k++ ) {
-          datain.position( t );
-          temp = ( 0x000000FF & datain.get() );
-          datain.position( t + group_size );
-          temp += ( 0x000000FF & datain.get() );
-          datain.position( t + ysize );
-          temp += ( 0x000000FF & datain.get() );
-          datain.position( t + ysize + group_size );
-          temp += ( 0x000000FF & datain.get() ) + 2;
-          dataout.put( (byte)(temp / 4) );
-          t += element_size;
-        }
-        t += group_size;
-      }
-      t += ysize;
-    }
-  }
-  
-  public static void halve1Dimage_ubyte( int components, int width, int height,
-                      ByteBuffer datain, ByteBuffer dataout, 
-                      int element_size, int ysize, int group_size ) {
-    int halfWidth = width / 2;
-    int halfHeight = height / 2;
-    int src = 0;
-    int dest = 0;
-    int jj;
-    int temp = 0;
-    
-    assert( width == 1 || height == 1 ); // Must be 1D
-    assert( width != height ); // can't be square
-    
-    if( height == 1 ) { // 1 row
-      assert( width != 1 ); // widthxheight can't be 1x1
-      halfHeight = 1;
-      
-      for( jj = 0; jj < halfWidth; jj++ ) {
-        int kk;
-        for( kk = 0; kk < components; kk++ ) {
-          datain.position( src );
-          temp = ( 0x000000FF & datain.get() );
-          datain.position( src + group_size );
-          temp += ( 0x000000FF & datain.get() );
-          temp /= 2;
-          dataout.put( (byte)temp );
-          /*
-          dataout.setByte( (byte)(((0x000000FF & datain.setIndexInBytes(src).getByte()) + 
-                    (0x000000FF & datain.setIndexInBytes( src + group_size ).getByte())) / 2 ) );
-           */
-          src += element_size;
-          //dataout.plusPlus();
-          dest++;
-        }
-        src += group_size; // skip to next 2
-      }
-      int padBytes = ysize - ( width * group_size );
-      src += padBytes; // for assertion only
-    } else if( width == 1 ) { // 1 column
-      int padBytes = ysize - ( width * group_size );
-      assert( height != 1 );
-      halfWidth = 1;
-      // one vertical column with possible pad bytes per row
-      // average two at a time
-      for( jj = 0; jj < halfHeight; jj++ ) {
-        int kk;
-        for( kk = 0; kk < components; kk++ ) {
-          datain.position( src );
-          temp = ( 0x000000FF & datain.get() );
-          datain.position( src + ysize );
-          temp += ( 0x000000FF & datain.get() );
-          temp /= 2;
-          dataout.put( (byte)temp );
-          /*
-          dataout.setByte( (byte)(((0x000000FF & datain.setIndexInBytes(src).getByte()) + 
-                    (0x000000FF & datain.setIndexInBytes(src + ysize).getByte()) ) / 2 ) );
-           */
-          src += element_size;
-          //dataout.plusPlus();
-          dest++;
-        }
-        src += padBytes; // add pad bytes, if any, to get to end of row
-        src += ysize;
-      }
-    }
-    assert( src == ysize * height );
-    assert( dest == components * element_size * halfWidth * halfHeight );
-  }
-  
-  public static void halveImage_byte( int components, int width, int height,
-                    ByteBuffer datain, ByteBuffer dataout, int element_size,
-                    int ysize, int group_size ) {
-    int i, j, k;
-    int newwidth, newheight;
-    int s = 0;
-    int t = 0;
-    byte temp = (byte)0;
-    
-    // handle case where there is only 1 column
-    if( width == 1 || height == 1 ) {
-      assert( !( width == 1 && height == 1 ) );
-      halve1Dimage_byte( components, width, height, datain, dataout, element_size,
-                                                            ysize, group_size );
-      return;
-    }
-    
-    newwidth = width / 2;
-    newheight = height / 2;
-    
-    for( i = 0; i < newheight; i++ ) {
-      for( j = 0; j < newwidth; j++ ) {
-        for( k = 0; k < components; k++ ) {
-          datain.position( t );
-          temp = datain.get();
-          datain.position( t + group_size );
-          temp += datain.get();
-          datain.position( t + ysize );
-          temp += datain.get();
-          datain.position( t + ysize + group_size );
-          temp += datain.get();
-          temp += 2;
-          temp /= 4;
-          dataout.put( temp );
-          t += element_size;
-        }
-        t += group_size;
-      }
-      t += ysize;
-    }
-  }
-  
-  public static void halve1Dimage_byte( int components, int width, int height,
-                      ByteBuffer datain, ByteBuffer dataout,
-                      int element_size, int ysize, int group_size ) {
-    int halfWidth = width / 2;
-    int halfHeight = width / 2;
-    int src = 0;
-    int dest = 0;
-    int jj;
-    byte temp = (byte)0;
-    
-    assert( width == 1 || height == 1 ); // must be 1D
-    assert( width != height ); // can't be square
-    
-    if( height == 1 ) { // 1 row
-      assert( width != 1 ); // widthxheight can't be 1
-      halfHeight = 1;
-      
-      for( jj = 0; jj < halfWidth; jj++ ) {
-        int kk;
-        for( kk = 0; kk < components; kk++ ) {
-          datain.position( src );
-          temp = datain.get();
-          datain.position( src + group_size );
-          temp += datain.get();
-          temp /= 2;
-          dataout.put( temp );
-          src += element_size;
-          dest++;
-        }
-        src += group_size; // skip to next 2
-      }
-      int padBytes = ysize - ( width * group_size );
-      src += padBytes; // for assert only
-    } else if( width == 1 ) { // 1 column
-      int padBytes = ysize - ( width * group_size );
-      assert( height != 1 ); // widthxheight can't be 1
-      halfWidth = 1;
-      // one vertical column with possible pad bytes per row
-      // average two at a time
-      
-      for( jj = 0; jj < halfHeight; jj++ ) {
-        int kk;
-        for( kk = 0; kk < components; kk++ ) {
-          datain.position( src );
-          temp = datain.get();
-          datain.position( src + ysize );
-          temp += datain.get();
-          temp /= 2;
-          src += element_size;
-          dest++;
-        }
-        src += padBytes; // add pad bytes, if any, to get to end of row
-        src += ysize;
-      }
-      assert( src == ysize * height );
-    }
-    assert( dest == components * element_size * halfWidth * halfHeight );
-  }
-  
-  public static void halveImage_ushort( int components, int width, int height,
-                          ByteBuffer datain, ShortBuffer dataout, int element_size,
-                          int ysize, int group_size, boolean myswap_bytes ) {
-    int i, j, k, l;
-    int newwidth, newheight;
-    int s = 0;
-    int t = 0;
-    int temp = 0;
-    // handle case where there is only 1 column/row
-    if( width == 1 || height == 1 ) {
-      assert( !( width == 1 && height == 1 ) ); // can't be 1x1
-      halve1Dimage_ushort( components, width, height, datain, dataout, element_size,
-                                ysize, group_size, myswap_bytes );
-      return;
-    }
-    
-    newwidth = width / 2;
-    newheight = height / 2;
-    
-    // Piece of cake
-    if( !myswap_bytes ) {
-      for( i = 0; i < newheight; i++ ) {
-        for( j = 0; j < newwidth; j++ ) {
-          for( k = 0; k < components; k++ ) {
-            datain.position( t );
-            temp = ( 0x0000FFFF & datain.getShort() );
-            datain.position( t + group_size );
-            temp += ( 0x0000FFFF & datain.getShort() );
-            datain.position( t + ysize );
-            temp += ( 0x0000FFFF & datain.getShort() );
-            datain.position( t + ysize + group_size );
-            temp += ( 0x0000FFFF & datain.getShort() );
-            dataout.put( (short)( ( temp + 2 ) / 4 ) );
-            t += element_size;
-          }
-          t += group_size;
-        }
-        t += ysize;
-      }
-    } else {
-      for( i = 0; i < newheight; i++ ) {
-        for( j = 0; j < newwidth; j++ ) {
-          for( k = 0; k < components; k++ ) {
-            datain.position( t );
-            temp = ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
-            datain.position( t + group_size );
-            temp += ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
-            datain.position( t + ysize );
-            temp += ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
-            datain.position( t + ysize + group_size );
-            temp += ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
-            dataout.put( (short)( ( temp + 2 ) / 4 ) );
-            t += element_size;
-          }
-          t += group_size;
-        }
-        t += ysize;
-      }
-    }
-  }
-  
-  public static void halve1Dimage_ushort( int components, int width, int height,
-                      ByteBuffer datain, ShortBuffer dataout, int element_size,
-                      int ysize, int group_size, boolean myswap_bytes ) {
-    int halfWidth = width / 2;
-    int halfHeight = height / 2;
-    int src = 0;
-    int dest = 0;
-    int jj;
-    
-    assert( width == 1 || height == 1 ); // must be 1D
-    assert( width != height ); // can't be square
-    
-    if( height == 1 ) { // 1 row
-      assert( width != 1 ); // widthxheight can't be 1
-      halfHeight = 1;
-      
-      for( jj = 0; jj < halfWidth; jj++ ) {
-        int kk;
-        for( kk = 0; kk < halfHeight; kk++ ) {
-          int[] ushort = new int[BOX2];
-          if( myswap_bytes ) {
-            datain.position( src );
-            ushort[0] = ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
-            datain.position( src + group_size );
-            ushort[1] = (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
-          } else {
-            datain.position( src );
-            ushort[0] = (0x0000FFFF & datain.getShort() );
-            datain.position( src + group_size );
-            ushort[1] = (0x0000FFFF & datain.getShort() );
-          }
-          dataout.put( (short)( (ushort[0] + ushort[1]) / 2 ) );
-          src += element_size;
-          dest += 2;
-        }
-        src += group_size; // skip to next 2
-      }
-      int padBytes = ysize - ( width * group_size );
-      src += padBytes; // for assertion only
-    } else if( width == 1 ) { // 1 column
-      int padBytes = ysize - ( width * group_size );
-      assert( height != 1 ); // widthxheight can't be 1
-      halfWidth = 1;
-      // one vertical column with possible pad bytes per row
-      // average two at a time
-      
-      for( jj = 0; jj < halfHeight; jj++ ) {
-        int kk;
-        for( kk = 0; kk < components; kk++ ) {
-          int[] ushort = new int[BOX2];
-          if( myswap_bytes ) {
-            datain.position( src );
-            ushort[0] = ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
-            datain.position( src + ysize );
-            ushort[0] = ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ) );
-          } else {
-            datain.position( src );
-            ushort[0] = ( 0x0000FFFF & datain.getShort() );
-            datain.position( src + ysize );
-            ushort[1] = ( 0x0000FFFF & datain.getShort() );
-          }
-          dataout.put( (short)((ushort[0] + ushort[1]) / 2) );
-          src += element_size;
-          dest += 2;
-        }
-        src += padBytes; // add pad bytes, if any, to get to end of row
-        src += ysize;
-      }
-      assert( src == ysize * height );
-    }
-    assert( dest == components * element_size * halfWidth * halfHeight );
-  }
-  
-  public static void halveImage_short( int components, int width, int height,
-                        ByteBuffer datain, ShortBuffer dataout, int element_size,
-                        int ysize, int group_size, boolean myswap_bytes ) {
-    int i, j, k, l;
-    int newwidth, newheight;
-    int s = 0;
-    int t = 0;
-    short temp = (short)0;
-    // handle case where there is only 1 column/row
-    if( width == 1 || height == 1 ) {
-      assert( !( width == 1 && height == 1 ) ); // can't be 1x1
-      halve1Dimage_short( components, width, height, datain, dataout, element_size,
-                            ysize, group_size, myswap_bytes );
-      return;
-    }
-    
-    newwidth = width / 2;
-    newheight = height / 2;
-    
-    // Piece of cake
-    if( !myswap_bytes ) {
-      for( i = 0; i < newheight; i++ ) {
-        for( j = 0; j < newwidth; j++ ) {
-          for( k = 0; k < components; k++ ) {
-            datain.position( t );
-            temp = datain.getShort();
-            datain.position( t + group_size );
-            temp += datain.getShort();
-            datain.position( t + ysize );
-            temp += datain.getShort();
-            datain.position( t + ysize + group_size );
-            temp += datain.getShort();
-            temp += 2;
-            temp /= 4;
-            dataout.put( (short)temp );
-            t += element_size;
-          }
-          t += group_size;
-        }
-        t += ysize;
-      }
-    } else {
-      for( i = 0; i < newheight; i++ ) {
-        for( j = 0; j < newwidth; j++ ) {
-          for( k = 0; k < components; k++ ) {
-            short b;
-            int buf;
-            datain.position( t );
-            temp = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-            datain.position( t + group_size );
-            temp += Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-            datain.position( t + ysize );
-            temp += Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-            datain.position( t + ysize + group_size );
-            temp += Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-            temp += 2;
-            temp /= 4;
-            dataout.put( temp );
-            t += element_size;
-          }
-          t += group_size;
-        }
-        t += ysize;
-      }
-    }
-  }
-  
-  public static void halve1Dimage_short( int components, int width, int height,
-              ByteBuffer datain, ShortBuffer dataout, int element_size, int ysize,
-              int group_size, boolean myswap_bytes ) {
-    int halfWidth = width / 2;
-    int halfHeight = height / 2;
-    int src = 0;
-    int dest = 0;
-    int jj;
-    
-    assert( width == 1 || height == 1 ); // must be 1D
-    assert( width != height ); // can't be square
-    
-    if( height == 1 ) { // 1 row
-      assert( width != 1 ); // can't be 1x1
-      halfHeight = 1;
-      
-      for( jj = 0; jj < halfWidth; jj++ ) {
-        int kk;
-        for( kk = 0; kk < components; kk++ ) {
-          short[] sshort = new short[BOX2];
-          if( myswap_bytes ) {
-            datain.position( src );
-            sshort[0] = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-            datain.position( src + group_size );
-            sshort[1] = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-          } else {
-            datain.position( src );
-            sshort[0] = datain.getShort();
-            datain.position( src + group_size );
-            sshort[1] = datain.getShort();
-          }
-          dataout.put( (short)(( sshort[0] + sshort[1] ) / 2) );
-          src += element_size;
-          dest += 2;
-        }
-        src += group_size; // skip to next 2
-      }
-      int padBytes = ysize - ( width * group_size );
-      src += padBytes; // for assertion only
-    } else if( width == 1 ) {
-      int padBytes = ysize - ( width * group_size );
-      assert( height != 1 );
-      halfWidth = 1;
-      // one vertical column with possible pad bytes per row
-      // average two at a time
-      
-      for( jj = 0; jj < halfHeight; jj++ ) {
-        int kk;
-        for( kk = 0; kk < components; kk++ ) {
-          short[] sshort = new short[BOX2];
-          if( myswap_bytes ) {
-            datain.position( src );
-            sshort[0] = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-            datain.position( src + ysize );
-            sshort[1] = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-          } else {
-            datain.position( src );
-            sshort[0] = datain.getShort();
-            datain.position( src + ysize );
-            sshort[1] = datain.getShort();
-          }
-          dataout.put( (short)(( sshort[0] + sshort[1] ) / 2) );
-          src += element_size;
-          dest += 2;
-        }
-        src += padBytes; // add pad bytes, if any, to get to end of row
-        src += ysize;
-      }
-      assert( src == ysize * height );
-    }
-    assert( dest == ( components * element_size * halfWidth * halfHeight ) );
-  }
-  
-  public static void halveImage_uint( int components, int width, int height,
-                          ByteBuffer datain, IntBuffer dataout, int element_size,
-                          int ysize, int group_size, boolean myswap_bytes ) {
-    int i, j, k, l;
-    int newwidth, newheight;
-    int s = 0;
-    int t = 0;
-    double temp = 0;
-    
-    // handle case where there is only 1 column/row
-    if( width == 1 || height == 1 ) {
-      assert( !( width == 1 && height == 1 ) ); // can't be 1x1
-      halve1Dimage_uint( components, width, height, datain, dataout, element_size,
-                                ysize, group_size, myswap_bytes );
-      return;
-    }
-    
-    newwidth = width / 2;
-    newheight = height / 2;
-    
-    // Piece of cake
-    if( !myswap_bytes ) {
-      for( i = 0; i < newheight; i++ ) {
-        for( j = 0; j < newwidth; j++ ) {
-          for( k = 0; k < components; k++ ) {
-            datain.position( t );
-            temp = (0x000000007FFFFFFFL & datain.getInt() );
-            datain.position( t + group_size );
-            temp += (0x000000007FFFFFFFL & datain.getInt() );
-            datain.position( t + ysize );
-            temp += (0x000000007FFFFFFFL & datain.getInt() );
-            datain.position( t + ysize + group_size );
-            temp += (0x000000007FFFFFFFL & datain.getInt() );
-            dataout.put( (int)( ( temp / 4 ) + 0.5 ) );
-            t += element_size;
-          }
-          t += group_size;
-        }
-        t += ysize;
-      }
-    } else {
-      for( i = 0; i < newheight; i++ ) {
-        for( j = 0; j < newwidth; j++ ) {
-          for( k = 0; k < components; k++ ) {
-            // need to cast to double to hold large unsigned ints
-            double buf;
-            datain.position( t );
-            buf = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-            datain.position( t + group_size );
-            buf += ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-            datain.position( t + ysize );
-            buf += ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-            datain.position( t + ysize + group_size );
-            buf += ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-            temp /= 4;
-            temp += 0.5;
-            dataout.put( (int)temp );
-            t += element_size;
-          }
-          t += group_size;
-        }
-        t += ysize;
-      }
-    }
-  }
-  
-  public static void halve1Dimage_uint( int components, int width, int height,
-                      ByteBuffer datain, IntBuffer dataout, int element_size, int ysize,
-                      int group_size, boolean myswap_bytes ) {
-    int halfWidth = width / 2;
-    int halfHeight = height / 2;
-    int src = 0;
-    int dest = 0;
-    int jj;
-    
-    assert( width == 1 || height == 1 ); // must be 1D
-    assert( width != height ); // can't be square
-    
-    if( height == 1 ) { // 1 row
-      assert( width != 1 ); // widthxheight can't be 1
-      halfHeight = 1;
-      
-      for( jj = 0; jj < halfWidth; jj++ ) {
-        int kk;
-        for( kk = 0; kk < halfHeight; kk++ ) {
-          long[] uint = new long[BOX2];
-          if( myswap_bytes ) {
-            datain.position( src );
-            uint[0] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-            datain.position( src + group_size );
-            uint[1] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-          } else {
-            datain.position( src );
-            uint[0] = ( 0x00000000FFFFFFFF & datain.getInt() );
-            datain.position( src + group_size );
-            uint[1] = (0x00000000FFFFFFFF & datain.getInt() );
-          }
-          dataout.put( (int)( ( uint[0] + uint[1] ) / 2.0 ) );
-          src += element_size;
-          dest += 4;
-        }
-        src += group_size; // skip to next 2
-      }
-      int padBytes = ysize - ( width * group_size );
-      src += padBytes; // for assertion only
-    } else if( width == 1 ) { // 1 column
-      int padBytes = ysize - ( width * group_size );
-      assert( height != 1 ); // widthxheight can't be 1
-      halfWidth = 1;
-      // one vertical column with possible pad bytes per row
-      // average two at a time
-      
-      for( jj = 0; jj < halfHeight; jj++ ) {
-        int kk;
-        for( kk = 0; kk < components; kk++ ) {
-          long[] uint = new long[BOX2];
-          if( myswap_bytes ) {
-            datain.position( src );
-            uint[0] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-            datain.position( src + group_size );
-            uint[0] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-          } else {
-            datain.position( src );
-            uint[0] = ( 0x00000000FFFFFFFF & datain.getInt() );
-            datain.position( src + ysize );
-            uint[1] = ( 0x00000000FFFFFFFF & datain.getInt() );
-          }
-          dataout.put( (int)( ( uint[0] + uint[1] ) / 2.0 ) );
-          src += element_size;
-          dest += 4;
-        }
-        src += padBytes; // add pad bytes, if any, to get to end of row
-        src += ysize;
-      }
-      assert( src == ysize * height );
-    }
-    assert( dest == components * element_size * halfWidth * halfHeight );
-  }
-  
-  public static void halveImage_int( int components, int width, int height,
-                        ByteBuffer datain, IntBuffer dataout, int element_size,
-                        int ysize, int group_size, boolean myswap_bytes ) {
-    int i, j, k, l;
-    int newwidth, newheight;
-    int s = 0;
-    int t = 0;
-    int temp = 0;
-    
-    // handle case where there is only 1 column/row
-    if( width == 1 || height == 1 ) {
-      assert( !( width == 1 && height == 1 ) ); // can't be 1x1
-      halve1Dimage_int( components, width, height, datain, dataout, element_size,
-                            ysize, group_size, myswap_bytes );
-      return;
-    }
-    
-    newwidth = width / 2;
-    newheight = height / 2;
-    
-    // Piece of cake
-    if( !myswap_bytes ) {
-      for( i = 0; i < newheight; i++ ) {
-        for( j = 0; j < newwidth; j++ ) {
-          for( k = 0; k < components; k++ ) {
-            datain.position( t );
-            temp = datain.getInt();
-            datain.position( t + group_size );
-            temp += datain.getInt();
-            datain.position( t + ysize );
-            temp += datain.getInt();
-            datain.position( t + ysize + group_size );
-            temp += datain.getInt();
-            temp = (int)( ( temp / 4.0f ) + 0.5f );
-            dataout.put( temp );
-            t += element_size;
-          }
-          t += group_size;
-        }
-        t += ysize;
-      }
-    } else {
-      for( i = 0; i < newheight; i++ ) {
-        for( j = 0; j < newwidth; j++ ) {
-          for( k = 0; k < components; k++ ) {
-            long b;
-            float buf;
-            datain.position( t );
-            b = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-            buf = b;
-            datain.position( t + group_size );
-            b = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-            buf += b;
-            datain.position( t + ysize );
-            b = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-            buf += b;
-            datain.position( t + ysize + group_size );
-            b = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-            buf += b;
-            dataout.put( (int)( ( buf / 4.0f ) + 0.5f ) );
-            t += element_size;
-          }
-          t += group_size;
-        }
-        t += ysize;
-      }
-    }
-  }
-  
-  public static void halve1Dimage_int( int components, int width, int height,
-              ByteBuffer datain, IntBuffer dataout, int element_size, int ysize,
-              int group_size, boolean myswap_bytes ) {
-    int halfWidth = width / 2;
-    int halfHeight = height / 2;
-    int src = 0;
-    int dest = 0;
-    int jj;
-    
-    assert( width == 1 || height == 1 ); // must be 1D
-    assert( width != height ); // can't be square
-    
-    if( height == 1 ) { // 1 row
-      assert( width != 1 ); // can't be 1x1
-      halfHeight = 1;
-      
-      for( jj = 0; jj < halfWidth; jj++ ) {
-        int kk;
-        for( kk = 0; kk < components; kk++ ) {
-          long[] uint = new long[BOX2];
-          if( myswap_bytes ) {
-            datain.position( src );
-            uint[0] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-            datain.position( src + group_size );
-            uint[1] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-          } else {
-            datain.position( src );
-            uint[0] = ( 0x00000000FFFFFFFF & datain.getInt() );
-            datain.position( src + group_size );
-            uint[1] = ( 0x00000000FFFFFFFF & datain.getInt() );
-          }
-          dataout.put( (int)( ( (float)uint[0] + (float)uint[1] ) / 2.0f) );
-          src += element_size;
-          dest += 4;
-        }
-        src += group_size; // skip to next 2
-      }
-      int padBytes = ysize - ( width * group_size );
-      src += padBytes; // for assertion only
-    } else if( width == 1 ) {
-      int padBytes = ysize - ( width * group_size );
-      assert( height != 1 );
-      halfWidth = 1;
-      // one vertical column with possible pad bytes per row
-      // average two at a time
-      
-      for( jj = 0; jj < halfHeight; jj++ ) {
-        int kk;
-        for( kk = 0; kk < components; kk++ ) {
-          long[] uint = new long[BOX2];
-          if( myswap_bytes ) {
-            datain.position( src );
-            uint[0] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-            datain.position( src + ysize );
-            uint[1] = ( 0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt() ) );
-          } else {
-            datain.position( src );
-            uint[0] = ( 0x00000000FFFFFFFF & datain.getInt() );
-            datain.position( src + ysize );
-            uint[1] = ( 0x00000000FFFFFFFF & datain.getInt() );
-          }
-          dataout.put( (int)(( (float)uint[0] + (float)uint[1] ) / 2.0f) );
-          src += element_size;
-          dest += 4;
-        }
-        src += padBytes; // add pad bytes, if any, to get to end of row
-        src += ysize;
-      }
-      assert( src == ysize * height );
-    }
-    assert( dest == ( components * element_size * halfWidth * halfHeight ) );
-  }
-  
-  public static void halveImage_float( int components, int width, int height,
-                    ByteBuffer datain, FloatBuffer dataout, int element_size,
-                    int ysize, int group_size, boolean myswap_bytes ) {
-    int i, j, k, l;
-    int newwidth, newheight;
-    int s = 0;
-    int t = 0;
-    float temp = 0.0f;
-    // handle case where there is only 1 column/row
-    if( width == 1 || height == 1 ) {
-      assert( !( width == 1 && height == 1 ) ); // can't be 1x1
-      halve1Dimage_float( components, width, height, datain, dataout, element_size,
-                                              ysize, group_size, myswap_bytes );
-      return;
-    }
-    
-    newwidth = width / 2;
-    newheight = height / 2;
-    
-    // Piece of cake
-    if( !myswap_bytes ) {
-      for( i = 0; i < newheight; i++ ) {
-        for( j = 0; j < newwidth; j++ ) {
-          for( k = 0; k < components; k++ ) {
-            datain.position( t );
-            temp = datain.getFloat();
-            datain.position( t + group_size );
-            temp += datain.getFloat();
-            datain.position( t + ysize );
-            temp += datain.getFloat();
-            datain.position( t + ysize + group_size );
-            temp /= 4.0f;
-            dataout.put( temp );
-            t += element_size;
-          }
-          t += group_size;
-        }
-        t += ysize;
-      }
-    } else {
-      for( i = 0; i < newheight; i++ ) {
-        for( j = 0; j < newwidth; j++ ) {
-          for( k = 0; k < components; k++ ) {
-            float buf;
-            datain.position( t );
-            buf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-            datain.position( t + group_size );
-            buf += Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-            datain.position( t + ysize );
-            buf += Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-            datain.position( t + ysize + group_size );
-            buf += Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-            dataout.put( buf / 4.0f );
-            t += element_size;
-          }
-          t += group_size;
-        }
-        t += ysize;
-      }
-    }
-  }
-  
-  public static void halve1Dimage_float( int components, int width, int height,
-              ByteBuffer datain, FloatBuffer dataout, int element_size, int ysize,
-              int group_size, boolean myswap_bytes ) {
-    int halfWidth = width / 2;
-    int halfHeight = height / 2;
-    int src = 0;
-    int dest = 0;
-    int jj;
-    
-    assert( width == 1 || height == 1 ); // must be 1D
-    assert( width != height ); // can't be square
-    
-    if( height == 1 ) { // 1 row
-      assert( width != 1 ); // can't be 1x1
-      halfHeight = 1;
-      
-      for( jj = 0; jj < halfWidth; jj++ ) {
-        int kk;
-        for( kk = 0; kk < components; kk++ ) {
-          float[] sfloat = new float[BOX2];
-          if( myswap_bytes ) {
-            datain.position( src );
-            sfloat[0] = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-            datain.position( src + group_size );
-            sfloat[1] = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-          } else {
-            datain.position( src );
-            sfloat[0] = datain.getFloat();
-            datain.position( src + group_size );
-            sfloat[1] = datain.getFloat();
-          }
-          dataout.put( (sfloat[0] + sfloat[1]) / 2.0f );
-          src += element_size;
-          dest += 4;
-        }
-        src += group_size; // skip to next 2
-      }
-      int padBytes = ysize - ( width * group_size );
-      src += padBytes; // for assertion only
-    } else if( width == 1 ) {
-      int padBytes = ysize - ( width * group_size );
-      assert( height != 1 );
-      halfWidth = 1;
-      // one vertical column with possible pad bytes per row
-      // average two at a time
-      
-      for( jj = 0; jj < halfHeight; jj++ ) {
-        int kk;
-        for( kk = 0; kk < components; kk++ ) {
-          float[] sfloat = new float[BOX2];
-          if( myswap_bytes ) {
-            datain.position( src );
-            sfloat[0] = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-            datain.position( src + ysize );
-            sfloat[1] = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-          } else {
-            datain.position( src );
-            sfloat[0] = datain.getFloat();
-            datain.position( src + ysize );
-            sfloat[1] = datain.getFloat();
-          }
-          dataout.put( ( sfloat[0] + sfloat[1] ) / 2.0f );
-          src += element_size;
-          dest += 4;
-        }
-        src += padBytes; // add pad bytes, if any, to get to end of row
-        src += ysize;
-      }
-      assert( src == ysize * height );
-    }
-    assert( dest == ( components * element_size * halfWidth * halfHeight ) );
-  }
-  
-  public static void halveImagePackedPixel( int components, Extract extract, int width, 
-          int height, ByteBuffer datain, ByteBuffer dataout, 
-          int pixelSizeInBytes, int rowSizeInBytes, boolean isSwap ) {
-    if( width == 1 || height == 1 ) {
-      assert( !( width == 1 && height == 1 ) );
-      halve1DimagePackedPixel( components, extract, width, height, datain, dataout,
-                          pixelSizeInBytes, rowSizeInBytes, isSwap );
-      return;
-    }
-    int ii, jj;
-    
-    int halfWidth = width / 2;
-    int halfHeight = height / 2;
-    int src = 0;
-    int padBytes = rowSizeInBytes - ( width * pixelSizeInBytes );
-    int outIndex = 0;
-    
-    for( ii = 0; ii < halfHeight; ii++ ) {
-      for( jj = 0; jj < halfWidth; jj++ ) {
-        float totals[] = new float[4];
-        float extractTotals[][] = new float[BOX4][4];
-        int cc;
-        
-        datain.position( src );
-        extract.extract( isSwap, datain, extractTotals[0] );
-        datain.position( src + pixelSizeInBytes );
-        extract.extract( isSwap, datain, extractTotals[1] );
-        datain.position( src + rowSizeInBytes );
-        extract.extract( isSwap, datain, extractTotals[2] );
-        datain.position( src + rowSizeInBytes + pixelSizeInBytes );
-        extract.extract( isSwap, datain, extractTotals[3] );
-        for( cc = 0; cc < components; cc++ ) {
-          int kk = 0;
-          // grab 4 pixels to average
-          totals[cc] = 0.0f;
-          for( kk = 0; kk < BOX4; kk++ ) {
-            totals[cc] += extractTotals[kk][cc];
-          }
-          totals[cc] /= BOX4;
-        }
-        extract.shove( totals, outIndex, dataout );
-        outIndex++;
-        src += pixelSizeInBytes + pixelSizeInBytes;
-      }
-      // skip past pad bytes, if any, to get to next row
-      src += padBytes;
-      src += rowSizeInBytes;
-    }
-    assert( src == rowSizeInBytes * height );
-    assert( outIndex == halfWidth * halfHeight );
-  }
-  
-  public static void halve1DimagePackedPixel( int components, Extract extract, int width,
-              int height, ByteBuffer datain, ByteBuffer dataout,
-              int pixelSizeInBytes, int rowSizeInBytes, boolean isSwap ) {
-    int halfWidth = width / 2;
-    int halfHeight = height / 2;
-    int src = 0;
-    int jj;
-    
-    assert( width == 1 || height == 1 );
-    assert( width != height );
-    
-    if( height == 1 ) {
-      int outIndex = 0;
-      
-      assert( width != 1 );
-      halfHeight = 1;
-      
-      // one horizontal row with possible pad bytes
-      
-      for( jj = 0; jj < halfWidth; jj++ ) {
-        float[] totals = new float[4];
-        float[][] extractTotals = new float[BOX2][4];
-        int cc;
-        
-        datain.position( src );
-        extract.extract( isSwap, datain, extractTotals[0] );
-        datain.position( src + pixelSizeInBytes );
-        extract.extract( isSwap, datain, extractTotals[1] );
-        for( cc = 0; cc < components; cc++ ) {
-          int kk = 0;
-          // grab 4 pixels to average
-          totals[cc] = 0.0f;
-          for( kk = 0; kk < BOX2; kk++ ) {
-            totals[cc] += extractTotals[kk][cc];
-          }
-          totals[cc] /= BOX2;
-        }
-        extract.shove( totals, outIndex, dataout );
-        outIndex++;
-        // skip over to next group of 2
-        src += pixelSizeInBytes + pixelSizeInBytes;
-      }
-      int padBytes = rowSizeInBytes - ( width * pixelSizeInBytes );
-      src += padBytes;
-      
-      assert( src == rowSizeInBytes );
-      assert( outIndex == halfWidth * halfHeight );
-    } else if( width == 1 ) {
-      int outIndex = 0;
-      
-      assert( height != 1 );
-      halfWidth = 1;
-      // one vertical volumn with possible pad bytes per row
-      // average two at a time
-      
-      for( jj = 0; jj < halfHeight; jj++ ) {
-        float[] totals = new float[4];
-        float[][] extractTotals = new float[BOX2][4];
-        int cc;
-        // average two at a time, instead of four
-        datain.position( src );
-        extract.extract( isSwap, datain, extractTotals[0] );
-        datain.position( src + rowSizeInBytes );
-        extract.extract( isSwap, datain, extractTotals[1] );
-        for( cc = 0; cc < components; cc++ ) {
-          int kk = 0;
-          // grab 4 pixels to average
-          totals[cc] = 0.0f;
-          for( kk = 0; kk < BOX2; kk++ ) {
-            totals[cc] += extractTotals[kk][cc];
-          }
-          totals[cc] /= BOX2;
-        }
-        extract.shove( totals, outIndex, dataout );
-        outIndex++;
-        // skip over to next group of 2
-        src += rowSizeInBytes + rowSizeInBytes;
-      }
-      assert( src == rowSizeInBytes );
-      assert( outIndex == halfWidth * halfHeight );
-    }
-  }
-  
-  public static void halveImagePackedPixelSlice( int components, Extract extract,
-          int width, int height, int depth, ByteBuffer dataIn,
-          ByteBuffer dataOut, int pixelSizeInBytes, int rowSizeInBytes,
-          int imageSizeInBytes, boolean isSwap ) {
-    int ii, jj;
-    int halfWidth = width / 2;
-    int halfHeight = height / 2;
-    int halfDepth = depth / 2;
-    int src = 0;
-    int padBytes = rowSizeInBytes - ( width * pixelSizeInBytes );
-    int outIndex = 0;
-    
-    assert( (width == 1 || height == 1) && depth >= 2 );
-    
-    if( width == height ) {
-      assert( width == 1 && height == 1 );
-      assert( depth >= 2 );
-      
-      for( ii = 0; ii < halfDepth; ii++ ) {
-        float totals[] = new float[4];
-        float extractTotals[][] = new float[BOX2][4];
-        int cc;
-        
-        dataIn.position( src );
-        extract.extract( isSwap, dataIn, extractTotals[0] );
-        dataIn.position( src + imageSizeInBytes );
-        extract.extract( isSwap, dataIn, extractTotals[1] );
-        
-        for( cc = 0; cc < components; cc++ ) {
-          int kk;
-          
-          // average only 2 pixels since a column
-          totals[cc]= 0.0f;
-          for( kk = 0; kk < BOX2; kk++ ) {
-            totals[cc] += extractTotals[kk][cc];
-          }
-          totals[cc] /= BOX2;
-        } // for cc
-        
-        extract.shove( totals, outIndex, dataOut );
-        outIndex++;
-        // skip over to next group of 2
-        src += imageSizeInBytes + imageSizeInBytes;
-      } // for ii
-    } else if( height == 1 ) {
-      assert( width != 1 );
-      
-      for( ii = 0; ii < halfDepth; ii++ ) {
-        for( jj = 0; jj < halfWidth; jj++ ) {
-          float totals[] = new float[4];
-          float extractTotals[][] = new float[BOX4][4];
-          int cc;
-          
-          dataIn.position( src );
-          extract.extract( isSwap, dataIn, extractTotals[0] );
-          dataIn.position( src + pixelSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[1] );
-          dataIn.position( src + imageSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[2] );
-          dataIn.position( src + pixelSizeInBytes + imageSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[3] );
-          
-          for( cc = 0; cc < components; cc++ ) {
-            int kk;
-            
-            // grab 4 pixels to average
-            totals[cc] = 0.0f;
-            for( kk = 0; kk < BOX4; kk++ ) {
-              totals[cc]+= extractTotals[kk][cc];
-            }
-            totals[cc]/= (float)BOX4;
-          }
-          extract.shove( totals, outIndex, dataOut );
-          outIndex++;
-          // skip over to next horizontal square of 4
-          src += imageSizeInBytes + imageSizeInBytes;
-        }
-      }
-    } else if( width == 1 ) {
-      assert( height != 1 );
-      
-      for( ii = 0; ii < halfDepth; ii++ ) {
-        for( jj = 0; jj < halfWidth; jj++ ) {
-          float totals[] = new float[4];
-          float extractTotals[][] = new float[BOX4][4];
-          int cc;
-          
-          dataIn.position( src );
-          extract.extract( isSwap, dataIn, extractTotals[0] );
-          dataIn.position( src + rowSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[1] );
-          dataIn.position( src + imageSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[2] );
-          dataIn.position( src + rowSizeInBytes + imageSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[3] );
-          
-          for( cc = 0; cc < components; cc++ ) {
-            int kk;
-            
-            // grab 4 pixels to average
-            totals[cc] = 0.0f;
-            for( kk = 0; kk < BOX4; kk++ ) {
-              totals[cc]+= extractTotals[kk][cc];
-            }
-            totals[cc]/= (float)BOX4;
-          }
-          extract.shove( totals, outIndex, dataOut );
-          outIndex++;
-          // skip over to next horizontal square of 4
-          src += imageSizeInBytes + imageSizeInBytes;
-        }
-      }
-    }
-  }
-  
-  public static void halveImageSlice( int components, ExtractPrimitive extract, int width,
-          int height, int depth, ByteBuffer dataIn, ByteBuffer dataOut,
-          int elementSizeInBytes, int groupSizeInBytes, int rowSizeInBytes,
-          int imageSizeInBytes, boolean isSwap ) {
-    int ii, jj;
-    int halfWidth = width / 2;
-    int halfHeight = height / 2;
-    int halfDepth = depth / 2;
-    int src = 0;
-    int padBytes = rowSizeInBytes - ( width * groupSizeInBytes );
-    int outIndex = 0;
-    
-    assert( (width == 1 || height == 1) && depth >= 2 );
-    
-    if( width == height ) {
-      assert( width == 1 && height == 1 );
-      assert( depth >= 2 );
-      
-      for( ii = 0; ii < halfDepth; ii++ ) {
-        int cc;
-        for( cc = 0; cc < components; cc++ ) {
-          double[] totals = new double[4];
-          double[][] extractTotals = new double[BOX2][4];
-          int kk;
-          
-          dataIn.position( src );
-          extractTotals[0][cc] = extract.extract( isSwap, dataIn );
-          dataIn.position( src + imageSizeInBytes );
-          extractTotals[1][cc] = extract.extract( isSwap, dataIn );
-          
-          // average 2 pixels since only a column
-          totals[cc] = 0.0f;
-          // totals[red] = extractTotals[0][red] + extractTotals[1][red];
-          // totals[red] = red / 2;
-          for( kk = 0; kk < BOX2; kk++ ) {
-            totals[cc] += extractTotals[kk][cc];
-          }
-          totals[cc] /= (double)BOX2;
-          
-          extract.shove( totals[cc], outIndex, dataOut );
-          outIndex++;
-          src += elementSizeInBytes;
-        } // for cc
-        // skip over next group of 2
-        src += rowSizeInBytes;
-      } // for ii
-      
-      assert( src == rowSizeInBytes * height * depth );
-      assert( outIndex == halfDepth * components );
-    } else if( height == 1 ) {
-      assert( width != 1 );
-      
-      for( ii = 0; ii < halfDepth; ii++ ) {
-        for( jj = 0; jj < halfWidth; jj++ ) {
-          int cc;
-          for( cc = 0; cc < components; cc++ ) {
-            int kk;
-            double totals[] = new double[4];
-            double extractTotals[][] = new double[BOX4][4];
-            
-            dataIn.position( src );
-            extractTotals[0][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + groupSizeInBytes );
-            extractTotals[1][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + imageSizeInBytes );
-            extractTotals[2][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + imageSizeInBytes + groupSizeInBytes );
-            extractTotals[3][cc] = extract.extract( isSwap, dataIn );
-            
-            // grab 4 pixels to average
-            totals[cc] = 0.0f;
-            // totals[red] = extractTotals[0][red] + extractTotals[1][red] +
-            //               extractTotals[2][red] + extractTotals[3][red];
-            // totals[red] /= (double)BOX4;
-            for( kk = 0; kk < BOX4; kk++ ) {
-              totals[cc] += extractTotals[kk][cc];
-            }
-            totals[cc] /= (double)BOX4;
-            
-            extract.shove( totals[cc], outIndex, dataOut );
-            outIndex++;
-            src += elementSizeInBytes;
-          } // for cc
-          // skip over to next horizontal square of 4
-          src += elementSizeInBytes;
-        } // for jj
-        src += padBytes;
-        src += rowSizeInBytes;
-      } // for ii
-      assert( src == rowSizeInBytes * height * depth );
-      assert( outIndex == halfWidth * halfDepth * components );
-    } else if( width == 1 ) {
-      assert( height != 1 );
-      
-      for( ii = 0; ii < halfDepth; ii++ ) {
-        for( jj = 0; jj < halfHeight; jj++ ) {
-          int cc;
-          for( cc = 0; cc < components; cc++ ) {
-            int kk;
-            double totals[] = new double[4];
-            double extractTotals[][] = new double[BOX4][4];
-            
-            dataIn.position( src );
-            extractTotals[0][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + rowSizeInBytes );
-            extractTotals[1][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + imageSizeInBytes );
-            extractTotals[2][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + imageSizeInBytes + groupSizeInBytes );
-            extractTotals[3][cc] = extract.extract( isSwap, dataIn );
-            
-            
-            // grab 4 pixels to average
-            totals[cc] = 0.0f;
-            // totals[red] = extractTotals[0][red] + extractTotals[1][red] +
-            //               extractTotals[2][red] + extractTotals[3][red];
-            // totals[red] /= (double)BOX4;
-            for( kk = 0; kk < BOX4; kk++ ) {
-              totals[cc] += extractTotals[kk][cc];
-            }
-            totals[cc] /= (double)BOX4;
-            
-            extract.shove( totals[cc], outIndex, dataOut );
-            outIndex++;
-            src += elementSizeInBytes;
-          } // for cc
-          // skip over to next horizontal square of 4
-          src += padBytes;
-          src += rowSizeInBytes;
-        } // for jj
-        src += imageSizeInBytes;
-      } // for ii
-      assert( src == rowSizeInBytes * height * depth );
-      assert( outIndex == halfWidth * halfDepth * components );
-    }
-  }
-  
-  public static void halveImage3D( int components, ExtractPrimitive extract,
-          int width, int height, int depth, ByteBuffer dataIn, ByteBuffer dataOut,
-          int elementSizeInBytes, int groupSizeInBytes, int rowSizeInBytes,
-          int imageSizeInBytes, boolean isSwap ) {
-    assert( depth > 1 );
-    
-    // horizontal/vertical/onecolumn slice viewed from top
-    if( width == 1 || height == 1 ) {
-      assert( 1 <= depth );
-      
-      halveImageSlice( components, extract, width, height, depth, dataIn, dataOut,
-              elementSizeInBytes, groupSizeInBytes, rowSizeInBytes, imageSizeInBytes,
-              isSwap );
-      return;
-    }
-    
-    int ii, jj, dd;
-    
-    int halfWidth = width / 2;
-    int halfHeight = height / 2;
-    int halfDepth = depth / 2;
-    int src = 0;
-    int padBytes = rowSizeInBytes - ( width * groupSizeInBytes );
-    int outIndex = 0;
-    
-    for( dd = 0; dd < halfDepth; dd++ ) {
-      for( ii = 0; ii < halfHeight; ii++ ) {
-        for( jj = 0; jj < halfWidth; jj++ ) {
-          int cc;
-          for( cc = 0; cc < components; cc++ ) {
-            int kk;
-            double totals[] = new double[4];
-            double extractTotals[][] = new double[BOX8][4];
-            
-            dataIn.position( src );
-            extractTotals[0][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + groupSizeInBytes );
-            extractTotals[1][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + rowSizeInBytes );
-            extractTotals[2][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + rowSizeInBytes + groupSizeInBytes );
-            extractTotals[3][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + imageSizeInBytes );
-            extractTotals[4][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + groupSizeInBytes + imageSizeInBytes );
-            extractTotals[5][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + rowSizeInBytes + imageSizeInBytes );
-            extractTotals[6][cc] = extract.extract( isSwap, dataIn );
-            dataIn.position( src + rowSizeInBytes + imageSizeInBytes + groupSizeInBytes );
-            extractTotals[7][cc] = extract.extract( isSwap, dataIn );
-            
-            totals[cc] = 0.0f;
-            
-            for( kk = 0; kk < BOX8; kk++ ) {
-              totals[cc] += extractTotals[kk][cc];
-            }
-            totals[cc] /= (double)BOX8;
-            
-            extract.shove( totals[cc], outIndex, dataOut );
-            outIndex++;
-            
-            src += elementSizeInBytes;
-          } // for cc
-          // skip over to next square of 4
-          src += groupSizeInBytes;
-        } // for jj
-        // skip past pad bytes, if any, to get to next row
-        src += padBytes;
-        src += rowSizeInBytes;
-      } // for ii
-      src += imageSizeInBytes;
-    } // for dd
-    assert( src == rowSizeInBytes * height * depth );
-    assert( outIndex == halfWidth * halfHeight * halfDepth * components );
-  }
-  
-  public static void halveImagePackedPixel3D( int components, Extract extract,
-          int width, int height, int depth, ByteBuffer dataIn, 
-          ByteBuffer dataOut, int pixelSizeInBytes, int rowSizeInBytes,
-          int imageSizeInBytes, boolean isSwap ) {
-    if( depth == 1 ) {
-      assert( 1 <= width && 1 <= height );
-      
-      halveImagePackedPixel( components, extract, width, height, dataIn, dataOut,
-              pixelSizeInBytes, rowSizeInBytes, isSwap );
-      return;
-    } else if( width == 1 || height == 1 ) { // a horizontal or vertical slice viewed from top
-      assert( 1 <= depth );
-      
-      halveImagePackedPixelSlice( components, extract, width, height, depth, dataIn,
-              dataOut, pixelSizeInBytes, rowSizeInBytes, imageSizeInBytes, isSwap );
-      return;
-    }
-    int ii, jj, dd;
-    
-    int halfWidth = width / 2;
-    int halfHeight = height / 2;
-    int halfDepth = depth / 2;
-    int src = 0;
-    int padBytes = rowSizeInBytes - ( width * pixelSizeInBytes );
-    int outIndex = 0;
-    
-    for( dd = 0; dd < halfDepth; dd++ ) {
-      for( ii = 0; ii < halfHeight; ii++ ) {
-        for( jj = 0; jj < halfWidth; jj++ ) {
-          float totals[] = new float[4]; // 4 is max components
-          float extractTotals[][] = new float[BOX8][4];
-          int cc;
-          
-          dataIn.position( src );
-          extract.extract( isSwap, dataIn, extractTotals[0] );
-          dataIn.position( src + pixelSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[1] );
-          dataIn.position( src + rowSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[2] );
-          dataIn.position( src + rowSizeInBytes + pixelSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[3] );
-          dataIn.position( src + imageSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[4] );
-          dataIn.position( src + pixelSizeInBytes + imageSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[5] );
-          dataIn.position( src + rowSizeInBytes + imageSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[6] );
-          dataIn.position( src + rowSizeInBytes + pixelSizeInBytes + imageSizeInBytes );
-          extract.extract( isSwap, dataIn, extractTotals[7] );
-          
-          for( cc = 0; cc < components; cc++ ) {
-            int kk;
-            // grab 8 pixels to average
-            totals[cc] = 0.0f;
-            for( kk = 0; kk < BOX8; kk++ ) {
-              totals[cc] += extractTotals[kk][cc];
-            }
-            totals[cc] /= (float)BOX8;
-          }
-          extract.shove( totals, outIndex, dataOut );
-          outIndex++;
-          // skip over to next square of 4
-          src += pixelSizeInBytes + pixelSizeInBytes;
-        }
-        // skip past pad bytes, if any, to get to next row
-        src += padBytes;
-        src += rowSizeInBytes;
-      }
-      src += imageSizeInBytes;
-    }
-    assert( src == rowSizeInBytes * height * depth );
-    assert( outIndex == halfWidth * halfHeight * halfDepth );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Image.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Image.java
deleted file mode 100644
index 192544205..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Image.java
+++ /dev/null
@@ -1,1413 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import java.nio.*;
-
-/**
- *
- * @author  Administrator
- */
-public class Image {
-  
-  /** Creates a new instance of Image */
-  public Image() {
-  }
-  
-  public static short getShortFromByteArray( byte[] array, int index ) {
-    short s;
-    s = (short)(array[index] << 8 );
-    s |= (short)(0x00FF & array[index+1]);
-    return( s );
-  }
-  
-  public static int getIntFromByteArray( byte[] array, int index ) {
-    int i;
-    i = ( array[index] << 24 ) & 0xFF000000;
-    i |= ( array[index+1] << 16 ) & 0x00FF0000;
-    i |= ( array[index+2] << 8 ) & 0x0000FF00;
-    i |= ( array[index+3] ) & 0x000000FF;
-    return( i );
-  }
-  
-  public static float getFloatFromByteArray( byte[] array, int index ) {
-    int i = getIntFromByteArray( array, index );
-    return( Float.intBitsToFloat(i) );
-  }
-  
-  /*
-   *  Extract array from user's data applying all pixel store modes.
-   *  The internal format used is an array of unsigned shorts.
-   */
-  public static void fill_image( PixelStorageModes psm, int width, int height,
-                  int format, int type, boolean index_format, ByteBuffer userdata,
-                  ShortBuffer newimage ) {
-    int components;
-    int element_size;
-    int rowsize;
-    int padding;
-    int groups_per_line;
-    int group_size;
-    int elements_per_line;
-    int start;
-    int iter = 0;
-    int iter2;
-    int i, j, k;
-    boolean myswap_bytes;
-    
-    // Create a Extract interface object
-    Extract extract = null;
-    switch( type ) {
-      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-        extract = new Extract332();
-        break;
-      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-        extract = new Extract233rev();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-        extract = new Extract565();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-        extract = new Extract565rev();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-        extract = new Extract4444();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-        extract = new Extract4444rev();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-        extract = new Extract5551();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-        extract = new Extract1555rev();
-        break;
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-        extract = new Extract8888();
-        break;
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-        extract = new Extract8888rev();
-        break;
-      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-        extract = new Extract1010102();
-        break;
-      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-        extract = new Extract2101010rev();
-        break;
-    }
-    
-    myswap_bytes = psm.getUnpackSwapBytes();
-    components = Mipmap.elements_per_group( format, type );
-    if( psm.getUnpackRowLength() > 0 ) {
-      groups_per_line = psm.getUnpackRowLength();
-    } else {
-      groups_per_line = width;
-    }
-    
-    // All formats except GL_BITMAP fall out trivially
-    if( type == GL2.GL_BITMAP ) {
-      int bit_offset;
-      int current_bit;
-      
-      rowsize = ( groups_per_line * components + 7 ) / 8;
-      padding = ( rowsize % psm.getUnpackAlignment() );
-      if( padding != 0 ) {
-        rowsize += psm.getUnpackAlignment() - padding;
-      }
-      start = psm.getUnpackSkipRows() * rowsize + ( psm.getUnpackSkipPixels() * components / 8 );
-      elements_per_line = width * components;
-      iter2 = 0;
-      for( i = 0; i < height; i++ ) {
-        iter = start;
-        userdata.position( iter ); // ****************************************
-        bit_offset = (psm.getUnpackSkipPixels() * components) % 8;
-        for( j = 0; j < elements_per_line; j++ ) {
-          // retrieve bit
-          if( psm.getUnpackLsbFirst() ) {
-            userdata.position( iter );
-            current_bit = ( userdata.get() & 0x000000FF ) & ( 1 << bit_offset );//userdata[iter] & ( 1 << bit_offset );
-          } else {
-            current_bit = ( userdata.get() & 0x000000FF ) & ( 1 << ( 7 - bit_offset ) );
-          }
-          if( current_bit != 0 ) {
-            if( index_format ) {
-              newimage.position( iter2 );
-              newimage.put( (short)1 );
-            } else {
-              newimage.position( iter2 );
-              newimage.put( (short)65535 );
-            }
-          } else {
-            newimage.position( iter2 );
-            newimage.put( (short)0 );
-          }
-          bit_offset++;
-          if( bit_offset == 8 ) {
-            bit_offset = 0;
-            iter++;
-          }
-          iter2++;
-        }
-        start += rowsize;
-      }
-    } else {
-      element_size = Mipmap.bytes_per_element( type );
-      group_size = element_size * components;
-      if( element_size == 1 ) {
-        myswap_bytes = false;
-      }
-      
-      rowsize = groups_per_line * group_size;
-      padding = ( rowsize % psm.getUnpackAlignment() );
-      if( padding != 0 ) {
-        rowsize += psm.getUnpackAlignment() - padding;
-      }
-      start = psm.getUnpackSkipRows() * rowsize + psm.getUnpackSkipPixels() * group_size;
-      elements_per_line = width * components;
-      
-      iter2 = 0;
-      for( i = 0; i < height; i++ ) {
-        iter = start;
-        userdata.position( iter ); //***************************************
-        for( j = 0; j < elements_per_line; j++ ) {
-          Type_Widget widget = new Type_Widget();
-          float[] extractComponents = new float[4];
-          userdata.position( iter );
-          switch( type ) {
-            case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-              extract.extract( false, userdata /*userdata[iter]*/, extractComponents );
-              for( k = 0; k < 3; k++ ) {
-                newimage.put( iter2++, (short)(extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-              extract.extract( false, userdata /*userdata[iter]*/, extractComponents );
-              for( k = 0; k < 3; k++ ) {
-                newimage.put( iter2++, (short)(extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_BYTE ):
-              if( index_format ) {
-                newimage.put( iter2++, (short)( 0x000000FF & userdata.get() ) );//userdata[iter];
-              } else {
-                newimage.put( iter2++, (short)( 0x000000FF & userdata.get()/*userdata[iter]*/ * 257 ) );
-              }
-              break;
-            case( GL2.GL_BYTE ):
-              if( index_format ) {
-                newimage.put( iter2++, userdata.get() ); //userdata[iter];
-              } else {
-                newimage.put( iter2++, (short)(userdata.get()/*userdata[iter]*/ * 516 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-              extract.extract( myswap_bytes, userdata/*userdata[iter]*/, extractComponents );
-              for( k = 0; k < 3; k++ ) {
-                newimage.put( iter2++, (short)(extractComponents[k] * 65535) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-              extract.extract( myswap_bytes, userdata, extractComponents );
-              for( k = 0; k < 3; k++ ) {
-                newimage.put( iter2++, (short)(extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-              extract.extract( myswap_bytes, userdata, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newimage.put( iter2++, (short)(extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-              extract.extract( myswap_bytes, userdata, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newimage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-              extract.extract( myswap_bytes, userdata, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newimage.put( iter2++, (short)(extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-              extract.extract( myswap_bytes, userdata, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newimage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT ):
-            case( GL2.GL_SHORT ):
-              if( myswap_bytes ) {
-                widget.setUB1( userdata.get() );
-                widget.setUB0( userdata.get() );
-              } else {
-                widget.setUB0( userdata.get() );
-                widget.setUB1( userdata.get() );
-              }
-              if( type == GL2.GL_SHORT ) {
-                if( index_format ) {
-                  newimage.put( iter2++, widget.getS0() );
-                } else {
-                  newimage.put( iter2++, (short)(widget.getS0() * 2) );
-                }
-              } else {
-                newimage.put( iter2++, widget.getUS0() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-              extract.extract( myswap_bytes, userdata, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newimage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-              extract.extract( myswap_bytes, userdata, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newimage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-              extract.extract( myswap_bytes, userdata, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newimage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-              extract.extract( myswap_bytes, userdata, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newimage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_INT ):
-            case( GL2.GL_UNSIGNED_INT ):
-            case( GL2.GL_FLOAT ):
-              if( myswap_bytes ) {
-                widget.setUB3( userdata.get() );
-                widget.setUB2( userdata.get() );
-                widget.setUB1( userdata.get() );
-                widget.setUB0( userdata.get() );
-              } else {
-                widget.setUB0( userdata.get() );
-                widget.setUB1( userdata.get() );
-                widget.setUB2( userdata.get() );
-                widget.setUB3( userdata.get() );
-              }
-              if( type == GL2.GL_FLOAT ) {
-                if( index_format ) {
-                  newimage.put( iter2++, (short)widget.getF() );
-                } else {
-                  newimage.put( iter2++, (short)(widget.getF() * 65535 ) );
-                }
-              } else if( type == GL2.GL_UNSIGNED_INT ) {
-                if( index_format ) {
-                  newimage.put( iter2++, (short)( widget.getUI() ) );
-                } else {
-                  newimage.put( iter2++, (short)( widget.getUI() >> 16 ) );
-                }
-              } else {
-                if( index_format ) {
-                  newimage.put( iter2++, (short)( widget.getI() ) );
-                } else {
-                  newimage.put( iter2++, (short)( widget.getI() >> 15 ) );
-                }
-              }
-              break;
-          }
-          iter += element_size;
-        }  // for j
-        start += rowsize;
-        // want iter pointing at start, not within, row for assertion purposes
-        iter = start;
-      } // for i
-      
-      // iterators should be one byte past end
-      if( !Mipmap.isTypePackedPixel( type ) ) {
-        assert( iter2 == ( width * height * components ) );
-      } else {
-        assert( iter2 == ( width * height * Mipmap.elements_per_group( format, 0 ) ) );
-      }
-      assert( iter == ( rowsize * height + psm.getUnpackSkipRows() * rowsize + psm.getUnpackSkipPixels() * group_size ) );
-    }
-  }
-  
-  /*
-   *  Insert array into user's data applying all pixel store modes.
-   *  Theinternal format is an array of unsigned shorts.
-   *  empty_image() because it is the opposet of fill_image().
-   */
-  public static void empty_image( PixelStorageModes psm, int width, int height, 
-                                  int format, int type, boolean index_format, 
-                                  ShortBuffer oldimage, ByteBuffer userdata ) {
-    
-    int components;
-    int element_size;
-    int rowsize;
-    int padding;
-    int groups_per_line;
-    int group_size;
-    int elements_per_line;
-    int start;
-    int iter = 0;
-    int iter2;
-    int i, j, k;
-    boolean myswap_bytes;
-    
-    // Create a Extract interface object
-    Extract extract = null;
-    switch( type ) {
-      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-        extract = new Extract332();
-        break;
-      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-        extract = new Extract233rev();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-        extract = new Extract565();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-        extract = new Extract565rev();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-        extract = new Extract4444();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-        extract = new Extract4444rev();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-        extract = new Extract5551();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-        extract = new Extract1555rev();
-        break;
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-        extract = new Extract8888();
-        break;
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-        extract = new Extract8888rev();
-        break;
-      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-        extract = new Extract1010102();
-        break;
-      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-        extract = new Extract2101010rev();
-        break;
-    }
-    
-    myswap_bytes = psm.getPackSwapBytes();
-    components = Mipmap.elements_per_group( format, type );
-    if( psm.getPackRowLength() > 0 ) {
-      groups_per_line = psm.getPackRowLength();
-    } else {
-      groups_per_line = width;
-    }
-    
-    // all formats except GL_BITMAP fall out trivially
-    if( type == GL2.GL_BITMAP ) {
-      int bit_offset;
-      int current_bit;
-      
-      rowsize = ( groups_per_line * components + 7 ) / 8;
-      padding = ( rowsize % psm.getPackAlignment() );
-      if( padding != 0 ) {
-        rowsize += psm.getPackAlignment() - padding;
-      }
-      start = psm.getPackSkipRows() * rowsize + psm.getPackSkipPixels() * components / 8;
-      elements_per_line = width * components;
-      iter2 = 0;
-      for( i = 0; i < height; i++ ) {
-        iter = start;
-        bit_offset = ( psm.getPackSkipPixels() * components ) % 8;
-        for( j = 0; j < elements_per_line; j++ ) {
-          if( index_format ) {
-            current_bit = oldimage.get( iter2 ) & 1;
-          } else {
-            if( oldimage.get( iter2 ) < 0 ) { // must check for negative rather than 32767
-              current_bit = 1;
-            } else {
-              current_bit = 0;
-            }
-          }
-          
-          if( current_bit != 0 ) {
-            if( psm.getPackLsbFirst() ) {
-              userdata.put( iter, (byte)( ( userdata.get( iter ) | ( 1 << bit_offset ) ) ) );
-            } else {
-              userdata.put( iter, (byte)( ( userdata.get( iter ) | ( 7 - bit_offset ) ) ) );
-            }
-          } else {
-            if( psm.getPackLsbFirst() ) {
-              //userdata[iter] &= ~( 1 << bit_offset );
-              userdata.put( iter, (byte)( ( userdata.get( iter ) & ~( 1 << bit_offset ) ) ) );
-            } else {
-              //userdata[iter] &= ~( 1 << ( 7 - bit_offset ) );
-              userdata.put( iter, (byte)( ( userdata.get( iter ) & ~( 7 - bit_offset ) ) ) );
-            }
-          }
-          
-          bit_offset++;
-          if( bit_offset == 8 ) {
-            bit_offset = 0;
-            iter++;
-          }
-          iter2++;
-        }
-        start += rowsize;
-      }
-    } else {
-      float shoveComponents[] = new float[4];
-      
-      element_size = Mipmap.bytes_per_element( type );
-      group_size = element_size * components;
-      if( element_size == 1 ) {
-        myswap_bytes = false;
-      }
-      
-      rowsize = groups_per_line * group_size;
-      padding = ( rowsize % psm.getPackAlignment() );
-      if( padding != 0 ) {
-        rowsize += psm.getPackAlignment() - padding;
-      }
-      start = psm.getPackSkipRows() * rowsize + psm.getPackSkipPixels() * group_size;
-      elements_per_line = width * components;
-      
-      iter2 = 0;
-      for( i = 0; i < height; i++ ) {
-        iter = start;
-        for( j = 0; j < elements_per_line; j++ ) {
-          Type_Widget widget = new Type_Widget();
-          
-          switch( type ) {
-            case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-              for( k = 0; k < 3; k++ ) {
-                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, userdata );
-              break;
-            case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-              for( k = 0; k < 3; k++ ) {
-                shoveComponents[k] = oldimage.get(iter2++) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, userdata );
-              break;
-            case( GL2.GL_UNSIGNED_BYTE ):
-              if( index_format ) {
-                //userdata[iter] = (byte)oldimage[iter2++];
-                userdata.put( iter, (byte)oldimage.get(iter2++) );
-              } else {
-                //userdata[iter] = (byte)( oldimage[iter2++] >> 8 );
-                userdata.put( iter, (byte)( oldimage.get(iter2++) ) );
-              }
-              break;
-            case( GL2.GL_BYTE ):
-              if( index_format ) {
-                //userdata[iter] = (byte)oldimage[iter2++];
-                userdata.put( iter, (byte)oldimage.get(iter2++) );
-              } else {
-                //userdata[iter] = (byte)( oldimage[iter2++] >> 9 );
-                userdata.put( iter, (byte)( oldimage.get(iter2++) ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-              for( k = 0; k < 3; k++ ) {
-                shoveComponents[k] = oldimage.get(iter2++) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswap_bytes ) {
-                //userdata[iter] = widget.getUB1();
-                //userdata[iter+1] = widget.getUB0();
-                userdata.put( iter, widget.getUB1() );
-                userdata.put( iter + 1,widget.getUB0() );
-              } else {
-                //userdata[iter] = widget.getUB0();
-                //userdata[iter+1] = widget.getUB1();
-                userdata.put( iter, widget.getUB0() );
-                userdata.put( iter + 1, widget.getUB1() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-              for( k = 0; k < 3; k++ ) {
-                shoveComponents[k] = oldimage.get(iter2++) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswap_bytes ) {
-                //userdata[iter] = widget.getUB1();
-                //userdata[iter+1] = widget.getUB0();
-                userdata.put( iter, widget.getUB1() );
-                userdata.put( iter + 1, widget.getUB0() );
-              } else {
-                //userdata[iter] = widget.getUB0();
-                //userdata[iter+1] = widget.getUB1();
-                userdata.put( iter, widget.getUB0() );
-                userdata.put( iter, widget.getUB1() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldimage.get(iter2++) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswap_bytes ) {
-                //userdata[iter] = widget.getUB1();
-                //userdata[iter+1] = widget.getUB0();
-                userdata.put( iter, widget.getUB1() );
-                userdata.put( iter + 1, widget.getUB0() );
-              } else {
-                //userdata[iter] = widget.getUB0();
-                //userdata[iter+1] = widget.getUB1();
-                userdata.put( iter, widget.getUB0() );
-                userdata.put( iter + 1, widget.getUB1() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswap_bytes ) {
-                //userdata[iter] = widget.getUB1();
-                //userdata[iter+1] = widget.getUB0();
-                userdata.put( iter, widget.getUB1() );
-                userdata.put( iter + 1, widget.getUB0() );
-              } else {
-                //userdata[iter] = widget.getUB0();
-                //userdata[iter+1] = widget.getUB1();
-                userdata.put( iter, widget.getUB0() );
-                userdata.put( iter + 1, widget.getUB1() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswap_bytes ) {
-                //userdata[iter] = widget.getUB1();
-                //userdata[iter+1] = widget.getUB0();
-                userdata.put( iter, widget.getUB1() );
-                userdata.put( iter + 1, widget.getUB0() );
-              } else {
-                //userdata[iter] = widget.getUB0();
-                //userdata[iter+1] = widget.getUB1();
-                userdata.put( iter, widget.getUB0() );
-                userdata.put( iter + 1, widget.getUB1() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswap_bytes ) {
-                //userdata[iter] = widget.getUB1();
-                //userdata[iter+1] = widget.getUB0();
-                userdata.put( iter, widget.getUB1() );
-                userdata.put( iter + 1, widget.getUB0() );
-              } else {
-                //userdata[iter] = widget.getUB0();
-                //userdata[iter+1] = widget.getUB1();
-                userdata.put( iter, widget.getUB0() );
-                userdata.put( iter + 1, widget.getUB1() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT ):
-            case( GL2.GL_SHORT ):
-              if( type == GL2.GL_SHORT ) {
-                if( index_format ) {
-                  widget.setS0( oldimage.get( iter2++ ) );
-                } else {
-                  widget.setS0( (short)(oldimage.get( iter2++ ) >> 1) );
-                }
-              } else {
-                widget.setUS0( oldimage.get( iter2++ ) );
-              }
-              if( myswap_bytes ) {
-                //userdata[iter] = widget.getUB1();
-                //userdata[iter+1] = widget.getUB0();
-                userdata.put( iter, widget.getUB1() );
-                userdata.put( iter + 1, widget.getUB0() );
-              } else {
-                //userdata[iter] = widget.getUB0();
-                //userdata[iter] = widget.getUB1();
-                userdata.put( iter, widget.getUB0() );
-                userdata.put( iter + 1, widget.getUB1() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswap_bytes ) {
-                //userdata[iter+3] = widget.getUB0();
-                //userdata[iter+2] = widget.getUB1();
-                //userdata[iter+1] = widget.getUB2();
-                //userdata[iter  ] = widget.getUB3();
-                userdata.put( iter + 3, widget.getUB0() );
-                userdata.put( iter + 2, widget.getUB1() );
-                userdata.put( iter + 1, widget.getUB2() );
-                userdata.put( iter    , widget.getUB3() );
-              } else {
-                userdata.putInt( iter, widget.getUI() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswap_bytes ) {
-                //userdata[iter+3] = widget.getUB0();
-                //userdata[iter+2] = widget.getUB1();
-                //userdata[iter+1] = widget.getUB2();
-                //userdata[iter  ] = widget.getUB3();
-                userdata.put( iter + 3, widget.getUB0() );
-                userdata.put( iter + 2, widget.getUB1() );
-                userdata.put( iter + 2, widget.getUB2() );
-                userdata.put( iter    , widget.getUB3() );
-              } else {
-                userdata.putInt( iter, widget.getUI() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswap_bytes ) {
-                //userdata[iter+3] = widget.getUB0();
-                //userdata[iter+2] = widget.getUB1();
-                //userdata[iter+1] = widget.getUB2();
-                //userdata[iter  ] = widget.getUB3();
-                userdata.put( iter + 3, widget.getUB0() );
-                userdata.put( iter + 2, widget.getUB1() );
-                userdata.put( iter + 1, widget.getUB2() );
-                userdata.put( iter    , widget.getUB3() );
-              } else {
-                userdata.putInt( iter, widget.getUI() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldimage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswap_bytes ) {
-                //userdata[iter+3] = widget.getUB0();
-                //userdata[iter+2] = widget.getUB1();
-                //userdata[iter+1] = widget.getUB2();
-                //userdata[iter  ] = widget.getUB3();
-                userdata.put( iter + 3, widget.getUB0() );
-                userdata.put( iter + 2, widget.getUB1() );
-                userdata.put( iter + 1, widget.getUB2() );
-                userdata.put( iter    , widget.getUB3() );
-              } else {
-                userdata.putInt( iter, widget.getUI() );
-              }
-              break;
-            case( GL2.GL_INT ):
-            case( GL2.GL_UNSIGNED_INT ):
-            case( GL2.GL_FLOAT ):
-              if( type == GL2.GL_FLOAT ) {
-                if( index_format ) {
-                  widget.setF( oldimage.get( iter2++ ) );
-                } else {
-                  widget.setF( oldimage.get( iter2++ ) / 65535.0f );
-                }
-              } else if( type == GL2.GL_UNSIGNED_INT ) {
-                if( index_format ) {
-                  widget.setUI( oldimage.get( iter2++ ) );
-                } else {
-                  widget.setUI( oldimage.get( iter2++ ) * 65537 );
-                }
-              } else {
-                if( index_format ) {
-                  widget.setI( oldimage.get( iter2++ ) );
-                } else {
-                  widget.setI( (oldimage.get( iter2++ ) * 65537) / 2 );
-                }
-              }
-              if( myswap_bytes ) {
-                userdata.put( iter + 3, widget.getUB0() );
-                userdata.put( iter + 2, widget.getUB1() );
-                userdata.put( iter + 1, widget.getUB2() );
-                userdata.put( iter    , widget.getUB3() );
-              } else {
-                userdata.put( iter    , widget.getUB0() );
-                userdata.put( iter + 1, widget.getUB1() );
-                userdata.put( iter + 2, widget.getUB2() );
-                userdata.put( iter + 3, widget.getUB3() );
-              }
-              break;
-          }
-          iter += element_size;
-        } // for j
-        start += rowsize;
-        // want iter pointing at start, not within, row for assertion purposes
-        iter = start;
-      } // for i
-      // iterators should be one byte past end
-      if( !Mipmap.isTypePackedPixel( type ) ) {
-        assert( iter2 == width * height * components );
-      } else {
-        assert( iter2 == width * height * Mipmap.elements_per_group( format, 0 ) );
-      }
-      assert( iter == rowsize * height + psm.getPackSkipRows() * rowsize + psm.getPackSkipPixels() * group_size );
-    }
-  }
-  
-  public static void fillImage3D( PixelStorageModes psm, int width, int height,
-          int depth, int format, int type, boolean indexFormat, ByteBuffer userImage,
-          ShortBuffer newImage ) {
-    boolean myswapBytes;
-    int components;
-    int groupsPerLine;
-    int elementSize;
-    int groupSize;
-    int rowSize;
-    int padding;
-    int elementsPerLine;
-    int rowsPerImage;
-    int imageSize;
-    int start, rowStart;
-    int iter = 0;
-    int iter2 = 0;
-    int ww, hh, dd, k;
-    Type_Widget widget = new Type_Widget();
-    float extractComponents[] = new float[4];
-    
-    // Create a Extract interface object
-    Extract extract = null;
-    switch( type ) {
-      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-        extract = new Extract332();
-        break;
-      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-        extract = new Extract233rev();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-        extract = new Extract565();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-        extract = new Extract565rev();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-        extract = new Extract4444();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-        extract = new Extract4444rev();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-        extract = new Extract5551();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-        extract = new Extract1555rev();
-        break;
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-        extract = new Extract8888();
-        break;
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-        extract = new Extract8888rev();
-        break;
-      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-        extract = new Extract1010102();
-        break;
-      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-        extract = new Extract2101010rev();
-        break;
-    }
-    
-    myswapBytes = psm.getUnpackSwapBytes();
-    components = Mipmap.elements_per_group( format, type );
-    if( psm.getUnpackRowLength() > 0 ) {
-      groupsPerLine = psm.getUnpackRowLength();
-    } else {
-      groupsPerLine = width;
-    }
-    elementSize = Mipmap.bytes_per_element( type );
-    groupSize = elementSize * components;
-    if( elementSize == 1 ) {
-      myswapBytes = false;
-    }
-    
-    // 3dstuff begin
-    if( psm.getUnpackImageHeight() > 0 ) {
-      rowsPerImage = psm.getUnpackImageHeight();
-    } else {
-      rowsPerImage = height;
-    }
-    // 3dstuff end
-    
-    rowSize = groupsPerLine * groupSize;
-    padding = rowSize % psm.getUnpackAlignment();
-    if( padding != 0 ) {
-      rowSize += psm.getUnpackAlignment() - padding;
-    }
-    
-    imageSize = rowsPerImage * rowSize; // 3dstuff
-    
-    start = psm.getUnpackSkipRows() * rowSize + 
-            psm.getUnpackSkipPixels() * groupSize + 
-            psm.getUnpackSkipImages() * imageSize;
-    elementsPerLine = width * components;
-    
-    iter2 = 0;
-    for( dd = 0; dd < depth; dd++ ) {
-      rowStart = start;
-      for( hh = 0; hh < height; hh++ ) {
-        iter = rowStart;
-        for( ww = 0; ww < elementsPerLine; ww++ ) {
-          
-          switch( type ) {
-            case( GL2.GL_UNSIGNED_BYTE ):
-              if( indexFormat ) {
-                newImage.put( iter2++, (short)(0x000000FF & userImage.get( iter ) ) );
-              } else {
-                newImage.put( iter2++, (short)((0x000000FF & userImage.get( iter ) ) * 257 ) );
-              }
-              break;
-            case( GL2.GL_BYTE ):
-              if( indexFormat ) {
-                newImage.put( iter2++, userImage.get( iter ) );
-              } else {
-                newImage.put( iter2++, (short)(userImage.get( iter ) * 516 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-              userImage.position( iter );
-              extract.extract( false, userImage, extractComponents );
-              for( k = 0; k < 3; k++ ) {
-                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-              userImage.position( iter );
-              extract.extract( false, userImage, extractComponents );
-              for( k = 0; k < 3; k++ ) {
-                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-              userImage.position( iter );
-              extract.extract( myswapBytes, userImage, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-              userImage.position( iter );
-              extract.extract( myswapBytes, userImage, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-              userImage.position( iter );
-              extract.extract( myswapBytes, userImage, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-              userImage.position( iter );
-              extract.extract( myswapBytes, userImage, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-              userImage.position( iter );
-              extract.extract( myswapBytes, userImage, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-              userImage.position( iter );
-              extract.extract( myswapBytes, userImage, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newImage.put( iter2++, (short)(extractComponents[k] * 65535) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT ):
-            case( GL2.GL_SHORT ):
-              if( myswapBytes ) {
-                widget.setUB0( userImage.get( iter + 1 ) );
-                widget.setUB1( userImage.get( iter ) );
-              } else {
-                widget.setUB0( userImage.get( iter ) );
-                widget.setUB1( userImage.get( iter + 1 ) );
-              }
-              if( type == GL2.GL_SHORT ) {
-                if( indexFormat ) {
-                  newImage.put( iter2++, widget.getUS0() );
-                } else {
-                  newImage.put( iter2++, (short)(widget.getUS0() * 2) );
-                }
-              } else {
-                newImage.put( iter2++, widget.getUS0() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-              userImage.position( iter );
-              extract.extract( myswapBytes, userImage, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newImage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-              userImage.position( iter );
-              extract.extract( myswapBytes, userImage, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newImage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-              userImage.position( iter );
-              extract.extract( myswapBytes, userImage, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newImage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-              extract.extract( myswapBytes, userImage, extractComponents );
-              for( k = 0; k < 4; k++ ) {
-                newImage.put( iter2++, (short)( extractComponents[k] * 65535 ) );
-              }
-              break;
-            case( GL2.GL_INT ):
-            case( GL2.GL_UNSIGNED_INT ):
-            case( GL2.GL_FLOAT ):
-              if( myswapBytes ) {
-                widget.setUB0( userImage.get( iter + 3 ) );
-                widget.setUB1( userImage.get( iter + 2 ) );
-                widget.setUB2( userImage.get( iter + 1 ) );
-                widget.setUB3( userImage.get( iter     ) );
-              } else {
-                widget.setUB0( userImage.get( iter     ) );
-                widget.setUB1( userImage.get( iter + 1 ) );
-                widget.setUB2( userImage.get( iter + 2 ) );
-                widget.setUB3( userImage.get( iter + 3 ) );
-              }
-              if( type == GL2.GL_FLOAT ) {
-                if( indexFormat ) {
-                  newImage.put( iter2++, (short)widget.getF() );
-                } else {
-                  newImage.put( iter2++, (short)( widget.getF() * 65535.0f ) );
-                }
-              } else if( type == GL2.GL_UNSIGNED_INT ) {
-                if( indexFormat ) {
-                  newImage.put( iter2++, (short)widget.getUI() );
-                } else {
-                  newImage.put( iter2++, (short)(widget.getUI() >> 16) );
-                }
-              } else {
-                if( indexFormat ) {
-                  newImage.put( iter2++, (short)widget.getI() );
-                } else {
-                  newImage.put( iter2++, (short)(widget.getI() >> 15) );
-                }
-              }
-              break;
-            default:
-              assert( false );
-          }
-          iter += elementSize;
-        } // for ww
-        rowStart += rowSize;
-        iter = rowStart; // for assert
-      } // for hh
-      start += imageSize;
-    }// for dd
-    
-    // iterators should be one byte past end
-    if( !Mipmap.isTypePackedPixel( type ) ) {
-      assert( iter2 == width * height * depth * components );
-    } else {
-      assert( iter2 == width * height * depth * Mipmap.elements_per_group( format, 0 ) );
-    }
-    assert( iter == rowSize * height * depth + psm.getUnpackSkipRows() * rowSize + 
-            psm.getUnpackSkipPixels() * groupSize +
-            psm.getUnpackSkipImages() * imageSize );
-  }
-  
-  public static void emptyImage3D( PixelStorageModes psm, int width, int height, int depth,
-          int format, int type, boolean indexFormat, ShortBuffer oldImage, ByteBuffer userImage ) {
-    boolean myswapBytes;
-    int components;
-    int groupsPerLine;
-    int elementSize;
-    int groupSize;
-    int rowSize;
-    int padding;
-    int start, rowStart, iter;
-    int elementsPerLine;
-    int iter2;
-    int ii, jj, dd, k;
-    int rowsPerImage;
-    int imageSize;
-    Type_Widget widget = new Type_Widget();
-    float[] shoveComponents = new float[4];
-    
-    // Create a Extract interface object
-    Extract extract = null;
-    switch( type ) {
-      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-        extract = new Extract332();
-        break;
-      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-        extract = new Extract233rev();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-        extract = new Extract565();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-        extract = new Extract565rev();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-        extract = new Extract4444();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-        extract = new Extract4444rev();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-        extract = new Extract5551();
-        break;
-      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-        extract = new Extract1555rev();
-        break;
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-        extract = new Extract8888();
-        break;
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-        extract = new Extract8888rev();
-        break;
-      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-        extract = new Extract1010102();
-        break;
-      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-        extract = new Extract2101010rev();
-        break;
-    }
-    
-    iter = 0;
-    
-    myswapBytes = psm.getPackSwapBytes();
-    components = Mipmap.elements_per_group( format, type );
-    if( psm.getPackRowLength() > 0 ) {
-      groupsPerLine = psm.getPackRowLength();
-    } else {
-      groupsPerLine = width;
-    }
-    
-    elementSize = Mipmap.bytes_per_element( type );
-    groupSize = elementSize * components;
-    if( elementSize == 1 ) {
-      myswapBytes = false;
-    }
-    
-    // 3dstuff begin
-    if( psm.getPackImageHeight() > 0 ) {
-      rowsPerImage = psm.getPackImageHeight();
-    } else {
-      rowsPerImage = height;
-    }
-    
-    // 3dstuff end
-    
-    rowSize = groupsPerLine * groupSize;
-    padding = rowSize % psm.getPackAlignment();
-    if( padding != 0 ) {
-      rowSize += psm.getPackAlignment() - padding;
-    }
-    
-    imageSize = rowsPerImage * rowSize;
-    
-    start = psm.getPackSkipRows() * rowSize +
-            psm.getPackSkipPixels() * groupSize +
-            psm.getPackSkipImages() * imageSize;
-    elementsPerLine = width * components;
-    
-    iter2 = 0;
-    for( dd = 0; dd < depth; dd++ ) {
-      rowStart = start;
-      
-      for( ii = 0; ii < height; ii++ ) {
-        iter = rowStart;
-        
-        for( jj = 0; jj < elementsPerLine; jj++ ) {
-          
-          switch( type ) {
-            case( GL2.GL_UNSIGNED_BYTE ):
-              if( indexFormat ) {
-                userImage.put( iter, (byte)(oldImage.get( iter2++ ) ) );
-              } else {
-                userImage.put( iter, (byte)(oldImage.get( iter2++ ) >> 8 ) );
-              }
-              break;
-            case( GL2.GL_BYTE ):
-              if( indexFormat ) {
-                userImage.put( iter, (byte)(oldImage.get(iter2++) ) );
-              } else {
-                userImage.put( iter, (byte)(oldImage.get(iter2++) >> 9) );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-              for( k = 0; k < 3; k++ ) {
-                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, userImage );
-              break;
-            case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-              for( k = 0; k < 3; k++ ) {
-                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, userImage );
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswapBytes ) {
-                userImage.putShort( iter, widget.getUB1() );
-                userImage.putShort( iter + 1, widget.getUB0() );
-              } else {
-                userImage.putShort( iter, widget.getUS0() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswapBytes ) {
-                userImage.put( iter, widget.getUB1() );
-                userImage.put( iter + 1, widget.getUB0() );
-              } else {
-                userImage.putShort( iter, widget.getUS0() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswapBytes ) {
-                userImage.put( iter, widget.getUB1() );
-                userImage.put( iter + 1, widget.getUB0() );
-              } else {
-                userImage.putShort( iter, widget.getUS0() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswapBytes ) {
-                userImage.put( iter, widget.getUB1() );
-                userImage.put( iter + 1, widget.getUB0() );
-              } else {
-                userImage.putShort( iter, widget.getUS0() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswapBytes ) {
-                userImage.put( iter, widget.getUB1() );
-                userImage.put( iter + 1, widget.getUB0() );
-              } else {
-                userImage.putShort( iter, widget.getUS0() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswapBytes ) {
-                userImage.put( iter, widget.getUB1() );
-                userImage.put( iter + 1, widget.getUB0() );
-              } else {
-                userImage.putShort( iter, widget.getUS0() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_SHORT ):
-            case( GL2.GL_SHORT ):
-              if( type == GL2.GL_SHORT ) {
-                if( indexFormat ) {
-                  widget.setS0( (short)oldImage.get( iter2++ ) );
-                } else {
-                  widget.setS0( (short)(oldImage.get( iter2++ ) >> 1) );
-                }
-              } else {
-                widget.setUS0( (short)oldImage.get( iter2++ ) );
-              }
-              if( myswapBytes ) {
-                userImage.put( iter, widget.getUB1() );
-                userImage.put( iter + 1, widget.getUB0() );
-              } else {
-                userImage.put( iter, widget.getUB0() );
-                userImage.put( iter + 1, widget.getUB1() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswapBytes ) {
-                userImage.put( iter + 3, widget.getUB0() );
-                userImage.put( iter + 2, widget.getUB1() );
-                userImage.put( iter + 1, widget.getUB2() );
-                userImage.put( iter    , widget.getUB3() );
-              } else {
-                userImage.putInt( iter, widget.getUI() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswapBytes ) {
-                userImage.put( iter + 3, widget.getUB0() );
-                userImage.put( iter + 2, widget.getUB1() );
-                userImage.put( iter + 1, widget.getUB2() );
-                userImage.put( iter    , widget.getUB3() );
-              } else {
-                userImage.putInt( iter, widget.getUI() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswapBytes ) {
-                userImage.put( iter + 3, widget.getUB0() );
-                userImage.put( iter + 2, widget.getUB1() );
-                userImage.put( iter + 1, widget.getUB2() );
-                userImage.put( iter    ,widget.getUB3() );
-              } else {
-                userImage.putInt( iter, widget.getUI() );
-              }
-              break;
-            case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-              for( k = 0; k < 4; k++ ) {
-                shoveComponents[k] = oldImage.get( iter2++ ) / 65535.0f;
-              }
-              extract.shove( shoveComponents, 0, widget.getBuffer() );
-              if( myswapBytes ) {
-                userImage.put( iter + 3, widget.getUB0() );
-                userImage.put( iter + 2, widget.getUB2() );
-                userImage.put( iter + 1, widget.getUB1() );
-                userImage.put( iter    , widget.getUB0() );
-              } else {
-                userImage.putInt( iter, widget.getUI() );
-              }
-              break;
-            case( GL2.GL_INT ):
-            case( GL2.GL_UNSIGNED_INT ):
-            case( GL2.GL_FLOAT ):
-              if( type == GL2.GL_FLOAT ) {
-                if( indexFormat ) {
-                  widget.setF( oldImage.get( iter2++ ) );
-                } else {
-                  widget.setF( oldImage.get( iter2++ ) / 65535.0f );
-                }
-              } else if( type == GL2.GL_UNSIGNED_INT ) {
-                if( indexFormat ) {
-                  widget.setUI( oldImage.get( iter2++ ) );
-                } else {
-                  widget.setUI( oldImage.get( iter2++ ) * 65537 );
-                }
-              } else {
-                if( indexFormat ) {
-                  widget.setI( oldImage.get( iter2++ ) );
-                } else {
-                  widget.setI( ( oldImage.get( iter2++ ) * 65535 ) / 2 );
-                }
-              }
-              if( myswapBytes ) {
-                userImage.put( iter + 3, widget.getUB0() );
-                userImage.put( iter + 2, widget.getUB1() );
-                userImage.put( iter + 1, widget.getUB2() );
-                userImage.put( iter    , widget.getUB3() );
-              } else {
-                userImage.put( iter    , widget.getUB0() );
-                userImage.put( iter + 1, widget.getUB1() );
-                userImage.put( iter + 2, widget.getUB2() );
-                userImage.put( iter + 3, widget.getUB3() );
-              }
-              break;
-            default:
-              assert( false );
-          }
-          
-          iter += elementSize;
-        } // for jj
-        rowStart += rowSize;
-      } // for ii
-      start += imageSize;
-    } // for dd
-    
-    if( !Mipmap.isTypePackedPixel( type ) ) {
-      assert( iter2 == width * height * depth * components );
-    } else {
-      assert( iter2 == width * height * depth * Mipmap.elements_per_group( format, 0 ) );
-    }
-    assert( iter == rowSize * height * depth + 
-                    psm.getUnpackSkipRows() * rowSize +
-                    psm.getUnpackSkipPixels() * groupSize +
-                    psm.getUnpackSkipImages() * imageSize );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java
deleted file mode 100644
index c9850639d..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java
+++ /dev/null
@@ -1,867 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.GLException;
-import java.nio.*;
-import com.sun.opengl.impl.InternalBufferUtil;
-
-/**
- *
- * @author  Administrator
- */
-public class Mipmap {
-  
-  /** Creates a new instance of Mipmap */
-  public Mipmap() {
-  }
-  
-  public static int computeLog( int value ) {
-    int i = 0;
-    // Error
-    if( value == 0 ) {
-      return( -1 );
-    }
-    for( ;; ) {
-      if( (value & 1) >= 1 ) {
-        if( value != 1 ) {
-          return( -1 );
-        }
-        return( i );
-      }
-      value = value >> 1;
-      i++;
-    }
-  }
-  
-  /* Compute the nearest power of 2 number.  This algorithm is a little strange
-   * but it works quite well.
-   */
-  public static int nearestPower( int value ) {
-    int i = 1;
-    // Error!
-    if( value == 0 ) {
-      return( -1 );
-    }
-    for( ;; ) {
-      if( value == 1 ) {
-        return( i );
-      } else if( value == 3 ) {
-        return( i * 4 );
-      }
-      value = value >> 1;
-      i *= 2;
-    }
-  }
-  
-  public static short GLU_SWAP_2_BYTES( short s ) {
-    byte b = 0;
-    b = (byte)( s >>> 8 );
-    s = (short)( s << 8 );
-    s = (short)( s | (0x00FF & b) );
-    return( s );
-  }
-  
-  public static int GLU_SWAP_4_BYTES( int i ) {
-    int t = i << 24;
-    t |= 0x00FF0000 & ( i << 8 );
-    t |= 0x0000FF00 & ( i >>> 8 );
-    t |= 0x000000FF & ( i >>> 24 );
-    return( t );
-  }
-  
-  public static float GLU_SWAP_4_BYTES( float f ) {
-    int i = Float.floatToRawIntBits( f );
-    float temp = Float.intBitsToFloat( i );
-    return( temp );
-  }
-  
-  public static int checkMipmapArgs( int internalFormat, int format, int type ) {
-    if( !legalFormat( format ) || !legalType( type ) ) {
-      return( GLU.GLU_INVALID_ENUM );
-    }
-    if( format == GL2.GL_STENCIL_INDEX ) {
-      return( GLU.GLU_INVALID_ENUM );
-    }
-    if( !isLegalFormatForPackedPixelType( format, type ) ) {
-      return( GLU.GLU_INVALID_OPERATION );
-    }
-    return( 0 );
-  }
-  
-  public static boolean legalFormat( int format ) {
-    switch( format ) {
-      case( GL2.GL_COLOR_INDEX ):
-      case( GL2.GL_STENCIL_INDEX ):
-      case( GL2.GL_DEPTH_COMPONENT ):
-      case( GL2.GL_RED ):
-      case( GL2.GL_GREEN ):
-      case( GL2.GL_BLUE ):
-      case( GL2.GL_ALPHA ):
-      case( GL2.GL_RGB ):
-      case( GL2.GL_RGBA ):
-      case( GL2.GL_LUMINANCE ):
-      case( GL2.GL_LUMINANCE_ALPHA ):
-      case( GL2.GL_BGR ):
-      case( GL2.GL_BGRA ):
-        return( true );
-      default:
-        return( false );
-    }
-  }
-  
-  public static boolean legalType( int type ) {
-    switch( type ) {
-      case( GL2.GL_BITMAP ):
-      case( GL2.GL_BYTE ):
-      case( GL2.GL_UNSIGNED_BYTE ):
-      case( GL2.GL_SHORT ):
-      case( GL2.GL_UNSIGNED_SHORT ):
-      case( GL2.GL_INT ):
-      case( GL2.GL_UNSIGNED_INT ):
-      case( GL2.GL_FLOAT ):
-      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-        return( true );
-      default:
-        return( false );
-    }
-  }
-  
-  public static boolean isTypePackedPixel( int type ) {
-    assert( legalType( type ) );
-    
-    if( type == GL2.GL_UNSIGNED_BYTE_3_3_2 ||
-        type == GL2.GL_UNSIGNED_BYTE_2_3_3_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_5_6_5 ||
-        type == GL2.GL_UNSIGNED_SHORT_5_6_5_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_4_4_4_4 ||
-        type == GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_5_5_5_1 ||
-        type == GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ||
-        type == GL2.GL_UNSIGNED_INT_8_8_8_8 ||
-        type == GL2.GL_UNSIGNED_INT_8_8_8_8_REV ||
-        type == GL2.GL_UNSIGNED_INT_10_10_10_2 ||
-        type == GL2.GL_UNSIGNED_INT_2_10_10_10_REV ) {
-          return( true );
-    }
-    return( false );
-  }
-  
-  public static boolean isLegalFormatForPackedPixelType( int format, int type ) {
-    // if not a packed pixel type then return true
-    if( isTypePackedPixel( type ) ) {
-      return( true );
-    }
-    
-    // 3_3_2/2_3_3_REV & 5_6_5/5_6_5_REV are only compatible with RGB
-    if( (type == GL2.GL_UNSIGNED_BYTE_3_3_2 || type == GL2.GL_UNSIGNED_BYTE_2_3_3_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_5_6_5 || type == GL2.GL_UNSIGNED_SHORT_5_6_5_REV )
-        & format != GL2.GL_RGB ) {
-          return( false );
-    }
-    
-    // 4_4_4_4/4_4_4_4_REV & 5_5_5_1/1_5_5_5_REV & 8_8_8_8/8_8_8_8_REV &
-    // 10_10_10_2/2_10_10_10_REV are only campatible with RGBA, BGRA & ARGB_EXT
-    if( ( type == GL2.GL_UNSIGNED_SHORT_4_4_4_4 ||
-          type == GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ||
-          type == GL2.GL_UNSIGNED_SHORT_5_5_5_1 ||
-          type == GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ||
-          type == GL2.GL_UNSIGNED_INT_8_8_8_8 ||
-          type == GL2.GL_UNSIGNED_INT_8_8_8_8_REV ||
-          type == GL2.GL_UNSIGNED_INT_10_10_10_2 ||
-          type == GL2.GL_UNSIGNED_INT_2_10_10_10_REV ) &&
-          (format != GL2.GL_RGBA && format != GL2.GL_BGRA) ) {
-            return( false );
-    }
-    return( true );
-  }
-  
-  public static boolean isLegalLevels( int userLevel, int baseLevel, int maxLevel,
-                                            int totalLevels ) {
-    if( (baseLevel < 0) || (baseLevel < userLevel) || (maxLevel < baseLevel) ||
-                                                  (totalLevels < maxLevel) ) {
-      return( false );
-    }
-    return( true );
-  }
-  
-  /* Given user requested textures size, determine if it fits. If it doesn't then
-   * halve both sides and make the determination again until it does fit ( for
-   * IR only ).
-   * Note that proxy textures are not implemented in RE* even though they
-   * advertise the texture extension.
-   * Note that proxy textures are implemented but not according to spec in IMPACT*
-   */
-  public static void closestFit( GL gl, int target, int width, int height, int internalFormat,
-                                int format, int type, int[] newWidth, int[] newHeight ) {
-    // Use proxy textures if OpenGL version >= 1.1
-    if( Double.parseDouble( gl.glGetString( GL.GL_VERSION ).trim().substring( 0, 3 ) ) >= 1.1 ) {
-      int widthPowerOf2 = nearestPower( width );
-      int heightPowerOf2 = nearestPower( height );
-      int[] proxyWidth = new int[1];
-      boolean noProxyTextures = false;
-      
-      // Some drivers (in particular, ATI's) seem to set a GL error
-      // when proxy textures are used even though this is in violation
-      // of the spec. Guard against this and interactions with the
-      // DebugGL by watching for GLException.
-      try {
-        do {
-          // compute level 1 width & height, clamping each at 1
-          int widthAtLevelOne = ( ( width > 1 ) ? (widthPowerOf2 >> 1) : widthPowerOf2 );
-          int heightAtLevelOne = ( ( height > 1 ) ? (heightPowerOf2 >> 1) : heightPowerOf2 );
-          int proxyTarget;
-        
-          assert( widthAtLevelOne > 0 );
-          assert( heightAtLevelOne > 0 );
-        
-          // does width x height at level 1 & all their mipmaps fit?
-          if( target == GL2.GL_TEXTURE_2D || target == GL2.GL_PROXY_TEXTURE_2D ) {
-            proxyTarget = GL2.GL_PROXY_TEXTURE_2D;
-            gl.glTexImage2D( proxyTarget, 1, internalFormat, widthAtLevelOne,
-                             heightAtLevelOne, 0, format, type, null );
-          } else if( (target == GL2.GL_TEXTURE_CUBE_MAP_POSITIVE_X) || 
-                     (target == GL2.GL_TEXTURE_CUBE_MAP_NEGATIVE_X) || 
-                     (target == GL2.GL_TEXTURE_CUBE_MAP_POSITIVE_Y) || 
-                     (target == GL2.GL_TEXTURE_CUBE_MAP_NEGATIVE_Y) || 
-                     (target == GL2.GL_TEXTURE_CUBE_MAP_POSITIVE_Z) || 
-                     (target == GL2.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z) ) {
-            proxyTarget = GL2.GL_PROXY_TEXTURE_CUBE_MAP;
-            gl.glTexImage2D( proxyTarget, 1, internalFormat, widthAtLevelOne,
-                             heightAtLevelOne, 0, format, type, null );
-          } else {
-            assert( target == GL2.GL_TEXTURE_1D || target == GL2.GL_PROXY_TEXTURE_1D );
-            proxyTarget = GL2.GL_PROXY_TEXTURE_1D;
-            gl.getGL2().glTexImage1D( proxyTarget, 1, internalFormat, widthAtLevelOne, 
-                             0, format, type, null );
-          }
-          if(gl.isGL2()) {
-            gl.getGL2().glGetTexLevelParameteriv( proxyTarget, 1, GL2.GL_TEXTURE_WIDTH, proxyWidth, 0 );
-          } else {
-            proxyWidth[0] = 0;
-          }
-          // does it fit?
-          if( proxyWidth[0] == 0 ) { // nope, so try again with theses sizes
-            if( widthPowerOf2 == 1 && heightPowerOf2 == 1 ) {
-              /* A 1x1 texture couldn't fit for some reason so break out.  This
-               * should never happen.  But things happen.  The disadvantage with
-               * this if-statement is that we will never be aware of when this
-               * happens since it will silently branch out.
-               */
-              noProxyTextures = true;
-              break;
-            }
-            widthPowerOf2 = widthAtLevelOne;
-            heightPowerOf2 = heightAtLevelOne;
-          }
-          // else it does fit
-        } while( proxyWidth[0] == 0 );
-      } catch (GLException e) {
-        noProxyTextures = true;
-      }
-      // loop must terminate
-      // return the width & height at level 0 that fits
-      if( !noProxyTextures ) {
-        newWidth[0] = widthPowerOf2;
-        newHeight[0] = heightPowerOf2;
-        return;
-      }
-    }
-    int[] maxsize = new int[1];
-    gl.glGetIntegerv( GL2.GL_MAX_TEXTURE_SIZE, maxsize , 0);
-    // clamp user's texture sizes to maximum sizes, if necessary
-    newWidth[0] = nearestPower( width );
-    if( newWidth[0] > maxsize[0] ) {
-      newWidth[0] = maxsize[0];
-    }
-    newHeight[0] = nearestPower( height );
-    if( newHeight[0] > maxsize[0] ) {
-      newHeight[0] = maxsize[0];
-    }
-  }
-  
-  public static void closestFit3D( GL gl, int target, int width, int height, int depth, 
-          int internalFormat, int format, int type, int[] newWidth, int[] newHeight,
-          int[] newDepth ) {
-    int widthPowerOf2 = nearestPower( width );
-    int heightPowerOf2 = nearestPower( height );
-    int depthPowerOf2 = nearestPower( depth );
-    int[] proxyWidth = new int[1];
-    
-    do {
-      // compute level 1 width & height & depth, clamping each at 1
-      int widthAtLevelOne = (widthPowerOf2 > 1) ? widthPowerOf2 >> 1 : widthPowerOf2;
-      int heightAtLevelOne = (heightPowerOf2 > 1) ? heightPowerOf2 >> 1 : heightPowerOf2;
-      int depthAtLevelOne = (depthPowerOf2 > 1) ? depthPowerOf2 >> 1 : depthPowerOf2;
-      int proxyTarget = 0;
-      assert( widthAtLevelOne > 0 );
-      assert( heightAtLevelOne > 0 );
-      assert( depthAtLevelOne > 0 );
-      
-      // does width x height x depth at level 1 & all their mipmaps fit?
-      if( target == GL2.GL_TEXTURE_3D || target == GL2.GL_PROXY_TEXTURE_3D ) {
-        proxyTarget = GL2.GL_PROXY_TEXTURE_3D;
-        gl.getGL2().glTexImage3D( proxyTarget, 1, internalFormat, widthAtLevelOne,
-                heightAtLevelOne, depthAtLevelOne, 0, format, type, null );
-      }
-      if(gl.isGL2()) {
-        gl.getGL2().glGetTexLevelParameteriv( proxyTarget, 1, GL2.GL_TEXTURE_WIDTH, proxyWidth, 0 );
-      } else {
-        proxyWidth[0] = 0;
-      }
-      // does it fit
-      if( proxyWidth[0] == 0 ) {
-        if( widthPowerOf2 == 1 && heightPowerOf2 == 1 && depthPowerOf2 == 1 ) {
-          newWidth[0] = newHeight[0] = newDepth[0] = 1;
-          return;
-        }
-        widthPowerOf2 = widthAtLevelOne;
-        heightPowerOf2 = heightAtLevelOne;
-        depthPowerOf2 = depthAtLevelOne;
-      }
-    } while( proxyWidth[0] == 0 );
-    // loop must terminate
-    
-    // return the width & height at level 0 that fits
-    newWidth[0] = widthPowerOf2;
-    newHeight[0] = heightPowerOf2;
-    newDepth[0] = depthPowerOf2;
-  }
-  
-  public static int elements_per_group( int format, int type ) {
-    // Return the number of elements per grtoup of a specified gromat
-    
-    // If the type is packedpixels then answer is 1
-    if( type == GL2.GL_UNSIGNED_BYTE_3_3_2 ||
-        type == GL2.GL_UNSIGNED_BYTE_2_3_3_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_5_6_5 ||
-        type == GL2.GL_UNSIGNED_SHORT_5_6_5_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_4_4_4_4 ||
-        type == GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_5_5_5_1 ||
-        type == GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ||
-        type == GL2.GL_UNSIGNED_INT_8_8_8_8 ||
-        type == GL2.GL_UNSIGNED_INT_8_8_8_8_REV ||
-        type == GL2.GL_UNSIGNED_INT_10_10_10_2 ||
-        type == GL2.GL_UNSIGNED_INT_2_10_10_10_REV ) {
-          return( 1 );
-    }
-    
-    // Types are not packed pixels so get elements per group
-    switch( format ) {
-      case( GL2.GL_RGB ):
-      case( GL2.GL_BGR ):
-        return( 3 );
-      case( GL2.GL_LUMINANCE_ALPHA ):
-        return( 2 );
-      case( GL2.GL_RGBA ):
-      case( GL2.GL_BGRA ):
-        return( 4 );
-      default:
-        return( 1 );
-    }
-  }
-  
-  public static int bytes_per_element( int type ) {
-    // return the number of bytes per element, based on the element type
-    
-    switch( type ) {
-      case( GL2.GL_BITMAP ):
-      case( GL2.GL_BYTE ):
-      case( GL2.GL_UNSIGNED_BYTE ):
-      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-        return( 1 );
-      case( GL2.GL_SHORT ):
-      case( GL2.GL_UNSIGNED_SHORT ):
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-        return( 2 );
-      case( GL2.GL_INT ):
-      case( GL2.GL_UNSIGNED_INT ):
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-      case( GL2.GL_FLOAT ):
-        return( 4 );
-      default:
-        return( 4 );
-    }
-  }
-  
-  public static boolean is_index( int format ) {
-    return( format == GL2.GL_COLOR_INDEX || format == GL2.GL_STENCIL_INDEX );
-  }
-  
-  /* Compute memory required for internal packed array of data of given type and format. */
-  
-  public static int image_size( int width, int height, int format, int type ) {
-    int bytes_per_row;
-    int components;
-    
-    assert( width > 0 );
-    assert( height > 0 );
-    components = elements_per_group( format, type );
-    if( type == GL2.GL_BITMAP ) {
-      bytes_per_row = (width + 7) / 8;
-    } else {
-      bytes_per_row = bytes_per_element( type ) * width;
-    }
-    return( bytes_per_row * height * components );
-  }
-  
-  public static int imageSize3D( int width, int height, int depth, int format, int type ) {
-    int components = elements_per_group( format, type );
-    int bytes_per_row = bytes_per_element( type ) * width;
-    
-    assert( width > 0 && height > 0 && depth > 0 );
-    assert( type != GL2.GL_BITMAP );
-    
-    return( bytes_per_row * height * depth * components );
-  }
-  
-  public static void retrieveStoreModes( GL gl, PixelStorageModes psm ) {
-    int[] a = new int[1];
-    gl.glGetIntegerv( GL2.GL_UNPACK_ALIGNMENT, a, 0);
-    psm.setUnpackAlignment( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_ROW_LENGTH, a, 0);
-    psm.setUnpackRowLength( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_ROWS, a, 0);
-    psm.setUnpackSkipRows( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_PIXELS, a, 0);
-    psm.setUnpackSkipPixels( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_LSB_FIRST, a, 0);
-    psm.setUnpackLsbFirst( ( a[0] == 1 ) );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SWAP_BYTES, a, 0);
-    psm.setUnpackSwapBytes( ( a[0] == 1 ) );
-    
-    gl.glGetIntegerv( GL2.GL_PACK_ALIGNMENT, a, 0);
-    psm.setPackAlignment( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_ROW_LENGTH, a, 0);
-    psm.setPackRowLength( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_SKIP_ROWS, a, 0);
-    psm.setPackSkipRows( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_SKIP_PIXELS, a, 0);
-    psm.setPackSkipPixels( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_LSB_FIRST, a, 0);
-    psm.setPackLsbFirst( ( a[0] == 1 ) );
-    gl.glGetIntegerv( GL2.GL_PACK_SWAP_BYTES, a, 0);
-    psm.setPackSwapBytes( ( a[0] == 1 ) );
-  }
-  
-  public static void retrieveStoreModes3D( GL gl, PixelStorageModes psm ) {
-    int[] a = new int[1];
-    gl.glGetIntegerv( GL2.GL_UNPACK_ALIGNMENT, a, 0);
-    psm.setUnpackAlignment( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_ROW_LENGTH, a, 0);
-    psm.setUnpackRowLength( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_ROWS, a, 0);
-    psm.setUnpackSkipRows( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_PIXELS, a, 0);
-    psm.setUnpackSkipPixels( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_LSB_FIRST, a, 0);
-    psm.setUnpackLsbFirst( ( a[0] == 1 ) );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SWAP_BYTES, a, 0);
-    psm.setUnpackSwapBytes( ( a[0] == 1 ) );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_IMAGES, a, 0);
-    psm.setUnpackSkipImages( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_IMAGE_HEIGHT, a, 0);
-    psm.setUnpackImageHeight( a[0] );
-    
-    gl.glGetIntegerv( GL2.GL_PACK_ALIGNMENT, a, 0);
-    psm.setPackAlignment( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_ROW_LENGTH, a, 0);
-    psm.setPackRowLength( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_SKIP_ROWS, a, 0);
-    psm.setPackSkipRows( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_SKIP_PIXELS, a, 0 );
-    psm.setPackSkipPixels( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_LSB_FIRST, a, 0 );
-    psm.setPackLsbFirst( ( a[0] == 1 ) );
-    gl.glGetIntegerv( GL2.GL_PACK_SWAP_BYTES, a, 0 );
-    psm.setPackSwapBytes( ( a[0] == 1 ) );
-    gl.glGetIntegerv( GL2.GL_PACK_SKIP_IMAGES, a, 0 );
-    psm.setPackSkipImages( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_IMAGE_HEIGHT, a, 0 );
-    psm.setPackImageHeight( a[0] );
-  }
-  
-  public static int gluScaleImage( GL gl, int format, int widthin, int heightin, 
-          int typein, ByteBuffer datain, int widthout, int heightout, 
-          int typeout, ByteBuffer dataout ) {
-    int datainPos = datain.position();
-    int dataoutPos = dataout.position();
-    try {
-
-      int components;
-      ByteBuffer beforeimage;
-      ByteBuffer afterimage;
-      PixelStorageModes psm = new PixelStorageModes();
-    
-      if( (widthin == 0)  || (heightin == 0) || (widthout == 0) || (heightout == 0) ) {
-        return( 0 );
-      }
-      if( (widthin < 0) || (heightin < 0) || (widthout < 0) || (heightout < 0) ) {
-        return( GLU.GLU_INVALID_VALUE );
-      }
-      if( !legalFormat( format ) || !legalType( typein ) || !legalType( typeout ) ) {
-        return( GLU.GLU_INVALID_ENUM );
-      }
-      if( !isLegalFormatForPackedPixelType( format, typein ) ) {
-        return( GLU.GLU_INVALID_OPERATION );
-      }
-      if( !isLegalFormatForPackedPixelType( format, typeout ) ) {
-        return( GLU.GLU_INVALID_OPERATION );
-      }
-      beforeimage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( image_size( widthin, heightin, format, GL2.GL_UNSIGNED_SHORT ) ));
-      afterimage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( image_size( widthout, heightout, format, GL2.GL_UNSIGNED_SHORT ) ));
-      if( beforeimage == null || afterimage == null ) {
-        return( GLU.GLU_OUT_OF_MEMORY );
-      }
-    
-      retrieveStoreModes( gl, psm );
-      Image.fill_image( psm, widthin, heightin, format, typein, is_index( format ), datain, beforeimage.asShortBuffer() );
-      components = elements_per_group( format, 0 );
-      ScaleInternal.scale_internal( components, widthin, heightin, beforeimage.asShortBuffer(), widthout, heightout, afterimage.asShortBuffer() );
-      Image.empty_image( psm, widthout, heightout, format, typeout, is_index( format ), afterimage.asShortBuffer(), dataout );
-    
-      return( 0 );
-    } finally {
-      datain.position(datainPos);
-      dataout.position(dataoutPos);
-    }
-  }
-  
-  public static int gluBuild1DMipmapLevels( GL gl, int target, int internalFormat,
-                          int width, int format, int type, int userLevel, int baseLevel,
-                          int maxLevel, ByteBuffer data ) {
-    int dataPos = data.position();
-    try {
-
-      int levels;
-    
-      int rc = checkMipmapArgs( internalFormat, format, type );
-      if( rc != 0 ) {
-        return( rc );
-      }
-    
-      if( width < 1 ) {
-        return( GLU.GLU_INVALID_VALUE );
-      }
-    
-      levels = computeLog( width );
-    
-      levels += userLevel;
-      if( !isLegalLevels( userLevel, baseLevel, maxLevel, levels ) ) {
-        return( GLU.GLU_INVALID_VALUE );
-      }
-    
-      return( BuildMipmap.gluBuild1DMipmapLevelsCore( gl, target, internalFormat, width,
-              width, format, type, userLevel, baseLevel, maxLevel, data ) );
-    } finally {
-      data.position(dataPos);
-    }
-  }
-  
-  public static int gluBuild1DMipmaps( GL gl, int target, int internalFormat, int width,
-              int format, int type, ByteBuffer data ) {
-    int dataPos = data.position();
-
-    try {
-      int[] widthPowerOf2 = new int[1];
-      int levels;
-      int[] dummy = new int[1];
-    
-      int rc = checkMipmapArgs( internalFormat, format, type );
-      if( rc != 0 ) {
-        return( rc );
-      }
-    
-      if( width < 1 ) {
-        return( GLU.GLU_INVALID_VALUE );
-      }
-    
-      closestFit( gl, target, width, 1, internalFormat, format, type, widthPowerOf2, dummy );
-      levels = computeLog( widthPowerOf2[0] );
-    
-      return( BuildMipmap.gluBuild1DMipmapLevelsCore( gl, target, internalFormat, 
-                    width, widthPowerOf2[0], format, type, 0, 0, levels, data ) );
-    } finally {
-      data.position(dataPos);
-    }
-  }
-
- 
-  public static int gluBuild2DMipmapLevels( GL gl, int target, int internalFormat,
-          int width, int height, int format, int type, int userLevel,
-          int baseLevel, int maxLevel, Object data ) {
-    int dataPos = 0;
-
-    int level, levels;
-    
-    int rc = checkMipmapArgs( internalFormat, format, type );
-    if( rc != 0 ) {
-      return( rc );
-    }
-    
-    if( width < 1 || height < 1 ) {
-      return( GLU.GLU_INVALID_VALUE );
-    }
-    
-    levels = computeLog( width );
-    level = computeLog( height );
-    if( level > levels ) {
-      levels = level;
-    }
-    
-    levels += userLevel;
-    if( !isLegalLevels( userLevel, baseLevel, maxLevel, levels ) ) {
-      return( GLU.GLU_INVALID_VALUE );
-    }
-    
-    //PointerWrapper pointer = PointerWrapperFactory.getPointerWrapper( data );
-    ByteBuffer buffer = null;
-    if( data instanceof ByteBuffer ) {
-        buffer = (ByteBuffer)data;
-        dataPos = buffer.position();
-    } else if( data instanceof byte[] ) {
-      byte[] array = (byte[])data;
-      buffer = ByteBuffer.allocateDirect(array.length);
-      buffer.put(array);
-    } else if( data instanceof short[] ) {
-        short[] array = (short[])data;
-        buffer = ByteBuffer.allocateDirect( array.length * 2 );
-        ShortBuffer sb = buffer.asShortBuffer();
-        sb.put( array );
-    } else if( data instanceof int[] ) {
-        int[] array = (int[])data;
-        buffer = ByteBuffer.allocateDirect( array.length * 4 );
-        IntBuffer ib = buffer.asIntBuffer();
-        ib.put( array );
-    } else if( data instanceof float[] ) {
-        float[] array = (float[])data;
-        buffer = ByteBuffer.allocateDirect( array.length * 4 );
-        FloatBuffer fb = buffer.asFloatBuffer();
-        fb.put( array );
-    }
-    
-    try {
-      return( BuildMipmap.gluBuild2DMipmapLevelsCore( gl, target, internalFormat,
-              width, height, width, height, format, type, userLevel, baseLevel,
-              maxLevel, buffer ) );
-    } finally {
-      buffer.position(dataPos);
-    }
-  }
-
- 
-  public static int gluBuild2DMipmaps( GL gl, int target, int internalFormat,
-          int width, int height, int format, int type, Object data ) {
-    int dataPos = 0;
-
-    int[] widthPowerOf2 = new int[1];
-    int[] heightPowerOf2 = new int[1];
-    int level, levels;
-    
-    int rc = checkMipmapArgs( internalFormat, format, type );
-    if( rc != 0 ) {
-      return( rc );
-    }
-    
-    if( width < 1 || height < 1 ) {
-      return( GLU.GLU_INVALID_VALUE );
-    }
-    
-    closestFit( gl, target, width, height, internalFormat, format, type, 
-            widthPowerOf2, heightPowerOf2 );
-    
-    levels = computeLog( widthPowerOf2[0] );
-    level = computeLog( heightPowerOf2[0] );
-    if( level > levels ) {
-      levels = level;
-    }
-    
-    //PointerWrapper pointer = PointerWrapperFactory.getPointerWrapper( data );
-    ByteBuffer buffer = null;
-    if( data instanceof ByteBuffer ) {
-        buffer = (ByteBuffer)data;
-        dataPos = buffer.position();
-    } else if( data instanceof byte[] ) {
-      byte[] array = (byte[])data;
-      buffer = ByteBuffer.allocateDirect(array.length);
-      buffer.put(array);
-    } else if( data instanceof short[] ) {
-        short[] array = (short[])data;
-        buffer = ByteBuffer.allocateDirect( array.length * 2 );
-        ShortBuffer sb = buffer.asShortBuffer();
-        sb.put( array );
-    } else if( data instanceof int[] ) {
-        int[] array = (int[])data;
-        buffer = ByteBuffer.allocateDirect( array.length * 4 );
-        IntBuffer ib = buffer.asIntBuffer();
-        ib.put( array );
-    } else if( data instanceof float[] ) {
-        float[] array = (float[])data;
-        buffer = ByteBuffer.allocateDirect( array.length * 4 );
-        FloatBuffer fb = buffer.asFloatBuffer();
-        fb.put( array );
-    }
-    
-    try {
-      return( BuildMipmap.gluBuild2DMipmapLevelsCore( gl, target, internalFormat, 
-              width, height, widthPowerOf2[0], heightPowerOf2[0], format, type, 0, 
-              0, levels, buffer ) );
-    } finally {
-      buffer.position(dataPos);
-    }
-  }
- 
- 
-  public static int gluBuild3DMipmaps( GL gl, int target, int internalFormat,
-          int width, int height, int depth, int format, int type, ByteBuffer data ) {
-    int dataPos = data.position();
-    try {
-
-      int[] widthPowerOf2 = new int[1];
-      int[] heightPowerOf2 = new int[1];
-      int[] depthPowerOf2 = new int[1];
-      int level, levels;
-    
-      int rc = checkMipmapArgs( internalFormat, format, type );
-      if( rc != 0 ) {
-        return( rc );
-      }
-    
-      if( width < 1 || height < 1 || depth < 1 ) {
-        return( GLU.GLU_INVALID_VALUE );
-      }
-    
-      if( type == GL2.GL_BITMAP ) {
-        return( GLU.GLU_INVALID_ENUM );
-      }
-    
-      closestFit3D( gl, target, width, height, depth, internalFormat, format,
-                    type, widthPowerOf2, heightPowerOf2, depthPowerOf2 );
-    
-      levels = computeLog( widthPowerOf2[0] );
-      level = computeLog( heightPowerOf2[0] );
-      if( level > levels ) {
-        levels = level;
-      }
-      level = computeLog( depthPowerOf2[0] );
-      if( level > levels ) {
-        levels = level;
-      }
-    
-      return( BuildMipmap.gluBuild3DMipmapLevelsCore( gl, target, internalFormat, width,
-              height, depth, widthPowerOf2[0], heightPowerOf2[0], depthPowerOf2[0],
-              format, type, 0, 0, levels, data ) );
-    } finally {
-      data.position(dataPos);
-    }
-  }
-  
-  public static int gluBuild3DMipmapLevels( GL gl, int target, int internalFormat,
-          int width, int height, int depth, int format, int type, int userLevel,
-          int baseLevel, int maxLevel, ByteBuffer data ) {
-    int dataPos = data.position();
-    try {
-      int level, levels;
-    
-      int rc = checkMipmapArgs( internalFormat, format, type );
-      if( rc != 0 ) {
-        return( rc );
-      }
-    
-      if( width < 1 || height < 1 || depth < 1 ) {
-        return( GLU.GLU_INVALID_VALUE );
-      }
-    
-      if( type == GL2.GL_BITMAP ) {
-        return( GLU.GLU_INVALID_ENUM );
-      }
-    
-      levels = computeLog( width );
-      level = computeLog( height );
-      if( level > levels ) {
-        levels = level;
-      }
-      level = computeLog( depth );
-      if( level > levels ) {
-        levels = level;
-      }
-    
-      levels += userLevel;
-      if( !isLegalLevels( userLevel, baseLevel, maxLevel, levels ) ) {
-        return( GLU.GLU_INVALID_VALUE );
-      }
-    
-      return( BuildMipmap.gluBuild3DMipmapLevelsCore( gl, target, internalFormat, width,
-              height, depth, width, height, depth, format, type, userLevel,
-              baseLevel, maxLevel, data ) );
-    } finally {
-      data.position(dataPos);
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/PixelStorageModes.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/PixelStorageModes.java
deleted file mode 100644
index c66d138a2..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/PixelStorageModes.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-/**
- *
- * @author  Administrator
- */
-public class PixelStorageModes {
-
-  /**
-   * Holds value of property packAlignment.
-   */
-  private int packAlignment;
-
-  /**
-   * Holds value of property packRowLength.
-   */
-  private int packRowLength;
-
-  /**
-   * Holds value of property packSkipRows.
-   */
-  private int packSkipRows;
-
-  /**
-   * Holds value of property packSkipPixels.
-   */
-  private int packSkipPixels;
-
-  /**
-   * Holds value of property packLsbFirst.
-   */
-  private boolean packLsbFirst;
-
-  /**
-   * Holds value of property packSwapBytes.
-   */
-  private boolean packSwapBytes;
-
-  /**
-   * Holds value of property packSkipImages.
-   */
-  private int packSkipImages;
-
-  /**
-   * Holds value of property packImageHeight.
-   */
-  private int packImageHeight;
-
-  /**
-   * Holds value of property unpackAlignment.
-   */
-  private int unpackAlignment;
-
-  /**
-   * Holds value of property unpackRowLength.
-   */
-  private int unpackRowLength;
-
-  /**
-   * Holds value of property unpackSkipRows.
-   */
-  private int unpackSkipRows;
-
-  /**
-   * Holds value of property unpackSkipPixels.
-   */
-  private int unpackSkipPixels;
-
-  /**
-   * Holds value of property unpackLsbFirst.
-   */
-  private boolean unpackLsbFirst;
-
-  /**
-   * Holds value of property unpackSwapBytes.
-   */
-  private boolean unpackSwapBytes;
-
-  /**
-   * Holds value of property unpackSkipImages.
-   */
-  private int unpackSkipImages;
-
-  /**
-   * Holds value of property unpackImageHeight.
-   */
-  private int unpackImageHeight;
-  
-  /** Creates a new instance of PixelStorageModes */
-  public PixelStorageModes() {
-  }
-
-  /**
-   * Getter for property packAlignment.
-   * @return Value of property packAlignment.
-   */
-  public int getPackAlignment() {
-
-    return this.packAlignment;
-  }
-
-  /**
-   * Setter for property packAlignment.
-   * @param packAlignment New value of property packAlignment.
-   */
-  public void setPackAlignment(int packAlignment) {
-
-    this.packAlignment = packAlignment;
-  }
-
-  /**
-   * Getter for property packRowLength.
-   * @return Value of property packRowLength.
-   */
-  public int getPackRowLength() {
-
-    return this.packRowLength;
-  }
-
-  /**
-   * Setter for property packRowLength.
-   * @param packRowLength New value of property packRowLength.
-   */
-  public void setPackRowLength(int packRowLength) {
-
-    this.packRowLength = packRowLength;
-  }
-
-  /**
-   * Getter for property packSkipRows.
-   * @return Value of property packSkipRows.
-   */
-  public int getPackSkipRows() {
-
-    return this.packSkipRows;
-  }
-
-  /**
-   * Setter for property packSkipRows.
-   * @param packSkipRows New value of property packSkipRows.
-   */
-  public void setPackSkipRows(int packSkipRows) {
-
-    this.packSkipRows = packSkipRows;
-  }
-
-  /**
-   * Getter for property packSkipPixels.
-   * @return Value of property packSkipPixels.
-   */
-  public int getPackSkipPixels() {
-
-    return this.packSkipPixels;
-  }
-
-  /**
-   * Setter for property packSkipPixels.
-   * @param packSkipPixels New value of property packSkipPixels.
-   */
-  public void setPackSkipPixels(int packSkipPixels) {
-
-    this.packSkipPixels = packSkipPixels;
-  }
-
-  /**
-   * Getter for property packLsbFirst.
-   * @return Value of property packLsbFirst.
-   */
-  public boolean getPackLsbFirst() {
-
-    return this.packLsbFirst;
-  }
-
-  /**
-   * Setter for property packLsbFirst.
-   * @param packLsbFirst New value of property packLsbFirst.
-   */
-  public void setPackLsbFirst(boolean packLsbFirst) {
-
-    this.packLsbFirst = packLsbFirst;
-  }
-
-  /**
-   * Getter for property packSwapBytes.
-   * @return Value of property packSwapBytes.
-   */
-  public boolean getPackSwapBytes() {
-
-    return this.packSwapBytes;
-  }
-
-  /**
-   * Setter for property packSwapBytes.
-   * @param packSwapBytes New value of property packSwapBytes.
-   */
-  public void setPackSwapBytes(boolean packSwapBytes) {
-
-    this.packSwapBytes = packSwapBytes;
-  }
-
-  /**
-   * Getter for property packSkipImages.
-   * @return Value of property packSkipImages.
-   */
-  public int getPackSkipImages() {
-
-    return this.packSkipImages;
-  }
-
-  /**
-   * Setter for property packSkipImages.
-   * @param packSkipImages New value of property packSkipImages.
-   */
-  public void setPackSkipImages(int packSkipImages) {
-
-    this.packSkipImages = packSkipImages;
-  }
-
-  /**
-   * Getter for property packImageHeight.
-   * @return Value of property packImageHeight.
-   */
-  public int getPackImageHeight() {
-
-    return this.packImageHeight;
-  }
-
-  /**
-   * Setter for property packImageHeight.
-   * @param packImageHeight New value of property packImageHeight.
-   */
-  public void setPackImageHeight(int packImageHeight) {
-
-    this.packImageHeight = packImageHeight;
-  }
-
-  /**
-   * Getter for property unpackAlignment.
-   * @return Value of property unpackAlignment.
-   */
-  public int getUnpackAlignment() {
-
-    return this.unpackAlignment;
-  }
-
-  /**
-   * Setter for property unpackAlignment.
-   * @param unpackAlignment New value of property unpackAlignment.
-   */
-  public void setUnpackAlignment(int unpackAlignment) {
-
-    this.unpackAlignment = unpackAlignment;
-  }
-
-  /**
-   * Getter for property unpackRowLength.
-   * @return Value of property unpackRowLength.
-   */
-  public int getUnpackRowLength() {
-
-    return this.unpackRowLength;
-  }
-
-  /**
-   * Setter for property unpackRowLength.
-   * @param unpackRowLength New value of property unpackRowLength.
-   */
-  public void setUnpackRowLength(int unpackRowLength) {
-
-    this.unpackRowLength = unpackRowLength;
-  }
-
-  /**
-   * Getter for property unpackSkipRows.
-   * @return Value of property unpackSkipRows.
-   */
-  public int getUnpackSkipRows() {
-
-    return this.unpackSkipRows;
-  }
-
-  /**
-   * Setter for property unpackSkipRows.
-   * @param unpackSkipRows New value of property unpackSkipRows.
-   */
-  public void setUnpackSkipRows(int unpackSkipRows) {
-
-    this.unpackSkipRows = unpackSkipRows;
-  }
-
-  /**
-   * Getter for property unpackSkipPixels.
-   * @return Value of property unpackSkipPixels.
-   */
-  public int getUnpackSkipPixels() {
-
-    return this.unpackSkipPixels;
-  }
-
-  /**
-   * Setter for property unpackSkipPixels.
-   * @param unpackSkipPixels New value of property unpackSkipPixels.
-   */
-  public void setUnpackSkipPixels(int unpackSkipPixels) {
-
-    this.unpackSkipPixels = unpackSkipPixels;
-  }
-
-  /**
-   * Getter for property unpackLsbFirst.
-   * @return Value of property unpackLsbFirst.
-   */
-  public boolean getUnpackLsbFirst() {
-
-    return this.unpackLsbFirst;
-  }
-
-  /**
-   * Setter for property unpackLsbFirst.
-   * @param unpackLsbFirst New value of property unpackLsbFirst.
-   */
-  public void setUnpackLsbFirst(boolean unpackLsbFirst) {
-
-    this.unpackLsbFirst = unpackLsbFirst;
-  }
-
-  /**
-   * Getter for property unpackSwapBytes.
-   * @return Value of property unpackSwapBytes.
-   */
-  public boolean getUnpackSwapBytes() {
-
-    return this.unpackSwapBytes;
-  }
-
-  /**
-   * Setter for property unpackSwapBytes.
-   * @param unpackSwapBytes New value of property unpackSwapBytes.
-   */
-  public void setUnpackSwapBytes(boolean unpackSwapBytes) {
-
-    this.unpackSwapBytes = unpackSwapBytes;
-  }
-
-  /**
-   * Getter for property unpackSkipImages.
-   * @return Value of property unpackSkipImages.
-   */
-  public int getUnpackSkipImages() {
-
-    return this.unpackSkipImages;
-  }
-
-  /**
-   * Setter for property unpackSkipImages.
-   * @param unpackSkipImages New value of property unpackSkipImages.
-   */
-  public void setUnpackSkipImages(int unpackSkipImages) {
-
-    this.unpackSkipImages = unpackSkipImages;
-  }
-
-  /**
-   * Getter for property unpackImageHeight.
-   * @return Value of property unpackImageHeight.
-   */
-  public int getUnpackImageHeight() {
-
-    return this.unpackImageHeight;
-  }
-
-  /**
-   * Setter for property unpackImageHeight.
-   * @param unpackImageHeight New value of property unpackImageHeight.
-   */
-  public void setUnpackImageHeight(int unpackImageHeight) {
-
-    this.unpackImageHeight = unpackImageHeight;
-  }
-  
-  
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ScaleInternal.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ScaleInternal.java
deleted file mode 100644
index d998e4bf0..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ScaleInternal.java
+++ /dev/null
@@ -1,2447 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.glu.GLU;
-import java.nio.*;
-import com.sun.opengl.impl.InternalBufferUtil;
-
-/**
- *
- * @author  Administrator
- */
-public class ScaleInternal {
-  
-  public static final float UINT_MAX = (float)(0x00000000FFFFFFFF);
-  
-  public static void scale_internal( int components, int widthin, int heightin,
-          ShortBuffer datain, int widthout, int heightout, ShortBuffer dataout ) {
-    float x, lowx, highx, convx, halfconvx;
-    float y, lowy, highy, convy, halfconvy;
-    float xpercent, ypercent;
-    float percent;
-    // Max components in a format is 4, so...
-    float[] totals = new float[4];
-    float area;
-    int i, j, k, yint, xint, xindex, yindex;
-    int temp;
-    
-    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
-      HalveImage.halveImage( components, widthin, heightin, datain, dataout );
-      return;
-    }
-    convy = (float)heightin / heightout;
-    convx = (float)widthin / widthout;
-    halfconvx = convx / 2;
-    halfconvy = convy / 2;
-    for( i = 0; i < heightout; i++ ) {
-      y = convy * ( i + 0.5f );
-      if( heightin > heightout ) {
-        highy = y + halfconvy;
-        lowy = y - halfconvy;
-      } else {
-        highy = y + 0.5f;
-        lowy = y - 0.5f;
-      }
-      for( j = 0; j < widthout; j++ ) {
-        x = convx * ( j + 0.5f );
-        if( widthin > widthout ) {
-          highx = x + halfconvx;
-          lowx = x - halfconvx;
-        } else {
-          highx = x + 0.5f;
-          lowx = x - 0.5f;
-        }
-        // Ok, now apply box filter to box that goes from (lowx, lowy)
-        // to (highx, highy) on input data into this pixel on output
-        // data.
-        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
-        area = 0.0f;
-        
-        y = lowy;
-        yint = (int)Math.floor( y );
-        while( y < highy ) {
-          yindex = ( yint + heightin ) % heightin;
-          if( highy < yint + 1 ) {
-            ypercent = highy - y;
-          } else {
-            ypercent = yint + 1 - y;
-          }
-          
-          x = lowx;
-          xint = (int)Math.floor( x );
-          
-          while( x < highx ) {
-            xindex = ( xint + widthin ) % widthin;
-            if( highx < xint + 1 ) {
-              xpercent = highx -x;
-            } else {
-              xpercent = xint + 1 - x;
-            }
-            
-            percent = xpercent * ypercent;
-            area += percent;
-            temp = ( xindex + ( yindex * widthin) ) * components;
-            for( k = 0; k < components; k++ ) {
-              totals[k] += datain.get( temp + k ) * percent; 
-            }
-            
-            xint++;
-            x = xint;
-          }
-          yint++;
-          y = yint;
-        }
-        
-        temp = ( j + ( i * widthout ) ) * components;
-        for( k = 0; k < components; k++ ) {
-          // totals[] should be rounded in the case of enlarging an RGB
-          // ramp when the type is 332 or 4444
-          dataout.put(  temp + k, (short)((totals[k] + 0.5f) / area) );
-        }
-      }
-    }
-  }
-  
-  public static void scale_internal_ubyte( int components, int widthin, int heightin,
-                              ByteBuffer datain, int widthout, int heightout, 
-                              ByteBuffer dataout, int element_size, int ysize, int group_size ) {
-    float x, convx;
-    float y, convy;
-    float percent;
-    // Max components in a format is 4, so...
-    float[] totals = new float[4];
-    float area;
-    int i, j, k, xindex;
-    
-    int temp, temp0;
-    int temp_index;
-    int outindex;
-    
-    int lowx_int, highx_int, lowy_int, highy_int;
-    float x_percent, y_percent;
-    float lowx_float, highx_float, lowy_float, highy_float;
-    float convy_float, convx_float;
-    int convy_int, convx_int;
-    int l, m;
-    int left, right;
-    
-    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
-      HalveImage.halveImage_ubyte( components, widthin, heightin, datain, dataout, 
-                        element_size, ysize, group_size );
-      return;
-    }
-    convy = (float)heightin / heightout;
-    convx = (float)widthin / widthout;
-    convy_int = (int)Math.floor( convy );
-    convy_float = convy - convy_int;
-    convx_int = (int)Math.floor( convx );
-    convx_float = convx - convx_int;
-    
-    area = convx * convy;
-    
-    lowy_int = 0;
-    lowy_float = 0.0f;
-    highy_int = convy_int;
-    highy_float = convy_float;
-    
-    for( i = 0; i < heightout; i++ ) {
-      // Clamp here to be sure we don't read beyond input buffer.
-      if (highy_int >= heightin)
-        highy_int = heightin - 1;
-      lowx_int = 0;
-      lowx_float = 0.0f;
-      highx_int = convx_int;
-      highx_float = convx_float;
-      
-      for( j = 0; j < widthout; j++ ) {
-        
-        // Ok, now apply box filter to box that goes from (lowx, lowy)
-        // to (highx, highy) on input data into this pixel on output
-        // data.
-        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
-        
-        // caulate the value for pixels in the 1st row
-        xindex = lowx_int * group_size;
-
-        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
-          
-          y_percent = 1 - lowy_float;
-          temp = xindex + lowy_int * ysize;
-          percent = y_percent * ( 1 - lowx_float );
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += ( 0x000000FF & datain.get() ) * percent;
-          }
-          left = temp;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              totals[k] += ( 0x000000FF & datain.get() ) * y_percent;
-            }
-          }
-          temp += group_size;
-          right = temp;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += ( 0x000000FF & datain.get() ) * percent;
-          }
-          
-          // calculate the value for pixels in the last row
-          y_percent = highy_float;
-          percent = y_percent * ( 1 - lowx_float );
-          temp = xindex + highy_int * ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += ( 0x000000FF & datain.get() ) * percent;
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              totals[k] += ( 0x000000FF & datain.get() ) * y_percent;
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += ( 0x000000FF & datain.get() ) * percent;
-          }
-          
-          // calculate the value for the pixels in the 1st and last column
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            left += ysize;
-            right += ysize;
-            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
-              float f = 0.0f;
-              datain.position( left );
-              f = ( 0x000000FF & datain.get() ) * ( 1.0f - lowx_float );
-              datain.position( right );
-              f += ( 0x000000FF & datain.get() ) * highx_float;
-              totals[k] += f;
-            }
-          }
-        } else if( highy_int > lowy_int ) {
-          x_percent = highx_float - lowx_float;
-          percent = ( 1 - lowy_float) * x_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += ( 0x000000FF & datain.get() ) * percent;
-          }
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            temp += ysize;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              totals[k] += ( 0x000000FF & datain.get() ) * x_percent;
-            }
-          }
-          percent = x_percent * highy_float;
-          temp += ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += ( 0x000000FF & datain.get() ) * percent;
-          }
-        } else if( highx_int > lowx_int ) {
-          y_percent = highy_float - lowy_float;
-          percent = ( 1 - lowx_float ) * y_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += ( 0x000000FF & datain.get() ) * percent;
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              totals[k] += ( 0x000000FF & datain.get() ) * y_percent;
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += ( 0x000000FF & datain.get() ) * percent;
-          }
-        } else {
-          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += ( 0x000000FF & datain.get() ) * percent;
-          }
-        }
-
-        // this is for the pixels in the body
-        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
-        for( m = lowy_int + 1; m < highy_int; m++ ) {
-          temp = temp0;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              totals[k] += ( 0x000000FF & datain.get() );
-            }
-            temp += group_size;
-          }
-          temp0 += ysize;
-        }
-        
-        outindex = ( j + ( i * widthout ) ) * components;
-        for( k = 0; k < components; k++ ) {
-          dataout.position( outindex + k );
-          dataout.put( (byte)(totals[k] / area) );
-        }
-        lowx_int = highx_int;
-        lowx_float = highx_float;
-        highx_int += convx_int;
-        highx_float += convx_float;
-        if( highx_float > 1.0f ) {
-          highx_float -= 1.0f;
-          highx_int++;
-        }
-
-        // Clamp to make sure we don't run off the right edge
-        if (highx_int > widthin - 1) {
-          int delta = (highx_int - widthin + 1);
-          lowx_int -= delta;
-          highx_int -= delta;
-        }
-      }
-      lowy_int = highy_int;
-      lowy_float = highy_float;
-      highy_int += convy_int;
-      highy_float += convy_float;
-      if( highy_float > 1.0f ) {
-        highy_float -= 1.0f;
-        highy_int++;
-      }
-    }
-  }
-  
-  public static void scale_internal_byte( int components, int widthin, int heightin,
-                              ByteBuffer datain, int widthout, int heightout, 
-                              ByteBuffer dataout, int element_size, int ysize,
-                              int group_size ) {
-    float x, convx;
-    float y, convy;
-    float percent;
-    // Max components in a format is 4, so...
-    float[] totals = new float[4];
-    float area;
-    int i, j, k, xindex;
-    
-    int temp, temp0;
-    int temp_index;
-    int outindex;
-    
-    int lowx_int, highx_int, lowy_int, highy_int;
-    float x_percent, y_percent;
-    float lowx_float, highx_float, lowy_float, highy_float;
-    float convy_float, convx_float;
-    int convy_int, convx_int;
-    int l, m;
-    int left, right;
-    
-    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
-      HalveImage.halveImage_byte( components, widthin, heightin, datain, dataout, 
-                        element_size, ysize, group_size );
-      return;
-    }
-    convy = (float)heightin / heightout;
-    convx = (float)widthin / widthout;
-    convy_int = (int)Math.floor( convy );
-    convy_float = convy - convy_int;
-    convx_int = (int)Math.floor( convx );
-    convx_float = convx - convx_int;
-    
-    area = convx * convy;
-    
-    lowy_int = 0;
-    lowy_float = 0.0f;
-    highy_int = convy_int;
-    highy_float = convy_float;
-    
-    for( i = 0; i < heightout; i++ ) {
-      // Clamp here to be sure we don't read beyond input buffer.
-      if (highy_int >= heightin)
-        highy_int = heightin - 1;
-      lowx_int = 0;
-      lowx_float = 0.0f;
-      highx_int = convx_int;
-      highx_float = convx_float;
-      
-      for( j = 0; j < widthout; j++ ) {
-        
-        // Ok, now apply box filter to box that goes from (lowx, lowy)
-        // to (highx, highy) on input data into this pixel on output
-        // data.
-        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
-        
-        // caulate the value for pixels in the 1st row
-        xindex = lowx_int * group_size;
-        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
-          
-          y_percent = 1 - lowy_float;
-          temp = xindex + lowy_int * ysize;
-          percent = y_percent * ( 1 - lowx_float );
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += datain.get() * percent;
-          }
-          left = temp;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              totals[k] += datain.get() * y_percent;
-            }
-          }
-          temp += group_size;
-          right = temp;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += datain.get() * percent;
-          }
-          
-          // calculate the value for pixels in the last row
-          y_percent = highy_float;
-          percent = y_percent * ( 1 - lowx_float );
-          temp = xindex + highy_int * ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += datain.get() * percent;
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              totals[k] += datain.get() * y_percent;
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += datain.get() * percent;
-          }
-          
-          // calculate the value for the pixels in the 1st and last column
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            left += ysize;
-            right += ysize;
-            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
-              float f = 0.0f;
-              datain.position( left );
-              f = datain.get() * ( 1 - lowx_float );
-              datain.position( right );
-              f += datain.get() * highx_float;
-              totals[k] += f;
-            }
-          }
-        } else if( highy_int > lowy_int ) {
-          x_percent = highx_float - lowx_float;
-          percent = ( 1 - lowy_float) * x_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += datain.get() * percent;
-          }
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            temp += ysize;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              totals[k] += datain.get() * x_percent;
-            }
-          }
-          percent = x_percent * highy_float;
-          temp += ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += datain.get() * percent;
-          }
-        } else if( highx_int > lowx_int ) {
-          y_percent = highy_float - lowy_float;
-          percent = ( 1 - lowx_float ) * y_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += datain.get() * percent;
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              totals[k] += datain.get() * y_percent;
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += datain.get() * percent;
-          }
-        } else {
-          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            totals[k] += datain.get() * percent;
-          }
-        }
-        
-        // this is for the pixels in the body
-        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
-        for( m = lowy_int + 1; m < highy_int; m++ ) {
-          temp = temp0;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              totals[k] += datain.get();
-            }
-            temp += group_size;
-          }
-          temp0 += ysize;
-        }
-        
-        outindex = ( j + ( i * widthout ) ) * components;
-        for( k = 0; k < components; k++ ) {
-          dataout.position( outindex + k );
-          dataout.put( (byte)(totals[k] / area) );
-        }
-        lowx_int = highx_int;
-        lowx_float = highx_float;
-        highx_int += convx_int;
-        highx_float += convx_float;
-        if( highx_float > 1.0f ) {
-          highx_float -= 1.0f;
-          highx_int++;
-        }
-
-        // Clamp to make sure we don't run off the right edge
-        if (highx_int > widthin - 1) {
-          int delta = (highx_int - widthin + 1);
-          lowx_int -= delta;
-          highx_int -= delta;
-        }
-      }
-      lowy_int = highy_int;
-      lowy_float = highy_float;
-      highy_int += convy_int;
-      highy_float += convy_float;
-      if( highy_float > 1.0f ) {
-        highy_float -= 1.0f;
-        highy_int++;
-      }
-    }
-  }
-  
-  public static void scale_internal_ushort( int components, int widthin, int heightin,
-                              ByteBuffer datain, int widthout, int heightout, 
-                              ShortBuffer dataout, int element_size, int ysize, 
-                              int group_size, boolean myswap_bytes ) {
-    float x, convx;
-    float y, convy;
-    float percent;
-    // Max components in a format is 4, so...
-    float[] totals = new float[4];
-    float area;
-    int i, j, k, xindex;
-    
-    int temp, temp0;
-    int temp_index;
-    int outindex;
-    
-    int lowx_int, highx_int, lowy_int, highy_int;
-    float x_percent, y_percent;
-    float lowx_float, highx_float, lowy_float, highy_float;
-    float convy_float, convx_float;
-    int convy_int, convx_int;
-    int l, m;
-    int left, right;
-    
-    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
-      HalveImage.halveImage_ushort( components, widthin, heightin, datain, dataout, 
-                        element_size, ysize, group_size, myswap_bytes );
-      return;
-    }
-    convy = (float)heightin / heightout;
-    convx = (float)widthin / widthout;
-    convy_int = (int)Math.floor( convy );
-    convy_float = convy - convy_int;
-    convx_int = (int)Math.floor( convx );
-    convx_float = convx - convx_int;
-    
-    area = convx * convy;
-    
-    lowy_int = 0;
-    lowy_float = 0.0f;
-    highy_int = convy_int;
-    highy_float = convy_float;
-    
-    for( i = 0; i < heightout; i++ ) {
-      // Clamp here to be sure we don't read beyond input buffer.
-      if (highy_int >= heightin)
-        highy_int = heightin - 1;
-      lowx_int = 0;
-      lowx_float = 0.0f;
-      highx_int = convx_int;
-      highx_float = convx_float;
-      
-      for( j = 0; j < widthout; j++ ) {
-        
-        // Ok, now apply box filter to box that goes from (lowx, lowy)
-        // to (highx, highy) on input data into this pixel on output
-        // data.
-        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
-        
-        // caulate the value for pixels in the 1st row
-        xindex = lowx_int * group_size;
-        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
-          
-          y_percent = 1 - lowy_float;
-          temp = xindex + lowy_int * ysize;
-          percent = y_percent * ( 1 - lowx_float );
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += ( 0x0000FFFF & ((int)Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ))) * percent;
-            } else {
-              totals[k] += ( 0x0000FFFF & datain.getShort() ) * percent;
-            }
-          }
-          left = temp;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                totals[k] += ( 0x0000FFFF & ((int)Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ))) * y_percent;
-              } else {
-                totals[k] += ( 0x0000FFFF & datain.getShort()) * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          right = temp;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += ( 0x0000FFFF & (Mipmap.GLU_SWAP_2_BYTES( datain.getShort() ))) * percent;
-            } else {
-              totals[k] += ( 0x0000FFFF & datain.getShort()) * percent;
-            }
-          }
-          
-          // calculate the value for pixels in the last row
-          y_percent = highy_float;
-          percent = y_percent * ( 1 - lowx_float );
-          temp = xindex + highy_int * ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * percent;
-            } else {
-              totals[k] += ( 0x0000FFFF & datain.getShort() ) * percent;
-            }
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                totals[k] += ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * y_percent;
-              } else {
-                totals[k] += ( 0x0000FFFF & datain.getShort()) * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += ( 0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * percent;
-            } else {
-              totals[k] += ( 0x0000FFFF & datain.getShort()) * percent;
-            }
-          }
-          
-          // calculate the value for the pixels in the 1st and last column
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            left += ysize;
-            right += ysize;
-            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
-              if( myswap_bytes ) {
-                datain.position( left );
-                float f = (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES(datain.getShort())) * ( 1 - lowx_float );
-                datain.position( right );
-                f += ((0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES(datain.getShort())) * highx_float);
-                totals[k] += f;
-              } else {
-                datain.position( left );
-                float f = ((0x0000FFFF & datain.getShort()) * ( 1 - lowx_float ));
-                datain.position( right );
-                f += ((0x0000FFFF & datain.getShort()) * highx_float);
-                totals[k] += f;
-              }
-            }
-          }
-        } else if( highy_int > lowy_int ) {
-          x_percent = highx_float - lowx_float;
-          percent = ( 1 - lowy_float) * x_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() )) * percent;
-            } else {
-              totals[k] += (0x0000FFFF & datain.getShort()) * percent;
-            }
-          }
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            temp += ysize;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * x_percent;
-              } else {
-                totals[k] += (0x0000FFFF & datain.getShort()) * x_percent;
-              }
-            }
-          }
-          percent = x_percent * highy_float;
-          temp += ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort() )) * percent;
-            } else {
-              totals[k] += (0x0000FFFF & datain.getShort()) * percent;
-            }
-          }
-        } else if( highx_int > lowx_int ) {
-          y_percent = highy_float - lowy_float;
-          percent = ( 1 - lowx_float ) * y_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * percent;
-            } else {
-              totals[k] += (0x0000FFFF & datain.getShort()) * percent;
-            }
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * y_percent;
-              } else {
-                totals[k] += (0x0000FFFF & datain.getShort()) * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * percent;
-            } else {
-              totals[k] += (0x0000FFFF & datain.getShort()) * percent;
-            }
-          }
-        } else {
-          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()) ) * percent;
-            } else {
-              totals[k] += (0x0000FFFF & datain.getShort()) * percent;
-            }
-          }
-        }
-        
-        // this is for the pixels in the body
-        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
-        for( m = lowy_int + 1; m < highy_int; m++ ) {
-          temp = temp0;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                totals[k] += (0x0000FFFF & Mipmap.GLU_SWAP_2_BYTES( datain.getShort()));
-              } else {
-                totals[k] += (0x0000FFFF & datain.getShort());
-              }
-            }
-            temp += group_size;
-          }
-          temp0 += ysize;
-        }
-        
-        outindex = ( j + ( i * widthout ) ) * components;
-        for( k = 0; k < components; k++ ) {
-          dataout.position( outindex + k );
-          dataout.put( (short)(totals[k] / area) );
-        }
-        lowx_int = highx_int;
-        lowx_float = highx_float;
-        highx_int += convx_int;
-        highx_float += convx_float;
-        if( highx_float > 1.0f ) {
-          highx_float -= 1.0f;
-          highx_int++;
-        }
-
-        // Clamp to make sure we don't run off the right edge
-        if (highx_int > widthin - 1) {
-          int delta = (highx_int - widthin + 1);
-          lowx_int -= delta;
-          highx_int -= delta;
-        }
-      }
-      lowy_int = highy_int;
-      lowy_float = highy_float;
-      highy_int += convy_int;
-      highy_float += convy_float;
-      if( highy_float > 1.0f ) {
-        highy_float -= 1.0f;
-        highy_int++;
-      }
-    }
-  }
-  
-  public static void scale_internal_short( int components, int widthin, int heightin,
-                              ByteBuffer datain, int widthout, int heightout,
-                              ShortBuffer dataout, int element_size, int ysize, 
-                              int group_size, boolean myswap_bytes ) {
-    float x, convx;
-    float y, convy;
-    float percent;
-    // Max components in a format is 4, so...
-    float[] totals = new float[4];
-    float area;
-    int i, j, k, xindex;
-    
-    int temp, temp0;
-    int temp_index;
-    int outindex;
-    
-    int lowx_int, highx_int, lowy_int, highy_int;
-    float x_percent, y_percent;
-    float lowx_float, highx_float, lowy_float, highy_float;
-    float convy_float, convx_float;
-    int convy_int, convx_int;
-    int l, m;
-    int left, right;
-    
-    int swapbuf; // unsigned buffer
-    
-    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
-      HalveImage.halveImage_short( components, widthin, heightin, datain, dataout, 
-                        element_size, ysize, group_size, myswap_bytes );
-      return;
-    }
-    convy = (float)heightin / heightout;
-    convx = (float)widthin / widthout;
-    convy_int = (int)Math.floor( convy );
-    convy_float = convy - convy_int;
-    convx_int = (int)Math.floor( convx );
-    convx_float = convx - convx_int;
-    
-    area = convx * convy;
-    
-    lowy_int = 0;
-    lowy_float = 0.0f;
-    highy_int = convy_int;
-    highy_float = convy_float;
-    
-    for( i = 0; i < heightout; i++ ) {
-      // Clamp here to be sure we don't read beyond input buffer.
-      if (highy_int >= heightin)
-        highy_int = heightin - 1;
-      lowx_int = 0;
-      lowx_float = 0.0f;
-      highx_int = convx_int;
-      highx_float = convx_float;
-      
-      for( j = 0; j < widthout; j++ ) {
-        
-        // Ok, now apply box filter to box that goes from (lowx, lowy)
-        // to (highx, highy) on input data into this pixel on output
-        // data.
-        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
-        
-        // caulate the value for pixels in the 1st row
-        xindex = lowx_int * group_size;
-        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
-          
-          y_percent = 1 - lowy_float;
-          temp = xindex + lowy_int * ysize;
-          percent = y_percent * ( 1 - lowx_float );
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getShort() * percent;
-            }
-          }
-          left = temp;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-                totals[k] += swapbuf * y_percent;
-              } else {
-                totals[k] += datain.getShort() * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          right = temp;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getShort() * percent;
-            }
-          }
-          
-          // calculate the value for pixels in the last row
-          y_percent = highy_float;
-          percent = y_percent * ( 1 - lowx_float );
-          temp = xindex + highy_int * ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getShort() * percent;
-            }
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-                totals[k] += swapbuf * y_percent;
-              } else {
-                totals[k] += datain.getShort() * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getShort() * percent;
-            }
-          }
-          
-          // calculate the value for the pixels in the 1st and last column
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            left += ysize;
-            right += ysize;
-            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
-              if( myswap_bytes ) {
-                datain.position( left );
-                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-                totals[k] += swapbuf * ( 1 - lowx_float );
-                datain.position( right );
-                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-                totals[k] += swapbuf * highx_float;
-              } else {
-                datain.position( left );
-                totals[k] += datain.getShort() * ( 1 - lowx_float );
-                datain.position( right );
-                totals[k] += datain.getShort() * highx_float;
-              }
-            }
-          }
-        } else if( highy_int > lowy_int ) {
-          x_percent = highx_float - lowx_float;
-          percent = ( 1 - lowy_float) * x_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getShort() * percent;
-            }
-          }
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            temp += ysize;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort());
-                totals[k] += swapbuf * x_percent;
-              } else {
-                totals[k] += datain.getShort() * x_percent;
-              }
-            }
-          }
-          percent = x_percent * highy_float;
-          temp += ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getShort() * percent;
-            }
-          }
-        } else if( highx_int > lowx_int ) {
-          y_percent = highy_float - lowy_float;
-          percent = ( 1 - lowx_float ) * y_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getShort() * percent;
-            }
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-                totals[k] += swapbuf * y_percent;
-              } else {
-                totals[k] += datain.getShort() * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getShort() * percent;
-            }
-          }
-        } else {
-          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getShort() * percent;
-            }
-          }
-        }
-        
-        // this is for the pixels in the body
-        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
-        for( m = lowy_int + 1; m < highy_int; m++ ) {
-          temp = temp0;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_2_BYTES( datain.getShort() );
-                totals[k] += swapbuf;
-              } else {
-                totals[k] += datain.getShort();
-              }
-            }
-            temp += group_size;
-          }
-          temp0 += ysize;
-        }
-        
-        outindex = ( j + ( i * widthout ) ) * components;
-        for( k = 0; k < components; k++ ) {
-          dataout.position( outindex + k );
-          dataout.put( (short)(totals[k] / area) );
-        }
-        lowx_int = highx_int;
-        lowx_float = highx_float;
-        highx_int += convx_int;
-        highx_float += convx_float;
-        if( highx_float > 1.0f ) {
-          highx_float -= 1.0f;
-          highx_int++;
-        }
-
-        // Clamp to make sure we don't run off the right edge
-        if (highx_int > widthin - 1) {
-          int delta = (highx_int - widthin + 1);
-          lowx_int -= delta;
-          highx_int -= delta;
-        }
-      }
-      lowy_int = highy_int;
-      lowy_float = highy_float;
-      highy_int += convy_int;
-      highy_float += convy_float;
-      if( highy_float > 1.0f ) {
-        highy_float -= 1.0f;
-        highy_int++;
-      }
-    }
-  }
-  
-  public static void scale_internal_uint( int components, int widthin, int heightin,
-                              ByteBuffer datain, int widthout, int heightout, 
-                              IntBuffer dataout, int element_size, int ysize, 
-                              int group_size, boolean myswap_bytes ) {
-    float x, convx;
-    float y, convy;
-    float percent;
-    // Max components in a format is 4, so...
-    float[] totals = new float[4];
-    float area;
-    int i, j, k, xindex;
-    
-    int temp, temp0;
-    int temp_index;
-    int outindex;
-    
-    int lowx_int, highx_int, lowy_int, highy_int;
-    float x_percent, y_percent;
-    float lowx_float, highx_float, lowy_float, highy_float;
-    float convy_float, convx_float;
-    int convy_int, convx_int;
-    int l, m;
-    int left, right;
-    
-    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
-      HalveImage.halveImage_uint( components, widthin, heightin, datain, dataout, 
-                        element_size, ysize, group_size, myswap_bytes );
-      return;
-    }
-    convy = (float)heightin / heightout;
-    convx = (float)widthin / widthout;
-    convy_int = (int)Math.floor( convy );
-    convy_float = convy - convy_int;
-    convx_int = (int)Math.floor( convx );
-    convx_float = convx - convx_int;
-    
-    area = convx * convy;
-    
-    lowy_int = 0;
-    lowy_float = 0.0f;
-    highy_int = convy_int;
-    highy_float = convy_float;
-    
-    for( i = 0; i < heightout; i++ ) {
-      // Clamp here to be sure we don't read beyond input buffer.
-      if (highy_int >= heightin)
-        highy_int = heightin - 1;
-      lowx_int = 0;
-      lowx_float = 0.0f;
-      highx_int = convx_int;
-      highx_float = convx_float;
-      
-      for( j = 0; j < widthout; j++ ) {
-        
-        // Ok, now apply box filter to box that goes from (lowx, lowy)
-        // to (highx, highy) on input data into this pixel on output
-        // data.
-        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
-        
-        // caulate the value for pixels in the 1st row
-        xindex = lowx_int * group_size;
-        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
-          
-          y_percent = 1 - lowy_float;
-          temp = xindex + lowy_int * ysize;
-          percent = y_percent * ( 1 - lowx_float );
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()) ) * percent;
-            } else {
-              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
-            }
-          }
-          left = temp;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()) ) * y_percent;
-              } else {
-                totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          right = temp;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()) ) * percent;
-            } else {
-              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
-            }
-          }
-          
-          // calculate the value for pixels in the last row
-          y_percent = highy_float;
-          percent = y_percent * ( 1 - lowx_float );
-          temp = xindex + highy_int * ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()) ) * percent;
-            } else {
-              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
-            }
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()) ) * y_percent;
-              } else {
-                totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()) ) * percent;
-            } else {
-              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
-            }
-          }
-          
-          // calculate the value for the pixels in the 1st and last column
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            left += ysize;
-            right += ysize;
-            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
-              if( myswap_bytes ) {
-                datain.position( left );
-                totals[k] += ((0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES(datain.getInt())) * ( 1 - lowx_float ));
-                datain.position( right );
-                totals[k] += ((0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES(datain.getInt())) * highx_float);
-              } else {
-                datain.position( left );
-                totals[k] += ((0x00000000FFFFFFFF & datain.getInt()) * ( 1 - lowx_float ));
-                datain.position( right );
-                totals[k] += ((0x00000000FFFFFFFF & datain.getInt()) * highx_float);
-              }
-            }
-          }
-        } else if( highy_int > lowy_int ) {
-          x_percent = highx_float - lowx_float;
-          percent = ( 1 - lowy_float) * x_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * percent;
-            } else {
-              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
-            }
-          }
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            temp += ysize;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * x_percent;
-              } else {
-                totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * x_percent;
-              }
-            }
-          }
-          percent = x_percent * highy_float;
-          temp += ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * percent;
-            } else {
-              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
-            }
-          }
-        } else if( highx_int > lowx_int ) {
-          y_percent = highy_float - lowy_float;
-          percent = ( 1 - lowx_float ) * y_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * percent;
-            } else {
-              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
-            }
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * y_percent;
-              } else {
-                totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * percent;
-            } else {
-              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
-            }
-          }
-        } else {
-          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            long tempInt0 = ( 0xFFFFFFFFL & datain.getInt( temp_index ) );
-            datain.position( temp_index );
-            long tempInt1 = ( 0xFFFFFFFFL & datain.getInt() );
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt())) * percent;
-            } else {
-              totals[k] += (0x00000000FFFFFFFF & datain.getInt()) * percent;
-            }
-          }
-        }
-        
-        // this is for the pixels in the body
-        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
-        for( m = lowy_int + 1; m < highy_int; m++ ) {
-          temp = temp0;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                totals[k] += (0x00000000FFFFFFFF & Mipmap.GLU_SWAP_4_BYTES( datain.getInt()));
-              } else {
-                totals[k] += (0x00000000FFFFFFFF & datain.getInt());
-              }
-            }
-            temp += group_size;
-          }
-          temp0 += ysize;
-        }
-        
-        outindex = ( j + ( i * widthout ) ) * components;
-        float value = 0.0f;
-        for( k = 0; k < components; k++ ) {
-          value = totals[k] / area;
-          dataout.position( outindex + k );
-          if( value >= UINT_MAX ) {
-            dataout.put( (int)value );
-          } else {
-            dataout.put( (int)(totals[k] / area) );
-          }
-        }
-        lowx_int = highx_int;
-        lowx_float = highx_float;
-        highx_int += convx_int;
-        highx_float += convx_float;
-        if( highx_float > 1.0f ) {
-          highx_float -= 1.0f;
-          highx_int++;
-        }
-
-        // Clamp to make sure we don't run off the right edge
-        if (highx_int > widthin - 1) {
-          int delta = (highx_int - widthin + 1);
-          lowx_int -= delta;
-          highx_int -= delta;
-        }
-      }
-      lowy_int = highy_int;
-      lowy_float = highy_float;
-      highy_int += convy_int;
-      highy_float += convy_float;
-      if( highy_float > 1.0f ) {
-        highy_float -= 1.0f;
-        highy_int++;
-      }
-    }
-  }
-  
-  public static void scale_internal_int( int components, int widthin, int heightin,
-                              ByteBuffer datain, int widthout, int heightout, 
-                              IntBuffer dataout, int element_size, int ysize, 
-                              int group_size, boolean myswap_bytes ) {
-    float x, convx;
-    float y, convy;
-    float percent;
-    // Max components in a format is 4, so...
-    float[] totals = new float[4];
-    float area;
-    int i, j, k, xindex;
-    
-    int temp, temp0;
-    int temp_index;
-    int outindex;
-    
-    int lowx_int, highx_int, lowy_int, highy_int;
-    float x_percent, y_percent;
-    float lowx_float, highx_float, lowy_float, highy_float;
-    float convy_float, convx_float;
-    int convy_int, convx_int;
-    int l, m;
-    int left, right;
-    
-    long swapbuf; // unsigned buffer
-    
-    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
-      HalveImage.halveImage_int( components, widthin, heightin, datain, dataout, 
-                        element_size, ysize, group_size, myswap_bytes );
-      return;
-    }
-    convy = (float)heightin / heightout;
-    convx = (float)widthin / widthout;
-    convy_int = (int)Math.floor( convy );
-    convy_float = convy - convy_int;
-    convx_int = (int)Math.floor( convx );
-    convx_float = convx - convx_int;
-    
-    area = convx * convy;
-    
-    lowy_int = 0;
-    lowy_float = 0.0f;
-    highy_int = convy_int;
-    highy_float = convy_float;
-    
-    for( i = 0; i < heightout; i++ ) {
-      // Clamp here to be sure we don't read beyond input buffer.
-      if (highy_int >= heightin)
-        highy_int = heightin - 1;
-      lowx_int = 0;
-      lowx_float = 0.0f;
-      highx_int = convx_int;
-      highx_float = convx_float;
-      
-      for( j = 0; j < widthout; j++ ) {
-        
-        // Ok, now apply box filter to box that goes from (lowx, lowy)
-        // to (highx, highy) on input data into this pixel on output
-        // data.
-        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
-        
-        // caulate the value for pixels in the 1st row
-        xindex = lowx_int * group_size;
-        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
-          
-          y_percent = 1 - lowy_float;
-          temp = xindex + lowy_int * ysize;
-          percent = y_percent * ( 1 - lowx_float );
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getInt() * percent;
-            }
-          }
-          left = temp;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-                totals[k] += swapbuf * y_percent;
-              } else {
-                totals[k] += datain.getInt() * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          right = temp;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getInt() * percent;
-            }
-          }
-          
-          // calculate the value for pixels in the last row
-          y_percent = highy_float;
-          percent = y_percent * ( 1 - lowx_float );
-          temp = xindex + highy_int * ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getInt() * percent;
-            }
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-                totals[k] += swapbuf * y_percent;
-              } else {
-                totals[k] += datain.getInt() * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getInt() * percent;
-            }
-          }
-          
-          // calculate the value for the pixels in the 1st and last column
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            left += ysize;
-            right += ysize;
-            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
-              if( myswap_bytes ) {
-                datain.position( left );
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-                totals[k] += swapbuf * ( 1 - lowx_float );
-                datain.position( right );
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-                totals[k] += swapbuf * highx_float;
-              } else {
-                datain.position( left );
-                totals[k] += (datain.getInt() * ( 1 - lowx_float ));
-                datain.position( right );
-                totals[k] += (datain.getInt() * highx_float);
-              }
-            }
-          }
-        } else if( highy_int > lowy_int ) {
-          x_percent = highx_float - lowx_float;
-          percent = ( 1 - lowy_float) * x_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getInt() * percent;
-            }
-          }
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            temp += ysize;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-                totals[k] += swapbuf * x_percent;
-              } else {
-                totals[k] += datain.getInt() * x_percent;
-              }
-            }
-          }
-          percent = x_percent * highy_float;
-          temp += ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getInt() * percent;
-            }
-          }
-        } else if( highx_int > lowx_int ) {
-          y_percent = highy_float - lowy_float;
-          percent = ( 1 - lowx_float ) * y_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getInt() * percent;
-            }
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-                totals[k] += swapbuf * y_percent;
-              } else {
-                totals[k] += datain.getInt() * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getInt() * percent;
-            }
-          }
-        } else {
-          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getInt() * percent;
-            }
-          }
-        }
-        
-        // this is for the pixels in the body
-        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
-        for( m = lowy_int + 1; m < highy_int; m++ ) {
-          temp = temp0;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getInt() );
-                totals[k] += swapbuf;
-              } else {
-                totals[k] += datain.getInt();
-              }
-            }
-            temp += group_size;
-          }
-          temp0 += ysize;
-        }
-        
-        outindex = ( j + ( i * widthout ) ) * components;
-        for( k = 0; k < components; k++ ) {
-          dataout.position( outindex + k );
-          dataout.put( (int)(totals[k] / area) );
-        }
-        lowx_int = highx_int;
-        lowx_float = highx_float;
-        highx_int += convx_int;
-        highx_float += convx_float;
-        if( highx_float > 1.0f ) {
-          highx_float -= 1.0f;
-          highx_int++;
-        }
-
-        // Clamp to make sure we don't run off the right edge
-        if (highx_int > widthin - 1) {
-          int delta = (highx_int - widthin + 1);
-          lowx_int -= delta;
-          highx_int -= delta;
-        }
-      }
-      lowy_int = highy_int;
-      lowy_float = highy_float;
-      highy_int += convy_int;
-      highy_float += convy_float;
-      if( highy_float > 1.0f ) {
-        highy_float -= 1.0f;
-        highy_int++;
-      }
-    }
-  }
-  
-  public static void scale_internal_float( int components, int widthin, int heightin,
-                              ByteBuffer datain, int widthout, int heightout, 
-                              FloatBuffer dataout, int element_size, int ysize, 
-                              int group_size, boolean myswap_bytes ) {
-    float x, convx;
-    float y, convy;
-    float percent;
-    // Max components in a format is 4, so...
-    float[] totals = new float[4];
-    float area;
-    int i, j, k, xindex;
-    
-    int temp, temp0;
-    int temp_index;
-    int outindex;
-    
-    int lowx_int, highx_int, lowy_int, highy_int;
-    float x_percent, y_percent;
-    float lowx_float, highx_float, lowy_float, highy_float;
-    float convy_float, convx_float;
-    int convy_int, convx_int;
-    int l, m;
-    int left, right;
-    
-    float swapbuf; // unsigned buffer
-    
-    if( (widthin == (widthout * 2)) && (heightin == (heightout * 2)) ) {
-      HalveImage.halveImage_float( components, widthin, heightin, datain, dataout, 
-                        element_size, ysize, group_size, myswap_bytes );
-      return;
-    }
-    convy = (float)heightin / heightout;
-    convx = (float)widthin / widthout;
-    convy_int = (int)Math.floor( convy );
-    convy_float = convy - convy_int;
-    convx_int = (int)Math.floor( convx );
-    convx_float = convx - convx_int;
-    
-    area = convx * convy;
-    
-    lowy_int = 0;
-    lowy_float = 0.0f;
-    highy_int = convy_int;
-    highy_float = convy_float;
-    
-    for( i = 0; i < heightout; i++ ) {
-      // Clamp here to be sure we don't read beyond input buffer.
-      if (highy_int >= heightin)
-        highy_int = heightin - 1;
-      lowx_int = 0;
-      lowx_float = 0.0f;
-      highx_int = convx_int;
-      highx_float = convx_float;
-      
-      for( j = 0; j < widthout; j++ ) {
-        
-        // Ok, now apply box filter to box that goes from (lowx, lowy)
-        // to (highx, highy) on input data into this pixel on output
-        // data.
-        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
-        
-        // caulate the value for pixels in the 1st row
-        xindex = lowx_int * group_size;
-        if( ( highy_int > lowy_int ) && ( highx_int > lowx_int ) ) {
-          
-          y_percent = 1 - lowy_float;
-          temp = xindex + lowy_int * ysize;
-          percent = y_percent * ( 1 - lowx_float );
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getFloat() * percent;
-            }
-          }
-          left = temp;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-                totals[k] += swapbuf * y_percent;
-              } else {
-                totals[k] += datain.getFloat() * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          right = temp;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getFloat() * percent;
-            }
-          }
-          
-          // calculate the value for pixels in the last row
-          y_percent = highy_float;
-          percent = y_percent * ( 1 - lowx_float );
-          temp = xindex + highy_int * ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getFloat() * percent;
-            }
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-                totals[k] += swapbuf * y_percent;
-              } else {
-                totals[k] += datain.getFloat() * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getFloat() * percent;
-            }
-          }
-          
-          // calculate the value for the pixels in the 1st and last column
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            left += ysize;
-            right += ysize;
-            for( k = 0; k < components; k++, left += element_size, right += element_size ) {
-              if( myswap_bytes ) {
-                datain.position( left );
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-                totals[k] += swapbuf * ( 1 - lowx_float );
-                datain.position( right );
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-                totals[k] += swapbuf * highx_float;
-              } else {
-                datain.position( left );
-                totals[k] += (datain.getFloat() * ( 1 - lowx_float ));
-                datain.position( right );
-                totals[k] += (datain.getFloat() * highx_float);
-              }
-            }
-          }
-        } else if( highy_int > lowy_int ) {
-          x_percent = highx_float - lowx_float;
-          percent = ( 1 - lowy_float) * x_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getFloat() * percent;
-            }
-          }
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            temp += ysize;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-                totals[k] += swapbuf * x_percent;
-              } else {
-                totals[k] += datain.getFloat() * x_percent;
-              }
-            }
-          }
-          percent = x_percent * highy_float;
-          temp += ysize;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getFloat() * percent;
-            }
-          }
-        } else if( highx_int > lowx_int ) {
-          y_percent = highy_float - lowy_float;
-          percent = ( 1 - lowx_float ) * y_percent;
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getFloat() * percent;
-            }
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += group_size;
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-                totals[k] += swapbuf * y_percent;
-              } else {
-                totals[k] += datain.getFloat() * y_percent;
-              }
-            }
-          }
-          temp += group_size;
-          percent = y_percent * highx_float;
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getFloat() * percent;
-            }
-          }
-        } else {
-          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
-          temp = xindex + (lowy_int * ysize);
-          for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-            datain.position( temp_index );
-            if( myswap_bytes ) {
-              swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-              totals[k] += swapbuf * percent;
-            } else {
-              totals[k] += datain.getFloat() * percent;
-            }
-          }
-        }
-        
-        // this is for the pixels in the body
-        temp0 = xindex + group_size + ( lowy_int + 1 ) * ysize;
-        for( m = lowy_int + 1; m < highy_int; m++ ) {
-          temp = temp0;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            for( k = 0, temp_index = temp; k < components; k++, temp_index += element_size ) {
-              datain.position( temp_index );
-              if( myswap_bytes ) {
-                swapbuf = Mipmap.GLU_SWAP_4_BYTES( datain.getFloat() );
-                totals[k] += swapbuf;
-              } else {
-                totals[k] += datain.getFloat();
-              }
-            }
-            temp += group_size;
-          }
-          temp0 += ysize;
-        }
-        
-        outindex = ( j + ( i * widthout ) ) * components;
-        for( k = 0; k < components; k++ ) {
-          dataout.position( outindex + k );
-          dataout.put( (totals[k] / area) );
-        }
-        lowx_int = highx_int;
-        lowx_float = highx_float;
-        highx_int += convx_int;
-        highx_float += convx_float;
-        if( highx_float > 1.0f ) {
-          highx_float -= 1.0f;
-          highx_int++;
-        }
-
-        // Clamp to make sure we don't run off the right edge
-        if (highx_int > widthin - 1) {
-          int delta = (highx_int - widthin + 1);
-          lowx_int -= delta;
-          highx_int -= delta;
-        }
-      }
-      lowy_int = highy_int;
-      lowy_float = highy_float;
-      highy_int += convy_int;
-      highy_float += convy_float;
-      if( highy_float > 1.0f ) {
-        highy_float -= 1.0f;
-        highy_int++;
-      }
-    }
-  }
-  
-  public static void scaleInternalPackedPixel( int components, Extract extract, 
-              int widthIn, int heightIn, ByteBuffer dataIn, int widthOut,
-              int heightOut, ByteBuffer dataOut, int pixelSizeInBytes,
-              int rowSizeInBytes, boolean isSwap ) {
-    float x, convx;
-    float y, convy;
-    float percent;
-    
-    // max components in a format is 4, so
-    float[] totals = new float[4];
-    float[] extractTotals = new float[4];
-    float[] extractMoreTotals = new float[4];
-    float[] shoveTotals = new float[4];
-    
-    float area;
-    int i, j, k, xindex;
-    
-    int temp, temp0;
-    int temp_index;
-    int outIndex = 0;
-    
-    int lowx_int, highx_int, lowy_int, highy_int;
-    float x_percent, y_percent;
-    float lowx_float, highx_float, lowy_float, highy_float;
-    float convy_float, convx_float;
-    int convy_int, convx_int;
-    int l, m;
-    int left, right;
-    
-    if( widthIn == widthOut * 2 && heightIn == heightOut * 2 ) {
-      HalveImage.halveImagePackedPixel( components, extract, widthIn, heightIn, dataIn, dataOut,
-                              pixelSizeInBytes, rowSizeInBytes, isSwap );
-      return;
-    }
-    convy = (float)heightIn / (float)heightOut;
-    convx = (float)widthIn / (float)widthOut;
-    convy_int = (int)Math.floor( convy );
-    convy_float = convy - convy_int;
-    convx_int = (int)Math.floor( convx );
-    convx_float = convx - convx_int;
-    
-    area = convx * convy;
-    
-    lowy_int = 0;
-    lowy_float = 0.0f;
-    highy_int = convy_int;
-    highy_float = convx_float;
-    
-    for( i = 0; i < heightOut; i++ ) {
-      // Clamp here to be sure we don't read beyond input buffer.
-      if (highy_int >= heightIn)
-        highy_int = heightIn - 1;
-      lowx_int = 0;
-      lowx_float = 0.0f;
-      highx_int = convx_int;
-      highx_float = convx_float;
-      
-      for( j = 0; j < widthOut; j++ ) {
-        // ok now apply box filter to box that goes from( lowx, lowy )
-        // to ( highx, highy ) on input data into this pixel on output data
-        totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
-        
-        // calculate that value for pixels in the 1st row
-        xindex = lowx_int * pixelSizeInBytes;
-        if( (highy_int > lowy_int) && (highx_int > lowx_int) ) {
-          
-          y_percent = 1 - lowy_float;
-          temp = xindex + lowy_int * rowSizeInBytes;
-          percent = y_percent * ( 1 - lowx_float );
-          dataIn.position( temp );
-          extract.extract( isSwap, dataIn, extractTotals );
-          for( k = 0; k < components; k++ ) {
-            totals[k] += extractTotals[k] * percent;
-          }
-          left = temp;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += pixelSizeInBytes;
-            dataIn.position( temp );
-            extract.extract( isSwap, dataIn, extractTotals );
-            for( k = 0; k < components; k++ ) {
-              totals[k] += extractTotals[k] * y_percent;
-            }
-          }
-          temp += pixelSizeInBytes;
-          right = temp;
-          percent = y_percent * highx_float;
-          dataIn.position( temp );
-          extract.extract( isSwap, dataIn, extractTotals );
-          for( k = 0; k < components; k++ ) {
-            totals[k] += extractTotals[k] * percent;
-          }
-          // calculate the value for pixels in the last row
-          
-          y_percent = highy_float;
-          percent = y_percent * ( 1 - lowx_float );
-          temp = xindex + highy_int * rowSizeInBytes;
-          dataIn.position( temp );
-          extract.extract( isSwap, dataIn, extractTotals );
-          for( k = 0; k < components; k++ ) {
-            totals[k] += extractTotals[k] * percent;
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += pixelSizeInBytes;
-            dataIn.position( temp );
-            extract.extract( isSwap, dataIn, extractTotals );
-            for( k = 0; k < components; k++ ) {
-              totals[k] += extractTotals[k] * y_percent;
-            }
-          }
-          temp += pixelSizeInBytes;
-          percent = y_percent * highx_float;
-          dataIn.position( temp );
-          for( k = 0; k < components; k++ ) {
-            totals[k] += extractTotals[k] * percent;
-          }
-          
-          // calculate the value for pixels in the 1st and last column
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            left += rowSizeInBytes;
-            right += rowSizeInBytes;
-            dataIn.position( left );
-            extract.extract( isSwap, dataIn, extractTotals );
-            dataIn.position( right );
-            extract.extract( isSwap, dataIn, extractMoreTotals );
-            for( k = 0; k < components; k++ ) {
-              totals[k] += ( extractTotals[k] * ( 1 - lowx_float ) + extractMoreTotals[k] * highx_float );
-            }
-          }
-        } else if( highy_int > lowy_int ) {
-          x_percent = highx_float - lowx_float;
-          percent = ( 1 - lowy_float ) * x_percent;
-          temp = xindex + lowy_int * rowSizeInBytes;
-          dataIn.position( temp );
-          extract.extract( isSwap, dataIn, extractTotals );
-          for( k = 0; k < components; k++ ) {
-            totals[k] += extractTotals[k] * percent;
-          }
-          for( m = lowy_int + 1; m < highy_int; m++ ) {
-            temp += rowSizeInBytes;
-            dataIn.position( temp );
-            extract.extract( isSwap, dataIn, extractTotals );
-            for( k = 0; k < components; k++ ) {
-              totals[k] += extractTotals[k] * x_percent;
-            }
-          }
-          percent = x_percent * highy_float;
-          temp += rowSizeInBytes;
-          dataIn.position( temp );
-          extract.extract( isSwap, dataIn, extractTotals );
-          for( k = 0; k < components; k++ ) {
-            totals[k] += extractTotals[k] * percent;
-          }
-        } else if( highx_int > lowx_int ) {
-          y_percent = highy_float - lowy_float;
-          percent = ( 1 - lowx_float ) * y_percent;
-          temp = xindex + lowy_int * rowSizeInBytes;
-          dataIn.position( temp );
-          extract.extract( isSwap, dataIn, extractTotals );
-          for( k = 0; k < components; k++ ) {
-            totals[k] += extractTotals[k] * percent;
-          }
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            temp += pixelSizeInBytes;
-            dataIn.position( temp );
-            extract.extract( isSwap, dataIn, extractTotals );
-            for( k = 0; k < components; k++ ) {
-              totals[k] += extractTotals[k] * y_percent;
-            }
-          }
-          temp += pixelSizeInBytes;
-          percent = y_percent * highx_float;
-          dataIn.position( temp );
-          extract.extract( isSwap, dataIn, extractTotals );
-          for( k = 0; k < components; k++ ) {
-            totals[k] += extractTotals[k] * percent;
-          }
-        } else {
-          percent = ( highy_float - lowy_float ) * ( highx_float - lowx_float );
-          temp = xindex + lowy_int * rowSizeInBytes;
-          dataIn.position( temp );
-          extract.extract( isSwap, dataIn, extractTotals );
-          for( k = 0; k < components; k++ ) {
-            totals[k] += extractTotals[k] * percent;
-          }
-        }
-        
-        // this is for the pixels in the body
-        temp0 = xindex + pixelSizeInBytes + ( lowy_int + 1 ) * rowSizeInBytes;
-        for( m = lowy_int + 1; m < highy_int; m++ ) {
-          temp = temp0;
-          for( l = lowx_int + 1; l < highx_int; l++ ) {
-            dataIn.position( temp );
-            extract.extract( isSwap, dataIn, extractTotals );
-            for( k = 0; k < components; k++ ) {
-              totals[k] += extractTotals[k] * percent;
-            }
-            temp += pixelSizeInBytes;
-          }
-          temp0 += rowSizeInBytes;
-        }
-        
-        outIndex = ( j + ( i * widthOut ) );
-        for( k = 0; k < components; k++ ) {
-          shoveTotals[k] = totals[k] / area;
-        }
-        extract.shove( shoveTotals, outIndex, dataOut );
-        lowx_int = highx_int;
-        lowx_float = highx_float;
-        highx_int += convx_int;
-        highx_float += convx_float;
-        if( highx_float > 1.0f ) {
-          highx_float -= 1.0f;
-          highx_int++;
-        }
-
-        // Clamp to make sure we don't run off the right edge
-        if (highx_int > widthIn - 1) {
-          int delta = (highx_int - widthIn + 1);
-          lowx_int -= delta;
-          highx_int -= delta;
-        }
-      }
-      lowy_int = highy_int;
-      lowy_float = highy_float;
-      highy_int += convy_int;
-      highy_float += convy_float;
-      if( highy_float > 1.0f ) {
-        highy_float -= 1.0f;
-        highy_int++;
-      }
-    }
-    assert( outIndex == ( widthOut * heightOut - 1) );
-  }
-  
-  public static void scaleInternal3D( int components, int widthIn, int heightIn,
-          int depthIn, ShortBuffer dataIn, int widthOut, int heightOut,
-          int depthOut, ShortBuffer dataOut ) {
-    float x, lowx, highx, convx, halfconvx;
-    float y, lowy, highy, convy, halfconvy;
-    float z, lowz, highz, convz, halfconvz;
-    float xpercent, ypercent, zpercent;
-    float percent;
-    // max compnents in a format is 4
-    float[] totals = new float[4];
-    float volume;
-    int i, j, d, k, zint, yint, xint, xindex, yindex, zindex;
-    int temp;
-    
-    lowy = highy = lowx = highx = 0.0f;
-    
-    convz = (float)depthIn / depthOut;
-    convy = (float)heightIn / heightOut;
-    convx = (float)widthIn / widthOut;
-    halfconvz = convz / 2.0f;
-    halfconvy = convy / 2.0f;
-    halfconvx = convx / 2.0f;
-    for( d = 0; d < depthOut; d++ ) {
-      z = convz * ( d + 0.5f );
-      if( depthIn > depthOut ) {
-        highz = z + halfconvz;
-        lowz = z - halfconvz;
-      } else {
-        highz = z + 0.5f;
-        lowz = z - 0.5f;
-      }
-      for( i = 0; i < heightOut; i++ ) {
-        y = convy * ( i + 0.5f );
-        if( heightIn > heightOut ) {
-          highz = y + halfconvy;
-          lowz = y - halfconvy;
-        } else {
-          highz = y + 0.5f;
-          lowz = y - 0.5f;
-        }
-        for( j = 0; j < widthOut; j++ ) {
-          x = convx * ( j + 0.5f );
-          if( depthIn > depthOut ) {
-            highz = x + halfconvx;
-            lowz = x - halfconvx;
-          } else {
-            highz = x + 0.5f;
-            lowz = x - 0.5f;
-          }
-          
-          // Ok, now apply box filter to box that goes from ( lowx, lowy, lowz )
-          // to ( highx, highy, highz ) on input data into this pixel on output data
-          
-          totals[0] = totals[1] = totals[2] = totals[3] = 0.0f;
-          volume = 0.0f;
-          
-          z = lowz;
-          zint = (int)(Math.floor( z ) );
-          while( z < highz ) {
-            zindex = ( zint + depthIn ) % depthIn;
-            if( highz < zint + 1 ) {
-              zpercent = highz - z;
-            } else {
-              zpercent = zint + 1 - z;
-            }
-            
-            y = lowy;
-            yint = (int)(Math.floor( y ) );
-            while( y < highy ) {
-              yindex = ( yint + heightIn ) % heightIn;
-              if( highy < yint + 1 ) {
-                ypercent = highy - y;
-              } else {
-                ypercent = yint + 1 - y;
-              }
-              
-              x = lowx;
-              xint = (int)(Math.floor( x ) );
-              
-              while( x < highx ) {
-                xindex = (xint + widthIn ) % widthIn;
-                if( highx < xint + 1 ) {
-                  xpercent = highx - x;
-                } else {
-                  xpercent = xint + 1 - x;
-                }
-                
-                percent = xpercent * ypercent * zpercent;
-                volume += percent;
-                
-                temp = (xindex + ( yindex *widthIn) + (zindex * widthIn *heightIn)) * components;
-                for( k = 0; k < components; k++ ) {
-                  assert( 0 <= (temp+k) && (temp+k) < (widthIn * heightIn * depthIn * components) );
-                  totals[k] += dataIn.get( temp + k ) * percent;
-                }
-                xint++;
-                x = xint;
-              } // while x
-              yint++;
-              y = yint;
-            } // while y
-            zint++;
-            z = zint;
-          } // while z
-          
-          temp = ( j + ( i * widthOut ) + (d * widthOut * heightOut ) ) * components;
-          for( k = 0; k < components; k++ ) {
-            // totals should be rounded in the case of enlarging an rgb ramp when the type is 332 or 4444
-            assert( 0 <= ( temp + k ) && ( temp + k ) < (widthOut * heightOut* depthOut * components) );
-            dataOut.put( temp + k, (short)((totals[k] + 0.5f) / volume ) );
-          }
-        }
-      }
-    }
-  }
-  
-  public static int gluScaleImage3D( GL gl, int format, int widthIn, int heightIn, 
-          int depthIn, int typeIn, ByteBuffer dataIn, int widthOut, int heightOut, 
-          int depthOut, int typeOut, ByteBuffer dataOut ) {
-    int components;
-    ShortBuffer beforeImage, afterImage;
-    PixelStorageModes psm = new PixelStorageModes();
-    
-    if( widthIn == 0 || heightIn == 0 || depthIn == 0 ||
-            widthOut == 0 || heightOut == 0 || depthOut == 0 ) {
-      return( 0 );
-    }
-    
-    if( widthIn < 0 || heightIn < 0 || depthIn < 0 ||
-            widthOut < 0 || heightOut < 0 || depthOut < 0 ) {
-      return( GLU.GLU_INVALID_VALUE );
-    }
-    
-    if( !Mipmap.legalFormat(format) || !Mipmap.legalType(typeIn) || 
-            !Mipmap.legalType(typeOut) || typeIn == GL2.GL_BITMAP ||
-            typeOut == GL2.GL_BITMAP ) {
-      return( GLU.GLU_INVALID_ENUM );
-    }
-    
-    if( !Mipmap.isLegalFormatForPackedPixelType( format, typeIn ) ) {
-      return( GLU.GLU_INVALID_OPERATION );
-    }
-    
-    if( !Mipmap.isLegalFormatForPackedPixelType( format, typeOut ) ) {
-      return( GLU.GLU_INVALID_OPERATION );
-    }
-    
-    try {
-    beforeImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( Mipmap.imageSize3D( widthIn, 
-            heightIn, depthIn, format, GL2.GL_UNSIGNED_SHORT ) )).asShortBuffer();
-    afterImage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( Mipmap.imageSize3D( widthIn, 
-            heightIn, depthIn, format, GL2.GL_UNSIGNED_SHORT ) )).asShortBuffer();
-    } catch( OutOfMemoryError err ) {
-      return( GLU.GLU_OUT_OF_MEMORY );
-    }
-    Mipmap.retrieveStoreModes3D( gl, psm );
-    
-    Image.fillImage3D( psm, widthIn, heightIn, depthIn, format, typeIn,
-            Mipmap.is_index( format ), dataIn, beforeImage );
-    components = Mipmap.elements_per_group( format, 0 );
-    ScaleInternal.scaleInternal3D( components, widthIn, heightIn, depthIn,
-            beforeImage, widthOut, heightOut, depthOut, afterImage );
-    Image.emptyImage3D( psm, widthOut, heightOut, depthOut, format, typeOut,
-            Mipmap.is_index( format ), afterImage, dataOut );
-    
-    return( 0 );
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Type_Widget.java b/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Type_Widget.java
deleted file mode 100644
index fd2eabb65..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Type_Widget.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.mipmap;
-
-import java.nio.*;
-
-/**
- *
- * @author  Administrator
- */
-public class Type_Widget {
-  
-  ByteBuffer buffer;
-  
-  /** Creates a new instance of Type_Widget */
-  public Type_Widget() {
-    buffer = ByteBuffer.allocateDirect( 4 );
-  }
-  
-  public void setUB0( byte b ) {
-    buffer.position( 0 );
-    buffer.put( b );
-  }
-  
-  public byte getUB0() {
-    buffer.position( 0 );
-    return( buffer.get() );
-  }
-  
-  public void setUB1( byte b ) {
-    buffer.position( 1 );
-    buffer.put( b );
-  }
-  
-  public byte getUB1() {
-    buffer.position( 1 );
-    return( buffer.get() );
-  }
-  
-  public void setUB2( byte b ) {
-    buffer.position( 2 );
-    buffer.put( b );
-  }
-  
-  public byte getUB2() {
-    buffer.position( 2 );
-    return( buffer.get() );
-  }
-  
-  public void setUB3( byte b ) {
-    buffer.position( 3 );
-    buffer.put( b );
-  }
-  
-  public byte getUB3() {
-    buffer.position( 3 );
-    return( buffer.get() );
-  }
-  
-  public void setUS0( short s ) {
-    buffer.position( 0 );
-    buffer.putShort( s );
-  }
-  
-  public short getUS0() {
-    buffer.position( 0 );
-    return( buffer.getShort() );
-  }
-  
-  public void setUS1( short s ) {
-    buffer.position( 2 );
-    buffer.putShort( s );
-  }
-  
-  public short getUS1() {
-   buffer.position( 2 );
-   return( buffer.getShort() );
-  }
-  
-  public void setUI( int i ) {
-    buffer.position( 0 );
-    buffer.putInt( i );
-  }
-  
-  public int getUI() {
-    buffer.position( 0 );
-    return( buffer.getInt() );
-  }
-  
-  public void setB0( byte b ) {
-    buffer.position( 0 );
-    buffer.put( b );
-  }
-  
-  public byte getB0() {
-    buffer.position( 0 );
-    return( buffer.get() );
-  }
-  
-  public void setB1( byte b ) {
-    buffer.position( 1 );
-    buffer.put( b );
-  }
-  
-  public byte getB1() {
-    buffer.position( 1 );
-    return( buffer.get() );
-  }
-  
-  public void setB2( byte b ) {
-    buffer.position( 2 );
-    buffer.put( b );
-  }
-  
-  public byte getB2() {
-    buffer.position( 2 );
-    return( buffer.get() );
-  }
-  
-  public void setB3( byte b ) {
-    buffer.position( 3 );
-    buffer.put( b );
-  }
-  
-  public byte getB3() {
-    buffer.position( 3 );
-    return( buffer.get() );
-  }
-  
-  public void setS0( short s ) {
-    buffer.position( 0 );
-    buffer.putShort( s );
-  }
-  
-  public short getS0() {
-    buffer.position( 0 );
-    return( buffer.getShort() );
-  }
-  
-  public void setS1( short s ) {
-    buffer.position( 2 );
-    buffer.putShort( s );
-  }
-  
-  public short getS1() {
-    buffer.position( 2 );
-    return( buffer.getShort() );
-  }
-  
-  public void setI( int i ) {
-    buffer.position( 0 );
-    buffer.putInt( i );
-  }
-  
-  public int getI() {
-    buffer.position( 0 );
-    return( buffer.getInt() );
-  }
-  
-  public void setF( float f ) {
-    buffer.position( 0 );
-    buffer.putFloat( f );
-  }
-  
-  public float getF() {
-    buffer.position( 0 );
-    return( buffer.getFloat() );
-  }
-  
-  public ByteBuffer getBuffer() {
-    buffer.rewind();
-    return( buffer );
-  }
-  
-  public static void main( String args[] ) {
-    Type_Widget t = new Type_Widget();
-    t.setI( 1000000 );
-    
-    System.out.println("int: " + Integer.toHexString( t.getI() ) );
-    
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Arc.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Arc.java
deleted file mode 100755
index ed629d1da..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Arc.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-*/
-
-/**
- * Trimming arc
- * @author Tomas Hrasky
- *
- */
-public class Arc {
-  /**
-   * Corresponding picewise-linear arc
-   */
-  public PwlArc pwlArc;
-
-  /**
-   * Arc type
-   */
-  private long type;
-
-  /**
-   * Arc link in linked list
-   */
-  public Arc link;
-
-  /**
-   * Previous arc
-   */
-  Arc prev;
-
-  /**
-   * Next arc
-   */
-  Arc next;
-
-  /**
-   * Corresponding berizer type arc
-   */
-  private BezierArc bezierArc;
-
-  /**
-   * Makes new arc at specified side
-   * 
-   * @param side
-   *            which side doeas this arc form
-   */
-  public Arc(int side) {
-    bezierArc = null;
-    pwlArc = null;
-    type = 0;
-    setside(side);
-    // nuid=_nuid
-  }
-
-  /**
-   * Sets side the arc is at
-   * 
-   * @param side
-   *            arc side
-   */
-  private void setside(int side) {
-    // DONE
-    clearside();
-    type |= side << 8;
-  }
-
-  /**
-   * Unsets side
-   */
-  private void clearside() {
-    // DONE
-    type &= ~(0x7 << 8);
-  }
-
-  // this one replaces enum arc_side 
-  /**
-   * Side not specified
-   */
-  public static final int ARC_NONE = 0;
-
-  /**
-   * Arc on right
-   */
-  public static final int ARC_RIGHT = 1;
-
-  /**
-   * Arc on top
-   */
-  public static final int ARC_TOP = 2;
-
-  /**
-   * Arc on left
-   */
-  public static final int ARC_LEFT = 3;
-
-  /**
-   * Arc on bottom
-   */
-  public static final int ARC_BOTTOM = 4;
-
-  /**
-   * Bezier type flag
-   */
-  private static final long BEZIER_TAG = 1 << 13;
-
-  /**
-   * Arc type flag
-   */
-  private static final long ARC_TAG = 1 << 3;
-
-  /**
-   * Tail type tag
-   */
-  private static final long TAIL_TAG = 1 << 6;
-
-  /**
-   * Appends arc to the list
-   * 
-   * @param jarc
-   *            arc to be append
-   * @return this
-   */
-  public Arc append(Arc jarc) {
-    // DONE
-    if (jarc != null) {
-      next = jarc.next;
-      prev = jarc;
-      next.prev = this;
-      prev.next = this;
-    } else {
-      next = this;
-      prev = this;
-    }
-
-    return this;
-  }
-
-  /**
-   * Unused
-   * 
-   * @return true
-   */
-  public boolean check() {
-    return true;
-  }
-
-  /**
-   * Sets bezier type flag
-   */
-  public void setbezier() {
-    // DONE
-    type |= BEZIER_TAG;
-
-  }
-
-  /**
-   * Returns tail of linked list coords
-   * 
-   * @return tail coords
-   */
-  public float[] tail() {
-    // DONE
-    return pwlArc.pts[0].param;
-  }
-
-  /**
-   * Returns head of linked list coords
-   * 
-   * @return head coords
-   */
-  public float[] head() {
-    // DONE
-    return next.pwlArc.pts[0].param;
-  }
-
-  /**
-   * Returns whether arc is marked with arc_tag
-   * 
-   * @return is arc marked with arc_tag
-   */
-  public boolean ismarked() {
-    // DONE
-    return ((type & ARC_TAG) > 0) ? true : false;
-  }
-
-  /**
-   * Cleans arc_tag flag
-   */
-  public void clearmark() {
-    // DONE
-    type &= (~ARC_TAG);
-  }
-
-  /**
-   * Sets arc_tag flag
-   */
-  public void setmark() {
-    // DONE
-    type |= ARC_TAG;
-  }
-
-  /**
-   * sets tail tag
-   */
-  public void setitail() {
-    // DONE
-    type |= TAIL_TAG;
-  }
-
-  /**
-   * Returns whether arc is marked tail
-   * 
-   * @return is tail
-   */
-  public boolean getitail() {
-    return false;
-  }
-
-  /**
-   * Unsets tail tag
-   */
-  public void clearitail() {
-    // DONE
-    type &= (~TAIL_TAG);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcSdirSorter.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcSdirSorter.java
deleted file mode 100755
index 9a7063886..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcSdirSorter.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class for sorting list of Arcs
- * @author Tomas Hrasky
- *
- */
-public class ArcSdirSorter {
-
-  /**
-   * Makes new ArcSdirSorter with Subdivider
-   * @param subdivider subdivider
-   */ 
-  public ArcSdirSorter(Subdivider subdivider) {
-    //TODO
-    //			System.out.println("TODO arcsdirsorter.constructor");
-  }
-
-  /**
-   * Sorts list of arcs
-   * @param list  arc list to be sorted
-   * @param count size of list
-   */
-  public void qsort(CArrayOfArcs list, int count) {
-    // TODO
-    //			System.out.println("TODO arcsdirsorter.qsort");
-  }
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTdirSorter.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTdirSorter.java
deleted file mode 100755
index 2fbb5181f..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTdirSorter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class for sorting list of Arcs
- * @author Tomas Hrasky
- *
- */
-public class ArcTdirSorter {
-  /**
-   * Makes new ArcSdirSorter with Subdivider
-   * @param subdivider subdivider
-   */ 
-  public ArcTdirSorter(Subdivider subdivider) {
-    // TODO Auto-generated constructor stub
-    //			System.out.println("TODO arcTsorter.konstruktor");
-  }
-  /**
-   * Sorts list of arcs
-   * @param list  arc list to be sorted
-   * @param count size of list
-   */
-  public void qsort(CArrayOfArcs list, int count) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO arcTsorter.qsort");
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTesselator.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTesselator.java
deleted file mode 100755
index c40780e76..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTesselator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class for arc tesselation
- * @author Tomas Hrasky
- *
- */
-public class ArcTesselator {
-
-  /**
-   * Makes given arc an bezier arc
-   * @param arc arc to work with
-   * @param s1 minimum s param
-   * @param s2 maximum s param
-   * @param t1 minimum t param
-   * @param t2 maximum s param
-   */
-  public void bezier(Arc arc, float s1, float s2, float t1, float t2) {
-    // DONE
-    TrimVertex[] p = new TrimVertex[2];
-    p[0] = new TrimVertex();
-    p[1] = new TrimVertex();
-    arc.pwlArc = new PwlArc(2, p);
-    p[0].param[0] = s1;
-    p[0].param[1] = s2;
-    p[1].param[0] = t1;
-    p[1].param[1] = t2;
-    arc.setbezier();
-  }
-
-  /**
-   * Empty method
-   * @param newright arc to work with
-   * @param s first tail
-   * @param t2 second tail
-   * @param t1 third tail
-   * @param f stepsize
-   */
-  public void pwl_right(Arc newright, float s, float t1, float t2, float f) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO arctesselator.pwl_right");
-  }
-
-  /**
-   * Empty method
-   * @param newright arc to work with
-   * @param s first tail
-   * @param t2 second tail
-   * @param t1 third tail
-   * @param f stepsize
-   */
-  public void pwl_left(Arc newright, float s, float t2, float t1, float f) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO arctesselator.pwl_left");
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Backend.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Backend.java
deleted file mode 100755
index caa17a74d..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Backend.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class responsible for rendering
- * @author Tomas Hrasky
- *
- */
-public abstract class Backend {
-
-  /**
-   * Fill surface
-   */
-  public static final int N_MESHFILL = 0;
-
-  /**
-   * Draw surface as wire model
-   */
-  public static final int N_MESHLINE = 1;
-
-  /**
-   * Draw surface with points
-   */
-  public static final int N_MESHPOINT = 2;
-
-  /**
-   * Object rendering curves
-   */
-  protected CurveEvaluator curveEvaluator;
-
-  /**
-   * Object rendering surfaces
-   */
-  protected SurfaceEvaluator surfaceEvaluator;
-
-  /**
-   * Makes new backend 
-   */
-  public Backend() {
-    // curveEvaluator = new OpenGLCurveEvaluator();
-    // surfaceEvaluator = new OpenGLSurfaceEvaluator();
-  }
-
-  /**
-   * Begin a curve
-   */
-  public void bgncurv() {
-    // DONE
-    curveEvaluator.bgnmap1f();
-
-  }
-
-  /**
-   * End a curve
-   */
-  public void endcurv() {
-    // DONE
-    curveEvaluator.endmap1f();
-
-  }
-
-  /**
-   * Make cuve with given parameters
-   * @param type curve type
-   * @param ps control points
-   * @param stride control points coordinates number
-   * @param order order of curve
-   * @param ulo smallest u
-   * @param uhi highest u
-   */
-  public void curvpts(int type, CArrayOfFloats ps, int stride, int order,
-                      float ulo, float uhi) {
-    // DONE
-    curveEvaluator.map1f(type, ulo, uhi, stride, order, ps);
-    curveEvaluator.enable(type);
-  }
-
-  /**
-   * Draw curve
-   * @param u1 smallest u
-   * @param u2 highest u
-   * @param nu number of pieces
-   */
-  public void curvgrid(float u1, float u2, int nu) {
-    // DONE
-    curveEvaluator.mapgrid1f(nu, u1, u2);
-
-  }
-
-  /**
-   * Evaluates curve mesh
-   * @param from low param
-   * @param n step
-   */
-  public void curvmesh(int from, int n) {
-    // DONE
-    curveEvaluator.mapmesh1f(N_MESHFILL, from, from + n);
-  }
-
-  /**
-   * Begin surface
-   * @param wiretris use triangles
-   * @param wirequads use quads
-   */
-  public void bgnsurf(int wiretris, int wirequads) {
-    // DONE
-    surfaceEvaluator.bgnmap2f();
-
-    if (wiretris > 0)
-      surfaceEvaluator.polymode(NurbsConsts.N_MESHLINE);
-    else
-      surfaceEvaluator.polymode(NurbsConsts.N_MESHFILL);
-  }
-
-  /**
-   * End surface
-   */
-  public void endsurf() {
-    // DONE
-    surfaceEvaluator.endmap2f();
-  }
-
-  /**
-   * Empty method
-   * @param ulo low u param
-   * @param uhi hig u param
-   * @param vlo low v param
-   * @param vhi high v param
-   */
-  public void patch(float ulo, float uhi, float vlo, float vhi) {
-    // DONE
-    surfaceEvaluator.domain2f(ulo, uhi, vlo, vhi);
-  }
-
-  /**
-   * Draw surface
-   * @param u0 lowest u
-   * @param u1 highest u
-   * @param nu number of pieces in u direction
-   * @param v0 lowest v
-   * @param v1 highest v
-   * @param nv number of pieces in v direction
-   */
-  public void surfgrid(float u0, float u1, int nu, float v0, float v1, int nv) {
-    // DONE
-    surfaceEvaluator.mapgrid2f(nu, u0, u1, nv, v0, v1);
-
-  }
-
-  /**
-   * Evaluates surface mesh
-   * @param u u param
-   * @param v v param
-   * @param n step in u direction
-   * @param m step in v direction
-   */
-  public void surfmesh(int u, int v, int n, int m) {
-    //			System.out.println("TODO backend.surfmesh wireframequads");
-    // TODO wireframequads
-    surfaceEvaluator.mapmesh2f(NurbsConsts.N_MESHFILL, u, u + n, v, v + m);
-  }
-
-  /**
-   * Make surface
-   * @param type surface type
-   * @param pts control points
-   * @param ustride control points coordinates in u direction
-   * @param vstride control points coordinates in v direction
-   * @param uorder surface order in u direction
-   * @param vorder surface order in v direction
-   * @param ulo lowest u
-   * @param uhi hightest u
-   * @param vlo lowest v
-   * @param vhi hightest v
-   */
-  public void surfpts(int type, CArrayOfFloats pts, int ustride, int vstride,
-                      int uorder, int vorder, float ulo, float uhi, float vlo, float vhi) {
-    // DONE
-    surfaceEvaluator.map2f(type, ulo, uhi, ustride, uorder, vlo, vhi,
-                           vstride, vorder, pts);
-    surfaceEvaluator.enable(type);
-
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/BezierArc.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/BezierArc.java
deleted file mode 100755
index e249787f6..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/BezierArc.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Empty class
- * @author Tomas Hrasky
- *
- */
-public class BezierArc {
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Bin.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Bin.java
deleted file mode 100755
index 4a1ac1401..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Bin.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class holding trimming arcs
- * @author Tomas Hrasky
- *
- */
-public class Bin {
-
-  /**
-   * Head of linked list of arcs
-   */
-  private Arc head;
-
-  /**
-   * Current arc
-   */
-  private Arc current;
-
-  /**
-   * Indicates whether there are any Arcs in linked list
-   * @return true if there are any Arcs in linked list
-   */
-  public boolean isnonempty() {
-    // DONE
-    return this.head != null ? true : false;
-  }
-
-  /**
-   * Adds and arc to linked list
-   * @param jarc added arc
-   */
-  public void addarc(Arc jarc) {
-    // DONE
-    // if (head == null)
-    // head = jarc;
-    // else {
-    jarc.link = head;
-    head = jarc;
-    // }
-
-  }
-
-  /**
-   * Returns number of arcs in linked list
-   * @return number of arcs
-   */
-  public int numarcs() {
-    // DONE
-    int count = 0;
-    for (Arc jarc = firstarc(); jarc != null; jarc = nextarc())
-      count++;
-    return count;
-  }
-
-  /**
-   * Removes first arc in list
-   * @return new linked list head
-   */
-  public Arc removearc() {
-    // DONE
-    Arc jarc = head;
-    if (jarc != null)
-      head = jarc.link;
-    return jarc;
-
-  }
-
-  /**
-   * Consolidates linked list
-   */
-  public void adopt() {
-    // DONE
-    markall();
-
-    Arc orphan;
-    while ((orphan = removearc()) != null) {
-      for (Arc parent = orphan.next; !parent.equals(orphan); parent = parent.next) {
-        if (!parent.ismarked()) {
-          orphan.link = parent.link;
-          parent.link = orphan;
-          orphan.clearmark();
-          break;
-        }
-      }
-    }
-
-  }
-
-  /**
-   * Marks all arc in linked list
-   */
-  private void markall() {
-    // DONE
-    for (Arc jarc = firstarc(); jarc != null; jarc = nextarc())
-      jarc.setmark();
-  }
-
-  /**
-   * Returns first arc in linked list
-   * @return first arc in linked list
-   */
-  private Arc firstarc() {
-    // DONE
-    current = head;
-    return nextarc();
-  }
-
-  /**
-   * Returns next arc in linked list
-   * @return next arc
-   * 
-   */
-  private Arc nextarc() {
-    // DONE
-    Arc jarc = current;
-    if (jarc != null)
-      current = jarc.link;
-    return jarc;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Breakpt.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Breakpt.java
deleted file mode 100755
index d088de87f..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Breakpt.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class holding break point parameters
- * 
- * @author Tomas Hrasky
- * 
- */
-public class Breakpt {
-
-  /**
-   * Breakpoint multiplicity
-   */
-  public int multi;
-
-  /**
-   * Breakpint value
-   */
-  public float value;
-
-  /**
-   * Breakpoint deficit (how many times it has to be added)
-   */
-  public int def;
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfArcs.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfArcs.java
deleted file mode 100755
index 3d6e1d47f..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfArcs.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/**
- * Class replacing C language pointer
- * 
- * @author Tomas Hrasky
- * 
- */
-public class CArrayOfArcs {
-  /**
-   * Underlaying array
-   */
-  private Arc[] array;
-
-  /**
-   * Pointer to array member
-   */
-  private int pointer;
-
-  /**
-   * Don't check for array borders?
-   */
-  private boolean noCheck = true;
-
-  /**
-   * Makes new CArray
-   * 
-   * @param array
-   *            underlaying array
-   * @param pointer
-   *            pointer (index) to array
-   */
-  public CArrayOfArcs(Arc[] array, int pointer) {
-    this.array = array;
-    // this.pointer=pointer;
-    setPointer(pointer);
-  }
-
-  /**
-   * Makes new CArray from other CArray
-   * 
-   * @param carray
-   *            reference array
-   */
-  public CArrayOfArcs(CArrayOfArcs carray) {
-    this.array = carray.array;
-    // this.pointer=carray.pointer;
-    setPointer(carray.pointer);
-  }
-
-  /**
-   * Makes new CArray with pointer set to 0
-   * 
-   * @param ctlarray
-   *            underlaying array
-   */
-  public CArrayOfArcs(Arc[] ctlarray) {
-    this.array = ctlarray;
-    this.pointer = 0;
-  }
-
-  /**
-   * Returns element at pointer
-   * 
-   * @return element at pointer
-   */
-  public Arc get() {
-    return array[pointer];
-  }
-
-  /**
-   * Increases pointer by one (++)
-   */
-  public void pp() {
-    // pointer++;
-    setPointer(pointer + 1);
-  }
-
-  /**
-   * Sets element at pointer
-   * 
-   * @param f
-   *            desired value
-   */
-  public void set(Arc f) {
-    array[pointer] = f;
-
-  }
-
-  /**
-   * Returns array element at specified index
-   * 
-   * @param i
-   *            array index
-   * @return element at index
-   */
-  public Arc get(int i) {
-    return array[i];
-  }
-
-  /**
-   * Returns array element at specified index relatively to pointer
-   * 
-   * @param i
-   *            relative index
-   * @return element at relative index
-   */
-  public Arc getRelative(int i) {
-    return array[pointer + i];
-  }
-
-  /**
-   * Sets value of element at specified index relatively to pointer
-   * 
-   * @param i
-   *            relative index
-   * @param value
-   *            value to be set
-   */
-  public void setRelative(int i, Arc value) {
-    array[pointer + i] = value;
-  }
-
-  /**
-   * Lessens pointer by value
-   * 
-   * @param i
-   *            lessen by
-   */
-  public void lessenPointerBy(int i) {
-    // pointer-=i;
-    setPointer(pointer - i);
-  }
-
-  /**
-   * Returns pointer value
-   * 
-   * @return pointer value
-   */
-  public int getPointer() {
-    return pointer;
-  }
-
-  /**
-   * Sets ponter value
-   * 
-   * @param pointer
-   *            pointer value to be set
-   */
-  public void setPointer(int pointer) {
-    if (!noCheck && pointer > array.length)
-      throw new IllegalArgumentException("Pointer " + pointer
-                                         + " out of bounds " + array.length);
-    this.pointer = pointer;
-  }
-
-  /**
-   * Raises pointer by value
-   * 
-   * @param i
-   *            raise by
-   */
-  public void raisePointerBy(int i) {
-    // pointer+=i;
-    setPointer(pointer + i);
-  }
-
-  /**
-   * Lessens ponter by one (--)
-   */
-  public void mm() {
-    // pointer--;
-    setPointer(pointer - 1);
-  }
-
-  /**
-   * Returns underlaying array
-   * 
-   * @return underlaying array
-   */
-  public Arc[] getArray() {
-    return array;
-  }
-
-  /**
-   * Sets underlaying array
-   * 
-   * @param array
-   *            underlaying array
-   */
-  public void setArray(Arc[] array) {
-    this.array = array;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfBreakpts.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfBreakpts.java
deleted file mode 100755
index f5932d954..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfBreakpts.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/**
- * Class replacing C language pointer
- * 
- * @author Tomas Hrasky
- * 
- */
-public class CArrayOfBreakpts {
-  /**
-   * Underlaying array
-   */
-  private Breakpt[] pole;
-
-  /**
-   * Pointer to array member
-   */
-  private int pointer;
-
-  /**
-   * Makes new CArray
-   * 
-   * @param array
-   *            underlaying array
-   * @param pointer
-   *            pointer (index) to array
-   */
-  public CArrayOfBreakpts(Breakpt[] array, int pointer) {
-    this.pole = array;
-    this.pointer = pointer;
-  }
-
-  /**
-   * Makes new CArray from other CArray
-   * 
-   * @param carray
-   *            reference array
-   */
-  public CArrayOfBreakpts(CArrayOfBreakpts carray) {
-    this.pole = carray.pole;
-    this.pointer = carray.pointer;
-  }
-
-  /**
-   * Returns element at pointer
-   * 
-   * @return element at pointer
-   */
-  public Breakpt get() {
-    return pole[pointer];
-  }
-
-  /**
-   * Increases pointer by one (++)
-   */
-  public void pp() {
-    pointer++;
-  }
-
-  /**
-   * Sets element at pointer
-   * 
-   * @param f
-   *            desired value
-   */
-  public void set(Breakpt f) {
-    pole[pointer] = f;
-
-  }
-
-  /**
-   * Returns array element at specified index
-   * 
-   * @param i
-   *            array index
-   * @return element at index
-   */
-  public Breakpt get(int i) {
-    return pole[i];
-  }
-
-  /**
-   * Lessens pointer by value
-   * 
-   * @param i
-   *            lessen by
-   */
-  public void lessenPointerBy(int i) {
-    pointer -= i;
-
-  }
-
-  /**
-   * Returns pointer value
-   * 
-   * @return pointer value
-   */
-  public int getPointer() {
-    return pointer;
-  }
-
-  /**
-   * Sets ponter value
-   * 
-   * @param pointer
-   *            pointer value to be set
-   */
-  public void setPointer(int pointer) {
-    this.pointer = pointer;
-  }
-
-  /**
-   * Raises pointer by value
-   * 
-   * @param i
-   *            raise by
-   */
-  public void raisePointerBy(int i) {
-    pointer += i;
-
-  }
-
-  /**
-   * Lessens ponter by one (--)
-   */
-  public void mm() {
-    pointer--;
-
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfFloats.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfFloats.java
deleted file mode 100755
index fb3fac69b..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfFloats.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/**
- * Class replacing C language pointer
- * 
- * @author Tomas Hrasky
- * 
- */
-public class CArrayOfFloats {
-
-  /**
-   * Underlaying array
-   */
-  private float[] array;
-
-  /**
-   * Pointer to array member
-   */
-  private int pointer;
-
-  /**
-   * Don't check for array borders?
-   */
-  private boolean noCheck = true;
-
-  /**
-   * Makes new CArray
-   * 
-   * @param array
-   *            underlaying array
-   * @param pointer
-   *            pointer (index) to array
-   */
-  public CArrayOfFloats(float[] array, int pointer) {
-    this.array = array;
-    // this.pointer=pointer;
-    setPointer(pointer);
-  }
-
-  /**
-   * Makes new CArray from other CArray
-   * 
-   * @param carray
-   *            reference array
-   */
-  public CArrayOfFloats(CArrayOfFloats carray) {
-    this.array = carray.array;
-    // this.pointer=carray.pointer;
-    setPointer(carray.pointer);
-  }
-
-  /**
-   * Makes new CArray with pointer set to 0
-   * 
-   * @param ctlarray
-   *            underlaying array
-   */
-  public CArrayOfFloats(float[] ctlarray) {
-    this.array = ctlarray;
-    this.pointer = 0;
-  }
-
-  /**
-   * Returns element at pointer
-   * 
-   * @return element at pointer
-   */
-  public float get() {
-    return array[pointer];
-  }
-
-  /**
-   * Increases pointer by one (++)
-   */
-  public void pp() {
-    // pointer++;
-    setPointer(pointer + 1);
-  }
-
-  /**
-   * Sets element at pointer
-   * 
-   * @param f
-   *            desired value
-   */
-  public void set(float f) {
-    array[pointer] = f;
-
-  }
-
-  /**
-   * Returns array element at specified index
-   * 
-   * @param i
-   *            array index
-   * @return element at index
-   */
-  public float get(int i) {
-    return array[i];
-  }
-
-  /**
-   * Returns array element at specified index relatively to pointer
-   * 
-   * @param i
-   *            relative index
-   * @return element at relative index
-   */
-  public float getRelative(int i) {
-    return array[pointer + i];
-  }
-
-  /**
-   * Sets value of element at specified index relatively to pointer
-   * 
-   * @param i
-   *            relative index
-   * @param value
-   *            value to be set
-   */
-  public void setRelative(int i, float value) {
-    array[pointer + i] = value;
-  }
-
-  /**
-   * Lessens pointer by value
-   * 
-   * @param i
-   *            lessen by
-   */
-  public void lessenPointerBy(int i) {
-    // pointer-=i;
-    setPointer(pointer - i);
-  }
-
-  /**
-   * Returns pointer value
-   * 
-   * @return pointer value
-   */
-  public int getPointer() {
-    return pointer;
-  }
-
-  /**
-   * Sets ponter value
-   * 
-   * @param pointer
-   *            pointer value to be set
-   */
-  public void setPointer(int pointer) {
-    if (!noCheck && pointer > array.length)
-      throw new IllegalArgumentException("Pointer " + pointer
-                                         + " out of bounds " + array.length);
-    this.pointer = pointer;
-  }
-
-  /**
-   * Raises pointer by value
-   * 
-   * @param i
-   *            raise by
-   */
-  public void raisePointerBy(int i) {
-    // pointer+=i;
-    setPointer(pointer + i);
-  }
-
-  /**
-   * Lessens ponter by one (--)
-   */
-  public void mm() {
-    // pointer--;
-    setPointer(pointer - 1);
-  }
-
-  /**
-   * Returns underlaying array
-   * 
-   * @return underlaying array
-   */
-  public float[] getArray() {
-    return array;
-  }
-
-  /**
-   * Sets underlaying array
-   * 
-   * @param array
-   *            underlaying array
-   */
-  public void setArray(float[] array) {
-    this.array = array;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java
deleted file mode 100755
index fed301895..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/**
- * Class replacing C language pointer
- * 
- * @author Tomas Hrasky
- * 
- */
-public class CArrayOfQuiltspecs {
-  /**
-   * Underlaying array
-   */
-  private Quiltspec[] array;
-
-  /**
-   * Pointer to array member
-   */
-  private int pointer;
-
-  /**
-   * Makes new CArray
-   * 
-   * @param array
-   *            underlaying array
-   * @param pointer
-   *            pointer (index) to array
-   */
-  public CArrayOfQuiltspecs(Quiltspec[] array, int pointer) {
-    this.array = array;
-    this.pointer = pointer;
-  }
-
-  /**
-   * Makes new CArray from other CArray
-   * 
-   * @param carray
-   *            reference array
-   */
-  public CArrayOfQuiltspecs(CArrayOfQuiltspecs carray) {
-    this.array = carray.array;
-    this.pointer = carray.pointer;
-  }
-
-  /**
-   * Makes new CArray with pointer set to 0
-   * 
-   * @param array
-   *            underlaying array
-   */
-  public CArrayOfQuiltspecs(Quiltspec[] array) {
-    this.array = array;
-    this.pointer = 0;
-  }
-
-  /**
-   * Returns element at pointer
-   * 
-   * @return element at pointer
-   */
-  public Quiltspec get() {
-    return array[pointer];
-  }
-
-  /**
-   * Increases pointer by one (++)
-   */
-  public void pp() {
-    pointer++;
-  }
-
-  /**
-   * Sets element at pointer
-   * 
-   * @param f
-   *            desired value
-   */
-  public void set(Quiltspec f) {
-    array[pointer] = f;
-
-  }
-
-  /**
-   * Returns array element at specified index
-   * 
-   * @param i
-   *            array index
-   * @return element at index
-   */
-  public Quiltspec get(int i) {
-    return array[i];
-  }
-
-  /**
-   * Lessens pointer by value
-   * 
-   * @param i
-   *            lessen by
-   */
-  public void lessenPointerBy(int i) {
-    pointer -= i;
-
-  }
-
-  /**
-   * Returns pointer value
-   * 
-   * @return pointer value
-   */
-  public int getPointer() {
-    return pointer;
-  }
-
-  /**
-   * Sets ponter value
-   * 
-   * @param pointer
-   *            pointer value to be set
-   */
-  public void setPointer(int pointer) {
-    this.pointer = pointer;
-  }
-
-  /**
-   * Raises pointer by value
-   * 
-   * @param i
-   *            raise by
-   */
-  public void raisePointerBy(int i) {
-    pointer += i;
-
-  }
-
-  /**
-   * Lessens ponter by one (--)
-   */
-  public void mm() {
-    pointer--;
-
-  }
-
-  /**
-   * Returns underlaying array
-   * 
-   * @return underlaying array
-   */
-  public Quiltspec[] getArray() {
-    return array;
-  }
-
-  /**
-   * Sets underlaying array
-   * 
-   * @param array
-   *            underlaying array
-   */
-  public void setArray(Quiltspec[] array) {
-    this.array = array;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curve.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curve.java
deleted file mode 100755
index 752d7ac2e..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curve.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class holding curve definition
- * @author Tomáš Hráský
- *
- */
-public class Curve {
-
-  /**
-   * Maximum coordinates per control point
-   */
-  private static final int MAXCOORDS = 5;
-
-  /**
-   * Max curve order
-   */
-  private static final int MAXORDER = 24;
-
-  /**
-   * Next curve in linked list
-   */
-  public Curve next;
-
-  /**
-   * OpenGL maps
-   */
-  private Mapdesc mapdesc;
-
-  /**
-   * Does the curve need sampling
-   */
-  private boolean needsSampling;
-
-  /**
-   * Culling
-   */
-  private int cullval;
-
-  /**
-   * Number of coords
-   */
-  private int stride;
-
-  /**
-   * Curve order
-   */
-  private int order;
-
-  /**
-   * Holds conversion range borders
-   */
-  private float[] range;
-
-  /**
-   * Subdivision stepsize
-   */
-  public float stepsize;
-
-  /**
-   * Minimal subdivision stepsize
-   */
-  private float minstepsize;
-
-  /**
-   * Sampling points
-   */
-  float[] spts;
-
-  /**
-   * Makes new Curve
-   * 
-   * @param geo
-   * @param pta
-   * @param ptb
-   * @param c
-   *            next curve in linked list
-   */
-  public Curve(Quilt geo, float[] pta, float[] ptb, Curve c) {
-
-    spts = new float[MAXORDER * MAXCOORDS];
-
-    mapdesc = geo.mapdesc;
-
-    next = c;
-    needsSampling = mapdesc.isRangeSampling() ? true : false;
-
-    cullval = mapdesc.isCulling() ? Subdivider.CULL_ACCEPT
-      : Subdivider.CULL_TRIVIAL_REJECT;
-    order = geo.qspec.get(0).order;
-    stride = MAXCOORDS;
-
-    // CArrayOfFloats ps = geo.cpts;
-    CArrayOfFloats ps = new CArrayOfFloats(geo.cpts.getArray(), 0);
-    CArrayOfQuiltspecs qs = geo.qspec;
-    ps.raisePointerBy(qs.get().offset);
-    ps.raisePointerBy(qs.get().index * qs.get().order * qs.get().stride);
-
-    if (needsSampling) {
-      mapdesc.xformSampling(ps, qs.get().order, qs.get().stride, spts,
-                            stride);
-    }
-    if (cullval == Subdivider.CULL_ACCEPT) {
-      //				System.out.println("TODO curve.Curve-cullval");
-      // mapdesc.xformCulling(ps,qs.get().order,qs.get().stride,cpts,stride);
-    }
-
-    range = new float[3];
-    range[0] = qs.get().breakpoints[qs.get().index];
-    range[1] = qs.get().breakpoints[qs.get().index + 1];
-    range[2] = range[1] - range[0];
-    // TODO it is necessary to solve problem with "this" pointer here 
-    if (range[0] != pta[0]) {
-      //				System.out.println("TODO curve.Curve-range0");
-      // Curve lower=new Curve(this,pta,0);
-      // lower.next=next;
-      // this=lower;
-    }
-    if (range[1] != ptb[0]) {
-      //				System.out.println("TODO curve.Curve-range1");
-      // Curve lower=new Curve(this,ptb,0);
-    }
-  }
-
-  /**
-   * Checks culling type
-   * @return Subdivider.CULL_ACCEPT
-   */
-  public int cullCheck() {
-    if (cullval == Subdivider.CULL_ACCEPT) {
-      //				System.out.println("TODO curve.cullval");
-      // cullval=mapdesc.cullCheck(cpts,order,stride);
-    }
-    // TODO compute cullval and return the computed value
-    // return cullval;
-    return Subdivider.CULL_ACCEPT;
-  }
-
-  /**
-   * Computes subdivision step size
-   */
-  public void getStepSize() {
-    minstepsize = 0;
-    if (mapdesc.isConstantSampling()) {
-      setstepsize(mapdesc.maxrate);
-    } else if (mapdesc.isDomainSampling()) {
-      setstepsize(mapdesc.maxrate * range[2]);
-    } else {
-      assert (order <= MAXORDER);
-
-      float tmp[][] = new float[MAXORDER][MAXCOORDS];
-
-      int tstride = (MAXORDER);
-
-      int val = 0;
-      // mapdesc.project(spts,stride,tmp,tstride,order);
-
-      //				System.out.println("TODO curve.getsptepsize mapdesc.project");
-
-      if (val == 0) {
-        setstepsize(mapdesc.maxrate);
-      } else {
-        float t = mapdesc.getProperty(NurbsConsts.N_PIXEL_TOLERANCE);
-        if (mapdesc.isParametricDistanceSampling()) {
-          //						System.out.println("TODO curve.getstepsize - parametric");
-        } else if (mapdesc.isPathLengthSampling()) {
-          //						System.out.println("TODO curve.getstepsize - pathlength");
-        } else {
-          setstepsize(mapdesc.maxrate);
-        }
-      }
-
-    }
-
-  }
-
-  /**
-   * Sets maximum subdivision step size
-   * @param max maximum subdivision step size
-   */
-  private void setstepsize(float max) {
-    // DONE
-    stepsize = (max >= 1) ? (range[2] / max) : range[2];
-    minstepsize = stepsize;
-  }
-
-  /**
-   * Clamps the curve
-   */
-  public void clamp() {
-    // DONE
-    if (stepsize < minstepsize)
-      stepsize = mapdesc.clampfactor * minstepsize;
-  }
-
-  /**
-   * Tells whether curve needs subdivision
-   * 
-   * @return curve needs subdivison
-   */
-  public boolean needsSamplingSubdivision() {
-    return (stepsize < minstepsize);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CurveEvaluator.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CurveEvaluator.java
deleted file mode 100755
index ddfe30ad8..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CurveEvaluator.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class rendering curves with OpenGL
- * @author Tomáš Hráský
- *
- */
-public interface CurveEvaluator {
-  /**
-   * Pushes eval bit
-   */
-  public void bgnmap1f();
-
-  /**
-   * Pops all OpenGL attributes
-   */
-  public void endmap1f() ;
-
-  /**
-   * Initializes opengl evaluator
-   * @param type curve type
-   * @param ulo lowest u
-   * @param uhi highest u
-   * @param stride control point coords
-   * @param order curve order
-   * @param ps control points
-   */
-  public void map1f(int type, float ulo, float uhi, int stride, int order,
-                    CArrayOfFloats ps) ;
-
-  /**
-   * Calls opengl enable
-   * @param type what to enable
-   */
-  public void enable(int type) ;
-
-  /**
-   * Calls glMapGrid1f
-   * @param nu steps
-   * @param u1 low u
-   * @param u2 high u
-   */
-  public void mapgrid1f(int nu, float u1, float u2) ;
-
-  /**
-   * Evaluates a curve using glEvalMesh1f
-   * @param style Backend.N_MESHFILL/N_MESHLINE/N_MESHPOINT
-   * @param from lowest param
-   * @param to highest param
-   */
-  public void mapmesh1f(int style, int from, int to) ;
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curvelist.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curvelist.java
deleted file mode 100755
index 2de7e8208..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curvelist.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class for woking with linked list of curves
- * @author Tomas Hrasky
- *
- */
-public class Curvelist {
-
-  /**
-   * Head of linked list
-   */
-  private Curve curve;
-
-  /**
-   * Holds conversion range borders
-   */
-  float[] range;
-
-  /**
-   * Subdivision step size
-   */
-  public float stepsize;
-
-  /**
-   * Do curves need subdivision?
-   */
-  private boolean needsSubdivision;
-
-  /**
-   * Makes new instance on top of specified lis of Quilts
-   * @param qlist underlaying list of quilts
-   * @param pta range start
-   * @param ptb range end
-   */
-  public Curvelist(Quilt qlist, float[] pta, float[] ptb) {
-    // DONE
-    curve = null;
-    range = new float[3];
-
-    for (Quilt q = qlist; q != null; q = q.next) {
-      curve = new Curve(q, pta, ptb, curve);
-    }
-    range[0] = pta[0];
-    range[1] = ptb[0];
-    range[2] = range[1] - range[0];
-  }
-
-  /**
-   * Compute step size
-   */
-  public void getstepsize() {
-    // DONE
-    stepsize = range[2];
-    Curve c;
-    for (c = curve; c != null; c = c.next) {
-      c.getStepSize();
-      c.clamp();
-      stepsize = (c.stepsize < stepsize) ? c.stepsize : stepsize;
-      if (c.needsSamplingSubdivision())
-        break;
-    }
-    needsSubdivision = (c != null) ? true : false;
-
-  }
-
-  /**
-   * Indicates whether curves need subdivision
-   * @return curves need subdivision
-   */
-  public boolean needsSamplingSubdivision() {
-    // DONE
-    return needsSubdivision;
-  }
-
-  /**
-   * Checks for culling
-   * @return Subdivider.CULL_TRIVIAL_REJECT or Subdivider.CULL_ACCEPT
-   */
-  public int cullCheck() {
-    // DONE
-    for (Curve c = curve; c != null; c = c.next)
-      if (c.cullCheck() == Subdivider.CULL_TRIVIAL_REJECT)
-        return Subdivider.CULL_TRIVIAL_REJECT;
-    return Subdivider.CULL_ACCEPT;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/DisplayList.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/DisplayList.java
deleted file mode 100755
index d0090d7f6..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/DisplayList.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-import java.lang.reflect.Method;
-
-/**
- * Display list
- * @author Tomas Hrasky
- *
- */
-public class DisplayList {
-
-  /**
-   * Append action to the display list
-   * @param src source object to invoke method on
-   * @param m invoked method
-   * @param arg method argument
-   */
-  public void append(Object src, Method m, Object arg) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO displaylist append");
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Flist.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Flist.java
deleted file mode 100755
index c329a5cf7..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Flist.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-import java.util.Arrays;
-
-/**
- * List of breakpoints
- * @author Tomas Hrasky
- *
- */
-public class Flist {
-
-  /**
-   * Data elements end index
-   * 
-   */
-  public int end;
-
-  /**
-   *Data elements start index 
-   */
-  public int start;
-
-  /**
-   * Breakpoint values
-   */
-  public float[] pts;
-
-  /**
-   * Number of array fields
-   */
-  private int npts;
-
-  /**
-   * Grows list
-   * @param maxpts maximum desired size
-   */
-  public void grow(int maxpts) {
-    // DONE
-    if (npts < maxpts) {
-      // npts=2*maxpts;
-      npts = maxpts;
-      pts = new float[npts];
-    }
-    start = 0;
-    end = 0;
-  }
-
-  /**
-   * Removes duplicate array elemnts 
-   */
-  public void filter() {
-    // INFO the aim of this method is to remove duplicates from array
-
-    Arrays.sort(pts);
-
-    start = 0;
-
-    int j = 0;
-
-    for (int i = 1; i < end; i++) {
-      if (pts[i] == pts[i - j - 1])
-        j++;
-      pts[i - j] = pts[i];
-    }
-
-    end -= j;
-
-  }
-
-  /**
-   * Sets start and and to real start and end of array elements
-   * @param from start from
-   * @param to end at
-   */
-  public void taper(float from, float to) {
-    // DONE
-
-    while (pts[start] != from) {
-      start++;
-    }
-
-    while (pts[end - 1] != to) {
-      end--;
-    }
-
-  }
-
-  /**
-   * Adds breakpoint value
-   * @param f value
-   */
-  public void add(float f) {
-    //DONE
-    pts[end++] = f;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotspec.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotspec.java
deleted file mode 100755
index a6b3c458c..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotspec.java
+++ /dev/null
@@ -1,557 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Knot vector specification
- * 
- * @author Tomas Hrasky
- * 
- */
-public class Knotspec {
-
-  /**
-   * Begin of input knots
-   */
-  public CArrayOfFloats inkbegin;
-
-  /**
-   * End of input knots
-   */
-  public CArrayOfFloats inkend;
-
-  /**
-   * Stride before knot operations
-   */
-  public int prestride;
-
-  /**
-   * Curve order
-   */
-  public int order;
-
-  /**
-   * Next knot specification in linked list (used in surfaces)
-   */
-  public Knotspec next;
-
-  /**
-   * Last knot
-   */
-  public CArrayOfFloats klast;
-
-  /**
-   * First knot
-   */
-  CArrayOfFloats kfirst;
-
-  /**
-   * Beginning of breakpoints
-   */
-  CArrayOfBreakpts bbegin;
-
-  /**
-   * End of breakpoints
-   */
-  CArrayOfBreakpts bend;
-
-  /**
-   * Considered left end knot
-   */
-  CArrayOfFloats kleft;
-
-  /**
-   * Considered right end knot
-   */
-  CArrayOfFloats kright;
-
-  /**
-   * Offset before knot operations
-   */
-  int preoffset;
-
-  /**
-   * Control points array Length after knot operations
-   */
-  int postwidth;
-
-  /**
-   * Beginning of coeficients array
-   */
-  private CArrayOfFloats sbegin;
-
-  /**
-   * Beginning of output knots
-   */
-  private CArrayOfFloats outkbegin;
-
-  /**
-   * End of output knots
-   */
-  private CArrayOfFloats outkend;
-
-  /**
-   * Control points aray length before knot operations
-   */
-  int prewidth;
-
-  /**
-   * Offset after knot operations
-   */
-  int postoffset;
-
-  /**
-   * Number of control points' coordinates after knot operations
-   */
-  public int poststride;
-
-  /**
-   * Number of control points' coordinates
-   */
-  public int ncoords;
-
-  /**
-   * Tell whether knotspec has already benn transformed
-   */
-  public boolean istransformed;
-
-  /**
-   * Knotspec to be transformed
-   */
-  public Knotspec kspectotrans;
-
-  /**
-   * Finds knot border of knot insertion and required multiplicities
-   */
-  public void preselect() {
-    // DONE
-    float kval;
-
-    klast = new CArrayOfFloats(inkend);
-    klast.lessenPointerBy(order);
-    for (kval = klast.get(); klast.getPointer() != inkend.getPointer(); klast
-           .pp()) {
-      if (!Knotvector.identical(klast.get(), kval))
-        break;
-    }
-
-    kfirst = new CArrayOfFloats(inkbegin);
-    kfirst.raisePointerBy(order - 1);
-    for (kval = kfirst.get(); kfirst.getPointer() != inkend.getPointer(); kfirst
-           .pp()) {
-      if (!Knotvector.identical(kfirst.get(), kval))
-        break;
-    }
-
-    CArrayOfFloats k = new CArrayOfFloats(kfirst);
-    k.mm();
-
-    for (; k.getPointer() >= inkbegin.getPointer(); k.mm())
-      if (!Knotvector.identical(kval, k.get()))
-        break;
-    k.pp();
-
-    Breakpt[] bbeginArray = new Breakpt[(klast.getPointer() - kfirst
-                                         .getPointer()) + 1];
-    for (int i = 0; i < bbeginArray.length; i++)
-      bbeginArray[i] = new Breakpt();
-    bbegin = new CArrayOfBreakpts(bbeginArray, 0);
-    bbegin.get().multi = kfirst.getPointer() - k.getPointer();
-    bbegin.get().value = kval;
-
-    bend = new CArrayOfBreakpts(bbegin);
-    kleft = new CArrayOfFloats(kfirst);
-    kright = new CArrayOfFloats(kfirst);
-
-  }
-
-  /**
-   * Perpares knotspec for transformation
-   */
-  public void select() {
-    // DONE
-    breakpoints();
-    knots();
-    factors();
-
-    preoffset = kleft.getPointer() - (inkbegin.getPointer() + order);
-    postwidth = ((bend.getPointer() - bbegin.getPointer()) * order);
-    prewidth = (outkend.getPointer() - outkbegin.getPointer()) - order;
-    postoffset = (bbegin.get().def > 1) ? (bbegin.get().def - 1) : 0;
-
-  }
-
-  /**
-   * Computes alpha factors for computing new control points
-   */
-  private void factors() {
-    // DONE
-    CArrayOfFloats mid = new CArrayOfFloats(outkend.getArray(), (outkend
-                                                                 .getPointer() - 1)
-                                            - order + bend.get().multi);
-
-    CArrayOfFloats fptr = null;
-    if (sbegin != null)
-      fptr = new CArrayOfFloats(sbegin);
-
-    for (CArrayOfBreakpts bpt = new CArrayOfBreakpts(bend); bpt
-           .getPointer() >= bbegin.getPointer(); bpt.mm()) {
-      mid.lessenPointerBy(bpt.get().multi);
-      int def = bpt.get().def - 1;
-      if (def < 0)
-        continue;
-      float kv = bpt.get().value;
-
-      CArrayOfFloats kf = new CArrayOfFloats(mid.getArray(), (mid
-                                                              .getPointer() - def)
-                                             + (order - 1));
-      for (CArrayOfFloats kl = new CArrayOfFloats(kf.getArray(), kf
-                                                  .getPointer()
-                                                  + def); kl.getPointer() != kf.getPointer(); kl.mm()) {
-        CArrayOfFloats kh, kt;
-        for (kt = new CArrayOfFloats(kl), kh = new CArrayOfFloats(mid); kt
-               .getPointer() != kf.getPointer(); kh.mm(), kt.mm()) {
-          fptr.set((kv - kh.get()) / (kt.get() - kh.get()));
-          fptr.pp();
-        }
-        kl.set(kv);
-      }
-    }
-
-  }
-
-  /**
-   * Makes new knot vector
-   */
-  private void knots() {
-    // DONE
-    CArrayOfFloats inkpt = new CArrayOfFloats(kleft.getArray(), kleft
-                                              .getPointer()
-                                              - order);
-    CArrayOfFloats inkend = new CArrayOfFloats(kright.getArray(), kright
-                                               .getPointer()
-                                               + bend.get().def);
-
-    outkbegin = new CArrayOfFloats(new float[inkend.getPointer()
-                                             - inkpt.getPointer()], 0);
-    CArrayOfFloats outkpt;
-    for (outkpt = new CArrayOfFloats(outkbegin); inkpt.getPointer() != inkend
-           .getPointer(); inkpt.pp(), outkpt.pp()) {
-      outkpt.set(inkpt.get());
-    }
-    outkend = new CArrayOfFloats(outkpt);
-  }
-
-  /**
-   * Analyzes breakpoints
-   */
-  private void breakpoints() {
-    // DONE
-    CArrayOfBreakpts ubpt = new CArrayOfBreakpts(bbegin);
-    CArrayOfBreakpts ubend = new CArrayOfBreakpts(bend);
-    int nfactors = 0;
-
-    ubpt.get().value = ubend.get().value;
-    ubpt.get().multi = ubend.get().multi;
-
-    kleft = new CArrayOfFloats(kright);
-
-    for (; kright.getPointer() != klast.getPointer(); kright.pp()) {
-      if (Knotvector.identical(kright.get(), ubpt.get().value)) {
-        ubpt.get().multi++;
-      } else {
-        ubpt.get().def = order - ubpt.get().multi;
-        nfactors += (ubpt.get().def * (ubpt.get().def - 1)) / 2;
-        ubpt.pp();
-        ubpt.get().value = kright.get();
-        ubpt.get().multi = 1;
-      }
-    }
-    ubpt.get().def = order - ubpt.get().multi;
-    nfactors += (ubpt.get().def * (ubpt.get().def - 1)) / 2;
-
-    bend = new CArrayOfBreakpts(ubpt);
-
-    if (nfactors > 0) {
-      sbegin = new CArrayOfFloats(new float[nfactors], 0);
-    } else {
-      sbegin = null;
-    }
-
-  }
-
-  /**
-   * Copies control points
-   * 
-   * @param _inpt
-   *            input control points
-   * @param _outpt
-   *            output control points
-   */
-  public void copy(CArrayOfFloats _inpt, CArrayOfFloats _outpt) {
-    CArrayOfFloats inpt = new CArrayOfFloats(_inpt);
-    CArrayOfFloats outpt = new CArrayOfFloats(_outpt);
-
-    inpt.raisePointerBy(preoffset);
-    if (next != null) {
-      for (CArrayOfFloats lpt = new CArrayOfFloats(outpt.getArray(),
-                                                   outpt.getPointer() + prewidth); outpt.getPointer() != lpt
-             .getPointer(); outpt.raisePointerBy(poststride)) {
-        next.copy(inpt, outpt);
-        inpt.raisePointerBy(prestride);
-      }
-
-    } else {
-      for (CArrayOfFloats lpt = new CArrayOfFloats(outpt.getArray(),
-                                                   outpt.getPointer() + prewidth); outpt.getPointer() != lpt
-             .getPointer(); outpt.raisePointerBy(poststride)) {
-        pt_io_copy(outpt, inpt);
-        inpt.raisePointerBy(prestride);
-      }
-    }
-
-  }
-
-  /**
-   * Copies one control point to other
-   * 
-   * @param topt
-   *            source control point
-   * @param frompt
-   *            destination control point
-   */
-  private void pt_io_copy(CArrayOfFloats topt, CArrayOfFloats frompt) {
-    // DONE
-    switch (ncoords) {
-    case 4:
-      topt.setRelative(3, frompt.getRelative(3));
-    case 3:
-      topt.setRelative(2, frompt.getRelative(2));
-    case 2:
-      topt.setRelative(1, frompt.getRelative(1));
-    case 1:
-      topt.set(frompt.get());
-      break;
-    default:
-      // TODO break with copying in general case
-      //				System.out.println("TODO knotspec.pt_io_copy");
-      break;
-    }
-
-  }
-
-  /**
-   * Inserts a knot
-   * 
-   * @param _p
-   *            inserted knot
-   */
-  public void transform(CArrayOfFloats _p) {
-    CArrayOfFloats p = new CArrayOfFloats(_p);
-    // DONE
-    if (next != null) {//surface code
-      if (this.equals(kspectotrans)) {
-        next.transform(p);
-      } else {
-        if (istransformed) {
-          p.raisePointerBy(postoffset);
-          for (CArrayOfFloats pend = new CArrayOfFloats(p.getArray(),
-							p.getPointer() + postwidth); p.getPointer() != pend
-                 .getPointer(); p.raisePointerBy(poststride))
-            next.transform(p);
-
-        } else {
-          CArrayOfFloats pend = new CArrayOfFloats(p.getArray(), p
-                                                   .getPointer()
-                                                   + prewidth);
-          for (; p.getPointer() != pend.getPointer(); p
-                 .raisePointerBy(poststride))
-            next.transform(p);
-        }
-      }
-
-    } else {//code for curve 
-      if (this.equals(kspectotrans)) {
-        insert(p);
-      } else {
-        if (istransformed) {
-          p.raisePointerBy(postoffset);
-          for (CArrayOfFloats pend = new CArrayOfFloats(p.getArray(),
-							p.getPointer() + postwidth); p.getPointer() != pend
-                 .getPointer(); p.raisePointerBy(poststride)) {
-            kspectotrans.insert(p);
-          }
-        } else {
-          CArrayOfFloats pend = new CArrayOfFloats(p.getArray(), p
-                                                   .getPointer()
-                                                   + prewidth);
-          for (; p.getPointer() != pend.getPointer(); p
-                 .raisePointerBy(poststride))
-            kspectotrans.insert(p);
-        }
-      }
-    }
-
-  }
-
-  /**
-   * Inserts a knot and computes new control points
-   * 
-   * @param p
-   *            inserted knot
-   */
-  private void insert(CArrayOfFloats p) {
-    // DONE
-    CArrayOfFloats fptr = null;
-    if (sbegin != null)
-      fptr = new CArrayOfFloats(sbegin);
-    CArrayOfFloats srcpt = new CArrayOfFloats(p.getArray(), p.getPointer()
-                                              + prewidth - poststride);
-    // CArrayOfFloats srcpt = new CArrayOfFloats(p.getArray(), prewidth -
-    // poststride);
-    CArrayOfFloats dstpt = new CArrayOfFloats(p.getArray(), p.getPointer()
-                                              + postwidth + postoffset - poststride);
-    // CArrayOfFloats dstpt = new CArrayOfFloats(p.getArray(), postwidth +
-    // postoffset - poststride);
-    CArrayOfBreakpts bpt = new CArrayOfBreakpts(bend);
-
-    for (CArrayOfFloats pend = new CArrayOfFloats(srcpt.getArray(), srcpt
-                                                  .getPointer()
-                                                  - poststride * bpt.get().def); srcpt.getPointer() != pend
-           .getPointer(); pend.raisePointerBy(poststride)) {
-      CArrayOfFloats p1 = new CArrayOfFloats(srcpt);
-      for (CArrayOfFloats p2 = new CArrayOfFloats(srcpt.getArray(), srcpt
-                                                  .getPointer()
-                                                  - poststride); p2.getPointer() != pend.getPointer(); p1
-             .setPointer(p2.getPointer()), p2
-             .lessenPointerBy(poststride)) {
-        pt_oo_sum(p1, p1, p2, fptr.get(), 1.0 - fptr.get());
-        fptr.pp();
-      }
-    }
-    bpt.mm();
-    for (; bpt.getPointer() >= bbegin.getPointer(); bpt.mm()) {
-
-      for (int multi = bpt.get().multi; multi > 0; multi--) {
-        pt_oo_copy(dstpt, srcpt);
-        dstpt.lessenPointerBy(poststride);
-        srcpt.lessenPointerBy(poststride);
-      }
-      for (CArrayOfFloats pend = new CArrayOfFloats(srcpt.getArray(),
-                                                    srcpt.getPointer() - poststride * bpt.get().def); srcpt
-             .getPointer() != pend.getPointer(); pend
-             .raisePointerBy(poststride), dstpt
-             .lessenPointerBy(poststride)) {
-        pt_oo_copy(dstpt, srcpt);
-        CArrayOfFloats p1 = new CArrayOfFloats(srcpt);
-
-        for (CArrayOfFloats p2 = new CArrayOfFloats(srcpt.getArray(),
-                                                    srcpt.getPointer() - poststride); p2.getPointer() != pend
-               .getPointer(); p1.setPointer(p2.getPointer()), p2
-               .lessenPointerBy(poststride)) {
-          pt_oo_sum(p1, p1, p2, fptr.get(), 1.0 - fptr.get());
-          fptr.pp();
-        }
-      }
-    }
-  }
-
-  /**
-   * Copies one control point to another
-   * 
-   * @param topt
-   *            source ctrl point
-   * @param frompt
-   *            distance ctrl point
-   */
-  private void pt_oo_copy(CArrayOfFloats topt, CArrayOfFloats frompt) {
-    // DONE
-    // this is a "trick" with case - "break" is omitted so it comes through all cases
-    switch (ncoords) {
-    case 4:
-      topt.setRelative(3, frompt.getRelative(3));
-    case 3:
-      topt.setRelative(2, frompt.getRelative(2));
-    case 2:
-      topt.setRelative(1, frompt.getRelative(1));
-    case 1:
-      topt.setRelative(0, frompt.getRelative(0));
-      break;
-    default:
-      // default uses memcpy but it is not needed (we probably won't have more than 4 coords)
-      // TODO not sure about it
-      break;
-    }
-
-  }
-
-  /**
-   * Computes new control point
-   * 
-   * @param x
-   *            first point
-   * @param y
-   *            second point
-   * @param z
-   *            third pont
-   * @param a
-   *            alpha
-   * @param b
-   *            1 - alpha
-   */
-  private void pt_oo_sum(CArrayOfFloats x, CArrayOfFloats y,
-                         CArrayOfFloats z, float a, double b) {
-    // DONE
-    switch (ncoords) {
-    case 4:
-      x.setRelative(3, (float) (a * y.getRelative(3) + b
-                                * z.getRelative(3)));
-    case 3:
-      x.setRelative(2, (float) (a * y.getRelative(2) + b
-                                * z.getRelative(2)));
-    case 2:
-      x.setRelative(1, (float) (a * y.getRelative(1) + b
-                                * z.getRelative(1)));
-    case 1:
-      x.setRelative(0, (float) (a * y.getRelative(0) + b
-                                * z.getRelative(0)));
-      break;
-    default:
-      //no need of default - see previous method and its case statement				
-      //				System.out.println("TODO pt_oo_sum default");
-      break;
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotvector.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotvector.java
deleted file mode 100755
index 9af8a7d15..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotvector.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Knot vector used in curve specification
- * 
- * @author Tomas Hrasky
- * 
- */
-public class Knotvector {
-
-  /**
-   * Tolerance used when comparing knots - when difference is smaller, knots
-   * are considered equal
-   */
-  public static final float TOLERANCE = 1.0e-5f;
-
-  /**
-   * Maximum curve order
-   */
-  private static final int MAXORDER = 24;
-
-  /**
-   * Number of knots
-   */
-  int knotcount;
-
-  /**
-   * Number of control points' coordinates
-   */
-  int stride;
-
-  /**
-   * Curve order
-   */
-  int order;
-
-  /**
-   * Knots
-   */
-  float[] knotlist;
-
-  /**
-   * Makes new knotvector
-   * 
-   * @param nknots
-   *            number of knots
-   * @param stride
-   *            number of ctrl points' corrdinates
-   * @param order
-   *            curve order
-   * @param knot
-   *            knots
-   */
-  public Knotvector(int nknots, int stride, int order, float[] knot) {
-    // DONE
-    init(nknots, stride, order, knot);
-  }
-
-  /**
-   * Initializes knotvector
-   * 
-   * @param nknots
-   *            number of knots
-   * @param stride
-   *            number of ctrl points' corrdinates
-   * @param order
-   *            curve order
-   * @param knot
-   *            knots
-   */
-  public void init(int nknots, int stride, int order, float[] knot) {
-    // DONE
-    this.knotcount = nknots;
-    this.stride = stride;
-    this.order = order;
-    this.knotlist = new float[nknots];
-    for (int i = 0; i < nknots; i++) {
-      this.knotlist[i] = knot[i];
-    }
-
-  }
-
-  /**
-   * Validates knot vector parameters
-   * 
-   * @return knot vector validity
-   */
-  public int validate() {
-    int kindex = knotcount - 1;
-    if (order < 1 || order > MAXORDER) {
-      return 1;
-    }
-    if (knotcount < 2 * order) {
-      return 2;
-    }
-    if (identical(knotlist[kindex - (order - 1)], knotlist[order - 1])) {
-      return 3;
-    }
-    for (int i = 0; i < kindex; i++) {
-      if (knotlist[i] > knotlist[i + 1])
-        return 4;
-    }
-    int multi = 1;
-    for (; kindex >= 1; kindex--) {
-      if (knotlist[kindex] - knotlist[kindex - 1] < TOLERANCE) {
-        multi++;
-        continue;
-      }
-      if (multi > order) {
-        return 5;
-      }
-      multi = 1;
-    }
-    if (multi > order) {
-      return 5;
-    }
-
-    return 0;
-  }
-
-  /**
-   * Show specified message
-   * 
-   * @param msg
-   *            message to be shown
-   */
-  public void show(String msg) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO knotvector.show");
-
-  }
-
-  /**
-   * Compares two knots for equality
-   * 
-   * @param a
-   *            first knot
-   * @param b
-   *            second knot
-   * @return knots are/are not equal
-   */
-  public static boolean identical(float a, float b) {
-    return ((a - b) < TOLERANCE) ? true : false;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Mapdesc.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Mapdesc.java
deleted file mode 100755
index 9a1d434ff..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Mapdesc.java
+++ /dev/null
@@ -1,442 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class holding properties of OpenGL map
- * @author Tomas Hrasky
- *
- */
-public class Mapdesc {
-
-  /**
-   * Maximum control point coords
-   */
-  private static final int MAXCOORDS = 5;
-
-  /**
-   * Next description in list
-   */
-  public Mapdesc next;
-
-  /**
-   * Is map rational
-   */
-  public int isrational;
-
-  /**
-   * Number of control point coords
-   */
-  public int ncoords;
-
-  /**
-   * Map type
-   */
-  private int type;
-
-  /**
-   * Number of homogenous coords
-   */
-  private int hcoords;
-
-  /**
-   * Number of inhomogenous coords
-   */
-  private int inhcoords;
-
-  /**
-   * Not used
-   */
-  private int mask;
-
-  /**
-   * Value of N_PIXEL_TOLERANCE property
-   */
-  private float pixel_tolerance;
-
-  /**
-   * Value of N_ERROR_TOLERANCE property
-   */
-  private float error_tolerance;
-
-  /**
-   * Value of N_BBOX_SUBDIVIDING property
-   */
-  private float bbox_subdividing;
-
-  /**
-   * Value of N_CULLING property
-   */
-  private float culling_method;
-
-  /**
-   * Value of N_SAMPLINGMETHOD property
-   */
-  private float sampling_method;
-
-  /**
-   * Value of N_CLAMPFACTOR property
-   */
-  float clampfactor;
-
-  /**
-   * Value of N_MINSAVINGS property 
-   */
-  private float minsavings;
-
-  /**
-   * Steps in u direction
-   */
-  private float s_steps;
-
-  /**
-   * Steps in v direction
-   */
-  private float t_steps;
-
-  /**
-   * Maximal step
-   */
-  float maxrate;
-
-  /**
-   * Maximal u direction step
-   */
-  private float maxsrate;
-
-  /**
-   * Maximal v direction step
-   */
-  private float maxtrate;
-
-  /**
-   * Not used
-   */
-  private float[][] bmat;
-
-  /**
-   * Sampling matrix
-   */
-  private float[][] smat;
-
-  /**
-   * Not used
-   */
-  private float[][] cmat;
-
-  /**
-   * Not used
-   */
-  private float[] bboxsize;
-
-  /**
-   * Makes new mapdesc 
-   * @param type map type
-   * @param rational is rational
-   * @param ncoords number of control points coords
-   * @param backend backend object
-   */
-  public Mapdesc(int type, int rational, int ncoords, Backend backend) {
-    // DONE
-    this.type = type;
-    this.isrational = rational;
-    this.ncoords = ncoords;
-    this.hcoords = ncoords + (isrational > 0 ? 0 : 1);
-    this.inhcoords = ncoords - (isrational > 0 ? 1 : 0);
-    this.mask = ((1 << (inhcoords * 2)) - 1);
-    next = null;
-
-    assert (hcoords <= MAXCOORDS);
-    assert (inhcoords >= 1);
-
-    pixel_tolerance = 1f;
-    error_tolerance = 1f;
-    bbox_subdividing = NurbsConsts.N_NOBBOXSUBDIVISION;
-    culling_method = NurbsConsts.N_NOCULLING;
-    sampling_method = NurbsConsts.N_NOSAMPLING;
-    clampfactor = NurbsConsts.N_NOCLAMPING;
-    minsavings = NurbsConsts.N_NOSAVINGSSUBDIVISION;
-    s_steps = 0f;
-    t_steps = 0f;
-
-    maxrate = (s_steps < 0) ? 0 : s_steps;
-    maxsrate = (s_steps < 0) ? 0 : s_steps;
-    maxtrate = (t_steps < 0) ? 0 : t_steps;
-    bmat = new float[MAXCOORDS][MAXCOORDS];
-    cmat = new float[MAXCOORDS][MAXCOORDS];
-    smat = new float[MAXCOORDS][MAXCOORDS];
-
-    identify(bmat);
-    identify(cmat);
-    identify(smat);
-    bboxsize = new float[MAXCOORDS];
-    for (int i = 0; i < inhcoords; i++)
-      bboxsize[i] = 1;
-  }
-
-  /**
-   * Make matrix identity matrix
-   * @param arr matrix
-   */
-  private void identify(float[][] arr) {
-    // DONE
-    for (int i = 0; i < MAXCOORDS; i++)
-      for (int j = 0; j < MAXCOORDS; j++)
-        arr[i][j] = 0;
-    for (int i = 0; i < MAXCOORDS; i++)
-      arr[i][i] = 1;
-
-  }
-
-  /**
-   * Tells whether tag is property tag
-   * @param tag property tag
-   * @return is/is not property
-   */
-  public boolean isProperty(int tag) {
-    boolean ret;
-    switch (tag) {
-    case NurbsConsts.N_PIXEL_TOLERANCE:
-    case NurbsConsts.N_ERROR_TOLERANCE:
-    case NurbsConsts.N_CULLING:
-    case NurbsConsts.N_BBOX_SUBDIVIDING:
-    case NurbsConsts.N_S_STEPS:
-    case NurbsConsts.N_T_STEPS:
-    case NurbsConsts.N_SAMPLINGMETHOD:
-    case NurbsConsts.N_CLAMPFACTOR:
-    case NurbsConsts.N_MINSAVINGS:
-      ret = true;
-      break;
-    default:
-      ret = false;
-      break;
-    }
-    return ret;
-  }
-
-  /**
-   * Returns number of control points' coords
-   * @return number of control points' coords
-   */
-  public int getNCoords() {
-    return ncoords;
-  }
-
-  /**
-   * Returns map type
-   * @return map type
-   */
-  public int getType() {
-    return type;
-  }
-
-  /**
-   * Tells whether map is range sampling
-   * @return is map range sampling
-   */
-  public boolean isRangeSampling() {
-    // DONE
-    return (isParametricDistanceSampling() || isPathLengthSampling()
-            || isSurfaceAreaSampling() || isObjectSpaceParaSampling() || isObjectSpacePathSampling());
-  }
-
-  /**
-   * Tells whether map is object space sampling
-   * @return is map object space sampling
-   */
-  private boolean isObjectSpacePathSampling() {
-    // DONE
-    return sampling_method == NurbsConsts.N_OBJECTSPACE_PATH;
-  }
-
-  /**
-   * Tells whether map is object space parasampling
-   * @return is map object space parasampling
-   */
-  private boolean isObjectSpaceParaSampling() {
-    // DONE
-    return sampling_method == NurbsConsts.N_OBJECTSPACE_PARA;
-  }
-
-  /**
-   * Tells whether map is area sampling surface
-   * @return is map area sampling surface
-   */
-  private boolean isSurfaceAreaSampling() {
-    // DONE
-    return sampling_method == NurbsConsts.N_SURFACEAREA;
-  }
-
-  /**
-   * Tells whether map is path length sampling
-   * @return is map path length sampling
-   */
-  boolean isPathLengthSampling() {
-    // DONE
-    return sampling_method == NurbsConsts.N_PATHLENGTH;
-  }
-
-  /**
-   * Tells whether map is parametric distance sampling
-   * @return is map parametric distance sampling
-   */
-  boolean isParametricDistanceSampling() {
-    // DONE
-    return sampling_method == NurbsConsts.N_PARAMETRICDISTANCE;
-  }
-
-  /**
-   * Tells whether map is culling 
-   * @return is map culling
-   */
-  public boolean isCulling() {
-    // DONE
-    return culling_method != NurbsConsts.N_NOCULLING ? true : false;
-  }
-
-  /**
-   * Tells whether map is constantly sampling 
-   * @return is map constant sampling
-   */
-  public boolean isConstantSampling() {
-    return (sampling_method == NurbsConsts.N_FIXEDRATE) ? true : false;
-  }
-
-  /**
-   * Tells whether map is domain sampling 
-   * @return is map domain sampling
-   */
-  public boolean isDomainSampling() {
-    return (sampling_method == NurbsConsts.N_DOMAINDISTANCE) ? true : false;
-  }
-
-  /**
-   * Returns property of specified tag value 
-   * @param tag property tag
-   * @return property value
-   */
-  public float getProperty(int tag) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO mapdesc.getproperty");
-    return 0;
-  }
-
-  /**
-   * Sets property with given tag
-   * @param tag property tag
-   * @param value desired value
-   */
-  public void setProperty(int tag, float value) {
-    // TODO Auto-generated method stub
-    switch (tag) {
-    case NurbsConsts.N_PIXEL_TOLERANCE:
-      pixel_tolerance = value;
-      break;
-    case NurbsConsts.N_ERROR_TOLERANCE:
-      error_tolerance = value;
-      break;
-    case NurbsConsts.N_CULLING:
-      culling_method = value;
-      break;
-    case NurbsConsts.N_BBOX_SUBDIVIDING:
-      if (value <= 0)
-        value = NurbsConsts.N_NOBBOXSUBDIVISION;
-      bbox_subdividing = value;
-      break;
-    case NurbsConsts.N_S_STEPS:
-      if (value < 0)
-        value = 0;
-      s_steps = value;
-      maxrate = value;
-      maxsrate = value;
-      break;
-    case NurbsConsts.N_T_STEPS:
-      if (value < 0)
-        value = 0;
-      t_steps = value;
-      maxtrate = value;
-      break;
-    case NurbsConsts.N_SAMPLINGMETHOD:
-      sampling_method = value;
-      break;
-    case NurbsConsts.N_CLAMPFACTOR:
-      if (value < 0)
-        value = 0;
-      clampfactor = value;
-      break;
-    case NurbsConsts.N_MINSAVINGS:
-      if (value <= 0)
-        value = NurbsConsts.N_NOSAVINGSSUBDIVISION;
-      minsavings = value;
-      break;
-    }
-  }
-
-  /**
-   * Samples curve
-   * @param pts control points
-   * @param order curve order
-   * @param stride number of control points' coordinates
-   * @param sp breakpoints
-   * @param outstride output number of control points' coordinates
-   */
-  public void xformSampling(CArrayOfFloats pts, int order, int stride,
-                            float[] sp, int outstride) {
-    // DONE
-    xFormMat(smat, pts, order, stride, sp, outstride);
-  }
-
-  /**
-   * Empty method
-   * @param mat sampling matrix
-   * @param pts ontrol points
-   * @param order curve order
-   * @param stride number of control points' coordinates
-   * @param cp breakpoints
-   * @param outstride output number of control points' coordinates
-   */
-  private void xFormMat(float[][] mat, CArrayOfFloats pts, int order,
-			int stride, float[] cp, int outstride) {
-    // TODO Auto-generated method stub
-
-    //		System.out.println("TODO mapdsc.xformmat ; change cp from float[] to carrayoffloats");
-
-    if (isrational > 0) {
-
-    } else {
-
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Maplist.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Maplist.java
deleted file mode 100755
index 66d9b7805..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Maplist.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class holding list of Mapdescs
- * @author Tomáš Hráský
- *
- */
-public class Maplist {
-  /**
-   * Head of linked list
-   */
-  private Mapdesc maps;
-
-  /**
-   * Backend class
-   */
-  private Backend backend;
-
-  /**
-   * Makes new Maplist
-   * @param backend Backend class
-   */
-  public Maplist(Backend backend) {
-    this.backend = backend;
-  }
-
-  /**
-   * Sets linked list beginning to null
-   */
-  public void initialize() {
-    // TODO mapdespool.clear ?
-    maps = null;
-  }
-
-  /**
-   * Defines new Mapdesc if it is not defined and appends it to linked list
-   * @param type map type
-   * @param rational is map rational
-   * @param ncoords number of coords
-   */
-  public void define(int type, int rational, int ncoords) {
-    // DONE
-    Mapdesc m = locate(type);
-    assert (m == null || (m.isrational == rational && m.ncoords == ncoords));
-    add(type, rational, ncoords);
-
-  }
-
-  /**
-   * Adds new Mapdesc to linked list
-   * @param type map type
-   * @param rational is map rational
-   * @param ncoords number of coords
-   */
-  private void add(int type, int rational, int ncoords) {
-    // DONE
-    Mapdesc map = new Mapdesc(type, rational, ncoords, backend);
-    if (maps == null) {
-      maps = map;
-    } else {
-      map.next = maps;
-      maps = map;
-    }
-  }
-
-  /**
-   * Tries to find Mapdesc in linked list
-   * @param type map type
-   * @return Mapdesc of type or null if there is no such map
-   */
-  public Mapdesc locate(int type) {
-    // DONE
-    Mapdesc m = null;
-    for (m = maps; m != null; m = m.next)
-      if (m.getType() == type)
-        break;
-    return m;
-  }
-
-  /**
-   * Alias for locate
-   * @param type maptype
-   * @return Mapdesc of type or null if there is no such map
-   */
-  public Mapdesc find(int type) {
-    return locate(type);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/NurbsConsts.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/NurbsConsts.java
deleted file mode 100755
index d6fb1b685..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/NurbsConsts.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class hodling NURBS constants as seen in OpenGL GLU documentation
- * @author JOGL project
- *
- */
-public class NurbsConsts {
-  /*
-   * NURBS Properties - one set per map, each takes a single INREAL arg
-   */
-  public static final int N_SAMPLING_TOLERANCE = 1;
-
-  public static final int N_S_RATE = 6;
-
-  public static final int N_T_RATE = 7;
-
-  public static final int N_CLAMPFACTOR = 13;
-
-  public static final float N_NOCLAMPING = 0.0f;
-
-  public static final int N_MINSAVINGS = 14;
-
-  public static final float N_NOSAVINGSSUBDIVISION = 0.0f;
-
-  /*
-   * NURBS Properties - one set per map, each takes an enumerated value
-   */
-  public static final int N_CULLING = 2;
-
-  public static final float N_NOCULLING = 0.0f;
-
-  public static final float N_CULLINGON = 1.0f;
-
-  public static final int N_SAMPLINGMETHOD = 10;
-
-  public static final float N_NOSAMPLING = 0.0f;
-
-  public static final float N_FIXEDRATE = 3.0f;
-
-  public static final float N_DOMAINDISTANCE = 2.0f;
-
-  public static final float N_PARAMETRICDISTANCE = 5.0f;
-
-  public static final float N_PATHLENGTH = 6.0f;
-
-  public static final float N_SURFACEAREA = 7.0f;
-
-  public static final float N_OBJECTSPACE_PARA = 8.0f;
-
-  public static final float N_OBJECTSPACE_PATH = 9.0f;
-
-  public static final int N_BBOX_SUBDIVIDING = 17;
-
-  public static final float N_NOBBOXSUBDIVISION = 0.0f;
-
-  public static final float N_BBOXTIGHT = 1.0f;
-
-  public static final float N_BBOXROUND = 2.0f;
-
-  /*
-   * NURBS Rendering Properties - one set per renderer each takes an
-   * enumerated value
-   */
-  public static final int N_DISPLAY = 3;
-
-  public static final int N_FILL = 1;
-
-  public static final int N_OUTLINE_POLY = 2;
-
-  public static final int N_OUTLINE_TRI = 3;
-
-  public static final int N_OUTLINE_QUAD = 4;
-
-  public static final int N_OUTLINE_PATCH = 5;
-
-  public static final int N_OUTLINE_PARAM = 6;
-
-  public static final int N_OUTLINE_PARAM_S = 7;
-
-  public static final int N_OUTLINE_PARAM_ST = 8;
-
-  public static final int N_OUTLINE_SUBDIV = 9;
-
-  public static final int N_OUTLINE_SUBDIV_S = 10;
-
-  public static final int N_OUTLINE_SUBDIV_ST = 11;
-
-  public static final int N_ISOLINE_S = 12;
-
-  public static final int N_ERRORCHECKING = 4;
-
-  public static final int N_NOMSG = 0;
-
-  public static final int N_MSG = 1;
-
-  /* GL 4.0 propeties not defined above */
-
-  public static final int N_PIXEL_TOLERANCE = N_SAMPLING_TOLERANCE;
-
-  public static final int N_ERROR_TOLERANCE = 20;
-
-  public static final int N_SUBDIVISIONS = 5;
-
-  public static final int N_TILES = 8;
-
-  public static final int N_TMP1 = 9;
-
-  public static final int N_TMP2 = N_SAMPLINGMETHOD;
-
-  public static final int N_TMP3 = 11;
-
-  public static final int N_TMP4 = 12;
-
-  public static final int N_TMP5 = N_CLAMPFACTOR;
-
-  public static final int N_TMP6 = N_MINSAVINGS;
-
-  public static final int N_S_STEPS = N_S_RATE;
-
-  public static final int N_T_STEPS = N_T_RATE;
-
-  /*
-   * NURBS Rendering Properties - one set per map, each takes an INREAL matrix
-   * argument
-   */
-  public static final int N_CULLINGMATRIX = 1;
-
-  public static final int N_SAMPLINGMATRIX = 2;
-
-  public static final int N_BBOXMATRIX = 3;
-
-  /*
-   * NURBS Rendering Properties - one set per map, each takes an INREAL vector
-   * argument
-   */
-  public static final int N_BBOXSIZE = 4;
-
-  /* type argument for trimming curves */
-
-  public static final int N_P2D = 0x8;
-
-  public static final int N_P2DR = 0xd;
-
-  public static final int N_MESHLINE = 1;
-
-  public static final int N_MESHFILL = 0;
-
-  public static final int N_MESHPOINT = 2;
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_curve.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_curve.java
deleted file mode 100755
index 285c444df..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_curve.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Struct holding curve links
- * @author Tomáš Hráský
- *
- */
-public class O_curve {
-
-  /**
-   * Curve type
-   */
-  public int curvetype;
-
-  /**
-   * Next curve in linked list
-   */
-  public O_curve next;
-
-  /**
-   * Curve of picewiselinear type
-   */
-  public O_pwlcurve o_pwlcurve;
-
-  /**
-   * NURBS curve
-   */
-  public O_nurbscurve o_nurbscurve;
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbscurve.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbscurve.java
deleted file mode 100755
index f1c3ffef7..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbscurve.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * NURBS curve object
- * @author Tomáš Hráský
- *
- */
-public class O_nurbscurve {
-
-  /**
-   * List of bezier curves
-   */
-  public Quilt bezier_curves;
-
-  /**
-   * Curve type
-   */
-  public int type;
-
-  /**
-   * Was curve used ?
-   */
-  public boolean used;
-
-  /**
-   * Parent curve
-   */
-  public O_curve owner;
-
-  /**
-   * Next curve in list
-   */
-  public O_nurbscurve next;
-
-  /**
-   * Makes new O_nurbscurve
-   * @param realType type of curve 
-   */
-  public O_nurbscurve(int realType) {
-    // DONE
-    this.type = realType;
-    this.owner = null;
-    this.next = null;
-    this.used = false;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbssurface.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbssurface.java
deleted file mode 100755
index 4a4c6753a..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbssurface.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * NURBS surface object
- * @author Tomáš Hráský
- *
- */
-public class O_nurbssurface {
-
-  /**
-   * List of bezier patches forming NURBS surface
-   */
-  public Quilt bezier_patches;
-
-  /**
-   * Was surface used
-   */
-  public boolean used;
-
-  /**
-   * Parent O_surface
-   */
-  public O_surface owner;
-
-  /**
-   * Next surface in list
-   */
-  public O_nurbssurface next;
-
-  /**
-   * Surface type
-   */
-  private int type;
-
-  /**
-   * Makes new O_nurbssurface of type
-   * @param type surface type
-   */
-  public O_nurbssurface(int type) {
-    this.type = type;
-    this.owner = null;
-    this.next = null;
-    this.used = false;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java
deleted file mode 100755
index 53c0060a0..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Empty class
- * @author Tomáš Hráský
- *
- */
-public class O_pwlcurve {
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_surface.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_surface.java
deleted file mode 100755
index f135026db..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_surface.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Surface object
- * @author Tomáš Hráský
- *
- */
-public class O_surface {
-  /**
-   * NURBS surface
-   */
-  public O_nurbssurface o_nurbssurface;
-
-  /**
-   * Trims
-   */
-  public O_trim o_trim;
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_trim.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_trim.java
deleted file mode 100755
index 0f59ccec8..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_trim.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Empty class
- * @author Tomáš Hráský
- *
- */
-public class O_trim {
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patch.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patch.java
deleted file mode 100755
index d9a79c45c..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patch.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Empty class
- * @author Tomas Hrasky
- *
- */
-public class Patch {
-
-  /**
-   * Empty constructor
-   * @param q
-   * @param pta
-   * @param ptb
-   * @param patch
-   */
-  public Patch(Quilt q, float[] pta, float[] ptb, Patch patch) {
-    //			System.out.println("TODO patch.constructor");
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patchlist.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patchlist.java
deleted file mode 100755
index 8755ad60e..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patchlist.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * List of patches
- * @author Tomáš Hráský
- *
- */
-public class Patchlist {
-
-  /**
-   * Array of ranges
-   */
-  public Pspec[] pspec;
-
-  /**
-   * head of list of patches
-   */
-  private Patch patch;
-
-  /**
-   * Makes new list of patches 
-   * @param quilts list of quilts
-   * @param pta low border
-   * @param ptb high border
-   */
-  public Patchlist(Quilt quilts, float[] pta, float[] ptb) {
-    // DONE
-    patch = null;
-
-    for (Quilt q = quilts; q != null; q = q.next)
-      patch = new Patch(q, pta, ptb, patch);
-    pspec[0] = new Pspec();
-    pspec[0].range[0] = pta[0];
-    pspec[0].range[1] = ptb[0];
-    pspec[0].range[2] = ptb[0] - pta[0];
-    pspec[1] = new Pspec();
-    pspec[1].range[0] = pta[1];
-    pspec[1].range[1] = ptb[1];
-    pspec[1].range[2] = ptb[1] - pta[1];
-
-  }
-
-  /**
-   * Empty constructor
-   * @param patchlist
-   * @param param
-   * @param mid
-   */
-  public Patchlist(Patchlist patchlist, int param, float mid) {
-    // TODO Auto-generated constructor stub
-    //			System.out.println("TODO patchlist.konstruktor 2");
-  }
-
-  /**
-   * Empty method
-   * @return 0
-   */
-  public int cullCheck() {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO patchlist.cullcheck");
-    return 0;
-  }
-
-  /**
-   * Empty method
-   */
-  public void getstepsize() {
-    //			System.out.println("TODO patchlist.getsptepsize");
-    // TODO Auto-generated method stub
-
-  }
-
-  /**
-   * Empty method
-   * @return false
-   */
-  public boolean needsSamplingSubdivision() {
-    // TODO Auto-generated method stub
-    //			System.out.println("patchlist.needsSamplingSubdivision");
-    return false;
-  }
-
-  /**
-   * Empty method
-   * @param i
-   * @return false
-   */
-  public boolean needsSubdivision(int i) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO patchlist.needsSubdivision");
-    return false;
-  }
-
-  /**
-   * Empty method
-   * @return false
-   */
-  public boolean needsNonSamplingSubdivision() {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO patchlist.needsNonSamplingSubdivision");
-    return false;
-  }
-
-  /**
-   * Empty method
-   */
-  public void bbox() {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO patchlist.bbox");
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Property.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Property.java
deleted file mode 100755
index 8640b1d79..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Property.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class representing property
- * 
- * @author Tomas Hrasky
- * 
- */
-public class Property {
-
-  /**
-   * Property type
-   */
-  public int type;
-
-  /**
-   * Property id
-   */
-  public int tag;
-
-  /**
-   * Property value
-   */
-  public float value;
-
-  /**
-   * Makes new property with given parameters
-   * 
-   * @param type
-   *            property type
-   * @param tag
-   *            property id
-   * @param value
-   *            property value
-   */
-  public Property(int type, int tag, float value) {
-    this.type = type;
-    this.tag = tag;
-    this.value = value;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Pspec.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Pspec.java
deleted file mode 100755
index 1e0a091d2..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Pspec.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class holding range
- * @author Tomáš Hráský
- *
- */
-public class Pspec {
-  /**
-   * Range
-   */
-  public float[] range;
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/PwlArc.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/PwlArc.java
deleted file mode 100755
index 9f6c77774..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/PwlArc.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Picewiselinar trimming arc
- * @author Tomáš Hráský
- *
- */
-public class PwlArc {
-
-  /**
-   * Number of points
-   */
-  private int npts;
-
-  /**
-   * Vertexes
-   */
-  public TrimVertex[] pts;
-
-  /**
-   * Arc type
-   */
-  private int type;
-
-  /**
-   * Makes new trimming arc
-   * @param i num ber of vertexes
-   * @param p trimming vertexes array
-   */
-  public PwlArc(int i, TrimVertex[] p) {
-    // DONE
-    this.npts = i;
-    this.pts = p;
-    type = NurbsConsts.N_P2D;
-
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quilt.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quilt.java
deleted file mode 100755
index 640eb2e83..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quilt.java
+++ /dev/null
@@ -1,282 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class for converting NURBS curves and surfaces to list of bezier arcs or patches repectively
- * @author Tomáš Hráský
- *
- */
-public class Quilt {
-  /**
-   * Maximum quilt dimension
-   */
-  private static final int MAXDIM = 2;
-
-  /**
-   * List of map descriptions
-   */
-  Mapdesc mapdesc;
-
-  /**
-   *  Array of quiltspecs pointer
-   */
-  public CArrayOfQuiltspecs qspec;
-
-  /**
-   * End array of quilt specs pointer
-   */
-  public CArrayOfQuiltspecs eqspec;
-
-  /**
-   * Control points
-   */
-  public CArrayOfFloats cpts;
-
-  /**
-   * Next quilt in list
-   */
-  public Quilt next;
-
-  /**
-   * Makes new quilt with mapdesc
-   * @param mapdesc map description
-   */
-  public Quilt(Mapdesc mapdesc) {
-    // DONE
-    this.mapdesc = mapdesc;
-    Quiltspec[] tmpquilts = new Quiltspec[MAXDIM];
-    for (int i = 0; i < tmpquilts.length; i++)
-      tmpquilts[i] = new Quiltspec();
-    this.qspec = new CArrayOfQuiltspecs(tmpquilts);
-
-  }
-
-  /**
-   * Converts NURBS surface to bezier patches
-   * @param sknotvector knots in u direction
-   * @param tknotvector knots in v direction
-   * @param ctrlarr control points
-   * @param coords control points coords
-   */
-  public void toBezier(Knotvector sknotvector, Knotvector tknotvector,
-                       CArrayOfFloats ctrlarr, int coords) {
-    Splinespec spline = new Splinespec(2);
-    spline.kspecinit(sknotvector, tknotvector);
-    spline.select();
-    spline.layout(coords);
-    spline.setupquilt(this);
-    spline.copy(ctrlarr);
-    spline.transform();
-  }
-
-  /**
-   * Converts NURBS curve to list of bezier curves
-   * @param knots knot vector
-   * @param ctlarray control points
-   * @param ncoords number of coordinates
-   */
-  public void toBezier(Knotvector knots, CArrayOfFloats ctlarray, int ncoords) {
-    // DONE
-    Splinespec spline = new Splinespec(1);
-    spline.kspecinit(knots);
-    spline.select();
-    spline.layout(ncoords);
-    spline.setupquilt(this);
-    spline.copy(ctlarray);
-    spline.transform();
-  }
-
-  /**
-   * Walks thru all arcs/patches
-   * @param pta low border
-   * @param ptb high border
-   * @param backend Backend
-   */
-  public void downloadAll(float[] pta, float[] ptb, Backend backend) {
-    // DONE
-    for (Quilt m = this; m != null; m = m.next) {
-      m.select(pta, ptb);
-      m.download(backend);
-    }
-
-  }
-
-  /**
-   * Renders arcs/patches
-   * @param backend Backend for rendering
-   */
-  private void download(Backend backend) {
-    // DONE
-    if (getDimension() == 2) {
-
-      CArrayOfFloats ps = new CArrayOfFloats(cpts);
-      ps.raisePointerBy(qspec.get(0).offset);
-      ps.raisePointerBy(qspec.get(1).offset);
-      ps.raisePointerBy(qspec.get(0).index * qspec.get(0).order
-                        * qspec.get(0).stride);
-      ps.raisePointerBy(qspec.get(1).index * qspec.get(1).order
-                        * qspec.get(1).stride);
-
-      backend.surfpts(mapdesc.getType(), ps, qspec.get(0).stride, qspec
-                      .get(1).stride, qspec.get(0).order, qspec.get(1).order,
-                      qspec.get(0).breakpoints[qspec.get(0).index],
-                      qspec.get(0).breakpoints[qspec.get(0).index + 1], qspec
-                      .get(1).breakpoints[qspec.get(1).index], qspec
-                      .get(1).breakpoints[qspec.get(1).index + 1]);
-
-    } else {// code for curves
-      // CArrayOfFloats ps=new CArrayOfFloats(cpts);
-      CArrayOfFloats ps = new CArrayOfFloats(cpts.getArray(), 0);
-      ps.raisePointerBy(qspec.get(0).offset);
-      ps.raisePointerBy(qspec.get(0).index * qspec.get(0).order
-                        * qspec.get(0).stride);
-      backend.curvpts(mapdesc.getType(), ps, qspec.get(0).stride, qspec
-                      .get(0).order,
-                      qspec.get(0).breakpoints[qspec.get(0).index],
-                      qspec.get(0).breakpoints[qspec.get(0).index + 1]);
-    }
-
-  }
-
-  /**
-   * Returns quilt dimension
-   * @return quilt dimesion
-   */
-  private int getDimension() {
-    // DONE
-    return eqspec.getPointer() - qspec.getPointer();
-  }
-
-  /**
-   * Finds Quiltspec.index
-   * @param pta range
-   * @param ptb range
-   */
-  private void select(float[] pta, float[] ptb) {
-    // DONE
-    int dim = eqspec.getPointer() - qspec.getPointer();
-    int i, j;
-    for (i = 0; i < dim; i++) {
-      for (j = qspec.get(i).width - 1; j >= 0; j--)
-        if (qspec.get(i).breakpoints[j] <= pta[i]
-            && ptb[i] <= qspec.get(i).breakpoints[j + 1])
-          break;
-      assert (j != -1);
-      qspec.get(i).index = j;
-    }
-  }
-
-  /**
-   * Find range according to breakpoints
-   * @param from low param
-   * @param to high param
-   * @param bpts breakpoints
-   */
-  public void getRange(float[] from, float[] to, Flist bpts) {
-    // DONE
-    getRange(from, to, 0, bpts);
-
-  }
-
-  /**
-   * Find range according to breakpoints
-   * @param from low param
-   * @param to high param
-   * @param i from/to array index
-   * @param list breakpoints
-   */
-  private void getRange(float[] from, float[] to, int i, Flist list) {
-    // DONE
-    Quilt maps = this;
-    from[i] = maps.qspec.get(i).breakpoints[0];
-    to[i] = maps.qspec.get(i).breakpoints[maps.qspec.get(i).width];
-    int maxpts = 0;
-    Quilt m;
-    for (m = maps; m != null; m = m.next) {
-      if (m.qspec.get(i).breakpoints[0] > from[i])
-        from[i] = m.qspec.get(i).breakpoints[0];
-      if (m.qspec.get(i).breakpoints[m.qspec.get(i).width] < to[i])
-        to[i] = m.qspec.get(i).breakpoints[m.qspec.get(i).width];
-      maxpts += m.qspec.get(i).width + 1;
-    }
-    list.grow(maxpts);
-    for (m = maps; m != null; m = m.next) {
-      for (int j = 0; j <= m.qspec.get(i).width; j++) {
-        list.add(m.qspec.get(i).breakpoints[j]);
-      }
-    }
-    list.filter();
-    list.taper(from[i], to[i]);
-  }
-
-  /**
-   * Is this quilt culled
-   * @return 0 or Subdivider.CULL_ACCEPT
-   */
-  public int isCulled() {
-    if (mapdesc.isCulling()) {
-      //				System.out.println("TODO quilt.isculled mapdesc.isculling");
-      return 0;
-    } else {
-      return Subdivider.CULL_ACCEPT;
-    }
-  }
-
-  /**
-   * Finds range for surface
-   * @param from low param
-   * @param to high param
-   * @param slist u direction breakpoints
-   * @param tlist v direction breakpoints
-   */
-  public void getRange(float[] from, float[] to, Flist slist, Flist tlist) {
-    // DONE
-    getRange(from, to, 0, slist);
-    getRange(from, to, 1, tlist);
-
-  }
-
-  /**
-   * Empty method
-   * @param sbrkpts
-   * @param tbrkpts
-   * @param rate
-   */
-  public void findRates(Flist sbrkpts, Flist tbrkpts, float[] rate) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO quilt.findrates");
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quiltspec.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quiltspec.java
deleted file mode 100755
index ee2924918..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quiltspec.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Quilt definition
- * @author Tomas Hrasky
- *
- */
-public class Quiltspec {
-
-  /**
-   * Stride between control points
-   */
-  public int stride;
-
-  /**
-   * Quilt width in breakpoints
-   */
-  public int width;
-
-  /**
-   * Quilt order
-   */
-  public int order;
-
-  /**
-   * Start offset
-   */
-  public int offset;
-
-  /**
-   * Breakpoint index
-   */
-  public int index;
-
-  /**
-   * Boundary
-   */
-  public int[] bdry;
-
-  /**
-   * Breakpoints
-   */
-  public float[] breakpoints;
-
-  /**
-   * Makes new quiltspec
-   */
-  public Quiltspec() {
-    this.bdry = new int[2];
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/README.txt b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/README.txt
deleted file mode 100755
index 89630c71e..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/README.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-Unimplemented functionality
-	- tesselation and callbacks
-	- trimming
-	- setting NURBS properties (-> sampling etc.)
-Differences from C++ source
-	- no pooling
-	- pointers to arrays are replaced by CArrayOf... classes and their methods
-Unimplemented or incomplete "calltree top" methods (according to glu.def in Mesa 6.5)
-	gluBeginTrim
-	gluDeleteNurbsRenderer - won't be needed
-	gluEndTrim
-	gluGetNurbsProperty
-	gluLoadSamplingMatrices
-	gluNurbsCallback
-	gluNurbsCallbackData
-	gluNurbsCallbackDataEXT
-	gluNurbsCurve - TODO type switch
-	gluNurbsProperty
-	gluPwlCurve
-	gluQuadricCallback - not a NURBS method
-As of files
-	- Arc[ST]dirSorter.java - unimplemented (part of tesselation)
-	- Backend.java:194 - wireframe quads - part of tesselation/callback
-	- Curve.java:141-204 - culling
-	- DisplayList.java:57 - append to DL - not sure whether it will be needed
-	- GLUnurbs.java	:443,484 - error values
-			:445 - trimming
-			:512 - error handling (callback)
-			:530 - loadGLmatrices
-			:786 - nuid - nurbs object id - won't be needed I think
-			:803 - end trim
-	- GLUwNURBS.java:68,176 - NUBRS properties
-	- Knotspec.java	:371 - copying in general case (more than 4 coords)
-			:517 - copying with more than 4 coords
-			:556 - pt_oo_sum default
-	- Knotvector.java:165 - show method (probably debugging)
-	- Mapdesc.java	:354 - get property
-			:435 - xFormMat - change param cp to CArrayOfFloats; probably sampling functionality
-	- Maplist.java:68 - clear ?
-	- OpenGLCurveEvaluator.java	:132 - tess./callback code
-					:168 - mapgrid1f
-					:190 - tess./callback code (output triangles)
-	- OpenGLSurfaceEvaluator.java	:77 . tess./callback code
-					:81 - glGetIntegerValue
-					:114 - tess./callback code
-					:117 - Level of detail
-					:144,161,201 - tess./callback code - output triangles
-	- Patch.java:55 - constructor stuff ?
-	- Patchlist.java:55 - constructor stuff ?
-			:97 - cull check
-			:105 - step size
-			:115 - need of sampling subdivision
-			:126 - need of subdivision
-			:137 - need of non sampling subd.
-			:146 - bbox (??)
-	-Quilt.java	:254 - culling
-			:282 - rates
-	-Subdivider.java - all TODOs - it's stuff about trimming probably
-			 :545 - jumpbuffer - not sure purpose it exactly served in original source
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Renderhints.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Renderhints.java
deleted file mode 100755
index 8470a64a1..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Renderhints.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class holding rendering params 
- * @author Tomas Hrasky
- *
- */
-public class Renderhints {
-
-  /**
-   * Check for errors
-   */
-  public int errorchecking;
-
-  /**
-   * Maximum subdivisions
-   */
-  public int maxsubdivisions;
-
-  /**
-   * Number of subdivisions
-   */
-  private int subdivisions;
-
-  /**
-   * Display method
-   */
-  int display_method;
-
-  /**
-   * Output triangles
-   */
-  int wiretris;
-
-  /**
-   * Output quads
-   */
-  int wirequads;
-
-  /**
-   * Makes new Renderinghints
-   */
-  public Renderhints() {
-    display_method = NurbsConsts.N_FILL;
-    errorchecking = NurbsConsts.N_MSG;
-    subdivisions = 6;
-    // tmp1=0;
-  }
-
-  /**
-   * Set property value
-   * @param prop property
-   */
-  public void setProperty(Property prop) {
-    switch (prop.type) {
-    case NurbsConsts.N_DISPLAY:
-      display_method = (int) prop.value;
-      break;
-    case NurbsConsts.N_ERRORCHECKING:
-      errorchecking = (int) prop.value;
-      break;
-    case NurbsConsts.N_SUBDIVISIONS:
-      subdivisions = (int) prop.value;
-      break;
-    default:
-      // abort - end program
-      break;
-    }
-  }
-
-  /**
-   * Initialization
-   */
-  public void init() {
-    // DONE
-    maxsubdivisions = subdivisions;
-    if (maxsubdivisions < 0)
-      maxsubdivisions = 0;
-
-    if (display_method == NurbsConsts.N_FILL) {
-      wiretris = 0;
-      wirequads = 0;
-    } else if (display_method == NurbsConsts.N_OUTLINE_TRI) {
-      wiretris = 1;
-      wirequads = 0;
-    } else if (display_method == NurbsConsts.N_OUTLINE_QUAD) {
-      wiretris = 0;
-      wirequads = 1;
-    } else {
-      wiretris = 1;
-      wirequads = 1;
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Splinespec.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Splinespec.java
deleted file mode 100755
index 7f01435fd..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Splinespec.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * NURBS definition
- * @author Tomas Hrasky
- *
- */
-public class Splinespec {
-
-  /**
-   * Dimension
-   */
-  private int dim;
-
-  /**
-   * Knot vector specs
-   */
-  private Knotspec kspec;
-
-  /**
-   * Control points after conversion
-   */
-  private CArrayOfFloats outcpts;
-
-  /**
-   * Makes new Splinespec with given dimension
-   * @param i dimension
-   */
-  public Splinespec(int i) {
-    // DONE
-    this.dim = i;
-  }
-
-  /**
-   * Initializes knotspec according to knotvector
-   * @param knotvector basic knotvector
-   */
-  public void kspecinit(Knotvector knotvector) {
-    // DONE
-    this.kspec = new Knotspec();
-    kspec.inkbegin = new CArrayOfFloats(knotvector.knotlist, 0);
-    kspec.inkend = new CArrayOfFloats(knotvector.knotlist,
-                                      knotvector.knotcount);
-    kspec.prestride = knotvector.stride;
-    kspec.order = knotvector.order;
-    kspec.next = null;
-  }
-
-  /**
-   * Initializes knotspec according to knotvector - SURFACE
-   * @param sknotvector knotvector in u dir
-   * @param tknotvector knotvector in v dir
-   */
-  public void kspecinit(Knotvector sknotvector, Knotvector tknotvector) {
-    // DONE
-    this.kspec = new Knotspec();
-    Knotspec tkspec = new Knotspec();
-
-    kspec.inkbegin = new CArrayOfFloats(sknotvector.knotlist, 0);
-    kspec.inkend = new CArrayOfFloats(sknotvector.knotlist,
-                                      sknotvector.knotcount);
-    kspec.prestride = sknotvector.stride;
-    kspec.order = sknotvector.order;
-    kspec.next = tkspec;
-
-    tkspec.inkbegin = new CArrayOfFloats(tknotvector.knotlist, 0);
-    tkspec.inkend = new CArrayOfFloats(tknotvector.knotlist,
-                                       tknotvector.knotcount);
-    tkspec.prestride = tknotvector.stride;
-    tkspec.order = tknotvector.order;
-    tkspec.next = null;
-  }
-
-  /**
-   * Preselect and select knotspecs
-   */
-  public void select() {
-    // DONE
-    for (Knotspec knotspec = kspec; knotspec != null; knotspec = knotspec.next) {
-      knotspec.preselect();
-      knotspec.select();
-    }
-
-  }
-
-  /**
-   * Prepares for conversion
-   * @param ncoords number of coords
-   */
-  public void layout(int ncoords) {
-    // DONE
-    int stride = ncoords;
-    for (Knotspec knotspec = kspec; knotspec != null; knotspec = knotspec.next) {
-      knotspec.poststride = stride;
-      stride *= (knotspec.bend.getPointer() - knotspec.bbegin
-                 .getPointer())
-        * knotspec.order + knotspec.postoffset;
-      knotspec.preoffset *= knotspec.prestride;
-      knotspec.prewidth *= knotspec.poststride;
-      knotspec.postwidth *= knotspec.poststride;
-      knotspec.postoffset *= knotspec.poststride;
-      knotspec.ncoords = ncoords;
-    }
-    outcpts = new CArrayOfFloats(new float[stride]);
-
-  }
-
-  /**
-   * Prepares quilt for conversion
-   * @param quilt quilt to work with
-   */
-  public void setupquilt(Quilt quilt) {
-    // DONE
-    CArrayOfQuiltspecs qspec = new CArrayOfQuiltspecs(quilt.qspec);
-    quilt.eqspec = new CArrayOfQuiltspecs(qspec.getArray(), dim);
-    for (Knotspec knotspec = kspec; knotspec != null;) {
-      qspec.get().stride = knotspec.poststride;
-      qspec.get().width = knotspec.bend.getPointer()
-        - knotspec.bbegin.getPointer();
-      qspec.get().order = knotspec.order;
-      qspec.get().offset = knotspec.postoffset;
-      qspec.get().index = 0;
-      qspec.get().bdry[0] = (knotspec.kleft.getPointer() == knotspec.kfirst
-                             .getPointer()) ? 1 : 0;
-      qspec.get().bdry[1] = (knotspec.kright.getPointer() == knotspec.klast
-                             .getPointer()) ? 1 : 0;
-      qspec.get().breakpoints = new float[qspec.get().width + 1];
-      CArrayOfFloats k = new CArrayOfFloats(qspec.get().breakpoints, 0);
-      for (CArrayOfBreakpts bk = new CArrayOfBreakpts(knotspec.bbegin); bk
-             .getPointer() <= knotspec.bend.getPointer(); bk.pp()) {
-        k.set(bk.get().value);
-        k.pp();
-      }
-      knotspec = knotspec.next;
-      if (knotspec != null)
-        qspec.pp();
-    }
-    quilt.cpts = new CArrayOfFloats(outcpts);
-    quilt.next = null;
-  }
-
-  /**
-   * Copies array of control points to output array
-   * @param ctlarray control points array
-   */
-  public void copy(CArrayOfFloats ctlarray) {
-    // DONE
-    kspec.copy(ctlarray, outcpts);
-
-  }
-
-  /**
-   * Transforms knotspecs - conversion
-   */
-  public void transform() {
-    // DONE
-    Knotspec knotspec;
-    outcpts.setPointer(0);
-    for (knotspec = kspec; knotspec != null; knotspec = knotspec.next)
-      knotspec.istransformed = false;
-
-    for (knotspec = kspec; knotspec != null; knotspec = knotspec.next) {
-      for (Knotspec kspec2 = kspec; kspec2 != null; kspec2 = kspec2.next)
-        kspec2.kspectotrans = knotspec;
-      kspec.transform(outcpts);
-      knotspec.istransformed = true;
-    }
-
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Subdivider.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Subdivider.java
deleted file mode 100755
index b8da3e1dd..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Subdivider.java
+++ /dev/null
@@ -1,1167 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class working with curves and surfaces
- * @author Tomas Hrasky
- *
- */
-public class Subdivider {
-  /**
-   * Cull type 
-   */
-  public static final int CULL_TRIVIAL_REJECT = 0;
-
-  /**
-   * Cull type
-   */
-  public static final int CULL_ACCEPT = 1;
-
-  /**
-   * Maximum trimming arcs
-   */
-  private static final int MAXARCS = 10;
-
-  /**
-   * Linked list of Quilts
-   */
-  Quilt qlist;
-
-  /**
-   * Object holding rendering honts information
-   */
-  private Renderhints renderhints;
-
-  /**
-   * Backend object
-   */
-  private Backend backend;
-
-  /**
-   * Number of subdivisions
-   */
-  private int subdivisions;
-
-  /**
-   * U step when using domain distance sampling 
-   */
-  private float domain_distance_u_rate;
-
-  /**
-   * Use domain distance sampling
-   */
-  private int is_domain_distance_sampling;
-
-  /**
-   * Initial class holding trimming arcs
-   */
-  private Bin initialbin;
-
-  /**
-   * Not used
-   */
-  private boolean showDegenerate;
-
-  /**
-   * Is triming arc type bezier arc
-   */
-  private boolean isArcTypeBezier;
-
-  /**
-   * Breakpoints in v direction
-   */
-  private Flist tpbrkpts;
-
-  /**
-   * Breakpoints in u direction
-   */
-  private Flist spbrkpts;
-
-  /**
-   * Unused
-   */
-  private int s_index;
-
-  /**
-   * Head of linked list of trimming arcs
-   */
-  private Arc pjarc;
-
-  /**
-   * Class tesselating trimming arcs
-   */
-  private ArcTesselator arctesselator;
-
-  /**
-   * Unused
-   */
-  private int t_index;
-
-  /**
-   * Breakpoints
-   */
-  private Flist smbrkpts;
-
-  /**
-   * Not used
-   */
-  private float[] stepsizes;
-
-  /**
-   * Domain distance in V direction
-   */
-  private float domain_distance_v_rate;
-
-  /**
-   * Initializes quilt list
-   */
-  public void beginQuilts(Backend backend) {
-    // DONE
-    qlist = null;
-    renderhints = new Renderhints();
-    this.backend = backend;
-
-    initialbin = new Bin();
-    arctesselator = new ArcTesselator();
-  }
-
-  /**
-   * Adds quilt to linked list
-   * @param quilt added quilt
-   */
-  public void addQuilt(Quilt quilt) {
-    // DONE
-    if (qlist == null)
-      qlist = quilt;
-    else {
-      quilt.next = qlist;
-      qlist = quilt;
-    }
-
-  }
-
-  /**
-   * Empty method
-   */
-  public void endQuilts() {
-    // DONE
-  }
-
-  /**
-   * Draws a surface
-   */
-  public void drawSurfaces() {
-    renderhints.init();
-
-    if (qlist == null) {
-      //				System.out.println("qlist is null");
-      return;
-    }
-
-    for (Quilt q = qlist; q != null; q = q.next) {
-      if (q.isCulled() == CULL_TRIVIAL_REJECT) {
-        freejarcs(initialbin);
-        return;
-      }
-    }
-
-    float[] from = new float[2];
-    float[] to = new float[2];
-
-    spbrkpts = new Flist();
-    tpbrkpts = new Flist();
-    qlist.getRange(from, to, spbrkpts, tpbrkpts);
-
-    boolean optimize = (is_domain_distance_sampling > 0 && (renderhints.display_method != NurbsConsts.N_OUTLINE_PATCH));
-
-    // TODO decide whether to optimize (when there is gluNurbsProperty implemented)
-    optimize = true;
-
-    if (!initialbin.isnonempty()) {
-      if (!optimize) {
-        makeBorderTrim(from, to);
-      }
-    } else {
-      float[] rate = new float[2];
-      qlist.findRates(spbrkpts, tpbrkpts, rate);
-      //				System.out.println("subdivider.drawsurfaces decompose");
-    }
-
-    backend.bgnsurf(renderhints.wiretris, renderhints.wirequads);
-
-    // TODO partition test
-
-    if (!initialbin.isnonempty() && optimize) {
-
-      int i, j;
-      int num_u_steps;
-      int num_v_steps;
-      for (i = spbrkpts.start; i < spbrkpts.end - 1; i++) {
-        for (j = tpbrkpts.start; j < tpbrkpts.end - 1; j++) {
-          float[] pta = new float[2];
-          float[] ptb = new float[2];
-
-          pta[0] = spbrkpts.pts[i];
-          ptb[0] = spbrkpts.pts[i + 1];
-          pta[1] = tpbrkpts.pts[j];
-          ptb[1] = tpbrkpts.pts[j + 1];
-          qlist.downloadAll(pta, ptb, backend);
-
-          num_u_steps = (int) (domain_distance_u_rate * (ptb[0] - pta[0]));
-          num_v_steps = (int) (domain_distance_v_rate * (ptb[1] - pta[1]));
-
-          if (num_u_steps <= 0)
-            num_u_steps = 1;
-          if (num_v_steps <= 0)
-            num_v_steps = 1;
-
-          backend.surfgrid(pta[0], ptb[0], num_u_steps, ptb[1],
-                           pta[1], num_v_steps);
-          backend.surfmesh(0, 0, num_u_steps, num_v_steps);
-
-        }
-      }
-
-    } else
-
-      subdivideInS(initialbin);
-
-    backend.endsurf();
-  }
-
-  /**
-   * Empty method
-   * @param initialbin2
-   */
-  private void freejarcs(Bin initialbin2) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.freejarcs");
-  }
-
-  /**
-   * Subdivide in U direction
-   * @param source Trimming arcs source
-   */
-  private void subdivideInS(Bin source) {
-    // DONE
-    if (renderhints.display_method == NurbsConsts.N_OUTLINE_PARAM) {
-      outline(source);
-      freejarcs(source);
-    } else {
-      setArcTypeBezier();
-      setNonDegenerate();
-      splitInS(source, spbrkpts.start, spbrkpts.end);
-    }
-
-  }
-
-  /**
-   * Split in U direction
-   * @param source Trimming arcs source
-   * @param start breakpoints start
-   * @param end breakpoints end
-   */
-  private void splitInS(Bin source, int start, int end) {
-    // DONE
-    if (source.isnonempty()) {
-      if (start != end) {
-        int i = start + (end - start) / 2;
-        Bin left = new Bin();
-        Bin right = new Bin();
-
-        split(source, left, right, 0, spbrkpts.pts[i]);
-        splitInS(left, start, i);
-        splitInS(right, i + 1, end);
-      } else {
-        if (start == spbrkpts.start || start == spbrkpts.end) {
-          freejarcs(source);
-        } else if (renderhints.display_method == NurbsConsts.N_OUTLINE_PARAM_S) {
-          outline(source);
-          freejarcs(source);
-        } else {
-          setArcTypeBezier();
-          setNonDegenerate();
-          s_index = start;
-          splitInT(source, tpbrkpts.start, tpbrkpts.end);
-        }
-      }
-    } else{
-      //				System.out.println("Source is empty - subdivider.splitins");
-    }
-  }
-
-  /**
-   * Split in V direction
-   * @param source
-   * @param start
-   * @param end
-   */
-  private void splitInT(Bin source, int start, int end) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.splitint");
-
-    if (source.isnonempty()) {
-      if (start != end) {
-        int i = start + (end - start) / 2;
-        Bin left = new Bin();
-        Bin right = new Bin();
-        split(source, left, right, 1, tpbrkpts.pts[i + 1]);
-        splitInT(left, start, i);
-        splitInT(right, i + 1, end);
-      } else {
-        if (start == tpbrkpts.start || start == tpbrkpts.end) {
-          freejarcs(source);
-        } else if (renderhints.display_method == NurbsConsts.N_OUTLINE_PARAM_ST) {
-          outline(source);
-          freejarcs(source);
-        } else {
-          t_index = start;
-          setArcTypeBezier();
-          setDegenerate();
-
-          float[] pta = new float[2];
-          float[] ptb = new float[2];
-
-          pta[0] = spbrkpts.pts[s_index - 1];
-          pta[1] = tpbrkpts.pts[t_index - 1];
-
-          ptb[0] = spbrkpts.pts[s_index];
-          ptb[1] = tpbrkpts.pts[t_index];
-          qlist.downloadAll(pta, ptb, backend);
-
-          Patchlist patchlist = new Patchlist(qlist, pta, ptb);
-
-          samplingSplit(source, patchlist,
-                        renderhints.maxsubdivisions, 0);
-          setNonDegenerate();
-          setArcTypeBezier();
-        }
-      }
-    }
-
-  }
-
-  /**
-   * Sample 
-   * @param source
-   * @param patchlist
-   * @param subdivisions
-   * @param param
-   */
-  private void samplingSplit(Bin source, Patchlist patchlist,
-                             int subdivisions, int param) {
-    // DONE
-    if (!source.isnonempty())
-      return;
-    if (patchlist.cullCheck() == CULL_TRIVIAL_REJECT) {
-      freejarcs(source);
-      return;
-    }
-
-    patchlist.getstepsize();
-    if (renderhints.display_method == NurbsConsts.N_OUTLINE_PATCH) {
-      tesselation(source, patchlist);
-      outline(source);
-      freejarcs(source);
-      return;
-    }
-
-    tesselation(source, patchlist);
-    if (patchlist.needsSamplingSubdivision() && subdivisions > 0) {
-      if (!patchlist.needsSubdivision(0)) {
-        param = 1;
-      } else if (patchlist.needsSubdivision(1))
-        param = 0;
-      else
-        param = 1 - param;
-
-      Bin left = new Bin();
-      Bin right = new Bin();
-
-      float mid = (float) ((patchlist.pspec[param].range[0] + patchlist.pspec[param].range[1]) * .5);
-
-      split(source, left, right, param, mid);
-      Patchlist subpatchlist = new Patchlist(patchlist, param, mid);
-      samplingSplit(left, subpatchlist, subdivisions - 1, param);
-      samplingSplit(right, subpatchlist, subdivisions - 1, param);
-    } else {
-      setArcTypePwl();
-      setDegenerate();
-      nonSamplingSplit(source, patchlist, subdivisions, param);
-      setDegenerate();
-      setArcTypeBezier();
-    }
-  }
-
-  /**
-   * Not used
-   * @param source
-   * @param patchlist
-   * @param subdivisions
-   * @param param
-   */
-  private void nonSamplingSplit(Bin source, Patchlist patchlist,
-                                int subdivisions, int param) {
-    // DONE
-    if (patchlist.needsNonSamplingSubdivision() && subdivisions > 0) {
-      param = 1 - param;
-
-      Bin left = new Bin();
-      Bin right = new Bin();
-
-      float mid = (float) ((patchlist.pspec[param].range[0] + patchlist.pspec[param].range[1]) * .5);
-      split(source, left, right, param, mid);
-      Patchlist subpatchlist = new Patchlist(patchlist, param, mid);
-      if (left.isnonempty()) {
-        if (subpatchlist.cullCheck() == CULL_TRIVIAL_REJECT)
-          freejarcs(left);
-        else
-          nonSamplingSplit(left, subpatchlist, subdivisions - 1,
-                           param);
-      }
-      if (right.isnonempty()) {
-        if (patchlist.cullCheck() == CULL_TRIVIAL_REJECT)
-          freejarcs(right);
-        else
-          nonSamplingSplit(right, subpatchlist, subdivisions - 1,
-                           param);
-      }
-    } else {
-      patchlist.bbox();
-      backend.patch(patchlist.pspec[0].range[0],
-                    patchlist.pspec[0].range[1], patchlist.pspec[1].range[0],
-                    patchlist.pspec[1].range[1]);
-      if (renderhints.display_method == NurbsConsts.N_OUTLINE_SUBDIV) {
-        outline(source);
-        freejarcs(source);
-      } else {
-        setArcTypePwl();
-        setDegenerate();
-        findIrregularS(source);
-        monosplitInS(source, smbrkpts.start, smbrkpts.end);
-      }
-    }
-
-  }
-
-  /**
-   * Not used
-   * @param source
-   * @param start
-   * @param end
-   */
-  private void monosplitInS(Bin source, int start, int end) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.monosplitins");
-  }
-
-  /**
-   * Not used
-   * @param source
-   */
-  private void findIrregularS(Bin source) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.findIrregularS");
-  }
-
-  /**
-   * Not used
-   */
-  private void setArcTypePwl() {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.setarctypepwl");
-  }
-
-  /**
-   * Not used
-   * @param source
-   * @param patchlist
-   */
-  private void tesselation(Bin source, Patchlist patchlist) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.tesselation");
-  }
-
-  /**
-   * Not used
-   */
-  private void setDegenerate() {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.setdegenerate");
-  }
-
-  /**
-   * Not used
-   * @param bin
-   * @param left
-   * @param right
-   * @param param
-   * @param value
-   */
-  private void split(Bin bin, Bin left, Bin right, int param, float value) {
-    // DONE
-    Bin intersections = new Bin();
-    Bin unknown = new Bin();
-
-    partition(bin, left, intersections, right, unknown, param, value);
-
-    int count = intersections.numarcs();
-    // TODO jumpbuffer ??
-
-    if (count % 2 == 0) {
-
-      Arc[] arclist = new Arc[MAXARCS];
-      CArrayOfArcs list;
-      if (count >= MAXARCS) {
-        list = new CArrayOfArcs(new Arc[count]);
-      } else {
-        list = new CArrayOfArcs(arclist);
-      }
-
-      CArrayOfArcs last, lptr;
-      Arc jarc;
-
-      for (last = new CArrayOfArcs(list); (jarc = intersections
-                                           .removearc()) != null; last.pp())
-        last.set(jarc);
-
-      if (param == 0) {// sort into incrasing t order
-        ArcSdirSorter sorter = new ArcSdirSorter(this);
-        sorter.qsort(list, count);
-
-        for (lptr = new CArrayOfArcs(list); lptr.getPointer() < last
-               .getPointer(); lptr.raisePointerBy(2))
-          check_s(lptr.get(), lptr.getRelative(1));
-        for (lptr = new CArrayOfArcs(list); lptr.getPointer() < last
-               .getPointer(); lptr.raisePointerBy(2))
-          join_s(left, right, lptr.get(), lptr.getRelative(1));
-        for (lptr = new CArrayOfArcs(list); lptr.getPointer() != last
-               .getPointer(); lptr.pp()) {
-          if (lptr.get().head()[0] <= value
-              && lptr.get().tail()[0] <= value)
-            left.addarc(lptr.get());
-          else
-            right.addarc(lptr.get());
-        }
-
-      } else {// sort into decreasing s order
-        ArcTdirSorter sorter = new ArcTdirSorter(this);
-        sorter.qsort(list, count);
-
-        for (lptr = new CArrayOfArcs(list); lptr.getPointer() < last
-               .getPointer(); lptr.raisePointerBy(2))
-          check_t(lptr.get(), lptr.getRelative(1));
-        for (lptr = new CArrayOfArcs(list); lptr.getPointer() < last
-               .getPointer(); lptr.raisePointerBy(2))
-          join_t(left, right, lptr.get(), lptr.getRelative(1));
-        for (lptr = new CArrayOfArcs(list); lptr.getPointer() != last
-               .getPointer(); lptr.raisePointerBy(2)) {
-          if (lptr.get().head()[0] <= value
-              && lptr.get().tail()[0] <= value)
-            left.addarc(lptr.get());
-          else
-            right.addarc(lptr.get());
-        }
-
-      }
-
-      unknown.adopt();
-    }
-  }
-
-  /**
-   * Not used
-   * @param left
-   * @param right
-   * @param arc
-   * @param relative
-   */
-  private void join_t(Bin left, Bin right, Arc arc, Arc relative) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.join_t");
-  }
-
-  /**
-   * Not used
-   * @param arc
-   * @param relative
-   */
-  private void check_t(Arc arc, Arc relative) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.check_t");
-  }
-
-  /**
-   * Not used
-   * @param left
-   * @param right
-   * @param jarc1
-   * @param jarc2
-   */
-  private void join_s(Bin left, Bin right, Arc jarc1, Arc jarc2) {
-    // DONE
-    if (!jarc1.getitail())
-      jarc1 = jarc1.next;
-    if (!jarc2.getitail())
-      jarc2 = jarc2.next;
-
-    float s = jarc1.tail()[0];
-    float t1 = jarc1.tail()[1];
-    float t2 = jarc2.tail()[1];
-
-    if (t1 == t2) {
-      simplelink(jarc1, jarc2);
-    } else {
-      Arc newright = new Arc(Arc.ARC_RIGHT);
-      Arc newleft = new Arc(Arc.ARC_LEFT);
-      if (isBezierArcType()) {
-        arctesselator.bezier(newright, s, s, t1, t2);
-        arctesselator.bezier(newleft, s, s, t2, t1);
-      } else {
-        arctesselator.pwl_right(newright, s, t1, t2, stepsizes[0]);
-        arctesselator.pwl_left(newright, s, t2, t1, stepsizes[2]);
-      }
-      link(jarc1, jarc2, newright, newleft);
-      left.addarc(newright);
-      right.addarc(newleft);
-    }
-
-  }
-
-  /**
-   * Not used
-   * @param jarc1
-   * @param jarc2
-   * @param newright
-   * @param newleft
-   */
-  private void link(Arc jarc1, Arc jarc2, Arc newright, Arc newleft) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.link");
-  }
-
-  /**
-   * Not used
-   * @return true
-   */
-  private boolean isBezierArcType() {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.isbezierarc");
-    return true;
-  }
-
-  /**
-   * Not used
-   * @param jarc1
-   * @param jarc2
-   */
-  private void simplelink(Arc jarc1, Arc jarc2) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.simplelink");
-  }
-
-  /**
-   * Not used
-   * @param arc
-   * @param relative
-   */
-  private void check_s(Arc arc, Arc relative) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.check_s");
-
-  }
-
-  /**
-   * Not used
-   * @param bin
-   * @param left
-   * @param intersections
-   * @param right
-   * @param unknown
-   * @param param
-   * @param value
-   */
-  private void partition(Bin bin, Bin left, Bin intersections, Bin right,
-                         Bin unknown, int param, float value) {
-
-    Bin headonleft = new Bin();
-    Bin headonright = new Bin();
-    Bin tailonleft = new Bin();
-    Bin tailonright = new Bin();
-
-    for (Arc jarc = bin.removearc(); jarc != null; jarc = bin.removearc()) {
-      float tdiff = jarc.tail()[param] - value;
-      float hdiff = jarc.head()[param] - value;
-
-      if (tdiff > 0) {
-        if (hdiff > 0) {
-          right.addarc(jarc);
-        } else if (hdiff == 0) {
-          tailonright.addarc(jarc);
-        } else {
-          Arc jtemp;
-          switch (arc_split(jarc, param, value, 0)) {
-          case 2:
-            tailonright.addarc(jarc);
-            headonleft.addarc(jarc.next);
-            break;
-            // TODO rest cases
-          default:
-            System.out
-              .println("TODO subdivider.partition rest cases");
-            break;
-          }
-        }
-      } else if (tdiff == 0) {
-        if (hdiff > 0) {
-          headonright.addarc(jarc);
-        } else if (hdiff == 0) {
-          unknown.addarc(jarc);
-        } else {
-          headonright.addarc(jarc);
-        }
-      } else {
-        if (hdiff > 0) {
-          // TODO rest
-          //						System.out.println("TODO subdivider.partition rest of else");
-        } else if (hdiff == 0) {
-          tailonleft.addarc(jarc);
-        } else {
-          left.addarc(jarc);
-        }
-      }
-
-    }
-    if (param == 0) {
-      classify_headonleft_s(headonleft, intersections, left, value);
-      classify_tailonleft_s(tailonleft, intersections, left, value);
-      classify_headonright_s(headonright, intersections, right, value);
-      classify_tailonright_s(tailonright, intersections, right, value);
-    } else {
-      classify_headonleft_t(headonleft, intersections, left, value);
-      classify_tailonleft_t(tailonleft, intersections, left, value);
-      classify_headonright_t(headonright, intersections, right, value);
-      classify_tailonright_t(tailonright, intersections, right, value);
-    }
-  }
-
-  /**
-   * Not used
-   * @param tailonright
-   * @param intersections
-   * @param right
-   * @param value
-   */
-  private void classify_tailonright_t(Bin tailonright, Bin intersections,
-                                      Bin right, float value) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.classify_tailonright_t");
-
-  }
-
-  /**
-   * Not used
-   * @param bin
-   * @param in
-   * @param out
-   * @param val
-   */
-  private void classify_tailonleft_s(Bin bin, Bin in, Bin out, float val) {
-
-    // DONE
-    Arc j;
-    while ((j = bin.removearc()) != null) {
-      j.clearitail();
-
-      float diff = j.next.head()[0] - val;
-      if (diff > 0) {
-        in.addarc(j);
-      } else if (diff < 0) {
-        if (ccwTurn_sl(j, j.next))
-          out.addarc(j);
-        else
-          in.addarc(j);
-      } else {
-        if (j.next.tail()[1] > j.next.head()[1])
-          in.addarc(j);
-        else
-          out.addarc(j);
-      }
-    }
-
-  }
-
-  /**
-   * Not used
-   * @param bin
-   * @param in
-   * @param out
-   * @param val
-   */
-  private void classify_headonright_s(Bin bin, Bin in, Bin out, float val) {
-    // DONE
-    Arc j;
-    while ((j = bin.removearc()) != null) {
-      j.setitail();
-
-      float diff = j.prev.tail()[0] - val;
-      if (diff > 0) {
-        if (ccwTurn_sr(j.prev, j))
-          out.addarc(j);
-        else
-          in.addarc(j);
-      } else if (diff < 0) {
-        out.addarc(j);
-      } else {
-        if (j.prev.tail()[1] > j.prev.head()[1])
-          out.addarc(j);
-        else
-          in.addarc(j);
-      }
-    }
-  }
-
-  /**
-   * Not used
-   * @param prev
-   * @param j
-   * @return false
-   */
-  private boolean ccwTurn_sr(Arc prev, Arc j) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO ccwTurn_sr");
-    return false;
-  }
-
-  /**
-   * Not used
-   * @param headonright
-   * @param intersections
-   * @param right
-   * @param value
-   */
-  private void classify_headonright_t(Bin headonright, Bin intersections,
-                                      Bin right, float value) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.classify_headonright_t");
-  }
-
-  /**
-   * Not used
-   * @param tailonleft
-   * @param intersections
-   * @param left
-   * @param value
-   */
-  private void classify_tailonleft_t(Bin tailonleft, Bin intersections,
-                                     Bin left, float value) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.classify_tailonleft_t");
-  }
-
-  /**
-   * Not used
-   * @param bin
-   * @param in
-   * @param out
-   * @param val
-   */
-  private void classify_headonleft_t(Bin bin, Bin in, Bin out, float val) {
-    // DONE
-    Arc j;
-    while ((j = bin.removearc()) != null) {
-      j.setitail();
-
-      float diff = j.prev.tail()[1] - val;
-      if (diff > 0) {
-        out.addarc(j);
-      } else if (diff < 0) {
-        if (ccwTurn_tl(j.prev, j))
-          out.addarc(j);
-        else
-          in.addarc(j);
-      } else {
-        if (j.prev.tail()[0] > j.prev.head()[0])
-          out.addarc(j);
-        else
-          in.addarc(j);
-      }
-    }
-  }
-
-  /**
-   * Not used
-   * @param prev
-   * @param j
-   * @return false
-   */
-  private boolean ccwTurn_tl(Arc prev, Arc j) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.ccwTurn_tl");
-    return false;
-  }
-
-  /**
-   * Not used
-   * @param bin
-   * @param in
-   * @param out
-   * @param val
-   */
-  private void classify_tailonright_s(Bin bin, Bin in, Bin out, float val) {
-    // DONE
-    Arc j;
-    while ((j = bin.removearc()) != null) {
-      j.clearitail();
-
-      float diff = j.next.head()[0] - val;
-      if (diff > 0) {
-        if (ccwTurn_sr(j, j.next))
-          out.addarc(j);
-        else
-          in.addarc(j);
-      } else if (diff < 0) {
-        in.addarc(j);
-      } else {
-        if (j.next.tail()[1] > j.next.head()[1])
-          out.addarc(j);
-        else
-          in.addarc(j);
-      }
-    }
-
-  }
-
-  /**
-   * Not used
-   * @param bin
-   * @param in
-   * @param out
-   * @param val
-   */
-  private void classify_headonleft_s(Bin bin, Bin in, Bin out, float val) {
-    // DONE
-    Arc j;
-    while ((j = bin.removearc()) != null) {
-      j.setitail();
-
-      float diff = j.prev.tail()[0] - val;
-      if (diff > 0) {
-        out.addarc(j);
-      } else if (diff < 0) {
-        if (ccwTurn_sl(j.prev, j))
-          out.addarc(j);
-        else
-          in.addarc(j);
-      } else {
-        if (j.prev.tail()[1] > j.prev.head()[1])
-          in.addarc(j);
-        else
-          out.addarc(j);
-      }
-    }
-
-  }
-
-  /**
-   * Not used
-   * @param prev
-   * @param j
-   * @return false
-   */
-  private boolean ccwTurn_sl(Arc prev, Arc j) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.ccwTurn_sl");
-    return false;
-  }
-
-  /**
-   * Not used
-   * @param jarc
-   * @param param
-   * @param value
-   * @param i
-   * @return 0
-   */
-  private int arc_split(Arc jarc, int param, float value, int i) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.arc_split");
-    return 0;
-  }
-
-  /**
-   * Not used
-   */
-  private void setNonDegenerate() {
-    // DONE
-    this.showDegenerate = false;
-
-  }
-
-  /**
-   * sets trimming arc default type to bezier
-   */
-  private void setArcTypeBezier() {
-    // DONE
-    isArcTypeBezier = true;
-  }
-
-  /**
-   * Not used
-   * @param source
-   */
-  private void outline(Bin source) {
-    // TODO Auto-generated method stub
-    //			System.out.println("TODO subdivider.outline");
-  }
-
-  /**
-   * Makes default trim along surface borders
-   * @param from range beginnings
-   * @param to range ends
-   */
-  private void makeBorderTrim(float[] from, float[] to) {
-    // DONE
-    float smin = from[0];
-    float smax = to[0];
-
-    float tmin = from[1];
-    float tmax = to[1];
-
-    pjarc = null;
-    Arc jarc = null;
-
-    jarc = new Arc(Arc.ARC_BOTTOM);
-    arctesselator.bezier(jarc, smin, smax, tmin, tmin);
-    initialbin.addarc(jarc);
-    pjarc = jarc.append(pjarc);
-
-    jarc = new Arc(Arc.ARC_RIGHT);
-    arctesselator.bezier(jarc, smax, smax, tmin, tmax);
-    initialbin.addarc(jarc);
-    pjarc = jarc.append(pjarc);
-
-    jarc = new Arc(Arc.ARC_TOP);
-    arctesselator.bezier(jarc, smax, smin, tmax, tmax);
-    initialbin.addarc(jarc);
-    pjarc = jarc.append(pjarc);
-
-    jarc = new Arc(Arc.ARC_LEFT);
-    arctesselator.bezier(jarc, smin, smin, tmax, tmin);
-    initialbin.addarc(jarc);
-    jarc = jarc.append(pjarc);
-
-    // assert (jarc.check() == true);
-  }
-
-  /**
-   * Draws NURBS curve
-   */
-  public void drawCurves() {
-    // DONE
-    float[] from = new float[1];
-    float[] to = new float[1];
-
-    Flist bpts = new Flist();
-    qlist.getRange(from, to, bpts);
-
-    renderhints.init();
-
-    backend.bgncurv();
-
-    for (int i = bpts.start; i < bpts.end - 1; i++) {
-      float[] pta = new float[1];
-      float[] ptb = new float[1];
-      pta[0] = bpts.pts[i];
-      ptb[0] = bpts.pts[i + 1];
-
-      qlist.downloadAll(pta, ptb, backend);
-      Curvelist curvelist = new Curvelist(qlist, pta, ptb);
-      samplingSplit(curvelist, renderhints.maxsubdivisions);
-    }
-    backend.endcurv();
-  }
-
-  /**
-   * Samples a curve in case of need, or sends curve to backend
-   * @param curvelist list of curves
-   * @param maxsubdivisions maximum number of subdivisions
-   */
-  private void samplingSplit(Curvelist curvelist, int maxsubdivisions) {
-    if (curvelist.cullCheck() == CULL_TRIVIAL_REJECT)
-      return;
-
-    curvelist.getstepsize();
-
-    if (curvelist.needsSamplingSubdivision() && (subdivisions > 0)) {
-      // TODO kód
-      //				System.out.println("TODO subdivider-needsSamplingSubdivision");
-    } else {
-      int nu = (int) (1 + curvelist.range[2] / curvelist.stepsize);
-      backend.curvgrid(curvelist.range[0], curvelist.range[1], nu);
-      backend.curvmesh(0, nu);
-    }
-
-  }
-
-  /**
-   * Sets new domain_distance_u_rate value
-   * @param d new domain_distance_u_rate value
-
-  */
-  public void set_domain_distance_u_rate(double d) {
-    // DONE
-    domain_distance_u_rate = (float) d;
-  }
-
-  /**
-   * Sets new domain_distance_v_rate value
-   * @param d new domain_distance_v_rate value
-   */
-  public void set_domain_distance_v_rate(double d) {
-    // DONE
-    domain_distance_v_rate = (float) d;
-  }
-
-  /**
-   * Sets new is_domain_distance_sampling value
-   * @param i new is_domain_distance_sampling value
-   */
-  public void set_is_domain_distance_sampling(int i) {
-    // DONE
-    this.is_domain_distance_sampling = i;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/SurfaceEvaluator.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/SurfaceEvaluator.java
deleted file mode 100755
index 99209b744..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/SurfaceEvaluator.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Class rendering surfaces with OpenGL
- * @author Tomas Hrasky
- *
- */
-public interface SurfaceEvaluator {
-
-  /**
-   * Pushes eval bit
-   */
-  public void bgnmap2f() ;
-
-  /**
-   * Sets  glPolygonMode
-   * @param style polygon mode (N_MESHFILL/N_MESHLINE/N_MESHPOINT)
-   */
-  public void polymode(int style) ;
-
-  /**
-   * Pops all attributes
-   */
-  public void endmap2f() ;
-
-  /**
-   * Empty method
-   * @param ulo
-   * @param uhi
-   * @param vlo
-   * @param vhi
-   */
-  public void domain2f(float ulo, float uhi, float vlo, float vhi) ;
-
-  /**
-   * Defines 2D mesh
-   * @param nu number of steps in u direction
-   * @param u0 lowest u
-   * @param u1 highest u
-   * @param nv number of steps in v direction
-   * @param v0 lowest v
-   * @param v1 highest v
-   */
-  public void mapgrid2f(int nu, float u0, float u1, int nv, float v0, float v1) ;
-
-  /**
-   * Evaluates surface
-   * @param style surface style
-   * @param umin minimum U
-   * @param umax maximum U
-   * @param vmin minimum V
-   * @param vmax maximum V
-   */
-  public void mapmesh2f(int style, int umin, int umax, int vmin, int vmax) ;
-
-  /**
-   * Initializes evaluator
-   * @param type surface type
-   * @param ulo lowest u
-   * @param uhi highest u
-   * @param ustride number of objects between control points in u direction
-   * @param uorder surface order in u direction
-   * @param vlo lowest v
-   * @param vhi highest v
-   * @param vstride number of control points' coords
-   * @param vorder surface order in v direction
-   * @param pts control points
-   */
-  public void map2f(int type, float ulo, float uhi, int ustride, int uorder,
-                    float vlo, float vhi, int vstride, int vorder, CArrayOfFloats pts) ;
-
-  /**
-   * Calls opengl enable
-   * @param type what to enable
-   */
-  public void enable(int type) ;
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/TrimVertex.java b/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/TrimVertex.java
deleted file mode 100755
index 2c4b94ba3..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/TrimVertex.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.sun.opengl.impl.glu.nurbs;
-
-/*
- ** License Applicability. Except to the extent portions of this file are
- ** made subject to an alternative license as permitted in the SGI Free
- ** Software License B, Version 2.0 (the "License"), the contents of this
- ** file are subject only to the provisions of the License. You may not use
- ** this file except in compliance with the License. You may obtain a copy
- ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- **
- ** http://oss.sgi.com/projects/FreeB
- **
- ** Note that, as provided in the License, the Software is distributed on an
- ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- **
- ** Original Code. The Original Code is: OpenGL Sample Implementation,
- ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- ** Copyright in any portions created by third parties is as indicated
- ** elsewhere herein. All Rights Reserved.
- **
- ** Additional Notice Provisions: The application programming interfaces
- ** established by SGI in conjunction with the Original Code are The
- ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- ** Window System(R) (Version 1.3), released October 19, 1998. This software
- ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
- ** published by SGI, but has not been independently verified as being
- ** compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-/**
- * Holds vertex used in trim
- * 
- * @author Tomas Hrasky
- * 
- */
-public class TrimVertex {
-
-  /**
-   * Trim vertex coords
-   */
-  public float[] param;
-
-  /**
-   * Makes new empty trim vertex
-   */
-  public TrimVertex() {
-    param = new float[2];
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/registry/Registry.java b/src/jogl/classes/com/sun/opengl/impl/glu/registry/Registry.java
deleted file mode 100644
index 5c6b03c20..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/registry/Registry.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * License Applicability. Except to the extent portions of this file are
- * made subject to an alternative license as permitted in the SGI Free
- * Software License B, Version 2.0 (the "License"), the contents of this
- * file are subject only to the provisions of the License. You may not use
- * this file except in compliance with the License. You may obtain a copy
- * of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- * Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- * 
- * http://oss.sgi.com/projects/FreeB
- * 
- * Note that, as provided in the License, the Software is distributed on an
- * "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- * DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- * CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- * 
- * NOTE:  The Original Code (as defined below) has been licensed to Sun
- * Microsystems, Inc. ("Sun") under the SGI Free Software License B
- * (Version 1.1), shown above ("SGI License").   Pursuant to Section
- * 3.2(3) of the SGI License, Sun is distributing the Covered Code to
- * you under an alternative license ("Alternative License").  This
- * Alternative License includes all of the provisions of the SGI License
- * except that Section 2.2 and 11 are omitted.  Any differences between
- * the Alternative License and the SGI License are offered solely by Sun
- * and not by SGI.
- *
- * Original Code. The Original Code is: OpenGL Sample Implementation,
- * Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- * Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
- * Copyright in any portions created by third parties is as indicated
- * elsewhere herein. All Rights Reserved.
- * 
- * Additional Notice Provisions: The application programming interfaces
- * established by SGI in conjunction with the Original Code are The
- * OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
- * April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
- * 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
- * Window System(R) (Version 1.3), released October 19, 1998. This software
- * was created using the OpenGL(R) version 1.2.1 Sample Implementation
- * published by SGI, but has not been independently verified as being
- * compliant with the OpenGL(R) version 1.2.1 Specification.
- */
-
-package com.sun.opengl.impl.glu.registry;
-
-import javax.media.opengl.glu.GLU;
-
-/**
- *
- * @author  Administrator
- */
-public class Registry {
-  
-  /** Creates a new instance of Registry */
-  public Registry() {
-  }
-  
-  public static String gluGetString(int name) {
-    if( name == GLU.GLU_VERSION ) {
-      return( "1.3" );
-    } else if( name == GLU.GLU_EXTENSIONS ) {
-      return( "GLU_EXT_nurbs_tessellator GLU_EXT_object_space_tess " );
-    }
-    return( null );
-  }
-  
-  public static boolean gluCheckExtension( String extName, String extString ) {
-    if( extName == null || extString == null ) {
-      return( false );
-    }
-    if ((extString.indexOf(extName + " ") >= 0) ||
-        extString.endsWith(extName) ||
-        extString.equals(extName)) {
-        return true;
-    }
-    return false;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/ActiveRegion.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/ActiveRegion.java
deleted file mode 100644
index a875fb92e..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/ActiveRegion.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-
-class ActiveRegion {
-    GLUhalfEdge eUp;		/* upper edge, directed right to left */
-    DictNode nodeUp;	/* dictionary node corresponding to eUp */
-    int windingNumber;	/* used to determine which regions are
-                                 * inside the polygon */
-    boolean inside;		/* is this region inside the polygon? */
-    boolean sentinel;	/* marks fake edges at t = +/-infinity */
-    boolean dirty;		/* marks regions where the upper or lower
-                                 * edge has changed, but we haven't checked
-                                 * whether they intersect yet */
-    boolean fixUpperEdge;	/* marks temporary edges introduced when
-                                 * we process a "right vertex" (one without
-                                 * any edges leaving to the right) */
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/CachedVertex.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/CachedVertex.java
deleted file mode 100644
index 85c9d5007..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/CachedVertex.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class CachedVertex {
-    public double[] coords = new double[3];
-    public Object data;
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Dict.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Dict.java
deleted file mode 100644
index 9b7fb65a1..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Dict.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class Dict {
-    DictNode head;
-    Object frame;
-    DictLeq leq;
-
-    private Dict() {
-    }
-
-    static Dict dictNewDict(Object frame, DictLeq leq) {
-        Dict dict = new Dict();
-        dict.head = new DictNode();
-
-        dict.head.key = null;
-        dict.head.next = dict.head;
-        dict.head.prev = dict.head;
-
-        dict.frame = frame;
-        dict.leq = leq;
-
-        return dict;
-    }
-
-    static void dictDeleteDict(Dict dict) {
-        dict.head = null;
-        dict.frame = null;
-        dict.leq = null;
-    }
-
-    static DictNode dictInsert(Dict dict, Object key) {
-        return dictInsertBefore(dict, dict.head, key);
-    }
-
-    static DictNode dictInsertBefore(Dict dict, DictNode node, Object key) {
-        do {
-            node = node.prev;
-        } while (node.key != null && !dict.leq.leq(dict.frame, node.key, key));
-
-        DictNode newNode = new DictNode();
-        newNode.key = key;
-        newNode.next = node.next;
-        node.next.prev = newNode;
-        newNode.prev = node;
-        node.next = newNode;
-
-        return newNode;
-    }
-
-    static Object dictKey(DictNode aNode) {
-        return aNode.key;
-    }
-
-    static DictNode dictSucc(DictNode aNode) {
-        return aNode.next;
-    }
-
-    static DictNode dictPred(DictNode aNode) {
-        return aNode.prev;
-    }
-
-    static DictNode dictMin(Dict aDict) {
-        return aDict.head.next;
-    }
-
-    static DictNode dictMax(Dict aDict) {
-        return aDict.head.prev;
-    }
-
-    static void dictDelete(Dict dict, DictNode node) {
-        node.next.prev = node.prev;
-        node.prev.next = node.next;
-    }
-
-    static DictNode dictSearch(Dict dict, Object key) {
-        DictNode node = dict.head;
-
-        do {
-            node = node.next;
-        } while (node.key != null && !(dict.leq.leq(dict.frame, key, node.key)));
-
-        return node;
-    }
-
-    public interface DictLeq {
-        boolean leq(Object frame, Object key1, Object key2);
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/DictNode.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/DictNode.java
deleted file mode 100644
index 3c6342776..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/DictNode.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class DictNode {
-    Object key;
-    DictNode next;
-    DictNode prev;
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUface.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUface.java
deleted file mode 100644
index 1bcd12b0b..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUface.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class GLUface {
-    public GLUface next;		/* next face (never NULL) */
-    public GLUface prev;		/* previous face (never NULL) */
-    public GLUhalfEdge anEdge;	/* a half edge with this left face */
-    public Object data;		/* room for client's data */
-
-    /* Internal data (keep hidden) */
-    public GLUface trail;		/* "stack" for conversion to strips */
-    public boolean marked;		/* flag for conversion to strips */
-    public boolean inside;		/* this face is in the polygon interior */
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUhalfEdge.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUhalfEdge.java
deleted file mode 100644
index 3747bcf25..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUhalfEdge.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class GLUhalfEdge {
-    public GLUhalfEdge next;		/* doubly-linked list (prev==Sym->next) */
-    public GLUhalfEdge Sym;		/* same edge, opposite direction */
-    public GLUhalfEdge Onext;		/* next edge CCW around origin */
-    public GLUhalfEdge Lnext;		/* next edge CCW around left face */
-    public GLUvertex Org;		/* origin vertex (Overtex too long) */
-    public com.sun.opengl.impl.glu.tessellator.GLUface Lface;		/* left face */
-
-    /* Internal data (keep hidden) */
-    public com.sun.opengl.impl.glu.tessellator.ActiveRegion activeRegion;	/* a region with this upper edge (sweep.c) */
-    public int winding;	/* change in winding number when crossing */
-    public boolean first;
-
-    public GLUhalfEdge(boolean first) {
-        this.first = first;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUmesh.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUmesh.java
deleted file mode 100644
index 4f753a28c..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUmesh.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class GLUmesh {
-    GLUvertex vHead = new GLUvertex();		/* dummy header for vertex list */
-    com.sun.opengl.impl.glu.tessellator.GLUface fHead = new GLUface();		/* dummy header for face list */
-    com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eHead = new GLUhalfEdge(true);		/* dummy header for edge list */
-    com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eHeadSym = new GLUhalfEdge(false);	/* and its symmetric counterpart */
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUtessellatorImpl.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
deleted file mode 100644
index 5155272f6..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
+++ /dev/null
@@ -1,646 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-import com.sun.opengl.impl.glu.tessellator.*;
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-
-public class GLUtessellatorImpl implements GLUtessellator {
-    public static final int TESS_MAX_CACHE = 100;
-
-    private int state;		/* what begin/end calls have we seen? */
-
-    private GLUhalfEdge lastEdge;	/* lastEdge->Org is the most recent vertex */
-    GLUmesh mesh;		/* stores the input contours, and eventually
-                                   the tessellation itself */
-
-    /*** state needed for projecting onto the sweep plane ***/
-
-    double[] normal = new double[3];	/* user-specified normal (if provided) */
-    double[] sUnit = new double[3];	/* unit vector in s-direction (debugging) */
-    double[] tUnit = new double[3];	/* unit vector in t-direction (debugging) */
-
-    /*** state needed for the line sweep ***/
-
-    private double relTolerance;	/* tolerance for merging features */
-    int windingRule;	/* rule for determining polygon interior */
-    boolean fatalError;	/* fatal error: needed combine callback */
-
-    Dict dict;		/* edge dictionary for sweep line */
-    PriorityQ pq;		/* priority queue of vertex events */
-    GLUvertex event;		/* current sweep event being processed */
-
-    /*** state needed for rendering callbacks (see render.c) ***/
-
-    boolean flagBoundary;	/* mark boundary edges (use EdgeFlag) */
-    boolean boundaryOnly;	/* Extract contours, not triangles */
-    boolean avoidDegenerateTris; /* JOGL-specific hint to try to improve triangulation
-                                    by avoiding producing degenerate (zero-area) triangles;
-                                    has not been tested exhaustively and is therefore an option */
-
-    GLUface lonelyTriList;
-    /* list of triangles which could not be rendered as strips or fans */
-
-
-
-    /*** state needed to cache single-contour polygons for renderCache() */
-
-    private boolean flushCacheOnNextVertex;		/* empty cache on next vertex() call */
-    int cacheCount;		/* number of cached vertices */
-    CachedVertex[] cache = new CachedVertex[TESS_MAX_CACHE];	/* the vertex data */
-
-    /*** rendering callbacks that also pass polygon data  ***/
-    private Object polygonData;		/* client data for current polygon */
-
-    private GLUtessellatorCallback callBegin;
-    private GLUtessellatorCallback callEdgeFlag;
-    private GLUtessellatorCallback callVertex;
-    private GLUtessellatorCallback callEnd;
-//    private GLUtessellatorCallback callMesh;
-    private GLUtessellatorCallback callError;
-    private GLUtessellatorCallback callCombine;
-
-    private GLUtessellatorCallback callBeginData;
-    private GLUtessellatorCallback callEdgeFlagData;
-    private GLUtessellatorCallback callVertexData;
-    private GLUtessellatorCallback callEndData;
-//    private GLUtessellatorCallback callMeshData;
-    private GLUtessellatorCallback callErrorData;
-    private GLUtessellatorCallback callCombineData;
-
-    private static final double GLU_TESS_DEFAULT_TOLERANCE = 0.0;
-//    private static final int GLU_TESS_MESH = 100112;	/* void (*)(GLUmesh *mesh)	    */
-    private static GLUtessellatorCallback NULL_CB = new GLUtessellatorCallbackAdapter();
-
-//    #define MAX_FAST_ALLOC	(MAX(sizeof(EdgePair), \
-//                 MAX(sizeof(GLUvertex),sizeof(GLUface))))
-
-    private GLUtessellatorImpl() {
-        state = TessState.T_DORMANT;
-
-        normal[0] = 0;
-        normal[1] = 0;
-        normal[2] = 0;
-
-        relTolerance = GLU_TESS_DEFAULT_TOLERANCE;
-        windingRule = GLU.GLU_TESS_WINDING_ODD;
-        flagBoundary = false;
-        boundaryOnly = false;
-
-        callBegin = NULL_CB;
-        callEdgeFlag = NULL_CB;
-        callVertex = NULL_CB;
-        callEnd = NULL_CB;
-        callError = NULL_CB;
-        callCombine = NULL_CB;
-//        callMesh = NULL_CB;
-
-        callBeginData = NULL_CB;
-        callEdgeFlagData = NULL_CB;
-        callVertexData = NULL_CB;
-        callEndData = NULL_CB;
-        callErrorData = NULL_CB;
-        callCombineData = NULL_CB;
-
-        polygonData = null;
-
-        for (int i = 0; i < cache.length; i++) {
-            cache[i] = new CachedVertex();
-        }
-    }
-
-    static public GLUtessellator gluNewTess()
-    {
-        return new GLUtessellatorImpl();
-    }
-
-
-    private void makeDormant() {
-        /* Return the tessellator to its original dormant state. */
-
-        if (mesh != null) {
-            Mesh.__gl_meshDeleteMesh(mesh);
-        }
-        state = TessState.T_DORMANT;
-        lastEdge = null;
-        mesh = null;
-    }
-
-    private void requireState(int newState) {
-        if (state != newState) gotoState(newState);
-    }
-
-    private void gotoState(int newState) {
-        while (state != newState) {
-            /* We change the current state one level at a time, to get to
-             * the desired state.
-             */
-            if (state < newState) {
-                if (state == TessState.T_DORMANT) {
-                    callErrorOrErrorData(GLU.GLU_TESS_MISSING_BEGIN_POLYGON);
-                    gluTessBeginPolygon(null);
-                } else if (state == TessState.T_IN_POLYGON) {
-                    callErrorOrErrorData(GLU.GLU_TESS_MISSING_BEGIN_CONTOUR);
-                    gluTessBeginContour();
-                }
-            } else {
-                if (state == TessState.T_IN_CONTOUR) {
-                    callErrorOrErrorData(GLU.GLU_TESS_MISSING_END_CONTOUR);
-                    gluTessEndContour();
-                } else if (state == TessState.T_IN_POLYGON) {
-                    callErrorOrErrorData(GLU.GLU_TESS_MISSING_END_POLYGON);
-                    /* gluTessEndPolygon( tess ) is too much work! */
-                    makeDormant();
-                }
-            }
-        }
-    }
-
-    public void gluDeleteTess() {
-        requireState(TessState.T_DORMANT);
-    }
-
-    public void gluTessProperty(int which, double value) {
-        switch (which) {
-            case GLU.GLU_TESS_TOLERANCE:
-                if (value < 0.0 || value > 1.0) break;
-                relTolerance = value;
-                return;
-
-            case GLU.GLU_TESS_WINDING_RULE:
-                int windingRule = (int) value;
-                if (windingRule != value) break;	/* not an integer */
-
-                switch (windingRule) {
-                    case GLU.GLU_TESS_WINDING_ODD:
-                    case GLU.GLU_TESS_WINDING_NONZERO:
-                    case GLU.GLU_TESS_WINDING_POSITIVE:
-                    case GLU.GLU_TESS_WINDING_NEGATIVE:
-                    case GLU.GLU_TESS_WINDING_ABS_GEQ_TWO:
-                        this.windingRule = windingRule;
-                        return;
-                    default:
-                        break;
-                }
-
-            case GLU.GLU_TESS_BOUNDARY_ONLY:
-                boundaryOnly = (value != 0);
-                return;
-
-            case GLU.GLU_TESS_AVOID_DEGENERATE_TRIANGLES:
-                avoidDegenerateTris = (value != 0);
-                return;
-
-            default:
-                callErrorOrErrorData(GLU.GLU_INVALID_ENUM);
-                return;
-        }
-        callErrorOrErrorData(GLU.GLU_INVALID_VALUE);
-    }
-
-/* Returns tessellator property */
-    public void gluGetTessProperty(int which, double[] value, int value_offset) {
-        switch (which) {
-            case GLU.GLU_TESS_TOLERANCE:
-/* tolerance should be in range [0..1] */
-                assert (0.0 <= relTolerance && relTolerance <= 1.0);
-                value[value_offset] = relTolerance;
-                break;
-            case GLU.GLU_TESS_WINDING_RULE:
-                assert (windingRule == GLU.GLU_TESS_WINDING_ODD ||
-                        windingRule == GLU.GLU_TESS_WINDING_NONZERO ||
-                        windingRule == GLU.GLU_TESS_WINDING_POSITIVE ||
-                        windingRule == GLU.GLU_TESS_WINDING_NEGATIVE ||
-                        windingRule == GLU.GLU_TESS_WINDING_ABS_GEQ_TWO);
-                value[value_offset] = windingRule;
-                break;
-            case GLU.GLU_TESS_BOUNDARY_ONLY:
-                assert (boundaryOnly == true || boundaryOnly == false);
-                value[value_offset] = boundaryOnly ? 1 : 0;
-                break;
-            case GLU.GLU_TESS_AVOID_DEGENERATE_TRIANGLES:
-                value[value_offset] = avoidDegenerateTris ? 1 : 0;
-                break;
-            default:
-                value[value_offset] = 0.0;
-                callErrorOrErrorData(GLU.GLU_INVALID_ENUM);
-                break;
-        }
-    } /* gluGetTessProperty() */
-
-    public void gluTessNormal(double x, double y, double z) {
-        normal[0] = x;
-        normal[1] = y;
-        normal[2] = z;
-    }
-
-    public void gluTessCallback(int which, GLUtessellatorCallback aCallback) {
-        switch (which) {
-            case GLU.GLU_TESS_BEGIN:
-                callBegin = aCallback == null ? NULL_CB : aCallback;
-                return;
-            case GLU.GLU_TESS_BEGIN_DATA:
-                callBeginData = aCallback == null ? NULL_CB : aCallback;
-                return;
-            case GLU.GLU_TESS_EDGE_FLAG:
-                callEdgeFlag = aCallback == null ? NULL_CB : aCallback;
-/* If the client wants boundary edges to be flagged,
- * we render everything as separate triangles (no strips or fans).
- */
-                flagBoundary = aCallback != null;
-                return;
-            case GLU.GLU_TESS_EDGE_FLAG_DATA:
-                callEdgeFlagData = callBegin = aCallback == null ? NULL_CB : aCallback;
-/* If the client wants boundary edges to be flagged,
- * we render everything as separate triangles (no strips or fans).
- */
-                flagBoundary = (aCallback != null);
-                return;
-            case GLU.GLU_TESS_VERTEX:
-                callVertex = aCallback == null ? NULL_CB : aCallback;
-                return;
-            case GLU.GLU_TESS_VERTEX_DATA:
-                callVertexData = aCallback == null ? NULL_CB : aCallback;
-                return;
-            case GLU.GLU_TESS_END:
-                callEnd = aCallback == null ? NULL_CB : aCallback;
-                return;
-            case GLU.GLU_TESS_END_DATA:
-                callEndData = aCallback == null ? NULL_CB : aCallback;
-                return;
-            case GLU.GLU_TESS_ERROR:
-                callError = aCallback == null ? NULL_CB : aCallback;
-                return;
-            case GLU.GLU_TESS_ERROR_DATA:
-                callErrorData = aCallback == null ? NULL_CB : aCallback;
-                return;
-            case GLU.GLU_TESS_COMBINE:
-                callCombine = aCallback == null ? NULL_CB : aCallback;
-                return;
-            case GLU.GLU_TESS_COMBINE_DATA:
-                callCombineData = aCallback == null ? NULL_CB : aCallback;
-                return;
-//            case GLU_TESS_MESH:
-//                callMesh = aCallback == null ? NULL_CB : aCallback;
-//                return;
-            default:
-                callErrorOrErrorData(GLU.GLU_INVALID_ENUM);
-                return;
-        }
-    }
-
-    private boolean addVertex(double[] coords, Object vertexData) {
-        GLUhalfEdge e;
-
-        e = lastEdge;
-        if (e == null) {
-/* Make a self-loop (one vertex, one edge). */
-
-            e = Mesh.__gl_meshMakeEdge(mesh);
-            if (e == null) return false;
-            if (!Mesh.__gl_meshSplice(e, e.Sym)) return false;
-        } else {
-/* Create a new vertex and edge which immediately follow e
- * in the ordering around the left face.
- */
-            if (Mesh.__gl_meshSplitEdge(e) == null) return false;
-            e = e.Lnext;
-        }
-
-/* The new vertex is now e.Org. */
-        e.Org.data = vertexData;
-        e.Org.coords[0] = coords[0];
-        e.Org.coords[1] = coords[1];
-        e.Org.coords[2] = coords[2];
-
-/* The winding of an edge says how the winding number changes as we
- * cross from the edge''s right face to its left face.  We add the
- * vertices in such an order that a CCW contour will add +1 to
- * the winding number of the region inside the contour.
- */
-        e.winding = 1;
-        e.Sym.winding = -1;
-
-        lastEdge = e;
-
-        return true;
-    }
-
-    private void cacheVertex(double[] coords, Object vertexData) {
-        if (cache[cacheCount] == null) {
-            cache[cacheCount] = new CachedVertex();
-        }
-
-        CachedVertex v = cache[cacheCount];
-
-        v.data = vertexData;
-        v.coords[0] = coords[0];
-        v.coords[1] = coords[1];
-        v.coords[2] = coords[2];
-        ++cacheCount;
-    }
-
-
-    private boolean flushCache() {
-        CachedVertex[] v = cache;
-
-        mesh = Mesh.__gl_meshNewMesh();
-        if (mesh == null) return false;
-
-        for (int i = 0; i < cacheCount; i++) {
-            CachedVertex vertex = v[i];
-            if (!addVertex(vertex.coords, vertex.data)) return false;
-        }
-        cacheCount = 0;
-        flushCacheOnNextVertex = false;
-
-        return true;
-    }
-
-    public void gluTessVertex(double[] coords, int coords_offset, Object vertexData) {
-        int i;
-        boolean tooLarge = false;
-        double x;
-        double[] clamped = new double[3];
-
-        requireState(TessState.T_IN_CONTOUR);
-
-        if (flushCacheOnNextVertex) {
-            if (!flushCache()) {
-                callErrorOrErrorData(GLU.GLU_OUT_OF_MEMORY);
-                return;
-            }
-            lastEdge = null;
-        }
-        for (i = 0; i < 3; ++i) {
-            x = coords[i+coords_offset];
-            if (x < -GLU.GLU_TESS_MAX_COORD) {
-                x = -GLU.GLU_TESS_MAX_COORD;
-                tooLarge = true;
-            }
-            if (x > GLU.GLU_TESS_MAX_COORD) {
-                x = GLU.GLU_TESS_MAX_COORD;
-                tooLarge = true;
-            }
-            clamped[i] = x;
-        }
-        if (tooLarge) {
-            callErrorOrErrorData(GLU.GLU_TESS_COORD_TOO_LARGE);
-        }
-
-        if (mesh == null) {
-            if (cacheCount < TESS_MAX_CACHE) {
-                cacheVertex(clamped, vertexData);
-                return;
-            }
-            if (!flushCache()) {
-                callErrorOrErrorData(GLU.GLU_OUT_OF_MEMORY);
-                return;
-            }
-        }
-
-        if (!addVertex(clamped, vertexData)) {
-            callErrorOrErrorData(GLU.GLU_OUT_OF_MEMORY);
-        }
-    }
-
-
-    public void gluTessBeginPolygon(Object data) {
-        requireState(TessState.T_DORMANT);
-
-        state = TessState.T_IN_POLYGON;
-        cacheCount = 0;
-        flushCacheOnNextVertex = false;
-        mesh = null;
-
-        polygonData = data;
-    }
-
-
-    public void gluTessBeginContour() {
-        requireState(TessState.T_IN_POLYGON);
-
-        state = TessState.T_IN_CONTOUR;
-        lastEdge = null;
-        if (cacheCount > 0) {
-/* Just set a flag so we don't get confused by empty contours
- * -- these can be generated accidentally with the obsolete
- * NextContour() interface.
- */
-            flushCacheOnNextVertex = true;
-        }
-    }
-
-
-    public void gluTessEndContour() {
-        requireState(TessState.T_IN_CONTOUR);
-        state = TessState.T_IN_POLYGON;
-    }
-
-    public void gluTessEndPolygon() {
-        GLUmesh mesh;
-
-        try {
-            requireState(TessState.T_IN_POLYGON);
-            state = TessState.T_DORMANT;
-
-            if (this.mesh == null) {
-                if (!flagBoundary /*&& callMesh == NULL_CB*/) {
-
-/* Try some special code to make the easy cases go quickly
- * (eg. convex polygons).  This code does NOT handle multiple contours,
- * intersections, edge flags, and of course it does not generate
- * an explicit mesh either.
- */
-                    if (Render.__gl_renderCache(this)) {
-                        polygonData = null;
-                        return;
-                    }
-                }
-                if (!flushCache()) throw new RuntimeException(); /* could've used a label*/
-            }
-
-/* Determine the polygon normal and project vertices onto the plane
-         * of the polygon.
-         */
-            Normal.__gl_projectPolygon(this);
-
-/* __gl_computeInterior( tess ) computes the planar arrangement specified
- * by the given contours, and further subdivides this arrangement
- * into regions.  Each region is marked "inside" if it belongs
- * to the polygon, according to the rule given by windingRule.
- * Each interior region is guaranteed be monotone.
- */
-            if (!Sweep.__gl_computeInterior(this)) {
-                throw new RuntimeException();	/* could've used a label */
-            }
-
-            mesh = this.mesh;
-            if (!fatalError) {
-                boolean rc = true;
-
-/* If the user wants only the boundary contours, we throw away all edges
- * except those which separate the interior from the exterior.
- * Otherwise we tessellate all the regions marked "inside".
- */
-                if (boundaryOnly) {
-                    rc = TessMono.__gl_meshSetWindingNumber(mesh, 1, true);
-                } else {
-                    rc = TessMono.__gl_meshTessellateInterior(mesh, avoidDegenerateTris);
-                }
-                if (!rc) throw new RuntimeException();	/* could've used a label */
-
-                Mesh.__gl_meshCheckMesh(mesh);
-
-                if (callBegin != NULL_CB || callEnd != NULL_CB
-                        || callVertex != NULL_CB || callEdgeFlag != NULL_CB
-                        || callBeginData != NULL_CB
-                        || callEndData != NULL_CB
-                        || callVertexData != NULL_CB
-                        || callEdgeFlagData != NULL_CB) {
-                    if (boundaryOnly) {
-                        Render.__gl_renderBoundary(this, mesh);  /* output boundary contours */
-                    } else {
-                        Render.__gl_renderMesh(this, mesh);	   /* output strips and fans */
-                    }
-                }
-//                if (callMesh != NULL_CB) {
-//
-///* Throw away the exterior faces, so that all faces are interior.
-//                 * This way the user doesn't have to check the "inside" flag,
-//                 * and we don't need to even reveal its existence.  It also leaves
-//                 * the freedom for an implementation to not generate the exterior
-//                 * faces in the first place.
-//                 */
-//                    TessMono.__gl_meshDiscardExterior(mesh);
-//                    callMesh.mesh(mesh);		/* user wants the mesh itself */
-//                    mesh = null;
-//                    polygonData = null;
-//                    return;
-//                }
-            }
-            Mesh.__gl_meshDeleteMesh(mesh);
-            polygonData = null;
-            mesh = null;
-        } catch (Exception e) {
-            e.printStackTrace();
-            callErrorOrErrorData(GLU.GLU_OUT_OF_MEMORY);
-        }
-    }
-
-    /*******************************************************/
-
-/* Obsolete calls -- for backward compatibility */
-
-    public void gluBeginPolygon() {
-        gluTessBeginPolygon(null);
-        gluTessBeginContour();
-    }
-
-
-/*ARGSUSED*/
-    public void gluNextContour(int type) {
-        gluTessEndContour();
-        gluTessBeginContour();
-    }
-
-
-    public void gluEndPolygon() {
-        gluTessEndContour();
-        gluTessEndPolygon();
-    }
-
-    void callBeginOrBeginData(int a) {
-        if (callBeginData != NULL_CB)
-            callBeginData.beginData(a, polygonData);
-        else
-            callBegin.begin(a);
-    }
-
-    void callVertexOrVertexData(Object a) {
-        if (callVertexData != NULL_CB)
-            callVertexData.vertexData(a, polygonData);
-        else
-            callVertex.vertex(a);
-    }
-
-    void callEdgeFlagOrEdgeFlagData(boolean a) {
-        if (callEdgeFlagData != NULL_CB)
-            callEdgeFlagData.edgeFlagData(a, polygonData);
-        else
-            callEdgeFlag.edgeFlag(a);
-    }
-
-    void callEndOrEndData() {
-        if (callEndData != NULL_CB)
-            callEndData.endData(polygonData);
-        else
-            callEnd.end();
-    }
-
-    void callCombineOrCombineData(double[] coords, Object[] vertexData, float[] weights, Object[] outData) {
-        if (callCombineData != NULL_CB)
-            callCombineData.combineData(coords, vertexData, weights, outData, polygonData);
-        else
-            callCombine.combine(coords, vertexData, weights, outData);
-    }
-
-    void callErrorOrErrorData(int a) {
-        if (callErrorData != NULL_CB)
-            callErrorData.errorData(a, polygonData);
-        else
-            callError.error(a);
-    }
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUvertex.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUvertex.java
deleted file mode 100644
index 9c01148e8..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUvertex.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class GLUvertex {
-    public GLUvertex next;		/* next vertex (never NULL) */
-    public GLUvertex prev;		/* previous vertex (never NULL) */
-    public com.sun.opengl.impl.glu.tessellator.GLUhalfEdge anEdge;	/* a half-edge with this origin */
-    public Object data;		/* client's data */
-
-    /* Internal data (keep hidden) */
-    public double[] coords = new double[3];	/* vertex location in 3D */
-    public double s, t;		/* projection onto the sweep plane */
-    public int pqHandle;	/* to allow deletion from priority queue */
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Geom.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Geom.java
deleted file mode 100644
index 818dc663d..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Geom.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class Geom {
-    private Geom() {
-    }
-
-    /* Given three vertices u,v,w such that VertLeq(u,v) && VertLeq(v,w),
-     * evaluates the t-coord of the edge uw at the s-coord of the vertex v.
-     * Returns v->t - (uw)(v->s), ie. the signed distance from uw to v.
-     * If uw is vertical (and thus passes thru v), the result is zero.
-     *
-     * The calculation is extremely accurate and stable, even when v
-     * is very close to u or w.  In particular if we set v->t = 0 and
-     * let r be the negated result (this evaluates (uw)(v->s)), then
-     * r is guaranteed to satisfy MIN(u->t,w->t) <= r <= MAX(u->t,w->t).
-     */
-    static double EdgeEval(GLUvertex u, GLUvertex v, GLUvertex w) {
-        double gapL, gapR;
-
-        assert (VertLeq(u, v) && VertLeq(v, w));
-
-        gapL = v.s - u.s;
-        gapR = w.s - v.s;
-
-        if (gapL + gapR > 0) {
-            if (gapL < gapR) {
-                return (v.t - u.t) + (u.t - w.t) * (gapL / (gapL + gapR));
-            } else {
-                return (v.t - w.t) + (w.t - u.t) * (gapR / (gapL + gapR));
-            }
-        }
-        /* vertical line */
-        return 0;
-    }
-
-    static double EdgeSign(GLUvertex u, GLUvertex v, GLUvertex w) {
-        double gapL, gapR;
-
-        assert (VertLeq(u, v) && VertLeq(v, w));
-
-        gapL = v.s - u.s;
-        gapR = w.s - v.s;
-
-        if (gapL + gapR > 0) {
-            return (v.t - w.t) * gapL + (v.t - u.t) * gapR;
-        }
-        /* vertical line */
-        return 0;
-    }
-
-
-    /***********************************************************************
-     * Define versions of EdgeSign, EdgeEval with s and t transposed.
-     */
-
-    static double TransEval(GLUvertex u, GLUvertex v, GLUvertex w) {
-        /* Given three vertices u,v,w such that TransLeq(u,v) && TransLeq(v,w),
-         * evaluates the t-coord of the edge uw at the s-coord of the vertex v.
-         * Returns v->s - (uw)(v->t), ie. the signed distance from uw to v.
-         * If uw is vertical (and thus passes thru v), the result is zero.
-         *
-         * The calculation is extremely accurate and stable, even when v
-         * is very close to u or w.  In particular if we set v->s = 0 and
-         * let r be the negated result (this evaluates (uw)(v->t)), then
-         * r is guaranteed to satisfy MIN(u->s,w->s) <= r <= MAX(u->s,w->s).
-         */
-        double gapL, gapR;
-
-        assert (TransLeq(u, v) && TransLeq(v, w));
-
-        gapL = v.t - u.t;
-        gapR = w.t - v.t;
-
-        if (gapL + gapR > 0) {
-            if (gapL < gapR) {
-                return (v.s - u.s) + (u.s - w.s) * (gapL / (gapL + gapR));
-            } else {
-                return (v.s - w.s) + (w.s - u.s) * (gapR / (gapL + gapR));
-            }
-        }
-        /* vertical line */
-        return 0;
-    }
-
-    static double TransSign(GLUvertex u, GLUvertex v, GLUvertex w) {
-        /* Returns a number whose sign matches TransEval(u,v,w) but which
-         * is cheaper to evaluate.  Returns > 0, == 0 , or < 0
-         * as v is above, on, or below the edge uw.
-         */
-        double gapL, gapR;
-
-        assert (TransLeq(u, v) && TransLeq(v, w));
-
-        gapL = v.t - u.t;
-        gapR = w.t - v.t;
-
-        if (gapL + gapR > 0) {
-            return (v.s - w.s) * gapL + (v.s - u.s) * gapR;
-        }
-        /* vertical line */
-        return 0;
-    }
-
-
-    static boolean VertCCW(GLUvertex u, GLUvertex v, GLUvertex w) {
-        /* For almost-degenerate situations, the results are not reliable.
-         * Unless the floating-point arithmetic can be performed without
-         * rounding errors, *any* implementation will give incorrect results
-         * on some degenerate inputs, so the client must have some way to
-         * handle this situation.
-         */
-        return (u.s * (v.t - w.t) + v.s * (w.t - u.t) + w.s * (u.t - v.t)) >= 0;
-    }
-
-/* Given parameters a,x,b,y returns the value (b*x+a*y)/(a+b),
- * or (x+y)/2 if a==b==0.  It requires that a,b >= 0, and enforces
- * this in the rare case that one argument is slightly negative.
- * The implementation is extremely stable numerically.
- * In particular it guarantees that the result r satisfies
- * MIN(x,y) <= r <= MAX(x,y), and the results are very accurate
- * even when a and b differ greatly in magnitude.
- */
-    static double Interpolate(double a, double x, double b, double y) {
-        a = (a < 0) ? 0 : a;
-        b = (b < 0) ? 0 : b;
-        if (a <= b) {
-            if (b == 0) {
-                return (x + y) / 2.0;
-            } else {
-                return (x + (y - x) * (a / (a + b)));
-            }
-        } else {
-            return (y + (x - y) * (b / (a + b)));
-        }
-    }
-
-    static void EdgeIntersect(GLUvertex o1, GLUvertex d1,
-                              GLUvertex o2, GLUvertex d2,
-                              GLUvertex v)
-/* Given edges (o1,d1) and (o2,d2), compute their point of intersection.
- * The computed point is guaranteed to lie in the intersection of the
- * bounding rectangles defined by each edge.
- */ {
-        double z1, z2;
-
-        /* This is certainly not the most efficient way to find the intersection
-         * of two line segments, but it is very numerically stable.
-         *
-         * Strategy: find the two middle vertices in the VertLeq ordering,
-         * and interpolate the intersection s-value from these.  Then repeat
-         * using the TransLeq ordering to find the intersection t-value.
-         */
-
-        if (!VertLeq(o1, d1)) {
-            GLUvertex temp = o1;
-            o1 = d1;
-            d1 = temp;
-        }
-        if (!VertLeq(o2, d2)) {
-            GLUvertex temp = o2;
-            o2 = d2;
-            d2 = temp;
-        }
-        if (!VertLeq(o1, o2)) {
-            GLUvertex temp = o1;
-            o1 = o2;
-            o2 = temp;
-            temp = d1;
-            d1 = d2;
-            d2 = temp;
-        }
-
-        if (!VertLeq(o2, d1)) {
-            /* Technically, no intersection -- do our best */
-            v.s = (o2.s + d1.s) / 2.0;
-        } else if (VertLeq(d1, d2)) {
-            /* Interpolate between o2 and d1 */
-            z1 = EdgeEval(o1, o2, d1);
-            z2 = EdgeEval(o2, d1, d2);
-            if (z1 + z2 < 0) {
-                z1 = -z1;
-                z2 = -z2;
-            }
-            v.s = Interpolate(z1, o2.s, z2, d1.s);
-        } else {
-            /* Interpolate between o2 and d2 */
-            z1 = EdgeSign(o1, o2, d1);
-            z2 = -EdgeSign(o1, d2, d1);
-            if (z1 + z2 < 0) {
-                z1 = -z1;
-                z2 = -z2;
-            }
-            v.s = Interpolate(z1, o2.s, z2, d2.s);
-        }
-
-        /* Now repeat the process for t */
-
-        if (!TransLeq(o1, d1)) {
-            GLUvertex temp = o1;
-            o1 = d1;
-            d1 = temp;
-        }
-        if (!TransLeq(o2, d2)) {
-            GLUvertex temp = o2;
-            o2 = d2;
-            d2 = temp;
-        }
-        if (!TransLeq(o1, o2)) {
-            GLUvertex temp = o2;
-            o2 = o1;
-            o1 = temp;
-            temp = d2;
-            d2 = d1;
-            d1 = temp;
-        }
-
-        if (!TransLeq(o2, d1)) {
-            /* Technically, no intersection -- do our best */
-            v.t = (o2.t + d1.t) / 2.0;
-        } else if (TransLeq(d1, d2)) {
-            /* Interpolate between o2 and d1 */
-            z1 = TransEval(o1, o2, d1);
-            z2 = TransEval(o2, d1, d2);
-            if (z1 + z2 < 0) {
-                z1 = -z1;
-                z2 = -z2;
-            }
-            v.t = Interpolate(z1, o2.t, z2, d1.t);
-        } else {
-            /* Interpolate between o2 and d2 */
-            z1 = TransSign(o1, o2, d1);
-            z2 = -TransSign(o1, d2, d1);
-            if (z1 + z2 < 0) {
-                z1 = -z1;
-                z2 = -z2;
-            }
-            v.t = Interpolate(z1, o2.t, z2, d2.t);
-        }
-    }
-
-    static boolean VertEq(GLUvertex u, GLUvertex v) {
-        return u.s == v.s && u.t == v.t;
-    }
-
-    static boolean VertLeq(GLUvertex u, GLUvertex v) {
-        return u.s < v.s || (u.s == v.s && u.t <= v.t);
-    }
-
-/* Versions of VertLeq, EdgeSign, EdgeEval with s and t transposed. */
-
-    static boolean TransLeq(GLUvertex u, GLUvertex v) {
-        return u.t < v.t || (u.t == v.t && u.s <= v.s);
-    }
-
-    static boolean EdgeGoesLeft(GLUhalfEdge e) {
-        return VertLeq(e.Sym.Org, e.Org);
-    }
-
-    static boolean EdgeGoesRight(GLUhalfEdge e) {
-        return VertLeq(e.Org, e.Sym.Org);
-    }
-
-    static double VertL1dist(GLUvertex u, GLUvertex v) {
-        return Math.abs(u.s - v.s) + Math.abs(u.t - v.t);
-    }
-
-    /***********************************************************************/
-
-    // Compute the cosine of the angle between the edges between o and
-    // v1 and between o and v2
-    static double EdgeCos(GLUvertex o, GLUvertex v1, GLUvertex v2) {
-        double ov1s = v1.s - o.s;
-        double ov1t = v1.t - o.t;
-        double ov2s = v2.s - o.s;
-        double ov2t = v2.t - o.t;
-        double dotp = ov1s * ov2s + ov1t * ov2t;
-        double len = Math.sqrt(ov1s * ov1s + ov1t * ov1t) * Math.sqrt(ov2s * ov2s + ov2t * ov2t);
-        if (len > 0.0) {
-            dotp /= len;
-        }
-        return dotp;
-    }
-
-    static final double EPSILON = 1.0e-5;
-    static final double ONE_MINUS_EPSILON = 1.0 - EPSILON;
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Mesh.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Mesh.java
deleted file mode 100644
index a1e36e815..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Mesh.java
+++ /dev/null
@@ -1,734 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class Mesh {
-    private Mesh() {
-    }
-
-    /************************ Utility Routines ************************/
-/* MakeEdge creates a new pair of half-edges which form their own loop.
- * No vertex or face structures are allocated, but these must be assigned
- * before the current edge operation is completed.
- */
-    static com.sun.opengl.impl.glu.tessellator.GLUhalfEdge MakeEdge(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eNext) {
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eSym;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge ePrev;
-
-//        EdgePair * pair = (EdgePair *)
-//        memAlloc(sizeof(EdgePair));
-//        if (pair == NULL) return NULL;
-//
-//        e = &pair - > e;
-        e = new com.sun.opengl.impl.glu.tessellator.GLUhalfEdge(true);
-//        eSym = &pair - > eSym;
-        eSym = new com.sun.opengl.impl.glu.tessellator.GLUhalfEdge(false);
-
-
-        /* Make sure eNext points to the first edge of the edge pair */
-        if (!eNext.first) {
-            eNext = eNext.Sym;
-        }
-
-        /* Insert in circular doubly-linked list before eNext.
-         * Note that the prev pointer is stored in Sym->next.
-         */
-        ePrev = eNext.Sym.next;
-        eSym.next = ePrev;
-        ePrev.Sym.next = e;
-        e.next = eNext;
-        eNext.Sym.next = eSym;
-
-        e.Sym = eSym;
-        e.Onext = e;
-        e.Lnext = eSym;
-        e.Org = null;
-        e.Lface = null;
-        e.winding = 0;
-        e.activeRegion = null;
-
-        eSym.Sym = e;
-        eSym.Onext = eSym;
-        eSym.Lnext = e;
-        eSym.Org = null;
-        eSym.Lface = null;
-        eSym.winding = 0;
-        eSym.activeRegion = null;
-
-        return e;
-    }
-
-/* Splice( a, b ) is best described by the Guibas/Stolfi paper or the
- * CS348a notes (see mesh.h).  Basically it modifies the mesh so that
- * a->Onext and b->Onext are exchanged.  This can have various effects
- * depending on whether a and b belong to different face or vertex rings.
- * For more explanation see __gl_meshSplice() below.
- */
-    static void Splice(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge a, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge b) {
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge aOnext = a.Onext;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge bOnext = b.Onext;
-
-        aOnext.Sym.Lnext = b;
-        bOnext.Sym.Lnext = a;
-        a.Onext = bOnext;
-        b.Onext = aOnext;
-    }
-
-/* MakeVertex( newVertex, eOrig, vNext ) attaches a new vertex and makes it the
- * origin of all edges in the vertex loop to which eOrig belongs. "vNext" gives
- * a place to insert the new vertex in the global vertex list.  We insert
- * the new vertex *before* vNext so that algorithms which walk the vertex
- * list will not see the newly created vertices.
- */
-    static void MakeVertex(com.sun.opengl.impl.glu.tessellator.GLUvertex newVertex,
-                           com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrig, com.sun.opengl.impl.glu.tessellator.GLUvertex vNext) {
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
-        com.sun.opengl.impl.glu.tessellator.GLUvertex vPrev;
-        com.sun.opengl.impl.glu.tessellator.GLUvertex vNew = newVertex;
-
-        assert (vNew != null);
-
-        /* insert in circular doubly-linked list before vNext */
-        vPrev = vNext.prev;
-        vNew.prev = vPrev;
-        vPrev.next = vNew;
-        vNew.next = vNext;
-        vNext.prev = vNew;
-
-        vNew.anEdge = eOrig;
-        vNew.data = null;
-        /* leave coords, s, t undefined */
-
-        /* fix other edges on this vertex loop */
-        e = eOrig;
-        do {
-            e.Org = vNew;
-            e = e.Onext;
-        } while (e != eOrig);
-    }
-
-/* MakeFace( newFace, eOrig, fNext ) attaches a new face and makes it the left
- * face of all edges in the face loop to which eOrig belongs.  "fNext" gives
- * a place to insert the new face in the global face list.  We insert
- * the new face *before* fNext so that algorithms which walk the face
- * list will not see the newly created faces.
- */
-    static void MakeFace(com.sun.opengl.impl.glu.tessellator.GLUface newFace, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrig, com.sun.opengl.impl.glu.tessellator.GLUface fNext) {
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
-        com.sun.opengl.impl.glu.tessellator.GLUface fPrev;
-        com.sun.opengl.impl.glu.tessellator.GLUface fNew = newFace;
-
-        assert (fNew != null);
-
-        /* insert in circular doubly-linked list before fNext */
-        fPrev = fNext.prev;
-        fNew.prev = fPrev;
-        fPrev.next = fNew;
-        fNew.next = fNext;
-        fNext.prev = fNew;
-
-        fNew.anEdge = eOrig;
-        fNew.data = null;
-        fNew.trail = null;
-        fNew.marked = false;
-
-        /* The new face is marked "inside" if the old one was.  This is a
-         * convenience for the common case where a face has been split in two.
-         */
-        fNew.inside = fNext.inside;
-
-        /* fix other edges on this face loop */
-        e = eOrig;
-        do {
-            e.Lface = fNew;
-            e = e.Lnext;
-        } while (e != eOrig);
-    }
-
-/* KillEdge( eDel ) destroys an edge (the half-edges eDel and eDel->Sym),
- * and removes from the global edge list.
- */
-    static void KillEdge(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eDel) {
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge ePrev, eNext;
-
-        /* Half-edges are allocated in pairs, see EdgePair above */
-        if (!eDel.first) {
-            eDel = eDel.Sym;
-        }
-
-        /* delete from circular doubly-linked list */
-        eNext = eDel.next;
-        ePrev = eDel.Sym.next;
-        eNext.Sym.next = ePrev;
-        ePrev.Sym.next = eNext;
-    }
-
-
-/* KillVertex( vDel ) destroys a vertex and removes it from the global
- * vertex list.  It updates the vertex loop to point to a given new vertex.
- */
-    static void KillVertex(com.sun.opengl.impl.glu.tessellator.GLUvertex vDel, com.sun.opengl.impl.glu.tessellator.GLUvertex newOrg) {
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, eStart = vDel.anEdge;
-        com.sun.opengl.impl.glu.tessellator.GLUvertex vPrev, vNext;
-
-        /* change the origin of all affected edges */
-        e = eStart;
-        do {
-            e.Org = newOrg;
-            e = e.Onext;
-        } while (e != eStart);
-
-        /* delete from circular doubly-linked list */
-        vPrev = vDel.prev;
-        vNext = vDel.next;
-        vNext.prev = vPrev;
-        vPrev.next = vNext;
-    }
-
-/* KillFace( fDel ) destroys a face and removes it from the global face
- * list.  It updates the face loop to point to a given new face.
- */
-    static void KillFace(com.sun.opengl.impl.glu.tessellator.GLUface fDel, com.sun.opengl.impl.glu.tessellator.GLUface newLface) {
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, eStart = fDel.anEdge;
-        com.sun.opengl.impl.glu.tessellator.GLUface fPrev, fNext;
-
-        /* change the left face of all affected edges */
-        e = eStart;
-        do {
-            e.Lface = newLface;
-            e = e.Lnext;
-        } while (e != eStart);
-
-        /* delete from circular doubly-linked list */
-        fPrev = fDel.prev;
-        fNext = fDel.next;
-        fNext.prev = fPrev;
-        fPrev.next = fNext;
-    }
-
-
-    /****************** Basic Edge Operations **********************/
-
-/* __gl_meshMakeEdge creates one edge, two vertices, and a loop (face).
- * The loop consists of the two new half-edges.
- */
-    public static com.sun.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshMakeEdge(com.sun.opengl.impl.glu.tessellator.GLUmesh mesh) {
-        com.sun.opengl.impl.glu.tessellator.GLUvertex newVertex1 = new com.sun.opengl.impl.glu.tessellator.GLUvertex();
-        com.sun.opengl.impl.glu.tessellator.GLUvertex newVertex2 = new com.sun.opengl.impl.glu.tessellator.GLUvertex();
-        com.sun.opengl.impl.glu.tessellator.GLUface newFace = new com.sun.opengl.impl.glu.tessellator.GLUface();
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
-
-        e = MakeEdge(mesh.eHead);
-        if (e == null) return null;
-
-        MakeVertex(newVertex1, e, mesh.vHead);
-        MakeVertex(newVertex2, e.Sym, mesh.vHead);
-        MakeFace(newFace, e, mesh.fHead);
-        return e;
-    }
-
-
-/* __gl_meshSplice( eOrg, eDst ) is the basic operation for changing the
- * mesh connectivity and topology.  It changes the mesh so that
- *	eOrg->Onext <- OLD( eDst->Onext )
- *	eDst->Onext <- OLD( eOrg->Onext )
- * where OLD(...) means the value before the meshSplice operation.
- *
- * This can have two effects on the vertex structure:
- *  - if eOrg->Org != eDst->Org, the two vertices are merged together
- *  - if eOrg->Org == eDst->Org, the origin is split into two vertices
- * In both cases, eDst->Org is changed and eOrg->Org is untouched.
- *
- * Similarly (and independently) for the face structure,
- *  - if eOrg->Lface == eDst->Lface, one loop is split into two
- *  - if eOrg->Lface != eDst->Lface, two distinct loops are joined into one
- * In both cases, eDst->Lface is changed and eOrg->Lface is unaffected.
- *
- * Some special cases:
- * If eDst == eOrg, the operation has no effect.
- * If eDst == eOrg->Lnext, the new face will have a single edge.
- * If eDst == eOrg->Lprev, the old face will have a single edge.
- * If eDst == eOrg->Onext, the new vertex will have a single edge.
- * If eDst == eOrg->Oprev, the old vertex will have a single edge.
- */
-    public static boolean __gl_meshSplice(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrg, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eDst) {
-        boolean joiningLoops = false;
-        boolean joiningVertices = false;
-
-        if (eOrg == eDst) return true;
-
-        if (eDst.Org != eOrg.Org) {
-            /* We are merging two disjoint vertices -- destroy eDst->Org */
-            joiningVertices = true;
-            KillVertex(eDst.Org, eOrg.Org);
-        }
-        if (eDst.Lface != eOrg.Lface) {
-            /* We are connecting two disjoint loops -- destroy eDst.Lface */
-            joiningLoops = true;
-            KillFace(eDst.Lface, eOrg.Lface);
-        }
-
-        /* Change the edge structure */
-        Splice(eDst, eOrg);
-
-        if (!joiningVertices) {
-            com.sun.opengl.impl.glu.tessellator.GLUvertex newVertex = new com.sun.opengl.impl.glu.tessellator.GLUvertex();
-
-            /* We split one vertex into two -- the new vertex is eDst.Org.
-             * Make sure the old vertex points to a valid half-edge.
-             */
-            MakeVertex(newVertex, eDst, eOrg.Org);
-            eOrg.Org.anEdge = eOrg;
-        }
-        if (!joiningLoops) {
-            com.sun.opengl.impl.glu.tessellator.GLUface newFace = new com.sun.opengl.impl.glu.tessellator.GLUface();
-
-            /* We split one loop into two -- the new loop is eDst.Lface.
-             * Make sure the old face points to a valid half-edge.
-             */
-            MakeFace(newFace, eDst, eOrg.Lface);
-            eOrg.Lface.anEdge = eOrg;
-        }
-
-        return true;
-    }
-
-
-/* __gl_meshDelete( eDel ) removes the edge eDel.  There are several cases:
- * if (eDel.Lface != eDel.Rface), we join two loops into one; the loop
- * eDel.Lface is deleted.  Otherwise, we are splitting one loop into two;
- * the newly created loop will contain eDel.Dst.  If the deletion of eDel
- * would create isolated vertices, those are deleted as well.
- *
- * This function could be implemented as two calls to __gl_meshSplice
- * plus a few calls to memFree, but this would allocate and delete
- * unnecessary vertices and faces.
- */
-    static boolean __gl_meshDelete(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eDel) {
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eDelSym = eDel.Sym;
-        boolean joiningLoops = false;
-
-        /* First step: disconnect the origin vertex eDel.Org.  We make all
-         * changes to get a consistent mesh in this "intermediate" state.
-         */
-        if (eDel.Lface != eDel.Sym.Lface) {
-            /* We are joining two loops into one -- remove the left face */
-            joiningLoops = true;
-            KillFace(eDel.Lface, eDel.Sym.Lface);
-        }
-
-        if (eDel.Onext == eDel) {
-            KillVertex(eDel.Org, null);
-        } else {
-            /* Make sure that eDel.Org and eDel.Sym.Lface point to valid half-edges */
-            eDel.Sym.Lface.anEdge = eDel.Sym.Lnext;
-            eDel.Org.anEdge = eDel.Onext;
-
-            Splice(eDel, eDel.Sym.Lnext);
-            if (!joiningLoops) {
-                com.sun.opengl.impl.glu.tessellator.GLUface newFace = new com.sun.opengl.impl.glu.tessellator.GLUface();
-
-                /* We are splitting one loop into two -- create a new loop for eDel. */
-                MakeFace(newFace, eDel, eDel.Lface);
-            }
-        }
-
-        /* Claim: the mesh is now in a consistent state, except that eDel.Org
-         * may have been deleted.  Now we disconnect eDel.Dst.
-         */
-        if (eDelSym.Onext == eDelSym) {
-            KillVertex(eDelSym.Org, null);
-            KillFace(eDelSym.Lface, null);
-        } else {
-            /* Make sure that eDel.Dst and eDel.Lface point to valid half-edges */
-            eDel.Lface.anEdge = eDelSym.Sym.Lnext;
-            eDelSym.Org.anEdge = eDelSym.Onext;
-            Splice(eDelSym, eDelSym.Sym.Lnext);
-        }
-
-        /* Any isolated vertices or faces have already been freed. */
-        KillEdge(eDel);
-
-        return true;
-    }
-
-
-    /******************** Other Edge Operations **********************/
-
-/* All these routines can be implemented with the basic edge
- * operations above.  They are provided for convenience and efficiency.
- */
-
-
-/* __gl_meshAddEdgeVertex( eOrg ) creates a new edge eNew such that
- * eNew == eOrg.Lnext, and eNew.Dst is a newly created vertex.
- * eOrg and eNew will have the same left face.
- */
-    static com.sun.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshAddEdgeVertex(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrg) {
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eNewSym;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg);
-
-        eNewSym = eNew.Sym;
-
-        /* Connect the new edge appropriately */
-        Splice(eNew, eOrg.Lnext);
-
-        /* Set the vertex and face information */
-        eNew.Org = eOrg.Sym.Org;
-        {
-            com.sun.opengl.impl.glu.tessellator.GLUvertex newVertex = new com.sun.opengl.impl.glu.tessellator.GLUvertex();
-
-            MakeVertex(newVertex, eNewSym, eNew.Org);
-        }
-        eNew.Lface = eNewSym.Lface = eOrg.Lface;
-
-        return eNew;
-    }
-
-
-/* __gl_meshSplitEdge( eOrg ) splits eOrg into two edges eOrg and eNew,
- * such that eNew == eOrg.Lnext.  The new vertex is eOrg.Sym.Org == eNew.Org.
- * eOrg and eNew will have the same left face.
- */
-    public static com.sun.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshSplitEdge(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrg) {
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eNew;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge tempHalfEdge = __gl_meshAddEdgeVertex(eOrg);
-
-        eNew = tempHalfEdge.Sym;
-
-        /* Disconnect eOrg from eOrg.Sym.Org and connect it to eNew.Org */
-        Splice(eOrg.Sym, eOrg.Sym.Sym.Lnext);
-        Splice(eOrg.Sym, eNew);
-
-        /* Set the vertex and face information */
-        eOrg.Sym.Org = eNew.Org;
-        eNew.Sym.Org.anEdge = eNew.Sym;	/* may have pointed to eOrg.Sym */
-        eNew.Sym.Lface = eOrg.Sym.Lface;
-        eNew.winding = eOrg.winding;	/* copy old winding information */
-        eNew.Sym.winding = eOrg.Sym.winding;
-
-        return eNew;
-    }
-
-
-/* __gl_meshConnect( eOrg, eDst ) creates a new edge from eOrg.Sym.Org
- * to eDst.Org, and returns the corresponding half-edge eNew.
- * If eOrg.Lface == eDst.Lface, this splits one loop into two,
- * and the newly created loop is eNew.Lface.  Otherwise, two disjoint
- * loops are merged into one, and the loop eDst.Lface is destroyed.
- *
- * If (eOrg == eDst), the new face will have only two edges.
- * If (eOrg.Lnext == eDst), the old face is reduced to a single edge.
- * If (eOrg.Lnext.Lnext == eDst), the old face is reduced to two edges.
- */
-    static com.sun.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshConnect(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrg, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eDst) {
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eNewSym;
-        boolean joiningLoops = false;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg);
-
-        eNewSym = eNew.Sym;
-
-        if (eDst.Lface != eOrg.Lface) {
-            /* We are connecting two disjoint loops -- destroy eDst.Lface */
-            joiningLoops = true;
-            KillFace(eDst.Lface, eOrg.Lface);
-        }
-
-        /* Connect the new edge appropriately */
-        Splice(eNew, eOrg.Lnext);
-        Splice(eNewSym, eDst);
-
-        /* Set the vertex and face information */
-        eNew.Org = eOrg.Sym.Org;
-        eNewSym.Org = eDst.Org;
-        eNew.Lface = eNewSym.Lface = eOrg.Lface;
-
-        /* Make sure the old face points to a valid half-edge */
-        eOrg.Lface.anEdge = eNewSym;
-
-        if (!joiningLoops) {
-            com.sun.opengl.impl.glu.tessellator.GLUface newFace = new com.sun.opengl.impl.glu.tessellator.GLUface();
-
-            /* We split one loop into two -- the new loop is eNew.Lface */
-            MakeFace(newFace, eNew, eOrg.Lface);
-        }
-        return eNew;
-    }
-
-
-    /******************** Other Operations **********************/
-
-/* __gl_meshZapFace( fZap ) destroys a face and removes it from the
- * global face list.  All edges of fZap will have a null pointer as their
- * left face.  Any edges which also have a null pointer as their right face
- * are deleted entirely (along with any isolated vertices this produces).
- * An entire mesh can be deleted by zapping its faces, one at a time,
- * in any order.  Zapped faces cannot be used in further mesh operations!
- */
-    static void __gl_meshZapFace(com.sun.opengl.impl.glu.tessellator.GLUface fZap) {
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eStart = fZap.anEdge;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, eNext, eSym;
-        com.sun.opengl.impl.glu.tessellator.GLUface fPrev, fNext;
-
-        /* walk around face, deleting edges whose right face is also null */
-        eNext = eStart.Lnext;
-        do {
-            e = eNext;
-            eNext = e.Lnext;
-
-            e.Lface = null;
-            if (e.Sym.Lface == null) {
-                /* delete the edge -- see __gl_MeshDelete above */
-
-                if (e.Onext == e) {
-                    KillVertex(e.Org, null);
-                } else {
-                    /* Make sure that e.Org points to a valid half-edge */
-                    e.Org.anEdge = e.Onext;
-                    Splice(e, e.Sym.Lnext);
-                }
-                eSym = e.Sym;
-                if (eSym.Onext == eSym) {
-                    KillVertex(eSym.Org, null);
-                } else {
-                    /* Make sure that eSym.Org points to a valid half-edge */
-                    eSym.Org.anEdge = eSym.Onext;
-                    Splice(eSym, eSym.Sym.Lnext);
-                }
-                KillEdge(e);
-            }
-        } while (e != eStart);
-
-        /* delete from circular doubly-linked list */
-        fPrev = fZap.prev;
-        fNext = fZap.next;
-        fNext.prev = fPrev;
-        fPrev.next = fNext;
-    }
-
-
-/* __gl_meshNewMesh() creates a new mesh with no edges, no vertices,
- * and no loops (what we usually call a "face").
- */
-    public static com.sun.opengl.impl.glu.tessellator.GLUmesh __gl_meshNewMesh() {
-        com.sun.opengl.impl.glu.tessellator.GLUvertex v;
-        com.sun.opengl.impl.glu.tessellator.GLUface f;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eSym;
-        com.sun.opengl.impl.glu.tessellator.GLUmesh mesh = new com.sun.opengl.impl.glu.tessellator.GLUmesh();
-
-        v = mesh.vHead;
-        f = mesh.fHead;
-        e = mesh.eHead;
-        eSym = mesh.eHeadSym;
-
-        v.next = v.prev = v;
-        v.anEdge = null;
-        v.data = null;
-
-        f.next = f.prev = f;
-        f.anEdge = null;
-        f.data = null;
-        f.trail = null;
-        f.marked = false;
-        f.inside = false;
-
-        e.next = e;
-        e.Sym = eSym;
-        e.Onext = null;
-        e.Lnext = null;
-        e.Org = null;
-        e.Lface = null;
-        e.winding = 0;
-        e.activeRegion = null;
-
-        eSym.next = eSym;
-        eSym.Sym = e;
-        eSym.Onext = null;
-        eSym.Lnext = null;
-        eSym.Org = null;
-        eSym.Lface = null;
-        eSym.winding = 0;
-        eSym.activeRegion = null;
-
-        return mesh;
-    }
-
-
-/* __gl_meshUnion( mesh1, mesh2 ) forms the union of all structures in
- * both meshes, and returns the new mesh (the old meshes are destroyed).
- */
-    static com.sun.opengl.impl.glu.tessellator.GLUmesh __gl_meshUnion(com.sun.opengl.impl.glu.tessellator.GLUmesh mesh1, com.sun.opengl.impl.glu.tessellator.GLUmesh mesh2) {
-        com.sun.opengl.impl.glu.tessellator.GLUface f1 = mesh1.fHead;
-        com.sun.opengl.impl.glu.tessellator.GLUvertex v1 = mesh1.vHead;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e1 = mesh1.eHead;
-        com.sun.opengl.impl.glu.tessellator.GLUface f2 = mesh2.fHead;
-        com.sun.opengl.impl.glu.tessellator.GLUvertex v2 = mesh2.vHead;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e2 = mesh2.eHead;
-
-        /* Add the faces, vertices, and edges of mesh2 to those of mesh1 */
-        if (f2.next != f2) {
-            f1.prev.next = f2.next;
-            f2.next.prev = f1.prev;
-            f2.prev.next = f1;
-            f1.prev = f2.prev;
-        }
-
-        if (v2.next != v2) {
-            v1.prev.next = v2.next;
-            v2.next.prev = v1.prev;
-            v2.prev.next = v1;
-            v1.prev = v2.prev;
-        }
-
-        if (e2.next != e2) {
-            e1.Sym.next.Sym.next = e2.next;
-            e2.next.Sym.next = e1.Sym.next;
-            e2.Sym.next.Sym.next = e1;
-            e1.Sym.next = e2.Sym.next;
-        }
-
-        return mesh1;
-    }
-
-
-/* __gl_meshDeleteMesh( mesh ) will free all storage for any valid mesh.
- */
-    static void __gl_meshDeleteMeshZap(com.sun.opengl.impl.glu.tessellator.GLUmesh mesh) {
-        com.sun.opengl.impl.glu.tessellator.GLUface fHead = mesh.fHead;
-
-        while (fHead.next != fHead) {
-            __gl_meshZapFace(fHead.next);
-        }
-        assert (mesh.vHead.next == mesh.vHead);
-    }
-
-/* __gl_meshDeleteMesh( mesh ) will free all storage for any valid mesh.
- */
-    public static void __gl_meshDeleteMesh(com.sun.opengl.impl.glu.tessellator.GLUmesh mesh) {
-        com.sun.opengl.impl.glu.tessellator.GLUface f, fNext;
-        com.sun.opengl.impl.glu.tessellator.GLUvertex v, vNext;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, eNext;
-
-        for (f = mesh.fHead.next; f != mesh.fHead; f = fNext) {
-            fNext = f.next;
-        }
-
-        for (v = mesh.vHead.next; v != mesh.vHead; v = vNext) {
-            vNext = v.next;
-        }
-
-        for (e = mesh.eHead.next; e != mesh.eHead; e = eNext) {
-            /* One call frees both e and e.Sym (see EdgePair above) */
-            eNext = e.next;
-        }
-    }
-
-/* __gl_meshCheckMesh( mesh ) checks a mesh for self-consistency.
- */
-    public static void __gl_meshCheckMesh(com.sun.opengl.impl.glu.tessellator.GLUmesh mesh) {
-        com.sun.opengl.impl.glu.tessellator.GLUface fHead = mesh.fHead;
-        com.sun.opengl.impl.glu.tessellator.GLUvertex vHead = mesh.vHead;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eHead = mesh.eHead;
-        com.sun.opengl.impl.glu.tessellator.GLUface f, fPrev;
-        com.sun.opengl.impl.glu.tessellator.GLUvertex v, vPrev;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, ePrev;
-
-        fPrev = fHead;
-        for (fPrev = fHead; (f = fPrev.next) != fHead; fPrev = f) {
-            assert (f.prev == fPrev);
-            e = f.anEdge;
-            do {
-                assert (e.Sym != e);
-                assert (e.Sym.Sym == e);
-                assert (e.Lnext.Onext.Sym == e);
-                assert (e.Onext.Sym.Lnext == e);
-                assert (e.Lface == f);
-                e = e.Lnext;
-            } while (e != f.anEdge);
-        }
-        assert (f.prev == fPrev && f.anEdge == null && f.data == null);
-
-        vPrev = vHead;
-        for (vPrev = vHead; (v = vPrev.next) != vHead; vPrev = v) {
-            assert (v.prev == vPrev);
-            e = v.anEdge;
-            do {
-                assert (e.Sym != e);
-                assert (e.Sym.Sym == e);
-                assert (e.Lnext.Onext.Sym == e);
-                assert (e.Onext.Sym.Lnext == e);
-                assert (e.Org == v);
-                e = e.Onext;
-            } while (e != v.anEdge);
-        }
-        assert (v.prev == vPrev && v.anEdge == null && v.data == null);
-
-        ePrev = eHead;
-        for (ePrev = eHead; (e = ePrev.next) != eHead; ePrev = e) {
-            assert (e.Sym.next == ePrev.Sym);
-            assert (e.Sym != e);
-            assert (e.Sym.Sym == e);
-            assert (e.Org != null);
-            assert (e.Sym.Org != null);
-            assert (e.Lnext.Onext.Sym == e);
-            assert (e.Onext.Sym.Lnext == e);
-        }
-        assert (e.Sym.next == ePrev.Sym
-                && e.Sym == mesh.eHeadSym
-                && e.Sym.Sym == e
-                && e.Org == null && e.Sym.Org == null
-                && e.Lface == null && e.Sym.Lface == null);
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Normal.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Normal.java
deleted file mode 100644
index cf6239de1..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Normal.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-
-class Normal {
-    private Normal() {
-    }
-
-    static boolean SLANTED_SWEEP = false;
-    static double S_UNIT_X;	/* Pre-normalized */
-    static double S_UNIT_Y;
-    private static final boolean TRUE_PROJECT = false;
-
-    static {
-        if (SLANTED_SWEEP) {
-/* The "feature merging" is not intended to be complete.  There are
- * special cases where edges are nearly parallel to the sweep line
- * which are not implemented.  The algorithm should still behave
- * robustly (ie. produce a reasonable tesselation) in the presence
- * of such edges, however it may miss features which could have been
- * merged.  We could minimize this effect by choosing the sweep line
- * direction to be something unusual (ie. not parallel to one of the
- * coordinate axes).
- */
-            S_UNIT_X = 0.50941539564955385;	/* Pre-normalized */
-            S_UNIT_Y = 0.86052074622010633;
-        } else {
-            S_UNIT_X = 1.0;
-            S_UNIT_Y = 0.0;
-        }
-    }
-
-    private static double Dot(double[] u, double[] v) {
-        return (u[0] * v[0] + u[1] * v[1] + u[2] * v[2]);
-    }
-
-    static void Normalize(double[] v) {
-        double len = v[0] * v[0] + v[1] * v[1] + v[2] * v[2];
-
-        assert (len > 0);
-        len = Math.sqrt(len);
-        v[0] /= len;
-        v[1] /= len;
-        v[2] /= len;
-    }
-
-    static int LongAxis(double[] v) {
-        int i = 0;
-
-        if (Math.abs(v[1]) > Math.abs(v[0])) {
-            i = 1;
-        }
-        if (Math.abs(v[2]) > Math.abs(v[i])) {
-            i = 2;
-        }
-        return i;
-    }
-
-    static void ComputeNormal(GLUtessellatorImpl tess, double[] norm) {
-        com.sun.opengl.impl.glu.tessellator.GLUvertex v, v1, v2;
-        double c, tLen2, maxLen2;
-        double[] maxVal, minVal, d1, d2, tNorm;
-        com.sun.opengl.impl.glu.tessellator.GLUvertex[] maxVert, minVert;
-        com.sun.opengl.impl.glu.tessellator.GLUvertex vHead = tess.mesh.vHead;
-        int i;
-
-        maxVal = new double[3];
-        minVal = new double[3];
-        minVert = new com.sun.opengl.impl.glu.tessellator.GLUvertex[3];
-        maxVert = new com.sun.opengl.impl.glu.tessellator.GLUvertex[3];
-        d1 = new double[3];
-        d2 = new double[3];
-        tNorm = new double[3];
-
-        maxVal[0] = maxVal[1] = maxVal[2] = -2 * GLU.GLU_TESS_MAX_COORD;
-        minVal[0] = minVal[1] = minVal[2] = 2 * GLU.GLU_TESS_MAX_COORD;
-
-        for (v = vHead.next; v != vHead; v = v.next) {
-            for (i = 0; i < 3; ++i) {
-                c = v.coords[i];
-                if (c < minVal[i]) {
-                    minVal[i] = c;
-                    minVert[i] = v;
-                }
-                if (c > maxVal[i]) {
-                    maxVal[i] = c;
-                    maxVert[i] = v;
-                }
-            }
-        }
-
-/* Find two vertices separated by at least 1/sqrt(3) of the maximum
-         * distance between any two vertices
-         */
-        i = 0;
-        if (maxVal[1] - minVal[1] > maxVal[0] - minVal[0]) {
-            i = 1;
-        }
-        if (maxVal[2] - minVal[2] > maxVal[i] - minVal[i]) {
-            i = 2;
-        }
-        if (minVal[i] >= maxVal[i]) {
-/* All vertices are the same -- normal doesn't matter */
-            norm[0] = 0;
-            norm[1] = 0;
-            norm[2] = 1;
-            return;
-        }
-
-/* Look for a third vertex which forms the triangle with maximum area
-         * (Length of normal == twice the triangle area)
-         */
-        maxLen2 = 0;
-        v1 = minVert[i];
-        v2 = maxVert[i];
-        d1[0] = v1.coords[0] - v2.coords[0];
-        d1[1] = v1.coords[1] - v2.coords[1];
-        d1[2] = v1.coords[2] - v2.coords[2];
-        for (v = vHead.next; v != vHead; v = v.next) {
-            d2[0] = v.coords[0] - v2.coords[0];
-            d2[1] = v.coords[1] - v2.coords[1];
-            d2[2] = v.coords[2] - v2.coords[2];
-            tNorm[0] = d1[1] * d2[2] - d1[2] * d2[1];
-            tNorm[1] = d1[2] * d2[0] - d1[0] * d2[2];
-            tNorm[2] = d1[0] * d2[1] - d1[1] * d2[0];
-            tLen2 = tNorm[0] * tNorm[0] + tNorm[1] * tNorm[1] + tNorm[2] * tNorm[2];
-            if (tLen2 > maxLen2) {
-                maxLen2 = tLen2;
-                norm[0] = tNorm[0];
-                norm[1] = tNorm[1];
-                norm[2] = tNorm[2];
-            }
-        }
-
-        if (maxLen2 <= 0) {
-/* All points lie on a single line -- any decent normal will do */
-            norm[0] = norm[1] = norm[2] = 0;
-            norm[LongAxis(d1)] = 1;
-        }
-    }
-
-    static void CheckOrientation(GLUtessellatorImpl tess) {
-        double area;
-        com.sun.opengl.impl.glu.tessellator.GLUface f, fHead = tess.mesh.fHead;
-        com.sun.opengl.impl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
-
-/* When we compute the normal automatically, we choose the orientation
- * so that the the sum of the signed areas of all contours is non-negative.
- */
-        area = 0;
-        for (f = fHead.next; f != fHead; f = f.next) {
-            e = f.anEdge;
-            if (e.winding <= 0) continue;
-            do {
-                area += (e.Org.s - e.Sym.Org.s) * (e.Org.t + e.Sym.Org.t);
-                e = e.Lnext;
-            } while (e != f.anEdge);
-        }
-        if (area < 0) {
-/* Reverse the orientation by flipping all the t-coordinates */
-            for (v = vHead.next; v != vHead; v = v.next) {
-                v.t = -v.t;
-            }
-            tess.tUnit[0] = -tess.tUnit[0];
-            tess.tUnit[1] = -tess.tUnit[1];
-            tess.tUnit[2] = -tess.tUnit[2];
-        }
-    }
-
-/* Determine the polygon normal and project vertices onto the plane
- * of the polygon.
- */
-    public static void __gl_projectPolygon(GLUtessellatorImpl tess) {
-        com.sun.opengl.impl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead;
-        double w;
-        double[] norm = new double[3];
-        double[] sUnit, tUnit;
-        int i;
-        boolean computedNormal = false;
-
-        norm[0] = tess.normal[0];
-        norm[1] = tess.normal[1];
-        norm[2] = tess.normal[2];
-        if (norm[0] == 0 && norm[1] == 0 && norm[2] == 0) {
-            ComputeNormal(tess, norm);
-            computedNormal = true;
-        }
-        sUnit = tess.sUnit;
-        tUnit = tess.tUnit;
-        i = LongAxis(norm);
-
-        if (TRUE_PROJECT) {
-/* Choose the initial sUnit vector to be approximately perpendicular
- * to the normal.
- */
-            Normalize(norm);
-
-            sUnit[i] = 0;
-            sUnit[(i + 1) % 3] = S_UNIT_X;
-            sUnit[(i + 2) % 3] = S_UNIT_Y;
-
-/* Now make it exactly perpendicular */
-            w = Dot(sUnit, norm);
-            sUnit[0] -= w * norm[0];
-            sUnit[1] -= w * norm[1];
-            sUnit[2] -= w * norm[2];
-            Normalize(sUnit);
-
-/* Choose tUnit so that (sUnit,tUnit,norm) form a right-handed frame */
-            tUnit[0] = norm[1] * sUnit[2] - norm[2] * sUnit[1];
-            tUnit[1] = norm[2] * sUnit[0] - norm[0] * sUnit[2];
-            tUnit[2] = norm[0] * sUnit[1] - norm[1] * sUnit[0];
-            Normalize(tUnit);
-        } else {
-/* Project perpendicular to a coordinate axis -- better numerically */
-            sUnit[i] = 0;
-            sUnit[(i + 1) % 3] = S_UNIT_X;
-            sUnit[(i + 2) % 3] = S_UNIT_Y;
-
-            tUnit[i] = 0;
-            tUnit[(i + 1) % 3] = (norm[i] > 0) ? -S_UNIT_Y : S_UNIT_Y;
-            tUnit[(i + 2) % 3] = (norm[i] > 0) ? S_UNIT_X : -S_UNIT_X;
-        }
-
-/* Project the vertices onto the sweep plane */
-        for (v = vHead.next; v != vHead; v = v.next) {
-            v.s = Dot(v.coords, sUnit);
-            v.t = Dot(v.coords, tUnit);
-        }
-        if (computedNormal) {
-            CheckOrientation(tess);
-        }
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQ.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQ.java
deleted file mode 100644
index 83914c193..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQ.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-abstract class PriorityQ {
-    public static final int INIT_SIZE = 32;
-
-    public static class PQnode {
-        int handle;
-    }
-
-    public static class PQhandleElem {
-        Object key;
-        int node;
-    }
-
-    public static interface Leq {
-        boolean leq(Object key1, Object key2);
-    }
-
-    //    #ifdef FOR_TRITE_TEST_PROGRAM
-//    private static boolean LEQ(PriorityQCommon.Leq leq, Object x,Object y) {
-//        return pq.leq.leq(x,y);
-//    }
-//    #else
-/* Violates modularity, but a little faster */
-//    #include "geom.h"
-    public static boolean LEQ(Leq leq, Object x, Object y) {
-        return com.sun.opengl.impl.glu.tessellator.Geom.VertLeq((com.sun.opengl.impl.glu.tessellator.GLUvertex) x, (com.sun.opengl.impl.glu.tessellator.GLUvertex) y);
-    }
-
-    static PriorityQ pqNewPriorityQ(Leq leq) {
-        return new PriorityQSort(leq);
-    }
-
-    abstract void pqDeletePriorityQ();
-
-    abstract boolean pqInit();
-
-    abstract int pqInsert(Object keyNew);
-
-    abstract Object pqExtractMin();
-
-    abstract void pqDelete(int hCurr);
-
-    abstract Object pqMinimum();
-
-    abstract boolean pqIsEmpty();
-//    #endif
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQHeap.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQHeap.java
deleted file mode 100644
index 7eec10699..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQHeap.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class PriorityQHeap extends com.sun.opengl.impl.glu.tessellator.PriorityQ {
-    com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[] nodes;
-    com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] handles;
-    int size, max;
-    int freeList;
-    boolean initialized;
-    com.sun.opengl.impl.glu.tessellator.PriorityQ.Leq leq;
-
-/* really __gl_pqHeapNewPriorityQ */
-    public PriorityQHeap(com.sun.opengl.impl.glu.tessellator.PriorityQ.Leq leq) {
-        size = 0;
-        max = com.sun.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE;
-        nodes = new com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[com.sun.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE + 1];
-        for (int i = 0; i < nodes.length; i++) {
-            nodes[i] = new PQnode();
-        }
-        handles = new com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[com.sun.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE + 1];
-        for (int i = 0; i < handles.length; i++) {
-            handles[i] = new PQhandleElem();
-        }
-        initialized = false;
-        freeList = 0;
-        this.leq = leq;
-
-        nodes[1].handle = 1;	/* so that Minimum() returns NULL */
-        handles[1].key = null;
-    }
-
-/* really __gl_pqHeapDeletePriorityQ */
-    void pqDeletePriorityQ() {
-        handles = null;
-        nodes = null;
-    }
-
-    void FloatDown(int curr) {
-        com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
-        com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
-        int hCurr, hChild;
-        int child;
-
-        hCurr = n[curr].handle;
-        for (; ;) {
-            child = curr << 1;
-            if (child < size && LEQ(leq, h[n[child + 1].handle].key,
-                    h[n[child].handle].key)) {
-                ++child;
-            }
-
-            assert (child <= max);
-
-            hChild = n[child].handle;
-            if (child > size || LEQ(leq, h[hCurr].key, h[hChild].key)) {
-                n[curr].handle = hCurr;
-                h[hCurr].node = curr;
-                break;
-            }
-            n[curr].handle = hChild;
-            h[hChild].node = curr;
-            curr = child;
-        }
-    }
-
-
-    void FloatUp(int curr) {
-        com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
-        com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
-        int hCurr, hParent;
-        int parent;
-
-        hCurr = n[curr].handle;
-        for (; ;) {
-            parent = curr >> 1;
-            hParent = n[parent].handle;
-            if (parent == 0 || LEQ(leq, h[hParent].key, h[hCurr].key)) {
-                n[curr].handle = hCurr;
-                h[hCurr].node = curr;
-                break;
-            }
-            n[curr].handle = hParent;
-            h[hParent].node = curr;
-            curr = parent;
-        }
-    }
-
-/* really __gl_pqHeapInit */
-    boolean pqInit() {
-        int i;
-
-        /* This method of building a heap is O(n), rather than O(n lg n). */
-
-        for (i = size; i >= 1; --i) {
-            FloatDown(i);
-        }
-        initialized = true;
-
-        return true;
-    }
-
-/* really __gl_pqHeapInsert */
-/* returns LONG_MAX iff out of memory */
-    int pqInsert(Object keyNew) {
-        int curr;
-        int free;
-
-        curr = ++size;
-        if ((curr * 2) > max) {
-            com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[] saveNodes = nodes;
-            com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] saveHandles = handles;
-
-            /* If the heap overflows, double its size. */
-            max <<= 1;
-//            pq->nodes = (PQnode *)memRealloc( pq->nodes, (size_t) ((pq->max + 1) * sizeof( pq->nodes[0] )));
-            PriorityQ.PQnode[] pqNodes = new PriorityQ.PQnode[max + 1];
-            System.arraycopy( nodes, 0, pqNodes, 0, nodes.length );
-            for (int i = nodes.length; i < pqNodes.length; i++) {
-                pqNodes[i] = new PQnode();
-            }
-            nodes = pqNodes;
-            if (nodes == null) {
-                nodes = saveNodes;	/* restore ptr to free upon return */
-                return Integer.MAX_VALUE;
-            }
-
-//            pq->handles = (PQhandleElem *)memRealloc( pq->handles,(size_t)((pq->max + 1) * sizeof( pq->handles[0] )));
-            PriorityQ.PQhandleElem[] pqHandles = new PriorityQ.PQhandleElem[max + 1];
-            System.arraycopy( handles, 0, pqHandles, 0, handles.length );
-            for (int i = handles.length; i < pqHandles.length; i++) {
-                pqHandles[i] = new PQhandleElem();
-            }
-            handles = pqHandles;
-            if (handles == null) {
-                handles = saveHandles; /* restore ptr to free upon return */
-                return Integer.MAX_VALUE;
-            }
-        }
-
-        if (freeList == 0) {
-            free = curr;
-        } else {
-            free = freeList;
-            freeList = handles[free].node;
-        }
-
-        nodes[curr].handle = free;
-        handles[free].node = curr;
-        handles[free].key = keyNew;
-
-        if (initialized) {
-            FloatUp(curr);
-        }
-        assert (free != Integer.MAX_VALUE);
-        return free;
-    }
-
-/* really __gl_pqHeapExtractMin */
-    Object pqExtractMin() {
-        com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
-        com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
-        int hMin = n[1].handle;
-        Object min = h[hMin].key;
-
-        if (size > 0) {
-            n[1].handle = n[size].handle;
-            h[n[1].handle].node = 1;
-
-            h[hMin].key = null;
-            h[hMin].node = freeList;
-            freeList = hMin;
-
-            if (--size > 0) {
-                FloatDown(1);
-            }
-        }
-        return min;
-    }
-
-/* really __gl_pqHeapDelete */
-    void pqDelete(int hCurr) {
-        com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
-        com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
-        int curr;
-
-        assert (hCurr >= 1 && hCurr <= max && h[hCurr].key != null);
-
-        curr = h[hCurr].node;
-        n[curr].handle = n[size].handle;
-        h[n[curr].handle].node = curr;
-
-        if (curr <= --size) {
-            if (curr <= 1 || LEQ(leq, h[n[curr >> 1].handle].key, h[n[curr].handle].key)) {
-                FloatDown(curr);
-            } else {
-                FloatUp(curr);
-            }
-        }
-        h[hCurr].key = null;
-        h[hCurr].node = freeList;
-        freeList = hCurr;
-    }
-
-    Object pqMinimum() {
-        return handles[nodes[1].handle].key;
-    }
-
-    boolean pqIsEmpty() {
-        return size == 0;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQSort.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQSort.java
deleted file mode 100644
index 0b22e55d9..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQSort.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class PriorityQSort extends com.sun.opengl.impl.glu.tessellator.PriorityQ {
-    com.sun.opengl.impl.glu.tessellator.PriorityQHeap heap;
-    Object[] keys;
-
-    // JAVA: 'order' contains indices into the keys array.
-    // This simulates the indirect pointers used in the original C code
-    // (from Frank Suykens, Luciad.com).
-    int[] order;
-    int size, max;
-    boolean initialized;
-    com.sun.opengl.impl.glu.tessellator.PriorityQ.Leq leq;
-
-    public PriorityQSort(com.sun.opengl.impl.glu.tessellator.PriorityQ.Leq leq) {
-        heap = new com.sun.opengl.impl.glu.tessellator.PriorityQHeap(leq);
-
-        keys = new Object[com.sun.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE];
-
-        size = 0;
-        max = com.sun.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE;
-        initialized = false;
-        this.leq = leq;
-    }
-
-/* really __gl_pqSortDeletePriorityQ */
-    void pqDeletePriorityQ() {
-        if (heap != null) heap.pqDeletePriorityQ();
-        order = null;
-        keys = null;
-    }
-
-    private static boolean LT(com.sun.opengl.impl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) {
-        return (!com.sun.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, y, x));
-    }
-
-    private static boolean GT(com.sun.opengl.impl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) {
-        return (!com.sun.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, x, y));
-    }
-
-    private static void Swap(int[] array, int a, int b) {
-        if (true) {
-            int tmp = array[a];
-            array[a] = array[b];
-            array[b] = tmp;
-        } else {
-
-        }
-    }
-
-    private static class Stack {
-        int p, r;
-    }
-
-/* really __gl_pqSortInit */
-    boolean pqInit() {
-        int p, r, i, j;
-        int piv;
-        Stack[] stack = new Stack[50];
-        for (int k = 0; k < stack.length; k++) {
-            stack[k] = new Stack();
-        }
-        int top = 0;
-
-        int seed = 2016473283;
-
-        /* Create an array of indirect pointers to the keys, so that we
-         * the handles we have returned are still valid.
-         */
-        order = new int[size + 1];
-/* the previous line is a patch to compensate for the fact that IBM */
-/* machines return a null on a malloc of zero bytes (unlike SGI),   */
-/* so we have to put in this defense to guard against a memory      */
-/* fault four lines down. from fossum@austin.ibm.com.               */
-        p = 0;
-        r = size - 1;
-        for (piv = 0, i = p; i <= r; ++piv, ++i) {
-            // indirect pointers: keep an index into the keys array, not a direct pointer to its contents
-            order[i] = piv;
-        }
-
-        /* Sort the indirect pointers in descending order,
-         * using randomized Quicksort
-         */
-        stack[top].p = p;
-        stack[top].r = r;
-        ++top;
-        while (--top >= 0) {
-            p = stack[top].p;
-            r = stack[top].r;
-            while (r > p + 10) {
-                seed = Math.abs( seed * 1539415821 + 1 );
-                i = p + seed % (r - p + 1);
-                piv = order[i];
-                order[i] = order[p];
-                order[p] = piv;
-                i = p - 1;
-                j = r + 1;
-                do {
-                    do {
-                        ++i;
-                    } while (GT(leq, keys[order[i]], keys[piv]));
-                    do {
-                        --j;
-                    } while (LT(leq, keys[order[j]], keys[piv]));
-                    Swap(order, i, j);
-                } while (i < j);
-                Swap(order, i, j);	/* Undo last swap */
-                if (i - p < r - j) {
-                    stack[top].p = j + 1;
-                    stack[top].r = r;
-                    ++top;
-                    r = i - 1;
-                } else {
-                    stack[top].p = p;
-                    stack[top].r = i - 1;
-                    ++top;
-                    p = j + 1;
-                }
-            }
-            /* Insertion sort small lists */
-            for (i = p + 1; i <= r; ++i) {
-                piv = order[i];
-                for (j = i; j > p && LT(leq, keys[order[j - 1]], keys[piv]); --j) {
-                    order[j] = order[j - 1];
-                }
-                order[j] = piv;
-            }
-        }
-        max = size;
-        initialized = true;
-        heap.pqInit();	/* always succeeds */
-
-/*        #ifndef NDEBUG
-        p = order;
-        r = p + size - 1;
-        for (i = p; i < r; ++i) {
-            Assertion.doAssert(LEQ(     * * (i + 1), **i ));
-        }
-        #endif*/
-
-        return true;
-    }
-
-/* really __gl_pqSortInsert */
-/* returns LONG_MAX iff out of memory */
-    int pqInsert(Object keyNew) {
-        int curr;
-
-        if (initialized) {
-            return heap.pqInsert(keyNew);
-        }
-        curr = size;
-        if (++size >= max) {
-            Object[] saveKey = keys;
-
-            /* If the heap overflows, double its size. */
-            max <<= 1;
-//            pq->keys = (PQHeapKey *)memRealloc( pq->keys,(size_t)(pq->max * sizeof( pq->keys[0] )));
-            Object[] pqKeys = new Object[max];
-            System.arraycopy( keys, 0, pqKeys, 0, keys.length );
-            keys = pqKeys;
-            if (keys == null) {
-                keys = saveKey;	/* restore ptr to free upon return */
-                return Integer.MAX_VALUE;
-            }
-        }
-        assert curr != Integer.MAX_VALUE;
-        keys[curr] = keyNew;
-
-        /* Negative handles index the sorted array. */
-        return -(curr + 1);
-    }
-
-/* really __gl_pqSortExtractMin */
-    Object pqExtractMin() {
-        Object sortMin, heapMin;
-
-        if (size == 0) {
-            return heap.pqExtractMin();
-        }
-        sortMin = keys[order[size - 1]];
-        if (!heap.pqIsEmpty()) {
-            heapMin = heap.pqMinimum();
-            if (LEQ(leq, heapMin, sortMin)) {
-                return heap.pqExtractMin();
-            }
-        }
-        do {
-            --size;
-        } while (size > 0 && keys[order[size - 1]] == null);
-        return sortMin;
-    }
-
-/* really __gl_pqSortMinimum */
-    Object pqMinimum() {
-        Object sortMin, heapMin;
-
-        if (size == 0) {
-            return heap.pqMinimum();
-        }
-        sortMin = keys[order[size - 1]];
-        if (!heap.pqIsEmpty()) {
-            heapMin = heap.pqMinimum();
-            if (com.sun.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, heapMin, sortMin)) {
-                return heapMin;
-            }
-        }
-        return sortMin;
-    }
-
-/* really __gl_pqSortIsEmpty */
-    boolean pqIsEmpty() {
-        return (size == 0) && heap.pqIsEmpty();
-    }
-
-/* really __gl_pqSortDelete */
-    void pqDelete(int curr) {
-        if (curr >= 0) {
-            heap.pqDelete(curr);
-            return;
-        }
-        curr = -(curr + 1);
-        assert curr < max && keys[curr] != null;
-
-        keys[curr] = null;
-        while (size > 0 && keys[order[size - 1]] == null) {
-            --size;
-        }
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Render.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Render.java
deleted file mode 100644
index a5e0ae84c..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Render.java
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-
-class Render {
-    private static final boolean USE_OPTIMIZED_CODE_PATH = false;
-
-    private Render() {
-    }
-
-    private static final RenderFan renderFan = new RenderFan();
-    private static final RenderStrip renderStrip = new RenderStrip();
-    private static final RenderTriangle renderTriangle = new RenderTriangle();
-
-/* This structure remembers the information we need about a primitive
- * to be able to render it later, once we have determined which
- * primitive is able to use the most triangles.
- */
-    private static class FaceCount {
-        public FaceCount() {
-        }
-
-        public FaceCount(long size, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eStart, renderCallBack render) {
-            this.size = size;
-            this.eStart = eStart;
-            this.render = render;
-        }
-
-        long size;		/* number of triangles used */
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eStart;	/* edge where this primitive starts */
-        renderCallBack render;
-    };
-
-    private static interface renderCallBack {
-        void render(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, long size);
-    }
-
-    /************************ Strips and Fans decomposition ******************/
-
-/* __gl_renderMesh( tess, mesh ) takes a mesh and breaks it into triangle
- * fans, strips, and separate triangles.  A substantial effort is made
- * to use as few rendering primitives as possible (ie. to make the fans
- * and strips as large as possible).
- *
- * The rendering output is provided as callbacks (see the api).
- */
-    public static void __gl_renderMesh(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUmesh mesh) {
-        com.sun.opengl.impl.glu.tessellator.GLUface f;
-
-        /* Make a list of separate triangles so we can render them all at once */
-        tess.lonelyTriList = null;
-
-        for (f = mesh.fHead.next; f != mesh.fHead; f = f.next) {
-            f.marked = false;
-        }
-        for (f = mesh.fHead.next; f != mesh.fHead; f = f.next) {
-
-            /* We examine all faces in an arbitrary order.  Whenever we find
-             * an unprocessed face F, we output a group of faces including F
-             * whose size is maximum.
-             */
-            if (f.inside && !f.marked) {
-                RenderMaximumFaceGroup(tess, f);
-                assert (f.marked);
-            }
-        }
-        if (tess.lonelyTriList != null) {
-            RenderLonelyTriangles(tess, tess.lonelyTriList);
-            tess.lonelyTriList = null;
-        }
-    }
-
-
-    static void RenderMaximumFaceGroup(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUface fOrig) {
-        /* We want to find the largest triangle fan or strip of unmarked faces
-         * which includes the given face fOrig.  There are 3 possible fans
-         * passing through fOrig (one centered at each vertex), and 3 possible
-         * strips (one for each CCW permutation of the vertices).  Our strategy
-         * is to try all of these, and take the primitive which uses the most
-         * triangles (a greedy approach).
-         */
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e = fOrig.anEdge;
-        FaceCount max = new FaceCount();
-        FaceCount newFace = new FaceCount();
-
-        max.size = 1;
-        max.eStart = e;
-        max.render = renderTriangle;
-
-        if (!tess.flagBoundary) {
-            newFace = MaximumFan(e);
-            if (newFace.size > max.size) {
-                max = newFace;
-            }
-            newFace = MaximumFan(e.Lnext);
-            if (newFace.size > max.size) {
-                max = newFace;
-            }
-            newFace = MaximumFan(e.Onext.Sym);
-            if (newFace.size > max.size) {
-                max = newFace;
-            }
-
-            newFace = MaximumStrip(e);
-            if (newFace.size > max.size) {
-                max = newFace;
-            }
-            newFace = MaximumStrip(e.Lnext);
-            if (newFace.size > max.size) {
-                max = newFace;
-            }
-            newFace = MaximumStrip(e.Onext.Sym);
-            if (newFace.size > max.size) {
-                max = newFace;
-            }
-        }
-        max.render.render(tess, max.eStart, max.size);
-    }
-
-
-/* Macros which keep track of faces we have marked temporarily, and allow
- * us to backtrack when necessary.  With triangle fans, this is not
- * really necessary, since the only awkward case is a loop of triangles
- * around a single origin vertex.  However with strips the situation is
- * more complicated, and we need a general tracking method like the
- * one here.
- */
-    private static boolean Marked(com.sun.opengl.impl.glu.tessellator.GLUface f) {
-        return !f.inside || f.marked;
-    }
-
-    private static GLUface AddToTrail(com.sun.opengl.impl.glu.tessellator.GLUface f, com.sun.opengl.impl.glu.tessellator.GLUface t) {
-        f.trail = t;
-        f.marked = true;
-        return f;
-    }
-
-    private static void FreeTrail(com.sun.opengl.impl.glu.tessellator.GLUface t) {
-        if (true) {
-            while (t != null) {
-                t.marked = false;
-                t = t.trail;
-            }
-        } else {
-            /* absorb trailing semicolon */
-        }
-    }
-
-    static FaceCount MaximumFan(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrig) {
-        /* eOrig.Lface is the face we want to render.  We want to find the size
-         * of a maximal fan around eOrig.Org.  To do this we just walk around
-         * the origin vertex as far as possible in both directions.
-         */
-        FaceCount newFace = new FaceCount(0, null, renderFan);
-        com.sun.opengl.impl.glu.tessellator.GLUface trail = null;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
-
-        for (e = eOrig; !Marked(e.Lface); e = e.Onext) {
-            trail = AddToTrail(e.Lface, trail);
-            ++newFace.size;
-        }
-        for (e = eOrig; !Marked(e.Sym.Lface); e = e.Sym.Lnext) {
-            trail = AddToTrail(e.Sym.Lface, trail);
-            ++newFace.size;
-        }
-        newFace.eStart = e;
-        /*LINTED*/
-        FreeTrail(trail);
-        return newFace;
-    }
-
-
-    private static boolean IsEven(long n) {
-        return (n & 0x1L) == 0;
-    }
-
-    static FaceCount MaximumStrip(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrig) {
-        /* Here we are looking for a maximal strip that contains the vertices
-         * eOrig.Org, eOrig.Dst, eOrig.Lnext.Dst (in that order or the
-         * reverse, such that all triangles are oriented CCW).
-         *
-         * Again we walk forward and backward as far as possible.  However for
-         * strips there is a twist: to get CCW orientations, there must be
-         * an *even* number of triangles in the strip on one side of eOrig.
-         * We walk the strip starting on a side with an even number of triangles;
-         * if both side have an odd number, we are forced to shorten one side.
-         */
-        FaceCount newFace = new FaceCount(0, null, renderStrip);
-        long headSize = 0, tailSize = 0;
-        com.sun.opengl.impl.glu.tessellator.GLUface trail = null;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, eTail, eHead;
-
-        for (e = eOrig; !Marked(e.Lface); ++tailSize, e = e.Onext) {
-            trail = AddToTrail(e.Lface, trail);
-            ++tailSize;
-            e = e.Lnext.Sym;
-            if (Marked(e.Lface)) break;
-            trail = AddToTrail(e.Lface, trail);
-        }
-        eTail = e;
-
-        for (e = eOrig; !Marked(e.Sym.Lface); ++headSize, e = e.Sym.Onext.Sym) {
-            trail = AddToTrail(e.Sym.Lface, trail);
-            ++headSize;
-            e = e.Sym.Lnext;
-            if (Marked(e.Sym.Lface)) break;
-            trail = AddToTrail(e.Sym.Lface, trail);
-        }
-        eHead = e;
-
-        newFace.size = tailSize + headSize;
-        if (IsEven(tailSize)) {
-            newFace.eStart = eTail.Sym;
-        } else if (IsEven(headSize)) {
-            newFace.eStart = eHead;
-        } else {
-            /* Both sides have odd length, we must shorten one of them.  In fact,
-             * we must start from eHead to guarantee inclusion of eOrig.Lface.
-             */
-            --newFace.size;
-            newFace.eStart = eHead.Onext;
-        }
-        /*LINTED*/
-        FreeTrail(trail);
-        return newFace;
-    }
-
-    private static class RenderTriangle implements renderCallBack {
-        public void render(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
-            /* Just add the triangle to a triangle list, so we can render all
-             * the separate triangles at once.
-             */
-            assert (size == 1);
-            tess.lonelyTriList = AddToTrail(e.Lface, tess.lonelyTriList);
-        }
-    }
-
-
-    static void RenderLonelyTriangles(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUface f) {
-        /* Now we render all the separate triangles which could not be
-         * grouped into a triangle fan or strip.
-         */
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
-        int newState;
-        int edgeState = -1;	/* force edge state output for first vertex */
-
-        tess.callBeginOrBeginData(GL.GL_TRIANGLES);
-
-        for (; f != null; f = f.trail) {
-            /* Loop once for each edge (there will always be 3 edges) */
-
-            e = f.anEdge;
-            do {
-                if (tess.flagBoundary) {
-                    /* Set the "edge state" to true just before we output the
-                     * first vertex of each edge on the polygon boundary.
-                     */
-                    newState = (!e.Sym.Lface.inside) ? 1 : 0;
-                    if (edgeState != newState) {
-                        edgeState = newState;
-                        tess.callEdgeFlagOrEdgeFlagData( edgeState != 0);
-                    }
-                }
-                tess.callVertexOrVertexData( e.Org.data);
-
-                e = e.Lnext;
-            } while (e != f.anEdge);
-        }
-        tess.callEndOrEndData();
-    }
-
-    private static class RenderFan implements renderCallBack {
-        public void render(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
-            /* Render as many CCW triangles as possible in a fan starting from
-             * edge "e".  The fan *should* contain exactly "size" triangles
-             * (otherwise we've goofed up somewhere).
-             */
-            tess.callBeginOrBeginData( GL.GL_TRIANGLE_FAN);
-            tess.callVertexOrVertexData( e.Org.data);
-            tess.callVertexOrVertexData( e.Sym.Org.data);
-
-            while (!Marked(e.Lface)) {
-                e.Lface.marked = true;
-                --size;
-                e = e.Onext;
-                tess.callVertexOrVertexData( e.Sym.Org.data);
-            }
-
-            assert (size == 0);
-            tess.callEndOrEndData();
-        }
-    }
-
-    private static class RenderStrip implements renderCallBack {
-        public void render(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
-            /* Render as many CCW triangles as possible in a strip starting from
-             * edge "e".  The strip *should* contain exactly "size" triangles
-             * (otherwise we've goofed up somewhere).
-             */
-            tess.callBeginOrBeginData( GL.GL_TRIANGLE_STRIP);
-            tess.callVertexOrVertexData( e.Org.data);
-            tess.callVertexOrVertexData( e.Sym.Org.data);
-
-            while (!Marked(e.Lface)) {
-                e.Lface.marked = true;
-                --size;
-                e = e.Lnext.Sym;
-                tess.callVertexOrVertexData( e.Org.data);
-                if (Marked(e.Lface)) break;
-
-                e.Lface.marked = true;
-                --size;
-                e = e.Onext;
-                tess.callVertexOrVertexData( e.Sym.Org.data);
-            }
-
-            assert (size == 0);
-            tess.callEndOrEndData();
-        }
-    }
-
-    /************************ Boundary contour decomposition ******************/
-
-/* __gl_renderBoundary( tess, mesh ) takes a mesh, and outputs one
- * contour for each face marked "inside".  The rendering output is
- * provided as callbacks (see the api).
- */
-    public static void __gl_renderBoundary(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUmesh mesh) {
-        com.sun.opengl.impl.glu.tessellator.GLUface f;
-        com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
-
-        for (f = mesh.fHead.next; f != mesh.fHead; f = f.next) {
-            if (f.inside) {
-                tess.callBeginOrBeginData( GL.GL_LINE_LOOP);
-                e = f.anEdge;
-                do {
-                    tess.callVertexOrVertexData( e.Org.data);
-                    e = e.Lnext;
-                } while (e != f.anEdge);
-                tess.callEndOrEndData();
-            }
-        }
-    }
-
-
-    /************************ Quick-and-dirty decomposition ******************/
-
-    private static final int SIGN_INCONSISTENT = 2;
-
-    static int ComputeNormal(GLUtessellatorImpl tess, double[] norm, boolean check)
-/*
- * If check==false, we compute the polygon normal and place it in norm[].
- * If check==true, we check that each triangle in the fan from v0 has a
- * consistent orientation with respect to norm[].  If triangles are
- * consistently oriented CCW, return 1; if CW, return -1; if all triangles
- * are degenerate return 0; otherwise (no consistent orientation) return
- * SIGN_INCONSISTENT.
- */ {
-        com.sun.opengl.impl.glu.tessellator.CachedVertex[] v = tess.cache;
-//            CachedVertex vn = v0 + tess.cacheCount;
-        int vn = tess.cacheCount;
-//            CachedVertex vc;
-        int vc;
-        double dot, xc, yc, zc, xp, yp, zp;
-        double[] n = new double[3];
-        int sign = 0;
-
-        /* Find the polygon normal.  It is important to get a reasonable
-         * normal even when the polygon is self-intersecting (eg. a bowtie).
-         * Otherwise, the computed normal could be very tiny, but perpendicular
-         * to the true plane of the polygon due to numerical noise.  Then all
-         * the triangles would appear to be degenerate and we would incorrectly
-         * decompose the polygon as a fan (or simply not render it at all).
-         *
-         * We use a sum-of-triangles normal algorithm rather than the more
-         * efficient sum-of-trapezoids method (used in CheckOrientation()
-         * in normal.c).  This lets us explicitly reverse the signed area
-         * of some triangles to get a reasonable normal in the self-intersecting
-         * case.
-         */
-        if (!check) {
-            norm[0] = norm[1] = norm[2] = 0.0;
-        }
-
-        vc = 1;
-        xc = v[vc].coords[0] - v[0].coords[0];
-        yc = v[vc].coords[1] - v[0].coords[1];
-        zc = v[vc].coords[2] - v[0].coords[2];
-        while (++vc < vn) {
-            xp = xc;
-            yp = yc;
-            zp = zc;
-            xc = v[vc].coords[0] - v[0].coords[0];
-            yc = v[vc].coords[1] - v[0].coords[1];
-            zc = v[vc].coords[2] - v[0].coords[2];
-
-            /* Compute (vp - v0) cross (vc - v0) */
-            n[0] = yp * zc - zp * yc;
-            n[1] = zp * xc - xp * zc;
-            n[2] = xp * yc - yp * xc;
-
-            dot = n[0] * norm[0] + n[1] * norm[1] + n[2] * norm[2];
-            if (!check) {
-                /* Reverse the contribution of back-facing triangles to get
-                 * a reasonable normal for self-intersecting polygons (see above)
-                 */
-                if (dot >= 0) {
-                    norm[0] += n[0];
-                    norm[1] += n[1];
-                    norm[2] += n[2];
-                } else {
-                    norm[0] -= n[0];
-                    norm[1] -= n[1];
-                    norm[2] -= n[2];
-                }
-            } else if (dot != 0) {
-                /* Check the new orientation for consistency with previous triangles */
-                if (dot > 0) {
-                    if (sign < 0) return SIGN_INCONSISTENT;
-                    sign = 1;
-                } else {
-                    if (sign > 0) return SIGN_INCONSISTENT;
-                    sign = -1;
-                }
-            }
-        }
-        return sign;
-    }
-
-/* __gl_renderCache( tess ) takes a single contour and tries to render it
- * as a triangle fan.  This handles convex polygons, as well as some
- * non-convex polygons if we get lucky.
- *
- * Returns true if the polygon was successfully rendered.  The rendering
- * output is provided as callbacks (see the api).
- */
-    public static boolean __gl_renderCache(GLUtessellatorImpl tess) {
-        com.sun.opengl.impl.glu.tessellator.CachedVertex[] v = tess.cache;
-//            CachedVertex vn = v0 + tess.cacheCount;
-        int vn = tess.cacheCount;
-//            CachedVertex vc;
-        int vc;
-        double[] norm = new double[3];
-        int sign;
-
-        if (tess.cacheCount < 3) {
-            /* Degenerate contour -- no output */
-            return true;
-        }
-
-        norm[0] = tess.normal[0];
-        norm[1] = tess.normal[1];
-        norm[2] = tess.normal[2];
-        if (norm[0] == 0 && norm[1] == 0 && norm[2] == 0) {
-            ComputeNormal( tess, norm, false);
-        }
-
-        sign = ComputeNormal( tess, norm, true);
-        if (sign == SIGN_INCONSISTENT) {
-            /* Fan triangles did not have a consistent orientation */
-            return false;
-        }
-        if (sign == 0) {
-            /* All triangles were degenerate */
-            return true;
-        }
-
-        if ( !USE_OPTIMIZED_CODE_PATH ) {
-            return false;
-        } else {
-            /* Make sure we do the right thing for each winding rule */
-            switch (tess.windingRule) {
-                case GLU.GLU_TESS_WINDING_ODD:
-                case GLU.GLU_TESS_WINDING_NONZERO:
-                    break;
-                case GLU.GLU_TESS_WINDING_POSITIVE:
-                    if (sign < 0) return true;
-                    break;
-                case GLU.GLU_TESS_WINDING_NEGATIVE:
-                    if (sign > 0) return true;
-                    break;
-                case GLU.GLU_TESS_WINDING_ABS_GEQ_TWO:
-                    return true;
-            }
-
-            tess.callBeginOrBeginData( tess.boundaryOnly ? GL.GL_LINE_LOOP
-                    : (tess.cacheCount > 3) ? GL.GL_TRIANGLE_FAN
-                    : GL.GL_TRIANGLES);
-
-            tess.callVertexOrVertexData( v[0].data);
-            if (sign > 0) {
-                for (vc = 1; vc < vn; ++vc) {
-                    tess.callVertexOrVertexData( v[vc].data);
-                }
-            } else {
-                for (vc = vn - 1; vc > 0; --vc) {
-                    tess.callVertexOrVertexData( v[vc].data);
-                }
-            }
-            tess.callEndOrEndData();
-            return true;
-        }
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Sweep.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Sweep.java
deleted file mode 100644
index 140cdcf93..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Sweep.java
+++ /dev/null
@@ -1,1353 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-
-class Sweep {
-    private Sweep() {
-    }
-
-//    #ifdef FOR_TRITE_TEST_PROGRAM
-//    extern void DebugEvent( GLUtessellator *tess );
-//    #else
-    private static void DebugEvent(GLUtessellatorImpl tess) {
-
-    }
-//    #endif
-
-/*
- * Invariants for the Edge Dictionary.
- * - each pair of adjacent edges e2=Succ(e1) satisfies EdgeLeq(e1,e2)
- *   at any valid location of the sweep event
- * - if EdgeLeq(e2,e1) as well (at any valid sweep event), then e1 and e2
- *   share a common endpoint
- * - for each e, e.Dst has been processed, but not e.Org
- * - each edge e satisfies VertLeq(e.Dst,event) && VertLeq(event,e.Org)
- *   where "event" is the current sweep line event.
- * - no edge e has zero length
- *
- * Invariants for the Mesh (the processed portion).
- * - the portion of the mesh left of the sweep line is a planar graph,
- *   ie. there is *some* way to embed it in the plane
- * - no processed edge has zero length
- * - no two processed vertices have identical coordinates
- * - each "inside" region is monotone, ie. can be broken into two chains
- *   of monotonically increasing vertices according to VertLeq(v1,v2)
- *   - a non-invariant: these chains may intersect (very slightly)
- *
- * Invariants for the Sweep.
- * - if none of the edges incident to the event vertex have an activeRegion
- *   (ie. none of these edges are in the edge dictionary), then the vertex
- *   has only right-going edges.
- * - if an edge is marked "fixUpperEdge" (it is a temporary edge introduced
- *   by ConnectRightVertex), then it is the only right-going edge from
- *   its associated vertex.  (This says that these edges exist only
- *   when it is necessary.)
- */
-
-/* When we merge two edges into one, we need to compute the combined
- * winding of the new edge.
- */
-    private static void AddWinding(GLUhalfEdge eDst, GLUhalfEdge eSrc) {
-        eDst.winding += eSrc.winding;
-        eDst.Sym.winding += eSrc.Sym.winding;
-    }
-
-
-    private static ActiveRegion RegionBelow(ActiveRegion r) {
-        return ((ActiveRegion) Dict.dictKey(Dict.dictPred(r.nodeUp)));
-    }
-
-    private static ActiveRegion RegionAbove(ActiveRegion r) {
-        return ((ActiveRegion) Dict.dictKey(Dict.dictSucc(r.nodeUp)));
-    }
-
-    static boolean EdgeLeq(GLUtessellatorImpl tess, ActiveRegion reg1, ActiveRegion reg2)
-/*
- * Both edges must be directed from right to left (this is the canonical
- * direction for the upper edge of each region).
- *
- * The strategy is to evaluate a "t" value for each edge at the
- * current sweep line position, given by tess.event.  The calculations
- * are designed to be very stable, but of course they are not perfect.
- *
- * Special case: if both edge destinations are at the sweep event,
- * we sort the edges by slope (they would otherwise compare equally).
- */ {
-        GLUvertex event = tess.event;
-        GLUhalfEdge e1, e2;
-        double t1, t2;
-
-        e1 = reg1.eUp;
-        e2 = reg2.eUp;
-
-        if (e1.Sym.Org == event) {
-            if (e2.Sym.Org == event) {
-                /* Two edges right of the sweep line which meet at the sweep event.
-                 * Sort them by slope.
-                 */
-                if (Geom.VertLeq(e1.Org, e2.Org)) {
-                    return Geom.EdgeSign(e2.Sym.Org, e1.Org, e2.Org) <= 0;
-                }
-                return Geom.EdgeSign(e1.Sym.Org, e2.Org, e1.Org) >= 0;
-            }
-            return Geom.EdgeSign(e2.Sym.Org, event, e2.Org) <= 0;
-        }
-        if (e2.Sym.Org == event) {
-            return Geom.EdgeSign(e1.Sym.Org, event, e1.Org) >= 0;
-        }
-
-        /* General case - compute signed distance *from* e1, e2 to event */
-        t1 = Geom.EdgeEval(e1.Sym.Org, event, e1.Org);
-        t2 = Geom.EdgeEval(e2.Sym.Org, event, e2.Org);
-        return (t1 >= t2);
-    }
-
-
-    static void DeleteRegion(GLUtessellatorImpl tess, ActiveRegion reg) {
-        if (reg.fixUpperEdge) {
-            /* It was created with zero winding number, so it better be
-             * deleted with zero winding number (ie. it better not get merged
-             * with a real edge).
-             */
-            assert (reg.eUp.winding == 0);
-        }
-        reg.eUp.activeRegion = null;
-        Dict.dictDelete(tess.dict, reg.nodeUp); /* __gl_dictListDelete */
-    }
-
-
-    static boolean FixUpperEdge(ActiveRegion reg, GLUhalfEdge newEdge)
-/*
- * Replace an upper edge which needs fixing (see ConnectRightVertex).
- */ {
-        assert (reg.fixUpperEdge);
-        if (!Mesh.__gl_meshDelete(reg.eUp)) return false;
-        reg.fixUpperEdge = false;
-        reg.eUp = newEdge;
-        newEdge.activeRegion = reg;
-
-        return true;
-    }
-
-    static ActiveRegion TopLeftRegion(ActiveRegion reg) {
-        GLUvertex org = reg.eUp.Org;
-        GLUhalfEdge e;
-
-        /* Find the region above the uppermost edge with the same origin */
-        do {
-            reg = RegionAbove(reg);
-        } while (reg.eUp.Org == org);
-
-        /* If the edge above was a temporary edge introduced by ConnectRightVertex,
-         * now is the time to fix it.
-         */
-        if (reg.fixUpperEdge) {
-            e = Mesh.__gl_meshConnect(RegionBelow(reg).eUp.Sym, reg.eUp.Lnext);
-            if (e == null) return null;
-            if (!FixUpperEdge(reg, e)) return null;
-            reg = RegionAbove(reg);
-        }
-        return reg;
-    }
-
-    static ActiveRegion TopRightRegion(ActiveRegion reg) {
-        GLUvertex dst = reg.eUp.Sym.Org;
-
-        /* Find the region above the uppermost edge with the same destination */
-        do {
-            reg = RegionAbove(reg);
-        } while (reg.eUp.Sym.Org == dst);
-        return reg;
-    }
-
-    static ActiveRegion AddRegionBelow(GLUtessellatorImpl tess,
-                                       ActiveRegion regAbove,
-                                       GLUhalfEdge eNewUp)
-/*
- * Add a new active region to the sweep line, *somewhere* below "regAbove"
- * (according to where the new edge belongs in the sweep-line dictionary).
- * The upper edge of the new region will be "eNewUp".
- * Winding number and "inside" flag are not updated.
- */ {
-        ActiveRegion regNew = new ActiveRegion();
-        if (regNew == null) throw new RuntimeException();
-
-        regNew.eUp = eNewUp;
-        /* __gl_dictListInsertBefore */
-        regNew.nodeUp = Dict.dictInsertBefore(tess.dict, regAbove.nodeUp, regNew);
-        if (regNew.nodeUp == null) throw new RuntimeException();
-        regNew.fixUpperEdge = false;
-        regNew.sentinel = false;
-        regNew.dirty = false;
-
-        eNewUp.activeRegion = regNew;
-        return regNew;
-    }
-
-    static boolean IsWindingInside(GLUtessellatorImpl tess, int n) {
-        switch (tess.windingRule) {
-            case GLU.GLU_TESS_WINDING_ODD:
-                return (n & 1) != 0;
-            case GLU.GLU_TESS_WINDING_NONZERO:
-                return (n != 0);
-            case GLU.GLU_TESS_WINDING_POSITIVE:
-                return (n > 0);
-            case GLU.GLU_TESS_WINDING_NEGATIVE:
-                return (n < 0);
-            case GLU.GLU_TESS_WINDING_ABS_GEQ_TWO:
-                return (n >= 2) || (n <= -2);
-        }
-        /*LINTED*/
-//        assert (false);
-        throw new InternalError();
-        /*NOTREACHED*/
-    }
-
-
-    static void ComputeWinding(GLUtessellatorImpl tess, ActiveRegion reg) {
-        reg.windingNumber = RegionAbove(reg).windingNumber + reg.eUp.winding;
-        reg.inside = IsWindingInside(tess, reg.windingNumber);
-    }
-
-
-    static void FinishRegion(GLUtessellatorImpl tess, ActiveRegion reg)
-/*
- * Delete a region from the sweep line.  This happens when the upper
- * and lower chains of a region meet (at a vertex on the sweep line).
- * The "inside" flag is copied to the appropriate mesh face (we could
- * not do this before -- since the structure of the mesh is always
- * changing, this face may not have even existed until now).
- */ {
-        GLUhalfEdge e = reg.eUp;
-        GLUface f = e.Lface;
-
-        f.inside = reg.inside;
-        f.anEdge = e;   /* optimization for __gl_meshTessellateMonoRegion() */
-        DeleteRegion(tess, reg);
-    }
-
-
-    static GLUhalfEdge FinishLeftRegions(GLUtessellatorImpl tess,
-                                         ActiveRegion regFirst, ActiveRegion regLast)
-/*
- * We are given a vertex with one or more left-going edges.  All affected
- * edges should be in the edge dictionary.  Starting at regFirst.eUp,
- * we walk down deleting all regions where both edges have the same
- * origin vOrg.  At the same time we copy the "inside" flag from the
- * active region to the face, since at this point each face will belong
- * to at most one region (this was not necessarily true until this point
- * in the sweep).  The walk stops at the region above regLast; if regLast
- * is null we walk as far as possible.  At the same time we relink the
- * mesh if necessary, so that the ordering of edges around vOrg is the
- * same as in the dictionary.
- */ {
-        ActiveRegion reg, regPrev;
-        GLUhalfEdge e, ePrev;
-
-        regPrev = regFirst;
-        ePrev = regFirst.eUp;
-        while (regPrev != regLast) {
-            regPrev.fixUpperEdge = false;	/* placement was OK */
-            reg = RegionBelow(regPrev);
-            e = reg.eUp;
-            if (e.Org != ePrev.Org) {
-                if (!reg.fixUpperEdge) {
-                    /* Remove the last left-going edge.  Even though there are no further
-                     * edges in the dictionary with this origin, there may be further
-                     * such edges in the mesh (if we are adding left edges to a vertex
-                     * that has already been processed).  Thus it is important to call
-                     * FinishRegion rather than just DeleteRegion.
-                     */
-                    FinishRegion(tess, regPrev);
-                    break;
-                }
-                /* If the edge below was a temporary edge introduced by
-                 * ConnectRightVertex, now is the time to fix it.
-                 */
-                e = Mesh.__gl_meshConnect(ePrev.Onext.Sym, e.Sym);
-                if (e == null) throw new RuntimeException();
-                if (!FixUpperEdge(reg, e)) throw new RuntimeException();
-            }
-
-            /* Relink edges so that ePrev.Onext == e */
-            if (ePrev.Onext != e) {
-                if (!Mesh.__gl_meshSplice(e.Sym.Lnext, e)) throw new RuntimeException();
-                if (!Mesh.__gl_meshSplice(ePrev, e)) throw new RuntimeException();
-            }
-            FinishRegion(tess, regPrev);	/* may change reg.eUp */
-            ePrev = reg.eUp;
-            regPrev = reg;
-        }
-        return ePrev;
-    }
-
-
-    static void AddRightEdges(GLUtessellatorImpl tess, ActiveRegion regUp,
-                              GLUhalfEdge eFirst, GLUhalfEdge eLast, GLUhalfEdge eTopLeft,
-                              boolean cleanUp)
-/*
- * Purpose: insert right-going edges into the edge dictionary, and update
- * winding numbers and mesh connectivity appropriately.  All right-going
- * edges share a common origin vOrg.  Edges are inserted CCW starting at
- * eFirst; the last edge inserted is eLast.Sym.Lnext.  If vOrg has any
- * left-going edges already processed, then eTopLeft must be the edge
- * such that an imaginary upward vertical segment from vOrg would be
- * contained between eTopLeft.Sym.Lnext and eTopLeft; otherwise eTopLeft
- * should be null.
- */ {
-        ActiveRegion reg, regPrev;
-        GLUhalfEdge e, ePrev;
-        boolean firstTime = true;
-
-        /* Insert the new right-going edges in the dictionary */
-        e = eFirst;
-        do {
-            assert (Geom.VertLeq(e.Org, e.Sym.Org));
-            AddRegionBelow(tess, regUp, e.Sym);
-            e = e.Onext;
-        } while (e != eLast);
-
-        /* Walk *all* right-going edges from e.Org, in the dictionary order,
-         * updating the winding numbers of each region, and re-linking the mesh
-         * edges to match the dictionary ordering (if necessary).
-         */
-        if (eTopLeft == null) {
-            eTopLeft = RegionBelow(regUp).eUp.Sym.Onext;
-        }
-        regPrev = regUp;
-        ePrev = eTopLeft;
-        for (; ;) {
-            reg = RegionBelow(regPrev);
-            e = reg.eUp.Sym;
-            if (e.Org != ePrev.Org) break;
-
-            if (e.Onext != ePrev) {
-                /* Unlink e from its current position, and relink below ePrev */
-                if (!Mesh.__gl_meshSplice(e.Sym.Lnext, e)) throw new RuntimeException();
-                if (!Mesh.__gl_meshSplice(ePrev.Sym.Lnext, e)) throw new RuntimeException();
-            }
-            /* Compute the winding number and "inside" flag for the new regions */
-            reg.windingNumber = regPrev.windingNumber - e.winding;
-            reg.inside = IsWindingInside(tess, reg.windingNumber);
-
-            /* Check for two outgoing edges with same slope -- process these
-             * before any intersection tests (see example in __gl_computeInterior).
-             */
-            regPrev.dirty = true;
-            if (!firstTime && CheckForRightSplice(tess, regPrev)) {
-                AddWinding(e, ePrev);
-                DeleteRegion(tess, regPrev);
-                if (!Mesh.__gl_meshDelete(ePrev)) throw new RuntimeException();
-            }
-            firstTime = false;
-            regPrev = reg;
-            ePrev = e;
-        }
-        regPrev.dirty = true;
-        assert (regPrev.windingNumber - e.winding == reg.windingNumber);
-
-        if (cleanUp) {
-            /* Check for intersections between newly adjacent edges. */
-            WalkDirtyRegions(tess, regPrev);
-        }
-    }
-
-
-    static void CallCombine(GLUtessellatorImpl tess, GLUvertex isect,
-                            Object[] data, float[] weights, boolean needed) {
-        double[] coords = new double[3];
-
-        /* Copy coord data in case the callback changes it. */
-        coords[0] = isect.coords[0];
-        coords[1] = isect.coords[1];
-        coords[2] = isect.coords[2];
-
-        Object[] outData = new Object[1];
-        tess.callCombineOrCombineData(coords, data, weights, outData);
-        isect.data = outData[0];
-        if (isect.data == null) {
-            if (!needed) {
-                isect.data = data[0];
-            } else if (!tess.fatalError) {
-                /* The only way fatal error is when two edges are found to intersect,
-                 * but the user has not provided the callback necessary to handle
-                 * generated intersection points.
-                 */
-                tess.callErrorOrErrorData(GLU.GLU_TESS_NEED_COMBINE_CALLBACK);
-                tess.fatalError = true;
-            }
-        }
-    }
-
-    static void SpliceMergeVertices(GLUtessellatorImpl tess, GLUhalfEdge e1,
-                                    GLUhalfEdge e2)
-/*
- * Two vertices with idential coordinates are combined into one.
- * e1.Org is kept, while e2.Org is discarded.
- */ {
-        Object[] data = new Object[4];
-        float[] weights = new float[]{0.5f, 0.5f, 0.0f, 0.0f};
-
-        data[0] = e1.Org.data;
-        data[1] = e2.Org.data;
-        CallCombine(tess, e1.Org, data, weights, false);
-        if (!Mesh.__gl_meshSplice(e1, e2)) throw new RuntimeException();
-    }
-
-    static void VertexWeights(GLUvertex isect, GLUvertex org, GLUvertex dst,
-                              float[] weights)
-/*
- * Find some weights which describe how the intersection vertex is
- * a linear combination of "org" and "dest".  Each of the two edges
- * which generated "isect" is allocated 50% of the weight; each edge
- * splits the weight between its org and dst according to the
- * relative distance to "isect".
- */ {
-        double t1 = Geom.VertL1dist(org, isect);
-        double t2 = Geom.VertL1dist(dst, isect);
-
-        weights[0] = (float) (0.5 * t2 / (t1 + t2));
-        weights[1] = (float) (0.5 * t1 / (t1 + t2));
-        isect.coords[0] += weights[0] * org.coords[0] + weights[1] * dst.coords[0];
-        isect.coords[1] += weights[0] * org.coords[1] + weights[1] * dst.coords[1];
-        isect.coords[2] += weights[0] * org.coords[2] + weights[1] * dst.coords[2];
-    }
-
-
-    static void GetIntersectData(GLUtessellatorImpl tess, GLUvertex isect,
-                                 GLUvertex orgUp, GLUvertex dstUp,
-                                 GLUvertex orgLo, GLUvertex dstLo)
-/*
- * We've computed a new intersection point, now we need a "data" pointer
- * from the user so that we can refer to this new vertex in the
- * rendering callbacks.
- */ {
-        Object[] data = new Object[4];
-        float[] weights = new float[4];
-        float[] weights1 = new float[2];
-        float[] weights2 = new float[2];
-
-        data[0] = orgUp.data;
-        data[1] = dstUp.data;
-        data[2] = orgLo.data;
-        data[3] = dstLo.data;
-
-        isect.coords[0] = isect.coords[1] = isect.coords[2] = 0;
-        VertexWeights(isect, orgUp, dstUp, weights1);
-        VertexWeights(isect, orgLo, dstLo, weights2);
-        System.arraycopy(weights1, 0, weights, 0, 2);
-        System.arraycopy(weights2, 0, weights, 2, 2);
-
-        CallCombine(tess, isect, data, weights, true);
-    }
-
-    static boolean CheckForRightSplice(GLUtessellatorImpl tess, ActiveRegion regUp)
-/*
- * Check the upper and lower edge of "regUp", to make sure that the
- * eUp.Org is above eLo, or eLo.Org is below eUp (depending on which
- * origin is leftmost).
- *
- * The main purpose is to splice right-going edges with the same
- * dest vertex and nearly identical slopes (ie. we can't distinguish
- * the slopes numerically).  However the splicing can also help us
- * to recover from numerical errors.  For example, suppose at one
- * point we checked eUp and eLo, and decided that eUp.Org is barely
- * above eLo.  Then later, we split eLo into two edges (eg. from
- * a splice operation like this one).  This can change the result of
- * our test so that now eUp.Org is incident to eLo, or barely below it.
- * We must correct this condition to maintain the dictionary invariants.
- *
- * One possibility is to check these edges for intersection again
- * (ie. CheckForIntersect).  This is what we do if possible.  However
- * CheckForIntersect requires that tess.event lies between eUp and eLo,
- * so that it has something to fall back on when the intersection
- * calculation gives us an unusable answer.  So, for those cases where
- * we can't check for intersection, this routine fixes the problem
- * by just splicing the offending vertex into the other edge.
- * This is a guaranteed solution, no matter how degenerate things get.
- * Basically this is a combinatorial solution to a numerical problem.
- */ {
-        ActiveRegion regLo = RegionBelow(regUp);
-        GLUhalfEdge eUp = regUp.eUp;
-        GLUhalfEdge eLo = regLo.eUp;
-
-        if (Geom.VertLeq(eUp.Org, eLo.Org)) {
-            if (Geom.EdgeSign(eLo.Sym.Org, eUp.Org, eLo.Org) > 0) return false;
-
-            /* eUp.Org appears to be below eLo */
-            if (!Geom.VertEq(eUp.Org, eLo.Org)) {
-                /* Splice eUp.Org into eLo */
-                if (Mesh.__gl_meshSplitEdge(eLo.Sym) == null) throw new RuntimeException();
-                if (!Mesh.__gl_meshSplice(eUp, eLo.Sym.Lnext)) throw new RuntimeException();
-                regUp.dirty = regLo.dirty = true;
-
-            } else if (eUp.Org != eLo.Org) {
-                /* merge the two vertices, discarding eUp.Org */
-                tess.pq.pqDelete(eUp.Org.pqHandle); /* __gl_pqSortDelete */
-                SpliceMergeVertices(tess, eLo.Sym.Lnext, eUp);
-            }
-        } else {
-            if (Geom.EdgeSign(eUp.Sym.Org, eLo.Org, eUp.Org) < 0) return false;
-
-            /* eLo.Org appears to be above eUp, so splice eLo.Org into eUp */
-            RegionAbove(regUp).dirty = regUp.dirty = true;
-            if (Mesh.__gl_meshSplitEdge(eUp.Sym) == null) throw new RuntimeException();
-            if (!Mesh.__gl_meshSplice(eLo.Sym.Lnext, eUp)) throw new RuntimeException();
-        }
-        return true;
-    }
-
-    static boolean CheckForLeftSplice(GLUtessellatorImpl tess, ActiveRegion regUp)
-/*
- * Check the upper and lower edge of "regUp", to make sure that the
- * eUp.Sym.Org is above eLo, or eLo.Sym.Org is below eUp (depending on which
- * destination is rightmost).
- *
- * Theoretically, this should always be true.  However, splitting an edge
- * into two pieces can change the results of previous tests.  For example,
- * suppose at one point we checked eUp and eLo, and decided that eUp.Sym.Org
- * is barely above eLo.  Then later, we split eLo into two edges (eg. from
- * a splice operation like this one).  This can change the result of
- * the test so that now eUp.Sym.Org is incident to eLo, or barely below it.
- * We must correct this condition to maintain the dictionary invariants
- * (otherwise new edges might get inserted in the wrong place in the
- * dictionary, and bad stuff will happen).
- *
- * We fix the problem by just splicing the offending vertex into the
- * other edge.
- */ {
-        ActiveRegion regLo = RegionBelow(regUp);
-        GLUhalfEdge eUp = regUp.eUp;
-        GLUhalfEdge eLo = regLo.eUp;
-        GLUhalfEdge e;
-
-        assert (!Geom.VertEq(eUp.Sym.Org, eLo.Sym.Org));
-
-        if (Geom.VertLeq(eUp.Sym.Org, eLo.Sym.Org)) {
-            if (Geom.EdgeSign(eUp.Sym.Org, eLo.Sym.Org, eUp.Org) < 0) return false;
-
-            /* eLo.Sym.Org is above eUp, so splice eLo.Sym.Org into eUp */
-            RegionAbove(regUp).dirty = regUp.dirty = true;
-            e = Mesh.__gl_meshSplitEdge(eUp);
-            if (e == null) throw new RuntimeException();
-            if (!Mesh.__gl_meshSplice(eLo.Sym, e)) throw new RuntimeException();
-            e.Lface.inside = regUp.inside;
-        } else {
-            if (Geom.EdgeSign(eLo.Sym.Org, eUp.Sym.Org, eLo.Org) > 0) return false;
-
-            /* eUp.Sym.Org is below eLo, so splice eUp.Sym.Org into eLo */
-            regUp.dirty = regLo.dirty = true;
-            e = Mesh.__gl_meshSplitEdge(eLo);
-            if (e == null) throw new RuntimeException();
-            if (!Mesh.__gl_meshSplice(eUp.Lnext, eLo.Sym)) throw new RuntimeException();
-            e.Sym.Lface.inside = regUp.inside;
-        }
-        return true;
-    }
-
-
-    static boolean CheckForIntersect(GLUtessellatorImpl tess, ActiveRegion regUp)
-/*
- * Check the upper and lower edges of the given region to see if
- * they intersect.  If so, create the intersection and add it
- * to the data structures.
- *
- * Returns true if adding the new intersection resulted in a recursive
- * call to AddRightEdges(); in this case all "dirty" regions have been
- * checked for intersections, and possibly regUp has been deleted.
- */ {
-        ActiveRegion regLo = RegionBelow(regUp);
-        GLUhalfEdge eUp = regUp.eUp;
-        GLUhalfEdge eLo = regLo.eUp;
-        GLUvertex orgUp = eUp.Org;
-        GLUvertex orgLo = eLo.Org;
-        GLUvertex dstUp = eUp.Sym.Org;
-        GLUvertex dstLo = eLo.Sym.Org;
-        double tMinUp, tMaxLo;
-        GLUvertex isect = new GLUvertex();
-        GLUvertex orgMin;
-        GLUhalfEdge e;
-
-        assert (!Geom.VertEq(dstLo, dstUp));
-        assert (Geom.EdgeSign(dstUp, tess.event, orgUp) <= 0);
-        assert (Geom.EdgeSign(dstLo, tess.event, orgLo) >= 0);
-        assert (orgUp != tess.event && orgLo != tess.event);
-        assert (!regUp.fixUpperEdge && !regLo.fixUpperEdge);
-
-        if (orgUp == orgLo) return false;	/* right endpoints are the same */
-
-        tMinUp = Math.min(orgUp.t, dstUp.t);
-        tMaxLo = Math.max(orgLo.t, dstLo.t);
-        if (tMinUp > tMaxLo) return false;	/* t ranges do not overlap */
-
-        if (Geom.VertLeq(orgUp, orgLo)) {
-            if (Geom.EdgeSign(dstLo, orgUp, orgLo) > 0) return false;
-        } else {
-            if (Geom.EdgeSign(dstUp, orgLo, orgUp) < 0) return false;
-        }
-
-        /* At this point the edges intersect, at least marginally */
-        DebugEvent(tess);
-
-        Geom.EdgeIntersect(dstUp, orgUp, dstLo, orgLo, isect);
-        /* The following properties are guaranteed: */
-        assert (Math.min(orgUp.t, dstUp.t) <= isect.t);
-        assert (isect.t <= Math.max(orgLo.t, dstLo.t));
-        assert (Math.min(dstLo.s, dstUp.s) <= isect.s);
-        assert (isect.s <= Math.max(orgLo.s, orgUp.s));
-
-        if (Geom.VertLeq(isect, tess.event)) {
-            /* The intersection point lies slightly to the left of the sweep line,
-             * so move it until it''s slightly to the right of the sweep line.
-             * (If we had perfect numerical precision, this would never happen
-             * in the first place).  The easiest and safest thing to do is
-             * replace the intersection by tess.event.
-             */
-            isect.s = tess.event.s;
-            isect.t = tess.event.t;
-        }
-        /* Similarly, if the computed intersection lies to the right of the
-         * rightmost origin (which should rarely happen), it can cause
-         * unbelievable inefficiency on sufficiently degenerate inputs.
-         * (If you have the test program, try running test54.d with the
-         * "X zoom" option turned on).
-         */
-        orgMin = Geom.VertLeq(orgUp, orgLo) ? orgUp : orgLo;
-        if (Geom.VertLeq(orgMin, isect)) {
-            isect.s = orgMin.s;
-            isect.t = orgMin.t;
-        }
-
-        if (Geom.VertEq(isect, orgUp) || Geom.VertEq(isect, orgLo)) {
-            /* Easy case -- intersection at one of the right endpoints */
-            CheckForRightSplice(tess, regUp);
-            return false;
-        }
-
-        if ((!Geom.VertEq(dstUp, tess.event)
-                && Geom.EdgeSign(dstUp, tess.event, isect) >= 0)
-                || (!Geom.VertEq(dstLo, tess.event)
-                && Geom.EdgeSign(dstLo, tess.event, isect) <= 0)) {
-            /* Very unusual -- the new upper or lower edge would pass on the
-             * wrong side of the sweep event, or through it.  This can happen
-             * due to very small numerical errors in the intersection calculation.
-             */
-            if (dstLo == tess.event) {
-                /* Splice dstLo into eUp, and process the new region(s) */
-                if (Mesh.__gl_meshSplitEdge(eUp.Sym) == null) throw new RuntimeException();
-                if (!Mesh.__gl_meshSplice(eLo.Sym, eUp)) throw new RuntimeException();
-                regUp = TopLeftRegion(regUp);
-                if (regUp == null) throw new RuntimeException();
-                eUp = RegionBelow(regUp).eUp;
-                FinishLeftRegions(tess, RegionBelow(regUp), regLo);
-                AddRightEdges(tess, regUp, eUp.Sym.Lnext, eUp, eUp, true);
-                return true;
-            }
-            if (dstUp == tess.event) {
-                /* Splice dstUp into eLo, and process the new region(s) */
-                if (Mesh.__gl_meshSplitEdge(eLo.Sym) == null) throw new RuntimeException();
-                if (!Mesh.__gl_meshSplice(eUp.Lnext, eLo.Sym.Lnext)) throw new RuntimeException();
-                regLo = regUp;
-                regUp = TopRightRegion(regUp);
-                e = RegionBelow(regUp).eUp.Sym.Onext;
-                regLo.eUp = eLo.Sym.Lnext;
-                eLo = FinishLeftRegions(tess, regLo, null);
-                AddRightEdges(tess, regUp, eLo.Onext, eUp.Sym.Onext, e, true);
-                return true;
-            }
-            /* Special case: called from ConnectRightVertex.  If either
-             * edge passes on the wrong side of tess.event, split it
-             * (and wait for ConnectRightVertex to splice it appropriately).
-             */
-            if (Geom.EdgeSign(dstUp, tess.event, isect) >= 0) {
-                RegionAbove(regUp).dirty = regUp.dirty = true;
-                if (Mesh.__gl_meshSplitEdge(eUp.Sym) == null) throw new RuntimeException();
-                eUp.Org.s = tess.event.s;
-                eUp.Org.t = tess.event.t;
-            }
-            if (Geom.EdgeSign(dstLo, tess.event, isect) <= 0) {
-                regUp.dirty = regLo.dirty = true;
-                if (Mesh.__gl_meshSplitEdge(eLo.Sym) == null) throw new RuntimeException();
-                eLo.Org.s = tess.event.s;
-                eLo.Org.t = tess.event.t;
-            }
-            /* leave the rest for ConnectRightVertex */
-            return false;
-        }
-
-        /* General case -- split both edges, splice into new vertex.
-         * When we do the splice operation, the order of the arguments is
-         * arbitrary as far as correctness goes.  However, when the operation
-         * creates a new face, the work done is proportional to the size of
-         * the new face.  We expect the faces in the processed part of
-         * the mesh (ie. eUp.Lface) to be smaller than the faces in the
-         * unprocessed original contours (which will be eLo.Sym.Lnext.Lface).
-         */
-        if (Mesh.__gl_meshSplitEdge(eUp.Sym) == null) throw new RuntimeException();
-        if (Mesh.__gl_meshSplitEdge(eLo.Sym) == null) throw new RuntimeException();
-        if (!Mesh.__gl_meshSplice(eLo.Sym.Lnext, eUp)) throw new RuntimeException();
-        eUp.Org.s = isect.s;
-        eUp.Org.t = isect.t;
-        eUp.Org.pqHandle = tess.pq.pqInsert(eUp.Org); /* __gl_pqSortInsert */
-        if (eUp.Org.pqHandle == Long.MAX_VALUE) {
-            tess.pq.pqDeletePriorityQ();	/* __gl_pqSortDeletePriorityQ */
-            tess.pq = null;
-            throw new RuntimeException();
-        }
-        GetIntersectData(tess, eUp.Org, orgUp, dstUp, orgLo, dstLo);
-        RegionAbove(regUp).dirty = regUp.dirty = regLo.dirty = true;
-        return false;
-    }
-
-    static void WalkDirtyRegions(GLUtessellatorImpl tess, ActiveRegion regUp)
-/*
- * When the upper or lower edge of any region changes, the region is
- * marked "dirty".  This routine walks through all the dirty regions
- * and makes sure that the dictionary invariants are satisfied
- * (see the comments at the beginning of this file).  Of course
- * new dirty regions can be created as we make changes to restore
- * the invariants.
- */ {
-        ActiveRegion regLo = RegionBelow(regUp);
-        GLUhalfEdge eUp, eLo;
-
-        for (; ;) {
-            /* Find the lowest dirty region (we walk from the bottom up). */
-            while (regLo.dirty) {
-                regUp = regLo;
-                regLo = RegionBelow(regLo);
-            }
-            if (!regUp.dirty) {
-                regLo = regUp;
-                regUp = RegionAbove(regUp);
-                if (regUp == null || !regUp.dirty) {
-                    /* We've walked all the dirty regions */
-                    return;
-                }
-            }
-            regUp.dirty = false;
-            eUp = regUp.eUp;
-            eLo = regLo.eUp;
-
-            if (eUp.Sym.Org != eLo.Sym.Org) {
-                /* Check that the edge ordering is obeyed at the Dst vertices. */
-                if (CheckForLeftSplice(tess, regUp)) {
-
-                    /* If the upper or lower edge was marked fixUpperEdge, then
-                     * we no longer need it (since these edges are needed only for
-                     * vertices which otherwise have no right-going edges).
-                     */
-                    if (regLo.fixUpperEdge) {
-                        DeleteRegion(tess, regLo);
-                        if (!Mesh.__gl_meshDelete(eLo)) throw new RuntimeException();
-                        regLo = RegionBelow(regUp);
-                        eLo = regLo.eUp;
-                    } else if (regUp.fixUpperEdge) {
-                        DeleteRegion(tess, regUp);
-                        if (!Mesh.__gl_meshDelete(eUp)) throw new RuntimeException();
-                        regUp = RegionAbove(regLo);
-                        eUp = regUp.eUp;
-                    }
-                }
-            }
-            if (eUp.Org != eLo.Org) {
-                if (eUp.Sym.Org != eLo.Sym.Org
-                        && !regUp.fixUpperEdge && !regLo.fixUpperEdge
-                        && (eUp.Sym.Org == tess.event || eLo.Sym.Org == tess.event)) {
-                    /* When all else fails in CheckForIntersect(), it uses tess.event
-                     * as the intersection location.  To make this possible, it requires
-                     * that tess.event lie between the upper and lower edges, and also
-                     * that neither of these is marked fixUpperEdge (since in the worst
-                     * case it might splice one of these edges into tess.event, and
-                     * violate the invariant that fixable edges are the only right-going
-                     * edge from their associated vertex).
-                         */
-                    if (CheckForIntersect(tess, regUp)) {
-                        /* WalkDirtyRegions() was called recursively; we're done */
-                        return;
-                    }
-                } else {
-                    /* Even though we can't use CheckForIntersect(), the Org vertices
-                     * may violate the dictionary edge ordering.  Check and correct this.
-                     */
-                    CheckForRightSplice(tess, regUp);
-                }
-            }
-            if (eUp.Org == eLo.Org && eUp.Sym.Org == eLo.Sym.Org) {
-                /* A degenerate loop consisting of only two edges -- delete it. */
-                AddWinding(eLo, eUp);
-                DeleteRegion(tess, regUp);
-                if (!Mesh.__gl_meshDelete(eUp)) throw new RuntimeException();
-                regUp = RegionAbove(regLo);
-            }
-        }
-    }
-
-
-    static void ConnectRightVertex(GLUtessellatorImpl tess, ActiveRegion regUp,
-                                   GLUhalfEdge eBottomLeft)
-/*
- * Purpose: connect a "right" vertex vEvent (one where all edges go left)
- * to the unprocessed portion of the mesh.  Since there are no right-going
- * edges, two regions (one above vEvent and one below) are being merged
- * into one.  "regUp" is the upper of these two regions.
- *
- * There are two reasons for doing this (adding a right-going edge):
- *  - if the two regions being merged are "inside", we must add an edge
- *    to keep them separated (the combined region would not be monotone).
- *  - in any case, we must leave some record of vEvent in the dictionary,
- *    so that we can merge vEvent with features that we have not seen yet.
- *    For example, maybe there is a vertical edge which passes just to
- *    the right of vEvent; we would like to splice vEvent into this edge.
- *
- * However, we don't want to connect vEvent to just any vertex.  We don''t
- * want the new edge to cross any other edges; otherwise we will create
- * intersection vertices even when the input data had no self-intersections.
- * (This is a bad thing; if the user's input data has no intersections,
- * we don't want to generate any false intersections ourselves.)
- *
- * Our eventual goal is to connect vEvent to the leftmost unprocessed
- * vertex of the combined region (the union of regUp and regLo).
- * But because of unseen vertices with all right-going edges, and also
- * new vertices which may be created by edge intersections, we don''t
- * know where that leftmost unprocessed vertex is.  In the meantime, we
- * connect vEvent to the closest vertex of either chain, and mark the region
- * as "fixUpperEdge".  This flag says to delete and reconnect this edge
- * to the next processed vertex on the boundary of the combined region.
- * Quite possibly the vertex we connected to will turn out to be the
- * closest one, in which case we won''t need to make any changes.
- */ {
-        GLUhalfEdge eNew;
-        GLUhalfEdge eTopLeft = eBottomLeft.Onext;
-        ActiveRegion regLo = RegionBelow(regUp);
-        GLUhalfEdge eUp = regUp.eUp;
-        GLUhalfEdge eLo = regLo.eUp;
-        boolean degenerate = false;
-
-        if (eUp.Sym.Org != eLo.Sym.Org) {
-            CheckForIntersect(tess, regUp);
-        }
-
-        /* Possible new degeneracies: upper or lower edge of regUp may pass
-         * through vEvent, or may coincide with new intersection vertex
-         */
-        if (Geom.VertEq(eUp.Org, tess.event)) {
-            if (!Mesh.__gl_meshSplice(eTopLeft.Sym.Lnext, eUp)) throw new RuntimeException();
-            regUp = TopLeftRegion(regUp);
-            if (regUp == null) throw new RuntimeException();
-            eTopLeft = RegionBelow(regUp).eUp;
-            FinishLeftRegions(tess, RegionBelow(regUp), regLo);
-            degenerate = true;
-        }
-        if (Geom.VertEq(eLo.Org, tess.event)) {
-            if (!Mesh.__gl_meshSplice(eBottomLeft, eLo.Sym.Lnext)) throw new RuntimeException();
-            eBottomLeft = FinishLeftRegions(tess, regLo, null);
-            degenerate = true;
-        }
-        if (degenerate) {
-            AddRightEdges(tess, regUp, eBottomLeft.Onext, eTopLeft, eTopLeft, true);
-            return;
-        }
-
-        /* Non-degenerate situation -- need to add a temporary, fixable edge.
-         * Connect to the closer of eLo.Org, eUp.Org.
-         */
-        if (Geom.VertLeq(eLo.Org, eUp.Org)) {
-            eNew = eLo.Sym.Lnext;
-        } else {
-            eNew = eUp;
-        }
-        eNew = Mesh.__gl_meshConnect(eBottomLeft.Onext.Sym, eNew);
-        if (eNew == null) throw new RuntimeException();
-
-        /* Prevent cleanup, otherwise eNew might disappear before we've even
-         * had a chance to mark it as a temporary edge.
-         */
-        AddRightEdges(tess, regUp, eNew, eNew.Onext, eNew.Onext, false);
-        eNew.Sym.activeRegion.fixUpperEdge = true;
-        WalkDirtyRegions(tess, regUp);
-    }
-
-/* Because vertices at exactly the same location are merged together
- * before we process the sweep event, some degenerate cases can't occur.
- * However if someone eventually makes the modifications required to
- * merge features which are close together, the cases below marked
- * TOLERANCE_NONZERO will be useful.  They were debugged before the
- * code to merge identical vertices in the main loop was added.
- */
-    private static final boolean TOLERANCE_NONZERO = false;
-
-    static void ConnectLeftDegenerate(GLUtessellatorImpl tess,
-                                      ActiveRegion regUp, GLUvertex vEvent)
-/*
- * The event vertex lies exacty on an already-processed edge or vertex.
- * Adding the new vertex involves splicing it into the already-processed
- * part of the mesh.
- */ {
-        GLUhalfEdge e, eTopLeft, eTopRight, eLast;
-        ActiveRegion reg;
-
-        e = regUp.eUp;
-        if (Geom.VertEq(e.Org, vEvent)) {
-            /* e.Org is an unprocessed vertex - just combine them, and wait
-             * for e.Org to be pulled from the queue
-             */
-            assert (TOLERANCE_NONZERO);
-            SpliceMergeVertices(tess, e, vEvent.anEdge);
-            return;
-        }
-
-        if (!Geom.VertEq(e.Sym.Org, vEvent)) {
-            /* General case -- splice vEvent into edge e which passes through it */
-            if (Mesh.__gl_meshSplitEdge(e.Sym) == null) throw new RuntimeException();
-            if (regUp.fixUpperEdge) {
-                /* This edge was fixable -- delete unused portion of original edge */
-                if (!Mesh.__gl_meshDelete(e.Onext)) throw new RuntimeException();
-                regUp.fixUpperEdge = false;
-            }
-            if (!Mesh.__gl_meshSplice(vEvent.anEdge, e)) throw new RuntimeException();
-            SweepEvent(tess, vEvent);	/* recurse */
-            return;
-        }
-
-        /* vEvent coincides with e.Sym.Org, which has already been processed.
-         * Splice in the additional right-going edges.
-         */
-        assert (TOLERANCE_NONZERO);
-        regUp = TopRightRegion(regUp);
-        reg = RegionBelow(regUp);
-        eTopRight = reg.eUp.Sym;
-        eTopLeft = eLast = eTopRight.Onext;
-        if (reg.fixUpperEdge) {
-            /* Here e.Sym.Org has only a single fixable edge going right.
-             * We can delete it since now we have some real right-going edges.
-             */
-            assert (eTopLeft != eTopRight);   /* there are some left edges too */
-            DeleteRegion(tess, reg);
-            if (!Mesh.__gl_meshDelete(eTopRight)) throw new RuntimeException();
-            eTopRight = eTopLeft.Sym.Lnext;
-        }
-        if (!Mesh.__gl_meshSplice(vEvent.anEdge, eTopRight)) throw new RuntimeException();
-        if (!Geom.EdgeGoesLeft(eTopLeft)) {
-            /* e.Sym.Org had no left-going edges -- indicate this to AddRightEdges() */
-            eTopLeft = null;
-        }
-        AddRightEdges(tess, regUp, eTopRight.Onext, eLast, eTopLeft, true);
-    }
-
-
-    static void ConnectLeftVertex(GLUtessellatorImpl tess, GLUvertex vEvent)
-/*
- * Purpose: connect a "left" vertex (one where both edges go right)
- * to the processed portion of the mesh.  Let R be the active region
- * containing vEvent, and let U and L be the upper and lower edge
- * chains of R.  There are two possibilities:
- *
- * - the normal case: split R into two regions, by connecting vEvent to
- *   the rightmost vertex of U or L lying to the left of the sweep line
- *
- * - the degenerate case: if vEvent is close enough to U or L, we
- *   merge vEvent into that edge chain.  The subcases are:
- *	- merging with the rightmost vertex of U or L
- *	- merging with the active edge of U or L
- *	- merging with an already-processed portion of U or L
- */ {
-        ActiveRegion regUp, regLo, reg;
-        GLUhalfEdge eUp, eLo, eNew;
-        ActiveRegion tmp = new ActiveRegion();
-
-        /* assert ( vEvent.anEdge.Onext.Onext == vEvent.anEdge ); */
-
-        /* Get a pointer to the active region containing vEvent */
-        tmp.eUp = vEvent.anEdge.Sym;
-        /* __GL_DICTLISTKEY */ /* __gl_dictListSearch */
-        regUp = (ActiveRegion) Dict.dictKey(Dict.dictSearch(tess.dict, tmp));
-        regLo = RegionBelow(regUp);
-        eUp = regUp.eUp;
-        eLo = regLo.eUp;
-
-        /* Try merging with U or L first */
-        if (Geom.EdgeSign(eUp.Sym.Org, vEvent, eUp.Org) == 0) {
-            ConnectLeftDegenerate(tess, regUp, vEvent);
-            return;
-        }
-
-        /* Connect vEvent to rightmost processed vertex of either chain.
-         * e.Sym.Org is the vertex that we will connect to vEvent.
-         */
-        reg = Geom.VertLeq(eLo.Sym.Org, eUp.Sym.Org) ? regUp : regLo;
-
-        if (regUp.inside || reg.fixUpperEdge) {
-            if (reg == regUp) {
-                eNew = Mesh.__gl_meshConnect(vEvent.anEdge.Sym, eUp.Lnext);
-                if (eNew == null) throw new RuntimeException();
-            } else {
-                GLUhalfEdge tempHalfEdge = Mesh.__gl_meshConnect(eLo.Sym.Onext.Sym, vEvent.anEdge);
-                if (tempHalfEdge == null) throw new RuntimeException();
-
-                eNew = tempHalfEdge.Sym;
-            }
-            if (reg.fixUpperEdge) {
-                if (!FixUpperEdge(reg, eNew)) throw new RuntimeException();
-            } else {
-                ComputeWinding(tess, AddRegionBelow(tess, regUp, eNew));
-            }
-            SweepEvent(tess, vEvent);
-        } else {
-            /* The new vertex is in a region which does not belong to the polygon.
-             * We don''t need to connect this vertex to the rest of the mesh.
-             */
-            AddRightEdges(tess, regUp, vEvent.anEdge, vEvent.anEdge, null, true);
-        }
-    }
-
-
-    static void SweepEvent(GLUtessellatorImpl tess, GLUvertex vEvent)
-/*
- * Does everything necessary when the sweep line crosses a vertex.
- * Updates the mesh and the edge dictionary.
- */ {
-        ActiveRegion regUp, reg;
-        GLUhalfEdge e, eTopLeft, eBottomLeft;
-
-        tess.event = vEvent;		/* for access in EdgeLeq() */
-        DebugEvent(tess);
-
-        /* Check if this vertex is the right endpoint of an edge that is
-         * already in the dictionary.  In this case we don't need to waste
-         * time searching for the location to insert new edges.
-         */
-        e = vEvent.anEdge;
-        while (e.activeRegion == null) {
-            e = e.Onext;
-            if (e == vEvent.anEdge) {
-                /* All edges go right -- not incident to any processed edges */
-                ConnectLeftVertex(tess, vEvent);
-                return;
-            }
-        }
-
-        /* Processing consists of two phases: first we "finish" all the
-         * active regions where both the upper and lower edges terminate
-         * at vEvent (ie. vEvent is closing off these regions).
-         * We mark these faces "inside" or "outside" the polygon according
-         * to their winding number, and delete the edges from the dictionary.
-         * This takes care of all the left-going edges from vEvent.
-         */
-        regUp = TopLeftRegion(e.activeRegion);
-        if (regUp == null) throw new RuntimeException();
-        reg = RegionBelow(regUp);
-        eTopLeft = reg.eUp;
-        eBottomLeft = FinishLeftRegions(tess, reg, null);
-
-        /* Next we process all the right-going edges from vEvent.  This
-         * involves adding the edges to the dictionary, and creating the
-         * associated "active regions" which record information about the
-         * regions between adjacent dictionary edges.
-         */
-        if (eBottomLeft.Onext == eTopLeft) {
-            /* No right-going edges -- add a temporary "fixable" edge */
-            ConnectRightVertex(tess, regUp, eBottomLeft);
-        } else {
-            AddRightEdges(tess, regUp, eBottomLeft.Onext, eTopLeft, eTopLeft, true);
-        }
-    }
-
-
-/* Make the sentinel coordinates big enough that they will never be
- * merged with real input features.  (Even with the largest possible
- * input contour and the maximum tolerance of 1.0, no merging will be
- * done with coordinates larger than 3 * GLU_TESS_MAX_COORD).
- */
-    private static final double SENTINEL_COORD = (4.0 * GLU.GLU_TESS_MAX_COORD);
-
-    static void AddSentinel(GLUtessellatorImpl tess, double t)
-/*
- * We add two sentinel edges above and below all other edges,
- * to avoid special cases at the top and bottom.
- */ {
-        GLUhalfEdge e;
-        ActiveRegion reg = new ActiveRegion();
-        if (reg == null) throw new RuntimeException();
-
-        e = Mesh.__gl_meshMakeEdge(tess.mesh);
-        if (e == null) throw new RuntimeException();
-
-        e.Org.s = SENTINEL_COORD;
-        e.Org.t = t;
-        e.Sym.Org.s = -SENTINEL_COORD;
-        e.Sym.Org.t = t;
-        tess.event = e.Sym.Org;		/* initialize it */
-
-        reg.eUp = e;
-        reg.windingNumber = 0;
-        reg.inside = false;
-        reg.fixUpperEdge = false;
-        reg.sentinel = true;
-        reg.dirty = false;
-        reg.nodeUp = Dict.dictInsert(tess.dict, reg); /* __gl_dictListInsertBefore */
-        if (reg.nodeUp == null) throw new RuntimeException();
-    }
-
-
-    static void InitEdgeDict(final GLUtessellatorImpl tess)
-/*
- * We maintain an ordering of edge intersections with the sweep line.
- * This order is maintained in a dynamic dictionary.
- */ {
-        /* __gl_dictListNewDict */
-        tess.dict = Dict.dictNewDict(tess, new Dict.DictLeq() {
-            public boolean leq(Object frame, Object key1, Object key2) {
-                return EdgeLeq(tess, (ActiveRegion) key1, (ActiveRegion) key2);
-            }
-        });
-        if (tess.dict == null) throw new RuntimeException();
-
-        AddSentinel(tess, -SENTINEL_COORD);
-        AddSentinel(tess, SENTINEL_COORD);
-    }
-
-
-    static void DoneEdgeDict(GLUtessellatorImpl tess) {
-        ActiveRegion reg;
-        int fixedEdges = 0;
-
-        /* __GL_DICTLISTKEY */ /* __GL_DICTLISTMIN */
-        while ((reg = (ActiveRegion) Dict.dictKey(Dict.dictMin(tess.dict))) != null) {
-            /*
-             * At the end of all processing, the dictionary should contain
-             * only the two sentinel edges, plus at most one "fixable" edge
-             * created by ConnectRightVertex().
-             */
-            if (!reg.sentinel) {
-                assert (reg.fixUpperEdge);
-                assert (++fixedEdges == 1);
-            }
-            assert (reg.windingNumber == 0);
-            DeleteRegion(tess, reg);
-/*    __gl_meshDelete( reg.eUp );*/
-        }
-        Dict.dictDeleteDict(tess.dict);	/* __gl_dictListDeleteDict */
-    }
-
-
-    static void RemoveDegenerateEdges(GLUtessellatorImpl tess)
-/*
- * Remove zero-length edges, and contours with fewer than 3 vertices.
- */ {
-        GLUhalfEdge e, eNext, eLnext;
-        GLUhalfEdge eHead = tess.mesh.eHead;
-
-        /*LINTED*/
-        for (e = eHead.next; e != eHead; e = eNext) {
-            eNext = e.next;
-            eLnext = e.Lnext;
-
-            if (Geom.VertEq(e.Org, e.Sym.Org) && e.Lnext.Lnext != e) {
-                /* Zero-length edge, contour has at least 3 edges */
-
-                SpliceMergeVertices(tess, eLnext, e);	/* deletes e.Org */
-                if (!Mesh.__gl_meshDelete(e)) throw new RuntimeException(); /* e is a self-loop */
-                e = eLnext;
-                eLnext = e.Lnext;
-            }
-            if (eLnext.Lnext == e) {
-                /* Degenerate contour (one or two edges) */
-
-                if (eLnext != e) {
-                    if (eLnext == eNext || eLnext == eNext.Sym) {
-                        eNext = eNext.next;
-                    }
-                    if (!Mesh.__gl_meshDelete(eLnext)) throw new RuntimeException();
-                }
-                if (e == eNext || e == eNext.Sym) {
-                    eNext = eNext.next;
-                }
-                if (!Mesh.__gl_meshDelete(e)) throw new RuntimeException();
-            }
-        }
-    }
-
-    static boolean InitPriorityQ(GLUtessellatorImpl tess)
-/*
- * Insert all vertices into the priority queue which determines the
- * order in which vertices cross the sweep line.
- */ {
-        PriorityQ pq;
-        GLUvertex v, vHead;
-
-        /* __gl_pqSortNewPriorityQ */
-        pq = tess.pq = PriorityQ.pqNewPriorityQ(new PriorityQ.Leq() {
-            public boolean leq(Object key1, Object key2) {
-                return Geom.VertLeq(((GLUvertex) key1), (GLUvertex) key2);
-            }
-        });
-        if (pq == null) return false;
-
-        vHead = tess.mesh.vHead;
-        for (v = vHead.next; v != vHead; v = v.next) {
-            v.pqHandle = pq.pqInsert(v); /* __gl_pqSortInsert */
-            if (v.pqHandle == Long.MAX_VALUE) break;
-        }
-        if (v != vHead || !pq.pqInit()) { /* __gl_pqSortInit */
-            tess.pq.pqDeletePriorityQ();	/* __gl_pqSortDeletePriorityQ */
-            tess.pq = null;
-            return false;
-        }
-
-        return true;
-    }
-
-
-    static void DonePriorityQ(GLUtessellatorImpl tess) {
-        tess.pq.pqDeletePriorityQ(); /* __gl_pqSortDeletePriorityQ */
-    }
-
-
-    static boolean RemoveDegenerateFaces(GLUmesh mesh)
-/*
- * Delete any degenerate faces with only two edges.  WalkDirtyRegions()
- * will catch almost all of these, but it won't catch degenerate faces
- * produced by splice operations on already-processed edges.
- * The two places this can happen are in FinishLeftRegions(), when
- * we splice in a "temporary" edge produced by ConnectRightVertex(),
- * and in CheckForLeftSplice(), where we splice already-processed
- * edges to ensure that our dictionary invariants are not violated
- * by numerical errors.
- *
- * In both these cases it is *very* dangerous to delete the offending
- * edge at the time, since one of the routines further up the stack
- * will sometimes be keeping a pointer to that edge.
- */ {
-        GLUface f, fNext;
-        GLUhalfEdge e;
-
-        /*LINTED*/
-        for (f = mesh.fHead.next; f != mesh.fHead; f = fNext) {
-            fNext = f.next;
-            e = f.anEdge;
-            assert (e.Lnext != e);
-
-            if (e.Lnext.Lnext == e) {
-                /* A face with only two edges */
-                AddWinding(e.Onext, e);
-                if (!Mesh.__gl_meshDelete(e)) return false;
-            }
-        }
-        return true;
-    }
-
-    public static boolean __gl_computeInterior(GLUtessellatorImpl tess)
-/*
- * __gl_computeInterior( tess ) computes the planar arrangement specified
- * by the given contours, and further subdivides this arrangement
- * into regions.  Each region is marked "inside" if it belongs
- * to the polygon, according to the rule given by tess.windingRule.
- * Each interior region is guaranteed be monotone.
- */ {
-        GLUvertex v, vNext;
-
-        tess.fatalError = false;
-
-        /* Each vertex defines an event for our sweep line.  Start by inserting
-         * all the vertices in a priority queue.  Events are processed in
-         * lexicographic order, ie.
-         *
-         *	e1 < e2  iff  e1.x < e2.x || (e1.x == e2.x && e1.y < e2.y)
-         */
-        RemoveDegenerateEdges(tess);
-        if (!InitPriorityQ(tess)) return false; /* if error */
-        InitEdgeDict(tess);
-
-        /* __gl_pqSortExtractMin */
-        while ((v = (GLUvertex) tess.pq.pqExtractMin()) != null) {
-            for (; ;) {
-                vNext = (GLUvertex) tess.pq.pqMinimum(); /* __gl_pqSortMinimum */
-                if (vNext == null || !Geom.VertEq(vNext, v)) break;
-
-                /* Merge together all vertices at exactly the same location.
-                 * This is more efficient than processing them one at a time,
-                 * simplifies the code (see ConnectLeftDegenerate), and is also
-                 * important for correct handling of certain degenerate cases.
-                 * For example, suppose there are two identical edges A and B
-                 * that belong to different contours (so without this code they would
-                 * be processed by separate sweep events).  Suppose another edge C
-                 * crosses A and B from above.  When A is processed, we split it
-                 * at its intersection point with C.  However this also splits C,
-                 * so when we insert B we may compute a slightly different
-                 * intersection point.  This might leave two edges with a small
-                 * gap between them.  This kind of error is especially obvious
-                 * when using boundary extraction (GLU_TESS_BOUNDARY_ONLY).
-                 */
-                vNext = (GLUvertex) tess.pq.pqExtractMin(); /* __gl_pqSortExtractMin*/
-                SpliceMergeVertices(tess, v.anEdge, vNext.anEdge);
-            }
-            SweepEvent(tess, v);
-        }
-
-        /* Set tess.event for debugging purposes */
-        /* __GL_DICTLISTKEY */ /* __GL_DICTLISTMIN */
-        tess.event = ((ActiveRegion) Dict.dictKey(Dict.dictMin(tess.dict))).eUp.Org;
-        DebugEvent(tess);
-        DoneEdgeDict(tess);
-        DonePriorityQ(tess);
-
-        if (!RemoveDegenerateFaces(tess.mesh)) return false;
-        Mesh.__gl_meshCheckMesh(tess.mesh);
-
-        return true;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessMono.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessMono.java
deleted file mode 100644
index f4c9545a9..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessMono.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class TessMono {
-/* __gl_meshTessellateMonoRegion( face ) tessellates a monotone region
- * (what else would it do??)  The region must consist of a single
- * loop of half-edges (see mesh.h) oriented CCW.  "Monotone" in this
- * case means that any vertical line intersects the interior of the
- * region in a single interval.
- *
- * Tessellation consists of adding interior edges (actually pairs of
- * half-edges), to split the region into non-overlapping triangles.
- *
- * The basic idea is explained in Preparata and Shamos (which I don''t
- * have handy right now), although their implementation is more
- * complicated than this one.  The are two edge chains, an upper chain
- * and a lower chain.  We process all vertices from both chains in order,
- * from right to left.
- *
- * The algorithm ensures that the following invariant holds after each
- * vertex is processed: the untessellated region consists of two
- * chains, where one chain (say the upper) is a single edge, and
- * the other chain is concave.  The left vertex of the single edge
- * is always to the left of all vertices in the concave chain.
- *
- * Each step consists of adding the rightmost unprocessed vertex to one
- * of the two chains, and forming a fan of triangles from the rightmost
- * of two chain endpoints.  Determining whether we can add each triangle
- * to the fan is a simple orientation test.  By making the fan as large
- * as possible, we restore the invariant (check it yourself).
- */
-    static boolean __gl_meshTessellateMonoRegion(GLUface face, boolean avoidDegenerateTris) {
-        GLUhalfEdge up, lo;
-
-        /* All edges are oriented CCW around the boundary of the region.
-         * First, find the half-edge whose origin vertex is rightmost.
-         * Since the sweep goes from left to right, face->anEdge should
-         * be close to the edge we want.
-         */
-        up = face.anEdge;
-        assert (up.Lnext != up && up.Lnext.Lnext != up);
-
-        for (; Geom.VertLeq(up.Sym.Org, up.Org); up = up.Onext.Sym)
-            ;
-        for (; Geom.VertLeq(up.Org, up.Sym.Org); up = up.Lnext)
-            ;
-        lo = up.Onext.Sym;
-
-        boolean mustConnect = false; // hack for avoidDegenerateTris
-
-        while (up.Lnext != lo) {
-            if (avoidDegenerateTris && !mustConnect) {
-                // Skip over regions where several vertices are collinear,
-                // to try to avoid producing degenerate (zero-area) triangles
-                //
-                // The "mustConnect" flag is a hack to try to avoid
-                // skipping too large regions and causing incorrect
-                // triangulations. This entire modification is overall
-                // not robust and needs more work
-                if (Geom.EdgeCos(lo.Lnext.Org, lo.Org, lo.Lnext.Lnext.Org) <= -Geom.ONE_MINUS_EPSILON) {
-                    // Lines around lo
-                    do {
-                        lo = lo.Onext.Sym;
-                        mustConnect = true;
-                    } while (up.Lnext != lo &&
-                             Geom.EdgeCos(lo.Lnext.Org, lo.Org, lo.Lnext.Lnext.Org) <= -Geom.ONE_MINUS_EPSILON);
-                } else if (Geom.EdgeCos(up.Onext.Sym.Org, up.Org, up.Onext.Sym.Onext.Sym.Org) <= -Geom.ONE_MINUS_EPSILON) {
-                    // Lines around up
-                    do {
-                        up = up.Lnext;
-                        mustConnect = true;
-                    } while (up.Lnext != lo &&
-                             Geom.EdgeCos(up.Onext.Sym.Org, up.Org, up.Onext.Sym.Onext.Sym.Org) <= -Geom.ONE_MINUS_EPSILON);
-                }
-
-                if (up.Lnext == lo)
-                    break;
-            }
-
-            if (Geom.VertLeq(up.Sym.Org, lo.Org)) {
-                /* up.Sym.Org is on the left.  It is safe to form triangles from lo.Org.
-                 * The EdgeGoesLeft test guarantees progress even when some triangles
-                 * are CW, given that the upper and lower chains are truly monotone.
-                 */
-                while (lo.Lnext != up && (Geom.EdgeGoesLeft(lo.Lnext)
-                        || Geom.EdgeSign(lo.Org, lo.Sym.Org, lo.Lnext.Sym.Org) <= 0)) {
-                    GLUhalfEdge tempHalfEdge = Mesh.__gl_meshConnect(lo.Lnext, lo);
-                    mustConnect = false;
-                    if (tempHalfEdge == null) return false;
-                    lo = tempHalfEdge.Sym;
-                }
-                lo = lo.Onext.Sym;
-            } else {
-                /* lo.Org is on the left.  We can make CCW triangles from up.Sym.Org. */
-                while (lo.Lnext != up && (Geom.EdgeGoesRight(up.Onext.Sym)
-                        || Geom.EdgeSign(up.Sym.Org, up.Org, up.Onext.Sym.Org) >= 0)) {
-                    GLUhalfEdge tempHalfEdge = Mesh.__gl_meshConnect(up, up.Onext.Sym);
-                    mustConnect = false;
-                    if (tempHalfEdge == null) return false;
-                    up = tempHalfEdge.Sym;
-                }
-                up = up.Lnext;
-            }
-        }
-
-        /* Now lo.Org == up.Sym.Org == the leftmost vertex.  The remaining region
-         * can be tessellated in a fan from this leftmost vertex.
-         */
-        assert (lo.Lnext != up);
-        while (lo.Lnext.Lnext != up) {
-            GLUhalfEdge tempHalfEdge = Mesh.__gl_meshConnect(lo.Lnext, lo);
-            if (tempHalfEdge == null) return false;
-            lo = tempHalfEdge.Sym;
-        }
-
-        return true;
-    }
-
-
-/* __gl_meshTessellateInterior( mesh ) tessellates each region of
- * the mesh which is marked "inside" the polygon.  Each such region
- * must be monotone.
- */
-    public static boolean __gl_meshTessellateInterior(GLUmesh mesh, boolean avoidDegenerateTris) {
-        GLUface f, next;
-
-        /*LINTED*/
-        for (f = mesh.fHead.next; f != mesh.fHead; f = next) {
-            /* Make sure we don''t try to tessellate the new triangles. */
-            next = f.next;
-            if (f.inside) {
-                if (!__gl_meshTessellateMonoRegion(f, avoidDegenerateTris)) return false;
-            }
-        }
-
-        return true;
-    }
-
-
-/* __gl_meshDiscardExterior( mesh ) zaps (ie. sets to NULL) all faces
- * which are not marked "inside" the polygon.  Since further mesh operations
- * on NULL faces are not allowed, the main purpose is to clean up the
- * mesh so that exterior loops are not represented in the data structure.
- */
-    public static void __gl_meshDiscardExterior(GLUmesh mesh) {
-        GLUface f, next;
-
-        /*LINTED*/
-        for (f = mesh.fHead.next; f != mesh.fHead; f = next) {
-            /* Since f will be destroyed, save its next pointer. */
-            next = f.next;
-            if (!f.inside) {
-                Mesh.__gl_meshZapFace(f);
-            }
-        }
-    }
-
-    private static final int MARKED_FOR_DELETION = 0x7fffffff;
-
-/* __gl_meshSetWindingNumber( mesh, value, keepOnlyBoundary ) resets the
- * winding numbers on all edges so that regions marked "inside" the
- * polygon have a winding number of "value", and regions outside
- * have a winding number of 0.
- *
- * If keepOnlyBoundary is TRUE, it also deletes all edges which do not
- * separate an interior region from an exterior one.
- */
-    public static boolean __gl_meshSetWindingNumber(GLUmesh mesh, int value, boolean keepOnlyBoundary) {
-        GLUhalfEdge e, eNext;
-
-        for (e = mesh.eHead.next; e != mesh.eHead; e = eNext) {
-            eNext = e.next;
-            if (e.Sym.Lface.inside != e.Lface.inside) {
-
-                /* This is a boundary edge (one side is interior, one is exterior). */
-                e.winding = (e.Lface.inside) ? value : -value;
-            } else {
-
-                /* Both regions are interior, or both are exterior. */
-                if (!keepOnlyBoundary) {
-                    e.winding = 0;
-                } else {
-                    if (!Mesh.__gl_meshDelete(e)) return false;
-                }
-            }
-        }
-        return true;
-    }
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessState.java b/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessState.java
deleted file mode 100644
index 73ac7ebe3..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessState.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
-* All rights reserved.
-*/
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** Author: Eric Veach, July 1994
-** Java Port: Pepijn Van Eeckhoudt, July 2003
-** Java Port: Nathan Parker Burg, August 2003
-*/
-package com.sun.opengl.impl.glu.tessellator;
-
-class TessState {
-    public static final int T_DORMANT = 0;
-    public static final int T_IN_POLYGON = 1;
-    public static final int T_IN_CONTOUR = 2;
-}
-- 
cgit v1.2.3


From 3f72e907e869370b98dc7519ae5fc53681376450 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sat, 27 Mar 2010 23:28:04 +0100
Subject: refactoring part 3 (impl package): renamed com.sun.opengl ->
 com.jogamp.opengl.

---
 .../classes/com/jogamp/opengl/impl/DRIHack.java    |  127 +++
 src/jogl/classes/com/jogamp/opengl/impl/Debug.java |  140 +++
 .../opengl/impl/ExtensionAvailabilityCache.java    |  390 ++++++++
 .../jogamp/opengl/impl/GLBufferSizeTracker.java    |  188 ++++
 .../jogamp/opengl/impl/GLBufferStateTracker.java   |  169 ++++
 .../com/jogamp/opengl/impl/GLContextImpl.java      |  602 +++++++++++
 .../com/jogamp/opengl/impl/GLContextLock.java      |  126 +++
 .../com/jogamp/opengl/impl/GLContextShareSet.java  |  293 ++++++
 .../jogamp/opengl/impl/GLDrawableFactoryImpl.java  |  377 +++++++
 .../com/jogamp/opengl/impl/GLDrawableHelper.java   |  180 ++++
 .../com/jogamp/opengl/impl/GLDrawableImpl.java     |  179 ++++
 .../com/jogamp/opengl/impl/GLPbufferImpl.java      |  320 ++++++
 .../com/jogamp/opengl/impl/GLStateTracker.java     |  238 +++++
 .../com/jogamp/opengl/impl/GLWorkerThread.java     |  275 +++++
 .../impl/InternalBufferUtil.java.javame_cdc_fp     |  189 ++++
 .../opengl/impl/InternalBufferUtil.java.javase     |  199 ++++
 .../com/jogamp/opengl/impl/NativeLibLoader.java    |  109 ++
 .../com/jogamp/opengl/impl/ProjectFloat.java       | 1057 ++++++++++++++++++++
 .../opengl/impl/SystemUtil.java.javame_cdc_fp      |   10 +
 .../com/jogamp/opengl/impl/SystemUtil.java.javase  |   18 +
 .../com/jogamp/opengl/impl/ThreadingImpl.java      |  234 +++++
 .../com/jogamp/opengl/impl/ThreadingPlugin.java    |   62 ++
 .../jogamp/opengl/impl/awt/AWTThreadingPlugin.java |  129 +++
 .../com/jogamp/opengl/impl/awt/AWTUtil.java        |  125 +++
 .../classes/com/jogamp/opengl/impl/awt/Java2D.java |  569 +++++++++++
 .../jogamp/opengl/impl/awt/Java2DGLContext.java    |   52 +
 .../com/jogamp/opengl/impl/egl/EGLContext.java     |  299 ++++++
 .../com/jogamp/opengl/impl/egl/EGLDrawable.java    |  225 +++++
 .../jogamp/opengl/impl/egl/EGLDrawableFactory.java |  113 +++
 .../opengl/impl/egl/EGLDynamicLookupHelper.java    |  271 +++++
 .../opengl/impl/egl/EGLES1DynamicLookupHelper.java |   73 ++
 .../opengl/impl/egl/EGLES2DynamicLookupHelper.java |   73 ++
 .../jogamp/opengl/impl/egl/EGLExternalContext.java |   99 ++
 .../opengl/impl/egl/EGLGraphicsConfiguration.java  |  306 ++++++
 .../impl/egl/EGLGraphicsConfigurationFactory.java  |  298 ++++++
 .../jogamp/opengl/impl/egl/EGLOnscreenContext.java |   90 ++
 .../opengl/impl/egl/EGLOnscreenDrawable.java       |   82 ++
 .../jogamp/opengl/impl/egl/EGLPbufferContext.java  |   62 ++
 .../jogamp/opengl/impl/egl/EGLPbufferDrawable.java |   99 ++
 .../com/jogamp/opengl/impl/gl2/ProjectDouble.java  | 1041 +++++++++++++++++++
 .../classes/com/jogamp/opengl/impl/gl2/Util.java   |  244 +++++
 .../opengl/impl/gl2/fixme/GLObjectTracker.java     |  835 ++++++++++++++++
 .../opengl/impl/macosx/cgl/MacOSXCGLContext.java   |  342 +++++++
 .../opengl/impl/macosx/cgl/MacOSXCGLDrawable.java  |  109 ++
 .../impl/macosx/cgl/MacOSXCGLDrawableFactory.java  |  161 +++
 .../macosx/cgl/MacOSXCGLGraphicsConfiguration.java |  231 +++++
 .../cgl/MacOSXCGLGraphicsConfigurationFactory.java |   84 ++
 .../impl/macosx/cgl/MacOSXExternalCGLContext.java  |  216 ++++
 .../impl/macosx/cgl/MacOSXOffscreenCGLContext.java |   64 ++
 .../macosx/cgl/MacOSXOffscreenCGLDrawable.java     |   56 ++
 .../impl/macosx/cgl/MacOSXOnscreenCGLContext.java  |  130 +++
 .../impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java |  100 ++
 .../impl/macosx/cgl/MacOSXPbufferCGLContext.java   |  359 +++++++
 .../impl/macosx/cgl/MacOSXPbufferCGLDrawable.java  |  250 +++++
 .../cgl/awt/MacOSXAWTCGLDrawableFactory.java       |   64 ++
 .../MacOSXAWTCGLGraphicsConfigurationFactory.java  |  111 ++
 .../macosx/cgl/awt/MacOSXJava2DCGLContext.java     |  155 +++
 .../impl/windows/wgl/WindowsDummyWGLDrawable.java  |  101 ++
 .../windows/wgl/WindowsExternalWGLContext.java     |  146 +++
 .../windows/wgl/WindowsExternalWGLDrawable.java    |   90 ++
 .../windows/wgl/WindowsOffscreenWGLContext.java    |   64 ++
 .../windows/wgl/WindowsOffscreenWGLDrawable.java   |  139 +++
 .../windows/wgl/WindowsOnscreenWGLContext.java     |   88 ++
 .../windows/wgl/WindowsOnscreenWGLDrawable.java    |   63 ++
 .../impl/windows/wgl/WindowsPbufferWGLContext.java |  155 +++
 .../windows/wgl/WindowsPbufferWGLDrawable.java     |  330 ++++++
 .../opengl/impl/windows/wgl/WindowsWGLContext.java |  439 ++++++++
 .../impl/windows/wgl/WindowsWGLDrawable.java       |  129 +++
 .../windows/wgl/WindowsWGLDrawableFactory.java     |  279 ++++++
 .../wgl/WindowsWGLGraphicsConfiguration.java       |  638 ++++++++++++
 .../WindowsWGLGraphicsConfigurationFactory.java    |  319 ++++++
 .../WindowsAWTWGLGraphicsConfigurationFactory.java |  114 +++
 .../com/jogamp/opengl/impl/x11/glx/GLXUtil.java    |   66 ++
 .../opengl/impl/x11/glx/X11ExternalGLXContext.java |  154 +++
 .../impl/x11/glx/X11ExternalGLXDrawable.java       |  134 +++
 .../jogamp/opengl/impl/x11/glx/X11GLXContext.java  |  555 ++++++++++
 .../jogamp/opengl/impl/x11/glx/X11GLXDrawable.java |  100 ++
 .../opengl/impl/x11/glx/X11GLXDrawableFactory.java |  285 ++++++
 .../impl/x11/glx/X11GLXGraphicsConfiguration.java  |  416 ++++++++
 .../glx/X11GLXGraphicsConfigurationFactory.java    |  340 +++++++
 .../impl/x11/glx/X11OffscreenGLXContext.java       |   77 ++
 .../impl/x11/glx/X11OffscreenGLXDrawable.java      |  150 +++
 .../opengl/impl/x11/glx/X11OnscreenGLXContext.java |   68 ++
 .../impl/x11/glx/X11OnscreenGLXDrawable.java       |   64 ++
 .../opengl/impl/x11/glx/X11PbufferGLXContext.java  |  100 ++
 .../opengl/impl/x11/glx/X11PbufferGLXDrawable.java |  157 +++
 .../awt/X11AWTGLXGraphicsConfigurationFactory.java |  150 +++
 src/jogl/classes/com/sun/opengl/impl/DRIHack.java  |  127 ---
 src/jogl/classes/com/sun/opengl/impl/Debug.java    |  140 ---
 .../opengl/impl/ExtensionAvailabilityCache.java    |  390 --------
 .../com/sun/opengl/impl/GLBufferSizeTracker.java   |  188 ----
 .../com/sun/opengl/impl/GLBufferStateTracker.java  |  169 ----
 .../classes/com/sun/opengl/impl/GLContextImpl.java |  602 -----------
 .../classes/com/sun/opengl/impl/GLContextLock.java |  126 ---
 .../com/sun/opengl/impl/GLContextShareSet.java     |  293 ------
 .../com/sun/opengl/impl/GLDrawableFactoryImpl.java |  377 -------
 .../com/sun/opengl/impl/GLDrawableHelper.java      |  180 ----
 .../com/sun/opengl/impl/GLDrawableImpl.java        |  179 ----
 .../classes/com/sun/opengl/impl/GLPbufferImpl.java |  320 ------
 .../com/sun/opengl/impl/GLStateTracker.java        |  238 -----
 .../com/sun/opengl/impl/GLWorkerThread.java        |  275 -----
 .../impl/InternalBufferUtil.java.javame_cdc_fp     |  189 ----
 .../sun/opengl/impl/InternalBufferUtil.java.javase |  199 ----
 .../com/sun/opengl/impl/NativeLibLoader.java       |  109 --
 .../classes/com/sun/opengl/impl/ProjectFloat.java  | 1057 --------------------
 .../sun/opengl/impl/SystemUtil.java.javame_cdc_fp  |   10 -
 .../com/sun/opengl/impl/SystemUtil.java.javase     |   18 -
 .../classes/com/sun/opengl/impl/ThreadingImpl.java |  234 -----
 .../com/sun/opengl/impl/ThreadingPlugin.java       |   62 --
 .../sun/opengl/impl/awt/AWTThreadingPlugin.java    |  129 ---
 .../classes/com/sun/opengl/impl/awt/AWTUtil.java   |  125 ---
 .../classes/com/sun/opengl/impl/awt/Java2D.java    |  569 -----------
 .../com/sun/opengl/impl/awt/Java2DGLContext.java   |   52 -
 .../com/sun/opengl/impl/egl/EGLContext.java        |  299 ------
 .../com/sun/opengl/impl/egl/EGLDrawable.java       |  225 -----
 .../sun/opengl/impl/egl/EGLDrawableFactory.java    |  113 ---
 .../opengl/impl/egl/EGLDynamicLookupHelper.java    |  271 -----
 .../opengl/impl/egl/EGLES1DynamicLookupHelper.java |   73 --
 .../opengl/impl/egl/EGLES2DynamicLookupHelper.java |   73 --
 .../sun/opengl/impl/egl/EGLExternalContext.java    |   99 --
 .../opengl/impl/egl/EGLGraphicsConfiguration.java  |  306 ------
 .../impl/egl/EGLGraphicsConfigurationFactory.java  |  298 ------
 .../sun/opengl/impl/egl/EGLOnscreenContext.java    |   90 --
 .../sun/opengl/impl/egl/EGLOnscreenDrawable.java   |   82 --
 .../com/sun/opengl/impl/egl/EGLPbufferContext.java |   62 --
 .../sun/opengl/impl/egl/EGLPbufferDrawable.java    |   99 --
 .../com/sun/opengl/impl/gl2/ProjectDouble.java     | 1041 -------------------
 src/jogl/classes/com/sun/opengl/impl/gl2/Util.java |  244 -----
 .../sun/opengl/impl/gl2/fixme/GLObjectTracker.java |  835 ----------------
 .../opengl/impl/macosx/cgl/MacOSXCGLContext.java   |  342 -------
 .../opengl/impl/macosx/cgl/MacOSXCGLDrawable.java  |  109 --
 .../impl/macosx/cgl/MacOSXCGLDrawableFactory.java  |  161 ---
 .../macosx/cgl/MacOSXCGLGraphicsConfiguration.java |  231 -----
 .../cgl/MacOSXCGLGraphicsConfigurationFactory.java |   84 --
 .../impl/macosx/cgl/MacOSXExternalCGLContext.java  |  216 ----
 .../impl/macosx/cgl/MacOSXOffscreenCGLContext.java |   64 --
 .../macosx/cgl/MacOSXOffscreenCGLDrawable.java     |   56 --
 .../impl/macosx/cgl/MacOSXOnscreenCGLContext.java  |  130 ---
 .../impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java |  100 --
 .../impl/macosx/cgl/MacOSXPbufferCGLContext.java   |  359 -------
 .../impl/macosx/cgl/MacOSXPbufferCGLDrawable.java  |  250 -----
 .../cgl/awt/MacOSXAWTCGLDrawableFactory.java       |   64 --
 .../MacOSXAWTCGLGraphicsConfigurationFactory.java  |  111 --
 .../macosx/cgl/awt/MacOSXJava2DCGLContext.java     |  155 ---
 .../impl/windows/wgl/WindowsDummyWGLDrawable.java  |  101 --
 .../windows/wgl/WindowsExternalWGLContext.java     |  146 ---
 .../windows/wgl/WindowsExternalWGLDrawable.java    |   90 --
 .../windows/wgl/WindowsOffscreenWGLContext.java    |   64 --
 .../windows/wgl/WindowsOffscreenWGLDrawable.java   |  139 ---
 .../windows/wgl/WindowsOnscreenWGLContext.java     |   88 --
 .../windows/wgl/WindowsOnscreenWGLDrawable.java    |   63 --
 .../impl/windows/wgl/WindowsPbufferWGLContext.java |  155 ---
 .../windows/wgl/WindowsPbufferWGLDrawable.java     |  330 ------
 .../opengl/impl/windows/wgl/WindowsWGLContext.java |  439 --------
 .../impl/windows/wgl/WindowsWGLDrawable.java       |  129 ---
 .../windows/wgl/WindowsWGLDrawableFactory.java     |  279 ------
 .../wgl/WindowsWGLGraphicsConfiguration.java       |  638 ------------
 .../WindowsWGLGraphicsConfigurationFactory.java    |  319 ------
 .../WindowsAWTWGLGraphicsConfigurationFactory.java |  114 ---
 .../com/sun/opengl/impl/x11/glx/GLXUtil.java       |   66 --
 .../opengl/impl/x11/glx/X11ExternalGLXContext.java |  154 ---
 .../impl/x11/glx/X11ExternalGLXDrawable.java       |  134 ---
 .../com/sun/opengl/impl/x11/glx/X11GLXContext.java |  555 ----------
 .../sun/opengl/impl/x11/glx/X11GLXDrawable.java    |  100 --
 .../opengl/impl/x11/glx/X11GLXDrawableFactory.java |  285 ------
 .../impl/x11/glx/X11GLXGraphicsConfiguration.java  |  416 --------
 .../glx/X11GLXGraphicsConfigurationFactory.java    |  340 -------
 .../impl/x11/glx/X11OffscreenGLXContext.java       |   77 --
 .../impl/x11/glx/X11OffscreenGLXDrawable.java      |  150 ---
 .../opengl/impl/x11/glx/X11OnscreenGLXContext.java |   68 --
 .../impl/x11/glx/X11OnscreenGLXDrawable.java       |   64 --
 .../opengl/impl/x11/glx/X11PbufferGLXContext.java  |  100 --
 .../opengl/impl/x11/glx/X11PbufferGLXDrawable.java |  157 ---
 .../awt/X11AWTGLXGraphicsConfigurationFactory.java |  150 ---
 174 files changed, 18909 insertions(+), 18909 deletions(-)
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/Debug.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/GLBufferSizeTracker.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/GLBufferStateTracker.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/GLContextLock.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/GLContextShareSet.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/GLPbufferImpl.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/GLStateTracker.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/GLWorkerThread.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javame_cdc_fp
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javase
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/ProjectFloat.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/ThreadingPlugin.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/awt/AWTThreadingPlugin.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/awt/Java2D.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/awt/Java2DGLContext.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/gl2/ProjectDouble.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/gl2/Util.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/gl2/fixme/GLObjectTracker.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/DRIHack.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/Debug.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/ExtensionAvailabilityCache.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/GLBufferSizeTracker.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/GLBufferStateTracker.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/GLContextLock.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/GLContextShareSet.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/GLDrawableHelper.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/GLPbufferImpl.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/GLStateTracker.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/GLWorkerThread.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javame_cdc_fp
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javase
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/ProjectFloat.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javase
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/ThreadingImpl.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/ThreadingPlugin.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/awt/AWTThreadingPlugin.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/awt/AWTUtil.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/awt/Java2D.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/awt/Java2DGLContext.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/egl/EGLExternalContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenDrawable.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferDrawable.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/gl2/ProjectDouble.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/gl2/Util.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/gl2/fixme/GLObjectTracker.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/GLXUtil.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXContext.java
 delete mode 100755 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXContext.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java b/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java
new file mode 100755
index 000000000..ede966259
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import java.io.*;
+import java.security.*;
+import com.jogamp.gluegen.runtime.*;
+
+/**
+ * Helper class for working around problems with open-source DRI
+ * drivers. In the current DRI implementation it is required that the
+ * symbols in libGL.so.1.2 be globally visible to be accessible from
+ * other libraries that are dynamically loaded by the implementation.
+ * Applications may typically satisfy this need either by linking
+ * against libGL.so on the command line (-lGL) or by dlopen'ing
+ * libGL.so.1.2 with the RTLD_GLOBAL flag. The JOGL implementation
+ * links against libGL on all platforms rather than forcing all OpenGL
+ * entry points to be called through a function pointer. This allows
+ * the JOGL library to link directly to core 1.1 OpenGL entry points
+ * like glVertex3f, while calling through function pointers for entry
+ * points from later OpenGL versions as well as from
+ * extensions. However, because libjogl.so (which links against
+ * libGL.so) is loaded by the JVM, and because the JVM implicitly uses
+ * RTLD_LOCAL in the implementation of System.loadLibrary(), this
+ * means via transitivity that the symbols for libGL.so have only
+ * RTLD_LOCAL visibility to the rest of the application, so the DRI
+ * drivers can not find the symbols required. <P>
+ *
+ * There are at least two possible solutions. One would be to change
+ * the JOGL implementation to call through function pointers uniformly
+ * so that it does not need to link against libGL.so. This is
+ * possible, but requires changes to GlueGen and also is not really
+ * necessary in any other situation than with the DRI drivers. Another
+ * solution is to force the first load of libGL.so.1.2 to be done
+ * dynamically with RTLD_GLOBAL before libjogl.so is loaded and causes
+ * libGL.so.1.2 to be loaded again. The NativeLibrary class in the
+ * GlueGen runtime has this property, and we use it to implement this
+ * workaround.
+ */
+
+public class DRIHack {
+  private static final boolean DEBUG = Debug.debug("DRIHack");
+  private static boolean driHackNeeded;
+  private static NativeLibrary oglLib;
+
+  public static void begin() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+        public Object run() {
+          String os = Debug.getProperty("os.name", false).toLowerCase();
+          // Do DRI hack on all Linux distributions for best robustness
+          driHackNeeded =
+            (os.startsWith("linux") ||
+             new File("/usr/lib/dri").exists() ||
+             new File("/usr/X11R6/lib/modules/dri").exists());
+          // Allow manual overriding for now as a workaround for
+          // problems seen in some situations -- needs more investigation
+          if (Debug.getProperty("jogl.drihack.disable", true) != null) {
+            driHackNeeded = false;
+          }
+          return null;
+        }
+      });
+
+    if (driHackNeeded) {
+      if (DEBUG) {
+        System.err.println("Beginning DRI hack");
+      }
+
+      // Try a few different variants for best robustness
+      // In theory probably only the first is necessary
+      oglLib = NativeLibrary.open("libGL.so.1", null);
+      if (DEBUG && oglLib != null) System.err.println(" Found libGL.so.1");
+      if (oglLib == null) {
+        oglLib = NativeLibrary.open("/usr/lib/libGL.so.1", null);
+        if (DEBUG && oglLib != null) System.err.println(" Found /usr/lib/libGL.so.1");
+      }
+    }
+  }
+
+  public static void end() {
+    if (oglLib != null) {
+      if (DEBUG) {
+        System.err.println("Ending DRI hack");
+      }
+
+      oglLib.close();
+      oglLib = null;
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/Debug.java b/src/jogl/classes/com/jogamp/opengl/impl/Debug.java
new file mode 100644
index 000000000..82a5f2ff2
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/Debug.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import java.security.*;
+
+/** Helper routines for logging and debugging. */
+
+public class Debug {
+  // Some common properties
+  private static boolean verbose;
+  private static boolean debugAll;
+  private static AccessControlContext localACC;
+  
+  static {
+    localACC=AccessController.getContext();
+    verbose = isPropertyDefined("jogl.verbose", true);
+    debugAll = isPropertyDefined("jogl.debug", true);
+    if (verbose) {
+       Package p = Package.getPackage("javax.media.opengl");
+       System.err.println("JOGL specification version " + p.getSpecificationVersion());
+       System.err.println("JOGL implementation version " + p.getImplementationVersion());
+       System.err.println("JOGL implementation vendor " + p.getImplementationVendor());
+    }
+  }
+
+  static int getIntProperty(final String property, final boolean jnlpAlias) {
+      return getIntProperty(property, jnlpAlias, localACC);
+  }
+
+  public static int getIntProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    int i=0;
+    try {
+        Integer iv = Integer.valueOf(Debug.getProperty(property, jnlpAlias, acc));
+        i = iv.intValue();
+    } catch (NumberFormatException nfe) {}
+    return i;
+  }
+
+  static boolean getBooleanProperty(final String property, final boolean jnlpAlias) {
+    return getBooleanProperty(property, jnlpAlias, localACC);
+  }
+
+  public static boolean getBooleanProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    Boolean b = Boolean.valueOf(Debug.getProperty(property, jnlpAlias, acc));
+    return b.booleanValue();
+  }
+
+  static boolean isPropertyDefined(final String property, final boolean jnlpAlias) {
+    return isPropertyDefined(property, jnlpAlias, localACC);
+  }
+
+  public static boolean isPropertyDefined(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    return (Debug.getProperty(property, jnlpAlias, acc) != null) ? true : false;
+  }
+
+  static String getProperty(final String property, final boolean jnlpAlias) {
+    return getProperty(property, jnlpAlias, localACC);
+  }
+
+  public static String getProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    String s=null;
+    if(null!=acc && acc.equals(localACC)) {
+        s = (String) AccessController.doPrivileged(new PrivilegedAction() {
+            public Object run() {
+              String val=null;
+              try {
+                  val = System.getProperty(property);
+              } catch (Exception e) {}
+              if(null==val && jnlpAlias && !property.startsWith(jnlp_prefix)) {
+                  try {
+                      val = System.getProperty(jnlp_prefix + property);
+                  } catch (Exception e) {}
+              }
+              return val;
+            }
+          });
+    } else {
+        try {
+            s = System.getProperty(property);
+        } catch (Exception e) {}
+        if(null==s && jnlpAlias && !property.startsWith(jnlp_prefix)) {
+            try {
+                s = System.getProperty(jnlp_prefix + property);
+            } catch (Exception e) {}
+        }
+    }
+    return s;
+  }
+  public static final String jnlp_prefix = "jnlp." ;
+
+  public static boolean verbose() {
+    return verbose;
+  }
+
+  public static boolean debugAll() {
+    return debugAll;
+  }
+
+  public static boolean debug(String subcomponent) {
+    return debugAll() || isPropertyDefined("jogl.debug." + subcomponent, true);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java b/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
new file mode 100644
index 000000000..f36c4f749
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
@@ -0,0 +1,390 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import javax.media.opengl.*;
+import java.util.*;
+// FIXME: refactor Java SE dependencies
+//import java.util.regex.*;
+import java.lang.reflect.*;
+
+/**
+ * A utility object intended to be used by implementations to act as a cache
+ * of which OpenGL extensions are currently available on both the host machine
+ * and display.
+ */
+public final class ExtensionAvailabilityCache {
+  private static final boolean DEBUG = Debug.debug("ExtensionAvailabilityCache");
+  private static final boolean DEBUG_AVAILABILITY = Debug.isPropertyDefined("ExtensionAvailabilityCache", true);
+
+  ExtensionAvailabilityCache(GLContextImpl context)
+  {
+    this.context = context;
+  }
+
+  /**
+   * Flush the cache. The cache will be rebuilt lazily as calls to {@link
+   * #isExtensionAvailable(String)} are received.
+   */
+  public void flush()
+  {
+    if(DEBUG) {
+        System.out.println("ExtensionAvailabilityCache: Flush availability OpenGL "+majorVersion+"."+minorVersion);
+    }
+    availableExtensionCache.clear();
+    initialized = false;
+    majorVersion = 1;
+    minorVersion = 0;
+  }
+
+  /**
+   * Flush the cache and rebuild the cache.
+   */
+  public void reset() {
+    flush();
+    initAvailableExtensions();
+  }
+
+  public boolean isInitialized() {
+    return initialized && !availableExtensionCache.isEmpty() ;
+  }
+
+  public boolean isExtensionAvailable(String glExtensionName) {
+    initAvailableExtensions();
+    return availableExtensionCache.contains(mapGLExtensionName(glExtensionName));
+  }
+
+  public String getPlatformExtensionsString() {
+    initAvailableExtensions();
+    return glXExtensions;
+  }
+
+  public String getGLExtensions() {
+    initAvailableExtensions();
+    if(DEBUG) {
+        System.err.println("ExtensionAvailabilityCache: getGLExtensions() called");
+    }
+    return glExtensions;
+  }
+
+  public int getMajorVersion() {
+    initAvailableExtensions();
+    return majorVersion;
+  }
+
+  public int getMinorVersion() {
+    initAvailableExtensions();
+    return minorVersion;
+  }
+
+  private void initAvailableExtensions() {
+    // if hash is empty (meaning it was flushed), pre-cache it with the list
+    // of extensions that are in the GL_EXTENSIONS string
+    if (availableExtensionCache.isEmpty() || !initialized) {
+      GL gl = context.getGL();
+
+      if (DEBUG) {
+         System.err.println("ExtensionAvailabilityCache: Pre-caching init "+gl+", GL_VERSION "+gl.glGetString(GL.GL_VERSION));
+      }
+
+      // Set version
+      Version version = new Version(gl.glGetString(GL.GL_VERSION));
+      if (version.isValid()) {
+        majorVersion = version.getMajor();
+        minorVersion = version.getMinor();
+
+        if( !gl.isGL3() &&
+            ( majorVersion > 3 ||
+              ( majorVersion == 3 && minorVersion >= 1 ) ) ) {
+            // downsize version to 3.0 in case we are not using GL3 (3.1)
+            majorVersion = 3;
+            minorVersion = 0;
+        }
+      }
+
+      boolean useGetStringi = false;
+
+      if ( majorVersion > 3 ||
+           ( majorVersion == 3 && minorVersion >= 0 ) ||
+           gl.isGL3() ) {
+          if ( ! gl.isGL2GL3() ) {
+            if(DEBUG) {
+                System.err.println("ExtensionAvailabilityCache: GL >= 3.1 usage, but no GL2GL3 interface: "+gl.getClass().getName());
+            }
+          } else if ( ! gl.isFunctionAvailable("glGetStringi") ) {
+            if(DEBUG) {
+                System.err.println("ExtensionAvailabilityCache: GL >= 3.1 usage, but no glGetStringi");
+            }
+          } else {
+              useGetStringi = true;
+          }
+      }
+
+      if (DEBUG) {
+        System.err.println("ExtensionAvailabilityCache: Pre-caching extension availability OpenGL "+majorVersion+"."+minorVersion+
+                           ", use "+ ( useGetStringi ? "glGetStringi" : "glGetString" ) );
+      }
+
+      StringBuffer sb = new StringBuffer();
+      if(useGetStringi) {
+        GL2GL3 gl2gl3 = gl.getGL2GL3();
+        int[] numExtensions = { 0 } ;
+        gl2gl3.glGetIntegerv(gl2gl3.GL_NUM_EXTENSIONS, numExtensions, 0);
+        for (int i = 0; i < numExtensions[0]; i++) {
+            sb.append(gl2gl3.glGetStringi(gl2gl3.GL_EXTENSIONS, i));
+            if(i < numExtensions[0]) {
+                sb.append(" ");
+            }
+        }
+      } else {
+        sb.append(gl.glGetString(GL.GL_EXTENSIONS));
+      }
+      glExtensions = sb.toString();
+      glXExtensions = context.getPlatformExtensionsString();
+
+      sb.append(" ");
+      sb.append(glXExtensions);
+
+      String allAvailableExtensions = sb.toString();
+      if (DEBUG_AVAILABILITY) {
+        System.err.println("ExtensionAvailabilityCache: Available extensions: " + allAvailableExtensions);
+        System.err.println("ExtensionAvailabilityCache: GL vendor: " + gl.glGetString(GL.GL_VENDOR));
+      }
+      StringTokenizer tok = new StringTokenizer(allAvailableExtensions);
+      while (tok.hasMoreTokens()) {
+        String availableExt = tok.nextToken().trim();
+        availableExt = availableExt.intern();
+        availableExtensionCache.add(availableExt);
+        if (DEBUG_AVAILABILITY) {
+          System.err.println("ExtensionAvailabilityCache:   Available: " + availableExt);
+        }
+      }
+
+      // Put GL version strings in the table as well
+      // FIXME: this needs to be adjusted when the major rev changes
+      // beyond the known ones
+      int major = majorVersion;
+      int minor = minorVersion;
+      while (major > 0) {
+        while (minor >= 0) {
+          availableExtensionCache.add("GL_VERSION_" + major + "_" + minor);
+          if (DEBUG) {
+            System.err.println("ExtensionAvailabilityCache: Added GL_VERSION_" + major + "_" + minor + " to known extensions");
+          }
+          --minor;
+        }
+
+        switch (major) {
+        case 3:
+          if(gl.isGL3()) {
+              // GL3 is a GL 3.1 forward compatible context,
+              // hence no 2.0, 1.0 - 1.5 GL versions are supported.
+              major=0; 
+          }
+          // Restart loop at version 2.1
+          minor = 1;
+          break;
+        case 2:
+          // Restart loop at version 1.5
+          minor = 5;
+          break;
+        case 1:
+          break;
+        }
+
+        --major;
+      }
+
+      // put a dummy var in here so that the cache is no longer empty even if
+      // no extensions are in the GL_EXTENSIONS string
+      availableExtensionCache.add("<INTERNAL_DUMMY_PLACEHOLDER>");
+
+      initialized = true;
+    }
+  }
+
+  // FIXME: hack to re-enable GL_NV_vertex_array_range extension after
+  // recent upgrade to new wglext.h and glxext.h headers
+  private static String mapGLExtensionName(String extensionName) {
+    if (extensionName != null &&
+        (extensionName.equals("WGL_NV_vertex_array_range") ||
+         extensionName.equals("GLX_NV_vertex_array_range"))) 
+      return "GL_NV_vertex_array_range";
+    return extensionName;
+  }
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  private boolean initialized = false;
+  private int majorVersion = 1;
+  private int minorVersion = 0;
+  private String glExtensions = null;
+  private String glXExtensions = null;
+  private HashSet availableExtensionCache = new HashSet(50);
+  private GLContextImpl context;
+
+  /**
+   * A class for storing and comparing OpenGL version numbers.
+   * This only works for desktop OpenGL at the moment.
+   */
+  private static class Version implements Comparable
+  {
+    private boolean valid;
+    private int major, minor, sub;
+    public Version(int majorRev, int minorRev, int subMinorRev)
+    {
+      major = majorRev;
+      minor = minorRev;
+      sub = subMinorRev;
+    }
+
+    /**
+     * @param versionString must be of the form "GL_VERSION_X" or
+     * "GL_VERSION_X_Y" or "GL_VERSION_X_Y_Z" or "X.Y", where X, Y,
+     * and Z are integers.
+     *
+     * @exception IllegalArgumentException if the argument is not a valid
+     * OpenGL version identifier
+     */
+    public Version(String versionString)
+    {
+      try 
+      {
+        if (versionString.startsWith("GL_VERSION_"))
+        {
+          StringTokenizer tok = new StringTokenizer(versionString, "_");
+
+          tok.nextToken(); // GL_
+          tok.nextToken(); // VERSION_ 
+          if (!tok.hasMoreTokens()) { major = 0; return; }
+          major = Integer.valueOf(tok.nextToken()).intValue();
+          if (!tok.hasMoreTokens()) { minor = 0; return; }
+          minor = Integer.valueOf(tok.nextToken()).intValue();
+          if (!tok.hasMoreTokens()) { sub = 0; return; }
+          sub = Integer.valueOf(tok.nextToken()).intValue();
+        }
+        else
+        {
+          int radix = 10;
+          if (versionString.length() > 2) {
+            if (Character.isDigit(versionString.charAt(0)) &&
+                versionString.charAt(1) == '.' &&
+                Character.isDigit(versionString.charAt(2))) {
+              major = Character.digit(versionString.charAt(0), radix);
+              minor = Character.digit(versionString.charAt(2), radix);
+
+              // See if there's version-specific information which might
+              // imply a more recent OpenGL version
+              StringTokenizer tok = new StringTokenizer(versionString, " ");
+              if (tok.hasMoreTokens()) {
+                tok.nextToken();
+                if (tok.hasMoreTokens()) {
+                  String token = tok.nextToken();
+                  int i = 0;
+                  while (i < token.length() && !Character.isDigit(token.charAt(i))) {
+                    i++;
+                  }
+                  if (i < token.length() - 2 &&
+                      Character.isDigit(token.charAt(i)) &&
+                      token.charAt(i+1) == '.' &&
+                      Character.isDigit(token.charAt(i+2))) {
+                    int altMajor = Character.digit(token.charAt(i), radix);
+                    int altMinor = Character.digit(token.charAt(i+2), radix);
+                    // Avoid possibly confusing situations by putting some
+                    // constraints on the upgrades we do to the major and
+                    // minor versions
+                    if ((altMajor == major && altMinor > minor) ||
+                        altMajor == major + 1) {
+                      major = altMajor;
+                      minor = altMinor;
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+        valid = true;
+      }
+      catch (Exception e)
+      {
+        // FIXME: refactor desktop OpenGL dependencies and make this
+        // class work properly for OpenGL ES
+        System.err.println("ExtensionAvailabilityCache: FunctionAvailabilityCache.Version.<init>: "+e);
+        major = 1;
+        minor = 0;
+        /*
+        throw (IllegalArgumentException)
+          new IllegalArgumentException(
+            "Illegally formatted version identifier: \"" + versionString + "\"")
+              .initCause(e);
+        */
+      }
+    }
+
+    public boolean isValid() {
+      return valid;
+    }
+
+    public int compareTo(Object o)
+    {
+      Version vo = (Version)o;
+      if (major > vo.major) return 1; 
+      else if (major < vo.major) return -1; 
+      else if (minor > vo.minor) return 1; 
+      else if (minor < vo.minor) return -1; 
+      else if (sub > vo.sub) return 1; 
+      else if (sub < vo.sub) return -1; 
+
+      return 0; // they are equal
+    }
+
+    public int getMajor() {
+      return major;
+    }
+
+    public int getMinor() {
+      return minor;
+    }
+    
+  } // end class Version
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLBufferSizeTracker.java b/src/jogl/classes/com/jogamp/opengl/impl/GLBufferSizeTracker.java
new file mode 100755
index 000000000..48affa534
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLBufferSizeTracker.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import java.util.*;
+import javax.media.opengl.*;
+
+/**
+ * Tracks as closely as possible the sizes of allocated OpenGL buffer
+ * objects. When glMapBuffer or glMapBufferARB is called, in order to
+ * turn the resulting base address into a java.nio.ByteBuffer, we need
+ * to know the size in bytes of the allocated OpenGL buffer object.
+ * Previously we would compute this size by using
+ * glGetBufferParameterivARB with a pname of GL_BUFFER_SIZE, but
+ * it appears doing so each time glMapBuffer is called is too costly
+ * on at least Apple's new multithreaded OpenGL implementation. <P>
+ *
+ * Instead we now try to track the sizes of allocated buffer objects.
+ * We watch calls to glBindBuffer to see which buffer is bound to
+ * which target and to glBufferData to see how large the buffer's
+ * allocated size is. When glMapBuffer is called, we consult our table
+ * of buffer sizes to see if we can return an answer without a glGet
+ * call. <P>
+ *
+ * We share the GLBufferSizeTracker objects among all GLContexts for
+ * which sharing is enabled, because the namespace for buffer objects
+ * is the same for these contexts. <P>
+ *
+ * Tracking the state of which buffer objects are bound is done in the
+ * GLBufferStateTracker and is not completely trivial. In the face of
+ * calls to glPushClientAttrib / glPopClientAttrib we currently punt
+ * and re-fetch the bound buffer object for the state in question;
+ * see, for example, glVertexPointer and the calls down to
+ * GLBufferStateTracker.getBoundBufferObject(). Note that we currently
+ * ignore new binding targets such as GL_TRANSFORM_FEEDBACK_BUFFER_NV;
+ * the fact that new binding targets may be added in the future makes
+ * it impossible to cache state for these new targets. <P>
+ *
+ * Ignoring new binding targets, the primary situation in which we may
+ * not be able to return a cached answer is in the case of an error,
+ * where glBindBuffer may not have been called before trying to call
+ * glBufferData. Also, if external native code modifies a buffer
+ * object, we may return an incorrect answer. (FIXME: this case
+ * requires more thought, and perhaps stochastic and
+ * exponential-fallback checking. However, note that it can only occur
+ * in the face of external native code which requires that the
+ * application be signed anyway, so there is no security risk in this
+ * area.)
+ */
+
+public class GLBufferSizeTracker {
+  // Map from buffer names to sizes.
+  // Note: should probably have some way of shrinking this map, but
+  // can't just make it a WeakHashMap because nobody holds on to the
+  // keys; would have to always track creation and deletion of buffer
+  // objects, which is probably sub-optimal. The expected usage
+  // pattern of buffer objects indicates that the fact that this map
+  // never shrinks is probably not that bad.
+  private Map/*<Integer,Integer>*/ bufferSizeMap =
+    Collections.synchronizedMap(new HashMap/*<Integer,Integer>*/());
+
+  private static final boolean DEBUG = Debug.debug("GLBufferSizeTracker");
+
+  public GLBufferSizeTracker() {
+  }
+
+  public void setBufferSize(GLBufferStateTracker bufferStateTracker,
+                            int target,
+                            GL caller,
+                            int size) {
+    // Need to do some similar queries to getBufferSize below
+    int buffer = bufferStateTracker.getBoundBufferObject(target, caller);
+    boolean valid = bufferStateTracker.isBoundBufferObjectKnown(target);
+    if (valid) {
+      if (buffer == 0) {
+        // FIXME: this really should not happen if we know what's
+        // going on. Very likely there is an OpenGL error in the
+        // application if we get here. Could silently return 0, but it
+        // seems better to get an early warning that something is
+        // wrong.
+        throw new GLException("Error: no OpenGL buffer object appears to be bound to target 0x" +
+                              Integer.toHexString(target));
+      }
+      bufferSizeMap.put(new Integer(buffer), new Integer(size));
+    }
+    // We don't know the current buffer state. Note that the buffer
+    // state tracker will have made the appropriate OpenGL query if it
+    // didn't know what was going on, so at this point we have nothing
+    // left to do except drop this piece of information on the floor.
+  }
+
+  public int getBufferSize(GLBufferStateTracker bufferStateTracker,
+                           int target,
+                           GL caller) {
+    // See whether we know what buffer is currently bound to the given
+    // state
+    int buffer = bufferStateTracker.getBoundBufferObject(target, caller);
+    boolean valid = bufferStateTracker.isBoundBufferObjectKnown(target);
+    if (valid) {
+      if (buffer == 0) {
+        // FIXME: this really should not happen if we know what's
+        // going on. Very likely there is an OpenGL error in the
+        // application if we get here. Could silently return 0, but it
+        // seems better to get an early warning that something is
+        // wrong.
+        throw new GLException("Error: no OpenGL buffer object appears to be bound to target 0x" +
+                              Integer.toHexString(target));
+      }
+      // See whether we know the size of this buffer object; at this
+      // point we almost certainly should if the application is
+      // written correctly
+      Integer key = new Integer(buffer);
+      Integer sz = (Integer) bufferSizeMap.get(key);
+      if (sz == null) {
+        // For robustness, try to query this value from the GL as we used to
+        int[] tmp = new int[1];
+        caller.glGetBufferParameteriv(target, GL.GL_BUFFER_SIZE, tmp, 0);
+        if (tmp[0] == 0) {
+          // Assume something is wrong rather than silently going along
+          throw new GLException("Error: buffer size returned by glGetBufferParameteriv was zero; probably application error");
+        }
+        // Assume we just don't know what's happening
+        sz = new Integer(tmp[0]);
+        bufferSizeMap.put(key, sz);
+        if (DEBUG) {
+          System.err.println("GLBufferSizeTracker.getBufferSize(): made slow query to cache size " +
+                             tmp[0] +
+                             " for buffer " +
+                             buffer);
+        }
+      }
+      return sz.intValue();
+    }
+    // We don't know what's going on in this case; query the GL for an answer
+    int[] tmp = new int[1];
+    caller.glGetBufferParameteriv(target, GL.GL_BUFFER_SIZE, tmp, 0);
+    if (DEBUG) {
+      System.err.println("GLBufferSizeTracker.getBufferSize(): no cached buffer information");
+    }
+    return tmp[0];
+  }
+
+  // This should be called on any major event where we might start
+  // producing wrong answers, such as OpenGL context creation and
+  // destruction if we don't know whether there are other currently-
+  // created contexts that might be keeping the buffer objects alive
+  // that we're dealing with
+  public void clearCachedBufferSizes() {
+    bufferSizeMap.clear();
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLBufferStateTracker.java b/src/jogl/classes/com/jogamp/opengl/impl/GLBufferStateTracker.java
new file mode 100755
index 000000000..df8d673a1
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLBufferStateTracker.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import java.util.*;
+import javax.media.opengl.*;
+
+/**
+ * Tracks as closely as possible which OpenGL buffer object is bound
+ * to which binding target in the current OpenGL context.
+ * GLBufferStateTracker objects are allocated on a per-OpenGL-context basis.
+ * This class is used to verify that e.g. the vertex
+ * buffer object extension is in use when the glVertexPointer variant
+ * taking a long as argument is called. <P>
+ * 
+ * Note that because the enumerated value used for the binding of a
+ * buffer object (e.g. GL_ARRAY_BUFFER) is different than that used to
+ * query the binding using glGetIntegerv (e.g.
+ * GL_ARRAY_BUFFER_BINDING), then in the face of new binding targets
+ * being added to the GL (e.g. GL_TRANSFORM_FEEDBACK_BUFFER_NV) it is
+ * impossible to set up a query of the buffer object currently bound
+ * to a particular state. It turns out that for some uses, such as
+ * finding the size of the currently bound buffer, this doesn't
+ * matter, though of course without knowing the buffer object we can't
+ * re-associate the queried size with the buffer object ID. <P>
+ *
+ * Because the namespace of buffer objects is the unsigned integers
+ * with 0 reserved by the GL, and because we have to be able to return
+ * both 0 and other integers as valid answers from
+ * getBoundBufferObject(), we need a second query, which is to ask
+ * whether we know the state of the binding for a given target. For
+ * "unknown" targets such as GL_TRANSFORM_FEEDBACK_BUFFER_NV we return
+ * false from this, but we also clear the valid bit and later refresh
+ * the binding state if glPushClientAttrib / glPopClientAttrib are
+ * called, since we don't want the complexity of tracking stacks of
+ * these attributes.
+ *
+ */
+
+public class GLBufferStateTracker {
+  private static final boolean DEBUG = Debug.debug("GLBufferStateTracker");
+
+  private static final Integer arrayBufferEnum        = new Integer(GL.GL_ARRAY_BUFFER);
+  private static final Integer elementArrayBufferEnum = new Integer(GL.GL_ELEMENT_ARRAY_BUFFER);
+  private static final Integer pixelPackBufferEnum    = new Integer(GL2.GL_PIXEL_PACK_BUFFER);
+  private static final Integer pixelUnpackBufferEnum  = new Integer(GL2.GL_PIXEL_UNPACK_BUFFER);
+  private static final Integer zero                   = new Integer(0);
+
+  // Maps binding targets to buffer objects. A null value indicates
+  // that the binding is unknown. A zero value indicates that it is
+  // known that no buffer is bound to the target.
+  private Map/*<Integer,Integer>*/ bindingMap = new HashMap/*<Integer,Integer>*/();
+
+  private int[] bufTmp = new int[1];
+
+  public GLBufferStateTracker() {
+    // Start with known unbound targets for known keys
+    bindingMap.put(arrayBufferEnum,        zero);
+    bindingMap.put(elementArrayBufferEnum, zero);
+    bindingMap.put(pixelPackBufferEnum,    zero);
+    bindingMap.put(pixelUnpackBufferEnum,  zero);
+  }
+
+  public void setBoundBufferObject(int target, int buffer) {
+    bindingMap.put(box(target), box(buffer));
+  }
+
+  /** Note: returns an unspecified value if the binding for the
+      specified target (e.g. GL_ARRAY_BUFFER) is currently unknown.
+      You must use isBoundBufferObjectKnown() to see whether the
+      return value is valid. */
+  public int getBoundBufferObject(int target, GL caller) {
+    Integer value = (Integer) bindingMap.get(box(target));
+    if (value == null) {
+      // User probably either called glPushClientAttrib /
+      // glPopClientAttrib or is querying an unknown target. See
+      // whether we know how to fetch this state.
+      boolean gotQueryTarget = true;
+      int queryTarget = 0;
+      switch (target) {
+        case GL.GL_ARRAY_BUFFER:          queryTarget = GL.GL_ARRAY_BUFFER_BINDING;         break;
+        case GL.GL_ELEMENT_ARRAY_BUFFER:  queryTarget = GL.GL_ELEMENT_ARRAY_BUFFER_BINDING; break;
+        case GL2.GL_PIXEL_PACK_BUFFER:    queryTarget = GL2.GL_PIXEL_PACK_BUFFER_BINDING;    break;
+        case GL2.GL_PIXEL_UNPACK_BUFFER:  queryTarget = GL2.GL_PIXEL_UNPACK_BUFFER_BINDING;  break;
+        default:                          gotQueryTarget = false; break;
+      }
+      if (gotQueryTarget) {
+        caller.glGetIntegerv(queryTarget, bufTmp, 0);
+        if (DEBUG) {
+          System.err.println("GLBufferStateTracker.getBoundBufferObject(): queried bound buffer " +
+                             bufTmp[0] +
+                             " for query target 0x" + Integer.toHexString(queryTarget));
+        }
+        setBoundBufferObject(target, bufTmp[0]);
+        // Try once more
+        return getBoundBufferObject(target, caller);
+      }
+      return 0;
+    }
+    return value.intValue();
+  }
+
+  /** Indicates whether the binding state for the specified target is
+      currently known. Should be called after getBoundBufferObject()
+      because that method may change the answer for a given target. */
+  public boolean isBoundBufferObjectKnown(int target) {
+    return (bindingMap.get(box(target)) != null);
+  }
+
+  /** Clears out the known/unknown state of the various buffer object
+      binding states. These will be refreshed later on an as-needed
+      basis. This is called by the implementations of
+      glPushClientAttrib / glPopClientAttrib. Might want to call this
+      from GLContext.makeCurrent() in the future to possibly increase
+      the robustness of these caches in the face of external native
+      code manipulating OpenGL state. */
+  public void clearBufferObjectState() {
+    bindingMap.clear();
+  }
+
+  // FIXME: could largely remove this and use Integer.valueOf() in JDK 5
+  private static Integer box(int key) {
+    switch (key) {
+      case 0:                          return zero;
+      case GL.GL_ARRAY_BUFFER:         return arrayBufferEnum;
+      case GL.GL_ELEMENT_ARRAY_BUFFER: return elementArrayBufferEnum;
+      case GL2.GL_PIXEL_PACK_BUFFER:   return pixelPackBufferEnum;
+      case GL2.GL_PIXEL_UNPACK_BUFFER: return pixelUnpackBufferEnum;
+      default:                         return new Integer(key);
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
new file mode 100644
index 000000000..32a32e322
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
@@ -0,0 +1,602 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import java.nio.*;
+import java.lang.reflect.*;
+
+import javax.media.opengl.*;
+import com.sun.nativewindow.impl.NWReflection;
+import com.jogamp.gluegen.runtime.*;
+import com.jogamp.gluegen.runtime.opengl.*;
+
+public abstract class GLContextImpl extends GLContext {
+  protected GLContextLock lock = new GLContextLock();
+  protected static final boolean DEBUG = Debug.debug("GLContext");
+  protected static final boolean VERBOSE = Debug.verbose();
+  // NOTE: default sense of GLContext optimization disabled in JSR-231
+  // 1.0 beta 5 due to problems on X11 platforms (both Linux and
+  // Solaris) when moving and resizing windows. Apparently GLX tokens
+  // get sent to the X server under the hood (and out from under the
+  // cover of the AWT lock) in these situations. Users requiring
+  // multi-screen X11 applications can manually enable this flag. It
+  // basically had no tangible effect on the Windows or Mac OS X
+  // platforms anyway in particular with the disabling of the
+  // GLWorkerThread which we found to be necessary in 1.0 beta 4.
+  protected boolean optimizationEnabled = Debug.isPropertyDefined("jogl.GLContext.optimize", true);
+
+  // Cache of the functions that are available to be called at the current
+  // moment in time
+  protected ExtensionAvailabilityCache extensionAvailability;
+  // Table that holds the addresses of the native C-language entry points for
+  // OpenGL functions.
+  private ProcAddressTable glProcAddressTable;
+
+  // Tracks creation and initialization of buffer objects to avoid
+  // repeated glGet calls upon glMapBuffer operations
+  private GLBufferSizeTracker bufferSizeTracker; // Singleton - Set by GLContextShareSet
+  private GLBufferStateTracker bufferStateTracker = new GLBufferStateTracker();
+  private GLStateTracker glStateTracker = new GLStateTracker();
+
+  protected GLDrawableImpl drawable;
+  protected GLDrawableImpl drawableRead;
+
+  protected GL gl;
+
+  public GLContextImpl(GLDrawableImpl drawable, GLDrawableImpl drawableRead, GLContext shareWith) {
+    extensionAvailability = new ExtensionAvailabilityCache(this);
+    if (shareWith != null) {
+      GLContextShareSet.registerSharing(this, shareWith);
+    }
+    GLContextShareSet.registerForBufferObjectSharing(shareWith, this);
+    // This must occur after the above calls into the
+    // GLContextShareSet, which set up state needed by the GL object
+    setGL(createGL(drawable.getGLProfile()));
+
+    this.drawable = drawable;
+    setGLDrawableRead(drawableRead);
+  }
+
+  public GLContextImpl(GLDrawableImpl drawable, GLContext shareWith) {
+    this(drawable, null, shareWith);
+  }
+
+  public void setGLDrawableRead(GLDrawable read) {
+    boolean lockHeld = lock.isHeld();
+    if(lockHeld) {
+        release();
+    }
+    drawableRead = ( null != read ) ? (GLDrawableImpl) read : drawable;
+    if(lockHeld) {
+        makeCurrent();
+    }
+  }
+
+  public GLDrawable getGLDrawable() {
+    return drawable;
+  }
+
+  public GLDrawable getGLDrawableRead() {
+    return drawableRead;
+  }
+
+  public GLDrawableImpl getDrawableImpl() {
+    return (GLDrawableImpl) getGLDrawable();
+  }
+
+  public int makeCurrent() throws GLException {
+    // Support calls to makeCurrent() over and over again with
+    // different contexts without releasing them
+    // Could implement this more efficiently without explicit
+    // releasing of the underlying context; would require more error
+    // checking during the makeCurrentImpl phase
+    GLContext current = getCurrent();
+    if (current != null) {
+      if (current == this) {
+        // Assume we don't need to make this context current again
+        // For Mac OS X, however, we need to update the context to track resizes
+        update();
+        return CONTEXT_CURRENT;
+      } else {
+        current.release();
+      }
+    }
+
+    if (GLWorkerThread.isStarted() &&
+        !GLWorkerThread.isWorkerThread()) {
+      // Kick the GLWorkerThread off its current context
+      GLWorkerThread.invokeLater(new Runnable() { public void run() {} });
+    }
+
+    lock.lock();
+    int res = 0;
+    try {
+      res = makeCurrentImpl();
+
+      /* FIXME: refactor dependence on Java 2D / JOGL bridge
+      if ((tracker != null) &&
+          (res == CONTEXT_CURRENT_NEW)) {
+        // Increase reference count of GLObjectTracker
+        tracker.ref();
+      }
+      */
+    } catch (GLException e) {
+      lock.unlock();
+      throw(e);
+    }
+    if (res == CONTEXT_NOT_CURRENT) {
+      lock.unlock();
+    } else {
+      if(res == CONTEXT_CURRENT_NEW) {
+        // check if the drawable's and the GL's GLProfile are equal
+        // throws an GLException if not 
+        getGLDrawable().getGLProfile().verifyEquality(gl.getGLProfile());
+      }
+      setCurrent(this);
+
+      /* FIXME: refactor dependence on Java 2D / JOGL bridge
+
+      // Try cleaning up any stale server-side OpenGL objects
+      // FIXME: not sure what to do here if this throws
+      if (deletedObjectTracker != null) {
+        deletedObjectTracker.clean(getGL());
+      }
+      */
+    }
+    return res;
+  }
+
+  protected abstract int makeCurrentImpl() throws GLException;
+
+  public void release() throws GLException {
+    if (!lock.isHeld()) {
+      throw new GLException("Context not current on current thread");
+    }
+    setCurrent(null);
+    try {
+      releaseImpl();
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  protected abstract void releaseImpl() throws GLException;
+
+  public void destroy() {
+    if (lock.isHeld()) {
+        // release current context 
+        release();
+    }
+
+    // Must hold the lock around the destroy operation to make sure we
+    // don't destroy the context out from under another thread rendering to it
+    lock.lock();
+    try {
+      /* FIXME: refactor dependence on Java 2D / JOGL bridge
+      if (tracker != null) {
+        // Don't need to do anything for contexts that haven't been
+        // created yet
+        if (isCreated()) {
+          // If we are tracking creation and destruction of server-side
+          // OpenGL objects, we must decrement the reference count of the
+          // GLObjectTracker upon context destruction.
+          //
+          // Note that we can only eagerly delete these server-side
+          // objects if there is another context currrent right now
+          // which shares textures and display lists with this one.
+          tracker.unref(deletedObjectTracker);
+        }
+      }
+      */
+  
+      // 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();
+      }
+
+      if (bufferStateTracker != null) {
+          bufferStateTracker.clearBufferObjectState();
+      }
+  
+      if (glStateTracker != null) {
+          glStateTracker.clearStates(false);
+      }
+  
+      destroyImpl();
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  protected abstract void destroyImpl() throws GLException;
+
+  // This is only needed for Mac OS X on-screen contexts
+  protected void update() throws GLException {
+  }
+
+  public boolean isSynchronized() {
+    return !lock.getFailFastMode();
+  }
+
+  public void setSynchronized(boolean isSynchronized) {
+    lock.setFailFastMode(!isSynchronized);
+  }
+
+  public final GL getGL() {
+    return gl;
+  }
+
+  public GL setGL(GL gl) {
+    if(DEBUG) {
+        String sgl1 = (null!=this.gl)?this.gl.getClass().toString()+", "+this.gl.toString():new String("<null>");
+        String sgl2 = (null!=gl)?gl.getClass().toString()+", "+gl.toString():new String("<null>");
+        Exception e = new Exception("setGL: "+Thread.currentThread()+", "+sgl1+" -> "+sgl2);
+        e.printStackTrace();
+    }
+    this.gl = gl;
+    return gl;
+  }
+
+  public abstract Object getPlatformGLExtensions();
+
+  //----------------------------------------------------------------------
+  // Helpers for various context implementations
+  //
+
+  private Object createInstance(GLProfile glp, String suffix, Class[] cstrArgTypes, Object[] cstrArgs) {
+    return NWReflection.createInstance(glp.getGLImplBaseClassName()+suffix, cstrArgTypes, cstrArgs);
+  }
+
+  /** Create the GL for this context. */
+  protected GL createGL(GLProfile glp) {
+    GL gl = (GL) createInstance(glp, "Impl", new Class[] { GLProfile.class, GLContextImpl.class }, new Object[] { glp, this } );
+
+    /* FIXME: refactor dependence on Java 2D / JOGL bridge
+    if (tracker != null) {
+      gl.setObjectTracker(tracker);
+    }
+    */
+    return gl;
+  }
+  
+  public final ProcAddressTable getGLProcAddressTable() {
+    return glProcAddressTable;
+  }
+  
+  /**
+   * Shall return the platform extension ProcAddressTable,
+   * ie for GLXExt, EGLExt, ..
+   */
+  public abstract ProcAddressTable getPlatformExtProcAddressTable();
+
+  /**
+   * Pbuffer support; given that this is a GLContext associated with a
+   * pbuffer, binds this pbuffer to its texture target.
+   */
+  public abstract void bindPbufferToTexture();
+
+  /**
+   * Pbuffer support; given that this is a GLContext associated with a
+   * pbuffer, releases this pbuffer from its texture target.
+   */
+  public abstract void releasePbufferFromTexture();
+
+  public abstract ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3);
+
+  public void setSwapInterval(final int interval) {
+    GLContext current = getCurrent();
+    if (current != this) {
+        throw new GLException("This context is not current. Current context: "+current+
+                              ", this context "+this);
+    }
+    setSwapIntervalImpl(interval);
+  }
+
+  protected int currentSwapInterval = -1; // default: not set yet ..
+
+  public int getSwapInterval() {
+    return currentSwapInterval;
+  }
+
+  protected void setSwapIntervalImpl(final int interval) {
+    // nop per default ..
+  }
+
+  /** Maps the given "platform-independent" function name to a real function
+      name. Currently this is only used to map "glAllocateMemoryNV" and
+      associated routines to wglAllocateMemoryNV / glXAllocateMemoryNV. */
+  protected abstract String mapToRealGLFunctionName(String glFunctionName);
+
+  /** Maps the given "platform-independent" extension name to a real
+      function name. Currently this is only used to map
+      "GL_ARB_pbuffer" and "GL_ARB_pixel_format" to "WGL_ARB_pbuffer"
+      and "WGL_ARB_pixel_format" (not yet mapped to X11). */
+  protected abstract String mapToRealGLExtensionName(String glExtensionName);
+
+  /** Helper routine which resets a ProcAddressTable generated by the
+      GLEmitter by looking up anew all of its function pointers. */
+  protected void resetProcAddressTable(Object table) {
+    GLProcAddressHelper.resetProcAddressTable(table, getDrawableImpl().getDynamicLookupHelper() );
+  }
+
+  /** Indicates whether the underlying OpenGL context has been
+      created. This is used to manage sharing of display lists and
+      textures between contexts. */
+  public abstract boolean isCreated();
+
+  /**
+   * Sets the OpenGL implementation class and
+   * the cache of which GL functions are available for calling through this
+   * context. See {@link #isFunctionAvailable(String)} for more information on
+   * the definition of "available".
+   *
+   * @param force force the setting, even if is already being set.
+   *              This might be usefull if you change the OpenGL implementation.
+   */
+  protected void setGLFunctionAvailability(boolean force) {
+    if(null!=this.gl && null!=glProcAddressTable && !force) {
+        return; // already done and not forced
+    }
+    if(null==this.gl || force) {
+        setGL(createGL(getGLDrawable().getGLProfile()));
+    }
+
+    updateGLProcAddressTable();
+  }
+
+  /**
+   * Updates the cache of which GL functions are available for calling through this
+   * context. See {@link #isFunctionAvailable(String)} for more information on
+   * the definition of "available".
+   */
+  protected void updateGLProcAddressTable() {
+    if(null==this.gl) {
+        throw new GLException("setGLFunctionAvailability not called yet");
+    }
+    if (DEBUG) {
+      System.err.println(getThreadName() + ": !!! Initializing OpenGL extension address table for " + this);
+    }
+    if (glProcAddressTable == null) {
+      glProcAddressTable = (ProcAddressTable) createInstance(gl.getGLProfile(), "ProcAddressTable", new Class[0], null);
+      // FIXME: cache ProcAddressTables by capability bits so we can
+      // share them among contexts with the same capabilities
+    }
+    resetProcAddressTable(getGLProcAddressTable());
+
+    extensionAvailability.reset();
+  }
+
+  /**
+   * Returns true if the specified OpenGL core- or extension-function can be
+   * successfully called using this GL context given the current host (OpenGL
+   * <i>client</i>) and display (OpenGL <i>server</i>) configuration.
+   *
+   * See {@link GL#isFunctionAvailable(String)} for more details.
+   *
+   * @param glFunctionName the name of the OpenGL function (e.g., use
+   * "glPolygonOffsetEXT" or "glPolygonOffset" to check if the {@link
+   * javax.media.opengl.GL#glPolygonOffset(float,float)} is available).
+   */
+  public boolean isFunctionAvailable(String glFunctionName) {
+    if(isCreated()) {
+        // Check GL 1st (cached)
+        ProcAddressTable pTable = getGLProcAddressTable();
+        try {
+            if(0!=pTable.getAddressFor(glFunctionName)) {
+                return true;
+            }
+        } catch (Exception e) {}
+
+        // Check platform extensions 2nd (cached)
+        pTable = getPlatformExtProcAddressTable();
+        try {
+            if(0!=pTable.getAddressFor(glFunctionName)) {
+                return true;
+            }
+        } catch (Exception e) {}
+    }
+    // dynamic function lookup at last incl name aliasing (not cached)
+    DynamicLookupHelper dynLookup = getDrawableImpl().getDynamicLookupHelper();
+    String tmpBase = GLExtensionNames.normalizeVEN(GLExtensionNames.normalizeARB(glFunctionName, true), true);
+    long addr = 0;
+    int  variants = GLExtensionNames.getFuncNamePermutationNumber(tmpBase);
+    for(int i = 0; 0==addr && i < variants; i++) {
+        String tmp = GLExtensionNames.getFuncNamePermutation(tmpBase, i);
+        try {
+            addr = dynLookup.dynamicLookupFunction(tmp);
+        } catch (Exception e) { }
+    }
+    if(0!=addr) {
+        return true;
+    }
+    return false;
+  }
+
+  /**
+   * Returns true if the specified OpenGL extension can be
+   * successfully called using this GL context given the current host (OpenGL
+   * <i>client</i>) and display (OpenGL <i>server</i>) configuration.
+   *
+   * See {@link GL#isExtensionAvailable(String)} for more details.
+   *
+   * @param glExtensionName the name of the OpenGL extension (e.g.,
+   * "GL_VERTEX_PROGRAM_ARB").
+   */
+  public boolean isExtensionAvailable(String glExtensionName) {
+      return extensionAvailability.isExtensionAvailable(mapToRealGLExtensionName(glExtensionName));
+  }
+
+  public String getPlatformExtensionsString() {
+      return extensionAvailability.getPlatformExtensionsString();
+  }
+
+  public String getGLExtensions() {
+      return extensionAvailability.getGLExtensions();
+  }
+
+  public int getMajorVersion() {
+      return extensionAvailability.getMajorVersion();
+  }
+
+  public int getMinorVersion() {
+      return extensionAvailability.getMinorVersion();
+  }
+
+  public boolean isExtensionCacheInitialized() {
+      return extensionAvailability.isInitialized();
+  }
+
+  /** Indicates which floating-point pbuffer implementation is in
+      use. Returns one of GLPbuffer.APPLE_FLOAT, GLPbuffer.ATI_FLOAT,
+      or GLPbuffer.NV_FLOAT. */
+  public int getFloatingPointMode() throws GLException {
+    throw new GLException("Not supported on non-pbuffer contexts");
+  }
+
+  /** On some platforms the mismatch between OpenGL's coordinate
+      system (origin at bottom left) and the window system's
+      coordinate system (origin at top left) necessitates a vertical
+      flip of pixels read from offscreen contexts. */
+  public abstract boolean offscreenImageNeedsVerticalFlip();
+
+  /** Only called for offscreen contexts; needed by glReadPixels */
+  public abstract int getOffscreenContextPixelDataType();
+
+  protected static String getThreadName() {
+    return Thread.currentThread().getName();
+  }
+
+  public static String toHexString(long hex) {
+    return "0x" + Long.toHexString(hex);
+  }
+
+  //----------------------------------------------------------------------
+  // Helpers for buffer object optimizations
+  
+  public void setBufferSizeTracker(GLBufferSizeTracker bufferSizeTracker) {
+    this.bufferSizeTracker = bufferSizeTracker;
+  }
+
+  public GLBufferSizeTracker getBufferSizeTracker() {
+    return bufferSizeTracker;
+  }
+
+  public GLBufferStateTracker getBufferStateTracker() {
+    return bufferStateTracker;
+  }
+
+  public GLStateTracker getGLStateTracker() {
+    return glStateTracker;
+  }
+
+  //---------------------------------------------------------------------------
+  // Helpers for context optimization where the last context is left
+  // current on the OpenGL worker thread
+  //
+
+  public boolean isOptimizable() {
+    return optimizationEnabled;
+  }
+
+  public boolean hasWaiters() {
+    return lock.hasWaiters();
+  }
+
+  /* FIXME: needed only by the Java 2D / JOGL bridge; refactor
+
+  public GLContextImpl(GLContext shareWith) {
+    this(shareWith, false);
+  }
+  
+  public GLContextImpl(GLContext shareWith, boolean dontShareWithJava2D) {
+    extensionAvailability = new ExtensionAvailabilityCache(this);
+    GLContext shareContext = shareWith;
+    if (!dontShareWithJava2D) {
+      shareContext = Java2D.filterShareContext(shareWith);
+    }
+    if (shareContext != null) {
+      GLContextShareSet.registerSharing(this, shareContext);
+    }
+    // Always indicate real behind-the-scenes sharing to track deleted objects
+    if (shareContext == null) {
+      shareContext = Java2D.filterShareContext(shareWith);
+    }
+    GLContextShareSet.registerForObjectTracking(shareWith, this, shareContext);
+    GLContextShareSet.registerForBufferObjectSharing(shareWith, this);
+    // This must occur after the above calls into the
+    // GLContextShareSet, which set up state needed by the GL object
+    setGL(createGL());
+  }
+
+  //---------------------------------------------------------------------------
+  // Helpers for integration with Java2D/OpenGL pipeline when FBOs are
+  // being used
+  //
+
+  public void setObjectTracker(GLObjectTracker tracker) {
+    this.tracker = tracker;
+  }
+  
+  public GLObjectTracker getObjectTracker() {
+    return tracker;
+  }
+
+  public void setDeletedObjectTracker(GLObjectTracker deletedObjectTracker) {
+    this.deletedObjectTracker = deletedObjectTracker;
+  }
+
+  public GLObjectTracker getDeletedObjectTracker() {
+    return deletedObjectTracker;
+  }
+
+  // Tracks creation and deletion of server-side OpenGL objects when
+  // the Java2D/OpenGL pipeline is active and using FBOs to render
+  private GLObjectTracker tracker;
+  // Supports deletion of these objects when no other context is
+  // current which can support immediate deletion of them
+  private GLObjectTracker deletedObjectTracker;
+
+  */
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextLock.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextLock.java
new file mode 100644
index 000000000..56a5b023f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextLock.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import javax.media.opengl.*;
+
+/** Implements the makeCurrent / release locking behavior of the
+    GLContext class. When "fail fast mode" is enabled, attempts to
+    lock the same GLContextLock on more than one thread cause
+    GLException to be raised. This lock is not recursive. Attempts to
+    lock it more than once on a given thread will cause GLException to
+    be raised. */
+
+public class GLContextLock {
+  private Object lock = new Object();
+  private Thread owner;
+  private boolean failFastMode = true;
+  private volatile int waiters;
+
+  /** Locks this GLContextLock on the current thread. If fail fast
+      mode is enabled and the GLContextLock is already owned by
+      another thread, throws GLException. */
+  public void lock() throws GLException {
+    synchronized(lock) {
+      Thread current = Thread.currentThread();
+      if (owner == null) {
+        owner = current;
+      } else if (owner != current) {
+        while (owner != null) {
+          if (failFastMode) {
+            throw new GLException("Attempt to make context current on thread " + current +
+                                  " which is already current on thread " + owner);
+          } else {
+            try {
+              ++waiters;
+              lock.wait();
+            } catch (InterruptedException e) {
+              throw new GLException(e);
+            } finally {
+              --waiters;
+            }
+          }
+        }
+        owner = current;
+      } else {
+        throw new GLException("Attempt to make the same context current twice on thread " + current);
+      }
+    }
+  }
+
+  /** Unlocks this GLContextLock. */
+  public void unlock() throws GLException {
+    synchronized (lock) {
+      Thread current = Thread.currentThread();
+      if (owner == current) {
+        owner = null;
+        lock.notifyAll();
+      } else {
+        if (owner != null) {
+          throw new GLException("Attempt by thread " + current +
+                                " to release context owned by thread " + owner);
+        } else {
+          throw new GLException("Attempt by thread " + current +
+                                " to release unowned context");
+        }
+      }
+    }
+  }
+
+  /** Indicates whether this lock is held by the current thread. */
+  public boolean isHeld() {
+    synchronized(lock) {
+      Thread current = Thread.currentThread();
+      return (owner == current);
+    }
+  }
+
+  public void setFailFastMode(boolean onOrOff) {
+    failFastMode = onOrOff;
+  }
+
+  public boolean getFailFastMode() {
+    return failFastMode;
+  }
+
+  public boolean hasWaiters() {
+    return (waiters != 0);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextShareSet.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextShareSet.java
new file mode 100644
index 000000000..abeb231f4
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextShareSet.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+// FIXME: refactor Java SE dependencies
+// import java.awt.GraphicsConfiguration;
+// import java.awt.GraphicsDevice;
+// import java.awt.GraphicsEnvironment;
+import java.lang.ref.*;
+import java.util.*;
+import javax.media.opengl.*;
+
+/** Provides a mechanism by which OpenGL contexts can share textures
+    and display lists in the face of multithreading and asynchronous
+    context creation as is inherent in the AWT and Swing. */
+
+public class GLContextShareSet {
+  // FIXME: refactor Java SE dependencies
+  //  private static boolean forceTracking = Debug.isPropertyDefined("jogl.glcontext.forcetracking");
+  private static final boolean DEBUG = Debug.debug("GLContextShareSet");
+
+  // This class is implemented with a WeakHashMap that goes from the
+  // contexts as keys to a complex data structure as value that tracks
+  // context creation and deletion.
+
+  private static Map/*<GLContext, ShareSet>*/ shareMap = new WeakHashMap();
+  private static Object dummyValue = new Object();
+
+  private static class ShareSet {
+    private Map allShares       = new WeakHashMap();
+    private Map createdShares   = new WeakHashMap();
+    private Map destroyedShares = new WeakHashMap();
+
+    public void add(GLContext ctx) {
+      if (allShares.put(ctx, dummyValue) == null) {
+        // FIXME: downcast to GLContextImpl undesirable
+        if (((GLContextImpl) ctx).isCreated()) {
+          createdShares.put(ctx, dummyValue);
+        } else {
+          destroyedShares.put(ctx, dummyValue);
+        }
+      }      
+    }
+
+    public GLContext getCreatedShare(GLContext ignore) {
+      for (Iterator iter = createdShares.keySet().iterator(); iter.hasNext(); ) {
+        GLContext ctx = (GLContext) iter.next();
+        if (ctx != ignore) {
+          return ctx;
+        }
+      }
+      return null;
+    }
+
+    public void contextCreated(GLContext ctx) {
+      Object res = destroyedShares.remove(ctx);
+      assert res != null : "State of ShareSet corrupted; thought context " +
+        ctx + " should have been in destroyed set but wasn't";
+      res = createdShares.put(ctx, dummyValue);
+      assert res == null : "State of ShareSet corrupted; thought context " +
+        ctx + " shouldn't have been in created set but was";
+    }
+
+    public void contextDestroyed(GLContext ctx) {
+      Object res = createdShares.remove(ctx);
+      assert res != null : "State of ShareSet corrupted; thought context " +
+        ctx + " should have been in created set but wasn't";
+      res = destroyedShares.put(ctx, dummyValue);
+      assert res == null : "State of ShareSet corrupted; thought context " +
+        ctx + " shouldn't have been in destroyed set but was";
+    }
+  }
+
+  /** Indicate that contexts <code>share1</code> and
+      <code>share2</code> will share textures and display lists. Both
+      must be non-null. */
+  public static synchronized void registerSharing(GLContext share1, GLContext share2) {
+    if (share1 == null || share2 == null) {
+      throw new IllegalArgumentException("Both share1 and share2 must be non-null");
+    }
+    ShareSet share = entryFor(share1);
+    if (share == null) {
+      share = entryFor(share2);
+    }
+    if (share == null) {
+      share = new ShareSet();
+    }
+    share.add(share1);
+    share.add(share2);
+    addEntry(share1, share);
+    addEntry(share2, share);
+  }
+
+  public static synchronized GLContext getShareContext(GLContext contextToCreate) {
+    ShareSet share = entryFor(contextToCreate);
+    if (share == null) {
+      return null;
+    }
+    return share.getCreatedShare(contextToCreate);
+  }
+
+  public static synchronized void contextCreated(GLContext context) {
+    ShareSet share = entryFor(context);
+    if (share != null) {
+      share.contextCreated(context);
+    }
+  }
+
+  public static synchronized void contextDestroyed(GLContext context) {
+    ShareSet share = entryFor(context);
+    if (share != null) {
+      share.contextDestroyed(context);
+    }
+  }
+
+  /** In order to avoid glGet calls for buffer object checks related
+      to glVertexPointer, etc. calls as well as glMapBuffer calls, we
+      need to share the same GLBufferSizeTracker object between
+      contexts sharing textures and display lists. For now we keep
+      this mechanism orthogonal to the GLObjectTracker to hopefully
+      keep things easier to understand. (The GLObjectTracker is
+      currently only needed in a fairly esoteric case, when the
+      Java2D/JOGL bridge is active, but the GLBufferSizeTracker
+      mechanism is now always required.) */
+  public static void registerForBufferObjectSharing(GLContext olderContextOrNull, GLContext newContext) {
+    // FIXME: downcasts to GLContextImpl undesirable
+    GLContextImpl older = (GLContextImpl) olderContextOrNull;
+    GLContextImpl newer = (GLContextImpl) newContext;
+    GLBufferSizeTracker tracker = null;
+    if (older != null) {
+      tracker = older.getBufferSizeTracker();
+      assert (tracker != null)
+        : "registerForBufferObjectSharing was not called properly for the older context, or has a bug in it";
+    }
+    if (tracker == null) {
+      tracker = new GLBufferSizeTracker();
+    }
+    newer.setBufferSizeTracker(tracker);
+  }
+
+  // FIXME: refactor Java SE dependencies
+  //  /** Indicates that the two supplied contexts (which must be able to
+  //      share textures and display lists) should be in the same
+  //      namespace for tracking of server-side object creation and
+  //      deletion. Because the sharing necessary behind the scenes is
+  //      different than that requested at the user level, the two notions
+  //      are different. This must be called immediately after the
+  //      creation of the new context (which is the second argument)
+  //      before any server-side OpenGL objects have been created in that
+  //      context. */
+  //  public static void registerForObjectTracking(GLContext olderContextOrNull,
+  //                                               GLContext newContext,
+  //                                               GLContext realShareContext) {
+  //    if (isObjectTrackingEnabled() || isObjectTrackingDebuggingEnabled()) {
+  //      GLContextImpl impl1 = null;      
+  //      GLContextImpl impl2 = null;      
+  //      GLObjectTracker tracker = null;
+  //
+  //      synchronized (GLContextShareSet.class) {
+  //        if (olderContextOrNull != null &&
+  //            newContext != null) {
+  //          if (entryFor(olderContextOrNull) != entryFor(newContext)) {
+  //            throw new IllegalArgumentException("old and new contexts must be able to share textures and display lists");
+  //          }
+  //        }
+  //
+  //        // FIXME: downcast to GLContextImpl undesirable
+  //        impl1 = (GLContextImpl) olderContextOrNull;
+  //        impl2 = (GLContextImpl) newContext;
+  //
+  //        GLObjectTracker deletedObjectTracker = null;
+  //        GLContextImpl shareImpl = (GLContextImpl) realShareContext;
+  //        // Before we zap the "user-level" object trackers, make sure
+  //        // that all contexts in the share set share the destroyed object
+  //        // tracker
+  //        if (shareImpl != null) {
+  //          deletedObjectTracker = shareImpl.getDeletedObjectTracker();
+  //        }
+  //        if (deletedObjectTracker == null) {
+  //          // Must create one and possibly set it up in the older context
+  //          deletedObjectTracker = new GLObjectTracker();
+  //          if (DEBUG) {
+  //            System.err.println("Created deletedObjectTracker " + deletedObjectTracker + " because " +
+  //                               ((shareImpl == null) ? "shareImpl was null" : "shareImpl's (" + shareImpl + ") deletedObjectTracker was null"));
+  //          }
+  //
+  //          if (shareImpl != null) {
+  //            // FIXME: think should really assert in this case
+  //            shareImpl.setDeletedObjectTracker(deletedObjectTracker);
+  //            if (DEBUG) {
+  //              System.err.println("Set deletedObjectTracker " + deletedObjectTracker + " in shareImpl context " + shareImpl);
+  //            }
+  //          }
+  //        }
+  //        impl2.setDeletedObjectTracker(deletedObjectTracker);
+  //        if (DEBUG) {
+  //          System.err.println("Set deletedObjectTracker " + deletedObjectTracker + " in impl2 context " + impl2);
+  //        }
+  //      }
+  //
+  //      // Must not hold lock around this operation
+  //      // Don't share object trackers with the primordial share context from Java2D
+  //      if (Java2D.isOGLPipelineActive()) {
+  //        // FIXME: probably need to do something different here
+  //        // Need to be able to figure out the GraphicsDevice for the
+  //        // older context if it's on-screen
+  //        GraphicsDevice device = GraphicsEnvironment.
+  //          getLocalGraphicsEnvironment().
+  //          getDefaultScreenDevice();
+  //        GLContext j2dShareContext = Java2D.getShareContext(device);
+  //        if (impl1 != null && impl1 == j2dShareContext) {
+  //          impl1 = null;
+  //        }
+  //      }
+  //
+  //      synchronized (GLContextShareSet.class) {
+  //        if (impl1 != null) {
+  //          tracker = impl1.getObjectTracker();
+  //          assert (tracker != null)
+  //            : "registerForObjectTracking was not called properly for the older context";
+  //        }
+  //        if (tracker == null) {
+  //          tracker = new GLObjectTracker();
+  //        }
+  //        // Note that we don't assert that the tracker is non-null for
+  //        // impl2 because the way we use this functionality we actually
+  //        // overwrite the initially-set object tracker in the new context
+  //        impl2.setObjectTracker(tracker);
+  //      }
+  //    }
+  //  }
+  
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  
+
+  private static ShareSet entryFor(GLContext context) {
+    return (ShareSet) shareMap.get(context);
+  }
+
+  private static void addEntry(GLContext context, ShareSet share) {
+    if (shareMap.get(context) == null) {
+      shareMap.put(context, share);
+    }
+  }
+
+  // FIXME: refactor Java SE dependencies
+  //  private static boolean isObjectTrackingEnabled() {
+  //    return ((Java2D.isOGLPipelineActive() && Java2D.isFBOEnabled()) ||
+  //            isObjectTrackingDebuggingEnabled());
+  //  }
+  //
+  //  private static boolean isObjectTrackingDebuggingEnabled() {
+  //    return forceTracking;
+  //  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
new file mode 100644
index 000000000..20d0c8072
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
@@ -0,0 +1,377 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import java.nio.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.gluegen.runtime.*;
+import com.sun.nativewindow.impl.NWReflection;
+import java.lang.reflect.*;
+
+/** Extends GLDrawableFactory with a few methods for handling
+    typically software-accelerated offscreen rendering (Device
+    Independent Bitmaps on Windows, pixmaps on X11). Direct access to
+    these GLDrawables is not supplied directly to end users, though
+    they may be instantiated by the GLJPanel implementation. */
+public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
+  protected static final boolean DEBUG = Debug.debug("GLDrawableFactory");
+
+  //---------------------------------------------------------------------------
+  // Dispatching GLDrawable construction in respect to the NativeWindow Capabilities
+  //
+  public GLDrawable createGLDrawable(NativeWindow target) {
+    if (target == null) {
+      throw new IllegalArgumentException("Null target");
+    }
+    AbstractGraphicsConfiguration config = target.getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    GLCapabilities caps = (GLCapabilities) target.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
+    GLDrawable result = null;
+    if(caps.isOnscreen()) {
+        if(caps.isPBuffer()) {
+            throw new IllegalArgumentException("Onscreen target can't be PBuffer: "+caps);
+        }
+        if(DEBUG) {
+            System.out.println("GLDrawableFactoryImpl.createGLDrawable -> OnscreenDrawable: "+target);
+        }
+        result = createOnscreenDrawable(target);
+    } else {
+        if( ! ( target instanceof SurfaceChangeable ) ) {
+            throw new IllegalArgumentException("Passed NativeWindow must implement SurfaceChangeable for offscreen: "+target);
+        }
+        if(caps.isPBuffer() && canCreateGLPbuffer()) {
+            if(DEBUG) {
+                System.out.println("GLDrawableFactoryImpl.createGLDrawable -> PbufferDrawable: "+target);
+            }
+            result = createGLPbufferDrawable(target);
+        }
+        if(null==result) {
+            if(DEBUG) {
+                System.out.println("GLDrawableFactoryImpl.createGLDrawable -> OffScreenDrawable: "+target);
+            }
+            result = createOffscreenDrawable(target);
+        }
+    }
+    if(DEBUG) {
+        System.out.println("GLDrawableFactoryImpl.createGLDrawable: "+result);
+    }
+    return result;
+  }
+
+  //---------------------------------------------------------------------------
+  //
+  // Onscreen GLDrawable construction 
+  //
+
+  protected abstract GLDrawableImpl createOnscreenDrawable(NativeWindow target);
+
+  //---------------------------------------------------------------------------
+  //
+  // PBuffer GLDrawable construction 
+  //
+
+  /** Target must implement SurfaceChangeable */
+  protected abstract GLDrawableImpl createGLPbufferDrawableImpl(NativeWindow target);
+
+  protected GLDrawableImpl createGLPbufferDrawable(NativeWindow target) {
+    if (!canCreateGLPbuffer()) {
+        throw new GLException("Pbuffer support not available with current graphics card");
+    }
+    return createGLPbufferDrawableImpl(target);
+  }
+
+  public GLDrawable createGLPbufferDrawable(GLCapabilities capabilities,
+                                            GLCapabilitiesChooser chooser,
+                                            int width,
+                                            int height) {
+    if(height<=0 || height<=0) {
+        throw new GLException("Width and height of pbuffer must be positive (were (" +
+                        width + ", " + height + "))");
+    }
+    capabilities.setDoubleBuffered(false); // FIXME
+    capabilities.setOnscreen(false);
+    capabilities.setPBuffer(true);
+    return createGLPbufferDrawable( createOffscreenWindow(capabilities, chooser, height, height) );
+  }
+
+  public GLPbuffer createGLPbuffer(GLCapabilities capabilities,
+                                   GLCapabilitiesChooser chooser,
+                                   int width,
+                                   int height,
+                                   GLContext shareWith) {
+    return new GLPbufferImpl( (GLDrawableImpl) createGLPbufferDrawable(capabilities, chooser, height, height),
+                              shareWith);
+  }
+
+
+  //---------------------------------------------------------------------------
+  //
+  // Offscreen GLDrawable construction 
+  //
+
+  protected abstract GLDrawableImpl createOffscreenDrawable(NativeWindow target) ;
+
+  public GLDrawable createOffscreenDrawable(GLCapabilities capabilities,
+                                            GLCapabilitiesChooser chooser,
+                                            int width,
+                                            int height) {
+    if(width<=0 || height<=0) {
+        throw new GLException("Width and height of pbuffer must be positive (were (" +
+                        width + ", " + height + "))");
+    }
+    capabilities.setDoubleBuffered(false); // FIXME
+    capabilities.setOnscreen(false);
+    capabilities.setPBuffer(false);
+    return createOffscreenDrawable( createOffscreenWindow(capabilities, chooser, width, height) );
+  }
+
+  /**
+   * creates an offscreen NativeWindow, which must implement SurfaceChangeable as well,
+   * so the windowing system related implementation is able to set the surface handle.
+   */
+  protected abstract NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, 
+                                                        int width, int height);
+
+  protected GLDrawableFactoryImpl() {
+    super();
+  }
+
+  protected void maybeDoSingleThreadedWorkaround(Runnable action) {
+    if (Threading.isSingleThreaded() &&
+        !Threading.isOpenGLThread()) {
+      Threading.invokeOnOpenGLThread(action);
+    } else {
+      action.run();
+    }
+  }
+
+  /**
+   * Returns the sole GLDrawableFactoryImpl instance.
+   *
+   * @param glProfile GLProfile to determine the factory type, ie EGLDrawableFactory,
+   *                or one of the native GLDrawableFactory's, ie X11/GLX, Windows/WGL or MacOSX/CGL.
+   */
+  public static GLDrawableFactoryImpl getFactoryImpl(GLProfile glp) {
+    return (GLDrawableFactoryImpl) getFactory(glp);
+  }
+
+  // Helper function for more lazily loading the GLU library;
+  // apparently can't use System.loadLibrary on UNIX because it uses
+  // RTLD_LOCAL and we need to call dlsym(RTLD_DEFAULT)
+  public abstract void loadGLULibrary();
+
+  //----------------------------------------------------------------------
+  // Support for locking and unlocking the toolkit -- needed only on X11 platforms
+  //
+
+  public void lockToolkit() {
+    NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
+  }
+
+  public void unlockToolkit() {
+    NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
+  }
+
+  //---------------------------------------------------------------------------
+  // Support for Java2D/JOGL bridge on Mac OS X; the external
+  // GLDrawable mechanism in the public API is sufficient to
+  // implement this functionality on all other platforms
+  //
+
+  public abstract boolean canCreateContextOnJava2DSurface();
+
+  public abstract GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
+    throws GLException;
+
+  //----------------------------------------------------------------------
+  // Gamma adjustment support
+  // Thanks to the LWJGL team for illustrating how to make these
+  // adjustments on various OSs.
+
+  /*
+   * Portions Copyright (c) 2002-2004 LWJGL Project
+   * All rights reserved.
+   *
+   * Redistribution and use in source and binary forms, with or without
+   * modification, are permitted provided that the following conditions are
+   * met:
+   *
+   * * Redistributions of source code must retain the above copyright
+   *   notice, this list of conditions and the following disclaimer.
+   *
+   * * Redistributions in binary form must reproduce the above copyright
+   *   notice, this list of conditions and the following disclaimer in the
+   *   documentation and/or other materials provided with the distribution.
+   *
+   * * Neither the name of 'LWJGL' nor the names of
+   *   its contributors may be used to endorse or promote products derived
+   *   from this software without specific prior written permission.
+   *
+   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+   * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   */
+
+  /**
+   * Sets the gamma, brightness, and contrast of the current main
+   * display. Returns true if the settings were changed, false if
+   * not. If this method returns true, the display settings will
+   * automatically be reset upon JVM exit (assuming the JVM does not
+   * crash); if the user wishes to change the display settings back to
+   * normal ahead of time, use resetDisplayGamma(). Throws
+   * IllegalArgumentException if any of the parameters were
+   * out-of-bounds.
+   * 
+   * @param gamma The gamma value, typically > 1.0 (default value is
+   *   1.0)
+   * @param brightness The brightness value between -1.0 and 1.0,
+   *   inclusive (default value is 0)
+   * @param contrast The contrast, greater than 0.0 (default value is 1)
+   * @throws IllegalArgumentException if any of the parameters were
+   *   out-of-bounds
+   */
+  public boolean setDisplayGamma(float gamma, float brightness, float contrast) throws IllegalArgumentException {
+    if ((brightness < -1.0f) || (brightness > 1.0f)) {
+      throw new IllegalArgumentException("Brightness must be between -1.0 and 1.0");
+    }
+    if (contrast < 0) {
+      throw new IllegalArgumentException("Contrast must be greater than 0.0");
+    }
+    // FIXME: ensure gamma is > 1.0? Are smaller / negative values legal?
+    int rampLength = getGammaRampLength();
+    if (rampLength == 0) {
+      return false;
+    }
+    float[] gammaRamp = new float[rampLength];
+    for (int i = 0; i < rampLength; i++) {
+      float intensity = (float) i / (float) (rampLength - 1);
+      // apply gamma
+      float rampEntry = (float) java.lang.Math.pow(intensity, gamma);
+      // apply brightness
+      rampEntry += brightness;
+      // apply contrast
+      rampEntry = (rampEntry - 0.5f) * contrast + 0.5f;
+      // Clamp entry to [0, 1]
+      if (rampEntry > 1.0f)
+        rampEntry = 1.0f;
+      else if (rampEntry < 0.0f)
+        rampEntry = 0.0f;
+      gammaRamp[i] = rampEntry;
+    }
+    registerGammaShutdownHook();
+    return setGammaRamp(gammaRamp);
+  }
+
+  public synchronized void resetDisplayGamma() {
+    if (gammaShutdownHook == null) {
+      throw new IllegalArgumentException("Should not call this unless setDisplayGamma called first");
+    }
+    resetGammaRamp(originalGammaRamp);
+    unregisterGammeShutdownHook();
+  }
+
+  //------------------------------------------------------
+  // Gamma-related methods to be implemented by subclasses
+  //
+
+  /** Returns the length of the computed gamma ramp for this OS and
+      hardware. Returns 0 if gamma changes are not supported. */
+  protected int getGammaRampLength() {
+    return 0;
+  }
+
+  /** Sets the gamma ramp for the main screen. Returns false if gamma
+      ramp changes were not supported. */
+  protected boolean setGammaRamp(float[] ramp) {
+    return false;
+  }
+
+  /** Gets the current gamma ramp. This is basically an opaque value
+      used only on some platforms to reset the gamma ramp to its
+      original settings. */
+  protected Buffer getGammaRamp() {
+    return null;
+  }
+
+  /** Resets the gamma ramp, potentially using the specified Buffer as
+      data to restore the original values. */
+  protected void resetGammaRamp(Buffer originalGammaRamp) {
+  }
+
+  // Shutdown hook mechanism for resetting gamma
+  private boolean gammaShutdownHookRegistered;
+  private Thread  gammaShutdownHook;
+  private Buffer  originalGammaRamp;
+  private synchronized void registerGammaShutdownHook() {
+    if (gammaShutdownHookRegistered)
+      return;
+    if (gammaShutdownHook == null) {
+      gammaShutdownHook = new Thread(new Runnable() {
+          public void run() {
+            synchronized (GLDrawableFactoryImpl.this) {
+              resetGammaRamp(originalGammaRamp);
+            }
+          }
+        });
+      originalGammaRamp = getGammaRamp();
+    }
+    Runtime.getRuntime().addShutdownHook(gammaShutdownHook);
+    gammaShutdownHookRegistered = true;
+  }
+
+  private synchronized void unregisterGammeShutdownHook() {
+    if (!gammaShutdownHookRegistered)
+      return;
+    if (gammaShutdownHook == null) {
+      throw new InternalError("Error in gamma shutdown hook logic");
+    }
+    Runtime.getRuntime().removeShutdownHook(gammaShutdownHook);
+    gammaShutdownHookRegistered = false;
+    // Leave the original gamma ramp data alone
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java
new file mode 100644
index 000000000..7a4e84081
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import java.util.*;
+import javax.media.opengl.*;
+
+/** Encapsulates the implementation of most of the GLAutoDrawable's
+    methods to be able to share it between GLCanvas and GLJPanel. */
+
+public class GLDrawableHelper {
+  private volatile List listeners = new ArrayList();
+  private static final boolean DEBUG = Debug.debug("GLDrawableHelper");
+  private static final boolean VERBOSE = Debug.verbose();
+  private static final boolean NVIDIA_CRASH_WORKAROUND = Debug.isPropertyDefined("jogl.nvidia.crash.workaround", true);
+  private boolean autoSwapBufferMode = true;
+
+  public GLDrawableHelper() {
+  }
+
+  public synchronized String toString() {
+    StringBuffer sb = new StringBuffer();
+    sb.append("GLEventListeners num "+listeners.size()+" [");
+    for (Iterator iter = listeners.iterator(); iter.hasNext(); ) {
+      sb.append(iter.next()+", ");
+    }
+    sb.append("]");
+    return sb.toString();
+  }
+
+  public synchronized void addGLEventListener(GLEventListener listener) {
+    List newListeners = (List) ((ArrayList) listeners).clone();
+    newListeners.add(listener);
+    listeners = newListeners;
+  }
+  
+  public synchronized void removeGLEventListener(GLEventListener listener) {
+    List newListeners = (List) ((ArrayList) listeners).clone();
+    newListeners.remove(listener);
+    listeners = newListeners;
+  }
+
+  public synchronized void dispose(GLAutoDrawable drawable) {
+    for (Iterator iter = listeners.iterator(); iter.hasNext(); ) {
+      ((GLEventListener) iter.next()).dispose(drawable);
+    }
+  }
+
+  public void init(GLAutoDrawable drawable) {
+    for (Iterator iter = listeners.iterator(); iter.hasNext(); ) {
+      ((GLEventListener) iter.next()).init(drawable);
+    }
+  }
+
+  public void display(GLAutoDrawable drawable) {
+    for (Iterator iter = listeners.iterator(); iter.hasNext(); ) {
+      ((GLEventListener) iter.next()).display(drawable);
+    }
+  }
+
+  public void reshape(GLAutoDrawable drawable,
+                      int x, int y, int width, int height) {
+    for (Iterator iter = listeners.iterator(); iter.hasNext(); ) {
+      ((GLEventListener) iter.next()).reshape(drawable, x, y, width, height);
+    }
+  }
+
+  public void setAutoSwapBufferMode(boolean onOrOff) {
+    autoSwapBufferMode = onOrOff;
+  }
+
+  public boolean getAutoSwapBufferMode() {
+    return autoSwapBufferMode;
+  }
+
+  private static final ThreadLocal perThreadInitAction = new ThreadLocal();
+  /** Principal helper method which runs a Runnable with the context
+      made current. This could have been made part of GLContext, but a
+      desired goal is to be able to implement the GLCanvas in terms of
+      the GLContext's public APIs, and putting it into a separate
+      class helps ensure that we don't inadvertently use private
+      methods of the GLContext or its implementing classes. */
+  public void invokeGL(GLDrawable drawable,
+                       GLContext context,
+                       Runnable  runnable,
+                       Runnable  initAction) {
+    if(null==context) {
+        if (DEBUG) {
+            Exception e = new GLException(Thread.currentThread().getName()+" GLDrawableHelper " + this + ".invokeGL(): NULL GLContext");
+            e.printStackTrace();
+        }
+        return;
+    }
+    // Support for recursive makeCurrent() calls as well as calling
+    // other drawables' display() methods from within another one's
+    GLContext lastContext    = GLContext.getCurrent();
+    Runnable  lastInitAction = (Runnable) perThreadInitAction.get();
+    if (lastContext != null) {
+      lastContext.release();
+    }
+  
+    int res = 0;
+    try {
+      res = context.makeCurrent();
+      if (res != GLContext.CONTEXT_NOT_CURRENT) {
+        if(null!=initAction) {
+            perThreadInitAction.set(initAction);
+            if (res == GLContext.CONTEXT_CURRENT_NEW) {
+              if (DEBUG) {
+                System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running initAction");
+              }
+              initAction.run();
+            }
+        }
+        if(null!=runnable) {
+            if (DEBUG && VERBOSE) {
+              System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running runnable");
+            }
+            runnable.run();
+            if (autoSwapBufferMode) {
+              if (drawable != null) {
+                drawable.swapBuffers();
+              }
+            }
+        }
+      }
+    } finally {
+      try {
+        if (res != GLContext.CONTEXT_NOT_CURRENT) {
+          context.release();
+        }
+      } catch (Exception e) {
+      }
+      if (lastContext != null) {
+        int res2 = lastContext.makeCurrent();
+        if (res2 == GLContext.CONTEXT_CURRENT_NEW) {
+          lastInitAction.run();
+        }
+      }
+    }
+  }
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
new file mode 100644
index 000000000..20bf20c20
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
+
+public abstract class GLDrawableImpl implements GLDrawable {
+  protected static final boolean DEBUG = Debug.debug("GLDrawable");
+
+  protected GLDrawableImpl(GLDrawableFactory factory,
+                           NativeWindow comp,
+                           boolean realized) {
+      this.factory = factory;
+      this.component = comp;
+      this.realized = realized;
+      this.requestedCapabilities = (GLCapabilities)component.getGraphicsConfiguration().getNativeGraphicsConfiguration().getRequestedCapabilities(); // a copy ..
+  }
+
+  /** 
+   * Returns the DynamicLookupHelper
+   */
+  public abstract DynamicLookupHelper getDynamicLookupHelper();
+
+  public GLDrawableFactoryImpl getFactoryImpl() {
+    return (GLDrawableFactoryImpl) getFactory();
+  }
+
+  /** For offscreen GLDrawables (pbuffers and "pixmap" drawables),
+      indicates that native resources should be reclaimed. */
+  public void destroy() {
+    throw new GLException("Should not call this (should only be called for offscreen GLDrawables)");
+  }
+
+  public void swapBuffers() throws GLException {
+    GLCapabilities caps = (GLCapabilities)component.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
+    if ( caps.getDoubleBuffered() ) {
+        if(!component.surfaceSwap()) {
+            swapBuffersImpl();
+        }
+    } else {
+        GLContext ctx = GLContext.getCurrent();
+        if(null!=ctx && ctx.getGLDrawable()==this) { 
+            ctx.getGL().glFinish();
+        }
+    }
+    component.surfaceUpdated(this, component, System.currentTimeMillis());
+  }
+
+  protected abstract void swapBuffersImpl();
+
+  public static String toHexString(long hex) {
+    return GLContextImpl.toHexString(hex);
+  }
+
+  public GLProfile getGLProfile() {
+    return requestedCapabilities.getGLProfile();
+  }
+
+  public GLCapabilities getChosenGLCapabilities() {
+    return  (GLCapabilities)component.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities(); // a copy
+  }
+
+  public GLCapabilities getRequestedGLCapabilities() {
+    return requestedCapabilities;
+  }
+
+  public NativeWindow getNativeWindow() {
+    return component;
+  }
+
+  public GLDrawableFactory getFactory() {
+    return factory;
+  }
+
+  public void setRealized(boolean realized) {
+    if ( this.realized != realized ) {
+        if(DEBUG) {
+            System.err.println("setRealized: "+getClass().getName()+" "+this.realized+" -> "+realized);
+        }
+        this.realized = realized;
+        setRealizedImpl();
+    } else if(DEBUG) {
+        System.err.println("setRealized: "+getClass().getName()+" "+this.realized+" == "+realized);
+    }
+  }
+  protected abstract void setRealizedImpl();
+
+  public boolean getRealized() {
+    return realized;
+  }
+
+  public int getWidth() {
+    return component.getWidth();
+  }
+
+  /** Returns the current height of this GLDrawable. */
+  public int getHeight() {
+    return component.getHeight();
+  }
+
+  public int lockSurface() throws GLException {
+    if (!realized) {
+      return NativeWindow.LOCK_SURFACE_NOT_READY;
+    }
+    return component.lockSurface();
+  }
+
+  public void unlockSurface() {
+    component.unlockSurface();
+  }
+
+  public boolean isSurfaceLocked() {
+    return component.isSurfaceLocked();
+  }
+
+  public String toString() {
+    return getClass().getName()+"[realized "+getRealized()+
+                ",\n\tfactory   "+getFactory()+
+                ",\n\twindow    "+getNativeWindow()+
+                ",\n\trequested "+getRequestedGLCapabilities()+
+                ",\n\tchosen    "+getChosenGLCapabilities()+"]";
+  }
+
+  protected GLDrawableFactory factory;
+  protected NativeWindow component;
+  protected GLCapabilities requestedCapabilities;
+
+  // Indicates whether the component (if an onscreen context) has been
+  // realized. Plausibly, before the component is realized the JAWT
+  // should return an error or NULL object from some of its
+  // operations; this appears to be the case on Win32 but is not true
+  // at least with Sun's current X11 implementation (1.4.x), which
+  // crashes with no other error reported if the DrawingSurfaceInfo is
+  // fetched from a locked DrawingSurface during the validation as a
+  // result of calling show() on the main thread. To work around this
+  // we prevent any JAWT or OpenGL operations from being done until
+  // addNotify() is called on the component.
+  protected boolean realized;
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLPbufferImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLPbufferImpl.java
new file mode 100644
index 000000000..dd8d980a6
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLPbufferImpl.java
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+/**
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.event.*;
+import java.beans.PropertyChangeListener;
+ */
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+
+/** Platform-independent class exposing pbuffer functionality to
+    applications. This class is not exposed in the public API as it
+    would probably add no value; however it implements the GLDrawable
+    interface so can be interacted with via its display() method. */
+
+public class GLPbufferImpl implements GLPbuffer {
+  private GLDrawableImpl pbufferDrawable;
+  private GLContextImpl context;
+  private GLDrawableHelper drawableHelper = new GLDrawableHelper();
+  private int floatMode;
+
+  public GLPbufferImpl(GLDrawableImpl pbufferDrawable,
+                       GLContext parentContext) {
+    GLCapabilities caps = (GLCapabilities) 
+         pbufferDrawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
+    if(caps.isOnscreen()) {
+        if(caps.isPBuffer()) {
+            throw new IllegalArgumentException("Error: Given drawable is Onscreen and Pbuffer: "+pbufferDrawable);
+        }
+        throw new IllegalArgumentException("Error: Given drawable is Onscreen: "+pbufferDrawable);
+    } else {
+        if(!caps.isPBuffer()) {
+            throw new IllegalArgumentException("Error: Given drawable is not Pbuffer: "+pbufferDrawable);
+        }
+    }
+    this.pbufferDrawable = pbufferDrawable;
+    context = (GLContextImpl) pbufferDrawable.createContext(parentContext);
+    context.setSynchronized(true);
+  }
+
+  public GLContext createContext(GLContext shareWith) {
+    return pbufferDrawable.createContext(shareWith);
+  }
+
+  public void setRealized(boolean realized) {
+  }
+
+  public void setSize(int width, int height) {
+    // FIXME
+    throw new GLException("Not yet implemented");
+  }
+
+  public NativeWindow getNativeWindow() {
+      return pbufferDrawable.getNativeWindow();
+  }
+
+  public GLDrawableFactory getFactory() {
+      return pbufferDrawable.getFactory();
+  }
+
+  public int getWidth() {
+    return pbufferDrawable.getWidth();
+  }
+
+  public int getHeight() {
+    return pbufferDrawable.getHeight();
+  }
+
+  public void display() {
+    maybeDoSingleThreadedWorkaround(displayOnEventDispatchThreadAction,
+                                    displayAction,
+                                    false);
+  }
+
+  public void repaint() {
+    display();
+  }
+
+  public void addGLEventListener(GLEventListener listener) {
+    drawableHelper.addGLEventListener(listener);
+  }
+
+  public void removeGLEventListener(GLEventListener listener) {
+    drawableHelper.removeGLEventListener(listener);
+  }
+
+  public void setContext(GLContext ctx) {
+    context=(GLContextImpl)ctx;
+  }
+
+  public GLContext getContext() {
+    return context;
+  }
+
+  public GLDrawable getDrawable() {
+    return pbufferDrawable;
+  }
+
+  public GL getGL() {
+    return getContext().getGL();
+  }
+
+  public GL setGL(GL gl) {
+    return getContext().setGL(gl);
+  }
+
+  public void setAutoSwapBufferMode(boolean onOrOff) {
+    drawableHelper.setAutoSwapBufferMode(onOrOff);
+  }
+
+  public boolean getAutoSwapBufferMode() {
+    return drawableHelper.getAutoSwapBufferMode();
+  }
+
+  public void swapBuffers() {
+    maybeDoSingleThreadedWorkaround(swapBuffersOnEventDispatchThreadAction, swapBuffersAction, false);
+  }
+
+  public void bindTexture() {
+    // Doesn't make much sense to try to do this on the event dispatch
+    // thread given that it has to be called while the context is current
+    context.bindPbufferToTexture();
+  }
+
+  public void releaseTexture() {
+    // Doesn't make much sense to try to do this on the event dispatch
+    // thread given that it has to be called while the context is current
+    context.releasePbufferFromTexture();
+  }
+
+  public GLCapabilities getChosenGLCapabilities() {
+    if (pbufferDrawable == null)
+      return null;
+
+    return pbufferDrawable.getChosenGLCapabilities();
+  }
+
+  public GLCapabilities getRequestedGLCapabilities() {
+    if (pbufferDrawable == null)
+      return null;
+
+    return pbufferDrawable.getRequestedGLCapabilities();
+  }
+
+  public GLProfile getGLProfile() {
+    if (pbufferDrawable == null)
+      return null;
+
+    return pbufferDrawable.getGLProfile();
+  }
+
+  private boolean surfaceLocked = false;
+
+  public int lockSurface() throws GLException {
+    surfaceLocked=true;
+    return NativeWindow.LOCK_SUCCESS;
+  }
+
+  public void unlockSurface() {
+    surfaceLocked=false;
+  }
+
+  public boolean isSurfaceLocked() {
+    return surfaceLocked;
+  }
+
+  //----------------------------------------------------------------------
+  // No-ops for ComponentEvents
+  //
+
+  /*
+  public void addComponentListener(ComponentListener l) {}
+  public void removeComponentListener(ComponentListener l) {}
+  public void addFocusListener(FocusListener l) {}
+  public void removeFocusListener(FocusListener l) {}
+  public void addHierarchyBoundsListener(HierarchyBoundsListener l) {}
+  public void removeHierarchyBoundsListener(HierarchyBoundsListener l) {}
+  public void addHierarchyListener(HierarchyListener l) {}
+  public void removeHierarchyListener(HierarchyListener l) {}
+  public void addInputMethodListener(InputMethodListener l) {}
+  public void removeInputMethodListener(InputMethodListener l) {}
+  public void addKeyListener(KeyListener l) {}
+  public void removeKeyListener(KeyListener l) {}
+  public void addMouseListener(MouseListener l) {}
+  public void removeMouseListener(MouseListener l) {}
+  public void addMouseMotionListener(MouseMotionListener l) {}
+  public void removeMouseMotionListener(MouseMotionListener l) {}
+  public void addMouseWheelListener(MouseWheelListener l) {}
+  public void removeMouseWheelListener(MouseWheelListener l) {}
+  public void addPropertyChangeListener(PropertyChangeListener listener) {}
+  public void removePropertyChangeListener(PropertyChangeListener listener) {}
+  public void addPropertyChangeListener(String propertyName,
+                                        PropertyChangeListener listener) {}
+  public void removePropertyChangeListener(String propertyName,
+                                           PropertyChangeListener listener) {}
+                                           */
+
+  public void destroy() {
+    // FIXME: not calling event listeners .. see GLAutoDrawable spec
+    if (Threading.isSingleThreaded() &&
+        !Threading.isOpenGLThread()) {
+      Threading.invokeOnOpenGLThread(destroyAction);
+    } else {
+      destroyAction.run();
+    }
+  }
+
+  public int getFloatingPointMode() {
+    if (floatMode == 0) {
+      throw new GLException("Pbuffer not initialized, or floating-point support not requested");
+    }
+    return floatMode;
+  }
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  private void maybeDoSingleThreadedWorkaround(Runnable eventDispatchThreadAction,
+                                               Runnable invokeGLAction,
+                                               boolean  isReshape) {
+    if (Threading.isSingleThreaded() &&
+        !Threading.isOpenGLThread()) {
+      Threading.invokeOnOpenGLThread(eventDispatchThreadAction);
+    } else {
+      drawableHelper.invokeGL(pbufferDrawable, context, invokeGLAction, initAction);
+    }
+  }
+
+  class InitAction implements Runnable {
+    public void run() {
+      floatMode = context.getFloatingPointMode();
+      drawableHelper.init(GLPbufferImpl.this);
+    }
+  }
+  private InitAction initAction = new InitAction();
+  
+  class DisplayAction implements Runnable {
+    public void run() {
+      drawableHelper.display(GLPbufferImpl.this);
+    }
+  }
+  private DisplayAction displayAction = new DisplayAction();
+
+  class SwapBuffersAction implements Runnable {
+    public void run() {
+      pbufferDrawable.swapBuffers();
+    }
+  }
+  private SwapBuffersAction swapBuffersAction = new SwapBuffersAction();
+
+  // Workaround for ATI driver bugs related to multithreading issues
+  // like simultaneous rendering via Animators to canvases that are
+  // being resized on the AWT event dispatch thread
+  class DisplayOnEventDispatchThreadAction implements Runnable {
+    public void run() {
+      drawableHelper.invokeGL(pbufferDrawable, context, displayAction, initAction);
+    }
+  }
+  private DisplayOnEventDispatchThreadAction displayOnEventDispatchThreadAction =
+    new DisplayOnEventDispatchThreadAction();
+  class SwapBuffersOnEventDispatchThreadAction implements Runnable {
+    public void run() {
+      drawableHelper.invokeGL(pbufferDrawable, context, swapBuffersAction, initAction);
+    }
+  }
+  private SwapBuffersOnEventDispatchThreadAction swapBuffersOnEventDispatchThreadAction =
+    new SwapBuffersOnEventDispatchThreadAction();
+
+  class DestroyAction implements Runnable {
+    public void run() {
+      if (null != context) {
+          context.destroy();
+      }
+      pbufferDrawable.destroy();
+    }
+  }
+  private DestroyAction destroyAction = new DestroyAction();
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLStateTracker.java b/src/jogl/classes/com/jogamp/opengl/impl/GLStateTracker.java
new file mode 100755
index 000000000..744e7b924
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLStateTracker.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import java.util.*;
+import javax.media.opengl.*;
+
+/**
+ * Tracks as closely as possible OpenGL states.
+ * GLStateTracker objects are allocated on a per-OpenGL-context basis.
+ * <p>
+ * Currently supported states: PixelStorei
+ */
+
+public class GLStateTracker {
+  private static final boolean DEBUG = Debug.debug("GLStateTracker");
+
+  private volatile boolean enabled = true;
+
+  private Map/*<Integer,Integer>*/ pixelStateMap = new HashMap/*<Integer,Integer>*/();
+
+  static class SavedState {
+    SavedState() {
+        this.pixelStateMap = null;
+    }
+    void putPixelStateMap(Map pixelStateMap) {
+        this.pixelStateMap = new HashMap();
+        this.pixelStateMap.putAll(pixelStateMap);
+    }
+    Map getPixelStateMap() { return pixelStateMap; }
+
+    private Map pixelStateMap;
+    // private Map otherStateMap;
+  }
+  private List/*<SavedState>*/ stack = new ArrayList();
+
+  public GLStateTracker() {
+    resetStates();
+  }
+
+  public void clearStates(boolean enable) {
+    enabled = enable;    
+    pixelStateMap.clear();
+  }
+
+  public void setEnabled(boolean on) {
+    enabled = on;    
+  }
+
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  public boolean getInt(int pname, int[] params, int params_offset) {
+    if(enabled) {
+        Integer key = boxKey(pname);
+        if(null!=key) {
+            Integer value = (Integer) pixelStateMap.get(key);
+            if(null!=value) {
+                params[params_offset] = value.intValue();
+            } else {
+                GLException re = new GLException("Key (0x"+Integer.toHexString(key.intValue())+") is not mapped");
+                throw re;
+            }
+            return true;
+        }
+    }
+    return false;
+  }
+
+  public boolean getInt(int pname, java.nio.IntBuffer params, int dummy) {
+    if(enabled) {
+        Integer key = boxKey(pname);
+        if(null!=key) {
+            Integer value = (Integer) pixelStateMap.get(key);
+            if(null!=value) {
+                params.put(params.position(), value.intValue());
+            } else {
+                GLException re = new GLException("Key (0x"+Integer.toHexString(key.intValue())+") is not mapped");
+                throw re;
+            }
+            return true;
+        }
+    }
+    return false;
+  }
+
+  public void setInt(int pname, int param) {
+    if(enabled) {
+        Integer key = boxKey(pname);
+        if(null!=key) {
+            pixelStateMap.put(key, boxInt(param));
+        }
+    }
+  }
+
+  public void pushAttrib(int flags) {
+    if(enabled) {
+        SavedState state = new SavedState();
+        if( 0 != (flags&GL2.GL_CLIENT_PIXEL_STORE_BIT) ) {
+            state.putPixelStateMap(pixelStateMap);
+        }
+        stack.add(0, state);
+    }
+  }
+
+  public void popAttrib() {
+    if(enabled) {
+        if(stack.size()==0) {
+            throw new GLException("stack contains no elements");
+        }
+        SavedState state = (SavedState) stack.remove(0);
+        if(null==state) {
+            throw new GLException("null stack element (remaining stack size "+stack.size()+")");
+        }
+
+        Map/*<Integer,Integer>*/ pixelStateMapNew = new HashMap/*<Integer,Integer>*/();
+        if ( null != state.getPixelStateMap() ) {
+            pixelStateMapNew.putAll(state.getPixelStateMap());
+        }
+        pixelStateMap = pixelStateMapNew;
+    }
+  }
+
+  private static final Integer GL_PACK_SWAP_BYTES   = new Integer(GL2GL3.GL_PACK_SWAP_BYTES);
+  private static final Integer GL_PACK_LSB_FIRST    = new Integer(GL2GL3.GL_PACK_LSB_FIRST);
+  private static final Integer GL_PACK_ROW_LENGTH   = new Integer(GL2GL3.GL_PACK_ROW_LENGTH);
+  private static final Integer GL_PACK_SKIP_ROWS    = new Integer(GL2GL3.GL_PACK_SKIP_ROWS);
+  private static final Integer GL_PACK_SKIP_PIXELS  = new Integer(GL2GL3.GL_PACK_SKIP_PIXELS);
+  private static final Integer GL_PACK_ALIGNMENT    = new Integer(GL.GL_PACK_ALIGNMENT);
+  private static final Integer GL_PACK_IMAGE_HEIGHT = new Integer(GL2GL3.GL_PACK_IMAGE_HEIGHT);
+  private static final Integer GL_PACK_SKIP_IMAGES  = new Integer(GL2GL3.GL_PACK_SKIP_IMAGES);
+
+  private static final Integer GL_UNPACK_SWAP_BYTES   = new Integer(GL2GL3.GL_UNPACK_SWAP_BYTES);
+  private static final Integer GL_UNPACK_LSB_FIRST    = new Integer(GL2GL3.GL_UNPACK_LSB_FIRST);
+  private static final Integer GL_UNPACK_ROW_LENGTH   = new Integer(GL2GL3.GL_UNPACK_ROW_LENGTH);
+  private static final Integer GL_UNPACK_SKIP_ROWS    = new Integer(GL2GL3.GL_UNPACK_SKIP_ROWS);
+  private static final Integer GL_UNPACK_SKIP_PIXELS  = new Integer(GL2GL3.GL_UNPACK_SKIP_PIXELS);
+  private static final Integer GL_UNPACK_ALIGNMENT    = new Integer(GL.GL_UNPACK_ALIGNMENT);
+  private static final Integer GL_UNPACK_IMAGE_HEIGHT = new Integer(GL2GL3.GL_UNPACK_IMAGE_HEIGHT);
+  private static final Integer GL_UNPACK_SKIP_IMAGES  = new Integer(GL2GL3.GL_UNPACK_SKIP_IMAGES);
+
+  private static final Integer zero                   = new Integer(0);
+  private static final Integer one                    = new Integer(1);
+
+  private static Integer boxKey(int key) {
+    switch (key) {
+      case 0:                          return zero;
+      case GL2GL3.GL_PACK_SWAP_BYTES:     return GL_PACK_SWAP_BYTES;
+      case GL2GL3.GL_PACK_LSB_FIRST:      return GL_PACK_LSB_FIRST;
+      case GL2GL3.GL_PACK_ROW_LENGTH:     return GL_PACK_ROW_LENGTH;
+      case GL2GL3.GL_PACK_SKIP_ROWS:      return GL_PACK_SKIP_ROWS;
+      case GL2GL3.GL_PACK_SKIP_PIXELS:    return GL_PACK_SKIP_PIXELS;
+      case GL.GL_PACK_ALIGNMENT:          return GL_PACK_ALIGNMENT;
+      case GL2GL3.GL_PACK_IMAGE_HEIGHT:   return GL_PACK_IMAGE_HEIGHT;
+      case GL2GL3.GL_PACK_SKIP_IMAGES:    return GL_PACK_SKIP_IMAGES;
+
+      case GL2GL3.GL_UNPACK_SWAP_BYTES:   return GL_UNPACK_SWAP_BYTES;
+      case GL2GL3.GL_UNPACK_LSB_FIRST:    return GL_UNPACK_LSB_FIRST;
+      case GL2GL3.GL_UNPACK_ROW_LENGTH:   return GL_UNPACK_ROW_LENGTH;
+      case GL2GL3.GL_UNPACK_SKIP_ROWS:    return GL_UNPACK_SKIP_ROWS;
+      case GL2GL3.GL_UNPACK_SKIP_PIXELS:  return GL_UNPACK_SKIP_PIXELS;
+      case GL.GL_UNPACK_ALIGNMENT:        return GL_UNPACK_ALIGNMENT;
+      case GL2GL3.GL_UNPACK_IMAGE_HEIGHT: return GL_UNPACK_IMAGE_HEIGHT;
+      case GL2GL3.GL_UNPACK_SKIP_IMAGES:  return GL_UNPACK_SKIP_IMAGES;
+
+      default: return null;
+    }
+  }
+
+  public void resetStates() {
+    pixelStateMap.clear();
+
+    pixelStateMap.put(GL_PACK_SWAP_BYTES,   zero /* GL_FALSE */);
+    pixelStateMap.put(GL_PACK_LSB_FIRST,    zero /* GL_FALSE */);
+    pixelStateMap.put(GL_PACK_ROW_LENGTH,   zero);
+    pixelStateMap.put(GL_PACK_SKIP_ROWS,    zero);
+    pixelStateMap.put(GL_PACK_SKIP_PIXELS,  zero);
+    pixelStateMap.put(GL_PACK_ALIGNMENT,    new Integer(4));
+    pixelStateMap.put(GL_PACK_IMAGE_HEIGHT, zero);
+    pixelStateMap.put(GL_PACK_SKIP_IMAGES,  zero);
+
+    pixelStateMap.put(GL_UNPACK_SWAP_BYTES,   zero /* GL_FALSE */);
+    pixelStateMap.put(GL_UNPACK_LSB_FIRST,    zero /* GL_FALSE */);
+    pixelStateMap.put(GL_UNPACK_ROW_LENGTH,   zero);
+    pixelStateMap.put(GL_UNPACK_SKIP_ROWS,    zero);
+    pixelStateMap.put(GL_UNPACK_SKIP_PIXELS,  zero);
+    pixelStateMap.put(GL_UNPACK_ALIGNMENT,    new Integer(4));
+    pixelStateMap.put(GL_UNPACK_IMAGE_HEIGHT, zero);
+    pixelStateMap.put(GL_UNPACK_SKIP_IMAGES,  zero);
+  }
+
+  private static Integer boxInt(int value) {
+    switch (value) {
+      case 0:           return zero;
+      case 1:           return one;
+
+      default: return new Integer(value);
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLWorkerThread.java b/src/jogl/classes/com/jogamp/opengl/impl/GLWorkerThread.java
new file mode 100755
index 000000000..768eea3f7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLWorkerThread.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import java.lang.reflect.InvocationTargetException;
+import java.security.*;
+import java.util.*;
+import javax.media.opengl.*;
+
+/** Singleton thread upon which all OpenGL work is performed by
+    default. Unfortunately many vendors' OpenGL drivers are not really
+    thread-safe and stability is much improved by performing OpenGL
+    work on at most one thread. This is the default behavior of the
+    GLAutoDrawable implementations according to the {@link
+    javax.media.opengl.Threading Threading} class. The GLWorkerThread
+    replaces the original AWT event queue thread-based mechanism for
+    two reasons: first, more than one AWT event queue thread may be
+    spawned, for example if a dialog is being shown; second, it avoids
+    blocking the AWT event queue thread during OpenGL rendering. */
+
+public class GLWorkerThread {
+  private static volatile boolean started;
+  private static volatile Thread thread;
+  private static Object lock;
+  private static volatile boolean shouldTerminate;
+  private static volatile Throwable exception;
+
+  // The Runnable to execute immediately on the worker thread
+  private static volatile Runnable work;
+  // Queue of Runnables to be asynchronously invoked
+  private static List queue = new LinkedList();
+  
+  /** Should only be called by Threading class if creation of the
+      GLWorkerThread was requested via the opengl.1thread system
+      property. */
+  public static void start() {
+    if (!started) {
+      synchronized (GLWorkerThread.class) {
+        if (!started) {
+          lock = new Object();
+          thread = new Thread(new WorkerRunnable(),
+                              "JOGL GLWorkerThread");
+          thread.setDaemon(true);
+          started = true;
+          synchronized (lock) {
+            thread.start();
+            try {
+              lock.wait();
+            } catch (InterruptedException e) {
+            }
+          }
+
+          /*
+
+          // Note: it appears that there is a bug in NVidia's current
+          // drivers where if a context was ever made current on a
+          // given thread and that thread has exited before program
+          // exit, a crash occurs in the drivers. Releasing the
+          // context from the given thread does not work around the
+          // problem.
+          //
+          // For the time being, we're going to work around this
+          // problem by not terminating the GLWorkerThread. In theory,
+          // shutting down the GLWorkerThread cleanly could be a good
+          // general solution to the problem of needing to
+          // cooperatively terminate all Animators at program exit.
+          //
+          // It appears that this doesn't even work around all of the
+          // kinds of crashes. Causing the context to be unilaterally
+          // released from the GLWorkerThread after each invocation
+          // seems to work around all of the kinds of crashes seen.
+          //
+          // These appear to be similar to the kinds of crashes seen
+          // when the Java2D/OpenGL pipeline terminates, and those are
+          // a known issue being fixed, so presumably these will be
+          // fixed in NVidia's next driver set.
+
+          // Install shutdown hook to terminate daemon thread more or
+          // less cooperatively
+          AccessController.doPrivileged(new PrivilegedAction() {
+              public Object run() {
+                Runtime.getRuntime().addShutdownHook(new Thread() {
+                    public void run() {
+                      Object lockTemp = lock;
+                      if (lockTemp == null) {
+                        // Already terminating (?)
+                        return;
+                      }
+                      synchronized (lockTemp) {
+                        shouldTerminate = true;
+                        lockTemp.notifyAll();
+                        try {
+                          lockTemp.wait(500);
+                        } catch (InterruptedException e) {
+                        }
+                      }
+                    }
+                  });
+                return null;
+              }
+            });
+
+          */
+
+        } else {
+          throw new RuntimeException("Should not start GLWorkerThread twice");
+        }
+      }
+    }
+  }
+
+  public static void invokeAndWait(Runnable runnable)
+    throws InvocationTargetException, InterruptedException {
+    if (!started) {
+      throw new RuntimeException("May not invokeAndWait on worker thread without starting it first");
+    }
+
+    Object lockTemp = lock;
+    if (lockTemp == null) {
+      return; // Terminating
+    }
+
+    synchronized (lockTemp) {
+      if (thread == null) {
+        // Terminating
+        return;
+      }
+
+      work = runnable;
+      lockTemp.notifyAll();
+      lockTemp.wait();
+      if (exception != null) {
+        Throwable localException = exception;
+        exception = null;
+        throw new InvocationTargetException(localException);
+      }
+    }
+  }
+
+  public static void invokeLater(Runnable runnable) {
+    if (!started) {
+      throw new RuntimeException("May not invokeLater on worker thread without starting it first");
+    }
+
+    Object lockTemp = lock;
+    if (lockTemp == null) {
+      return; // Terminating
+    }
+
+    synchronized (lockTemp) {
+      if (thread == null) {
+        // Terminating
+        return;
+      }
+
+      queue.add(runnable);
+      lockTemp.notifyAll();
+    }
+  }
+
+  /** Indicates whether the OpenGL worker thread was started, i.e.,
+      whether it is currently in use. */
+  public static boolean isStarted() {
+    return started;
+  }
+
+  /** Indicates whether the current thread is the OpenGL worker
+      thread. */
+  public static boolean isWorkerThread() {
+    return (Thread.currentThread() == thread);
+  }
+
+  static class WorkerRunnable implements Runnable {
+    public void run() {
+      // Notify starting thread that we're ready
+      synchronized (lock) {
+        lock.notifyAll();
+      }
+
+      while (!shouldTerminate) {
+        synchronized (lock) {
+          while (!shouldTerminate &&
+                 (work == null) &&
+                 queue.isEmpty()) {
+            try {
+              // Avoid race conditions with wanting to release contexts on this thread
+              lock.wait(1000);
+            } catch (InterruptedException e) {
+            }
+
+            if (GLContext.getCurrent() != null) {
+              // Test later to see whether we need to release this context
+              break;
+            }
+          }
+          
+          if (shouldTerminate) {
+            lock.notifyAll();
+            thread = null;
+            lock = null;
+            return;
+          }
+
+          if (work != null) {
+            try {
+              work.run();
+            } catch (Throwable t) {
+              exception = t;
+            } finally {
+              work = null;
+              lock.notifyAll();
+            }
+          }
+
+          while (!queue.isEmpty()) {
+            try {
+              Runnable curAsync = (Runnable) queue.remove(0);
+              curAsync.run();
+            } catch (Throwable t) {
+              System.out.println("Exception occurred on JOGL OpenGL worker thread:");
+              t.printStackTrace();
+            }
+          }
+
+          // See about releasing current context
+          GLContext curContext = GLContext.getCurrent();
+          if (curContext != null &&
+              (curContext instanceof GLContextImpl)) {
+            GLContextImpl impl = (GLContextImpl) curContext;
+            if (impl.hasWaiters()) {
+              impl.release();
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javame_cdc_fp
new file mode 100644
index 000000000..4a0eaa22b
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javame_cdc_fp
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.opengl.impl;
+
+import java.lang.reflect.*;
+import java.nio.*;
+
+/** Internal copy of selected routines from BufferUtil to avoid
+    outward dependencies on com.jogamp.opengl.util package. */
+public class InternalBufferUtil {
+    public static final int SIZEOF_BYTE = 1;
+    public static final int SIZEOF_SHORT = 2;
+    public static final int SIZEOF_INT = 4;
+    public static final int SIZEOF_FLOAT = 4;
+
+    //----------------------------------------------------------------------
+    // Allocation routines
+    //
+
+    /** Allocates a new direct ByteBuffer with the specified number of
+        elements. The returned buffer will have its byte order set to
+        the host platform's native byte order. */
+    public static ByteBuffer newByteBuffer(int numElements) {
+        ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
+        nativeOrder(bb);
+        return bb;
+    }
+    
+    /** Allocates a new direct IntBuffer with the specified number of
+        elements. The returned buffer will have its byte order set to
+        the host platform's native byte order. */
+    public static IntBuffer newIntBuffer(int numElements) {
+        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
+        return bb.asIntBuffer();
+    }
+    
+    /** Allocates a new direct ShortBuffer with the specified number of
+        elements. The returned buffer will have its byte order set to
+        the host platform's native byte order. */
+    public static ShortBuffer newShortBuffer(int numElements) {
+        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_SHORT);
+        return bb.asShortBuffer();
+    }
+    
+    /** Allocates a new direct FloatBuffer with the specified number of
+        elements. The returned buffer will have its byte order set to
+        the host platform's native byte order. */
+    public static FloatBuffer newFloatBuffer(int numElements) {
+        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_FLOAT);
+        return bb.asFloatBuffer();
+    }
+    
+    //----------------------------------------------------------------------
+    // Copy routines (type-to-type)
+    //
+
+    /** Copies the <i>remaining</i> elements (as defined by
+        <code>limit() - position()</code>) in the passed FloatBuffer
+        into a newly-allocated direct ByteBuffer. The returned buffer
+        will have its byte order set to the host platform's native byte
+        order. The position of the newly-allocated buffer will be zero,
+        and the position of the passed buffer is unchanged (though its
+        mark is changed). */
+    public static ByteBuffer copyFloatBufferAsByteBuffer(FloatBuffer orig) {
+        ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_FLOAT);
+        dest.asFloatBuffer().put(orig);
+        dest.rewind();
+        return dest;
+    }
+  
+    /** Copies the <i>remaining</i> elements (as defined by
+        <code>limit() - position()</code>) in the passed IntBuffer into
+        a newly-allocated direct ByteBuffer. The returned buffer will
+        have its byte order set to the host platform's native byte
+        order. The position of the newly-allocated buffer will be zero,
+        and the position of the passed buffer is unchanged (though its
+        mark is changed). */
+    public static ByteBuffer copyIntBufferAsByteBuffer(IntBuffer orig) {
+        ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_INT);
+        dest.asIntBuffer().put(orig);
+        dest.rewind();
+        return dest;
+    }
+  
+    /** Copies the <i>remaining</i> elements (as defined by
+        <code>limit() - position()</code>) in the passed ShortBuffer
+        into a newly-allocated direct ByteBuffer. The returned buffer
+        will have its byte order set to the host platform's native byte
+        order. The position of the newly-allocated buffer will be zero,
+        and the position of the passed buffer is unchanged (though its
+        mark is changed). */
+    public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
+        ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_SHORT);
+        dest.asShortBuffer().put(orig);
+        dest.rewind();
+        return dest;
+    }
+
+    /** Copies the <i>remaining</i> elements (as defined by
+        <code>limit() - position()</code>) in the passed ByteBuffer into
+        a newly-allocated direct ByteBuffer. The returned buffer will
+        have its byte order set to the host platform's native byte
+        order. The position of the newly-allocated buffer will be zero,
+        and the position of the passed buffer is unchanged (though its
+        mark is changed). */
+    public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
+        ByteBuffer dest = newByteBuffer(orig.remaining());
+        dest.put(orig);
+        dest.rewind();
+        return dest;
+    }
+
+    //----------------------------------------------------------------------
+    // Conversion routines 
+    //
+
+    public static float[] getFloatArray(double[] source) {
+        int i=source.length;
+        float[] dest = new float[i--];
+        while(i>=0) { dest[i]=(float)source[i]; i--; }
+        return dest;
+    }
+
+    public static ByteBuffer nativeOrder(ByteBuffer buf) {
+        if (!isCDCFP) {
+            try {
+                if (byteOrderClass == null) {
+                    byteOrderClass = Class.forName("java.nio.ByteOrder");
+                    orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
+                    Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
+                    nativeOrderObject = nativeOrderMethod.invoke(null, null);
+                }
+            } catch (Throwable t) {
+                // Must be running on CDC / FP
+                isCDCFP = true;
+            }
+
+            if (!isCDCFP) {
+                try {
+                    orderMethod.invoke(buf, new Object[] { nativeOrderObject });
+                } catch (Throwable t) {
+                }
+            }
+        }
+        return buf;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    // NOTE that this work must be done reflectively at the present time
+    // because this code must compile and run correctly on both CDC/FP and J2SE
+    private static boolean isCDCFP;
+    private static Class byteOrderClass;
+    private static Object nativeOrderObject;
+    private static Method orderMethod;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javase b/src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javase
new file mode 100644
index 000000000..655fa95de
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javase
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.opengl.impl;
+
+import java.lang.reflect.*;
+import java.nio.*;
+
+/** Internal copy of selected routines from BufferUtil to avoid
+    outward dependencies on com.jogamp.opengl.util package. */
+public class InternalBufferUtil {
+    public static final int SIZEOF_BYTE = 1;
+    public static final int SIZEOF_SHORT = 2;
+    public static final int SIZEOF_INT = 4;
+    public static final int SIZEOF_FLOAT = 4;
+    public static final int SIZEOF_LONG = 8;
+    public static final int SIZEOF_DOUBLE = 8;
+
+    //----------------------------------------------------------------------
+    // Allocation routines
+    //
+
+    /** Allocates a new direct ByteBuffer with the specified number of
+        elements. The returned buffer will have its byte order set to
+        the host platform's native byte order. */
+    public static ByteBuffer newByteBuffer(int numElements) {
+        ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
+        nativeOrder(bb);
+        return bb;
+    }
+    
+    /** Allocates a new direct DoubleBuffer with the specified number of
+        elements. The returned buffer will have its byte order set to
+        the host platform's native byte order. */
+    public static DoubleBuffer newDoubleBuffer(int numElements) {
+        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_DOUBLE);
+        return bb.asDoubleBuffer();
+    }
+
+    /** Allocates a new direct IntBuffer with the specified number of
+        elements. The returned buffer will have its byte order set to
+        the host platform's native byte order. */
+    public static IntBuffer newIntBuffer(int numElements) {
+        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
+        return bb.asIntBuffer();
+    }
+    
+    /** Allocates a new direct ShortBuffer with the specified number of
+        elements. The returned buffer will have its byte order set to
+        the host platform's native byte order. */
+    public static ShortBuffer newShortBuffer(int numElements) {
+        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_SHORT);
+        return bb.asShortBuffer();
+    }
+    
+    /** Allocates a new direct FloatBuffer with the specified number of
+        elements. The returned buffer will have its byte order set to
+        the host platform's native byte order. */
+    public static FloatBuffer newFloatBuffer(int numElements) {
+        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_FLOAT);
+        return bb.asFloatBuffer();
+    }
+    
+    //----------------------------------------------------------------------
+    // Copy routines (type-to-ByteBuffer)
+    //
+
+    /** Copies the <i>remaining</i> elements (as defined by
+        <code>limit() - position()</code>) in the passed FloatBuffer
+        into a newly-allocated direct ByteBuffer. The returned buffer
+        will have its byte order set to the host platform's native byte
+        order. The position of the newly-allocated buffer will be zero,
+        and the position of the passed buffer is unchanged (though its
+        mark is changed). */
+    public static ByteBuffer copyFloatBufferAsByteBuffer(FloatBuffer orig) {
+        ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_FLOAT);
+        dest.asFloatBuffer().put(orig);
+        dest.rewind();
+        return dest;
+    }
+  
+    /** Copies the <i>remaining</i> elements (as defined by
+        <code>limit() - position()</code>) in the passed IntBuffer into
+        a newly-allocated direct ByteBuffer. The returned buffer will
+        have its byte order set to the host platform's native byte
+        order. The position of the newly-allocated buffer will be zero,
+        and the position of the passed buffer is unchanged (though its
+        mark is changed). */
+    public static ByteBuffer copyIntBufferAsByteBuffer(IntBuffer orig) {
+        ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_INT);
+        dest.asIntBuffer().put(orig);
+        dest.rewind();
+        return dest;
+    }
+  
+    /** Copies the <i>remaining</i> elements (as defined by
+        <code>limit() - position()</code>) in the passed ShortBuffer
+        into a newly-allocated direct ByteBuffer. The returned buffer
+        will have its byte order set to the host platform's native byte
+        order. The position of the newly-allocated buffer will be zero,
+        and the position of the passed buffer is unchanged (though its
+        mark is changed). */
+    public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
+        ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_SHORT);
+        dest.asShortBuffer().put(orig);
+        dest.rewind();
+        return dest;
+    }
+
+    /** Copies the <i>remaining</i> elements (as defined by
+        <code>limit() - position()</code>) in the passed ByteBuffer into
+        a newly-allocated direct ByteBuffer. The returned buffer will
+        have its byte order set to the host platform's native byte
+        order. The position of the newly-allocated buffer will be zero,
+        and the position of the passed buffer is unchanged (though its
+        mark is changed). */
+    public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
+        ByteBuffer dest = newByteBuffer(orig.remaining());
+        dest.put(orig);
+        dest.rewind();
+        return dest;
+    }
+
+    //----------------------------------------------------------------------
+    // Conversion routines 
+    //
+
+    public static float[] getFloatArray(double[] source) {
+        int i=source.length;
+        float[] dest = new float[i--];
+        while(i>=0) { dest[i]=(float)source[i]; i--; }
+        return dest;
+    }
+
+    public static ByteBuffer nativeOrder(ByteBuffer buf) {
+        if (!isCDCFP) {
+            try {
+                if (byteOrderClass == null) {
+                    byteOrderClass = Class.forName("java.nio.ByteOrder");
+                    orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
+                    Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
+                    nativeOrderObject = nativeOrderMethod.invoke(null, null);
+                }
+            } catch (Throwable t) {
+                // Must be running on CDC / FP
+                isCDCFP = true;
+            }
+
+            if (!isCDCFP) {
+                try {
+                    orderMethod.invoke(buf, new Object[] { nativeOrderObject });
+                } catch (Throwable t) {
+                }
+            }
+        }
+        return buf;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    // NOTE that this work must be done reflectively at the present time
+    // because this code must compile and run correctly on both CDC/FP and J2SE
+    private static boolean isCDCFP;
+    private static Class byteOrderClass;
+    private static Object nativeOrderObject;
+    private static Method orderMethod;
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
new file mode 100644
index 000000000..aa71a37da
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+// FIXME: refactor Java SE dependencies
+//import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.HashSet;
+import com.sun.nativewindow.impl.NativeLibLoaderBase;
+
+public class NativeLibLoader extends NativeLibLoaderBase {
+  public static void loadNEWT() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("newt", nativeOSPreload, true);
+        return null;
+      }
+    });
+  }
+
+  public static void loadGLDesktop() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("jogl_gl2", nativeOSPreload, true);
+        return null;
+      }
+    });
+  }
+
+  public static void loadGLDesktopES12() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("jogl_gl2es12", nativeOSPreload, true);
+        return null;
+      }
+    });
+  }
+
+  public static void loadES2() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("jogl_es2", nativeOSPreload, true);
+        return null;
+      }
+    });
+  }
+
+  public static void loadES1() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("jogl_es1", nativeOSPreload, true);
+        return null;
+      }
+    });
+  }
+
+  public static void loadCgImpl() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        String[] preload = { "nativewindow", "cg", "cgGL" };
+        loadLibrary("jogl_cg", preload, true);
+        return null;
+      }
+    });
+  }
+
+  private static final String[] nativeOSPreload = { "nativewindow_x11" };
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ProjectFloat.java b/src/jogl/classes/com/jogamp/opengl/impl/ProjectFloat.java
new file mode 100755
index 000000000..dbd84c9de
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ProjectFloat.java
@@ -0,0 +1,1057 @@
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** $Date: 2009-03-13 22:20:29 -0700 (Fri, 13 Mar 2009) $ $Revision: 1867 $
+** $Header$
+*/
+
+/* 
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are 
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright 
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of 
+ *   its contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+package com.jogamp.opengl.impl;
+
+import java.nio.*;
+
+import javax.media.opengl.*;
+import javax.media.opengl.fixedfunc.GLMatrixFunc;
+
+/**
+ * ProjectFloat.java
+ * <p/>
+ * <p/>
+ * Created 11-jan-2004
+ * 
+ * @author Erik Duijs
+ * @author Kenneth Russell
+ */
+public class ProjectFloat {
+  private static final float[] IDENTITY_MATRIX =
+    new float[] {
+      1.0f, 0.0f, 0.0f, 0.0f,
+      0.0f, 1.0f, 0.0f, 0.0f,
+      0.0f, 0.0f, 1.0f, 0.0f,
+      0.0f, 0.0f, 0.0f, 1.0f };
+
+  private static final float[] ZERO_MATRIX =
+    new float[] {
+      0.0f, 0.0f, 0.0f, 0.0f,
+      0.0f, 0.0f, 0.0f, 0.0f,
+      0.0f, 0.0f, 0.0f, 0.0f,
+      0.0f, 0.0f, 0.0f, 0.0f };
+
+  // Note that we have cloned parts of the implementation in order to
+  // support incoming Buffers. The reason for this is to avoid loading
+  // non-direct buffer subclasses unnecessarily, because doing so can
+  // cause performance decreases on direct buffer operations, at least
+  // on the current HotSpot JVM. It would be nicer (and make the code
+  // simpler) to simply have the array-based entry points delegate to
+  // the versions taking Buffers by wrapping the arrays.
+
+  // Array-based implementation
+  private final float[] matrix = new float[16];
+  private final float[][] tempInvertMatrix = new float[4][4];
+
+  private final float[] in = new float[4];
+  private final float[] out = new float[4];
+
+  private final float[] forward = new float[3];
+  private final float[] side = new float[3];
+  private final float[] up = new float[3];
+  
+  // Buffer-based implementation
+  private FloatBuffer locbuf;
+  private final FloatBuffer matrixBuf;
+  private final FloatBuffer tempInvertMatrixBuf;
+
+  private final FloatBuffer inBuf;
+  private final FloatBuffer outBuf;
+
+  private final FloatBuffer forwardBuf;
+  private final FloatBuffer sideBuf;
+  private final FloatBuffer upBuf;
+
+  public ProjectFloat() {
+    // Use direct buffers to avoid loading indirect buffer
+    // implementations for applications trying to avoid doing so.
+    // Slice up one big buffer because some NIO implementations
+    // allocate a huge amount of memory to back even the smallest of
+    // buffers.
+    locbuf = InternalBufferUtil.newFloatBuffer(2*16+2*4+3*3);
+    int pos = 0;
+    int sz = 16;
+    matrixBuf = slice(locbuf, pos, sz);
+    pos += sz;
+    tempInvertMatrixBuf = slice(locbuf, pos, sz);
+    pos += sz;
+    sz = 4;
+    inBuf = slice(locbuf, pos, sz);
+    pos += sz;
+    outBuf = slice(locbuf, pos, sz);
+    pos += sz;
+    sz = 3;
+    forwardBuf = slice(locbuf, pos, sz);
+    pos += sz;
+    sideBuf = slice(locbuf, pos, sz);
+    pos += sz;
+    upBuf = slice(locbuf, pos, sz);
+  }
+
+  public void destroy() {
+    if(locbuf!=null) {
+        locbuf.clear();
+        locbuf=null;
+    }
+  }
+
+  private static FloatBuffer slice(FloatBuffer buf, int pos, int len) {
+    buf.position(pos);
+    buf.limit(pos + len);
+    return buf.slice();
+  }
+
+  /**
+   * Make matrix an identity matrix
+   */
+  public static void gluMakeIdentityf(FloatBuffer m) {
+    int oldPos = m.position();
+    m.put(IDENTITY_MATRIX);
+    m.position(oldPos);
+  }
+
+  /**
+   * Make matrix an zero matrix
+   */
+  public static void gluMakeZero(FloatBuffer m) {
+    int oldPos = m.position();
+    m.put(ZERO_MATRIX);
+    m.position(oldPos);
+  }
+
+  /**
+   * Make matrix an identity matrix
+   */
+  public static void gluMakeIdentityf(float[] m) {
+    for (int i = 0; i < 16; i++) {
+      m[i] = IDENTITY_MATRIX[i];
+    }
+  }
+
+  /**
+   * Method __gluMultMatrixVecf
+   * 
+   * @param matrix
+   * @param in
+   * @param out
+   */
+  private void __gluMultMatrixVecf(float[] matrix, int matrix_offset, float[] in, float[] out) {
+    for (int i = 0; i < 4; i++) {
+      out[i] =
+        in[0] * matrix[0*4+i+matrix_offset] +
+        in[1] * matrix[1*4+i+matrix_offset] +
+        in[2] * matrix[2*4+i+matrix_offset] +
+        in[3] * matrix[3*4+i+matrix_offset];
+    }
+  }
+
+  /**
+   * Method __gluMultMatrixVecf
+   * 
+   * @param matrix
+   * @param in
+   * @param out
+   */
+  private void __gluMultMatrixVecf(FloatBuffer matrix, FloatBuffer in, FloatBuffer out) {
+    int inPos = in.position();
+    int outPos = out.position();
+    int matrixPos = matrix.position();
+    for (int i = 0; i < 4; i++) {
+      out.put(i + outPos,
+              in.get(0+inPos) * matrix.get(0*4+i+matrixPos) +
+              in.get(1+inPos) * matrix.get(1*4+i+matrixPos) +
+              in.get(2+inPos) * matrix.get(2*4+i+matrixPos) +
+              in.get(3+inPos) * matrix.get(3*4+i+matrixPos));
+    }
+  }
+
+  /**
+   * @param src
+   * @param inverse
+   * 
+   * @return
+   */
+  public boolean gluInvertMatrixf(float[] src, float[] inverse) {
+    int i, j, k, swap;
+    float t;
+    float[][] temp = tempInvertMatrix;
+
+    for (i = 0; i < 4; i++) {
+      for (j = 0; j < 4; j++) {
+        temp[i][j] = src[i*4+j];
+      }
+    }
+    gluMakeIdentityf(inverse);
+
+    for (i = 0; i < 4; i++) {
+      //
+      // Look for largest element in column
+      //
+      swap = i;
+      for (j = i + 1; j < 4; j++) {
+        if (Math.abs(temp[j][i]) > Math.abs(temp[i][i])) {
+          swap = j;
+        }
+      }
+
+      if (swap != i) {
+        //
+        // Swap rows.
+        //
+        for (k = 0; k < 4; k++) {
+          t = temp[i][k];
+          temp[i][k] = temp[swap][k];
+          temp[swap][k] = t;
+
+          t = inverse[i*4+k];
+          inverse[i*4+k] = inverse[swap*4+k];
+          inverse[swap*4+k] = t;
+        }
+      }
+
+      if (temp[i][i] == 0) {
+        //
+        // No non-zero pivot. The matrix is singular, which shouldn't
+        // happen. This means the user gave us a bad matrix.
+        //
+        return false;
+      }
+
+      t = temp[i][i];
+      for (k = 0; k < 4; k++) {
+        temp[i][k] /= t;
+        inverse[i*4+k] /= t;
+      }
+      for (j = 0; j < 4; j++) {
+        if (j != i) {
+          t = temp[j][i];
+          for (k = 0; k < 4; k++) {
+            temp[j][k] -= temp[i][k] * t;
+            inverse[j*4+k] -= inverse[i*4+k]*t;
+          }
+        }
+      }
+    }
+    return true;
+  }
+
+  /**
+   * @param src
+   * @param inverse
+   * 
+   * @return
+   */
+  public boolean gluInvertMatrixf(FloatBuffer src, FloatBuffer inverse) {
+    int i, j, k, swap;
+    float t;
+
+    int srcPos = src.position();
+    int invPos = inverse.position();
+
+    FloatBuffer temp = tempInvertMatrixBuf;
+
+    for (i = 0; i < 4; i++) {
+      for (j = 0; j < 4; j++) {
+        temp.put(i*4+j, src.get(i*4+j + srcPos));
+      }
+    }
+    gluMakeIdentityf(inverse);
+
+    for (i = 0; i < 4; i++) {
+      //
+      // Look for largest element in column
+      //
+      swap = i;
+      for (j = i + 1; j < 4; j++) {
+        if (Math.abs(temp.get(j*4+i)) > Math.abs(temp.get(i*4+i))) {
+          swap = j;
+        }
+      }
+
+      if (swap != i) {
+        //
+        // Swap rows.
+        //
+        for (k = 0; k < 4; k++) {
+          t = temp.get(i*4+k);
+          temp.put(i*4+k, temp.get(swap*4+k));
+          temp.put(swap*4+k, t);
+
+          t = inverse.get(i*4+k + invPos);
+          inverse.put(i*4+k + invPos, inverse.get(swap*4+k + invPos));
+          inverse.put(swap*4+k + invPos, t);
+        }
+      }
+
+      if (temp.get(i*4+i) == 0) {
+        //
+        // No non-zero pivot. The matrix is singular, which shouldn't
+        // happen. This means the user gave us a bad matrix.
+        //
+        return false;
+      }
+
+      t = temp.get(i*4+i);
+      for (k = 0; k < 4; k++) {
+        temp.put(i*4+k, temp.get(i*4+k) / t);
+        inverse.put(i*4+k + invPos, inverse.get(i*4+k + invPos) / t);
+      }
+      for (j = 0; j < 4; j++) {
+        if (j != i) {
+          t = temp.get(j*4+i);
+          for (k = 0; k < 4; k++) {
+            temp.put(j*4+k, temp.get(j*4+k) - temp.get(i*4+k) * t);
+            inverse.put(j*4+k + invPos, inverse.get(j*4+k + invPos) - inverse.get(i*4+k + invPos) * t);
+          }
+        }
+      }
+    }
+    return true;
+  }
+
+
+  /**
+   * @param a
+   * @param b
+   * @param r
+   */
+  private void gluMultMatricesf(float[] a, int a_offset, float[] b, int b_offset, float[] r) {
+    for (int i = 0; i < 4; i++) {
+      for (int j = 0; j < 4; j++) {
+        r[i*4+j] =
+          a[i*4+0+a_offset]*b[0*4+j+b_offset] +
+          a[i*4+1+a_offset]*b[1*4+j+b_offset] +
+          a[i*4+2+a_offset]*b[2*4+j+b_offset] +
+          a[i*4+3+a_offset]*b[3*4+j+b_offset];
+      }
+    }
+  }
+
+
+  /**
+   * @param a
+   * @param b
+   * @param r
+   */
+  public static void gluMultMatricesf(FloatBuffer a, FloatBuffer b, FloatBuffer r) {
+    int aPos = a.position();
+    int bPos = b.position();
+    int rPos = r.position();
+
+    for (int i = 0; i < 4; i++) {
+      for (int j = 0; j < 4; j++) {
+        r.put(i*4+j + rPos,
+          a.get(i*4+0+aPos)*b.get(0*4+j+bPos) +
+          a.get(i*4+1+aPos)*b.get(1*4+j+bPos) +
+          a.get(i*4+2+aPos)*b.get(2*4+j+bPos) +
+          a.get(i*4+3+aPos)*b.get(3*4+j+bPos));
+      }
+    }
+  }
+
+  /**
+   * Normalize vector
+   *
+   * @param v
+   */
+  public static void normalize(float[] v) {
+    float r;
+
+    r = (float) Math.sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
+    if ( r == 0.0 || r == 1.0)
+      return;
+
+    r = 1.0f / r;
+
+    v[0] *= r;
+    v[1] *= r;
+    v[2] *= r;
+
+    return;
+  }
+
+  /**
+   * Normalize vector
+   *
+   * @param v
+   */
+  public static void normalize(FloatBuffer v) {
+    float r;
+
+    int vPos = v.position();
+
+    r = (float) Math.sqrt(v.get(0+vPos) * v.get(0+vPos) +
+                          v.get(1+vPos) * v.get(1+vPos) +
+                          v.get(2+vPos) * v.get(2+vPos));
+    if ( r == 0.0 || r == 1.0)
+      return;
+
+    r = 1.0f / r;
+
+    v.put(0+vPos, v.get(0+vPos) * r);
+    v.put(1+vPos, v.get(1+vPos) * r);
+    v.put(2+vPos, v.get(2+vPos) * r);
+
+    return;
+  }
+
+
+  /**
+   * Calculate cross-product
+   *
+   * @param v1
+   * @param v2
+   * @param result
+   */
+  private static void cross(float[] v1, float[] v2, float[] result) {
+    result[0] = v1[1] * v2[2] - v1[2] * v2[1];
+    result[1] = v1[2] * v2[0] - v1[0] * v2[2];
+    result[2] = v1[0] * v2[1] - v1[1] * v2[0];
+  }
+
+  /**
+   * Calculate cross-product
+   *
+   * @param v1
+   * @param v2
+   * @param result
+   */
+  private static void cross(FloatBuffer v1, FloatBuffer v2, FloatBuffer result) {
+    int v1Pos = v1.position();
+    int v2Pos = v2.position();
+    int rPos  = result.position();
+
+    result.put(0+rPos, v1.get(1+v1Pos) * v2.get(2+v2Pos) - v1.get(2+v1Pos) * v2.get(1+v2Pos));
+    result.put(1+rPos, v1.get(2+v1Pos) * v2.get(0+v2Pos) - v1.get(0+v1Pos) * v2.get(2+v2Pos));
+    result.put(2+rPos, v1.get(0+v1Pos) * v2.get(1+v2Pos) - v1.get(1+v1Pos) * v2.get(0+v2Pos));
+  }
+
+  /**
+   * Method gluOrtho2D.
+   * 
+   * @param left
+   * @param right
+   * @param bottom
+   * @param top
+   */
+  public void gluOrtho2D(GLMatrixFunc gl, float left, float right, float bottom, float top) {
+    gl.glOrthof(left, right, bottom, top, -1, 1);
+  }
+
+  /**
+   * Method gluPerspective.
+   * 
+   * @param fovy
+   * @param aspect
+   * @param zNear
+   * @param zFar
+   */
+  public void gluPerspective(GLMatrixFunc gl, float fovy, float aspect, float zNear, float zFar) {
+    float sine, cotangent, deltaZ;
+    float radians = fovy / 2 * (float) Math.PI / 180;
+
+    deltaZ = zFar - zNear;
+    sine = (float) Math.sin(radians);
+
+    if ((deltaZ == 0) || (sine == 0) || (aspect == 0)) {
+      return;
+    }
+
+    cotangent = (float) Math.cos(radians) / sine;
+
+    gluMakeIdentityf(matrixBuf);
+
+    matrixBuf.put(0 * 4 + 0, cotangent / aspect);
+    matrixBuf.put(1 * 4 + 1, cotangent);
+    matrixBuf.put(2 * 4 + 2, - (zFar + zNear) / deltaZ);
+    matrixBuf.put(2 * 4 + 3, -1);
+    matrixBuf.put(3 * 4 + 2, -2 * zNear * zFar / deltaZ);
+    matrixBuf.put(3 * 4 + 3, 0);
+
+    gl.glMultMatrixf(matrixBuf);
+  }
+
+  /**
+   * Method gluLookAt
+   * 
+   * @param eyex
+   * @param eyey
+   * @param eyez
+   * @param centerx
+   * @param centery
+   * @param centerz
+   * @param upx
+   * @param upy
+   * @param upz
+   */
+  public void gluLookAt(GLMatrixFunc gl,
+                        float eyex,
+                        float eyey,
+                        float eyez,
+                        float centerx,
+                        float centery,
+                        float centerz,
+                        float upx,
+                        float upy,
+                        float upz) {
+    FloatBuffer forward = this.forwardBuf;
+    FloatBuffer side = this.sideBuf;
+    FloatBuffer up = this.upBuf;
+
+    forward.put(0, centerx - eyex);
+    forward.put(1, centery - eyey);
+    forward.put(2, centerz - eyez);
+
+    up.put(0, upx);
+    up.put(1, upy);
+    up.put(2, upz);
+
+    normalize(forward);
+
+    /* Side = forward x up */
+    cross(forward, up, side);
+    normalize(side);
+
+    /* Recompute up as: up = side x forward */
+    cross(side, forward, up);
+
+    gluMakeIdentityf(matrixBuf);
+    matrixBuf.put(0 * 4 + 0, side.get(0));
+    matrixBuf.put(1 * 4 + 0, side.get(1));
+    matrixBuf.put(2 * 4 + 0, side.get(2));
+
+    matrixBuf.put(0 * 4 + 1, up.get(0));
+    matrixBuf.put(1 * 4 + 1, up.get(1));
+    matrixBuf.put(2 * 4 + 1, up.get(2));
+
+    matrixBuf.put(0 * 4 + 2, -forward.get(0));
+    matrixBuf.put(1 * 4 + 2, -forward.get(1));
+    matrixBuf.put(2 * 4 + 2, -forward.get(2));
+
+    gl.glMultMatrixf(matrixBuf);
+    gl.glTranslatef(-eyex, -eyey, -eyez);
+  }
+
+  /**
+   * Method gluProject
+   * 
+   * @param objx
+   * @param objy
+   * @param objz
+   * @param modelMatrix
+   * @param projMatrix
+   * @param viewport
+   * @param win_pos
+   * 
+   * @return
+   */
+  public boolean gluProject(float objx,
+                            float objy,
+                            float objz,
+                            float[] modelMatrix,
+                            int modelMatrix_offset,
+                            float[] projMatrix,
+                            int projMatrix_offset,
+                            int[] viewport,
+                            int viewport_offset,
+                            float[] win_pos,
+                            int win_pos_offset ) {
+
+    float[] in = this.in;
+    float[] out = this.out;
+
+    in[0] = objx;
+    in[1] = objy;
+    in[2] = objz;
+    in[3] = 1.0f;
+
+    __gluMultMatrixVecf(modelMatrix, modelMatrix_offset, in, out);
+    __gluMultMatrixVecf(projMatrix, projMatrix_offset, out, in);
+
+    if (in[3] == 0.0f)
+      return false;
+
+    in[3] = (1.0f / in[3]) * 0.5f;
+
+    // Map x, y and z to range 0-1
+    in[0] = in[0] * in[3] + 0.5f;
+    in[1] = in[1] * in[3] + 0.5f;
+    in[2] = in[2] * in[3] + 0.5f;
+
+    // Map x,y to viewport
+    win_pos[0+win_pos_offset] = in[0] * viewport[2+viewport_offset] + viewport[0+viewport_offset];
+    win_pos[1+win_pos_offset] = in[1] * viewport[3+viewport_offset] + viewport[1+viewport_offset];
+    win_pos[2+win_pos_offset] = in[2];
+
+    return true;
+  }
+
+  /**
+   * Method gluProject
+   * 
+   * @param objx
+   * @param objy
+   * @param objz
+   * @param modelMatrix
+   * @param projMatrix
+   * @param viewport
+   * @param win_pos
+   * 
+   * @return
+   */
+  public boolean gluProject(float objx,
+                            float objy,
+                            float objz,
+                            FloatBuffer modelMatrix,
+                            FloatBuffer projMatrix,
+                            IntBuffer viewport,
+                            FloatBuffer win_pos) {
+
+    FloatBuffer in = this.inBuf;
+    FloatBuffer out = this.outBuf;
+
+    in.put(0, objx);
+    in.put(1, objy);
+    in.put(2, objz);
+    in.put(3, 1.0f);
+
+    __gluMultMatrixVecf(modelMatrix, in, out);
+    __gluMultMatrixVecf(projMatrix, out, in);
+
+    if (in.get(3) == 0.0f)
+      return false;
+
+    in.put(3, (1.0f / in.get(3)) * 0.5f);
+
+    // Map x, y and z to range 0-1
+    in.put(0, in.get(0) * in.get(3) + 0.5f);
+    in.put(1, in.get(1) * in.get(3) + 0.5f);
+    in.put(2, in.get(2) * in.get(3) + 0.5f);
+
+    // Map x,y to viewport
+    int vPos = viewport.position();
+    int wPos = win_pos.position();
+    win_pos.put(0+wPos, in.get(0) * viewport.get(2+vPos) + viewport.get(0+vPos));
+    win_pos.put(1+wPos, in.get(1) * viewport.get(3+vPos) + viewport.get(1+vPos));
+    win_pos.put(2+wPos, in.get(2));
+
+    return true;
+  }
+
+
+  /**
+   * Method gluUnproject
+   * 
+   * @param winx
+   * @param winy
+   * @param winz
+   * @param modelMatrix
+   * @param projMatrix
+   * @param viewport
+   * @param obj_pos
+   * 
+   * @return
+   */
+  public boolean gluUnProject(float winx,
+                              float winy,
+                              float winz,
+                              float[] modelMatrix,
+                              int modelMatrix_offset,
+                              float[] projMatrix,
+                              int projMatrix_offset,
+                              int[] viewport,
+                              int viewport_offset,
+                              float[] obj_pos,
+                              int obj_pos_offset) {
+    float[] in = this.in;
+    float[] out = this.out;
+
+    gluMultMatricesf(modelMatrix, modelMatrix_offset, projMatrix, projMatrix_offset, matrix);
+
+    if (!gluInvertMatrixf(matrix, matrix))
+      return false;
+
+    in[0] = winx;
+    in[1] = winy;
+    in[2] = winz;
+    in[3] = 1.0f;
+
+    // Map x and y from window coordinates
+    in[0] = (in[0] - viewport[0+viewport_offset]) / viewport[2+viewport_offset];
+    in[1] = (in[1] - viewport[1+viewport_offset]) / viewport[3+viewport_offset];
+
+    // Map to range -1 to 1
+    in[0] = in[0] * 2 - 1;
+    in[1] = in[1] * 2 - 1;
+    in[2] = in[2] * 2 - 1;
+
+    __gluMultMatrixVecf(matrix, 0, in, out);
+
+    if (out[3] == 0.0)
+      return false;
+
+    out[3] = 1.0f / out[3];
+
+    obj_pos[0+obj_pos_offset] = out[0] * out[3];
+    obj_pos[1+obj_pos_offset] = out[1] * out[3];
+    obj_pos[2+obj_pos_offset] = out[2] * out[3];
+
+    return true;
+  }
+
+
+  /**
+   * Method gluUnproject
+   * 
+   * @param winx
+   * @param winy
+   * @param winz
+   * @param modelMatrix
+   * @param projMatrix
+   * @param viewport
+   * @param obj_pos
+   * 
+   * @return
+   */
+  public boolean gluUnProject(float winx,
+                              float winy,
+                              float winz,
+                              FloatBuffer modelMatrix,
+                              FloatBuffer projMatrix,
+                              IntBuffer viewport,
+                              FloatBuffer obj_pos) {
+    FloatBuffer in = this.inBuf;
+    FloatBuffer out = this.outBuf;
+
+    gluMultMatricesf(modelMatrix, projMatrix, matrixBuf);
+
+    if (!gluInvertMatrixf(matrixBuf, matrixBuf))
+      return false;
+
+    in.put(0, winx);
+    in.put(1, winy);
+    in.put(2, winz);
+    in.put(3, 1.0f);
+
+    // Map x and y from window coordinates
+    int vPos = viewport.position();
+    int oPos = obj_pos.position();
+    in.put(0, (in.get(0) - viewport.get(0+vPos)) / viewport.get(2+vPos));
+    in.put(1, (in.get(1) - viewport.get(1+vPos)) / viewport.get(3+vPos));
+
+    // Map to range -1 to 1
+    in.put(0, in.get(0) * 2 - 1);
+    in.put(1, in.get(1) * 2 - 1);
+    in.put(2, in.get(2) * 2 - 1);
+
+    __gluMultMatrixVecf(matrixBuf, in, out);
+
+    if (out.get(3) == 0.0f)
+      return false;
+
+    out.put(3, 1.0f / out.get(3));
+
+    obj_pos.put(0+oPos, out.get(0) * out.get(3));
+    obj_pos.put(1+oPos, out.get(1) * out.get(3));
+    obj_pos.put(2+oPos, out.get(2) * out.get(3));
+
+    return true;
+  }
+
+
+  /**
+   * Method gluUnproject4
+   * 
+   * @param winx
+   * @param winy
+   * @param winz
+   * @param clipw
+   * @param modelMatrix
+   * @param projMatrix
+   * @param viewport
+   * @param near
+   * @param far
+   * @param obj_pos
+   * 
+   * @return
+   */
+  public boolean gluUnProject4(float winx,
+                               float winy,
+                               float winz,
+                               float clipw,
+                               float[] modelMatrix,
+                               int modelMatrix_offset,
+                               float[] projMatrix,
+                               int projMatrix_offset,
+                               int[] viewport,
+                               int viewport_offset,
+                               float near,
+                               float far,
+                               float[] obj_pos,
+                               int obj_pos_offset ) {
+    float[] in = this.in;
+    float[] out = this.out;
+
+    gluMultMatricesf(modelMatrix, modelMatrix_offset, projMatrix, projMatrix_offset, matrix);
+
+    if (!gluInvertMatrixf(matrix, matrix))
+      return false;
+
+    in[0] = winx;
+    in[1] = winy;
+    in[2] = winz;
+    in[3] = clipw;
+
+    // Map x and y from window coordinates
+    in[0] = (in[0] - viewport[0+viewport_offset]) / viewport[2+viewport_offset];
+    in[1] = (in[1] - viewport[1+viewport_offset]) / viewport[3+viewport_offset];
+    in[2] = (in[2] - near) / (far - near);
+
+    // Map to range -1 to 1
+    in[0] = in[0] * 2 - 1;
+    in[1] = in[1] * 2 - 1;
+    in[2] = in[2] * 2 - 1;
+
+    __gluMultMatrixVecf(matrix, 0, in, out);
+
+    if (out[3] == 0.0f)
+      return false;
+
+    obj_pos[0+obj_pos_offset] = out[0];
+    obj_pos[1+obj_pos_offset] = out[1];
+    obj_pos[2+obj_pos_offset] = out[2];
+    obj_pos[3+obj_pos_offset] = out[3];
+    return true;
+  }
+
+  /**
+   * Method gluUnproject4
+   * 
+   * @param winx
+   * @param winy
+   * @param winz
+   * @param clipw
+   * @param modelMatrix
+   * @param projMatrix
+   * @param viewport
+   * @param near
+   * @param far
+   * @param obj_pos
+   * 
+   * @return
+   */
+  public boolean gluUnProject4(float winx,
+                               float winy,
+                               float winz,
+                               float clipw,
+                               FloatBuffer modelMatrix,
+                               FloatBuffer projMatrix,
+                               IntBuffer viewport,
+                               float near,
+                               float far,
+                               FloatBuffer obj_pos) {
+    FloatBuffer in = this.inBuf;
+    FloatBuffer out = this.outBuf;
+
+    gluMultMatricesf(modelMatrix, projMatrix, matrixBuf);
+
+    if (!gluInvertMatrixf(matrixBuf, matrixBuf))
+      return false;
+
+    in.put(0, winx);
+    in.put(1, winy);
+    in.put(2, winz);
+    in.put(3, clipw);
+
+    // Map x and y from window coordinates
+    int vPos = viewport.position();
+    in.put(0, (in.get(0) - viewport.get(0+vPos)) / viewport.get(2+vPos));
+    in.put(1, (in.get(1) - viewport.get(1+vPos)) / viewport.get(3+vPos));
+    in.put(2, (in.get(2) - near) / (far - near));
+
+    // Map to range -1 to 1
+    in.put(0, in.get(0) * 2 - 1);
+    in.put(1, in.get(1) * 2 - 1);
+    in.put(2, in.get(2) * 2 - 1);
+
+    __gluMultMatrixVecf(matrixBuf, in, out);
+
+    if (out.get(3) == 0.0f)
+      return false;
+
+    int oPos = obj_pos.position();
+    obj_pos.put(0+oPos, out.get(0));
+    obj_pos.put(1+oPos, out.get(1));
+    obj_pos.put(2+oPos, out.get(2));
+    obj_pos.put(3+oPos, out.get(3));
+    return true;
+  }
+
+
+  /**
+   * Method gluPickMatrix
+   * 
+   * @param x
+   * @param y
+   * @param deltaX
+   * @param deltaY
+   * @param viewport
+   */
+  public void gluPickMatrix(GLMatrixFunc gl,
+                            float x,
+                            float y,
+                            float deltaX,
+                            float deltaY,
+                            IntBuffer viewport) {
+    if (deltaX <= 0 || deltaY <= 0) {
+      return;
+    }
+
+    /* Translate and scale the picked region to the entire window */
+    int vPos = viewport.position();
+    gl.glTranslatef((viewport.get(2+vPos) - 2 * (x - viewport.get(0+vPos))) / deltaX,
+                    (viewport.get(3+vPos) - 2 * (y - viewport.get(1+vPos))) / deltaY,
+                    0);
+    gl.glScalef(viewport.get(2) / deltaX, viewport.get(3) / deltaY, 1.0f);
+  }
+
+  /**
+   * Method gluPickMatrix
+   * 
+   * @param x
+   * @param y
+   * @param deltaX
+   * @param deltaY
+   * @param viewport
+   * @param viewport_offset
+   */
+  public void gluPickMatrix(GLMatrixFunc gl,
+                            float x,
+                            float y,
+                            float deltaX,
+                            float deltaY,
+                            int[] viewport,
+                            int viewport_offset) {
+    if (deltaX <= 0 || deltaY <= 0) {
+      return;
+    }
+
+    /* Translate and scale the picked region to the entire window */
+    gl.glTranslatef((viewport[2+viewport_offset] - 2 * (x - viewport[0+viewport_offset])) / deltaX,
+                    (viewport[3+viewport_offset] - 2 * (y - viewport[1+viewport_offset])) / deltaY,
+                    0);
+    gl.glScalef(viewport[2+viewport_offset] / deltaX, viewport[3+viewport_offset] / deltaY, 1.0f);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp
new file mode 100644
index 000000000..f686bea92
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp
@@ -0,0 +1,10 @@
+package com.jogamp.opengl.impl;
+
+public class SystemUtil {
+
+    /** Wrapper for System.getenv(), which doesn't work on platforms
+        earlier than JDK 5 */
+    public static String getenv(String variableName) {
+        return null;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase b/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase
new file mode 100644
index 000000000..dbb717a32
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase
@@ -0,0 +1,18 @@
+package com.jogamp.opengl.impl;
+
+public class SystemUtil {
+
+    private static volatile boolean getenvSupported = true;
+    /** Wrapper for System.getenv(), which doesn't work on platforms
+        earlier than JDK 5 */
+    public static String getenv(String variableName) {
+        if (getenvSupported) {
+            try {
+                return System.getenv(variableName);
+            } catch (Error e) {
+                getenvSupported = false;
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java
new file mode 100644
index 000000000..2576c8ae8
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.opengl.impl;
+
+import java.lang.reflect.InvocationTargetException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import javax.media.nativewindow.NativeWindowFactory;
+import com.sun.nativewindow.impl.NWReflection;
+import javax.media.opengl.GLException;
+
+/** Implementation of the {@link javax.media.opengl.Threading} class. */
+
+public class ThreadingImpl {
+    public static final int AWT    = 1;
+    public static final int WORKER = 2;
+
+    protected static final boolean DEBUG = Debug.debug("Threading");
+
+    private static boolean singleThreaded = true;
+    private static int mode;
+    private static boolean hasAWT;
+    // We need to know whether we're running on X11 platforms to change
+    // our behavior when the Java2D/JOGL bridge is active
+    private static boolean _isX11;
+
+    private static final ThreadingPlugin threadingPlugin;
+  
+    static {
+        Object threadingPluginTmp =
+            AccessController.doPrivileged(new PrivilegedAction() {
+                    public Object run() {
+                        String workaround = Debug.getProperty("jogl.1thread", true);
+                        // Default to using the AWT thread on all platforms except
+                        // Windows. On OS X there is instability apparently due to
+                        // using the JAWT on non-AWT threads. On X11 platforms there
+                        // are potential deadlocks which can be caused if the AWT
+                        // EventQueue thread hands work off to the GLWorkerThread
+                        // while holding the AWT lock. The optimization of
+                        // makeCurrent / release calls isn't worth these stability
+                        // problems.
+                        hasAWT = NWReflection.isClassAvailable("java.awt.Canvas") &&
+                            NWReflection.isClassAvailable("javax.media.opengl.awt.GLCanvas");
+
+                        String osType = NativeWindowFactory.getNativeWindowType(false);
+                        _isX11 = NativeWindowFactory.TYPE_X11.equals(osType);
+                        // boolean isWindows = NativeWindowFactory.TYPE_WINDOWS.equals(osType);
+
+                        // int defaultMode = (isWindows ? WORKER : ( hasAWT ? AWT : WORKER ) );
+                        int defaultMode = ( hasAWT ? AWT : WORKER );
+
+                        mode = defaultMode;
+                        if (workaround != null) {
+                            workaround = workaround.toLowerCase();
+                            if (workaround.equals("true") ||
+                                workaround.equals("auto")) {
+                                // Nothing to do; singleThreaded and mode already set up
+                            } else if (workaround.equals("worker")) {
+                                singleThreaded = true;
+                                mode = WORKER;
+                            } else if (workaround.equals("awt")) {
+                                singleThreaded = true;
+                                mode = AWT;
+                            } else {
+                                singleThreaded = false;
+                            }
+                        }
+                        printWorkaroundNotice();
+
+                        Object threadingPluginObj=null;
+                        // try to fetch the AWTThreadingPlugin
+                        try {
+                            threadingPluginObj = NWReflection.createInstance("com.jogamp.opengl.impl.awt.AWTThreadingPlugin");
+                        } catch (Throwable t) { }
+                        return threadingPluginObj;
+                    }
+                });
+        threadingPlugin = (ThreadingPlugin) threadingPluginTmp;
+        if(DEBUG) {
+            System.err.println("Threading: hasAWT "+hasAWT+", mode "+((mode==AWT)?"AWT":"WORKER")+", plugin "+threadingPlugin);
+        }
+    }
+
+    /** No reason to ever instantiate this class */
+    private ThreadingImpl() {}
+
+    public static boolean isX11() { return _isX11; }
+    public static int getMode() { return mode; }
+
+    /** If an implementation of the javax.media.opengl APIs offers a 
+        multithreading option but the default behavior is single-threading, 
+        this API provides a mechanism for end users to disable single-threading 
+        in this implementation.  Users are strongly discouraged from
+        calling this method unless they are aware of all of the
+        consequences and are prepared to enforce some amount of
+        threading restrictions in their applications. Disabling
+        single-threading, for example, may have unintended consequences
+        on GLAutoDrawable implementations such as GLCanvas, GLJPanel and
+        GLPbuffer. Currently there is no supported way to re-enable it
+        once disabled, partly to discourage careless use of this
+        method. This method should be called as early as possible in an
+        application. */ 
+    public static void disableSingleThreading() {
+        singleThreaded = false;
+        if (Debug.verbose()) {
+            System.err.println("Application forced disabling of single-threading of javax.media.opengl implementation");
+        }
+    }
+
+    /** Indicates whether OpenGL work is being automatically forced to a
+        single thread in this implementation. */
+    public static boolean isSingleThreaded() {
+        return singleThreaded;
+    }
+
+    /** Indicates whether the current thread is the single thread on
+        which this implementation of the javax.media.opengl APIs
+        performs all of its OpenGL-related work. This method should only
+        be called if the single-thread model is in effect. */
+    public static boolean isOpenGLThread() throws GLException {
+        if (!isSingleThreaded()) {
+            throw new GLException("Should only call this in single-threaded mode");
+        }
+
+        if(null!=threadingPlugin) {
+            return threadingPlugin.isOpenGLThread();
+        }
+
+        switch (mode) {
+        case AWT:
+            return true;
+        case WORKER:
+            return GLWorkerThread.isWorkerThread();
+        default:
+            throw new InternalError("Illegal single-threading mode " + mode);
+        }
+    }
+
+    /** Executes the passed Runnable on the single thread used for all
+        OpenGL work in this javax.media.opengl API implementation. It is
+        not specified exactly which thread is used for this
+        purpose. This method should only be called if the single-thread
+        model is in use and if the current thread is not the OpenGL
+        thread (i.e., if <code>isOpenGLThread()</code> returns
+        false). It is up to the end user to check to see whether the
+        current thread is the OpenGL thread and either execute the
+        Runnable directly or perform the work inside it. */
+    public static void invokeOnOpenGLThread(Runnable r) throws GLException {
+        if (!isSingleThreaded()) {
+            throw new GLException ("Should only call this in single-threaded mode");
+        }
+
+        if (isOpenGLThread()) {
+            throw new GLException ("Should only call this from other threads than the OpenGL thread");
+        }    
+
+        if(null!=threadingPlugin) {
+            threadingPlugin.invokeOnOpenGLThread(r);
+            return;
+        }
+
+        switch (mode) {
+            case AWT:
+                r.run();
+                break;
+
+            case WORKER:
+                if (!GLWorkerThread.isStarted()) {
+                    synchronized (GLWorkerThread.class) {
+                        if (!GLWorkerThread.isStarted()) {
+                            GLWorkerThread.start();
+                        }
+                    }
+                }
+                try {
+                    GLWorkerThread.invokeAndWait(r);
+                } catch (InvocationTargetException e) {
+                    throw new GLException(e.getTargetException());
+                } catch (InterruptedException e) {
+                    throw new GLException(e);
+                }
+                break;
+
+            default:
+                throw new InternalError("Illegal single-threading mode " + mode);
+        }
+    }
+
+    /** This is a workaround for AWT-related deadlocks which only seem
+        to show up in the context of applets */
+    public static boolean isAWTMode() {
+        return (mode == AWT);
+    }
+
+    private static void printWorkaroundNotice() {
+        if (singleThreaded && Debug.verbose()) {
+            System.err.println("Using " +
+                               (mode == AWT ? "AWT" : "OpenGL worker") +
+                               " thread for performing OpenGL work in javax.media.opengl implementation");
+        }
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ThreadingPlugin.java b/src/jogl/classes/com/jogamp/opengl/impl/ThreadingPlugin.java
new file mode 100644
index 000000000..37e4aac70
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ThreadingPlugin.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+import javax.media.opengl.*;
+
+public interface ThreadingPlugin {
+  /** Indicates whether the current thread is the single thread on
+      which this implementation of the javax.media.opengl APIs
+      performs all of its OpenGL-related work. This method should only
+      be called if the single-thread model is in effect. */
+  public boolean isOpenGLThread() throws GLException;
+
+  /** Executes the passed Runnable on the single thread used for all
+      OpenGL work in this javax.media.opengl API implementation. It is
+      not specified exactly which thread is used for this
+      purpose. This method should only be called if the single-thread
+      model is in use and if the current thread is not the OpenGL
+      thread (i.e., if <code>isOpenGLThread()</code> returns
+      false). It is up to the end user to check to see whether the
+      current thread is the OpenGL thread and either execute the
+      Runnable directly or perform the work inside it. */
+  public void invokeOnOpenGLThread(Runnable r) throws GLException;
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTThreadingPlugin.java b/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTThreadingPlugin.java
new file mode 100755
index 000000000..07bf2f2db
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTThreadingPlugin.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.awt;
+
+import javax.media.opengl.*;
+
+import java.awt.event.*;
+
+import java.awt.EventQueue;
+import java.lang.reflect.InvocationTargetException;
+
+import com.jogamp.opengl.impl.*;
+
+public class AWTThreadingPlugin implements ThreadingPlugin {
+
+  public AWTThreadingPlugin() {}
+
+  public boolean isOpenGLThread() throws GLException {
+    switch (ThreadingImpl.getMode()) {
+      case ThreadingImpl.AWT:
+        if (Java2D.isOGLPipelineActive()) {
+          // FIXME: ideally only the QFT would be considered to be the
+          // "OpenGL thread", but we can not currently run all of
+          // JOGL's OpenGL work on that thread. See the FIXME in
+          // invokeOnOpenGLThread.
+          return (Java2D.isQueueFlusherThread() ||
+                  (ThreadingImpl.isX11() && EventQueue.isDispatchThread()));
+        } else {
+          return EventQueue.isDispatchThread();
+        }
+      case ThreadingImpl.WORKER:
+        if (Java2D.isOGLPipelineActive()) {
+          // FIXME: ideally only the QFT would be considered to be the
+          // "OpenGL thread", but we can not currently run all of
+          // JOGL's OpenGL work on that thread. See the FIXME in
+          // invokeOnOpenGLThread.
+          return (Java2D.isQueueFlusherThread() ||
+                  (ThreadingImpl.isX11() && GLWorkerThread.isWorkerThread()));
+        } else {
+          return GLWorkerThread.isWorkerThread();
+        }
+      default:
+        throw new InternalError("Illegal single-threading mode " + ThreadingImpl.getMode());
+    }
+  }
+
+  public void invokeOnOpenGLThread(Runnable r) throws GLException {
+    switch (ThreadingImpl.getMode()) {
+      case ThreadingImpl.AWT:
+        // FIXME: ideally should run all OpenGL work on the Java2D QFT
+        // thread when it's enabled, but unfortunately there are
+        // deadlock issues on X11 platforms when making our
+        // heavyweight OpenGL contexts current on the QFT because we
+        // perform the JAWT lock inside the makeCurrent()
+        // implementation, which attempts to grab the AWT lock on the
+        // QFT which is not allowed. For now, on X11 platforms,
+        // continue to perform this work on the EDT.
+        if (Java2D.isOGLPipelineActive() && !ThreadingImpl.isX11()) {
+          Java2D.invokeWithOGLContextCurrent(null, r);
+        } else {
+          try {
+            EventQueue.invokeAndWait(r);
+          } catch (InvocationTargetException e) {
+            throw new GLException(e.getTargetException());
+          } catch (InterruptedException e) {
+            throw new GLException(e);
+          }
+        }
+        break;
+
+      case ThreadingImpl.WORKER:
+        if (!GLWorkerThread.isStarted()) {
+          synchronized (GLWorkerThread.class) {
+            if (!GLWorkerThread.isStarted()) {
+              GLWorkerThread.start();
+            }
+          }
+        }
+        try {
+          GLWorkerThread.invokeAndWait(r);
+        } catch (InvocationTargetException e) {
+          throw new GLException(e.getTargetException());
+        } catch (InterruptedException e) {
+          throw new GLException(e);
+        }
+        break;
+
+      default:
+        throw new InternalError("Illegal single-threading mode " + ThreadingImpl.getMode());
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java b/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java
new file mode 100644
index 000000000..306f6cee7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.opengl.impl.awt;
+
+import com.sun.nativewindow.impl.jawt.*;
+
+import com.jogamp.opengl.impl.*;
+
+import javax.media.opengl.*;
+
+import java.lang.reflect.*;
+import java.awt.GraphicsEnvironment;
+
+public class AWTUtil {
+  // See whether we're running in headless mode
+  private static boolean headlessMode;
+  private static Class j2dClazz = null;
+  private static Method isOGLPipelineActive = null;
+  private static Method isQueueFlusherThread = null;
+  private static boolean j2dOk = false;
+
+  static {
+    lockedToolkit = false;
+    headlessMode = GraphicsEnvironment.isHeadless();
+    if(!headlessMode) {
+        try {
+            j2dClazz = Class.forName("com.jogamp.opengl.impl.awt.Java2D");
+            isOGLPipelineActive = j2dClazz.getMethod("isOGLPipelineActive", null);
+            isQueueFlusherThread = j2dClazz.getMethod("isQueueFlusherThread", null);
+            j2dOk = true;
+        } catch (Exception e) {}
+    }
+  }
+
+  private static boolean lockedToolkit;
+
+  public static synchronized void lockToolkit() throws GLException {
+    if (lockedToolkit) {
+      throw new GLException("Toolkit already locked");
+    }
+    lockedToolkit = true;
+
+    if (headlessMode) {
+      // Workaround for running (to some degree) in headless
+      // environments but still supporting rendering via pbuffers
+      // For full correctness, would need to implement a Lock class
+      return;
+    }
+
+    if(j2dOk) {
+      try {
+        if( !((Boolean)isOGLPipelineActive.invoke(null, null)).booleanValue() ||
+            !((Boolean)isQueueFlusherThread.invoke(null, null)).booleanValue() ) {
+          JAWTUtil.lockToolkit();
+        }
+      } catch (Exception e) { j2dOk=false; }
+    } 
+    if(!j2dOk) {
+      JAWTUtil.lockToolkit();
+    }
+  }
+
+  public static synchronized void unlockToolkit() {
+    if (lockedToolkit) {
+        lockedToolkit = false;
+        if (headlessMode) {
+          // Workaround for running (to some degree) in headless
+          // environments but still supporting rendering via pbuffers
+          // For full correctness, would need to implement a Lock class
+          return;
+        }
+
+        if(j2dOk) {
+          try {
+            if( !((Boolean)isOGLPipelineActive.invoke(null, null)).booleanValue() ||
+                !((Boolean)isQueueFlusherThread.invoke(null, null)).booleanValue() ) {
+              JAWTUtil.unlockToolkit();
+            }
+          } catch (Exception e) { j2dOk=false; }
+        } 
+        if(!j2dOk) {
+          JAWTUtil.unlockToolkit();
+        }
+    }
+  }
+
+  public static boolean isToolkitLocked() {
+    return JAWTUtil.isToolkitLocked();
+  }
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2D.java b/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2D.java
new file mode 100755
index 000000000..b871c66a7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2D.java
@@ -0,0 +1,569 @@
+/*
+ * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.awt;
+
+import com.jogamp.opengl.impl.*;
+
+import java.awt.*;
+import java.awt.image.*;
+import java.lang.reflect.*;
+import java.security.*;
+
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.awt.*;
+
+/** Defines integration with the Java2D OpenGL pipeline. This
+    integration is only supported in 1.6 and is highly experimental. */
+
+public class Java2D {
+  private static boolean DEBUG = Debug.debug("Java2D");
+  private static boolean VERBOSE = Debug.verbose();
+  private static boolean isHeadless;
+  private static boolean isOGLPipelineActive;
+  private static Method invokeWithOGLContextCurrentMethod;
+  private static Method isQueueFlusherThreadMethod;
+  private static Method getOGLViewportMethod;
+  private static Method getOGLScissorBoxMethod;
+  private static Method getOGLSurfaceIdentifierMethod;
+  // This one is currently optional and is only in very recent Mustang builds
+  private static Method getOGLTextureTypeMethod;
+
+  // The following methods and fields are needed for proper support of
+  // Frame Buffer Objects in the Java2D/OpenGL pipeline
+  // (-Dsun.java2d.opengl.fbobject=true)
+  private static boolean fbObjectSupportInitialized;
+  private static Method invokeWithOGLSharedContextCurrentMethod;
+  private static Method getOGLSurfaceTypeMethod;
+
+  // Publicly-visible constants for OpenGL surface types
+  public static final int UNDEFINED       = getOGLUtilitiesIntField("UNDEFINED");
+  public static final int WINDOW          = getOGLUtilitiesIntField("WINDOW");
+  public static final int PBUFFER         = getOGLUtilitiesIntField("PBUFFER");
+  public static final int TEXTURE         = getOGLUtilitiesIntField("TEXTURE");
+  public static final int FLIP_BACKBUFFER = getOGLUtilitiesIntField("FLIP_BACKBUFFER");
+  public static final int FBOBJECT        = getOGLUtilitiesIntField("FBOBJECT");
+
+  // If FBOs are enabled in the Java2D/OpenGL pipeline, all contexts
+  // created by JOGL must share textures and display lists with the
+  // Java2D contexts in order to access the frame buffer object for
+  // potential rendering, and to simultaneously support sharing of
+  // textures and display lists with one another. Java2D has the
+  // notion of a single shared context with which all other contexts
+  // (on the same display device?) share textures and display lists;
+  // this is an approximation to that notion which will be refined
+  // later.
+  private static boolean initializedJ2DFBOShareContext;
+  private static GLContext j2dFBOShareContext;
+
+  // Accessors for new methods in sun.java2d.opengl.CGLSurfaceData
+  // class on OS X for enabling bridge
+  //  public static long    createOGLContextOnSurface(Graphics g, long ctx);
+  //  public static boolean makeOGLContextCurrentOnSurface(Graphics g, long ctx);
+  //  public static void    destroyOGLContext(long ctx);
+  private static Method createOGLContextOnSurfaceMethod;
+  private static Method makeOGLContextCurrentOnSurfaceMethod;
+  private static Method destroyOGLContextMethod;
+
+  static {
+    AccessController.doPrivileged(new PrivilegedAction() {
+        public Object run() {
+          if (DEBUG && VERBOSE) {
+            System.err.println("Checking for Java2D/OpenGL support");
+          }
+          try {
+            isHeadless = true;
+            // Figure out whether the default graphics configuration is an
+            // OpenGL graphics configuration
+            GraphicsConfiguration cfg =
+              GraphicsEnvironment.getLocalGraphicsEnvironment().
+              getDefaultScreenDevice().
+              getDefaultConfiguration();
+            // If we get here, we aren't running in headless mode
+            isHeadless = false;
+            String name = cfg.getClass().getName();
+            if (DEBUG && VERBOSE) {
+              System.err.println("Java2D support: default GraphicsConfiguration = " + name);
+            }
+            isOGLPipelineActive = (name.startsWith("sun.java2d.opengl"));
+
+            if (isOGLPipelineActive) {
+              try {
+                // Try to get methods we need to integrate
+                Class utils = Class.forName("sun.java2d.opengl.OGLUtilities");
+                invokeWithOGLContextCurrentMethod = utils.getDeclaredMethod("invokeWithOGLContextCurrent",
+                                                                            new Class[] {
+                                                                              Graphics.class,
+                                                                              Runnable.class
+                                                                            });
+                invokeWithOGLContextCurrentMethod.setAccessible(true);
+
+                isQueueFlusherThreadMethod = utils.getDeclaredMethod("isQueueFlusherThread",
+                                                                     new Class[] {});
+                isQueueFlusherThreadMethod.setAccessible(true);
+
+                getOGLViewportMethod = utils.getDeclaredMethod("getOGLViewport",
+                                                               new Class[] {
+                                                                 Graphics.class,
+                                                                 Integer.TYPE,
+                                                                 Integer.TYPE
+                                                               });
+                getOGLViewportMethod.setAccessible(true);
+
+                getOGLScissorBoxMethod = utils.getDeclaredMethod("getOGLScissorBox",
+                                                                 new Class[] {
+                                                                   Graphics.class
+                                                                 });
+                getOGLScissorBoxMethod.setAccessible(true);
+
+                getOGLSurfaceIdentifierMethod = utils.getDeclaredMethod("getOGLSurfaceIdentifier",
+                                                                        new Class[] {
+                                                                          Graphics.class
+                                                                        });
+                getOGLSurfaceIdentifierMethod.setAccessible(true);
+
+                // Try to get additional methods required for proper FBO support
+                fbObjectSupportInitialized = true;
+                try {
+                  invokeWithOGLSharedContextCurrentMethod = utils.getDeclaredMethod("invokeWithOGLSharedContextCurrent",
+                                                                                    new Class[] {
+                                                                                      GraphicsConfiguration.class,
+                                                                                      Runnable.class
+                                                                                    });
+                  invokeWithOGLSharedContextCurrentMethod.setAccessible(true);
+
+                  getOGLSurfaceTypeMethod = utils.getDeclaredMethod("getOGLSurfaceType",
+                                                                    new Class[] {
+                                                                      Graphics.class
+                                                                    });
+                  getOGLSurfaceTypeMethod.setAccessible(true);
+                } catch (Exception e) {
+                  fbObjectSupportInitialized = false;
+                  if (DEBUG && VERBOSE) {
+                    e.printStackTrace();
+                    System.err.println("Disabling Java2D/JOGL FBO support");
+                  }
+                }
+
+                // Try to get an additional method for FBO support in recent Mustang builds
+                try {
+                  getOGLTextureTypeMethod = utils.getDeclaredMethod("getOGLTextureType",
+                                                                    new Class[] {
+                                                                      Graphics.class
+                                                                    });
+                  getOGLTextureTypeMethod.setAccessible(true);
+                } catch (Exception e) {
+                  if (DEBUG && VERBOSE) {
+                    e.printStackTrace();
+                    System.err.println("GL_ARB_texture_rectangle FBO support disabled");
+                  }
+                }
+
+                // Try to set up APIs for enabling the bridge on OS X,
+                // where it isn't possible to create generalized
+                // external GLDrawables
+                Class cglSurfaceData = null;
+                try {
+                  cglSurfaceData = Class.forName("sun.java2d.opengl.CGLSurfaceData");
+                } catch (Exception e) {
+                  if (DEBUG && VERBOSE) {
+                    e.printStackTrace();
+                    System.err.println("Unable to find class sun.java2d.opengl.CGLSurfaceData for OS X");
+                  }
+                }
+                if (cglSurfaceData != null) {
+                  // FIXME: for now, assume that FBO support is not enabled on OS X
+                  fbObjectSupportInitialized = false;
+
+                  // We need to find these methods in order to make the bridge work on OS X
+                  createOGLContextOnSurfaceMethod = cglSurfaceData.getDeclaredMethod("createOGLContextOnSurface",
+                                                                                     new Class[] {
+                                                                                       Graphics.class,
+                                                                                       Long.TYPE
+                                                                                     });
+                  createOGLContextOnSurfaceMethod.setAccessible(true);
+
+                  makeOGLContextCurrentOnSurfaceMethod = cglSurfaceData.getDeclaredMethod("makeOGLContextCurrentOnSurface",
+                                                                                          new Class[] {
+                                                                                            Graphics.class,
+                                                                                            Long.TYPE
+                                                                                          });
+                  makeOGLContextCurrentOnSurfaceMethod.setAccessible(true);
+
+                  destroyOGLContextMethod = cglSurfaceData.getDeclaredMethod("destroyOGLContext",
+                                                                             new Class[] {
+                                                                               Long.TYPE
+                                                                             });
+                  destroyOGLContextMethod.setAccessible(true);
+                }
+              } catch (Exception e) {
+                if (DEBUG && VERBOSE) {
+                  e.printStackTrace();
+                  System.err.println("Disabling Java2D/JOGL integration");
+                }
+                isOGLPipelineActive = false;
+              }
+            }
+          } catch (HeadlessException e) {
+            // The AWT is running in headless mode, so the Java 2D / JOGL bridge is clearly disabled
+          }
+
+          if (DEBUG) {
+            System.err.println("JOGL/Java2D integration " + (isOGLPipelineActive ? "enabled" : "disabled"));
+          }
+          return null;
+        }
+      });
+  }
+
+  public static boolean isOGLPipelineActive() {
+    return isOGLPipelineActive;
+  }
+
+  public static boolean isFBOEnabled() {
+    return fbObjectSupportInitialized;
+  }
+
+  public static boolean isQueueFlusherThread() {
+    checkActive();
+
+    try {
+      return ((Boolean) isQueueFlusherThreadMethod.invoke(null, new Object[] {})).booleanValue();
+    } catch (InvocationTargetException e) {
+      throw new GLException(e.getTargetException());
+    } catch (Exception e) {
+      throw (InternalError) new InternalError().initCause(e);
+    }
+  }
+  
+  /** Makes current the OpenGL context associated with the passed
+      Graphics object and runs the given Runnable on the Queue
+      Flushing Thread in one atomic action. */
+  public static void invokeWithOGLContextCurrent(Graphics g, Runnable r) throws GLException {
+    checkActive();
+
+    try {
+      // FIXME: this may need adjustment
+      // This seems to be needed in many applications which don't
+      // initialize an OpenGL context before this and which would
+      // otherwise cause initFBOShareContext to be called from the
+      // Queue Flusher Thread, which isn't allowed
+      initFBOShareContext(GraphicsEnvironment.
+                          getLocalGraphicsEnvironment().
+                          getDefaultScreenDevice());
+
+      AWTUtil.lockToolkit();
+      try {
+        invokeWithOGLContextCurrentMethod.invoke(null, new Object[] {g, r});
+      } finally {
+        AWTUtil.unlockToolkit();
+      }
+    } catch (InvocationTargetException e) {
+      throw new GLException(e.getTargetException());
+    } catch (Exception e) {
+      throw (InternalError) new InternalError().initCause(e);
+    }
+  }
+
+  /** Makes current the "shared" OpenGL context associated with the
+      given GraphicsConfiguration object, allowing JOGL to share
+      server-side OpenGL objects like textures and display lists with
+      this context when necessary. This is needed when Java2D's FBO
+      support is enabled, because in order to render into that FBO,
+      JOGL must share textures and display lists with it. Returns
+      false if the passed GraphicsConfiguration was not an OpenGL
+      GraphicsConfiguration. */
+  public static boolean invokeWithOGLSharedContextCurrent(GraphicsConfiguration g, Runnable r) throws GLException {
+    checkActive();
+
+    try {
+      AWTUtil.lockToolkit();
+      try {
+        return ((Boolean) invokeWithOGLSharedContextCurrentMethod.invoke(null, new Object[] {g, r})).booleanValue();
+      } finally {
+        AWTUtil.unlockToolkit();
+      }
+    } catch (InvocationTargetException e) {
+      throw new GLException(e.getTargetException());
+    } catch (Exception e) {
+      throw (InternalError) new InternalError().initCause(e);
+    }
+  }
+
+  /** Returns the OpenGL viewport associated with the given Graphics
+      object, assuming that the Graphics object is associated with a
+      component of the specified width and height. The user should
+      call glViewport() with the returned rectangle's bounds in order
+      to get correct rendering results. Should only be called from the
+      Queue Flusher Thread. */
+  public static Rectangle getOGLViewport(Graphics g,
+                                         int componentWidth,
+                                         int componentHeight) {
+    checkActive();
+
+    try {
+      return (Rectangle) getOGLViewportMethod.invoke(null, new Object[] {g,
+                                                                         new Integer(componentWidth),
+                                                                         new Integer(componentHeight)});
+    } catch (InvocationTargetException e) {
+      throw new GLException(e.getTargetException());
+    } catch (Exception e) {
+      throw (InternalError) new InternalError().initCause(e);
+    }
+  }
+
+  /** Returns the OpenGL scissor region associated with the given
+      Graphics object, taking into account all clipping regions, etc.
+      To avoid destroying Java2D's previous rendering results, this
+      method should be called and the resulting rectangle's bounds
+      passed to a call to glScissor(). Should only be called from the
+      Queue Flusher Thread. */
+  public static Rectangle getOGLScissorBox(Graphics g) {
+    checkActive();
+
+    try {
+      return (Rectangle) getOGLScissorBoxMethod.invoke(null, new Object[] {g});
+    } catch (InvocationTargetException e) {
+      throw new GLException(e.getTargetException());
+    } catch (Exception e) {
+      throw (InternalError) new InternalError().initCause(e);
+    }
+  }
+
+  /** Returns an opaque "surface identifier" associated with the given
+      Graphics object. If this changes from invocation to invocation,
+      the underlying OpenGL drawable for the Graphics object has
+      changed and a new external GLDrawable and GLContext should be
+      created (and the old ones destroyed). Should only be called from
+      the Queue Flusher Thread.*/
+  public static Object getOGLSurfaceIdentifier(Graphics g) {
+    checkActive();
+
+    try {
+      return getOGLSurfaceIdentifierMethod.invoke(null, new Object[] {g});
+    } catch (InvocationTargetException e) {
+      throw new GLException(e.getTargetException());
+    } catch (Exception e) {
+      throw (InternalError) new InternalError().initCause(e);
+    }
+  }
+
+  /** Returns the underlying surface type for the given Graphics
+      object. This indicates, in particular, whether Java2D is
+      currently rendering into a pbuffer or FBO. */
+  public static int getOGLSurfaceType(Graphics g) {
+    checkActive();
+
+    try {
+      // FIXME: fallback path for pre-b73 (?) Mustang builds -- remove
+      // once fbobject support is in OGLUtilities
+      if (!fbObjectSupportInitialized) {
+        return 0;
+      }
+
+      return ((Integer) getOGLSurfaceTypeMethod.invoke(null, new Object[] { g })).intValue();
+    } catch (InvocationTargetException e) {
+      throw new GLException(e.getTargetException());
+    } catch (Exception e) {
+      throw (InternalError) new InternalError().initCause(e);
+    }
+  }
+
+  /** Returns the underlying texture target of the given Graphics
+      object assuming it is rendering to an FBO. Returns either
+      GL_TEXTURE_2D or GL_TEXTURE_RECTANGLE_ARB. */
+  public static int getOGLTextureType(Graphics g) {
+    checkActive();
+
+    if (getOGLTextureTypeMethod == null) {
+      return GL.GL_TEXTURE_2D;
+    }
+
+    try {
+      return ((Integer) getOGLTextureTypeMethod.invoke(null, new Object[] { g })).intValue();
+    } catch (InvocationTargetException e) {
+      throw new GLException(e.getTargetException());
+    } catch (Exception e) {
+      throw (InternalError) new InternalError().initCause(e);
+    }
+  }
+
+  /** Returns either the given GLContext or a substitute one with
+      which clients should share textures and display lists. Needed
+      when the Java2D/OpenGL pipeline is active and FBOs are being
+      used for rendering. FIXME: may need to alter the API in the
+      future to indicate which GraphicsDevice the source context is
+      associated with. */
+  public static GLContext filterShareContext(GLContext shareContext) {
+    if (isHeadless)
+      return shareContext;
+
+    // FIXME: this may need adjustment
+    initFBOShareContext(GraphicsEnvironment.
+                        getLocalGraphicsEnvironment().
+                        getDefaultScreenDevice());
+    if (j2dFBOShareContext != null) {
+      return j2dFBOShareContext;
+    }
+    return shareContext;
+  }
+
+  /** Returns the GLContext associated with the Java2D "share
+      context", with which all contexts created by JOGL must share
+      textures and display lists when the FBO option is enabled for
+      the Java2D/OpenGL pipeline. */
+  public static GLContext getShareContext(GraphicsDevice device) {
+    initFBOShareContext(device);
+    // FIXME: for full generality probably need to have multiple of
+    // these, one per GraphicsConfiguration seen?
+    return j2dFBOShareContext;
+  }
+
+  //----------------------------------------------------------------------
+  // Mac OS X-specific methods
+  //
+
+  /** (Mac OS X-specific) Creates a new OpenGL context on the surface
+      associated with the given Graphics object, sharing textures and
+      display lists with the specified (CGLContextObj) share context. */
+  public static long createOGLContextOnSurface(Graphics g, long shareCtx) {
+    checkActive();
+
+    try {
+      return ((Long) createOGLContextOnSurfaceMethod.invoke(null, new Object[] { g, new Long(shareCtx) })).longValue();
+    } catch (InvocationTargetException e) {
+      throw new GLException(e.getTargetException());
+    } catch (Exception e) {
+      throw (InternalError) new InternalError().initCause(e);
+    }
+  }
+
+  /** (Mac OS X-specific) Makes the given OpenGL context current on
+      the surface associated with the given Graphics object. */
+  public static boolean makeOGLContextCurrentOnSurface(Graphics g, long ctx) {
+    checkActive();
+
+    try {
+      return ((Boolean) makeOGLContextCurrentOnSurfaceMethod.invoke(null, new Object[] { g, new Long(ctx) })).booleanValue();
+    } catch (InvocationTargetException e) {
+      throw new GLException(e.getTargetException());
+    } catch (Exception e) {
+      throw (InternalError) new InternalError().initCause(e);
+    }
+  }
+
+  /** (Mac OS X-specific) Destroys the given OpenGL context. */
+  public static void destroyOGLContext(long ctx) {
+    checkActive();
+
+    try {
+      destroyOGLContextMethod.invoke(null, new Object[] { new Long(ctx) });
+    } catch (InvocationTargetException e) {
+      throw new GLException(e.getTargetException());
+    } catch (Exception e) {
+      throw (InternalError) new InternalError().initCause(e);
+    }
+  }
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  private static void checkActive() {
+    if (!isOGLPipelineActive()) {
+      throw new GLException("Java2D OpenGL pipeline not active (or necessary support not present)");
+    }
+  }
+
+  private static int getOGLUtilitiesIntField(final String name) {
+    Integer i = (Integer) AccessController.doPrivileged(new PrivilegedAction() {
+        public Object run() {
+          try {
+            Class utils = Class.forName("sun.java2d.opengl.OGLUtilities");
+            Field f = utils.getField(name);
+            f.setAccessible(true);
+            return f.get(null);
+          } catch (Exception e) {
+            if (DEBUG && VERBOSE) {
+              e.printStackTrace();
+            }
+            return null;
+          }
+        }
+      });
+    if (i == null)
+      return 0;
+    if (DEBUG && VERBOSE) {
+      System.err.println("OGLUtilities." + name + " = " + i.intValue());
+    }
+    return i.intValue();
+  }
+
+  private static void initFBOShareContext(final GraphicsDevice device) {
+    // Note 1: this must not be done in the static initalizer due to
+    // deadlock problems.
+
+    // Note 2: the first execution of this method must not be from the
+    // Java2D Queue Flusher Thread.
+
+    if (isOGLPipelineActive() &&
+        isFBOEnabled() &&
+        !initializedJ2DFBOShareContext) {
+
+      // FIXME: this technique is probably not adequate in multi-head
+      // situations. Ideally we would keep track of a given share
+      // context on a per-GraphicsConfiguration basis or something
+      // similar rather than keeping one share context in a global
+      // variable.
+      initializedJ2DFBOShareContext = true;
+      if (DEBUG) {
+        System.err.println("Starting initialization of J2D FBO share context");
+      }
+      invokeWithOGLSharedContextCurrent(device.getDefaultConfiguration(), new Runnable() {
+          public void run() {
+            j2dFBOShareContext = GLDrawableFactory.getFactory(GLProfile.getDefault()).createExternalGLContext();
+          }
+        });
+      if (DEBUG) {
+        System.err.println("Ending initialization of J2D FBO share context");
+      }
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2DGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2DGLContext.java
new file mode 100644
index 000000000..07bc54b6a
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2DGLContext.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.awt;
+
+import com.jogamp.opengl.impl.*;
+import java.awt.Graphics;
+
+/** Provides a construct by which the shared GLJPanel code can
+ * interact with a few methods in the Mac OS X-specific Java2D/JOGL
+ * bridge implementation.
+ */
+
+public interface Java2DGLContext {
+  public void setGraphics(Graphics g);
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
new file mode 100755
index 000000000..42d4588b5
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
@@ -0,0 +1,299 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
+import java.nio.*;
+import java.util.*;
+
+public abstract class EGLContext extends GLContextImpl {
+    private long eglContext;
+    private boolean eglQueryStringInitialized;
+    private boolean eglQueryStringAvailable;
+    private EGLExt eglExt;
+    // Table that holds the addresses of the native C-language entry points for
+    // EGL extension functions.
+    private EGLExtProcAddressTable eglExtProcAddressTable;
+
+    public EGLContext(GLDrawableImpl drawable, GLDrawableImpl drawableRead,
+                      GLContext shareWith) {
+        super(drawable, drawableRead, shareWith);
+    }
+
+    public EGLContext(GLDrawableImpl drawable,
+                      GLContext shareWith) {
+        this(drawable, null, shareWith);
+    }
+
+    public Object getPlatformGLExtensions() {
+      return getEGLExt();
+    }
+
+    public EGLExt getEGLExt() {
+      if (eglExt == null) {
+        eglExt = new EGLExtImpl(this);
+      }
+      return eglExt;
+    }
+
+    public final ProcAddressTable getPlatformExtProcAddressTable() {
+        return eglExtProcAddressTable;
+    }
+
+    public final EGLExtProcAddressTable getEGLExtProcAddressTable() {
+        return eglExtProcAddressTable;
+    }
+
+    protected String mapToRealGLFunctionName(String glFunctionName) {
+        return glFunctionName;
+    }
+
+    protected String mapToRealGLExtensionName(String glExtensionName) {
+        return glExtensionName;
+    }
+
+    public long getContext() {
+        return eglContext;
+    }
+
+    protected int makeCurrentImpl() throws GLException {
+        if(EGL.EGL_NO_DISPLAY==((EGLDrawable)drawable).getDisplay() ) {
+            System.err.println("drawable not properly initialized");
+            return CONTEXT_NOT_CURRENT;
+        }
+        boolean created = false;
+        if (eglContext == 0) {
+            create();
+            if (DEBUG) {
+                System.err.println(getThreadName() + ": !!! Created GL context 0x" +
+                                   Long.toHexString(eglContext) + " for " + getClass().getName());
+            }
+            created = true;
+        }
+        if (EGL.eglGetCurrentContext() != eglContext) {
+            if (!EGL.eglMakeCurrent(((EGLDrawable)drawable).getDisplay(),
+                                    ((EGLDrawable)drawable).getSurface(),
+                                    ((EGLDrawable)drawableRead).getSurface(),
+                                    eglContext)) {
+                throw new GLException("Error making context 0x" +
+                                      Long.toHexString(eglContext) + " current: error code " + EGL.eglGetError());
+            }
+        }
+
+        if (created) {
+            setGLFunctionAvailability(false);
+            return CONTEXT_CURRENT_NEW;
+        }
+        return CONTEXT_CURRENT;
+    }
+
+    protected void releaseImpl() throws GLException {
+      getDrawableImpl().getFactoryImpl().lockToolkit();
+      try {
+          if (!EGL.eglMakeCurrent(((EGLDrawable)drawable).getDisplay(),
+                                  EGL.EGL_NO_SURFACE,
+                                  EGL.EGL_NO_SURFACE,
+                                  EGL.EGL_NO_CONTEXT)) {
+                throw new GLException("Error freeing OpenGL context 0x" +
+                                      Long.toHexString(eglContext) + ": error code " + EGL.eglGetError());
+          }
+      } finally {
+          getDrawableImpl().getFactoryImpl().unlockToolkit();
+      }
+    }
+
+    protected void destroyImpl() throws GLException {
+      getDrawableImpl().getFactoryImpl().lockToolkit();
+      try {
+          if (eglContext != 0) {
+              if (!EGL.eglDestroyContext(((EGLDrawable)drawable).getDisplay(), eglContext)) {
+                  throw new GLException("Error destroying OpenGL context 0x" +
+                                        Long.toHexString(eglContext) + ": error code " + EGL.eglGetError());
+              }
+              eglContext = 0;
+              GLContextShareSet.contextDestroyed(this);
+          }
+      } finally {
+          getDrawableImpl().getFactoryImpl().unlockToolkit();
+      }
+    }
+
+    protected void create() throws GLException {
+        long eglDisplay = ((EGLDrawable)drawable).getDisplay();
+        EGLGraphicsConfiguration config = ((EGLDrawable)drawable).getGraphicsConfiguration();
+        GLProfile glProfile = drawable.getGLProfile();
+        _EGLConfig eglConfig = config.getNativeConfig();
+        long shareWith = EGL.EGL_NO_CONTEXT;
+
+        if (eglDisplay == 0) {
+            throw new GLException("Error: attempted to create an OpenGL context without a display connection");
+        }
+        if (eglConfig == null) {
+            throw new GLException("Error: attempted to create an OpenGL context without a graphics configuration");
+        }
+
+        try {
+            // might be unavailable on EGL < 1.2
+            if(!EGL.eglBindAPI(EGL.EGL_OPENGL_ES_API)) {
+                throw new GLException("eglBindAPI to ES failed , error 0x"+Integer.toHexString(EGL.eglGetError()));
+            }
+        } catch (GLException glex) {
+            if (DEBUG) {
+                glex.printStackTrace();
+            }
+        }
+
+        EGLContext other = (EGLContext) GLContextShareSet.getShareContext(this);
+        if (other != null) {
+            shareWith = other.getContext();
+            if (shareWith == 0) {
+                throw new GLException("GLContextShareSet returned an invalid OpenGL context");
+            }
+        }
+
+        int[] contextAttrs = new int[] {
+                EGL.EGL_CONTEXT_CLIENT_VERSION, -1,
+                EGL.EGL_NONE
+        };
+        if (glProfile.usesNativeGLES2()) {
+            contextAttrs[1] = 2;
+        } else if (glProfile.usesNativeGLES1()) {
+            contextAttrs[1] = 1;
+        } else {
+            throw new GLException("Error creating OpenGL context - invalid GLProfile: "+glProfile);
+        }
+        eglContext = EGL.eglCreateContext(eglDisplay, eglConfig, shareWith, contextAttrs, 0);
+        if (eglContext == 0) {
+            throw new GLException("Error creating OpenGL context: eglDisplay 0x"+Long.toHexString(eglDisplay)+
+                                  ", "+glProfile+", error 0x"+Integer.toHexString(EGL.eglGetError()));
+        }
+        GLContextShareSet.contextCreated(this);
+        if (DEBUG) {
+            System.err.println(getThreadName() + ": !!! Created OpenGL context 0x" +
+                               Long.toHexString(eglContext) + 
+                               ",\n\twrite surface 0x" + Long.toHexString(((EGLDrawable)drawable).getSurface()) +
+                               ",\n\tread  surface 0x" + Long.toHexString(((EGLDrawable)drawableRead).getSurface())+
+                               ",\n\t"+this+
+                               ",\n\tsharing with 0x" + Long.toHexString(shareWith));
+        }
+        if (!EGL.eglMakeCurrent(((EGLDrawable)drawable).getDisplay(),
+                                ((EGLDrawable)drawable).getSurface(),
+                                ((EGLDrawable)drawableRead).getSurface(),
+                                eglContext)) {
+            throw new GLException("Error making context 0x" +
+                                  Long.toHexString(eglContext) + " current: error code " + EGL.eglGetError());
+        }
+        setGLFunctionAvailability(true);
+    }
+
+    public boolean isCreated() {
+        return (eglContext != 0);
+    }
+
+    protected void updateGLProcAddressTable() {
+        if (DEBUG) {
+          System.err.println(getThreadName() + ": !!! Initializing EGL extension address table");
+        }
+        eglQueryStringInitialized = false;
+        eglQueryStringAvailable = false;
+
+        if (eglExtProcAddressTable == null) {
+          // FIXME: cache ProcAddressTables by capability bits so we can
+          // share them among contexts with the same capabilities
+          eglExtProcAddressTable = new EGLExtProcAddressTable();
+        }          
+        resetProcAddressTable(getEGLExtProcAddressTable());
+        super.updateGLProcAddressTable();
+    }
+  
+    public synchronized String getPlatformExtensionsString() {
+        if (!eglQueryStringInitialized) {
+          eglQueryStringAvailable =
+            getDrawableImpl().getDynamicLookupHelper().dynamicLookupFunction("eglQueryString") != 0;
+          eglQueryStringInitialized = true;
+        }
+        if (eglQueryStringAvailable) {
+          GLDrawableFactoryImpl factory = getDrawableImpl().getFactoryImpl();
+          factory.lockToolkit();
+          try {
+            String ret = EGL.eglQueryString(((EGLDrawable)drawable).getDisplay(), 
+                                            EGL.EGL_EXTENSIONS);
+            if (DEBUG) {
+              System.err.println("!!! EGL extensions: " + ret);
+            }
+            return ret;
+          } finally {
+            factory.unlockToolkit();
+          }
+        } else {
+          return "";
+        }
+    }
+
+    protected void setSwapIntervalImpl(int interval) {
+        if (EGL.eglSwapInterval(((EGLDrawable)drawable).getDisplay(), interval)) {
+            currentSwapInterval = interval ;
+        }
+    }
+
+    public abstract void bindPbufferToTexture();
+
+    public abstract void releasePbufferFromTexture();
+
+    //----------------------------------------------------------------------
+    // Currently unimplemented stuff
+    //
+
+    public void copy(GLContext source, int mask) throws GLException {
+        throw new GLException("Not yet implemented");
+    }
+
+
+    public ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3) {
+        throw new GLException("Should not call this");
+    }
+
+    public boolean offscreenImageNeedsVerticalFlip() {
+        throw new GLException("Should not call this");
+    }
+
+    public int getOffscreenContextPixelDataType() {
+        throw new GLException("Should not call this");
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
new file mode 100755
index 000000000..e48c78301
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import com.jogamp.opengl.impl.GLDrawableImpl;
+import com.sun.nativewindow.impl.NWReflection;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.egl.*;
+import javax.media.opengl.*;
+
+public abstract class EGLDrawable extends GLDrawableImpl {
+    protected boolean ownEGLDisplay = false; // for destruction
+    protected boolean ownEGLSurface = false; // for destruction
+    private EGLGraphicsConfiguration eglConfig;
+    protected long eglDisplay;
+    protected long eglSurface;
+
+    protected EGLDrawable(EGLDrawableFactory factory,
+                       NativeWindow component) throws GLException {
+        super(factory, component, false);
+        eglSurface=EGL.EGL_NO_SURFACE;
+        eglDisplay=0;
+    }
+
+    public long getDisplay() {
+        return eglDisplay;
+    }
+
+    public long getSurface() {
+        return eglSurface;
+    }
+
+    public EGLGraphicsConfiguration getGraphicsConfiguration() {
+        return eglConfig;
+    }
+
+    public GLCapabilities getChosenGLCapabilities() {
+        return (null==eglConfig)?super.getChosenGLCapabilities():(GLCapabilities)eglConfig.getChosenCapabilities();
+    }
+
+    public abstract GLContext createContext(GLContext shareWith);
+
+    protected abstract long createSurface(long eglDpy, _EGLConfig eglNativeCfg, long surfaceHandle);
+
+    private void recreateSurface() {
+        // create a new EGLSurface ..
+        if(EGL.EGL_NO_SURFACE!=eglSurface) {
+            EGL.eglDestroySurface(eglDisplay, eglSurface);
+        }
+
+        if(DEBUG) {
+            System.err.println("createSurface using eglDisplay 0x"+Long.toHexString(eglDisplay)+", "+eglConfig);
+        }
+
+        eglSurface = createSurface(eglDisplay, eglConfig.getNativeConfig(), component.getSurfaceHandle());
+        if (EGL.EGL_NO_SURFACE==eglSurface) {
+            throw new GLException("Creation of window surface failed: "+eglConfig+", error 0x"+Integer.toHexString(EGL.eglGetError()));
+        }
+
+        if(DEBUG) {
+            System.err.println("setSurface using component: handle 0x"+Long.toHexString(component.getSurfaceHandle())+" -> 0x"+Long.toHexString(eglSurface));
+        }
+    }
+
+    protected void setRealizedImpl() {
+        if (realized) {
+            if ( NativeWindow.LOCK_SURFACE_NOT_READY == lockSurface() ) {
+                throw new GLException("Couldn't lock surface");
+            }
+            // lockSurface() also resolved the window/surface handles
+            try {
+                AbstractGraphicsConfiguration aConfig = component.getGraphicsConfiguration().getNativeGraphicsConfiguration();
+                AbstractGraphicsDevice aDevice = aConfig.getScreen().getDevice();
+                if(aDevice instanceof EGLGraphicsDevice) {
+                    // just fetch the data .. trust but verify ..
+                    eglDisplay = aDevice.getHandle();
+                    if (eglDisplay == EGL.EGL_NO_DISPLAY) {
+                        throw new GLException("Invalid EGL display in EGLGraphicsDevice from "+aDevice);
+                    }
+                    if(aConfig instanceof EGLGraphicsConfiguration) {
+                        eglConfig = (EGLGraphicsConfiguration) aConfig; // done ..
+                        if (null == eglConfig) {
+                            throw new GLException("Null EGLGraphicsConfiguration from "+aConfig);
+                        }
+
+                        int[] tmp = new int[1];
+                        if ( 0 != component.getSurfaceHandle() &&
+                             EGL.eglQuerySurface(eglDisplay, component.getSurfaceHandle(), EGL.EGL_CONFIG_ID, tmp, 0) ) {
+                            // component holds static EGLSurface
+                            eglSurface = component.getSurfaceHandle();
+                            if(DEBUG) {
+                                System.err.println("setSurface re-using component's EGLSurface: handle 0x"+Long.toHexString(eglSurface));
+                            }
+                        } else {
+                            // EGLSurface is ours ..
+                            ownEGLSurface=true;
+                            
+                            eglConfig.updateGraphicsConfiguration();
+
+                            recreateSurface();
+                        }
+                    } else {
+                        throw new GLException("EGLGraphicsDevice hold by non EGLGraphicsConfiguration: "+aConfig);
+                    }
+                } else {
+                    // create a new EGL config ..
+                    ownEGLDisplay=true;
+                    // EGLSurface is ours ..
+                    ownEGLSurface=true;
+
+                    long nDisplay=0;
+                    if( NativeWindowFactory.TYPE_WINDOWS.equals(NativeWindowFactory.getNativeWindowType(false)) ) {
+                        nDisplay = component.getSurfaceHandle(); // don't even ask ..
+                    } else {
+                        nDisplay = aDevice.getHandle(); // 0 == EGL.EGL_DEFAULT_DISPLAY
+                    }
+                    eglDisplay = EGL.eglGetDisplay(nDisplay);
+                    if (eglDisplay == EGL.EGL_NO_DISPLAY) {
+                        if(DEBUG) {
+                            System.err.println("eglDisplay("+Long.toHexString(nDisplay)+" <surfaceHandle>): failed, using EGL_DEFAULT_DISPLAY");
+                        }
+                        nDisplay = EGL.EGL_DEFAULT_DISPLAY;
+                        eglDisplay = EGL.eglGetDisplay(nDisplay);
+                    }
+                    if (eglDisplay == EGL.EGL_NO_DISPLAY) {
+                        throw new GLException("Failed to created EGL display: nhandle 0x"+Long.toHexString(nDisplay)+", "+aDevice+", error 0x"+Integer.toHexString(EGL.eglGetError()));
+                    } else if(DEBUG) {
+                        System.err.println("eglDisplay("+Long.toHexString(nDisplay)+"): 0x"+Long.toHexString(eglDisplay));
+                    }
+                    if (!EGL.eglInitialize(eglDisplay, null, null)) {
+                        throw new GLException("eglInitialize failed"+", error 0x"+Integer.toHexString(EGL.eglGetError()));
+                    }
+                    EGLGraphicsDevice e = new EGLGraphicsDevice(eglDisplay);
+                    DefaultGraphicsScreen s = new DefaultGraphicsScreen(e, aConfig.getScreen().getIndex());
+                    GLCapabilities caps = (GLCapabilities) aConfig.getChosenCapabilities(); // yes, use the already choosen Capabilities (x11,win32,..)
+                    eglConfig = (EGLGraphicsConfiguration) GraphicsConfigurationFactory.getFactory(e).chooseGraphicsConfiguration(caps, null, s);
+                    if (null == eglConfig) {
+                        throw new GLException("Couldn't create EGLGraphicsConfiguration from "+s);
+                    } else if(DEBUG) {
+                        System.err.println("Chosen eglConfig: "+eglConfig);
+                    }
+                    recreateSurface();
+                }
+            } finally {
+              unlockSurface();
+            }
+        } else if (ownEGLSurface && eglSurface != EGL.EGL_NO_SURFACE) {
+            // Destroy the window surface
+            if (!EGL.eglDestroySurface(eglDisplay, eglSurface)) {
+                throw new GLException("Error destroying window surface (eglDestroySurface)");
+            }
+            eglSurface = EGL.EGL_NO_SURFACE;
+            if (ownEGLDisplay && EGL.EGL_NO_DISPLAY!=eglDisplay) {
+                EGL.eglTerminate(eglDisplay);
+            }
+            eglDisplay=EGL.EGL_NO_DISPLAY;
+            eglConfig=null;
+        }
+    }
+
+    public int getWidth() {
+        int[] tmp = new int[1];
+        if (!EGL.eglQuerySurface(eglDisplay, eglSurface, EGL.EGL_WIDTH, tmp, 0)) {
+            throw new GLException("Error querying surface width");
+        }
+        return tmp[0];
+    }
+
+    public int getHeight() {
+        int[] tmp = new int[1];
+        if (!EGL.eglQuerySurface(eglDisplay, eglSurface, EGL.EGL_HEIGHT, tmp, 0)) {
+            throw new GLException("Error querying surface height");
+        }
+        return tmp[0];
+    }
+
+    public DynamicLookupHelper getDynamicLookupHelper() {
+        return EGLDynamicLookupHelper.getDynamicLookupHelper(getGLProfile());
+    }
+
+    public String toString() {
+        return getClass().getName()+"[realized "+getRealized()+
+                    ",\n\tfactory    "+getFactory()+
+                    ",\n\twindow     "+getNativeWindow()+
+                    ",\n\teglSurface  0x"+Long.toHexString(eglSurface)+
+                    ",\n\teglConfig  "+eglConfig+
+                    ",\n\trequested  "+getRequestedGLCapabilities()+
+                    ",\n\tchosen     "+getChosenGLCapabilities()+"]";
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
new file mode 100755
index 000000000..f6c8b800e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import java.util.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.*;
+import com.jogamp.gluegen.runtime.NativeLibrary;
+
+public class EGLDrawableFactory extends GLDrawableFactoryImpl {
+  
+    static {
+        // Register our GraphicsConfigurationFactory implementations
+        // The act of constructing them causes them to be registered
+        new EGLGraphicsConfigurationFactory();
+
+        // Check for other underlying stuff ..
+        if(NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(true))) {
+            try {
+                NWReflection.createInstance("com.jogamp.opengl.impl.x11.glx.X11GLXGraphicsConfigurationFactory");
+            } catch (Throwable t) {}
+        }
+    }
+
+    public EGLDrawableFactory() {
+        super();
+    }
+
+    public GLDrawableImpl createOnscreenDrawable(NativeWindow target) {
+        if (target == null) {
+          throw new IllegalArgumentException("Null target");
+        }
+        return new EGLOnscreenDrawable(this, target);
+    }
+
+    protected GLDrawableImpl createOffscreenDrawable(NativeWindow target) {
+        throw new GLException("Not yet implemented");
+    }
+
+    public boolean canCreateGLPbuffer() {
+        return true;
+    }
+
+    protected GLDrawableImpl createGLPbufferDrawableImpl(NativeWindow target) {
+        return new EGLPbufferDrawable(this, target);
+    }
+
+    protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
+        NullWindow nw = new NullWindow(EGLGraphicsConfigurationFactory.createOffscreenGraphicsConfiguration(capabilities, chooser));
+        nw.setSize(width, height);
+        return nw;
+    }
+
+    public GLContext createExternalGLContext() {
+        AbstractGraphicsScreen absScreen = DefaultGraphicsScreen.createScreenDevice(0);
+        return new EGLExternalContext(absScreen);
+    }
+
+    public boolean canCreateExternalGLDrawable() {
+        return false;
+    }
+
+    public GLDrawable createExternalGLDrawable() {
+        throw new GLException("Not yet implemented");
+    }
+
+    public void loadGLULibrary() {
+    }
+
+    public boolean canCreateContextOnJava2DSurface() {
+        return false;
+    }
+
+    public GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
+        throws GLException {
+        throw new GLException("Unimplemented on this platform");
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
new file mode 100755
index 000000000..21e28ad28
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
@@ -0,0 +1,271 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import java.util.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.*;
+import com.jogamp.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
+import java.security.*;
+
+/**
+ * Abstract implementation of the DynamicLookupHelper for EGL,
+ * which decouples it's dependencies to EGLDrawableFactory.
+ *
+ * Currently two implementations exist, one for ES1 and one for ES2.
+ */
+public abstract class EGLDynamicLookupHelper implements DynamicLookupHelper {
+    protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("EGL");
+    protected static final boolean DEBUG_LOOKUP;
+
+    private static final EGLDynamicLookupHelper eglES1DynamicLookupHelper;
+    private static final EGLDynamicLookupHelper eglES2DynamicLookupHelper;
+    private List/*<NativeLibrary>*/ glesLibraries;
+
+    static {
+        AccessControlContext localACC=AccessController.getContext();
+        DEBUG_LOOKUP = com.jogamp.opengl.impl.Debug.isPropertyDefined("jogl.debug.DynamicLookup", true, localACC);
+
+        EGLDynamicLookupHelper tmp=null;
+        try {
+            tmp = new EGLES1DynamicLookupHelper();
+        } catch (Throwable t) {
+            if(DEBUG) {
+                t.printStackTrace();
+            }
+        }
+        eglES1DynamicLookupHelper = tmp;
+
+        tmp=null;
+        try {
+            tmp = new EGLES2DynamicLookupHelper();
+        } catch (Throwable t) {
+            if(DEBUG) {
+                t.printStackTrace();
+            }
+        }
+        eglES2DynamicLookupHelper = tmp;
+    }
+
+    public static EGLDynamicLookupHelper getDynamicLookupHelper(GLProfile glp) {
+        if (glp.usesNativeGLES2()) {
+            if(null==eglES2DynamicLookupHelper) {
+                throw new GLException("EGLDynamicLookupHelper for ES2 not available");
+            }
+            return eglES2DynamicLookupHelper;
+        } else if (glp.usesNativeGLES1()) {
+            if(null==eglES1DynamicLookupHelper) {
+                throw new GLException("EGLDynamicLookupHelper for ES1 not available");
+            }
+            return eglES1DynamicLookupHelper;
+        } else {
+            throw new GLException("Unsupported: "+glp);
+        }
+    }
+
+    public static EGLDynamicLookupHelper getDynamicLookupHelper(int esProfile) {
+        if (2==esProfile) {
+            if(null==eglES2DynamicLookupHelper) {
+                throw new GLException("EGLDynamicLookupHelper for ES2 not available");
+            }
+            return eglES2DynamicLookupHelper;
+        } else if (1==esProfile) {
+            if(null==eglES1DynamicLookupHelper) {
+                throw new GLException("EGLDynamicLookupHelper for ES1 not available");
+            }
+            return eglES1DynamicLookupHelper;
+        } else {
+            throw new GLException("Unsupported: ES"+esProfile);
+        }
+    }
+
+    protected EGLDynamicLookupHelper() {
+        loadGLESLibrary(getESProfile());
+        EGL.resetProcAddressTable(this);
+    }
+
+    /** Must return the proper ES profile number, 1 for ES1 and 2 for ES2 */
+    protected abstract int getESProfile();
+
+    /** Must return at least one OpenGL ES library name */
+    protected abstract List/*<String>*/ getGLESLibNames();
+
+    /** May return OpenGL ES library name(s) */
+    protected List/*<String>*/ getEGLLibNames() {
+        List/*<String>*/ eglLibNames = new ArrayList();
+
+        // EGL
+        eglLibNames.add("EGL");
+        // for windows distributions using the 'unlike' lib prefix, 
+        // where our tool does not add it.
+        eglLibNames.add("libEGL");
+
+        return eglLibNames;
+    }
+
+    private NativeLibrary loadFirstAvailable(List/*<String>*/ libNames, ClassLoader loader) {
+        for (Iterator iter = libNames.iterator(); iter.hasNext(); ) {
+            NativeLibrary lib = NativeLibrary.open((String) iter.next(), loader, false /*global*/);
+            if (lib != null) {
+                return lib;
+            }
+        }
+        return null;
+    }
+
+    private boolean loadEGLLibrary(ClassLoader loader, List/*<String>*/ eglLibNames) {
+        NativeLibrary lib = null;
+        if(null!=eglLibNames && eglLibNames.size()>0) {
+            // EGL libraries ..
+            lib = loadFirstAvailable(eglLibNames, loader);
+            if ( null != lib ) {
+                glesLibraries.add(lib);
+            }
+        }
+        return null!=lib;
+    }
+
+    private void loadGLESLibrary(int esProfile) {
+        List/*<String>*/ glesLibNames = getGLESLibNames();
+        List/*<String>*/ eglLibNames = getEGLLibNames();
+        boolean eglLoaded = false;
+
+        ClassLoader loader = getClass().getClassLoader();
+        NativeLibrary lib = null;
+
+        glesLibraries = new ArrayList();
+
+        // ES libraries ..
+        lib = loadFirstAvailable(glesLibNames, loader);
+        if ( null == lib ) {
+            /*** FIXME: Have to think about this ..
+            // try again with EGL loaded first ..
+            if ( !eglLoaded && loadEGLLibrary(loader, eglLibNames) ) {
+                eglLoaded = true ;
+                lib = loadFirstAvailable(glesLibNames, loader);
+            }
+            if ( null == lib ) {
+                throw new GLException("Unable to dynamically load OpenGL ES library for profile ES" + esProfile);
+            } */
+            throw new GLException("Unable to dynamically load OpenGL ES library for profile ES" + esProfile);
+        }
+        glesLibraries.add(lib);
+
+        if ( !eglLoaded && !loadEGLLibrary(loader, eglLibNames) ) {
+            throw new GLException("Unable to dynamically load EGL library for profile ES" + esProfile);
+        }
+
+        if (esProfile==2) {
+            NativeLibLoader.loadES2();
+        } else if (esProfile==1) {
+            NativeLibLoader.loadES1();
+        } else {
+            throw new GLException("Unsupported: ES"+esProfile);
+        }
+    }
+
+    private long dynamicLookupFunctionOnLibs(String glFuncName) {
+        String funcName=glFuncName;
+        long addr = dynamicLookupFunctionOnLibsImpl(funcName);
+        if( 0==addr && NativeWindowFactory.TYPE_WINDOWS.equals(NativeWindowFactory.getNativeWindowType(false)) ) {
+            // Hack: try some C++ decoration here for Imageon's emulation libraries ..
+            final int argAlignment=4;  // 4 byte alignment of each argument
+            final int maxArguments=12; // experience ..
+            for(int arg=0; 0==addr && arg<=maxArguments; arg++) {
+                funcName = "_"+glFuncName+"@"+(arg*argAlignment);
+                addr = dynamicLookupFunctionOnLibsImpl(funcName);
+            }
+        }
+        if(DEBUG_LOOKUP) {
+            if(0!=addr) {
+                System.err.println("Lookup-Native: "+glFuncName+" / "+funcName+" 0x"+Long.toHexString(addr));
+            } else {
+                System.err.println("Lookup-Native: "+glFuncName+" / "+funcName+" ** FAILED ** ");
+            }
+        }
+        return addr;
+    }
+
+    private long dynamicLookupFunctionOnLibsImpl(String glFuncName) {
+        // Look up this function name in all known libraries
+        for (Iterator iter = glesLibraries.iterator(); iter.hasNext(); ) {
+            NativeLibrary lib = (NativeLibrary) iter.next();
+            long addr = lib.lookupFunction(glFuncName);
+            if (addr != 0) {
+                return addr;
+            }
+        }
+        return 0;
+    }
+
+    private long eglGetProcAddressHandle = 0;
+
+    public long dynamicLookupFunction(String glFuncName) {
+        if(null==glFuncName) {
+            return 0;
+        }
+
+        // bootstrap eglGetProcAddress
+        if(0==eglGetProcAddressHandle) {
+            eglGetProcAddressHandle = dynamicLookupFunctionOnLibs("eglGetProcAddress");
+            if(0==eglGetProcAddressHandle) {
+                GLException e = new GLException("Couldn't find eglGetProcAddress function entry");
+                if(DEBUG) {
+                    e.printStackTrace();
+                }
+                throw e;
+            }
+        }
+
+        if(glFuncName.equals("eglGetProcAddress")) {
+            return eglGetProcAddressHandle;
+        }
+
+        long addr = EGL.eglGetProcAddress(eglGetProcAddressHandle, glFuncName);
+        if(DEBUG_LOOKUP) {
+            if(0!=addr) {
+                System.err.println("Lookup-EGL: <"+glFuncName+"> 0x"+Long.toHexString(addr));
+            }
+        }
+        if(0==addr) {
+            addr = dynamicLookupFunctionOnLibs(glFuncName);
+        }
+        return addr;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java
new file mode 100755
index 000000000..0dc9535ce
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import java.util.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.*;
+import com.jogamp.gluegen.runtime.NativeLibrary;
+
+/**
+ * Implementation of the EGLDynamicLookupHelper for ES1.
+ */
+public class EGLES1DynamicLookupHelper extends EGLDynamicLookupHelper {
+  
+    protected EGLES1DynamicLookupHelper() {
+        super();
+    }
+
+    protected int getESProfile() {
+        return 1;
+    }
+
+    protected List/*<String>*/ getGLESLibNames() {
+        List/*<String>*/ glesLibNames = new ArrayList();
+
+        glesLibNames.add("GLES_CM");
+        glesLibNames.add("GLES_CL");
+        glesLibNames.add("GLESv1_CM");
+        // for windows distributions using the 'unlike' lib prefix, 
+        // where our tool does not add it.
+        glesLibNames.add("libGLES_CM");
+        glesLibNames.add("libGLES_CL");
+        glesLibNames.add("libGLESv1_CM");
+
+        return glesLibNames;
+    }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java
new file mode 100755
index 000000000..595ded538
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import java.util.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.*;
+import com.jogamp.gluegen.runtime.NativeLibrary;
+
+/**
+ * Implementation of the EGLDynamicLookupHelper for ES2.
+ */
+public class EGLES2DynamicLookupHelper extends EGLDynamicLookupHelper {
+  
+    protected EGLES2DynamicLookupHelper() {
+        super();
+    }
+
+    protected int getESProfile() {
+        return 2;
+    }
+
+    protected List/*<String>*/ getGLESLibNames() {
+        List/*<String>*/ glesLibNames = new ArrayList();
+
+        glesLibNames.add("GLES20");
+        glesLibNames.add("GLESv2");
+        glesLibNames.add("GLESv2_CM");
+        // for windows distributions using the 'unlike' lib prefix
+        // where our tool does not add it.
+        glesLibNames.add("libGLES20"); 
+        glesLibNames.add("libGLESv2");
+        glesLibNames.add("libGLESv2_CM");
+
+        return glesLibNames;
+    }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java
new file mode 100755
index 000000000..de7fd2ba4
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import javax.media.nativewindow.*;
+
+public class EGLExternalContext extends EGLContext {
+    private boolean firstMakeCurrent = true;
+    private boolean created = true;
+    private GLContext lastContext;
+
+    public EGLExternalContext(AbstractGraphicsScreen screen) {
+        super(null, null);
+        GLContextShareSet.contextCreated(this);
+        setGLFunctionAvailability(false);
+        getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
+    }
+
+    public int makeCurrent() throws GLException {
+        // Save last context if necessary to allow external GLContexts to
+        // talk to other GLContexts created by this library
+        GLContext cur = getCurrent();
+        if (cur != null && cur != this) {
+            lastContext = cur;
+            setCurrent(null);
+        }
+        return super.makeCurrent();
+    }  
+
+    public void release() throws GLException {
+        super.release();
+        setCurrent(lastContext);
+        lastContext = null;
+    }
+
+    protected int makeCurrentImpl() throws GLException {
+        if (firstMakeCurrent) {
+            firstMakeCurrent = false;
+            return CONTEXT_CURRENT_NEW;
+        }
+        return CONTEXT_CURRENT;
+    }
+
+    protected void releaseImpl() throws GLException {
+    }
+
+    protected void destroyImpl() throws GLException {
+        created = false;
+        GLContextShareSet.contextDestroyed(this);
+    }
+
+    public boolean isCreated() {
+        return created;
+    }
+
+    public void bindPbufferToTexture() {
+        throw new GLException("Should not call this");
+    }
+
+    public void releasePbufferFromTexture() {
+        throw new GLException("Should not call this");
+    }
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
new file mode 100644
index 000000000..33f9db140
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import java.util.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.egl.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.NativeLibrary;
+
+public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
+    protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
+
+    public _EGLConfig getNativeConfig() {
+        return _config;
+    }
+
+    public int getNativeConfigID() {
+        return configID;
+    }
+
+    public EGLGraphicsConfiguration(AbstractGraphicsScreen absScreen, 
+                                    GLCapabilities capsChosen, GLCapabilities capsRequested, GLCapabilitiesChooser chooser,
+                                    _EGLConfig cfg, int cfgID) {
+        super(absScreen, capsChosen, capsRequested);
+        this.chooser = chooser;
+        _config = cfg;
+        configID = cfgID;
+    }
+
+    public static EGLGraphicsConfiguration create(GLCapabilities capsRequested, AbstractGraphicsScreen absScreen, int cfgID) {
+        AbstractGraphicsDevice absDevice = absScreen.getDevice();
+        if(null==absDevice || !(absDevice instanceof EGLGraphicsDevice)) {
+            throw new GLException("GraphicsDevice must be a valid EGLGraphicsDevice");
+        }
+        long dpy = absDevice.getHandle();
+        if (dpy == EGL.EGL_NO_DISPLAY) {
+            throw new GLException("Invalid EGL display: "+absDevice);
+        }
+        GLProfile glp = capsRequested.getGLProfile();
+        _EGLConfig _cfg = EGLConfigId2EGLConfig(glp, dpy, cfgID);
+        GLCapabilities caps = EGLConfig2Capabilities(glp, dpy, _cfg, false, capsRequested.isOnscreen(), capsRequested.isPBuffer());
+        return new EGLGraphicsConfiguration(absScreen, caps, capsRequested, new DefaultGLCapabilitiesChooser(), _cfg, cfgID);
+    }
+
+    public Object clone() {
+        return super.clone();
+    }
+
+    protected void updateGraphicsConfiguration() {
+        EGLGraphicsConfiguration newConfig = (EGLGraphicsConfiguration)
+            GraphicsConfigurationFactory.getFactory(getScreen().getDevice()).chooseGraphicsConfiguration(getRequestedCapabilities(),
+                                                                                                         chooser,
+                                                                                                         getScreen());
+        if(null!=newConfig) {
+            // FIXME: setScreen( ... );
+            setChosenCapabilities(newConfig.getChosenCapabilities());
+            _config = newConfig.getNativeConfig();
+            configID = newConfig.getNativeConfigID();
+            if(DEBUG) {
+                System.err.println("!!! updateGraphicsConfiguration: "+this);
+            }
+        }
+    }
+
+    public static _EGLConfig EGLConfigId2EGLConfig(GLProfile glp, long display, int configID) {
+        int[] attrs = new int[] {
+                EGL.EGL_CONFIG_ID, configID,
+                EGL.EGL_NONE
+            };
+        _EGLConfig[] configs = new _EGLConfig[1];
+        int[] numConfigs = new int[1];
+        if (!EGL.eglChooseConfig(display,
+                                 attrs, 0,
+                                 configs, 1,
+                                 numConfigs, 0)) {
+            return null;
+        }
+        if (numConfigs[0] == 0) {
+            return null;
+        }
+        return configs[0];
+    }
+
+    public static boolean EGLConfigDrawableTypeVerify(int val, boolean onscreen, boolean usePBuffer) {
+        boolean res;
+
+        if ( onscreen ) {
+            res = ( 0 != (val & EGL.EGL_WINDOW_BIT) ) ;
+        } else {
+            res = ( 0 != (val & EGL.EGL_PIXMAP_BIT) ) || usePBuffer ;
+        }
+        if ( usePBuffer ) {
+            res = res && ( 0 != (val & EGL.EGL_PBUFFER_BIT) ) ;
+        }
+
+        return res;
+    }
+
+    public static GLCapabilities EGLConfig2Capabilities(GLProfile glp, long display, _EGLConfig _config, 
+                                                        boolean relaxed, boolean onscreen, boolean usePBuffer) {
+        GLCapabilities caps = new GLCapabilities(glp);
+        int[] val = new int[1];
+
+        // Read the actual configuration into the choosen caps
+        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_RED_SIZE, val, 0)) {
+            caps.setRedBits(val[0]);
+        }
+        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_GREEN_SIZE, val, 0)) {
+            caps.setGreenBits(val[0]);
+        }
+        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_BLUE_SIZE, val, 0)) {
+            caps.setBlueBits(val[0]);
+        }
+        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_ALPHA_SIZE, val, 0)) {
+            caps.setAlphaBits(val[0]);
+        }
+        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_STENCIL_SIZE, val, 0)) {
+            caps.setStencilBits(val[0]);
+        }
+        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_DEPTH_SIZE, val, 0)) {
+            caps.setDepthBits(val[0]);
+        }
+        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_SAMPLES, val, 0)) {
+            caps.setSampleBuffers(val[0]>0?true:false);
+            caps.setNumSamples(val[0]);
+        }
+        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_TYPE, val, 0)) {
+            caps.setBackgroundOpaque(val[0] != EGL.EGL_TRANSPARENT_RGB);
+        }
+        if(!caps.isBackgroundOpaque()) {
+            if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_RED_VALUE, val, 0)) {
+                caps.setTransparentRedValue(val[0]==EGL.EGL_DONT_CARE?-1:val[0]);
+            }
+            if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_GREEN_VALUE, val, 0)) {
+                caps.setTransparentGreenValue(val[0]==EGL.EGL_DONT_CARE?-1:val[0]);
+            }
+            if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_BLUE_VALUE, val, 0)) {
+                caps.setTransparentBlueValue(val[0]==EGL.EGL_DONT_CARE?-1:val[0]);
+            }
+            /** Not defined in EGL 
+            if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_ALPHA_VALUE, val, 0)) {
+                caps.setTransparentAlphaValue(val[0]==EGL.EGL_DONT_CARE?-1:val[0]);
+            } */
+        }
+        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_SURFACE_TYPE, val, 0)) {
+            if(EGLConfigDrawableTypeVerify(val[0], onscreen, usePBuffer)) {
+                caps.setDoubleBuffered(onscreen);
+                caps.setOnscreen(onscreen);
+                caps.setPBuffer(usePBuffer);
+            } else if(relaxed) {
+                caps.setDoubleBuffered( 0 != (val[0] & EGL.EGL_WINDOW_BIT) );
+                caps.setOnscreen( 0 != (val[0] & EGL.EGL_WINDOW_BIT) );
+                caps.setPBuffer ( 0 != (val[0] & EGL.EGL_PBUFFER_BIT) );
+            } else {
+                throw new GLException("EGL_SURFACE_TYPE does not match !!!");
+            }
+        } else {
+            if(relaxed) {
+                if(DEBUG) {
+                    System.err.println("Could not determine EGL_SURFACE_TYPE !!!");
+                }
+                return null;
+            } else {
+                throw new GLException("Could not determine EGL_SURFACE_TYPE !!!");
+            }
+        }
+
+        return caps;
+    }
+
+    public static int[] GLCapabilities2AttribList(GLCapabilities caps) {
+        int[] attrs = new int[32];
+        int idx=0;
+
+        attrs[idx++] = EGL.EGL_SURFACE_TYPE;
+        attrs[idx++] = caps.isOnscreen() ? ( EGL.EGL_WINDOW_BIT ) : ( caps.isPBuffer() ? EGL.EGL_PBUFFER_BIT : EGL.EGL_PIXMAP_BIT ) ;
+
+        attrs[idx++] = EGL.EGL_RED_SIZE;
+        attrs[idx++] = caps.getRedBits();
+
+        attrs[idx++] = EGL.EGL_GREEN_SIZE;
+        attrs[idx++] = caps.getGreenBits();
+
+        attrs[idx++] = EGL.EGL_BLUE_SIZE;
+        attrs[idx++] = caps.getBlueBits();
+
+        attrs[idx++] = EGL.EGL_ALPHA_SIZE;
+        attrs[idx++] = caps.getAlphaBits() > 0 ? caps.getAlphaBits() : EGL.EGL_DONT_CARE;
+
+        attrs[idx++] = EGL.EGL_STENCIL_SIZE;
+        attrs[idx++] = caps.getStencilBits() > 0 ? caps.getStencilBits() : EGL.EGL_DONT_CARE;
+
+        attrs[idx++] = EGL.EGL_DEPTH_SIZE;
+        attrs[idx++] = caps.getDepthBits();
+
+        attrs[idx++] = EGL.EGL_SAMPLES;
+        attrs[idx++] = caps.getSampleBuffers() ? caps.getNumSamples() : 1;
+
+        attrs[idx++] = EGL.EGL_TRANSPARENT_TYPE;
+        attrs[idx++] = caps.isBackgroundOpaque() ? EGL.EGL_NONE : EGL.EGL_TRANSPARENT_TYPE;
+
+        // 20
+
+        if(!caps.isBackgroundOpaque()) {
+            attrs[idx++] = EGL.EGL_TRANSPARENT_RED_VALUE;
+            attrs[idx++] = caps.getTransparentRedValue()>=0?caps.getTransparentRedValue():EGL.EGL_DONT_CARE;
+
+            attrs[idx++] = EGL.EGL_TRANSPARENT_GREEN_VALUE;
+            attrs[idx++] = caps.getTransparentGreenValue()>=0?caps.getTransparentGreenValue():EGL.EGL_DONT_CARE;
+
+            attrs[idx++] = EGL.EGL_TRANSPARENT_BLUE_VALUE;
+            attrs[idx++] = caps.getTransparentBlueValue()>=0?caps.getTransparentBlueValue():EGL.EGL_DONT_CARE;
+
+            /** Not define in EGL
+            attrs[idx++] = EGL.EGL_TRANSPARENT_ALPHA_VALUE;
+            attrs[idx++] = caps.getTransparentAlphaValue()>=0?caps.getTransparentAlphaValue():EGL.EGL_DONT_CARE; */
+        }
+
+        // 26 
+
+        attrs[idx++] = EGL.EGL_RENDERABLE_TYPE;
+        if(caps.getGLProfile().usesNativeGLES1()) {
+            attrs[idx++] = EGL.EGL_OPENGL_ES_BIT;
+        }
+        else if(caps.getGLProfile().usesNativeGLES2()) {
+            attrs[idx++] = EGL.EGL_OPENGL_ES2_BIT;
+        } else {
+            attrs[idx++] = EGL.EGL_OPENGL_BIT;
+        }
+
+        // 28
+
+        attrs[idx++] = EGL.EGL_NONE;
+
+        return attrs;
+    }
+
+    public static int[] CreatePBufferSurfaceAttribList(int width, int height, int texFormat) {
+        int[] attrs = new int[16];
+        int idx=0;
+
+        attrs[idx++] = EGL.EGL_WIDTH;
+        attrs[idx++] = width;
+
+        attrs[idx++] = EGL.EGL_HEIGHT;
+        attrs[idx++] = height;
+
+        attrs[idx++] = EGL.EGL_TEXTURE_FORMAT;
+        attrs[idx++] = texFormat;
+
+        attrs[idx++] = EGL.EGL_TEXTURE_TARGET;
+        attrs[idx++] = EGL.EGL_NO_TEXTURE==texFormat ? EGL.EGL_NO_TEXTURE : EGL.EGL_TEXTURE_2D;
+
+        attrs[idx++] = EGL.EGL_NONE;
+
+        return attrs;
+    }
+
+    public String toString() {
+        return getClass().toString()+"["+getScreen()+", eglConfigID 0x"+Integer.toHexString(configID)+
+                                     ",\n\trequested " + getRequestedCapabilities()+
+                                     ",\n\tchosen    " + getChosenCapabilities()+
+                                     "]";
+
+    }
+
+    private GLCapabilitiesChooser chooser;
+    private _EGLConfig _config;
+    private int configID;
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
new file mode 100644
index 000000000..6546ecab7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import java.io.PrintStream;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.egl.*;
+import com.sun.nativewindow.impl.*;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+/** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
+    are used on X11 platforms. Toolkits will likely need to delegate
+    to this one to change the accepted and returned types of the
+    GraphicsDevice and GraphicsConfiguration abstractions. */
+
+public class EGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
+    protected static final boolean DEBUG = GraphicsConfigurationFactory.DEBUG || com.jogamp.opengl.impl.Debug.debug("EGL");
+
+    public EGLGraphicsConfigurationFactory() {
+        // become the selector for KD/EGL ..
+        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.egl.EGLGraphicsDevice.class, this);
+    }
+
+    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
+                                                                     CapabilitiesChooser chooser,
+                                                                     AbstractGraphicsScreen absScreen) {
+        if (absScreen == null) {
+            throw new IllegalArgumentException("This NativeWindowFactory accepts only AbstractGraphicsDevice objects");
+        }
+
+        if (capabilities != null &&
+            !(capabilities instanceof GLCapabilities)) {
+            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilities objects");
+        }
+
+        if (chooser != null &&
+            !(chooser instanceof GLCapabilitiesChooser)) {
+            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilitiesChooser objects");
+        }
+
+        return chooseGraphicsConfigurationStatic((GLCapabilities) capabilities,
+                                                 (GLCapabilitiesChooser) chooser,
+                                                 absScreen);
+    }
+
+    public static EGLGraphicsConfiguration chooseGraphicsConfigurationStatic(GLCapabilities capabilities,
+                                                                             GLCapabilitiesChooser chooser,
+                                                                             AbstractGraphicsScreen absScreen) {
+        if (capabilities == null) {
+            capabilities = new GLCapabilities(null);
+        }
+        GLProfile glp = capabilities.getGLProfile();
+
+        if(null==absScreen) {
+            throw new GLException("Null AbstractGraphicsScreen");
+        }
+        AbstractGraphicsDevice absDevice = absScreen.getDevice();
+
+        if(null==absDevice || !(absDevice instanceof EGLGraphicsDevice)) {
+            throw new GLException("GraphicsDevice must be a valid EGLGraphicsDevice");
+        }
+        long eglDisplay = absDevice.getHandle();
+
+        if (eglDisplay == EGL.EGL_NO_DISPLAY) {
+            throw new GLException("Invalid EGL display: "+absDevice);
+        }
+
+        GLCapabilities caps2 = (GLCapabilities) capabilities.clone();
+        if(!caps2.isOnscreen()) {
+            // OFFSCREEN !DOUBLE_BUFFER
+            caps2.setDoubleBuffered(false);
+        }
+
+        EGLGraphicsConfiguration res = eglChooseConfig(eglDisplay, caps2, capabilities, chooser, absScreen);
+        if(null!=res) {
+            return res;
+        }
+        if(DEBUG) {
+            System.err.println("eglChooseConfig failed with given capabilities "+caps2);
+        }
+
+        if (chooser == null) {
+            chooser = new DefaultGLCapabilitiesChooser();
+        }
+
+        _EGLConfig[] configs = new _EGLConfig[10];
+        int[] numConfigs = new int[1];
+
+        if(!EGL.eglGetConfigs(eglDisplay, configs, configs.length, numConfigs, 0)) {
+            throw new GLException("Graphics configuration fetch (eglGetConfigs) failed");
+        }
+        if (numConfigs[0] == 0) {
+            throw new GLException("Graphics configuration fetch (eglGetConfigs) - no EGLConfig found");
+        }
+        GLCapabilities[] caps = eglConfigs2GLCaps(glp, eglDisplay, configs, numConfigs[0],
+                                                    caps2.isOnscreen(), caps2.isPBuffer());
+        if(DEBUG) {
+            System.err.println("EGL Get Configs: "+numConfigs[0]+", Caps "+caps.length);
+            printCaps("eglGetConfigs", caps, System.err);
+        }
+        int chosen = -1;
+        try {
+            chosen = chooser.chooseCapabilities(caps2, caps, -1);
+        } catch (NativeWindowException e) { throw new GLException(e); }
+        if(chosen<0) {
+            throw new GLException("Graphics configuration chooser failed");
+        }
+        if(DEBUG) {
+            System.err.println("Chosen "+caps[chosen]);
+        }
+        res = eglChooseConfig(eglDisplay, caps[chosen], capabilities, chooser, absScreen);
+        if(null!=res) {
+            return res;
+        }
+        if(DEBUG) {
+            System.err.println("eglChooseConfig failed with eglGetConfig/choosen capabilities "+caps[chosen]);
+        }
+
+        // Last try .. add a fixed embedded profile [ATI, Nokia, Intel, ..]
+        //
+        // rgb888 - d16, s4
+        GLCapabilities fixedCaps = new GLCapabilities(glp);
+        fixedCaps.setRedBits(8);
+        fixedCaps.setGreenBits(8);
+        fixedCaps.setBlueBits(8);
+        fixedCaps.setDepthBits(16);
+        fixedCaps.setSampleBuffers(true);
+        fixedCaps.setNumSamples(4);
+        if(DEBUG) {
+            System.err.println("trying fixed caps (1): "+fixedCaps);
+        }
+        res = eglChooseConfig(eglDisplay, fixedCaps, capabilities, chooser, absScreen);
+        if(null!=res) {
+            return res;
+        }
+
+        //
+        // rgb565 - d16, s0
+        fixedCaps = new GLCapabilities(glp);
+        fixedCaps.setRedBits(5);
+        fixedCaps.setGreenBits(6);
+        fixedCaps.setBlueBits(5);
+        fixedCaps.setDepthBits(16);
+        if(DEBUG) {
+            System.err.println("trying fixed caps (2): "+fixedCaps);
+        }
+        res = eglChooseConfig(eglDisplay, fixedCaps, capabilities, chooser, absScreen);
+        if(null!=res) {
+            return res;
+        }
+
+        //
+        // rgb565 - d16, s4
+        fixedCaps = new GLCapabilities(glp);
+        fixedCaps.setRedBits(5);
+        fixedCaps.setGreenBits(6);
+        fixedCaps.setBlueBits(5);
+        fixedCaps.setDepthBits(16);
+        fixedCaps.setSampleBuffers(true);
+        fixedCaps.setNumSamples(4);
+        if(DEBUG) {
+            System.err.println("trying fixed caps (3): "+fixedCaps);
+        }
+        res = eglChooseConfig(eglDisplay, fixedCaps, capabilities, chooser, absScreen);
+        if(null!=res) {
+            return res;
+        }
+        throw new GLException("Graphics configuration failed [direct caps, eglGetConfig/chooser and fixed-caps(1-3)]");
+    }
+
+    protected static EGLGraphicsConfiguration eglChooseConfig(long eglDisplay, 
+                                                              GLCapabilities capsChosen0, GLCapabilities capsRequested, GLCapabilitiesChooser chooser,
+                                                              AbstractGraphicsScreen absScreen) {
+        GLProfile glp = capsChosen0.getGLProfile();
+        int[] attrs = EGLGraphicsConfiguration.GLCapabilities2AttribList(capsChosen0);
+        _EGLConfig[] configs = new _EGLConfig[1];
+        int[] numConfigs = new int[1];
+        if (!EGL.eglChooseConfig(eglDisplay,
+                                 attrs, 0,
+                                 configs, configs.length,
+                                 numConfigs, 0)) {
+            throw new GLException("Graphics configuration selection (eglChooseConfig) failed for "+capsChosen0);
+        }
+        if (numConfigs[0] > 0) {
+            if(DEBUG) {
+                GLCapabilities[] caps = eglConfigs2GLCaps(glp, eglDisplay, configs, numConfigs[0],
+                                                    capsChosen0.isOnscreen(), capsChosen0.isPBuffer());
+                System.err.println("EGL Choose Configs: "+numConfigs[0]+", Caps "+caps.length);
+                printCaps("eglChooseConfig", caps, System.err);
+            }
+            int[] val = new int[1];
+            // get the configID 
+            if(!EGL.eglGetConfigAttrib(eglDisplay, configs[0], EGL.EGL_CONFIG_ID, val, 0)) {
+                if(DEBUG) {
+                    // FIXME: this happens on a ATI PC Emulation ..
+                    System.err.println("EGL couldn't retrieve ConfigID for already chosen eglConfig "+capsChosen0+", error 0x"+Integer.toHexString(EGL.eglGetError()));
+                }
+                return null;
+            }
+            GLCapabilities capsChosen1 = EGLGraphicsConfiguration.EGLConfig2Capabilities(glp, eglDisplay, configs[0],
+                                                                    true, capsChosen0.isOnscreen(), capsChosen0.isPBuffer());
+            if(null!=capsChosen1) {
+                if(DEBUG) {
+                    System.err.println("eglChooseConfig found: eglDisplay 0x"+Long.toHexString(eglDisplay)+
+                                                            ", eglConfig ID 0x"+Integer.toHexString(val[0])+
+                                                            ", "+capsChosen0+" -> "+capsChosen1);
+                }
+                return new EGLGraphicsConfiguration(absScreen, capsChosen1, capsRequested, chooser, configs[0], val[0]);
+            }
+            if(DEBUG) {
+                System.err.println("eglChooseConfig couldn't verify: eglDisplay 0x"+Long.toHexString(eglDisplay)+
+                                                                        ", eglConfig ID 0x"+Integer.toHexString(val[0])+
+                                                                        ", for "+capsChosen0);
+            }
+        } else {
+            if(DEBUG) {
+                System.err.println("EGL Choose Configs: None using eglDisplay 0x"+Long.toHexString(eglDisplay)+
+                                                                ", "+capsChosen0);
+            }
+        }
+        return null;
+    }
+
+    protected static GLCapabilities[] eglConfigs2GLCaps(GLProfile glp, long eglDisplay, _EGLConfig[] configs, int num,
+                                                        boolean onscreen, boolean usePBuffer) {
+        GLCapabilities[] caps = new GLCapabilities[num];
+        for(int i=0; i<num; i++) {
+            caps[i] = EGLGraphicsConfiguration.EGLConfig2Capabilities(glp, eglDisplay, configs[i],
+                                            true, onscreen, usePBuffer);
+        }
+        return caps;
+    }
+
+    protected static void printCaps(String prefix, GLCapabilities[] caps, PrintStream out) {
+        for(int i=0; i<caps.length; i++) {
+            out.println(prefix+"["+i+"] "+caps[i]);
+        }
+    }
+
+    protected static EGLGraphicsConfiguration createOffscreenGraphicsConfiguration(GLCapabilities caps, GLCapabilitiesChooser chooser) {
+        if(caps.isOnscreen()) {
+            throw new GLException("Error: Onscreen set: "+caps);
+        }
+        caps.setDoubleBuffered(false); // FIXME
+        long eglDisplay = EGL.eglGetDisplay(EGL.EGL_DEFAULT_DISPLAY);
+        if (eglDisplay == EGL.EGL_NO_DISPLAY) {
+            throw new GLException("Failed to created EGL default display: error 0x"+Integer.toHexString(EGL.eglGetError()));
+        } else if(DEBUG) {
+            System.err.println("eglDisplay(EGL_DEFAULT_DISPLAY): 0x"+Long.toHexString(eglDisplay));
+        }
+        if (!EGL.eglInitialize(eglDisplay, null, null)) {
+            throw new GLException("eglInitialize failed"+", error 0x"+Integer.toHexString(EGL.eglGetError()));
+        }
+        EGLGraphicsDevice e = new EGLGraphicsDevice(eglDisplay);
+        DefaultGraphicsScreen s = new DefaultGraphicsScreen(e, 0);
+        EGLGraphicsConfiguration eglConfig = chooseGraphicsConfigurationStatic(caps, chooser, s);
+        if (null == eglConfig) {
+            EGL.eglTerminate(eglDisplay);
+            throw new GLException("Couldn't create EGLGraphicsConfiguration from "+s);
+        } else if(DEBUG) {
+            System.err.println("Chosen eglConfig: "+eglConfig);
+        }
+        return eglConfig;
+    }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenContext.java
new file mode 100755
index 000000000..b74991671
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenContext.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
+import java.nio.*;
+import java.util.*;
+
+public class EGLOnscreenContext extends EGLContext {
+    public EGLOnscreenContext(EGLOnscreenDrawable drawable, GLContext shareWith) {
+        super(drawable, shareWith);
+    }
+
+    // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
+    protected int makeCurrentImpl() throws GLException {
+        int lockRes = drawable.lockSurface();
+        boolean exceptionOccurred = false;
+        try {
+          if (lockRes == NativeWindow.LOCK_SURFACE_NOT_READY) {
+            return CONTEXT_NOT_CURRENT;
+          }
+          return super.makeCurrentImpl();
+        } catch (RuntimeException e) {
+          exceptionOccurred = true;
+          throw e;
+        } finally {
+          if (exceptionOccurred ||
+              (isOptimizable() && lockRes != NativeWindow.LOCK_SURFACE_NOT_READY) && drawable.isSurfaceLocked()) {
+            drawable.unlockSurface();
+          }
+        }
+    }
+
+    // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
+    protected void releaseImpl() throws GLException {
+        try {
+          super.releaseImpl();
+        } finally {
+          if (!isOptimizable() && drawable.isSurfaceLocked()) {
+            drawable.unlockSurface();
+          }
+        }
+    }
+
+    public void bindPbufferToTexture() {
+        throw new GLException("Should not call this");
+    }
+
+    public void releasePbufferFromTexture() {
+        throw new GLException("Should not call this");
+    }
+
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
new file mode 100644
index 000000000..d37a36fb0
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.egl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.NullWindow;
+
+public class EGLOnscreenDrawable extends EGLDrawable {
+    protected EGLOnscreenDrawable(EGLDrawableFactory factory, NativeWindow component) throws GLException {
+        super(factory, component);
+    }
+
+    public GLContext createContext(GLContext shareWith) {
+        return new EGLOnscreenContext(this, shareWith);
+    }
+
+    protected long createSurface(long eglDpy, _EGLConfig eglNativeCfg, long surfaceHandle) {
+        return EGL.eglCreateWindowSurface(eglDpy, eglNativeCfg, surfaceHandle, null);
+    }
+
+    protected void swapBuffersImpl() {
+        boolean didLock = false;
+        try {
+          if ( !isSurfaceLocked() ) {
+              // Usually the surface shall be locked within [makeCurrent .. swap .. release]
+              if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
+                  return;
+              }
+              didLock = true;
+          }
+
+          EGL.eglSwapBuffers(eglDisplay, eglSurface);
+
+        } finally {
+          if(didLock) {
+              unlockSurface();
+          }
+        }
+    }
+
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferContext.java
new file mode 100755
index 000000000..5c634b9bd
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferContext.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
+import java.nio.*;
+import java.util.*;
+
+public class EGLPbufferContext extends EGLContext {
+    public EGLPbufferContext(EGLPbufferDrawable drawable, GLContext shareWith) {
+        super(drawable, shareWith);
+    }
+
+    public int getFloatingPointMode() {
+        return 0; // FIXME ??
+    }
+
+    public void bindPbufferToTexture() {
+        throw new GLException("Not yet implemented");
+    }
+
+    public void releasePbufferFromTexture() {
+        throw new GLException("Not yet implemented");
+    }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java
new file mode 100644
index 000000000..a86045789
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.egl;
+
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.egl.*;
+import com.jogamp.opengl.impl.*;
+
+public class EGLPbufferDrawable extends EGLDrawable {
+    private int texFormat;
+    protected static final boolean useTexture = false; // No yet ..
+
+    protected EGLPbufferDrawable(EGLDrawableFactory factory, NativeWindow target) {
+        super(factory, target);
+        ownEGLDisplay = true;
+
+        // get choosen ones ..
+        GLCapabilities caps = (GLCapabilities) getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
+
+        if(useTexture) {
+            this.texFormat = caps.getAlphaBits() > 0 ? EGL.EGL_TEXTURE_RGBA : EGL.EGL_TEXTURE_RGB ;
+        } else {
+            this.texFormat = EGL.EGL_NO_TEXTURE;
+        }
+
+        if (DEBUG) {
+          System.out.println("Pbuffer config: " + getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration());
+        }
+
+        setRealized(true);
+
+        if (DEBUG) {
+          System.out.println("Created pbuffer: " + this);
+        }
+
+    }
+
+    protected long createSurface(long eglDpy, _EGLConfig eglNativeCfg, long surfaceHandle) {
+        NativeWindow nw = getNativeWindow();
+        int[] attrs = EGLGraphicsConfiguration.CreatePBufferSurfaceAttribList(nw.getWidth(), nw.getHeight(), texFormat);
+        long surf = EGL.eglCreatePbufferSurface(eglDpy, eglNativeCfg, attrs, 0);
+        if (EGL.EGL_NO_SURFACE==surf) {
+            throw new GLException("Creation of window surface (eglCreatePbufferSurface) failed, dim "+nw.getWidth()+"x"+nw.getHeight()+", error 0x"+Integer.toHexString(EGL.eglGetError()));
+        } else if(DEBUG) {
+            System.err.println("PBuffer setSurface result: eglSurface 0x"+Long.toHexString(surf));
+        }
+        ((SurfaceChangeable)nw).setSurfaceHandle(surf);
+        return surf;
+    }
+
+    public GLContext createContext(GLContext shareWith) {
+        return new EGLPbufferContext(this, shareWith);
+    }
+
+    protected void swapBuffersImpl() { 
+        if(DEBUG) {
+            System.err.println("unhandled swapBuffersImpl() called for: "+this);
+        }
+    }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/gl2/ProjectDouble.java b/src/jogl/classes/com/jogamp/opengl/impl/gl2/ProjectDouble.java
new file mode 100755
index 000000000..2eb3ca5df
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/gl2/ProjectDouble.java
@@ -0,0 +1,1041 @@
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 2.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** $Date: 2009-03-13 22:20:29 -0700 (Fri, 13 Mar 2009) $ $Revision: 1867 $
+** $Header$
+*/
+
+/* 
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are 
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright 
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of 
+ *   its contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+package com.jogamp.opengl.impl.gl2;
+
+import java.nio.*;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+/**
+ * Project.java
+ * <p/>
+ * <p/>
+ * Created 11-jan-2004
+ * 
+ * @author Erik Duijs
+ * @author Kenneth Russell
+ */
+public class ProjectDouble {
+  private static final double[] IDENTITY_MATRIX =
+    new double[] {
+      1.0, 0.0, 0.0, 0.0,
+      0.0, 1.0, 0.0, 0.0,
+      0.0, 0.0, 1.0, 0.0,
+      0.0, 0.0, 0.0, 1.0 };
+
+  // Note that we have cloned parts of the implementation in order to
+  // support incoming Buffers. The reason for this is to avoid loading
+  // non-direct buffer subclasses unnecessarily, because doing so can
+  // cause performance decreases on direct buffer operations, at least
+  // on the current HotSpot JVM. It would be nicer (and make the code
+  // simpler) to simply have the array-based entry points delegate to
+  // the versions taking Buffers by wrapping the arrays.
+
+  // Array-based implementation
+  private final double[] matrix = new double[16];
+
+  private final double[][] tempMatrix = new double[4][4];
+  private final double[] in = new double[4];
+  private final double[] out = new double[4];
+
+  private final double[] forward = new double[3];
+  private final double[] side = new double[3];
+  private final double[] up = new double[3];
+  
+  // Buffer-based implementation
+  private DoubleBuffer locbuf;
+  private final DoubleBuffer matrixBuf;
+
+  private final DoubleBuffer tempMatrixBuf;
+  private final DoubleBuffer inBuf;
+  private final DoubleBuffer outBuf;
+
+  private final DoubleBuffer forwardBuf;
+  private final DoubleBuffer sideBuf;
+  private final DoubleBuffer upBuf;
+
+  public ProjectDouble() {
+    // Use direct buffers to avoid loading indirect buffer
+    // implementations for applications trying to avoid doing so.
+    // Slice up one big buffer because some NIO implementations
+    // allocate a huge amount of memory to back even the smallest of
+    // buffers.
+    DoubleBuffer locbuf = InternalBufferUtil.newDoubleBuffer(128);
+    int pos = 0;
+    int sz = 16;
+    matrixBuf = slice(locbuf, pos, sz);
+    pos += sz;
+    tempMatrixBuf = slice(locbuf, pos, sz);
+    pos += sz;
+    sz = 4;
+    inBuf = slice(locbuf, pos, sz);
+    pos += sz;
+    outBuf = slice(locbuf, pos, sz);
+    pos += sz;
+    sz = 3;
+    forwardBuf = slice(locbuf, pos, sz);
+    pos += sz;
+    sideBuf = slice(locbuf, pos, sz);
+    pos += sz;
+    upBuf = slice(locbuf, pos, sz);
+  }
+
+  public void destroy() {
+    if(locbuf!=null) {
+        locbuf.clear();
+        locbuf=null;
+    }
+  }
+
+  private static DoubleBuffer slice(DoubleBuffer buf, int pos, int len) {
+    buf.position(pos);
+    buf.limit(pos + len);
+    return buf.slice();
+  }
+
+  /**
+   * Make matrix an identity matrix
+   */
+  private void __gluMakeIdentityd(DoubleBuffer m) {
+    int oldPos = m.position();
+    m.put(IDENTITY_MATRIX);
+    m.position(oldPos);
+  }
+
+  /**
+   * Make matrix an identity matrix
+   */
+  private void __gluMakeIdentityd(double[] m) {
+    for (int i = 0; i < 16; i++) {
+      m[i] = IDENTITY_MATRIX[i];
+    }
+  }
+
+  /**
+   * Method __gluMultMatrixVecd
+   * 
+   * @param matrix
+   * @param in
+   * @param out
+   */
+  private void __gluMultMatrixVecd(double[] matrix, int matrix_offset, double[] in, double[] out) {
+    for (int i = 0; i < 4; i++) {
+      out[i] =
+        in[0] * matrix[0*4+i+matrix_offset] +
+        in[1] * matrix[1*4+i+matrix_offset] +
+        in[2] * matrix[2*4+i+matrix_offset] +
+        in[3] * matrix[3*4+i+matrix_offset];
+    }
+  }
+
+  /**
+   * Method __gluMultMatrixVecd
+   * 
+   * @param matrix
+   * @param in
+   * @param out
+   */
+  private void __gluMultMatrixVecd(DoubleBuffer matrix, DoubleBuffer in, DoubleBuffer out) {
+    int inPos = in.position();
+    int outPos = out.position();
+    int matrixPos = matrix.position();
+    for (int i = 0; i < 4; i++) {
+      out.put(i + outPos,
+              in.get(0+inPos) * matrix.get(0*4+i+matrixPos) +
+              in.get(1+inPos) * matrix.get(1*4+i+matrixPos) +
+              in.get(2+inPos) * matrix.get(2*4+i+matrixPos) +
+              in.get(3+inPos) * matrix.get(3*4+i+matrixPos));
+    }
+  }
+
+  /**
+   * @param src
+   * @param inverse
+   * 
+   * @return
+   */
+  private boolean __gluInvertMatrixd(double[] src, double[] inverse) {
+    int i, j, k, swap;
+    double t;
+    double[][] temp = tempMatrix;
+
+    for (i = 0; i < 4; i++) {
+      for (j = 0; j < 4; j++) {
+        temp[i][j] = src[i*4+j];
+      }
+    }
+    __gluMakeIdentityd(inverse);
+
+    for (i = 0; i < 4; i++) {
+      //
+      // Look for largest element in column
+      //
+      swap = i;
+      for (j = i + 1; j < 4; j++) {
+        if (Math.abs(temp[j][i]) > Math.abs(temp[i][i])) {
+          swap = j;
+        }
+      }
+
+      if (swap != i) {
+        //
+        // Swap rows.
+        //
+        for (k = 0; k < 4; k++) {
+          t = temp[i][k];
+          temp[i][k] = temp[swap][k];
+          temp[swap][k] = t;
+
+          t = inverse[i*4+k];
+          inverse[i*4+k] = inverse[swap*4+k];
+          inverse[swap*4+k] = t;
+        }
+      }
+
+      if (temp[i][i] == 0) {
+        //
+        // No non-zero pivot. The matrix is singular, which shouldn't
+        // happen. This means the user gave us a bad matrix.
+        //
+        return false;
+      }
+
+      t = temp[i][i];
+      for (k = 0; k < 4; k++) {
+        temp[i][k] /= t;
+        inverse[i*4+k] /= t;
+      }
+      for (j = 0; j < 4; j++) {
+        if (j != i) {
+          t = temp[j][i];
+          for (k = 0; k < 4; k++) {
+            temp[j][k] -= temp[i][k] * t;
+            inverse[j*4+k] -= inverse[i*4+k]*t;
+          }
+        }
+      }
+    }
+    return true;
+  }
+
+  /**
+   * @param src
+   * @param inverse
+   * 
+   * @return
+   */
+  private boolean __gluInvertMatrixd(DoubleBuffer src, DoubleBuffer inverse) {
+    int i, j, k, swap;
+    double t;
+
+    int srcPos = src.position();
+    int invPos = inverse.position();
+
+    DoubleBuffer temp = tempMatrixBuf;
+
+    for (i = 0; i < 4; i++) {
+      for (j = 0; j < 4; j++) {
+        temp.put(i*4+j, src.get(i*4+j + srcPos));
+      }
+    }
+    __gluMakeIdentityd(inverse);
+
+    for (i = 0; i < 4; i++) {
+      //
+      // Look for largest element in column
+      //
+      swap = i;
+      for (j = i + 1; j < 4; j++) {
+        if (Math.abs(temp.get(j*4+i)) > Math.abs(temp.get(i*4+i))) {
+          swap = j;
+        }
+      }
+
+      if (swap != i) {
+        //
+        // Swap rows.
+        //
+        for (k = 0; k < 4; k++) {
+          t = temp.get(i*4+k);
+          temp.put(i*4+k, temp.get(swap*4+k));
+          temp.put(swap*4+k, t);
+
+          t = inverse.get(i*4+k + invPos);
+          inverse.put(i*4+k + invPos, inverse.get(swap*4+k + invPos));
+          inverse.put(swap*4+k + invPos, t);
+        }
+      }
+
+      if (temp.get(i*4+i) == 0) {
+        //
+        // No non-zero pivot. The matrix is singular, which shouldn't
+        // happen. This means the user gave us a bad matrix.
+        //
+        return false;
+      }
+
+      t = temp.get(i*4+i);
+      for (k = 0; k < 4; k++) {
+        temp.put(i*4+k, temp.get(i*4+k) / t);
+        inverse.put(i*4+k + invPos, inverse.get(i*4+k + invPos) / t);
+      }
+      for (j = 0; j < 4; j++) {
+        if (j != i) {
+          t = temp.get(j*4+i);
+          for (k = 0; k < 4; k++) {
+            temp.put(j*4+k, temp.get(j*4+k) - temp.get(i*4+k) * t);
+            inverse.put(j*4+k + invPos, inverse.get(j*4+k + invPos) - inverse.get(i*4+k + invPos) * t);
+          }
+        }
+      }
+    }
+    return true;
+  }
+
+
+  /**
+   * @param a
+   * @param b
+   * @param r
+   */
+  private void __gluMultMatricesd(double[] a, int a_offset, double[] b, int b_offset, double[] r) {
+    for (int i = 0; i < 4; i++) {
+      for (int j = 0; j < 4; j++) {
+        r[i*4+j] =
+          a[i*4+0+a_offset]*b[0*4+j+b_offset] +
+          a[i*4+1+a_offset]*b[1*4+j+b_offset] +
+          a[i*4+2+a_offset]*b[2*4+j+b_offset] +
+          a[i*4+3+a_offset]*b[3*4+j+b_offset];
+      }
+    }
+  }
+
+
+  /**
+   * @param a
+   * @param b
+   * @param r
+   */
+  private void __gluMultMatricesd(DoubleBuffer a, DoubleBuffer b, DoubleBuffer r) {
+    int aPos = a.position();
+    int bPos = b.position();
+    int rPos = r.position();
+
+    for (int i = 0; i < 4; i++) {
+      for (int j = 0; j < 4; j++) {
+        r.put(i*4+j + rPos,
+          a.get(i*4+0+aPos)*b.get(0*4+j+bPos) +
+          a.get(i*4+1+aPos)*b.get(1*4+j+bPos) +
+          a.get(i*4+2+aPos)*b.get(2*4+j+bPos) +
+          a.get(i*4+3+aPos)*b.get(3*4+j+bPos));
+      }
+    }
+  }
+
+  /**
+   * Normalize vector
+   *
+   * @param v
+   */
+  private static void normalize(double[] v) {
+    double r;
+
+    r = Math.sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
+    if ( r == 0.0 )
+      return;
+
+    r = 1.0 / r;
+
+    v[0] *= r;
+    v[1] *= r;
+    v[2] *= r;
+
+    return;
+  }
+
+  /**
+   * Normalize vector
+   *
+   * @param v
+   */
+  private static void normalize(DoubleBuffer v) {
+    double r;
+
+    int vPos = v.position();
+
+    r = Math.sqrt(v.get(0+vPos) * v.get(0+vPos) +
+                  v.get(1+vPos) * v.get(1+vPos) +
+                  v.get(2+vPos) * v.get(2+vPos));
+    if ( r == 0.0 )
+      return;
+
+    r = 1.0 / r;
+
+    v.put(0+vPos, v.get(0+vPos) * r);
+    v.put(1+vPos, v.get(1+vPos) * r);
+    v.put(2+vPos, v.get(2+vPos) * r);
+
+    return;
+  }
+
+
+  /**
+   * Calculate cross-product
+   *
+   * @param v1
+   * @param v2
+   * @param result
+   */
+  private static void cross(double[] v1, double[] v2, double[] result) {
+    result[0] = v1[1] * v2[2] - v1[2] * v2[1];
+    result[1] = v1[2] * v2[0] - v1[0] * v2[2];
+    result[2] = v1[0] * v2[1] - v1[1] * v2[0];
+  }
+
+  /**
+   * Calculate cross-product
+   *
+   * @param v1
+   * @param v2
+   * @param result
+   */
+  private static void cross(DoubleBuffer v1, DoubleBuffer v2, DoubleBuffer result) {
+    int v1Pos = v1.position();
+    int v2Pos = v2.position();
+    int rPos  = result.position();
+
+    result.put(0+rPos, v1.get(1+v1Pos) * v2.get(2+v2Pos) - v1.get(2+v1Pos) * v2.get(1+v2Pos));
+    result.put(1+rPos, v1.get(2+v1Pos) * v2.get(0+v2Pos) - v1.get(0+v1Pos) * v2.get(2+v2Pos));
+    result.put(2+rPos, v1.get(0+v1Pos) * v2.get(1+v2Pos) - v1.get(1+v1Pos) * v2.get(0+v2Pos));
+  }
+
+  /**
+   * Method gluOrtho2D.
+   * 
+   * @param left
+   * @param right
+   * @param bottom
+   * @param top
+   */
+  public void gluOrtho2D(GL2 gl, double left, double right, double bottom, double top) {
+    gl.glOrtho(left, right, bottom, top, -1, 1);
+  }
+
+  /**
+   * Method gluPerspective.
+   * 
+   * @param fovy
+   * @param aspect
+   * @param zNear
+   * @param zFar
+   */
+  public void gluPerspective(GL2 gl, double fovy, double aspect, double zNear, double zFar) {
+    double sine, cotangent, deltaZ;
+    double radians = fovy / 2 * Math.PI / 180;
+
+    deltaZ = zFar - zNear;
+    sine = Math.sin(radians);
+
+    if ((deltaZ == 0) || (sine == 0) || (aspect == 0)) {
+      return;
+    }
+
+    cotangent = Math.cos(radians) / sine;
+
+    __gluMakeIdentityd(matrixBuf);
+
+    matrixBuf.put(0 * 4 + 0, cotangent / aspect);
+    matrixBuf.put(1 * 4 + 1, cotangent);
+    matrixBuf.put(2 * 4 + 2, - (zFar + zNear) / deltaZ);
+    matrixBuf.put(2 * 4 + 3, -1);
+    matrixBuf.put(3 * 4 + 2, -2 * zNear * zFar / deltaZ);
+    matrixBuf.put(3 * 4 + 3, 0);
+
+    gl.glMultMatrixd(matrixBuf);
+  }
+
+  /**
+   * Method gluLookAt
+   * 
+   * @param eyex
+   * @param eyey
+   * @param eyez
+   * @param centerx
+   * @param centery
+   * @param centerz
+   * @param upx
+   * @param upy
+   * @param upz
+   */
+  public void gluLookAt(GL2 gl,
+                        double eyex,
+                        double eyey,
+                        double eyez,
+                        double centerx,
+                        double centery,
+                        double centerz,
+                        double upx,
+                        double upy,
+                        double upz) {
+    DoubleBuffer forward = this.forwardBuf;
+    DoubleBuffer side = this.sideBuf;
+    DoubleBuffer up = this.upBuf;
+
+    forward.put(0, centerx - eyex);
+    forward.put(1, centery - eyey);
+    forward.put(2, centerz - eyez);
+
+    up.put(0, upx);
+    up.put(1, upy);
+    up.put(2, upz);
+
+    normalize(forward);
+
+    /* Side = forward x up */
+    cross(forward, up, side);
+    normalize(side);
+
+    /* Recompute up as: up = side x forward */
+    cross(side, forward, up);
+
+    __gluMakeIdentityd(matrixBuf);
+    matrixBuf.put(0 * 4 + 0, side.get(0));
+    matrixBuf.put(1 * 4 + 0, side.get(1));
+    matrixBuf.put(2 * 4 + 0, side.get(2));
+
+    matrixBuf.put(0 * 4 + 1, up.get(0));
+    matrixBuf.put(1 * 4 + 1, up.get(1));
+    matrixBuf.put(2 * 4 + 1, up.get(2));
+
+    matrixBuf.put(0 * 4 + 2, -forward.get(0));
+    matrixBuf.put(1 * 4 + 2, -forward.get(1));
+    matrixBuf.put(2 * 4 + 2, -forward.get(2));
+
+    gl.glMultMatrixd(matrixBuf);
+    gl.glTranslated(-eyex, -eyey, -eyez);
+  }
+
+  /**
+   * Method gluProject
+   * 
+   * @param objx
+   * @param objy
+   * @param objz
+   * @param modelMatrix
+   * @param projMatrix
+   * @param viewport
+   * @param win_pos
+   * 
+   * @return
+   */
+  public boolean gluProject(double objx,
+                            double objy,
+                            double objz,
+                            double[] modelMatrix,
+                            int modelMatrix_offset,
+                            double[] projMatrix,
+                            int projMatrix_offset,
+                            int[] viewport,
+                            int viewport_offset,
+                            double[] win_pos,
+                            int win_pos_offset ) {
+
+    double[] in = this.in;
+    double[] out = this.out;
+
+    in[0] = objx;
+    in[1] = objy;
+    in[2] = objz;
+    in[3] = 1.0;
+
+    __gluMultMatrixVecd(modelMatrix, modelMatrix_offset, in, out);
+    __gluMultMatrixVecd(projMatrix, projMatrix_offset, out, in);
+
+    if (in[3] == 0.0)
+      return false;
+
+    in[3] = (1.0 / in[3]) * 0.5;
+
+    // Map x, y and z to range 0-1
+    in[0] = in[0] * in[3] + 0.5f;
+    in[1] = in[1] * in[3] + 0.5f;
+    in[2] = in[2] * in[3] + 0.5f;
+
+    // Map x,y to viewport
+    win_pos[0+win_pos_offset] = in[0] * viewport[2+viewport_offset] + viewport[0+viewport_offset];
+    win_pos[1+win_pos_offset] = in[1] * viewport[3+viewport_offset] + viewport[1+viewport_offset];
+    win_pos[2+win_pos_offset] = in[2];
+
+    return true;
+  }
+
+  /**
+   * Method gluProject
+   * 
+   * @param objx
+   * @param objy
+   * @param objz
+   * @param modelMatrix
+   * @param projMatrix
+   * @param viewport
+   * @param win_pos
+   * 
+   * @return
+   */
+  public boolean gluProject(double objx,
+                            double objy,
+                            double objz,
+                            DoubleBuffer modelMatrix,
+                            DoubleBuffer projMatrix,
+                            IntBuffer viewport,
+                            DoubleBuffer win_pos) {
+
+    DoubleBuffer in = this.inBuf;
+    DoubleBuffer out = this.outBuf;
+
+    in.put(0, objx);
+    in.put(1, objy);
+    in.put(2, objz);
+    in.put(3, 1.0);
+
+    __gluMultMatrixVecd(modelMatrix, in, out);
+    __gluMultMatrixVecd(projMatrix, out, in);
+
+    if (in.get(3) == 0.0)
+      return false;
+
+    in.put(3, (1.0 / in.get(3)) * 0.5);
+
+    // Map x, y and z to range 0-1
+    in.put(0, in.get(0) * in.get(3) + 0.5f);
+    in.put(1, in.get(1) * in.get(3) + 0.5f);
+    in.put(2, in.get(2) * in.get(3) + 0.5f);
+
+    // Map x,y to viewport
+    int vPos = viewport.position();
+    int wPos = win_pos.position();
+    win_pos.put(0+wPos, in.get(0) * viewport.get(2+vPos) + viewport.get(0+vPos));
+    win_pos.put(1+wPos, in.get(1) * viewport.get(3+vPos) + viewport.get(1+vPos));
+    win_pos.put(2+wPos, in.get(2));
+
+    return true;
+  }
+
+
+  /**
+   * Method gluUnproject
+   * 
+   * @param winx
+   * @param winy
+   * @param winz
+   * @param modelMatrix
+   * @param projMatrix
+   * @param viewport
+   * @param obj_pos
+   * 
+   * @return
+   */
+  public boolean gluUnProject(double winx,
+                              double winy,
+                              double winz,
+                              double[] modelMatrix,
+                              int modelMatrix_offset,
+                              double[] projMatrix,
+                              int projMatrix_offset,
+                              int[] viewport,
+                              int viewport_offset,
+                              double[] obj_pos,
+                              int obj_pos_offset) {
+    double[] in = this.in;
+    double[] out = this.out;
+
+    __gluMultMatricesd(modelMatrix, modelMatrix_offset, projMatrix, projMatrix_offset, matrix);
+
+    if (!__gluInvertMatrixd(matrix, matrix))
+      return false;
+
+    in[0] = winx;
+    in[1] = winy;
+    in[2] = winz;
+    in[3] = 1.0;
+
+    // Map x and y from window coordinates
+    in[0] = (in[0] - viewport[0+viewport_offset]) / viewport[2+viewport_offset];
+    in[1] = (in[1] - viewport[1+viewport_offset]) / viewport[3+viewport_offset];
+
+    // Map to range -1 to 1
+    in[0] = in[0] * 2 - 1;
+    in[1] = in[1] * 2 - 1;
+    in[2] = in[2] * 2 - 1;
+
+    __gluMultMatrixVecd(matrix, 0, in, out);
+
+    if (out[3] == 0.0)
+      return false;
+
+    out[3] = 1.0 / out[3];
+
+    obj_pos[0+obj_pos_offset] = out[0] * out[3];
+    obj_pos[1+obj_pos_offset] = out[1] * out[3];
+    obj_pos[2+obj_pos_offset] = out[2] * out[3];
+
+    return true;
+  }
+
+
+  /**
+   * Method gluUnproject
+   * 
+   * @param winx
+   * @param winy
+   * @param winz
+   * @param modelMatrix
+   * @param projMatrix
+   * @param viewport
+   * @param obj_pos
+   * 
+   * @return
+   */
+  public boolean gluUnProject(double winx,
+                              double winy,
+                              double winz,
+                              DoubleBuffer modelMatrix,
+                              DoubleBuffer projMatrix,
+                              IntBuffer viewport,
+                              DoubleBuffer obj_pos) {
+    DoubleBuffer in = this.inBuf;
+    DoubleBuffer out = this.outBuf;
+
+    __gluMultMatricesd(modelMatrix, projMatrix, matrixBuf);
+
+    if (!__gluInvertMatrixd(matrixBuf, matrixBuf))
+      return false;
+
+    in.put(0, winx);
+    in.put(1, winy);
+    in.put(2, winz);
+    in.put(3, 1.0);
+
+    // Map x and y from window coordinates
+    int vPos = viewport.position();
+    int oPos = obj_pos.position();
+    in.put(0, (in.get(0) - viewport.get(0+vPos)) / viewport.get(2+vPos));
+    in.put(1, (in.get(1) - viewport.get(1+vPos)) / viewport.get(3+vPos));
+
+    // Map to range -1 to 1
+    in.put(0, in.get(0) * 2 - 1);
+    in.put(1, in.get(1) * 2 - 1);
+    in.put(2, in.get(2) * 2 - 1);
+
+    __gluMultMatrixVecd(matrixBuf, in, out);
+
+    if (out.get(3) == 0.0)
+      return false;
+
+    out.put(3, 1.0 / out.get(3));
+
+    obj_pos.put(0+oPos, out.get(0) * out.get(3));
+    obj_pos.put(1+oPos, out.get(1) * out.get(3));
+    obj_pos.put(2+oPos, out.get(2) * out.get(3));
+
+    return true;
+  }
+
+
+  /**
+   * Method gluUnproject4
+   * 
+   * @param winx
+   * @param winy
+   * @param winz
+   * @param clipw
+   * @param modelMatrix
+   * @param projMatrix
+   * @param viewport
+   * @param near
+   * @param far
+   * @param obj_pos
+   * 
+   * @return
+   */
+  public boolean gluUnProject4(double winx,
+                               double winy,
+                               double winz,
+                               double clipw,
+                               double[] modelMatrix,
+                               int modelMatrix_offset,
+                               double[] projMatrix,
+                               int projMatrix_offset,
+                               int[] viewport,
+                               int viewport_offset,
+                               double near,
+                               double far,
+                               double[] obj_pos,
+                               int obj_pos_offset ) {
+    double[] in = this.in;
+    double[] out = this.out;
+
+    __gluMultMatricesd(modelMatrix, modelMatrix_offset, projMatrix, projMatrix_offset, matrix);
+
+    if (!__gluInvertMatrixd(matrix, matrix))
+      return false;
+
+    in[0] = winx;
+    in[1] = winy;
+    in[2] = winz;
+    in[3] = clipw;
+
+    // Map x and y from window coordinates
+    in[0] = (in[0] - viewport[0+viewport_offset]) / viewport[2+viewport_offset];
+    in[1] = (in[1] - viewport[1+viewport_offset]) / viewport[3+viewport_offset];
+    in[2] = (in[2] - near) / (far - near);
+
+    // Map to range -1 to 1
+    in[0] = in[0] * 2 - 1;
+    in[1] = in[1] * 2 - 1;
+    in[2] = in[2] * 2 - 1;
+
+    __gluMultMatrixVecd(matrix, 0, in, out);
+
+    if (out[3] == 0.0)
+      return false;
+
+    obj_pos[0+obj_pos_offset] = out[0];
+    obj_pos[1+obj_pos_offset] = out[1];
+    obj_pos[2+obj_pos_offset] = out[2];
+    obj_pos[3+obj_pos_offset] = out[3];
+    return true;
+  }
+
+  /**
+   * Method gluUnproject4
+   * 
+   * @param winx
+   * @param winy
+   * @param winz
+   * @param clipw
+   * @param modelMatrix
+   * @param projMatrix
+   * @param viewport
+   * @param near
+   * @param far
+   * @param obj_pos
+   * 
+   * @return
+   */
+  public boolean gluUnProject4(double winx,
+                               double winy,
+                               double winz,
+                               double clipw,
+                               DoubleBuffer modelMatrix,
+                               DoubleBuffer projMatrix,
+                               IntBuffer viewport,
+                               double near,
+                               double far,
+                               DoubleBuffer obj_pos) {
+    DoubleBuffer in = this.inBuf;
+    DoubleBuffer out = this.outBuf;
+
+    __gluMultMatricesd(modelMatrix, projMatrix, matrixBuf);
+
+    if (!__gluInvertMatrixd(matrixBuf, matrixBuf))
+      return false;
+
+    in.put(0, winx);
+    in.put(1, winy);
+    in.put(2, winz);
+    in.put(3, clipw);
+
+    // Map x and y from window coordinates
+    int vPos = viewport.position();
+    in.put(0, (in.get(0) - viewport.get(0+vPos)) / viewport.get(2+vPos));
+    in.put(1, (in.get(1) - viewport.get(1+vPos)) / viewport.get(3+vPos));
+    in.put(2, (in.get(2) - near) / (far - near));
+
+    // Map to range -1 to 1
+    in.put(0, in.get(0) * 2 - 1);
+    in.put(1, in.get(1) * 2 - 1);
+    in.put(2, in.get(2) * 2 - 1);
+
+    __gluMultMatrixVecd(matrixBuf, in, out);
+
+    if (out.get(3) == 0.0)
+      return false;
+
+    int oPos = obj_pos.position();
+    obj_pos.put(0+oPos, out.get(0));
+    obj_pos.put(1+oPos, out.get(1));
+    obj_pos.put(2+oPos, out.get(2));
+    obj_pos.put(3+oPos, out.get(3));
+    return true;
+  }
+
+
+  /**
+   * Method gluPickMatrix
+   * 
+   * @param x
+   * @param y
+   * @param deltaX
+   * @param deltaY
+   * @param viewport
+   */
+  public void gluPickMatrix(GL2 gl,
+                            double x,
+                            double y,
+                            double deltaX,
+                            double deltaY,
+                            IntBuffer viewport) {
+    if (deltaX <= 0 || deltaY <= 0) {
+      return;
+    }
+
+    /* Translate and scale the picked region to the entire window */
+    int vPos = viewport.position();
+    gl.glTranslated((viewport.get(2+vPos) - 2 * (x - viewport.get(0+vPos))) / deltaX,
+                    (viewport.get(3+vPos) - 2 * (y - viewport.get(1+vPos))) / deltaY,
+                    0);
+    gl.glScaled(viewport.get(2) / deltaX, viewport.get(3) / deltaY, 1.0);
+  }
+
+  /**
+   * Method gluPickMatrix
+   * 
+   * @param x
+   * @param y
+   * @param deltaX
+   * @param deltaY
+   * @param viewport
+   * @param viewport_offset
+   */
+  public void gluPickMatrix(GL2 gl,
+                            double x,
+                            double y,
+                            double deltaX,
+                            double deltaY,
+                            int[] viewport,
+                            int viewport_offset) {
+    if (deltaX <= 0 || deltaY <= 0) {
+      return;
+    }
+
+    /* Translate and scale the picked region to the entire window */
+    gl.glTranslated((viewport[2+viewport_offset] - 2 * (x - viewport[0+viewport_offset])) / deltaX,
+                    (viewport[3+viewport_offset] - 2 * (y - viewport[1+viewport_offset])) / deltaY,
+                    0);
+    gl.glScaled(viewport[2+viewport_offset] / deltaX, viewport[3+viewport_offset] / deltaY, 1.0);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/gl2/Util.java b/src/jogl/classes/com/jogamp/opengl/impl/gl2/Util.java
new file mode 100644
index 000000000..a542dcf19
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/gl2/Util.java
@@ -0,0 +1,244 @@
+/* 
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are 
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright 
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of 
+ *   its contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.opengl.impl.gl2;
+
+import com.jogamp.opengl.impl.*;
+
+import java.nio.IntBuffer;
+import javax.media.opengl.*;
+
+/**
+ * Util.java
+ * <p/>
+ * <p/>
+ * Created 7-jan-2004
+ *
+ * @author Erik Duijs
+ */
+class Util {
+
+  /**
+   * temp int[] of one for getting an int from some GL functions
+   */
+  private int[] scratch = new int[1];
+
+  /**
+   * Return ceiling of integer division
+   *
+   * @param a
+   * @param b
+   *
+   * @return int
+   */
+  protected static int ceil(int a, int b) {
+    return (a % b == 0 ? a / b : a / b + 1);
+  }
+
+  /**
+   * Method compPerPix.
+   *
+   * @param format
+   *
+   * @return int
+   */
+  protected static int compPerPix(int format) {
+    /* Determine number of components per pixel */
+    switch ( format ) {
+    case GL2.GL_COLOR_INDEX:
+    case GL2.GL_STENCIL_INDEX:
+    case GL2.GL_DEPTH_COMPONENT:
+    case GL2.GL_RED:
+    case GL2.GL_GREEN:
+    case GL2.GL_BLUE:
+    case GL2.GL_ALPHA:
+    case GL2.GL_LUMINANCE:
+      return 1;
+    case GL2.GL_LUMINANCE_ALPHA:
+      return 2;
+    case GL2.GL_RGB:
+    case GL2.GL_BGR:
+      return 3;
+    case GL2.GL_RGBA:
+    case GL2.GL_BGRA:
+      return 4;
+    default :
+      return -1;
+    }
+  }
+
+  /**
+   * Method nearestPower.
+   * <p/>
+   * Compute the nearest power of 2 number.  This algorithm is a little strange, but it works quite well.
+   *
+   * @param value
+   *
+   * @return int
+   */
+  protected static int nearestPower(int value) {
+    int i;
+
+    i = 1;
+
+    /* Error! */
+    if ( value == 0 )
+      return -1;
+
+    for ( ; ; ) {
+      if ( value == 1 ) {
+        return i;
+      } else if ( value == 3 ) {
+        return i << 2;
+      }
+      value >>= 1;
+      i <<= 1;
+    }
+  }
+
+  /**
+   * Method bytesPerPixel.
+   *
+   * @param format
+   * @param type
+   *
+   * @return int
+   */
+  protected static int bytesPerPixel(int format, int type) {
+    int n, m;
+
+    switch ( format ) {
+    case GL2.GL_COLOR_INDEX:
+    case GL2.GL_STENCIL_INDEX:
+    case GL2.GL_DEPTH_COMPONENT:
+    case GL2.GL_RED:
+    case GL2.GL_GREEN:
+    case GL2.GL_BLUE:
+    case GL2.GL_ALPHA:
+    case GL2.GL_LUMINANCE:
+      n = 1;
+      break;
+    case GL2.GL_LUMINANCE_ALPHA:
+      n = 2;
+      break;
+    case GL2.GL_RGB:
+    case GL2.GL_BGR:
+      n = 3;
+      break;
+    case GL2.GL_RGBA:
+    case GL2.GL_BGRA:
+      n = 4;
+      break;
+    default :
+      n = 0;
+    }
+
+    switch ( type ) {
+    case GL2.GL_UNSIGNED_BYTE:
+      m = 1;
+      break;
+    case GL2.GL_BYTE:
+      m = 1;
+      break;
+    case GL2.GL_BITMAP:
+      m = 1;
+      break;
+    case GL2.GL_UNSIGNED_SHORT:
+      m = 2;
+      break;
+    case GL2.GL_SHORT:
+      m = 2;
+      break;
+    case GL2.GL_UNSIGNED_INT:
+      m = 4;
+      break;
+    case GL2.GL_INT:
+      m = 4;
+      break;
+    case GL2.GL_FLOAT:
+      m = 4;
+      break;
+    default :
+      m = 0;
+    }
+
+    return n * m;
+  }
+
+  /**
+   * Convenience method for returning an int, rather than getting it out of a buffer yourself.
+   *
+   * @param what
+   *
+   * @return int
+   */
+  protected int glGetIntegerv(GL gl, int what) {
+    gl.glGetIntegerv(what, scratch, 0);
+    return scratch[0];
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/gl2/fixme/GLObjectTracker.java b/src/jogl/classes/com/jogamp/opengl/impl/gl2/fixme/GLObjectTracker.java
new file mode 100755
index 000000000..3e3b6ae87
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/gl2/fixme/GLObjectTracker.java
@@ -0,0 +1,835 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.gl2;
+
+import com.jogamp.opengl.impl.*;
+
+import java.nio.*;
+import javax.media.opengl.*;
+
+/** 
+ * Tracks the creation of server-side OpenGL objects which can be
+ * shared between contexts. Ordinarily, when an OpenGL context is
+ * deleted and no other contexts are sharing server-side objects with
+ * it, all of the server-side objects are automatically deleted by the
+ * OpenGL implementation. It is not necessary for the end user to
+ * explicitly delete these objects. However, when the Java2D/OpenGL
+ * pipeline is active and frame buffer objects are being used for
+ * rendering, it is necessary for all OpenGL contexts created by JOGL
+ * to share server-side objects with the Java2D OpenGL context. This
+ * means that these objects "leak" into the namespace used by Java2D.
+ * In order to prevent memory leaks and to present the same
+ * programming model to the end user, it is necessary to track the
+ * creation and destruction of all of these server-side OpenGL objects
+ * and to explicitly release them when all of the JOGL-created
+ * contexts which can see them have been released. <P>
+ *
+ * The {@link #ref ref} and {@link #unref unref} methods should be
+ * used during the creation and destruction of OpenGL contexts by JOGL
+ * in order to update the liveness of the objects being tracked. The
+ * various other methods should be called by the OpenGL binding in the
+ * various named methods.
+ */
+
+public class GLObjectTracker {
+  private static final boolean DEBUG = Debug.debug("GLObjectTracker");
+
+  //----------------------------------------------------------------------
+  // Adders
+  //
+
+  // glGenBuffers
+  public synchronized void addBuffers(int n, IntBuffer ids) {
+    add(getList(BUFFERS), n, ids);
+  }
+
+  // glGenBuffers
+  public synchronized void addBuffers(int n, int[] ids, int ids_offset) {
+    add(getList(BUFFERS), n, ids, ids_offset);
+  }
+
+  // glGenBuffersARB
+  public synchronized void addBuffersARB(int n, IntBuffer ids) {
+    add(getList(BUFFERS_ARB), n, ids);
+  }
+
+  // glGenBuffersARB
+  public synchronized void addBuffersARB(int n, int[] ids, int ids_offset) {
+    add(getList(BUFFERS_ARB), n, ids, ids_offset);
+  }
+
+  // glGenFencesAPPLE
+  public synchronized void addFencesAPPLE(int n, IntBuffer ids) {
+    add(getList(FENCES_APPLE), n, ids);
+  }
+
+  // glGenFencesAPPLE
+  public synchronized void addFencesAPPLE(int n, int[] ids, int ids_offset) {
+    add(getList(FENCES_APPLE), n, ids, ids_offset);
+  }
+
+  // glGenFencesNV
+  public synchronized void addFencesNV(int n, IntBuffer ids) {
+    add(getList(FENCES_NV), n, ids);
+  }
+
+  // glGenFencesNV
+  public synchronized void addFencesNV(int n, int[] ids, int ids_offset) {
+    add(getList(FENCES_NV), n, ids, ids_offset);
+  }
+
+  // glGenFragmentShadersATI
+  public synchronized void addFragmentShadersATI(int start, int n) {
+    add(getList(FRAGMENT_SHADERS_ATI), start, n);
+  }
+
+  // glGenFramebuffersEXT
+  public synchronized void addFramebuffersEXT(int n, IntBuffer ids) {
+    add(getList(FRAMEBUFFERS_EXT), n, ids);
+  }
+
+  // glGenFramebuffersEXT
+  public synchronized void addFramebuffersEXT(int n, int[] ids, int ids_offset) {
+    add(getList(FRAMEBUFFERS_EXT), n, ids, ids_offset);
+  }
+  
+  // glGenLists
+  public synchronized void addLists(int start, int n) {
+    add(getList(LISTS), start, n);
+  }
+
+  // glGenOcclusionQueriesNV
+  public synchronized void addOcclusionQueriesNV(int n, IntBuffer ids) {
+    add(getList(OCCLUSION_QUERIES_NV), n, ids);
+  }
+
+  // glGenOcclusionQueriesNV
+  public synchronized void addOcclusionQueriesNV(int n, int[] ids, int ids_offset) {
+    add(getList(OCCLUSION_QUERIES_NV), n, ids, ids_offset);
+  }
+
+  // glCreateProgram
+  public synchronized void addProgramObject(int obj) {
+    add(getList(PROGRAM_OBJECTS), obj, 1);
+  }
+
+  // glCreateProgramObjectARB
+  public synchronized void addProgramObjectARB(int obj) {
+    add(getList(PROGRAM_AND_SHADER_OBJECTS_ARB), obj, 1);
+  }
+
+  // glGenProgramsARB
+  public synchronized void addProgramsARB(int n, IntBuffer ids) {
+    add(getList(PROGRAMS_ARB), n, ids);
+  }
+
+  // glGenProgramsARB
+  public synchronized void addProgramsARB(int n, int[] ids, int ids_offset) {
+    add(getList(PROGRAMS_ARB), n, ids, ids_offset);
+  }
+
+  // glGenProgramsNV
+  public synchronized void addProgramsNV(int n, IntBuffer ids) {
+    add(getList(PROGRAMS_NV), n, ids);
+  }
+
+  // glGenProgramsNV
+  public synchronized void addProgramsNV(int n, int[] ids, int ids_offset) {
+    add(getList(PROGRAMS_NV), n, ids, ids_offset);
+  }
+
+  // glGenQueries
+  public synchronized void addQueries(int n, IntBuffer ids) {
+    add(getList(QUERIES), n, ids);
+  }
+
+  // glGenQueries
+  public synchronized void addQueries(int n, int[] ids, int ids_offset) {
+    add(getList(QUERIES), n, ids, ids_offset);
+  }
+
+  // glGenQueriesARB
+  public synchronized void addQueriesARB(int n, IntBuffer ids) {
+    add(getList(QUERIES_ARB), n, ids);
+  }
+
+  // glGenQueriesARB
+  public synchronized void addQueriesARB(int n, int[] ids, int ids_offset) {
+    add(getList(QUERIES_ARB), n, ids, ids_offset);
+  }
+
+  // glGenRenderbuffersEXT
+  public synchronized void addRenderbuffersEXT(int n, IntBuffer ids) {
+    add(getList(RENDERBUFFERS_EXT), n, ids);
+  }
+
+  // glGenRenderbuffersEXT
+  public synchronized void addRenderbuffersEXT(int n, int[] ids, int ids_offset) {
+    add(getList(RENDERBUFFERS_EXT), n, ids, ids_offset);
+  }
+
+  // glCreateShader
+  public synchronized void addShaderObject(int obj) {
+    add(getList(SHADER_OBJECTS), obj, 1);
+  }
+
+  // glCreateShaderObjectARB
+  public synchronized void addShaderObjectARB(int obj) {
+    add(getList(PROGRAM_AND_SHADER_OBJECTS_ARB), obj, 1);
+  }
+
+  // glGenTextures
+  public synchronized void addTextures(int n, IntBuffer ids) {
+    add(getList(TEXTURES), n, ids);
+  }
+
+  // glGenTextures
+  public synchronized void addTextures(int n, int[] ids, int ids_offset) {
+    add(getList(TEXTURES), n, ids, ids_offset);
+  }
+
+  // glGenVertexArraysAPPLE
+  public synchronized void addVertexArraysAPPLE(int n, IntBuffer ids) {
+    add(getList(VERTEX_ARRAYS_APPLE), n, ids);
+  }
+
+  // glGenVertexArraysAPPLE
+  public synchronized void addVertexArraysAPPLE(int n, int[] ids, int ids_offset) {
+    add(getList(VERTEX_ARRAYS_APPLE), n, ids, ids_offset);
+  }
+
+  // glGenVertexShadersEXT
+  public synchronized void addVertexShadersEXT(int start, int n) {
+    add(getList(VERTEX_SHADERS_EXT), start, n);
+  }
+
+  //----------------------------------------------------------------------
+  // Removers
+  //
+
+  // glDeleteBuffers
+  public synchronized void removeBuffers(int n, IntBuffer ids) {
+    remove(getList(BUFFERS), n, ids);
+  }
+
+  // glDeleteBuffers
+  public synchronized void removeBuffers(int n, int[] ids, int ids_offset) {
+    remove(getList(BUFFERS), n, ids, ids_offset);
+  }
+
+  // glDeleteBuffersARB
+  public synchronized void removeBuffersARB(int n, IntBuffer ids) {
+    remove(getList(BUFFERS_ARB), n, ids);
+  }
+
+  // glDeleteBuffersARB
+  public synchronized void removeBuffersARB(int n, int[] ids, int ids_offset) {
+    remove(getList(BUFFERS_ARB), n, ids, ids_offset);
+  }
+
+  // glDeleteFencesAPPLE
+  public synchronized void removeFencesAPPLE(int n, IntBuffer ids) {
+    remove(getList(FENCES_APPLE), n, ids);
+  }
+
+  // glDeleteFencesAPPLE
+  public synchronized void removeFencesAPPLE(int n, int[] ids, int ids_offset) {
+    remove(getList(FENCES_APPLE), n, ids, ids_offset);
+  }
+
+  // glDeleteFencesNV
+  public synchronized void removeFencesNV(int n, IntBuffer ids) {
+    remove(getList(FENCES_NV), n, ids);
+  }
+
+  // glDeleteFencesNV
+  public synchronized void removeFencesNV(int n, int[] ids, int ids_offset) {
+    remove(getList(FENCES_NV), n, ids, ids_offset);
+  }
+
+  // glDeleteFragmentShaderATI
+  public synchronized void removeFragmentShaderATI(int obj) {
+    remove(getList(FRAGMENT_SHADERS_ATI), obj, 1);
+  }
+
+  // glDeleteFramebuffersEXT
+  public synchronized void removeFramebuffersEXT(int n, IntBuffer ids) {
+    remove(getList(FRAMEBUFFERS_EXT), n, ids);
+  }
+
+  // glDeleteFramebuffersEXT
+  public synchronized void removeFramebuffersEXT(int n, int[] ids, int ids_offset) {
+    remove(getList(FRAMEBUFFERS_EXT), n, ids, ids_offset);
+  }
+  
+  // glDeleteLists
+  public synchronized void removeLists(int start, int n) {
+    remove(getList(LISTS), start, n);
+  }
+
+  // glDeleteOcclusionQueriesNV
+  public synchronized void removeOcclusionQueriesNV(int n, IntBuffer ids) {
+    remove(getList(OCCLUSION_QUERIES_NV), n, ids);
+  }
+
+  // glDeleteOcclusionQueriesNV
+  public synchronized void removeOcclusionQueriesNV(int n, int[] ids, int ids_offset) {
+    remove(getList(OCCLUSION_QUERIES_NV), n, ids, ids_offset);
+  }
+
+  // glDeleteProgram
+  public synchronized void removeProgramObject(int obj) {
+    remove(getList(PROGRAM_OBJECTS), obj, 1);
+  }
+
+  // glDeleteObjectARB
+  public synchronized void removeProgramOrShaderObjectARB(int obj) {
+    remove(getList(PROGRAM_AND_SHADER_OBJECTS_ARB), obj, 1);
+  }
+
+  // glDeleteProgramsARB
+  public synchronized void removeProgramsARB(int n, IntBuffer ids) {
+    remove(getList(PROGRAMS_ARB), n, ids);
+  }
+
+  // glDeleteProgramsARB
+  public synchronized void removeProgramsARB(int n, int[] ids, int ids_offset) {
+    remove(getList(PROGRAMS_ARB), n, ids, ids_offset);
+  }
+
+  // glDeleteProgramsNV
+  public synchronized void removeProgramsNV(int n, IntBuffer ids) {
+    remove(getList(PROGRAMS_NV), n, ids);
+  }
+
+  // glDeleteProgramsNV
+  public synchronized void removeProgramsNV(int n, int[] ids, int ids_offset) {
+    remove(getList(PROGRAMS_NV), n, ids, ids_offset);
+  }
+
+  // glDeleteQueries
+  public synchronized void removeQueries(int n, IntBuffer ids) {
+    remove(getList(QUERIES), n, ids);
+  }
+
+  // glDeleteQueries
+  public synchronized void removeQueries(int n, int[] ids, int ids_offset) {
+    remove(getList(QUERIES), n, ids, ids_offset);
+  }
+
+  // glDeleteQueriesARB
+  public synchronized void removeQueriesARB(int n, IntBuffer ids) {
+    remove(getList(QUERIES_ARB), n, ids);
+  }
+
+  // glDeleteQueriesARB
+  public synchronized void removeQueriesARB(int n, int[] ids, int ids_offset) {
+    remove(getList(QUERIES_ARB), n, ids, ids_offset);
+  }
+
+  // glDeleteRenderbuffersEXT
+  public synchronized void removeRenderbuffersEXT(int n, IntBuffer ids) {
+    remove(getList(RENDERBUFFERS_EXT), n, ids);
+  }
+
+  // glDeleteRenderbuffersEXT
+  public synchronized void removeRenderbuffersEXT(int n, int[] ids, int ids_offset) {
+    remove(getList(RENDERBUFFERS_EXT), n, ids, ids_offset);
+  }
+
+  // glDeleteShader
+  public synchronized void removeShaderObject(int obj) {
+    remove(getList(SHADER_OBJECTS), obj, 1);
+  }
+
+  // glDeleteTextures
+  public synchronized void removeTextures(int n, IntBuffer ids) {
+    remove(getList(TEXTURES), n, ids);
+  }
+
+  // glDeleteTextures
+  public synchronized void removeTextures(int n, int[] ids, int ids_offset) {
+    remove(getList(TEXTURES), n, ids, ids_offset);
+  }
+
+  // glDeleteVertexArraysAPPLE
+  public synchronized void removeVertexArraysAPPLE(int n, IntBuffer ids) {
+    remove(getList(VERTEX_ARRAYS_APPLE), n, ids);
+  }
+
+  // glDeleteVertexArraysAPPLE
+  public synchronized void removeVertexArraysAPPLE(int n, int[] ids, int ids_offset) {
+    remove(getList(VERTEX_ARRAYS_APPLE), n, ids, ids_offset);
+  }
+
+  // glDeleteVertexShaderEXT
+  public synchronized void removeVertexShaderEXT(int obj) {
+    remove(getList(VERTEX_SHADERS_EXT), obj, 1);
+  }
+
+  //----------------------------------------------------------------------
+  // Reference count maintenance and manual deletion
+  //
+
+  public synchronized void transferAll(GLObjectTracker other) {
+    for (int i = 0; i < lists.length; i++) {
+      getList(i).addAll(other.lists[i]);
+      if (other.lists[i] != null) {
+        other.lists[i].clear();
+      }
+    }
+    dirty = true;
+  }
+
+  public synchronized void ref() {
+    ++refCount;
+  }
+
+  public void unref(GLObjectTracker deletedObjectPool) {
+    boolean tryDelete = false;
+    synchronized (this) {
+      if (--refCount == 0) {
+        tryDelete = true;
+      }
+    }
+    if (tryDelete) {
+      // See whether we should try to do the work now or whether we
+      // have to postpone
+      GLContext cur = GLContext.getCurrent();
+      if ((cur != null) &&
+          (cur instanceof GLContextImpl)) {
+        GLContextImpl curImpl = (GLContextImpl) cur;
+        if (deletedObjectPool != null &&
+            deletedObjectPool == curImpl.getDeletedObjectTracker()) {
+          // Should be safe to delete these objects now
+          try {
+            delete((GL2)curImpl.getGL());
+            return;
+          } catch (GLException e) {
+            // Shouldn't happen, but if it does, transfer all objects
+            // to the deleted object pool hoping we can later clean
+            // them up
+            deletedObjectPool.transferAll(this);
+            throw(e);
+          }
+        }
+      }
+      // If we get here, we couldn't attempt to delete the objects
+      // right now; instead try to transfer them to the
+      // deletedObjectPool for later cleanup (FIXME: should consider
+      // throwing an exception if deletedObjectPool is null, since
+      // that shouldn't happen)
+      if (DEBUG) {
+        String s = null;
+        if (cur == null) {
+          s = "current context was null";
+        } else if (!(cur instanceof GLContextImpl)) {
+          s = "current context was not a GLContextImpl";
+        } else if (deletedObjectPool == null) {
+          s = "no current deletedObjectPool";
+        } else if (deletedObjectPool != ((GLContextImpl) cur).getDeletedObjectTracker()) {
+          s = "deletedObjectTracker didn't match";
+          if (((GLContextImpl) cur).getDeletedObjectTracker() == null) {
+            s += " (other was null)";
+          }
+        } else {
+          s = "unknown reason";
+        }
+        System.err.println("Deferred destruction of server-side OpenGL objects into " + deletedObjectPool + ": " + s);
+      }
+
+      if (deletedObjectPool != null) {
+        deletedObjectPool.transferAll(this);
+      }
+    }
+  }
+
+  public void clean(GL2 gl) {
+    if (dirty) {
+      try {
+        delete(gl);
+        dirty = false;
+      } catch (GLException e) {
+        // FIXME: not sure what to do here; probably a bad idea to be
+        // throwing exceptions during an otherwise-successful makeCurrent
+      }
+    }
+  }
+
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  // Kinds of sharable server-side OpenGL objects this class tracks
+  private static final int BUFFERS                        = 0;
+  private static final int BUFFERS_ARB                    = 1;
+  private static final int FENCES_APPLE                   = 2;
+  private static final int FENCES_NV                      = 3;
+  private static final int FRAGMENT_SHADERS_ATI           = 4;
+  private static final int FRAMEBUFFERS_EXT               = 5;
+  private static final int LISTS                          = 6;
+  private static final int OCCLUSION_QUERIES_NV           = 7;
+  private static final int PROGRAM_AND_SHADER_OBJECTS_ARB = 8;
+  private static final int PROGRAM_OBJECTS                = 9;
+  private static final int PROGRAMS_ARB                   = 10;
+  private static final int PROGRAMS_NV                    = 11;
+  private static final int QUERIES                        = 12;
+  private static final int QUERIES_ARB                    = 13;
+  private static final int RENDERBUFFERS_EXT              = 14;
+  private static final int SHADER_OBJECTS                 = 15;
+  private static final int TEXTURES                       = 16;
+  private static final int VERTEX_ARRAYS_APPLE            = 17;
+  private static final int VERTEX_SHADERS_EXT             = 18;
+  private static final int NUM_OBJECT_TYPES               = 19;
+
+  static abstract class Deleter {
+    public abstract void delete(GL2 gl, int obj);
+  }
+
+  static class ObjectList {
+    private static final int MIN_CAPACITY = 4;
+
+    private int size;
+    private int capacity;
+    private int[] data;
+    private Deleter deleter;
+    private String name;
+
+    public ObjectList(Deleter deleter) {
+      this.deleter = deleter;
+      clear();
+    }
+
+    public void add(int obj) {
+      if (size == capacity) {
+        int newCapacity = 2 * capacity;
+        int[] newData = new int[newCapacity];
+        System.arraycopy(data, 0, newData, 0, size);
+        data = newData;
+        capacity = newCapacity;
+      }
+
+      data[size++] = obj;
+    }
+
+    public void addAll(ObjectList other) {
+      if (other == null) {
+        return;
+      }
+      for (int i = 0; i < other.size; i++) {
+        add(other.data[i]);
+      }
+    }
+
+    public boolean remove(int value) {
+      for (int i = 0; i < size; i++) {
+        if (data[i] == value) {
+          if (i < size - 1) {
+            System.arraycopy(data, i+1, data, i, size - i - 1);
+          }
+          --size;
+          if ((size < capacity / 4) &&
+              (capacity > MIN_CAPACITY)) {
+            int newCapacity = capacity / 4;
+            if (newCapacity < MIN_CAPACITY) {
+              newCapacity = MIN_CAPACITY;
+            }
+            int[] newData = new int[newCapacity];
+            System.arraycopy(data, 0, newData, 0, size);
+            data = newData;
+            capacity = newCapacity;
+          }
+          return true;
+        }
+      }
+      return false;
+    }
+
+    public void setName(String name) {
+      if (DEBUG) {
+        this.name = name;
+      }
+    }
+
+    public void delete(GL2 gl) {
+      // Just in case we start throwing exceptions during deletion,
+      // make sure we make progress rather than going into an infinite
+      // loop
+      while (size > 0) {
+        int obj = data[size - 1];
+        --size;
+        if (DEBUG) {
+          System.err.println("Deleting server-side OpenGL object " + obj +
+                             ((name != null) ? (" (" + name + ")") : ""));
+        }
+        deleter.delete(gl, obj);
+      }
+    }
+
+    public void clear() {
+      size = 0;
+      capacity = MIN_CAPACITY;
+      data = new int[capacity];
+    }
+  }
+
+  private ObjectList[] lists = new ObjectList[NUM_OBJECT_TYPES];
+  private int refCount;
+  private boolean dirty;
+
+  private void add(ObjectList list, int n, IntBuffer ids) {
+    int pos = ids.position();
+    for (int i = 0; i < n; i++) {
+      list.add(ids.get(pos + i));
+    }
+  }
+
+  private void add(ObjectList list, int n, int[] ids, int ids_offset) {
+    for (int i = 0; i < n; i++) {
+      list.add(ids[i + ids_offset]);
+    }
+  }
+
+  private void add(ObjectList list, int start, int n) {
+    for (int i = 0; i < n; i++) {
+      list.add(start + i);
+    }
+  }
+
+  private void remove(ObjectList list, int n, IntBuffer ids) {
+    int pos = ids.position();
+    for (int i = 0; i < n; i++) {
+      list.remove(ids.get(pos + i));
+    }
+  }
+
+  private void remove(ObjectList list, int n, int[] ids, int ids_offset) {
+    for (int i = 0; i < n; i++) {
+      list.remove(ids[i + ids_offset]);
+    }
+  }
+
+  private void remove(ObjectList list, int start, int n) {
+    for (int i = 0; i < n; i++) {
+      list.remove(start + i);
+    }
+  }
+
+  private ObjectList getList(int which) {
+    ObjectList list = lists[which];
+    if (list == null) {
+      Deleter deleter = null;
+      String name = null;
+      // Figure out which deleter we need
+      switch (which) {
+        case BUFFERS:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteBuffers(1, new int[] { obj }, 0);
+              }
+            };
+          name = "buffer";
+          break;
+        case BUFFERS_ARB:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteBuffersARB(1, new int[] { obj }, 0);
+              }
+            };
+          name = "ARB buffer";
+          break;
+        case FENCES_APPLE:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteFencesAPPLE(1, new int[] { obj }, 0);
+              }
+            };
+          name = "APPLE fence";
+          break;
+        case FENCES_NV:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteFencesNV(1, new int[] { obj }, 0);
+              }
+            };
+          name = "NV fence";
+          break;
+        case FRAGMENT_SHADERS_ATI:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteFragmentShaderATI(obj);
+              }
+            };
+          name = "ATI fragment shader";
+          break;
+        case FRAMEBUFFERS_EXT:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteFramebuffersEXT(1, new int[] { obj }, 0);
+              }
+            };
+          name = "EXT framebuffer";
+          break;
+        case LISTS:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteLists(obj, 1);
+              }
+            };
+          name = "display list";
+          break;
+        case OCCLUSION_QUERIES_NV:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteOcclusionQueriesNV(1, new int[] { obj }, 0);
+              }
+            };
+          name = "NV occlusion query";
+          break;
+        case PROGRAM_AND_SHADER_OBJECTS_ARB:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteObjectARB(obj);
+              }
+            };
+          name = "ARB program or shader object";
+          break;
+        case PROGRAM_OBJECTS:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteProgram(obj);
+              }
+            };
+          name = "program object";
+          break;
+        case PROGRAMS_ARB:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteProgramsARB(1, new int[] { obj }, 0);
+              }
+            };
+          name = "ARB program object";
+          break;
+        case PROGRAMS_NV:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteProgramsNV(1, new int[] { obj }, 0);
+              }
+            };
+          name = "NV program";
+          break;
+        case QUERIES:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteQueries(1, new int[] { obj }, 0);
+              }
+            };
+          name = "query";
+          break;
+        case QUERIES_ARB:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteQueriesARB(1, new int[] { obj }, 0);
+              }
+            };
+          name = "ARB query";
+          break;
+        case RENDERBUFFERS_EXT:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteRenderbuffersEXT(1, new int[] { obj }, 0);
+              }
+            };
+          name = "EXT renderbuffer";
+          break;
+        case SHADER_OBJECTS:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteShader(obj);
+              }
+            };
+          name = "shader object";
+          break;
+        case TEXTURES:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteTextures(1, new int[] { obj }, 0);
+              }
+            };
+          name = "texture";
+          break;
+        case VERTEX_ARRAYS_APPLE:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteVertexArraysAPPLE(1, new int[] { obj }, 0);
+              }
+            };
+          name = "APPLE vertex array";
+          break;
+        case VERTEX_SHADERS_EXT:
+          deleter = new Deleter() {
+              public void delete(GL2 gl, int obj) {
+                gl.glDeleteVertexShaderEXT(obj);
+              }
+            };
+          name = "EXT vertex shader";
+          break;
+        default:
+          throw new InternalError("Unexpected OpenGL object type " + which);
+      }
+
+      list = new ObjectList(deleter);
+      list.setName(name);
+      lists[which] = list;
+    }
+    return list;
+  }
+
+  private void delete(GL2 gl) {
+    for (int i = 0; i < lists.length; i++) {
+      ObjectList list = lists[i];
+      if (list != null) {
+        list.delete(gl);
+        lists[i] = null;
+      }
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
new file mode 100644
index 000000000..bf4023c1c
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl;
+
+import java.nio.*;
+import java.util.*;
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
+
+public abstract class MacOSXCGLContext extends GLContextImpl
+{	
+  protected long nsContext;  // NSOpenGLContext
+  protected long cglContext; // CGLContextObj
+  private CGLExt cglExt;
+  // Table that holds the addresses of the native C-language entry points for
+  // CGL extension functions.
+  private CGLExtProcAddressTable cglExtProcAddressTable;
+  
+  public MacOSXCGLContext(GLDrawableImpl drawable, GLDrawableImpl drawableRead,
+                          GLContext shareWith) {
+    super(drawable, drawableRead, shareWith);
+  }
+
+  public MacOSXCGLContext(GLDrawableImpl drawable,
+                          GLContext shareWith) {
+    this(drawable, null, shareWith);
+  }
+  
+  public Object getPlatformGLExtensions() {
+    return getCGLExt();
+  }
+
+  public CGLExt getCGLExt() {
+    if (cglExt == null) {
+      cglExt = new CGLExtImpl(this);
+    }
+    return cglExt;
+  }
+
+  public final ProcAddressTable getPlatformExtProcAddressTable() {
+    return getCGLExtProcAddressTable();
+  }
+
+  public final CGLExtProcAddressTable getCGLExtProcAddressTable() {
+    return cglExtProcAddressTable;
+  }
+
+  protected String mapToRealGLFunctionName(String glFunctionName)
+  {
+    return glFunctionName;
+  }
+	
+  protected String mapToRealGLExtensionName(String glExtensionName)
+  {
+    return glExtensionName;
+  }
+	
+  protected abstract boolean create();
+
+  /**
+   * Creates and initializes an appropriate OpenGl nsContext. Should only be
+   * called by {@link makeCurrentImpl()}.
+   */
+  protected boolean create(boolean pbuffer, boolean floatingPoint) {
+    MacOSXCGLContext other = (MacOSXCGLContext) GLContextShareSet.getShareContext(this);
+    long share = 0;
+    if (other != null) {
+      share = other.getNSContext();
+      if (share == 0) {
+        throw new GLException("GLContextShareSet returned an invalid OpenGL context");
+      }
+    }
+    MacOSXCGLGraphicsConfiguration config = (MacOSXCGLGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    GLCapabilities capabilitiesRequested = (GLCapabilities)config.getRequestedCapabilities();
+    GLProfile glProfile = capabilitiesRequested.getGLProfile();
+    if(glProfile.isGL3()) {
+        throw new GLException("GL3 profile currently not supported on MacOSX, due to the lack of a OpenGL 3.1 implementation");
+    }
+    // HACK .. bring in OnScreen/PBuffer selection to the DrawableFactory !!
+    GLCapabilities capabilities = (GLCapabilities) capabilitiesRequested.clone();
+    capabilities.setPBuffer(pbuffer);
+    capabilities.setPbufferFloatingPointBuffers(floatingPoint);
+
+    long pixelFormat = MacOSXCGLGraphicsConfiguration.GLCapabilities2NSPixelFormat(capabilities);
+    if (pixelFormat == 0) {
+      throw new GLException("Unable to allocate pixel format with requested GLCapabilities");
+    }
+    config.setChosenPixelFormat(pixelFormat);
+    try {
+      int[] viewNotReady = new int[1];
+      // Try to allocate a context with this
+      nsContext = CGL.createContext(share,
+                                    drawable.getNativeWindow().getSurfaceHandle(),
+                                    pixelFormat,
+                                    viewNotReady, 0);
+      if (nsContext == 0) {
+        if (viewNotReady[0] == 1) {
+          if (DEBUG) {
+            System.err.println("!!! View not ready for " + getClass().getName());
+          }
+          // View not ready at the window system level -- this is OK
+          return false;
+        }
+        throw new GLException("Error creating NSOpenGLContext with requested pixel format");
+      }
+
+      if (!pbuffer && !capabilities.isBackgroundOpaque()) {
+          // Set the context opacity
+          CGL.setContextOpacity(nsContext, 0);
+      }
+
+      GLCapabilities caps = MacOSXCGLGraphicsConfiguration.NSPixelFormat2GLCapabilities(glProfile, pixelFormat);
+      config.setChosenCapabilities(caps);
+    } finally {
+      CGL.deletePixelFormat(pixelFormat);
+    }
+    if (!CGL.makeCurrentContext(nsContext)) {
+      throw new GLException("Error making nsContext current");
+    }
+    setGLFunctionAvailability(true);
+    GLContextShareSet.contextCreated(this);
+    return true;
+  }    
+	
+  protected int makeCurrentImpl() throws GLException {
+    if (0 == cglContext && drawable.getNativeWindow().getSurfaceHandle() == 0) {
+        if (DEBUG) {
+          System.err.println("drawable not properly initialized");
+        }
+        return CONTEXT_NOT_CURRENT;
+    }
+    boolean created = false;
+    if ( 0 == cglContext && 0 == nsContext) {
+      if (!create()) {
+        return CONTEXT_NOT_CURRENT;
+      }
+      if (DEBUG) {
+        System.err.println("!!! Created OpenGL context " + toHexString(nsContext) + " for " + getClass().getName());
+      }
+      created = true;
+    }
+            
+    if ( 0 != cglContext ) {
+        if (CGL.kCGLNoError != CGL.CGLSetCurrentContext(cglContext)) {
+          throw new GLException("Error making cglContext current");
+        }
+    } else {
+        if (!CGL.makeCurrentContext(nsContext)) {
+          throw new GLException("Error making nsContext current");
+        }
+    }
+            
+    if (created) {
+      setGLFunctionAvailability(false);
+      return CONTEXT_CURRENT_NEW;
+    }
+    return CONTEXT_CURRENT;
+  }
+	
+  protected void releaseImpl() throws GLException {
+    if ( 0 != cglContext ) {
+        CGL.CGLReleaseContext(cglContext);
+    } else {
+        if (!CGL.clearCurrentContext(nsContext)) {
+          throw new GLException("Error freeing OpenGL nsContext");
+        }
+    }
+  }
+	
+  protected void destroyImpl() throws GLException {
+    boolean hadContext = isCreated();
+    if ( 0 != cglContext ) {
+      if (CGL.kCGLNoError != CGL.CGLDestroyContext(cglContext)) {
+        throw new GLException("Unable to delete OpenGL cglContext");
+      }
+      if (DEBUG) {
+        System.err.println("!!! Destroyed OpenGL cglContext " + cglContext);
+      }
+      cglContext = 0;
+      GLContextShareSet.contextDestroyed(this);
+    } else if ( 0 != nsContext ) {
+      if (!CGL.deleteContext(nsContext)) {
+        throw new GLException("Unable to delete OpenGL nsContext");
+      }
+      if (DEBUG) {
+        System.err.println("!!! Destroyed OpenGL nsContext " + nsContext);
+      }
+      nsContext = 0;
+    }
+    if(hadContext) {
+      GLContextShareSet.contextDestroyed(this);
+    }
+  }
+
+  public boolean isCreated() {
+    return 0 != cglContext || 0 != nsContext ;
+  }
+	
+  public void copy(GLContext source, int mask) throws GLException {
+    long dst = getCGLContext();
+    long src = 0;
+    if( 0 != dst ) {
+        src = ((MacOSXCGLContext) source).getCGLContext();
+        if (src == 0) {
+          throw new GLException("Source OpenGL cglContext has not been created ; Destination has a cglContext.");
+        }
+        CGL.CGLCopyContext(src, dst, mask);
+    } else {
+        dst = getNSContext();
+        src = ((MacOSXCGLContext) source).getNSContext();
+        if (src == 0) {
+          throw new GLException("Source OpenGL nsContext has not been created");
+        }
+        if (dst == 0) {
+          throw new GLException("Destination OpenGL nsContext has not been created");
+        }
+        CGL.copyContext(dst, src, mask);
+    }
+  }
+
+  protected void updateGLProcAddressTable() {
+    if (DEBUG) {
+      System.err.println("!!! Initializing CGL extension address table");
+    }
+    if (cglExtProcAddressTable == null) {
+      // FIXME: cache ProcAddressTables by capability bits so we can
+      // share them among contexts with the same capabilities
+      cglExtProcAddressTable = new CGLExtProcAddressTable();
+    }          
+    resetProcAddressTable(getCGLExtProcAddressTable());
+    super.updateGLProcAddressTable();
+  }
+	
+  public String getPlatformExtensionsString()
+  {
+    return "";
+  }
+	
+  protected void setSwapIntervalImpl(int interval) {
+    if ( 0 != cglContext ) {
+        int[] lval = new int[] { (int) interval } ;
+        CGL.CGLSetParameter(cglContext, CGL.kCGLCPSwapInterval, lval, 0);
+    } else if ( 0 != nsContext ) {
+        CGL.setSwapInterval(nsContext, interval);
+    } else {
+      throw new GLException("OpenGL context not current");
+    }
+    currentSwapInterval = interval ;
+  }
+
+  public ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3) {
+    // FIXME: apparently the Apple extension doesn't require a custom memory allocator
+    throw new GLException("Not yet implemented");
+  }
+
+  public boolean isFunctionAvailable(String glFunctionName)
+  {
+    return super.isFunctionAvailable(glFunctionName);
+  }
+  
+  public boolean isExtensionAvailable(String glExtensionName) {
+    if (glExtensionName.equals("GL_ARB_pbuffer") ||
+        glExtensionName.equals("GL_ARB_pixel_format")) {
+      return true;
+    }
+    return super.isExtensionAvailable(glExtensionName);
+  }
+  
+  public int getOffscreenContextPixelDataType() {
+    throw new GLException("Should not call this");
+  }
+
+  public int getOffscreenContextReadBuffer() {
+    throw new GLException("Should not call this");
+  }
+
+  public boolean offscreenImageNeedsVerticalFlip() {
+    throw new GLException("Should not call this");
+  }
+
+  public void bindPbufferToTexture() {
+    throw new GLException("Should not call this");
+  }
+    
+  public void releasePbufferFromTexture() {
+    throw new GLException("Should not call this");
+  }
+    
+  // Support for "mode switching" as described in MacOSXCGLDrawable
+  public abstract void setOpenGLMode(int mode);
+  public abstract int  getOpenGLMode();
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+	
+  public long getCGLContext() {
+    return cglContext;
+  }
+  public long getNSContext() {
+    return nsContext;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
new file mode 100644
index 000000000..2b91eb5d3
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
+
+public abstract class MacOSXCGLDrawable extends GLDrawableImpl {
+  // The Java2D/OpenGL pipeline on OS X uses low-level CGLContextObjs
+  // to represent the contexts for e.g. the Java2D back buffer. When
+  // the Java2D/JOGL bridge is active, this means that if we want to
+  // be able to share textures and display lists with the Java2D
+  // contexts, we need to use the CGL APIs rather than the NSOpenGL
+  // APIs on the JOGL side. For example, if we create a pbuffer using
+  // the NSOpenGL APIs and want to share textures and display lists
+  // between it and the Java2D back buffer, there is no way to do so,
+  // because the Java2D context is actually a CGLContextObj and the
+  // NSOpenGLContext's initWithFormat:shareContext: only accepts an
+  // NSOpenGLContext as its second argument. Of course there is no way
+  // to wrap an NSOpenGLContext around an arbitrary CGLContextObj.
+  //
+  // The situation we care most about is allowing a GLPbuffer to share
+  // textures, etc. with a GLJPanel when the Java2D/JOGL bridge is
+  // active; several of the demos rely on this functionality. We aim
+  // to get there by allowing a GLPBuffer to switch its implementation
+  // between using an NSOpenGLPixelBuffer and a CGLPBufferObj. In
+  // order to track whether this has been done we need to have the
+  // notion of a "mode" of both the MacOSXCGLDrawable and the
+  // MacOSXGLContext. Initially the mode is "unspecified", meaning it
+  // leans toward the default (NSOpenGL). If sharing is requested
+  // between either a GLJPanel and a GLPbuffer or a GLCanvas and a
+  // GLPbuffer, the GLPbuffer will be switched into the appropriate
+  // mode: CGL mode for a GLJPanel and NSOpenGL mode for a GLCanvas.
+  // To avoid thrashing we support exactly one such switch during the
+  // lifetime of a given GLPbuffer. This is not a fully general
+  // solution (for example, you can't share textures among a
+  // GLPbuffer, a GLJPanel and a GLCanvas simultaneously) but should
+  // be enough to get things off the ground.
+  public static final int NSOPENGL_MODE = 1;
+  public static final int CGL_MODE      = 2;
+
+  public MacOSXCGLDrawable(GLDrawableFactory factory, NativeWindow comp, boolean realized) {
+    super(factory, comp, realized);
+ }
+
+  protected void setRealizedImpl() {
+    if(realized) {
+        if( NativeWindow.LOCK_SURFACE_NOT_READY == lockSurface() ) {
+            throw new GLException("Couldn't lock surface");
+        }
+        try {
+            // don't remove this block .. locking the surface is essential to update surface data
+        } finally {
+            unlockSurface();
+        }
+    }
+  }
+
+  public DynamicLookupHelper getDynamicLookupHelper() {
+    return (MacOSXCGLDrawableFactory) getFactoryImpl() ;
+  }
+
+  protected static String getThreadName() {
+    return Thread.currentThread().getName();
+  }
+
+  // Support for "mode switching" as per above
+  public abstract void setOpenGLMode(int mode);
+  public abstract int  getOpenGLMode();
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
new file mode 100644
index 000000000..c08599964
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl;
+
+import java.lang.reflect.InvocationTargetException;
+import java.nio.*;
+import java.util.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.*;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
+
+public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
+  public MacOSXCGLDrawableFactory() {
+    super();
+
+    // Register our GraphicsConfigurationFactory implementations
+    // The act of constructing them causes them to be registered
+    new MacOSXCGLGraphicsConfigurationFactory();
+
+    try {
+      NWReflection.createInstance("com.jogamp.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLGraphicsConfigurationFactory",
+                                  new Object[] {});
+    } catch (Throwable t) { }
+  }
+
+  public GLDrawableImpl createOnscreenDrawable(NativeWindow target) {
+    if (target == null) {
+      throw new IllegalArgumentException("Null target");
+    }
+    return new MacOSXOnscreenCGLDrawable(this, target);
+  }
+
+  protected GLDrawableImpl createOffscreenDrawable(NativeWindow target) {
+    return new MacOSXOffscreenCGLDrawable(this, target);
+  }
+
+  public boolean canCreateGLPbuffer() {
+    return true;
+  }
+
+  protected GLDrawableImpl createGLPbufferDrawableImpl(final NativeWindow target) {
+    /** 
+     * FIXME: Think about this ..
+     * should not be necessary ? ..
+    final List returnList = new ArrayList();
+    final GLDrawableFactory factory = this;
+    Runnable r = new Runnable() {
+        public void run() {
+          returnList.add(new MacOSXPbufferCGLDrawable(factory, target));
+        }
+      };
+    maybeDoSingleThreadedWorkaround(r);
+    return (GLDrawableImpl) returnList.get(0);
+    */
+    return new MacOSXPbufferCGLDrawable(this, target);
+  }
+
+  protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
+    AbstractGraphicsScreen screen = DefaultGraphicsScreen.createDefault();
+    NullWindow nw = new NullWindow(MacOSXCGLGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(capabilities, chooser, screen, true));
+    nw.setSize(width, height);
+    return nw;
+  }
+
+  public GLContext createExternalGLContext() {
+    return MacOSXExternalCGLContext.create(this, null);
+  }
+
+  public boolean canCreateExternalGLDrawable() {
+    return false;
+  }
+
+  public GLDrawable createExternalGLDrawable() {
+    // FIXME
+    throw new GLException("Not yet implemented");
+  }
+
+  public void loadGLULibrary() {
+    // Nothing to do; already loaded by native code; not much point in
+    // making it lazier on this platform
+  }
+
+  public long dynamicLookupFunction(String glFuncName) {
+    return CGL.getProcAddress(glFuncName);
+  }
+
+  public boolean canCreateContextOnJava2DSurface() {
+    return false;
+  }
+
+  public GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
+    throws GLException {
+    throw new GLException("not supported in non AWT enviroment");
+  }
+  
+  //------------------------------------------------------
+  // Gamma-related functionality
+  //
+
+  private static final int GAMMA_RAMP_LENGTH = 256;
+
+  /** Returns the length of the computed gamma ramp for this OS and
+      hardware. Returns 0 if gamma changes are not supported. */
+  protected int getGammaRampLength() {
+    return GAMMA_RAMP_LENGTH;
+  }
+
+  protected boolean setGammaRamp(float[] ramp) {
+    return CGL.setGammaRamp(ramp.length,
+                            ramp, 0,
+                            ramp, 0,
+                            ramp, 0);
+  }
+
+  protected Buffer getGammaRamp() {
+    return null;
+  }
+
+  protected void resetGammaRamp(Buffer originalGammaRamp) {
+    CGL.resetGammaRamp();
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
new file mode 100644
index 000000000..889d1c333
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+
+public class MacOSXCGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
+    long pixelformat;
+
+    public MacOSXCGLGraphicsConfiguration(AbstractGraphicsScreen screen, GLCapabilities capsChosen, GLCapabilities capsRequested,
+                                          long pixelformat) {
+        super(screen, capsChosen, capsRequested);
+        this.pixelformat=pixelformat;
+    }
+
+    public Object clone() {
+        return super.clone();
+    }
+
+    protected void setChosenPixelFormat(long pixelformat) {
+        this.pixelformat=pixelformat;
+    }
+
+    protected void setChosenCapabilities(GLCapabilities caps) {
+        super.setChosenCapabilities(caps);
+    }
+
+    protected static final int[] cglInternalAttributeToken = new int[] {
+        CGL.kCGLPFAColorFloat,
+        CGL.NSOpenGLPFAPixelBuffer,
+        CGL.NSOpenGLPFADoubleBuffer,
+        CGL.NSOpenGLPFAStereo,
+        CGL.NSOpenGLPFAColorSize,
+        CGL.NSOpenGLPFAAlphaSize,
+        CGL.NSOpenGLPFADepthSize,
+        CGL.NSOpenGLPFAAccumSize,
+        CGL.NSOpenGLPFAStencilSize,
+        CGL.NSOpenGLPFASampleBuffers,
+        CGL.NSOpenGLPFASamples };
+
+    protected static int[] GLCapabilities2AttribList(GLCapabilities caps) {
+        int[] ivalues = new int[cglInternalAttributeToken.length];
+
+        for (int idx = 0; idx < cglInternalAttributeToken.length; idx++) {
+          int attr = cglInternalAttributeToken[idx];
+          switch (attr) {
+              case CGL.kCGLPFAColorFloat:
+                ivalues[idx] = caps.getPbufferFloatingPointBuffers() ? 1 : 0;
+                break;
+
+              case CGL.NSOpenGLPFAPixelBuffer:
+                ivalues[idx] = caps.isPBuffer() ? 1 : 0;
+                break;
+
+              case CGL.NSOpenGLPFADoubleBuffer:
+                ivalues[idx] = (caps.getDoubleBuffered() ? 1 : 0);
+                break;
+
+              case CGL.NSOpenGLPFAStereo:
+                ivalues[idx] = (caps.getStereo() ? 1 : 0);
+                break;
+
+              case CGL.NSOpenGLPFAColorSize:
+                ivalues[idx] = (caps.getRedBits() + caps.getGreenBits() + caps.getBlueBits());
+                break;
+
+              case CGL.NSOpenGLPFAAlphaSize:
+                ivalues[idx] = caps.getAlphaBits();
+                break;
+
+              case CGL.NSOpenGLPFADepthSize:
+                ivalues[idx] = caps.getDepthBits();
+                break;
+
+              case CGL.NSOpenGLPFAAccumSize:
+                ivalues[idx] = (caps.getAccumRedBits() + caps.getAccumGreenBits() + caps.getAccumBlueBits() + caps.getAccumAlphaBits());
+                break;
+
+              case CGL.NSOpenGLPFAStencilSize:
+                ivalues[idx] = caps.getStencilBits();
+                break;
+
+              case CGL.NSOpenGLPFASampleBuffers:
+                ivalues[idx] = caps.getSampleBuffers() ? 1 : 0;
+                break;
+
+              case CGL.NSOpenGLPFASamples:
+                ivalues[idx] = caps.getSampleBuffers() ? ivalues[idx] = caps.getNumSamples() : 0;
+                break;
+
+              default:
+                break;
+          }
+        }
+        return ivalues;
+    }
+
+    protected static long GLCapabilities2NSPixelFormat(GLCapabilities caps) {
+        int[] ivalues = GLCapabilities2AttribList(caps);
+        return CGL.createPixelFormat(cglInternalAttributeToken, 0, cglInternalAttributeToken.length, ivalues, 0);
+    }
+
+    protected static GLCapabilities NSPixelFormat2GLCapabilities(GLProfile glp, long pixelFormat) {
+        return PixelFormat2GLCapabilities(glp, pixelFormat, true);
+    }
+
+    protected static GLCapabilities CGLPixelFormat2GLCapabilities(GLProfile glp, long pixelFormat) {
+        return PixelFormat2GLCapabilities(glp, pixelFormat, false);
+    }
+
+    private static GLCapabilities PixelFormat2GLCapabilities(GLProfile glp, long pixelFormat, boolean nsUsage) {
+        int[] ivalues = new int[cglInternalAttributeToken.length];
+
+        // On this platform the pixel format is associated with the
+        // context and not the drawable. However it's a reasonable
+        // approximation to just store the chosen pixel format up in the
+        // NativeWindow's AbstractGraphicsConfiguration, 
+        // since the public API doesn't provide for a different GLCapabilities per context.
+        // Note: These restrictions of the platform's API might be considered as a bug anyways.
+
+        // Figure out what attributes we really got
+        GLCapabilities caps = new GLCapabilities(glp);
+        if(nsUsage) {
+            CGL.queryPixelFormat(pixelFormat, cglInternalAttributeToken, 0, cglInternalAttributeToken.length, ivalues, 0);
+        } else {
+            CGL.CGLQueryPixelFormat(pixelFormat, cglInternalAttributeToken, 0, cglInternalAttributeToken.length, ivalues, 0);
+        }
+        for (int i = 0; i < cglInternalAttributeToken.length; i++) {
+          int attr = cglInternalAttributeToken[i];
+          switch (attr) {
+              case CGL.kCGLPFAColorFloat:
+                caps.setPbufferFloatingPointBuffers(ivalues[i] != 0);
+                break;
+
+              case CGL.NSOpenGLPFAPixelBuffer:
+                caps.setPBuffer(ivalues[i] != 0);
+                break;
+
+              case CGL.NSOpenGLPFADoubleBuffer:
+                caps.setDoubleBuffered(ivalues[i] != 0);
+                break;
+
+              case CGL.NSOpenGLPFAStereo:
+                caps.setStereo(ivalues[i] != 0);
+                break;
+
+              case CGL.NSOpenGLPFAColorSize:
+                {
+                  int bitSize = ivalues[i];
+                  if (bitSize == 32)
+                    bitSize = 24;
+                  bitSize /= 3;
+                  caps.setRedBits(bitSize);
+                  caps.setGreenBits(bitSize);
+                  caps.setBlueBits(bitSize);
+                }
+                break;
+
+              case CGL.NSOpenGLPFAAlphaSize:
+                caps.setAlphaBits(ivalues[i]);
+                break;
+
+              case CGL.NSOpenGLPFADepthSize:
+                caps.setDepthBits(ivalues[i]);
+                break;
+
+              case CGL.NSOpenGLPFAAccumSize:
+                {
+                  int bitSize = ivalues[i] / 4;
+                  caps.setAccumRedBits(bitSize);
+                  caps.setAccumGreenBits(bitSize);
+                  caps.setAccumBlueBits(bitSize);
+                  caps.setAccumAlphaBits(bitSize);
+                }
+                break;
+
+              case CGL.NSOpenGLPFAStencilSize:
+                caps.setStencilBits(ivalues[i]);
+                break;
+
+              case CGL.NSOpenGLPFASampleBuffers:
+                caps.setSampleBuffers(ivalues[i] != 0);
+                break;
+
+              case CGL.NSOpenGLPFASamples:
+                caps.setNumSamples(ivalues[i]);
+                break;
+
+              default:
+                break;
+          }
+        }
+
+        return caps;
+      }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
new file mode 100644
index 000000000..ab53e49e9
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.macosx.*;
+import com.sun.nativewindow.impl.*;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+/** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
+    are used on OSX platforms. Toolkits will likely need to delegate
+    to this one to change the accepted and returned types of the
+    GraphicsDevice and GraphicsConfiguration abstractions. */
+
+public class MacOSXCGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
+    protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
+
+    public MacOSXCGLGraphicsConfigurationFactory() {
+        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.macosx.MacOSXGraphicsDevice.class, this);
+    }
+
+    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
+                                                                     CapabilitiesChooser chooser,
+                                                                     AbstractGraphicsScreen absScreen) {
+        return chooseGraphicsConfigurationStatic(capabilities, chooser, absScreen, false);
+    }
+
+    protected static MacOSXCGLGraphicsConfiguration chooseGraphicsConfigurationStatic(Capabilities capabilities,
+                                                                                   CapabilitiesChooser chooser,
+                                                                                   AbstractGraphicsScreen absScreen, boolean usePBuffer) {
+        if (absScreen == null) {
+            throw new IllegalArgumentException("AbstractGraphicsScreen is null");
+        }
+
+        if (capabilities != null &&
+            !(capabilities instanceof GLCapabilities)) {
+            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilities objects");
+        }
+
+        if (chooser != null &&
+            !(chooser instanceof GLCapabilitiesChooser)) {
+            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilitiesChooser objects");
+        }
+
+        if (capabilities == null) {
+            capabilities = new GLCapabilities(null);
+        }
+
+        return new MacOSXCGLGraphicsConfiguration(absScreen, (GLCapabilities)capabilities, (GLCapabilities)capabilities, 0);
+    }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
new file mode 100644
index 000000000..239eedd43
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+import javax.media.nativewindow.*;
+import com.sun.nativewindow.impl.NullWindow;
+
+public class MacOSXExternalCGLContext extends MacOSXCGLContext {
+  private boolean firstMakeCurrent = true;
+  private boolean created = true;
+  private GLContext lastContext;
+
+  private MacOSXExternalCGLContext(Drawable drawable, long cglContext, long nsContext) {
+    super(drawable, null);
+    drawable.setExternalCGLContext(this);
+    this.cglContext = cglContext;
+    this.nsContext = nsContext;
+    GLContextShareSet.contextCreated(this);
+    setGLFunctionAvailability(false);
+    getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
+  }
+
+  protected static MacOSXExternalCGLContext create(GLDrawableFactory factory, GLProfile glp) {
+    ((GLDrawableFactoryImpl)factory).lockToolkit();
+    try {
+        long pixelFormat = 0;
+        long currentDrawable = 0;
+        long cglContext = 0;
+        long nsContext = CGL.getCurrentContext(); // Check: MacOSX 10.3 ..
+        if( 0 != nsContext ) {
+            currentDrawable = CGL.getNSView(nsContext);
+            long ctx = CGL.getCGLContext(nsContext);
+            if (ctx == 0) {
+              throw new GLException("Error: NULL cglContext of nsContext 0x" +Long.toHexString(nsContext));
+            }
+            pixelFormat = CGL.CGLGetPixelFormat(ctx);
+            if(DEBUG) {
+                System.err.println("MacOSXExternalCGLContext Create nsContext 0x"+Long.toHexString(nsContext)+
+                                   ", cglContext 0x"+Long.toHexString(ctx)+
+                                   ", pixelFormat 0x"+Long.toHexString(pixelFormat));
+            }
+        } else {
+            cglContext = CGL.CGLGetCurrentContext();
+            if (cglContext == 0) {
+              throw new GLException("Error: current cglContext null, no nsContext");
+            }
+            pixelFormat = CGL.CGLGetPixelFormat(cglContext);
+            if(DEBUG) {
+                System.err.println("MacOSXExternalCGLContext Create cglContext 0x"+Long.toHexString(cglContext)+
+                                   ", pixelFormat 0x"+Long.toHexString(pixelFormat));
+            }
+        }
+
+        if (0 == pixelFormat) {
+          throw new GLException("Error: current pixelformat of current cglContext 0x"+Long.toHexString(cglContext)+" is null");
+        }
+        GLCapabilities caps = MacOSXCGLGraphicsConfiguration.CGLPixelFormat2GLCapabilities(glp, pixelFormat);
+        if(DEBUG) {
+            System.err.println("MacOSXExternalCGLContext Create "+caps);
+        }
+
+        AbstractGraphicsScreen aScreen = DefaultGraphicsScreen.createDefault();
+        MacOSXCGLGraphicsConfiguration cfg = new MacOSXCGLGraphicsConfiguration(aScreen, caps, caps, pixelFormat);
+
+        NullWindow nw = new NullWindow(cfg);
+        nw.setSurfaceHandle(currentDrawable); 
+        return new MacOSXExternalCGLContext(new Drawable(factory, nw), cglContext, nsContext);
+    } finally {
+        ((GLDrawableFactoryImpl)factory).unlockToolkit();
+    }
+  }
+
+  protected boolean create() {
+    return true;
+  }
+
+  public int makeCurrent() throws GLException {
+    // Save last context if necessary to allow external GLContexts to
+    // talk to other GLContexts created by this library
+    GLContext cur = getCurrent();
+    if (cur != null && cur != this) {
+      lastContext = cur;
+      setCurrent(null);
+    }
+    return super.makeCurrent();
+  }  
+
+  protected void swapBuffers() {
+    DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    GLCapabilities caps = (GLCapabilities)config.getChosenCapabilities();
+    if(caps.isOnscreen()) {
+        if (CGL.kCGLNoError != CGL.CGLFlushDrawable(cglContext)) {
+          throw new GLException("Error swapping buffers");
+        }
+    }
+  }
+
+  public void release() throws GLException {
+    super.release();
+    setCurrent(lastContext);
+    lastContext = null;
+  }
+
+  protected int makeCurrentImpl() throws GLException {
+    if (firstMakeCurrent) {
+      firstMakeCurrent = false;
+      return CONTEXT_CURRENT_NEW;
+    }
+    return CONTEXT_CURRENT;
+  }
+
+  protected void releaseImpl() throws GLException {
+  }
+
+  protected void destroyImpl() throws GLException {
+    created = false;
+    GLContextShareSet.contextDestroyed(this);
+  }
+
+  public boolean isCreated() {
+    return created;
+  }
+
+  public void setOpenGLMode(int mode) {
+    if (mode != MacOSXCGLDrawable.CGL_MODE)
+      throw new GLException("OpenGL mode switching not supported for external GLContexts");
+  }
+    
+  public int  getOpenGLMode() {
+    return MacOSXCGLDrawable.CGL_MODE;
+  }
+
+  // Need to provide the display connection to extension querying APIs
+  static class Drawable extends MacOSXCGLDrawable {
+    MacOSXExternalCGLContext extCtx;
+
+    Drawable(GLDrawableFactory factory, NativeWindow comp) {
+      super(factory, comp, true);
+    }
+
+    void setExternalCGLContext(MacOSXExternalCGLContext externalContext) {
+      extCtx = externalContext;
+    }
+
+    public GLContext createContext(GLContext shareWith) {
+      throw new GLException("Should not call this");
+    }
+
+    public int getWidth() {
+      throw new GLException("Should not call this");
+    }
+
+    public int getHeight() {
+      throw new GLException("Should not call this");
+    }
+
+    public void setSize(int width, int height) {
+      throw new GLException("Should not call this");
+    }
+
+    protected void swapBuffersImpl() {
+      if (extCtx != null) {
+        extCtx.swapBuffers();
+      }
+    }
+  
+    public void setOpenGLMode(int mode) {
+        if (mode != CGL_MODE)
+          throw new GLException("OpenGL mode switching not supported for external GLContext's drawables");
+    }
+
+    public int  getOpenGLMode() {
+        return CGL_MODE;
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
new file mode 100644
index 000000000..8b8bb46fa
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+public class MacOSXOffscreenCGLContext extends MacOSXPbufferCGLContext
+{  
+  public MacOSXOffscreenCGLContext(MacOSXPbufferCGLDrawable drawable,
+                                  GLContext shareWith) {
+    super(drawable, shareWith);
+  }
+	
+  public int getOffscreenContextPixelDataType() {
+    GL gl = getGL();
+    return gl.isGL2()?GL2.GL_UNSIGNED_INT_8_8_8_8_REV:GL.GL_UNSIGNED_SHORT_5_5_5_1;
+  }
+
+  public int getOffscreenContextReadBuffer() {
+    return GL.GL_FRONT;
+  }
+
+  public boolean offscreenImageNeedsVerticalFlip() {
+    return true;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java
new file mode 100644
index 000000000..adaa48f34
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl;
+
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import com.jogamp.opengl.impl.*;
+
+public class MacOSXOffscreenCGLDrawable extends MacOSXPbufferCGLDrawable {
+
+  public MacOSXOffscreenCGLDrawable(GLDrawableFactory factory,
+                                    NativeWindow target) {
+    super(factory, target);
+  }
+
+  public GLContext createContext(GLContext shareWith) {
+    return new MacOSXOffscreenCGLContext(this, shareWith);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
new file mode 100644
index 000000000..4c64864fa
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl;
+
+import java.util.*;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+public class MacOSXOnscreenCGLContext extends MacOSXCGLContext {
+  protected MacOSXOnscreenCGLDrawable drawable;
+
+  public MacOSXOnscreenCGLContext(MacOSXOnscreenCGLDrawable drawable,
+                                 GLContext shareWith) {
+    super(drawable, shareWith);
+    this.drawable = drawable;
+  }
+
+  protected int makeCurrentImpl() throws GLException {
+    int lockRes = drawable.lockSurface();
+    boolean exceptionOccurred = false;
+    try {
+      if (lockRes == NativeWindow.LOCK_SURFACE_NOT_READY) {
+        return CONTEXT_NOT_CURRENT;
+      }
+      int ret = super.makeCurrentImpl();
+      if ((ret == CONTEXT_CURRENT) ||
+          (ret == CONTEXT_CURRENT_NEW)) {
+        // Assume the canvas might have been resized or moved and tell the OpenGL
+        // context to update itself. This used to be done only upon receiving a
+        // reshape event but that doesn't appear to be sufficient. An experiment
+        // was also done to add a HierarchyBoundsListener to the GLCanvas and
+        // do this updating only upon reshape of this component or reshape or movement
+        // of an ancestor, but this also wasn't sufficient and left garbage on the
+        // screen in some situations.
+        CGL.updateContext(nsContext);
+      } else {
+        if (!isOptimizable()) {
+          // This can happen if the window currently is zero-sized, for example.
+          // Make sure we don't leave the surface locked in this case.
+          drawable.unlockSurface();
+          lockRes = NativeWindow.LOCK_SURFACE_NOT_READY;
+        }
+      }
+      return ret;
+    } catch (RuntimeException e) {
+      exceptionOccurred = true;
+      throw e;
+    } finally {
+      if (exceptionOccurred ||
+          (isOptimizable() && lockRes != NativeWindow.LOCK_SURFACE_NOT_READY)) {
+        drawable.unlockSurface();
+      }
+    }
+  }
+    
+  protected void releaseImpl() throws GLException {
+    try {
+      super.releaseImpl();
+    } finally {
+      if (!isOptimizable() && drawable.isSurfaceLocked()) {
+        drawable.unlockSurface();
+      }
+    }
+  }
+
+  protected void swapBuffers() {
+    if (!CGL.flushBuffer(nsContext)) {
+      throw new GLException("Error swapping buffers");
+    }
+  }
+
+  protected void update() throws GLException {
+    if (nsContext == 0) {
+      throw new GLException("Context not created");
+    }
+    CGL.updateContext(nsContext);
+  }
+
+  protected boolean create() {
+    return create(false, false);
+  }
+
+  public void setOpenGLMode(int mode) {
+    if (mode != MacOSXCGLDrawable.NSOPENGL_MODE)
+      throw new GLException("OpenGL mode switching not supported for on-screen GLContexts");
+  }
+    
+  public int  getOpenGLMode() {
+    return MacOSXCGLDrawable.NSOPENGL_MODE;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java
new file mode 100644
index 000000000..6ee023867
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl;
+
+import java.lang.ref.WeakReference;
+import java.security.*;
+import java.util.*;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+public class MacOSXOnscreenCGLDrawable extends MacOSXCGLDrawable {
+  private List/*<WeakReference<GLContext>>*/ createdContexts =
+    new ArrayList();
+
+  protected MacOSXOnscreenCGLDrawable(GLDrawableFactory factory, NativeWindow component) {
+    super(factory, component, false);
+  }
+
+  public GLContext createContext(GLContext shareWith) {
+    MacOSXOnscreenCGLContext context =
+      new MacOSXOnscreenCGLContext(this, shareWith);
+    // NOTE: we need to keep track of the created contexts in order to
+    // implement swapBuffers() because of how Mac OS X implements its
+    // OpenGL window interface
+    synchronized (this) {
+      List newContexts = new ArrayList();
+      newContexts.addAll(createdContexts);
+      newContexts.add(new WeakReference(context));
+      createdContexts = newContexts;
+    }
+    return context;
+  }
+
+  public int getWidth() {
+    return component.getWidth();
+  }
+
+  public int getHeight() {
+    return component.getHeight();
+  }
+
+  protected void swapBuffersImpl() {
+    for (Iterator iter = createdContexts.iterator(); iter.hasNext(); ) {
+      WeakReference ref = (WeakReference) iter.next();
+      MacOSXOnscreenCGLContext ctx = (MacOSXOnscreenCGLContext) ref.get();
+      // FIXME: clear out unreachable contexts
+      if (ctx != null) {
+        ctx.swapBuffers();
+      }
+    }
+  }
+  
+  public void setOpenGLMode(int mode) {
+    if (mode != NSOPENGL_MODE)
+      throw new GLException("OpenGL mode switching not supported for on-screen GLDrawables");
+  }
+
+  public int  getOpenGLMode() {
+    return NSOPENGL_MODE;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
new file mode 100644
index 000000000..131375338
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
@@ -0,0 +1,359 @@
+package com.jogamp.opengl.impl.macosx.cgl;
+
+import java.security.*;
+import java.util.*;
+
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import com.jogamp.opengl.impl.*;
+
+public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
+  protected MacOSXPbufferCGLDrawable drawable;
+
+  // State for render-to-texture and render-to-texture-rectangle support
+  private int textureTarget; // e.g. GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE_NV
+  private int texture;       // actual texture object
+
+  private static boolean isTigerOrLater;
+
+  static {
+    String osVersion = Debug.getProperty("os.version", false, AccessController.getContext());
+    StringTokenizer tok = new StringTokenizer(osVersion, ". ");
+    int major = Integer.parseInt(tok.nextToken());
+    int minor = Integer.parseInt(tok.nextToken());
+    isTigerOrLater = ((major > 10) || (minor > 3));
+  }
+
+  public MacOSXPbufferCGLContext(MacOSXPbufferCGLDrawable drawable,
+                                GLContext shareWith) {
+    super(drawable, shareWith);
+    this.drawable = drawable;
+    initOpenGLImpl();
+  }
+
+  public void bindPbufferToTexture() {
+    GL gl = getGL();
+    gl.glBindTexture(textureTarget, texture);
+    // FIXME: not clear whether this is really necessary, but since
+    // the API docs seem to imply it is and since it doesn't seem to
+    // impact performance, leaving it in
+    CGL.setContextTextureImageToPBuffer(nsContext, drawable.getPbuffer(), GL.GL_FRONT);
+  }
+
+  public void releasePbufferFromTexture() {
+  }
+
+  protected int makeCurrentImpl() throws GLException {
+    if (drawable.getPbuffer() == 0) {
+      if (DEBUG) {
+        System.err.println("Pbuffer not instantiated yet for " + this);
+      }
+      // pbuffer not instantiated yet
+      return CONTEXT_NOT_CURRENT;
+    }
+
+    if (getOpenGLMode() != drawable.getOpenGLMode()) {
+      setOpenGLMode(drawable.getOpenGLMode());
+    }
+
+    boolean created = false;
+    if (nsContext == 0) {
+      if (!create()) {
+        return CONTEXT_NOT_CURRENT;
+      }
+      if (DEBUG) {
+        System.err.println("!!! Created OpenGL context " + toHexString(nsContext) + " for " + getClass().getName());
+      }
+      created = true;
+    }
+    
+    if (!impl.makeCurrent(nsContext)) {
+      throw new GLException("Error making nsContext current");
+    }
+            
+    if (created) {
+      setGLFunctionAvailability(false);
+
+      // Initialize render-to-texture support if requested
+      DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+      GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
+      GL gl = getGL();
+      boolean rect = gl.isGL2() && capabilities.getPbufferRenderToTextureRectangle();
+      if (rect) {
+        if (!gl.isExtensionAvailable("GL_EXT_texture_rectangle")) {
+          System.err.println("MacOSXPbufferCGLContext: WARNING: GL_EXT_texture_rectangle extension not " +
+                             "supported; skipping requested render_to_texture_rectangle support for pbuffer");
+          rect = false;
+        }
+      }
+      textureTarget = (rect ? GL2.GL_TEXTURE_RECTANGLE : GL.GL_TEXTURE_2D);
+      int[] tmp = new int[1];
+      gl.glGenTextures(1, tmp, 0);
+      texture = tmp[0];
+      gl.glBindTexture(textureTarget, texture);
+      gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_MIN_FILTER, GL.GL_NEAREST);
+      gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST);
+      gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_WRAP_S, GL.GL_CLAMP_TO_EDGE);
+      gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_WRAP_T, GL.GL_CLAMP_TO_EDGE);
+      gl.glCopyTexImage2D(textureTarget, 0, GL.GL_RGB, 0, 0, drawable.getWidth(), drawable.getHeight(), 0);
+
+      return CONTEXT_CURRENT_NEW;
+    }
+    return CONTEXT_CURRENT;
+  }
+
+  protected void releaseImpl() throws GLException {
+    if (!impl.release(nsContext)) {
+      throw new GLException("Error releasing OpenGL nsContext");
+    }
+  }
+
+  protected void destroyImpl() throws GLException {
+    if (nsContext != 0) {
+      if (!impl.destroy(nsContext)) {
+        throw new GLException("Unable to delete OpenGL context");
+      }
+      if (DEBUG) {
+        System.err.println("!!! Destroyed OpenGL context " + nsContext);
+      }
+      nsContext = 0;
+      GLContextShareSet.contextDestroyed(this);
+    }
+  }
+
+  protected void setSwapIntervalImpl(int interval) {
+    if (nsContext == 0) {
+      throw new GLException("OpenGL context not current");
+    }
+    impl.setSwapInterval(nsContext, interval);
+    currentSwapInterval = impl.getSwapInterval() ;
+  }
+
+  public int getFloatingPointMode() {
+    return GLPbuffer.APPLE_FLOAT;
+  }
+
+  protected boolean create() {
+    DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
+    if (capabilities.getPbufferFloatingPointBuffers() &&
+	!isTigerOrLater) {
+      throw new GLException("Floating-point pbuffers supported only on OS X 10.4 or later");
+    }
+    // Change our OpenGL mode to match that of any share context before we create ourselves
+    MacOSXCGLContext other = (MacOSXCGLContext) GLContextShareSet.getShareContext(this);
+    if (other != null) {
+      setOpenGLMode(other.getOpenGLMode());
+    }
+    // Will throw exception upon error
+    nsContext = impl.create();
+
+    if (!impl.makeCurrent(nsContext)) {
+      throw new GLException("Error making nsContext current");
+    }
+    setGLFunctionAvailability(true);
+            
+    return true;
+  }
+
+  //---------------------------------------------------------------------------
+  // OpenGL "mode switching" functionality
+  //
+  private boolean haveSetOpenGLMode = false;
+  // FIXME: should consider switching the default mode based on
+  // whether the Java2D/JOGL bridge is active -- need to ask ourselves
+  // whether it's more likely that we will share with a GLCanvas or a
+  // GLJPanel when the bridge is turned on
+  private int     openGLMode = MacOSXCGLDrawable.NSOPENGL_MODE;
+  // Implementation object (either NSOpenGL-based or CGL-based)
+  protected Impl impl;
+
+  public void setOpenGLMode(int mode) {
+    if (mode == openGLMode) {
+      return;
+    }
+    if (haveSetOpenGLMode) {
+      throw new GLException("Can't switch between using NSOpenGLPixelBuffer and CGLPBufferObj more than once");
+    }
+    destroyImpl();
+    drawable.setOpenGLMode(mode);
+    openGLMode = mode;
+    haveSetOpenGLMode = true;
+    if (DEBUG) {
+      System.err.println("Switching PBuffer context mode to " +
+                         ((mode == MacOSXCGLDrawable.NSOPENGL_MODE) ? "NSOPENGL_MODE" : "CGL_MODE"));
+    }
+    initOpenGLImpl();
+  }
+
+  public int  getOpenGLMode() {
+    return openGLMode;
+  }
+
+  private void initOpenGLImpl() {
+    switch (openGLMode) {
+      case MacOSXCGLDrawable.NSOPENGL_MODE:
+        impl = new NSOpenGLImpl();
+        break;
+      case MacOSXCGLDrawable.CGL_MODE:
+        impl = new CGLImpl();
+        break;
+      default:
+        throw new InternalError("Illegal implementation mode " + openGLMode);
+    }
+  }
+
+  // Abstract interface for implementation of this context (either
+  // NSOpenGL-based or CGL-based)
+  interface Impl {
+    public long    create();
+    public boolean destroy(long ctx);
+    public boolean makeCurrent(long ctx);
+    public boolean release(long ctx);
+    public void    setSwapInterval(long ctx, int interval);
+    public int     getSwapInterval();
+  }
+
+  // NSOpenGLContext-based implementation
+  class NSOpenGLImpl implements Impl {
+    public long create() {
+      DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+      GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
+      if (capabilities.getPbufferFloatingPointBuffers() &&
+          !isTigerOrLater) {
+        throw new GLException("Floating-point pbuffers supported only on OS X 10.4 or later");
+      }
+      if (!MacOSXPbufferCGLContext.this.create(true, capabilities.getPbufferFloatingPointBuffers())) {
+        throw new GLException("Error creating context for pbuffer");
+      }
+      // Must now associate the pbuffer with our newly-created context
+      CGL.setContextPBuffer(nsContext, drawable.getPbuffer());
+      return nsContext;
+    }
+
+    public boolean destroy(long ctx) {
+      return CGL.deleteContext(ctx);
+    }
+
+    public boolean makeCurrent(long ctx) {
+      return CGL.makeCurrentContext(ctx);
+    }
+
+    public boolean release(long ctx) {
+      return CGL.clearCurrentContext(ctx);
+    }
+
+    private int currentSwapInterval = 0 ;
+
+    public void setSwapInterval(long ctx, int interval) {
+      CGL.setSwapInterval(ctx, interval);      
+      currentSwapInterval = interval ;
+    }
+    public int getSwapInterval() {
+        return currentSwapInterval;
+    }
+  }
+
+  class CGLImpl implements Impl {
+    public long create() {
+      // Find and configure share context
+      MacOSXCGLContext other = (MacOSXCGLContext) GLContextShareSet.getShareContext(MacOSXPbufferCGLContext.this);
+      long share = 0;
+      if (other != null) {
+        // Reconfigure pbuffer-based GLContexts
+        if (other instanceof MacOSXPbufferCGLContext) {
+          MacOSXPbufferCGLContext ctx = (MacOSXPbufferCGLContext) other;
+          ctx.setOpenGLMode(MacOSXCGLDrawable.CGL_MODE);
+        } else {
+          if (other.getOpenGLMode() != MacOSXCGLDrawable.CGL_MODE) {
+            throw new GLException("Can't share between NSOpenGLContexts and CGLContextObjs");
+          }
+        }
+        share = other.getNSContext();
+        // Note we don't check for a 0 return value, since switching
+        // the context's mode causes it to be destroyed and not
+        // re-initialized until the next makeCurrent
+      }
+
+      // Set up pixel format attributes
+      // FIXME: shall go into MacOSXCGLGraphicsConfiguration
+      int[] attrs = new int[256];
+      int i = 0;
+      attrs[i++] = CGL.kCGLPFAPBuffer;
+      DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+      GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
+      if (capabilities.getPbufferFloatingPointBuffers())
+        attrs[i++] = CGL.kCGLPFAColorFloat;
+      if (capabilities.getDoubleBuffered())
+        attrs[i++] = CGL.kCGLPFADoubleBuffer;
+      if (capabilities.getStereo())
+        attrs[i++] = CGL.kCGLPFAStereo;
+      attrs[i++] = CGL.kCGLPFAColorSize;
+      attrs[i++] = (capabilities.getRedBits() +
+                    capabilities.getGreenBits() +
+                    capabilities.getBlueBits());
+      attrs[i++] = CGL.kCGLPFAAlphaSize;
+      attrs[i++] = capabilities.getAlphaBits();
+      attrs[i++] = CGL.kCGLPFADepthSize;
+      attrs[i++] = capabilities.getDepthBits();
+      // FIXME: should validate stencil size as is done in MacOSXWindowSystemInterface.m
+      attrs[i++] = CGL.kCGLPFAStencilSize;
+      attrs[i++] = capabilities.getStencilBits();
+      attrs[i++] = CGL.kCGLPFAAccumSize;
+      attrs[i++] = (capabilities.getAccumRedBits() +
+                    capabilities.getAccumGreenBits() +
+                    capabilities.getAccumBlueBits() +
+                    capabilities.getAccumAlphaBits());
+      if (capabilities.getSampleBuffers()) {
+        attrs[i++] = CGL.kCGLPFASampleBuffers;
+        attrs[i++] = 1;
+        attrs[i++] = CGL.kCGLPFASamples;
+        attrs[i++] = capabilities.getNumSamples();
+      }
+
+      // Use attribute array to select pixel format
+      long[] fmt = new long[1];
+      long[] numScreens = new long[1];
+      int res = CGL.CGLChoosePixelFormat(attrs, 0, fmt, 0, numScreens, 0);
+      if (res != CGL.kCGLNoError) {
+        throw new GLException("Error code " + res + " while choosing pixel format");
+      }
+      
+      // Create new context
+      long[] ctx = new long[1];
+      if (DEBUG) {
+        System.err.println("Share context for CGL-based pbuffer context is " + toHexString(share));
+      }
+      res = CGL.CGLCreateContext(fmt[0], share, ctx, 0);
+      CGL.CGLDestroyPixelFormat(fmt[0]);
+      if (res != CGL.kCGLNoError) {
+        throw new GLException("Error code " + res + " while creating context");
+      }
+      // Attach newly-created context to the pbuffer
+      res = CGL.CGLSetPBuffer(ctx[0], drawable.getPbuffer(), 0, 0, 0);
+      if (res != CGL.kCGLNoError) {
+        throw new GLException("Error code " + res + " while attaching context to pbuffer");
+      }
+      return ctx[0];
+    }
+    
+    public boolean destroy(long ctx) {
+      return (CGL.CGLDestroyContext(ctx) == CGL.kCGLNoError);
+    }
+
+    public boolean makeCurrent(long ctx) {
+      return CGL.CGLSetCurrentContext(ctx) == CGL.kCGLNoError;
+    }
+
+    public boolean release(long ctx) {
+      return (CGL.CGLSetCurrentContext(0) == CGL.kCGLNoError);
+    }
+
+    public void setSwapInterval(long ctx, int interval) {
+      // For now not supported (not really relevant for off-screen contexts anyway)
+    }
+    public int getSwapInterval() {
+        return 0;
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
new file mode 100644
index 000000000..eb6de929d
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl;
+
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import com.jogamp.opengl.impl.*;
+
+public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
+  private static final boolean DEBUG = Debug.debug("MacOSXPbufferCGLDrawable");
+  
+  // State for render-to-texture and render-to-texture-rectangle support
+  private int textureTarget; // e.g. GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE_NV
+  private int texture;       // actual texture object
+
+  // NSOpenGLPbuffer (for normal mode)
+  // CGLPbufferObj (for CGL_MODE situation, i.e., when Java2D/JOGL bridge is active)
+  // Note that we can not store this in the NativeWindow because the
+  // semantic is that contains an NSView
+  protected long pBuffer;
+
+  public MacOSXPbufferCGLDrawable(GLDrawableFactory factory, NativeWindow target) {
+    super(factory, target, true);
+
+    if (DEBUG) {
+        System.out.println("Pbuffer config: " + getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration());
+    }
+
+    initOpenGLImpl();
+    createPbuffer();
+
+    if (DEBUG) {
+        System.err.println("Created pbuffer " + this);
+    }
+  }
+
+  protected void setRealizedImpl() {
+    if(realized) {
+        createPbuffer();
+    } else {
+        destroy();
+    }
+  }
+
+  public GLContext createContext(GLContext shareWith) {
+    return new MacOSXPbufferCGLContext(this, shareWith);
+  }
+
+  public void destroy() {
+    if (this.pBuffer != 0) {
+      NativeWindow nw = getNativeWindow();
+      impl.destroy(pBuffer);
+      this.pBuffer = 0;
+      ((SurfaceChangeable)nw).setSurfaceHandle(0);
+      if (DEBUG) {
+        System.err.println("Destroyed pbuffer: " + pBuffer);
+      }
+    }
+  }
+
+  public long getPbuffer() {
+    return pBuffer;
+  }
+  
+  protected void swapBuffersImpl() {
+    if(DEBUG) {
+        System.err.println("unhandled swapBuffersImpl() called for: "+this);
+    }
+  }
+
+  private void createPbuffer() {
+    NativeWindow nw = getNativeWindow();
+    DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) nw.getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
+    GLProfile glProfile = capabilities.getGLProfile();
+    int renderTarget;
+    if (glProfile.isGL2() && capabilities.getPbufferRenderToTextureRectangle()) {
+      renderTarget = GL2.GL_TEXTURE_RECTANGLE;
+    } else {
+      int w = getNextPowerOf2(getWidth());
+      int h = getNextPowerOf2(getHeight());
+      ((SurfaceChangeable)nw).setSize(w, h);
+      renderTarget = GL.GL_TEXTURE_2D;
+    }
+
+    int internalFormat = GL.GL_RGBA;
+    if (capabilities.getPbufferFloatingPointBuffers()) {
+      // FIXME: want to check availability of GL_APPLE_float_pixels
+      // extension, but need valid OpenGL context in order to do so --
+      // in worst case would need to create dummy window / GLCanvas
+      // (undesirable) -- could maybe also do this with pbuffers
+      /*
+        if (!gl.isExtensionAvailable("GL_APPLE_float_pixels")) {
+        throw new GLException("Floating-point support (GL_APPLE_float_pixels) not available");
+        }
+      */
+      if(glProfile.isGL2()) {
+        switch (capabilities.getRedBits()) {
+        case 16: internalFormat = GL2.GL_RGBA_FLOAT16_APPLE; break;
+        case 32: internalFormat = GL2.GL_RGBA_FLOAT32_APPLE; break;
+        default: throw new GLException("Invalid floating-point bit depth (only 16 and 32 supported)");
+        }
+      } else {
+        internalFormat = GL.GL_RGBA;
+      }
+    }
+            
+    pBuffer = impl.create(renderTarget, internalFormat, getWidth(), getHeight());
+    if (pBuffer == 0) {
+      throw new GLException("pbuffer creation error: CGL.createPBuffer() failed");
+    }
+
+    ((SurfaceChangeable)nw).setSurfaceHandle(pBuffer);
+
+  }
+
+  private int getNextPowerOf2(int number) {
+    if (((number-1) & number) == 0) {
+      //ex: 8 -> 0b1000; 8-1=7 -> 0b0111; 0b1000&0b0111 == 0
+      return number;
+    }
+    int power = 0;
+    while (number > 0) {
+      number = number>>1;
+      power++;
+    }
+    return (1<<power);
+  }
+
+  //---------------------------------------------------------------------------
+  // OpenGL "mode switching" functionality
+  //
+  private boolean haveSetOpenGLMode = false;
+  // FIXME: should consider switching the default mode based on
+  // whether the Java2D/JOGL bridge is active -- need to ask ourselves
+  // whether it's more likely that we will share with a GLCanvas or a
+  // GLJPanel when the bridge is turned on
+  private int     openGLMode = NSOPENGL_MODE;
+  // Implementation object (either NSOpenGL-based or CGL-based)
+  protected Impl impl;
+
+  public void setOpenGLMode(int mode) {
+    if (mode == openGLMode) {
+      return;
+    }
+    if (haveSetOpenGLMode) {
+      throw new GLException("Can't switch between using NSOpenGLPixelBuffer and CGLPBufferObj more than once");
+    }
+    destroy();
+    openGLMode = mode;
+    haveSetOpenGLMode = true;
+    if (DEBUG) {
+      System.err.println("Switching PBuffer drawable mode to " +
+                         ((mode == MacOSXCGLDrawable.NSOPENGL_MODE) ? "NSOPENGL_MODE" : "CGL_MODE"));
+    }
+    initOpenGLImpl();
+    createPbuffer();
+  }
+
+  public int getOpenGLMode() {
+    return openGLMode;
+  }
+
+  private void initOpenGLImpl() {
+    switch (openGLMode) {
+      case NSOPENGL_MODE:
+        impl = new NSOpenGLImpl();
+        break;
+      case CGL_MODE:
+        impl = new CGLImpl();
+        break;
+      default:
+        throw new InternalError("Illegal implementation mode " + openGLMode);
+    }
+  }
+
+  // Abstract interface for implementation of this drawable (either
+  // NSOpenGL-based or CGL-based)
+  interface Impl {
+    public long create(int renderTarget, int internalFormat, int width, int height);
+    public void destroy(long pbuffer);
+  }
+
+  // NSOpenGLPixelBuffer implementation
+  class NSOpenGLImpl implements Impl {
+    public long create(int renderTarget, int internalFormat, int width, int height) {
+      return CGL.createPBuffer(renderTarget, internalFormat, width, height);
+    }
+
+    public void destroy(long pbuffer) {
+      CGL.destroyPBuffer(pbuffer);
+    }
+  }
+
+  // CGL implementation
+  class CGLImpl implements Impl {
+    public long create(int renderTarget, int internalFormat, int width, int height) {
+      long[] pbuffer = new long[1];
+      int res = CGL.CGLCreatePBuffer(width, height, renderTarget, internalFormat, 0, pbuffer, 0);
+      if (res != CGL.kCGLNoError) {
+        throw new GLException("Error creating CGL-based pbuffer: error code " + res);
+      }
+      return pbuffer[0];
+    }
+
+    public void destroy(long pbuffer) {
+      int res = CGL.CGLDestroyPBuffer(pbuffer);
+      if (res != CGL.kCGLNoError) {
+        throw new GLException("Error destroying CGL-based pbuffer: error code " + res);
+      }
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
new file mode 100644
index 000000000..cc973c56a
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl.awt;
+
+import java.lang.reflect.InvocationTargetException;
+import java.nio.*;
+import java.util.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.awt.*;
+import com.jogamp.opengl.impl.macosx.cgl.*;
+
+public class MacOSXAWTCGLDrawableFactory extends MacOSXCGLDrawableFactory {
+
+  public MacOSXAWTCGLDrawableFactory() {
+    super();
+  }
+
+  public boolean canCreateContextOnJava2DSurface() {
+    return true;
+  }
+
+  public GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
+    throws GLException {
+    return new MacOSXJava2DCGLContext(shareWith);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
new file mode 100644
index 000000000..97d5e8d68
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl.awt;
+
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.macosx.*;
+import javax.media.nativewindow.awt.*;
+import javax.media.opengl.*;
+import javax.media.opengl.awt.*;
+
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.macosx.cgl.*;
+import com.sun.nativewindow.impl.jawt.*;
+import com.sun.nativewindow.impl.jawt.macosx.*;
+
+public class MacOSXAWTCGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
+    protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
+
+    public MacOSXAWTCGLGraphicsConfigurationFactory() {
+        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.awt.AWTGraphicsDevice.class, this);
+    }
+
+    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
+                                                                     CapabilitiesChooser chooser,
+                                                                     AbstractGraphicsScreen absScreen) {
+        GraphicsDevice device = null;
+        if (absScreen != null &&
+            !(absScreen instanceof AWTGraphicsScreen)) {
+            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only AWTGraphicsScreen objects");
+        }
+
+        if(null==absScreen) {
+            absScreen = AWTGraphicsScreen.createScreenDevice(-1);
+        }
+        AWTGraphicsScreen awtScreen = (AWTGraphicsScreen) absScreen;
+        device = ((AWTGraphicsDevice)awtScreen.getDevice()).getGraphicsDevice();
+
+        if (capabilities != null &&
+            !(capabilities instanceof GLCapabilities)) {
+            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only GLCapabilities objects");
+        }
+
+        if (chooser != null &&
+            !(chooser instanceof GLCapabilitiesChooser)) {
+            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only GLCapabilitiesChooser objects");
+        }
+
+        if(DEBUG) {
+            System.err.println("MacOSXAWTCGLGraphicsConfigurationFactory: got "+absScreen);
+        }
+
+        long displayHandle = 0;
+
+        MacOSXGraphicsDevice macDevice = new MacOSXGraphicsDevice();
+        DefaultGraphicsScreen macScreen = new DefaultGraphicsScreen(macDevice, awtScreen.getIndex());
+        if(DEBUG) {
+            System.err.println("MacOSXAWTCGLGraphicsConfigurationFactory: made "+macScreen);
+        }
+
+        GraphicsConfiguration gc = device.getDefaultConfiguration();
+        AWTGraphicsConfiguration.setupCapabilitiesRGBABits(capabilities, gc);
+        if(DEBUG) {
+            System.err.println("AWT Colormodel compatible: "+capabilities);
+        }
+
+        MacOSXCGLGraphicsConfiguration macConfig = (MacOSXCGLGraphicsConfiguration)
+            GraphicsConfigurationFactory.getFactory(macDevice).chooseGraphicsConfiguration(capabilities,
+                                                                                           chooser,
+                                                                                           macScreen);
+
+        if (macConfig == null) {
+            throw new GLException("Unable to choose a GraphicsConfiguration: "+capabilities+",\n\t"+chooser+"\n\t"+macScreen);
+        }
+
+        // FIXME: we have nothing to match .. so choose the default
+        return new AWTGraphicsConfiguration(awtScreen, macConfig.getChosenCapabilities(), macConfig.getRequestedCapabilities(), gc, macConfig);
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
new file mode 100644
index 000000000..9010d4461
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.macosx.cgl.awt;
+
+import com.jogamp.opengl.impl.macosx.cgl.*;
+
+import java.awt.Graphics;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.awt.*;
+import com.jogamp.opengl.impl.macosx.cgl.*;
+
+/** MacOSXCGLContext implementation supporting the Java2D/JOGL bridge
+ * on Mac OS X. The external GLDrawable mechanism does not work on Mac
+ * OS X due to how drawables and contexts are operated upon on this
+ * platform, so it is necessary to supply an alternative means to
+ * create, make current, and destroy contexts on the Java2D "drawable"
+ * on the Mac platform.
+ */
+
+public class MacOSXJava2DCGLContext extends MacOSXCGLContext implements Java2DGLContext {
+  private Graphics graphics;
+
+  // FIXME: ignoring context sharing for the time being; will need to
+  // rethink this in particular if using FBOs to implement the
+  // Java2D/OpenGL pipeline on Mac OS X
+
+  public MacOSXJava2DCGLContext(GLContext shareWith) {
+    super(null, shareWith);
+  }
+
+  public void setGraphics(Graphics g) {
+    this.graphics = g;
+  }
+
+  protected int makeCurrentImpl() throws GLException {
+    boolean created = false;
+    if (nsContext == 0) {
+      if (!create()) {
+        return CONTEXT_NOT_CURRENT;
+      }
+      if (DEBUG) {
+        System.err.println("!!! Created GL nsContext for " + getClass().getName());
+      }
+      created = true;
+    }
+            
+    if (!Java2D.makeOGLContextCurrentOnSurface(graphics, nsContext)) {
+      throw new GLException("Error making context current");
+    }
+            
+    if (created) {
+      setGLFunctionAvailability(false);
+      return CONTEXT_CURRENT_NEW;
+    }
+    return CONTEXT_CURRENT;
+  }
+
+  protected boolean create() {
+    // Find and configure share context
+    MacOSXCGLContext other = (MacOSXCGLContext) GLContextShareSet.getShareContext(this);
+    long share = 0;
+    if (other != null) {
+      // Reconfigure pbuffer-based GLContexts
+      if (other instanceof MacOSXPbufferCGLContext) {
+        MacOSXPbufferCGLContext ctx = (MacOSXPbufferCGLContext) other;
+        ctx.setOpenGLMode(MacOSXCGLDrawable.CGL_MODE);
+      } else {
+        if (other.getOpenGLMode() != MacOSXCGLDrawable.CGL_MODE) {
+          throw new GLException("Can't share between NSOpenGLContexts and CGLContextObjs");
+        }
+      }
+      share = other.getNSContext();
+      // Note we don't check for a 0 return value, since switching
+      // the context's mode causes it to be destroyed and not
+      // re-initialized until the next makeCurrent
+    }
+
+    if (DEBUG) {
+      System.err.println("!!! Share context is " + toHexString(share) + " for " + getClass().getName());
+    }
+
+    long ctx = Java2D.createOGLContextOnSurface(graphics, share);
+    if (ctx == 0) {
+      return false;
+    }
+    // FIXME: think about GLContext sharing
+    nsContext = ctx;
+    return true;
+  }
+
+  protected void releaseImpl() throws GLException {
+    // FIXME: would need another primitive in the Java2D class in
+    // order to implement this; hopefully should not matter for
+    // correctness
+  }
+
+  protected void destroyImpl() throws GLException {
+    if (nsContext != 0) {
+      Java2D.destroyOGLContext(nsContext);
+      if (DEBUG) {
+        System.err.println("!!! Destroyed OpenGL context " + nsContext);
+      }
+      nsContext = 0;
+      // FIXME
+      // GLContextShareSet.contextDestroyed(this);
+    }
+  }
+
+  public void setOpenGLMode(int mode) {
+    if (mode != MacOSXCGLDrawable.CGL_MODE)
+      throw new GLException("OpenGL mode switching not supported for Java2D GLContexts");
+  }
+
+  public int  getOpenGLMode() {
+    return MacOSXCGLDrawable.CGL_MODE;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
new file mode 100644
index 000000000..89a25fe9a
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.NullWindow;
+
+public class WindowsDummyWGLDrawable extends WindowsWGLDrawable {
+  private long hwnd, hdc;
+
+  public WindowsDummyWGLDrawable(GLDrawableFactory factory) {
+    super(factory, new NullWindow(WindowsWGLGraphicsConfigurationFactory.createDefaultGraphicsConfiguration(null, true, true)), true);
+    // All entries to CreateDummyWindow must synchronize on one object
+    // to avoid accidentally registering the dummy window class twice
+    synchronized (WindowsDummyWGLDrawable.class) {
+      hwnd = WGL.CreateDummyWindow(0, 0, 1, 1);
+    }
+    hdc = WGL.GetDC(hwnd);
+    NullWindow nw = (NullWindow) getNativeWindow();
+    nw.setSurfaceHandle(hdc);
+    // Choose a (hopefully hardware-accelerated) OpenGL pixel format for this device context
+    GLCapabilities caps = new GLCapabilities(null);
+    caps.setDepthBits(16);
+    PIXELFORMATDESCRIPTOR pfd = WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(caps);
+    int pixelFormat = WGL.ChoosePixelFormat(hdc, pfd);
+    if ((pixelFormat == 0) ||
+        (!WGL.SetPixelFormat(hdc, pixelFormat, pfd))) {
+      destroy();
+    }
+  }
+
+  public void setSize(int width, int height) {
+  }
+
+  public int getWidth() {
+    return 1;
+  }
+
+  public int getHeight() {
+    return 1;
+  }
+
+  public GLContext createContext(GLContext shareWith) {
+    if (hdc == 0) {
+      // Construction failed
+      return null;
+    }
+    // FIXME: figure out how to hook back in the Java 2D / JOGL bridge
+    return new WindowsWGLContext(this, shareWith);
+  }
+
+  public void destroy() {
+    if (hdc != 0) {
+      WGL.ReleaseDC(hwnd, hdc);
+      hdc = 0;
+    }
+    if (hwnd != 0) {
+      WGL.ShowWindow(hwnd, WGL.SW_HIDE);
+      WGL.DestroyWindow(hwnd);
+      hwnd = 0;
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
new file mode 100755
index 000000000..25691ab91
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.NullWindow;
+
+public class WindowsExternalWGLContext extends WindowsWGLContext {
+  private boolean firstMakeCurrent = true;
+  private boolean created = true;
+  private GLContext lastContext;
+
+  private WindowsExternalWGLContext(Drawable drawable, long hglrc, WindowsWGLGraphicsConfiguration cfg) {
+    super(drawable, null);
+    this.context = hglrc;
+    if (DEBUG) {
+      System.err.println(getThreadName() + ": !!! Created external OpenGL context " + toHexString(hglrc) + " for " + this);
+    }
+    GLContextShareSet.contextCreated(this);
+    setGLFunctionAvailability(false);
+    cfg.updateCapabilitiesByWGL(this);
+    getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
+  }
+
+  protected static WindowsExternalWGLContext create(GLDrawableFactory factory, GLProfile glp) {
+    long hdc = WGL.wglGetCurrentDC();
+    if (0==hdc) {
+      throw new GLException("Error: attempted to make an external GLDrawable without a drawable current");
+    }
+    long hglrc = WGL.wglGetCurrentContext();
+    if (hglrc == 0) {
+      throw new GLException("Error: attempted to make an external GLContext without a context current");
+    }
+    int pfdID = WGL.GetPixelFormat(hdc);
+    if (pfdID == 0) {
+      throw new GLException("Error: attempted to make an external GLContext without a valid pixelformat");
+    }
+
+    AbstractGraphicsScreen aScreen = DefaultGraphicsScreen.createDefault();
+    WindowsWGLGraphicsConfiguration cfg = WindowsWGLGraphicsConfiguration.create(hdc, pfdID, glp, aScreen, true, true);
+
+    NullWindow nw = new NullWindow(cfg);
+    nw.setSurfaceHandle(hdc);
+
+    return new WindowsExternalWGLContext(new Drawable(factory, nw), hglrc, cfg);
+  }
+
+  public int makeCurrent() throws GLException {
+    // Save last context if necessary to allow external GLContexts to
+    // talk to other GLContexts created by this library
+    GLContext cur = getCurrent();
+    if (cur != null && cur != this) {
+      lastContext = cur;
+      setCurrent(null);
+    }
+    return super.makeCurrent();
+  }  
+
+  public void release() throws GLException {
+    super.release();
+    setCurrent(lastContext);
+    lastContext = null;
+  }
+
+  protected int makeCurrentImpl() throws GLException {
+    if (firstMakeCurrent) {
+      firstMakeCurrent = false;
+      return CONTEXT_CURRENT_NEW;
+    }
+    return CONTEXT_CURRENT;
+  }
+
+  protected void releaseImpl() throws GLException {
+  }
+
+  protected void destroyImpl() throws GLException {
+    created = false;
+    GLContextShareSet.contextDestroyed(this);
+  }
+
+  public boolean isCreated() {
+    return created;
+  }
+
+  // Need to provide the display connection to extension querying APIs
+  static class Drawable extends WindowsWGLDrawable {
+    Drawable(GLDrawableFactory factory, NativeWindow comp) {
+      super(factory, comp, true);
+    }
+
+    public GLContext createContext(GLContext shareWith) {
+      throw new GLException("Should not call this");
+    }
+
+    public int getWidth() {
+      throw new GLException("Should not call this");
+    }
+
+    public int getHeight() {
+      throw new GLException("Should not call this");
+    }
+
+    public void setSize(int width, int height) {
+      throw new GLException("Should not call this");
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
new file mode 100755
index 000000000..f5b89842d
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.NullWindow;
+
+public class WindowsExternalWGLDrawable extends WindowsWGLDrawable {
+
+  private WindowsExternalWGLDrawable(GLDrawableFactory factory, NativeWindow component) {
+    super(factory, component, true);
+  }
+
+  protected static WindowsExternalWGLDrawable create(GLDrawableFactory factory, GLProfile glp) {
+    long hdc = WGL.wglGetCurrentDC();
+    if (0==hdc) {
+      throw new GLException("Error: attempted to make an external GLDrawable without a drawable current");
+    }
+    int pfdID = WGL.GetPixelFormat(hdc);
+    if (pfdID == 0) {
+      throw new GLException("Error: attempted to make an external GLContext without a valid pixelformat");
+    }
+
+    AbstractGraphicsScreen aScreen = DefaultGraphicsScreen.createDefault();
+    WindowsWGLGraphicsConfiguration cfg = WindowsWGLGraphicsConfiguration.create(hdc, pfdID, glp, aScreen, true, true);
+
+    NullWindow nw = new NullWindow(cfg);
+    nw.setSurfaceHandle(hdc);
+
+    cfg.updateGraphicsConfiguration(factory, nw);
+
+    return new WindowsExternalWGLDrawable(factory, nw);
+  }
+
+
+  public GLContext createContext(GLContext shareWith) {
+    return new WindowsWGLContext(this, shareWith);
+  }
+  
+  public void setSize(int newWidth, int newHeight) {
+    throw new GLException("Should not call this");
+  }
+
+  public int getWidth() {
+    throw new GLException("Should not call this");
+  }  
+
+  public int getHeight() {
+    throw new GLException("Should not call this");
+  }  
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java
new file mode 100644
index 000000000..25d93b50e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+public class WindowsOffscreenWGLContext extends WindowsWGLContext {
+  public WindowsOffscreenWGLContext(WindowsOffscreenWGLDrawable drawable,
+                                   GLContext shareWith) {
+    super(drawable, shareWith);
+  }
+
+  public int getOffscreenContextPixelDataType() {
+      return GL.GL_UNSIGNED_BYTE;
+  }
+  
+  public int getOffscreenContextReadBuffer() {
+    // On Windows these contexts are always single-buffered
+    return GL.GL_FRONT;
+  }
+
+  public boolean offscreenImageNeedsVerticalFlip() {
+    // We can take care of this in the DIB creation (see below)
+    return false;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
new file mode 100644
index 000000000..88bfb3b1c
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.NullWindow;
+
+public class WindowsOffscreenWGLDrawable extends WindowsWGLDrawable {
+  private long origbitmap;
+  private long hbitmap;
+
+  public WindowsOffscreenWGLDrawable(GLDrawableFactory factory, NativeWindow target) {
+    super(factory, target, true);
+    create();
+  }
+
+  protected void setRealizedImpl() {
+    if(realized) {
+        create();
+    } else {
+        destroy();
+    }
+  }
+
+  public GLContext createContext(GLContext shareWith) {
+    return new WindowsOffscreenWGLContext(this, shareWith);
+  }
+
+  private void create() {
+    NativeWindow nw = getNativeWindow();
+    WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration)nw.getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    GLCapabilities capabilities = (GLCapabilities)config.getRequestedCapabilities();
+    int width = getWidth();
+    int height = getHeight();
+    BITMAPINFO info = BITMAPINFO.create();
+    BITMAPINFOHEADER header = info.getBmiHeader();
+    int bitsPerPixel = (capabilities.getRedBits() +
+                        capabilities.getGreenBits() +
+                        capabilities.getBlueBits() +
+                        capabilities.getAlphaBits());
+    header.setBiSize(header.size());
+    header.setBiWidth(width);
+    // NOTE: negating the height causes the DIB to be in top-down row
+    // order rather than bottom-up; ends up being correct during pixel
+    // readback
+    header.setBiHeight(-1 * height);
+    header.setBiPlanes((short) 1);
+    header.setBiBitCount((short) bitsPerPixel);
+    header.setBiXPelsPerMeter(0);
+    header.setBiYPelsPerMeter(0);
+    header.setBiClrUsed(0);
+    header.setBiClrImportant(0);
+    header.setBiCompression(WGL.BI_RGB);
+    header.setBiSizeImage(width * height * bitsPerPixel / 8);
+
+    long hdc = WGL.CreateCompatibleDC(0);
+    if (hdc == 0) {
+      System.out.println("LastError: " + WGL.GetLastError());
+      throw new GLException("Error creating device context for offscreen OpenGL context");
+    }
+    ((SurfaceChangeable)nw).setSurfaceHandle(hdc);
+
+    hbitmap = WGL.CreateDIBSection(hdc, info, WGL.DIB_RGB_COLORS, 0, 0, 0);
+    if (hbitmap == 0) {
+      WGL.DeleteDC(hdc);
+      hdc = 0;
+      throw new GLException("Error creating offscreen bitmap of width " + width +
+                            ", height " + height);
+    }
+    if ((origbitmap = WGL.SelectObject(hdc, hbitmap)) == 0) {
+      WGL.DeleteObject(hbitmap);
+      hbitmap = 0;
+      WGL.DeleteDC(hdc);
+      hdc = 0;
+      throw new GLException("Error selecting bitmap into new device context");
+    }
+        
+    config.updateGraphicsConfiguration(getFactory(), nw);
+  }
+  
+  public void destroy() {
+    NativeWindow nw = getNativeWindow();
+    if (nw.getSurfaceHandle() != 0) {
+      // Must destroy bitmap and device context
+      WGL.SelectObject(nw.getSurfaceHandle(), origbitmap);
+      WGL.DeleteObject(hbitmap);
+      WGL.DeleteDC(nw.getSurfaceHandle());
+      origbitmap = 0;
+      hbitmap = 0;
+      ((SurfaceChangeable)nw).setSurfaceHandle(0);
+    }
+  }
+
+  protected void swapBuffersImpl() {
+    if(DEBUG) {
+        System.err.println("unhandled swapBuffersImpl() called for: "+this);
+    }
+  }
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java
new file mode 100644
index 000000000..aeb13110e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import java.util.*;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+public class WindowsOnscreenWGLContext extends WindowsWGLContext {
+  protected WindowsOnscreenWGLDrawable drawable;
+
+  public WindowsOnscreenWGLContext(WindowsOnscreenWGLDrawable drawable,
+                                  GLContext shareWith) {
+    super(drawable, shareWith);
+    this.drawable = drawable;
+  }
+  
+  // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
+  protected int makeCurrentImpl() throws GLException {
+    int lockRes = drawable.lockSurface();
+    boolean exceptionOccurred = false;
+    try {
+      if (lockRes == NativeWindow.LOCK_SURFACE_NOT_READY) {
+        return CONTEXT_NOT_CURRENT;
+      }
+      int ret = super.makeCurrentImpl();
+      return ret;
+    } catch (RuntimeException e) {
+      exceptionOccurred = true;
+      throw e;
+    } finally {
+      if (exceptionOccurred ||
+          (isOptimizable() && lockRes != NativeWindow.LOCK_SURFACE_NOT_READY) && drawable.isSurfaceLocked()) {
+        drawable.unlockSurface();
+      }
+    }
+  }
+
+  // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
+  protected void releaseImpl() throws GLException {
+    try {
+      super.releaseImpl();
+    } finally {
+      if (!isOptimizable() && drawable.isSurfaceLocked()) {
+        drawable.unlockSurface();
+      }
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java
new file mode 100644
index 000000000..401b8c3c6
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+public class WindowsOnscreenWGLDrawable extends WindowsWGLDrawable {
+  protected WindowsOnscreenWGLDrawable(GLDrawableFactory factory, NativeWindow component) {
+    super(factory, component, false);
+  }
+
+  public GLContext createContext(GLContext shareWith) {
+    return new WindowsOnscreenWGLContext(this, shareWith);
+  }
+
+  public int getWidth() {
+    return component.getWidth();
+  }
+
+  public int getHeight() {
+    return component.getHeight();
+  }
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
new file mode 100644
index 000000000..b0524bcd9
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+public class WindowsPbufferWGLContext extends WindowsWGLContext {
+  private static final boolean DEBUG = Debug.debug("WindowsPbufferWGLContext");
+
+  // State for render-to-texture and render-to-texture-rectangle support
+  private WindowsPbufferWGLDrawable drawable;
+  private boolean rtt;       // render-to-texture?
+  private boolean hasRTT;    // render-to-texture extension available?
+  private boolean rect;      // render-to-texture-rectangle?
+  private int textureTarget; // e.g. GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE_NV
+  private int texture;       // actual texture object
+
+  public WindowsPbufferWGLContext(WindowsPbufferWGLDrawable drawable,
+                                 GLContext shareWith) {
+    super(drawable, shareWith);
+    this.drawable = drawable;
+  }
+
+  public void bindPbufferToTexture() {
+    if (!rtt) {
+      throw new GLException("Shouldn't try to bind a pbuffer to a texture if render-to-texture hasn't been " +
+                            "specified in its GLCapabilities");
+    }
+    GL gl = getGL();
+    WGLExt wglExt = getWGLExt();
+    gl.glBindTexture(textureTarget, texture);
+    if (rtt && hasRTT) {
+      if (!wglExt.wglBindTexImageARB(drawable.getPbuffer(), WGLExt.WGL_FRONT_LEFT_ARB)) {
+        throw new GLException("Binding of pbuffer to texture failed: " + wglGetLastError());
+      }
+    }
+    // FIXME: comment is wrong now
+    // Note that if the render-to-texture extension is not supported,
+    // we perform a glCopyTexImage2D in swapBuffers().
+  }
+
+  public void releasePbufferFromTexture() {
+    if (!rtt) {
+      throw new GLException("Shouldn't try to bind a pbuffer to a texture if render-to-texture hasn't been " +
+                            "specified in its GLCapabilities");
+    }
+    if (rtt && hasRTT) {
+      WGLExt wglExt = getWGLExt();
+      if (!wglExt.wglReleaseTexImageARB(drawable.getPbuffer(), WGLExt.WGL_FRONT_LEFT_ARB)) {
+        throw new GLException("Releasing of pbuffer from texture failed: " + wglGetLastError());
+      }
+    }
+  }
+
+  protected int makeCurrentImpl() throws GLException {
+    int res = super.makeCurrentImpl();
+    if (DEBUG && VERBOSE) {
+      System.err.println("WindowsPbufferWGLContext: super.makeCurrentImpl() = " + res);
+    }
+    if (res == CONTEXT_CURRENT_NEW) {
+      GLCapabilities capabilities = drawable.getChosenGLCapabilities();
+
+      // Initialize render-to-texture support if requested
+      GL gl = getGL();
+      rtt  = capabilities.getPbufferRenderToTexture();
+      rect = gl.isGL2() && capabilities.getPbufferRenderToTextureRectangle();
+
+      if (rtt) {
+        if (DEBUG) {
+          System.err.println("Initializing render-to-texture support");
+        }
+
+        if (!gl.isExtensionAvailable("WGL_ARB_render_texture")) {
+          System.err.println("WindowsPbufferWGLContext: WARNING: WGL_ARB_render_texture extension not " +
+                             "supported; implementing render_to_texture support using slow texture readback");
+        } else {
+          hasRTT = true;
+
+          if (rect && !gl.isExtensionAvailable("GL_NV_texture_rectangle")) {
+            System.err.println("WindowsPbufferWGLContext: WARNING: GL_NV_texture_rectangle extension not " +
+                               "supported; skipping requested render_to_texture_rectangle support for pbuffer");
+            rect = false;
+          }
+          if (rect) {
+            if (DEBUG) {
+              System.err.println("  Using render-to-texture-rectangle");
+            }
+            textureTarget = GL2.GL_TEXTURE_RECTANGLE_ARB;
+          } else {
+            if (DEBUG) {
+              System.err.println("  Using vanilla render-to-texture");
+            }
+            textureTarget = GL.GL_TEXTURE_2D;
+          }
+          int[] tmp = new int[1];
+          gl.glGenTextures(1, tmp, 0);
+          texture = tmp[0];
+          gl.glBindTexture(textureTarget, texture);
+          gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_MIN_FILTER, GL.GL_NEAREST);
+          gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST);
+          gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_WRAP_S, GL.GL_CLAMP_TO_EDGE);
+          gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_WRAP_T, GL.GL_CLAMP_TO_EDGE);
+          gl.glCopyTexImage2D(textureTarget, 0, GL.GL_RGB, 0, 0, drawable.getWidth(), drawable.getHeight(), 0);
+        }
+      }
+    }
+    return res;
+  }
+
+  public int getFloatingPointMode() {
+    return drawable.getFloatingPointMode();
+  }
+
+  private static String wglGetLastError() {
+    return WindowsWGLDrawableFactory.wglGetLastError();
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java
new file mode 100644
index 000000000..c7034e93b
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java
@@ -0,0 +1,330 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import com.jogamp.opengl.impl.*;
+
+public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable {
+  private long cachedParentHdc;
+  private WGLExt cachedWGLExt; // cached WGLExt instance from parent GLCanvas,
+                               // needed to destroy pbuffer
+  private long buffer; // pbuffer handle
+
+  private int floatMode;
+
+  public WindowsPbufferWGLDrawable(GLDrawableFactory factory, NativeWindow target,
+                                   WindowsWGLDrawable dummyDrawable,
+                                   WGLExt wglExt) {
+    super(factory, target, true);
+
+    if (DEBUG) {
+        System.out.println("Pbuffer config: " + getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration());
+    }
+
+    createPbuffer(dummyDrawable.getNativeWindow().getSurfaceHandle(), wglExt);
+
+    if (DEBUG) {
+        System.err.println("Created pbuffer " + this);
+    }
+  }
+
+  protected void setRealizedImpl() {
+    if(realized) {
+        throw new GLException("Recreation via setRealized not supported.");
+    } else {
+        destroy();
+    }
+  }
+
+  public GLContext createContext(GLContext shareWith) {
+    return new WindowsPbufferWGLContext(this, shareWith);
+  }
+
+  public void destroy() {
+    NativeWindow nw = getNativeWindow();
+    if(0!=buffer) {
+        WGLExt wglExt = cachedWGLExt;
+        if (nw.getSurfaceHandle() != 0) {
+          // Must release DC and pbuffer
+          // NOTE that since the context is not current, glGetError() can
+          // not be called here, so we skip the use of any composable
+          // pipelines (see WindowsOnscreenWGLContext.makeCurrentImpl)
+          if (wglExt.wglReleasePbufferDCARB(buffer, nw.getSurfaceHandle()) == 0) {
+            throw new GLException("Error releasing pbuffer device context: error code " + WGL.GetLastError());
+          }
+          ((SurfaceChangeable)nw).setSurfaceHandle(0);
+        }
+        if (!wglExt.wglDestroyPbufferARB(buffer)) {
+            throw new GLException("Error destroying pbuffer: error code " + WGL.GetLastError());
+        }
+        buffer = 0;
+    }
+  }
+
+  public long getPbuffer() {
+    return buffer;
+  }
+
+  public int getFloatingPointMode() {
+    return floatMode;
+  }
+
+  protected void swapBuffersImpl() {
+    if(DEBUG) {
+        System.err.println("unhandled swapBuffersImpl() called for: "+this);
+    }
+  }
+
+  private void createPbuffer(long parentHdc, WGLExt wglExt) {
+    int[]   iattributes = new int  [2*WindowsWGLGraphicsConfiguration.MAX_ATTRIBS];
+    float[] fattributes = new float[1];
+    int[]   floatModeTmp = new int[1];
+    int     niattribs   = 0;
+    int     width, height;
+
+    WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration) getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    GLCapabilities capabilities = (GLCapabilities)config.getRequestedCapabilities();
+    GLProfile glProfile = capabilities.getGLProfile();
+
+    if (DEBUG) {
+      System.out.println("Pbuffer parentHdc = " + toHexString(parentHdc));
+      System.out.println("Pbuffer caps: " + capabilities);
+    }
+
+    if(!WindowsWGLGraphicsConfiguration.GLCapabilities2AttribList(capabilities,
+                                    iattributes,
+                                    wglExt,
+                                    true,
+                                    floatModeTmp)){
+      throw new GLException("Pbuffer-related extensions not supported");
+    }
+
+    floatMode = floatModeTmp[0];
+    boolean rtt      = capabilities.getPbufferRenderToTexture();
+    boolean rect     = capabilities.getPbufferRenderToTextureRectangle();
+    boolean useFloat = capabilities.getPbufferFloatingPointBuffers();
+    boolean ati      = false;
+
+    if (useFloat) {
+      ati = (floatMode == GLPbuffer.ATI_FLOAT);
+    }
+
+    int[] pformats = new int[WindowsWGLGraphicsConfiguration.MAX_PFORMATS];
+    int   nformats;
+    int[] nformatsTmp = new int[1];
+    if (!wglExt.wglChoosePixelFormatARB(parentHdc,
+                                     iattributes, 0,
+                                     fattributes, 0,
+                                     WindowsWGLGraphicsConfiguration.MAX_PFORMATS,
+                                     pformats, 0,
+                                     nformatsTmp, 0)) {
+      throw new GLException("pbuffer creation error: wglChoosePixelFormat() failed");
+    }
+    nformats = nformatsTmp[0];
+    if (nformats <= 0) {
+      throw new GLException("pbuffer creation error: Couldn't find a suitable pixel format");
+    }
+
+    boolean haveMultisample = wglExt.isExtensionAvailable("WGL_ARB_multisample");
+
+    if (DEBUG) {
+      System.err.println("" + nformats + " suitable pixel formats found");
+      // query pixel format
+      iattributes[0] = WGLExt.WGL_RED_BITS_ARB;
+      iattributes[1] = WGLExt.WGL_GREEN_BITS_ARB;
+      iattributes[2] = WGLExt.WGL_BLUE_BITS_ARB;
+      iattributes[3] = WGLExt.WGL_ALPHA_BITS_ARB;
+      iattributes[4] = WGLExt.WGL_DEPTH_BITS_ARB;
+      iattributes[5] = (useFloat ? (ati ? WGLExt.WGL_PIXEL_TYPE_ARB : WGLExt.WGL_FLOAT_COMPONENTS_NV) : WGLExt.WGL_RED_BITS_ARB);
+      iattributes[6] = (haveMultisample ? WGLExt.WGL_SAMPLE_BUFFERS_ARB : WGLExt.WGL_RED_BITS_ARB);
+      iattributes[7] = (haveMultisample ? WGLExt.WGL_SAMPLES_ARB : WGLExt.WGL_RED_BITS_ARB);
+      iattributes[8] = WGLExt.WGL_DRAW_TO_PBUFFER_ARB;
+      int[] ivalues = new int[9];
+      for (int i = 0; i < nformats; i++) {
+        if (!wglExt.wglGetPixelFormatAttribivARB(parentHdc, pformats[i], 0, 9, iattributes, 0, ivalues, 0)) {
+          throw new GLException("Error while querying pixel format " + pformats[i] +
+                                "'s (index " + i + "'s) capabilities for debugging");
+        }
+        System.err.print("pixel format " + pformats[i] + " (index " + i + "): ");
+        System.err.print( "r: " + ivalues[0]);
+        System.err.print(" g: " + ivalues[1]);
+        System.err.print(" b: " + ivalues[2]);
+        System.err.print(" a: " + ivalues[3]);
+        System.err.print(" depth: " + ivalues[4]);
+        if (haveMultisample) {
+          System.err.print(" multisample: " + ivalues[6]);
+        }
+        System.err.print(" samples: " + ivalues[7]);
+        if (useFloat) {
+          if (ati) {
+            if (ivalues[5] == WGLExt.WGL_TYPE_RGBA_FLOAT_ARB) {
+              System.err.print(" [ati float]");
+            } else if (ivalues[5] != WGLExt.WGL_TYPE_RGBA_ARB) {
+              System.err.print(" [unknown pixel type " + ivalues[5] + "]");
+            }
+          } else {
+            if (ivalues[5] != 0) {
+              System.err.print(" [float]");
+            }
+          }
+        }
+
+        if (ivalues[8] != 0) {
+          System.err.print(" [pbuffer]");
+        }
+        System.err.println();
+      }
+    }
+
+    long tmpBuffer = 0;
+    int whichFormat = -1;
+    // Loop is a workaround for bugs in NVidia's recent drivers
+    for (whichFormat = 0; whichFormat < nformats; whichFormat++) {
+      int format = pformats[whichFormat];
+
+      // Create the p-buffer.
+      niattribs = 0;
+
+      if (rtt) {
+        iattributes[niattribs++]   = WGLExt.WGL_TEXTURE_FORMAT_ARB;
+        if (useFloat) {
+          iattributes[niattribs++] = WGLExt.WGL_TEXTURE_FLOAT_RGB_NV;
+        } else {
+          iattributes[niattribs++] = WGLExt.WGL_TEXTURE_RGBA_ARB;
+        }
+
+        iattributes[niattribs++] = WGLExt.WGL_TEXTURE_TARGET_ARB;
+        iattributes[niattribs++] = rect ? WGLExt.WGL_TEXTURE_RECTANGLE_NV : WGLExt.WGL_TEXTURE_2D_ARB;
+
+        iattributes[niattribs++] = WGLExt.WGL_MIPMAP_TEXTURE_ARB;
+        iattributes[niattribs++] = GL.GL_FALSE;
+
+        iattributes[niattribs++] = WGLExt.WGL_PBUFFER_LARGEST_ARB;
+        iattributes[niattribs++] = GL.GL_FALSE;
+      }
+
+      iattributes[niattribs++] = 0;
+
+      tmpBuffer = wglExt.wglCreatePbufferARB(parentHdc, format, getWidth(), getHeight(), iattributes, 0);
+      if (tmpBuffer != 0) {
+        // Done
+        break;
+      }
+    }
+
+    if (tmpBuffer == 0) {
+      throw new GLException("pbuffer creation error: wglCreatePbuffer() failed: tried " + nformats +
+                            " pixel formats, last error was: " + wglGetLastError());
+    }
+
+    // Get the device context.
+    long tmpHdc = wglExt.wglGetPbufferDCARB(tmpBuffer);
+    if (tmpHdc == 0) {
+      throw new GLException("pbuffer creation error: wglGetPbufferDC() failed");
+    }
+
+    NativeWindow nw = getNativeWindow();
+    // Set up instance variables
+    buffer = tmpBuffer;
+    ((SurfaceChangeable)nw).setSurfaceHandle(tmpHdc);
+    cachedWGLExt = wglExt;
+    cachedParentHdc = parentHdc;
+
+    // Re-query chosen pixel format
+    {
+      niattribs = 0;
+      iattributes[niattribs++] = WGLExt.WGL_ACCELERATION_ARB;
+      iattributes[niattribs++] = WGLExt.WGL_RED_BITS_ARB;
+      iattributes[niattribs++] = WGLExt.WGL_GREEN_BITS_ARB;
+      iattributes[niattribs++] = WGLExt.WGL_BLUE_BITS_ARB;
+      iattributes[niattribs++] = WGLExt.WGL_ALPHA_BITS_ARB;
+      iattributes[niattribs++] = WGLExt.WGL_DEPTH_BITS_ARB;
+      iattributes[niattribs++] = WGLExt.WGL_STENCIL_BITS_ARB;
+      iattributes[niattribs++] = WGLExt.WGL_DOUBLE_BUFFER_ARB;
+      iattributes[niattribs++] = WGLExt.WGL_STEREO_ARB;
+      iattributes[niattribs++] = WGLExt.WGL_ACCUM_RED_BITS_ARB;
+      iattributes[niattribs++] = WGLExt.WGL_ACCUM_GREEN_BITS_ARB;
+      iattributes[niattribs++] = WGLExt.WGL_ACCUM_BLUE_BITS_ARB;
+      iattributes[niattribs++] = WGLExt.WGL_ACCUM_ALPHA_BITS_ARB;
+      iattributes[niattribs++] = (useFloat ? (ati ? WGLExt.WGL_PIXEL_TYPE_ARB : WGLExt.WGL_FLOAT_COMPONENTS_NV) : WGLExt.WGL_RED_BITS_ARB);
+      iattributes[niattribs++] = (haveMultisample ? WGLExt.WGL_SAMPLE_BUFFERS_ARB : WGLExt.WGL_RED_BITS_ARB);
+      iattributes[niattribs++] = (haveMultisample ? WGLExt.WGL_SAMPLES_ARB : WGLExt.WGL_RED_BITS_ARB);
+      iattributes[niattribs++] = WGLExt.WGL_DRAW_TO_PBUFFER_ARB;
+      int[] ivalues = new int[niattribs];
+      if (wglExt.wglGetPixelFormatAttribivARB(parentHdc, pformats[whichFormat], 0, niattribs, iattributes, 0, ivalues, 0)) {
+        GLCapabilities newCaps = WindowsWGLGraphicsConfiguration.AttribList2GLCapabilities(glProfile, iattributes, niattribs, ivalues, true, false, true);
+        PIXELFORMATDESCRIPTOR pfd = WindowsWGLGraphicsConfiguration.createPixelFormatDescriptor();
+        if (WGL.DescribePixelFormat(parentHdc, pformats[whichFormat], pfd.size(), pfd) == 0) {
+          if (DEBUG) {
+              System.err.println("Unable to describe pixel format (Continue: true) " + whichFormat + "/" + nformats + " pfdID " + pformats[whichFormat]+":\n\t"+newCaps);
+          }
+        }
+        if(newCaps.isOnscreen()) {
+          throw new GLException("Error: Selected Onscreen Caps for PBuffer: "+newCaps+"\n\t"+newCaps);
+        }
+        config.setCapsPFD(newCaps, pfd, pformats[whichFormat], true);
+      } else {
+        PIXELFORMATDESCRIPTOR pfd = WindowsWGLGraphicsConfiguration.createPixelFormatDescriptor();
+        if (WGL.DescribePixelFormat(parentHdc, pformats[whichFormat], pfd.size(), pfd) == 0) {
+          throw new GLException("Unable to describe pixel format " + pformats[whichFormat]);
+        }
+        GLCapabilities newCaps = WindowsWGLGraphicsConfiguration.PFD2GLCapabilities(glProfile, pfd, false, true);
+        if(newCaps.isOnscreen()) {
+          throw new GLException("Error: Selected Onscreen Caps for PBuffer: "+newCaps+"\n\t"+newCaps);
+        }
+        config.setCapsPFD(newCaps, pfd, pformats[whichFormat], false);
+      }
+    }
+
+    // Determine the actual width and height we were able to create.
+    int[] tmp = new int[1];
+    wglExt.wglQueryPbufferARB( buffer, WGLExt.WGL_PBUFFER_WIDTH_ARB,  tmp, 0 );
+    width = tmp[0];
+    wglExt.wglQueryPbufferARB( buffer, WGLExt.WGL_PBUFFER_HEIGHT_ARB, tmp, 0 );
+    height = tmp[0];
+    ((SurfaceChangeable)nw).setSize(width, height);
+  }
+
+  private static String wglGetLastError() {
+    return WindowsWGLDrawableFactory.wglGetLastError();
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
new file mode 100644
index 000000000..08c77539c
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
@@ -0,0 +1,439 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import java.nio.*;
+import java.util.*;
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
+
+public class WindowsWGLContext extends GLContextImpl {
+  protected long hglrc;
+  private boolean wglGetExtensionsStringEXTInitialized;
+  private boolean wglGetExtensionsStringEXTAvailable;
+  private boolean wglMakeContextCurrentInitialized;
+  private boolean wglMakeContextCurrentARBAvailable;
+  private boolean wglMakeContextCurrentEXTAvailable;
+  private static final Map/*<String, String>*/ functionNameMap;
+  private static final Map/*<String, String>*/ extensionNameMap;
+  private WGLExt wglExt;
+  // Table that holds the addresses of the native C-language entry points for
+  // WGL extension functions.
+  private WGLExtProcAddressTable wglExtProcAddressTable;
+
+  static {
+    functionNameMap = new HashMap();
+    functionNameMap.put("glAllocateMemoryNV", "wglAllocateMemoryNV");
+    functionNameMap.put("glFreeMemoryNV", "wglFreeMemoryNV");
+
+    extensionNameMap = new HashMap();
+    extensionNameMap.put("GL_ARB_pbuffer", "WGL_ARB_pbuffer");
+    extensionNameMap.put("GL_ARB_pixel_format", "WGL_ARB_pixel_format");
+  }
+
+  // FIXME: figure out how to hook back in the Java 2D / JOGL bridge
+  public WindowsWGLContext(GLDrawableImpl drawable, GLDrawableImpl drawableRead,
+                           GLContext shareWith) {
+    super(drawable, drawableRead, shareWith);
+  }
+
+  public WindowsWGLContext(GLDrawableImpl drawable,
+                           GLContext shareWith) {
+    this(drawable, null, shareWith);
+  }
+  
+  public Object getPlatformGLExtensions() {
+    return getWGLExt();
+  }
+
+  public WGLExt getWGLExt() {
+    if (wglExt == null) {
+      wglExt = new WGLExtImpl(this);
+    }
+    return wglExt;
+  }
+
+  public boolean wglMakeContextCurrent(long hDrawDC, long hReadDC, long hglrc) {
+    WGLExt wglExt = getWGLExt();
+    if (!wglMakeContextCurrentInitialized) {
+      wglMakeContextCurrentARBAvailable = isFunctionAvailable("wglMakeContextCurrentARB");
+      wglMakeContextCurrentEXTAvailable = isFunctionAvailable("wglMakeContextCurrentEXT");
+      wglMakeContextCurrentInitialized = true;
+      if(DEBUG) {
+          System.err.println("WindowsWGLContext.wglMakeContextCurrent: ARB "+wglMakeContextCurrentARBAvailable+", EXT "+wglMakeContextCurrentEXTAvailable);
+      }
+    }
+    if(wglMakeContextCurrentARBAvailable) {
+        return wglExt.wglMakeContextCurrentARB(hDrawDC, hReadDC, hglrc);
+    } else if(wglMakeContextCurrentEXTAvailable) {
+        return wglExt.wglMakeContextCurrentEXT(hDrawDC, hReadDC, hglrc);
+    }
+    return WGL.wglMakeCurrent(hDrawDC, hglrc);
+  }
+
+  public final ProcAddressTable getPlatformExtProcAddressTable() {
+    return getWGLExtProcAddressTable();
+  }
+
+  public final WGLExtProcAddressTable getWGLExtProcAddressTable() {
+    return wglExtProcAddressTable;
+  }
+
+  protected String mapToRealGLFunctionName(String glFunctionName) {
+    String lookup = (String) functionNameMap.get(glFunctionName);
+    if (lookup != null) {
+      return lookup;
+    }
+    return glFunctionName;
+  }
+
+  protected String mapToRealGLExtensionName(String glExtensionName) {
+    String lookup = (String) extensionNameMap.get(glExtensionName);
+    if (lookup != null) {
+      return lookup;
+    }
+    return glExtensionName;
+  }
+
+  /**
+   * Creates and initializes an appropriate OpenGL context. Should only be
+   * called by {@link #makeCurrentImpl()}.
+   */
+  protected void create() {
+    GLCapabilities glCaps = drawable.getChosenGLCapabilities();
+    if(DEBUG) {
+          System.err.println("WindowsWGLContext.create got "+glCaps);
+    }
+
+    if (drawable.getNativeWindow().getSurfaceHandle() == 0) {
+      throw new GLException("Internal error: attempted to create OpenGL context without an associated drawable");
+    }
+    // Windows can set up sharing of display lists after creation time
+    WindowsWGLContext other = (WindowsWGLContext) GLContextShareSet.getShareContext(this);
+    long hglrc2 = 0;
+    if (other != null) {
+      hglrc2 = other.getHGLRC();
+      if (hglrc2 == 0) {
+        throw new GLException("GLContextShareSet returned an invalid OpenGL context");
+      }
+    }
+
+    // To use WGL_ARB_create_context, we have to make a temp context current,
+    // so we are able to use GetProcAddress
+    long temp_hglrc = WGL.wglCreateContext(drawable.getNativeWindow().getSurfaceHandle());
+    if (DEBUG) {
+      System.err.println(getThreadName() + ": !!! Created temp OpenGL context " + toHexString(temp_hglrc) + " for " + this + ", device context " + toHexString(drawable.getNativeWindow().getSurfaceHandle()) + ", not yet sharing");
+    }
+    if (temp_hglrc == 0) {
+      throw new GLException("Unable to create temp OpenGL context for device context " + toHexString(drawable.getNativeWindow().getSurfaceHandle()));
+    } else {
+        if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), temp_hglrc)) {
+            throw new GLException("Error making temp context current: 0x" + Integer.toHexString(WGL.GetLastError()));
+        }
+        setGLFunctionAvailability(true);
+
+        if( !isFunctionAvailable("wglCreateContextAttribsARB") ||
+            !isExtensionAvailable("WGL_ARB_create_context") ) {
+            if(glCaps.getGLProfile().isGL3()) {
+              WGL.wglMakeCurrent(0, 0);
+              WGL.wglDeleteContext(temp_hglrc);
+              throw new GLException("Unable to create OpenGL >= 3.1 context (no WGL_ARB_create_context)");
+            }
+
+            // continue with temp context for GL < 3.0
+            hglrc = temp_hglrc;
+            if(DEBUG) {
+              System.err.println("WindowsWGLContext.create done (old ctx < 3.0 - no WGL_ARB_create_context) 0x"+Long.toHexString(hglrc));
+            }
+        } else {
+            WGLExt wglExt = getWGLExt();
+
+            // preset with default values
+            int attribs[] = {
+                /*  0 */ WGLExt.WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
+                /*  2 */ WGLExt.WGL_CONTEXT_MINOR_VERSION_ARB, 0,
+                /*  4 */ WGLExt.WGL_CONTEXT_FLAGS_ARB,         0 /* WGLExt.WGL_CONTEXT_DEBUG_BIT_ARB */,
+                /*  6 */ 0,                                    0,
+                /*  8 */ 0
+            };
+
+            if(glCaps.getGLProfile().isGL3()) {
+                // Try >= 3.2 core first !
+                // In contrast to GLX no verify with a None drawable binding (default framebuffer) is necessary,
+                // if no 3.2 is available creation fails already!
+                attribs[0+1]  = 3;
+                attribs[2+1]  = 2;
+                if(glCaps.getGLProfile().isGL3bc()) {
+                    attribs[6+0]  = WGLExt.WGL_CONTEXT_PROFILE_MASK_ARB;
+                    attribs[6+1]  = WGLExt.WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
+                }
+                /**
+                 * don't stricten requirements any further, even compatible would be fine
+                 *
+                 } else {
+                    attribs[6+0]  = WGLExt.WGL_CONTEXT_PROFILE_MASK_ARB;
+                    attribs[6+1]  = WGLExt.WGL_CONTEXT_CORE_PROFILE_BIT_ARB;
+                 } 
+                 */
+                hglrc = wglExt.wglCreateContextAttribsARB(drawable.getNativeWindow().getSurfaceHandle(), hglrc2, attribs, 0); 
+                if(0==hglrc) {
+                    if(DEBUG) {
+                        System.err.println("WindowsWGLContext.createContext couldn't create >= 3.2 core context - fallback");
+                    }
+                    // Try >= 3.1 forward compatible - last resort for GL3 !
+                    attribs[0+1]  = 3;
+                    attribs[2+1]  = 1;
+                    if(!glCaps.getGLProfile().isGL3bc()) {
+                        attribs[4+1] |= WGLExt.WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
+                    }
+                    attribs[6+0]  = 0;
+                    attribs[6+1]  = 0;
+                } else if(DEBUG) {
+                  System.err.println("WindowsWGLContext.createContext >= 3.2 available 0x"+Long.toHexString(hglrc));
+                }
+            }
+            if(0==hglrc) {
+                // 3.1 or 3.0 ..
+                hglrc = wglExt.wglCreateContextAttribsARB(drawable.getNativeWindow().getSurfaceHandle(), hglrc2, attribs, 0); 
+                if(DEBUG) {
+                  if(0==hglrc) {
+                      System.err.println("WindowsWGLContext.createContext couldn't create >= 3.0 context - fallback");
+                  } else {
+                      System.err.println("WindowsWGLContext.createContext >= 3.0 available 0x"+Long.toHexString(hglrc));
+                  }
+                }
+            }
+
+            if(0==hglrc) {
+                if(glCaps.getGLProfile().isGL3()) {
+                  WGL.wglMakeCurrent(0, 0);
+                  WGL.wglDeleteContext(temp_hglrc);
+                  throw new GLException("Unable to create OpenGL >= 3.1 context (have WGL_ARB_create_context)");
+                }
+
+                // continue with temp context for GL < 3.0
+                hglrc = temp_hglrc;
+                if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), hglrc)) {
+                    throw new GLException("Error making old context current: 0x" + Integer.toHexString(WGL.GetLastError()));
+                }
+                updateGLProcAddressTable();
+                if(DEBUG) {
+                  System.err.println("WindowsWGLContext.create done (old ctx < 3.0 - no 3.0) 0x"+Long.toHexString(hglrc));
+                }
+            } else {
+                hglrc2 = 0; // mark as shared ..
+                WGL.wglMakeCurrent(0, 0);
+                WGL.wglDeleteContext(temp_hglrc);
+
+                if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), hglrc)) {
+                    throw new GLException("Error making new context current: 0x" + Integer.toHexString(WGL.GetLastError()));
+                }
+                updateGLProcAddressTable();
+                if(DEBUG) {
+                  System.err.println("WindowsWGLContext.create done (new ctx >= 3.0) 0x"+Long.toHexString(hglrc));
+                }
+            }
+        }
+    }
+    if(0!=hglrc2) {
+        if (!WGL.wglShareLists(hglrc2, hglrc)) {
+            throw new GLException("wglShareLists(" + toHexString(hglrc2) +
+                                  ", " + toHexString(hglrc) + ") failed: error code 0x" +
+                                  Integer.toHexString(WGL.GetLastError()));
+        }
+    }
+    GLContextShareSet.contextCreated(this);
+    WGL.wglMakeCurrent(0, 0); // release immediatly to gain from ARB/EXT wglMakeContextCurrent(draw, read, ctx)!
+    if (DEBUG) {
+      System.err.println(getThreadName() + ": !!! Created OpenGL context " + toHexString(hglrc) + " for " + this + ", device context " + toHexString(drawable.getNativeWindow().getSurfaceHandle()) + ", sharing with " + toHexString(hglrc2));
+    }
+  }
+  
+  protected int makeCurrentImpl() throws GLException {
+    if (drawable.getNativeWindow().getSurfaceHandle() == 0) {
+        if (DEBUG) {
+          System.err.println("drawable not properly initialized");
+        }
+        return CONTEXT_NOT_CURRENT;
+    }
+    boolean created = false;
+    if (hglrc == 0) {
+      create();
+      if (DEBUG) {
+        System.err.println(getThreadName() + ": !!! Created GL context for " + getClass().getName());
+      }
+      created = true;
+    }
+
+    if (WGL.wglGetCurrentContext() != hglrc) {
+      if (!wglMakeContextCurrent(drawable.getNativeWindow().getSurfaceHandle(), drawableRead.getNativeWindow().getSurfaceHandle(), hglrc)) {
+        throw new GLException("Error making context current: 0x" + Integer.toHexString(WGL.GetLastError()));
+      } else {
+        if (DEBUG && VERBOSE) {
+          System.err.println(getThreadName() + ": wglMakeCurrent(hdc " + toHexString(drawable.getNativeWindow().getSurfaceHandle()) +
+                             ", hglrc " + toHexString(hglrc) + ") succeeded");
+        }
+      }
+    }
+
+    if (created) {
+      setGLFunctionAvailability(false);
+
+      WindowsWGLGraphicsConfiguration config = 
+        (WindowsWGLGraphicsConfiguration)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+      config.updateCapabilitiesByWGL(this);
+
+      return CONTEXT_CURRENT_NEW;
+    }
+    return CONTEXT_CURRENT;
+  }
+
+  protected void releaseImpl() throws GLException {
+    if (!wglMakeContextCurrent(0, 0, 0)) {
+        throw new GLException("Error freeing OpenGL context: 0x" + Integer.toHexString(WGL.GetLastError()));
+    }
+  }
+
+  protected void destroyImpl() throws GLException {
+    if (DEBUG) {
+        Exception e = new Exception(getThreadName() + ": !!! Destroyed OpenGL context " + toHexString(hglrc));
+        e.printStackTrace();
+    }
+    if (hglrc != 0) {
+      if (!WGL.wglDeleteContext(hglrc)) {
+        throw new GLException("Unable to delete OpenGL context");
+      }
+      hglrc = 0;
+      GLContextShareSet.contextDestroyed(this);
+    }
+  }
+
+  public boolean isCreated() {
+    return (hglrc != 0);
+  }
+
+  public void copy(GLContext source, int mask) throws GLException {
+    long dst = getHGLRC();
+    long src = ((WindowsWGLContext) source).getHGLRC();
+    if (src == 0) {
+      throw new GLException("Source OpenGL context has not been created");
+    }
+    if (dst == 0) {
+      throw new GLException("Destination OpenGL context has not been created");
+    }
+    if (!WGL.wglCopyContext(src, dst, mask)) {
+      throw new GLException("wglCopyContext failed");
+    }
+  }
+
+  protected void updateGLProcAddressTable() {
+    if (DEBUG) {
+      System.err.println(getThreadName() + ": !!! Initializing WGL extension address table for " + this);
+    }
+    wglGetExtensionsStringEXTInitialized=false;
+    wglGetExtensionsStringEXTAvailable=false;
+    wglMakeContextCurrentInitialized=false;
+    wglMakeContextCurrentARBAvailable=false;
+    wglMakeContextCurrentEXTAvailable=false;
+
+    if (wglExtProcAddressTable == null) {
+      // FIXME: cache ProcAddressTables by capability bits so we can
+      // share them among contexts with the same capabilities
+      wglExtProcAddressTable = new WGLExtProcAddressTable();
+    }          
+    resetProcAddressTable(getWGLExtProcAddressTable());
+    super.updateGLProcAddressTable();
+  }
+  
+  public String getPlatformExtensionsString() {
+    if (!wglGetExtensionsStringEXTInitialized) {
+      wglGetExtensionsStringEXTAvailable = (WGL.wglGetProcAddress("wglGetExtensionsStringEXT") != 0);
+      wglGetExtensionsStringEXTInitialized = true;
+    }
+    if (wglGetExtensionsStringEXTAvailable) {
+      return getWGLExt().wglGetExtensionsStringEXT();
+    } else {
+      return "";
+    }
+  }
+
+  protected void setSwapIntervalImpl(int interval) {
+    WGLExt wglExt = getWGLExt();
+    if (wglExt.isExtensionAvailable("WGL_EXT_swap_control")) {
+      if ( wglExt.wglSwapIntervalEXT(interval) ) {
+        currentSwapInterval = interval ;
+      }
+    }
+  }
+
+  public ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3) {
+    return getWGLExt().wglAllocateMemoryNV(arg0, arg1, arg2, arg3);
+  }
+
+  public int getOffscreenContextPixelDataType() {
+    throw new GLException("Should not call this");
+  }
+
+  public int getOffscreenContextReadBuffer() {
+    throw new GLException("Should not call this");
+  }
+
+  public boolean offscreenImageNeedsVerticalFlip() {
+    throw new GLException("Should not call this");
+  }
+
+  public void bindPbufferToTexture() {
+    throw new GLException("Should not call this");
+  }
+
+  public void releasePbufferFromTexture() {
+    throw new GLException("Should not call this");
+  }
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  public long getHGLRC() {
+    return hglrc;
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java
new file mode 100644
index 000000000..c76766b2e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
+
+public abstract class WindowsWGLDrawable extends GLDrawableImpl {
+  private static final int MAX_SET_PIXEL_FORMAT_FAIL_COUNT = 5;
+  private static final boolean PROFILING = Debug.debug("WindowsWGLDrawable.profiling");
+  private static final int PROFILING_TICKS = 200;
+  private int  profilingLockSurfaceTicks;
+  private long profilingLockSurfaceTime;
+  private int  profilingUnlockSurfaceTicks;
+  private long profilingUnlockSurfaceTime;
+  private int  profilingSwapBuffersTicks;
+  private long profilingSwapBuffersTime;
+
+
+  public WindowsWGLDrawable(GLDrawableFactory factory, NativeWindow comp, boolean realized) {
+    super(factory, comp, realized);
+  }
+
+  protected void setRealizedImpl() {
+    if(!realized) {
+        return; // nothing todo ..
+    }
+
+    if(NativeWindow.LOCK_SURFACE_NOT_READY == lockSurface()) {
+      throw new GLException("WindowsWGLDrawable.setRealized(true): lockSurface - surface not ready");
+    }
+    try {
+        NativeWindow nativeWindow = getNativeWindow();
+        WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration)nativeWindow.getGraphicsConfiguration().getNativeGraphicsConfiguration();
+        config.updateGraphicsConfiguration(getFactory(), nativeWindow);
+        if (DEBUG) {
+          System.err.println("!!! WindowsWGLDrawable.setRealized(true): "+config);
+        }
+    } finally {
+        unlockSurface();
+    }
+  }
+
+  protected void swapBuffersImpl() {
+    boolean didLock = false;
+
+    try {
+        if ( !isSurfaceLocked() ) {
+            // Usually the surface shall be locked within [makeCurrent .. swap .. release]
+            if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
+                return;
+            }
+            didLock = true;
+        }
+
+        long startTime = 0;
+        if (PROFILING) {
+          startTime = System.currentTimeMillis();
+        }
+
+        if (!WGL.SwapBuffers(getNativeWindow().getSurfaceHandle()) && (WGL.GetLastError() != 0)) {
+          throw new GLException("Error swapping buffers");
+        }
+
+        if (PROFILING) {
+          long endTime = System.currentTimeMillis();
+          profilingSwapBuffersTime += (endTime - startTime);
+          int ticks = PROFILING_TICKS;
+          if (++profilingSwapBuffersTicks == ticks) {
+            System.err.println("SwapBuffers calls: " + profilingSwapBuffersTime + " ms / " + ticks + "  calls (" +
+                               ((float) profilingSwapBuffersTime / (float) ticks) + " ms/call)");
+            profilingSwapBuffersTime = 0;
+            profilingSwapBuffersTicks = 0;
+          }
+        }
+    } finally {
+        if (didLock) {
+          unlockSurface();
+        }
+    }
+  }
+
+  public DynamicLookupHelper getDynamicLookupHelper() {
+    return (WindowsWGLDrawableFactory) getFactoryImpl() ;
+  }
+
+  protected static String getThreadName() {
+    return Thread.currentThread().getName();
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
new file mode 100644
index 000000000..38b9bac51
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
@@ -0,0 +1,279 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import java.nio.*;
+import java.util.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.NWReflection;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
+import com.sun.nativewindow.impl.NullWindow;
+
+public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
+  private static final boolean VERBOSE = Debug.verbose();
+
+  // Handle to GLU32.dll
+  // FIXME: this should go away once we delete support for the C GLU library
+  private long hglu32;
+
+  // Handle to core OpenGL32.dll
+  private long hopengl32;
+
+  public WindowsWGLDrawableFactory() {
+    super();
+
+    // Register our GraphicsConfigurationFactory implementations
+    // The act of constructing them causes them to be registered
+    new WindowsWGLGraphicsConfigurationFactory();
+    try {
+      NWReflection.createInstance("com.jogamp.opengl.impl.windows.wgl.awt.WindowsAWTWGLGraphicsConfigurationFactory",
+                                  new Object[] {});
+    } catch (Throwable t) { }
+
+    loadOpenGL32Library();
+  }
+
+  public GLDrawableImpl createOnscreenDrawable(NativeWindow target) {
+    if (target == null) {
+      throw new IllegalArgumentException("Null target");
+    }
+    return new WindowsOnscreenWGLDrawable(this, target);
+  }
+
+  protected GLDrawableImpl createOffscreenDrawable(NativeWindow target) {
+    return new WindowsOffscreenWGLDrawable(this, target);
+  }
+
+  private boolean pbufferSupportInitialized = false;
+  private boolean canCreateGLPbuffer = false;
+  public boolean canCreateGLPbuffer() {
+    if (!pbufferSupportInitialized) {
+      final GLDrawableFactory factory = this;
+      Runnable r = new Runnable() {
+          public void run() {
+            WindowsDummyWGLDrawable dummyDrawable = new WindowsDummyWGLDrawable(factory);
+            GLContext dummyContext  = dummyDrawable.createContext(null);
+            if (dummyContext != null) {
+              GLContext lastContext = GLContext.getCurrent();
+              if (lastContext != null) {
+                lastContext.release();
+              }
+              dummyContext.makeCurrent();
+              GL dummyGL = dummyContext.getGL();
+              canCreateGLPbuffer = dummyGL.isExtensionAvailable("GL_ARB_pbuffer");
+              pbufferSupportInitialized = true;
+              dummyContext.release();
+              dummyContext.destroy();
+              dummyDrawable.destroy();
+              if (lastContext != null) {
+                lastContext.makeCurrent();
+              }
+            }
+          }
+        };
+      maybeDoSingleThreadedWorkaround(r);
+    }
+    if (DEBUG) {
+      System.err.println("WindowsWGLDrawableFactory.canCreateGLPbuffer() = " + canCreateGLPbuffer);
+    }
+    return canCreateGLPbuffer;
+  }
+
+  protected GLDrawableImpl createGLPbufferDrawableImpl(final NativeWindow target) {
+    final List returnList = new ArrayList();
+    final GLDrawableFactory factory = this;
+    Runnable r = new Runnable() {
+        public void run() {
+          WindowsDummyWGLDrawable dummyDrawable = new WindowsDummyWGLDrawable(factory);
+          WindowsWGLContext       dummyContext  = (WindowsWGLContext) dummyDrawable.createContext(null);
+          GLContext lastContext = GLContext.getCurrent();
+          if (lastContext != null) {
+            lastContext.release();
+          }
+          dummyContext.makeCurrent();
+          WGLExt dummyWGLExt = dummyContext.getWGLExt();
+          try {
+            GLDrawableImpl pbufferDrawable = new WindowsPbufferWGLDrawable(factory, target,
+                                                                           dummyDrawable,
+                                                                           dummyWGLExt);
+            returnList.add(pbufferDrawable);
+            dummyContext.release();
+            dummyContext.destroy();
+            dummyDrawable.destroy();
+          } finally {
+            if (lastContext != null) {
+              lastContext.makeCurrent();
+            }
+          }
+        }
+      };
+    maybeDoSingleThreadedWorkaround(r);
+    return (GLDrawableImpl) returnList.get(0);
+  }
+
+  protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
+    AbstractGraphicsScreen screen = DefaultGraphicsScreen.createDefault();
+    NullWindow nw = new NullWindow(WindowsWGLGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(
+                                   capabilities, chooser, screen) );
+    nw.setSize(width, height);
+    return nw;
+  }
+ 
+  public GLContext createExternalGLContext() {
+    return WindowsExternalWGLContext.create(this, null);
+  }
+
+  public boolean canCreateExternalGLDrawable() {
+    return true;
+  }
+
+  public GLDrawable createExternalGLDrawable() {
+    return WindowsExternalWGLDrawable.create(this, null);
+  }
+
+  public void loadOpenGL32Library() {
+    if (hopengl32 == 0) {
+      hopengl32 = WGL.LoadLibraryA("OpenGL32");
+      if (DEBUG) {
+        if (hopengl32 == 0) {
+          System.err.println("WindowsWGLDrawableFactory: Could not load OpenGL32.dll - maybe an embedded device");
+        }
+      }
+    }
+  }
+
+  public void loadGLULibrary() {
+    if (hglu32 == 0) {
+      hglu32 = WGL.LoadLibraryA("GLU32");
+      if (hglu32 == 0) {
+        throw new GLException("Error loading GLU32.DLL");
+      }
+    }
+  }
+
+  public long dynamicLookupFunction(String glFuncName) {
+    long res = WGL.wglGetProcAddress(glFuncName);
+    if (res == 0) {
+      // It may happen that a driver doesn't return the OpenGL32 core function pointer
+      // with wglGetProcAddress (e.g. NVidia GL 3.1) - hence we have to look harder.
+      if (hopengl32 != 0) {
+        res = WGL.GetProcAddress(hopengl32, glFuncName);
+      }
+    }
+    if (res == 0) {
+      // GLU routines aren't known to the OpenGL function lookup
+      if (hglu32 != 0) {
+        res = WGL.GetProcAddress(hglu32, glFuncName);
+      }
+    }
+    return res;
+  }
+
+  static String wglGetLastError() {
+    long err = WGL.GetLastError();
+    String detail = null;
+    switch ((int) err) {
+      case WGL.ERROR_INVALID_PIXEL_FORMAT: detail = "ERROR_INVALID_PIXEL_FORMAT";       break;
+      case WGL.ERROR_NO_SYSTEM_RESOURCES:  detail = "ERROR_NO_SYSTEM_RESOURCES";        break;
+      case WGL.ERROR_INVALID_DATA:         detail = "ERROR_INVALID_DATA";               break;
+      case WGL.ERROR_PROC_NOT_FOUND:       detail = "ERROR_PROC_NOT_FOUND";             break;
+      case WGL.ERROR_INVALID_WINDOW_HANDLE:detail = "ERROR_INVALID_WINDOW_HANDLE";      break;
+      default:                             detail = "(Unknown error code " + err + ")"; break;
+    }
+    return detail;
+  }
+
+  public boolean canCreateContextOnJava2DSurface() {
+    return false;
+  }
+
+  public GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
+    throws GLException {
+    throw new GLException("Unimplemented on this platform");
+  }
+
+  //------------------------------------------------------
+  // Gamma-related functionality
+  //
+
+  private static final int GAMMA_RAMP_LENGTH = 256;
+
+  protected int getGammaRampLength() {
+    return GAMMA_RAMP_LENGTH;
+  }
+
+  protected boolean setGammaRamp(float[] ramp) {
+    short[] rampData = new short[3 * GAMMA_RAMP_LENGTH];
+    for (int i = 0; i < GAMMA_RAMP_LENGTH; i++) {
+      short scaledValue = (short) (ramp[i] * 65535);
+      rampData[i] = scaledValue;
+      rampData[i +     GAMMA_RAMP_LENGTH] = scaledValue;
+      rampData[i + 2 * GAMMA_RAMP_LENGTH] = scaledValue;
+    }
+
+    long screenDC = WGL.GetDC(0);
+    boolean res = WGL.SetDeviceGammaRamp(screenDC, ShortBuffer.wrap(rampData));
+    WGL.ReleaseDC(0, screenDC);
+    return res;
+  }
+
+  protected Buffer getGammaRamp() {
+    ShortBuffer rampData = ShortBuffer.wrap(new short[3 * GAMMA_RAMP_LENGTH]);
+    long screenDC = WGL.GetDC(0);
+    boolean res = WGL.GetDeviceGammaRamp(screenDC, rampData);
+    WGL.ReleaseDC(0, screenDC);
+    if (!res) {
+      return null;
+    }
+    return rampData;
+  }
+
+  protected void resetGammaRamp(Buffer originalGammaRamp) {
+    if (originalGammaRamp == null) {
+      // getGammaRamp failed earlier
+      return;
+    }
+    long screenDC = WGL.GetDC(0);
+    WGL.SetDeviceGammaRamp(screenDC, originalGammaRamp);
+    WGL.ReleaseDC(0, screenDC);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
new file mode 100644
index 000000000..bb59434b7
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
@@ -0,0 +1,638 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import java.util.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.NativeLibrary;
+
+public class WindowsWGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
+    // Keep this under the same debug flag as the drawable factory for convenience
+    protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
+    
+    protected static final int MAX_PFORMATS = 256;
+    protected static final int MAX_ATTRIBS  = 256;
+
+    private PIXELFORMATDESCRIPTOR pixelfmt;
+    private int pixelfmtID;
+    private boolean isChosen = false;
+    private GLCapabilitiesChooser chooser;
+    private boolean choosenByWGLPixelFormat=false;
+
+    public WindowsWGLGraphicsConfiguration(AbstractGraphicsScreen screen, GLCapabilities capsChosen, GLCapabilities capsRequested,
+                                           PIXELFORMATDESCRIPTOR pixelfmt, int pixelfmtID, GLCapabilitiesChooser chooser) {
+        super(screen, capsChosen, capsRequested);
+        this.chooser=chooser;
+        this.pixelfmt = pixelfmt;
+        this.pixelfmtID = pixelfmtID;
+    }
+
+    public static WindowsWGLGraphicsConfiguration create(long hdc, int pfdID, 
+                                                         GLProfile glp, AbstractGraphicsScreen screen, boolean onscreen, boolean usePBuffer)
+    {
+        if(pfdID<=0) {
+            throw new GLException("Invalid pixelformat id "+pfdID);
+        }
+        if(null==glp) {
+          glp = GLProfile.getDefault();
+        }
+        PIXELFORMATDESCRIPTOR pfd = createPixelFormatDescriptor();
+        if (WGL.DescribePixelFormat(hdc, pfdID, pfd.size(), pfd) == 0) {
+            throw new GLException("Unable to describe pixel format " + pfdID);
+        }
+
+        GLCapabilities caps = PFD2GLCapabilities(glp, pfd, onscreen, usePBuffer);
+        if(null==caps) {
+            throw new GLException("Couldn't choose Capabilities by: HDC 0x"+Long.toHexString(hdc)+", pfdID "+pfdID);
+        }
+        WindowsWGLGraphicsConfiguration cfg = new WindowsWGLGraphicsConfiguration(screen, caps, caps, pfd, pfdID, new DefaultGLCapabilitiesChooser());
+        cfg.setCapsPFD(caps, pfd, pfdID, false);
+
+        return cfg;
+    }
+
+    public Object clone() {
+        return super.clone();
+    }
+
+    /** Update config - before having a valid context */
+    protected void updateGraphicsConfiguration(GLDrawableFactory factory, NativeWindow nativeWindow) {
+        WindowsWGLGraphicsConfigurationFactory.updateGraphicsConfiguration(chooser, factory, nativeWindow);
+    }
+
+    /** Update config - after having a valid and current context */
+    protected void updateCapabilitiesByWGL(GLContextImpl context) {
+        if(choosenByWGLPixelFormat) return; // already done ..
+
+        GLCapabilities capabilities = (GLCapabilities) getRequestedCapabilities();
+        boolean onscreen = capabilities.isOnscreen();
+        boolean usePBuffer = capabilities.isPBuffer();
+        GLProfile glp = capabilities.getGLProfile();
+
+        WGLExt wglExt = (WGLExt) context.getPlatformGLExtensions();
+        GLDrawable drawable = context.getGLDrawable();
+        NativeWindow nativeWindow = drawable.getNativeWindow();
+        long hdc = nativeWindow.getSurfaceHandle();
+
+        GLCapabilities[] caps = HDC2GLCapabilities(wglExt, hdc, getPixelFormatID(), glp, true, onscreen, usePBuffer);
+        if(null!=caps && null!=caps[0]) {
+            setCapsPFD(caps[0], getPixelFormat(), getPixelFormatID(), true);
+        }
+    }
+
+    protected void setCapsPFD(GLCapabilities caps, PIXELFORMATDESCRIPTOR pfd, int pfdID, boolean choosenByWGLPixelFormat) {
+        this.pixelfmt = pfd;
+        this.pixelfmtID = pfdID;
+        setChosenCapabilities(caps);
+        this.isChosen=true;
+        this.choosenByWGLPixelFormat=choosenByWGLPixelFormat;
+        if (DEBUG) {
+            System.err.println("*** setCapsPFD: WGL-Choosen "+choosenByWGLPixelFormat+", pfdID "+pfdID+", "+caps);
+        }
+    }
+
+    public boolean getCapabilitiesChosen() {
+        return isChosen;
+    }
+
+    public PIXELFORMATDESCRIPTOR getPixelFormat()   { return pixelfmt; }
+    public int getPixelFormatID() { return pixelfmtID; }
+    public boolean isChoosenByWGL() { return choosenByWGLPixelFormat; }
+
+    private static int haveWGLChoosePixelFormatARB = -1;
+    private static int haveWGLARBMultisample = -1;
+
+    public static GLCapabilities[] HDC2GLCapabilities(WGLExt wglExt, long hdc, int pfdIDOnly,
+                                                      GLProfile glp, boolean relaxed, boolean onscreen, boolean usePBuffer) {
+    
+        if(haveWGLChoosePixelFormatARB<0) {
+            haveWGLChoosePixelFormatARB = wglExt.isExtensionAvailable("WGL_ARB_pixel_format")?1:0;
+        }
+        if(haveWGLARBMultisample<0) {
+            haveWGLARBMultisample = wglExt.isExtensionAvailable("WGL_ARB_multisample")?1:0;
+        }
+        if (0==haveWGLChoosePixelFormatARB) {
+            return null;
+        }
+
+        // Produce a list of GLCapabilities to give to the
+        // GLCapabilitiesChooser.
+        // Use wglGetPixelFormatAttribivARB instead of
+        // DescribePixelFormat to get higher-precision information
+        // about the pixel format (should make the GLCapabilities
+        // more precise as well...i.e., remove the
+        // "HardwareAccelerated" bit, which is basically
+        // meaningless, and put in whether it can render to a
+        // window, to a pbuffer, or to a pixmap)
+        GLCapabilities[] availableCaps = null;
+        int numFormats = 0;
+        int niattribs = 0;
+        int[] iattributes = new int  [2*MAX_ATTRIBS];
+        int[] iresults    = new int  [2*MAX_ATTRIBS];
+
+        iattributes[0] = WGLExt.WGL_NUMBER_PIXEL_FORMATS_ARB;
+        if (wglExt.wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, iattributes, 0, iresults, 0)) {
+          numFormats = iresults[0];
+
+          if (DEBUG) {
+            System.err.println("wglGetPixelFormatAttribivARB reported WGL_NUMBER_PIXEL_FORMATS = " + numFormats);
+          }
+
+          if(pfdIDOnly>0 && pfdIDOnly>numFormats) {
+            throw new GLException("Invalid pixelformat ID " + pfdIDOnly + " (should be between 1 and " + numFormats + ")");
+          }
+
+          // Should we be filtering out the pixel formats which aren't
+          // applicable, as we are doing here?
+          // We don't have enough information in the GLCapabilities to
+          // represent those that aren't...
+          iattributes[niattribs++] = WGLExt.WGL_DRAW_TO_WINDOW_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_ACCELERATION_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_SUPPORT_OPENGL_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_DEPTH_BITS_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_STENCIL_BITS_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_DOUBLE_BUFFER_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_STEREO_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_PIXEL_TYPE_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_RED_BITS_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_GREEN_BITS_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_BLUE_BITS_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_ALPHA_BITS_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_ACCUM_RED_BITS_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_ACCUM_GREEN_BITS_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_ACCUM_BLUE_BITS_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_ACCUM_ALPHA_BITS_ARB;
+          if (1==haveWGLARBMultisample) {
+            iattributes[niattribs++] = WGLExt.WGL_SAMPLE_BUFFERS_ARB;
+            iattributes[niattribs++] = WGLExt.WGL_SAMPLES_ARB;
+          }
+
+          if(pfdIDOnly>0) {
+              availableCaps = new GLCapabilities[1];
+              if (!wglExt.wglGetPixelFormatAttribivARB(hdc, pfdIDOnly, 0, niattribs, iattributes, 0, iresults, 0)) {
+                  throw new GLException("Error getting pixel format attributes for pixel format " + pfdIDOnly + " of device context");
+              }
+              availableCaps[0] = AttribList2GLCapabilities(glp, iattributes, niattribs, iresults, 
+                                                           relaxed, onscreen, usePBuffer);
+          } else {
+              availableCaps = new GLCapabilities[numFormats];
+              for (int i = 0; i < numFormats; i++) {
+                if (!wglExt.wglGetPixelFormatAttribivARB(hdc, i+1, 0, niattribs, iattributes, 0, iresults, 0)) {
+                  throw new GLException("Error getting pixel format attributes for pixel format " + (i + 1) + " of device context");
+                }
+                availableCaps[i] = AttribList2GLCapabilities(glp, iattributes, niattribs, iresults, 
+                                                             relaxed, onscreen, usePBuffer);
+              }
+          }
+        } else {
+          long lastErr = WGL.GetLastError();
+          // Intel Extreme graphics fails with a zero error code
+          if (lastErr != 0) {
+            throw new GLException("Unable to enumerate pixel formats of window using wglGetPixelFormatAttribivARB: error code " + WGL.GetLastError());
+          }
+        }
+        return availableCaps;
+    }
+
+    public static boolean GLCapabilities2AttribList(GLCapabilities caps,
+                                                  int[] iattributes,
+                                                  WGLExt wglExt,
+                                                  boolean pbuffer,
+                                                  int[] floatMode) throws GLException {
+        if (!wglExt.isExtensionAvailable("WGL_ARB_pixel_format")) {
+          return false;
+        }
+
+        int niattribs = 0;
+
+        iattributes[niattribs++] = WGLExt.WGL_SUPPORT_OPENGL_ARB;
+        iattributes[niattribs++] = GL.GL_TRUE;
+        if (pbuffer) {
+          iattributes[niattribs++] = WGLExt.WGL_DRAW_TO_PBUFFER_ARB;
+          iattributes[niattribs++] = GL.GL_TRUE;
+        } else {
+          iattributes[niattribs++] = WGLExt.WGL_DRAW_TO_WINDOW_ARB;
+          iattributes[niattribs++] = GL.GL_TRUE;
+        }
+
+        iattributes[niattribs++] = WGLExt.WGL_DOUBLE_BUFFER_ARB;
+        if (caps.getDoubleBuffered()) {
+          iattributes[niattribs++] = GL.GL_TRUE;
+        } else {
+          iattributes[niattribs++] = GL.GL_FALSE;
+        }
+
+        iattributes[niattribs++] = WGLExt.WGL_STEREO_ARB;
+        if (caps.getStereo()) {
+          iattributes[niattribs++] = GL.GL_TRUE;
+        } else {
+          iattributes[niattribs++] = GL.GL_FALSE;
+        }
+        
+        iattributes[niattribs++] = WGLExt.WGL_DEPTH_BITS_ARB;
+        iattributes[niattribs++] = caps.getDepthBits();
+        iattributes[niattribs++] = WGLExt.WGL_RED_BITS_ARB;
+        iattributes[niattribs++] = caps.getRedBits();
+        iattributes[niattribs++] = WGLExt.WGL_GREEN_BITS_ARB;
+        iattributes[niattribs++] = caps.getGreenBits();
+        iattributes[niattribs++] = WGLExt.WGL_BLUE_BITS_ARB;
+        iattributes[niattribs++] = caps.getBlueBits();
+        iattributes[niattribs++] = WGLExt.WGL_ALPHA_BITS_ARB;
+        iattributes[niattribs++] = caps.getAlphaBits();
+        iattributes[niattribs++] = WGLExt.WGL_STENCIL_BITS_ARB;
+        iattributes[niattribs++] = caps.getStencilBits();
+        if (caps.getAccumRedBits()   > 0 ||
+            caps.getAccumGreenBits() > 0 ||
+            caps.getAccumBlueBits()  > 0 ||
+            caps.getAccumAlphaBits() > 0) {
+          iattributes[niattribs++] = WGLExt.WGL_ACCUM_BITS_ARB;
+          iattributes[niattribs++] = (caps.getAccumRedBits() +
+                                      caps.getAccumGreenBits() +
+                                      caps.getAccumBlueBits() +
+                                      caps.getAccumAlphaBits());
+          iattributes[niattribs++] = WGLExt.WGL_ACCUM_RED_BITS_ARB;
+          iattributes[niattribs++] = caps.getAccumRedBits();
+          iattributes[niattribs++] = WGLExt.WGL_ACCUM_GREEN_BITS_ARB;
+          iattributes[niattribs++] = caps.getAccumGreenBits();
+          iattributes[niattribs++] = WGLExt.WGL_ACCUM_BLUE_BITS_ARB;
+          iattributes[niattribs++] = caps.getAccumBlueBits();
+          iattributes[niattribs++] = WGLExt.WGL_ACCUM_ALPHA_BITS_ARB;
+          iattributes[niattribs++] = caps.getAccumAlphaBits();
+        }
+
+        if (wglExt.isExtensionAvailable("WGL_ARB_multisample")) {
+          if (caps.getSampleBuffers()) {
+            iattributes[niattribs++] = WGLExt.WGL_SAMPLE_BUFFERS_ARB;
+            iattributes[niattribs++] = GL.GL_TRUE;
+            iattributes[niattribs++] = WGLExt.WGL_SAMPLES_ARB;
+            iattributes[niattribs++] = caps.getNumSamples();
+          }
+        }
+
+        boolean rtt      = caps.getPbufferRenderToTexture();
+        boolean rect     = caps.getPbufferRenderToTextureRectangle();
+        boolean useFloat = caps.getPbufferFloatingPointBuffers();
+        boolean ati      = false;
+        if (pbuffer) {
+          // Check some invariants and set up some state
+          if (rect && !rtt) {
+            throw new GLException("Render-to-texture-rectangle requires render-to-texture to be specified");
+          }
+
+          if (rect) {
+            if (!wglExt.isExtensionAvailable("GL_NV_texture_rectangle")) {
+              throw new GLException("Render-to-texture-rectangle requires GL_NV_texture_rectangle extension");
+            }
+          }
+
+          if (useFloat) {
+            if (!wglExt.isExtensionAvailable("WGL_ATI_pixel_format_float") &&
+                !wglExt.isExtensionAvailable("WGL_NV_float_buffer")) {
+              throw new GLException("Floating-point pbuffers not supported by this hardware");
+            }
+
+            // Prefer NVidia extension over ATI
+            if (wglExt.isExtensionAvailable("WGL_NV_float_buffer")) {
+              ati = false;
+              floatMode[0] = GLPbuffer.NV_FLOAT;
+            } else {
+              ati = true;
+              floatMode[0] = GLPbuffer.ATI_FLOAT;
+            }
+            if (DEBUG) {
+              System.err.println("Using " + (ati ? "ATI" : "NVidia") + " floating-point extension");
+            }
+          }
+
+          // See whether we need to change the pixel type to support ATI's
+          // floating-point pbuffers
+          if (useFloat && ati) {
+            if (rtt) {
+              throw new GLException("Render-to-floating-point-texture not supported on ATI hardware");
+            } else {
+              iattributes[niattribs++] = WGLExt.WGL_PIXEL_TYPE_ARB;
+              iattributes[niattribs++] = WGLExt.WGL_TYPE_RGBA_FLOAT_ARB;
+            }
+          } else {
+            if (!rtt) {
+              // Currently we don't support non-truecolor visuals in the
+              // GLCapabilities, so we don't offer the option of making
+              // color-index pbuffers.
+              iattributes[niattribs++] = WGLExt.WGL_PIXEL_TYPE_ARB;
+              iattributes[niattribs++] = WGLExt.WGL_TYPE_RGBA_ARB;
+            }
+          }
+
+          if (useFloat && !ati) {
+            iattributes[niattribs++] = WGLExt.WGL_FLOAT_COMPONENTS_NV;
+            iattributes[niattribs++] = GL.GL_TRUE;
+          }
+
+          if (rtt) {
+            if (useFloat) {
+              assert(!ati);
+              if (!rect) {
+                throw new GLException("Render-to-floating-point-texture only supported on NVidia hardware with render-to-texture-rectangle");
+              }
+              iattributes[niattribs++] = WGLExt.WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV;
+              iattributes[niattribs++] = GL.GL_TRUE;
+            } else {
+              iattributes[niattribs++] = rect ? WGLExt.WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV : WGLExt.WGL_BIND_TO_TEXTURE_RGB_ARB;
+              iattributes[niattribs++] = GL.GL_TRUE;
+            }
+          }
+        } else {
+          iattributes[niattribs++] = WGLExt.WGL_PIXEL_TYPE_ARB;
+          iattributes[niattribs++] = WGLExt.WGL_TYPE_RGBA_ARB;
+        }
+        iattributes[niattribs++] = 0;
+
+        return true;
+    }
+
+    public static final int WINDOW_BIT  = 1 << 0 ;
+    public static final int BITMAP_BIT  = 1 << 1 ;
+    public static final int PBUFFER_BIT = 1 << 2 ;
+
+    public static int WGLConfig2DrawableTypeBits(int[] iattribs,
+                                                 int niattribs,
+                                                 int[] iresults) {
+        int val = 0;
+
+        for (int i = 0; i < niattribs; i++) {
+          int attr = iattribs[i];
+          switch (attr) {
+            case WGLExt.WGL_DRAW_TO_WINDOW_ARB:
+                if(iresults[i] == GL.GL_TRUE) val |= WINDOW_BIT;
+                break;
+            case WGLExt.WGL_DRAW_TO_BITMAP_ARB:
+                if(iresults[i] == GL.GL_TRUE) val |= BITMAP_BIT;
+                break;
+            case WGLExt.WGL_DRAW_TO_PBUFFER_ARB:
+                if(iresults[i] == GL.GL_TRUE) val |= PBUFFER_BIT;
+                break;
+            }
+        }
+        return val;
+    }
+
+    public static boolean WGLConfigDrawableTypeVerify(int val, boolean onscreen, boolean usePBuffer) {
+        boolean res;
+
+        if ( onscreen ) {
+            res = ( 0 != (val & WINDOW_BIT) ) ;
+        } else {
+            res = ( 0 != (val & BITMAP_BIT) ) || usePBuffer ;
+        }
+        if ( usePBuffer ) {
+            res = res && ( 0 != (val & PBUFFER_BIT) ) ;
+        }
+
+        return res;
+    }
+    public static GLCapabilities AttribList2GLCapabilities(GLProfile glp, int[] iattribs,
+                                                         int niattribs,
+                                                         int[] iresults,
+                                                         boolean relaxed, boolean onscreen, boolean usePBuffer) {
+        GLCapabilities res = new GLCapabilities(glp);
+        int drawableTypeBits = WGLConfig2DrawableTypeBits(iattribs, niattribs, iresults);
+        if(WGLConfigDrawableTypeVerify(drawableTypeBits, onscreen, usePBuffer)) {
+            res.setOnscreen(onscreen);
+            res.setPBuffer(usePBuffer);
+        } else if(relaxed) {
+            res.setOnscreen( 0 != (drawableTypeBits & WINDOW_BIT) );
+            res.setPBuffer ( 0 != (drawableTypeBits & PBUFFER_BIT) );
+        } else {
+            throw new GLException("WGL DrawableType does not match !!!");
+        }
+
+        for (int i = 0; i < niattribs; i++) {
+          int attr = iattribs[i];
+          switch (attr) {
+            case WGLExt.WGL_DRAW_TO_WINDOW_ARB:
+            case WGLExt.WGL_DRAW_TO_BITMAP_ARB:
+            case WGLExt.WGL_DRAW_TO_PBUFFER_ARB:
+              break;
+
+            case WGLExt.WGL_ACCELERATION_ARB:
+              res.setHardwareAccelerated(iresults[i] == WGLExt.WGL_FULL_ACCELERATION_ARB);
+              break;
+
+            case WGLExt.WGL_SUPPORT_OPENGL_ARB:
+              if (iresults[i] != GL.GL_TRUE) {
+                return null;
+              }
+              break;
+
+            case WGLExt.WGL_DEPTH_BITS_ARB:
+              res.setDepthBits(iresults[i]);
+              break;
+
+            case WGLExt.WGL_STENCIL_BITS_ARB:
+              res.setStencilBits(iresults[i]);
+              break;
+
+            case WGLExt.WGL_DOUBLE_BUFFER_ARB:
+              res.setDoubleBuffered(iresults[i] == GL.GL_TRUE);
+              break;
+
+            case WGLExt.WGL_STEREO_ARB:
+              res.setStereo(iresults[i] == GL.GL_TRUE);
+              break;
+
+            case WGLExt.WGL_PIXEL_TYPE_ARB:
+              // Fail softly with unknown results here
+              if (iresults[i] == WGLExt.WGL_TYPE_RGBA_ARB||
+                  iresults[i] == WGLExt.WGL_TYPE_RGBA_FLOAT_ARB) {
+                res.setPbufferFloatingPointBuffers(true);
+              }
+              break;
+
+            case WGLExt.WGL_FLOAT_COMPONENTS_NV:
+              if (iresults[i] != 0) {
+                res.setPbufferFloatingPointBuffers(true);
+              }
+              break;
+
+            case WGLExt.WGL_RED_BITS_ARB:
+              res.setRedBits(iresults[i]);
+              break;
+              
+            case WGLExt.WGL_GREEN_BITS_ARB:
+              res.setGreenBits(iresults[i]);
+              break;
+
+            case WGLExt.WGL_BLUE_BITS_ARB:
+              res.setBlueBits(iresults[i]);
+              break;
+
+            case WGLExt.WGL_ALPHA_BITS_ARB:
+              res.setAlphaBits(iresults[i]);
+              break;
+
+            case WGLExt.WGL_ACCUM_RED_BITS_ARB:
+              res.setAccumRedBits(iresults[i]);
+              break;
+
+            case WGLExt.WGL_ACCUM_GREEN_BITS_ARB:
+              res.setAccumGreenBits(iresults[i]);
+              break;
+
+            case WGLExt.WGL_ACCUM_BLUE_BITS_ARB:
+              res.setAccumBlueBits(iresults[i]);
+              break;
+
+            case WGLExt.WGL_ACCUM_ALPHA_BITS_ARB:
+              res.setAccumAlphaBits(iresults[i]);
+              break;
+
+            case WGLExt.WGL_SAMPLE_BUFFERS_ARB:
+              res.setSampleBuffers(iresults[i] != 0);
+              break;
+
+            case WGLExt.WGL_SAMPLES_ARB:
+              res.setNumSamples(iresults[i]);
+              break;
+
+            default:
+              throw new GLException("Unknown pixel format attribute " + iattribs[i]);
+          }
+        }
+        return res;
+    }
+
+  // PIXELFORMAT
+
+    public static GLCapabilities PFD2GLCapabilities(GLProfile glp, PIXELFORMATDESCRIPTOR pfd, boolean onscreen, boolean usePBuffer) {
+        if ((pfd.getDwFlags() & WGL.PFD_SUPPORT_OPENGL) == 0) {
+          return null;
+        }
+        GLCapabilities res = new GLCapabilities(glp);
+        res.setRedBits       (pfd.getCRedBits());
+        res.setGreenBits     (pfd.getCGreenBits());
+        res.setBlueBits      (pfd.getCBlueBits());
+        res.setAlphaBits     (pfd.getCAlphaBits());
+        res.setAccumRedBits  (pfd.getCAccumRedBits());
+        res.setAccumGreenBits(pfd.getCAccumGreenBits());
+        res.setAccumBlueBits (pfd.getCAccumBlueBits());
+        res.setAccumAlphaBits(pfd.getCAccumAlphaBits());
+        res.setDepthBits     (pfd.getCDepthBits());
+        res.setStencilBits   (pfd.getCStencilBits());
+        res.setDoubleBuffered((pfd.getDwFlags() & WGL.PFD_DOUBLEBUFFER) != 0);
+        res.setStereo        ((pfd.getDwFlags() & WGL.PFD_STEREO) != 0);
+        res.setHardwareAccelerated( ((pfd.getDwFlags() & WGL.PFD_GENERIC_FORMAT) == 0) ||
+                                    ((pfd.getDwFlags() & WGL.PFD_GENERIC_ACCELERATED) != 0) );
+        res.setOnscreen      ( onscreen && ((pfd.getDwFlags() & WGL.PFD_DRAW_TO_WINDOW) != 0) );
+        res.setPBuffer       ( usePBuffer );
+        /* FIXME: Missing ??
+        if (GLXUtil.isMultisampleAvailable()) {
+          res.setSampleBuffers(glXGetFBConfig(display, fbcfg, GLX.GLX_SAMPLE_BUFFERS, tmp, 0) != 0);
+          res.setNumSamples   (glXGetFBConfig(display, fbcfg, GLX.GLX_SAMPLES,        tmp, 0));
+        }
+        res.setBackgroundOpaque(glXGetFBConfig(display, fbcfg, GLX.GLX_TRANSPARENT_TYPE, tmp, 0) != GLX.GLX_NONE);
+        try { 
+            res.setPbufferFloatingPointBuffers(glXGetFBConfig(display, fbcfg, GLXExt.GLX_FLOAT_COMPONENTS_NV, tmp, 0) != GL.GL_FALSE);
+        } catch (Exception e) {}
+        */
+        return res;
+  }
+
+  public static PIXELFORMATDESCRIPTOR GLCapabilities2PFD(GLCapabilities caps) {
+    int colorDepth = (caps.getRedBits() +
+                      caps.getGreenBits() +
+                      caps.getBlueBits());
+    if (colorDepth < 15) {
+      throw new GLException("Bit depths < 15 (i.e., non-true-color) not supported");
+    }
+    PIXELFORMATDESCRIPTOR pfd = createPixelFormatDescriptor();
+    int pfdFlags = (WGL.PFD_SUPPORT_OPENGL |
+                    WGL.PFD_GENERIC_ACCELERATED);
+    if (caps.getDoubleBuffered()) {
+      pfdFlags |= WGL.PFD_DOUBLEBUFFER;
+    }
+    if (caps.isOnscreen()) {
+      pfdFlags |= WGL.PFD_DRAW_TO_WINDOW;
+    } else {
+      pfdFlags |= WGL.PFD_DRAW_TO_BITMAP;
+    }
+    if (caps.getStereo()) {
+      pfdFlags |= WGL.PFD_STEREO;
+    }
+    pfd.setDwFlags(pfdFlags);
+    pfd.setIPixelType((byte) WGL.PFD_TYPE_RGBA);
+    pfd.setCColorBits((byte) colorDepth);
+    pfd.setCRedBits  ((byte) caps.getRedBits());
+    pfd.setCGreenBits((byte) caps.getGreenBits());
+    pfd.setCBlueBits ((byte) caps.getBlueBits());
+    pfd.setCAlphaBits((byte) caps.getAlphaBits());
+    int accumDepth = (caps.getAccumRedBits() +
+                      caps.getAccumGreenBits() +
+                      caps.getAccumBlueBits());
+    pfd.setCAccumBits     ((byte) accumDepth);
+    pfd.setCAccumRedBits  ((byte) caps.getAccumRedBits());
+    pfd.setCAccumGreenBits((byte) caps.getAccumGreenBits());
+    pfd.setCAccumBlueBits ((byte) caps.getAccumBlueBits());
+    pfd.setCAccumAlphaBits((byte) caps.getAccumAlphaBits());
+    pfd.setCDepthBits((byte) caps.getDepthBits());
+    pfd.setCStencilBits((byte) caps.getStencilBits());
+    pfd.setILayerType((byte) WGL.PFD_MAIN_PLANE);
+
+    /* FIXME: Missing: 
+      caps.getSampleBuffers()
+      caps.getNumSamples   ()
+    }
+    caps.getBackgroundOpaque()
+    try { 
+        caps.getPbufferFloatingPointBuffers()
+    } catch (Exception e) {}
+    */
+    return pfd;
+  }
+
+  public static PIXELFORMATDESCRIPTOR createPixelFormatDescriptor() {
+    PIXELFORMATDESCRIPTOR pfd = PIXELFORMATDESCRIPTOR.create();
+    pfd.setNSize((short) pfd.size());
+    pfd.setNVersion((short) 1);
+    return pfd;
+  }
+
+  public String toString() {
+    return "WindowsWGLGraphicsConfiguration["+getScreen()+", pfdID " + pixelfmtID + ", wglChoosen "+choosenByWGLPixelFormat+
+                                            ",\n\trequested " + getRequestedCapabilities() +
+                                            ",\n\tchosen    " + getChosenCapabilities() +
+                                            "]";
+  }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
new file mode 100644
index 000000000..06590a913
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
@@ -0,0 +1,319 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.windows.*;
+import com.sun.nativewindow.impl.*;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+/** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
+    are used on Windows platforms. Toolkits will likely need to delegate
+    to this one to change the accepted and returned types of the
+    GraphicsDevice and GraphicsConfiguration abstractions. */
+
+public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
+    protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
+
+    public WindowsWGLGraphicsConfigurationFactory() {
+        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.windows.WindowsGraphicsDevice.class, this);
+    }
+
+    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
+                                                                     CapabilitiesChooser chooser,
+                                                                     AbstractGraphicsScreen absScreen) {
+        GLCapabilities caps = (GLCapabilities)capabilities;
+        return chooseGraphicsConfigurationStatic(caps, chooser, absScreen);
+    }
+
+    protected static WindowsWGLGraphicsConfiguration createDefaultGraphicsConfiguration(AbstractGraphicsScreen absScreen, boolean onscreen, boolean usePBuffer) {
+        GLCapabilities caps = new GLCapabilities(null);
+        caps.setDoubleBuffered(onscreen); // FIXME
+        caps.setOnscreen  (onscreen);
+        caps.setPBuffer   (usePBuffer);
+
+        GLCapabilities caps2 = (GLCapabilities) caps.clone();
+        if(!caps2.isOnscreen()) {
+            // OFFSCREEN !DOUBLE_BUFFER
+            caps2.setDoubleBuffered(false);
+        }
+
+        if(null==absScreen) {
+            absScreen = DefaultGraphicsScreen.createScreenDevice(0);
+        }
+        return new WindowsWGLGraphicsConfiguration(absScreen, caps2, caps, WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(caps2), -1, null);
+    }
+
+    protected static WindowsWGLGraphicsConfiguration chooseGraphicsConfigurationStatic(GLCapabilities caps,
+                                                                                       CapabilitiesChooser chooser,
+                                                                                       AbstractGraphicsScreen absScreen) {
+        if(null==absScreen) {
+            absScreen = DefaultGraphicsScreen.createScreenDevice(0);
+        }
+        GLCapabilities caps2 = (GLCapabilities) caps.clone();
+        if(!caps2.isOnscreen()) {
+            // OFFSCREEN !DOUBLE_BUFFER
+            caps2.setDoubleBuffered(false);
+        }
+        return new WindowsWGLGraphicsConfiguration(absScreen, caps2, caps, WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(caps2), -1, 
+                                                   (GLCapabilitiesChooser)chooser);
+    }
+
+    protected static void updateGraphicsConfiguration(CapabilitiesChooser chooser,
+                                                      GLDrawableFactory factory, NativeWindow nativeWindow) {
+        if (nativeWindow == null) {
+            throw new IllegalArgumentException("NativeWindow is null");
+        }
+
+        if (chooser != null &&
+            !(chooser instanceof GLCapabilitiesChooser)) {
+            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilitiesChooser objects");
+        }
+
+        boolean choosenBywGLPixelFormat = false;
+        WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration) nativeWindow.getGraphicsConfiguration().getNativeGraphicsConfiguration();
+        GLCapabilities capabilities = (GLCapabilities) config.getRequestedCapabilities();
+        boolean onscreen = capabilities.isOnscreen();
+        boolean usePBuffer = capabilities.isPBuffer();
+        GLProfile glProfile = capabilities.getGLProfile();
+        long hdc = nativeWindow.getSurfaceHandle();
+
+        if (DEBUG) {
+          Exception ex = new Exception("WindowsWGLGraphicsConfigurationFactory got HDC "+toHexString(hdc));
+          ex.printStackTrace();
+          System.err.println("WindowsWGLGraphicsConfigurationFactory got NW    "+nativeWindow);
+        }
+
+        PIXELFORMATDESCRIPTOR pfd = null;
+        int pixelFormat = -1; // 1-based pixel format
+        boolean pixelFormatSet = false;
+        GLCapabilities chosenCaps = null;
+
+        if (onscreen) {
+          if ((pixelFormat = WGL.GetPixelFormat(hdc)) != 0) {
+            // Pixelformat already set by either 
+            //  - a previous updateGraphicsConfiguration() call on the same HDC,
+            //  - the graphics driver, copying the HDC's pixelformat to the new one,
+            //  - or the Java2D/OpenGL pipeline's configuration
+            if (DEBUG) {
+              System.err.println("!!!! NOTE: pixel format already chosen for HDC: " + toHexString(hdc)+
+                                 ", pixelformat "+pixelFormat);
+            }
+            pixelFormatSet = true;
+          }
+
+          GLCapabilities[] availableCaps = null;
+          int numFormats = 0;
+          pfd = WindowsWGLGraphicsConfiguration.createPixelFormatDescriptor();
+          // Produce a recommended pixel format selection for the GLCapabilitiesChooser.
+          // Use wglChoosePixelFormatARB if user requested multisampling and if we have it available
+          WindowsWGLDrawable dummyDrawable = null;
+          GLContextImpl     dummyContext  = null;
+          WGLExt            dummyWGLExt   = null;
+          if (capabilities.getSampleBuffers()) {
+              dummyDrawable = new WindowsDummyWGLDrawable(factory);
+              dummyContext  = (GLContextImpl) dummyDrawable.createContext(null);
+              if (dummyContext != null) {
+                dummyContext.makeCurrent();
+                dummyWGLExt = (WGLExt) dummyContext.getPlatformGLExtensions();
+              }
+          } else if (DEBUG) {
+              System.err.println(getThreadName() + ": Not using WGL_ARB_pixel_format, because multisampling not requested");
+          }
+          int recommendedPixelFormat = pixelFormat; // 1-based pixel format
+          boolean haveWGLChoosePixelFormatARB = false;
+          boolean gotAvailableCaps = false;
+          if (dummyWGLExt != null) {
+            try {
+              haveWGLChoosePixelFormatARB = dummyWGLExt.isExtensionAvailable("WGL_ARB_pixel_format");
+              if (haveWGLChoosePixelFormatARB) {
+                if(pixelFormat<=0) {
+                  int[]   iattributes = new int  [2*WindowsWGLGraphicsConfiguration.MAX_ATTRIBS];
+                  float[] fattributes = new float[1];
+
+                  if(WindowsWGLGraphicsConfiguration.GLCapabilities2AttribList(capabilities,
+                                                                               iattributes,
+                                                                               dummyWGLExt,
+                                                                               false,
+                                                                               null)) {
+                    int[] pformats = new int[WindowsWGLGraphicsConfiguration.MAX_PFORMATS];
+                    int[] numFormatsTmp = new int[1];
+                    if (dummyWGLExt.wglChoosePixelFormatARB(hdc,
+                                                         iattributes, 0,
+                                                         fattributes, 0,
+                                                         WindowsWGLGraphicsConfiguration.MAX_PFORMATS,
+                                                         pformats, 0,
+                                                         numFormatsTmp, 0)) {
+                      numFormats = numFormatsTmp[0];
+                      if (recommendedPixelFormat<=0 && numFormats > 0) {
+                        recommendedPixelFormat = pformats[0];
+                        if (DEBUG) {
+                          System.err.println(getThreadName() + ": Used wglChoosePixelFormatARB to recommend pixel format " + recommendedPixelFormat);
+                        }
+                      }
+                    } else {
+                      if (DEBUG) {
+                        System.err.println(getThreadName() + ": wglChoosePixelFormatARB failed: " + WGL.GetLastError() );
+                        Thread.dumpStack();
+                      }
+                    }
+                    if (DEBUG) {
+                      if (recommendedPixelFormat <= 0) {
+                        System.err.print(getThreadName() + ": wglChoosePixelFormatARB didn't recommend a pixel format: "+WGL.GetLastError());
+                        if (capabilities.getSampleBuffers()) {
+                          System.err.print(" for multisampled GLCapabilities");
+                        }
+                        System.err.println();
+                      }
+                    }
+                  }
+                }
+
+                availableCaps = WindowsWGLGraphicsConfiguration.HDC2GLCapabilities(dummyWGLExt, hdc, -1, glProfile, pixelFormatSet, onscreen, usePBuffer);
+                gotAvailableCaps = null!=availableCaps ;
+                choosenBywGLPixelFormat = gotAvailableCaps ;
+              } else if (DEBUG) {
+                System.err.println(getThreadName() + ": wglChoosePixelFormatARB not available");
+              }
+            } finally {
+              dummyContext.release();
+              dummyContext.destroy();
+              dummyDrawable.destroy();
+            }
+          }
+
+          if (!gotAvailableCaps) {
+            if (DEBUG) {
+              System.err.println(getThreadName() + ": Using ChoosePixelFormat ... (LastError: "+WGL.GetLastError()+")");
+            }
+            pfd = WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(capabilities);
+            recommendedPixelFormat = WGL.ChoosePixelFormat(hdc, pfd);
+            if (DEBUG) {
+              System.err.println(getThreadName() + ": ChoosePixelFormat(HDC "+toHexString(hdc)+") = " + recommendedPixelFormat + " (LastError: "+WGL.GetLastError()+")");
+              System.err.println(getThreadName() + ": Used " + capabilities);
+            }
+
+            numFormats = WGL.DescribePixelFormat(hdc, 1, 0, null);
+            if (numFormats == 0) {
+              throw new GLException("Unable to enumerate pixel formats of window " +
+                                    toHexString(hdc) + " for GLCapabilitiesChooser (LastError: "+WGL.GetLastError()+")");
+            }
+            availableCaps = new GLCapabilities[numFormats];
+            for (int i = 0; i < numFormats; i++) {
+              if (WGL.DescribePixelFormat(hdc, 1 + i, pfd.size(), pfd) == 0) {
+                throw new GLException("Error describing pixel format " + (1 + i) + " of device context");
+              }
+              availableCaps[i] = WindowsWGLGraphicsConfiguration.PFD2GLCapabilities(glProfile, pfd, onscreen, usePBuffer);
+            }
+          }
+
+          // NOTE: officially, should make a copy of all of these
+          // GLCapabilities to avoid mutation by the end user during the
+          // chooseCapabilities call, but for the time being, assume they
+          // won't be changed
+
+          if(pixelFormat<=0) {
+              if(null!=chooser) {
+                  // Supply information to chooser
+                  try {
+                    pixelFormat = chooser.chooseCapabilities(capabilities, availableCaps, recommendedPixelFormat) + 1;
+                  } catch (NativeWindowException e) {
+                    if(DEBUG) {
+                          e.printStackTrace();
+                    }
+                    pixelFormat = -1;
+                  }
+              } else {
+                  pixelFormat = recommendedPixelFormat;
+              }
+              if (pixelFormat <= 0) {
+                  // keep on going ..
+                  if(DEBUG) {
+                      System.err.println("WindowsWGLGraphicsConfigurationFactory.updateGraphicsConfiguration .. unable to choose config, using first");
+                  }
+                  pixelFormat = 1; // default ..
+              } else if ( pixelFormat > numFormats ) {
+                throw new GLException("Invalid result " + pixelFormat +
+                                      " from GLCapabilitiesChooser (should be between 1 and " +
+                                      numFormats + ")");
+              }
+          }
+          chosenCaps = availableCaps[pixelFormat-1];
+          if (DEBUG) {
+            System.err.println(getThreadName() + ": Chosen pixel format (" + pixelFormat + "):");
+            System.err.println(chosenCaps);
+          }
+          if (WGL.DescribePixelFormat(hdc, pixelFormat, pfd.size(), pfd) == 0) {
+            throw new GLException("Error re-describing the chosen pixel format: " + WGL.GetLastError());
+          }
+        } else {
+          // For now, use ChoosePixelFormat for offscreen surfaces until
+          // we figure out how to properly choose an offscreen-
+          // compatible pixel format
+          pfd = WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(capabilities);
+          pixelFormat = WGL.ChoosePixelFormat(hdc, pfd);
+        }
+        if(!pixelFormatSet) {
+            if (!WGL.SetPixelFormat(hdc, pixelFormat, pfd)) {
+              long lastError = WGL.GetLastError();
+              if (DEBUG) {
+                System.err.println(getThreadName() + ": SetPixelFormat failed: current context = " + WGL.wglGetCurrentContext() +
+                                   ", current DC = " + WGL.wglGetCurrentDC());
+                System.err.println(getThreadName() + ": GetPixelFormat(hdc " + toHexString(hdc) + ") returns " + WGL.GetPixelFormat(hdc));
+              }
+              throw new GLException("Unable to set pixel format " + pixelFormat + " for device context " + toHexString(hdc) + ": error code " + lastError);
+            }
+            pixelFormatSet=true;
+        }
+        // Reuse the previously-constructed GLCapabilities because it
+        // turns out that using DescribePixelFormat on some pixel formats
+        // (which, for example, support full-scene antialiasing) for some
+        // reason return that they are not OpenGL-capable
+        if (chosenCaps != null) {
+          capabilities = chosenCaps;
+        } else {
+          capabilities = WindowsWGLGraphicsConfiguration.PFD2GLCapabilities(glProfile, pfd, onscreen, usePBuffer);
+        }
+        config.setCapsPFD(capabilities, pfd, pixelFormat, choosenBywGLPixelFormat);
+    }
+
+  protected static String getThreadName() {
+    return Thread.currentThread().getName();
+  }
+  public static String toHexString(long hex) {
+      return "0x" + Long.toHexString(hex);
+  }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
new file mode 100644
index 000000000..4458fb1ac
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.impl.windows.wgl.awt;
+
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.windows.*;
+import javax.media.nativewindow.awt.*;
+import javax.media.opengl.*;
+import javax.media.opengl.awt.*;
+
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.windows.wgl.*;
+import com.sun.nativewindow.impl.jawt.*;
+import com.sun.nativewindow.impl.jawt.windows.*;
+
+public class WindowsAWTWGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
+    protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
+
+    public WindowsAWTWGLGraphicsConfigurationFactory() {
+        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.awt.AWTGraphicsDevice.class, this);
+    }
+
+    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
+                                                                     CapabilitiesChooser chooser,
+                                                                     AbstractGraphicsScreen absScreen) {
+        GraphicsDevice device = null;
+        if (absScreen != null &&
+            !(absScreen instanceof AWTGraphicsScreen)) {
+            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only AWTGraphicsScreen objects");
+        }
+
+        if(null==absScreen) {
+            absScreen = AWTGraphicsScreen.createScreenDevice(-1);
+        }
+        AWTGraphicsScreen awtScreen = (AWTGraphicsScreen) absScreen;
+        device = ((AWTGraphicsDevice)awtScreen.getDevice()).getGraphicsDevice();
+
+        if (capabilities != null &&
+            !(capabilities instanceof GLCapabilities)) {
+            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only GLCapabilities objects");
+        }
+
+        if (chooser != null &&
+            !(chooser instanceof GLCapabilitiesChooser)) {
+            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only GLCapabilitiesChooser objects");
+        }
+
+        if(DEBUG) {
+            System.err.println("WindowsAWTWGLGraphicsConfigurationFactory: got "+absScreen);
+        }
+        GraphicsConfiguration gc = device.getDefaultConfiguration();
+        AWTGraphicsConfiguration.setupCapabilitiesRGBABits(capabilities, gc);
+        if(DEBUG) {
+            System.err.println("AWT Colormodel compatible: "+capabilities);
+        }
+
+        long displayHandle = 0;
+
+        WindowsGraphicsDevice winDevice = new WindowsGraphicsDevice();
+        DefaultGraphicsScreen winScreen = new DefaultGraphicsScreen(winDevice, awtScreen.getIndex());
+        if(DEBUG) {
+            System.err.println("WindowsAWTWGLGraphicsConfigurationFactory: made "+winScreen);
+        }
+
+        WindowsWGLGraphicsConfiguration winConfig = (WindowsWGLGraphicsConfiguration)
+            GraphicsConfigurationFactory.getFactory(winDevice).chooseGraphicsConfiguration(capabilities,
+                                                                                           chooser,
+                                                                                           winScreen);
+
+        if (winConfig == null) {
+            throw new GLException("Unable to choose a GraphicsConfiguration: "+capabilities+",\n\t"+chooser+"\n\t"+winScreen);
+        }
+
+        if(DEBUG) {
+            System.err.println("WindowsAWTWGLGraphicsConfigurationFactory: chosen "+winConfig);
+        }
+
+        // FIXME: we have nothing to match .. so choose the default
+        return new AWTGraphicsConfiguration(awtScreen, winConfig.getChosenCapabilities(), winConfig.getRequestedCapabilities(), gc, winConfig);
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
new file mode 100644
index 000000000..cbd98014a
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import javax.media.opengl.*;
+
+import com.jogamp.opengl.impl.*;
+import javax.media.nativewindow.NativeWindowFactory;
+import com.sun.nativewindow.impl.x11.*;
+
+public class GLXUtil {
+    public static boolean isMultisampleAvailable(long display) {
+        try {
+            X11Lib.XLockDisplay(display);
+            String exts = GLX.glXGetClientString(display, GLX.GLX_EXTENSIONS);
+            if (exts != null) {
+                return (exts.indexOf("GLX_ARB_multisample") >= 0);
+            }
+            return false;
+        } finally {
+            X11Lib.XUnlockDisplay(display);
+        }
+    }
+
+    /** Workaround for apparent issue with ATI's proprietary drivers
+        where direct contexts still send GLX tokens for GL calls */
+    public static boolean isVendorATI(long display) {
+        try {
+            X11Lib.XLockDisplay(display);
+            String vendor = GLX.glXGetClientString(display, GLX.GLX_VENDOR);
+            return vendor != null && vendor.startsWith("ATI") ;
+        } finally {
+            X11Lib.XUnlockDisplay(display);
+        }
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
new file mode 100755
index 000000000..b94dac1da
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.NullWindow;
+import com.sun.nativewindow.impl.x11.*;
+
+public class X11ExternalGLXContext extends X11GLXContext {
+  private boolean firstMakeCurrent = true;
+  private boolean created = true;
+  private GLContext lastContext;
+
+  private X11ExternalGLXContext(Drawable drawable, long context) {
+    super(drawable, null);
+    this.context = context;
+    GLContextShareSet.contextCreated(this);
+    setGLFunctionAvailability(false);
+    getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
+  }
+
+  protected static X11ExternalGLXContext create(GLDrawableFactory factory, GLProfile glp) {
+    ((GLDrawableFactoryImpl)factory).lockToolkit();
+    try {
+        long context = GLX.glXGetCurrentContext();
+        if (context == 0) {
+          throw new GLException("Error: current context null");
+        }
+        long display = GLX.glXGetCurrentDisplay();
+        if (display == 0) {
+          throw new GLException("Error: current display null");
+        }
+        long drawable = GLX.glXGetCurrentDrawable();
+        if (drawable == 0) {
+          throw new GLException("Error: attempted to make an external GLDrawable without a drawable/context current");
+        }
+        int[] val = new int[1];
+        GLX.glXQueryContext(display, context, GLX.GLX_SCREEN, val, 0);
+        X11GraphicsScreen x11Screen = (X11GraphicsScreen) X11GraphicsScreen.createScreenDevice(display, val[0]);
+
+        GLX.glXQueryContext(display, context, GLX.GLX_FBCONFIG_ID, val, 0);
+        X11GLXGraphicsConfiguration cfg = X11GLXGraphicsConfiguration.create(glp, x11Screen, val[0]);
+
+        NullWindow nw = new NullWindow(cfg);
+        nw.setSurfaceHandle(drawable);
+        return new X11ExternalGLXContext(new Drawable(factory, nw), context);
+    } finally {
+        ((GLDrawableFactoryImpl)factory).unlockToolkit();
+    }
+  }
+
+  protected void create() {
+  }
+
+  public int makeCurrent() throws GLException {
+    // Save last context if necessary to allow external GLContexts to
+    // talk to other GLContexts created by this library
+    GLContext cur = getCurrent();
+    if (cur != null && cur != this) {
+      lastContext = cur;
+      setCurrent(null);
+    }
+    return super.makeCurrent();
+  }  
+
+  public void release() throws GLException {
+    super.release();
+    setCurrent(lastContext);
+    lastContext = null;
+  }
+
+  protected int makeCurrentImpl() throws GLException {
+    if (firstMakeCurrent) {
+      firstMakeCurrent = false;
+      return CONTEXT_CURRENT_NEW;
+    }
+    return CONTEXT_CURRENT;
+  }
+
+  protected void releaseImpl() throws GLException {
+  }
+
+  protected void destroyImpl() throws GLException {
+    created = false;
+    GLContextShareSet.contextDestroyed(this);
+  }
+
+  public boolean isCreated() {
+    return created;
+  }
+
+  // Need to provide the display connection to extension querying APIs
+  static class Drawable extends X11GLXDrawable {
+    Drawable(GLDrawableFactory factory, NativeWindow comp) {
+      super(factory, comp, true);
+    }
+
+    public GLContext createContext(GLContext shareWith) {
+      throw new GLException("Should not call this");
+    }
+
+    public int getWidth() {
+      throw new GLException("Should not call this");
+    }
+
+    public int getHeight() {
+      throw new GLException("Should not call this");
+    }
+
+    public void setSize(int width, int height) {
+      throw new GLException("Should not call this");
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
new file mode 100755
index 000000000..261b1b370
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.NullWindow;
+import com.sun.nativewindow.impl.x11.*;
+
+import com.jogamp.gluegen.runtime.PointerBuffer;
+
+public class X11ExternalGLXDrawable extends X11GLXDrawable {
+  private int fbConfigID;
+  private int renderType;
+
+  private X11ExternalGLXDrawable(GLDrawableFactory factory, NativeWindow component, int renderType) {
+    super(factory, component, true);
+
+    this.renderType = renderType;
+
+    // Need GLXFBConfig ID in order to properly create new contexts
+    // on this drawable
+    X11GLXGraphicsConfiguration cfg = (X11GLXGraphicsConfiguration) component.getGraphicsConfiguration();
+    fbConfigID = cfg.getFBConfigID();
+  }
+
+  protected static X11ExternalGLXDrawable create(GLDrawableFactory factory, GLProfile glp) {
+    ((GLDrawableFactoryImpl)factory).lockToolkit();
+    try {
+        long context = GLX.glXGetCurrentContext();
+        if (context == 0) {
+          throw new GLException("Error: current context null");
+        }
+        long display = GLX.glXGetCurrentDisplay();
+        if (display == 0) {
+          throw new GLException("Error: current display null");
+        }
+        long drawable = GLX.glXGetCurrentDrawable();
+        if (drawable == 0) {
+          throw new GLException("Error: attempted to make an external GLDrawable without a drawable current");
+        }
+        int[] val = new int[1];
+        GLX.glXQueryContext(display, context, GLX.GLX_SCREEN, val, 0);
+        X11GraphicsScreen x11Screen = (X11GraphicsScreen) X11GraphicsScreen.createScreenDevice(display, val[0]);
+
+        GLX.glXQueryContext(display, context, GLX.GLX_FBCONFIG_ID, val, 0);
+        X11GLXGraphicsConfiguration cfg = X11GLXGraphicsConfiguration.create(glp, x11Screen, val[0]);
+
+        int w, h;
+        GLX.glXQueryDrawable(display, drawable, GLX.GLX_WIDTH, val, 0);
+        w=val[0];
+        GLX.glXQueryDrawable(display, drawable, GLX.GLX_HEIGHT, val, 0);
+        h=val[0];
+
+        GLX.glXQueryContext(display, context, GLX.GLX_RENDER_TYPE, val, 0);
+        if ((val[0] & GLX.GLX_RGBA_TYPE) == 0) {
+          if (DEBUG) {
+            System.err.println("X11ExternalGLXDrawable: WARNING: forcing GLX_RGBA_TYPE for newly created contexts (current 0x"+Integer.toHexString(val[0])+")");
+          }
+        }
+        NullWindow nw = new NullWindow(cfg);
+        nw.setSurfaceHandle(drawable);
+        nw.setSize(w, h);
+        return new X11ExternalGLXDrawable(factory, nw, GLX.GLX_RGBA_TYPE);
+    } finally {
+        ((GLDrawableFactoryImpl)factory).unlockToolkit();
+    }
+  }
+
+  public GLContext createContext(GLContext shareWith) {
+    return new Context(this, shareWith);
+  }
+
+  public void setSize(int newWidth, int newHeight) {
+    throw new GLException("Should not call this");
+  }
+
+  public int getWidth() {
+    return getNativeWindow().getWidth();
+  }  
+
+  public int getHeight() {
+    return getNativeWindow().getHeight();
+  }  
+
+  class Context extends X11GLXContext {
+    Context(X11GLXDrawable drawable, GLContext shareWith) {
+      super(drawable, shareWith);
+    }
+
+    protected void create() {
+      createContext(true);
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
new file mode 100644
index 000000000..629bcb0b9
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
@@ -0,0 +1,555 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import java.nio.*;
+import java.util.*;
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.glx.*;
+import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
+
+public abstract class X11GLXContext extends GLContextImpl {
+  protected long context;
+  private boolean glXQueryExtensionsStringInitialized;
+  private boolean glXQueryExtensionsStringAvailable;
+  private static final Map/*<String, String>*/ functionNameMap;
+  private GLXExt glXExt;
+  // Table that holds the addresses of the native C-language entry points for
+  // GLX extension functions.
+  private GLXExtProcAddressTable glXExtProcAddressTable;
+
+  static {
+    functionNameMap = new HashMap();
+    functionNameMap.put("glAllocateMemoryNV", "glXAllocateMemoryNV");
+    functionNameMap.put("glFreeMemoryNV", "glXFreeMemoryNV");
+  }
+
+  public X11GLXContext(GLDrawableImpl drawable, GLDrawableImpl drawableRead,
+                      GLContext shareWith) {
+    super(drawable, drawableRead, shareWith);
+  }
+
+  public X11GLXContext(GLDrawableImpl drawable,
+                      GLContext shareWith) {
+    this(drawable, null, shareWith);
+  }
+  
+  public final ProcAddressTable getPlatformExtProcAddressTable() {
+    return getGLXExtProcAddressTable();
+  }
+
+  public final GLXExtProcAddressTable getGLXExtProcAddressTable() {
+    return glXExtProcAddressTable;
+  }
+
+  public Object getPlatformGLExtensions() {
+    return getGLXExt();
+  }
+
+  public GLXExt getGLXExt() {
+    if (glXExt == null) {
+      glXExt = new GLXExtImpl(this);
+    }
+    return glXExt;
+  }
+
+  protected String mapToRealGLFunctionName(String glFunctionName) {
+    String lookup = (String) functionNameMap.get(glFunctionName);
+    if (lookup != null) {
+      return lookup;
+    }
+    return glFunctionName;
+  }
+
+  protected String mapToRealGLExtensionName(String glExtensionName) {
+    return glExtensionName;
+  }
+
+  /** Helper routine which usually just turns around and calls
+   * createContext (except for pbuffers, which use a different context
+   * creation mechanism). Should only be called by {@link
+   * makeCurrentImpl()}.
+   */
+  protected abstract void create();
+
+  /**
+   * Creates and initializes an appropriate OpenGL context. Should only be
+   * called by {@link create()}.
+   * Note: The direct parameter may be overwritten by the direct state of a shared context.
+   */
+  protected void createContext(boolean direct) {
+    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    if(DEBUG) {
+          System.err.println("X11GLXContext.createContext got "+config);
+    }
+    long display = config.getScreen().getDevice().getHandle();
+
+    X11GLXContext other = (X11GLXContext) GLContextShareSet.getShareContext(this);
+    long share = 0;
+    if (other != null) {
+      share = other.getContext();
+      if (share == 0) {
+        throw new GLException("GLContextShareSet returned an invalid OpenGL context");
+      }
+      direct = GLX.glXIsDirect(display, share);
+    }
+
+    GLCapabilities glCaps = (GLCapabilities) config.getChosenCapabilities();
+    isVendorATI = GLXUtil.isVendorATI(display);
+
+    if(config.getFBConfigID()<0) {
+        // not able to use FBConfig
+        if(glCaps.getGLProfile().isGL3()) {
+          throw new GLException("Unable to create OpenGL >= 3.1 context");
+        }
+        context = GLX.glXCreateContext(display, config.getXVisualInfo(), share, direct);
+        if (context == 0) {
+          throw new GLException("Unable to create OpenGL context");
+        }
+        if (!GLX.glXMakeContextCurrent(display,
+                                       drawable.getNativeWindow().getSurfaceHandle(), 
+                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                       context)) {
+          throw new GLException("Error making temp context (old2) current: display 0x"+Long.toHexString(display)+", context 0x"+Long.toHexString(context)+", drawable "+drawable);
+        }
+        setGLFunctionAvailability(true);
+        if(DEBUG) {
+              System.err.println("X11GLXContext.createContext done (old2 ctx) 0x"+Long.toHexString(context));
+        }
+
+    } else {
+
+        // To use GLX_ARB_create_context, we have to make a temp context current,
+        // so we are able to use GetProcAddress
+        long temp_context = GLX.glXCreateNewContext(display, config.getFBConfig(), GLX.GLX_RGBA_TYPE, share, direct);
+        if (temp_context == 0) {
+            throw new GLException("Unable to create temp OpenGL context");
+        } else {
+            if (!GLX.glXMakeContextCurrent(display,
+                                           drawable.getNativeWindow().getSurfaceHandle(), 
+                                           drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                           temp_context)) {
+              throw new GLException("Error making temp context (old) current: display 0x"+Long.toHexString(display)+", context 0x"+Long.toHexString(context)+", drawable "+drawable);
+            }
+            setGLFunctionAvailability(true);
+
+            if( !isFunctionAvailable("glXCreateContextAttribsARB") ||
+                !isExtensionAvailable("GLX_ARB_create_context") )  {
+                if(glCaps.getGLProfile().isGL3()) {
+                  GLX.glXMakeContextCurrent(display, 0, 0, 0);
+                  GLX.glXDestroyContext(display, temp_context);
+                  throw new GLException("Unable to create OpenGL >= 3.1 context (no GLX_ARB_create_context)");
+                }
+
+                // continue with temp context for GL < 3.0
+                context = temp_context;
+                if(DEBUG) {
+                  System.err.println("X11GLXContext.createContext done (old ctx < 3.0 - no GLX_ARB_create_context) 0x"+Long.toHexString(context));
+                }
+            } else {
+                GLXExt glXExt = getGLXExt();
+
+                // preset with default values
+                int attribs[] = {
+                    /*  0 */ GLX.GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
+                    /*  2 */ GLX.GLX_CONTEXT_MINOR_VERSION_ARB, 0,
+                    /*  4 */ GLX.GLX_RENDER_TYPE,               GLX.GLX_RGBA_TYPE,
+                    /*  6 */ GLX.GLX_CONTEXT_FLAGS_ARB,         0 /* GLX.GLX_CONTEXT_DEBUG_BIT_ARB */,      
+                    /*  8 */ 0,                                 0,
+                    /* 10 */ 0
+                };
+
+                if(glCaps.getGLProfile().isGL3()) {
+                    // Try >= 3.2 core first 
+                    // and verify with a None drawable binding (default framebuffer)
+                    attribs[0+1]  = 3;
+                    attribs[2+1]  = 2;
+                    if(glCaps.getGLProfile().isGL3bc()) {
+                        attribs[8+0]  = GLX.GLX_CONTEXT_PROFILE_MASK_ARB;
+                        attribs[8+1]  = GLX.GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
+                    }
+                    /**
+                     * don't stricten requirements any further, even compatible would be fine
+                     *
+                     } else {
+                        attribs[8+0]  = GLX.GLX_CONTEXT_PROFILE_MASK_ARB;
+                        attribs[8+1]  = GLX.GLX_CONTEXT_CORE_PROFILE_BIT_ARB;
+                     } 
+                     */
+
+                    context = glXExt.glXCreateContextAttribsARB(display, config.getFBConfig(), share, direct, attribs, 0);
+                    if(0!=context) {
+                        if (!GLX.glXMakeContextCurrent(display,
+                                                       drawable.getNativeWindow().getSurfaceHandle(), 
+                                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                                       context)) {
+                            if(DEBUG) {
+                              System.err.println("X11GLXContext.createContext couldn't make >= 3.2 core context current - fallback");
+                            }
+                            GLX.glXMakeContextCurrent(display, 0, 0, 0);
+                            GLX.glXDestroyContext(display, context);
+                            context = 0;
+                        } else if(DEBUG) {
+                          System.err.println("X11GLXContext.createContext >= 3.2 available 0x"+Long.toHexString(context));
+                        }
+                    } else {
+                        if(DEBUG) {
+                          System.err.println("X11GLXContext.createContext couldn't create >= 3.2 core context - fallback");
+                        }
+                    }
+                    if(0==context) {
+                        // Try >= 3.1 forward compatible - last resort for GL3 !
+                        attribs[0+1]  = 3;
+                        attribs[2+1]  = 1;
+                        if(!glCaps.getGLProfile().isGL3bc()) {
+                            attribs[6+1] |= GLX.GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
+                        }
+                        attribs[8+0]  = 0;
+                        attribs[8+1]  = 0;
+                    }
+                }
+                if(0==context) {
+                    // 3.1 or 3.0 ..
+                    context = glXExt.glXCreateContextAttribsARB(display, config.getFBConfig(), share, direct, attribs, 0);
+                    if(0!=context) {
+                        if (!GLX.glXMakeContextCurrent(display,
+                                                       drawable.getNativeWindow().getSurfaceHandle(), 
+                                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                                       context)) {
+                            if(DEBUG) {
+                              System.err.println("X11GLXContext.createContext couldn't make >= 3.0 core context current - fallback");
+                            }
+                            GLX.glXMakeContextCurrent(display, 0, 0, 0);
+                            GLX.glXDestroyContext(display, context);
+                            context = 0;
+                        } else if(DEBUG) {
+                          System.err.println("X11GLXContext.createContext >= 3.0 available 0x"+Long.toHexString(context));
+                        }
+                    } else {
+                        if(DEBUG) {
+                          System.err.println("X11GLXContext.createContext couldn't create >= 3.0 core context - fallback");
+                        }
+                    }
+                }
+
+                if(0==context) {
+                    if(glCaps.getGLProfile().isGL3()) {
+                      GLX.glXMakeContextCurrent(display, 0, 0, 0);
+                      GLX.glXDestroyContext(display, temp_context);
+                      throw new GLException("Unable to create OpenGL >= 3.1 context (have GLX_ARB_create_context)");
+                    }
+
+                    // continue with temp context for GL < 3.0
+                    context = temp_context;
+                    if (!GLX.glXMakeContextCurrent(display,
+                                                   drawable.getNativeWindow().getSurfaceHandle(), 
+                                                   drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                                   context)) {
+                      GLX.glXMakeContextCurrent(display, 0, 0, 0);
+                      GLX.glXDestroyContext(display, temp_context);
+                      throw new GLException("Error making context (old) current: display 0x"+Long.toHexString(display)+", context 0x"+Long.toHexString(context)+", drawable "+drawable);
+                    }
+                    if(DEBUG) {
+                      System.err.println("X11GLXContext.createContext done (old ctx < 3.0 - no 3.0) 0x"+Long.toHexString(context));
+                    }
+                } else {
+                    GLX.glXDestroyContext(display, temp_context);
+
+                    // need to update the GL func table ..
+                    updateGLProcAddressTable();
+                    if(DEBUG) {
+                      System.err.println("X11GLXContext.createContext done (new ctx >= 3.0) 0x"+Long.toHexString(context));
+                    }
+                }
+            }
+        } 
+    } 
+    GLContextShareSet.contextCreated(this);
+  }
+
+  // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
+  protected int makeCurrentImpl() throws GLException {
+    int lockRes = drawable.lockSurface();
+    boolean exceptionOccurred = false;
+    try {
+      if (lockRes == NativeWindow.LOCK_SURFACE_NOT_READY) {
+        return CONTEXT_NOT_CURRENT;
+      }
+      return makeCurrentImplAfterLock();
+    } catch (RuntimeException e) {
+      exceptionOccurred = true;
+      throw e;
+    } finally {
+      if (exceptionOccurred ||
+          (isOptimizable() && lockRes != NativeWindow.LOCK_SURFACE_NOT_READY) && drawable.isSurfaceLocked()) {
+        drawable.unlockSurface();
+      }
+    }
+  }
+
+  // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
+  protected void releaseImpl() throws GLException {
+    try {
+      releaseImplAfterLock();
+    } finally {
+      if (!isOptimizable() && drawable.isSurfaceLocked()) {
+        drawable.unlockSurface();
+      }
+    }
+  }
+
+  protected int makeCurrentImplAfterLock() throws GLException {
+    getDrawableImpl().getFactoryImpl().lockToolkit();
+    try {
+        if (drawable.getNativeWindow().getSurfaceHandle() == 0) {
+            if (DEBUG) {
+              System.err.println("drawable not properly initialized");
+            }
+            return CONTEXT_NOT_CURRENT;
+        }
+        boolean created = false;
+        if (context == 0) {
+          create();
+          if (DEBUG) {
+            System.err.println(getThreadName() + ": !!! Created GL context for " + getClass().getName());
+          }
+          created = true;
+        }
+
+        if (GLX.glXGetCurrentContext() != context) {
+            
+            if (!GLX.glXMakeContextCurrent(drawable.getNativeWindow().getDisplayHandle(), 
+                                           drawable.getNativeWindow().getSurfaceHandle(), 
+                                           drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                           context)) {
+              throw new GLException("Error making context current");
+            }
+            if (DEBUG && (VERBOSE || created)) {
+              System.err.println(getThreadName() + ": glXMakeCurrent(display " + 
+                                 toHexString(drawable.getNativeWindow().getDisplayHandle()) +
+                                 ", drawable " + toHexString(drawable.getNativeWindow().getSurfaceHandle()) +
+                                 ", drawableRead " + toHexString(drawableRead.getNativeWindow().getSurfaceHandle()) +
+                                 ", context " + toHexString(context) + ") succeeded");
+            }
+        }
+
+        if (created) {
+          setGLFunctionAvailability(false);
+          return CONTEXT_CURRENT_NEW;
+        }
+        return CONTEXT_CURRENT;
+    } finally {
+        getDrawableImpl().getFactoryImpl().unlockToolkit();
+    }
+  }
+
+  protected void releaseImplAfterLock() throws GLException {
+    getDrawableImpl().getFactoryImpl().lockToolkit();
+    try {
+        if (!GLX.glXMakeContextCurrent(drawable.getNativeWindow().getDisplayHandle(), 0, 0, 0)) {
+            throw new GLException("Error freeing OpenGL context");
+        }
+    } finally {
+        getDrawableImpl().getFactoryImpl().unlockToolkit();
+    }
+  }
+
+  protected void destroyImpl() throws GLException {
+    getDrawableImpl().getFactoryImpl().lockToolkit();
+    try {
+        if (context != 0) {
+            if (DEBUG) {
+              System.err.println("glXDestroyContext(0x" +
+                                 Long.toHexString(drawable.getNativeWindow().getDisplayHandle()) +
+                                 ", 0x" +
+                                 Long.toHexString(context) + ")");
+            }
+            GLX.glXDestroyContext(drawable.getNativeWindow().getDisplayHandle(), context);
+            if (DEBUG) {
+              System.err.println("!!! Destroyed OpenGL context " + context);
+            }
+            context = 0;
+            GLContextShareSet.contextDestroyed(this);
+        }
+    } finally {
+        getDrawableImpl().getFactoryImpl().unlockToolkit();
+    }
+  }
+
+  public boolean isCreated() {
+    return (context != 0);
+  }
+
+  public void copy(GLContext source, int mask) throws GLException {
+    long dst = getContext();
+    long src = ((X11GLXContext) source).getContext();
+    if (src == 0) {
+      throw new GLException("Source OpenGL context has not been created");
+    }
+    if (dst == 0) {
+      throw new GLException("Destination OpenGL context has not been created");
+    }
+    if (drawable.getNativeWindow().getDisplayHandle() == 0) {
+      throw new GLException("Connection to X display not yet set up");
+    }
+    getDrawableImpl().getFactoryImpl().lockToolkit();
+    try {
+      GLX.glXCopyContext(drawable.getNativeWindow().getDisplayHandle(), src, dst, mask);
+      // Should check for X errors and raise GLException
+    } finally {
+      getDrawableImpl().getFactoryImpl().unlockToolkit();
+    }
+  }
+
+  protected void updateGLProcAddressTable() {
+    if (DEBUG) {
+      System.err.println(getThreadName() + ": !!! Initializing GLX extension address table");
+    }
+    glXQueryExtensionsStringInitialized = false;
+    glXQueryExtensionsStringAvailable = false;
+
+    if (glXExtProcAddressTable == null) {
+      // FIXME: cache ProcAddressTables by capability bits so we can
+      // share them among contexts with the same capabilities
+      glXExtProcAddressTable = new GLXExtProcAddressTable();
+    }          
+    resetProcAddressTable(getGLXExtProcAddressTable());
+    super.updateGLProcAddressTable();
+  }
+
+  public synchronized String getPlatformExtensionsString() {
+    if (!glXQueryExtensionsStringInitialized) {
+      glXQueryExtensionsStringAvailable =
+        getDrawableImpl().getDynamicLookupHelper().dynamicLookupFunction("glXQueryExtensionsString") != 0;
+      glXQueryExtensionsStringInitialized = true;
+    }
+    if (glXQueryExtensionsStringAvailable) {
+      GLDrawableFactoryImpl factory = getDrawableImpl().getFactoryImpl();
+      factory.lockToolkit();
+      try {
+        String ret = GLX.glXQueryExtensionsString(drawable.getNativeWindow().getDisplayHandle(), 
+                                                  drawable.getNativeWindow().getScreenIndex());
+        if (DEBUG) {
+          System.err.println("!!! GLX extensions: " + ret);
+        }
+        return ret;
+      } finally {
+        factory.unlockToolkit();
+      }
+    } else {
+      return "";
+    }
+  }
+
+  public boolean isExtensionAvailable(String glExtensionName) {
+    if (glExtensionName.equals("GL_ARB_pbuffer") ||
+        glExtensionName.equals("GL_ARB_pixel_format")) {
+      return getGLDrawable().getFactory().canCreateGLPbuffer();
+    }
+    return super.isExtensionAvailable(glExtensionName);
+  }
+
+
+  private int hasSwapIntervalSGI = 0;
+
+  protected void setSwapIntervalImpl(int interval) {
+    getDrawableImpl().getFactoryImpl().lockToolkit();
+    try {
+      GLXExt glXExt = getGLXExt();
+      if(0==hasSwapIntervalSGI) {
+        try {
+            hasSwapIntervalSGI = glXExt.isExtensionAvailable("GLX_SGI_swap_control")?1:-1;
+        } catch (Throwable t) { hasSwapIntervalSGI=1; }
+      }
+      if (hasSwapIntervalSGI>0) {
+        try {
+            if( 0 == glXExt.glXSwapIntervalSGI(interval) ) {
+                currentSwapInterval = interval;
+            }
+        } catch (Throwable t) { hasSwapIntervalSGI=-1; }
+      }
+    } finally {
+      getDrawableImpl().getFactoryImpl().unlockToolkit();
+    }
+  }
+
+  public ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3) {
+    return getGLXExt().glXAllocateMemoryNV(arg0, arg1, arg2, arg3);
+  }
+
+  public int getOffscreenContextPixelDataType() {
+    throw new GLException("Should not call this");
+  }
+
+  public int getOffscreenContextReadBuffer() {
+    throw new GLException("Should not call this");
+  }
+
+  public boolean offscreenImageNeedsVerticalFlip() {
+    throw new GLException("Should not call this");
+  }
+
+  public void bindPbufferToTexture() {
+    throw new GLException("Should not call this");
+  }
+
+  public void releasePbufferFromTexture() {
+    throw new GLException("Should not call this");
+  }
+
+  public boolean isOptimizable() {
+    return (super.isOptimizable() && !isVendorATI);
+  }
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  public long getContext() {
+    return context;
+  }
+
+  private boolean isVendorATI = false;
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
new file mode 100644
index 000000000..fe030af00
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
+
+public abstract class X11GLXDrawable extends GLDrawableImpl {
+  protected X11GLXDrawable(GLDrawableFactory factory, NativeWindow comp, boolean realized) {
+    super(factory, comp, realized);
+  }
+
+  public DynamicLookupHelper getDynamicLookupHelper() {
+    return (X11GLXDrawableFactory) getFactoryImpl() ;
+  }
+
+  protected void setRealizedImpl() {
+    if(!realized) {
+        return; // nothing to do 
+    }
+
+    if(NativeWindow.LOCK_SURFACE_NOT_READY == lockSurface()) {
+      throw new GLException("X11GLXDrawable.setRealized(true): lockSurface - surface not ready");
+    }
+    try {
+        X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+        config.updateGraphicsConfiguration();
+
+        if (DEBUG) {
+          System.err.println("!!! X11GLXDrawable.setRealized(true): "+config);
+        }
+    } finally {
+        unlockSurface();
+    }
+  }
+
+  protected void swapBuffersImpl() {
+    boolean didLock = false;
+    try {
+      if ( !isSurfaceLocked() ) {
+          // Usually the surface shall be locked within [makeCurrent .. swap .. release]
+          if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
+              return;
+          }
+          didLock=true;
+      }
+
+      GLX.glXSwapBuffers(component.getDisplayHandle(), component.getSurfaceHandle());
+
+    } finally {
+      if(didLock) {
+          unlockSurface();
+      }
+    }
+  }
+
+  //---------------------------------------------------------------------------
+  // Internals only below this point
+  //
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
new file mode 100644
index 000000000..089a516ee
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import java.nio.*;
+import java.security.*;
+import java.util.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+import javax.media.opengl.*;
+import com.jogamp.gluegen.runtime.*;
+import com.jogamp.gluegen.runtime.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.glx.*;
+import com.sun.nativewindow.impl.NullWindow;
+import com.sun.nativewindow.impl.NWReflection;
+import com.sun.nativewindow.impl.x11.*;
+
+public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
+  public X11GLXDrawableFactory() {
+    super();
+    // Must initialize GLX support eagerly in case a pbuffer is the
+    // first thing instantiated
+    GLProcAddressHelper.resetProcAddressTable(GLX.getGLXProcAddressTable(), this);
+    // Register our GraphicsConfigurationFactory implementations
+    // The act of constructing them causes them to be registered
+    new X11GLXGraphicsConfigurationFactory();
+    try {
+      NWReflection.createInstance("com.jogamp.opengl.impl.x11.glx.awt.X11AWTGLXGraphicsConfigurationFactory",
+                                  new Object[] {});
+    } catch (Throwable t) { }
+  }
+
+  public GLDrawableImpl createOnscreenDrawable(NativeWindow target) {
+    if (target == null) {
+      throw new IllegalArgumentException("Null target");
+    }
+    return new X11OnscreenGLXDrawable(this, target);
+  }
+
+  protected GLDrawableImpl createOffscreenDrawable(NativeWindow target) {
+    return new X11OffscreenGLXDrawable(this, target);
+  }
+
+  private boolean pbufferSupportInitialized = false;
+  private boolean canCreateGLPbuffer = false;
+  public boolean canCreateGLPbuffer() {
+    if (!pbufferSupportInitialized) {
+        long display = X11Util.getThreadLocalDefaultDisplay();
+        int[] major = new int[1];
+        int[] minor = new int[1];
+        int screen = 0; // FIXME: provide way to specify this?
+
+        if (!GLX.glXQueryVersion(display, major, 0, minor, 0)) {
+          throw new GLException("glXQueryVersion failed");
+        }
+        if (DEBUG) {
+          System.err.println("!!! GLX version: major " + major[0] +
+                             ", minor " + minor[0]);
+        }
+
+        // Work around bugs in ATI's Linux drivers where they report they
+        // only implement GLX version 1.2 on the server side
+        if (major[0] == 1 && minor[0] == 2) {
+          String str = GLX.glXGetClientString(display, GLX.GLX_VERSION);
+          if (str != null && str.startsWith("1.") &&
+             (str.charAt(2) >= '3')) {
+            canCreateGLPbuffer = true;
+          }
+        } else {
+          canCreateGLPbuffer = ((major[0] > 1) || (minor[0] > 2));
+        }
+
+        pbufferSupportInitialized = true;        
+    }
+    return canCreateGLPbuffer;
+  }
+
+  protected GLDrawableImpl createGLPbufferDrawableImpl(final NativeWindow target) {
+    /** 
+     * FIXME: Think about this ..
+     * should not be necessary ? ..
+    final List returnList = new ArrayList();
+    final GLDrawableFactory factory = this;
+    Runnable r = new Runnable() {
+        public void run() {
+          returnList.add(new X11PbufferGLXDrawable(factory, target));
+        }
+      };
+    maybeDoSingleThreadedWorkaround(r);
+    return (GLDrawableImpl) returnList.get(0);
+    */
+    return new X11PbufferGLXDrawable(this, target);
+  }
+
+
+  protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
+    AbstractGraphicsScreen screen = X11GraphicsScreen.createDefault();
+    NullWindow nw = new NullWindow(X11GLXGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(capabilities, chooser, screen));
+    nw.setSize(width, height);
+    return nw;
+  }
+
+  public GLContext createExternalGLContext() {
+    return X11ExternalGLXContext.create(this, null);
+  }
+
+  public boolean canCreateExternalGLDrawable() {
+    return canCreateGLPbuffer();
+  }
+
+  public GLDrawable createExternalGLDrawable() {
+    return X11ExternalGLXDrawable.create(this, null);
+  }
+
+  public void loadGLULibrary() {
+    X11Lib.dlopen("/usr/lib/libGLU.so");
+  }
+
+  public long dynamicLookupFunction(String glFuncName) {
+    long res = 0;
+    res = GLX.glXGetProcAddressARB(glFuncName);
+    if (res == 0) {
+      // GLU routines aren't known to the OpenGL function lookup
+      res = X11Lib.dlsym(glFuncName);
+    }
+    return res;
+  }
+
+  public boolean canCreateContextOnJava2DSurface() {
+    return false;
+  }
+
+  public GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
+    throws GLException {
+    throw new GLException("Unimplemented on this platform");
+  }
+
+  //----------------------------------------------------------------------
+  // Gamma-related functionality
+  //
+
+  private boolean gotGammaRampLength;
+  private int gammaRampLength;
+  protected synchronized int getGammaRampLength() {
+    if (gotGammaRampLength) {
+      return gammaRampLength;
+    }
+
+    long display = X11Util.getThreadLocalDefaultDisplay();
+    try {
+        X11Lib.XLockDisplay(display);
+        int[] size = new int[1];
+        boolean res = X11Lib.XF86VidModeGetGammaRampSize(display,
+                                                      X11Lib.DefaultScreen(display),
+                                                      size, 0);
+        if (!res) {
+          return 0;
+        }
+        gotGammaRampLength = true;
+        gammaRampLength = size[0];
+        return gammaRampLength;
+    } finally {
+        X11Lib.XUnlockDisplay(display);
+    }
+  }
+
+  protected boolean setGammaRamp(float[] ramp) {
+    int len = ramp.length;
+    short[] rampData = new short[len];
+    for (int i = 0; i < len; i++) {
+      rampData[i] = (short) (ramp[i] * 65535);
+    }
+
+    long display = X11Util.getThreadLocalDefaultDisplay();
+    try {
+        X11Lib.XLockDisplay(display);
+        boolean res = X11Lib.XF86VidModeSetGammaRamp(display,
+                                                  X11Lib.DefaultScreen(display),
+                                                  rampData.length,
+                                                  rampData, 0,
+                                                  rampData, 0,
+                                                  rampData, 0);
+        return res;
+    } finally {
+        X11Lib.XUnlockDisplay(display);
+    }
+  }
+
+  protected Buffer getGammaRamp() {
+    int size = getGammaRampLength();
+    ShortBuffer rampData = ShortBuffer.wrap(new short[3 * size]);
+    rampData.position(0);
+    rampData.limit(size);
+    ShortBuffer redRampData = rampData.slice();
+    rampData.position(size);
+    rampData.limit(2 * size);
+    ShortBuffer greenRampData = rampData.slice();
+    rampData.position(2 * size);
+    rampData.limit(3 * size);
+    ShortBuffer blueRampData = rampData.slice();
+    long display = X11Util.getThreadLocalDefaultDisplay();
+    try {
+        X11Lib.XLockDisplay(display);
+        boolean res = X11Lib.XF86VidModeGetGammaRamp(display,
+                                                  X11Lib.DefaultScreen(display),
+                                                  size,
+                                                  redRampData,
+                                                  greenRampData,
+                                                  blueRampData);
+        if (!res) {
+          return null;
+        }
+        return rampData;
+    } finally {
+        X11Lib.XUnlockDisplay(display);
+    }
+  }
+
+  protected void resetGammaRamp(Buffer originalGammaRamp) {
+    if (originalGammaRamp == null)
+      return; // getGammaRamp failed originally
+    ShortBuffer rampData = (ShortBuffer) originalGammaRamp;
+    int capacity = rampData.capacity();
+    if ((capacity % 3) != 0) {
+      throw new IllegalArgumentException("Must not be the original gamma ramp");
+    }
+    int size = capacity / 3;
+    rampData.position(0);
+    rampData.limit(size);
+    ShortBuffer redRampData = rampData.slice();
+    rampData.position(size);
+    rampData.limit(2 * size);
+    ShortBuffer greenRampData = rampData.slice();
+    rampData.position(2 * size);
+    rampData.limit(3 * size);
+    ShortBuffer blueRampData = rampData.slice();
+    long display = X11Util.getThreadLocalDefaultDisplay();
+    try {
+        X11Lib.XLockDisplay(display);
+        X11Lib.XF86VidModeSetGammaRamp(display,
+                                    X11Lib.DefaultScreen(display),
+                                    size,
+                                    redRampData,
+                                    greenRampData,
+                                    blueRampData);
+    } finally {
+        X11Lib.XUnlockDisplay(display);
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
new file mode 100644
index 000000000..498605594
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
@@ -0,0 +1,416 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import java.util.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.PointerBuffer;
+import com.sun.nativewindow.impl.x11.*;
+
+public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implements Cloneable {
+    protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
+    
+    public static final int MAX_ATTRIBS = 128;
+    private long fbConfig;
+    private int  fbConfigID;
+    private GLCapabilitiesChooser chooser; 
+
+    public X11GLXGraphicsConfiguration(X11GraphicsScreen screen, 
+                                       GLCapabilities capsChosen, GLCapabilities capsRequested, GLCapabilitiesChooser chooser,
+                                       XVisualInfo info, long fbcfg, int fbcfgID) {
+        super(screen, capsChosen, capsRequested, info);
+        this.chooser=chooser;
+        fbConfig = fbcfg;
+        fbConfigID = fbcfgID;
+    }
+
+    public static X11GLXGraphicsConfiguration create(GLProfile glp, X11GraphicsScreen x11Screen, int fbcfgID) {
+      long display = x11Screen.getDevice().getHandle();
+      if(0==display) {
+          throw new GLException("Display null of "+x11Screen);
+      }
+      int screen = x11Screen.getIndex();
+      long fbcfg = glXFBConfigID2FBConfig(display, screen, fbcfgID);
+      if(0==fbcfg) {
+          throw new GLException("FBConfig null of 0x"+Integer.toHexString(fbcfgID));
+      }
+      if(null==glp) {
+        glp = GLProfile.getDefault();
+      }
+      GLCapabilities caps = GLXFBConfig2GLCapabilities(glp, display, fbcfg, true, true, true, GLXUtil.isMultisampleAvailable(display));
+      if(null==caps) {
+          throw new GLException("GLCapabilities null of 0x"+Long.toHexString(fbcfg));
+      }
+      XVisualInfo xvi = GLX.glXGetVisualFromFBConfigCopied(display, fbcfg);
+      if(null==xvi) {
+          throw new GLException("XVisualInfo null of 0x"+Long.toHexString(fbcfg));
+      }
+      return new X11GLXGraphicsConfiguration(x11Screen, caps, caps, new DefaultGLCapabilitiesChooser(), xvi, fbcfg, fbcfgID);
+    }
+
+    public Object clone() {
+        return super.clone();
+    }
+
+    public long getFBConfig()   { return fbConfig; }
+    public int  getFBConfigID() { return fbConfigID; }
+
+    protected void updateGraphicsConfiguration() {
+        X11GLXGraphicsConfiguration newConfig = (X11GLXGraphicsConfiguration)
+            GraphicsConfigurationFactory.getFactory(getScreen().getDevice()).chooseGraphicsConfiguration(getRequestedCapabilities(),
+                                                                                                         chooser,
+                                                                                                         getScreen());
+        if(null!=newConfig) {
+            // FIXME: setScreen( ... );
+            setXVisualInfo(newConfig.getXVisualInfo());
+            setChosenCapabilities(newConfig.getChosenCapabilities());
+            fbConfig = newConfig.getFBConfig();
+            fbConfigID = newConfig.getFBConfigID();
+            if(DEBUG) {
+                System.err.println("!!! updateGraphicsConfiguration: "+this);
+            }
+        }
+    }
+
+    public static int[] GLCapabilities2AttribList(GLCapabilities caps,
+                                                  boolean forFBAttr,
+                                                  boolean isMultisampleAvailable,
+                                                  long display,
+                                                  int screen) 
+    {
+        int colorDepth = (caps.getRedBits() +
+                          caps.getGreenBits() +
+                          caps.getBlueBits());
+        if (colorDepth < 15) {
+          throw new GLException("Bit depths < 15 (i.e., non-true-color) not supported");
+        }
+        int[] res = new int[MAX_ATTRIBS];
+        int idx = 0;
+
+        if (forFBAttr) {
+          res[idx++] = GLX.GLX_DRAWABLE_TYPE;
+          res[idx++] = caps.isOnscreen() ? ( GLX.GLX_WINDOW_BIT ) : ( caps.isPBuffer() ? GLX.GLX_PBUFFER_BIT : GLX.GLX_PIXMAP_BIT ) ;
+        }
+
+        if (forFBAttr) {
+          res[idx++] = GLX.GLX_RENDER_TYPE;
+          res[idx++] = GLX.GLX_RGBA_BIT;
+        } else {
+          res[idx++] = GLX.GLX_RGBA;
+        }
+
+        // FIXME: Still a bug is Mesa: PBUFFER && GLX_STEREO==GL_FALSE ?
+        if (forFBAttr) {
+            res[idx++] = GLX.GLX_DOUBLEBUFFER;
+            res[idx++] = caps.getDoubleBuffered()?GL.GL_TRUE:GL.GL_FALSE;
+            res[idx++] = GLX.GLX_STEREO;
+            res[idx++] = caps.getStereo()?GL.GL_TRUE:GL.GL_FALSE;
+            res[idx++] = GLX.GLX_TRANSPARENT_TYPE;
+            res[idx++] = caps.isBackgroundOpaque()?GLX.GLX_NONE:GLX.GLX_TRANSPARENT_RGB;
+            if(!caps.isBackgroundOpaque()) {
+                res[idx++] = GLX.GLX_TRANSPARENT_RED_VALUE;
+                res[idx++] = caps.getTransparentRedValue()>=0?caps.getTransparentRedValue():(int)GLX.GLX_DONT_CARE;
+                res[idx++] = GLX.GLX_TRANSPARENT_GREEN_VALUE;
+                res[idx++] = caps.getTransparentGreenValue()>=0?caps.getTransparentGreenValue():(int)GLX.GLX_DONT_CARE;
+                res[idx++] = GLX.GLX_TRANSPARENT_BLUE_VALUE;
+                res[idx++] = caps.getTransparentBlueValue()>=0?caps.getTransparentBlueValue():(int)GLX.GLX_DONT_CARE;
+                res[idx++] = GLX.GLX_TRANSPARENT_ALPHA_VALUE;
+                res[idx++] = caps.getTransparentAlphaValue()>=0?caps.getTransparentAlphaValue():(int)GLX.GLX_DONT_CARE;
+            }
+        } else {
+            if (caps.getDoubleBuffered()) {
+              res[idx++] = GLX.GLX_DOUBLEBUFFER;
+            }
+            if (caps.getStereo()) {
+              res[idx++] = GLX.GLX_STEREO;
+            }
+        }
+
+        res[idx++] = GLX.GLX_RED_SIZE;
+        res[idx++] = caps.getRedBits();
+        res[idx++] = GLX.GLX_GREEN_SIZE;
+        res[idx++] = caps.getGreenBits();
+        res[idx++] = GLX.GLX_BLUE_SIZE;
+        res[idx++] = caps.getBlueBits();
+        res[idx++] = GLX.GLX_ALPHA_SIZE;
+        res[idx++] = caps.getAlphaBits();
+        res[idx++] = GLX.GLX_DEPTH_SIZE;
+        res[idx++] = caps.getDepthBits();
+        if (caps.getStencilBits() > 0) {
+          res[idx++] = GLX.GLX_STENCIL_SIZE;
+          res[idx++] = caps.getStencilBits();
+        }
+        if (caps.getAccumRedBits()   > 0 ||
+            caps.getAccumGreenBits() > 0 ||
+            caps.getAccumBlueBits()  > 0 ||
+            caps.getAccumAlphaBits() > 0) {
+          res[idx++] = GLX.GLX_ACCUM_RED_SIZE;
+          res[idx++] = caps.getAccumRedBits();
+          res[idx++] = GLX.GLX_ACCUM_GREEN_SIZE;
+          res[idx++] = caps.getAccumGreenBits();
+          res[idx++] = GLX.GLX_ACCUM_BLUE_SIZE;
+          res[idx++] = caps.getAccumBlueBits();
+          res[idx++] = GLX.GLX_ACCUM_ALPHA_SIZE;
+          res[idx++] = caps.getAccumAlphaBits();
+        }
+        if (isMultisampleAvailable && caps.getSampleBuffers()) {
+          res[idx++] = GLX.GLX_SAMPLE_BUFFERS;
+          res[idx++] = GL.GL_TRUE;
+          res[idx++] = GLX.GLX_SAMPLES;
+          res[idx++] = caps.getNumSamples();
+        }
+        if (caps.isPBuffer()) {
+          if (caps.getPbufferFloatingPointBuffers()) {
+            String glXExtensions = GLX.glXQueryExtensionsString(display, screen);
+            if (glXExtensions == null ||
+                glXExtensions.indexOf("GLX_NV_float_buffer") < 0) {
+              throw new GLException("Floating-point pbuffers on X11 currently require NVidia hardware: "+glXExtensions);
+            }
+            res[idx++] = GLXExt.GLX_FLOAT_COMPONENTS_NV;
+            res[idx++] = GL.GL_TRUE;
+          }
+        }
+        res[idx++] = 0;
+        return res;
+  }
+
+  // FBConfig
+
+  public static boolean GLXFBConfigValid(long display, long fbcfg) {
+    int[] tmp = new int[1];
+    if(GLX.GLX_BAD_ATTRIBUTE == GLX.glXGetFBConfigAttrib(display, fbcfg, GLX.GLX_RENDER_TYPE, tmp, 0)) {
+      return false;
+    }
+    return true;
+  }
+
+  public static boolean GLXFBConfigDrawableTypeVerify(int val, boolean onscreen, boolean usePBuffer) {
+    boolean res;
+
+    if ( onscreen ) {
+        res = ( 0 != (val & GLX.GLX_WINDOW_BIT) ) ;
+    } else {
+        res = ( 0 != (val & GLX.GLX_PIXMAP_BIT) ) || usePBuffer ;
+    }
+    if ( usePBuffer ) {
+        res = res && ( 0 != (val & GLX.GLX_PBUFFER_BIT) ) ;
+    }
+
+    return res;
+  }
+
+  public static GLCapabilities GLXFBConfig2GLCapabilities(GLProfile glp, long display, long fbcfg, 
+                                                          boolean relaxed, boolean onscreen, boolean usePBuffer, boolean isMultisampleEnabled) {
+    int[] tmp = new int[1];
+    int val;
+    val = glXGetFBConfig(display, fbcfg, GLX.GLX_RENDER_TYPE, tmp, 0);
+    if (val != GLX.GLX_RGBA_BIT) {
+      throw new GLException("Visual does not support RGBA");
+    }
+    GLCapabilities res = new GLCapabilities(glp);
+
+    val = glXGetFBConfig(display, fbcfg, GLX.GLX_DRAWABLE_TYPE, tmp, 0);
+    if(GLXFBConfigDrawableTypeVerify(val, onscreen, usePBuffer)) {
+        res.setOnscreen(onscreen);
+        res.setPBuffer(usePBuffer);
+    } else if(relaxed) {
+        res.setOnscreen( 0 != (val & GLX.GLX_WINDOW_BIT) );
+        res.setPBuffer ( 0 != (val & GLX.GLX_PBUFFER_BIT) );
+    } else {
+        throw new GLException("GLX_DRAWABLE_TYPE does not match !!!");
+    }
+    res.setDoubleBuffered(glXGetFBConfig(display, fbcfg, GLX.GLX_DOUBLEBUFFER,     tmp, 0) != 0);
+    res.setStereo        (glXGetFBConfig(display, fbcfg, GLX.GLX_STEREO,           tmp, 0) != 0);
+    res.setHardwareAccelerated(glXGetFBConfig(display, fbcfg, GLX.GLX_CONFIG_CAVEAT, tmp, 0) != GLX.GLX_SLOW_CONFIG);
+    res.setDepthBits     (glXGetFBConfig(display, fbcfg, GLX.GLX_DEPTH_SIZE,       tmp, 0));
+    res.setStencilBits   (glXGetFBConfig(display, fbcfg, GLX.GLX_STENCIL_SIZE,     tmp, 0));
+    res.setRedBits       (glXGetFBConfig(display, fbcfg, GLX.GLX_RED_SIZE,         tmp, 0));
+    res.setGreenBits     (glXGetFBConfig(display, fbcfg, GLX.GLX_GREEN_SIZE,       tmp, 0));
+    res.setBlueBits      (glXGetFBConfig(display, fbcfg, GLX.GLX_BLUE_SIZE,        tmp, 0));
+    res.setAlphaBits     (glXGetFBConfig(display, fbcfg, GLX.GLX_ALPHA_SIZE,       tmp, 0));
+    res.setAccumRedBits  (glXGetFBConfig(display, fbcfg, GLX.GLX_ACCUM_RED_SIZE,   tmp, 0));
+    res.setAccumGreenBits(glXGetFBConfig(display, fbcfg, GLX.GLX_ACCUM_GREEN_SIZE, tmp, 0));
+    res.setAccumBlueBits (glXGetFBConfig(display, fbcfg, GLX.GLX_ACCUM_BLUE_SIZE,  tmp, 0));
+    res.setAccumAlphaBits(glXGetFBConfig(display, fbcfg, GLX.GLX_ACCUM_ALPHA_SIZE, tmp, 0));
+    if (isMultisampleEnabled) {
+      res.setSampleBuffers(glXGetFBConfig(display, fbcfg, GLX.GLX_SAMPLE_BUFFERS, tmp, 0) != 0);
+      res.setNumSamples   (glXGetFBConfig(display, fbcfg, GLX.GLX_SAMPLES,        tmp, 0));
+    }
+    res.setBackgroundOpaque(glXGetFBConfig(display, fbcfg, GLX.GLX_TRANSPARENT_TYPE, tmp, 0) == GLX.GLX_NONE);
+    if(!res.isBackgroundOpaque()) {
+        glXGetFBConfig(display, fbcfg, GLX.GLX_TRANSPARENT_RED_VALUE,  tmp, 0);
+        res.setTransparentRedValue(tmp[0]==GLX.GLX_DONT_CARE?-1:tmp[0]);
+
+        glXGetFBConfig(display, fbcfg, GLX.GLX_TRANSPARENT_GREEN_VALUE,  tmp, 0);
+        res.setTransparentGreenValue(tmp[0]==GLX.GLX_DONT_CARE?-1:tmp[0]);
+
+        glXGetFBConfig(display, fbcfg, GLX.GLX_TRANSPARENT_BLUE_VALUE,  tmp, 0);
+        res.setTransparentBlueValue(tmp[0]==GLX.GLX_DONT_CARE?-1:tmp[0]);
+
+        glXGetFBConfig(display, fbcfg, GLX.GLX_TRANSPARENT_ALPHA_VALUE,  tmp, 0);
+        res.setTransparentAlphaValue(tmp[0]==GLX.GLX_DONT_CARE?-1:tmp[0]);
+    }
+    try { 
+        res.setPbufferFloatingPointBuffers(glXGetFBConfig(display, fbcfg, GLXExt.GLX_FLOAT_COMPONENTS_NV, tmp, 0) != GL.GL_FALSE);
+    } catch (Exception e) {}
+    return res;
+  }
+
+  private static String glXGetFBConfigErrorCode(int err) {
+    switch (err) {
+      case GLX.GLX_NO_EXTENSION:  return "GLX_NO_EXTENSION";
+      case GLX.GLX_BAD_ATTRIBUTE: return "GLX_BAD_ATTRIBUTE";
+      default:                return "Unknown error code " + err;
+    }
+  }
+
+  public static int glXGetFBConfig(long display, long cfg, int attrib, int[] tmp, int tmp_offset) {
+    if (display == 0) {
+      throw new GLException("No display connection");
+    }
+    int res = GLX.glXGetFBConfigAttrib(display, cfg, attrib, tmp, tmp_offset);
+    if (res != 0) {
+      throw new GLException("glXGetFBConfig(0x"+Long.toHexString(attrib)+") failed: error code " + glXGetFBConfigErrorCode(res));
+    }
+    return tmp[tmp_offset];
+  }
+
+  public static int glXFBConfig2FBConfigID(long display, long cfg) {
+      int[] tmpID = new int[1];
+      return glXGetFBConfig(display, cfg, GLX.GLX_FBCONFIG_ID, tmpID, 0);
+  }
+
+  public static long glXFBConfigID2FBConfig(long display, int screen, int id) {
+      int[] attribs = new int[] { GLX.GLX_FBCONFIG_ID, id, 0 };
+      int[] count = { -1 };
+      PointerBuffer fbcfgsL = GLX.glXChooseFBConfigCopied(display, screen, attribs, 0, count, 0);
+      if (fbcfgsL == null || fbcfgsL.limit()<1) {
+          return 0;
+      }
+      return fbcfgsL.get(0);
+  }
+
+  // Visual Info
+
+  public static XVisualInfo XVisualID2XVisualInfo(long display, long visualID) {
+      XVisualInfo res = null;
+      NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
+      try{
+          int[] count = new int[1];
+          XVisualInfo template = XVisualInfo.create();
+          template.setVisualid(visualID);
+          XVisualInfo[] infos = X11Lib.XGetVisualInfoCopied(display, X11Lib.VisualIDMask, template, count, 0);
+          if (infos == null || infos.length == 0) {
+            return null;
+          }  
+        res = XVisualInfo.create(infos[0]);
+      } finally {
+          NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
+      }
+      if (DEBUG) {
+        System.err.println("!!! Fetched XVisualInfo for visual ID 0x" + Long.toHexString(visualID));
+        System.err.println("!!! Resulting XVisualInfo: visualid = 0x" + Long.toHexString(res.getVisualid()));
+      }
+      return res;
+  }
+
+  public static GLCapabilities XVisualInfo2GLCapabilities(GLProfile glp, long display, XVisualInfo info, boolean onscreen, boolean usePBuffer, boolean isMultisampleEnabled) {
+    int[] tmp = new int[1];
+    int val = glXGetConfig(display, info, GLX.GLX_USE_GL, tmp, 0);
+    if (val == 0) {
+      throw new GLException("Visual does not support OpenGL");
+    }
+    val = glXGetConfig(display, info, GLX.GLX_RGBA, tmp, 0);
+    if (val == 0) {
+      throw new GLException("Visual does not support RGBA");
+    }
+    GLCapabilities res = new GLCapabilities(glp);
+    res.setOnscreen      (onscreen);
+    res.setPBuffer       (usePBuffer);
+    res.setDoubleBuffered(glXGetConfig(display, info, GLX.GLX_DOUBLEBUFFER,     tmp, 0) != 0);
+    res.setStereo        (glXGetConfig(display, info, GLX.GLX_STEREO,           tmp, 0) != 0);
+    // Note: use of hardware acceleration is determined by
+    // glXCreateContext, not by the XVisualInfo. Optimistically claim
+    // that all GLCapabilities have the capability to be hardware
+    // accelerated.
+    res.setHardwareAccelerated(true);
+    res.setDepthBits     (glXGetConfig(display, info, GLX.GLX_DEPTH_SIZE,       tmp, 0));
+    res.setStencilBits   (glXGetConfig(display, info, GLX.GLX_STENCIL_SIZE,     tmp, 0));
+    res.setRedBits       (glXGetConfig(display, info, GLX.GLX_RED_SIZE,         tmp, 0));
+    res.setGreenBits     (glXGetConfig(display, info, GLX.GLX_GREEN_SIZE,       tmp, 0));
+    res.setBlueBits      (glXGetConfig(display, info, GLX.GLX_BLUE_SIZE,        tmp, 0));
+    res.setAlphaBits     (glXGetConfig(display, info, GLX.GLX_ALPHA_SIZE,       tmp, 0));
+    res.setAccumRedBits  (glXGetConfig(display, info, GLX.GLX_ACCUM_RED_SIZE,   tmp, 0));
+    res.setAccumGreenBits(glXGetConfig(display, info, GLX.GLX_ACCUM_GREEN_SIZE, tmp, 0));
+    res.setAccumBlueBits (glXGetConfig(display, info, GLX.GLX_ACCUM_BLUE_SIZE,  tmp, 0));
+    res.setAccumAlphaBits(glXGetConfig(display, info, GLX.GLX_ACCUM_ALPHA_SIZE, tmp, 0));
+    if (isMultisampleEnabled) {
+      res.setSampleBuffers(glXGetConfig(display, info, GLX.GLX_SAMPLE_BUFFERS, tmp, 0) != 0);
+      res.setNumSamples   (glXGetConfig(display, info, GLX.GLX_SAMPLES,        tmp, 0));
+    }
+    return res;
+  }
+
+  private static String glXGetConfigErrorCode(int err) {
+    switch (err) {
+      case GLX.GLX_NO_EXTENSION:  return "GLX_NO_EXTENSION";
+      case GLX.GLX_BAD_SCREEN:    return "GLX_BAD_SCREEN";
+      case GLX.GLX_BAD_ATTRIBUTE: return "GLX_BAD_ATTRIBUTE";
+      case GLX.GLX_BAD_VISUAL:    return "GLX_BAD_VISUAL";
+      default:                return "Unknown error code " + err;
+    }
+  }
+
+  public static int glXGetConfig(long display, XVisualInfo info, int attrib, int[] tmp, int tmp_offset) {
+    if (display == 0) {
+      throw new GLException("No display connection");
+    }
+    int res = GLX.glXGetConfig(display, info, attrib, tmp, tmp_offset);
+    if (res != 0) {
+      throw new GLException("glXGetConfig(0x"+Long.toHexString(attrib)+") failed: error code " + glXGetConfigErrorCode(res));
+    }
+    return tmp[tmp_offset];
+  }
+
+  public String toString() {
+    return "X11GLXGraphicsConfiguration["+getScreen()+", visualID 0x" + Long.toHexString(getVisualID()) + ", fbConfigID 0x" + Long.toHexString(fbConfigID) + 
+                                        ",\n\trequested " + getRequestedCapabilities()+
+                                        ",\n\tchosen    " + getChosenCapabilities()+
+                                        "]";
+  }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
new file mode 100644
index 000000000..1ddac9013
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
@@ -0,0 +1,340 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+import com.sun.nativewindow.impl.NativeWindowFactoryImpl;
+import com.sun.nativewindow.impl.x11.*;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.glx.*;
+
+import com.jogamp.gluegen.runtime.PointerBuffer;
+
+/** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
+    are used on X11 platforms. Toolkits will likely need to delegate
+    to this one to change the accepted and returned types of the
+    GraphicsDevice and GraphicsConfiguration abstractions. */
+
+public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
+    protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
+
+    public X11GLXGraphicsConfigurationFactory() {
+        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.x11.X11GraphicsDevice.class, this);
+    }
+
+    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
+                                                                     CapabilitiesChooser chooser,
+                                                                     AbstractGraphicsScreen absScreen) {
+        return chooseGraphicsConfigurationStatic(capabilities, chooser, absScreen);
+    }
+
+    protected static X11GLXGraphicsConfiguration createDefaultGraphicsConfiguration(AbstractGraphicsScreen absScreen, boolean onscreen, boolean usePBuffer) {
+      if (absScreen == null) {
+        throw new IllegalArgumentException("AbstractGraphicsScreen is null");
+      }
+      if (!(absScreen instanceof X11GraphicsScreen)) {
+        throw new IllegalArgumentException("Only X11GraphicsScreen are allowed here");
+      }
+      X11GraphicsScreen x11Screen = (X11GraphicsScreen)absScreen;
+
+      GLProfile glProfile = GLProfile.getDefault();
+      GLCapabilities caps=null;
+      XVisualInfo xvis=null;
+      long fbcfg = 0;
+      int fbid = -1;
+
+      // Utilizing FBConfig
+      //
+      GLCapabilities capsFB = null;
+      long display = x11Screen.getDevice().getHandle();
+      try {
+          NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
+          X11Lib.XLockDisplay(display);
+          int screen = x11Screen.getIndex();
+          boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
+
+          long visID = X11Lib.DefaultVisualID(display, x11Screen.getIndex());
+          xvis = X11GLXGraphicsConfiguration.XVisualID2XVisualInfo(display, visID);
+          caps = X11GLXGraphicsConfiguration.XVisualInfo2GLCapabilities(glProfile, display, xvis, onscreen, usePBuffer, isMultisampleAvailable);
+
+          int[] attribs = X11GLXGraphicsConfiguration.GLCapabilities2AttribList(caps, true, isMultisampleAvailable, display, screen);
+          int[] count = { -1 };
+          PointerBuffer fbcfgsL = GLX.glXChooseFBConfigCopied(display, screen, attribs, 0, count, 0);
+          if (fbcfgsL == null || fbcfgsL.limit()<1) {
+              throw new Exception("Could not fetch FBConfig for "+caps);
+          }
+          fbcfg = fbcfgsL.get(0);
+          capsFB = X11GLXGraphicsConfiguration.GLXFBConfig2GLCapabilities(glProfile, display, fbcfg, true, onscreen, usePBuffer, isMultisampleAvailable);
+
+          fbid = X11GLXGraphicsConfiguration.glXFBConfig2FBConfigID(display, fbcfg);
+
+          xvis = GLX.glXGetVisualFromFBConfigCopied(display, fbcfg);
+          if (xvis==null) {
+            throw new GLException("Error: Choosen FBConfig has no visual");
+          }
+      } catch (Throwable t) {
+      } finally {
+          X11Lib.XUnlockDisplay(display);
+          NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
+      }
+
+      return new X11GLXGraphicsConfiguration(x11Screen, (null!=capsFB)?capsFB:caps, caps, null, xvis, fbcfg, fbid);
+    }
+
+    protected static X11GLXGraphicsConfiguration chooseGraphicsConfigurationStatic(Capabilities capabilities,
+                                                                                   CapabilitiesChooser chooser,
+                                                                                   AbstractGraphicsScreen absScreen) {
+        if (absScreen == null) {
+            throw new IllegalArgumentException("AbstractGraphicsScreen is null");
+        }
+        if (!(absScreen instanceof X11GraphicsScreen)) {
+            throw new IllegalArgumentException("Only X11GraphicsScreen are allowed here");
+        }
+        X11GraphicsScreen x11Screen = (X11GraphicsScreen)absScreen;
+
+
+        if (capabilities != null &&
+            !(capabilities instanceof GLCapabilities)) {
+            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilities objects");
+        }
+
+        if (chooser != null &&
+            !(chooser instanceof GLCapabilitiesChooser)) {
+            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilitiesChooser objects");
+        }
+
+        if (capabilities == null) {
+            capabilities = new GLCapabilities(null);
+        }
+
+        boolean onscreen = capabilities.isOnscreen();
+        boolean usePBuffer = ((GLCapabilities)capabilities).isPBuffer();
+
+        GLCapabilities caps2 = (GLCapabilities) capabilities.clone();
+        if(!caps2.isOnscreen()) {
+            // OFFSCREEN !DOUBLE_BUFFER
+            caps2.setDoubleBuffered(false);
+        }
+    
+        X11GLXGraphicsConfiguration res;
+        res = chooseGraphicsConfigurationFBConfig((GLCapabilities) caps2,
+                                                  (GLCapabilitiesChooser) chooser,
+                                                  x11Screen);
+        if(null==res) {
+            if(usePBuffer) {
+                throw new GLException("Error: Couldn't create X11GLXGraphicsConfiguration based on FBConfig");
+            }
+            res = chooseGraphicsConfigurationXVisual((GLCapabilities) caps2,
+                                                     (GLCapabilitiesChooser) chooser,
+                                                     x11Screen);
+        }
+        if(null==res) {
+            throw new GLException("Error: Couldn't create X11GLXGraphicsConfiguration");
+        }
+        if(DEBUG) {
+            System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationStatic("+x11Screen+","+caps2+"): "+res);
+        }
+        return res;
+    }
+
+    protected static X11GLXGraphicsConfiguration chooseGraphicsConfigurationFBConfig(GLCapabilities capabilities,
+                                                                                     GLCapabilitiesChooser chooser,
+                                                                                     X11GraphicsScreen x11Screen) {
+        int recommendedIndex = -1;
+        GLCapabilities[] caps = null;
+        PointerBuffer fbcfgsL = null;
+        int chosen=-1;
+        int retFBID=-1;
+        XVisualInfo retXVisualInfo = null;
+        GLProfile glProfile = capabilities.getGLProfile();
+        boolean onscreen = capabilities.isOnscreen();
+        boolean usePBuffer = capabilities.isPBuffer();
+
+        // Utilizing FBConfig
+        //
+        AbstractGraphicsDevice absDevice = x11Screen.getDevice();
+        long display = absDevice.getHandle();
+        try {
+            NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
+            X11Lib.XLockDisplay(display);
+            int screen = x11Screen.getIndex();
+            boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
+            int[] attribs = X11GLXGraphicsConfiguration.GLCapabilities2AttribList(capabilities, true, isMultisampleAvailable, display, screen);
+            int[] count = { -1 };
+
+            fbcfgsL = GLX.glXChooseFBConfigCopied(display, screen, attribs, 0, count, 0);
+            if (fbcfgsL == null || fbcfgsL.limit()<1) {
+                if(DEBUG) {
+                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed glXChooseFBConfig ("+x11Screen+","+capabilities+"): "+fbcfgsL+", "+count[0]);
+                }
+                return null;
+            }
+            if( !X11GLXGraphicsConfiguration.GLXFBConfigValid( display, fbcfgsL.get(0) ) ) {
+                if(DEBUG) {
+                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed - GLX FBConfig invalid: ("+x11Screen+","+capabilities+"): "+fbcfgsL+", fbcfg: 0x"+Long.toHexString(fbcfgsL.get(0)));
+                }
+                return null;
+            }
+            recommendedIndex = 0; // 1st match is always recommended ..
+            caps = new GLCapabilities[fbcfgsL.limit()];
+            for (int i = 0; i < fbcfgsL.limit(); i++) {
+                caps[i] = X11GLXGraphicsConfiguration.GLXFBConfig2GLCapabilities(glProfile, display, fbcfgsL.get(i), 
+                                                                                 false, onscreen, usePBuffer, isMultisampleAvailable);
+            }
+
+            if(null==chooser) {
+                chosen = recommendedIndex;
+            } else {
+                try {
+                  chosen = chooser.chooseCapabilities(capabilities, caps, recommendedIndex);
+                } catch (NativeWindowException e) {
+                  if(DEBUG) {
+                      e.printStackTrace();
+                  }
+                  chosen = -1;
+                }
+            }
+            if (chosen < 0) {
+              // keep on going ..
+              if(DEBUG) {
+                  System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig Failed .. unable to choose config, using first");
+              }
+              chosen = 0; // default ..
+            } else if (chosen >= caps.length) {
+                throw new GLException("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ")");
+            }
+
+            retFBID = X11GLXGraphicsConfiguration.glXFBConfig2FBConfigID(display, fbcfgsL.get(chosen));
+
+            retXVisualInfo = GLX.glXGetVisualFromFBConfigCopied(display, fbcfgsL.get(chosen));
+            if (retXVisualInfo==null) {
+                if(DEBUG) {
+                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed glXGetVisualFromFBConfig ("+x11Screen+", "+fbcfgsL.get(chosen) +" (Continue: "+(false==caps[chosen].isOnscreen())+"):\n\t"+caps[chosen]);
+                }
+                if(caps[chosen].isOnscreen()) {
+                    // Onscreen drawables shall have a XVisual ..
+                    return null;
+                }
+            }
+        } finally {
+            X11Lib.XUnlockDisplay(display);
+            NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
+        }
+
+        return new X11GLXGraphicsConfiguration(x11Screen, caps[chosen], capabilities, chooser, retXVisualInfo, fbcfgsL.get(chosen), retFBID);
+    }
+
+    protected static X11GLXGraphicsConfiguration chooseGraphicsConfigurationXVisual(GLCapabilities capabilities,
+                                                                                    GLCapabilitiesChooser chooser,
+                                                                                    X11GraphicsScreen x11Screen) {
+        if (chooser == null) {
+            chooser = new DefaultGLCapabilitiesChooser();
+        }
+
+        // Until we have a rock-solid visual selection algorithm written
+        // in pure Java, we're going to provide the underlying window
+        // system's selection to the chooser as a hint
+
+        GLProfile glProfile = capabilities.getGLProfile();
+        boolean onscreen = capabilities.isOnscreen();
+        GLCapabilities[] caps = null;
+        int recommendedIndex = -1;
+        XVisualInfo retXVisualInfo = null;
+        int chosen=-1;
+
+        AbstractGraphicsDevice absDevice = x11Screen.getDevice();
+        long display = absDevice.getHandle();
+        try {
+            NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
+            X11Lib.XLockDisplay(display);
+            int screen = x11Screen.getIndex();
+            boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
+            int[] attribs = X11GLXGraphicsConfiguration.GLCapabilities2AttribList(capabilities, false, isMultisampleAvailable, display, screen);
+            XVisualInfo[] infos = null;
+
+            XVisualInfo recommendedVis = GLX.glXChooseVisualCopied(display, screen, attribs, 0);
+            if (DEBUG) {
+                System.err.print("!!! glXChooseVisual recommended ");
+                if (recommendedVis == null) {
+                    System.err.println("null visual");
+                } else {
+                    System.err.println("visual id 0x" + Long.toHexString(recommendedVis.getVisualid()));
+                }
+            }
+            int[] count = new int[1];
+            XVisualInfo template = XVisualInfo.create();
+            template.setScreen(screen);
+            infos = X11Lib.XGetVisualInfoCopied(display, X11Lib.VisualScreenMask, template, count, 0);
+            if (infos == null || infos.length<1) {
+                throw new GLException("Error while enumerating available XVisualInfos");
+            }
+            caps = new GLCapabilities[infos.length];
+            for (int i = 0; i < infos.length; i++) {
+                caps[i] = X11GLXGraphicsConfiguration.XVisualInfo2GLCapabilities(glProfile, display, infos[i], onscreen, false, isMultisampleAvailable);
+                // Attempt to find the visual chosen by glXChooseVisual
+                if (recommendedVis != null && recommendedVis.getVisualid() == infos[i].getVisualid()) {
+                    recommendedIndex = i;
+                }
+            }
+            try {
+              chosen = chooser.chooseCapabilities(capabilities, caps, recommendedIndex);
+            } catch (NativeWindowException e) {
+              if(DEBUG) {
+                  e.printStackTrace();
+              }
+              chosen = -1;
+            }
+            if (chosen < 0) {
+              // keep on going ..
+              if(DEBUG) {
+                  System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationXVisual Failed .. unable to choose config, using first");
+              }
+              chosen = 0; // default ..
+            } else if (chosen >= caps.length) {
+                throw new GLException("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ")");
+            }
+            if (infos[chosen] == null) {
+                throw new GLException("GLCapabilitiesChooser chose an invalid visual");
+            }
+            retXVisualInfo = XVisualInfo.create(infos[chosen]);
+        } finally {
+            X11Lib.XUnlockDisplay(display);
+            NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
+        }
+        return new X11GLXGraphicsConfiguration(x11Screen, caps[chosen], capabilities, chooser, retXVisualInfo, 0, -1);
+    }
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java
new file mode 100644
index 000000000..306a711bd
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.*;
+
+public class X11OffscreenGLXContext extends X11GLXContext {
+  private X11OffscreenGLXDrawable drawable;
+
+  public X11OffscreenGLXContext(X11OffscreenGLXDrawable drawable,
+                               GLContext shareWith) {
+    super(drawable, shareWith);
+    this.drawable = drawable;
+  }
+
+  public int getOffscreenContextPixelDataType() {
+    GL gl = getGL();
+    return gl.isGL2()?GL2.GL_UNSIGNED_INT_8_8_8_8_REV:GL.GL_UNSIGNED_SHORT_5_5_5_1;
+  }
+  
+  public int getOffscreenContextReadBuffer() {
+    GLCapabilities caps = (GLCapabilities)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
+    if (caps.getDoubleBuffered()) {
+      return GL.GL_BACK;
+    }
+    return GL.GL_FRONT;
+  }
+
+  public boolean offscreenImageNeedsVerticalFlip() {
+    // There doesn't seem to be a way to do this in the construction
+    // of the Pixmap or GLXPixmap
+    return true;
+  }
+
+  protected void create() {
+    createContext(false);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
new file mode 100644
index 000000000..7d866a200
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.x11.*;
+
+public class X11OffscreenGLXDrawable extends X11GLXDrawable {
+  private long pixmap;
+
+  protected X11OffscreenGLXDrawable(GLDrawableFactory factory, NativeWindow target) {
+    super(factory, target, true);
+    create();
+  }
+
+  protected void setRealizedImpl() {
+    if(realized) {
+        create();
+    } else {
+        destroy();
+    }
+  }
+
+  public GLContext createContext(GLContext shareWith) {
+    return new X11OffscreenGLXContext(this, shareWith);
+  }
+  
+  private void create() {
+    NativeWindow nw = getNativeWindow();
+    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration) nw.getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    XVisualInfo vis = config.getXVisualInfo();
+    int bitsPerPixel = vis.getDepth();
+    AbstractGraphicsScreen aScreen = config.getScreen();
+    AbstractGraphicsDevice aDevice = aScreen.getDevice();
+    long dpy = aDevice.getHandle();
+    int screen = aScreen.getIndex();
+
+    getFactoryImpl().lockToolkit();
+    try {
+      X11Lib.XLockDisplay(dpy);
+      pixmap = X11Lib.XCreatePixmap(dpy, (int) X11Lib.RootWindow(dpy, screen), 
+                                    component.getWidth(), component.getHeight(), bitsPerPixel);
+      if (pixmap == 0) {
+        throw new GLException("XCreatePixmap failed");
+      }
+      long drawable = GLX.glXCreateGLXPixmap(dpy, vis, pixmap);
+      if (drawable == 0) {
+        X11Lib.XFreePixmap(dpy, pixmap);
+        pixmap = 0;
+        throw new GLException("glXCreateGLXPixmap failed");
+      }
+      ((SurfaceChangeable)nw).setSurfaceHandle(drawable);
+      if (DEBUG) {
+        System.err.println("Created pixmap " + toHexString(pixmap) +
+                           ", GLXPixmap " + toHexString(drawable) +
+                           ", display " + toHexString(dpy));
+      }
+    } finally {
+      X11Lib.XUnlockDisplay(dpy);
+      getFactoryImpl().unlockToolkit();
+    }
+  }
+
+  public void destroy() {
+    if (pixmap == 0) return;
+
+    NativeWindow nw = getNativeWindow();
+    long display = nw.getDisplayHandle();
+    try {
+      getFactoryImpl().lockToolkit();
+      X11Lib.XLockDisplay(display);
+
+      long drawable = nw.getSurfaceHandle();
+      if (DEBUG) {
+        System.err.println("Destroying pixmap " + toHexString(pixmap) +
+                           ", GLXPixmap " + toHexString(drawable) +
+                           ", display " + toHexString(display));
+      }
+
+      // Must destroy pixmap and GLXPixmap
+
+      if (DEBUG) {
+        long cur = GLX.glXGetCurrentContext();
+        if (cur != 0) {
+          System.err.println("WARNING: found context " + toHexString(cur) + " current during pixmap destruction");
+        }
+      }
+
+      // FIXME: workaround for crashes on NVidia hardware when
+      // destroying pixmap (no context is current at the point of the
+      // crash, at least from the point of view of
+      // glXGetCurrentContext)
+      GLX.glXMakeCurrent(display, 0, 0);
+
+      GLX.glXDestroyGLXPixmap(display, drawable);
+      X11Lib.XFreePixmap(display, pixmap);
+      drawable = 0;
+      pixmap = 0;
+      display = 0;
+      ((SurfaceChangeable)nw).setSurfaceHandle(0);
+    } finally {
+      X11Lib.XUnlockDisplay(display);
+      getFactoryImpl().unlockToolkit();
+    }
+  }
+  protected void swapBuffersImpl() {
+    if(DEBUG) {
+        System.err.println("unhandled swapBuffersImpl() called for: "+this);
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXContext.java
new file mode 100644
index 000000000..c89a5efd5
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXContext.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import java.util.*;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.*;
+
+public class X11OnscreenGLXContext extends X11GLXContext {
+  // This indicates whether the context we have created is indirect
+  // and therefore requires the toolkit to be locked around all GL
+  // calls rather than just all GLX calls
+  protected boolean isIndirect;
+
+  public X11OnscreenGLXContext(X11OnscreenGLXDrawable drawable,
+                              GLContext shareWith) {
+    super(drawable, shareWith);
+  }
+  
+  public boolean isOptimizable() {
+    return super.isOptimizable() && !isIndirect;
+  }
+
+  protected void create() {
+    createContext(true);
+    isIndirect = !GLX.glXIsDirect(drawable.getNativeWindow().getDisplayHandle(), context);
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
new file mode 100644
index 000000000..43468b858
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.*;
+
+public class X11OnscreenGLXDrawable extends X11GLXDrawable {
+  protected X11OnscreenGLXDrawable(GLDrawableFactory factory, NativeWindow component) {
+    super(factory, component, false);
+  }
+
+  public GLContext createContext(GLContext shareWith) {
+    return new X11OnscreenGLXContext(this, shareWith);
+  }
+
+  public int getWidth() {
+    return component.getWidth();
+  }
+
+  public int getHeight() {
+    return component.getHeight();
+  }
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java
new file mode 100644
index 000000000..e0993abc3
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.*;
+
+public class X11PbufferGLXContext extends X11GLXContext {
+  private X11PbufferGLXDrawable drawable;
+
+  public X11PbufferGLXContext(X11PbufferGLXDrawable drawable,
+                             GLContext shareWith) {
+    super(drawable, shareWith);
+    this.drawable = drawable;
+  }
+
+  public void bindPbufferToTexture() {
+    // FIXME: figure out how to implement this
+    throw new GLException("Not yet implemented");
+  }
+
+  public void releasePbufferFromTexture() {
+    // FIXME: figure out how to implement this
+    throw new GLException("Not yet implemented");
+  }
+
+
+  public int getFloatingPointMode() {
+    return drawable.getFloatingPointMode();
+  }
+
+  protected void create() {
+    if (DEBUG) {
+      System.err.println("Creating context for pbuffer " + drawable.getWidth() +
+                         " x " + drawable.getHeight());
+    }
+
+    // Create a gl context for the p-buffer.
+    X11GLXContext other = (X11GLXContext) GLContextShareSet.getShareContext(this);
+    long share = 0;
+    if (other != null) {
+      share = other.getContext();
+      if (share == 0) {
+        throw new GLException("GLContextShareSet returned an invalid OpenGL context");
+      }
+    }
+    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)
+        getGLDrawable().getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+
+    context = GLX.glXCreateNewContext(drawable.getNativeWindow().getDisplayHandle(), 
+                                      config.getFBConfig(), GLX.GLX_RGBA_TYPE, share, true);
+    if (context == 0) {
+      throw new GLException("pbuffer creation error: glXCreateNewContext() failed");
+    }
+    GLContextShareSet.contextCreated(this);
+
+    if (DEBUG) {
+      System.err.println("Created context for pbuffer " + drawable.getWidth() +
+                         " x " + drawable.getHeight());
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
new file mode 100644
index 000000000..3e012225e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.glx.*;
+import com.sun.nativewindow.impl.x11.*;
+
+public class X11PbufferGLXDrawable extends X11GLXDrawable {
+  protected X11PbufferGLXDrawable(GLDrawableFactory factory, NativeWindow target) {
+                                  /* GLCapabilities caps, 
+                                  GLCapabilitiesChooser chooser,
+                                  int width, int height */
+    super(factory, target, true);
+
+    if (DEBUG) {
+        System.out.println("Pbuffer config: " + getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration());
+    }
+
+    createPbuffer();
+
+    if (DEBUG) {
+        System.err.println("Created pbuffer " + this);
+    }
+  }
+
+  protected void setRealizedImpl() {
+    if(realized) {
+        createPbuffer();
+    } else {
+        destroy();
+    }
+  }
+
+  public GLContext createContext(GLContext shareWith) {
+    return new X11PbufferGLXContext(this, shareWith);
+  }
+
+  public void destroy() {
+    getFactoryImpl().lockToolkit();
+    try {
+        NativeWindow nw = getNativeWindow();
+        if (nw.getSurfaceHandle() != 0) {
+          GLX.glXDestroyPbuffer(nw.getDisplayHandle(), nw.getSurfaceHandle());
+        }
+        ((SurfaceChangeable)nw).setSurfaceHandle(0);
+    } finally {
+        getFactoryImpl().unlockToolkit();
+    }
+  }
+
+  private void createPbuffer() {
+    getFactoryImpl().lockToolkit();
+    try {
+      X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration) getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+      AbstractGraphicsScreen aScreen = config.getScreen();
+      AbstractGraphicsDevice aDevice = aScreen.getDevice();
+      long display = aDevice.getHandle();
+      int screen = aScreen.getIndex();
+
+      if (display==0) {
+        throw new GLException("Null display");
+      }
+
+      NativeWindow nw = getNativeWindow();
+    
+      GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
+
+      if (capabilities.getPbufferRenderToTexture()) {
+        throw new GLException("Render-to-texture pbuffers not supported yet on X11");
+      }
+
+      if (capabilities.getPbufferRenderToTextureRectangle()) {
+        throw new GLException("Render-to-texture-rectangle pbuffers not supported yet on X11");
+      }
+
+      // Create the p-buffer.
+      int niattribs = 0;
+      int[] iattributes = new int[5];
+
+      iattributes[niattribs++] = GLX.GLX_PBUFFER_WIDTH;
+      iattributes[niattribs++] = nw.getWidth();
+      iattributes[niattribs++] = GLX.GLX_PBUFFER_HEIGHT;
+      iattributes[niattribs++] = nw.getHeight();
+      iattributes[niattribs++] = 0;
+
+      long pbuffer = GLX.glXCreatePbuffer(display, config.getFBConfig(), iattributes, 0);
+      if (pbuffer == 0) {
+        // FIXME: query X error code for detail error message
+        throw new GLException("pbuffer creation error: glXCreatePbuffer() failed");
+      }
+
+      // Set up instance variables
+      ((SurfaceChangeable)nw).setSurfaceHandle(pbuffer);
+      
+      // Determine the actual width and height we were able to create.
+      int[] tmp = new int[1];
+      GLX.glXQueryDrawable(display, pbuffer, GLX.GLX_WIDTH, tmp, 0);
+      int width = tmp[0];
+      GLX.glXQueryDrawable(display, pbuffer, GLX.GLX_HEIGHT, tmp, 0);
+      int height = tmp[0];
+      ((SurfaceChangeable)nw).setSize(width, height);
+    } finally {
+      getFactoryImpl().unlockToolkit();
+    }
+  }
+
+  public int getFloatingPointMode() {
+    // Floating-point pbuffers currently require NVidia hardware on X11
+    return GLPbuffer.NV_FLOAT;
+  }
+
+  protected void swapBuffersImpl() {
+    if(DEBUG) {
+        System.err.println("unhandled swapBuffersImpl() called for: "+this);
+    }
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
new file mode 100644
index 000000000..3b2c8f541
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.impl.x11.glx.awt;
+
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+import javax.media.nativewindow.awt.*;
+import javax.media.opengl.*;
+import javax.media.opengl.awt.*;
+
+import com.jogamp.opengl.impl.*;
+import com.sun.nativewindow.impl.jawt.*;
+import com.sun.nativewindow.impl.jawt.x11.*;
+import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.opengl.impl.x11.*;
+import com.jogamp.opengl.impl.x11.glx.*;
+
+public class X11AWTGLXGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
+    protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
+
+    public X11AWTGLXGraphicsConfigurationFactory() {
+        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.awt.AWTGraphicsDevice.class, this);
+    }
+
+    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
+                                                                     CapabilitiesChooser chooser,
+                                                                     AbstractGraphicsScreen absScreen) {
+        GraphicsDevice device = null;
+        if (absScreen != null &&
+            !(absScreen instanceof AWTGraphicsScreen)) {
+            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only AWTGraphicsScreen objects");
+        }
+
+        if(null==absScreen) {
+            absScreen = AWTGraphicsScreen.createScreenDevice(-1);
+        }
+        AWTGraphicsScreen awtScreen = (AWTGraphicsScreen) absScreen;
+        device = ((AWTGraphicsDevice)awtScreen.getDevice()).getGraphicsDevice();
+
+        if (capabilities != null &&
+            !(capabilities instanceof GLCapabilities)) {
+            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only GLCapabilities objects");
+        }
+
+        if (chooser != null &&
+            !(chooser instanceof GLCapabilitiesChooser)) {
+            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only GLCapabilitiesChooser objects");
+        }
+
+        if(DEBUG) {
+            System.err.println("X11AWTGLXGraphicsConfigurationFactory: got "+absScreen);
+        }
+        
+        GraphicsConfiguration gc;
+        X11GraphicsConfiguration x11Config;
+
+        // Need the lock here, since it could be an AWT owned display connection
+        NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
+        try {
+            long displayHandle = X11SunJDKReflection.graphicsDeviceGetDisplay(device);
+            if(0==displayHandle) {
+                displayHandle = X11Util.getThreadLocalDefaultDisplay();
+                if(DEBUG) {
+                    System.err.println("X11AWTGLXGraphicsConfigurationFactory: using a thread local X11 display");
+                }
+            } else {
+                if(DEBUG) {
+                    System.err.println("X11AWTGLXGraphicsConfigurationFactory: using AWT X11 display 0x"+Long.toHexString(displayHandle));
+                }
+            }
+            ((AWTGraphicsDevice)awtScreen.getDevice()).setHandle(displayHandle);
+            X11GraphicsDevice x11Device = new X11GraphicsDevice(displayHandle);
+
+            X11GraphicsScreen x11Screen = new X11GraphicsScreen(x11Device, awtScreen.getIndex());
+            if(DEBUG) {
+                System.err.println("X11AWTGLXGraphicsConfigurationFactory: made "+x11Screen);
+            }
+
+            gc = device.getDefaultConfiguration();
+            AWTGraphicsConfiguration.setupCapabilitiesRGBABits(capabilities, gc);
+            if(DEBUG) {
+                System.err.println("AWT Colormodel compatible: "+capabilities);
+            }
+
+            x11Config = (X11GraphicsConfiguration)
+                GraphicsConfigurationFactory.getFactory(x11Device).chooseGraphicsConfiguration(capabilities,
+                                                                                               chooser,
+                                                                                               x11Screen);
+            if (x11Config == null) {
+                throw new GLException("Unable to choose a GraphicsConfiguration: "+capabilities+",\n\t"+chooser+"\n\t"+x11Screen);
+            }
+
+            long visualID = x11Config.getVisualID();
+            // Now figure out which GraphicsConfiguration corresponds to this
+            // visual by matching the visual ID
+            GraphicsConfiguration[] configs = device.getConfigurations();
+            for (int i = 0; i < configs.length; i++) {
+                GraphicsConfiguration config = configs[i];
+                if (config != null) {
+                    if (X11SunJDKReflection.graphicsConfigurationGetVisualID(config) == visualID) {
+                        return new AWTGraphicsConfiguration(awtScreen, x11Config.getChosenCapabilities(), x11Config.getRequestedCapabilities(), 
+                                                            config, x11Config);
+                    }
+                }
+            }
+        } finally {
+            NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
+        }
+        // Either we weren't able to reflectively introspect on the
+        // X11GraphicsConfig or something went wrong in the steps above;
+        // Let's take the default configuration as used on Windows and MacOSX then ..
+        if(DEBUG) {
+            System.err.println("!!! Using default configuration");
+        }
+        return new AWTGraphicsConfiguration(awtScreen, x11Config.getChosenCapabilities(), x11Config.getRequestedCapabilities(), gc, x11Config);
+    }
+}
diff --git a/src/jogl/classes/com/sun/opengl/impl/DRIHack.java b/src/jogl/classes/com/sun/opengl/impl/DRIHack.java
deleted file mode 100755
index c55e9ec3e..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/DRIHack.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import java.io.*;
-import java.security.*;
-import com.jogamp.gluegen.runtime.*;
-
-/**
- * Helper class for working around problems with open-source DRI
- * drivers. In the current DRI implementation it is required that the
- * symbols in libGL.so.1.2 be globally visible to be accessible from
- * other libraries that are dynamically loaded by the implementation.
- * Applications may typically satisfy this need either by linking
- * against libGL.so on the command line (-lGL) or by dlopen'ing
- * libGL.so.1.2 with the RTLD_GLOBAL flag. The JOGL implementation
- * links against libGL on all platforms rather than forcing all OpenGL
- * entry points to be called through a function pointer. This allows
- * the JOGL library to link directly to core 1.1 OpenGL entry points
- * like glVertex3f, while calling through function pointers for entry
- * points from later OpenGL versions as well as from
- * extensions. However, because libjogl.so (which links against
- * libGL.so) is loaded by the JVM, and because the JVM implicitly uses
- * RTLD_LOCAL in the implementation of System.loadLibrary(), this
- * means via transitivity that the symbols for libGL.so have only
- * RTLD_LOCAL visibility to the rest of the application, so the DRI
- * drivers can not find the symbols required. <P>
- *
- * There are at least two possible solutions. One would be to change
- * the JOGL implementation to call through function pointers uniformly
- * so that it does not need to link against libGL.so. This is
- * possible, but requires changes to GlueGen and also is not really
- * necessary in any other situation than with the DRI drivers. Another
- * solution is to force the first load of libGL.so.1.2 to be done
- * dynamically with RTLD_GLOBAL before libjogl.so is loaded and causes
- * libGL.so.1.2 to be loaded again. The NativeLibrary class in the
- * GlueGen runtime has this property, and we use it to implement this
- * workaround.
- */
-
-public class DRIHack {
-  private static final boolean DEBUG = Debug.debug("DRIHack");
-  private static boolean driHackNeeded;
-  private static NativeLibrary oglLib;
-
-  public static void begin() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-        public Object run() {
-          String os = Debug.getProperty("os.name", false).toLowerCase();
-          // Do DRI hack on all Linux distributions for best robustness
-          driHackNeeded =
-            (os.startsWith("linux") ||
-             new File("/usr/lib/dri").exists() ||
-             new File("/usr/X11R6/lib/modules/dri").exists());
-          // Allow manual overriding for now as a workaround for
-          // problems seen in some situations -- needs more investigation
-          if (Debug.getProperty("jogl.drihack.disable", true) != null) {
-            driHackNeeded = false;
-          }
-          return null;
-        }
-      });
-
-    if (driHackNeeded) {
-      if (DEBUG) {
-        System.err.println("Beginning DRI hack");
-      }
-
-      // Try a few different variants for best robustness
-      // In theory probably only the first is necessary
-      oglLib = NativeLibrary.open("libGL.so.1", null);
-      if (DEBUG && oglLib != null) System.err.println(" Found libGL.so.1");
-      if (oglLib == null) {
-        oglLib = NativeLibrary.open("/usr/lib/libGL.so.1", null);
-        if (DEBUG && oglLib != null) System.err.println(" Found /usr/lib/libGL.so.1");
-      }
-    }
-  }
-
-  public static void end() {
-    if (oglLib != null) {
-      if (DEBUG) {
-        System.err.println("Ending DRI hack");
-      }
-
-      oglLib.close();
-      oglLib = null;
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/Debug.java b/src/jogl/classes/com/sun/opengl/impl/Debug.java
deleted file mode 100644
index 7c5451706..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/Debug.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import java.security.*;
-
-/** Helper routines for logging and debugging. */
-
-public class Debug {
-  // Some common properties
-  private static boolean verbose;
-  private static boolean debugAll;
-  private static AccessControlContext localACC;
-  
-  static {
-    localACC=AccessController.getContext();
-    verbose = isPropertyDefined("jogl.verbose", true);
-    debugAll = isPropertyDefined("jogl.debug", true);
-    if (verbose) {
-       Package p = Package.getPackage("javax.media.opengl");
-       System.err.println("JOGL specification version " + p.getSpecificationVersion());
-       System.err.println("JOGL implementation version " + p.getImplementationVersion());
-       System.err.println("JOGL implementation vendor " + p.getImplementationVendor());
-    }
-  }
-
-  static int getIntProperty(final String property, final boolean jnlpAlias) {
-      return getIntProperty(property, jnlpAlias, localACC);
-  }
-
-  public static int getIntProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    int i=0;
-    try {
-        Integer iv = Integer.valueOf(Debug.getProperty(property, jnlpAlias, acc));
-        i = iv.intValue();
-    } catch (NumberFormatException nfe) {}
-    return i;
-  }
-
-  static boolean getBooleanProperty(final String property, final boolean jnlpAlias) {
-    return getBooleanProperty(property, jnlpAlias, localACC);
-  }
-
-  public static boolean getBooleanProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    Boolean b = Boolean.valueOf(Debug.getProperty(property, jnlpAlias, acc));
-    return b.booleanValue();
-  }
-
-  static boolean isPropertyDefined(final String property, final boolean jnlpAlias) {
-    return isPropertyDefined(property, jnlpAlias, localACC);
-  }
-
-  public static boolean isPropertyDefined(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    return (Debug.getProperty(property, jnlpAlias, acc) != null) ? true : false;
-  }
-
-  static String getProperty(final String property, final boolean jnlpAlias) {
-    return getProperty(property, jnlpAlias, localACC);
-  }
-
-  public static String getProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    String s=null;
-    if(null!=acc && acc.equals(localACC)) {
-        s = (String) AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-              String val=null;
-              try {
-                  val = System.getProperty(property);
-              } catch (Exception e) {}
-              if(null==val && jnlpAlias && !property.startsWith(jnlp_prefix)) {
-                  try {
-                      val = System.getProperty(jnlp_prefix + property);
-                  } catch (Exception e) {}
-              }
-              return val;
-            }
-          });
-    } else {
-        try {
-            s = System.getProperty(property);
-        } catch (Exception e) {}
-        if(null==s && jnlpAlias && !property.startsWith(jnlp_prefix)) {
-            try {
-                s = System.getProperty(jnlp_prefix + property);
-            } catch (Exception e) {}
-        }
-    }
-    return s;
-  }
-  public static final String jnlp_prefix = "jnlp." ;
-
-  public static boolean verbose() {
-    return verbose;
-  }
-
-  public static boolean debugAll() {
-    return debugAll;
-  }
-
-  public static boolean debug(String subcomponent) {
-    return debugAll() || isPropertyDefined("jogl.debug." + subcomponent, true);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/ExtensionAvailabilityCache.java b/src/jogl/classes/com/sun/opengl/impl/ExtensionAvailabilityCache.java
deleted file mode 100644
index 26072519e..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/ExtensionAvailabilityCache.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import javax.media.opengl.*;
-import java.util.*;
-// FIXME: refactor Java SE dependencies
-//import java.util.regex.*;
-import java.lang.reflect.*;
-
-/**
- * A utility object intended to be used by implementations to act as a cache
- * of which OpenGL extensions are currently available on both the host machine
- * and display.
- */
-public final class ExtensionAvailabilityCache {
-  private static final boolean DEBUG = Debug.debug("ExtensionAvailabilityCache");
-  private static final boolean DEBUG_AVAILABILITY = Debug.isPropertyDefined("ExtensionAvailabilityCache", true);
-
-  ExtensionAvailabilityCache(GLContextImpl context)
-  {
-    this.context = context;
-  }
-
-  /**
-   * Flush the cache. The cache will be rebuilt lazily as calls to {@link
-   * #isExtensionAvailable(String)} are received.
-   */
-  public void flush()
-  {
-    if(DEBUG) {
-        System.out.println("ExtensionAvailabilityCache: Flush availability OpenGL "+majorVersion+"."+minorVersion);
-    }
-    availableExtensionCache.clear();
-    initialized = false;
-    majorVersion = 1;
-    minorVersion = 0;
-  }
-
-  /**
-   * Flush the cache and rebuild the cache.
-   */
-  public void reset() {
-    flush();
-    initAvailableExtensions();
-  }
-
-  public boolean isInitialized() {
-    return initialized && !availableExtensionCache.isEmpty() ;
-  }
-
-  public boolean isExtensionAvailable(String glExtensionName) {
-    initAvailableExtensions();
-    return availableExtensionCache.contains(mapGLExtensionName(glExtensionName));
-  }
-
-  public String getPlatformExtensionsString() {
-    initAvailableExtensions();
-    return glXExtensions;
-  }
-
-  public String getGLExtensions() {
-    initAvailableExtensions();
-    if(DEBUG) {
-        System.err.println("ExtensionAvailabilityCache: getGLExtensions() called");
-    }
-    return glExtensions;
-  }
-
-  public int getMajorVersion() {
-    initAvailableExtensions();
-    return majorVersion;
-  }
-
-  public int getMinorVersion() {
-    initAvailableExtensions();
-    return minorVersion;
-  }
-
-  private void initAvailableExtensions() {
-    // if hash is empty (meaning it was flushed), pre-cache it with the list
-    // of extensions that are in the GL_EXTENSIONS string
-    if (availableExtensionCache.isEmpty() || !initialized) {
-      GL gl = context.getGL();
-
-      if (DEBUG) {
-         System.err.println("ExtensionAvailabilityCache: Pre-caching init "+gl+", GL_VERSION "+gl.glGetString(GL.GL_VERSION));
-      }
-
-      // Set version
-      Version version = new Version(gl.glGetString(GL.GL_VERSION));
-      if (version.isValid()) {
-        majorVersion = version.getMajor();
-        minorVersion = version.getMinor();
-
-        if( !gl.isGL3() &&
-            ( majorVersion > 3 ||
-              ( majorVersion == 3 && minorVersion >= 1 ) ) ) {
-            // downsize version to 3.0 in case we are not using GL3 (3.1)
-            majorVersion = 3;
-            minorVersion = 0;
-        }
-      }
-
-      boolean useGetStringi = false;
-
-      if ( majorVersion > 3 ||
-           ( majorVersion == 3 && minorVersion >= 0 ) ||
-           gl.isGL3() ) {
-          if ( ! gl.isGL2GL3() ) {
-            if(DEBUG) {
-                System.err.println("ExtensionAvailabilityCache: GL >= 3.1 usage, but no GL2GL3 interface: "+gl.getClass().getName());
-            }
-          } else if ( ! gl.isFunctionAvailable("glGetStringi") ) {
-            if(DEBUG) {
-                System.err.println("ExtensionAvailabilityCache: GL >= 3.1 usage, but no glGetStringi");
-            }
-          } else {
-              useGetStringi = true;
-          }
-      }
-
-      if (DEBUG) {
-        System.err.println("ExtensionAvailabilityCache: Pre-caching extension availability OpenGL "+majorVersion+"."+minorVersion+
-                           ", use "+ ( useGetStringi ? "glGetStringi" : "glGetString" ) );
-      }
-
-      StringBuffer sb = new StringBuffer();
-      if(useGetStringi) {
-        GL2GL3 gl2gl3 = gl.getGL2GL3();
-        int[] numExtensions = { 0 } ;
-        gl2gl3.glGetIntegerv(gl2gl3.GL_NUM_EXTENSIONS, numExtensions, 0);
-        for (int i = 0; i < numExtensions[0]; i++) {
-            sb.append(gl2gl3.glGetStringi(gl2gl3.GL_EXTENSIONS, i));
-            if(i < numExtensions[0]) {
-                sb.append(" ");
-            }
-        }
-      } else {
-        sb.append(gl.glGetString(GL.GL_EXTENSIONS));
-      }
-      glExtensions = sb.toString();
-      glXExtensions = context.getPlatformExtensionsString();
-
-      sb.append(" ");
-      sb.append(glXExtensions);
-
-      String allAvailableExtensions = sb.toString();
-      if (DEBUG_AVAILABILITY) {
-        System.err.println("ExtensionAvailabilityCache: Available extensions: " + allAvailableExtensions);
-        System.err.println("ExtensionAvailabilityCache: GL vendor: " + gl.glGetString(GL.GL_VENDOR));
-      }
-      StringTokenizer tok = new StringTokenizer(allAvailableExtensions);
-      while (tok.hasMoreTokens()) {
-        String availableExt = tok.nextToken().trim();
-        availableExt = availableExt.intern();
-        availableExtensionCache.add(availableExt);
-        if (DEBUG_AVAILABILITY) {
-          System.err.println("ExtensionAvailabilityCache:   Available: " + availableExt);
-        }
-      }
-
-      // Put GL version strings in the table as well
-      // FIXME: this needs to be adjusted when the major rev changes
-      // beyond the known ones
-      int major = majorVersion;
-      int minor = minorVersion;
-      while (major > 0) {
-        while (minor >= 0) {
-          availableExtensionCache.add("GL_VERSION_" + major + "_" + minor);
-          if (DEBUG) {
-            System.err.println("ExtensionAvailabilityCache: Added GL_VERSION_" + major + "_" + minor + " to known extensions");
-          }
-          --minor;
-        }
-
-        switch (major) {
-        case 3:
-          if(gl.isGL3()) {
-              // GL3 is a GL 3.1 forward compatible context,
-              // hence no 2.0, 1.0 - 1.5 GL versions are supported.
-              major=0; 
-          }
-          // Restart loop at version 2.1
-          minor = 1;
-          break;
-        case 2:
-          // Restart loop at version 1.5
-          minor = 5;
-          break;
-        case 1:
-          break;
-        }
-
-        --major;
-      }
-
-      // put a dummy var in here so that the cache is no longer empty even if
-      // no extensions are in the GL_EXTENSIONS string
-      availableExtensionCache.add("<INTERNAL_DUMMY_PLACEHOLDER>");
-
-      initialized = true;
-    }
-  }
-
-  // FIXME: hack to re-enable GL_NV_vertex_array_range extension after
-  // recent upgrade to new wglext.h and glxext.h headers
-  private static String mapGLExtensionName(String extensionName) {
-    if (extensionName != null &&
-        (extensionName.equals("WGL_NV_vertex_array_range") ||
-         extensionName.equals("GLX_NV_vertex_array_range"))) 
-      return "GL_NV_vertex_array_range";
-    return extensionName;
-  }
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  private boolean initialized = false;
-  private int majorVersion = 1;
-  private int minorVersion = 0;
-  private String glExtensions = null;
-  private String glXExtensions = null;
-  private HashSet availableExtensionCache = new HashSet(50);
-  private GLContextImpl context;
-
-  /**
-   * A class for storing and comparing OpenGL version numbers.
-   * This only works for desktop OpenGL at the moment.
-   */
-  private static class Version implements Comparable
-  {
-    private boolean valid;
-    private int major, minor, sub;
-    public Version(int majorRev, int minorRev, int subMinorRev)
-    {
-      major = majorRev;
-      minor = minorRev;
-      sub = subMinorRev;
-    }
-
-    /**
-     * @param versionString must be of the form "GL_VERSION_X" or
-     * "GL_VERSION_X_Y" or "GL_VERSION_X_Y_Z" or "X.Y", where X, Y,
-     * and Z are integers.
-     *
-     * @exception IllegalArgumentException if the argument is not a valid
-     * OpenGL version identifier
-     */
-    public Version(String versionString)
-    {
-      try 
-      {
-        if (versionString.startsWith("GL_VERSION_"))
-        {
-          StringTokenizer tok = new StringTokenizer(versionString, "_");
-
-          tok.nextToken(); // GL_
-          tok.nextToken(); // VERSION_ 
-          if (!tok.hasMoreTokens()) { major = 0; return; }
-          major = Integer.valueOf(tok.nextToken()).intValue();
-          if (!tok.hasMoreTokens()) { minor = 0; return; }
-          minor = Integer.valueOf(tok.nextToken()).intValue();
-          if (!tok.hasMoreTokens()) { sub = 0; return; }
-          sub = Integer.valueOf(tok.nextToken()).intValue();
-        }
-        else
-        {
-          int radix = 10;
-          if (versionString.length() > 2) {
-            if (Character.isDigit(versionString.charAt(0)) &&
-                versionString.charAt(1) == '.' &&
-                Character.isDigit(versionString.charAt(2))) {
-              major = Character.digit(versionString.charAt(0), radix);
-              minor = Character.digit(versionString.charAt(2), radix);
-
-              // See if there's version-specific information which might
-              // imply a more recent OpenGL version
-              StringTokenizer tok = new StringTokenizer(versionString, " ");
-              if (tok.hasMoreTokens()) {
-                tok.nextToken();
-                if (tok.hasMoreTokens()) {
-                  String token = tok.nextToken();
-                  int i = 0;
-                  while (i < token.length() && !Character.isDigit(token.charAt(i))) {
-                    i++;
-                  }
-                  if (i < token.length() - 2 &&
-                      Character.isDigit(token.charAt(i)) &&
-                      token.charAt(i+1) == '.' &&
-                      Character.isDigit(token.charAt(i+2))) {
-                    int altMajor = Character.digit(token.charAt(i), radix);
-                    int altMinor = Character.digit(token.charAt(i+2), radix);
-                    // Avoid possibly confusing situations by putting some
-                    // constraints on the upgrades we do to the major and
-                    // minor versions
-                    if ((altMajor == major && altMinor > minor) ||
-                        altMajor == major + 1) {
-                      major = altMajor;
-                      minor = altMinor;
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        valid = true;
-      }
-      catch (Exception e)
-      {
-        // FIXME: refactor desktop OpenGL dependencies and make this
-        // class work properly for OpenGL ES
-        System.err.println("ExtensionAvailabilityCache: FunctionAvailabilityCache.Version.<init>: "+e);
-        major = 1;
-        minor = 0;
-        /*
-        throw (IllegalArgumentException)
-          new IllegalArgumentException(
-            "Illegally formatted version identifier: \"" + versionString + "\"")
-              .initCause(e);
-        */
-      }
-    }
-
-    public boolean isValid() {
-      return valid;
-    }
-
-    public int compareTo(Object o)
-    {
-      Version vo = (Version)o;
-      if (major > vo.major) return 1; 
-      else if (major < vo.major) return -1; 
-      else if (minor > vo.minor) return 1; 
-      else if (minor < vo.minor) return -1; 
-      else if (sub > vo.sub) return 1; 
-      else if (sub < vo.sub) return -1; 
-
-      return 0; // they are equal
-    }
-
-    public int getMajor() {
-      return major;
-    }
-
-    public int getMinor() {
-      return minor;
-    }
-    
-  } // end class Version
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLBufferSizeTracker.java b/src/jogl/classes/com/sun/opengl/impl/GLBufferSizeTracker.java
deleted file mode 100755
index 53fcc2de1..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/GLBufferSizeTracker.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import java.util.*;
-import javax.media.opengl.*;
-
-/**
- * Tracks as closely as possible the sizes of allocated OpenGL buffer
- * objects. When glMapBuffer or glMapBufferARB is called, in order to
- * turn the resulting base address into a java.nio.ByteBuffer, we need
- * to know the size in bytes of the allocated OpenGL buffer object.
- * Previously we would compute this size by using
- * glGetBufferParameterivARB with a pname of GL_BUFFER_SIZE, but
- * it appears doing so each time glMapBuffer is called is too costly
- * on at least Apple's new multithreaded OpenGL implementation. <P>
- *
- * Instead we now try to track the sizes of allocated buffer objects.
- * We watch calls to glBindBuffer to see which buffer is bound to
- * which target and to glBufferData to see how large the buffer's
- * allocated size is. When glMapBuffer is called, we consult our table
- * of buffer sizes to see if we can return an answer without a glGet
- * call. <P>
- *
- * We share the GLBufferSizeTracker objects among all GLContexts for
- * which sharing is enabled, because the namespace for buffer objects
- * is the same for these contexts. <P>
- *
- * Tracking the state of which buffer objects are bound is done in the
- * GLBufferStateTracker and is not completely trivial. In the face of
- * calls to glPushClientAttrib / glPopClientAttrib we currently punt
- * and re-fetch the bound buffer object for the state in question;
- * see, for example, glVertexPointer and the calls down to
- * GLBufferStateTracker.getBoundBufferObject(). Note that we currently
- * ignore new binding targets such as GL_TRANSFORM_FEEDBACK_BUFFER_NV;
- * the fact that new binding targets may be added in the future makes
- * it impossible to cache state for these new targets. <P>
- *
- * Ignoring new binding targets, the primary situation in which we may
- * not be able to return a cached answer is in the case of an error,
- * where glBindBuffer may not have been called before trying to call
- * glBufferData. Also, if external native code modifies a buffer
- * object, we may return an incorrect answer. (FIXME: this case
- * requires more thought, and perhaps stochastic and
- * exponential-fallback checking. However, note that it can only occur
- * in the face of external native code which requires that the
- * application be signed anyway, so there is no security risk in this
- * area.)
- */
-
-public class GLBufferSizeTracker {
-  // Map from buffer names to sizes.
-  // Note: should probably have some way of shrinking this map, but
-  // can't just make it a WeakHashMap because nobody holds on to the
-  // keys; would have to always track creation and deletion of buffer
-  // objects, which is probably sub-optimal. The expected usage
-  // pattern of buffer objects indicates that the fact that this map
-  // never shrinks is probably not that bad.
-  private Map/*<Integer,Integer>*/ bufferSizeMap =
-    Collections.synchronizedMap(new HashMap/*<Integer,Integer>*/());
-
-  private static final boolean DEBUG = Debug.debug("GLBufferSizeTracker");
-
-  public GLBufferSizeTracker() {
-  }
-
-  public void setBufferSize(GLBufferStateTracker bufferStateTracker,
-                            int target,
-                            GL caller,
-                            int size) {
-    // Need to do some similar queries to getBufferSize below
-    int buffer = bufferStateTracker.getBoundBufferObject(target, caller);
-    boolean valid = bufferStateTracker.isBoundBufferObjectKnown(target);
-    if (valid) {
-      if (buffer == 0) {
-        // FIXME: this really should not happen if we know what's
-        // going on. Very likely there is an OpenGL error in the
-        // application if we get here. Could silently return 0, but it
-        // seems better to get an early warning that something is
-        // wrong.
-        throw new GLException("Error: no OpenGL buffer object appears to be bound to target 0x" +
-                              Integer.toHexString(target));
-      }
-      bufferSizeMap.put(new Integer(buffer), new Integer(size));
-    }
-    // We don't know the current buffer state. Note that the buffer
-    // state tracker will have made the appropriate OpenGL query if it
-    // didn't know what was going on, so at this point we have nothing
-    // left to do except drop this piece of information on the floor.
-  }
-
-  public int getBufferSize(GLBufferStateTracker bufferStateTracker,
-                           int target,
-                           GL caller) {
-    // See whether we know what buffer is currently bound to the given
-    // state
-    int buffer = bufferStateTracker.getBoundBufferObject(target, caller);
-    boolean valid = bufferStateTracker.isBoundBufferObjectKnown(target);
-    if (valid) {
-      if (buffer == 0) {
-        // FIXME: this really should not happen if we know what's
-        // going on. Very likely there is an OpenGL error in the
-        // application if we get here. Could silently return 0, but it
-        // seems better to get an early warning that something is
-        // wrong.
-        throw new GLException("Error: no OpenGL buffer object appears to be bound to target 0x" +
-                              Integer.toHexString(target));
-      }
-      // See whether we know the size of this buffer object; at this
-      // point we almost certainly should if the application is
-      // written correctly
-      Integer key = new Integer(buffer);
-      Integer sz = (Integer) bufferSizeMap.get(key);
-      if (sz == null) {
-        // For robustness, try to query this value from the GL as we used to
-        int[] tmp = new int[1];
-        caller.glGetBufferParameteriv(target, GL.GL_BUFFER_SIZE, tmp, 0);
-        if (tmp[0] == 0) {
-          // Assume something is wrong rather than silently going along
-          throw new GLException("Error: buffer size returned by glGetBufferParameteriv was zero; probably application error");
-        }
-        // Assume we just don't know what's happening
-        sz = new Integer(tmp[0]);
-        bufferSizeMap.put(key, sz);
-        if (DEBUG) {
-          System.err.println("GLBufferSizeTracker.getBufferSize(): made slow query to cache size " +
-                             tmp[0] +
-                             " for buffer " +
-                             buffer);
-        }
-      }
-      return sz.intValue();
-    }
-    // We don't know what's going on in this case; query the GL for an answer
-    int[] tmp = new int[1];
-    caller.glGetBufferParameteriv(target, GL.GL_BUFFER_SIZE, tmp, 0);
-    if (DEBUG) {
-      System.err.println("GLBufferSizeTracker.getBufferSize(): no cached buffer information");
-    }
-    return tmp[0];
-  }
-
-  // This should be called on any major event where we might start
-  // producing wrong answers, such as OpenGL context creation and
-  // destruction if we don't know whether there are other currently-
-  // created contexts that might be keeping the buffer objects alive
-  // that we're dealing with
-  public void clearCachedBufferSizes() {
-    bufferSizeMap.clear();
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLBufferStateTracker.java b/src/jogl/classes/com/sun/opengl/impl/GLBufferStateTracker.java
deleted file mode 100755
index c61d3602d..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/GLBufferStateTracker.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import java.util.*;
-import javax.media.opengl.*;
-
-/**
- * Tracks as closely as possible which OpenGL buffer object is bound
- * to which binding target in the current OpenGL context.
- * GLBufferStateTracker objects are allocated on a per-OpenGL-context basis.
- * This class is used to verify that e.g. the vertex
- * buffer object extension is in use when the glVertexPointer variant
- * taking a long as argument is called. <P>
- * 
- * Note that because the enumerated value used for the binding of a
- * buffer object (e.g. GL_ARRAY_BUFFER) is different than that used to
- * query the binding using glGetIntegerv (e.g.
- * GL_ARRAY_BUFFER_BINDING), then in the face of new binding targets
- * being added to the GL (e.g. GL_TRANSFORM_FEEDBACK_BUFFER_NV) it is
- * impossible to set up a query of the buffer object currently bound
- * to a particular state. It turns out that for some uses, such as
- * finding the size of the currently bound buffer, this doesn't
- * matter, though of course without knowing the buffer object we can't
- * re-associate the queried size with the buffer object ID. <P>
- *
- * Because the namespace of buffer objects is the unsigned integers
- * with 0 reserved by the GL, and because we have to be able to return
- * both 0 and other integers as valid answers from
- * getBoundBufferObject(), we need a second query, which is to ask
- * whether we know the state of the binding for a given target. For
- * "unknown" targets such as GL_TRANSFORM_FEEDBACK_BUFFER_NV we return
- * false from this, but we also clear the valid bit and later refresh
- * the binding state if glPushClientAttrib / glPopClientAttrib are
- * called, since we don't want the complexity of tracking stacks of
- * these attributes.
- *
- */
-
-public class GLBufferStateTracker {
-  private static final boolean DEBUG = Debug.debug("GLBufferStateTracker");
-
-  private static final Integer arrayBufferEnum        = new Integer(GL.GL_ARRAY_BUFFER);
-  private static final Integer elementArrayBufferEnum = new Integer(GL.GL_ELEMENT_ARRAY_BUFFER);
-  private static final Integer pixelPackBufferEnum    = new Integer(GL2.GL_PIXEL_PACK_BUFFER);
-  private static final Integer pixelUnpackBufferEnum  = new Integer(GL2.GL_PIXEL_UNPACK_BUFFER);
-  private static final Integer zero                   = new Integer(0);
-
-  // Maps binding targets to buffer objects. A null value indicates
-  // that the binding is unknown. A zero value indicates that it is
-  // known that no buffer is bound to the target.
-  private Map/*<Integer,Integer>*/ bindingMap = new HashMap/*<Integer,Integer>*/();
-
-  private int[] bufTmp = new int[1];
-
-  public GLBufferStateTracker() {
-    // Start with known unbound targets for known keys
-    bindingMap.put(arrayBufferEnum,        zero);
-    bindingMap.put(elementArrayBufferEnum, zero);
-    bindingMap.put(pixelPackBufferEnum,    zero);
-    bindingMap.put(pixelUnpackBufferEnum,  zero);
-  }
-
-  public void setBoundBufferObject(int target, int buffer) {
-    bindingMap.put(box(target), box(buffer));
-  }
-
-  /** Note: returns an unspecified value if the binding for the
-      specified target (e.g. GL_ARRAY_BUFFER) is currently unknown.
-      You must use isBoundBufferObjectKnown() to see whether the
-      return value is valid. */
-  public int getBoundBufferObject(int target, GL caller) {
-    Integer value = (Integer) bindingMap.get(box(target));
-    if (value == null) {
-      // User probably either called glPushClientAttrib /
-      // glPopClientAttrib or is querying an unknown target. See
-      // whether we know how to fetch this state.
-      boolean gotQueryTarget = true;
-      int queryTarget = 0;
-      switch (target) {
-        case GL.GL_ARRAY_BUFFER:          queryTarget = GL.GL_ARRAY_BUFFER_BINDING;         break;
-        case GL.GL_ELEMENT_ARRAY_BUFFER:  queryTarget = GL.GL_ELEMENT_ARRAY_BUFFER_BINDING; break;
-        case GL2.GL_PIXEL_PACK_BUFFER:    queryTarget = GL2.GL_PIXEL_PACK_BUFFER_BINDING;    break;
-        case GL2.GL_PIXEL_UNPACK_BUFFER:  queryTarget = GL2.GL_PIXEL_UNPACK_BUFFER_BINDING;  break;
-        default:                          gotQueryTarget = false; break;
-      }
-      if (gotQueryTarget) {
-        caller.glGetIntegerv(queryTarget, bufTmp, 0);
-        if (DEBUG) {
-          System.err.println("GLBufferStateTracker.getBoundBufferObject(): queried bound buffer " +
-                             bufTmp[0] +
-                             " for query target 0x" + Integer.toHexString(queryTarget));
-        }
-        setBoundBufferObject(target, bufTmp[0]);
-        // Try once more
-        return getBoundBufferObject(target, caller);
-      }
-      return 0;
-    }
-    return value.intValue();
-  }
-
-  /** Indicates whether the binding state for the specified target is
-      currently known. Should be called after getBoundBufferObject()
-      because that method may change the answer for a given target. */
-  public boolean isBoundBufferObjectKnown(int target) {
-    return (bindingMap.get(box(target)) != null);
-  }
-
-  /** Clears out the known/unknown state of the various buffer object
-      binding states. These will be refreshed later on an as-needed
-      basis. This is called by the implementations of
-      glPushClientAttrib / glPopClientAttrib. Might want to call this
-      from GLContext.makeCurrent() in the future to possibly increase
-      the robustness of these caches in the face of external native
-      code manipulating OpenGL state. */
-  public void clearBufferObjectState() {
-    bindingMap.clear();
-  }
-
-  // FIXME: could largely remove this and use Integer.valueOf() in JDK 5
-  private static Integer box(int key) {
-    switch (key) {
-      case 0:                          return zero;
-      case GL.GL_ARRAY_BUFFER:         return arrayBufferEnum;
-      case GL.GL_ELEMENT_ARRAY_BUFFER: return elementArrayBufferEnum;
-      case GL2.GL_PIXEL_PACK_BUFFER:   return pixelPackBufferEnum;
-      case GL2.GL_PIXEL_UNPACK_BUFFER: return pixelUnpackBufferEnum;
-      default:                         return new Integer(key);
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java
deleted file mode 100644
index 70de5b8ba..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java
+++ /dev/null
@@ -1,602 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import java.nio.*;
-import java.lang.reflect.*;
-
-import javax.media.opengl.*;
-import com.sun.nativewindow.impl.NWReflection;
-import com.jogamp.gluegen.runtime.*;
-import com.jogamp.gluegen.runtime.opengl.*;
-
-public abstract class GLContextImpl extends GLContext {
-  protected GLContextLock lock = new GLContextLock();
-  protected static final boolean DEBUG = Debug.debug("GLContext");
-  protected static final boolean VERBOSE = Debug.verbose();
-  // NOTE: default sense of GLContext optimization disabled in JSR-231
-  // 1.0 beta 5 due to problems on X11 platforms (both Linux and
-  // Solaris) when moving and resizing windows. Apparently GLX tokens
-  // get sent to the X server under the hood (and out from under the
-  // cover of the AWT lock) in these situations. Users requiring
-  // multi-screen X11 applications can manually enable this flag. It
-  // basically had no tangible effect on the Windows or Mac OS X
-  // platforms anyway in particular with the disabling of the
-  // GLWorkerThread which we found to be necessary in 1.0 beta 4.
-  protected boolean optimizationEnabled = Debug.isPropertyDefined("jogl.GLContext.optimize", true);
-
-  // Cache of the functions that are available to be called at the current
-  // moment in time
-  protected ExtensionAvailabilityCache extensionAvailability;
-  // Table that holds the addresses of the native C-language entry points for
-  // OpenGL functions.
-  private ProcAddressTable glProcAddressTable;
-
-  // Tracks creation and initialization of buffer objects to avoid
-  // repeated glGet calls upon glMapBuffer operations
-  private GLBufferSizeTracker bufferSizeTracker; // Singleton - Set by GLContextShareSet
-  private GLBufferStateTracker bufferStateTracker = new GLBufferStateTracker();
-  private GLStateTracker glStateTracker = new GLStateTracker();
-
-  protected GLDrawableImpl drawable;
-  protected GLDrawableImpl drawableRead;
-
-  protected GL gl;
-
-  public GLContextImpl(GLDrawableImpl drawable, GLDrawableImpl drawableRead, GLContext shareWith) {
-    extensionAvailability = new ExtensionAvailabilityCache(this);
-    if (shareWith != null) {
-      GLContextShareSet.registerSharing(this, shareWith);
-    }
-    GLContextShareSet.registerForBufferObjectSharing(shareWith, this);
-    // This must occur after the above calls into the
-    // GLContextShareSet, which set up state needed by the GL object
-    setGL(createGL(drawable.getGLProfile()));
-
-    this.drawable = drawable;
-    setGLDrawableRead(drawableRead);
-  }
-
-  public GLContextImpl(GLDrawableImpl drawable, GLContext shareWith) {
-    this(drawable, null, shareWith);
-  }
-
-  public void setGLDrawableRead(GLDrawable read) {
-    boolean lockHeld = lock.isHeld();
-    if(lockHeld) {
-        release();
-    }
-    drawableRead = ( null != read ) ? (GLDrawableImpl) read : drawable;
-    if(lockHeld) {
-        makeCurrent();
-    }
-  }
-
-  public GLDrawable getGLDrawable() {
-    return drawable;
-  }
-
-  public GLDrawable getGLDrawableRead() {
-    return drawableRead;
-  }
-
-  public GLDrawableImpl getDrawableImpl() {
-    return (GLDrawableImpl) getGLDrawable();
-  }
-
-  public int makeCurrent() throws GLException {
-    // Support calls to makeCurrent() over and over again with
-    // different contexts without releasing them
-    // Could implement this more efficiently without explicit
-    // releasing of the underlying context; would require more error
-    // checking during the makeCurrentImpl phase
-    GLContext current = getCurrent();
-    if (current != null) {
-      if (current == this) {
-        // Assume we don't need to make this context current again
-        // For Mac OS X, however, we need to update the context to track resizes
-        update();
-        return CONTEXT_CURRENT;
-      } else {
-        current.release();
-      }
-    }
-
-    if (GLWorkerThread.isStarted() &&
-        !GLWorkerThread.isWorkerThread()) {
-      // Kick the GLWorkerThread off its current context
-      GLWorkerThread.invokeLater(new Runnable() { public void run() {} });
-    }
-
-    lock.lock();
-    int res = 0;
-    try {
-      res = makeCurrentImpl();
-
-      /* FIXME: refactor dependence on Java 2D / JOGL bridge
-      if ((tracker != null) &&
-          (res == CONTEXT_CURRENT_NEW)) {
-        // Increase reference count of GLObjectTracker
-        tracker.ref();
-      }
-      */
-    } catch (GLException e) {
-      lock.unlock();
-      throw(e);
-    }
-    if (res == CONTEXT_NOT_CURRENT) {
-      lock.unlock();
-    } else {
-      if(res == CONTEXT_CURRENT_NEW) {
-        // check if the drawable's and the GL's GLProfile are equal
-        // throws an GLException if not 
-        getGLDrawable().getGLProfile().verifyEquality(gl.getGLProfile());
-      }
-      setCurrent(this);
-
-      /* FIXME: refactor dependence on Java 2D / JOGL bridge
-
-      // Try cleaning up any stale server-side OpenGL objects
-      // FIXME: not sure what to do here if this throws
-      if (deletedObjectTracker != null) {
-        deletedObjectTracker.clean(getGL());
-      }
-      */
-    }
-    return res;
-  }
-
-  protected abstract int makeCurrentImpl() throws GLException;
-
-  public void release() throws GLException {
-    if (!lock.isHeld()) {
-      throw new GLException("Context not current on current thread");
-    }
-    setCurrent(null);
-    try {
-      releaseImpl();
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  protected abstract void releaseImpl() throws GLException;
-
-  public void destroy() {
-    if (lock.isHeld()) {
-        // release current context 
-        release();
-    }
-
-    // Must hold the lock around the destroy operation to make sure we
-    // don't destroy the context out from under another thread rendering to it
-    lock.lock();
-    try {
-      /* FIXME: refactor dependence on Java 2D / JOGL bridge
-      if (tracker != null) {
-        // Don't need to do anything for contexts that haven't been
-        // created yet
-        if (isCreated()) {
-          // If we are tracking creation and destruction of server-side
-          // OpenGL objects, we must decrement the reference count of the
-          // GLObjectTracker upon context destruction.
-          //
-          // Note that we can only eagerly delete these server-side
-          // objects if there is another context currrent right now
-          // which shares textures and display lists with this one.
-          tracker.unref(deletedObjectTracker);
-        }
-      }
-      */
-  
-      // 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();
-      }
-
-      if (bufferStateTracker != null) {
-          bufferStateTracker.clearBufferObjectState();
-      }
-  
-      if (glStateTracker != null) {
-          glStateTracker.clearStates(false);
-      }
-  
-      destroyImpl();
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  protected abstract void destroyImpl() throws GLException;
-
-  // This is only needed for Mac OS X on-screen contexts
-  protected void update() throws GLException {
-  }
-
-  public boolean isSynchronized() {
-    return !lock.getFailFastMode();
-  }
-
-  public void setSynchronized(boolean isSynchronized) {
-    lock.setFailFastMode(!isSynchronized);
-  }
-
-  public final GL getGL() {
-    return gl;
-  }
-
-  public GL setGL(GL gl) {
-    if(DEBUG) {
-        String sgl1 = (null!=this.gl)?this.gl.getClass().toString()+", "+this.gl.toString():new String("<null>");
-        String sgl2 = (null!=gl)?gl.getClass().toString()+", "+gl.toString():new String("<null>");
-        Exception e = new Exception("setGL: "+Thread.currentThread()+", "+sgl1+" -> "+sgl2);
-        e.printStackTrace();
-    }
-    this.gl = gl;
-    return gl;
-  }
-
-  public abstract Object getPlatformGLExtensions();
-
-  //----------------------------------------------------------------------
-  // Helpers for various context implementations
-  //
-
-  private Object createInstance(GLProfile glp, String suffix, Class[] cstrArgTypes, Object[] cstrArgs) {
-    return NWReflection.createInstance(glp.getGLImplBaseClassName()+suffix, cstrArgTypes, cstrArgs);
-  }
-
-  /** Create the GL for this context. */
-  protected GL createGL(GLProfile glp) {
-    GL gl = (GL) createInstance(glp, "Impl", new Class[] { GLProfile.class, GLContextImpl.class }, new Object[] { glp, this } );
-
-    /* FIXME: refactor dependence on Java 2D / JOGL bridge
-    if (tracker != null) {
-      gl.setObjectTracker(tracker);
-    }
-    */
-    return gl;
-  }
-  
-  public final ProcAddressTable getGLProcAddressTable() {
-    return glProcAddressTable;
-  }
-  
-  /**
-   * Shall return the platform extension ProcAddressTable,
-   * ie for GLXExt, EGLExt, ..
-   */
-  public abstract ProcAddressTable getPlatformExtProcAddressTable();
-
-  /**
-   * Pbuffer support; given that this is a GLContext associated with a
-   * pbuffer, binds this pbuffer to its texture target.
-   */
-  public abstract void bindPbufferToTexture();
-
-  /**
-   * Pbuffer support; given that this is a GLContext associated with a
-   * pbuffer, releases this pbuffer from its texture target.
-   */
-  public abstract void releasePbufferFromTexture();
-
-  public abstract ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3);
-
-  public void setSwapInterval(final int interval) {
-    GLContext current = getCurrent();
-    if (current != this) {
-        throw new GLException("This context is not current. Current context: "+current+
-                              ", this context "+this);
-    }
-    setSwapIntervalImpl(interval);
-  }
-
-  protected int currentSwapInterval = -1; // default: not set yet ..
-
-  public int getSwapInterval() {
-    return currentSwapInterval;
-  }
-
-  protected void setSwapIntervalImpl(final int interval) {
-    // nop per default ..
-  }
-
-  /** Maps the given "platform-independent" function name to a real function
-      name. Currently this is only used to map "glAllocateMemoryNV" and
-      associated routines to wglAllocateMemoryNV / glXAllocateMemoryNV. */
-  protected abstract String mapToRealGLFunctionName(String glFunctionName);
-
-  /** Maps the given "platform-independent" extension name to a real
-      function name. Currently this is only used to map
-      "GL_ARB_pbuffer" and "GL_ARB_pixel_format" to "WGL_ARB_pbuffer"
-      and "WGL_ARB_pixel_format" (not yet mapped to X11). */
-  protected abstract String mapToRealGLExtensionName(String glExtensionName);
-
-  /** Helper routine which resets a ProcAddressTable generated by the
-      GLEmitter by looking up anew all of its function pointers. */
-  protected void resetProcAddressTable(Object table) {
-    GLProcAddressHelper.resetProcAddressTable(table, getDrawableImpl().getDynamicLookupHelper() );
-  }
-
-  /** Indicates whether the underlying OpenGL context has been
-      created. This is used to manage sharing of display lists and
-      textures between contexts. */
-  public abstract boolean isCreated();
-
-  /**
-   * Sets the OpenGL implementation class and
-   * the cache of which GL functions are available for calling through this
-   * context. See {@link #isFunctionAvailable(String)} for more information on
-   * the definition of "available".
-   *
-   * @param force force the setting, even if is already being set.
-   *              This might be usefull if you change the OpenGL implementation.
-   */
-  protected void setGLFunctionAvailability(boolean force) {
-    if(null!=this.gl && null!=glProcAddressTable && !force) {
-        return; // already done and not forced
-    }
-    if(null==this.gl || force) {
-        setGL(createGL(getGLDrawable().getGLProfile()));
-    }
-
-    updateGLProcAddressTable();
-  }
-
-  /**
-   * Updates the cache of which GL functions are available for calling through this
-   * context. See {@link #isFunctionAvailable(String)} for more information on
-   * the definition of "available".
-   */
-  protected void updateGLProcAddressTable() {
-    if(null==this.gl) {
-        throw new GLException("setGLFunctionAvailability not called yet");
-    }
-    if (DEBUG) {
-      System.err.println(getThreadName() + ": !!! Initializing OpenGL extension address table for " + this);
-    }
-    if (glProcAddressTable == null) {
-      glProcAddressTable = (ProcAddressTable) createInstance(gl.getGLProfile(), "ProcAddressTable", new Class[0], null);
-      // FIXME: cache ProcAddressTables by capability bits so we can
-      // share them among contexts with the same capabilities
-    }
-    resetProcAddressTable(getGLProcAddressTable());
-
-    extensionAvailability.reset();
-  }
-
-  /**
-   * Returns true if the specified OpenGL core- or extension-function can be
-   * successfully called using this GL context given the current host (OpenGL
-   * <i>client</i>) and display (OpenGL <i>server</i>) configuration.
-   *
-   * See {@link GL#isFunctionAvailable(String)} for more details.
-   *
-   * @param glFunctionName the name of the OpenGL function (e.g., use
-   * "glPolygonOffsetEXT" or "glPolygonOffset" to check if the {@link
-   * javax.media.opengl.GL#glPolygonOffset(float,float)} is available).
-   */
-  public boolean isFunctionAvailable(String glFunctionName) {
-    if(isCreated()) {
-        // Check GL 1st (cached)
-        ProcAddressTable pTable = getGLProcAddressTable();
-        try {
-            if(0!=pTable.getAddressFor(glFunctionName)) {
-                return true;
-            }
-        } catch (Exception e) {}
-
-        // Check platform extensions 2nd (cached)
-        pTable = getPlatformExtProcAddressTable();
-        try {
-            if(0!=pTable.getAddressFor(glFunctionName)) {
-                return true;
-            }
-        } catch (Exception e) {}
-    }
-    // dynamic function lookup at last incl name aliasing (not cached)
-    DynamicLookupHelper dynLookup = getDrawableImpl().getDynamicLookupHelper();
-    String tmpBase = GLExtensionNames.normalizeVEN(GLExtensionNames.normalizeARB(glFunctionName, true), true);
-    long addr = 0;
-    int  variants = GLExtensionNames.getFuncNamePermutationNumber(tmpBase);
-    for(int i = 0; 0==addr && i < variants; i++) {
-        String tmp = GLExtensionNames.getFuncNamePermutation(tmpBase, i);
-        try {
-            addr = dynLookup.dynamicLookupFunction(tmp);
-        } catch (Exception e) { }
-    }
-    if(0!=addr) {
-        return true;
-    }
-    return false;
-  }
-
-  /**
-   * Returns true if the specified OpenGL extension can be
-   * successfully called using this GL context given the current host (OpenGL
-   * <i>client</i>) and display (OpenGL <i>server</i>) configuration.
-   *
-   * See {@link GL#isExtensionAvailable(String)} for more details.
-   *
-   * @param glExtensionName the name of the OpenGL extension (e.g.,
-   * "GL_VERTEX_PROGRAM_ARB").
-   */
-  public boolean isExtensionAvailable(String glExtensionName) {
-      return extensionAvailability.isExtensionAvailable(mapToRealGLExtensionName(glExtensionName));
-  }
-
-  public String getPlatformExtensionsString() {
-      return extensionAvailability.getPlatformExtensionsString();
-  }
-
-  public String getGLExtensions() {
-      return extensionAvailability.getGLExtensions();
-  }
-
-  public int getMajorVersion() {
-      return extensionAvailability.getMajorVersion();
-  }
-
-  public int getMinorVersion() {
-      return extensionAvailability.getMinorVersion();
-  }
-
-  public boolean isExtensionCacheInitialized() {
-      return extensionAvailability.isInitialized();
-  }
-
-  /** Indicates which floating-point pbuffer implementation is in
-      use. Returns one of GLPbuffer.APPLE_FLOAT, GLPbuffer.ATI_FLOAT,
-      or GLPbuffer.NV_FLOAT. */
-  public int getFloatingPointMode() throws GLException {
-    throw new GLException("Not supported on non-pbuffer contexts");
-  }
-
-  /** On some platforms the mismatch between OpenGL's coordinate
-      system (origin at bottom left) and the window system's
-      coordinate system (origin at top left) necessitates a vertical
-      flip of pixels read from offscreen contexts. */
-  public abstract boolean offscreenImageNeedsVerticalFlip();
-
-  /** Only called for offscreen contexts; needed by glReadPixels */
-  public abstract int getOffscreenContextPixelDataType();
-
-  protected static String getThreadName() {
-    return Thread.currentThread().getName();
-  }
-
-  public static String toHexString(long hex) {
-    return "0x" + Long.toHexString(hex);
-  }
-
-  //----------------------------------------------------------------------
-  // Helpers for buffer object optimizations
-  
-  public void setBufferSizeTracker(GLBufferSizeTracker bufferSizeTracker) {
-    this.bufferSizeTracker = bufferSizeTracker;
-  }
-
-  public GLBufferSizeTracker getBufferSizeTracker() {
-    return bufferSizeTracker;
-  }
-
-  public GLBufferStateTracker getBufferStateTracker() {
-    return bufferStateTracker;
-  }
-
-  public GLStateTracker getGLStateTracker() {
-    return glStateTracker;
-  }
-
-  //---------------------------------------------------------------------------
-  // Helpers for context optimization where the last context is left
-  // current on the OpenGL worker thread
-  //
-
-  public boolean isOptimizable() {
-    return optimizationEnabled;
-  }
-
-  public boolean hasWaiters() {
-    return lock.hasWaiters();
-  }
-
-  /* FIXME: needed only by the Java 2D / JOGL bridge; refactor
-
-  public GLContextImpl(GLContext shareWith) {
-    this(shareWith, false);
-  }
-  
-  public GLContextImpl(GLContext shareWith, boolean dontShareWithJava2D) {
-    extensionAvailability = new ExtensionAvailabilityCache(this);
-    GLContext shareContext = shareWith;
-    if (!dontShareWithJava2D) {
-      shareContext = Java2D.filterShareContext(shareWith);
-    }
-    if (shareContext != null) {
-      GLContextShareSet.registerSharing(this, shareContext);
-    }
-    // Always indicate real behind-the-scenes sharing to track deleted objects
-    if (shareContext == null) {
-      shareContext = Java2D.filterShareContext(shareWith);
-    }
-    GLContextShareSet.registerForObjectTracking(shareWith, this, shareContext);
-    GLContextShareSet.registerForBufferObjectSharing(shareWith, this);
-    // This must occur after the above calls into the
-    // GLContextShareSet, which set up state needed by the GL object
-    setGL(createGL());
-  }
-
-  //---------------------------------------------------------------------------
-  // Helpers for integration with Java2D/OpenGL pipeline when FBOs are
-  // being used
-  //
-
-  public void setObjectTracker(GLObjectTracker tracker) {
-    this.tracker = tracker;
-  }
-  
-  public GLObjectTracker getObjectTracker() {
-    return tracker;
-  }
-
-  public void setDeletedObjectTracker(GLObjectTracker deletedObjectTracker) {
-    this.deletedObjectTracker = deletedObjectTracker;
-  }
-
-  public GLObjectTracker getDeletedObjectTracker() {
-    return deletedObjectTracker;
-  }
-
-  // Tracks creation and deletion of server-side OpenGL objects when
-  // the Java2D/OpenGL pipeline is active and using FBOs to render
-  private GLObjectTracker tracker;
-  // Supports deletion of these objects when no other context is
-  // current which can support immediate deletion of them
-  private GLObjectTracker deletedObjectTracker;
-
-  */
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLContextLock.java b/src/jogl/classes/com/sun/opengl/impl/GLContextLock.java
deleted file mode 100644
index 753ef14f8..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/GLContextLock.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import javax.media.opengl.*;
-
-/** Implements the makeCurrent / release locking behavior of the
-    GLContext class. When "fail fast mode" is enabled, attempts to
-    lock the same GLContextLock on more than one thread cause
-    GLException to be raised. This lock is not recursive. Attempts to
-    lock it more than once on a given thread will cause GLException to
-    be raised. */
-
-public class GLContextLock {
-  private Object lock = new Object();
-  private Thread owner;
-  private boolean failFastMode = true;
-  private volatile int waiters;
-
-  /** Locks this GLContextLock on the current thread. If fail fast
-      mode is enabled and the GLContextLock is already owned by
-      another thread, throws GLException. */
-  public void lock() throws GLException {
-    synchronized(lock) {
-      Thread current = Thread.currentThread();
-      if (owner == null) {
-        owner = current;
-      } else if (owner != current) {
-        while (owner != null) {
-          if (failFastMode) {
-            throw new GLException("Attempt to make context current on thread " + current +
-                                  " which is already current on thread " + owner);
-          } else {
-            try {
-              ++waiters;
-              lock.wait();
-            } catch (InterruptedException e) {
-              throw new GLException(e);
-            } finally {
-              --waiters;
-            }
-          }
-        }
-        owner = current;
-      } else {
-        throw new GLException("Attempt to make the same context current twice on thread " + current);
-      }
-    }
-  }
-
-  /** Unlocks this GLContextLock. */
-  public void unlock() throws GLException {
-    synchronized (lock) {
-      Thread current = Thread.currentThread();
-      if (owner == current) {
-        owner = null;
-        lock.notifyAll();
-      } else {
-        if (owner != null) {
-          throw new GLException("Attempt by thread " + current +
-                                " to release context owned by thread " + owner);
-        } else {
-          throw new GLException("Attempt by thread " + current +
-                                " to release unowned context");
-        }
-      }
-    }
-  }
-
-  /** Indicates whether this lock is held by the current thread. */
-  public boolean isHeld() {
-    synchronized(lock) {
-      Thread current = Thread.currentThread();
-      return (owner == current);
-    }
-  }
-
-  public void setFailFastMode(boolean onOrOff) {
-    failFastMode = onOrOff;
-  }
-
-  public boolean getFailFastMode() {
-    return failFastMode;
-  }
-
-  public boolean hasWaiters() {
-    return (waiters != 0);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLContextShareSet.java b/src/jogl/classes/com/sun/opengl/impl/GLContextShareSet.java
deleted file mode 100644
index 5f8fc1c84..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/GLContextShareSet.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-// FIXME: refactor Java SE dependencies
-// import java.awt.GraphicsConfiguration;
-// import java.awt.GraphicsDevice;
-// import java.awt.GraphicsEnvironment;
-import java.lang.ref.*;
-import java.util.*;
-import javax.media.opengl.*;
-
-/** Provides a mechanism by which OpenGL contexts can share textures
-    and display lists in the face of multithreading and asynchronous
-    context creation as is inherent in the AWT and Swing. */
-
-public class GLContextShareSet {
-  // FIXME: refactor Java SE dependencies
-  //  private static boolean forceTracking = Debug.isPropertyDefined("jogl.glcontext.forcetracking");
-  private static final boolean DEBUG = Debug.debug("GLContextShareSet");
-
-  // This class is implemented with a WeakHashMap that goes from the
-  // contexts as keys to a complex data structure as value that tracks
-  // context creation and deletion.
-
-  private static Map/*<GLContext, ShareSet>*/ shareMap = new WeakHashMap();
-  private static Object dummyValue = new Object();
-
-  private static class ShareSet {
-    private Map allShares       = new WeakHashMap();
-    private Map createdShares   = new WeakHashMap();
-    private Map destroyedShares = new WeakHashMap();
-
-    public void add(GLContext ctx) {
-      if (allShares.put(ctx, dummyValue) == null) {
-        // FIXME: downcast to GLContextImpl undesirable
-        if (((GLContextImpl) ctx).isCreated()) {
-          createdShares.put(ctx, dummyValue);
-        } else {
-          destroyedShares.put(ctx, dummyValue);
-        }
-      }      
-    }
-
-    public GLContext getCreatedShare(GLContext ignore) {
-      for (Iterator iter = createdShares.keySet().iterator(); iter.hasNext(); ) {
-        GLContext ctx = (GLContext) iter.next();
-        if (ctx != ignore) {
-          return ctx;
-        }
-      }
-      return null;
-    }
-
-    public void contextCreated(GLContext ctx) {
-      Object res = destroyedShares.remove(ctx);
-      assert res != null : "State of ShareSet corrupted; thought context " +
-        ctx + " should have been in destroyed set but wasn't";
-      res = createdShares.put(ctx, dummyValue);
-      assert res == null : "State of ShareSet corrupted; thought context " +
-        ctx + " shouldn't have been in created set but was";
-    }
-
-    public void contextDestroyed(GLContext ctx) {
-      Object res = createdShares.remove(ctx);
-      assert res != null : "State of ShareSet corrupted; thought context " +
-        ctx + " should have been in created set but wasn't";
-      res = destroyedShares.put(ctx, dummyValue);
-      assert res == null : "State of ShareSet corrupted; thought context " +
-        ctx + " shouldn't have been in destroyed set but was";
-    }
-  }
-
-  /** Indicate that contexts <code>share1</code> and
-      <code>share2</code> will share textures and display lists. Both
-      must be non-null. */
-  public static synchronized void registerSharing(GLContext share1, GLContext share2) {
-    if (share1 == null || share2 == null) {
-      throw new IllegalArgumentException("Both share1 and share2 must be non-null");
-    }
-    ShareSet share = entryFor(share1);
-    if (share == null) {
-      share = entryFor(share2);
-    }
-    if (share == null) {
-      share = new ShareSet();
-    }
-    share.add(share1);
-    share.add(share2);
-    addEntry(share1, share);
-    addEntry(share2, share);
-  }
-
-  public static synchronized GLContext getShareContext(GLContext contextToCreate) {
-    ShareSet share = entryFor(contextToCreate);
-    if (share == null) {
-      return null;
-    }
-    return share.getCreatedShare(contextToCreate);
-  }
-
-  public static synchronized void contextCreated(GLContext context) {
-    ShareSet share = entryFor(context);
-    if (share != null) {
-      share.contextCreated(context);
-    }
-  }
-
-  public static synchronized void contextDestroyed(GLContext context) {
-    ShareSet share = entryFor(context);
-    if (share != null) {
-      share.contextDestroyed(context);
-    }
-  }
-
-  /** In order to avoid glGet calls for buffer object checks related
-      to glVertexPointer, etc. calls as well as glMapBuffer calls, we
-      need to share the same GLBufferSizeTracker object between
-      contexts sharing textures and display lists. For now we keep
-      this mechanism orthogonal to the GLObjectTracker to hopefully
-      keep things easier to understand. (The GLObjectTracker is
-      currently only needed in a fairly esoteric case, when the
-      Java2D/JOGL bridge is active, but the GLBufferSizeTracker
-      mechanism is now always required.) */
-  public static void registerForBufferObjectSharing(GLContext olderContextOrNull, GLContext newContext) {
-    // FIXME: downcasts to GLContextImpl undesirable
-    GLContextImpl older = (GLContextImpl) olderContextOrNull;
-    GLContextImpl newer = (GLContextImpl) newContext;
-    GLBufferSizeTracker tracker = null;
-    if (older != null) {
-      tracker = older.getBufferSizeTracker();
-      assert (tracker != null)
-        : "registerForBufferObjectSharing was not called properly for the older context, or has a bug in it";
-    }
-    if (tracker == null) {
-      tracker = new GLBufferSizeTracker();
-    }
-    newer.setBufferSizeTracker(tracker);
-  }
-
-  // FIXME: refactor Java SE dependencies
-  //  /** Indicates that the two supplied contexts (which must be able to
-  //      share textures and display lists) should be in the same
-  //      namespace for tracking of server-side object creation and
-  //      deletion. Because the sharing necessary behind the scenes is
-  //      different than that requested at the user level, the two notions
-  //      are different. This must be called immediately after the
-  //      creation of the new context (which is the second argument)
-  //      before any server-side OpenGL objects have been created in that
-  //      context. */
-  //  public static void registerForObjectTracking(GLContext olderContextOrNull,
-  //                                               GLContext newContext,
-  //                                               GLContext realShareContext) {
-  //    if (isObjectTrackingEnabled() || isObjectTrackingDebuggingEnabled()) {
-  //      GLContextImpl impl1 = null;      
-  //      GLContextImpl impl2 = null;      
-  //      GLObjectTracker tracker = null;
-  //
-  //      synchronized (GLContextShareSet.class) {
-  //        if (olderContextOrNull != null &&
-  //            newContext != null) {
-  //          if (entryFor(olderContextOrNull) != entryFor(newContext)) {
-  //            throw new IllegalArgumentException("old and new contexts must be able to share textures and display lists");
-  //          }
-  //        }
-  //
-  //        // FIXME: downcast to GLContextImpl undesirable
-  //        impl1 = (GLContextImpl) olderContextOrNull;
-  //        impl2 = (GLContextImpl) newContext;
-  //
-  //        GLObjectTracker deletedObjectTracker = null;
-  //        GLContextImpl shareImpl = (GLContextImpl) realShareContext;
-  //        // Before we zap the "user-level" object trackers, make sure
-  //        // that all contexts in the share set share the destroyed object
-  //        // tracker
-  //        if (shareImpl != null) {
-  //          deletedObjectTracker = shareImpl.getDeletedObjectTracker();
-  //        }
-  //        if (deletedObjectTracker == null) {
-  //          // Must create one and possibly set it up in the older context
-  //          deletedObjectTracker = new GLObjectTracker();
-  //          if (DEBUG) {
-  //            System.err.println("Created deletedObjectTracker " + deletedObjectTracker + " because " +
-  //                               ((shareImpl == null) ? "shareImpl was null" : "shareImpl's (" + shareImpl + ") deletedObjectTracker was null"));
-  //          }
-  //
-  //          if (shareImpl != null) {
-  //            // FIXME: think should really assert in this case
-  //            shareImpl.setDeletedObjectTracker(deletedObjectTracker);
-  //            if (DEBUG) {
-  //              System.err.println("Set deletedObjectTracker " + deletedObjectTracker + " in shareImpl context " + shareImpl);
-  //            }
-  //          }
-  //        }
-  //        impl2.setDeletedObjectTracker(deletedObjectTracker);
-  //        if (DEBUG) {
-  //          System.err.println("Set deletedObjectTracker " + deletedObjectTracker + " in impl2 context " + impl2);
-  //        }
-  //      }
-  //
-  //      // Must not hold lock around this operation
-  //      // Don't share object trackers with the primordial share context from Java2D
-  //      if (Java2D.isOGLPipelineActive()) {
-  //        // FIXME: probably need to do something different here
-  //        // Need to be able to figure out the GraphicsDevice for the
-  //        // older context if it's on-screen
-  //        GraphicsDevice device = GraphicsEnvironment.
-  //          getLocalGraphicsEnvironment().
-  //          getDefaultScreenDevice();
-  //        GLContext j2dShareContext = Java2D.getShareContext(device);
-  //        if (impl1 != null && impl1 == j2dShareContext) {
-  //          impl1 = null;
-  //        }
-  //      }
-  //
-  //      synchronized (GLContextShareSet.class) {
-  //        if (impl1 != null) {
-  //          tracker = impl1.getObjectTracker();
-  //          assert (tracker != null)
-  //            : "registerForObjectTracking was not called properly for the older context";
-  //        }
-  //        if (tracker == null) {
-  //          tracker = new GLObjectTracker();
-  //        }
-  //        // Note that we don't assert that the tracker is non-null for
-  //        // impl2 because the way we use this functionality we actually
-  //        // overwrite the initially-set object tracker in the new context
-  //        impl2.setObjectTracker(tracker);
-  //      }
-  //    }
-  //  }
-  
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  
-
-  private static ShareSet entryFor(GLContext context) {
-    return (ShareSet) shareMap.get(context);
-  }
-
-  private static void addEntry(GLContext context, ShareSet share) {
-    if (shareMap.get(context) == null) {
-      shareMap.put(context, share);
-    }
-  }
-
-  // FIXME: refactor Java SE dependencies
-  //  private static boolean isObjectTrackingEnabled() {
-  //    return ((Java2D.isOGLPipelineActive() && Java2D.isFBOEnabled()) ||
-  //            isObjectTrackingDebuggingEnabled());
-  //  }
-  //
-  //  private static boolean isObjectTrackingDebuggingEnabled() {
-  //    return forceTracking;
-  //  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java
deleted file mode 100644
index 9f39c67cb..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import java.nio.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.jogamp.gluegen.runtime.*;
-import com.sun.nativewindow.impl.NWReflection;
-import java.lang.reflect.*;
-
-/** Extends GLDrawableFactory with a few methods for handling
-    typically software-accelerated offscreen rendering (Device
-    Independent Bitmaps on Windows, pixmaps on X11). Direct access to
-    these GLDrawables is not supplied directly to end users, though
-    they may be instantiated by the GLJPanel implementation. */
-public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
-  protected static final boolean DEBUG = Debug.debug("GLDrawableFactory");
-
-  //---------------------------------------------------------------------------
-  // Dispatching GLDrawable construction in respect to the NativeWindow Capabilities
-  //
-  public GLDrawable createGLDrawable(NativeWindow target) {
-    if (target == null) {
-      throw new IllegalArgumentException("Null target");
-    }
-    AbstractGraphicsConfiguration config = target.getGraphicsConfiguration().getNativeGraphicsConfiguration();
-    GLCapabilities caps = (GLCapabilities) target.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
-    GLDrawable result = null;
-    if(caps.isOnscreen()) {
-        if(caps.isPBuffer()) {
-            throw new IllegalArgumentException("Onscreen target can't be PBuffer: "+caps);
-        }
-        if(DEBUG) {
-            System.out.println("GLDrawableFactoryImpl.createGLDrawable -> OnscreenDrawable: "+target);
-        }
-        result = createOnscreenDrawable(target);
-    } else {
-        if( ! ( target instanceof SurfaceChangeable ) ) {
-            throw new IllegalArgumentException("Passed NativeWindow must implement SurfaceChangeable for offscreen: "+target);
-        }
-        if(caps.isPBuffer() && canCreateGLPbuffer()) {
-            if(DEBUG) {
-                System.out.println("GLDrawableFactoryImpl.createGLDrawable -> PbufferDrawable: "+target);
-            }
-            result = createGLPbufferDrawable(target);
-        }
-        if(null==result) {
-            if(DEBUG) {
-                System.out.println("GLDrawableFactoryImpl.createGLDrawable -> OffScreenDrawable: "+target);
-            }
-            result = createOffscreenDrawable(target);
-        }
-    }
-    if(DEBUG) {
-        System.out.println("GLDrawableFactoryImpl.createGLDrawable: "+result);
-    }
-    return result;
-  }
-
-  //---------------------------------------------------------------------------
-  //
-  // Onscreen GLDrawable construction 
-  //
-
-  protected abstract GLDrawableImpl createOnscreenDrawable(NativeWindow target);
-
-  //---------------------------------------------------------------------------
-  //
-  // PBuffer GLDrawable construction 
-  //
-
-  /** Target must implement SurfaceChangeable */
-  protected abstract GLDrawableImpl createGLPbufferDrawableImpl(NativeWindow target);
-
-  protected GLDrawableImpl createGLPbufferDrawable(NativeWindow target) {
-    if (!canCreateGLPbuffer()) {
-        throw new GLException("Pbuffer support not available with current graphics card");
-    }
-    return createGLPbufferDrawableImpl(target);
-  }
-
-  public GLDrawable createGLPbufferDrawable(GLCapabilities capabilities,
-                                            GLCapabilitiesChooser chooser,
-                                            int width,
-                                            int height) {
-    if(height<=0 || height<=0) {
-        throw new GLException("Width and height of pbuffer must be positive (were (" +
-                        width + ", " + height + "))");
-    }
-    capabilities.setDoubleBuffered(false); // FIXME
-    capabilities.setOnscreen(false);
-    capabilities.setPBuffer(true);
-    return createGLPbufferDrawable( createOffscreenWindow(capabilities, chooser, height, height) );
-  }
-
-  public GLPbuffer createGLPbuffer(GLCapabilities capabilities,
-                                   GLCapabilitiesChooser chooser,
-                                   int width,
-                                   int height,
-                                   GLContext shareWith) {
-    return new GLPbufferImpl( (GLDrawableImpl) createGLPbufferDrawable(capabilities, chooser, height, height),
-                              shareWith);
-  }
-
-
-  //---------------------------------------------------------------------------
-  //
-  // Offscreen GLDrawable construction 
-  //
-
-  protected abstract GLDrawableImpl createOffscreenDrawable(NativeWindow target) ;
-
-  public GLDrawable createOffscreenDrawable(GLCapabilities capabilities,
-                                            GLCapabilitiesChooser chooser,
-                                            int width,
-                                            int height) {
-    if(width<=0 || height<=0) {
-        throw new GLException("Width and height of pbuffer must be positive (were (" +
-                        width + ", " + height + "))");
-    }
-    capabilities.setDoubleBuffered(false); // FIXME
-    capabilities.setOnscreen(false);
-    capabilities.setPBuffer(false);
-    return createOffscreenDrawable( createOffscreenWindow(capabilities, chooser, width, height) );
-  }
-
-  /**
-   * creates an offscreen NativeWindow, which must implement SurfaceChangeable as well,
-   * so the windowing system related implementation is able to set the surface handle.
-   */
-  protected abstract NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, 
-                                                        int width, int height);
-
-  protected GLDrawableFactoryImpl() {
-    super();
-  }
-
-  protected void maybeDoSingleThreadedWorkaround(Runnable action) {
-    if (Threading.isSingleThreaded() &&
-        !Threading.isOpenGLThread()) {
-      Threading.invokeOnOpenGLThread(action);
-    } else {
-      action.run();
-    }
-  }
-
-  /**
-   * Returns the sole GLDrawableFactoryImpl instance.
-   *
-   * @param glProfile GLProfile to determine the factory type, ie EGLDrawableFactory,
-   *                or one of the native GLDrawableFactory's, ie X11/GLX, Windows/WGL or MacOSX/CGL.
-   */
-  public static GLDrawableFactoryImpl getFactoryImpl(GLProfile glp) {
-    return (GLDrawableFactoryImpl) getFactory(glp);
-  }
-
-  // Helper function for more lazily loading the GLU library;
-  // apparently can't use System.loadLibrary on UNIX because it uses
-  // RTLD_LOCAL and we need to call dlsym(RTLD_DEFAULT)
-  public abstract void loadGLULibrary();
-
-  //----------------------------------------------------------------------
-  // Support for locking and unlocking the toolkit -- needed only on X11 platforms
-  //
-
-  public void lockToolkit() {
-    NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-  }
-
-  public void unlockToolkit() {
-    NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
-  }
-
-  //---------------------------------------------------------------------------
-  // Support for Java2D/JOGL bridge on Mac OS X; the external
-  // GLDrawable mechanism in the public API is sufficient to
-  // implement this functionality on all other platforms
-  //
-
-  public abstract boolean canCreateContextOnJava2DSurface();
-
-  public abstract GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
-    throws GLException;
-
-  //----------------------------------------------------------------------
-  // Gamma adjustment support
-  // Thanks to the LWJGL team for illustrating how to make these
-  // adjustments on various OSs.
-
-  /*
-   * Portions Copyright (c) 2002-2004 LWJGL Project
-   * All rights reserved.
-   *
-   * Redistribution and use in source and binary forms, with or without
-   * modification, are permitted provided that the following conditions are
-   * met:
-   *
-   * * Redistributions of source code must retain the above copyright
-   *   notice, this list of conditions and the following disclaimer.
-   *
-   * * Redistributions in binary form must reproduce the above copyright
-   *   notice, this list of conditions and the following disclaimer in the
-   *   documentation and/or other materials provided with the distribution.
-   *
-   * * Neither the name of 'LWJGL' nor the names of
-   *   its contributors may be used to endorse or promote products derived
-   *   from this software without specific prior written permission.
-   *
-   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-   * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-   * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-   * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   */
-
-  /**
-   * Sets the gamma, brightness, and contrast of the current main
-   * display. Returns true if the settings were changed, false if
-   * not. If this method returns true, the display settings will
-   * automatically be reset upon JVM exit (assuming the JVM does not
-   * crash); if the user wishes to change the display settings back to
-   * normal ahead of time, use resetDisplayGamma(). Throws
-   * IllegalArgumentException if any of the parameters were
-   * out-of-bounds.
-   * 
-   * @param gamma The gamma value, typically > 1.0 (default value is
-   *   1.0)
-   * @param brightness The brightness value between -1.0 and 1.0,
-   *   inclusive (default value is 0)
-   * @param contrast The contrast, greater than 0.0 (default value is 1)
-   * @throws IllegalArgumentException if any of the parameters were
-   *   out-of-bounds
-   */
-  public boolean setDisplayGamma(float gamma, float brightness, float contrast) throws IllegalArgumentException {
-    if ((brightness < -1.0f) || (brightness > 1.0f)) {
-      throw new IllegalArgumentException("Brightness must be between -1.0 and 1.0");
-    }
-    if (contrast < 0) {
-      throw new IllegalArgumentException("Contrast must be greater than 0.0");
-    }
-    // FIXME: ensure gamma is > 1.0? Are smaller / negative values legal?
-    int rampLength = getGammaRampLength();
-    if (rampLength == 0) {
-      return false;
-    }
-    float[] gammaRamp = new float[rampLength];
-    for (int i = 0; i < rampLength; i++) {
-      float intensity = (float) i / (float) (rampLength - 1);
-      // apply gamma
-      float rampEntry = (float) java.lang.Math.pow(intensity, gamma);
-      // apply brightness
-      rampEntry += brightness;
-      // apply contrast
-      rampEntry = (rampEntry - 0.5f) * contrast + 0.5f;
-      // Clamp entry to [0, 1]
-      if (rampEntry > 1.0f)
-        rampEntry = 1.0f;
-      else if (rampEntry < 0.0f)
-        rampEntry = 0.0f;
-      gammaRamp[i] = rampEntry;
-    }
-    registerGammaShutdownHook();
-    return setGammaRamp(gammaRamp);
-  }
-
-  public synchronized void resetDisplayGamma() {
-    if (gammaShutdownHook == null) {
-      throw new IllegalArgumentException("Should not call this unless setDisplayGamma called first");
-    }
-    resetGammaRamp(originalGammaRamp);
-    unregisterGammeShutdownHook();
-  }
-
-  //------------------------------------------------------
-  // Gamma-related methods to be implemented by subclasses
-  //
-
-  /** Returns the length of the computed gamma ramp for this OS and
-      hardware. Returns 0 if gamma changes are not supported. */
-  protected int getGammaRampLength() {
-    return 0;
-  }
-
-  /** Sets the gamma ramp for the main screen. Returns false if gamma
-      ramp changes were not supported. */
-  protected boolean setGammaRamp(float[] ramp) {
-    return false;
-  }
-
-  /** Gets the current gamma ramp. This is basically an opaque value
-      used only on some platforms to reset the gamma ramp to its
-      original settings. */
-  protected Buffer getGammaRamp() {
-    return null;
-  }
-
-  /** Resets the gamma ramp, potentially using the specified Buffer as
-      data to restore the original values. */
-  protected void resetGammaRamp(Buffer originalGammaRamp) {
-  }
-
-  // Shutdown hook mechanism for resetting gamma
-  private boolean gammaShutdownHookRegistered;
-  private Thread  gammaShutdownHook;
-  private Buffer  originalGammaRamp;
-  private synchronized void registerGammaShutdownHook() {
-    if (gammaShutdownHookRegistered)
-      return;
-    if (gammaShutdownHook == null) {
-      gammaShutdownHook = new Thread(new Runnable() {
-          public void run() {
-            synchronized (GLDrawableFactoryImpl.this) {
-              resetGammaRamp(originalGammaRamp);
-            }
-          }
-        });
-      originalGammaRamp = getGammaRamp();
-    }
-    Runtime.getRuntime().addShutdownHook(gammaShutdownHook);
-    gammaShutdownHookRegistered = true;
-  }
-
-  private synchronized void unregisterGammeShutdownHook() {
-    if (!gammaShutdownHookRegistered)
-      return;
-    if (gammaShutdownHook == null) {
-      throw new InternalError("Error in gamma shutdown hook logic");
-    }
-    Runtime.getRuntime().removeShutdownHook(gammaShutdownHook);
-    gammaShutdownHookRegistered = false;
-    // Leave the original gamma ramp data alone
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableHelper.java b/src/jogl/classes/com/sun/opengl/impl/GLDrawableHelper.java
deleted file mode 100644
index d6ca2cbf5..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableHelper.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import java.util.*;
-import javax.media.opengl.*;
-
-/** Encapsulates the implementation of most of the GLAutoDrawable's
-    methods to be able to share it between GLCanvas and GLJPanel. */
-
-public class GLDrawableHelper {
-  private volatile List listeners = new ArrayList();
-  private static final boolean DEBUG = Debug.debug("GLDrawableHelper");
-  private static final boolean VERBOSE = Debug.verbose();
-  private static final boolean NVIDIA_CRASH_WORKAROUND = Debug.isPropertyDefined("jogl.nvidia.crash.workaround", true);
-  private boolean autoSwapBufferMode = true;
-
-  public GLDrawableHelper() {
-  }
-
-  public synchronized String toString() {
-    StringBuffer sb = new StringBuffer();
-    sb.append("GLEventListeners num "+listeners.size()+" [");
-    for (Iterator iter = listeners.iterator(); iter.hasNext(); ) {
-      sb.append(iter.next()+", ");
-    }
-    sb.append("]");
-    return sb.toString();
-  }
-
-  public synchronized void addGLEventListener(GLEventListener listener) {
-    List newListeners = (List) ((ArrayList) listeners).clone();
-    newListeners.add(listener);
-    listeners = newListeners;
-  }
-  
-  public synchronized void removeGLEventListener(GLEventListener listener) {
-    List newListeners = (List) ((ArrayList) listeners).clone();
-    newListeners.remove(listener);
-    listeners = newListeners;
-  }
-
-  public synchronized void dispose(GLAutoDrawable drawable) {
-    for (Iterator iter = listeners.iterator(); iter.hasNext(); ) {
-      ((GLEventListener) iter.next()).dispose(drawable);
-    }
-  }
-
-  public void init(GLAutoDrawable drawable) {
-    for (Iterator iter = listeners.iterator(); iter.hasNext(); ) {
-      ((GLEventListener) iter.next()).init(drawable);
-    }
-  }
-
-  public void display(GLAutoDrawable drawable) {
-    for (Iterator iter = listeners.iterator(); iter.hasNext(); ) {
-      ((GLEventListener) iter.next()).display(drawable);
-    }
-  }
-
-  public void reshape(GLAutoDrawable drawable,
-                      int x, int y, int width, int height) {
-    for (Iterator iter = listeners.iterator(); iter.hasNext(); ) {
-      ((GLEventListener) iter.next()).reshape(drawable, x, y, width, height);
-    }
-  }
-
-  public void setAutoSwapBufferMode(boolean onOrOff) {
-    autoSwapBufferMode = onOrOff;
-  }
-
-  public boolean getAutoSwapBufferMode() {
-    return autoSwapBufferMode;
-  }
-
-  private static final ThreadLocal perThreadInitAction = new ThreadLocal();
-  /** Principal helper method which runs a Runnable with the context
-      made current. This could have been made part of GLContext, but a
-      desired goal is to be able to implement the GLCanvas in terms of
-      the GLContext's public APIs, and putting it into a separate
-      class helps ensure that we don't inadvertently use private
-      methods of the GLContext or its implementing classes. */
-  public void invokeGL(GLDrawable drawable,
-                       GLContext context,
-                       Runnable  runnable,
-                       Runnable  initAction) {
-    if(null==context) {
-        if (DEBUG) {
-            Exception e = new GLException(Thread.currentThread().getName()+" GLDrawableHelper " + this + ".invokeGL(): NULL GLContext");
-            e.printStackTrace();
-        }
-        return;
-    }
-    // Support for recursive makeCurrent() calls as well as calling
-    // other drawables' display() methods from within another one's
-    GLContext lastContext    = GLContext.getCurrent();
-    Runnable  lastInitAction = (Runnable) perThreadInitAction.get();
-    if (lastContext != null) {
-      lastContext.release();
-    }
-  
-    int res = 0;
-    try {
-      res = context.makeCurrent();
-      if (res != GLContext.CONTEXT_NOT_CURRENT) {
-        if(null!=initAction) {
-            perThreadInitAction.set(initAction);
-            if (res == GLContext.CONTEXT_CURRENT_NEW) {
-              if (DEBUG) {
-                System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running initAction");
-              }
-              initAction.run();
-            }
-        }
-        if(null!=runnable) {
-            if (DEBUG && VERBOSE) {
-              System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running runnable");
-            }
-            runnable.run();
-            if (autoSwapBufferMode) {
-              if (drawable != null) {
-                drawable.swapBuffers();
-              }
-            }
-        }
-      }
-    } finally {
-      try {
-        if (res != GLContext.CONTEXT_NOT_CURRENT) {
-          context.release();
-        }
-      } catch (Exception e) {
-      }
-      if (lastContext != null) {
-        int res2 = lastContext.makeCurrent();
-        if (res2 == GLContext.CONTEXT_CURRENT_NEW) {
-          lastInitAction.run();
-        }
-      }
-    }
-  }
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java
deleted file mode 100644
index d29018116..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
-
-public abstract class GLDrawableImpl implements GLDrawable {
-  protected static final boolean DEBUG = Debug.debug("GLDrawable");
-
-  protected GLDrawableImpl(GLDrawableFactory factory,
-                           NativeWindow comp,
-                           boolean realized) {
-      this.factory = factory;
-      this.component = comp;
-      this.realized = realized;
-      this.requestedCapabilities = (GLCapabilities)component.getGraphicsConfiguration().getNativeGraphicsConfiguration().getRequestedCapabilities(); // a copy ..
-  }
-
-  /** 
-   * Returns the DynamicLookupHelper
-   */
-  public abstract DynamicLookupHelper getDynamicLookupHelper();
-
-  public GLDrawableFactoryImpl getFactoryImpl() {
-    return (GLDrawableFactoryImpl) getFactory();
-  }
-
-  /** For offscreen GLDrawables (pbuffers and "pixmap" drawables),
-      indicates that native resources should be reclaimed. */
-  public void destroy() {
-    throw new GLException("Should not call this (should only be called for offscreen GLDrawables)");
-  }
-
-  public void swapBuffers() throws GLException {
-    GLCapabilities caps = (GLCapabilities)component.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
-    if ( caps.getDoubleBuffered() ) {
-        if(!component.surfaceSwap()) {
-            swapBuffersImpl();
-        }
-    } else {
-        GLContext ctx = GLContext.getCurrent();
-        if(null!=ctx && ctx.getGLDrawable()==this) { 
-            ctx.getGL().glFinish();
-        }
-    }
-    component.surfaceUpdated(this, component, System.currentTimeMillis());
-  }
-
-  protected abstract void swapBuffersImpl();
-
-  public static String toHexString(long hex) {
-    return GLContextImpl.toHexString(hex);
-  }
-
-  public GLProfile getGLProfile() {
-    return requestedCapabilities.getGLProfile();
-  }
-
-  public GLCapabilities getChosenGLCapabilities() {
-    return  (GLCapabilities)component.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities(); // a copy
-  }
-
-  public GLCapabilities getRequestedGLCapabilities() {
-    return requestedCapabilities;
-  }
-
-  public NativeWindow getNativeWindow() {
-    return component;
-  }
-
-  public GLDrawableFactory getFactory() {
-    return factory;
-  }
-
-  public void setRealized(boolean realized) {
-    if ( this.realized != realized ) {
-        if(DEBUG) {
-            System.err.println("setRealized: "+getClass().getName()+" "+this.realized+" -> "+realized);
-        }
-        this.realized = realized;
-        setRealizedImpl();
-    } else if(DEBUG) {
-        System.err.println("setRealized: "+getClass().getName()+" "+this.realized+" == "+realized);
-    }
-  }
-  protected abstract void setRealizedImpl();
-
-  public boolean getRealized() {
-    return realized;
-  }
-
-  public int getWidth() {
-    return component.getWidth();
-  }
-
-  /** Returns the current height of this GLDrawable. */
-  public int getHeight() {
-    return component.getHeight();
-  }
-
-  public int lockSurface() throws GLException {
-    if (!realized) {
-      return NativeWindow.LOCK_SURFACE_NOT_READY;
-    }
-    return component.lockSurface();
-  }
-
-  public void unlockSurface() {
-    component.unlockSurface();
-  }
-
-  public boolean isSurfaceLocked() {
-    return component.isSurfaceLocked();
-  }
-
-  public String toString() {
-    return getClass().getName()+"[realized "+getRealized()+
-                ",\n\tfactory   "+getFactory()+
-                ",\n\twindow    "+getNativeWindow()+
-                ",\n\trequested "+getRequestedGLCapabilities()+
-                ",\n\tchosen    "+getChosenGLCapabilities()+"]";
-  }
-
-  protected GLDrawableFactory factory;
-  protected NativeWindow component;
-  protected GLCapabilities requestedCapabilities;
-
-  // Indicates whether the component (if an onscreen context) has been
-  // realized. Plausibly, before the component is realized the JAWT
-  // should return an error or NULL object from some of its
-  // operations; this appears to be the case on Win32 but is not true
-  // at least with Sun's current X11 implementation (1.4.x), which
-  // crashes with no other error reported if the DrawingSurfaceInfo is
-  // fetched from a locked DrawingSurface during the validation as a
-  // result of calling show() on the main thread. To work around this
-  // we prevent any JAWT or OpenGL operations from being done until
-  // addNotify() is called on the component.
-  protected boolean realized;
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLPbufferImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLPbufferImpl.java
deleted file mode 100644
index ffaf798ae..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/GLPbufferImpl.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-/**
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.awt.event.*;
-import java.beans.PropertyChangeListener;
- */
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-
-/** Platform-independent class exposing pbuffer functionality to
-    applications. This class is not exposed in the public API as it
-    would probably add no value; however it implements the GLDrawable
-    interface so can be interacted with via its display() method. */
-
-public class GLPbufferImpl implements GLPbuffer {
-  private GLDrawableImpl pbufferDrawable;
-  private GLContextImpl context;
-  private GLDrawableHelper drawableHelper = new GLDrawableHelper();
-  private int floatMode;
-
-  public GLPbufferImpl(GLDrawableImpl pbufferDrawable,
-                       GLContext parentContext) {
-    GLCapabilities caps = (GLCapabilities) 
-         pbufferDrawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
-    if(caps.isOnscreen()) {
-        if(caps.isPBuffer()) {
-            throw new IllegalArgumentException("Error: Given drawable is Onscreen and Pbuffer: "+pbufferDrawable);
-        }
-        throw new IllegalArgumentException("Error: Given drawable is Onscreen: "+pbufferDrawable);
-    } else {
-        if(!caps.isPBuffer()) {
-            throw new IllegalArgumentException("Error: Given drawable is not Pbuffer: "+pbufferDrawable);
-        }
-    }
-    this.pbufferDrawable = pbufferDrawable;
-    context = (GLContextImpl) pbufferDrawable.createContext(parentContext);
-    context.setSynchronized(true);
-  }
-
-  public GLContext createContext(GLContext shareWith) {
-    return pbufferDrawable.createContext(shareWith);
-  }
-
-  public void setRealized(boolean realized) {
-  }
-
-  public void setSize(int width, int height) {
-    // FIXME
-    throw new GLException("Not yet implemented");
-  }
-
-  public NativeWindow getNativeWindow() {
-      return pbufferDrawable.getNativeWindow();
-  }
-
-  public GLDrawableFactory getFactory() {
-      return pbufferDrawable.getFactory();
-  }
-
-  public int getWidth() {
-    return pbufferDrawable.getWidth();
-  }
-
-  public int getHeight() {
-    return pbufferDrawable.getHeight();
-  }
-
-  public void display() {
-    maybeDoSingleThreadedWorkaround(displayOnEventDispatchThreadAction,
-                                    displayAction,
-                                    false);
-  }
-
-  public void repaint() {
-    display();
-  }
-
-  public void addGLEventListener(GLEventListener listener) {
-    drawableHelper.addGLEventListener(listener);
-  }
-
-  public void removeGLEventListener(GLEventListener listener) {
-    drawableHelper.removeGLEventListener(listener);
-  }
-
-  public void setContext(GLContext ctx) {
-    context=(GLContextImpl)ctx;
-  }
-
-  public GLContext getContext() {
-    return context;
-  }
-
-  public GLDrawable getDrawable() {
-    return pbufferDrawable;
-  }
-
-  public GL getGL() {
-    return getContext().getGL();
-  }
-
-  public GL setGL(GL gl) {
-    return getContext().setGL(gl);
-  }
-
-  public void setAutoSwapBufferMode(boolean onOrOff) {
-    drawableHelper.setAutoSwapBufferMode(onOrOff);
-  }
-
-  public boolean getAutoSwapBufferMode() {
-    return drawableHelper.getAutoSwapBufferMode();
-  }
-
-  public void swapBuffers() {
-    maybeDoSingleThreadedWorkaround(swapBuffersOnEventDispatchThreadAction, swapBuffersAction, false);
-  }
-
-  public void bindTexture() {
-    // Doesn't make much sense to try to do this on the event dispatch
-    // thread given that it has to be called while the context is current
-    context.bindPbufferToTexture();
-  }
-
-  public void releaseTexture() {
-    // Doesn't make much sense to try to do this on the event dispatch
-    // thread given that it has to be called while the context is current
-    context.releasePbufferFromTexture();
-  }
-
-  public GLCapabilities getChosenGLCapabilities() {
-    if (pbufferDrawable == null)
-      return null;
-
-    return pbufferDrawable.getChosenGLCapabilities();
-  }
-
-  public GLCapabilities getRequestedGLCapabilities() {
-    if (pbufferDrawable == null)
-      return null;
-
-    return pbufferDrawable.getRequestedGLCapabilities();
-  }
-
-  public GLProfile getGLProfile() {
-    if (pbufferDrawable == null)
-      return null;
-
-    return pbufferDrawable.getGLProfile();
-  }
-
-  private boolean surfaceLocked = false;
-
-  public int lockSurface() throws GLException {
-    surfaceLocked=true;
-    return NativeWindow.LOCK_SUCCESS;
-  }
-
-  public void unlockSurface() {
-    surfaceLocked=false;
-  }
-
-  public boolean isSurfaceLocked() {
-    return surfaceLocked;
-  }
-
-  //----------------------------------------------------------------------
-  // No-ops for ComponentEvents
-  //
-
-  /*
-  public void addComponentListener(ComponentListener l) {}
-  public void removeComponentListener(ComponentListener l) {}
-  public void addFocusListener(FocusListener l) {}
-  public void removeFocusListener(FocusListener l) {}
-  public void addHierarchyBoundsListener(HierarchyBoundsListener l) {}
-  public void removeHierarchyBoundsListener(HierarchyBoundsListener l) {}
-  public void addHierarchyListener(HierarchyListener l) {}
-  public void removeHierarchyListener(HierarchyListener l) {}
-  public void addInputMethodListener(InputMethodListener l) {}
-  public void removeInputMethodListener(InputMethodListener l) {}
-  public void addKeyListener(KeyListener l) {}
-  public void removeKeyListener(KeyListener l) {}
-  public void addMouseListener(MouseListener l) {}
-  public void removeMouseListener(MouseListener l) {}
-  public void addMouseMotionListener(MouseMotionListener l) {}
-  public void removeMouseMotionListener(MouseMotionListener l) {}
-  public void addMouseWheelListener(MouseWheelListener l) {}
-  public void removeMouseWheelListener(MouseWheelListener l) {}
-  public void addPropertyChangeListener(PropertyChangeListener listener) {}
-  public void removePropertyChangeListener(PropertyChangeListener listener) {}
-  public void addPropertyChangeListener(String propertyName,
-                                        PropertyChangeListener listener) {}
-  public void removePropertyChangeListener(String propertyName,
-                                           PropertyChangeListener listener) {}
-                                           */
-
-  public void destroy() {
-    // FIXME: not calling event listeners .. see GLAutoDrawable spec
-    if (Threading.isSingleThreaded() &&
-        !Threading.isOpenGLThread()) {
-      Threading.invokeOnOpenGLThread(destroyAction);
-    } else {
-      destroyAction.run();
-    }
-  }
-
-  public int getFloatingPointMode() {
-    if (floatMode == 0) {
-      throw new GLException("Pbuffer not initialized, or floating-point support not requested");
-    }
-    return floatMode;
-  }
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  private void maybeDoSingleThreadedWorkaround(Runnable eventDispatchThreadAction,
-                                               Runnable invokeGLAction,
-                                               boolean  isReshape) {
-    if (Threading.isSingleThreaded() &&
-        !Threading.isOpenGLThread()) {
-      Threading.invokeOnOpenGLThread(eventDispatchThreadAction);
-    } else {
-      drawableHelper.invokeGL(pbufferDrawable, context, invokeGLAction, initAction);
-    }
-  }
-
-  class InitAction implements Runnable {
-    public void run() {
-      floatMode = context.getFloatingPointMode();
-      drawableHelper.init(GLPbufferImpl.this);
-    }
-  }
-  private InitAction initAction = new InitAction();
-  
-  class DisplayAction implements Runnable {
-    public void run() {
-      drawableHelper.display(GLPbufferImpl.this);
-    }
-  }
-  private DisplayAction displayAction = new DisplayAction();
-
-  class SwapBuffersAction implements Runnable {
-    public void run() {
-      pbufferDrawable.swapBuffers();
-    }
-  }
-  private SwapBuffersAction swapBuffersAction = new SwapBuffersAction();
-
-  // Workaround for ATI driver bugs related to multithreading issues
-  // like simultaneous rendering via Animators to canvases that are
-  // being resized on the AWT event dispatch thread
-  class DisplayOnEventDispatchThreadAction implements Runnable {
-    public void run() {
-      drawableHelper.invokeGL(pbufferDrawable, context, displayAction, initAction);
-    }
-  }
-  private DisplayOnEventDispatchThreadAction displayOnEventDispatchThreadAction =
-    new DisplayOnEventDispatchThreadAction();
-  class SwapBuffersOnEventDispatchThreadAction implements Runnable {
-    public void run() {
-      drawableHelper.invokeGL(pbufferDrawable, context, swapBuffersAction, initAction);
-    }
-  }
-  private SwapBuffersOnEventDispatchThreadAction swapBuffersOnEventDispatchThreadAction =
-    new SwapBuffersOnEventDispatchThreadAction();
-
-  class DestroyAction implements Runnable {
-    public void run() {
-      if (null != context) {
-          context.destroy();
-      }
-      pbufferDrawable.destroy();
-    }
-  }
-  private DestroyAction destroyAction = new DestroyAction();
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLStateTracker.java b/src/jogl/classes/com/sun/opengl/impl/GLStateTracker.java
deleted file mode 100755
index d28d39f7f..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/GLStateTracker.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import java.util.*;
-import javax.media.opengl.*;
-
-/**
- * Tracks as closely as possible OpenGL states.
- * GLStateTracker objects are allocated on a per-OpenGL-context basis.
- * <p>
- * Currently supported states: PixelStorei
- */
-
-public class GLStateTracker {
-  private static final boolean DEBUG = Debug.debug("GLStateTracker");
-
-  private volatile boolean enabled = true;
-
-  private Map/*<Integer,Integer>*/ pixelStateMap = new HashMap/*<Integer,Integer>*/();
-
-  static class SavedState {
-    SavedState() {
-        this.pixelStateMap = null;
-    }
-    void putPixelStateMap(Map pixelStateMap) {
-        this.pixelStateMap = new HashMap();
-        this.pixelStateMap.putAll(pixelStateMap);
-    }
-    Map getPixelStateMap() { return pixelStateMap; }
-
-    private Map pixelStateMap;
-    // private Map otherStateMap;
-  }
-  private List/*<SavedState>*/ stack = new ArrayList();
-
-  public GLStateTracker() {
-    resetStates();
-  }
-
-  public void clearStates(boolean enable) {
-    enabled = enable;    
-    pixelStateMap.clear();
-  }
-
-  public void setEnabled(boolean on) {
-    enabled = on;    
-  }
-
-  public boolean isEnabled() {
-    return enabled;
-  }
-
-  public boolean getInt(int pname, int[] params, int params_offset) {
-    if(enabled) {
-        Integer key = boxKey(pname);
-        if(null!=key) {
-            Integer value = (Integer) pixelStateMap.get(key);
-            if(null!=value) {
-                params[params_offset] = value.intValue();
-            } else {
-                GLException re = new GLException("Key (0x"+Integer.toHexString(key.intValue())+") is not mapped");
-                throw re;
-            }
-            return true;
-        }
-    }
-    return false;
-  }
-
-  public boolean getInt(int pname, java.nio.IntBuffer params, int dummy) {
-    if(enabled) {
-        Integer key = boxKey(pname);
-        if(null!=key) {
-            Integer value = (Integer) pixelStateMap.get(key);
-            if(null!=value) {
-                params.put(params.position(), value.intValue());
-            } else {
-                GLException re = new GLException("Key (0x"+Integer.toHexString(key.intValue())+") is not mapped");
-                throw re;
-            }
-            return true;
-        }
-    }
-    return false;
-  }
-
-  public void setInt(int pname, int param) {
-    if(enabled) {
-        Integer key = boxKey(pname);
-        if(null!=key) {
-            pixelStateMap.put(key, boxInt(param));
-        }
-    }
-  }
-
-  public void pushAttrib(int flags) {
-    if(enabled) {
-        SavedState state = new SavedState();
-        if( 0 != (flags&GL2.GL_CLIENT_PIXEL_STORE_BIT) ) {
-            state.putPixelStateMap(pixelStateMap);
-        }
-        stack.add(0, state);
-    }
-  }
-
-  public void popAttrib() {
-    if(enabled) {
-        if(stack.size()==0) {
-            throw new GLException("stack contains no elements");
-        }
-        SavedState state = (SavedState) stack.remove(0);
-        if(null==state) {
-            throw new GLException("null stack element (remaining stack size "+stack.size()+")");
-        }
-
-        Map/*<Integer,Integer>*/ pixelStateMapNew = new HashMap/*<Integer,Integer>*/();
-        if ( null != state.getPixelStateMap() ) {
-            pixelStateMapNew.putAll(state.getPixelStateMap());
-        }
-        pixelStateMap = pixelStateMapNew;
-    }
-  }
-
-  private static final Integer GL_PACK_SWAP_BYTES   = new Integer(GL2GL3.GL_PACK_SWAP_BYTES);
-  private static final Integer GL_PACK_LSB_FIRST    = new Integer(GL2GL3.GL_PACK_LSB_FIRST);
-  private static final Integer GL_PACK_ROW_LENGTH   = new Integer(GL2GL3.GL_PACK_ROW_LENGTH);
-  private static final Integer GL_PACK_SKIP_ROWS    = new Integer(GL2GL3.GL_PACK_SKIP_ROWS);
-  private static final Integer GL_PACK_SKIP_PIXELS  = new Integer(GL2GL3.GL_PACK_SKIP_PIXELS);
-  private static final Integer GL_PACK_ALIGNMENT    = new Integer(GL.GL_PACK_ALIGNMENT);
-  private static final Integer GL_PACK_IMAGE_HEIGHT = new Integer(GL2GL3.GL_PACK_IMAGE_HEIGHT);
-  private static final Integer GL_PACK_SKIP_IMAGES  = new Integer(GL2GL3.GL_PACK_SKIP_IMAGES);
-
-  private static final Integer GL_UNPACK_SWAP_BYTES   = new Integer(GL2GL3.GL_UNPACK_SWAP_BYTES);
-  private static final Integer GL_UNPACK_LSB_FIRST    = new Integer(GL2GL3.GL_UNPACK_LSB_FIRST);
-  private static final Integer GL_UNPACK_ROW_LENGTH   = new Integer(GL2GL3.GL_UNPACK_ROW_LENGTH);
-  private static final Integer GL_UNPACK_SKIP_ROWS    = new Integer(GL2GL3.GL_UNPACK_SKIP_ROWS);
-  private static final Integer GL_UNPACK_SKIP_PIXELS  = new Integer(GL2GL3.GL_UNPACK_SKIP_PIXELS);
-  private static final Integer GL_UNPACK_ALIGNMENT    = new Integer(GL.GL_UNPACK_ALIGNMENT);
-  private static final Integer GL_UNPACK_IMAGE_HEIGHT = new Integer(GL2GL3.GL_UNPACK_IMAGE_HEIGHT);
-  private static final Integer GL_UNPACK_SKIP_IMAGES  = new Integer(GL2GL3.GL_UNPACK_SKIP_IMAGES);
-
-  private static final Integer zero                   = new Integer(0);
-  private static final Integer one                    = new Integer(1);
-
-  private static Integer boxKey(int key) {
-    switch (key) {
-      case 0:                          return zero;
-      case GL2GL3.GL_PACK_SWAP_BYTES:     return GL_PACK_SWAP_BYTES;
-      case GL2GL3.GL_PACK_LSB_FIRST:      return GL_PACK_LSB_FIRST;
-      case GL2GL3.GL_PACK_ROW_LENGTH:     return GL_PACK_ROW_LENGTH;
-      case GL2GL3.GL_PACK_SKIP_ROWS:      return GL_PACK_SKIP_ROWS;
-      case GL2GL3.GL_PACK_SKIP_PIXELS:    return GL_PACK_SKIP_PIXELS;
-      case GL.GL_PACK_ALIGNMENT:          return GL_PACK_ALIGNMENT;
-      case GL2GL3.GL_PACK_IMAGE_HEIGHT:   return GL_PACK_IMAGE_HEIGHT;
-      case GL2GL3.GL_PACK_SKIP_IMAGES:    return GL_PACK_SKIP_IMAGES;
-
-      case GL2GL3.GL_UNPACK_SWAP_BYTES:   return GL_UNPACK_SWAP_BYTES;
-      case GL2GL3.GL_UNPACK_LSB_FIRST:    return GL_UNPACK_LSB_FIRST;
-      case GL2GL3.GL_UNPACK_ROW_LENGTH:   return GL_UNPACK_ROW_LENGTH;
-      case GL2GL3.GL_UNPACK_SKIP_ROWS:    return GL_UNPACK_SKIP_ROWS;
-      case GL2GL3.GL_UNPACK_SKIP_PIXELS:  return GL_UNPACK_SKIP_PIXELS;
-      case GL.GL_UNPACK_ALIGNMENT:        return GL_UNPACK_ALIGNMENT;
-      case GL2GL3.GL_UNPACK_IMAGE_HEIGHT: return GL_UNPACK_IMAGE_HEIGHT;
-      case GL2GL3.GL_UNPACK_SKIP_IMAGES:  return GL_UNPACK_SKIP_IMAGES;
-
-      default: return null;
-    }
-  }
-
-  public void resetStates() {
-    pixelStateMap.clear();
-
-    pixelStateMap.put(GL_PACK_SWAP_BYTES,   zero /* GL_FALSE */);
-    pixelStateMap.put(GL_PACK_LSB_FIRST,    zero /* GL_FALSE */);
-    pixelStateMap.put(GL_PACK_ROW_LENGTH,   zero);
-    pixelStateMap.put(GL_PACK_SKIP_ROWS,    zero);
-    pixelStateMap.put(GL_PACK_SKIP_PIXELS,  zero);
-    pixelStateMap.put(GL_PACK_ALIGNMENT,    new Integer(4));
-    pixelStateMap.put(GL_PACK_IMAGE_HEIGHT, zero);
-    pixelStateMap.put(GL_PACK_SKIP_IMAGES,  zero);
-
-    pixelStateMap.put(GL_UNPACK_SWAP_BYTES,   zero /* GL_FALSE */);
-    pixelStateMap.put(GL_UNPACK_LSB_FIRST,    zero /* GL_FALSE */);
-    pixelStateMap.put(GL_UNPACK_ROW_LENGTH,   zero);
-    pixelStateMap.put(GL_UNPACK_SKIP_ROWS,    zero);
-    pixelStateMap.put(GL_UNPACK_SKIP_PIXELS,  zero);
-    pixelStateMap.put(GL_UNPACK_ALIGNMENT,    new Integer(4));
-    pixelStateMap.put(GL_UNPACK_IMAGE_HEIGHT, zero);
-    pixelStateMap.put(GL_UNPACK_SKIP_IMAGES,  zero);
-  }
-
-  private static Integer boxInt(int value) {
-    switch (value) {
-      case 0:           return zero;
-      case 1:           return one;
-
-      default: return new Integer(value);
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLWorkerThread.java b/src/jogl/classes/com/sun/opengl/impl/GLWorkerThread.java
deleted file mode 100755
index b110e4335..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/GLWorkerThread.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.security.*;
-import java.util.*;
-import javax.media.opengl.*;
-
-/** Singleton thread upon which all OpenGL work is performed by
-    default. Unfortunately many vendors' OpenGL drivers are not really
-    thread-safe and stability is much improved by performing OpenGL
-    work on at most one thread. This is the default behavior of the
-    GLAutoDrawable implementations according to the {@link
-    javax.media.opengl.Threading Threading} class. The GLWorkerThread
-    replaces the original AWT event queue thread-based mechanism for
-    two reasons: first, more than one AWT event queue thread may be
-    spawned, for example if a dialog is being shown; second, it avoids
-    blocking the AWT event queue thread during OpenGL rendering. */
-
-public class GLWorkerThread {
-  private static volatile boolean started;
-  private static volatile Thread thread;
-  private static Object lock;
-  private static volatile boolean shouldTerminate;
-  private static volatile Throwable exception;
-
-  // The Runnable to execute immediately on the worker thread
-  private static volatile Runnable work;
-  // Queue of Runnables to be asynchronously invoked
-  private static List queue = new LinkedList();
-  
-  /** Should only be called by Threading class if creation of the
-      GLWorkerThread was requested via the opengl.1thread system
-      property. */
-  public static void start() {
-    if (!started) {
-      synchronized (GLWorkerThread.class) {
-        if (!started) {
-          lock = new Object();
-          thread = new Thread(new WorkerRunnable(),
-                              "JOGL GLWorkerThread");
-          thread.setDaemon(true);
-          started = true;
-          synchronized (lock) {
-            thread.start();
-            try {
-              lock.wait();
-            } catch (InterruptedException e) {
-            }
-          }
-
-          /*
-
-          // Note: it appears that there is a bug in NVidia's current
-          // drivers where if a context was ever made current on a
-          // given thread and that thread has exited before program
-          // exit, a crash occurs in the drivers. Releasing the
-          // context from the given thread does not work around the
-          // problem.
-          //
-          // For the time being, we're going to work around this
-          // problem by not terminating the GLWorkerThread. In theory,
-          // shutting down the GLWorkerThread cleanly could be a good
-          // general solution to the problem of needing to
-          // cooperatively terminate all Animators at program exit.
-          //
-          // It appears that this doesn't even work around all of the
-          // kinds of crashes. Causing the context to be unilaterally
-          // released from the GLWorkerThread after each invocation
-          // seems to work around all of the kinds of crashes seen.
-          //
-          // These appear to be similar to the kinds of crashes seen
-          // when the Java2D/OpenGL pipeline terminates, and those are
-          // a known issue being fixed, so presumably these will be
-          // fixed in NVidia's next driver set.
-
-          // Install shutdown hook to terminate daemon thread more or
-          // less cooperatively
-          AccessController.doPrivileged(new PrivilegedAction() {
-              public Object run() {
-                Runtime.getRuntime().addShutdownHook(new Thread() {
-                    public void run() {
-                      Object lockTemp = lock;
-                      if (lockTemp == null) {
-                        // Already terminating (?)
-                        return;
-                      }
-                      synchronized (lockTemp) {
-                        shouldTerminate = true;
-                        lockTemp.notifyAll();
-                        try {
-                          lockTemp.wait(500);
-                        } catch (InterruptedException e) {
-                        }
-                      }
-                    }
-                  });
-                return null;
-              }
-            });
-
-          */
-
-        } else {
-          throw new RuntimeException("Should not start GLWorkerThread twice");
-        }
-      }
-    }
-  }
-
-  public static void invokeAndWait(Runnable runnable)
-    throws InvocationTargetException, InterruptedException {
-    if (!started) {
-      throw new RuntimeException("May not invokeAndWait on worker thread without starting it first");
-    }
-
-    Object lockTemp = lock;
-    if (lockTemp == null) {
-      return; // Terminating
-    }
-
-    synchronized (lockTemp) {
-      if (thread == null) {
-        // Terminating
-        return;
-      }
-
-      work = runnable;
-      lockTemp.notifyAll();
-      lockTemp.wait();
-      if (exception != null) {
-        Throwable localException = exception;
-        exception = null;
-        throw new InvocationTargetException(localException);
-      }
-    }
-  }
-
-  public static void invokeLater(Runnable runnable) {
-    if (!started) {
-      throw new RuntimeException("May not invokeLater on worker thread without starting it first");
-    }
-
-    Object lockTemp = lock;
-    if (lockTemp == null) {
-      return; // Terminating
-    }
-
-    synchronized (lockTemp) {
-      if (thread == null) {
-        // Terminating
-        return;
-      }
-
-      queue.add(runnable);
-      lockTemp.notifyAll();
-    }
-  }
-
-  /** Indicates whether the OpenGL worker thread was started, i.e.,
-      whether it is currently in use. */
-  public static boolean isStarted() {
-    return started;
-  }
-
-  /** Indicates whether the current thread is the OpenGL worker
-      thread. */
-  public static boolean isWorkerThread() {
-    return (Thread.currentThread() == thread);
-  }
-
-  static class WorkerRunnable implements Runnable {
-    public void run() {
-      // Notify starting thread that we're ready
-      synchronized (lock) {
-        lock.notifyAll();
-      }
-
-      while (!shouldTerminate) {
-        synchronized (lock) {
-          while (!shouldTerminate &&
-                 (work == null) &&
-                 queue.isEmpty()) {
-            try {
-              // Avoid race conditions with wanting to release contexts on this thread
-              lock.wait(1000);
-            } catch (InterruptedException e) {
-            }
-
-            if (GLContext.getCurrent() != null) {
-              // Test later to see whether we need to release this context
-              break;
-            }
-          }
-          
-          if (shouldTerminate) {
-            lock.notifyAll();
-            thread = null;
-            lock = null;
-            return;
-          }
-
-          if (work != null) {
-            try {
-              work.run();
-            } catch (Throwable t) {
-              exception = t;
-            } finally {
-              work = null;
-              lock.notifyAll();
-            }
-          }
-
-          while (!queue.isEmpty()) {
-            try {
-              Runnable curAsync = (Runnable) queue.remove(0);
-              curAsync.run();
-            } catch (Throwable t) {
-              System.out.println("Exception occurred on JOGL OpenGL worker thread:");
-              t.printStackTrace();
-            }
-          }
-
-          // See about releasing current context
-          GLContext curContext = GLContext.getCurrent();
-          if (curContext != null &&
-              (curContext instanceof GLContextImpl)) {
-            GLContextImpl impl = (GLContextImpl) curContext;
-            if (impl.hasWaiters()) {
-              impl.release();
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javame_cdc_fp b/src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javame_cdc_fp
deleted file mode 100644
index 32c3cd70c..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javame_cdc_fp
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.opengl.impl;
-
-import java.lang.reflect.*;
-import java.nio.*;
-
-/** Internal copy of selected routines from BufferUtil to avoid
-    outward dependencies on com.sun.opengl.util package. */
-public class InternalBufferUtil {
-    public static final int SIZEOF_BYTE = 1;
-    public static final int SIZEOF_SHORT = 2;
-    public static final int SIZEOF_INT = 4;
-    public static final int SIZEOF_FLOAT = 4;
-
-    //----------------------------------------------------------------------
-    // Allocation routines
-    //
-
-    /** Allocates a new direct ByteBuffer with the specified number of
-        elements. The returned buffer will have its byte order set to
-        the host platform's native byte order. */
-    public static ByteBuffer newByteBuffer(int numElements) {
-        ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
-        nativeOrder(bb);
-        return bb;
-    }
-    
-    /** Allocates a new direct IntBuffer with the specified number of
-        elements. The returned buffer will have its byte order set to
-        the host platform's native byte order. */
-    public static IntBuffer newIntBuffer(int numElements) {
-        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
-        return bb.asIntBuffer();
-    }
-    
-    /** Allocates a new direct ShortBuffer with the specified number of
-        elements. The returned buffer will have its byte order set to
-        the host platform's native byte order. */
-    public static ShortBuffer newShortBuffer(int numElements) {
-        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_SHORT);
-        return bb.asShortBuffer();
-    }
-    
-    /** Allocates a new direct FloatBuffer with the specified number of
-        elements. The returned buffer will have its byte order set to
-        the host platform's native byte order. */
-    public static FloatBuffer newFloatBuffer(int numElements) {
-        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_FLOAT);
-        return bb.asFloatBuffer();
-    }
-    
-    //----------------------------------------------------------------------
-    // Copy routines (type-to-type)
-    //
-
-    /** Copies the <i>remaining</i> elements (as defined by
-        <code>limit() - position()</code>) in the passed FloatBuffer
-        into a newly-allocated direct ByteBuffer. The returned buffer
-        will have its byte order set to the host platform's native byte
-        order. The position of the newly-allocated buffer will be zero,
-        and the position of the passed buffer is unchanged (though its
-        mark is changed). */
-    public static ByteBuffer copyFloatBufferAsByteBuffer(FloatBuffer orig) {
-        ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_FLOAT);
-        dest.asFloatBuffer().put(orig);
-        dest.rewind();
-        return dest;
-    }
-  
-    /** Copies the <i>remaining</i> elements (as defined by
-        <code>limit() - position()</code>) in the passed IntBuffer into
-        a newly-allocated direct ByteBuffer. The returned buffer will
-        have its byte order set to the host platform's native byte
-        order. The position of the newly-allocated buffer will be zero,
-        and the position of the passed buffer is unchanged (though its
-        mark is changed). */
-    public static ByteBuffer copyIntBufferAsByteBuffer(IntBuffer orig) {
-        ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_INT);
-        dest.asIntBuffer().put(orig);
-        dest.rewind();
-        return dest;
-    }
-  
-    /** Copies the <i>remaining</i> elements (as defined by
-        <code>limit() - position()</code>) in the passed ShortBuffer
-        into a newly-allocated direct ByteBuffer. The returned buffer
-        will have its byte order set to the host platform's native byte
-        order. The position of the newly-allocated buffer will be zero,
-        and the position of the passed buffer is unchanged (though its
-        mark is changed). */
-    public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
-        ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_SHORT);
-        dest.asShortBuffer().put(orig);
-        dest.rewind();
-        return dest;
-    }
-
-    /** Copies the <i>remaining</i> elements (as defined by
-        <code>limit() - position()</code>) in the passed ByteBuffer into
-        a newly-allocated direct ByteBuffer. The returned buffer will
-        have its byte order set to the host platform's native byte
-        order. The position of the newly-allocated buffer will be zero,
-        and the position of the passed buffer is unchanged (though its
-        mark is changed). */
-    public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
-        ByteBuffer dest = newByteBuffer(orig.remaining());
-        dest.put(orig);
-        dest.rewind();
-        return dest;
-    }
-
-    //----------------------------------------------------------------------
-    // Conversion routines 
-    //
-
-    public static float[] getFloatArray(double[] source) {
-        int i=source.length;
-        float[] dest = new float[i--];
-        while(i>=0) { dest[i]=(float)source[i]; i--; }
-        return dest;
-    }
-
-    public static ByteBuffer nativeOrder(ByteBuffer buf) {
-        if (!isCDCFP) {
-            try {
-                if (byteOrderClass == null) {
-                    byteOrderClass = Class.forName("java.nio.ByteOrder");
-                    orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
-                    Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
-                    nativeOrderObject = nativeOrderMethod.invoke(null, null);
-                }
-            } catch (Throwable t) {
-                // Must be running on CDC / FP
-                isCDCFP = true;
-            }
-
-            if (!isCDCFP) {
-                try {
-                    orderMethod.invoke(buf, new Object[] { nativeOrderObject });
-                } catch (Throwable t) {
-                }
-            }
-        }
-        return buf;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    // NOTE that this work must be done reflectively at the present time
-    // because this code must compile and run correctly on both CDC/FP and J2SE
-    private static boolean isCDCFP;
-    private static Class byteOrderClass;
-    private static Object nativeOrderObject;
-    private static Method orderMethod;
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javase b/src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javase
deleted file mode 100644
index 59d44f04d..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javase
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.opengl.impl;
-
-import java.lang.reflect.*;
-import java.nio.*;
-
-/** Internal copy of selected routines from BufferUtil to avoid
-    outward dependencies on com.sun.opengl.util package. */
-public class InternalBufferUtil {
-    public static final int SIZEOF_BYTE = 1;
-    public static final int SIZEOF_SHORT = 2;
-    public static final int SIZEOF_INT = 4;
-    public static final int SIZEOF_FLOAT = 4;
-    public static final int SIZEOF_LONG = 8;
-    public static final int SIZEOF_DOUBLE = 8;
-
-    //----------------------------------------------------------------------
-    // Allocation routines
-    //
-
-    /** Allocates a new direct ByteBuffer with the specified number of
-        elements. The returned buffer will have its byte order set to
-        the host platform's native byte order. */
-    public static ByteBuffer newByteBuffer(int numElements) {
-        ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
-        nativeOrder(bb);
-        return bb;
-    }
-    
-    /** Allocates a new direct DoubleBuffer with the specified number of
-        elements. The returned buffer will have its byte order set to
-        the host platform's native byte order. */
-    public static DoubleBuffer newDoubleBuffer(int numElements) {
-        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_DOUBLE);
-        return bb.asDoubleBuffer();
-    }
-
-    /** Allocates a new direct IntBuffer with the specified number of
-        elements. The returned buffer will have its byte order set to
-        the host platform's native byte order. */
-    public static IntBuffer newIntBuffer(int numElements) {
-        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
-        return bb.asIntBuffer();
-    }
-    
-    /** Allocates a new direct ShortBuffer with the specified number of
-        elements. The returned buffer will have its byte order set to
-        the host platform's native byte order. */
-    public static ShortBuffer newShortBuffer(int numElements) {
-        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_SHORT);
-        return bb.asShortBuffer();
-    }
-    
-    /** Allocates a new direct FloatBuffer with the specified number of
-        elements. The returned buffer will have its byte order set to
-        the host platform's native byte order. */
-    public static FloatBuffer newFloatBuffer(int numElements) {
-        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_FLOAT);
-        return bb.asFloatBuffer();
-    }
-    
-    //----------------------------------------------------------------------
-    // Copy routines (type-to-ByteBuffer)
-    //
-
-    /** Copies the <i>remaining</i> elements (as defined by
-        <code>limit() - position()</code>) in the passed FloatBuffer
-        into a newly-allocated direct ByteBuffer. The returned buffer
-        will have its byte order set to the host platform's native byte
-        order. The position of the newly-allocated buffer will be zero,
-        and the position of the passed buffer is unchanged (though its
-        mark is changed). */
-    public static ByteBuffer copyFloatBufferAsByteBuffer(FloatBuffer orig) {
-        ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_FLOAT);
-        dest.asFloatBuffer().put(orig);
-        dest.rewind();
-        return dest;
-    }
-  
-    /** Copies the <i>remaining</i> elements (as defined by
-        <code>limit() - position()</code>) in the passed IntBuffer into
-        a newly-allocated direct ByteBuffer. The returned buffer will
-        have its byte order set to the host platform's native byte
-        order. The position of the newly-allocated buffer will be zero,
-        and the position of the passed buffer is unchanged (though its
-        mark is changed). */
-    public static ByteBuffer copyIntBufferAsByteBuffer(IntBuffer orig) {
-        ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_INT);
-        dest.asIntBuffer().put(orig);
-        dest.rewind();
-        return dest;
-    }
-  
-    /** Copies the <i>remaining</i> elements (as defined by
-        <code>limit() - position()</code>) in the passed ShortBuffer
-        into a newly-allocated direct ByteBuffer. The returned buffer
-        will have its byte order set to the host platform's native byte
-        order. The position of the newly-allocated buffer will be zero,
-        and the position of the passed buffer is unchanged (though its
-        mark is changed). */
-    public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
-        ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_SHORT);
-        dest.asShortBuffer().put(orig);
-        dest.rewind();
-        return dest;
-    }
-
-    /** Copies the <i>remaining</i> elements (as defined by
-        <code>limit() - position()</code>) in the passed ByteBuffer into
-        a newly-allocated direct ByteBuffer. The returned buffer will
-        have its byte order set to the host platform's native byte
-        order. The position of the newly-allocated buffer will be zero,
-        and the position of the passed buffer is unchanged (though its
-        mark is changed). */
-    public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
-        ByteBuffer dest = newByteBuffer(orig.remaining());
-        dest.put(orig);
-        dest.rewind();
-        return dest;
-    }
-
-    //----------------------------------------------------------------------
-    // Conversion routines 
-    //
-
-    public static float[] getFloatArray(double[] source) {
-        int i=source.length;
-        float[] dest = new float[i--];
-        while(i>=0) { dest[i]=(float)source[i]; i--; }
-        return dest;
-    }
-
-    public static ByteBuffer nativeOrder(ByteBuffer buf) {
-        if (!isCDCFP) {
-            try {
-                if (byteOrderClass == null) {
-                    byteOrderClass = Class.forName("java.nio.ByteOrder");
-                    orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
-                    Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
-                    nativeOrderObject = nativeOrderMethod.invoke(null, null);
-                }
-            } catch (Throwable t) {
-                // Must be running on CDC / FP
-                isCDCFP = true;
-            }
-
-            if (!isCDCFP) {
-                try {
-                    orderMethod.invoke(buf, new Object[] { nativeOrderObject });
-                } catch (Throwable t) {
-                }
-            }
-        }
-        return buf;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    // NOTE that this work must be done reflectively at the present time
-    // because this code must compile and run correctly on both CDC/FP and J2SE
-    private static boolean isCDCFP;
-    private static Class byteOrderClass;
-    private static Object nativeOrderObject;
-    private static Method orderMethod;
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java b/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java
deleted file mode 100644
index 59f92e53f..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-// FIXME: refactor Java SE dependencies
-//import java.awt.Toolkit;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashSet;
-import com.sun.nativewindow.impl.NativeLibLoaderBase;
-
-public class NativeLibLoader extends NativeLibLoaderBase {
-  public static void loadNEWT() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("newt", nativeOSPreload, true);
-        return null;
-      }
-    });
-  }
-
-  public static void loadGLDesktop() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("jogl_gl2", nativeOSPreload, true);
-        return null;
-      }
-    });
-  }
-
-  public static void loadGLDesktopES12() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("jogl_gl2es12", nativeOSPreload, true);
-        return null;
-      }
-    });
-  }
-
-  public static void loadES2() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("jogl_es2", nativeOSPreload, true);
-        return null;
-      }
-    });
-  }
-
-  public static void loadES1() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("jogl_es1", nativeOSPreload, true);
-        return null;
-      }
-    });
-  }
-
-  public static void loadCgImpl() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        String[] preload = { "nativewindow", "cg", "cgGL" };
-        loadLibrary("jogl_cg", preload, true);
-        return null;
-      }
-    });
-  }
-
-  private static final String[] nativeOSPreload = { "nativewindow_x11" };
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/ProjectFloat.java b/src/jogl/classes/com/sun/opengl/impl/ProjectFloat.java
deleted file mode 100755
index f9f38166d..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/ProjectFloat.java
+++ /dev/null
@@ -1,1057 +0,0 @@
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
-** http://oss.sgi.com/projects/FreeB
-** 
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-** 
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** $Date: 2009-03-13 22:20:29 -0700 (Fri, 13 Mar 2009) $ $Revision: 1867 $
-** $Header$
-*/
-
-/* 
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
- * met:
- * 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of 
- *   its contributors may be used to endorse or promote products derived 
- *   from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-package com.sun.opengl.impl;
-
-import java.nio.*;
-
-import javax.media.opengl.*;
-import javax.media.opengl.fixedfunc.GLMatrixFunc;
-
-/**
- * ProjectFloat.java
- * <p/>
- * <p/>
- * Created 11-jan-2004
- * 
- * @author Erik Duijs
- * @author Kenneth Russell
- */
-public class ProjectFloat {
-  private static final float[] IDENTITY_MATRIX =
-    new float[] {
-      1.0f, 0.0f, 0.0f, 0.0f,
-      0.0f, 1.0f, 0.0f, 0.0f,
-      0.0f, 0.0f, 1.0f, 0.0f,
-      0.0f, 0.0f, 0.0f, 1.0f };
-
-  private static final float[] ZERO_MATRIX =
-    new float[] {
-      0.0f, 0.0f, 0.0f, 0.0f,
-      0.0f, 0.0f, 0.0f, 0.0f,
-      0.0f, 0.0f, 0.0f, 0.0f,
-      0.0f, 0.0f, 0.0f, 0.0f };
-
-  // Note that we have cloned parts of the implementation in order to
-  // support incoming Buffers. The reason for this is to avoid loading
-  // non-direct buffer subclasses unnecessarily, because doing so can
-  // cause performance decreases on direct buffer operations, at least
-  // on the current HotSpot JVM. It would be nicer (and make the code
-  // simpler) to simply have the array-based entry points delegate to
-  // the versions taking Buffers by wrapping the arrays.
-
-  // Array-based implementation
-  private final float[] matrix = new float[16];
-  private final float[][] tempInvertMatrix = new float[4][4];
-
-  private final float[] in = new float[4];
-  private final float[] out = new float[4];
-
-  private final float[] forward = new float[3];
-  private final float[] side = new float[3];
-  private final float[] up = new float[3];
-  
-  // Buffer-based implementation
-  private FloatBuffer locbuf;
-  private final FloatBuffer matrixBuf;
-  private final FloatBuffer tempInvertMatrixBuf;
-
-  private final FloatBuffer inBuf;
-  private final FloatBuffer outBuf;
-
-  private final FloatBuffer forwardBuf;
-  private final FloatBuffer sideBuf;
-  private final FloatBuffer upBuf;
-
-  public ProjectFloat() {
-    // Use direct buffers to avoid loading indirect buffer
-    // implementations for applications trying to avoid doing so.
-    // Slice up one big buffer because some NIO implementations
-    // allocate a huge amount of memory to back even the smallest of
-    // buffers.
-    locbuf = InternalBufferUtil.newFloatBuffer(2*16+2*4+3*3);
-    int pos = 0;
-    int sz = 16;
-    matrixBuf = slice(locbuf, pos, sz);
-    pos += sz;
-    tempInvertMatrixBuf = slice(locbuf, pos, sz);
-    pos += sz;
-    sz = 4;
-    inBuf = slice(locbuf, pos, sz);
-    pos += sz;
-    outBuf = slice(locbuf, pos, sz);
-    pos += sz;
-    sz = 3;
-    forwardBuf = slice(locbuf, pos, sz);
-    pos += sz;
-    sideBuf = slice(locbuf, pos, sz);
-    pos += sz;
-    upBuf = slice(locbuf, pos, sz);
-  }
-
-  public void destroy() {
-    if(locbuf!=null) {
-        locbuf.clear();
-        locbuf=null;
-    }
-  }
-
-  private static FloatBuffer slice(FloatBuffer buf, int pos, int len) {
-    buf.position(pos);
-    buf.limit(pos + len);
-    return buf.slice();
-  }
-
-  /**
-   * Make matrix an identity matrix
-   */
-  public static void gluMakeIdentityf(FloatBuffer m) {
-    int oldPos = m.position();
-    m.put(IDENTITY_MATRIX);
-    m.position(oldPos);
-  }
-
-  /**
-   * Make matrix an zero matrix
-   */
-  public static void gluMakeZero(FloatBuffer m) {
-    int oldPos = m.position();
-    m.put(ZERO_MATRIX);
-    m.position(oldPos);
-  }
-
-  /**
-   * Make matrix an identity matrix
-   */
-  public static void gluMakeIdentityf(float[] m) {
-    for (int i = 0; i < 16; i++) {
-      m[i] = IDENTITY_MATRIX[i];
-    }
-  }
-
-  /**
-   * Method __gluMultMatrixVecf
-   * 
-   * @param matrix
-   * @param in
-   * @param out
-   */
-  private void __gluMultMatrixVecf(float[] matrix, int matrix_offset, float[] in, float[] out) {
-    for (int i = 0; i < 4; i++) {
-      out[i] =
-        in[0] * matrix[0*4+i+matrix_offset] +
-        in[1] * matrix[1*4+i+matrix_offset] +
-        in[2] * matrix[2*4+i+matrix_offset] +
-        in[3] * matrix[3*4+i+matrix_offset];
-    }
-  }
-
-  /**
-   * Method __gluMultMatrixVecf
-   * 
-   * @param matrix
-   * @param in
-   * @param out
-   */
-  private void __gluMultMatrixVecf(FloatBuffer matrix, FloatBuffer in, FloatBuffer out) {
-    int inPos = in.position();
-    int outPos = out.position();
-    int matrixPos = matrix.position();
-    for (int i = 0; i < 4; i++) {
-      out.put(i + outPos,
-              in.get(0+inPos) * matrix.get(0*4+i+matrixPos) +
-              in.get(1+inPos) * matrix.get(1*4+i+matrixPos) +
-              in.get(2+inPos) * matrix.get(2*4+i+matrixPos) +
-              in.get(3+inPos) * matrix.get(3*4+i+matrixPos));
-    }
-  }
-
-  /**
-   * @param src
-   * @param inverse
-   * 
-   * @return
-   */
-  public boolean gluInvertMatrixf(float[] src, float[] inverse) {
-    int i, j, k, swap;
-    float t;
-    float[][] temp = tempInvertMatrix;
-
-    for (i = 0; i < 4; i++) {
-      for (j = 0; j < 4; j++) {
-        temp[i][j] = src[i*4+j];
-      }
-    }
-    gluMakeIdentityf(inverse);
-
-    for (i = 0; i < 4; i++) {
-      //
-      // Look for largest element in column
-      //
-      swap = i;
-      for (j = i + 1; j < 4; j++) {
-        if (Math.abs(temp[j][i]) > Math.abs(temp[i][i])) {
-          swap = j;
-        }
-      }
-
-      if (swap != i) {
-        //
-        // Swap rows.
-        //
-        for (k = 0; k < 4; k++) {
-          t = temp[i][k];
-          temp[i][k] = temp[swap][k];
-          temp[swap][k] = t;
-
-          t = inverse[i*4+k];
-          inverse[i*4+k] = inverse[swap*4+k];
-          inverse[swap*4+k] = t;
-        }
-      }
-
-      if (temp[i][i] == 0) {
-        //
-        // No non-zero pivot. The matrix is singular, which shouldn't
-        // happen. This means the user gave us a bad matrix.
-        //
-        return false;
-      }
-
-      t = temp[i][i];
-      for (k = 0; k < 4; k++) {
-        temp[i][k] /= t;
-        inverse[i*4+k] /= t;
-      }
-      for (j = 0; j < 4; j++) {
-        if (j != i) {
-          t = temp[j][i];
-          for (k = 0; k < 4; k++) {
-            temp[j][k] -= temp[i][k] * t;
-            inverse[j*4+k] -= inverse[i*4+k]*t;
-          }
-        }
-      }
-    }
-    return true;
-  }
-
-  /**
-   * @param src
-   * @param inverse
-   * 
-   * @return
-   */
-  public boolean gluInvertMatrixf(FloatBuffer src, FloatBuffer inverse) {
-    int i, j, k, swap;
-    float t;
-
-    int srcPos = src.position();
-    int invPos = inverse.position();
-
-    FloatBuffer temp = tempInvertMatrixBuf;
-
-    for (i = 0; i < 4; i++) {
-      for (j = 0; j < 4; j++) {
-        temp.put(i*4+j, src.get(i*4+j + srcPos));
-      }
-    }
-    gluMakeIdentityf(inverse);
-
-    for (i = 0; i < 4; i++) {
-      //
-      // Look for largest element in column
-      //
-      swap = i;
-      for (j = i + 1; j < 4; j++) {
-        if (Math.abs(temp.get(j*4+i)) > Math.abs(temp.get(i*4+i))) {
-          swap = j;
-        }
-      }
-
-      if (swap != i) {
-        //
-        // Swap rows.
-        //
-        for (k = 0; k < 4; k++) {
-          t = temp.get(i*4+k);
-          temp.put(i*4+k, temp.get(swap*4+k));
-          temp.put(swap*4+k, t);
-
-          t = inverse.get(i*4+k + invPos);
-          inverse.put(i*4+k + invPos, inverse.get(swap*4+k + invPos));
-          inverse.put(swap*4+k + invPos, t);
-        }
-      }
-
-      if (temp.get(i*4+i) == 0) {
-        //
-        // No non-zero pivot. The matrix is singular, which shouldn't
-        // happen. This means the user gave us a bad matrix.
-        //
-        return false;
-      }
-
-      t = temp.get(i*4+i);
-      for (k = 0; k < 4; k++) {
-        temp.put(i*4+k, temp.get(i*4+k) / t);
-        inverse.put(i*4+k + invPos, inverse.get(i*4+k + invPos) / t);
-      }
-      for (j = 0; j < 4; j++) {
-        if (j != i) {
-          t = temp.get(j*4+i);
-          for (k = 0; k < 4; k++) {
-            temp.put(j*4+k, temp.get(j*4+k) - temp.get(i*4+k) * t);
-            inverse.put(j*4+k + invPos, inverse.get(j*4+k + invPos) - inverse.get(i*4+k + invPos) * t);
-          }
-        }
-      }
-    }
-    return true;
-  }
-
-
-  /**
-   * @param a
-   * @param b
-   * @param r
-   */
-  private void gluMultMatricesf(float[] a, int a_offset, float[] b, int b_offset, float[] r) {
-    for (int i = 0; i < 4; i++) {
-      for (int j = 0; j < 4; j++) {
-        r[i*4+j] =
-          a[i*4+0+a_offset]*b[0*4+j+b_offset] +
-          a[i*4+1+a_offset]*b[1*4+j+b_offset] +
-          a[i*4+2+a_offset]*b[2*4+j+b_offset] +
-          a[i*4+3+a_offset]*b[3*4+j+b_offset];
-      }
-    }
-  }
-
-
-  /**
-   * @param a
-   * @param b
-   * @param r
-   */
-  public static void gluMultMatricesf(FloatBuffer a, FloatBuffer b, FloatBuffer r) {
-    int aPos = a.position();
-    int bPos = b.position();
-    int rPos = r.position();
-
-    for (int i = 0; i < 4; i++) {
-      for (int j = 0; j < 4; j++) {
-        r.put(i*4+j + rPos,
-          a.get(i*4+0+aPos)*b.get(0*4+j+bPos) +
-          a.get(i*4+1+aPos)*b.get(1*4+j+bPos) +
-          a.get(i*4+2+aPos)*b.get(2*4+j+bPos) +
-          a.get(i*4+3+aPos)*b.get(3*4+j+bPos));
-      }
-    }
-  }
-
-  /**
-   * Normalize vector
-   *
-   * @param v
-   */
-  public static void normalize(float[] v) {
-    float r;
-
-    r = (float) Math.sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
-    if ( r == 0.0 || r == 1.0)
-      return;
-
-    r = 1.0f / r;
-
-    v[0] *= r;
-    v[1] *= r;
-    v[2] *= r;
-
-    return;
-  }
-
-  /**
-   * Normalize vector
-   *
-   * @param v
-   */
-  public static void normalize(FloatBuffer v) {
-    float r;
-
-    int vPos = v.position();
-
-    r = (float) Math.sqrt(v.get(0+vPos) * v.get(0+vPos) +
-                          v.get(1+vPos) * v.get(1+vPos) +
-                          v.get(2+vPos) * v.get(2+vPos));
-    if ( r == 0.0 || r == 1.0)
-      return;
-
-    r = 1.0f / r;
-
-    v.put(0+vPos, v.get(0+vPos) * r);
-    v.put(1+vPos, v.get(1+vPos) * r);
-    v.put(2+vPos, v.get(2+vPos) * r);
-
-    return;
-  }
-
-
-  /**
-   * Calculate cross-product
-   *
-   * @param v1
-   * @param v2
-   * @param result
-   */
-  private static void cross(float[] v1, float[] v2, float[] result) {
-    result[0] = v1[1] * v2[2] - v1[2] * v2[1];
-    result[1] = v1[2] * v2[0] - v1[0] * v2[2];
-    result[2] = v1[0] * v2[1] - v1[1] * v2[0];
-  }
-
-  /**
-   * Calculate cross-product
-   *
-   * @param v1
-   * @param v2
-   * @param result
-   */
-  private static void cross(FloatBuffer v1, FloatBuffer v2, FloatBuffer result) {
-    int v1Pos = v1.position();
-    int v2Pos = v2.position();
-    int rPos  = result.position();
-
-    result.put(0+rPos, v1.get(1+v1Pos) * v2.get(2+v2Pos) - v1.get(2+v1Pos) * v2.get(1+v2Pos));
-    result.put(1+rPos, v1.get(2+v1Pos) * v2.get(0+v2Pos) - v1.get(0+v1Pos) * v2.get(2+v2Pos));
-    result.put(2+rPos, v1.get(0+v1Pos) * v2.get(1+v2Pos) - v1.get(1+v1Pos) * v2.get(0+v2Pos));
-  }
-
-  /**
-   * Method gluOrtho2D.
-   * 
-   * @param left
-   * @param right
-   * @param bottom
-   * @param top
-   */
-  public void gluOrtho2D(GLMatrixFunc gl, float left, float right, float bottom, float top) {
-    gl.glOrthof(left, right, bottom, top, -1, 1);
-  }
-
-  /**
-   * Method gluPerspective.
-   * 
-   * @param fovy
-   * @param aspect
-   * @param zNear
-   * @param zFar
-   */
-  public void gluPerspective(GLMatrixFunc gl, float fovy, float aspect, float zNear, float zFar) {
-    float sine, cotangent, deltaZ;
-    float radians = fovy / 2 * (float) Math.PI / 180;
-
-    deltaZ = zFar - zNear;
-    sine = (float) Math.sin(radians);
-
-    if ((deltaZ == 0) || (sine == 0) || (aspect == 0)) {
-      return;
-    }
-
-    cotangent = (float) Math.cos(radians) / sine;
-
-    gluMakeIdentityf(matrixBuf);
-
-    matrixBuf.put(0 * 4 + 0, cotangent / aspect);
-    matrixBuf.put(1 * 4 + 1, cotangent);
-    matrixBuf.put(2 * 4 + 2, - (zFar + zNear) / deltaZ);
-    matrixBuf.put(2 * 4 + 3, -1);
-    matrixBuf.put(3 * 4 + 2, -2 * zNear * zFar / deltaZ);
-    matrixBuf.put(3 * 4 + 3, 0);
-
-    gl.glMultMatrixf(matrixBuf);
-  }
-
-  /**
-   * Method gluLookAt
-   * 
-   * @param eyex
-   * @param eyey
-   * @param eyez
-   * @param centerx
-   * @param centery
-   * @param centerz
-   * @param upx
-   * @param upy
-   * @param upz
-   */
-  public void gluLookAt(GLMatrixFunc gl,
-                        float eyex,
-                        float eyey,
-                        float eyez,
-                        float centerx,
-                        float centery,
-                        float centerz,
-                        float upx,
-                        float upy,
-                        float upz) {
-    FloatBuffer forward = this.forwardBuf;
-    FloatBuffer side = this.sideBuf;
-    FloatBuffer up = this.upBuf;
-
-    forward.put(0, centerx - eyex);
-    forward.put(1, centery - eyey);
-    forward.put(2, centerz - eyez);
-
-    up.put(0, upx);
-    up.put(1, upy);
-    up.put(2, upz);
-
-    normalize(forward);
-
-    /* Side = forward x up */
-    cross(forward, up, side);
-    normalize(side);
-
-    /* Recompute up as: up = side x forward */
-    cross(side, forward, up);
-
-    gluMakeIdentityf(matrixBuf);
-    matrixBuf.put(0 * 4 + 0, side.get(0));
-    matrixBuf.put(1 * 4 + 0, side.get(1));
-    matrixBuf.put(2 * 4 + 0, side.get(2));
-
-    matrixBuf.put(0 * 4 + 1, up.get(0));
-    matrixBuf.put(1 * 4 + 1, up.get(1));
-    matrixBuf.put(2 * 4 + 1, up.get(2));
-
-    matrixBuf.put(0 * 4 + 2, -forward.get(0));
-    matrixBuf.put(1 * 4 + 2, -forward.get(1));
-    matrixBuf.put(2 * 4 + 2, -forward.get(2));
-
-    gl.glMultMatrixf(matrixBuf);
-    gl.glTranslatef(-eyex, -eyey, -eyez);
-  }
-
-  /**
-   * Method gluProject
-   * 
-   * @param objx
-   * @param objy
-   * @param objz
-   * @param modelMatrix
-   * @param projMatrix
-   * @param viewport
-   * @param win_pos
-   * 
-   * @return
-   */
-  public boolean gluProject(float objx,
-                            float objy,
-                            float objz,
-                            float[] modelMatrix,
-                            int modelMatrix_offset,
-                            float[] projMatrix,
-                            int projMatrix_offset,
-                            int[] viewport,
-                            int viewport_offset,
-                            float[] win_pos,
-                            int win_pos_offset ) {
-
-    float[] in = this.in;
-    float[] out = this.out;
-
-    in[0] = objx;
-    in[1] = objy;
-    in[2] = objz;
-    in[3] = 1.0f;
-
-    __gluMultMatrixVecf(modelMatrix, modelMatrix_offset, in, out);
-    __gluMultMatrixVecf(projMatrix, projMatrix_offset, out, in);
-
-    if (in[3] == 0.0f)
-      return false;
-
-    in[3] = (1.0f / in[3]) * 0.5f;
-
-    // Map x, y and z to range 0-1
-    in[0] = in[0] * in[3] + 0.5f;
-    in[1] = in[1] * in[3] + 0.5f;
-    in[2] = in[2] * in[3] + 0.5f;
-
-    // Map x,y to viewport
-    win_pos[0+win_pos_offset] = in[0] * viewport[2+viewport_offset] + viewport[0+viewport_offset];
-    win_pos[1+win_pos_offset] = in[1] * viewport[3+viewport_offset] + viewport[1+viewport_offset];
-    win_pos[2+win_pos_offset] = in[2];
-
-    return true;
-  }
-
-  /**
-   * Method gluProject
-   * 
-   * @param objx
-   * @param objy
-   * @param objz
-   * @param modelMatrix
-   * @param projMatrix
-   * @param viewport
-   * @param win_pos
-   * 
-   * @return
-   */
-  public boolean gluProject(float objx,
-                            float objy,
-                            float objz,
-                            FloatBuffer modelMatrix,
-                            FloatBuffer projMatrix,
-                            IntBuffer viewport,
-                            FloatBuffer win_pos) {
-
-    FloatBuffer in = this.inBuf;
-    FloatBuffer out = this.outBuf;
-
-    in.put(0, objx);
-    in.put(1, objy);
-    in.put(2, objz);
-    in.put(3, 1.0f);
-
-    __gluMultMatrixVecf(modelMatrix, in, out);
-    __gluMultMatrixVecf(projMatrix, out, in);
-
-    if (in.get(3) == 0.0f)
-      return false;
-
-    in.put(3, (1.0f / in.get(3)) * 0.5f);
-
-    // Map x, y and z to range 0-1
-    in.put(0, in.get(0) * in.get(3) + 0.5f);
-    in.put(1, in.get(1) * in.get(3) + 0.5f);
-    in.put(2, in.get(2) * in.get(3) + 0.5f);
-
-    // Map x,y to viewport
-    int vPos = viewport.position();
-    int wPos = win_pos.position();
-    win_pos.put(0+wPos, in.get(0) * viewport.get(2+vPos) + viewport.get(0+vPos));
-    win_pos.put(1+wPos, in.get(1) * viewport.get(3+vPos) + viewport.get(1+vPos));
-    win_pos.put(2+wPos, in.get(2));
-
-    return true;
-  }
-
-
-  /**
-   * Method gluUnproject
-   * 
-   * @param winx
-   * @param winy
-   * @param winz
-   * @param modelMatrix
-   * @param projMatrix
-   * @param viewport
-   * @param obj_pos
-   * 
-   * @return
-   */
-  public boolean gluUnProject(float winx,
-                              float winy,
-                              float winz,
-                              float[] modelMatrix,
-                              int modelMatrix_offset,
-                              float[] projMatrix,
-                              int projMatrix_offset,
-                              int[] viewport,
-                              int viewport_offset,
-                              float[] obj_pos,
-                              int obj_pos_offset) {
-    float[] in = this.in;
-    float[] out = this.out;
-
-    gluMultMatricesf(modelMatrix, modelMatrix_offset, projMatrix, projMatrix_offset, matrix);
-
-    if (!gluInvertMatrixf(matrix, matrix))
-      return false;
-
-    in[0] = winx;
-    in[1] = winy;
-    in[2] = winz;
-    in[3] = 1.0f;
-
-    // Map x and y from window coordinates
-    in[0] = (in[0] - viewport[0+viewport_offset]) / viewport[2+viewport_offset];
-    in[1] = (in[1] - viewport[1+viewport_offset]) / viewport[3+viewport_offset];
-
-    // Map to range -1 to 1
-    in[0] = in[0] * 2 - 1;
-    in[1] = in[1] * 2 - 1;
-    in[2] = in[2] * 2 - 1;
-
-    __gluMultMatrixVecf(matrix, 0, in, out);
-
-    if (out[3] == 0.0)
-      return false;
-
-    out[3] = 1.0f / out[3];
-
-    obj_pos[0+obj_pos_offset] = out[0] * out[3];
-    obj_pos[1+obj_pos_offset] = out[1] * out[3];
-    obj_pos[2+obj_pos_offset] = out[2] * out[3];
-
-    return true;
-  }
-
-
-  /**
-   * Method gluUnproject
-   * 
-   * @param winx
-   * @param winy
-   * @param winz
-   * @param modelMatrix
-   * @param projMatrix
-   * @param viewport
-   * @param obj_pos
-   * 
-   * @return
-   */
-  public boolean gluUnProject(float winx,
-                              float winy,
-                              float winz,
-                              FloatBuffer modelMatrix,
-                              FloatBuffer projMatrix,
-                              IntBuffer viewport,
-                              FloatBuffer obj_pos) {
-    FloatBuffer in = this.inBuf;
-    FloatBuffer out = this.outBuf;
-
-    gluMultMatricesf(modelMatrix, projMatrix, matrixBuf);
-
-    if (!gluInvertMatrixf(matrixBuf, matrixBuf))
-      return false;
-
-    in.put(0, winx);
-    in.put(1, winy);
-    in.put(2, winz);
-    in.put(3, 1.0f);
-
-    // Map x and y from window coordinates
-    int vPos = viewport.position();
-    int oPos = obj_pos.position();
-    in.put(0, (in.get(0) - viewport.get(0+vPos)) / viewport.get(2+vPos));
-    in.put(1, (in.get(1) - viewport.get(1+vPos)) / viewport.get(3+vPos));
-
-    // Map to range -1 to 1
-    in.put(0, in.get(0) * 2 - 1);
-    in.put(1, in.get(1) * 2 - 1);
-    in.put(2, in.get(2) * 2 - 1);
-
-    __gluMultMatrixVecf(matrixBuf, in, out);
-
-    if (out.get(3) == 0.0f)
-      return false;
-
-    out.put(3, 1.0f / out.get(3));
-
-    obj_pos.put(0+oPos, out.get(0) * out.get(3));
-    obj_pos.put(1+oPos, out.get(1) * out.get(3));
-    obj_pos.put(2+oPos, out.get(2) * out.get(3));
-
-    return true;
-  }
-
-
-  /**
-   * Method gluUnproject4
-   * 
-   * @param winx
-   * @param winy
-   * @param winz
-   * @param clipw
-   * @param modelMatrix
-   * @param projMatrix
-   * @param viewport
-   * @param near
-   * @param far
-   * @param obj_pos
-   * 
-   * @return
-   */
-  public boolean gluUnProject4(float winx,
-                               float winy,
-                               float winz,
-                               float clipw,
-                               float[] modelMatrix,
-                               int modelMatrix_offset,
-                               float[] projMatrix,
-                               int projMatrix_offset,
-                               int[] viewport,
-                               int viewport_offset,
-                               float near,
-                               float far,
-                               float[] obj_pos,
-                               int obj_pos_offset ) {
-    float[] in = this.in;
-    float[] out = this.out;
-
-    gluMultMatricesf(modelMatrix, modelMatrix_offset, projMatrix, projMatrix_offset, matrix);
-
-    if (!gluInvertMatrixf(matrix, matrix))
-      return false;
-
-    in[0] = winx;
-    in[1] = winy;
-    in[2] = winz;
-    in[3] = clipw;
-
-    // Map x and y from window coordinates
-    in[0] = (in[0] - viewport[0+viewport_offset]) / viewport[2+viewport_offset];
-    in[1] = (in[1] - viewport[1+viewport_offset]) / viewport[3+viewport_offset];
-    in[2] = (in[2] - near) / (far - near);
-
-    // Map to range -1 to 1
-    in[0] = in[0] * 2 - 1;
-    in[1] = in[1] * 2 - 1;
-    in[2] = in[2] * 2 - 1;
-
-    __gluMultMatrixVecf(matrix, 0, in, out);
-
-    if (out[3] == 0.0f)
-      return false;
-
-    obj_pos[0+obj_pos_offset] = out[0];
-    obj_pos[1+obj_pos_offset] = out[1];
-    obj_pos[2+obj_pos_offset] = out[2];
-    obj_pos[3+obj_pos_offset] = out[3];
-    return true;
-  }
-
-  /**
-   * Method gluUnproject4
-   * 
-   * @param winx
-   * @param winy
-   * @param winz
-   * @param clipw
-   * @param modelMatrix
-   * @param projMatrix
-   * @param viewport
-   * @param near
-   * @param far
-   * @param obj_pos
-   * 
-   * @return
-   */
-  public boolean gluUnProject4(float winx,
-                               float winy,
-                               float winz,
-                               float clipw,
-                               FloatBuffer modelMatrix,
-                               FloatBuffer projMatrix,
-                               IntBuffer viewport,
-                               float near,
-                               float far,
-                               FloatBuffer obj_pos) {
-    FloatBuffer in = this.inBuf;
-    FloatBuffer out = this.outBuf;
-
-    gluMultMatricesf(modelMatrix, projMatrix, matrixBuf);
-
-    if (!gluInvertMatrixf(matrixBuf, matrixBuf))
-      return false;
-
-    in.put(0, winx);
-    in.put(1, winy);
-    in.put(2, winz);
-    in.put(3, clipw);
-
-    // Map x and y from window coordinates
-    int vPos = viewport.position();
-    in.put(0, (in.get(0) - viewport.get(0+vPos)) / viewport.get(2+vPos));
-    in.put(1, (in.get(1) - viewport.get(1+vPos)) / viewport.get(3+vPos));
-    in.put(2, (in.get(2) - near) / (far - near));
-
-    // Map to range -1 to 1
-    in.put(0, in.get(0) * 2 - 1);
-    in.put(1, in.get(1) * 2 - 1);
-    in.put(2, in.get(2) * 2 - 1);
-
-    __gluMultMatrixVecf(matrixBuf, in, out);
-
-    if (out.get(3) == 0.0f)
-      return false;
-
-    int oPos = obj_pos.position();
-    obj_pos.put(0+oPos, out.get(0));
-    obj_pos.put(1+oPos, out.get(1));
-    obj_pos.put(2+oPos, out.get(2));
-    obj_pos.put(3+oPos, out.get(3));
-    return true;
-  }
-
-
-  /**
-   * Method gluPickMatrix
-   * 
-   * @param x
-   * @param y
-   * @param deltaX
-   * @param deltaY
-   * @param viewport
-   */
-  public void gluPickMatrix(GLMatrixFunc gl,
-                            float x,
-                            float y,
-                            float deltaX,
-                            float deltaY,
-                            IntBuffer viewport) {
-    if (deltaX <= 0 || deltaY <= 0) {
-      return;
-    }
-
-    /* Translate and scale the picked region to the entire window */
-    int vPos = viewport.position();
-    gl.glTranslatef((viewport.get(2+vPos) - 2 * (x - viewport.get(0+vPos))) / deltaX,
-                    (viewport.get(3+vPos) - 2 * (y - viewport.get(1+vPos))) / deltaY,
-                    0);
-    gl.glScalef(viewport.get(2) / deltaX, viewport.get(3) / deltaY, 1.0f);
-  }
-
-  /**
-   * Method gluPickMatrix
-   * 
-   * @param x
-   * @param y
-   * @param deltaX
-   * @param deltaY
-   * @param viewport
-   * @param viewport_offset
-   */
-  public void gluPickMatrix(GLMatrixFunc gl,
-                            float x,
-                            float y,
-                            float deltaX,
-                            float deltaY,
-                            int[] viewport,
-                            int viewport_offset) {
-    if (deltaX <= 0 || deltaY <= 0) {
-      return;
-    }
-
-    /* Translate and scale the picked region to the entire window */
-    gl.glTranslatef((viewport[2+viewport_offset] - 2 * (x - viewport[0+viewport_offset])) / deltaX,
-                    (viewport[3+viewport_offset] - 2 * (y - viewport[1+viewport_offset])) / deltaY,
-                    0);
-    gl.glScalef(viewport[2+viewport_offset] / deltaX, viewport[3+viewport_offset] / deltaY, 1.0f);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp b/src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp
deleted file mode 100644
index 91723b505..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.sun.opengl.impl;
-
-public class SystemUtil {
-
-    /** Wrapper for System.getenv(), which doesn't work on platforms
-        earlier than JDK 5 */
-    public static String getenv(String variableName) {
-        return null;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javase b/src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javase
deleted file mode 100644
index 3f201c2b6..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javase
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.sun.opengl.impl;
-
-public class SystemUtil {
-
-    private static volatile boolean getenvSupported = true;
-    /** Wrapper for System.getenv(), which doesn't work on platforms
-        earlier than JDK 5 */
-    public static String getenv(String variableName) {
-        if (getenvSupported) {
-            try {
-                return System.getenv(variableName);
-            } catch (Error e) {
-                getenvSupported = false;
-            }
-        }
-        return null;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/ThreadingImpl.java b/src/jogl/classes/com/sun/opengl/impl/ThreadingImpl.java
deleted file mode 100644
index 4a4b2d5f9..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/ThreadingImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.opengl.impl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import javax.media.nativewindow.NativeWindowFactory;
-import com.sun.nativewindow.impl.NWReflection;
-import javax.media.opengl.GLException;
-
-/** Implementation of the {@link javax.media.opengl.Threading} class. */
-
-public class ThreadingImpl {
-    public static final int AWT    = 1;
-    public static final int WORKER = 2;
-
-    protected static final boolean DEBUG = Debug.debug("Threading");
-
-    private static boolean singleThreaded = true;
-    private static int mode;
-    private static boolean hasAWT;
-    // We need to know whether we're running on X11 platforms to change
-    // our behavior when the Java2D/JOGL bridge is active
-    private static boolean _isX11;
-
-    private static final ThreadingPlugin threadingPlugin;
-  
-    static {
-        Object threadingPluginTmp =
-            AccessController.doPrivileged(new PrivilegedAction() {
-                    public Object run() {
-                        String workaround = Debug.getProperty("jogl.1thread", true);
-                        // Default to using the AWT thread on all platforms except
-                        // Windows. On OS X there is instability apparently due to
-                        // using the JAWT on non-AWT threads. On X11 platforms there
-                        // are potential deadlocks which can be caused if the AWT
-                        // EventQueue thread hands work off to the GLWorkerThread
-                        // while holding the AWT lock. The optimization of
-                        // makeCurrent / release calls isn't worth these stability
-                        // problems.
-                        hasAWT = NWReflection.isClassAvailable("java.awt.Canvas") &&
-                            NWReflection.isClassAvailable("javax.media.opengl.awt.GLCanvas");
-
-                        String osType = NativeWindowFactory.getNativeWindowType(false);
-                        _isX11 = NativeWindowFactory.TYPE_X11.equals(osType);
-                        // boolean isWindows = NativeWindowFactory.TYPE_WINDOWS.equals(osType);
-
-                        // int defaultMode = (isWindows ? WORKER : ( hasAWT ? AWT : WORKER ) );
-                        int defaultMode = ( hasAWT ? AWT : WORKER );
-
-                        mode = defaultMode;
-                        if (workaround != null) {
-                            workaround = workaround.toLowerCase();
-                            if (workaround.equals("true") ||
-                                workaround.equals("auto")) {
-                                // Nothing to do; singleThreaded and mode already set up
-                            } else if (workaround.equals("worker")) {
-                                singleThreaded = true;
-                                mode = WORKER;
-                            } else if (workaround.equals("awt")) {
-                                singleThreaded = true;
-                                mode = AWT;
-                            } else {
-                                singleThreaded = false;
-                            }
-                        }
-                        printWorkaroundNotice();
-
-                        Object threadingPluginObj=null;
-                        // try to fetch the AWTThreadingPlugin
-                        try {
-                            threadingPluginObj = NWReflection.createInstance("com.sun.opengl.impl.awt.AWTThreadingPlugin");
-                        } catch (Throwable t) { }
-                        return threadingPluginObj;
-                    }
-                });
-        threadingPlugin = (ThreadingPlugin) threadingPluginTmp;
-        if(DEBUG) {
-            System.err.println("Threading: hasAWT "+hasAWT+", mode "+((mode==AWT)?"AWT":"WORKER")+", plugin "+threadingPlugin);
-        }
-    }
-
-    /** No reason to ever instantiate this class */
-    private ThreadingImpl() {}
-
-    public static boolean isX11() { return _isX11; }
-    public static int getMode() { return mode; }
-
-    /** If an implementation of the javax.media.opengl APIs offers a 
-        multithreading option but the default behavior is single-threading, 
-        this API provides a mechanism for end users to disable single-threading 
-        in this implementation.  Users are strongly discouraged from
-        calling this method unless they are aware of all of the
-        consequences and are prepared to enforce some amount of
-        threading restrictions in their applications. Disabling
-        single-threading, for example, may have unintended consequences
-        on GLAutoDrawable implementations such as GLCanvas, GLJPanel and
-        GLPbuffer. Currently there is no supported way to re-enable it
-        once disabled, partly to discourage careless use of this
-        method. This method should be called as early as possible in an
-        application. */ 
-    public static void disableSingleThreading() {
-        singleThreaded = false;
-        if (Debug.verbose()) {
-            System.err.println("Application forced disabling of single-threading of javax.media.opengl implementation");
-        }
-    }
-
-    /** Indicates whether OpenGL work is being automatically forced to a
-        single thread in this implementation. */
-    public static boolean isSingleThreaded() {
-        return singleThreaded;
-    }
-
-    /** Indicates whether the current thread is the single thread on
-        which this implementation of the javax.media.opengl APIs
-        performs all of its OpenGL-related work. This method should only
-        be called if the single-thread model is in effect. */
-    public static boolean isOpenGLThread() throws GLException {
-        if (!isSingleThreaded()) {
-            throw new GLException("Should only call this in single-threaded mode");
-        }
-
-        if(null!=threadingPlugin) {
-            return threadingPlugin.isOpenGLThread();
-        }
-
-        switch (mode) {
-        case AWT:
-            return true;
-        case WORKER:
-            return GLWorkerThread.isWorkerThread();
-        default:
-            throw new InternalError("Illegal single-threading mode " + mode);
-        }
-    }
-
-    /** Executes the passed Runnable on the single thread used for all
-        OpenGL work in this javax.media.opengl API implementation. It is
-        not specified exactly which thread is used for this
-        purpose. This method should only be called if the single-thread
-        model is in use and if the current thread is not the OpenGL
-        thread (i.e., if <code>isOpenGLThread()</code> returns
-        false). It is up to the end user to check to see whether the
-        current thread is the OpenGL thread and either execute the
-        Runnable directly or perform the work inside it. */
-    public static void invokeOnOpenGLThread(Runnable r) throws GLException {
-        if (!isSingleThreaded()) {
-            throw new GLException ("Should only call this in single-threaded mode");
-        }
-
-        if (isOpenGLThread()) {
-            throw new GLException ("Should only call this from other threads than the OpenGL thread");
-        }    
-
-        if(null!=threadingPlugin) {
-            threadingPlugin.invokeOnOpenGLThread(r);
-            return;
-        }
-
-        switch (mode) {
-            case AWT:
-                r.run();
-                break;
-
-            case WORKER:
-                if (!GLWorkerThread.isStarted()) {
-                    synchronized (GLWorkerThread.class) {
-                        if (!GLWorkerThread.isStarted()) {
-                            GLWorkerThread.start();
-                        }
-                    }
-                }
-                try {
-                    GLWorkerThread.invokeAndWait(r);
-                } catch (InvocationTargetException e) {
-                    throw new GLException(e.getTargetException());
-                } catch (InterruptedException e) {
-                    throw new GLException(e);
-                }
-                break;
-
-            default:
-                throw new InternalError("Illegal single-threading mode " + mode);
-        }
-    }
-
-    /** This is a workaround for AWT-related deadlocks which only seem
-        to show up in the context of applets */
-    public static boolean isAWTMode() {
-        return (mode == AWT);
-    }
-
-    private static void printWorkaroundNotice() {
-        if (singleThreaded && Debug.verbose()) {
-            System.err.println("Using " +
-                               (mode == AWT ? "AWT" : "OpenGL worker") +
-                               " thread for performing OpenGL work in javax.media.opengl implementation");
-        }
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/ThreadingPlugin.java b/src/jogl/classes/com/sun/opengl/impl/ThreadingPlugin.java
deleted file mode 100644
index 5c52f871e..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/ThreadingPlugin.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl;
-
-import javax.media.opengl.*;
-
-public interface ThreadingPlugin {
-  /** Indicates whether the current thread is the single thread on
-      which this implementation of the javax.media.opengl APIs
-      performs all of its OpenGL-related work. This method should only
-      be called if the single-thread model is in effect. */
-  public boolean isOpenGLThread() throws GLException;
-
-  /** Executes the passed Runnable on the single thread used for all
-      OpenGL work in this javax.media.opengl API implementation. It is
-      not specified exactly which thread is used for this
-      purpose. This method should only be called if the single-thread
-      model is in use and if the current thread is not the OpenGL
-      thread (i.e., if <code>isOpenGLThread()</code> returns
-      false). It is up to the end user to check to see whether the
-      current thread is the OpenGL thread and either execute the
-      Runnable directly or perform the work inside it. */
-  public void invokeOnOpenGLThread(Runnable r) throws GLException;
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/awt/AWTThreadingPlugin.java b/src/jogl/classes/com/sun/opengl/impl/awt/AWTThreadingPlugin.java
deleted file mode 100755
index c7dd9ea80..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/awt/AWTThreadingPlugin.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.awt;
-
-import javax.media.opengl.*;
-
-import java.awt.event.*;
-
-import java.awt.EventQueue;
-import java.lang.reflect.InvocationTargetException;
-
-import com.sun.opengl.impl.*;
-
-public class AWTThreadingPlugin implements ThreadingPlugin {
-
-  public AWTThreadingPlugin() {}
-
-  public boolean isOpenGLThread() throws GLException {
-    switch (ThreadingImpl.getMode()) {
-      case ThreadingImpl.AWT:
-        if (Java2D.isOGLPipelineActive()) {
-          // FIXME: ideally only the QFT would be considered to be the
-          // "OpenGL thread", but we can not currently run all of
-          // JOGL's OpenGL work on that thread. See the FIXME in
-          // invokeOnOpenGLThread.
-          return (Java2D.isQueueFlusherThread() ||
-                  (ThreadingImpl.isX11() && EventQueue.isDispatchThread()));
-        } else {
-          return EventQueue.isDispatchThread();
-        }
-      case ThreadingImpl.WORKER:
-        if (Java2D.isOGLPipelineActive()) {
-          // FIXME: ideally only the QFT would be considered to be the
-          // "OpenGL thread", but we can not currently run all of
-          // JOGL's OpenGL work on that thread. See the FIXME in
-          // invokeOnOpenGLThread.
-          return (Java2D.isQueueFlusherThread() ||
-                  (ThreadingImpl.isX11() && GLWorkerThread.isWorkerThread()));
-        } else {
-          return GLWorkerThread.isWorkerThread();
-        }
-      default:
-        throw new InternalError("Illegal single-threading mode " + ThreadingImpl.getMode());
-    }
-  }
-
-  public void invokeOnOpenGLThread(Runnable r) throws GLException {
-    switch (ThreadingImpl.getMode()) {
-      case ThreadingImpl.AWT:
-        // FIXME: ideally should run all OpenGL work on the Java2D QFT
-        // thread when it's enabled, but unfortunately there are
-        // deadlock issues on X11 platforms when making our
-        // heavyweight OpenGL contexts current on the QFT because we
-        // perform the JAWT lock inside the makeCurrent()
-        // implementation, which attempts to grab the AWT lock on the
-        // QFT which is not allowed. For now, on X11 platforms,
-        // continue to perform this work on the EDT.
-        if (Java2D.isOGLPipelineActive() && !ThreadingImpl.isX11()) {
-          Java2D.invokeWithOGLContextCurrent(null, r);
-        } else {
-          try {
-            EventQueue.invokeAndWait(r);
-          } catch (InvocationTargetException e) {
-            throw new GLException(e.getTargetException());
-          } catch (InterruptedException e) {
-            throw new GLException(e);
-          }
-        }
-        break;
-
-      case ThreadingImpl.WORKER:
-        if (!GLWorkerThread.isStarted()) {
-          synchronized (GLWorkerThread.class) {
-            if (!GLWorkerThread.isStarted()) {
-              GLWorkerThread.start();
-            }
-          }
-        }
-        try {
-          GLWorkerThread.invokeAndWait(r);
-        } catch (InvocationTargetException e) {
-          throw new GLException(e.getTargetException());
-        } catch (InterruptedException e) {
-          throw new GLException(e);
-        }
-        break;
-
-      default:
-        throw new InternalError("Illegal single-threading mode " + ThreadingImpl.getMode());
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/awt/AWTUtil.java b/src/jogl/classes/com/sun/opengl/impl/awt/AWTUtil.java
deleted file mode 100644
index f4c8944df..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/awt/AWTUtil.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.opengl.impl.awt;
-
-import com.sun.nativewindow.impl.jawt.*;
-
-import com.sun.opengl.impl.*;
-
-import javax.media.opengl.*;
-
-import java.lang.reflect.*;
-import java.awt.GraphicsEnvironment;
-
-public class AWTUtil {
-  // See whether we're running in headless mode
-  private static boolean headlessMode;
-  private static Class j2dClazz = null;
-  private static Method isOGLPipelineActive = null;
-  private static Method isQueueFlusherThread = null;
-  private static boolean j2dOk = false;
-
-  static {
-    lockedToolkit = false;
-    headlessMode = GraphicsEnvironment.isHeadless();
-    if(!headlessMode) {
-        try {
-            j2dClazz = Class.forName("com.sun.opengl.impl.awt.Java2D");
-            isOGLPipelineActive = j2dClazz.getMethod("isOGLPipelineActive", null);
-            isQueueFlusherThread = j2dClazz.getMethod("isQueueFlusherThread", null);
-            j2dOk = true;
-        } catch (Exception e) {}
-    }
-  }
-
-  private static boolean lockedToolkit;
-
-  public static synchronized void lockToolkit() throws GLException {
-    if (lockedToolkit) {
-      throw new GLException("Toolkit already locked");
-    }
-    lockedToolkit = true;
-
-    if (headlessMode) {
-      // Workaround for running (to some degree) in headless
-      // environments but still supporting rendering via pbuffers
-      // For full correctness, would need to implement a Lock class
-      return;
-    }
-
-    if(j2dOk) {
-      try {
-        if( !((Boolean)isOGLPipelineActive.invoke(null, null)).booleanValue() ||
-            !((Boolean)isQueueFlusherThread.invoke(null, null)).booleanValue() ) {
-          JAWTUtil.lockToolkit();
-        }
-      } catch (Exception e) { j2dOk=false; }
-    } 
-    if(!j2dOk) {
-      JAWTUtil.lockToolkit();
-    }
-  }
-
-  public static synchronized void unlockToolkit() {
-    if (lockedToolkit) {
-        lockedToolkit = false;
-        if (headlessMode) {
-          // Workaround for running (to some degree) in headless
-          // environments but still supporting rendering via pbuffers
-          // For full correctness, would need to implement a Lock class
-          return;
-        }
-
-        if(j2dOk) {
-          try {
-            if( !((Boolean)isOGLPipelineActive.invoke(null, null)).booleanValue() ||
-                !((Boolean)isQueueFlusherThread.invoke(null, null)).booleanValue() ) {
-              JAWTUtil.unlockToolkit();
-            }
-          } catch (Exception e) { j2dOk=false; }
-        } 
-        if(!j2dOk) {
-          JAWTUtil.unlockToolkit();
-        }
-    }
-  }
-
-  public static boolean isToolkitLocked() {
-    return JAWTUtil.isToolkitLocked();
-  }
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/awt/Java2D.java b/src/jogl/classes/com/sun/opengl/impl/awt/Java2D.java
deleted file mode 100755
index 098ec8529..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/awt/Java2D.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.awt;
-
-import com.sun.opengl.impl.*;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.lang.reflect.*;
-import java.security.*;
-
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.awt.*;
-
-/** Defines integration with the Java2D OpenGL pipeline. This
-    integration is only supported in 1.6 and is highly experimental. */
-
-public class Java2D {
-  private static boolean DEBUG = Debug.debug("Java2D");
-  private static boolean VERBOSE = Debug.verbose();
-  private static boolean isHeadless;
-  private static boolean isOGLPipelineActive;
-  private static Method invokeWithOGLContextCurrentMethod;
-  private static Method isQueueFlusherThreadMethod;
-  private static Method getOGLViewportMethod;
-  private static Method getOGLScissorBoxMethod;
-  private static Method getOGLSurfaceIdentifierMethod;
-  // This one is currently optional and is only in very recent Mustang builds
-  private static Method getOGLTextureTypeMethod;
-
-  // The following methods and fields are needed for proper support of
-  // Frame Buffer Objects in the Java2D/OpenGL pipeline
-  // (-Dsun.java2d.opengl.fbobject=true)
-  private static boolean fbObjectSupportInitialized;
-  private static Method invokeWithOGLSharedContextCurrentMethod;
-  private static Method getOGLSurfaceTypeMethod;
-
-  // Publicly-visible constants for OpenGL surface types
-  public static final int UNDEFINED       = getOGLUtilitiesIntField("UNDEFINED");
-  public static final int WINDOW          = getOGLUtilitiesIntField("WINDOW");
-  public static final int PBUFFER         = getOGLUtilitiesIntField("PBUFFER");
-  public static final int TEXTURE         = getOGLUtilitiesIntField("TEXTURE");
-  public static final int FLIP_BACKBUFFER = getOGLUtilitiesIntField("FLIP_BACKBUFFER");
-  public static final int FBOBJECT        = getOGLUtilitiesIntField("FBOBJECT");
-
-  // If FBOs are enabled in the Java2D/OpenGL pipeline, all contexts
-  // created by JOGL must share textures and display lists with the
-  // Java2D contexts in order to access the frame buffer object for
-  // potential rendering, and to simultaneously support sharing of
-  // textures and display lists with one another. Java2D has the
-  // notion of a single shared context with which all other contexts
-  // (on the same display device?) share textures and display lists;
-  // this is an approximation to that notion which will be refined
-  // later.
-  private static boolean initializedJ2DFBOShareContext;
-  private static GLContext j2dFBOShareContext;
-
-  // Accessors for new methods in sun.java2d.opengl.CGLSurfaceData
-  // class on OS X for enabling bridge
-  //  public static long    createOGLContextOnSurface(Graphics g, long ctx);
-  //  public static boolean makeOGLContextCurrentOnSurface(Graphics g, long ctx);
-  //  public static void    destroyOGLContext(long ctx);
-  private static Method createOGLContextOnSurfaceMethod;
-  private static Method makeOGLContextCurrentOnSurfaceMethod;
-  private static Method destroyOGLContextMethod;
-
-  static {
-    AccessController.doPrivileged(new PrivilegedAction() {
-        public Object run() {
-          if (DEBUG && VERBOSE) {
-            System.err.println("Checking for Java2D/OpenGL support");
-          }
-          try {
-            isHeadless = true;
-            // Figure out whether the default graphics configuration is an
-            // OpenGL graphics configuration
-            GraphicsConfiguration cfg =
-              GraphicsEnvironment.getLocalGraphicsEnvironment().
-              getDefaultScreenDevice().
-              getDefaultConfiguration();
-            // If we get here, we aren't running in headless mode
-            isHeadless = false;
-            String name = cfg.getClass().getName();
-            if (DEBUG && VERBOSE) {
-              System.err.println("Java2D support: default GraphicsConfiguration = " + name);
-            }
-            isOGLPipelineActive = (name.startsWith("sun.java2d.opengl"));
-
-            if (isOGLPipelineActive) {
-              try {
-                // Try to get methods we need to integrate
-                Class utils = Class.forName("sun.java2d.opengl.OGLUtilities");
-                invokeWithOGLContextCurrentMethod = utils.getDeclaredMethod("invokeWithOGLContextCurrent",
-                                                                            new Class[] {
-                                                                              Graphics.class,
-                                                                              Runnable.class
-                                                                            });
-                invokeWithOGLContextCurrentMethod.setAccessible(true);
-
-                isQueueFlusherThreadMethod = utils.getDeclaredMethod("isQueueFlusherThread",
-                                                                     new Class[] {});
-                isQueueFlusherThreadMethod.setAccessible(true);
-
-                getOGLViewportMethod = utils.getDeclaredMethod("getOGLViewport",
-                                                               new Class[] {
-                                                                 Graphics.class,
-                                                                 Integer.TYPE,
-                                                                 Integer.TYPE
-                                                               });
-                getOGLViewportMethod.setAccessible(true);
-
-                getOGLScissorBoxMethod = utils.getDeclaredMethod("getOGLScissorBox",
-                                                                 new Class[] {
-                                                                   Graphics.class
-                                                                 });
-                getOGLScissorBoxMethod.setAccessible(true);
-
-                getOGLSurfaceIdentifierMethod = utils.getDeclaredMethod("getOGLSurfaceIdentifier",
-                                                                        new Class[] {
-                                                                          Graphics.class
-                                                                        });
-                getOGLSurfaceIdentifierMethod.setAccessible(true);
-
-                // Try to get additional methods required for proper FBO support
-                fbObjectSupportInitialized = true;
-                try {
-                  invokeWithOGLSharedContextCurrentMethod = utils.getDeclaredMethod("invokeWithOGLSharedContextCurrent",
-                                                                                    new Class[] {
-                                                                                      GraphicsConfiguration.class,
-                                                                                      Runnable.class
-                                                                                    });
-                  invokeWithOGLSharedContextCurrentMethod.setAccessible(true);
-
-                  getOGLSurfaceTypeMethod = utils.getDeclaredMethod("getOGLSurfaceType",
-                                                                    new Class[] {
-                                                                      Graphics.class
-                                                                    });
-                  getOGLSurfaceTypeMethod.setAccessible(true);
-                } catch (Exception e) {
-                  fbObjectSupportInitialized = false;
-                  if (DEBUG && VERBOSE) {
-                    e.printStackTrace();
-                    System.err.println("Disabling Java2D/JOGL FBO support");
-                  }
-                }
-
-                // Try to get an additional method for FBO support in recent Mustang builds
-                try {
-                  getOGLTextureTypeMethod = utils.getDeclaredMethod("getOGLTextureType",
-                                                                    new Class[] {
-                                                                      Graphics.class
-                                                                    });
-                  getOGLTextureTypeMethod.setAccessible(true);
-                } catch (Exception e) {
-                  if (DEBUG && VERBOSE) {
-                    e.printStackTrace();
-                    System.err.println("GL_ARB_texture_rectangle FBO support disabled");
-                  }
-                }
-
-                // Try to set up APIs for enabling the bridge on OS X,
-                // where it isn't possible to create generalized
-                // external GLDrawables
-                Class cglSurfaceData = null;
-                try {
-                  cglSurfaceData = Class.forName("sun.java2d.opengl.CGLSurfaceData");
-                } catch (Exception e) {
-                  if (DEBUG && VERBOSE) {
-                    e.printStackTrace();
-                    System.err.println("Unable to find class sun.java2d.opengl.CGLSurfaceData for OS X");
-                  }
-                }
-                if (cglSurfaceData != null) {
-                  // FIXME: for now, assume that FBO support is not enabled on OS X
-                  fbObjectSupportInitialized = false;
-
-                  // We need to find these methods in order to make the bridge work on OS X
-                  createOGLContextOnSurfaceMethod = cglSurfaceData.getDeclaredMethod("createOGLContextOnSurface",
-                                                                                     new Class[] {
-                                                                                       Graphics.class,
-                                                                                       Long.TYPE
-                                                                                     });
-                  createOGLContextOnSurfaceMethod.setAccessible(true);
-
-                  makeOGLContextCurrentOnSurfaceMethod = cglSurfaceData.getDeclaredMethod("makeOGLContextCurrentOnSurface",
-                                                                                          new Class[] {
-                                                                                            Graphics.class,
-                                                                                            Long.TYPE
-                                                                                          });
-                  makeOGLContextCurrentOnSurfaceMethod.setAccessible(true);
-
-                  destroyOGLContextMethod = cglSurfaceData.getDeclaredMethod("destroyOGLContext",
-                                                                             new Class[] {
-                                                                               Long.TYPE
-                                                                             });
-                  destroyOGLContextMethod.setAccessible(true);
-                }
-              } catch (Exception e) {
-                if (DEBUG && VERBOSE) {
-                  e.printStackTrace();
-                  System.err.println("Disabling Java2D/JOGL integration");
-                }
-                isOGLPipelineActive = false;
-              }
-            }
-          } catch (HeadlessException e) {
-            // The AWT is running in headless mode, so the Java 2D / JOGL bridge is clearly disabled
-          }
-
-          if (DEBUG) {
-            System.err.println("JOGL/Java2D integration " + (isOGLPipelineActive ? "enabled" : "disabled"));
-          }
-          return null;
-        }
-      });
-  }
-
-  public static boolean isOGLPipelineActive() {
-    return isOGLPipelineActive;
-  }
-
-  public static boolean isFBOEnabled() {
-    return fbObjectSupportInitialized;
-  }
-
-  public static boolean isQueueFlusherThread() {
-    checkActive();
-
-    try {
-      return ((Boolean) isQueueFlusherThreadMethod.invoke(null, new Object[] {})).booleanValue();
-    } catch (InvocationTargetException e) {
-      throw new GLException(e.getTargetException());
-    } catch (Exception e) {
-      throw (InternalError) new InternalError().initCause(e);
-    }
-  }
-  
-  /** Makes current the OpenGL context associated with the passed
-      Graphics object and runs the given Runnable on the Queue
-      Flushing Thread in one atomic action. */
-  public static void invokeWithOGLContextCurrent(Graphics g, Runnable r) throws GLException {
-    checkActive();
-
-    try {
-      // FIXME: this may need adjustment
-      // This seems to be needed in many applications which don't
-      // initialize an OpenGL context before this and which would
-      // otherwise cause initFBOShareContext to be called from the
-      // Queue Flusher Thread, which isn't allowed
-      initFBOShareContext(GraphicsEnvironment.
-                          getLocalGraphicsEnvironment().
-                          getDefaultScreenDevice());
-
-      AWTUtil.lockToolkit();
-      try {
-        invokeWithOGLContextCurrentMethod.invoke(null, new Object[] {g, r});
-      } finally {
-        AWTUtil.unlockToolkit();
-      }
-    } catch (InvocationTargetException e) {
-      throw new GLException(e.getTargetException());
-    } catch (Exception e) {
-      throw (InternalError) new InternalError().initCause(e);
-    }
-  }
-
-  /** Makes current the "shared" OpenGL context associated with the
-      given GraphicsConfiguration object, allowing JOGL to share
-      server-side OpenGL objects like textures and display lists with
-      this context when necessary. This is needed when Java2D's FBO
-      support is enabled, because in order to render into that FBO,
-      JOGL must share textures and display lists with it. Returns
-      false if the passed GraphicsConfiguration was not an OpenGL
-      GraphicsConfiguration. */
-  public static boolean invokeWithOGLSharedContextCurrent(GraphicsConfiguration g, Runnable r) throws GLException {
-    checkActive();
-
-    try {
-      AWTUtil.lockToolkit();
-      try {
-        return ((Boolean) invokeWithOGLSharedContextCurrentMethod.invoke(null, new Object[] {g, r})).booleanValue();
-      } finally {
-        AWTUtil.unlockToolkit();
-      }
-    } catch (InvocationTargetException e) {
-      throw new GLException(e.getTargetException());
-    } catch (Exception e) {
-      throw (InternalError) new InternalError().initCause(e);
-    }
-  }
-
-  /** Returns the OpenGL viewport associated with the given Graphics
-      object, assuming that the Graphics object is associated with a
-      component of the specified width and height. The user should
-      call glViewport() with the returned rectangle's bounds in order
-      to get correct rendering results. Should only be called from the
-      Queue Flusher Thread. */
-  public static Rectangle getOGLViewport(Graphics g,
-                                         int componentWidth,
-                                         int componentHeight) {
-    checkActive();
-
-    try {
-      return (Rectangle) getOGLViewportMethod.invoke(null, new Object[] {g,
-                                                                         new Integer(componentWidth),
-                                                                         new Integer(componentHeight)});
-    } catch (InvocationTargetException e) {
-      throw new GLException(e.getTargetException());
-    } catch (Exception e) {
-      throw (InternalError) new InternalError().initCause(e);
-    }
-  }
-
-  /** Returns the OpenGL scissor region associated with the given
-      Graphics object, taking into account all clipping regions, etc.
-      To avoid destroying Java2D's previous rendering results, this
-      method should be called and the resulting rectangle's bounds
-      passed to a call to glScissor(). Should only be called from the
-      Queue Flusher Thread. */
-  public static Rectangle getOGLScissorBox(Graphics g) {
-    checkActive();
-
-    try {
-      return (Rectangle) getOGLScissorBoxMethod.invoke(null, new Object[] {g});
-    } catch (InvocationTargetException e) {
-      throw new GLException(e.getTargetException());
-    } catch (Exception e) {
-      throw (InternalError) new InternalError().initCause(e);
-    }
-  }
-
-  /** Returns an opaque "surface identifier" associated with the given
-      Graphics object. If this changes from invocation to invocation,
-      the underlying OpenGL drawable for the Graphics object has
-      changed and a new external GLDrawable and GLContext should be
-      created (and the old ones destroyed). Should only be called from
-      the Queue Flusher Thread.*/
-  public static Object getOGLSurfaceIdentifier(Graphics g) {
-    checkActive();
-
-    try {
-      return getOGLSurfaceIdentifierMethod.invoke(null, new Object[] {g});
-    } catch (InvocationTargetException e) {
-      throw new GLException(e.getTargetException());
-    } catch (Exception e) {
-      throw (InternalError) new InternalError().initCause(e);
-    }
-  }
-
-  /** Returns the underlying surface type for the given Graphics
-      object. This indicates, in particular, whether Java2D is
-      currently rendering into a pbuffer or FBO. */
-  public static int getOGLSurfaceType(Graphics g) {
-    checkActive();
-
-    try {
-      // FIXME: fallback path for pre-b73 (?) Mustang builds -- remove
-      // once fbobject support is in OGLUtilities
-      if (!fbObjectSupportInitialized) {
-        return 0;
-      }
-
-      return ((Integer) getOGLSurfaceTypeMethod.invoke(null, new Object[] { g })).intValue();
-    } catch (InvocationTargetException e) {
-      throw new GLException(e.getTargetException());
-    } catch (Exception e) {
-      throw (InternalError) new InternalError().initCause(e);
-    }
-  }
-
-  /** Returns the underlying texture target of the given Graphics
-      object assuming it is rendering to an FBO. Returns either
-      GL_TEXTURE_2D or GL_TEXTURE_RECTANGLE_ARB. */
-  public static int getOGLTextureType(Graphics g) {
-    checkActive();
-
-    if (getOGLTextureTypeMethod == null) {
-      return GL.GL_TEXTURE_2D;
-    }
-
-    try {
-      return ((Integer) getOGLTextureTypeMethod.invoke(null, new Object[] { g })).intValue();
-    } catch (InvocationTargetException e) {
-      throw new GLException(e.getTargetException());
-    } catch (Exception e) {
-      throw (InternalError) new InternalError().initCause(e);
-    }
-  }
-
-  /** Returns either the given GLContext or a substitute one with
-      which clients should share textures and display lists. Needed
-      when the Java2D/OpenGL pipeline is active and FBOs are being
-      used for rendering. FIXME: may need to alter the API in the
-      future to indicate which GraphicsDevice the source context is
-      associated with. */
-  public static GLContext filterShareContext(GLContext shareContext) {
-    if (isHeadless)
-      return shareContext;
-
-    // FIXME: this may need adjustment
-    initFBOShareContext(GraphicsEnvironment.
-                        getLocalGraphicsEnvironment().
-                        getDefaultScreenDevice());
-    if (j2dFBOShareContext != null) {
-      return j2dFBOShareContext;
-    }
-    return shareContext;
-  }
-
-  /** Returns the GLContext associated with the Java2D "share
-      context", with which all contexts created by JOGL must share
-      textures and display lists when the FBO option is enabled for
-      the Java2D/OpenGL pipeline. */
-  public static GLContext getShareContext(GraphicsDevice device) {
-    initFBOShareContext(device);
-    // FIXME: for full generality probably need to have multiple of
-    // these, one per GraphicsConfiguration seen?
-    return j2dFBOShareContext;
-  }
-
-  //----------------------------------------------------------------------
-  // Mac OS X-specific methods
-  //
-
-  /** (Mac OS X-specific) Creates a new OpenGL context on the surface
-      associated with the given Graphics object, sharing textures and
-      display lists with the specified (CGLContextObj) share context. */
-  public static long createOGLContextOnSurface(Graphics g, long shareCtx) {
-    checkActive();
-
-    try {
-      return ((Long) createOGLContextOnSurfaceMethod.invoke(null, new Object[] { g, new Long(shareCtx) })).longValue();
-    } catch (InvocationTargetException e) {
-      throw new GLException(e.getTargetException());
-    } catch (Exception e) {
-      throw (InternalError) new InternalError().initCause(e);
-    }
-  }
-
-  /** (Mac OS X-specific) Makes the given OpenGL context current on
-      the surface associated with the given Graphics object. */
-  public static boolean makeOGLContextCurrentOnSurface(Graphics g, long ctx) {
-    checkActive();
-
-    try {
-      return ((Boolean) makeOGLContextCurrentOnSurfaceMethod.invoke(null, new Object[] { g, new Long(ctx) })).booleanValue();
-    } catch (InvocationTargetException e) {
-      throw new GLException(e.getTargetException());
-    } catch (Exception e) {
-      throw (InternalError) new InternalError().initCause(e);
-    }
-  }
-
-  /** (Mac OS X-specific) Destroys the given OpenGL context. */
-  public static void destroyOGLContext(long ctx) {
-    checkActive();
-
-    try {
-      destroyOGLContextMethod.invoke(null, new Object[] { new Long(ctx) });
-    } catch (InvocationTargetException e) {
-      throw new GLException(e.getTargetException());
-    } catch (Exception e) {
-      throw (InternalError) new InternalError().initCause(e);
-    }
-  }
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  private static void checkActive() {
-    if (!isOGLPipelineActive()) {
-      throw new GLException("Java2D OpenGL pipeline not active (or necessary support not present)");
-    }
-  }
-
-  private static int getOGLUtilitiesIntField(final String name) {
-    Integer i = (Integer) AccessController.doPrivileged(new PrivilegedAction() {
-        public Object run() {
-          try {
-            Class utils = Class.forName("sun.java2d.opengl.OGLUtilities");
-            Field f = utils.getField(name);
-            f.setAccessible(true);
-            return f.get(null);
-          } catch (Exception e) {
-            if (DEBUG && VERBOSE) {
-              e.printStackTrace();
-            }
-            return null;
-          }
-        }
-      });
-    if (i == null)
-      return 0;
-    if (DEBUG && VERBOSE) {
-      System.err.println("OGLUtilities." + name + " = " + i.intValue());
-    }
-    return i.intValue();
-  }
-
-  private static void initFBOShareContext(final GraphicsDevice device) {
-    // Note 1: this must not be done in the static initalizer due to
-    // deadlock problems.
-
-    // Note 2: the first execution of this method must not be from the
-    // Java2D Queue Flusher Thread.
-
-    if (isOGLPipelineActive() &&
-        isFBOEnabled() &&
-        !initializedJ2DFBOShareContext) {
-
-      // FIXME: this technique is probably not adequate in multi-head
-      // situations. Ideally we would keep track of a given share
-      // context on a per-GraphicsConfiguration basis or something
-      // similar rather than keeping one share context in a global
-      // variable.
-      initializedJ2DFBOShareContext = true;
-      if (DEBUG) {
-        System.err.println("Starting initialization of J2D FBO share context");
-      }
-      invokeWithOGLSharedContextCurrent(device.getDefaultConfiguration(), new Runnable() {
-          public void run() {
-            j2dFBOShareContext = GLDrawableFactory.getFactory(GLProfile.getDefault()).createExternalGLContext();
-          }
-        });
-      if (DEBUG) {
-        System.err.println("Ending initialization of J2D FBO share context");
-      }
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/awt/Java2DGLContext.java b/src/jogl/classes/com/sun/opengl/impl/awt/Java2DGLContext.java
deleted file mode 100644
index 48461c116..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/awt/Java2DGLContext.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.awt;
-
-import com.sun.opengl.impl.*;
-import java.awt.Graphics;
-
-/** Provides a construct by which the shared GLJPanel code can
- * interact with a few methods in the Mac OS X-specific Java2D/JOGL
- * bridge implementation.
- */
-
-public interface Java2DGLContext {
-  public void setGraphics(Graphics g);
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java
deleted file mode 100755
index 3e67469b4..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.egl;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.jogamp.gluegen.runtime.ProcAddressTable;
-import java.nio.*;
-import java.util.*;
-
-public abstract class EGLContext extends GLContextImpl {
-    private long eglContext;
-    private boolean eglQueryStringInitialized;
-    private boolean eglQueryStringAvailable;
-    private EGLExt eglExt;
-    // Table that holds the addresses of the native C-language entry points for
-    // EGL extension functions.
-    private EGLExtProcAddressTable eglExtProcAddressTable;
-
-    public EGLContext(GLDrawableImpl drawable, GLDrawableImpl drawableRead,
-                      GLContext shareWith) {
-        super(drawable, drawableRead, shareWith);
-    }
-
-    public EGLContext(GLDrawableImpl drawable,
-                      GLContext shareWith) {
-        this(drawable, null, shareWith);
-    }
-
-    public Object getPlatformGLExtensions() {
-      return getEGLExt();
-    }
-
-    public EGLExt getEGLExt() {
-      if (eglExt == null) {
-        eglExt = new EGLExtImpl(this);
-      }
-      return eglExt;
-    }
-
-    public final ProcAddressTable getPlatformExtProcAddressTable() {
-        return eglExtProcAddressTable;
-    }
-
-    public final EGLExtProcAddressTable getEGLExtProcAddressTable() {
-        return eglExtProcAddressTable;
-    }
-
-    protected String mapToRealGLFunctionName(String glFunctionName) {
-        return glFunctionName;
-    }
-
-    protected String mapToRealGLExtensionName(String glExtensionName) {
-        return glExtensionName;
-    }
-
-    public long getContext() {
-        return eglContext;
-    }
-
-    protected int makeCurrentImpl() throws GLException {
-        if(EGL.EGL_NO_DISPLAY==((EGLDrawable)drawable).getDisplay() ) {
-            System.err.println("drawable not properly initialized");
-            return CONTEXT_NOT_CURRENT;
-        }
-        boolean created = false;
-        if (eglContext == 0) {
-            create();
-            if (DEBUG) {
-                System.err.println(getThreadName() + ": !!! Created GL context 0x" +
-                                   Long.toHexString(eglContext) + " for " + getClass().getName());
-            }
-            created = true;
-        }
-        if (EGL.eglGetCurrentContext() != eglContext) {
-            if (!EGL.eglMakeCurrent(((EGLDrawable)drawable).getDisplay(),
-                                    ((EGLDrawable)drawable).getSurface(),
-                                    ((EGLDrawable)drawableRead).getSurface(),
-                                    eglContext)) {
-                throw new GLException("Error making context 0x" +
-                                      Long.toHexString(eglContext) + " current: error code " + EGL.eglGetError());
-            }
-        }
-
-        if (created) {
-            setGLFunctionAvailability(false);
-            return CONTEXT_CURRENT_NEW;
-        }
-        return CONTEXT_CURRENT;
-    }
-
-    protected void releaseImpl() throws GLException {
-      getDrawableImpl().getFactoryImpl().lockToolkit();
-      try {
-          if (!EGL.eglMakeCurrent(((EGLDrawable)drawable).getDisplay(),
-                                  EGL.EGL_NO_SURFACE,
-                                  EGL.EGL_NO_SURFACE,
-                                  EGL.EGL_NO_CONTEXT)) {
-                throw new GLException("Error freeing OpenGL context 0x" +
-                                      Long.toHexString(eglContext) + ": error code " + EGL.eglGetError());
-          }
-      } finally {
-          getDrawableImpl().getFactoryImpl().unlockToolkit();
-      }
-    }
-
-    protected void destroyImpl() throws GLException {
-      getDrawableImpl().getFactoryImpl().lockToolkit();
-      try {
-          if (eglContext != 0) {
-              if (!EGL.eglDestroyContext(((EGLDrawable)drawable).getDisplay(), eglContext)) {
-                  throw new GLException("Error destroying OpenGL context 0x" +
-                                        Long.toHexString(eglContext) + ": error code " + EGL.eglGetError());
-              }
-              eglContext = 0;
-              GLContextShareSet.contextDestroyed(this);
-          }
-      } finally {
-          getDrawableImpl().getFactoryImpl().unlockToolkit();
-      }
-    }
-
-    protected void create() throws GLException {
-        long eglDisplay = ((EGLDrawable)drawable).getDisplay();
-        EGLGraphicsConfiguration config = ((EGLDrawable)drawable).getGraphicsConfiguration();
-        GLProfile glProfile = drawable.getGLProfile();
-        _EGLConfig eglConfig = config.getNativeConfig();
-        long shareWith = EGL.EGL_NO_CONTEXT;
-
-        if (eglDisplay == 0) {
-            throw new GLException("Error: attempted to create an OpenGL context without a display connection");
-        }
-        if (eglConfig == null) {
-            throw new GLException("Error: attempted to create an OpenGL context without a graphics configuration");
-        }
-
-        try {
-            // might be unavailable on EGL < 1.2
-            if(!EGL.eglBindAPI(EGL.EGL_OPENGL_ES_API)) {
-                throw new GLException("eglBindAPI to ES failed , error 0x"+Integer.toHexString(EGL.eglGetError()));
-            }
-        } catch (GLException glex) {
-            if (DEBUG) {
-                glex.printStackTrace();
-            }
-        }
-
-        EGLContext other = (EGLContext) GLContextShareSet.getShareContext(this);
-        if (other != null) {
-            shareWith = other.getContext();
-            if (shareWith == 0) {
-                throw new GLException("GLContextShareSet returned an invalid OpenGL context");
-            }
-        }
-
-        int[] contextAttrs = new int[] {
-                EGL.EGL_CONTEXT_CLIENT_VERSION, -1,
-                EGL.EGL_NONE
-        };
-        if (glProfile.usesNativeGLES2()) {
-            contextAttrs[1] = 2;
-        } else if (glProfile.usesNativeGLES1()) {
-            contextAttrs[1] = 1;
-        } else {
-            throw new GLException("Error creating OpenGL context - invalid GLProfile: "+glProfile);
-        }
-        eglContext = EGL.eglCreateContext(eglDisplay, eglConfig, shareWith, contextAttrs, 0);
-        if (eglContext == 0) {
-            throw new GLException("Error creating OpenGL context: eglDisplay 0x"+Long.toHexString(eglDisplay)+
-                                  ", "+glProfile+", error 0x"+Integer.toHexString(EGL.eglGetError()));
-        }
-        GLContextShareSet.contextCreated(this);
-        if (DEBUG) {
-            System.err.println(getThreadName() + ": !!! Created OpenGL context 0x" +
-                               Long.toHexString(eglContext) + 
-                               ",\n\twrite surface 0x" + Long.toHexString(((EGLDrawable)drawable).getSurface()) +
-                               ",\n\tread  surface 0x" + Long.toHexString(((EGLDrawable)drawableRead).getSurface())+
-                               ",\n\t"+this+
-                               ",\n\tsharing with 0x" + Long.toHexString(shareWith));
-        }
-        if (!EGL.eglMakeCurrent(((EGLDrawable)drawable).getDisplay(),
-                                ((EGLDrawable)drawable).getSurface(),
-                                ((EGLDrawable)drawableRead).getSurface(),
-                                eglContext)) {
-            throw new GLException("Error making context 0x" +
-                                  Long.toHexString(eglContext) + " current: error code " + EGL.eglGetError());
-        }
-        setGLFunctionAvailability(true);
-    }
-
-    public boolean isCreated() {
-        return (eglContext != 0);
-    }
-
-    protected void updateGLProcAddressTable() {
-        if (DEBUG) {
-          System.err.println(getThreadName() + ": !!! Initializing EGL extension address table");
-        }
-        eglQueryStringInitialized = false;
-        eglQueryStringAvailable = false;
-
-        if (eglExtProcAddressTable == null) {
-          // FIXME: cache ProcAddressTables by capability bits so we can
-          // share them among contexts with the same capabilities
-          eglExtProcAddressTable = new EGLExtProcAddressTable();
-        }          
-        resetProcAddressTable(getEGLExtProcAddressTable());
-        super.updateGLProcAddressTable();
-    }
-  
-    public synchronized String getPlatformExtensionsString() {
-        if (!eglQueryStringInitialized) {
-          eglQueryStringAvailable =
-            getDrawableImpl().getDynamicLookupHelper().dynamicLookupFunction("eglQueryString") != 0;
-          eglQueryStringInitialized = true;
-        }
-        if (eglQueryStringAvailable) {
-          GLDrawableFactoryImpl factory = getDrawableImpl().getFactoryImpl();
-          factory.lockToolkit();
-          try {
-            String ret = EGL.eglQueryString(((EGLDrawable)drawable).getDisplay(), 
-                                            EGL.EGL_EXTENSIONS);
-            if (DEBUG) {
-              System.err.println("!!! EGL extensions: " + ret);
-            }
-            return ret;
-          } finally {
-            factory.unlockToolkit();
-          }
-        } else {
-          return "";
-        }
-    }
-
-    protected void setSwapIntervalImpl(int interval) {
-        if (EGL.eglSwapInterval(((EGLDrawable)drawable).getDisplay(), interval)) {
-            currentSwapInterval = interval ;
-        }
-    }
-
-    public abstract void bindPbufferToTexture();
-
-    public abstract void releasePbufferFromTexture();
-
-    //----------------------------------------------------------------------
-    // Currently unimplemented stuff
-    //
-
-    public void copy(GLContext source, int mask) throws GLException {
-        throw new GLException("Not yet implemented");
-    }
-
-
-    public ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3) {
-        throw new GLException("Should not call this");
-    }
-
-    public boolean offscreenImageNeedsVerticalFlip() {
-        throw new GLException("Should not call this");
-    }
-
-    public int getOffscreenContextPixelDataType() {
-        throw new GLException("Should not call this");
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java
deleted file mode 100755
index b0a5a93d6..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.egl;
-
-import com.sun.opengl.impl.GLDrawableImpl;
-import com.sun.nativewindow.impl.NWReflection;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.egl.*;
-import javax.media.opengl.*;
-
-public abstract class EGLDrawable extends GLDrawableImpl {
-    protected boolean ownEGLDisplay = false; // for destruction
-    protected boolean ownEGLSurface = false; // for destruction
-    private EGLGraphicsConfiguration eglConfig;
-    protected long eglDisplay;
-    protected long eglSurface;
-
-    protected EGLDrawable(EGLDrawableFactory factory,
-                       NativeWindow component) throws GLException {
-        super(factory, component, false);
-        eglSurface=EGL.EGL_NO_SURFACE;
-        eglDisplay=0;
-    }
-
-    public long getDisplay() {
-        return eglDisplay;
-    }
-
-    public long getSurface() {
-        return eglSurface;
-    }
-
-    public EGLGraphicsConfiguration getGraphicsConfiguration() {
-        return eglConfig;
-    }
-
-    public GLCapabilities getChosenGLCapabilities() {
-        return (null==eglConfig)?super.getChosenGLCapabilities():(GLCapabilities)eglConfig.getChosenCapabilities();
-    }
-
-    public abstract GLContext createContext(GLContext shareWith);
-
-    protected abstract long createSurface(long eglDpy, _EGLConfig eglNativeCfg, long surfaceHandle);
-
-    private void recreateSurface() {
-        // create a new EGLSurface ..
-        if(EGL.EGL_NO_SURFACE!=eglSurface) {
-            EGL.eglDestroySurface(eglDisplay, eglSurface);
-        }
-
-        if(DEBUG) {
-            System.err.println("createSurface using eglDisplay 0x"+Long.toHexString(eglDisplay)+", "+eglConfig);
-        }
-
-        eglSurface = createSurface(eglDisplay, eglConfig.getNativeConfig(), component.getSurfaceHandle());
-        if (EGL.EGL_NO_SURFACE==eglSurface) {
-            throw new GLException("Creation of window surface failed: "+eglConfig+", error 0x"+Integer.toHexString(EGL.eglGetError()));
-        }
-
-        if(DEBUG) {
-            System.err.println("setSurface using component: handle 0x"+Long.toHexString(component.getSurfaceHandle())+" -> 0x"+Long.toHexString(eglSurface));
-        }
-    }
-
-    protected void setRealizedImpl() {
-        if (realized) {
-            if ( NativeWindow.LOCK_SURFACE_NOT_READY == lockSurface() ) {
-                throw new GLException("Couldn't lock surface");
-            }
-            // lockSurface() also resolved the window/surface handles
-            try {
-                AbstractGraphicsConfiguration aConfig = component.getGraphicsConfiguration().getNativeGraphicsConfiguration();
-                AbstractGraphicsDevice aDevice = aConfig.getScreen().getDevice();
-                if(aDevice instanceof EGLGraphicsDevice) {
-                    // just fetch the data .. trust but verify ..
-                    eglDisplay = aDevice.getHandle();
-                    if (eglDisplay == EGL.EGL_NO_DISPLAY) {
-                        throw new GLException("Invalid EGL display in EGLGraphicsDevice from "+aDevice);
-                    }
-                    if(aConfig instanceof EGLGraphicsConfiguration) {
-                        eglConfig = (EGLGraphicsConfiguration) aConfig; // done ..
-                        if (null == eglConfig) {
-                            throw new GLException("Null EGLGraphicsConfiguration from "+aConfig);
-                        }
-
-                        int[] tmp = new int[1];
-                        if ( 0 != component.getSurfaceHandle() &&
-                             EGL.eglQuerySurface(eglDisplay, component.getSurfaceHandle(), EGL.EGL_CONFIG_ID, tmp, 0) ) {
-                            // component holds static EGLSurface
-                            eglSurface = component.getSurfaceHandle();
-                            if(DEBUG) {
-                                System.err.println("setSurface re-using component's EGLSurface: handle 0x"+Long.toHexString(eglSurface));
-                            }
-                        } else {
-                            // EGLSurface is ours ..
-                            ownEGLSurface=true;
-                            
-                            eglConfig.updateGraphicsConfiguration();
-
-                            recreateSurface();
-                        }
-                    } else {
-                        throw new GLException("EGLGraphicsDevice hold by non EGLGraphicsConfiguration: "+aConfig);
-                    }
-                } else {
-                    // create a new EGL config ..
-                    ownEGLDisplay=true;
-                    // EGLSurface is ours ..
-                    ownEGLSurface=true;
-
-                    long nDisplay=0;
-                    if( NativeWindowFactory.TYPE_WINDOWS.equals(NativeWindowFactory.getNativeWindowType(false)) ) {
-                        nDisplay = component.getSurfaceHandle(); // don't even ask ..
-                    } else {
-                        nDisplay = aDevice.getHandle(); // 0 == EGL.EGL_DEFAULT_DISPLAY
-                    }
-                    eglDisplay = EGL.eglGetDisplay(nDisplay);
-                    if (eglDisplay == EGL.EGL_NO_DISPLAY) {
-                        if(DEBUG) {
-                            System.err.println("eglDisplay("+Long.toHexString(nDisplay)+" <surfaceHandle>): failed, using EGL_DEFAULT_DISPLAY");
-                        }
-                        nDisplay = EGL.EGL_DEFAULT_DISPLAY;
-                        eglDisplay = EGL.eglGetDisplay(nDisplay);
-                    }
-                    if (eglDisplay == EGL.EGL_NO_DISPLAY) {
-                        throw new GLException("Failed to created EGL display: nhandle 0x"+Long.toHexString(nDisplay)+", "+aDevice+", error 0x"+Integer.toHexString(EGL.eglGetError()));
-                    } else if(DEBUG) {
-                        System.err.println("eglDisplay("+Long.toHexString(nDisplay)+"): 0x"+Long.toHexString(eglDisplay));
-                    }
-                    if (!EGL.eglInitialize(eglDisplay, null, null)) {
-                        throw new GLException("eglInitialize failed"+", error 0x"+Integer.toHexString(EGL.eglGetError()));
-                    }
-                    EGLGraphicsDevice e = new EGLGraphicsDevice(eglDisplay);
-                    DefaultGraphicsScreen s = new DefaultGraphicsScreen(e, aConfig.getScreen().getIndex());
-                    GLCapabilities caps = (GLCapabilities) aConfig.getChosenCapabilities(); // yes, use the already choosen Capabilities (x11,win32,..)
-                    eglConfig = (EGLGraphicsConfiguration) GraphicsConfigurationFactory.getFactory(e).chooseGraphicsConfiguration(caps, null, s);
-                    if (null == eglConfig) {
-                        throw new GLException("Couldn't create EGLGraphicsConfiguration from "+s);
-                    } else if(DEBUG) {
-                        System.err.println("Chosen eglConfig: "+eglConfig);
-                    }
-                    recreateSurface();
-                }
-            } finally {
-              unlockSurface();
-            }
-        } else if (ownEGLSurface && eglSurface != EGL.EGL_NO_SURFACE) {
-            // Destroy the window surface
-            if (!EGL.eglDestroySurface(eglDisplay, eglSurface)) {
-                throw new GLException("Error destroying window surface (eglDestroySurface)");
-            }
-            eglSurface = EGL.EGL_NO_SURFACE;
-            if (ownEGLDisplay && EGL.EGL_NO_DISPLAY!=eglDisplay) {
-                EGL.eglTerminate(eglDisplay);
-            }
-            eglDisplay=EGL.EGL_NO_DISPLAY;
-            eglConfig=null;
-        }
-    }
-
-    public int getWidth() {
-        int[] tmp = new int[1];
-        if (!EGL.eglQuerySurface(eglDisplay, eglSurface, EGL.EGL_WIDTH, tmp, 0)) {
-            throw new GLException("Error querying surface width");
-        }
-        return tmp[0];
-    }
-
-    public int getHeight() {
-        int[] tmp = new int[1];
-        if (!EGL.eglQuerySurface(eglDisplay, eglSurface, EGL.EGL_HEIGHT, tmp, 0)) {
-            throw new GLException("Error querying surface height");
-        }
-        return tmp[0];
-    }
-
-    public DynamicLookupHelper getDynamicLookupHelper() {
-        return EGLDynamicLookupHelper.getDynamicLookupHelper(getGLProfile());
-    }
-
-    public String toString() {
-        return getClass().getName()+"[realized "+getRealized()+
-                    ",\n\tfactory    "+getFactory()+
-                    ",\n\twindow     "+getNativeWindow()+
-                    ",\n\teglSurface  0x"+Long.toHexString(eglSurface)+
-                    ",\n\teglConfig  "+eglConfig+
-                    ",\n\trequested  "+getRequestedGLCapabilities()+
-                    ",\n\tchosen     "+getChosenGLCapabilities()+"]";
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
deleted file mode 100755
index 6b508c716..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.egl;
-
-import java.util.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
-
-public class EGLDrawableFactory extends GLDrawableFactoryImpl {
-  
-    static {
-        // Register our GraphicsConfigurationFactory implementations
-        // The act of constructing them causes them to be registered
-        new EGLGraphicsConfigurationFactory();
-
-        // Check for other underlying stuff ..
-        if(NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(true))) {
-            try {
-                NWReflection.createInstance("com.sun.opengl.impl.x11.glx.X11GLXGraphicsConfigurationFactory");
-            } catch (Throwable t) {}
-        }
-    }
-
-    public EGLDrawableFactory() {
-        super();
-    }
-
-    public GLDrawableImpl createOnscreenDrawable(NativeWindow target) {
-        if (target == null) {
-          throw new IllegalArgumentException("Null target");
-        }
-        return new EGLOnscreenDrawable(this, target);
-    }
-
-    protected GLDrawableImpl createOffscreenDrawable(NativeWindow target) {
-        throw new GLException("Not yet implemented");
-    }
-
-    public boolean canCreateGLPbuffer() {
-        return true;
-    }
-
-    protected GLDrawableImpl createGLPbufferDrawableImpl(NativeWindow target) {
-        return new EGLPbufferDrawable(this, target);
-    }
-
-    protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
-        NullWindow nw = new NullWindow(EGLGraphicsConfigurationFactory.createOffscreenGraphicsConfiguration(capabilities, chooser));
-        nw.setSize(width, height);
-        return nw;
-    }
-
-    public GLContext createExternalGLContext() {
-        AbstractGraphicsScreen absScreen = DefaultGraphicsScreen.createScreenDevice(0);
-        return new EGLExternalContext(absScreen);
-    }
-
-    public boolean canCreateExternalGLDrawable() {
-        return false;
-    }
-
-    public GLDrawable createExternalGLDrawable() {
-        throw new GLException("Not yet implemented");
-    }
-
-    public void loadGLULibrary() {
-    }
-
-    public boolean canCreateContextOnJava2DSurface() {
-        return false;
-    }
-
-    public GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
-        throws GLException {
-        throw new GLException("Unimplemented on this platform");
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
deleted file mode 100755
index 93c4b665f..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.egl;
-
-import java.util.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
-import java.security.*;
-
-/**
- * Abstract implementation of the DynamicLookupHelper for EGL,
- * which decouples it's dependencies to EGLDrawableFactory.
- *
- * Currently two implementations exist, one for ES1 and one for ES2.
- */
-public abstract class EGLDynamicLookupHelper implements DynamicLookupHelper {
-    protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("EGL");
-    protected static final boolean DEBUG_LOOKUP;
-
-    private static final EGLDynamicLookupHelper eglES1DynamicLookupHelper;
-    private static final EGLDynamicLookupHelper eglES2DynamicLookupHelper;
-    private List/*<NativeLibrary>*/ glesLibraries;
-
-    static {
-        AccessControlContext localACC=AccessController.getContext();
-        DEBUG_LOOKUP = com.sun.opengl.impl.Debug.isPropertyDefined("jogl.debug.DynamicLookup", true, localACC);
-
-        EGLDynamicLookupHelper tmp=null;
-        try {
-            tmp = new EGLES1DynamicLookupHelper();
-        } catch (Throwable t) {
-            if(DEBUG) {
-                t.printStackTrace();
-            }
-        }
-        eglES1DynamicLookupHelper = tmp;
-
-        tmp=null;
-        try {
-            tmp = new EGLES2DynamicLookupHelper();
-        } catch (Throwable t) {
-            if(DEBUG) {
-                t.printStackTrace();
-            }
-        }
-        eglES2DynamicLookupHelper = tmp;
-    }
-
-    public static EGLDynamicLookupHelper getDynamicLookupHelper(GLProfile glp) {
-        if (glp.usesNativeGLES2()) {
-            if(null==eglES2DynamicLookupHelper) {
-                throw new GLException("EGLDynamicLookupHelper for ES2 not available");
-            }
-            return eglES2DynamicLookupHelper;
-        } else if (glp.usesNativeGLES1()) {
-            if(null==eglES1DynamicLookupHelper) {
-                throw new GLException("EGLDynamicLookupHelper for ES1 not available");
-            }
-            return eglES1DynamicLookupHelper;
-        } else {
-            throw new GLException("Unsupported: "+glp);
-        }
-    }
-
-    public static EGLDynamicLookupHelper getDynamicLookupHelper(int esProfile) {
-        if (2==esProfile) {
-            if(null==eglES2DynamicLookupHelper) {
-                throw new GLException("EGLDynamicLookupHelper for ES2 not available");
-            }
-            return eglES2DynamicLookupHelper;
-        } else if (1==esProfile) {
-            if(null==eglES1DynamicLookupHelper) {
-                throw new GLException("EGLDynamicLookupHelper for ES1 not available");
-            }
-            return eglES1DynamicLookupHelper;
-        } else {
-            throw new GLException("Unsupported: ES"+esProfile);
-        }
-    }
-
-    protected EGLDynamicLookupHelper() {
-        loadGLESLibrary(getESProfile());
-        EGL.resetProcAddressTable(this);
-    }
-
-    /** Must return the proper ES profile number, 1 for ES1 and 2 for ES2 */
-    protected abstract int getESProfile();
-
-    /** Must return at least one OpenGL ES library name */
-    protected abstract List/*<String>*/ getGLESLibNames();
-
-    /** May return OpenGL ES library name(s) */
-    protected List/*<String>*/ getEGLLibNames() {
-        List/*<String>*/ eglLibNames = new ArrayList();
-
-        // EGL
-        eglLibNames.add("EGL");
-        // for windows distributions using the 'unlike' lib prefix, 
-        // where our tool does not add it.
-        eglLibNames.add("libEGL");
-
-        return eglLibNames;
-    }
-
-    private NativeLibrary loadFirstAvailable(List/*<String>*/ libNames, ClassLoader loader) {
-        for (Iterator iter = libNames.iterator(); iter.hasNext(); ) {
-            NativeLibrary lib = NativeLibrary.open((String) iter.next(), loader, false /*global*/);
-            if (lib != null) {
-                return lib;
-            }
-        }
-        return null;
-    }
-
-    private boolean loadEGLLibrary(ClassLoader loader, List/*<String>*/ eglLibNames) {
-        NativeLibrary lib = null;
-        if(null!=eglLibNames && eglLibNames.size()>0) {
-            // EGL libraries ..
-            lib = loadFirstAvailable(eglLibNames, loader);
-            if ( null != lib ) {
-                glesLibraries.add(lib);
-            }
-        }
-        return null!=lib;
-    }
-
-    private void loadGLESLibrary(int esProfile) {
-        List/*<String>*/ glesLibNames = getGLESLibNames();
-        List/*<String>*/ eglLibNames = getEGLLibNames();
-        boolean eglLoaded = false;
-
-        ClassLoader loader = getClass().getClassLoader();
-        NativeLibrary lib = null;
-
-        glesLibraries = new ArrayList();
-
-        // ES libraries ..
-        lib = loadFirstAvailable(glesLibNames, loader);
-        if ( null == lib ) {
-            /*** FIXME: Have to think about this ..
-            // try again with EGL loaded first ..
-            if ( !eglLoaded && loadEGLLibrary(loader, eglLibNames) ) {
-                eglLoaded = true ;
-                lib = loadFirstAvailable(glesLibNames, loader);
-            }
-            if ( null == lib ) {
-                throw new GLException("Unable to dynamically load OpenGL ES library for profile ES" + esProfile);
-            } */
-            throw new GLException("Unable to dynamically load OpenGL ES library for profile ES" + esProfile);
-        }
-        glesLibraries.add(lib);
-
-        if ( !eglLoaded && !loadEGLLibrary(loader, eglLibNames) ) {
-            throw new GLException("Unable to dynamically load EGL library for profile ES" + esProfile);
-        }
-
-        if (esProfile==2) {
-            NativeLibLoader.loadES2();
-        } else if (esProfile==1) {
-            NativeLibLoader.loadES1();
-        } else {
-            throw new GLException("Unsupported: ES"+esProfile);
-        }
-    }
-
-    private long dynamicLookupFunctionOnLibs(String glFuncName) {
-        String funcName=glFuncName;
-        long addr = dynamicLookupFunctionOnLibsImpl(funcName);
-        if( 0==addr && NativeWindowFactory.TYPE_WINDOWS.equals(NativeWindowFactory.getNativeWindowType(false)) ) {
-            // Hack: try some C++ decoration here for Imageon's emulation libraries ..
-            final int argAlignment=4;  // 4 byte alignment of each argument
-            final int maxArguments=12; // experience ..
-            for(int arg=0; 0==addr && arg<=maxArguments; arg++) {
-                funcName = "_"+glFuncName+"@"+(arg*argAlignment);
-                addr = dynamicLookupFunctionOnLibsImpl(funcName);
-            }
-        }
-        if(DEBUG_LOOKUP) {
-            if(0!=addr) {
-                System.err.println("Lookup-Native: "+glFuncName+" / "+funcName+" 0x"+Long.toHexString(addr));
-            } else {
-                System.err.println("Lookup-Native: "+glFuncName+" / "+funcName+" ** FAILED ** ");
-            }
-        }
-        return addr;
-    }
-
-    private long dynamicLookupFunctionOnLibsImpl(String glFuncName) {
-        // Look up this function name in all known libraries
-        for (Iterator iter = glesLibraries.iterator(); iter.hasNext(); ) {
-            NativeLibrary lib = (NativeLibrary) iter.next();
-            long addr = lib.lookupFunction(glFuncName);
-            if (addr != 0) {
-                return addr;
-            }
-        }
-        return 0;
-    }
-
-    private long eglGetProcAddressHandle = 0;
-
-    public long dynamicLookupFunction(String glFuncName) {
-        if(null==glFuncName) {
-            return 0;
-        }
-
-        // bootstrap eglGetProcAddress
-        if(0==eglGetProcAddressHandle) {
-            eglGetProcAddressHandle = dynamicLookupFunctionOnLibs("eglGetProcAddress");
-            if(0==eglGetProcAddressHandle) {
-                GLException e = new GLException("Couldn't find eglGetProcAddress function entry");
-                if(DEBUG) {
-                    e.printStackTrace();
-                }
-                throw e;
-            }
-        }
-
-        if(glFuncName.equals("eglGetProcAddress")) {
-            return eglGetProcAddressHandle;
-        }
-
-        long addr = EGL.eglGetProcAddress(eglGetProcAddressHandle, glFuncName);
-        if(DEBUG_LOOKUP) {
-            if(0!=addr) {
-                System.err.println("Lookup-EGL: <"+glFuncName+"> 0x"+Long.toHexString(addr));
-            }
-        }
-        if(0==addr) {
-            addr = dynamicLookupFunctionOnLibs(glFuncName);
-        }
-        return addr;
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
deleted file mode 100755
index 4968d0f88..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.egl;
-
-import java.util.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
-
-/**
- * Implementation of the EGLDynamicLookupHelper for ES1.
- */
-public class EGLES1DynamicLookupHelper extends EGLDynamicLookupHelper {
-  
-    protected EGLES1DynamicLookupHelper() {
-        super();
-    }
-
-    protected int getESProfile() {
-        return 1;
-    }
-
-    protected List/*<String>*/ getGLESLibNames() {
-        List/*<String>*/ glesLibNames = new ArrayList();
-
-        glesLibNames.add("GLES_CM");
-        glesLibNames.add("GLES_CL");
-        glesLibNames.add("GLESv1_CM");
-        // for windows distributions using the 'unlike' lib prefix, 
-        // where our tool does not add it.
-        glesLibNames.add("libGLES_CM");
-        glesLibNames.add("libGLES_CL");
-        glesLibNames.add("libGLESv1_CM");
-
-        return glesLibNames;
-    }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java
deleted file mode 100755
index ce0edef6a..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.egl;
-
-import java.util.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
-
-/**
- * Implementation of the EGLDynamicLookupHelper for ES2.
- */
-public class EGLES2DynamicLookupHelper extends EGLDynamicLookupHelper {
-  
-    protected EGLES2DynamicLookupHelper() {
-        super();
-    }
-
-    protected int getESProfile() {
-        return 2;
-    }
-
-    protected List/*<String>*/ getGLESLibNames() {
-        List/*<String>*/ glesLibNames = new ArrayList();
-
-        glesLibNames.add("GLES20");
-        glesLibNames.add("GLESv2");
-        glesLibNames.add("GLESv2_CM");
-        // for windows distributions using the 'unlike' lib prefix
-        // where our tool does not add it.
-        glesLibNames.add("libGLES20"); 
-        glesLibNames.add("libGLESv2");
-        glesLibNames.add("libGLESv2_CM");
-
-        return glesLibNames;
-    }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLExternalContext.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLExternalContext.java
deleted file mode 100755
index 86c82396e..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLExternalContext.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.egl;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import javax.media.nativewindow.*;
-
-public class EGLExternalContext extends EGLContext {
-    private boolean firstMakeCurrent = true;
-    private boolean created = true;
-    private GLContext lastContext;
-
-    public EGLExternalContext(AbstractGraphicsScreen screen) {
-        super(null, null);
-        GLContextShareSet.contextCreated(this);
-        setGLFunctionAvailability(false);
-        getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
-    }
-
-    public int makeCurrent() throws GLException {
-        // Save last context if necessary to allow external GLContexts to
-        // talk to other GLContexts created by this library
-        GLContext cur = getCurrent();
-        if (cur != null && cur != this) {
-            lastContext = cur;
-            setCurrent(null);
-        }
-        return super.makeCurrent();
-    }  
-
-    public void release() throws GLException {
-        super.release();
-        setCurrent(lastContext);
-        lastContext = null;
-    }
-
-    protected int makeCurrentImpl() throws GLException {
-        if (firstMakeCurrent) {
-            firstMakeCurrent = false;
-            return CONTEXT_CURRENT_NEW;
-        }
-        return CONTEXT_CURRENT;
-    }
-
-    protected void releaseImpl() throws GLException {
-    }
-
-    protected void destroyImpl() throws GLException {
-        created = false;
-        GLContextShareSet.contextDestroyed(this);
-    }
-
-    public boolean isCreated() {
-        return created;
-    }
-
-    public void bindPbufferToTexture() {
-        throw new GLException("Should not call this");
-    }
-
-    public void releasePbufferFromTexture() {
-        throw new GLException("Should not call this");
-    }
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java
deleted file mode 100644
index 84e4ab19d..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.egl;
-
-import java.util.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.egl.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
-
-public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
-    protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
-
-    public _EGLConfig getNativeConfig() {
-        return _config;
-    }
-
-    public int getNativeConfigID() {
-        return configID;
-    }
-
-    public EGLGraphicsConfiguration(AbstractGraphicsScreen absScreen, 
-                                    GLCapabilities capsChosen, GLCapabilities capsRequested, GLCapabilitiesChooser chooser,
-                                    _EGLConfig cfg, int cfgID) {
-        super(absScreen, capsChosen, capsRequested);
-        this.chooser = chooser;
-        _config = cfg;
-        configID = cfgID;
-    }
-
-    public static EGLGraphicsConfiguration create(GLCapabilities capsRequested, AbstractGraphicsScreen absScreen, int cfgID) {
-        AbstractGraphicsDevice absDevice = absScreen.getDevice();
-        if(null==absDevice || !(absDevice instanceof EGLGraphicsDevice)) {
-            throw new GLException("GraphicsDevice must be a valid EGLGraphicsDevice");
-        }
-        long dpy = absDevice.getHandle();
-        if (dpy == EGL.EGL_NO_DISPLAY) {
-            throw new GLException("Invalid EGL display: "+absDevice);
-        }
-        GLProfile glp = capsRequested.getGLProfile();
-        _EGLConfig _cfg = EGLConfigId2EGLConfig(glp, dpy, cfgID);
-        GLCapabilities caps = EGLConfig2Capabilities(glp, dpy, _cfg, false, capsRequested.isOnscreen(), capsRequested.isPBuffer());
-        return new EGLGraphicsConfiguration(absScreen, caps, capsRequested, new DefaultGLCapabilitiesChooser(), _cfg, cfgID);
-    }
-
-    public Object clone() {
-        return super.clone();
-    }
-
-    protected void updateGraphicsConfiguration() {
-        EGLGraphicsConfiguration newConfig = (EGLGraphicsConfiguration)
-            GraphicsConfigurationFactory.getFactory(getScreen().getDevice()).chooseGraphicsConfiguration(getRequestedCapabilities(),
-                                                                                                         chooser,
-                                                                                                         getScreen());
-        if(null!=newConfig) {
-            // FIXME: setScreen( ... );
-            setChosenCapabilities(newConfig.getChosenCapabilities());
-            _config = newConfig.getNativeConfig();
-            configID = newConfig.getNativeConfigID();
-            if(DEBUG) {
-                System.err.println("!!! updateGraphicsConfiguration: "+this);
-            }
-        }
-    }
-
-    public static _EGLConfig EGLConfigId2EGLConfig(GLProfile glp, long display, int configID) {
-        int[] attrs = new int[] {
-                EGL.EGL_CONFIG_ID, configID,
-                EGL.EGL_NONE
-            };
-        _EGLConfig[] configs = new _EGLConfig[1];
-        int[] numConfigs = new int[1];
-        if (!EGL.eglChooseConfig(display,
-                                 attrs, 0,
-                                 configs, 1,
-                                 numConfigs, 0)) {
-            return null;
-        }
-        if (numConfigs[0] == 0) {
-            return null;
-        }
-        return configs[0];
-    }
-
-    public static boolean EGLConfigDrawableTypeVerify(int val, boolean onscreen, boolean usePBuffer) {
-        boolean res;
-
-        if ( onscreen ) {
-            res = ( 0 != (val & EGL.EGL_WINDOW_BIT) ) ;
-        } else {
-            res = ( 0 != (val & EGL.EGL_PIXMAP_BIT) ) || usePBuffer ;
-        }
-        if ( usePBuffer ) {
-            res = res && ( 0 != (val & EGL.EGL_PBUFFER_BIT) ) ;
-        }
-
-        return res;
-    }
-
-    public static GLCapabilities EGLConfig2Capabilities(GLProfile glp, long display, _EGLConfig _config, 
-                                                        boolean relaxed, boolean onscreen, boolean usePBuffer) {
-        GLCapabilities caps = new GLCapabilities(glp);
-        int[] val = new int[1];
-
-        // Read the actual configuration into the choosen caps
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_RED_SIZE, val, 0)) {
-            caps.setRedBits(val[0]);
-        }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_GREEN_SIZE, val, 0)) {
-            caps.setGreenBits(val[0]);
-        }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_BLUE_SIZE, val, 0)) {
-            caps.setBlueBits(val[0]);
-        }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_ALPHA_SIZE, val, 0)) {
-            caps.setAlphaBits(val[0]);
-        }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_STENCIL_SIZE, val, 0)) {
-            caps.setStencilBits(val[0]);
-        }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_DEPTH_SIZE, val, 0)) {
-            caps.setDepthBits(val[0]);
-        }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_SAMPLES, val, 0)) {
-            caps.setSampleBuffers(val[0]>0?true:false);
-            caps.setNumSamples(val[0]);
-        }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_TYPE, val, 0)) {
-            caps.setBackgroundOpaque(val[0] != EGL.EGL_TRANSPARENT_RGB);
-        }
-        if(!caps.isBackgroundOpaque()) {
-            if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_RED_VALUE, val, 0)) {
-                caps.setTransparentRedValue(val[0]==EGL.EGL_DONT_CARE?-1:val[0]);
-            }
-            if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_GREEN_VALUE, val, 0)) {
-                caps.setTransparentGreenValue(val[0]==EGL.EGL_DONT_CARE?-1:val[0]);
-            }
-            if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_BLUE_VALUE, val, 0)) {
-                caps.setTransparentBlueValue(val[0]==EGL.EGL_DONT_CARE?-1:val[0]);
-            }
-            /** Not defined in EGL 
-            if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_ALPHA_VALUE, val, 0)) {
-                caps.setTransparentAlphaValue(val[0]==EGL.EGL_DONT_CARE?-1:val[0]);
-            } */
-        }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_SURFACE_TYPE, val, 0)) {
-            if(EGLConfigDrawableTypeVerify(val[0], onscreen, usePBuffer)) {
-                caps.setDoubleBuffered(onscreen);
-                caps.setOnscreen(onscreen);
-                caps.setPBuffer(usePBuffer);
-            } else if(relaxed) {
-                caps.setDoubleBuffered( 0 != (val[0] & EGL.EGL_WINDOW_BIT) );
-                caps.setOnscreen( 0 != (val[0] & EGL.EGL_WINDOW_BIT) );
-                caps.setPBuffer ( 0 != (val[0] & EGL.EGL_PBUFFER_BIT) );
-            } else {
-                throw new GLException("EGL_SURFACE_TYPE does not match !!!");
-            }
-        } else {
-            if(relaxed) {
-                if(DEBUG) {
-                    System.err.println("Could not determine EGL_SURFACE_TYPE !!!");
-                }
-                return null;
-            } else {
-                throw new GLException("Could not determine EGL_SURFACE_TYPE !!!");
-            }
-        }
-
-        return caps;
-    }
-
-    public static int[] GLCapabilities2AttribList(GLCapabilities caps) {
-        int[] attrs = new int[32];
-        int idx=0;
-
-        attrs[idx++] = EGL.EGL_SURFACE_TYPE;
-        attrs[idx++] = caps.isOnscreen() ? ( EGL.EGL_WINDOW_BIT ) : ( caps.isPBuffer() ? EGL.EGL_PBUFFER_BIT : EGL.EGL_PIXMAP_BIT ) ;
-
-        attrs[idx++] = EGL.EGL_RED_SIZE;
-        attrs[idx++] = caps.getRedBits();
-
-        attrs[idx++] = EGL.EGL_GREEN_SIZE;
-        attrs[idx++] = caps.getGreenBits();
-
-        attrs[idx++] = EGL.EGL_BLUE_SIZE;
-        attrs[idx++] = caps.getBlueBits();
-
-        attrs[idx++] = EGL.EGL_ALPHA_SIZE;
-        attrs[idx++] = caps.getAlphaBits() > 0 ? caps.getAlphaBits() : EGL.EGL_DONT_CARE;
-
-        attrs[idx++] = EGL.EGL_STENCIL_SIZE;
-        attrs[idx++] = caps.getStencilBits() > 0 ? caps.getStencilBits() : EGL.EGL_DONT_CARE;
-
-        attrs[idx++] = EGL.EGL_DEPTH_SIZE;
-        attrs[idx++] = caps.getDepthBits();
-
-        attrs[idx++] = EGL.EGL_SAMPLES;
-        attrs[idx++] = caps.getSampleBuffers() ? caps.getNumSamples() : 1;
-
-        attrs[idx++] = EGL.EGL_TRANSPARENT_TYPE;
-        attrs[idx++] = caps.isBackgroundOpaque() ? EGL.EGL_NONE : EGL.EGL_TRANSPARENT_TYPE;
-
-        // 20
-
-        if(!caps.isBackgroundOpaque()) {
-            attrs[idx++] = EGL.EGL_TRANSPARENT_RED_VALUE;
-            attrs[idx++] = caps.getTransparentRedValue()>=0?caps.getTransparentRedValue():EGL.EGL_DONT_CARE;
-
-            attrs[idx++] = EGL.EGL_TRANSPARENT_GREEN_VALUE;
-            attrs[idx++] = caps.getTransparentGreenValue()>=0?caps.getTransparentGreenValue():EGL.EGL_DONT_CARE;
-
-            attrs[idx++] = EGL.EGL_TRANSPARENT_BLUE_VALUE;
-            attrs[idx++] = caps.getTransparentBlueValue()>=0?caps.getTransparentBlueValue():EGL.EGL_DONT_CARE;
-
-            /** Not define in EGL
-            attrs[idx++] = EGL.EGL_TRANSPARENT_ALPHA_VALUE;
-            attrs[idx++] = caps.getTransparentAlphaValue()>=0?caps.getTransparentAlphaValue():EGL.EGL_DONT_CARE; */
-        }
-
-        // 26 
-
-        attrs[idx++] = EGL.EGL_RENDERABLE_TYPE;
-        if(caps.getGLProfile().usesNativeGLES1()) {
-            attrs[idx++] = EGL.EGL_OPENGL_ES_BIT;
-        }
-        else if(caps.getGLProfile().usesNativeGLES2()) {
-            attrs[idx++] = EGL.EGL_OPENGL_ES2_BIT;
-        } else {
-            attrs[idx++] = EGL.EGL_OPENGL_BIT;
-        }
-
-        // 28
-
-        attrs[idx++] = EGL.EGL_NONE;
-
-        return attrs;
-    }
-
-    public static int[] CreatePBufferSurfaceAttribList(int width, int height, int texFormat) {
-        int[] attrs = new int[16];
-        int idx=0;
-
-        attrs[idx++] = EGL.EGL_WIDTH;
-        attrs[idx++] = width;
-
-        attrs[idx++] = EGL.EGL_HEIGHT;
-        attrs[idx++] = height;
-
-        attrs[idx++] = EGL.EGL_TEXTURE_FORMAT;
-        attrs[idx++] = texFormat;
-
-        attrs[idx++] = EGL.EGL_TEXTURE_TARGET;
-        attrs[idx++] = EGL.EGL_NO_TEXTURE==texFormat ? EGL.EGL_NO_TEXTURE : EGL.EGL_TEXTURE_2D;
-
-        attrs[idx++] = EGL.EGL_NONE;
-
-        return attrs;
-    }
-
-    public String toString() {
-        return getClass().toString()+"["+getScreen()+", eglConfigID 0x"+Integer.toHexString(configID)+
-                                     ",\n\trequested " + getRequestedCapabilities()+
-                                     ",\n\tchosen    " + getChosenCapabilities()+
-                                     "]";
-
-    }
-
-    private GLCapabilitiesChooser chooser;
-    private _EGLConfig _config;
-    private int configID;
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
deleted file mode 100644
index 3997850c0..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.opengl.impl.egl;
-
-import java.io.PrintStream;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.egl.*;
-import com.sun.nativewindow.impl.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-/** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
-    are used on X11 platforms. Toolkits will likely need to delegate
-    to this one to change the accepted and returned types of the
-    GraphicsDevice and GraphicsConfiguration abstractions. */
-
-public class EGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
-    protected static final boolean DEBUG = GraphicsConfigurationFactory.DEBUG || com.sun.opengl.impl.Debug.debug("EGL");
-
-    public EGLGraphicsConfigurationFactory() {
-        // become the selector for KD/EGL ..
-        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.egl.EGLGraphicsDevice.class, this);
-    }
-
-    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
-                                                                     CapabilitiesChooser chooser,
-                                                                     AbstractGraphicsScreen absScreen) {
-        if (absScreen == null) {
-            throw new IllegalArgumentException("This NativeWindowFactory accepts only AbstractGraphicsDevice objects");
-        }
-
-        if (capabilities != null &&
-            !(capabilities instanceof GLCapabilities)) {
-            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilities objects");
-        }
-
-        if (chooser != null &&
-            !(chooser instanceof GLCapabilitiesChooser)) {
-            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilitiesChooser objects");
-        }
-
-        return chooseGraphicsConfigurationStatic((GLCapabilities) capabilities,
-                                                 (GLCapabilitiesChooser) chooser,
-                                                 absScreen);
-    }
-
-    public static EGLGraphicsConfiguration chooseGraphicsConfigurationStatic(GLCapabilities capabilities,
-                                                                             GLCapabilitiesChooser chooser,
-                                                                             AbstractGraphicsScreen absScreen) {
-        if (capabilities == null) {
-            capabilities = new GLCapabilities(null);
-        }
-        GLProfile glp = capabilities.getGLProfile();
-
-        if(null==absScreen) {
-            throw new GLException("Null AbstractGraphicsScreen");
-        }
-        AbstractGraphicsDevice absDevice = absScreen.getDevice();
-
-        if(null==absDevice || !(absDevice instanceof EGLGraphicsDevice)) {
-            throw new GLException("GraphicsDevice must be a valid EGLGraphicsDevice");
-        }
-        long eglDisplay = absDevice.getHandle();
-
-        if (eglDisplay == EGL.EGL_NO_DISPLAY) {
-            throw new GLException("Invalid EGL display: "+absDevice);
-        }
-
-        GLCapabilities caps2 = (GLCapabilities) capabilities.clone();
-        if(!caps2.isOnscreen()) {
-            // OFFSCREEN !DOUBLE_BUFFER
-            caps2.setDoubleBuffered(false);
-        }
-
-        EGLGraphicsConfiguration res = eglChooseConfig(eglDisplay, caps2, capabilities, chooser, absScreen);
-        if(null!=res) {
-            return res;
-        }
-        if(DEBUG) {
-            System.err.println("eglChooseConfig failed with given capabilities "+caps2);
-        }
-
-        if (chooser == null) {
-            chooser = new DefaultGLCapabilitiesChooser();
-        }
-
-        _EGLConfig[] configs = new _EGLConfig[10];
-        int[] numConfigs = new int[1];
-
-        if(!EGL.eglGetConfigs(eglDisplay, configs, configs.length, numConfigs, 0)) {
-            throw new GLException("Graphics configuration fetch (eglGetConfigs) failed");
-        }
-        if (numConfigs[0] == 0) {
-            throw new GLException("Graphics configuration fetch (eglGetConfigs) - no EGLConfig found");
-        }
-        GLCapabilities[] caps = eglConfigs2GLCaps(glp, eglDisplay, configs, numConfigs[0],
-                                                    caps2.isOnscreen(), caps2.isPBuffer());
-        if(DEBUG) {
-            System.err.println("EGL Get Configs: "+numConfigs[0]+", Caps "+caps.length);
-            printCaps("eglGetConfigs", caps, System.err);
-        }
-        int chosen = -1;
-        try {
-            chosen = chooser.chooseCapabilities(caps2, caps, -1);
-        } catch (NativeWindowException e) { throw new GLException(e); }
-        if(chosen<0) {
-            throw new GLException("Graphics configuration chooser failed");
-        }
-        if(DEBUG) {
-            System.err.println("Chosen "+caps[chosen]);
-        }
-        res = eglChooseConfig(eglDisplay, caps[chosen], capabilities, chooser, absScreen);
-        if(null!=res) {
-            return res;
-        }
-        if(DEBUG) {
-            System.err.println("eglChooseConfig failed with eglGetConfig/choosen capabilities "+caps[chosen]);
-        }
-
-        // Last try .. add a fixed embedded profile [ATI, Nokia, Intel, ..]
-        //
-        // rgb888 - d16, s4
-        GLCapabilities fixedCaps = new GLCapabilities(glp);
-        fixedCaps.setRedBits(8);
-        fixedCaps.setGreenBits(8);
-        fixedCaps.setBlueBits(8);
-        fixedCaps.setDepthBits(16);
-        fixedCaps.setSampleBuffers(true);
-        fixedCaps.setNumSamples(4);
-        if(DEBUG) {
-            System.err.println("trying fixed caps (1): "+fixedCaps);
-        }
-        res = eglChooseConfig(eglDisplay, fixedCaps, capabilities, chooser, absScreen);
-        if(null!=res) {
-            return res;
-        }
-
-        //
-        // rgb565 - d16, s0
-        fixedCaps = new GLCapabilities(glp);
-        fixedCaps.setRedBits(5);
-        fixedCaps.setGreenBits(6);
-        fixedCaps.setBlueBits(5);
-        fixedCaps.setDepthBits(16);
-        if(DEBUG) {
-            System.err.println("trying fixed caps (2): "+fixedCaps);
-        }
-        res = eglChooseConfig(eglDisplay, fixedCaps, capabilities, chooser, absScreen);
-        if(null!=res) {
-            return res;
-        }
-
-        //
-        // rgb565 - d16, s4
-        fixedCaps = new GLCapabilities(glp);
-        fixedCaps.setRedBits(5);
-        fixedCaps.setGreenBits(6);
-        fixedCaps.setBlueBits(5);
-        fixedCaps.setDepthBits(16);
-        fixedCaps.setSampleBuffers(true);
-        fixedCaps.setNumSamples(4);
-        if(DEBUG) {
-            System.err.println("trying fixed caps (3): "+fixedCaps);
-        }
-        res = eglChooseConfig(eglDisplay, fixedCaps, capabilities, chooser, absScreen);
-        if(null!=res) {
-            return res;
-        }
-        throw new GLException("Graphics configuration failed [direct caps, eglGetConfig/chooser and fixed-caps(1-3)]");
-    }
-
-    protected static EGLGraphicsConfiguration eglChooseConfig(long eglDisplay, 
-                                                              GLCapabilities capsChosen0, GLCapabilities capsRequested, GLCapabilitiesChooser chooser,
-                                                              AbstractGraphicsScreen absScreen) {
-        GLProfile glp = capsChosen0.getGLProfile();
-        int[] attrs = EGLGraphicsConfiguration.GLCapabilities2AttribList(capsChosen0);
-        _EGLConfig[] configs = new _EGLConfig[1];
-        int[] numConfigs = new int[1];
-        if (!EGL.eglChooseConfig(eglDisplay,
-                                 attrs, 0,
-                                 configs, configs.length,
-                                 numConfigs, 0)) {
-            throw new GLException("Graphics configuration selection (eglChooseConfig) failed for "+capsChosen0);
-        }
-        if (numConfigs[0] > 0) {
-            if(DEBUG) {
-                GLCapabilities[] caps = eglConfigs2GLCaps(glp, eglDisplay, configs, numConfigs[0],
-                                                    capsChosen0.isOnscreen(), capsChosen0.isPBuffer());
-                System.err.println("EGL Choose Configs: "+numConfigs[0]+", Caps "+caps.length);
-                printCaps("eglChooseConfig", caps, System.err);
-            }
-            int[] val = new int[1];
-            // get the configID 
-            if(!EGL.eglGetConfigAttrib(eglDisplay, configs[0], EGL.EGL_CONFIG_ID, val, 0)) {
-                if(DEBUG) {
-                    // FIXME: this happens on a ATI PC Emulation ..
-                    System.err.println("EGL couldn't retrieve ConfigID for already chosen eglConfig "+capsChosen0+", error 0x"+Integer.toHexString(EGL.eglGetError()));
-                }
-                return null;
-            }
-            GLCapabilities capsChosen1 = EGLGraphicsConfiguration.EGLConfig2Capabilities(glp, eglDisplay, configs[0],
-                                                                    true, capsChosen0.isOnscreen(), capsChosen0.isPBuffer());
-            if(null!=capsChosen1) {
-                if(DEBUG) {
-                    System.err.println("eglChooseConfig found: eglDisplay 0x"+Long.toHexString(eglDisplay)+
-                                                            ", eglConfig ID 0x"+Integer.toHexString(val[0])+
-                                                            ", "+capsChosen0+" -> "+capsChosen1);
-                }
-                return new EGLGraphicsConfiguration(absScreen, capsChosen1, capsRequested, chooser, configs[0], val[0]);
-            }
-            if(DEBUG) {
-                System.err.println("eglChooseConfig couldn't verify: eglDisplay 0x"+Long.toHexString(eglDisplay)+
-                                                                        ", eglConfig ID 0x"+Integer.toHexString(val[0])+
-                                                                        ", for "+capsChosen0);
-            }
-        } else {
-            if(DEBUG) {
-                System.err.println("EGL Choose Configs: None using eglDisplay 0x"+Long.toHexString(eglDisplay)+
-                                                                ", "+capsChosen0);
-            }
-        }
-        return null;
-    }
-
-    protected static GLCapabilities[] eglConfigs2GLCaps(GLProfile glp, long eglDisplay, _EGLConfig[] configs, int num,
-                                                        boolean onscreen, boolean usePBuffer) {
-        GLCapabilities[] caps = new GLCapabilities[num];
-        for(int i=0; i<num; i++) {
-            caps[i] = EGLGraphicsConfiguration.EGLConfig2Capabilities(glp, eglDisplay, configs[i],
-                                            true, onscreen, usePBuffer);
-        }
-        return caps;
-    }
-
-    protected static void printCaps(String prefix, GLCapabilities[] caps, PrintStream out) {
-        for(int i=0; i<caps.length; i++) {
-            out.println(prefix+"["+i+"] "+caps[i]);
-        }
-    }
-
-    protected static EGLGraphicsConfiguration createOffscreenGraphicsConfiguration(GLCapabilities caps, GLCapabilitiesChooser chooser) {
-        if(caps.isOnscreen()) {
-            throw new GLException("Error: Onscreen set: "+caps);
-        }
-        caps.setDoubleBuffered(false); // FIXME
-        long eglDisplay = EGL.eglGetDisplay(EGL.EGL_DEFAULT_DISPLAY);
-        if (eglDisplay == EGL.EGL_NO_DISPLAY) {
-            throw new GLException("Failed to created EGL default display: error 0x"+Integer.toHexString(EGL.eglGetError()));
-        } else if(DEBUG) {
-            System.err.println("eglDisplay(EGL_DEFAULT_DISPLAY): 0x"+Long.toHexString(eglDisplay));
-        }
-        if (!EGL.eglInitialize(eglDisplay, null, null)) {
-            throw new GLException("eglInitialize failed"+", error 0x"+Integer.toHexString(EGL.eglGetError()));
-        }
-        EGLGraphicsDevice e = new EGLGraphicsDevice(eglDisplay);
-        DefaultGraphicsScreen s = new DefaultGraphicsScreen(e, 0);
-        EGLGraphicsConfiguration eglConfig = chooseGraphicsConfigurationStatic(caps, chooser, s);
-        if (null == eglConfig) {
-            EGL.eglTerminate(eglDisplay);
-            throw new GLException("Couldn't create EGLGraphicsConfiguration from "+s);
-        } else if(DEBUG) {
-            System.err.println("Chosen eglConfig: "+eglConfig);
-        }
-        return eglConfig;
-    }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java
deleted file mode 100755
index 957b7b7fe..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.egl;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.jogamp.gluegen.runtime.ProcAddressTable;
-import java.nio.*;
-import java.util.*;
-
-public class EGLOnscreenContext extends EGLContext {
-    public EGLOnscreenContext(EGLOnscreenDrawable drawable, GLContext shareWith) {
-        super(drawable, shareWith);
-    }
-
-    // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
-    protected int makeCurrentImpl() throws GLException {
-        int lockRes = drawable.lockSurface();
-        boolean exceptionOccurred = false;
-        try {
-          if (lockRes == NativeWindow.LOCK_SURFACE_NOT_READY) {
-            return CONTEXT_NOT_CURRENT;
-          }
-          return super.makeCurrentImpl();
-        } catch (RuntimeException e) {
-          exceptionOccurred = true;
-          throw e;
-        } finally {
-          if (exceptionOccurred ||
-              (isOptimizable() && lockRes != NativeWindow.LOCK_SURFACE_NOT_READY) && drawable.isSurfaceLocked()) {
-            drawable.unlockSurface();
-          }
-        }
-    }
-
-    // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
-    protected void releaseImpl() throws GLException {
-        try {
-          super.releaseImpl();
-        } finally {
-          if (!isOptimizable() && drawable.isSurfaceLocked()) {
-            drawable.unlockSurface();
-          }
-        }
-    }
-
-    public void bindPbufferToTexture() {
-        throw new GLException("Should not call this");
-    }
-
-    public void releasePbufferFromTexture() {
-        throw new GLException("Should not call this");
-    }
-
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenDrawable.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenDrawable.java
deleted file mode 100644
index 45fffbc91..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenDrawable.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.egl;
-
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.egl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
-
-public class EGLOnscreenDrawable extends EGLDrawable {
-    protected EGLOnscreenDrawable(EGLDrawableFactory factory, NativeWindow component) throws GLException {
-        super(factory, component);
-    }
-
-    public GLContext createContext(GLContext shareWith) {
-        return new EGLOnscreenContext(this, shareWith);
-    }
-
-    protected long createSurface(long eglDpy, _EGLConfig eglNativeCfg, long surfaceHandle) {
-        return EGL.eglCreateWindowSurface(eglDpy, eglNativeCfg, surfaceHandle, null);
-    }
-
-    protected void swapBuffersImpl() {
-        boolean didLock = false;
-        try {
-          if ( !isSurfaceLocked() ) {
-              // Usually the surface shall be locked within [makeCurrent .. swap .. release]
-              if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
-                  return;
-              }
-              didLock = true;
-          }
-
-          EGL.eglSwapBuffers(eglDisplay, eglSurface);
-
-        } finally {
-          if(didLock) {
-              unlockSurface();
-          }
-        }
-    }
-
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java
deleted file mode 100755
index 085f9c4b9..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.egl;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.jogamp.gluegen.runtime.ProcAddressTable;
-import java.nio.*;
-import java.util.*;
-
-public class EGLPbufferContext extends EGLContext {
-    public EGLPbufferContext(EGLPbufferDrawable drawable, GLContext shareWith) {
-        super(drawable, shareWith);
-    }
-
-    public int getFloatingPointMode() {
-        return 0; // FIXME ??
-    }
-
-    public void bindPbufferToTexture() {
-        throw new GLException("Not yet implemented");
-    }
-
-    public void releasePbufferFromTexture() {
-        throw new GLException("Not yet implemented");
-    }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferDrawable.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferDrawable.java
deleted file mode 100644
index e16420b3a..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferDrawable.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.egl;
-
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.egl.*;
-import com.sun.opengl.impl.*;
-
-public class EGLPbufferDrawable extends EGLDrawable {
-    private int texFormat;
-    protected static final boolean useTexture = false; // No yet ..
-
-    protected EGLPbufferDrawable(EGLDrawableFactory factory, NativeWindow target) {
-        super(factory, target);
-        ownEGLDisplay = true;
-
-        // get choosen ones ..
-        GLCapabilities caps = (GLCapabilities) getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
-
-        if(useTexture) {
-            this.texFormat = caps.getAlphaBits() > 0 ? EGL.EGL_TEXTURE_RGBA : EGL.EGL_TEXTURE_RGB ;
-        } else {
-            this.texFormat = EGL.EGL_NO_TEXTURE;
-        }
-
-        if (DEBUG) {
-          System.out.println("Pbuffer config: " + getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration());
-        }
-
-        setRealized(true);
-
-        if (DEBUG) {
-          System.out.println("Created pbuffer: " + this);
-        }
-
-    }
-
-    protected long createSurface(long eglDpy, _EGLConfig eglNativeCfg, long surfaceHandle) {
-        NativeWindow nw = getNativeWindow();
-        int[] attrs = EGLGraphicsConfiguration.CreatePBufferSurfaceAttribList(nw.getWidth(), nw.getHeight(), texFormat);
-        long surf = EGL.eglCreatePbufferSurface(eglDpy, eglNativeCfg, attrs, 0);
-        if (EGL.EGL_NO_SURFACE==surf) {
-            throw new GLException("Creation of window surface (eglCreatePbufferSurface) failed, dim "+nw.getWidth()+"x"+nw.getHeight()+", error 0x"+Integer.toHexString(EGL.eglGetError()));
-        } else if(DEBUG) {
-            System.err.println("PBuffer setSurface result: eglSurface 0x"+Long.toHexString(surf));
-        }
-        ((SurfaceChangeable)nw).setSurfaceHandle(surf);
-        return surf;
-    }
-
-    public GLContext createContext(GLContext shareWith) {
-        return new EGLPbufferContext(this, shareWith);
-    }
-
-    protected void swapBuffersImpl() { 
-        if(DEBUG) {
-            System.err.println("unhandled swapBuffersImpl() called for: "+this);
-        }
-    }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/gl2/ProjectDouble.java b/src/jogl/classes/com/sun/opengl/impl/gl2/ProjectDouble.java
deleted file mode 100755
index 54a029046..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/gl2/ProjectDouble.java
+++ /dev/null
@@ -1,1041 +0,0 @@
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 2.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
-** http://oss.sgi.com/projects/FreeB
-** 
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** NOTE:  The Original Code (as defined below) has been licensed to Sun
-** Microsystems, Inc. ("Sun") under the SGI Free Software License B
-** (Version 1.1), shown above ("SGI License").   Pursuant to Section
-** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
-** you under an alternative license ("Alternative License").  This
-** Alternative License includes all of the provisions of the SGI License
-** except that Section 2.2 and 11 are omitted.  Any differences between
-** the Alternative License and the SGI License are offered solely by Sun
-** and not by SGI.
-** 
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** $Date: 2009-03-13 22:20:29 -0700 (Fri, 13 Mar 2009) $ $Revision: 1867 $
-** $Header$
-*/
-
-/* 
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
- * met:
- * 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of 
- *   its contributors may be used to endorse or promote products derived 
- *   from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-package com.sun.opengl.impl.gl2;
-
-import java.nio.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-/**
- * Project.java
- * <p/>
- * <p/>
- * Created 11-jan-2004
- * 
- * @author Erik Duijs
- * @author Kenneth Russell
- */
-public class ProjectDouble {
-  private static final double[] IDENTITY_MATRIX =
-    new double[] {
-      1.0, 0.0, 0.0, 0.0,
-      0.0, 1.0, 0.0, 0.0,
-      0.0, 0.0, 1.0, 0.0,
-      0.0, 0.0, 0.0, 1.0 };
-
-  // Note that we have cloned parts of the implementation in order to
-  // support incoming Buffers. The reason for this is to avoid loading
-  // non-direct buffer subclasses unnecessarily, because doing so can
-  // cause performance decreases on direct buffer operations, at least
-  // on the current HotSpot JVM. It would be nicer (and make the code
-  // simpler) to simply have the array-based entry points delegate to
-  // the versions taking Buffers by wrapping the arrays.
-
-  // Array-based implementation
-  private final double[] matrix = new double[16];
-
-  private final double[][] tempMatrix = new double[4][4];
-  private final double[] in = new double[4];
-  private final double[] out = new double[4];
-
-  private final double[] forward = new double[3];
-  private final double[] side = new double[3];
-  private final double[] up = new double[3];
-  
-  // Buffer-based implementation
-  private DoubleBuffer locbuf;
-  private final DoubleBuffer matrixBuf;
-
-  private final DoubleBuffer tempMatrixBuf;
-  private final DoubleBuffer inBuf;
-  private final DoubleBuffer outBuf;
-
-  private final DoubleBuffer forwardBuf;
-  private final DoubleBuffer sideBuf;
-  private final DoubleBuffer upBuf;
-
-  public ProjectDouble() {
-    // Use direct buffers to avoid loading indirect buffer
-    // implementations for applications trying to avoid doing so.
-    // Slice up one big buffer because some NIO implementations
-    // allocate a huge amount of memory to back even the smallest of
-    // buffers.
-    DoubleBuffer locbuf = InternalBufferUtil.newDoubleBuffer(128);
-    int pos = 0;
-    int sz = 16;
-    matrixBuf = slice(locbuf, pos, sz);
-    pos += sz;
-    tempMatrixBuf = slice(locbuf, pos, sz);
-    pos += sz;
-    sz = 4;
-    inBuf = slice(locbuf, pos, sz);
-    pos += sz;
-    outBuf = slice(locbuf, pos, sz);
-    pos += sz;
-    sz = 3;
-    forwardBuf = slice(locbuf, pos, sz);
-    pos += sz;
-    sideBuf = slice(locbuf, pos, sz);
-    pos += sz;
-    upBuf = slice(locbuf, pos, sz);
-  }
-
-  public void destroy() {
-    if(locbuf!=null) {
-        locbuf.clear();
-        locbuf=null;
-    }
-  }
-
-  private static DoubleBuffer slice(DoubleBuffer buf, int pos, int len) {
-    buf.position(pos);
-    buf.limit(pos + len);
-    return buf.slice();
-  }
-
-  /**
-   * Make matrix an identity matrix
-   */
-  private void __gluMakeIdentityd(DoubleBuffer m) {
-    int oldPos = m.position();
-    m.put(IDENTITY_MATRIX);
-    m.position(oldPos);
-  }
-
-  /**
-   * Make matrix an identity matrix
-   */
-  private void __gluMakeIdentityd(double[] m) {
-    for (int i = 0; i < 16; i++) {
-      m[i] = IDENTITY_MATRIX[i];
-    }
-  }
-
-  /**
-   * Method __gluMultMatrixVecd
-   * 
-   * @param matrix
-   * @param in
-   * @param out
-   */
-  private void __gluMultMatrixVecd(double[] matrix, int matrix_offset, double[] in, double[] out) {
-    for (int i = 0; i < 4; i++) {
-      out[i] =
-        in[0] * matrix[0*4+i+matrix_offset] +
-        in[1] * matrix[1*4+i+matrix_offset] +
-        in[2] * matrix[2*4+i+matrix_offset] +
-        in[3] * matrix[3*4+i+matrix_offset];
-    }
-  }
-
-  /**
-   * Method __gluMultMatrixVecd
-   * 
-   * @param matrix
-   * @param in
-   * @param out
-   */
-  private void __gluMultMatrixVecd(DoubleBuffer matrix, DoubleBuffer in, DoubleBuffer out) {
-    int inPos = in.position();
-    int outPos = out.position();
-    int matrixPos = matrix.position();
-    for (int i = 0; i < 4; i++) {
-      out.put(i + outPos,
-              in.get(0+inPos) * matrix.get(0*4+i+matrixPos) +
-              in.get(1+inPos) * matrix.get(1*4+i+matrixPos) +
-              in.get(2+inPos) * matrix.get(2*4+i+matrixPos) +
-              in.get(3+inPos) * matrix.get(3*4+i+matrixPos));
-    }
-  }
-
-  /**
-   * @param src
-   * @param inverse
-   * 
-   * @return
-   */
-  private boolean __gluInvertMatrixd(double[] src, double[] inverse) {
-    int i, j, k, swap;
-    double t;
-    double[][] temp = tempMatrix;
-
-    for (i = 0; i < 4; i++) {
-      for (j = 0; j < 4; j++) {
-        temp[i][j] = src[i*4+j];
-      }
-    }
-    __gluMakeIdentityd(inverse);
-
-    for (i = 0; i < 4; i++) {
-      //
-      // Look for largest element in column
-      //
-      swap = i;
-      for (j = i + 1; j < 4; j++) {
-        if (Math.abs(temp[j][i]) > Math.abs(temp[i][i])) {
-          swap = j;
-        }
-      }
-
-      if (swap != i) {
-        //
-        // Swap rows.
-        //
-        for (k = 0; k < 4; k++) {
-          t = temp[i][k];
-          temp[i][k] = temp[swap][k];
-          temp[swap][k] = t;
-
-          t = inverse[i*4+k];
-          inverse[i*4+k] = inverse[swap*4+k];
-          inverse[swap*4+k] = t;
-        }
-      }
-
-      if (temp[i][i] == 0) {
-        //
-        // No non-zero pivot. The matrix is singular, which shouldn't
-        // happen. This means the user gave us a bad matrix.
-        //
-        return false;
-      }
-
-      t = temp[i][i];
-      for (k = 0; k < 4; k++) {
-        temp[i][k] /= t;
-        inverse[i*4+k] /= t;
-      }
-      for (j = 0; j < 4; j++) {
-        if (j != i) {
-          t = temp[j][i];
-          for (k = 0; k < 4; k++) {
-            temp[j][k] -= temp[i][k] * t;
-            inverse[j*4+k] -= inverse[i*4+k]*t;
-          }
-        }
-      }
-    }
-    return true;
-  }
-
-  /**
-   * @param src
-   * @param inverse
-   * 
-   * @return
-   */
-  private boolean __gluInvertMatrixd(DoubleBuffer src, DoubleBuffer inverse) {
-    int i, j, k, swap;
-    double t;
-
-    int srcPos = src.position();
-    int invPos = inverse.position();
-
-    DoubleBuffer temp = tempMatrixBuf;
-
-    for (i = 0; i < 4; i++) {
-      for (j = 0; j < 4; j++) {
-        temp.put(i*4+j, src.get(i*4+j + srcPos));
-      }
-    }
-    __gluMakeIdentityd(inverse);
-
-    for (i = 0; i < 4; i++) {
-      //
-      // Look for largest element in column
-      //
-      swap = i;
-      for (j = i + 1; j < 4; j++) {
-        if (Math.abs(temp.get(j*4+i)) > Math.abs(temp.get(i*4+i))) {
-          swap = j;
-        }
-      }
-
-      if (swap != i) {
-        //
-        // Swap rows.
-        //
-        for (k = 0; k < 4; k++) {
-          t = temp.get(i*4+k);
-          temp.put(i*4+k, temp.get(swap*4+k));
-          temp.put(swap*4+k, t);
-
-          t = inverse.get(i*4+k + invPos);
-          inverse.put(i*4+k + invPos, inverse.get(swap*4+k + invPos));
-          inverse.put(swap*4+k + invPos, t);
-        }
-      }
-
-      if (temp.get(i*4+i) == 0) {
-        //
-        // No non-zero pivot. The matrix is singular, which shouldn't
-        // happen. This means the user gave us a bad matrix.
-        //
-        return false;
-      }
-
-      t = temp.get(i*4+i);
-      for (k = 0; k < 4; k++) {
-        temp.put(i*4+k, temp.get(i*4+k) / t);
-        inverse.put(i*4+k + invPos, inverse.get(i*4+k + invPos) / t);
-      }
-      for (j = 0; j < 4; j++) {
-        if (j != i) {
-          t = temp.get(j*4+i);
-          for (k = 0; k < 4; k++) {
-            temp.put(j*4+k, temp.get(j*4+k) - temp.get(i*4+k) * t);
-            inverse.put(j*4+k + invPos, inverse.get(j*4+k + invPos) - inverse.get(i*4+k + invPos) * t);
-          }
-        }
-      }
-    }
-    return true;
-  }
-
-
-  /**
-   * @param a
-   * @param b
-   * @param r
-   */
-  private void __gluMultMatricesd(double[] a, int a_offset, double[] b, int b_offset, double[] r) {
-    for (int i = 0; i < 4; i++) {
-      for (int j = 0; j < 4; j++) {
-        r[i*4+j] =
-          a[i*4+0+a_offset]*b[0*4+j+b_offset] +
-          a[i*4+1+a_offset]*b[1*4+j+b_offset] +
-          a[i*4+2+a_offset]*b[2*4+j+b_offset] +
-          a[i*4+3+a_offset]*b[3*4+j+b_offset];
-      }
-    }
-  }
-
-
-  /**
-   * @param a
-   * @param b
-   * @param r
-   */
-  private void __gluMultMatricesd(DoubleBuffer a, DoubleBuffer b, DoubleBuffer r) {
-    int aPos = a.position();
-    int bPos = b.position();
-    int rPos = r.position();
-
-    for (int i = 0; i < 4; i++) {
-      for (int j = 0; j < 4; j++) {
-        r.put(i*4+j + rPos,
-          a.get(i*4+0+aPos)*b.get(0*4+j+bPos) +
-          a.get(i*4+1+aPos)*b.get(1*4+j+bPos) +
-          a.get(i*4+2+aPos)*b.get(2*4+j+bPos) +
-          a.get(i*4+3+aPos)*b.get(3*4+j+bPos));
-      }
-    }
-  }
-
-  /**
-   * Normalize vector
-   *
-   * @param v
-   */
-  private static void normalize(double[] v) {
-    double r;
-
-    r = Math.sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
-    if ( r == 0.0 )
-      return;
-
-    r = 1.0 / r;
-
-    v[0] *= r;
-    v[1] *= r;
-    v[2] *= r;
-
-    return;
-  }
-
-  /**
-   * Normalize vector
-   *
-   * @param v
-   */
-  private static void normalize(DoubleBuffer v) {
-    double r;
-
-    int vPos = v.position();
-
-    r = Math.sqrt(v.get(0+vPos) * v.get(0+vPos) +
-                  v.get(1+vPos) * v.get(1+vPos) +
-                  v.get(2+vPos) * v.get(2+vPos));
-    if ( r == 0.0 )
-      return;
-
-    r = 1.0 / r;
-
-    v.put(0+vPos, v.get(0+vPos) * r);
-    v.put(1+vPos, v.get(1+vPos) * r);
-    v.put(2+vPos, v.get(2+vPos) * r);
-
-    return;
-  }
-
-
-  /**
-   * Calculate cross-product
-   *
-   * @param v1
-   * @param v2
-   * @param result
-   */
-  private static void cross(double[] v1, double[] v2, double[] result) {
-    result[0] = v1[1] * v2[2] - v1[2] * v2[1];
-    result[1] = v1[2] * v2[0] - v1[0] * v2[2];
-    result[2] = v1[0] * v2[1] - v1[1] * v2[0];
-  }
-
-  /**
-   * Calculate cross-product
-   *
-   * @param v1
-   * @param v2
-   * @param result
-   */
-  private static void cross(DoubleBuffer v1, DoubleBuffer v2, DoubleBuffer result) {
-    int v1Pos = v1.position();
-    int v2Pos = v2.position();
-    int rPos  = result.position();
-
-    result.put(0+rPos, v1.get(1+v1Pos) * v2.get(2+v2Pos) - v1.get(2+v1Pos) * v2.get(1+v2Pos));
-    result.put(1+rPos, v1.get(2+v1Pos) * v2.get(0+v2Pos) - v1.get(0+v1Pos) * v2.get(2+v2Pos));
-    result.put(2+rPos, v1.get(0+v1Pos) * v2.get(1+v2Pos) - v1.get(1+v1Pos) * v2.get(0+v2Pos));
-  }
-
-  /**
-   * Method gluOrtho2D.
-   * 
-   * @param left
-   * @param right
-   * @param bottom
-   * @param top
-   */
-  public void gluOrtho2D(GL2 gl, double left, double right, double bottom, double top) {
-    gl.glOrtho(left, right, bottom, top, -1, 1);
-  }
-
-  /**
-   * Method gluPerspective.
-   * 
-   * @param fovy
-   * @param aspect
-   * @param zNear
-   * @param zFar
-   */
-  public void gluPerspective(GL2 gl, double fovy, double aspect, double zNear, double zFar) {
-    double sine, cotangent, deltaZ;
-    double radians = fovy / 2 * Math.PI / 180;
-
-    deltaZ = zFar - zNear;
-    sine = Math.sin(radians);
-
-    if ((deltaZ == 0) || (sine == 0) || (aspect == 0)) {
-      return;
-    }
-
-    cotangent = Math.cos(radians) / sine;
-
-    __gluMakeIdentityd(matrixBuf);
-
-    matrixBuf.put(0 * 4 + 0, cotangent / aspect);
-    matrixBuf.put(1 * 4 + 1, cotangent);
-    matrixBuf.put(2 * 4 + 2, - (zFar + zNear) / deltaZ);
-    matrixBuf.put(2 * 4 + 3, -1);
-    matrixBuf.put(3 * 4 + 2, -2 * zNear * zFar / deltaZ);
-    matrixBuf.put(3 * 4 + 3, 0);
-
-    gl.glMultMatrixd(matrixBuf);
-  }
-
-  /**
-   * Method gluLookAt
-   * 
-   * @param eyex
-   * @param eyey
-   * @param eyez
-   * @param centerx
-   * @param centery
-   * @param centerz
-   * @param upx
-   * @param upy
-   * @param upz
-   */
-  public void gluLookAt(GL2 gl,
-                        double eyex,
-                        double eyey,
-                        double eyez,
-                        double centerx,
-                        double centery,
-                        double centerz,
-                        double upx,
-                        double upy,
-                        double upz) {
-    DoubleBuffer forward = this.forwardBuf;
-    DoubleBuffer side = this.sideBuf;
-    DoubleBuffer up = this.upBuf;
-
-    forward.put(0, centerx - eyex);
-    forward.put(1, centery - eyey);
-    forward.put(2, centerz - eyez);
-
-    up.put(0, upx);
-    up.put(1, upy);
-    up.put(2, upz);
-
-    normalize(forward);
-
-    /* Side = forward x up */
-    cross(forward, up, side);
-    normalize(side);
-
-    /* Recompute up as: up = side x forward */
-    cross(side, forward, up);
-
-    __gluMakeIdentityd(matrixBuf);
-    matrixBuf.put(0 * 4 + 0, side.get(0));
-    matrixBuf.put(1 * 4 + 0, side.get(1));
-    matrixBuf.put(2 * 4 + 0, side.get(2));
-
-    matrixBuf.put(0 * 4 + 1, up.get(0));
-    matrixBuf.put(1 * 4 + 1, up.get(1));
-    matrixBuf.put(2 * 4 + 1, up.get(2));
-
-    matrixBuf.put(0 * 4 + 2, -forward.get(0));
-    matrixBuf.put(1 * 4 + 2, -forward.get(1));
-    matrixBuf.put(2 * 4 + 2, -forward.get(2));
-
-    gl.glMultMatrixd(matrixBuf);
-    gl.glTranslated(-eyex, -eyey, -eyez);
-  }
-
-  /**
-   * Method gluProject
-   * 
-   * @param objx
-   * @param objy
-   * @param objz
-   * @param modelMatrix
-   * @param projMatrix
-   * @param viewport
-   * @param win_pos
-   * 
-   * @return
-   */
-  public boolean gluProject(double objx,
-                            double objy,
-                            double objz,
-                            double[] modelMatrix,
-                            int modelMatrix_offset,
-                            double[] projMatrix,
-                            int projMatrix_offset,
-                            int[] viewport,
-                            int viewport_offset,
-                            double[] win_pos,
-                            int win_pos_offset ) {
-
-    double[] in = this.in;
-    double[] out = this.out;
-
-    in[0] = objx;
-    in[1] = objy;
-    in[2] = objz;
-    in[3] = 1.0;
-
-    __gluMultMatrixVecd(modelMatrix, modelMatrix_offset, in, out);
-    __gluMultMatrixVecd(projMatrix, projMatrix_offset, out, in);
-
-    if (in[3] == 0.0)
-      return false;
-
-    in[3] = (1.0 / in[3]) * 0.5;
-
-    // Map x, y and z to range 0-1
-    in[0] = in[0] * in[3] + 0.5f;
-    in[1] = in[1] * in[3] + 0.5f;
-    in[2] = in[2] * in[3] + 0.5f;
-
-    // Map x,y to viewport
-    win_pos[0+win_pos_offset] = in[0] * viewport[2+viewport_offset] + viewport[0+viewport_offset];
-    win_pos[1+win_pos_offset] = in[1] * viewport[3+viewport_offset] + viewport[1+viewport_offset];
-    win_pos[2+win_pos_offset] = in[2];
-
-    return true;
-  }
-
-  /**
-   * Method gluProject
-   * 
-   * @param objx
-   * @param objy
-   * @param objz
-   * @param modelMatrix
-   * @param projMatrix
-   * @param viewport
-   * @param win_pos
-   * 
-   * @return
-   */
-  public boolean gluProject(double objx,
-                            double objy,
-                            double objz,
-                            DoubleBuffer modelMatrix,
-                            DoubleBuffer projMatrix,
-                            IntBuffer viewport,
-                            DoubleBuffer win_pos) {
-
-    DoubleBuffer in = this.inBuf;
-    DoubleBuffer out = this.outBuf;
-
-    in.put(0, objx);
-    in.put(1, objy);
-    in.put(2, objz);
-    in.put(3, 1.0);
-
-    __gluMultMatrixVecd(modelMatrix, in, out);
-    __gluMultMatrixVecd(projMatrix, out, in);
-
-    if (in.get(3) == 0.0)
-      return false;
-
-    in.put(3, (1.0 / in.get(3)) * 0.5);
-
-    // Map x, y and z to range 0-1
-    in.put(0, in.get(0) * in.get(3) + 0.5f);
-    in.put(1, in.get(1) * in.get(3) + 0.5f);
-    in.put(2, in.get(2) * in.get(3) + 0.5f);
-
-    // Map x,y to viewport
-    int vPos = viewport.position();
-    int wPos = win_pos.position();
-    win_pos.put(0+wPos, in.get(0) * viewport.get(2+vPos) + viewport.get(0+vPos));
-    win_pos.put(1+wPos, in.get(1) * viewport.get(3+vPos) + viewport.get(1+vPos));
-    win_pos.put(2+wPos, in.get(2));
-
-    return true;
-  }
-
-
-  /**
-   * Method gluUnproject
-   * 
-   * @param winx
-   * @param winy
-   * @param winz
-   * @param modelMatrix
-   * @param projMatrix
-   * @param viewport
-   * @param obj_pos
-   * 
-   * @return
-   */
-  public boolean gluUnProject(double winx,
-                              double winy,
-                              double winz,
-                              double[] modelMatrix,
-                              int modelMatrix_offset,
-                              double[] projMatrix,
-                              int projMatrix_offset,
-                              int[] viewport,
-                              int viewport_offset,
-                              double[] obj_pos,
-                              int obj_pos_offset) {
-    double[] in = this.in;
-    double[] out = this.out;
-
-    __gluMultMatricesd(modelMatrix, modelMatrix_offset, projMatrix, projMatrix_offset, matrix);
-
-    if (!__gluInvertMatrixd(matrix, matrix))
-      return false;
-
-    in[0] = winx;
-    in[1] = winy;
-    in[2] = winz;
-    in[3] = 1.0;
-
-    // Map x and y from window coordinates
-    in[0] = (in[0] - viewport[0+viewport_offset]) / viewport[2+viewport_offset];
-    in[1] = (in[1] - viewport[1+viewport_offset]) / viewport[3+viewport_offset];
-
-    // Map to range -1 to 1
-    in[0] = in[0] * 2 - 1;
-    in[1] = in[1] * 2 - 1;
-    in[2] = in[2] * 2 - 1;
-
-    __gluMultMatrixVecd(matrix, 0, in, out);
-
-    if (out[3] == 0.0)
-      return false;
-
-    out[3] = 1.0 / out[3];
-
-    obj_pos[0+obj_pos_offset] = out[0] * out[3];
-    obj_pos[1+obj_pos_offset] = out[1] * out[3];
-    obj_pos[2+obj_pos_offset] = out[2] * out[3];
-
-    return true;
-  }
-
-
-  /**
-   * Method gluUnproject
-   * 
-   * @param winx
-   * @param winy
-   * @param winz
-   * @param modelMatrix
-   * @param projMatrix
-   * @param viewport
-   * @param obj_pos
-   * 
-   * @return
-   */
-  public boolean gluUnProject(double winx,
-                              double winy,
-                              double winz,
-                              DoubleBuffer modelMatrix,
-                              DoubleBuffer projMatrix,
-                              IntBuffer viewport,
-                              DoubleBuffer obj_pos) {
-    DoubleBuffer in = this.inBuf;
-    DoubleBuffer out = this.outBuf;
-
-    __gluMultMatricesd(modelMatrix, projMatrix, matrixBuf);
-
-    if (!__gluInvertMatrixd(matrixBuf, matrixBuf))
-      return false;
-
-    in.put(0, winx);
-    in.put(1, winy);
-    in.put(2, winz);
-    in.put(3, 1.0);
-
-    // Map x and y from window coordinates
-    int vPos = viewport.position();
-    int oPos = obj_pos.position();
-    in.put(0, (in.get(0) - viewport.get(0+vPos)) / viewport.get(2+vPos));
-    in.put(1, (in.get(1) - viewport.get(1+vPos)) / viewport.get(3+vPos));
-
-    // Map to range -1 to 1
-    in.put(0, in.get(0) * 2 - 1);
-    in.put(1, in.get(1) * 2 - 1);
-    in.put(2, in.get(2) * 2 - 1);
-
-    __gluMultMatrixVecd(matrixBuf, in, out);
-
-    if (out.get(3) == 0.0)
-      return false;
-
-    out.put(3, 1.0 / out.get(3));
-
-    obj_pos.put(0+oPos, out.get(0) * out.get(3));
-    obj_pos.put(1+oPos, out.get(1) * out.get(3));
-    obj_pos.put(2+oPos, out.get(2) * out.get(3));
-
-    return true;
-  }
-
-
-  /**
-   * Method gluUnproject4
-   * 
-   * @param winx
-   * @param winy
-   * @param winz
-   * @param clipw
-   * @param modelMatrix
-   * @param projMatrix
-   * @param viewport
-   * @param near
-   * @param far
-   * @param obj_pos
-   * 
-   * @return
-   */
-  public boolean gluUnProject4(double winx,
-                               double winy,
-                               double winz,
-                               double clipw,
-                               double[] modelMatrix,
-                               int modelMatrix_offset,
-                               double[] projMatrix,
-                               int projMatrix_offset,
-                               int[] viewport,
-                               int viewport_offset,
-                               double near,
-                               double far,
-                               double[] obj_pos,
-                               int obj_pos_offset ) {
-    double[] in = this.in;
-    double[] out = this.out;
-
-    __gluMultMatricesd(modelMatrix, modelMatrix_offset, projMatrix, projMatrix_offset, matrix);
-
-    if (!__gluInvertMatrixd(matrix, matrix))
-      return false;
-
-    in[0] = winx;
-    in[1] = winy;
-    in[2] = winz;
-    in[3] = clipw;
-
-    // Map x and y from window coordinates
-    in[0] = (in[0] - viewport[0+viewport_offset]) / viewport[2+viewport_offset];
-    in[1] = (in[1] - viewport[1+viewport_offset]) / viewport[3+viewport_offset];
-    in[2] = (in[2] - near) / (far - near);
-
-    // Map to range -1 to 1
-    in[0] = in[0] * 2 - 1;
-    in[1] = in[1] * 2 - 1;
-    in[2] = in[2] * 2 - 1;
-
-    __gluMultMatrixVecd(matrix, 0, in, out);
-
-    if (out[3] == 0.0)
-      return false;
-
-    obj_pos[0+obj_pos_offset] = out[0];
-    obj_pos[1+obj_pos_offset] = out[1];
-    obj_pos[2+obj_pos_offset] = out[2];
-    obj_pos[3+obj_pos_offset] = out[3];
-    return true;
-  }
-
-  /**
-   * Method gluUnproject4
-   * 
-   * @param winx
-   * @param winy
-   * @param winz
-   * @param clipw
-   * @param modelMatrix
-   * @param projMatrix
-   * @param viewport
-   * @param near
-   * @param far
-   * @param obj_pos
-   * 
-   * @return
-   */
-  public boolean gluUnProject4(double winx,
-                               double winy,
-                               double winz,
-                               double clipw,
-                               DoubleBuffer modelMatrix,
-                               DoubleBuffer projMatrix,
-                               IntBuffer viewport,
-                               double near,
-                               double far,
-                               DoubleBuffer obj_pos) {
-    DoubleBuffer in = this.inBuf;
-    DoubleBuffer out = this.outBuf;
-
-    __gluMultMatricesd(modelMatrix, projMatrix, matrixBuf);
-
-    if (!__gluInvertMatrixd(matrixBuf, matrixBuf))
-      return false;
-
-    in.put(0, winx);
-    in.put(1, winy);
-    in.put(2, winz);
-    in.put(3, clipw);
-
-    // Map x and y from window coordinates
-    int vPos = viewport.position();
-    in.put(0, (in.get(0) - viewport.get(0+vPos)) / viewport.get(2+vPos));
-    in.put(1, (in.get(1) - viewport.get(1+vPos)) / viewport.get(3+vPos));
-    in.put(2, (in.get(2) - near) / (far - near));
-
-    // Map to range -1 to 1
-    in.put(0, in.get(0) * 2 - 1);
-    in.put(1, in.get(1) * 2 - 1);
-    in.put(2, in.get(2) * 2 - 1);
-
-    __gluMultMatrixVecd(matrixBuf, in, out);
-
-    if (out.get(3) == 0.0)
-      return false;
-
-    int oPos = obj_pos.position();
-    obj_pos.put(0+oPos, out.get(0));
-    obj_pos.put(1+oPos, out.get(1));
-    obj_pos.put(2+oPos, out.get(2));
-    obj_pos.put(3+oPos, out.get(3));
-    return true;
-  }
-
-
-  /**
-   * Method gluPickMatrix
-   * 
-   * @param x
-   * @param y
-   * @param deltaX
-   * @param deltaY
-   * @param viewport
-   */
-  public void gluPickMatrix(GL2 gl,
-                            double x,
-                            double y,
-                            double deltaX,
-                            double deltaY,
-                            IntBuffer viewport) {
-    if (deltaX <= 0 || deltaY <= 0) {
-      return;
-    }
-
-    /* Translate and scale the picked region to the entire window */
-    int vPos = viewport.position();
-    gl.glTranslated((viewport.get(2+vPos) - 2 * (x - viewport.get(0+vPos))) / deltaX,
-                    (viewport.get(3+vPos) - 2 * (y - viewport.get(1+vPos))) / deltaY,
-                    0);
-    gl.glScaled(viewport.get(2) / deltaX, viewport.get(3) / deltaY, 1.0);
-  }
-
-  /**
-   * Method gluPickMatrix
-   * 
-   * @param x
-   * @param y
-   * @param deltaX
-   * @param deltaY
-   * @param viewport
-   * @param viewport_offset
-   */
-  public void gluPickMatrix(GL2 gl,
-                            double x,
-                            double y,
-                            double deltaX,
-                            double deltaY,
-                            int[] viewport,
-                            int viewport_offset) {
-    if (deltaX <= 0 || deltaY <= 0) {
-      return;
-    }
-
-    /* Translate and scale the picked region to the entire window */
-    gl.glTranslated((viewport[2+viewport_offset] - 2 * (x - viewport[0+viewport_offset])) / deltaX,
-                    (viewport[3+viewport_offset] - 2 * (y - viewport[1+viewport_offset])) / deltaY,
-                    0);
-    gl.glScaled(viewport[2+viewport_offset] / deltaX, viewport[3+viewport_offset] / deltaY, 1.0);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/gl2/Util.java b/src/jogl/classes/com/sun/opengl/impl/gl2/Util.java
deleted file mode 100644
index 0fc72daa9..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/gl2/Util.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/* 
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
- * met:
- * 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of 
- *   its contributors may be used to endorse or promote products derived 
- *   from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.opengl.impl.gl2;
-
-import com.sun.opengl.impl.*;
-
-import java.nio.IntBuffer;
-import javax.media.opengl.*;
-
-/**
- * Util.java
- * <p/>
- * <p/>
- * Created 7-jan-2004
- *
- * @author Erik Duijs
- */
-class Util {
-
-  /**
-   * temp int[] of one for getting an int from some GL functions
-   */
-  private int[] scratch = new int[1];
-
-  /**
-   * Return ceiling of integer division
-   *
-   * @param a
-   * @param b
-   *
-   * @return int
-   */
-  protected static int ceil(int a, int b) {
-    return (a % b == 0 ? a / b : a / b + 1);
-  }
-
-  /**
-   * Method compPerPix.
-   *
-   * @param format
-   *
-   * @return int
-   */
-  protected static int compPerPix(int format) {
-    /* Determine number of components per pixel */
-    switch ( format ) {
-    case GL2.GL_COLOR_INDEX:
-    case GL2.GL_STENCIL_INDEX:
-    case GL2.GL_DEPTH_COMPONENT:
-    case GL2.GL_RED:
-    case GL2.GL_GREEN:
-    case GL2.GL_BLUE:
-    case GL2.GL_ALPHA:
-    case GL2.GL_LUMINANCE:
-      return 1;
-    case GL2.GL_LUMINANCE_ALPHA:
-      return 2;
-    case GL2.GL_RGB:
-    case GL2.GL_BGR:
-      return 3;
-    case GL2.GL_RGBA:
-    case GL2.GL_BGRA:
-      return 4;
-    default :
-      return -1;
-    }
-  }
-
-  /**
-   * Method nearestPower.
-   * <p/>
-   * Compute the nearest power of 2 number.  This algorithm is a little strange, but it works quite well.
-   *
-   * @param value
-   *
-   * @return int
-   */
-  protected static int nearestPower(int value) {
-    int i;
-
-    i = 1;
-
-    /* Error! */
-    if ( value == 0 )
-      return -1;
-
-    for ( ; ; ) {
-      if ( value == 1 ) {
-        return i;
-      } else if ( value == 3 ) {
-        return i << 2;
-      }
-      value >>= 1;
-      i <<= 1;
-    }
-  }
-
-  /**
-   * Method bytesPerPixel.
-   *
-   * @param format
-   * @param type
-   *
-   * @return int
-   */
-  protected static int bytesPerPixel(int format, int type) {
-    int n, m;
-
-    switch ( format ) {
-    case GL2.GL_COLOR_INDEX:
-    case GL2.GL_STENCIL_INDEX:
-    case GL2.GL_DEPTH_COMPONENT:
-    case GL2.GL_RED:
-    case GL2.GL_GREEN:
-    case GL2.GL_BLUE:
-    case GL2.GL_ALPHA:
-    case GL2.GL_LUMINANCE:
-      n = 1;
-      break;
-    case GL2.GL_LUMINANCE_ALPHA:
-      n = 2;
-      break;
-    case GL2.GL_RGB:
-    case GL2.GL_BGR:
-      n = 3;
-      break;
-    case GL2.GL_RGBA:
-    case GL2.GL_BGRA:
-      n = 4;
-      break;
-    default :
-      n = 0;
-    }
-
-    switch ( type ) {
-    case GL2.GL_UNSIGNED_BYTE:
-      m = 1;
-      break;
-    case GL2.GL_BYTE:
-      m = 1;
-      break;
-    case GL2.GL_BITMAP:
-      m = 1;
-      break;
-    case GL2.GL_UNSIGNED_SHORT:
-      m = 2;
-      break;
-    case GL2.GL_SHORT:
-      m = 2;
-      break;
-    case GL2.GL_UNSIGNED_INT:
-      m = 4;
-      break;
-    case GL2.GL_INT:
-      m = 4;
-      break;
-    case GL2.GL_FLOAT:
-      m = 4;
-      break;
-    default :
-      m = 0;
-    }
-
-    return n * m;
-  }
-
-  /**
-   * Convenience method for returning an int, rather than getting it out of a buffer yourself.
-   *
-   * @param what
-   *
-   * @return int
-   */
-  protected int glGetIntegerv(GL gl, int what) {
-    gl.glGetIntegerv(what, scratch, 0);
-    return scratch[0];
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/gl2/fixme/GLObjectTracker.java b/src/jogl/classes/com/sun/opengl/impl/gl2/fixme/GLObjectTracker.java
deleted file mode 100755
index 885f3cb28..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/gl2/fixme/GLObjectTracker.java
+++ /dev/null
@@ -1,835 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.gl2;
-
-import com.sun.opengl.impl.*;
-
-import java.nio.*;
-import javax.media.opengl.*;
-
-/** 
- * Tracks the creation of server-side OpenGL objects which can be
- * shared between contexts. Ordinarily, when an OpenGL context is
- * deleted and no other contexts are sharing server-side objects with
- * it, all of the server-side objects are automatically deleted by the
- * OpenGL implementation. It is not necessary for the end user to
- * explicitly delete these objects. However, when the Java2D/OpenGL
- * pipeline is active and frame buffer objects are being used for
- * rendering, it is necessary for all OpenGL contexts created by JOGL
- * to share server-side objects with the Java2D OpenGL context. This
- * means that these objects "leak" into the namespace used by Java2D.
- * In order to prevent memory leaks and to present the same
- * programming model to the end user, it is necessary to track the
- * creation and destruction of all of these server-side OpenGL objects
- * and to explicitly release them when all of the JOGL-created
- * contexts which can see them have been released. <P>
- *
- * The {@link #ref ref} and {@link #unref unref} methods should be
- * used during the creation and destruction of OpenGL contexts by JOGL
- * in order to update the liveness of the objects being tracked. The
- * various other methods should be called by the OpenGL binding in the
- * various named methods.
- */
-
-public class GLObjectTracker {
-  private static final boolean DEBUG = Debug.debug("GLObjectTracker");
-
-  //----------------------------------------------------------------------
-  // Adders
-  //
-
-  // glGenBuffers
-  public synchronized void addBuffers(int n, IntBuffer ids) {
-    add(getList(BUFFERS), n, ids);
-  }
-
-  // glGenBuffers
-  public synchronized void addBuffers(int n, int[] ids, int ids_offset) {
-    add(getList(BUFFERS), n, ids, ids_offset);
-  }
-
-  // glGenBuffersARB
-  public synchronized void addBuffersARB(int n, IntBuffer ids) {
-    add(getList(BUFFERS_ARB), n, ids);
-  }
-
-  // glGenBuffersARB
-  public synchronized void addBuffersARB(int n, int[] ids, int ids_offset) {
-    add(getList(BUFFERS_ARB), n, ids, ids_offset);
-  }
-
-  // glGenFencesAPPLE
-  public synchronized void addFencesAPPLE(int n, IntBuffer ids) {
-    add(getList(FENCES_APPLE), n, ids);
-  }
-
-  // glGenFencesAPPLE
-  public synchronized void addFencesAPPLE(int n, int[] ids, int ids_offset) {
-    add(getList(FENCES_APPLE), n, ids, ids_offset);
-  }
-
-  // glGenFencesNV
-  public synchronized void addFencesNV(int n, IntBuffer ids) {
-    add(getList(FENCES_NV), n, ids);
-  }
-
-  // glGenFencesNV
-  public synchronized void addFencesNV(int n, int[] ids, int ids_offset) {
-    add(getList(FENCES_NV), n, ids, ids_offset);
-  }
-
-  // glGenFragmentShadersATI
-  public synchronized void addFragmentShadersATI(int start, int n) {
-    add(getList(FRAGMENT_SHADERS_ATI), start, n);
-  }
-
-  // glGenFramebuffersEXT
-  public synchronized void addFramebuffersEXT(int n, IntBuffer ids) {
-    add(getList(FRAMEBUFFERS_EXT), n, ids);
-  }
-
-  // glGenFramebuffersEXT
-  public synchronized void addFramebuffersEXT(int n, int[] ids, int ids_offset) {
-    add(getList(FRAMEBUFFERS_EXT), n, ids, ids_offset);
-  }
-  
-  // glGenLists
-  public synchronized void addLists(int start, int n) {
-    add(getList(LISTS), start, n);
-  }
-
-  // glGenOcclusionQueriesNV
-  public synchronized void addOcclusionQueriesNV(int n, IntBuffer ids) {
-    add(getList(OCCLUSION_QUERIES_NV), n, ids);
-  }
-
-  // glGenOcclusionQueriesNV
-  public synchronized void addOcclusionQueriesNV(int n, int[] ids, int ids_offset) {
-    add(getList(OCCLUSION_QUERIES_NV), n, ids, ids_offset);
-  }
-
-  // glCreateProgram
-  public synchronized void addProgramObject(int obj) {
-    add(getList(PROGRAM_OBJECTS), obj, 1);
-  }
-
-  // glCreateProgramObjectARB
-  public synchronized void addProgramObjectARB(int obj) {
-    add(getList(PROGRAM_AND_SHADER_OBJECTS_ARB), obj, 1);
-  }
-
-  // glGenProgramsARB
-  public synchronized void addProgramsARB(int n, IntBuffer ids) {
-    add(getList(PROGRAMS_ARB), n, ids);
-  }
-
-  // glGenProgramsARB
-  public synchronized void addProgramsARB(int n, int[] ids, int ids_offset) {
-    add(getList(PROGRAMS_ARB), n, ids, ids_offset);
-  }
-
-  // glGenProgramsNV
-  public synchronized void addProgramsNV(int n, IntBuffer ids) {
-    add(getList(PROGRAMS_NV), n, ids);
-  }
-
-  // glGenProgramsNV
-  public synchronized void addProgramsNV(int n, int[] ids, int ids_offset) {
-    add(getList(PROGRAMS_NV), n, ids, ids_offset);
-  }
-
-  // glGenQueries
-  public synchronized void addQueries(int n, IntBuffer ids) {
-    add(getList(QUERIES), n, ids);
-  }
-
-  // glGenQueries
-  public synchronized void addQueries(int n, int[] ids, int ids_offset) {
-    add(getList(QUERIES), n, ids, ids_offset);
-  }
-
-  // glGenQueriesARB
-  public synchronized void addQueriesARB(int n, IntBuffer ids) {
-    add(getList(QUERIES_ARB), n, ids);
-  }
-
-  // glGenQueriesARB
-  public synchronized void addQueriesARB(int n, int[] ids, int ids_offset) {
-    add(getList(QUERIES_ARB), n, ids, ids_offset);
-  }
-
-  // glGenRenderbuffersEXT
-  public synchronized void addRenderbuffersEXT(int n, IntBuffer ids) {
-    add(getList(RENDERBUFFERS_EXT), n, ids);
-  }
-
-  // glGenRenderbuffersEXT
-  public synchronized void addRenderbuffersEXT(int n, int[] ids, int ids_offset) {
-    add(getList(RENDERBUFFERS_EXT), n, ids, ids_offset);
-  }
-
-  // glCreateShader
-  public synchronized void addShaderObject(int obj) {
-    add(getList(SHADER_OBJECTS), obj, 1);
-  }
-
-  // glCreateShaderObjectARB
-  public synchronized void addShaderObjectARB(int obj) {
-    add(getList(PROGRAM_AND_SHADER_OBJECTS_ARB), obj, 1);
-  }
-
-  // glGenTextures
-  public synchronized void addTextures(int n, IntBuffer ids) {
-    add(getList(TEXTURES), n, ids);
-  }
-
-  // glGenTextures
-  public synchronized void addTextures(int n, int[] ids, int ids_offset) {
-    add(getList(TEXTURES), n, ids, ids_offset);
-  }
-
-  // glGenVertexArraysAPPLE
-  public synchronized void addVertexArraysAPPLE(int n, IntBuffer ids) {
-    add(getList(VERTEX_ARRAYS_APPLE), n, ids);
-  }
-
-  // glGenVertexArraysAPPLE
-  public synchronized void addVertexArraysAPPLE(int n, int[] ids, int ids_offset) {
-    add(getList(VERTEX_ARRAYS_APPLE), n, ids, ids_offset);
-  }
-
-  // glGenVertexShadersEXT
-  public synchronized void addVertexShadersEXT(int start, int n) {
-    add(getList(VERTEX_SHADERS_EXT), start, n);
-  }
-
-  //----------------------------------------------------------------------
-  // Removers
-  //
-
-  // glDeleteBuffers
-  public synchronized void removeBuffers(int n, IntBuffer ids) {
-    remove(getList(BUFFERS), n, ids);
-  }
-
-  // glDeleteBuffers
-  public synchronized void removeBuffers(int n, int[] ids, int ids_offset) {
-    remove(getList(BUFFERS), n, ids, ids_offset);
-  }
-
-  // glDeleteBuffersARB
-  public synchronized void removeBuffersARB(int n, IntBuffer ids) {
-    remove(getList(BUFFERS_ARB), n, ids);
-  }
-
-  // glDeleteBuffersARB
-  public synchronized void removeBuffersARB(int n, int[] ids, int ids_offset) {
-    remove(getList(BUFFERS_ARB), n, ids, ids_offset);
-  }
-
-  // glDeleteFencesAPPLE
-  public synchronized void removeFencesAPPLE(int n, IntBuffer ids) {
-    remove(getList(FENCES_APPLE), n, ids);
-  }
-
-  // glDeleteFencesAPPLE
-  public synchronized void removeFencesAPPLE(int n, int[] ids, int ids_offset) {
-    remove(getList(FENCES_APPLE), n, ids, ids_offset);
-  }
-
-  // glDeleteFencesNV
-  public synchronized void removeFencesNV(int n, IntBuffer ids) {
-    remove(getList(FENCES_NV), n, ids);
-  }
-
-  // glDeleteFencesNV
-  public synchronized void removeFencesNV(int n, int[] ids, int ids_offset) {
-    remove(getList(FENCES_NV), n, ids, ids_offset);
-  }
-
-  // glDeleteFragmentShaderATI
-  public synchronized void removeFragmentShaderATI(int obj) {
-    remove(getList(FRAGMENT_SHADERS_ATI), obj, 1);
-  }
-
-  // glDeleteFramebuffersEXT
-  public synchronized void removeFramebuffersEXT(int n, IntBuffer ids) {
-    remove(getList(FRAMEBUFFERS_EXT), n, ids);
-  }
-
-  // glDeleteFramebuffersEXT
-  public synchronized void removeFramebuffersEXT(int n, int[] ids, int ids_offset) {
-    remove(getList(FRAMEBUFFERS_EXT), n, ids, ids_offset);
-  }
-  
-  // glDeleteLists
-  public synchronized void removeLists(int start, int n) {
-    remove(getList(LISTS), start, n);
-  }
-
-  // glDeleteOcclusionQueriesNV
-  public synchronized void removeOcclusionQueriesNV(int n, IntBuffer ids) {
-    remove(getList(OCCLUSION_QUERIES_NV), n, ids);
-  }
-
-  // glDeleteOcclusionQueriesNV
-  public synchronized void removeOcclusionQueriesNV(int n, int[] ids, int ids_offset) {
-    remove(getList(OCCLUSION_QUERIES_NV), n, ids, ids_offset);
-  }
-
-  // glDeleteProgram
-  public synchronized void removeProgramObject(int obj) {
-    remove(getList(PROGRAM_OBJECTS), obj, 1);
-  }
-
-  // glDeleteObjectARB
-  public synchronized void removeProgramOrShaderObjectARB(int obj) {
-    remove(getList(PROGRAM_AND_SHADER_OBJECTS_ARB), obj, 1);
-  }
-
-  // glDeleteProgramsARB
-  public synchronized void removeProgramsARB(int n, IntBuffer ids) {
-    remove(getList(PROGRAMS_ARB), n, ids);
-  }
-
-  // glDeleteProgramsARB
-  public synchronized void removeProgramsARB(int n, int[] ids, int ids_offset) {
-    remove(getList(PROGRAMS_ARB), n, ids, ids_offset);
-  }
-
-  // glDeleteProgramsNV
-  public synchronized void removeProgramsNV(int n, IntBuffer ids) {
-    remove(getList(PROGRAMS_NV), n, ids);
-  }
-
-  // glDeleteProgramsNV
-  public synchronized void removeProgramsNV(int n, int[] ids, int ids_offset) {
-    remove(getList(PROGRAMS_NV), n, ids, ids_offset);
-  }
-
-  // glDeleteQueries
-  public synchronized void removeQueries(int n, IntBuffer ids) {
-    remove(getList(QUERIES), n, ids);
-  }
-
-  // glDeleteQueries
-  public synchronized void removeQueries(int n, int[] ids, int ids_offset) {
-    remove(getList(QUERIES), n, ids, ids_offset);
-  }
-
-  // glDeleteQueriesARB
-  public synchronized void removeQueriesARB(int n, IntBuffer ids) {
-    remove(getList(QUERIES_ARB), n, ids);
-  }
-
-  // glDeleteQueriesARB
-  public synchronized void removeQueriesARB(int n, int[] ids, int ids_offset) {
-    remove(getList(QUERIES_ARB), n, ids, ids_offset);
-  }
-
-  // glDeleteRenderbuffersEXT
-  public synchronized void removeRenderbuffersEXT(int n, IntBuffer ids) {
-    remove(getList(RENDERBUFFERS_EXT), n, ids);
-  }
-
-  // glDeleteRenderbuffersEXT
-  public synchronized void removeRenderbuffersEXT(int n, int[] ids, int ids_offset) {
-    remove(getList(RENDERBUFFERS_EXT), n, ids, ids_offset);
-  }
-
-  // glDeleteShader
-  public synchronized void removeShaderObject(int obj) {
-    remove(getList(SHADER_OBJECTS), obj, 1);
-  }
-
-  // glDeleteTextures
-  public synchronized void removeTextures(int n, IntBuffer ids) {
-    remove(getList(TEXTURES), n, ids);
-  }
-
-  // glDeleteTextures
-  public synchronized void removeTextures(int n, int[] ids, int ids_offset) {
-    remove(getList(TEXTURES), n, ids, ids_offset);
-  }
-
-  // glDeleteVertexArraysAPPLE
-  public synchronized void removeVertexArraysAPPLE(int n, IntBuffer ids) {
-    remove(getList(VERTEX_ARRAYS_APPLE), n, ids);
-  }
-
-  // glDeleteVertexArraysAPPLE
-  public synchronized void removeVertexArraysAPPLE(int n, int[] ids, int ids_offset) {
-    remove(getList(VERTEX_ARRAYS_APPLE), n, ids, ids_offset);
-  }
-
-  // glDeleteVertexShaderEXT
-  public synchronized void removeVertexShaderEXT(int obj) {
-    remove(getList(VERTEX_SHADERS_EXT), obj, 1);
-  }
-
-  //----------------------------------------------------------------------
-  // Reference count maintenance and manual deletion
-  //
-
-  public synchronized void transferAll(GLObjectTracker other) {
-    for (int i = 0; i < lists.length; i++) {
-      getList(i).addAll(other.lists[i]);
-      if (other.lists[i] != null) {
-        other.lists[i].clear();
-      }
-    }
-    dirty = true;
-  }
-
-  public synchronized void ref() {
-    ++refCount;
-  }
-
-  public void unref(GLObjectTracker deletedObjectPool) {
-    boolean tryDelete = false;
-    synchronized (this) {
-      if (--refCount == 0) {
-        tryDelete = true;
-      }
-    }
-    if (tryDelete) {
-      // See whether we should try to do the work now or whether we
-      // have to postpone
-      GLContext cur = GLContext.getCurrent();
-      if ((cur != null) &&
-          (cur instanceof GLContextImpl)) {
-        GLContextImpl curImpl = (GLContextImpl) cur;
-        if (deletedObjectPool != null &&
-            deletedObjectPool == curImpl.getDeletedObjectTracker()) {
-          // Should be safe to delete these objects now
-          try {
-            delete((GL2)curImpl.getGL());
-            return;
-          } catch (GLException e) {
-            // Shouldn't happen, but if it does, transfer all objects
-            // to the deleted object pool hoping we can later clean
-            // them up
-            deletedObjectPool.transferAll(this);
-            throw(e);
-          }
-        }
-      }
-      // If we get here, we couldn't attempt to delete the objects
-      // right now; instead try to transfer them to the
-      // deletedObjectPool for later cleanup (FIXME: should consider
-      // throwing an exception if deletedObjectPool is null, since
-      // that shouldn't happen)
-      if (DEBUG) {
-        String s = null;
-        if (cur == null) {
-          s = "current context was null";
-        } else if (!(cur instanceof GLContextImpl)) {
-          s = "current context was not a GLContextImpl";
-        } else if (deletedObjectPool == null) {
-          s = "no current deletedObjectPool";
-        } else if (deletedObjectPool != ((GLContextImpl) cur).getDeletedObjectTracker()) {
-          s = "deletedObjectTracker didn't match";
-          if (((GLContextImpl) cur).getDeletedObjectTracker() == null) {
-            s += " (other was null)";
-          }
-        } else {
-          s = "unknown reason";
-        }
-        System.err.println("Deferred destruction of server-side OpenGL objects into " + deletedObjectPool + ": " + s);
-      }
-
-      if (deletedObjectPool != null) {
-        deletedObjectPool.transferAll(this);
-      }
-    }
-  }
-
-  public void clean(GL2 gl) {
-    if (dirty) {
-      try {
-        delete(gl);
-        dirty = false;
-      } catch (GLException e) {
-        // FIXME: not sure what to do here; probably a bad idea to be
-        // throwing exceptions during an otherwise-successful makeCurrent
-      }
-    }
-  }
-
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  // Kinds of sharable server-side OpenGL objects this class tracks
-  private static final int BUFFERS                        = 0;
-  private static final int BUFFERS_ARB                    = 1;
-  private static final int FENCES_APPLE                   = 2;
-  private static final int FENCES_NV                      = 3;
-  private static final int FRAGMENT_SHADERS_ATI           = 4;
-  private static final int FRAMEBUFFERS_EXT               = 5;
-  private static final int LISTS                          = 6;
-  private static final int OCCLUSION_QUERIES_NV           = 7;
-  private static final int PROGRAM_AND_SHADER_OBJECTS_ARB = 8;
-  private static final int PROGRAM_OBJECTS                = 9;
-  private static final int PROGRAMS_ARB                   = 10;
-  private static final int PROGRAMS_NV                    = 11;
-  private static final int QUERIES                        = 12;
-  private static final int QUERIES_ARB                    = 13;
-  private static final int RENDERBUFFERS_EXT              = 14;
-  private static final int SHADER_OBJECTS                 = 15;
-  private static final int TEXTURES                       = 16;
-  private static final int VERTEX_ARRAYS_APPLE            = 17;
-  private static final int VERTEX_SHADERS_EXT             = 18;
-  private static final int NUM_OBJECT_TYPES               = 19;
-
-  static abstract class Deleter {
-    public abstract void delete(GL2 gl, int obj);
-  }
-
-  static class ObjectList {
-    private static final int MIN_CAPACITY = 4;
-
-    private int size;
-    private int capacity;
-    private int[] data;
-    private Deleter deleter;
-    private String name;
-
-    public ObjectList(Deleter deleter) {
-      this.deleter = deleter;
-      clear();
-    }
-
-    public void add(int obj) {
-      if (size == capacity) {
-        int newCapacity = 2 * capacity;
-        int[] newData = new int[newCapacity];
-        System.arraycopy(data, 0, newData, 0, size);
-        data = newData;
-        capacity = newCapacity;
-      }
-
-      data[size++] = obj;
-    }
-
-    public void addAll(ObjectList other) {
-      if (other == null) {
-        return;
-      }
-      for (int i = 0; i < other.size; i++) {
-        add(other.data[i]);
-      }
-    }
-
-    public boolean remove(int value) {
-      for (int i = 0; i < size; i++) {
-        if (data[i] == value) {
-          if (i < size - 1) {
-            System.arraycopy(data, i+1, data, i, size - i - 1);
-          }
-          --size;
-          if ((size < capacity / 4) &&
-              (capacity > MIN_CAPACITY)) {
-            int newCapacity = capacity / 4;
-            if (newCapacity < MIN_CAPACITY) {
-              newCapacity = MIN_CAPACITY;
-            }
-            int[] newData = new int[newCapacity];
-            System.arraycopy(data, 0, newData, 0, size);
-            data = newData;
-            capacity = newCapacity;
-          }
-          return true;
-        }
-      }
-      return false;
-    }
-
-    public void setName(String name) {
-      if (DEBUG) {
-        this.name = name;
-      }
-    }
-
-    public void delete(GL2 gl) {
-      // Just in case we start throwing exceptions during deletion,
-      // make sure we make progress rather than going into an infinite
-      // loop
-      while (size > 0) {
-        int obj = data[size - 1];
-        --size;
-        if (DEBUG) {
-          System.err.println("Deleting server-side OpenGL object " + obj +
-                             ((name != null) ? (" (" + name + ")") : ""));
-        }
-        deleter.delete(gl, obj);
-      }
-    }
-
-    public void clear() {
-      size = 0;
-      capacity = MIN_CAPACITY;
-      data = new int[capacity];
-    }
-  }
-
-  private ObjectList[] lists = new ObjectList[NUM_OBJECT_TYPES];
-  private int refCount;
-  private boolean dirty;
-
-  private void add(ObjectList list, int n, IntBuffer ids) {
-    int pos = ids.position();
-    for (int i = 0; i < n; i++) {
-      list.add(ids.get(pos + i));
-    }
-  }
-
-  private void add(ObjectList list, int n, int[] ids, int ids_offset) {
-    for (int i = 0; i < n; i++) {
-      list.add(ids[i + ids_offset]);
-    }
-  }
-
-  private void add(ObjectList list, int start, int n) {
-    for (int i = 0; i < n; i++) {
-      list.add(start + i);
-    }
-  }
-
-  private void remove(ObjectList list, int n, IntBuffer ids) {
-    int pos = ids.position();
-    for (int i = 0; i < n; i++) {
-      list.remove(ids.get(pos + i));
-    }
-  }
-
-  private void remove(ObjectList list, int n, int[] ids, int ids_offset) {
-    for (int i = 0; i < n; i++) {
-      list.remove(ids[i + ids_offset]);
-    }
-  }
-
-  private void remove(ObjectList list, int start, int n) {
-    for (int i = 0; i < n; i++) {
-      list.remove(start + i);
-    }
-  }
-
-  private ObjectList getList(int which) {
-    ObjectList list = lists[which];
-    if (list == null) {
-      Deleter deleter = null;
-      String name = null;
-      // Figure out which deleter we need
-      switch (which) {
-        case BUFFERS:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteBuffers(1, new int[] { obj }, 0);
-              }
-            };
-          name = "buffer";
-          break;
-        case BUFFERS_ARB:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteBuffersARB(1, new int[] { obj }, 0);
-              }
-            };
-          name = "ARB buffer";
-          break;
-        case FENCES_APPLE:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteFencesAPPLE(1, new int[] { obj }, 0);
-              }
-            };
-          name = "APPLE fence";
-          break;
-        case FENCES_NV:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteFencesNV(1, new int[] { obj }, 0);
-              }
-            };
-          name = "NV fence";
-          break;
-        case FRAGMENT_SHADERS_ATI:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteFragmentShaderATI(obj);
-              }
-            };
-          name = "ATI fragment shader";
-          break;
-        case FRAMEBUFFERS_EXT:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteFramebuffersEXT(1, new int[] { obj }, 0);
-              }
-            };
-          name = "EXT framebuffer";
-          break;
-        case LISTS:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteLists(obj, 1);
-              }
-            };
-          name = "display list";
-          break;
-        case OCCLUSION_QUERIES_NV:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteOcclusionQueriesNV(1, new int[] { obj }, 0);
-              }
-            };
-          name = "NV occlusion query";
-          break;
-        case PROGRAM_AND_SHADER_OBJECTS_ARB:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteObjectARB(obj);
-              }
-            };
-          name = "ARB program or shader object";
-          break;
-        case PROGRAM_OBJECTS:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteProgram(obj);
-              }
-            };
-          name = "program object";
-          break;
-        case PROGRAMS_ARB:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteProgramsARB(1, new int[] { obj }, 0);
-              }
-            };
-          name = "ARB program object";
-          break;
-        case PROGRAMS_NV:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteProgramsNV(1, new int[] { obj }, 0);
-              }
-            };
-          name = "NV program";
-          break;
-        case QUERIES:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteQueries(1, new int[] { obj }, 0);
-              }
-            };
-          name = "query";
-          break;
-        case QUERIES_ARB:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteQueriesARB(1, new int[] { obj }, 0);
-              }
-            };
-          name = "ARB query";
-          break;
-        case RENDERBUFFERS_EXT:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteRenderbuffersEXT(1, new int[] { obj }, 0);
-              }
-            };
-          name = "EXT renderbuffer";
-          break;
-        case SHADER_OBJECTS:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteShader(obj);
-              }
-            };
-          name = "shader object";
-          break;
-        case TEXTURES:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteTextures(1, new int[] { obj }, 0);
-              }
-            };
-          name = "texture";
-          break;
-        case VERTEX_ARRAYS_APPLE:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteVertexArraysAPPLE(1, new int[] { obj }, 0);
-              }
-            };
-          name = "APPLE vertex array";
-          break;
-        case VERTEX_SHADERS_EXT:
-          deleter = new Deleter() {
-              public void delete(GL2 gl, int obj) {
-                gl.glDeleteVertexShaderEXT(obj);
-              }
-            };
-          name = "EXT vertex shader";
-          break;
-        default:
-          throw new InternalError("Unexpected OpenGL object type " + which);
-      }
-
-      list = new ObjectList(deleter);
-      list.setName(name);
-      lists[which] = list;
-    }
-    return list;
-  }
-
-  private void delete(GL2 gl) {
-    for (int i = 0; i < lists.length; i++) {
-      ObjectList list = lists[i];
-      if (list != null) {
-        list.delete(gl);
-        lists[i] = null;
-      }
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java
deleted file mode 100644
index bd2162efc..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.macosx.cgl;
-
-import java.nio.*;
-import java.util.*;
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
-import com.jogamp.gluegen.runtime.ProcAddressTable;
-
-public abstract class MacOSXCGLContext extends GLContextImpl
-{	
-  protected long nsContext;  // NSOpenGLContext
-  protected long cglContext; // CGLContextObj
-  private CGLExt cglExt;
-  // Table that holds the addresses of the native C-language entry points for
-  // CGL extension functions.
-  private CGLExtProcAddressTable cglExtProcAddressTable;
-  
-  public MacOSXCGLContext(GLDrawableImpl drawable, GLDrawableImpl drawableRead,
-                          GLContext shareWith) {
-    super(drawable, drawableRead, shareWith);
-  }
-
-  public MacOSXCGLContext(GLDrawableImpl drawable,
-                          GLContext shareWith) {
-    this(drawable, null, shareWith);
-  }
-  
-  public Object getPlatformGLExtensions() {
-    return getCGLExt();
-  }
-
-  public CGLExt getCGLExt() {
-    if (cglExt == null) {
-      cglExt = new CGLExtImpl(this);
-    }
-    return cglExt;
-  }
-
-  public final ProcAddressTable getPlatformExtProcAddressTable() {
-    return getCGLExtProcAddressTable();
-  }
-
-  public final CGLExtProcAddressTable getCGLExtProcAddressTable() {
-    return cglExtProcAddressTable;
-  }
-
-  protected String mapToRealGLFunctionName(String glFunctionName)
-  {
-    return glFunctionName;
-  }
-	
-  protected String mapToRealGLExtensionName(String glExtensionName)
-  {
-    return glExtensionName;
-  }
-	
-  protected abstract boolean create();
-
-  /**
-   * Creates and initializes an appropriate OpenGl nsContext. Should only be
-   * called by {@link makeCurrentImpl()}.
-   */
-  protected boolean create(boolean pbuffer, boolean floatingPoint) {
-    MacOSXCGLContext other = (MacOSXCGLContext) GLContextShareSet.getShareContext(this);
-    long share = 0;
-    if (other != null) {
-      share = other.getNSContext();
-      if (share == 0) {
-        throw new GLException("GLContextShareSet returned an invalid OpenGL context");
-      }
-    }
-    MacOSXCGLGraphicsConfiguration config = (MacOSXCGLGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-    GLCapabilities capabilitiesRequested = (GLCapabilities)config.getRequestedCapabilities();
-    GLProfile glProfile = capabilitiesRequested.getGLProfile();
-    if(glProfile.isGL3()) {
-        throw new GLException("GL3 profile currently not supported on MacOSX, due to the lack of a OpenGL 3.1 implementation");
-    }
-    // HACK .. bring in OnScreen/PBuffer selection to the DrawableFactory !!
-    GLCapabilities capabilities = (GLCapabilities) capabilitiesRequested.clone();
-    capabilities.setPBuffer(pbuffer);
-    capabilities.setPbufferFloatingPointBuffers(floatingPoint);
-
-    long pixelFormat = MacOSXCGLGraphicsConfiguration.GLCapabilities2NSPixelFormat(capabilities);
-    if (pixelFormat == 0) {
-      throw new GLException("Unable to allocate pixel format with requested GLCapabilities");
-    }
-    config.setChosenPixelFormat(pixelFormat);
-    try {
-      int[] viewNotReady = new int[1];
-      // Try to allocate a context with this
-      nsContext = CGL.createContext(share,
-                                    drawable.getNativeWindow().getSurfaceHandle(),
-                                    pixelFormat,
-                                    viewNotReady, 0);
-      if (nsContext == 0) {
-        if (viewNotReady[0] == 1) {
-          if (DEBUG) {
-            System.err.println("!!! View not ready for " + getClass().getName());
-          }
-          // View not ready at the window system level -- this is OK
-          return false;
-        }
-        throw new GLException("Error creating NSOpenGLContext with requested pixel format");
-      }
-
-      if (!pbuffer && !capabilities.isBackgroundOpaque()) {
-          // Set the context opacity
-          CGL.setContextOpacity(nsContext, 0);
-      }
-
-      GLCapabilities caps = MacOSXCGLGraphicsConfiguration.NSPixelFormat2GLCapabilities(glProfile, pixelFormat);
-      config.setChosenCapabilities(caps);
-    } finally {
-      CGL.deletePixelFormat(pixelFormat);
-    }
-    if (!CGL.makeCurrentContext(nsContext)) {
-      throw new GLException("Error making nsContext current");
-    }
-    setGLFunctionAvailability(true);
-    GLContextShareSet.contextCreated(this);
-    return true;
-  }    
-	
-  protected int makeCurrentImpl() throws GLException {
-    if (0 == cglContext && drawable.getNativeWindow().getSurfaceHandle() == 0) {
-        if (DEBUG) {
-          System.err.println("drawable not properly initialized");
-        }
-        return CONTEXT_NOT_CURRENT;
-    }
-    boolean created = false;
-    if ( 0 == cglContext && 0 == nsContext) {
-      if (!create()) {
-        return CONTEXT_NOT_CURRENT;
-      }
-      if (DEBUG) {
-        System.err.println("!!! Created OpenGL context " + toHexString(nsContext) + " for " + getClass().getName());
-      }
-      created = true;
-    }
-            
-    if ( 0 != cglContext ) {
-        if (CGL.kCGLNoError != CGL.CGLSetCurrentContext(cglContext)) {
-          throw new GLException("Error making cglContext current");
-        }
-    } else {
-        if (!CGL.makeCurrentContext(nsContext)) {
-          throw new GLException("Error making nsContext current");
-        }
-    }
-            
-    if (created) {
-      setGLFunctionAvailability(false);
-      return CONTEXT_CURRENT_NEW;
-    }
-    return CONTEXT_CURRENT;
-  }
-	
-  protected void releaseImpl() throws GLException {
-    if ( 0 != cglContext ) {
-        CGL.CGLReleaseContext(cglContext);
-    } else {
-        if (!CGL.clearCurrentContext(nsContext)) {
-          throw new GLException("Error freeing OpenGL nsContext");
-        }
-    }
-  }
-	
-  protected void destroyImpl() throws GLException {
-    boolean hadContext = isCreated();
-    if ( 0 != cglContext ) {
-      if (CGL.kCGLNoError != CGL.CGLDestroyContext(cglContext)) {
-        throw new GLException("Unable to delete OpenGL cglContext");
-      }
-      if (DEBUG) {
-        System.err.println("!!! Destroyed OpenGL cglContext " + cglContext);
-      }
-      cglContext = 0;
-      GLContextShareSet.contextDestroyed(this);
-    } else if ( 0 != nsContext ) {
-      if (!CGL.deleteContext(nsContext)) {
-        throw new GLException("Unable to delete OpenGL nsContext");
-      }
-      if (DEBUG) {
-        System.err.println("!!! Destroyed OpenGL nsContext " + nsContext);
-      }
-      nsContext = 0;
-    }
-    if(hadContext) {
-      GLContextShareSet.contextDestroyed(this);
-    }
-  }
-
-  public boolean isCreated() {
-    return 0 != cglContext || 0 != nsContext ;
-  }
-	
-  public void copy(GLContext source, int mask) throws GLException {
-    long dst = getCGLContext();
-    long src = 0;
-    if( 0 != dst ) {
-        src = ((MacOSXCGLContext) source).getCGLContext();
-        if (src == 0) {
-          throw new GLException("Source OpenGL cglContext has not been created ; Destination has a cglContext.");
-        }
-        CGL.CGLCopyContext(src, dst, mask);
-    } else {
-        dst = getNSContext();
-        src = ((MacOSXCGLContext) source).getNSContext();
-        if (src == 0) {
-          throw new GLException("Source OpenGL nsContext has not been created");
-        }
-        if (dst == 0) {
-          throw new GLException("Destination OpenGL nsContext has not been created");
-        }
-        CGL.copyContext(dst, src, mask);
-    }
-  }
-
-  protected void updateGLProcAddressTable() {
-    if (DEBUG) {
-      System.err.println("!!! Initializing CGL extension address table");
-    }
-    if (cglExtProcAddressTable == null) {
-      // FIXME: cache ProcAddressTables by capability bits so we can
-      // share them among contexts with the same capabilities
-      cglExtProcAddressTable = new CGLExtProcAddressTable();
-    }          
-    resetProcAddressTable(getCGLExtProcAddressTable());
-    super.updateGLProcAddressTable();
-  }
-	
-  public String getPlatformExtensionsString()
-  {
-    return "";
-  }
-	
-  protected void setSwapIntervalImpl(int interval) {
-    if ( 0 != cglContext ) {
-        int[] lval = new int[] { (int) interval } ;
-        CGL.CGLSetParameter(cglContext, CGL.kCGLCPSwapInterval, lval, 0);
-    } else if ( 0 != nsContext ) {
-        CGL.setSwapInterval(nsContext, interval);
-    } else {
-      throw new GLException("OpenGL context not current");
-    }
-    currentSwapInterval = interval ;
-  }
-
-  public ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3) {
-    // FIXME: apparently the Apple extension doesn't require a custom memory allocator
-    throw new GLException("Not yet implemented");
-  }
-
-  public boolean isFunctionAvailable(String glFunctionName)
-  {
-    return super.isFunctionAvailable(glFunctionName);
-  }
-  
-  public boolean isExtensionAvailable(String glExtensionName) {
-    if (glExtensionName.equals("GL_ARB_pbuffer") ||
-        glExtensionName.equals("GL_ARB_pixel_format")) {
-      return true;
-    }
-    return super.isExtensionAvailable(glExtensionName);
-  }
-  
-  public int getOffscreenContextPixelDataType() {
-    throw new GLException("Should not call this");
-  }
-
-  public int getOffscreenContextReadBuffer() {
-    throw new GLException("Should not call this");
-  }
-
-  public boolean offscreenImageNeedsVerticalFlip() {
-    throw new GLException("Should not call this");
-  }
-
-  public void bindPbufferToTexture() {
-    throw new GLException("Should not call this");
-  }
-    
-  public void releasePbufferFromTexture() {
-    throw new GLException("Should not call this");
-  }
-    
-  // Support for "mode switching" as described in MacOSXCGLDrawable
-  public abstract void setOpenGLMode(int mode);
-  public abstract int  getOpenGLMode();
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-	
-  public long getCGLContext() {
-    return cglContext;
-  }
-  public long getNSContext() {
-    return nsContext;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
deleted file mode 100644
index 14df40ef1..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.macosx.cgl;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
-
-public abstract class MacOSXCGLDrawable extends GLDrawableImpl {
-  // The Java2D/OpenGL pipeline on OS X uses low-level CGLContextObjs
-  // to represent the contexts for e.g. the Java2D back buffer. When
-  // the Java2D/JOGL bridge is active, this means that if we want to
-  // be able to share textures and display lists with the Java2D
-  // contexts, we need to use the CGL APIs rather than the NSOpenGL
-  // APIs on the JOGL side. For example, if we create a pbuffer using
-  // the NSOpenGL APIs and want to share textures and display lists
-  // between it and the Java2D back buffer, there is no way to do so,
-  // because the Java2D context is actually a CGLContextObj and the
-  // NSOpenGLContext's initWithFormat:shareContext: only accepts an
-  // NSOpenGLContext as its second argument. Of course there is no way
-  // to wrap an NSOpenGLContext around an arbitrary CGLContextObj.
-  //
-  // The situation we care most about is allowing a GLPbuffer to share
-  // textures, etc. with a GLJPanel when the Java2D/JOGL bridge is
-  // active; several of the demos rely on this functionality. We aim
-  // to get there by allowing a GLPBuffer to switch its implementation
-  // between using an NSOpenGLPixelBuffer and a CGLPBufferObj. In
-  // order to track whether this has been done we need to have the
-  // notion of a "mode" of both the MacOSXCGLDrawable and the
-  // MacOSXGLContext. Initially the mode is "unspecified", meaning it
-  // leans toward the default (NSOpenGL). If sharing is requested
-  // between either a GLJPanel and a GLPbuffer or a GLCanvas and a
-  // GLPbuffer, the GLPbuffer will be switched into the appropriate
-  // mode: CGL mode for a GLJPanel and NSOpenGL mode for a GLCanvas.
-  // To avoid thrashing we support exactly one such switch during the
-  // lifetime of a given GLPbuffer. This is not a fully general
-  // solution (for example, you can't share textures among a
-  // GLPbuffer, a GLJPanel and a GLCanvas simultaneously) but should
-  // be enough to get things off the ground.
-  public static final int NSOPENGL_MODE = 1;
-  public static final int CGL_MODE      = 2;
-
-  public MacOSXCGLDrawable(GLDrawableFactory factory, NativeWindow comp, boolean realized) {
-    super(factory, comp, realized);
- }
-
-  protected void setRealizedImpl() {
-    if(realized) {
-        if( NativeWindow.LOCK_SURFACE_NOT_READY == lockSurface() ) {
-            throw new GLException("Couldn't lock surface");
-        }
-        try {
-            // don't remove this block .. locking the surface is essential to update surface data
-        } finally {
-            unlockSurface();
-        }
-    }
-  }
-
-  public DynamicLookupHelper getDynamicLookupHelper() {
-    return (MacOSXCGLDrawableFactory) getFactoryImpl() ;
-  }
-
-  protected static String getThreadName() {
-    return Thread.currentThread().getName();
-  }
-
-  // Support for "mode switching" as per above
-  public abstract void setOpenGLMode(int mode);
-  public abstract int  getOpenGLMode();
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
deleted file mode 100644
index 928bc8151..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.macosx.cgl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.nio.*;
-import java.util.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.*;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
-
-public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
-  public MacOSXCGLDrawableFactory() {
-    super();
-
-    // Register our GraphicsConfigurationFactory implementations
-    // The act of constructing them causes them to be registered
-    new MacOSXCGLGraphicsConfigurationFactory();
-
-    try {
-      NWReflection.createInstance("com.sun.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLGraphicsConfigurationFactory",
-                                  new Object[] {});
-    } catch (Throwable t) { }
-  }
-
-  public GLDrawableImpl createOnscreenDrawable(NativeWindow target) {
-    if (target == null) {
-      throw new IllegalArgumentException("Null target");
-    }
-    return new MacOSXOnscreenCGLDrawable(this, target);
-  }
-
-  protected GLDrawableImpl createOffscreenDrawable(NativeWindow target) {
-    return new MacOSXOffscreenCGLDrawable(this, target);
-  }
-
-  public boolean canCreateGLPbuffer() {
-    return true;
-  }
-
-  protected GLDrawableImpl createGLPbufferDrawableImpl(final NativeWindow target) {
-    /** 
-     * FIXME: Think about this ..
-     * should not be necessary ? ..
-    final List returnList = new ArrayList();
-    final GLDrawableFactory factory = this;
-    Runnable r = new Runnable() {
-        public void run() {
-          returnList.add(new MacOSXPbufferCGLDrawable(factory, target));
-        }
-      };
-    maybeDoSingleThreadedWorkaround(r);
-    return (GLDrawableImpl) returnList.get(0);
-    */
-    return new MacOSXPbufferCGLDrawable(this, target);
-  }
-
-  protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
-    AbstractGraphicsScreen screen = DefaultGraphicsScreen.createDefault();
-    NullWindow nw = new NullWindow(MacOSXCGLGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(capabilities, chooser, screen, true));
-    nw.setSize(width, height);
-    return nw;
-  }
-
-  public GLContext createExternalGLContext() {
-    return MacOSXExternalCGLContext.create(this, null);
-  }
-
-  public boolean canCreateExternalGLDrawable() {
-    return false;
-  }
-
-  public GLDrawable createExternalGLDrawable() {
-    // FIXME
-    throw new GLException("Not yet implemented");
-  }
-
-  public void loadGLULibrary() {
-    // Nothing to do; already loaded by native code; not much point in
-    // making it lazier on this platform
-  }
-
-  public long dynamicLookupFunction(String glFuncName) {
-    return CGL.getProcAddress(glFuncName);
-  }
-
-  public boolean canCreateContextOnJava2DSurface() {
-    return false;
-  }
-
-  public GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
-    throws GLException {
-    throw new GLException("not supported in non AWT enviroment");
-  }
-  
-  //------------------------------------------------------
-  // Gamma-related functionality
-  //
-
-  private static final int GAMMA_RAMP_LENGTH = 256;
-
-  /** Returns the length of the computed gamma ramp for this OS and
-      hardware. Returns 0 if gamma changes are not supported. */
-  protected int getGammaRampLength() {
-    return GAMMA_RAMP_LENGTH;
-  }
-
-  protected boolean setGammaRamp(float[] ramp) {
-    return CGL.setGammaRamp(ramp.length,
-                            ramp, 0,
-                            ramp, 0,
-                            ramp, 0);
-  }
-
-  protected Buffer getGammaRamp() {
-    return null;
-  }
-
-  protected void resetGammaRamp(Buffer originalGammaRamp) {
-    CGL.resetGammaRamp();
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
deleted file mode 100644
index 6bfa41167..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.macosx.cgl;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-
-public class MacOSXCGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
-    long pixelformat;
-
-    public MacOSXCGLGraphicsConfiguration(AbstractGraphicsScreen screen, GLCapabilities capsChosen, GLCapabilities capsRequested,
-                                          long pixelformat) {
-        super(screen, capsChosen, capsRequested);
-        this.pixelformat=pixelformat;
-    }
-
-    public Object clone() {
-        return super.clone();
-    }
-
-    protected void setChosenPixelFormat(long pixelformat) {
-        this.pixelformat=pixelformat;
-    }
-
-    protected void setChosenCapabilities(GLCapabilities caps) {
-        super.setChosenCapabilities(caps);
-    }
-
-    protected static final int[] cglInternalAttributeToken = new int[] {
-        CGL.kCGLPFAColorFloat,
-        CGL.NSOpenGLPFAPixelBuffer,
-        CGL.NSOpenGLPFADoubleBuffer,
-        CGL.NSOpenGLPFAStereo,
-        CGL.NSOpenGLPFAColorSize,
-        CGL.NSOpenGLPFAAlphaSize,
-        CGL.NSOpenGLPFADepthSize,
-        CGL.NSOpenGLPFAAccumSize,
-        CGL.NSOpenGLPFAStencilSize,
-        CGL.NSOpenGLPFASampleBuffers,
-        CGL.NSOpenGLPFASamples };
-
-    protected static int[] GLCapabilities2AttribList(GLCapabilities caps) {
-        int[] ivalues = new int[cglInternalAttributeToken.length];
-
-        for (int idx = 0; idx < cglInternalAttributeToken.length; idx++) {
-          int attr = cglInternalAttributeToken[idx];
-          switch (attr) {
-              case CGL.kCGLPFAColorFloat:
-                ivalues[idx] = caps.getPbufferFloatingPointBuffers() ? 1 : 0;
-                break;
-
-              case CGL.NSOpenGLPFAPixelBuffer:
-                ivalues[idx] = caps.isPBuffer() ? 1 : 0;
-                break;
-
-              case CGL.NSOpenGLPFADoubleBuffer:
-                ivalues[idx] = (caps.getDoubleBuffered() ? 1 : 0);
-                break;
-
-              case CGL.NSOpenGLPFAStereo:
-                ivalues[idx] = (caps.getStereo() ? 1 : 0);
-                break;
-
-              case CGL.NSOpenGLPFAColorSize:
-                ivalues[idx] = (caps.getRedBits() + caps.getGreenBits() + caps.getBlueBits());
-                break;
-
-              case CGL.NSOpenGLPFAAlphaSize:
-                ivalues[idx] = caps.getAlphaBits();
-                break;
-
-              case CGL.NSOpenGLPFADepthSize:
-                ivalues[idx] = caps.getDepthBits();
-                break;
-
-              case CGL.NSOpenGLPFAAccumSize:
-                ivalues[idx] = (caps.getAccumRedBits() + caps.getAccumGreenBits() + caps.getAccumBlueBits() + caps.getAccumAlphaBits());
-                break;
-
-              case CGL.NSOpenGLPFAStencilSize:
-                ivalues[idx] = caps.getStencilBits();
-                break;
-
-              case CGL.NSOpenGLPFASampleBuffers:
-                ivalues[idx] = caps.getSampleBuffers() ? 1 : 0;
-                break;
-
-              case CGL.NSOpenGLPFASamples:
-                ivalues[idx] = caps.getSampleBuffers() ? ivalues[idx] = caps.getNumSamples() : 0;
-                break;
-
-              default:
-                break;
-          }
-        }
-        return ivalues;
-    }
-
-    protected static long GLCapabilities2NSPixelFormat(GLCapabilities caps) {
-        int[] ivalues = GLCapabilities2AttribList(caps);
-        return CGL.createPixelFormat(cglInternalAttributeToken, 0, cglInternalAttributeToken.length, ivalues, 0);
-    }
-
-    protected static GLCapabilities NSPixelFormat2GLCapabilities(GLProfile glp, long pixelFormat) {
-        return PixelFormat2GLCapabilities(glp, pixelFormat, true);
-    }
-
-    protected static GLCapabilities CGLPixelFormat2GLCapabilities(GLProfile glp, long pixelFormat) {
-        return PixelFormat2GLCapabilities(glp, pixelFormat, false);
-    }
-
-    private static GLCapabilities PixelFormat2GLCapabilities(GLProfile glp, long pixelFormat, boolean nsUsage) {
-        int[] ivalues = new int[cglInternalAttributeToken.length];
-
-        // On this platform the pixel format is associated with the
-        // context and not the drawable. However it's a reasonable
-        // approximation to just store the chosen pixel format up in the
-        // NativeWindow's AbstractGraphicsConfiguration, 
-        // since the public API doesn't provide for a different GLCapabilities per context.
-        // Note: These restrictions of the platform's API might be considered as a bug anyways.
-
-        // Figure out what attributes we really got
-        GLCapabilities caps = new GLCapabilities(glp);
-        if(nsUsage) {
-            CGL.queryPixelFormat(pixelFormat, cglInternalAttributeToken, 0, cglInternalAttributeToken.length, ivalues, 0);
-        } else {
-            CGL.CGLQueryPixelFormat(pixelFormat, cglInternalAttributeToken, 0, cglInternalAttributeToken.length, ivalues, 0);
-        }
-        for (int i = 0; i < cglInternalAttributeToken.length; i++) {
-          int attr = cglInternalAttributeToken[i];
-          switch (attr) {
-              case CGL.kCGLPFAColorFloat:
-                caps.setPbufferFloatingPointBuffers(ivalues[i] != 0);
-                break;
-
-              case CGL.NSOpenGLPFAPixelBuffer:
-                caps.setPBuffer(ivalues[i] != 0);
-                break;
-
-              case CGL.NSOpenGLPFADoubleBuffer:
-                caps.setDoubleBuffered(ivalues[i] != 0);
-                break;
-
-              case CGL.NSOpenGLPFAStereo:
-                caps.setStereo(ivalues[i] != 0);
-                break;
-
-              case CGL.NSOpenGLPFAColorSize:
-                {
-                  int bitSize = ivalues[i];
-                  if (bitSize == 32)
-                    bitSize = 24;
-                  bitSize /= 3;
-                  caps.setRedBits(bitSize);
-                  caps.setGreenBits(bitSize);
-                  caps.setBlueBits(bitSize);
-                }
-                break;
-
-              case CGL.NSOpenGLPFAAlphaSize:
-                caps.setAlphaBits(ivalues[i]);
-                break;
-
-              case CGL.NSOpenGLPFADepthSize:
-                caps.setDepthBits(ivalues[i]);
-                break;
-
-              case CGL.NSOpenGLPFAAccumSize:
-                {
-                  int bitSize = ivalues[i] / 4;
-                  caps.setAccumRedBits(bitSize);
-                  caps.setAccumGreenBits(bitSize);
-                  caps.setAccumBlueBits(bitSize);
-                  caps.setAccumAlphaBits(bitSize);
-                }
-                break;
-
-              case CGL.NSOpenGLPFAStencilSize:
-                caps.setStencilBits(ivalues[i]);
-                break;
-
-              case CGL.NSOpenGLPFASampleBuffers:
-                caps.setSampleBuffers(ivalues[i] != 0);
-                break;
-
-              case CGL.NSOpenGLPFASamples:
-                caps.setNumSamples(ivalues[i]);
-                break;
-
-              default:
-                break;
-          }
-        }
-
-        return caps;
-      }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
deleted file mode 100644
index 7c2c7b751..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.opengl.impl.macosx.cgl;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.macosx.*;
-import com.sun.nativewindow.impl.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-/** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
-    are used on OSX platforms. Toolkits will likely need to delegate
-    to this one to change the accepted and returned types of the
-    GraphicsDevice and GraphicsConfiguration abstractions. */
-
-public class MacOSXCGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
-    protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("GraphicsConfiguration");
-
-    public MacOSXCGLGraphicsConfigurationFactory() {
-        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.macosx.MacOSXGraphicsDevice.class, this);
-    }
-
-    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
-                                                                     CapabilitiesChooser chooser,
-                                                                     AbstractGraphicsScreen absScreen) {
-        return chooseGraphicsConfigurationStatic(capabilities, chooser, absScreen, false);
-    }
-
-    protected static MacOSXCGLGraphicsConfiguration chooseGraphicsConfigurationStatic(Capabilities capabilities,
-                                                                                   CapabilitiesChooser chooser,
-                                                                                   AbstractGraphicsScreen absScreen, boolean usePBuffer) {
-        if (absScreen == null) {
-            throw new IllegalArgumentException("AbstractGraphicsScreen is null");
-        }
-
-        if (capabilities != null &&
-            !(capabilities instanceof GLCapabilities)) {
-            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilities objects");
-        }
-
-        if (chooser != null &&
-            !(chooser instanceof GLCapabilitiesChooser)) {
-            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilitiesChooser objects");
-        }
-
-        if (capabilities == null) {
-            capabilities = new GLCapabilities(null);
-        }
-
-        return new MacOSXCGLGraphicsConfiguration(absScreen, (GLCapabilities)capabilities, (GLCapabilities)capabilities, 0);
-    }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
deleted file mode 100644
index 0e468e5c5..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.macosx.cgl;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-import javax.media.nativewindow.*;
-import com.sun.nativewindow.impl.NullWindow;
-
-public class MacOSXExternalCGLContext extends MacOSXCGLContext {
-  private boolean firstMakeCurrent = true;
-  private boolean created = true;
-  private GLContext lastContext;
-
-  private MacOSXExternalCGLContext(Drawable drawable, long cglContext, long nsContext) {
-    super(drawable, null);
-    drawable.setExternalCGLContext(this);
-    this.cglContext = cglContext;
-    this.nsContext = nsContext;
-    GLContextShareSet.contextCreated(this);
-    setGLFunctionAvailability(false);
-    getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
-  }
-
-  protected static MacOSXExternalCGLContext create(GLDrawableFactory factory, GLProfile glp) {
-    ((GLDrawableFactoryImpl)factory).lockToolkit();
-    try {
-        long pixelFormat = 0;
-        long currentDrawable = 0;
-        long cglContext = 0;
-        long nsContext = CGL.getCurrentContext(); // Check: MacOSX 10.3 ..
-        if( 0 != nsContext ) {
-            currentDrawable = CGL.getNSView(nsContext);
-            long ctx = CGL.getCGLContext(nsContext);
-            if (ctx == 0) {
-              throw new GLException("Error: NULL cglContext of nsContext 0x" +Long.toHexString(nsContext));
-            }
-            pixelFormat = CGL.CGLGetPixelFormat(ctx);
-            if(DEBUG) {
-                System.err.println("MacOSXExternalCGLContext Create nsContext 0x"+Long.toHexString(nsContext)+
-                                   ", cglContext 0x"+Long.toHexString(ctx)+
-                                   ", pixelFormat 0x"+Long.toHexString(pixelFormat));
-            }
-        } else {
-            cglContext = CGL.CGLGetCurrentContext();
-            if (cglContext == 0) {
-              throw new GLException("Error: current cglContext null, no nsContext");
-            }
-            pixelFormat = CGL.CGLGetPixelFormat(cglContext);
-            if(DEBUG) {
-                System.err.println("MacOSXExternalCGLContext Create cglContext 0x"+Long.toHexString(cglContext)+
-                                   ", pixelFormat 0x"+Long.toHexString(pixelFormat));
-            }
-        }
-
-        if (0 == pixelFormat) {
-          throw new GLException("Error: current pixelformat of current cglContext 0x"+Long.toHexString(cglContext)+" is null");
-        }
-        GLCapabilities caps = MacOSXCGLGraphicsConfiguration.CGLPixelFormat2GLCapabilities(glp, pixelFormat);
-        if(DEBUG) {
-            System.err.println("MacOSXExternalCGLContext Create "+caps);
-        }
-
-        AbstractGraphicsScreen aScreen = DefaultGraphicsScreen.createDefault();
-        MacOSXCGLGraphicsConfiguration cfg = new MacOSXCGLGraphicsConfiguration(aScreen, caps, caps, pixelFormat);
-
-        NullWindow nw = new NullWindow(cfg);
-        nw.setSurfaceHandle(currentDrawable); 
-        return new MacOSXExternalCGLContext(new Drawable(factory, nw), cglContext, nsContext);
-    } finally {
-        ((GLDrawableFactoryImpl)factory).unlockToolkit();
-    }
-  }
-
-  protected boolean create() {
-    return true;
-  }
-
-  public int makeCurrent() throws GLException {
-    // Save last context if necessary to allow external GLContexts to
-    // talk to other GLContexts created by this library
-    GLContext cur = getCurrent();
-    if (cur != null && cur != this) {
-      lastContext = cur;
-      setCurrent(null);
-    }
-    return super.makeCurrent();
-  }  
-
-  protected void swapBuffers() {
-    DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-    GLCapabilities caps = (GLCapabilities)config.getChosenCapabilities();
-    if(caps.isOnscreen()) {
-        if (CGL.kCGLNoError != CGL.CGLFlushDrawable(cglContext)) {
-          throw new GLException("Error swapping buffers");
-        }
-    }
-  }
-
-  public void release() throws GLException {
-    super.release();
-    setCurrent(lastContext);
-    lastContext = null;
-  }
-
-  protected int makeCurrentImpl() throws GLException {
-    if (firstMakeCurrent) {
-      firstMakeCurrent = false;
-      return CONTEXT_CURRENT_NEW;
-    }
-    return CONTEXT_CURRENT;
-  }
-
-  protected void releaseImpl() throws GLException {
-  }
-
-  protected void destroyImpl() throws GLException {
-    created = false;
-    GLContextShareSet.contextDestroyed(this);
-  }
-
-  public boolean isCreated() {
-    return created;
-  }
-
-  public void setOpenGLMode(int mode) {
-    if (mode != MacOSXCGLDrawable.CGL_MODE)
-      throw new GLException("OpenGL mode switching not supported for external GLContexts");
-  }
-    
-  public int  getOpenGLMode() {
-    return MacOSXCGLDrawable.CGL_MODE;
-  }
-
-  // Need to provide the display connection to extension querying APIs
-  static class Drawable extends MacOSXCGLDrawable {
-    MacOSXExternalCGLContext extCtx;
-
-    Drawable(GLDrawableFactory factory, NativeWindow comp) {
-      super(factory, comp, true);
-    }
-
-    void setExternalCGLContext(MacOSXExternalCGLContext externalContext) {
-      extCtx = externalContext;
-    }
-
-    public GLContext createContext(GLContext shareWith) {
-      throw new GLException("Should not call this");
-    }
-
-    public int getWidth() {
-      throw new GLException("Should not call this");
-    }
-
-    public int getHeight() {
-      throw new GLException("Should not call this");
-    }
-
-    public void setSize(int width, int height) {
-      throw new GLException("Should not call this");
-    }
-
-    protected void swapBuffersImpl() {
-      if (extCtx != null) {
-        extCtx.swapBuffers();
-      }
-    }
-  
-    public void setOpenGLMode(int mode) {
-        if (mode != CGL_MODE)
-          throw new GLException("OpenGL mode switching not supported for external GLContext's drawables");
-    }
-
-    public int  getOpenGLMode() {
-        return CGL_MODE;
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
deleted file mode 100644
index b60c48237..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.macosx.cgl;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-public class MacOSXOffscreenCGLContext extends MacOSXPbufferCGLContext
-{  
-  public MacOSXOffscreenCGLContext(MacOSXPbufferCGLDrawable drawable,
-                                  GLContext shareWith) {
-    super(drawable, shareWith);
-  }
-	
-  public int getOffscreenContextPixelDataType() {
-    GL gl = getGL();
-    return gl.isGL2()?GL2.GL_UNSIGNED_INT_8_8_8_8_REV:GL.GL_UNSIGNED_SHORT_5_5_5_1;
-  }
-
-  public int getOffscreenContextReadBuffer() {
-    return GL.GL_FRONT;
-  }
-
-  public boolean offscreenImageNeedsVerticalFlip() {
-    return true;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java
deleted file mode 100644
index 3448b008a..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.macosx.cgl;
-
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
-
-public class MacOSXOffscreenCGLDrawable extends MacOSXPbufferCGLDrawable {
-
-  public MacOSXOffscreenCGLDrawable(GLDrawableFactory factory,
-                                    NativeWindow target) {
-    super(factory, target);
-  }
-
-  public GLContext createContext(GLContext shareWith) {
-    return new MacOSXOffscreenCGLContext(this, shareWith);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
deleted file mode 100644
index 4a3e0a8eb..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.macosx.cgl;
-
-import java.util.*;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-public class MacOSXOnscreenCGLContext extends MacOSXCGLContext {
-  protected MacOSXOnscreenCGLDrawable drawable;
-
-  public MacOSXOnscreenCGLContext(MacOSXOnscreenCGLDrawable drawable,
-                                 GLContext shareWith) {
-    super(drawable, shareWith);
-    this.drawable = drawable;
-  }
-
-  protected int makeCurrentImpl() throws GLException {
-    int lockRes = drawable.lockSurface();
-    boolean exceptionOccurred = false;
-    try {
-      if (lockRes == NativeWindow.LOCK_SURFACE_NOT_READY) {
-        return CONTEXT_NOT_CURRENT;
-      }
-      int ret = super.makeCurrentImpl();
-      if ((ret == CONTEXT_CURRENT) ||
-          (ret == CONTEXT_CURRENT_NEW)) {
-        // Assume the canvas might have been resized or moved and tell the OpenGL
-        // context to update itself. This used to be done only upon receiving a
-        // reshape event but that doesn't appear to be sufficient. An experiment
-        // was also done to add a HierarchyBoundsListener to the GLCanvas and
-        // do this updating only upon reshape of this component or reshape or movement
-        // of an ancestor, but this also wasn't sufficient and left garbage on the
-        // screen in some situations.
-        CGL.updateContext(nsContext);
-      } else {
-        if (!isOptimizable()) {
-          // This can happen if the window currently is zero-sized, for example.
-          // Make sure we don't leave the surface locked in this case.
-          drawable.unlockSurface();
-          lockRes = NativeWindow.LOCK_SURFACE_NOT_READY;
-        }
-      }
-      return ret;
-    } catch (RuntimeException e) {
-      exceptionOccurred = true;
-      throw e;
-    } finally {
-      if (exceptionOccurred ||
-          (isOptimizable() && lockRes != NativeWindow.LOCK_SURFACE_NOT_READY)) {
-        drawable.unlockSurface();
-      }
-    }
-  }
-    
-  protected void releaseImpl() throws GLException {
-    try {
-      super.releaseImpl();
-    } finally {
-      if (!isOptimizable() && drawable.isSurfaceLocked()) {
-        drawable.unlockSurface();
-      }
-    }
-  }
-
-  protected void swapBuffers() {
-    if (!CGL.flushBuffer(nsContext)) {
-      throw new GLException("Error swapping buffers");
-    }
-  }
-
-  protected void update() throws GLException {
-    if (nsContext == 0) {
-      throw new GLException("Context not created");
-    }
-    CGL.updateContext(nsContext);
-  }
-
-  protected boolean create() {
-    return create(false, false);
-  }
-
-  public void setOpenGLMode(int mode) {
-    if (mode != MacOSXCGLDrawable.NSOPENGL_MODE)
-      throw new GLException("OpenGL mode switching not supported for on-screen GLContexts");
-  }
-    
-  public int  getOpenGLMode() {
-    return MacOSXCGLDrawable.NSOPENGL_MODE;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java
deleted file mode 100644
index 56951ae10..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.macosx.cgl;
-
-import java.lang.ref.WeakReference;
-import java.security.*;
-import java.util.*;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-public class MacOSXOnscreenCGLDrawable extends MacOSXCGLDrawable {
-  private List/*<WeakReference<GLContext>>*/ createdContexts =
-    new ArrayList();
-
-  protected MacOSXOnscreenCGLDrawable(GLDrawableFactory factory, NativeWindow component) {
-    super(factory, component, false);
-  }
-
-  public GLContext createContext(GLContext shareWith) {
-    MacOSXOnscreenCGLContext context =
-      new MacOSXOnscreenCGLContext(this, shareWith);
-    // NOTE: we need to keep track of the created contexts in order to
-    // implement swapBuffers() because of how Mac OS X implements its
-    // OpenGL window interface
-    synchronized (this) {
-      List newContexts = new ArrayList();
-      newContexts.addAll(createdContexts);
-      newContexts.add(new WeakReference(context));
-      createdContexts = newContexts;
-    }
-    return context;
-  }
-
-  public int getWidth() {
-    return component.getWidth();
-  }
-
-  public int getHeight() {
-    return component.getHeight();
-  }
-
-  protected void swapBuffersImpl() {
-    for (Iterator iter = createdContexts.iterator(); iter.hasNext(); ) {
-      WeakReference ref = (WeakReference) iter.next();
-      MacOSXOnscreenCGLContext ctx = (MacOSXOnscreenCGLContext) ref.get();
-      // FIXME: clear out unreachable contexts
-      if (ctx != null) {
-        ctx.swapBuffers();
-      }
-    }
-  }
-  
-  public void setOpenGLMode(int mode) {
-    if (mode != NSOPENGL_MODE)
-      throw new GLException("OpenGL mode switching not supported for on-screen GLDrawables");
-  }
-
-  public int  getOpenGLMode() {
-    return NSOPENGL_MODE;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
deleted file mode 100644
index 0754c4b57..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
+++ /dev/null
@@ -1,359 +0,0 @@
-package com.sun.opengl.impl.macosx.cgl;
-
-import java.security.*;
-import java.util.*;
-
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
-
-public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
-  protected MacOSXPbufferCGLDrawable drawable;
-
-  // State for render-to-texture and render-to-texture-rectangle support
-  private int textureTarget; // e.g. GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE_NV
-  private int texture;       // actual texture object
-
-  private static boolean isTigerOrLater;
-
-  static {
-    String osVersion = Debug.getProperty("os.version", false, AccessController.getContext());
-    StringTokenizer tok = new StringTokenizer(osVersion, ". ");
-    int major = Integer.parseInt(tok.nextToken());
-    int minor = Integer.parseInt(tok.nextToken());
-    isTigerOrLater = ((major > 10) || (minor > 3));
-  }
-
-  public MacOSXPbufferCGLContext(MacOSXPbufferCGLDrawable drawable,
-                                GLContext shareWith) {
-    super(drawable, shareWith);
-    this.drawable = drawable;
-    initOpenGLImpl();
-  }
-
-  public void bindPbufferToTexture() {
-    GL gl = getGL();
-    gl.glBindTexture(textureTarget, texture);
-    // FIXME: not clear whether this is really necessary, but since
-    // the API docs seem to imply it is and since it doesn't seem to
-    // impact performance, leaving it in
-    CGL.setContextTextureImageToPBuffer(nsContext, drawable.getPbuffer(), GL.GL_FRONT);
-  }
-
-  public void releasePbufferFromTexture() {
-  }
-
-  protected int makeCurrentImpl() throws GLException {
-    if (drawable.getPbuffer() == 0) {
-      if (DEBUG) {
-        System.err.println("Pbuffer not instantiated yet for " + this);
-      }
-      // pbuffer not instantiated yet
-      return CONTEXT_NOT_CURRENT;
-    }
-
-    if (getOpenGLMode() != drawable.getOpenGLMode()) {
-      setOpenGLMode(drawable.getOpenGLMode());
-    }
-
-    boolean created = false;
-    if (nsContext == 0) {
-      if (!create()) {
-        return CONTEXT_NOT_CURRENT;
-      }
-      if (DEBUG) {
-        System.err.println("!!! Created OpenGL context " + toHexString(nsContext) + " for " + getClass().getName());
-      }
-      created = true;
-    }
-    
-    if (!impl.makeCurrent(nsContext)) {
-      throw new GLException("Error making nsContext current");
-    }
-            
-    if (created) {
-      setGLFunctionAvailability(false);
-
-      // Initialize render-to-texture support if requested
-      DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-      GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
-      GL gl = getGL();
-      boolean rect = gl.isGL2() && capabilities.getPbufferRenderToTextureRectangle();
-      if (rect) {
-        if (!gl.isExtensionAvailable("GL_EXT_texture_rectangle")) {
-          System.err.println("MacOSXPbufferCGLContext: WARNING: GL_EXT_texture_rectangle extension not " +
-                             "supported; skipping requested render_to_texture_rectangle support for pbuffer");
-          rect = false;
-        }
-      }
-      textureTarget = (rect ? GL2.GL_TEXTURE_RECTANGLE : GL.GL_TEXTURE_2D);
-      int[] tmp = new int[1];
-      gl.glGenTextures(1, tmp, 0);
-      texture = tmp[0];
-      gl.glBindTexture(textureTarget, texture);
-      gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_MIN_FILTER, GL.GL_NEAREST);
-      gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST);
-      gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_WRAP_S, GL.GL_CLAMP_TO_EDGE);
-      gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_WRAP_T, GL.GL_CLAMP_TO_EDGE);
-      gl.glCopyTexImage2D(textureTarget, 0, GL.GL_RGB, 0, 0, drawable.getWidth(), drawable.getHeight(), 0);
-
-      return CONTEXT_CURRENT_NEW;
-    }
-    return CONTEXT_CURRENT;
-  }
-
-  protected void releaseImpl() throws GLException {
-    if (!impl.release(nsContext)) {
-      throw new GLException("Error releasing OpenGL nsContext");
-    }
-  }
-
-  protected void destroyImpl() throws GLException {
-    if (nsContext != 0) {
-      if (!impl.destroy(nsContext)) {
-        throw new GLException("Unable to delete OpenGL context");
-      }
-      if (DEBUG) {
-        System.err.println("!!! Destroyed OpenGL context " + nsContext);
-      }
-      nsContext = 0;
-      GLContextShareSet.contextDestroyed(this);
-    }
-  }
-
-  protected void setSwapIntervalImpl(int interval) {
-    if (nsContext == 0) {
-      throw new GLException("OpenGL context not current");
-    }
-    impl.setSwapInterval(nsContext, interval);
-    currentSwapInterval = impl.getSwapInterval() ;
-  }
-
-  public int getFloatingPointMode() {
-    return GLPbuffer.APPLE_FLOAT;
-  }
-
-  protected boolean create() {
-    DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-    GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
-    if (capabilities.getPbufferFloatingPointBuffers() &&
-	!isTigerOrLater) {
-      throw new GLException("Floating-point pbuffers supported only on OS X 10.4 or later");
-    }
-    // Change our OpenGL mode to match that of any share context before we create ourselves
-    MacOSXCGLContext other = (MacOSXCGLContext) GLContextShareSet.getShareContext(this);
-    if (other != null) {
-      setOpenGLMode(other.getOpenGLMode());
-    }
-    // Will throw exception upon error
-    nsContext = impl.create();
-
-    if (!impl.makeCurrent(nsContext)) {
-      throw new GLException("Error making nsContext current");
-    }
-    setGLFunctionAvailability(true);
-            
-    return true;
-  }
-
-  //---------------------------------------------------------------------------
-  // OpenGL "mode switching" functionality
-  //
-  private boolean haveSetOpenGLMode = false;
-  // FIXME: should consider switching the default mode based on
-  // whether the Java2D/JOGL bridge is active -- need to ask ourselves
-  // whether it's more likely that we will share with a GLCanvas or a
-  // GLJPanel when the bridge is turned on
-  private int     openGLMode = MacOSXCGLDrawable.NSOPENGL_MODE;
-  // Implementation object (either NSOpenGL-based or CGL-based)
-  protected Impl impl;
-
-  public void setOpenGLMode(int mode) {
-    if (mode == openGLMode) {
-      return;
-    }
-    if (haveSetOpenGLMode) {
-      throw new GLException("Can't switch between using NSOpenGLPixelBuffer and CGLPBufferObj more than once");
-    }
-    destroyImpl();
-    drawable.setOpenGLMode(mode);
-    openGLMode = mode;
-    haveSetOpenGLMode = true;
-    if (DEBUG) {
-      System.err.println("Switching PBuffer context mode to " +
-                         ((mode == MacOSXCGLDrawable.NSOPENGL_MODE) ? "NSOPENGL_MODE" : "CGL_MODE"));
-    }
-    initOpenGLImpl();
-  }
-
-  public int  getOpenGLMode() {
-    return openGLMode;
-  }
-
-  private void initOpenGLImpl() {
-    switch (openGLMode) {
-      case MacOSXCGLDrawable.NSOPENGL_MODE:
-        impl = new NSOpenGLImpl();
-        break;
-      case MacOSXCGLDrawable.CGL_MODE:
-        impl = new CGLImpl();
-        break;
-      default:
-        throw new InternalError("Illegal implementation mode " + openGLMode);
-    }
-  }
-
-  // Abstract interface for implementation of this context (either
-  // NSOpenGL-based or CGL-based)
-  interface Impl {
-    public long    create();
-    public boolean destroy(long ctx);
-    public boolean makeCurrent(long ctx);
-    public boolean release(long ctx);
-    public void    setSwapInterval(long ctx, int interval);
-    public int     getSwapInterval();
-  }
-
-  // NSOpenGLContext-based implementation
-  class NSOpenGLImpl implements Impl {
-    public long create() {
-      DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-      GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
-      if (capabilities.getPbufferFloatingPointBuffers() &&
-          !isTigerOrLater) {
-        throw new GLException("Floating-point pbuffers supported only on OS X 10.4 or later");
-      }
-      if (!MacOSXPbufferCGLContext.this.create(true, capabilities.getPbufferFloatingPointBuffers())) {
-        throw new GLException("Error creating context for pbuffer");
-      }
-      // Must now associate the pbuffer with our newly-created context
-      CGL.setContextPBuffer(nsContext, drawable.getPbuffer());
-      return nsContext;
-    }
-
-    public boolean destroy(long ctx) {
-      return CGL.deleteContext(ctx);
-    }
-
-    public boolean makeCurrent(long ctx) {
-      return CGL.makeCurrentContext(ctx);
-    }
-
-    public boolean release(long ctx) {
-      return CGL.clearCurrentContext(ctx);
-    }
-
-    private int currentSwapInterval = 0 ;
-
-    public void setSwapInterval(long ctx, int interval) {
-      CGL.setSwapInterval(ctx, interval);      
-      currentSwapInterval = interval ;
-    }
-    public int getSwapInterval() {
-        return currentSwapInterval;
-    }
-  }
-
-  class CGLImpl implements Impl {
-    public long create() {
-      // Find and configure share context
-      MacOSXCGLContext other = (MacOSXCGLContext) GLContextShareSet.getShareContext(MacOSXPbufferCGLContext.this);
-      long share = 0;
-      if (other != null) {
-        // Reconfigure pbuffer-based GLContexts
-        if (other instanceof MacOSXPbufferCGLContext) {
-          MacOSXPbufferCGLContext ctx = (MacOSXPbufferCGLContext) other;
-          ctx.setOpenGLMode(MacOSXCGLDrawable.CGL_MODE);
-        } else {
-          if (other.getOpenGLMode() != MacOSXCGLDrawable.CGL_MODE) {
-            throw new GLException("Can't share between NSOpenGLContexts and CGLContextObjs");
-          }
-        }
-        share = other.getNSContext();
-        // Note we don't check for a 0 return value, since switching
-        // the context's mode causes it to be destroyed and not
-        // re-initialized until the next makeCurrent
-      }
-
-      // Set up pixel format attributes
-      // FIXME: shall go into MacOSXCGLGraphicsConfiguration
-      int[] attrs = new int[256];
-      int i = 0;
-      attrs[i++] = CGL.kCGLPFAPBuffer;
-      DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-      GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
-      if (capabilities.getPbufferFloatingPointBuffers())
-        attrs[i++] = CGL.kCGLPFAColorFloat;
-      if (capabilities.getDoubleBuffered())
-        attrs[i++] = CGL.kCGLPFADoubleBuffer;
-      if (capabilities.getStereo())
-        attrs[i++] = CGL.kCGLPFAStereo;
-      attrs[i++] = CGL.kCGLPFAColorSize;
-      attrs[i++] = (capabilities.getRedBits() +
-                    capabilities.getGreenBits() +
-                    capabilities.getBlueBits());
-      attrs[i++] = CGL.kCGLPFAAlphaSize;
-      attrs[i++] = capabilities.getAlphaBits();
-      attrs[i++] = CGL.kCGLPFADepthSize;
-      attrs[i++] = capabilities.getDepthBits();
-      // FIXME: should validate stencil size as is done in MacOSXWindowSystemInterface.m
-      attrs[i++] = CGL.kCGLPFAStencilSize;
-      attrs[i++] = capabilities.getStencilBits();
-      attrs[i++] = CGL.kCGLPFAAccumSize;
-      attrs[i++] = (capabilities.getAccumRedBits() +
-                    capabilities.getAccumGreenBits() +
-                    capabilities.getAccumBlueBits() +
-                    capabilities.getAccumAlphaBits());
-      if (capabilities.getSampleBuffers()) {
-        attrs[i++] = CGL.kCGLPFASampleBuffers;
-        attrs[i++] = 1;
-        attrs[i++] = CGL.kCGLPFASamples;
-        attrs[i++] = capabilities.getNumSamples();
-      }
-
-      // Use attribute array to select pixel format
-      long[] fmt = new long[1];
-      long[] numScreens = new long[1];
-      int res = CGL.CGLChoosePixelFormat(attrs, 0, fmt, 0, numScreens, 0);
-      if (res != CGL.kCGLNoError) {
-        throw new GLException("Error code " + res + " while choosing pixel format");
-      }
-      
-      // Create new context
-      long[] ctx = new long[1];
-      if (DEBUG) {
-        System.err.println("Share context for CGL-based pbuffer context is " + toHexString(share));
-      }
-      res = CGL.CGLCreateContext(fmt[0], share, ctx, 0);
-      CGL.CGLDestroyPixelFormat(fmt[0]);
-      if (res != CGL.kCGLNoError) {
-        throw new GLException("Error code " + res + " while creating context");
-      }
-      // Attach newly-created context to the pbuffer
-      res = CGL.CGLSetPBuffer(ctx[0], drawable.getPbuffer(), 0, 0, 0);
-      if (res != CGL.kCGLNoError) {
-        throw new GLException("Error code " + res + " while attaching context to pbuffer");
-      }
-      return ctx[0];
-    }
-    
-    public boolean destroy(long ctx) {
-      return (CGL.CGLDestroyContext(ctx) == CGL.kCGLNoError);
-    }
-
-    public boolean makeCurrent(long ctx) {
-      return CGL.CGLSetCurrentContext(ctx) == CGL.kCGLNoError;
-    }
-
-    public boolean release(long ctx) {
-      return (CGL.CGLSetCurrentContext(0) == CGL.kCGLNoError);
-    }
-
-    public void setSwapInterval(long ctx, int interval) {
-      // For now not supported (not really relevant for off-screen contexts anyway)
-    }
-    public int getSwapInterval() {
-        return 0;
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
deleted file mode 100644
index f57952b7c..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.macosx.cgl;
-
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
-
-public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
-  private static final boolean DEBUG = Debug.debug("MacOSXPbufferCGLDrawable");
-  
-  // State for render-to-texture and render-to-texture-rectangle support
-  private int textureTarget; // e.g. GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE_NV
-  private int texture;       // actual texture object
-
-  // NSOpenGLPbuffer (for normal mode)
-  // CGLPbufferObj (for CGL_MODE situation, i.e., when Java2D/JOGL bridge is active)
-  // Note that we can not store this in the NativeWindow because the
-  // semantic is that contains an NSView
-  protected long pBuffer;
-
-  public MacOSXPbufferCGLDrawable(GLDrawableFactory factory, NativeWindow target) {
-    super(factory, target, true);
-
-    if (DEBUG) {
-        System.out.println("Pbuffer config: " + getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration());
-    }
-
-    initOpenGLImpl();
-    createPbuffer();
-
-    if (DEBUG) {
-        System.err.println("Created pbuffer " + this);
-    }
-  }
-
-  protected void setRealizedImpl() {
-    if(realized) {
-        createPbuffer();
-    } else {
-        destroy();
-    }
-  }
-
-  public GLContext createContext(GLContext shareWith) {
-    return new MacOSXPbufferCGLContext(this, shareWith);
-  }
-
-  public void destroy() {
-    if (this.pBuffer != 0) {
-      NativeWindow nw = getNativeWindow();
-      impl.destroy(pBuffer);
-      this.pBuffer = 0;
-      ((SurfaceChangeable)nw).setSurfaceHandle(0);
-      if (DEBUG) {
-        System.err.println("Destroyed pbuffer: " + pBuffer);
-      }
-    }
-  }
-
-  public long getPbuffer() {
-    return pBuffer;
-  }
-  
-  protected void swapBuffersImpl() {
-    if(DEBUG) {
-        System.err.println("unhandled swapBuffersImpl() called for: "+this);
-    }
-  }
-
-  private void createPbuffer() {
-    NativeWindow nw = getNativeWindow();
-    DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) nw.getGraphicsConfiguration().getNativeGraphicsConfiguration();
-    GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
-    GLProfile glProfile = capabilities.getGLProfile();
-    int renderTarget;
-    if (glProfile.isGL2() && capabilities.getPbufferRenderToTextureRectangle()) {
-      renderTarget = GL2.GL_TEXTURE_RECTANGLE;
-    } else {
-      int w = getNextPowerOf2(getWidth());
-      int h = getNextPowerOf2(getHeight());
-      ((SurfaceChangeable)nw).setSize(w, h);
-      renderTarget = GL.GL_TEXTURE_2D;
-    }
-
-    int internalFormat = GL.GL_RGBA;
-    if (capabilities.getPbufferFloatingPointBuffers()) {
-      // FIXME: want to check availability of GL_APPLE_float_pixels
-      // extension, but need valid OpenGL context in order to do so --
-      // in worst case would need to create dummy window / GLCanvas
-      // (undesirable) -- could maybe also do this with pbuffers
-      /*
-        if (!gl.isExtensionAvailable("GL_APPLE_float_pixels")) {
-        throw new GLException("Floating-point support (GL_APPLE_float_pixels) not available");
-        }
-      */
-      if(glProfile.isGL2()) {
-        switch (capabilities.getRedBits()) {
-        case 16: internalFormat = GL2.GL_RGBA_FLOAT16_APPLE; break;
-        case 32: internalFormat = GL2.GL_RGBA_FLOAT32_APPLE; break;
-        default: throw new GLException("Invalid floating-point bit depth (only 16 and 32 supported)");
-        }
-      } else {
-        internalFormat = GL.GL_RGBA;
-      }
-    }
-            
-    pBuffer = impl.create(renderTarget, internalFormat, getWidth(), getHeight());
-    if (pBuffer == 0) {
-      throw new GLException("pbuffer creation error: CGL.createPBuffer() failed");
-    }
-
-    ((SurfaceChangeable)nw).setSurfaceHandle(pBuffer);
-
-  }
-
-  private int getNextPowerOf2(int number) {
-    if (((number-1) & number) == 0) {
-      //ex: 8 -> 0b1000; 8-1=7 -> 0b0111; 0b1000&0b0111 == 0
-      return number;
-    }
-    int power = 0;
-    while (number > 0) {
-      number = number>>1;
-      power++;
-    }
-    return (1<<power);
-  }
-
-  //---------------------------------------------------------------------------
-  // OpenGL "mode switching" functionality
-  //
-  private boolean haveSetOpenGLMode = false;
-  // FIXME: should consider switching the default mode based on
-  // whether the Java2D/JOGL bridge is active -- need to ask ourselves
-  // whether it's more likely that we will share with a GLCanvas or a
-  // GLJPanel when the bridge is turned on
-  private int     openGLMode = NSOPENGL_MODE;
-  // Implementation object (either NSOpenGL-based or CGL-based)
-  protected Impl impl;
-
-  public void setOpenGLMode(int mode) {
-    if (mode == openGLMode) {
-      return;
-    }
-    if (haveSetOpenGLMode) {
-      throw new GLException("Can't switch between using NSOpenGLPixelBuffer and CGLPBufferObj more than once");
-    }
-    destroy();
-    openGLMode = mode;
-    haveSetOpenGLMode = true;
-    if (DEBUG) {
-      System.err.println("Switching PBuffer drawable mode to " +
-                         ((mode == MacOSXCGLDrawable.NSOPENGL_MODE) ? "NSOPENGL_MODE" : "CGL_MODE"));
-    }
-    initOpenGLImpl();
-    createPbuffer();
-  }
-
-  public int getOpenGLMode() {
-    return openGLMode;
-  }
-
-  private void initOpenGLImpl() {
-    switch (openGLMode) {
-      case NSOPENGL_MODE:
-        impl = new NSOpenGLImpl();
-        break;
-      case CGL_MODE:
-        impl = new CGLImpl();
-        break;
-      default:
-        throw new InternalError("Illegal implementation mode " + openGLMode);
-    }
-  }
-
-  // Abstract interface for implementation of this drawable (either
-  // NSOpenGL-based or CGL-based)
-  interface Impl {
-    public long create(int renderTarget, int internalFormat, int width, int height);
-    public void destroy(long pbuffer);
-  }
-
-  // NSOpenGLPixelBuffer implementation
-  class NSOpenGLImpl implements Impl {
-    public long create(int renderTarget, int internalFormat, int width, int height) {
-      return CGL.createPBuffer(renderTarget, internalFormat, width, height);
-    }
-
-    public void destroy(long pbuffer) {
-      CGL.destroyPBuffer(pbuffer);
-    }
-  }
-
-  // CGL implementation
-  class CGLImpl implements Impl {
-    public long create(int renderTarget, int internalFormat, int width, int height) {
-      long[] pbuffer = new long[1];
-      int res = CGL.CGLCreatePBuffer(width, height, renderTarget, internalFormat, 0, pbuffer, 0);
-      if (res != CGL.kCGLNoError) {
-        throw new GLException("Error creating CGL-based pbuffer: error code " + res);
-      }
-      return pbuffer[0];
-    }
-
-    public void destroy(long pbuffer) {
-      int res = CGL.CGLDestroyPBuffer(pbuffer);
-      if (res != CGL.kCGLNoError) {
-        throw new GLException("Error destroying CGL-based pbuffer: error code " + res);
-      }
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
deleted file mode 100644
index d100ab442..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.macosx.cgl.awt;
-
-import java.lang.reflect.InvocationTargetException;
-import java.nio.*;
-import java.util.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.awt.*;
-import com.sun.opengl.impl.macosx.cgl.*;
-
-public class MacOSXAWTCGLDrawableFactory extends MacOSXCGLDrawableFactory {
-
-  public MacOSXAWTCGLDrawableFactory() {
-    super();
-  }
-
-  public boolean canCreateContextOnJava2DSurface() {
-    return true;
-  }
-
-  public GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
-    throws GLException {
-    return new MacOSXJava2DCGLContext(shareWith);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
deleted file mode 100644
index 5e43eea49..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.opengl.impl.macosx.cgl.awt;
-
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.macosx.*;
-import javax.media.nativewindow.awt.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.*;
-
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.macosx.cgl.*;
-import com.sun.nativewindow.impl.jawt.*;
-import com.sun.nativewindow.impl.jawt.macosx.*;
-
-public class MacOSXAWTCGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
-    protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("GraphicsConfiguration");
-
-    public MacOSXAWTCGLGraphicsConfigurationFactory() {
-        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.awt.AWTGraphicsDevice.class, this);
-    }
-
-    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
-                                                                     CapabilitiesChooser chooser,
-                                                                     AbstractGraphicsScreen absScreen) {
-        GraphicsDevice device = null;
-        if (absScreen != null &&
-            !(absScreen instanceof AWTGraphicsScreen)) {
-            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only AWTGraphicsScreen objects");
-        }
-
-        if(null==absScreen) {
-            absScreen = AWTGraphicsScreen.createScreenDevice(-1);
-        }
-        AWTGraphicsScreen awtScreen = (AWTGraphicsScreen) absScreen;
-        device = ((AWTGraphicsDevice)awtScreen.getDevice()).getGraphicsDevice();
-
-        if (capabilities != null &&
-            !(capabilities instanceof GLCapabilities)) {
-            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only GLCapabilities objects");
-        }
-
-        if (chooser != null &&
-            !(chooser instanceof GLCapabilitiesChooser)) {
-            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only GLCapabilitiesChooser objects");
-        }
-
-        if(DEBUG) {
-            System.err.println("MacOSXAWTCGLGraphicsConfigurationFactory: got "+absScreen);
-        }
-
-        long displayHandle = 0;
-
-        MacOSXGraphicsDevice macDevice = new MacOSXGraphicsDevice();
-        DefaultGraphicsScreen macScreen = new DefaultGraphicsScreen(macDevice, awtScreen.getIndex());
-        if(DEBUG) {
-            System.err.println("MacOSXAWTCGLGraphicsConfigurationFactory: made "+macScreen);
-        }
-
-        GraphicsConfiguration gc = device.getDefaultConfiguration();
-        AWTGraphicsConfiguration.setupCapabilitiesRGBABits(capabilities, gc);
-        if(DEBUG) {
-            System.err.println("AWT Colormodel compatible: "+capabilities);
-        }
-
-        MacOSXCGLGraphicsConfiguration macConfig = (MacOSXCGLGraphicsConfiguration)
-            GraphicsConfigurationFactory.getFactory(macDevice).chooseGraphicsConfiguration(capabilities,
-                                                                                           chooser,
-                                                                                           macScreen);
-
-        if (macConfig == null) {
-            throw new GLException("Unable to choose a GraphicsConfiguration: "+capabilities+",\n\t"+chooser+"\n\t"+macScreen);
-        }
-
-        // FIXME: we have nothing to match .. so choose the default
-        return new AWTGraphicsConfiguration(awtScreen, macConfig.getChosenCapabilities(), macConfig.getRequestedCapabilities(), gc, macConfig);
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
deleted file mode 100644
index 22b0ffe55..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.macosx.cgl.awt;
-
-import com.sun.opengl.impl.macosx.cgl.*;
-
-import java.awt.Graphics;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.awt.*;
-import com.sun.opengl.impl.macosx.cgl.*;
-
-/** MacOSXCGLContext implementation supporting the Java2D/JOGL bridge
- * on Mac OS X. The external GLDrawable mechanism does not work on Mac
- * OS X due to how drawables and contexts are operated upon on this
- * platform, so it is necessary to supply an alternative means to
- * create, make current, and destroy contexts on the Java2D "drawable"
- * on the Mac platform.
- */
-
-public class MacOSXJava2DCGLContext extends MacOSXCGLContext implements Java2DGLContext {
-  private Graphics graphics;
-
-  // FIXME: ignoring context sharing for the time being; will need to
-  // rethink this in particular if using FBOs to implement the
-  // Java2D/OpenGL pipeline on Mac OS X
-
-  public MacOSXJava2DCGLContext(GLContext shareWith) {
-    super(null, shareWith);
-  }
-
-  public void setGraphics(Graphics g) {
-    this.graphics = g;
-  }
-
-  protected int makeCurrentImpl() throws GLException {
-    boolean created = false;
-    if (nsContext == 0) {
-      if (!create()) {
-        return CONTEXT_NOT_CURRENT;
-      }
-      if (DEBUG) {
-        System.err.println("!!! Created GL nsContext for " + getClass().getName());
-      }
-      created = true;
-    }
-            
-    if (!Java2D.makeOGLContextCurrentOnSurface(graphics, nsContext)) {
-      throw new GLException("Error making context current");
-    }
-            
-    if (created) {
-      setGLFunctionAvailability(false);
-      return CONTEXT_CURRENT_NEW;
-    }
-    return CONTEXT_CURRENT;
-  }
-
-  protected boolean create() {
-    // Find and configure share context
-    MacOSXCGLContext other = (MacOSXCGLContext) GLContextShareSet.getShareContext(this);
-    long share = 0;
-    if (other != null) {
-      // Reconfigure pbuffer-based GLContexts
-      if (other instanceof MacOSXPbufferCGLContext) {
-        MacOSXPbufferCGLContext ctx = (MacOSXPbufferCGLContext) other;
-        ctx.setOpenGLMode(MacOSXCGLDrawable.CGL_MODE);
-      } else {
-        if (other.getOpenGLMode() != MacOSXCGLDrawable.CGL_MODE) {
-          throw new GLException("Can't share between NSOpenGLContexts and CGLContextObjs");
-        }
-      }
-      share = other.getNSContext();
-      // Note we don't check for a 0 return value, since switching
-      // the context's mode causes it to be destroyed and not
-      // re-initialized until the next makeCurrent
-    }
-
-    if (DEBUG) {
-      System.err.println("!!! Share context is " + toHexString(share) + " for " + getClass().getName());
-    }
-
-    long ctx = Java2D.createOGLContextOnSurface(graphics, share);
-    if (ctx == 0) {
-      return false;
-    }
-    // FIXME: think about GLContext sharing
-    nsContext = ctx;
-    return true;
-  }
-
-  protected void releaseImpl() throws GLException {
-    // FIXME: would need another primitive in the Java2D class in
-    // order to implement this; hopefully should not matter for
-    // correctness
-  }
-
-  protected void destroyImpl() throws GLException {
-    if (nsContext != 0) {
-      Java2D.destroyOGLContext(nsContext);
-      if (DEBUG) {
-        System.err.println("!!! Destroyed OpenGL context " + nsContext);
-      }
-      nsContext = 0;
-      // FIXME
-      // GLContextShareSet.contextDestroyed(this);
-    }
-  }
-
-  public void setOpenGLMode(int mode) {
-    if (mode != MacOSXCGLDrawable.CGL_MODE)
-      throw new GLException("OpenGL mode switching not supported for Java2D GLContexts");
-  }
-
-  public int  getOpenGLMode() {
-    return MacOSXCGLDrawable.CGL_MODE;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
deleted file mode 100644
index f1e9483cd..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
-
-public class WindowsDummyWGLDrawable extends WindowsWGLDrawable {
-  private long hwnd, hdc;
-
-  public WindowsDummyWGLDrawable(GLDrawableFactory factory) {
-    super(factory, new NullWindow(WindowsWGLGraphicsConfigurationFactory.createDefaultGraphicsConfiguration(null, true, true)), true);
-    // All entries to CreateDummyWindow must synchronize on one object
-    // to avoid accidentally registering the dummy window class twice
-    synchronized (WindowsDummyWGLDrawable.class) {
-      hwnd = WGL.CreateDummyWindow(0, 0, 1, 1);
-    }
-    hdc = WGL.GetDC(hwnd);
-    NullWindow nw = (NullWindow) getNativeWindow();
-    nw.setSurfaceHandle(hdc);
-    // Choose a (hopefully hardware-accelerated) OpenGL pixel format for this device context
-    GLCapabilities caps = new GLCapabilities(null);
-    caps.setDepthBits(16);
-    PIXELFORMATDESCRIPTOR pfd = WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(caps);
-    int pixelFormat = WGL.ChoosePixelFormat(hdc, pfd);
-    if ((pixelFormat == 0) ||
-        (!WGL.SetPixelFormat(hdc, pixelFormat, pfd))) {
-      destroy();
-    }
-  }
-
-  public void setSize(int width, int height) {
-  }
-
-  public int getWidth() {
-    return 1;
-  }
-
-  public int getHeight() {
-    return 1;
-  }
-
-  public GLContext createContext(GLContext shareWith) {
-    if (hdc == 0) {
-      // Construction failed
-      return null;
-    }
-    // FIXME: figure out how to hook back in the Java 2D / JOGL bridge
-    return new WindowsWGLContext(this, shareWith);
-  }
-
-  public void destroy() {
-    if (hdc != 0) {
-      WGL.ReleaseDC(hwnd, hdc);
-      hdc = 0;
-    }
-    if (hwnd != 0) {
-      WGL.ShowWindow(hwnd, WGL.SW_HIDE);
-      WGL.DestroyWindow(hwnd);
-      hwnd = 0;
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
deleted file mode 100755
index abb7ba11e..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
-
-public class WindowsExternalWGLContext extends WindowsWGLContext {
-  private boolean firstMakeCurrent = true;
-  private boolean created = true;
-  private GLContext lastContext;
-
-  private WindowsExternalWGLContext(Drawable drawable, long hglrc, WindowsWGLGraphicsConfiguration cfg) {
-    super(drawable, null);
-    this.context = hglrc;
-    if (DEBUG) {
-      System.err.println(getThreadName() + ": !!! Created external OpenGL context " + toHexString(hglrc) + " for " + this);
-    }
-    GLContextShareSet.contextCreated(this);
-    setGLFunctionAvailability(false);
-    cfg.updateCapabilitiesByWGL(this);
-    getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
-  }
-
-  protected static WindowsExternalWGLContext create(GLDrawableFactory factory, GLProfile glp) {
-    long hdc = WGL.wglGetCurrentDC();
-    if (0==hdc) {
-      throw new GLException("Error: attempted to make an external GLDrawable without a drawable current");
-    }
-    long hglrc = WGL.wglGetCurrentContext();
-    if (hglrc == 0) {
-      throw new GLException("Error: attempted to make an external GLContext without a context current");
-    }
-    int pfdID = WGL.GetPixelFormat(hdc);
-    if (pfdID == 0) {
-      throw new GLException("Error: attempted to make an external GLContext without a valid pixelformat");
-    }
-
-    AbstractGraphicsScreen aScreen = DefaultGraphicsScreen.createDefault();
-    WindowsWGLGraphicsConfiguration cfg = WindowsWGLGraphicsConfiguration.create(hdc, pfdID, glp, aScreen, true, true);
-
-    NullWindow nw = new NullWindow(cfg);
-    nw.setSurfaceHandle(hdc);
-
-    return new WindowsExternalWGLContext(new Drawable(factory, nw), hglrc, cfg);
-  }
-
-  public int makeCurrent() throws GLException {
-    // Save last context if necessary to allow external GLContexts to
-    // talk to other GLContexts created by this library
-    GLContext cur = getCurrent();
-    if (cur != null && cur != this) {
-      lastContext = cur;
-      setCurrent(null);
-    }
-    return super.makeCurrent();
-  }  
-
-  public void release() throws GLException {
-    super.release();
-    setCurrent(lastContext);
-    lastContext = null;
-  }
-
-  protected int makeCurrentImpl() throws GLException {
-    if (firstMakeCurrent) {
-      firstMakeCurrent = false;
-      return CONTEXT_CURRENT_NEW;
-    }
-    return CONTEXT_CURRENT;
-  }
-
-  protected void releaseImpl() throws GLException {
-  }
-
-  protected void destroyImpl() throws GLException {
-    created = false;
-    GLContextShareSet.contextDestroyed(this);
-  }
-
-  public boolean isCreated() {
-    return created;
-  }
-
-  // Need to provide the display connection to extension querying APIs
-  static class Drawable extends WindowsWGLDrawable {
-    Drawable(GLDrawableFactory factory, NativeWindow comp) {
-      super(factory, comp, true);
-    }
-
-    public GLContext createContext(GLContext shareWith) {
-      throw new GLException("Should not call this");
-    }
-
-    public int getWidth() {
-      throw new GLException("Should not call this");
-    }
-
-    public int getHeight() {
-      throw new GLException("Should not call this");
-    }
-
-    public void setSize(int width, int height) {
-      throw new GLException("Should not call this");
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
deleted file mode 100755
index 9b87afc38..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
-
-public class WindowsExternalWGLDrawable extends WindowsWGLDrawable {
-
-  private WindowsExternalWGLDrawable(GLDrawableFactory factory, NativeWindow component) {
-    super(factory, component, true);
-  }
-
-  protected static WindowsExternalWGLDrawable create(GLDrawableFactory factory, GLProfile glp) {
-    long hdc = WGL.wglGetCurrentDC();
-    if (0==hdc) {
-      throw new GLException("Error: attempted to make an external GLDrawable without a drawable current");
-    }
-    int pfdID = WGL.GetPixelFormat(hdc);
-    if (pfdID == 0) {
-      throw new GLException("Error: attempted to make an external GLContext without a valid pixelformat");
-    }
-
-    AbstractGraphicsScreen aScreen = DefaultGraphicsScreen.createDefault();
-    WindowsWGLGraphicsConfiguration cfg = WindowsWGLGraphicsConfiguration.create(hdc, pfdID, glp, aScreen, true, true);
-
-    NullWindow nw = new NullWindow(cfg);
-    nw.setSurfaceHandle(hdc);
-
-    cfg.updateGraphicsConfiguration(factory, nw);
-
-    return new WindowsExternalWGLDrawable(factory, nw);
-  }
-
-
-  public GLContext createContext(GLContext shareWith) {
-    return new WindowsWGLContext(this, shareWith);
-  }
-  
-  public void setSize(int newWidth, int newHeight) {
-    throw new GLException("Should not call this");
-  }
-
-  public int getWidth() {
-    throw new GLException("Should not call this");
-  }  
-
-  public int getHeight() {
-    throw new GLException("Should not call this");
-  }  
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java
deleted file mode 100644
index 9f0a5d2a6..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-public class WindowsOffscreenWGLContext extends WindowsWGLContext {
-  public WindowsOffscreenWGLContext(WindowsOffscreenWGLDrawable drawable,
-                                   GLContext shareWith) {
-    super(drawable, shareWith);
-  }
-
-  public int getOffscreenContextPixelDataType() {
-      return GL.GL_UNSIGNED_BYTE;
-  }
-  
-  public int getOffscreenContextReadBuffer() {
-    // On Windows these contexts are always single-buffered
-    return GL.GL_FRONT;
-  }
-
-  public boolean offscreenImageNeedsVerticalFlip() {
-    // We can take care of this in the DIB creation (see below)
-    return false;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
deleted file mode 100644
index cd0491867..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
-
-public class WindowsOffscreenWGLDrawable extends WindowsWGLDrawable {
-  private long origbitmap;
-  private long hbitmap;
-
-  public WindowsOffscreenWGLDrawable(GLDrawableFactory factory, NativeWindow target) {
-    super(factory, target, true);
-    create();
-  }
-
-  protected void setRealizedImpl() {
-    if(realized) {
-        create();
-    } else {
-        destroy();
-    }
-  }
-
-  public GLContext createContext(GLContext shareWith) {
-    return new WindowsOffscreenWGLContext(this, shareWith);
-  }
-
-  private void create() {
-    NativeWindow nw = getNativeWindow();
-    WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration)nw.getGraphicsConfiguration().getNativeGraphicsConfiguration();
-    GLCapabilities capabilities = (GLCapabilities)config.getRequestedCapabilities();
-    int width = getWidth();
-    int height = getHeight();
-    BITMAPINFO info = BITMAPINFO.create();
-    BITMAPINFOHEADER header = info.getBmiHeader();
-    int bitsPerPixel = (capabilities.getRedBits() +
-                        capabilities.getGreenBits() +
-                        capabilities.getBlueBits() +
-                        capabilities.getAlphaBits());
-    header.setBiSize(header.size());
-    header.setBiWidth(width);
-    // NOTE: negating the height causes the DIB to be in top-down row
-    // order rather than bottom-up; ends up being correct during pixel
-    // readback
-    header.setBiHeight(-1 * height);
-    header.setBiPlanes((short) 1);
-    header.setBiBitCount((short) bitsPerPixel);
-    header.setBiXPelsPerMeter(0);
-    header.setBiYPelsPerMeter(0);
-    header.setBiClrUsed(0);
-    header.setBiClrImportant(0);
-    header.setBiCompression(WGL.BI_RGB);
-    header.setBiSizeImage(width * height * bitsPerPixel / 8);
-
-    long hdc = WGL.CreateCompatibleDC(0);
-    if (hdc == 0) {
-      System.out.println("LastError: " + WGL.GetLastError());
-      throw new GLException("Error creating device context for offscreen OpenGL context");
-    }
-    ((SurfaceChangeable)nw).setSurfaceHandle(hdc);
-
-    hbitmap = WGL.CreateDIBSection(hdc, info, WGL.DIB_RGB_COLORS, 0, 0, 0);
-    if (hbitmap == 0) {
-      WGL.DeleteDC(hdc);
-      hdc = 0;
-      throw new GLException("Error creating offscreen bitmap of width " + width +
-                            ", height " + height);
-    }
-    if ((origbitmap = WGL.SelectObject(hdc, hbitmap)) == 0) {
-      WGL.DeleteObject(hbitmap);
-      hbitmap = 0;
-      WGL.DeleteDC(hdc);
-      hdc = 0;
-      throw new GLException("Error selecting bitmap into new device context");
-    }
-        
-    config.updateGraphicsConfiguration(getFactory(), nw);
-  }
-  
-  public void destroy() {
-    NativeWindow nw = getNativeWindow();
-    if (nw.getSurfaceHandle() != 0) {
-      // Must destroy bitmap and device context
-      WGL.SelectObject(nw.getSurfaceHandle(), origbitmap);
-      WGL.DeleteObject(hbitmap);
-      WGL.DeleteDC(nw.getSurfaceHandle());
-      origbitmap = 0;
-      hbitmap = 0;
-      ((SurfaceChangeable)nw).setSurfaceHandle(0);
-    }
-  }
-
-  protected void swapBuffersImpl() {
-    if(DEBUG) {
-        System.err.println("unhandled swapBuffersImpl() called for: "+this);
-    }
-  }
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java
deleted file mode 100644
index 2261f7742..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import java.util.*;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-public class WindowsOnscreenWGLContext extends WindowsWGLContext {
-  protected WindowsOnscreenWGLDrawable drawable;
-
-  public WindowsOnscreenWGLContext(WindowsOnscreenWGLDrawable drawable,
-                                  GLContext shareWith) {
-    super(drawable, shareWith);
-    this.drawable = drawable;
-  }
-  
-  // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
-  protected int makeCurrentImpl() throws GLException {
-    int lockRes = drawable.lockSurface();
-    boolean exceptionOccurred = false;
-    try {
-      if (lockRes == NativeWindow.LOCK_SURFACE_NOT_READY) {
-        return CONTEXT_NOT_CURRENT;
-      }
-      int ret = super.makeCurrentImpl();
-      return ret;
-    } catch (RuntimeException e) {
-      exceptionOccurred = true;
-      throw e;
-    } finally {
-      if (exceptionOccurred ||
-          (isOptimizable() && lockRes != NativeWindow.LOCK_SURFACE_NOT_READY) && drawable.isSurfaceLocked()) {
-        drawable.unlockSurface();
-      }
-    }
-  }
-
-  // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
-  protected void releaseImpl() throws GLException {
-    try {
-      super.releaseImpl();
-    } finally {
-      if (!isOptimizable() && drawable.isSurfaceLocked()) {
-        drawable.unlockSurface();
-      }
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java
deleted file mode 100644
index 395ccf7d2..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-public class WindowsOnscreenWGLDrawable extends WindowsWGLDrawable {
-  protected WindowsOnscreenWGLDrawable(GLDrawableFactory factory, NativeWindow component) {
-    super(factory, component, false);
-  }
-
-  public GLContext createContext(GLContext shareWith) {
-    return new WindowsOnscreenWGLContext(this, shareWith);
-  }
-
-  public int getWidth() {
-    return component.getWidth();
-  }
-
-  public int getHeight() {
-    return component.getHeight();
-  }
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
deleted file mode 100644
index 9c492e244..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-public class WindowsPbufferWGLContext extends WindowsWGLContext {
-  private static final boolean DEBUG = Debug.debug("WindowsPbufferWGLContext");
-
-  // State for render-to-texture and render-to-texture-rectangle support
-  private WindowsPbufferWGLDrawable drawable;
-  private boolean rtt;       // render-to-texture?
-  private boolean hasRTT;    // render-to-texture extension available?
-  private boolean rect;      // render-to-texture-rectangle?
-  private int textureTarget; // e.g. GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE_NV
-  private int texture;       // actual texture object
-
-  public WindowsPbufferWGLContext(WindowsPbufferWGLDrawable drawable,
-                                 GLContext shareWith) {
-    super(drawable, shareWith);
-    this.drawable = drawable;
-  }
-
-  public void bindPbufferToTexture() {
-    if (!rtt) {
-      throw new GLException("Shouldn't try to bind a pbuffer to a texture if render-to-texture hasn't been " +
-                            "specified in its GLCapabilities");
-    }
-    GL gl = getGL();
-    WGLExt wglExt = getWGLExt();
-    gl.glBindTexture(textureTarget, texture);
-    if (rtt && hasRTT) {
-      if (!wglExt.wglBindTexImageARB(drawable.getPbuffer(), WGLExt.WGL_FRONT_LEFT_ARB)) {
-        throw new GLException("Binding of pbuffer to texture failed: " + wglGetLastError());
-      }
-    }
-    // FIXME: comment is wrong now
-    // Note that if the render-to-texture extension is not supported,
-    // we perform a glCopyTexImage2D in swapBuffers().
-  }
-
-  public void releasePbufferFromTexture() {
-    if (!rtt) {
-      throw new GLException("Shouldn't try to bind a pbuffer to a texture if render-to-texture hasn't been " +
-                            "specified in its GLCapabilities");
-    }
-    if (rtt && hasRTT) {
-      WGLExt wglExt = getWGLExt();
-      if (!wglExt.wglReleaseTexImageARB(drawable.getPbuffer(), WGLExt.WGL_FRONT_LEFT_ARB)) {
-        throw new GLException("Releasing of pbuffer from texture failed: " + wglGetLastError());
-      }
-    }
-  }
-
-  protected int makeCurrentImpl() throws GLException {
-    int res = super.makeCurrentImpl();
-    if (DEBUG && VERBOSE) {
-      System.err.println("WindowsPbufferWGLContext: super.makeCurrentImpl() = " + res);
-    }
-    if (res == CONTEXT_CURRENT_NEW) {
-      GLCapabilities capabilities = drawable.getChosenGLCapabilities();
-
-      // Initialize render-to-texture support if requested
-      GL gl = getGL();
-      rtt  = capabilities.getPbufferRenderToTexture();
-      rect = gl.isGL2() && capabilities.getPbufferRenderToTextureRectangle();
-
-      if (rtt) {
-        if (DEBUG) {
-          System.err.println("Initializing render-to-texture support");
-        }
-
-        if (!gl.isExtensionAvailable("WGL_ARB_render_texture")) {
-          System.err.println("WindowsPbufferWGLContext: WARNING: WGL_ARB_render_texture extension not " +
-                             "supported; implementing render_to_texture support using slow texture readback");
-        } else {
-          hasRTT = true;
-
-          if (rect && !gl.isExtensionAvailable("GL_NV_texture_rectangle")) {
-            System.err.println("WindowsPbufferWGLContext: WARNING: GL_NV_texture_rectangle extension not " +
-                               "supported; skipping requested render_to_texture_rectangle support for pbuffer");
-            rect = false;
-          }
-          if (rect) {
-            if (DEBUG) {
-              System.err.println("  Using render-to-texture-rectangle");
-            }
-            textureTarget = GL2.GL_TEXTURE_RECTANGLE_ARB;
-          } else {
-            if (DEBUG) {
-              System.err.println("  Using vanilla render-to-texture");
-            }
-            textureTarget = GL.GL_TEXTURE_2D;
-          }
-          int[] tmp = new int[1];
-          gl.glGenTextures(1, tmp, 0);
-          texture = tmp[0];
-          gl.glBindTexture(textureTarget, texture);
-          gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_MIN_FILTER, GL.GL_NEAREST);
-          gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST);
-          gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_WRAP_S, GL.GL_CLAMP_TO_EDGE);
-          gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_WRAP_T, GL.GL_CLAMP_TO_EDGE);
-          gl.glCopyTexImage2D(textureTarget, 0, GL.GL_RGB, 0, 0, drawable.getWidth(), drawable.getHeight(), 0);
-        }
-      }
-    }
-    return res;
-  }
-
-  public int getFloatingPointMode() {
-    return drawable.getFloatingPointMode();
-  }
-
-  private static String wglGetLastError() {
-    return WindowsWGLDrawableFactory.wglGetLastError();
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java
deleted file mode 100644
index c324b1ce1..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
-
-public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable {
-  private long cachedParentHdc;
-  private WGLExt cachedWGLExt; // cached WGLExt instance from parent GLCanvas,
-                               // needed to destroy pbuffer
-  private long buffer; // pbuffer handle
-
-  private int floatMode;
-
-  public WindowsPbufferWGLDrawable(GLDrawableFactory factory, NativeWindow target,
-                                   WindowsWGLDrawable dummyDrawable,
-                                   WGLExt wglExt) {
-    super(factory, target, true);
-
-    if (DEBUG) {
-        System.out.println("Pbuffer config: " + getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration());
-    }
-
-    createPbuffer(dummyDrawable.getNativeWindow().getSurfaceHandle(), wglExt);
-
-    if (DEBUG) {
-        System.err.println("Created pbuffer " + this);
-    }
-  }
-
-  protected void setRealizedImpl() {
-    if(realized) {
-        throw new GLException("Recreation via setRealized not supported.");
-    } else {
-        destroy();
-    }
-  }
-
-  public GLContext createContext(GLContext shareWith) {
-    return new WindowsPbufferWGLContext(this, shareWith);
-  }
-
-  public void destroy() {
-    NativeWindow nw = getNativeWindow();
-    if(0!=buffer) {
-        WGLExt wglExt = cachedWGLExt;
-        if (nw.getSurfaceHandle() != 0) {
-          // Must release DC and pbuffer
-          // NOTE that since the context is not current, glGetError() can
-          // not be called here, so we skip the use of any composable
-          // pipelines (see WindowsOnscreenWGLContext.makeCurrentImpl)
-          if (wglExt.wglReleasePbufferDCARB(buffer, nw.getSurfaceHandle()) == 0) {
-            throw new GLException("Error releasing pbuffer device context: error code " + WGL.GetLastError());
-          }
-          ((SurfaceChangeable)nw).setSurfaceHandle(0);
-        }
-        if (!wglExt.wglDestroyPbufferARB(buffer)) {
-            throw new GLException("Error destroying pbuffer: error code " + WGL.GetLastError());
-        }
-        buffer = 0;
-    }
-  }
-
-  public long getPbuffer() {
-    return buffer;
-  }
-
-  public int getFloatingPointMode() {
-    return floatMode;
-  }
-
-  protected void swapBuffersImpl() {
-    if(DEBUG) {
-        System.err.println("unhandled swapBuffersImpl() called for: "+this);
-    }
-  }
-
-  private void createPbuffer(long parentHdc, WGLExt wglExt) {
-    int[]   iattributes = new int  [2*WindowsWGLGraphicsConfiguration.MAX_ATTRIBS];
-    float[] fattributes = new float[1];
-    int[]   floatModeTmp = new int[1];
-    int     niattribs   = 0;
-    int     width, height;
-
-    WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration) getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-    GLCapabilities capabilities = (GLCapabilities)config.getRequestedCapabilities();
-    GLProfile glProfile = capabilities.getGLProfile();
-
-    if (DEBUG) {
-      System.out.println("Pbuffer parentHdc = " + toHexString(parentHdc));
-      System.out.println("Pbuffer caps: " + capabilities);
-    }
-
-    if(!WindowsWGLGraphicsConfiguration.GLCapabilities2AttribList(capabilities,
-                                    iattributes,
-                                    wglExt,
-                                    true,
-                                    floatModeTmp)){
-      throw new GLException("Pbuffer-related extensions not supported");
-    }
-
-    floatMode = floatModeTmp[0];
-    boolean rtt      = capabilities.getPbufferRenderToTexture();
-    boolean rect     = capabilities.getPbufferRenderToTextureRectangle();
-    boolean useFloat = capabilities.getPbufferFloatingPointBuffers();
-    boolean ati      = false;
-
-    if (useFloat) {
-      ati = (floatMode == GLPbuffer.ATI_FLOAT);
-    }
-
-    int[] pformats = new int[WindowsWGLGraphicsConfiguration.MAX_PFORMATS];
-    int   nformats;
-    int[] nformatsTmp = new int[1];
-    if (!wglExt.wglChoosePixelFormatARB(parentHdc,
-                                     iattributes, 0,
-                                     fattributes, 0,
-                                     WindowsWGLGraphicsConfiguration.MAX_PFORMATS,
-                                     pformats, 0,
-                                     nformatsTmp, 0)) {
-      throw new GLException("pbuffer creation error: wglChoosePixelFormat() failed");
-    }
-    nformats = nformatsTmp[0];
-    if (nformats <= 0) {
-      throw new GLException("pbuffer creation error: Couldn't find a suitable pixel format");
-    }
-
-    boolean haveMultisample = wglExt.isExtensionAvailable("WGL_ARB_multisample");
-
-    if (DEBUG) {
-      System.err.println("" + nformats + " suitable pixel formats found");
-      // query pixel format
-      iattributes[0] = WGLExt.WGL_RED_BITS_ARB;
-      iattributes[1] = WGLExt.WGL_GREEN_BITS_ARB;
-      iattributes[2] = WGLExt.WGL_BLUE_BITS_ARB;
-      iattributes[3] = WGLExt.WGL_ALPHA_BITS_ARB;
-      iattributes[4] = WGLExt.WGL_DEPTH_BITS_ARB;
-      iattributes[5] = (useFloat ? (ati ? WGLExt.WGL_PIXEL_TYPE_ARB : WGLExt.WGL_FLOAT_COMPONENTS_NV) : WGLExt.WGL_RED_BITS_ARB);
-      iattributes[6] = (haveMultisample ? WGLExt.WGL_SAMPLE_BUFFERS_ARB : WGLExt.WGL_RED_BITS_ARB);
-      iattributes[7] = (haveMultisample ? WGLExt.WGL_SAMPLES_ARB : WGLExt.WGL_RED_BITS_ARB);
-      iattributes[8] = WGLExt.WGL_DRAW_TO_PBUFFER_ARB;
-      int[] ivalues = new int[9];
-      for (int i = 0; i < nformats; i++) {
-        if (!wglExt.wglGetPixelFormatAttribivARB(parentHdc, pformats[i], 0, 9, iattributes, 0, ivalues, 0)) {
-          throw new GLException("Error while querying pixel format " + pformats[i] +
-                                "'s (index " + i + "'s) capabilities for debugging");
-        }
-        System.err.print("pixel format " + pformats[i] + " (index " + i + "): ");
-        System.err.print( "r: " + ivalues[0]);
-        System.err.print(" g: " + ivalues[1]);
-        System.err.print(" b: " + ivalues[2]);
-        System.err.print(" a: " + ivalues[3]);
-        System.err.print(" depth: " + ivalues[4]);
-        if (haveMultisample) {
-          System.err.print(" multisample: " + ivalues[6]);
-        }
-        System.err.print(" samples: " + ivalues[7]);
-        if (useFloat) {
-          if (ati) {
-            if (ivalues[5] == WGLExt.WGL_TYPE_RGBA_FLOAT_ARB) {
-              System.err.print(" [ati float]");
-            } else if (ivalues[5] != WGLExt.WGL_TYPE_RGBA_ARB) {
-              System.err.print(" [unknown pixel type " + ivalues[5] + "]");
-            }
-          } else {
-            if (ivalues[5] != 0) {
-              System.err.print(" [float]");
-            }
-          }
-        }
-
-        if (ivalues[8] != 0) {
-          System.err.print(" [pbuffer]");
-        }
-        System.err.println();
-      }
-    }
-
-    long tmpBuffer = 0;
-    int whichFormat = -1;
-    // Loop is a workaround for bugs in NVidia's recent drivers
-    for (whichFormat = 0; whichFormat < nformats; whichFormat++) {
-      int format = pformats[whichFormat];
-
-      // Create the p-buffer.
-      niattribs = 0;
-
-      if (rtt) {
-        iattributes[niattribs++]   = WGLExt.WGL_TEXTURE_FORMAT_ARB;
-        if (useFloat) {
-          iattributes[niattribs++] = WGLExt.WGL_TEXTURE_FLOAT_RGB_NV;
-        } else {
-          iattributes[niattribs++] = WGLExt.WGL_TEXTURE_RGBA_ARB;
-        }
-
-        iattributes[niattribs++] = WGLExt.WGL_TEXTURE_TARGET_ARB;
-        iattributes[niattribs++] = rect ? WGLExt.WGL_TEXTURE_RECTANGLE_NV : WGLExt.WGL_TEXTURE_2D_ARB;
-
-        iattributes[niattribs++] = WGLExt.WGL_MIPMAP_TEXTURE_ARB;
-        iattributes[niattribs++] = GL.GL_FALSE;
-
-        iattributes[niattribs++] = WGLExt.WGL_PBUFFER_LARGEST_ARB;
-        iattributes[niattribs++] = GL.GL_FALSE;
-      }
-
-      iattributes[niattribs++] = 0;
-
-      tmpBuffer = wglExt.wglCreatePbufferARB(parentHdc, format, getWidth(), getHeight(), iattributes, 0);
-      if (tmpBuffer != 0) {
-        // Done
-        break;
-      }
-    }
-
-    if (tmpBuffer == 0) {
-      throw new GLException("pbuffer creation error: wglCreatePbuffer() failed: tried " + nformats +
-                            " pixel formats, last error was: " + wglGetLastError());
-    }
-
-    // Get the device context.
-    long tmpHdc = wglExt.wglGetPbufferDCARB(tmpBuffer);
-    if (tmpHdc == 0) {
-      throw new GLException("pbuffer creation error: wglGetPbufferDC() failed");
-    }
-
-    NativeWindow nw = getNativeWindow();
-    // Set up instance variables
-    buffer = tmpBuffer;
-    ((SurfaceChangeable)nw).setSurfaceHandle(tmpHdc);
-    cachedWGLExt = wglExt;
-    cachedParentHdc = parentHdc;
-
-    // Re-query chosen pixel format
-    {
-      niattribs = 0;
-      iattributes[niattribs++] = WGLExt.WGL_ACCELERATION_ARB;
-      iattributes[niattribs++] = WGLExt.WGL_RED_BITS_ARB;
-      iattributes[niattribs++] = WGLExt.WGL_GREEN_BITS_ARB;
-      iattributes[niattribs++] = WGLExt.WGL_BLUE_BITS_ARB;
-      iattributes[niattribs++] = WGLExt.WGL_ALPHA_BITS_ARB;
-      iattributes[niattribs++] = WGLExt.WGL_DEPTH_BITS_ARB;
-      iattributes[niattribs++] = WGLExt.WGL_STENCIL_BITS_ARB;
-      iattributes[niattribs++] = WGLExt.WGL_DOUBLE_BUFFER_ARB;
-      iattributes[niattribs++] = WGLExt.WGL_STEREO_ARB;
-      iattributes[niattribs++] = WGLExt.WGL_ACCUM_RED_BITS_ARB;
-      iattributes[niattribs++] = WGLExt.WGL_ACCUM_GREEN_BITS_ARB;
-      iattributes[niattribs++] = WGLExt.WGL_ACCUM_BLUE_BITS_ARB;
-      iattributes[niattribs++] = WGLExt.WGL_ACCUM_ALPHA_BITS_ARB;
-      iattributes[niattribs++] = (useFloat ? (ati ? WGLExt.WGL_PIXEL_TYPE_ARB : WGLExt.WGL_FLOAT_COMPONENTS_NV) : WGLExt.WGL_RED_BITS_ARB);
-      iattributes[niattribs++] = (haveMultisample ? WGLExt.WGL_SAMPLE_BUFFERS_ARB : WGLExt.WGL_RED_BITS_ARB);
-      iattributes[niattribs++] = (haveMultisample ? WGLExt.WGL_SAMPLES_ARB : WGLExt.WGL_RED_BITS_ARB);
-      iattributes[niattribs++] = WGLExt.WGL_DRAW_TO_PBUFFER_ARB;
-      int[] ivalues = new int[niattribs];
-      if (wglExt.wglGetPixelFormatAttribivARB(parentHdc, pformats[whichFormat], 0, niattribs, iattributes, 0, ivalues, 0)) {
-        GLCapabilities newCaps = WindowsWGLGraphicsConfiguration.AttribList2GLCapabilities(glProfile, iattributes, niattribs, ivalues, true, false, true);
-        PIXELFORMATDESCRIPTOR pfd = WindowsWGLGraphicsConfiguration.createPixelFormatDescriptor();
-        if (WGL.DescribePixelFormat(parentHdc, pformats[whichFormat], pfd.size(), pfd) == 0) {
-          if (DEBUG) {
-              System.err.println("Unable to describe pixel format (Continue: true) " + whichFormat + "/" + nformats + " pfdID " + pformats[whichFormat]+":\n\t"+newCaps);
-          }
-        }
-        if(newCaps.isOnscreen()) {
-          throw new GLException("Error: Selected Onscreen Caps for PBuffer: "+newCaps+"\n\t"+newCaps);
-        }
-        config.setCapsPFD(newCaps, pfd, pformats[whichFormat], true);
-      } else {
-        PIXELFORMATDESCRIPTOR pfd = WindowsWGLGraphicsConfiguration.createPixelFormatDescriptor();
-        if (WGL.DescribePixelFormat(parentHdc, pformats[whichFormat], pfd.size(), pfd) == 0) {
-          throw new GLException("Unable to describe pixel format " + pformats[whichFormat]);
-        }
-        GLCapabilities newCaps = WindowsWGLGraphicsConfiguration.PFD2GLCapabilities(glProfile, pfd, false, true);
-        if(newCaps.isOnscreen()) {
-          throw new GLException("Error: Selected Onscreen Caps for PBuffer: "+newCaps+"\n\t"+newCaps);
-        }
-        config.setCapsPFD(newCaps, pfd, pformats[whichFormat], false);
-      }
-    }
-
-    // Determine the actual width and height we were able to create.
-    int[] tmp = new int[1];
-    wglExt.wglQueryPbufferARB( buffer, WGLExt.WGL_PBUFFER_WIDTH_ARB,  tmp, 0 );
-    width = tmp[0];
-    wglExt.wglQueryPbufferARB( buffer, WGLExt.WGL_PBUFFER_HEIGHT_ARB, tmp, 0 );
-    height = tmp[0];
-    ((SurfaceChangeable)nw).setSize(width, height);
-  }
-
-  private static String wglGetLastError() {
-    return WindowsWGLDrawableFactory.wglGetLastError();
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java
deleted file mode 100644
index eb860a3e3..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import java.nio.*;
-import java.util.*;
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
-import com.jogamp.gluegen.runtime.ProcAddressTable;
-
-public class WindowsWGLContext extends GLContextImpl {
-  protected long hglrc;
-  private boolean wglGetExtensionsStringEXTInitialized;
-  private boolean wglGetExtensionsStringEXTAvailable;
-  private boolean wglMakeContextCurrentInitialized;
-  private boolean wglMakeContextCurrentARBAvailable;
-  private boolean wglMakeContextCurrentEXTAvailable;
-  private static final Map/*<String, String>*/ functionNameMap;
-  private static final Map/*<String, String>*/ extensionNameMap;
-  private WGLExt wglExt;
-  // Table that holds the addresses of the native C-language entry points for
-  // WGL extension functions.
-  private WGLExtProcAddressTable wglExtProcAddressTable;
-
-  static {
-    functionNameMap = new HashMap();
-    functionNameMap.put("glAllocateMemoryNV", "wglAllocateMemoryNV");
-    functionNameMap.put("glFreeMemoryNV", "wglFreeMemoryNV");
-
-    extensionNameMap = new HashMap();
-    extensionNameMap.put("GL_ARB_pbuffer", "WGL_ARB_pbuffer");
-    extensionNameMap.put("GL_ARB_pixel_format", "WGL_ARB_pixel_format");
-  }
-
-  // FIXME: figure out how to hook back in the Java 2D / JOGL bridge
-  public WindowsWGLContext(GLDrawableImpl drawable, GLDrawableImpl drawableRead,
-                           GLContext shareWith) {
-    super(drawable, drawableRead, shareWith);
-  }
-
-  public WindowsWGLContext(GLDrawableImpl drawable,
-                           GLContext shareWith) {
-    this(drawable, null, shareWith);
-  }
-  
-  public Object getPlatformGLExtensions() {
-    return getWGLExt();
-  }
-
-  public WGLExt getWGLExt() {
-    if (wglExt == null) {
-      wglExt = new WGLExtImpl(this);
-    }
-    return wglExt;
-  }
-
-  public boolean wglMakeContextCurrent(long hDrawDC, long hReadDC, long hglrc) {
-    WGLExt wglExt = getWGLExt();
-    if (!wglMakeContextCurrentInitialized) {
-      wglMakeContextCurrentARBAvailable = isFunctionAvailable("wglMakeContextCurrentARB");
-      wglMakeContextCurrentEXTAvailable = isFunctionAvailable("wglMakeContextCurrentEXT");
-      wglMakeContextCurrentInitialized = true;
-      if(DEBUG) {
-          System.err.println("WindowsWGLContext.wglMakeContextCurrent: ARB "+wglMakeContextCurrentARBAvailable+", EXT "+wglMakeContextCurrentEXTAvailable);
-      }
-    }
-    if(wglMakeContextCurrentARBAvailable) {
-        return wglExt.wglMakeContextCurrentARB(hDrawDC, hReadDC, hglrc);
-    } else if(wglMakeContextCurrentEXTAvailable) {
-        return wglExt.wglMakeContextCurrentEXT(hDrawDC, hReadDC, hglrc);
-    }
-    return WGL.wglMakeCurrent(hDrawDC, hglrc);
-  }
-
-  public final ProcAddressTable getPlatformExtProcAddressTable() {
-    return getWGLExtProcAddressTable();
-  }
-
-  public final WGLExtProcAddressTable getWGLExtProcAddressTable() {
-    return wglExtProcAddressTable;
-  }
-
-  protected String mapToRealGLFunctionName(String glFunctionName) {
-    String lookup = (String) functionNameMap.get(glFunctionName);
-    if (lookup != null) {
-      return lookup;
-    }
-    return glFunctionName;
-  }
-
-  protected String mapToRealGLExtensionName(String glExtensionName) {
-    String lookup = (String) extensionNameMap.get(glExtensionName);
-    if (lookup != null) {
-      return lookup;
-    }
-    return glExtensionName;
-  }
-
-  /**
-   * Creates and initializes an appropriate OpenGL context. Should only be
-   * called by {@link #makeCurrentImpl()}.
-   */
-  protected void create() {
-    GLCapabilities glCaps = drawable.getChosenGLCapabilities();
-    if(DEBUG) {
-          System.err.println("WindowsWGLContext.create got "+glCaps);
-    }
-
-    if (drawable.getNativeWindow().getSurfaceHandle() == 0) {
-      throw new GLException("Internal error: attempted to create OpenGL context without an associated drawable");
-    }
-    // Windows can set up sharing of display lists after creation time
-    WindowsWGLContext other = (WindowsWGLContext) GLContextShareSet.getShareContext(this);
-    long hglrc2 = 0;
-    if (other != null) {
-      hglrc2 = other.getHGLRC();
-      if (hglrc2 == 0) {
-        throw new GLException("GLContextShareSet returned an invalid OpenGL context");
-      }
-    }
-
-    // To use WGL_ARB_create_context, we have to make a temp context current,
-    // so we are able to use GetProcAddress
-    long temp_hglrc = WGL.wglCreateContext(drawable.getNativeWindow().getSurfaceHandle());
-    if (DEBUG) {
-      System.err.println(getThreadName() + ": !!! Created temp OpenGL context " + toHexString(temp_hglrc) + " for " + this + ", device context " + toHexString(drawable.getNativeWindow().getSurfaceHandle()) + ", not yet sharing");
-    }
-    if (temp_hglrc == 0) {
-      throw new GLException("Unable to create temp OpenGL context for device context " + toHexString(drawable.getNativeWindow().getSurfaceHandle()));
-    } else {
-        if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), temp_hglrc)) {
-            throw new GLException("Error making temp context current: 0x" + Integer.toHexString(WGL.GetLastError()));
-        }
-        setGLFunctionAvailability(true);
-
-        if( !isFunctionAvailable("wglCreateContextAttribsARB") ||
-            !isExtensionAvailable("WGL_ARB_create_context") ) {
-            if(glCaps.getGLProfile().isGL3()) {
-              WGL.wglMakeCurrent(0, 0);
-              WGL.wglDeleteContext(temp_hglrc);
-              throw new GLException("Unable to create OpenGL >= 3.1 context (no WGL_ARB_create_context)");
-            }
-
-            // continue with temp context for GL < 3.0
-            hglrc = temp_hglrc;
-            if(DEBUG) {
-              System.err.println("WindowsWGLContext.create done (old ctx < 3.0 - no WGL_ARB_create_context) 0x"+Long.toHexString(hglrc));
-            }
-        } else {
-            WGLExt wglExt = getWGLExt();
-
-            // preset with default values
-            int attribs[] = {
-                /*  0 */ WGLExt.WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-                /*  2 */ WGLExt.WGL_CONTEXT_MINOR_VERSION_ARB, 0,
-                /*  4 */ WGLExt.WGL_CONTEXT_FLAGS_ARB,         0 /* WGLExt.WGL_CONTEXT_DEBUG_BIT_ARB */,
-                /*  6 */ 0,                                    0,
-                /*  8 */ 0
-            };
-
-            if(glCaps.getGLProfile().isGL3()) {
-                // Try >= 3.2 core first !
-                // In contrast to GLX no verify with a None drawable binding (default framebuffer) is necessary,
-                // if no 3.2 is available creation fails already!
-                attribs[0+1]  = 3;
-                attribs[2+1]  = 2;
-                if(glCaps.getGLProfile().isGL3bc()) {
-                    attribs[6+0]  = WGLExt.WGL_CONTEXT_PROFILE_MASK_ARB;
-                    attribs[6+1]  = WGLExt.WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
-                }
-                /**
-                 * don't stricten requirements any further, even compatible would be fine
-                 *
-                 } else {
-                    attribs[6+0]  = WGLExt.WGL_CONTEXT_PROFILE_MASK_ARB;
-                    attribs[6+1]  = WGLExt.WGL_CONTEXT_CORE_PROFILE_BIT_ARB;
-                 } 
-                 */
-                hglrc = wglExt.wglCreateContextAttribsARB(drawable.getNativeWindow().getSurfaceHandle(), hglrc2, attribs, 0); 
-                if(0==hglrc) {
-                    if(DEBUG) {
-                        System.err.println("WindowsWGLContext.createContext couldn't create >= 3.2 core context - fallback");
-                    }
-                    // Try >= 3.1 forward compatible - last resort for GL3 !
-                    attribs[0+1]  = 3;
-                    attribs[2+1]  = 1;
-                    if(!glCaps.getGLProfile().isGL3bc()) {
-                        attribs[4+1] |= WGLExt.WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
-                    }
-                    attribs[6+0]  = 0;
-                    attribs[6+1]  = 0;
-                } else if(DEBUG) {
-                  System.err.println("WindowsWGLContext.createContext >= 3.2 available 0x"+Long.toHexString(hglrc));
-                }
-            }
-            if(0==hglrc) {
-                // 3.1 or 3.0 ..
-                hglrc = wglExt.wglCreateContextAttribsARB(drawable.getNativeWindow().getSurfaceHandle(), hglrc2, attribs, 0); 
-                if(DEBUG) {
-                  if(0==hglrc) {
-                      System.err.println("WindowsWGLContext.createContext couldn't create >= 3.0 context - fallback");
-                  } else {
-                      System.err.println("WindowsWGLContext.createContext >= 3.0 available 0x"+Long.toHexString(hglrc));
-                  }
-                }
-            }
-
-            if(0==hglrc) {
-                if(glCaps.getGLProfile().isGL3()) {
-                  WGL.wglMakeCurrent(0, 0);
-                  WGL.wglDeleteContext(temp_hglrc);
-                  throw new GLException("Unable to create OpenGL >= 3.1 context (have WGL_ARB_create_context)");
-                }
-
-                // continue with temp context for GL < 3.0
-                hglrc = temp_hglrc;
-                if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), hglrc)) {
-                    throw new GLException("Error making old context current: 0x" + Integer.toHexString(WGL.GetLastError()));
-                }
-                updateGLProcAddressTable();
-                if(DEBUG) {
-                  System.err.println("WindowsWGLContext.create done (old ctx < 3.0 - no 3.0) 0x"+Long.toHexString(hglrc));
-                }
-            } else {
-                hglrc2 = 0; // mark as shared ..
-                WGL.wglMakeCurrent(0, 0);
-                WGL.wglDeleteContext(temp_hglrc);
-
-                if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), hglrc)) {
-                    throw new GLException("Error making new context current: 0x" + Integer.toHexString(WGL.GetLastError()));
-                }
-                updateGLProcAddressTable();
-                if(DEBUG) {
-                  System.err.println("WindowsWGLContext.create done (new ctx >= 3.0) 0x"+Long.toHexString(hglrc));
-                }
-            }
-        }
-    }
-    if(0!=hglrc2) {
-        if (!WGL.wglShareLists(hglrc2, hglrc)) {
-            throw new GLException("wglShareLists(" + toHexString(hglrc2) +
-                                  ", " + toHexString(hglrc) + ") failed: error code 0x" +
-                                  Integer.toHexString(WGL.GetLastError()));
-        }
-    }
-    GLContextShareSet.contextCreated(this);
-    WGL.wglMakeCurrent(0, 0); // release immediatly to gain from ARB/EXT wglMakeContextCurrent(draw, read, ctx)!
-    if (DEBUG) {
-      System.err.println(getThreadName() + ": !!! Created OpenGL context " + toHexString(hglrc) + " for " + this + ", device context " + toHexString(drawable.getNativeWindow().getSurfaceHandle()) + ", sharing with " + toHexString(hglrc2));
-    }
-  }
-  
-  protected int makeCurrentImpl() throws GLException {
-    if (drawable.getNativeWindow().getSurfaceHandle() == 0) {
-        if (DEBUG) {
-          System.err.println("drawable not properly initialized");
-        }
-        return CONTEXT_NOT_CURRENT;
-    }
-    boolean created = false;
-    if (hglrc == 0) {
-      create();
-      if (DEBUG) {
-        System.err.println(getThreadName() + ": !!! Created GL context for " + getClass().getName());
-      }
-      created = true;
-    }
-
-    if (WGL.wglGetCurrentContext() != hglrc) {
-      if (!wglMakeContextCurrent(drawable.getNativeWindow().getSurfaceHandle(), drawableRead.getNativeWindow().getSurfaceHandle(), hglrc)) {
-        throw new GLException("Error making context current: 0x" + Integer.toHexString(WGL.GetLastError()));
-      } else {
-        if (DEBUG && VERBOSE) {
-          System.err.println(getThreadName() + ": wglMakeCurrent(hdc " + toHexString(drawable.getNativeWindow().getSurfaceHandle()) +
-                             ", hglrc " + toHexString(hglrc) + ") succeeded");
-        }
-      }
-    }
-
-    if (created) {
-      setGLFunctionAvailability(false);
-
-      WindowsWGLGraphicsConfiguration config = 
-        (WindowsWGLGraphicsConfiguration)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-      config.updateCapabilitiesByWGL(this);
-
-      return CONTEXT_CURRENT_NEW;
-    }
-    return CONTEXT_CURRENT;
-  }
-
-  protected void releaseImpl() throws GLException {
-    if (!wglMakeContextCurrent(0, 0, 0)) {
-        throw new GLException("Error freeing OpenGL context: 0x" + Integer.toHexString(WGL.GetLastError()));
-    }
-  }
-
-  protected void destroyImpl() throws GLException {
-    if (DEBUG) {
-        Exception e = new Exception(getThreadName() + ": !!! Destroyed OpenGL context " + toHexString(hglrc));
-        e.printStackTrace();
-    }
-    if (hglrc != 0) {
-      if (!WGL.wglDeleteContext(hglrc)) {
-        throw new GLException("Unable to delete OpenGL context");
-      }
-      hglrc = 0;
-      GLContextShareSet.contextDestroyed(this);
-    }
-  }
-
-  public boolean isCreated() {
-    return (hglrc != 0);
-  }
-
-  public void copy(GLContext source, int mask) throws GLException {
-    long dst = getHGLRC();
-    long src = ((WindowsWGLContext) source).getHGLRC();
-    if (src == 0) {
-      throw new GLException("Source OpenGL context has not been created");
-    }
-    if (dst == 0) {
-      throw new GLException("Destination OpenGL context has not been created");
-    }
-    if (!WGL.wglCopyContext(src, dst, mask)) {
-      throw new GLException("wglCopyContext failed");
-    }
-  }
-
-  protected void updateGLProcAddressTable() {
-    if (DEBUG) {
-      System.err.println(getThreadName() + ": !!! Initializing WGL extension address table for " + this);
-    }
-    wglGetExtensionsStringEXTInitialized=false;
-    wglGetExtensionsStringEXTAvailable=false;
-    wglMakeContextCurrentInitialized=false;
-    wglMakeContextCurrentARBAvailable=false;
-    wglMakeContextCurrentEXTAvailable=false;
-
-    if (wglExtProcAddressTable == null) {
-      // FIXME: cache ProcAddressTables by capability bits so we can
-      // share them among contexts with the same capabilities
-      wglExtProcAddressTable = new WGLExtProcAddressTable();
-    }          
-    resetProcAddressTable(getWGLExtProcAddressTable());
-    super.updateGLProcAddressTable();
-  }
-  
-  public String getPlatformExtensionsString() {
-    if (!wglGetExtensionsStringEXTInitialized) {
-      wglGetExtensionsStringEXTAvailable = (WGL.wglGetProcAddress("wglGetExtensionsStringEXT") != 0);
-      wglGetExtensionsStringEXTInitialized = true;
-    }
-    if (wglGetExtensionsStringEXTAvailable) {
-      return getWGLExt().wglGetExtensionsStringEXT();
-    } else {
-      return "";
-    }
-  }
-
-  protected void setSwapIntervalImpl(int interval) {
-    WGLExt wglExt = getWGLExt();
-    if (wglExt.isExtensionAvailable("WGL_EXT_swap_control")) {
-      if ( wglExt.wglSwapIntervalEXT(interval) ) {
-        currentSwapInterval = interval ;
-      }
-    }
-  }
-
-  public ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3) {
-    return getWGLExt().wglAllocateMemoryNV(arg0, arg1, arg2, arg3);
-  }
-
-  public int getOffscreenContextPixelDataType() {
-    throw new GLException("Should not call this");
-  }
-
-  public int getOffscreenContextReadBuffer() {
-    throw new GLException("Should not call this");
-  }
-
-  public boolean offscreenImageNeedsVerticalFlip() {
-    throw new GLException("Should not call this");
-  }
-
-  public void bindPbufferToTexture() {
-    throw new GLException("Should not call this");
-  }
-
-  public void releasePbufferFromTexture() {
-    throw new GLException("Should not call this");
-  }
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  public long getHGLRC() {
-    return hglrc;
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java
deleted file mode 100644
index 4bd5e47b2..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
-
-public abstract class WindowsWGLDrawable extends GLDrawableImpl {
-  private static final int MAX_SET_PIXEL_FORMAT_FAIL_COUNT = 5;
-  private static final boolean PROFILING = Debug.debug("WindowsWGLDrawable.profiling");
-  private static final int PROFILING_TICKS = 200;
-  private int  profilingLockSurfaceTicks;
-  private long profilingLockSurfaceTime;
-  private int  profilingUnlockSurfaceTicks;
-  private long profilingUnlockSurfaceTime;
-  private int  profilingSwapBuffersTicks;
-  private long profilingSwapBuffersTime;
-
-
-  public WindowsWGLDrawable(GLDrawableFactory factory, NativeWindow comp, boolean realized) {
-    super(factory, comp, realized);
-  }
-
-  protected void setRealizedImpl() {
-    if(!realized) {
-        return; // nothing todo ..
-    }
-
-    if(NativeWindow.LOCK_SURFACE_NOT_READY == lockSurface()) {
-      throw new GLException("WindowsWGLDrawable.setRealized(true): lockSurface - surface not ready");
-    }
-    try {
-        NativeWindow nativeWindow = getNativeWindow();
-        WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration)nativeWindow.getGraphicsConfiguration().getNativeGraphicsConfiguration();
-        config.updateGraphicsConfiguration(getFactory(), nativeWindow);
-        if (DEBUG) {
-          System.err.println("!!! WindowsWGLDrawable.setRealized(true): "+config);
-        }
-    } finally {
-        unlockSurface();
-    }
-  }
-
-  protected void swapBuffersImpl() {
-    boolean didLock = false;
-
-    try {
-        if ( !isSurfaceLocked() ) {
-            // Usually the surface shall be locked within [makeCurrent .. swap .. release]
-            if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
-                return;
-            }
-            didLock = true;
-        }
-
-        long startTime = 0;
-        if (PROFILING) {
-          startTime = System.currentTimeMillis();
-        }
-
-        if (!WGL.SwapBuffers(getNativeWindow().getSurfaceHandle()) && (WGL.GetLastError() != 0)) {
-          throw new GLException("Error swapping buffers");
-        }
-
-        if (PROFILING) {
-          long endTime = System.currentTimeMillis();
-          profilingSwapBuffersTime += (endTime - startTime);
-          int ticks = PROFILING_TICKS;
-          if (++profilingSwapBuffersTicks == ticks) {
-            System.err.println("SwapBuffers calls: " + profilingSwapBuffersTime + " ms / " + ticks + "  calls (" +
-                               ((float) profilingSwapBuffersTime / (float) ticks) + " ms/call)");
-            profilingSwapBuffersTime = 0;
-            profilingSwapBuffersTicks = 0;
-          }
-        }
-    } finally {
-        if (didLock) {
-          unlockSurface();
-        }
-    }
-  }
-
-  public DynamicLookupHelper getDynamicLookupHelper() {
-    return (WindowsWGLDrawableFactory) getFactoryImpl() ;
-  }
-
-  protected static String getThreadName() {
-    return Thread.currentThread().getName();
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
deleted file mode 100644
index 2a222c693..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import java.nio.*;
-import java.util.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.NWReflection;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
-import com.sun.nativewindow.impl.NullWindow;
-
-public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
-  private static final boolean VERBOSE = Debug.verbose();
-
-  // Handle to GLU32.dll
-  // FIXME: this should go away once we delete support for the C GLU library
-  private long hglu32;
-
-  // Handle to core OpenGL32.dll
-  private long hopengl32;
-
-  public WindowsWGLDrawableFactory() {
-    super();
-
-    // Register our GraphicsConfigurationFactory implementations
-    // The act of constructing them causes them to be registered
-    new WindowsWGLGraphicsConfigurationFactory();
-    try {
-      NWReflection.createInstance("com.sun.opengl.impl.windows.wgl.awt.WindowsAWTWGLGraphicsConfigurationFactory",
-                                  new Object[] {});
-    } catch (Throwable t) { }
-
-    loadOpenGL32Library();
-  }
-
-  public GLDrawableImpl createOnscreenDrawable(NativeWindow target) {
-    if (target == null) {
-      throw new IllegalArgumentException("Null target");
-    }
-    return new WindowsOnscreenWGLDrawable(this, target);
-  }
-
-  protected GLDrawableImpl createOffscreenDrawable(NativeWindow target) {
-    return new WindowsOffscreenWGLDrawable(this, target);
-  }
-
-  private boolean pbufferSupportInitialized = false;
-  private boolean canCreateGLPbuffer = false;
-  public boolean canCreateGLPbuffer() {
-    if (!pbufferSupportInitialized) {
-      final GLDrawableFactory factory = this;
-      Runnable r = new Runnable() {
-          public void run() {
-            WindowsDummyWGLDrawable dummyDrawable = new WindowsDummyWGLDrawable(factory);
-            GLContext dummyContext  = dummyDrawable.createContext(null);
-            if (dummyContext != null) {
-              GLContext lastContext = GLContext.getCurrent();
-              if (lastContext != null) {
-                lastContext.release();
-              }
-              dummyContext.makeCurrent();
-              GL dummyGL = dummyContext.getGL();
-              canCreateGLPbuffer = dummyGL.isExtensionAvailable("GL_ARB_pbuffer");
-              pbufferSupportInitialized = true;
-              dummyContext.release();
-              dummyContext.destroy();
-              dummyDrawable.destroy();
-              if (lastContext != null) {
-                lastContext.makeCurrent();
-              }
-            }
-          }
-        };
-      maybeDoSingleThreadedWorkaround(r);
-    }
-    if (DEBUG) {
-      System.err.println("WindowsWGLDrawableFactory.canCreateGLPbuffer() = " + canCreateGLPbuffer);
-    }
-    return canCreateGLPbuffer;
-  }
-
-  protected GLDrawableImpl createGLPbufferDrawableImpl(final NativeWindow target) {
-    final List returnList = new ArrayList();
-    final GLDrawableFactory factory = this;
-    Runnable r = new Runnable() {
-        public void run() {
-          WindowsDummyWGLDrawable dummyDrawable = new WindowsDummyWGLDrawable(factory);
-          WindowsWGLContext       dummyContext  = (WindowsWGLContext) dummyDrawable.createContext(null);
-          GLContext lastContext = GLContext.getCurrent();
-          if (lastContext != null) {
-            lastContext.release();
-          }
-          dummyContext.makeCurrent();
-          WGLExt dummyWGLExt = dummyContext.getWGLExt();
-          try {
-            GLDrawableImpl pbufferDrawable = new WindowsPbufferWGLDrawable(factory, target,
-                                                                           dummyDrawable,
-                                                                           dummyWGLExt);
-            returnList.add(pbufferDrawable);
-            dummyContext.release();
-            dummyContext.destroy();
-            dummyDrawable.destroy();
-          } finally {
-            if (lastContext != null) {
-              lastContext.makeCurrent();
-            }
-          }
-        }
-      };
-    maybeDoSingleThreadedWorkaround(r);
-    return (GLDrawableImpl) returnList.get(0);
-  }
-
-  protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
-    AbstractGraphicsScreen screen = DefaultGraphicsScreen.createDefault();
-    NullWindow nw = new NullWindow(WindowsWGLGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(
-                                   capabilities, chooser, screen) );
-    nw.setSize(width, height);
-    return nw;
-  }
- 
-  public GLContext createExternalGLContext() {
-    return WindowsExternalWGLContext.create(this, null);
-  }
-
-  public boolean canCreateExternalGLDrawable() {
-    return true;
-  }
-
-  public GLDrawable createExternalGLDrawable() {
-    return WindowsExternalWGLDrawable.create(this, null);
-  }
-
-  public void loadOpenGL32Library() {
-    if (hopengl32 == 0) {
-      hopengl32 = WGL.LoadLibraryA("OpenGL32");
-      if (DEBUG) {
-        if (hopengl32 == 0) {
-          System.err.println("WindowsWGLDrawableFactory: Could not load OpenGL32.dll - maybe an embedded device");
-        }
-      }
-    }
-  }
-
-  public void loadGLULibrary() {
-    if (hglu32 == 0) {
-      hglu32 = WGL.LoadLibraryA("GLU32");
-      if (hglu32 == 0) {
-        throw new GLException("Error loading GLU32.DLL");
-      }
-    }
-  }
-
-  public long dynamicLookupFunction(String glFuncName) {
-    long res = WGL.wglGetProcAddress(glFuncName);
-    if (res == 0) {
-      // It may happen that a driver doesn't return the OpenGL32 core function pointer
-      // with wglGetProcAddress (e.g. NVidia GL 3.1) - hence we have to look harder.
-      if (hopengl32 != 0) {
-        res = WGL.GetProcAddress(hopengl32, glFuncName);
-      }
-    }
-    if (res == 0) {
-      // GLU routines aren't known to the OpenGL function lookup
-      if (hglu32 != 0) {
-        res = WGL.GetProcAddress(hglu32, glFuncName);
-      }
-    }
-    return res;
-  }
-
-  static String wglGetLastError() {
-    long err = WGL.GetLastError();
-    String detail = null;
-    switch ((int) err) {
-      case WGL.ERROR_INVALID_PIXEL_FORMAT: detail = "ERROR_INVALID_PIXEL_FORMAT";       break;
-      case WGL.ERROR_NO_SYSTEM_RESOURCES:  detail = "ERROR_NO_SYSTEM_RESOURCES";        break;
-      case WGL.ERROR_INVALID_DATA:         detail = "ERROR_INVALID_DATA";               break;
-      case WGL.ERROR_PROC_NOT_FOUND:       detail = "ERROR_PROC_NOT_FOUND";             break;
-      case WGL.ERROR_INVALID_WINDOW_HANDLE:detail = "ERROR_INVALID_WINDOW_HANDLE";      break;
-      default:                             detail = "(Unknown error code " + err + ")"; break;
-    }
-    return detail;
-  }
-
-  public boolean canCreateContextOnJava2DSurface() {
-    return false;
-  }
-
-  public GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
-    throws GLException {
-    throw new GLException("Unimplemented on this platform");
-  }
-
-  //------------------------------------------------------
-  // Gamma-related functionality
-  //
-
-  private static final int GAMMA_RAMP_LENGTH = 256;
-
-  protected int getGammaRampLength() {
-    return GAMMA_RAMP_LENGTH;
-  }
-
-  protected boolean setGammaRamp(float[] ramp) {
-    short[] rampData = new short[3 * GAMMA_RAMP_LENGTH];
-    for (int i = 0; i < GAMMA_RAMP_LENGTH; i++) {
-      short scaledValue = (short) (ramp[i] * 65535);
-      rampData[i] = scaledValue;
-      rampData[i +     GAMMA_RAMP_LENGTH] = scaledValue;
-      rampData[i + 2 * GAMMA_RAMP_LENGTH] = scaledValue;
-    }
-
-    long screenDC = WGL.GetDC(0);
-    boolean res = WGL.SetDeviceGammaRamp(screenDC, ShortBuffer.wrap(rampData));
-    WGL.ReleaseDC(0, screenDC);
-    return res;
-  }
-
-  protected Buffer getGammaRamp() {
-    ShortBuffer rampData = ShortBuffer.wrap(new short[3 * GAMMA_RAMP_LENGTH]);
-    long screenDC = WGL.GetDC(0);
-    boolean res = WGL.GetDeviceGammaRamp(screenDC, rampData);
-    WGL.ReleaseDC(0, screenDC);
-    if (!res) {
-      return null;
-    }
-    return rampData;
-  }
-
-  protected void resetGammaRamp(Buffer originalGammaRamp) {
-    if (originalGammaRamp == null) {
-      // getGammaRamp failed earlier
-      return;
-    }
-    long screenDC = WGL.GetDC(0);
-    WGL.SetDeviceGammaRamp(screenDC, originalGammaRamp);
-    WGL.ReleaseDC(0, screenDC);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
deleted file mode 100644
index 158be9df6..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
+++ /dev/null
@@ -1,638 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import java.util.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
-
-public class WindowsWGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
-    // Keep this under the same debug flag as the drawable factory for convenience
-    protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("GraphicsConfiguration");
-    
-    protected static final int MAX_PFORMATS = 256;
-    protected static final int MAX_ATTRIBS  = 256;
-
-    private PIXELFORMATDESCRIPTOR pixelfmt;
-    private int pixelfmtID;
-    private boolean isChosen = false;
-    private GLCapabilitiesChooser chooser;
-    private boolean choosenByWGLPixelFormat=false;
-
-    public WindowsWGLGraphicsConfiguration(AbstractGraphicsScreen screen, GLCapabilities capsChosen, GLCapabilities capsRequested,
-                                           PIXELFORMATDESCRIPTOR pixelfmt, int pixelfmtID, GLCapabilitiesChooser chooser) {
-        super(screen, capsChosen, capsRequested);
-        this.chooser=chooser;
-        this.pixelfmt = pixelfmt;
-        this.pixelfmtID = pixelfmtID;
-    }
-
-    public static WindowsWGLGraphicsConfiguration create(long hdc, int pfdID, 
-                                                         GLProfile glp, AbstractGraphicsScreen screen, boolean onscreen, boolean usePBuffer)
-    {
-        if(pfdID<=0) {
-            throw new GLException("Invalid pixelformat id "+pfdID);
-        }
-        if(null==glp) {
-          glp = GLProfile.getDefault();
-        }
-        PIXELFORMATDESCRIPTOR pfd = createPixelFormatDescriptor();
-        if (WGL.DescribePixelFormat(hdc, pfdID, pfd.size(), pfd) == 0) {
-            throw new GLException("Unable to describe pixel format " + pfdID);
-        }
-
-        GLCapabilities caps = PFD2GLCapabilities(glp, pfd, onscreen, usePBuffer);
-        if(null==caps) {
-            throw new GLException("Couldn't choose Capabilities by: HDC 0x"+Long.toHexString(hdc)+", pfdID "+pfdID);
-        }
-        WindowsWGLGraphicsConfiguration cfg = new WindowsWGLGraphicsConfiguration(screen, caps, caps, pfd, pfdID, new DefaultGLCapabilitiesChooser());
-        cfg.setCapsPFD(caps, pfd, pfdID, false);
-
-        return cfg;
-    }
-
-    public Object clone() {
-        return super.clone();
-    }
-
-    /** Update config - before having a valid context */
-    protected void updateGraphicsConfiguration(GLDrawableFactory factory, NativeWindow nativeWindow) {
-        WindowsWGLGraphicsConfigurationFactory.updateGraphicsConfiguration(chooser, factory, nativeWindow);
-    }
-
-    /** Update config - after having a valid and current context */
-    protected void updateCapabilitiesByWGL(GLContextImpl context) {
-        if(choosenByWGLPixelFormat) return; // already done ..
-
-        GLCapabilities capabilities = (GLCapabilities) getRequestedCapabilities();
-        boolean onscreen = capabilities.isOnscreen();
-        boolean usePBuffer = capabilities.isPBuffer();
-        GLProfile glp = capabilities.getGLProfile();
-
-        WGLExt wglExt = (WGLExt) context.getPlatformGLExtensions();
-        GLDrawable drawable = context.getGLDrawable();
-        NativeWindow nativeWindow = drawable.getNativeWindow();
-        long hdc = nativeWindow.getSurfaceHandle();
-
-        GLCapabilities[] caps = HDC2GLCapabilities(wglExt, hdc, getPixelFormatID(), glp, true, onscreen, usePBuffer);
-        if(null!=caps && null!=caps[0]) {
-            setCapsPFD(caps[0], getPixelFormat(), getPixelFormatID(), true);
-        }
-    }
-
-    protected void setCapsPFD(GLCapabilities caps, PIXELFORMATDESCRIPTOR pfd, int pfdID, boolean choosenByWGLPixelFormat) {
-        this.pixelfmt = pfd;
-        this.pixelfmtID = pfdID;
-        setChosenCapabilities(caps);
-        this.isChosen=true;
-        this.choosenByWGLPixelFormat=choosenByWGLPixelFormat;
-        if (DEBUG) {
-            System.err.println("*** setCapsPFD: WGL-Choosen "+choosenByWGLPixelFormat+", pfdID "+pfdID+", "+caps);
-        }
-    }
-
-    public boolean getCapabilitiesChosen() {
-        return isChosen;
-    }
-
-    public PIXELFORMATDESCRIPTOR getPixelFormat()   { return pixelfmt; }
-    public int getPixelFormatID() { return pixelfmtID; }
-    public boolean isChoosenByWGL() { return choosenByWGLPixelFormat; }
-
-    private static int haveWGLChoosePixelFormatARB = -1;
-    private static int haveWGLARBMultisample = -1;
-
-    public static GLCapabilities[] HDC2GLCapabilities(WGLExt wglExt, long hdc, int pfdIDOnly,
-                                                      GLProfile glp, boolean relaxed, boolean onscreen, boolean usePBuffer) {
-    
-        if(haveWGLChoosePixelFormatARB<0) {
-            haveWGLChoosePixelFormatARB = wglExt.isExtensionAvailable("WGL_ARB_pixel_format")?1:0;
-        }
-        if(haveWGLARBMultisample<0) {
-            haveWGLARBMultisample = wglExt.isExtensionAvailable("WGL_ARB_multisample")?1:0;
-        }
-        if (0==haveWGLChoosePixelFormatARB) {
-            return null;
-        }
-
-        // Produce a list of GLCapabilities to give to the
-        // GLCapabilitiesChooser.
-        // Use wglGetPixelFormatAttribivARB instead of
-        // DescribePixelFormat to get higher-precision information
-        // about the pixel format (should make the GLCapabilities
-        // more precise as well...i.e., remove the
-        // "HardwareAccelerated" bit, which is basically
-        // meaningless, and put in whether it can render to a
-        // window, to a pbuffer, or to a pixmap)
-        GLCapabilities[] availableCaps = null;
-        int numFormats = 0;
-        int niattribs = 0;
-        int[] iattributes = new int  [2*MAX_ATTRIBS];
-        int[] iresults    = new int  [2*MAX_ATTRIBS];
-
-        iattributes[0] = WGLExt.WGL_NUMBER_PIXEL_FORMATS_ARB;
-        if (wglExt.wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, iattributes, 0, iresults, 0)) {
-          numFormats = iresults[0];
-
-          if (DEBUG) {
-            System.err.println("wglGetPixelFormatAttribivARB reported WGL_NUMBER_PIXEL_FORMATS = " + numFormats);
-          }
-
-          if(pfdIDOnly>0 && pfdIDOnly>numFormats) {
-            throw new GLException("Invalid pixelformat ID " + pfdIDOnly + " (should be between 1 and " + numFormats + ")");
-          }
-
-          // Should we be filtering out the pixel formats which aren't
-          // applicable, as we are doing here?
-          // We don't have enough information in the GLCapabilities to
-          // represent those that aren't...
-          iattributes[niattribs++] = WGLExt.WGL_DRAW_TO_WINDOW_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_ACCELERATION_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_SUPPORT_OPENGL_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_DEPTH_BITS_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_STENCIL_BITS_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_DOUBLE_BUFFER_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_STEREO_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_PIXEL_TYPE_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_RED_BITS_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_GREEN_BITS_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_BLUE_BITS_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_ALPHA_BITS_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_ACCUM_RED_BITS_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_ACCUM_GREEN_BITS_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_ACCUM_BLUE_BITS_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_ACCUM_ALPHA_BITS_ARB;
-          if (1==haveWGLARBMultisample) {
-            iattributes[niattribs++] = WGLExt.WGL_SAMPLE_BUFFERS_ARB;
-            iattributes[niattribs++] = WGLExt.WGL_SAMPLES_ARB;
-          }
-
-          if(pfdIDOnly>0) {
-              availableCaps = new GLCapabilities[1];
-              if (!wglExt.wglGetPixelFormatAttribivARB(hdc, pfdIDOnly, 0, niattribs, iattributes, 0, iresults, 0)) {
-                  throw new GLException("Error getting pixel format attributes for pixel format " + pfdIDOnly + " of device context");
-              }
-              availableCaps[0] = AttribList2GLCapabilities(glp, iattributes, niattribs, iresults, 
-                                                           relaxed, onscreen, usePBuffer);
-          } else {
-              availableCaps = new GLCapabilities[numFormats];
-              for (int i = 0; i < numFormats; i++) {
-                if (!wglExt.wglGetPixelFormatAttribivARB(hdc, i+1, 0, niattribs, iattributes, 0, iresults, 0)) {
-                  throw new GLException("Error getting pixel format attributes for pixel format " + (i + 1) + " of device context");
-                }
-                availableCaps[i] = AttribList2GLCapabilities(glp, iattributes, niattribs, iresults, 
-                                                             relaxed, onscreen, usePBuffer);
-              }
-          }
-        } else {
-          long lastErr = WGL.GetLastError();
-          // Intel Extreme graphics fails with a zero error code
-          if (lastErr != 0) {
-            throw new GLException("Unable to enumerate pixel formats of window using wglGetPixelFormatAttribivARB: error code " + WGL.GetLastError());
-          }
-        }
-        return availableCaps;
-    }
-
-    public static boolean GLCapabilities2AttribList(GLCapabilities caps,
-                                                  int[] iattributes,
-                                                  WGLExt wglExt,
-                                                  boolean pbuffer,
-                                                  int[] floatMode) throws GLException {
-        if (!wglExt.isExtensionAvailable("WGL_ARB_pixel_format")) {
-          return false;
-        }
-
-        int niattribs = 0;
-
-        iattributes[niattribs++] = WGLExt.WGL_SUPPORT_OPENGL_ARB;
-        iattributes[niattribs++] = GL.GL_TRUE;
-        if (pbuffer) {
-          iattributes[niattribs++] = WGLExt.WGL_DRAW_TO_PBUFFER_ARB;
-          iattributes[niattribs++] = GL.GL_TRUE;
-        } else {
-          iattributes[niattribs++] = WGLExt.WGL_DRAW_TO_WINDOW_ARB;
-          iattributes[niattribs++] = GL.GL_TRUE;
-        }
-
-        iattributes[niattribs++] = WGLExt.WGL_DOUBLE_BUFFER_ARB;
-        if (caps.getDoubleBuffered()) {
-          iattributes[niattribs++] = GL.GL_TRUE;
-        } else {
-          iattributes[niattribs++] = GL.GL_FALSE;
-        }
-
-        iattributes[niattribs++] = WGLExt.WGL_STEREO_ARB;
-        if (caps.getStereo()) {
-          iattributes[niattribs++] = GL.GL_TRUE;
-        } else {
-          iattributes[niattribs++] = GL.GL_FALSE;
-        }
-        
-        iattributes[niattribs++] = WGLExt.WGL_DEPTH_BITS_ARB;
-        iattributes[niattribs++] = caps.getDepthBits();
-        iattributes[niattribs++] = WGLExt.WGL_RED_BITS_ARB;
-        iattributes[niattribs++] = caps.getRedBits();
-        iattributes[niattribs++] = WGLExt.WGL_GREEN_BITS_ARB;
-        iattributes[niattribs++] = caps.getGreenBits();
-        iattributes[niattribs++] = WGLExt.WGL_BLUE_BITS_ARB;
-        iattributes[niattribs++] = caps.getBlueBits();
-        iattributes[niattribs++] = WGLExt.WGL_ALPHA_BITS_ARB;
-        iattributes[niattribs++] = caps.getAlphaBits();
-        iattributes[niattribs++] = WGLExt.WGL_STENCIL_BITS_ARB;
-        iattributes[niattribs++] = caps.getStencilBits();
-        if (caps.getAccumRedBits()   > 0 ||
-            caps.getAccumGreenBits() > 0 ||
-            caps.getAccumBlueBits()  > 0 ||
-            caps.getAccumAlphaBits() > 0) {
-          iattributes[niattribs++] = WGLExt.WGL_ACCUM_BITS_ARB;
-          iattributes[niattribs++] = (caps.getAccumRedBits() +
-                                      caps.getAccumGreenBits() +
-                                      caps.getAccumBlueBits() +
-                                      caps.getAccumAlphaBits());
-          iattributes[niattribs++] = WGLExt.WGL_ACCUM_RED_BITS_ARB;
-          iattributes[niattribs++] = caps.getAccumRedBits();
-          iattributes[niattribs++] = WGLExt.WGL_ACCUM_GREEN_BITS_ARB;
-          iattributes[niattribs++] = caps.getAccumGreenBits();
-          iattributes[niattribs++] = WGLExt.WGL_ACCUM_BLUE_BITS_ARB;
-          iattributes[niattribs++] = caps.getAccumBlueBits();
-          iattributes[niattribs++] = WGLExt.WGL_ACCUM_ALPHA_BITS_ARB;
-          iattributes[niattribs++] = caps.getAccumAlphaBits();
-        }
-
-        if (wglExt.isExtensionAvailable("WGL_ARB_multisample")) {
-          if (caps.getSampleBuffers()) {
-            iattributes[niattribs++] = WGLExt.WGL_SAMPLE_BUFFERS_ARB;
-            iattributes[niattribs++] = GL.GL_TRUE;
-            iattributes[niattribs++] = WGLExt.WGL_SAMPLES_ARB;
-            iattributes[niattribs++] = caps.getNumSamples();
-          }
-        }
-
-        boolean rtt      = caps.getPbufferRenderToTexture();
-        boolean rect     = caps.getPbufferRenderToTextureRectangle();
-        boolean useFloat = caps.getPbufferFloatingPointBuffers();
-        boolean ati      = false;
-        if (pbuffer) {
-          // Check some invariants and set up some state
-          if (rect && !rtt) {
-            throw new GLException("Render-to-texture-rectangle requires render-to-texture to be specified");
-          }
-
-          if (rect) {
-            if (!wglExt.isExtensionAvailable("GL_NV_texture_rectangle")) {
-              throw new GLException("Render-to-texture-rectangle requires GL_NV_texture_rectangle extension");
-            }
-          }
-
-          if (useFloat) {
-            if (!wglExt.isExtensionAvailable("WGL_ATI_pixel_format_float") &&
-                !wglExt.isExtensionAvailable("WGL_NV_float_buffer")) {
-              throw new GLException("Floating-point pbuffers not supported by this hardware");
-            }
-
-            // Prefer NVidia extension over ATI
-            if (wglExt.isExtensionAvailable("WGL_NV_float_buffer")) {
-              ati = false;
-              floatMode[0] = GLPbuffer.NV_FLOAT;
-            } else {
-              ati = true;
-              floatMode[0] = GLPbuffer.ATI_FLOAT;
-            }
-            if (DEBUG) {
-              System.err.println("Using " + (ati ? "ATI" : "NVidia") + " floating-point extension");
-            }
-          }
-
-          // See whether we need to change the pixel type to support ATI's
-          // floating-point pbuffers
-          if (useFloat && ati) {
-            if (rtt) {
-              throw new GLException("Render-to-floating-point-texture not supported on ATI hardware");
-            } else {
-              iattributes[niattribs++] = WGLExt.WGL_PIXEL_TYPE_ARB;
-              iattributes[niattribs++] = WGLExt.WGL_TYPE_RGBA_FLOAT_ARB;
-            }
-          } else {
-            if (!rtt) {
-              // Currently we don't support non-truecolor visuals in the
-              // GLCapabilities, so we don't offer the option of making
-              // color-index pbuffers.
-              iattributes[niattribs++] = WGLExt.WGL_PIXEL_TYPE_ARB;
-              iattributes[niattribs++] = WGLExt.WGL_TYPE_RGBA_ARB;
-            }
-          }
-
-          if (useFloat && !ati) {
-            iattributes[niattribs++] = WGLExt.WGL_FLOAT_COMPONENTS_NV;
-            iattributes[niattribs++] = GL.GL_TRUE;
-          }
-
-          if (rtt) {
-            if (useFloat) {
-              assert(!ati);
-              if (!rect) {
-                throw new GLException("Render-to-floating-point-texture only supported on NVidia hardware with render-to-texture-rectangle");
-              }
-              iattributes[niattribs++] = WGLExt.WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV;
-              iattributes[niattribs++] = GL.GL_TRUE;
-            } else {
-              iattributes[niattribs++] = rect ? WGLExt.WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV : WGLExt.WGL_BIND_TO_TEXTURE_RGB_ARB;
-              iattributes[niattribs++] = GL.GL_TRUE;
-            }
-          }
-        } else {
-          iattributes[niattribs++] = WGLExt.WGL_PIXEL_TYPE_ARB;
-          iattributes[niattribs++] = WGLExt.WGL_TYPE_RGBA_ARB;
-        }
-        iattributes[niattribs++] = 0;
-
-        return true;
-    }
-
-    public static final int WINDOW_BIT  = 1 << 0 ;
-    public static final int BITMAP_BIT  = 1 << 1 ;
-    public static final int PBUFFER_BIT = 1 << 2 ;
-
-    public static int WGLConfig2DrawableTypeBits(int[] iattribs,
-                                                 int niattribs,
-                                                 int[] iresults) {
-        int val = 0;
-
-        for (int i = 0; i < niattribs; i++) {
-          int attr = iattribs[i];
-          switch (attr) {
-            case WGLExt.WGL_DRAW_TO_WINDOW_ARB:
-                if(iresults[i] == GL.GL_TRUE) val |= WINDOW_BIT;
-                break;
-            case WGLExt.WGL_DRAW_TO_BITMAP_ARB:
-                if(iresults[i] == GL.GL_TRUE) val |= BITMAP_BIT;
-                break;
-            case WGLExt.WGL_DRAW_TO_PBUFFER_ARB:
-                if(iresults[i] == GL.GL_TRUE) val |= PBUFFER_BIT;
-                break;
-            }
-        }
-        return val;
-    }
-
-    public static boolean WGLConfigDrawableTypeVerify(int val, boolean onscreen, boolean usePBuffer) {
-        boolean res;
-
-        if ( onscreen ) {
-            res = ( 0 != (val & WINDOW_BIT) ) ;
-        } else {
-            res = ( 0 != (val & BITMAP_BIT) ) || usePBuffer ;
-        }
-        if ( usePBuffer ) {
-            res = res && ( 0 != (val & PBUFFER_BIT) ) ;
-        }
-
-        return res;
-    }
-    public static GLCapabilities AttribList2GLCapabilities(GLProfile glp, int[] iattribs,
-                                                         int niattribs,
-                                                         int[] iresults,
-                                                         boolean relaxed, boolean onscreen, boolean usePBuffer) {
-        GLCapabilities res = new GLCapabilities(glp);
-        int drawableTypeBits = WGLConfig2DrawableTypeBits(iattribs, niattribs, iresults);
-        if(WGLConfigDrawableTypeVerify(drawableTypeBits, onscreen, usePBuffer)) {
-            res.setOnscreen(onscreen);
-            res.setPBuffer(usePBuffer);
-        } else if(relaxed) {
-            res.setOnscreen( 0 != (drawableTypeBits & WINDOW_BIT) );
-            res.setPBuffer ( 0 != (drawableTypeBits & PBUFFER_BIT) );
-        } else {
-            throw new GLException("WGL DrawableType does not match !!!");
-        }
-
-        for (int i = 0; i < niattribs; i++) {
-          int attr = iattribs[i];
-          switch (attr) {
-            case WGLExt.WGL_DRAW_TO_WINDOW_ARB:
-            case WGLExt.WGL_DRAW_TO_BITMAP_ARB:
-            case WGLExt.WGL_DRAW_TO_PBUFFER_ARB:
-              break;
-
-            case WGLExt.WGL_ACCELERATION_ARB:
-              res.setHardwareAccelerated(iresults[i] == WGLExt.WGL_FULL_ACCELERATION_ARB);
-              break;
-
-            case WGLExt.WGL_SUPPORT_OPENGL_ARB:
-              if (iresults[i] != GL.GL_TRUE) {
-                return null;
-              }
-              break;
-
-            case WGLExt.WGL_DEPTH_BITS_ARB:
-              res.setDepthBits(iresults[i]);
-              break;
-
-            case WGLExt.WGL_STENCIL_BITS_ARB:
-              res.setStencilBits(iresults[i]);
-              break;
-
-            case WGLExt.WGL_DOUBLE_BUFFER_ARB:
-              res.setDoubleBuffered(iresults[i] == GL.GL_TRUE);
-              break;
-
-            case WGLExt.WGL_STEREO_ARB:
-              res.setStereo(iresults[i] == GL.GL_TRUE);
-              break;
-
-            case WGLExt.WGL_PIXEL_TYPE_ARB:
-              // Fail softly with unknown results here
-              if (iresults[i] == WGLExt.WGL_TYPE_RGBA_ARB||
-                  iresults[i] == WGLExt.WGL_TYPE_RGBA_FLOAT_ARB) {
-                res.setPbufferFloatingPointBuffers(true);
-              }
-              break;
-
-            case WGLExt.WGL_FLOAT_COMPONENTS_NV:
-              if (iresults[i] != 0) {
-                res.setPbufferFloatingPointBuffers(true);
-              }
-              break;
-
-            case WGLExt.WGL_RED_BITS_ARB:
-              res.setRedBits(iresults[i]);
-              break;
-              
-            case WGLExt.WGL_GREEN_BITS_ARB:
-              res.setGreenBits(iresults[i]);
-              break;
-
-            case WGLExt.WGL_BLUE_BITS_ARB:
-              res.setBlueBits(iresults[i]);
-              break;
-
-            case WGLExt.WGL_ALPHA_BITS_ARB:
-              res.setAlphaBits(iresults[i]);
-              break;
-
-            case WGLExt.WGL_ACCUM_RED_BITS_ARB:
-              res.setAccumRedBits(iresults[i]);
-              break;
-
-            case WGLExt.WGL_ACCUM_GREEN_BITS_ARB:
-              res.setAccumGreenBits(iresults[i]);
-              break;
-
-            case WGLExt.WGL_ACCUM_BLUE_BITS_ARB:
-              res.setAccumBlueBits(iresults[i]);
-              break;
-
-            case WGLExt.WGL_ACCUM_ALPHA_BITS_ARB:
-              res.setAccumAlphaBits(iresults[i]);
-              break;
-
-            case WGLExt.WGL_SAMPLE_BUFFERS_ARB:
-              res.setSampleBuffers(iresults[i] != 0);
-              break;
-
-            case WGLExt.WGL_SAMPLES_ARB:
-              res.setNumSamples(iresults[i]);
-              break;
-
-            default:
-              throw new GLException("Unknown pixel format attribute " + iattribs[i]);
-          }
-        }
-        return res;
-    }
-
-  // PIXELFORMAT
-
-    public static GLCapabilities PFD2GLCapabilities(GLProfile glp, PIXELFORMATDESCRIPTOR pfd, boolean onscreen, boolean usePBuffer) {
-        if ((pfd.getDwFlags() & WGL.PFD_SUPPORT_OPENGL) == 0) {
-          return null;
-        }
-        GLCapabilities res = new GLCapabilities(glp);
-        res.setRedBits       (pfd.getCRedBits());
-        res.setGreenBits     (pfd.getCGreenBits());
-        res.setBlueBits      (pfd.getCBlueBits());
-        res.setAlphaBits     (pfd.getCAlphaBits());
-        res.setAccumRedBits  (pfd.getCAccumRedBits());
-        res.setAccumGreenBits(pfd.getCAccumGreenBits());
-        res.setAccumBlueBits (pfd.getCAccumBlueBits());
-        res.setAccumAlphaBits(pfd.getCAccumAlphaBits());
-        res.setDepthBits     (pfd.getCDepthBits());
-        res.setStencilBits   (pfd.getCStencilBits());
-        res.setDoubleBuffered((pfd.getDwFlags() & WGL.PFD_DOUBLEBUFFER) != 0);
-        res.setStereo        ((pfd.getDwFlags() & WGL.PFD_STEREO) != 0);
-        res.setHardwareAccelerated( ((pfd.getDwFlags() & WGL.PFD_GENERIC_FORMAT) == 0) ||
-                                    ((pfd.getDwFlags() & WGL.PFD_GENERIC_ACCELERATED) != 0) );
-        res.setOnscreen      ( onscreen && ((pfd.getDwFlags() & WGL.PFD_DRAW_TO_WINDOW) != 0) );
-        res.setPBuffer       ( usePBuffer );
-        /* FIXME: Missing ??
-        if (GLXUtil.isMultisampleAvailable()) {
-          res.setSampleBuffers(glXGetFBConfig(display, fbcfg, GLX.GLX_SAMPLE_BUFFERS, tmp, 0) != 0);
-          res.setNumSamples   (glXGetFBConfig(display, fbcfg, GLX.GLX_SAMPLES,        tmp, 0));
-        }
-        res.setBackgroundOpaque(glXGetFBConfig(display, fbcfg, GLX.GLX_TRANSPARENT_TYPE, tmp, 0) != GLX.GLX_NONE);
-        try { 
-            res.setPbufferFloatingPointBuffers(glXGetFBConfig(display, fbcfg, GLXExt.GLX_FLOAT_COMPONENTS_NV, tmp, 0) != GL.GL_FALSE);
-        } catch (Exception e) {}
-        */
-        return res;
-  }
-
-  public static PIXELFORMATDESCRIPTOR GLCapabilities2PFD(GLCapabilities caps) {
-    int colorDepth = (caps.getRedBits() +
-                      caps.getGreenBits() +
-                      caps.getBlueBits());
-    if (colorDepth < 15) {
-      throw new GLException("Bit depths < 15 (i.e., non-true-color) not supported");
-    }
-    PIXELFORMATDESCRIPTOR pfd = createPixelFormatDescriptor();
-    int pfdFlags = (WGL.PFD_SUPPORT_OPENGL |
-                    WGL.PFD_GENERIC_ACCELERATED);
-    if (caps.getDoubleBuffered()) {
-      pfdFlags |= WGL.PFD_DOUBLEBUFFER;
-    }
-    if (caps.isOnscreen()) {
-      pfdFlags |= WGL.PFD_DRAW_TO_WINDOW;
-    } else {
-      pfdFlags |= WGL.PFD_DRAW_TO_BITMAP;
-    }
-    if (caps.getStereo()) {
-      pfdFlags |= WGL.PFD_STEREO;
-    }
-    pfd.setDwFlags(pfdFlags);
-    pfd.setIPixelType((byte) WGL.PFD_TYPE_RGBA);
-    pfd.setCColorBits((byte) colorDepth);
-    pfd.setCRedBits  ((byte) caps.getRedBits());
-    pfd.setCGreenBits((byte) caps.getGreenBits());
-    pfd.setCBlueBits ((byte) caps.getBlueBits());
-    pfd.setCAlphaBits((byte) caps.getAlphaBits());
-    int accumDepth = (caps.getAccumRedBits() +
-                      caps.getAccumGreenBits() +
-                      caps.getAccumBlueBits());
-    pfd.setCAccumBits     ((byte) accumDepth);
-    pfd.setCAccumRedBits  ((byte) caps.getAccumRedBits());
-    pfd.setCAccumGreenBits((byte) caps.getAccumGreenBits());
-    pfd.setCAccumBlueBits ((byte) caps.getAccumBlueBits());
-    pfd.setCAccumAlphaBits((byte) caps.getAccumAlphaBits());
-    pfd.setCDepthBits((byte) caps.getDepthBits());
-    pfd.setCStencilBits((byte) caps.getStencilBits());
-    pfd.setILayerType((byte) WGL.PFD_MAIN_PLANE);
-
-    /* FIXME: Missing: 
-      caps.getSampleBuffers()
-      caps.getNumSamples   ()
-    }
-    caps.getBackgroundOpaque()
-    try { 
-        caps.getPbufferFloatingPointBuffers()
-    } catch (Exception e) {}
-    */
-    return pfd;
-  }
-
-  public static PIXELFORMATDESCRIPTOR createPixelFormatDescriptor() {
-    PIXELFORMATDESCRIPTOR pfd = PIXELFORMATDESCRIPTOR.create();
-    pfd.setNSize((short) pfd.size());
-    pfd.setNVersion((short) 1);
-    return pfd;
-  }
-
-  public String toString() {
-    return "WindowsWGLGraphicsConfiguration["+getScreen()+", pfdID " + pixelfmtID + ", wglChoosen "+choosenByWGLPixelFormat+
-                                            ",\n\trequested " + getRequestedCapabilities() +
-                                            ",\n\tchosen    " + getChosenCapabilities() +
-                                            "]";
-  }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
deleted file mode 100644
index 229042d9d..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.opengl.impl.windows.wgl;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.windows.*;
-import com.sun.nativewindow.impl.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-
-/** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
-    are used on Windows platforms. Toolkits will likely need to delegate
-    to this one to change the accepted and returned types of the
-    GraphicsDevice and GraphicsConfiguration abstractions. */
-
-public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
-    protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("GraphicsConfiguration");
-
-    public WindowsWGLGraphicsConfigurationFactory() {
-        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.windows.WindowsGraphicsDevice.class, this);
-    }
-
-    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
-                                                                     CapabilitiesChooser chooser,
-                                                                     AbstractGraphicsScreen absScreen) {
-        GLCapabilities caps = (GLCapabilities)capabilities;
-        return chooseGraphicsConfigurationStatic(caps, chooser, absScreen);
-    }
-
-    protected static WindowsWGLGraphicsConfiguration createDefaultGraphicsConfiguration(AbstractGraphicsScreen absScreen, boolean onscreen, boolean usePBuffer) {
-        GLCapabilities caps = new GLCapabilities(null);
-        caps.setDoubleBuffered(onscreen); // FIXME
-        caps.setOnscreen  (onscreen);
-        caps.setPBuffer   (usePBuffer);
-
-        GLCapabilities caps2 = (GLCapabilities) caps.clone();
-        if(!caps2.isOnscreen()) {
-            // OFFSCREEN !DOUBLE_BUFFER
-            caps2.setDoubleBuffered(false);
-        }
-
-        if(null==absScreen) {
-            absScreen = DefaultGraphicsScreen.createScreenDevice(0);
-        }
-        return new WindowsWGLGraphicsConfiguration(absScreen, caps2, caps, WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(caps2), -1, null);
-    }
-
-    protected static WindowsWGLGraphicsConfiguration chooseGraphicsConfigurationStatic(GLCapabilities caps,
-                                                                                       CapabilitiesChooser chooser,
-                                                                                       AbstractGraphicsScreen absScreen) {
-        if(null==absScreen) {
-            absScreen = DefaultGraphicsScreen.createScreenDevice(0);
-        }
-        GLCapabilities caps2 = (GLCapabilities) caps.clone();
-        if(!caps2.isOnscreen()) {
-            // OFFSCREEN !DOUBLE_BUFFER
-            caps2.setDoubleBuffered(false);
-        }
-        return new WindowsWGLGraphicsConfiguration(absScreen, caps2, caps, WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(caps2), -1, 
-                                                   (GLCapabilitiesChooser)chooser);
-    }
-
-    protected static void updateGraphicsConfiguration(CapabilitiesChooser chooser,
-                                                      GLDrawableFactory factory, NativeWindow nativeWindow) {
-        if (nativeWindow == null) {
-            throw new IllegalArgumentException("NativeWindow is null");
-        }
-
-        if (chooser != null &&
-            !(chooser instanceof GLCapabilitiesChooser)) {
-            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilitiesChooser objects");
-        }
-
-        boolean choosenBywGLPixelFormat = false;
-        WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration) nativeWindow.getGraphicsConfiguration().getNativeGraphicsConfiguration();
-        GLCapabilities capabilities = (GLCapabilities) config.getRequestedCapabilities();
-        boolean onscreen = capabilities.isOnscreen();
-        boolean usePBuffer = capabilities.isPBuffer();
-        GLProfile glProfile = capabilities.getGLProfile();
-        long hdc = nativeWindow.getSurfaceHandle();
-
-        if (DEBUG) {
-          Exception ex = new Exception("WindowsWGLGraphicsConfigurationFactory got HDC "+toHexString(hdc));
-          ex.printStackTrace();
-          System.err.println("WindowsWGLGraphicsConfigurationFactory got NW    "+nativeWindow);
-        }
-
-        PIXELFORMATDESCRIPTOR pfd = null;
-        int pixelFormat = -1; // 1-based pixel format
-        boolean pixelFormatSet = false;
-        GLCapabilities chosenCaps = null;
-
-        if (onscreen) {
-          if ((pixelFormat = WGL.GetPixelFormat(hdc)) != 0) {
-            // Pixelformat already set by either 
-            //  - a previous updateGraphicsConfiguration() call on the same HDC,
-            //  - the graphics driver, copying the HDC's pixelformat to the new one,
-            //  - or the Java2D/OpenGL pipeline's configuration
-            if (DEBUG) {
-              System.err.println("!!!! NOTE: pixel format already chosen for HDC: " + toHexString(hdc)+
-                                 ", pixelformat "+pixelFormat);
-            }
-            pixelFormatSet = true;
-          }
-
-          GLCapabilities[] availableCaps = null;
-          int numFormats = 0;
-          pfd = WindowsWGLGraphicsConfiguration.createPixelFormatDescriptor();
-          // Produce a recommended pixel format selection for the GLCapabilitiesChooser.
-          // Use wglChoosePixelFormatARB if user requested multisampling and if we have it available
-          WindowsWGLDrawable dummyDrawable = null;
-          GLContextImpl     dummyContext  = null;
-          WGLExt            dummyWGLExt   = null;
-          if (capabilities.getSampleBuffers()) {
-              dummyDrawable = new WindowsDummyWGLDrawable(factory);
-              dummyContext  = (GLContextImpl) dummyDrawable.createContext(null);
-              if (dummyContext != null) {
-                dummyContext.makeCurrent();
-                dummyWGLExt = (WGLExt) dummyContext.getPlatformGLExtensions();
-              }
-          } else if (DEBUG) {
-              System.err.println(getThreadName() + ": Not using WGL_ARB_pixel_format, because multisampling not requested");
-          }
-          int recommendedPixelFormat = pixelFormat; // 1-based pixel format
-          boolean haveWGLChoosePixelFormatARB = false;
-          boolean gotAvailableCaps = false;
-          if (dummyWGLExt != null) {
-            try {
-              haveWGLChoosePixelFormatARB = dummyWGLExt.isExtensionAvailable("WGL_ARB_pixel_format");
-              if (haveWGLChoosePixelFormatARB) {
-                if(pixelFormat<=0) {
-                  int[]   iattributes = new int  [2*WindowsWGLGraphicsConfiguration.MAX_ATTRIBS];
-                  float[] fattributes = new float[1];
-
-                  if(WindowsWGLGraphicsConfiguration.GLCapabilities2AttribList(capabilities,
-                                                                               iattributes,
-                                                                               dummyWGLExt,
-                                                                               false,
-                                                                               null)) {
-                    int[] pformats = new int[WindowsWGLGraphicsConfiguration.MAX_PFORMATS];
-                    int[] numFormatsTmp = new int[1];
-                    if (dummyWGLExt.wglChoosePixelFormatARB(hdc,
-                                                         iattributes, 0,
-                                                         fattributes, 0,
-                                                         WindowsWGLGraphicsConfiguration.MAX_PFORMATS,
-                                                         pformats, 0,
-                                                         numFormatsTmp, 0)) {
-                      numFormats = numFormatsTmp[0];
-                      if (recommendedPixelFormat<=0 && numFormats > 0) {
-                        recommendedPixelFormat = pformats[0];
-                        if (DEBUG) {
-                          System.err.println(getThreadName() + ": Used wglChoosePixelFormatARB to recommend pixel format " + recommendedPixelFormat);
-                        }
-                      }
-                    } else {
-                      if (DEBUG) {
-                        System.err.println(getThreadName() + ": wglChoosePixelFormatARB failed: " + WGL.GetLastError() );
-                        Thread.dumpStack();
-                      }
-                    }
-                    if (DEBUG) {
-                      if (recommendedPixelFormat <= 0) {
-                        System.err.print(getThreadName() + ": wglChoosePixelFormatARB didn't recommend a pixel format: "+WGL.GetLastError());
-                        if (capabilities.getSampleBuffers()) {
-                          System.err.print(" for multisampled GLCapabilities");
-                        }
-                        System.err.println();
-                      }
-                    }
-                  }
-                }
-
-                availableCaps = WindowsWGLGraphicsConfiguration.HDC2GLCapabilities(dummyWGLExt, hdc, -1, glProfile, pixelFormatSet, onscreen, usePBuffer);
-                gotAvailableCaps = null!=availableCaps ;
-                choosenBywGLPixelFormat = gotAvailableCaps ;
-              } else if (DEBUG) {
-                System.err.println(getThreadName() + ": wglChoosePixelFormatARB not available");
-              }
-            } finally {
-              dummyContext.release();
-              dummyContext.destroy();
-              dummyDrawable.destroy();
-            }
-          }
-
-          if (!gotAvailableCaps) {
-            if (DEBUG) {
-              System.err.println(getThreadName() + ": Using ChoosePixelFormat ... (LastError: "+WGL.GetLastError()+")");
-            }
-            pfd = WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(capabilities);
-            recommendedPixelFormat = WGL.ChoosePixelFormat(hdc, pfd);
-            if (DEBUG) {
-              System.err.println(getThreadName() + ": ChoosePixelFormat(HDC "+toHexString(hdc)+") = " + recommendedPixelFormat + " (LastError: "+WGL.GetLastError()+")");
-              System.err.println(getThreadName() + ": Used " + capabilities);
-            }
-
-            numFormats = WGL.DescribePixelFormat(hdc, 1, 0, null);
-            if (numFormats == 0) {
-              throw new GLException("Unable to enumerate pixel formats of window " +
-                                    toHexString(hdc) + " for GLCapabilitiesChooser (LastError: "+WGL.GetLastError()+")");
-            }
-            availableCaps = new GLCapabilities[numFormats];
-            for (int i = 0; i < numFormats; i++) {
-              if (WGL.DescribePixelFormat(hdc, 1 + i, pfd.size(), pfd) == 0) {
-                throw new GLException("Error describing pixel format " + (1 + i) + " of device context");
-              }
-              availableCaps[i] = WindowsWGLGraphicsConfiguration.PFD2GLCapabilities(glProfile, pfd, onscreen, usePBuffer);
-            }
-          }
-
-          // NOTE: officially, should make a copy of all of these
-          // GLCapabilities to avoid mutation by the end user during the
-          // chooseCapabilities call, but for the time being, assume they
-          // won't be changed
-
-          if(pixelFormat<=0) {
-              if(null!=chooser) {
-                  // Supply information to chooser
-                  try {
-                    pixelFormat = chooser.chooseCapabilities(capabilities, availableCaps, recommendedPixelFormat) + 1;
-                  } catch (NativeWindowException e) {
-                    if(DEBUG) {
-                          e.printStackTrace();
-                    }
-                    pixelFormat = -1;
-                  }
-              } else {
-                  pixelFormat = recommendedPixelFormat;
-              }
-              if (pixelFormat <= 0) {
-                  // keep on going ..
-                  if(DEBUG) {
-                      System.err.println("WindowsWGLGraphicsConfigurationFactory.updateGraphicsConfiguration .. unable to choose config, using first");
-                  }
-                  pixelFormat = 1; // default ..
-              } else if ( pixelFormat > numFormats ) {
-                throw new GLException("Invalid result " + pixelFormat +
-                                      " from GLCapabilitiesChooser (should be between 1 and " +
-                                      numFormats + ")");
-              }
-          }
-          chosenCaps = availableCaps[pixelFormat-1];
-          if (DEBUG) {
-            System.err.println(getThreadName() + ": Chosen pixel format (" + pixelFormat + "):");
-            System.err.println(chosenCaps);
-          }
-          if (WGL.DescribePixelFormat(hdc, pixelFormat, pfd.size(), pfd) == 0) {
-            throw new GLException("Error re-describing the chosen pixel format: " + WGL.GetLastError());
-          }
-        } else {
-          // For now, use ChoosePixelFormat for offscreen surfaces until
-          // we figure out how to properly choose an offscreen-
-          // compatible pixel format
-          pfd = WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(capabilities);
-          pixelFormat = WGL.ChoosePixelFormat(hdc, pfd);
-        }
-        if(!pixelFormatSet) {
-            if (!WGL.SetPixelFormat(hdc, pixelFormat, pfd)) {
-              long lastError = WGL.GetLastError();
-              if (DEBUG) {
-                System.err.println(getThreadName() + ": SetPixelFormat failed: current context = " + WGL.wglGetCurrentContext() +
-                                   ", current DC = " + WGL.wglGetCurrentDC());
-                System.err.println(getThreadName() + ": GetPixelFormat(hdc " + toHexString(hdc) + ") returns " + WGL.GetPixelFormat(hdc));
-              }
-              throw new GLException("Unable to set pixel format " + pixelFormat + " for device context " + toHexString(hdc) + ": error code " + lastError);
-            }
-            pixelFormatSet=true;
-        }
-        // Reuse the previously-constructed GLCapabilities because it
-        // turns out that using DescribePixelFormat on some pixel formats
-        // (which, for example, support full-scene antialiasing) for some
-        // reason return that they are not OpenGL-capable
-        if (chosenCaps != null) {
-          capabilities = chosenCaps;
-        } else {
-          capabilities = WindowsWGLGraphicsConfiguration.PFD2GLCapabilities(glProfile, pfd, onscreen, usePBuffer);
-        }
-        config.setCapsPFD(capabilities, pfd, pixelFormat, choosenBywGLPixelFormat);
-    }
-
-  protected static String getThreadName() {
-    return Thread.currentThread().getName();
-  }
-  public static String toHexString(long hex) {
-      return "0x" + Long.toHexString(hex);
-  }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
deleted file mode 100644
index f4c0a8049..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.opengl.impl.windows.wgl.awt;
-
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.windows.*;
-import javax.media.nativewindow.awt.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.*;
-
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.windows.wgl.*;
-import com.sun.nativewindow.impl.jawt.*;
-import com.sun.nativewindow.impl.jawt.windows.*;
-
-public class WindowsAWTWGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
-    protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("GraphicsConfiguration");
-
-    public WindowsAWTWGLGraphicsConfigurationFactory() {
-        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.awt.AWTGraphicsDevice.class, this);
-    }
-
-    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
-                                                                     CapabilitiesChooser chooser,
-                                                                     AbstractGraphicsScreen absScreen) {
-        GraphicsDevice device = null;
-        if (absScreen != null &&
-            !(absScreen instanceof AWTGraphicsScreen)) {
-            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only AWTGraphicsScreen objects");
-        }
-
-        if(null==absScreen) {
-            absScreen = AWTGraphicsScreen.createScreenDevice(-1);
-        }
-        AWTGraphicsScreen awtScreen = (AWTGraphicsScreen) absScreen;
-        device = ((AWTGraphicsDevice)awtScreen.getDevice()).getGraphicsDevice();
-
-        if (capabilities != null &&
-            !(capabilities instanceof GLCapabilities)) {
-            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only GLCapabilities objects");
-        }
-
-        if (chooser != null &&
-            !(chooser instanceof GLCapabilitiesChooser)) {
-            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only GLCapabilitiesChooser objects");
-        }
-
-        if(DEBUG) {
-            System.err.println("WindowsAWTWGLGraphicsConfigurationFactory: got "+absScreen);
-        }
-        GraphicsConfiguration gc = device.getDefaultConfiguration();
-        AWTGraphicsConfiguration.setupCapabilitiesRGBABits(capabilities, gc);
-        if(DEBUG) {
-            System.err.println("AWT Colormodel compatible: "+capabilities);
-        }
-
-        long displayHandle = 0;
-
-        WindowsGraphicsDevice winDevice = new WindowsGraphicsDevice();
-        DefaultGraphicsScreen winScreen = new DefaultGraphicsScreen(winDevice, awtScreen.getIndex());
-        if(DEBUG) {
-            System.err.println("WindowsAWTWGLGraphicsConfigurationFactory: made "+winScreen);
-        }
-
-        WindowsWGLGraphicsConfiguration winConfig = (WindowsWGLGraphicsConfiguration)
-            GraphicsConfigurationFactory.getFactory(winDevice).chooseGraphicsConfiguration(capabilities,
-                                                                                           chooser,
-                                                                                           winScreen);
-
-        if (winConfig == null) {
-            throw new GLException("Unable to choose a GraphicsConfiguration: "+capabilities+",\n\t"+chooser+"\n\t"+winScreen);
-        }
-
-        if(DEBUG) {
-            System.err.println("WindowsAWTWGLGraphicsConfigurationFactory: chosen "+winConfig);
-        }
-
-        // FIXME: we have nothing to match .. so choose the default
-        return new AWTGraphicsConfiguration(awtScreen, winConfig.getChosenCapabilities(), winConfig.getRequestedCapabilities(), gc, winConfig);
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/GLXUtil.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/GLXUtil.java
deleted file mode 100644
index 418d31503..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/GLXUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import javax.media.opengl.*;
-
-import com.sun.opengl.impl.*;
-import javax.media.nativewindow.NativeWindowFactory;
-import com.sun.nativewindow.impl.x11.*;
-
-public class GLXUtil {
-    public static boolean isMultisampleAvailable(long display) {
-        try {
-            X11Lib.XLockDisplay(display);
-            String exts = GLX.glXGetClientString(display, GLX.GLX_EXTENSIONS);
-            if (exts != null) {
-                return (exts.indexOf("GLX_ARB_multisample") >= 0);
-            }
-            return false;
-        } finally {
-            X11Lib.XUnlockDisplay(display);
-        }
-    }
-
-    /** Workaround for apparent issue with ATI's proprietary drivers
-        where direct contexts still send GLX tokens for GL calls */
-    public static boolean isVendorATI(long display) {
-        try {
-            X11Lib.XLockDisplay(display);
-            String vendor = GLX.glXGetClientString(display, GLX.GLX_VENDOR);
-            return vendor != null && vendor.startsWith("ATI") ;
-        } finally {
-            X11Lib.XUnlockDisplay(display);
-        }
-    }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXContext.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXContext.java
deleted file mode 100755
index 7e3755870..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXContext.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
-import com.sun.nativewindow.impl.x11.*;
-
-public class X11ExternalGLXContext extends X11GLXContext {
-  private boolean firstMakeCurrent = true;
-  private boolean created = true;
-  private GLContext lastContext;
-
-  private X11ExternalGLXContext(Drawable drawable, long context) {
-    super(drawable, null);
-    this.context = context;
-    GLContextShareSet.contextCreated(this);
-    setGLFunctionAvailability(false);
-    getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
-  }
-
-  protected static X11ExternalGLXContext create(GLDrawableFactory factory, GLProfile glp) {
-    ((GLDrawableFactoryImpl)factory).lockToolkit();
-    try {
-        long context = GLX.glXGetCurrentContext();
-        if (context == 0) {
-          throw new GLException("Error: current context null");
-        }
-        long display = GLX.glXGetCurrentDisplay();
-        if (display == 0) {
-          throw new GLException("Error: current display null");
-        }
-        long drawable = GLX.glXGetCurrentDrawable();
-        if (drawable == 0) {
-          throw new GLException("Error: attempted to make an external GLDrawable without a drawable/context current");
-        }
-        int[] val = new int[1];
-        GLX.glXQueryContext(display, context, GLX.GLX_SCREEN, val, 0);
-        X11GraphicsScreen x11Screen = (X11GraphicsScreen) X11GraphicsScreen.createScreenDevice(display, val[0]);
-
-        GLX.glXQueryContext(display, context, GLX.GLX_FBCONFIG_ID, val, 0);
-        X11GLXGraphicsConfiguration cfg = X11GLXGraphicsConfiguration.create(glp, x11Screen, val[0]);
-
-        NullWindow nw = new NullWindow(cfg);
-        nw.setSurfaceHandle(drawable);
-        return new X11ExternalGLXContext(new Drawable(factory, nw), context);
-    } finally {
-        ((GLDrawableFactoryImpl)factory).unlockToolkit();
-    }
-  }
-
-  protected void create() {
-  }
-
-  public int makeCurrent() throws GLException {
-    // Save last context if necessary to allow external GLContexts to
-    // talk to other GLContexts created by this library
-    GLContext cur = getCurrent();
-    if (cur != null && cur != this) {
-      lastContext = cur;
-      setCurrent(null);
-    }
-    return super.makeCurrent();
-  }  
-
-  public void release() throws GLException {
-    super.release();
-    setCurrent(lastContext);
-    lastContext = null;
-  }
-
-  protected int makeCurrentImpl() throws GLException {
-    if (firstMakeCurrent) {
-      firstMakeCurrent = false;
-      return CONTEXT_CURRENT_NEW;
-    }
-    return CONTEXT_CURRENT;
-  }
-
-  protected void releaseImpl() throws GLException {
-  }
-
-  protected void destroyImpl() throws GLException {
-    created = false;
-    GLContextShareSet.contextDestroyed(this);
-  }
-
-  public boolean isCreated() {
-    return created;
-  }
-
-  // Need to provide the display connection to extension querying APIs
-  static class Drawable extends X11GLXDrawable {
-    Drawable(GLDrawableFactory factory, NativeWindow comp) {
-      super(factory, comp, true);
-    }
-
-    public GLContext createContext(GLContext shareWith) {
-      throw new GLException("Should not call this");
-    }
-
-    public int getWidth() {
-      throw new GLException("Should not call this");
-    }
-
-    public int getHeight() {
-      throw new GLException("Should not call this");
-    }
-
-    public void setSize(int width, int height) {
-      throw new GLException("Should not call this");
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
deleted file mode 100755
index 101d9fa42..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
-import com.sun.nativewindow.impl.x11.*;
-
-import com.jogamp.gluegen.runtime.PointerBuffer;
-
-public class X11ExternalGLXDrawable extends X11GLXDrawable {
-  private int fbConfigID;
-  private int renderType;
-
-  private X11ExternalGLXDrawable(GLDrawableFactory factory, NativeWindow component, int renderType) {
-    super(factory, component, true);
-
-    this.renderType = renderType;
-
-    // Need GLXFBConfig ID in order to properly create new contexts
-    // on this drawable
-    X11GLXGraphicsConfiguration cfg = (X11GLXGraphicsConfiguration) component.getGraphicsConfiguration();
-    fbConfigID = cfg.getFBConfigID();
-  }
-
-  protected static X11ExternalGLXDrawable create(GLDrawableFactory factory, GLProfile glp) {
-    ((GLDrawableFactoryImpl)factory).lockToolkit();
-    try {
-        long context = GLX.glXGetCurrentContext();
-        if (context == 0) {
-          throw new GLException("Error: current context null");
-        }
-        long display = GLX.glXGetCurrentDisplay();
-        if (display == 0) {
-          throw new GLException("Error: current display null");
-        }
-        long drawable = GLX.glXGetCurrentDrawable();
-        if (drawable == 0) {
-          throw new GLException("Error: attempted to make an external GLDrawable without a drawable current");
-        }
-        int[] val = new int[1];
-        GLX.glXQueryContext(display, context, GLX.GLX_SCREEN, val, 0);
-        X11GraphicsScreen x11Screen = (X11GraphicsScreen) X11GraphicsScreen.createScreenDevice(display, val[0]);
-
-        GLX.glXQueryContext(display, context, GLX.GLX_FBCONFIG_ID, val, 0);
-        X11GLXGraphicsConfiguration cfg = X11GLXGraphicsConfiguration.create(glp, x11Screen, val[0]);
-
-        int w, h;
-        GLX.glXQueryDrawable(display, drawable, GLX.GLX_WIDTH, val, 0);
-        w=val[0];
-        GLX.glXQueryDrawable(display, drawable, GLX.GLX_HEIGHT, val, 0);
-        h=val[0];
-
-        GLX.glXQueryContext(display, context, GLX.GLX_RENDER_TYPE, val, 0);
-        if ((val[0] & GLX.GLX_RGBA_TYPE) == 0) {
-          if (DEBUG) {
-            System.err.println("X11ExternalGLXDrawable: WARNING: forcing GLX_RGBA_TYPE for newly created contexts (current 0x"+Integer.toHexString(val[0])+")");
-          }
-        }
-        NullWindow nw = new NullWindow(cfg);
-        nw.setSurfaceHandle(drawable);
-        nw.setSize(w, h);
-        return new X11ExternalGLXDrawable(factory, nw, GLX.GLX_RGBA_TYPE);
-    } finally {
-        ((GLDrawableFactoryImpl)factory).unlockToolkit();
-    }
-  }
-
-  public GLContext createContext(GLContext shareWith) {
-    return new Context(this, shareWith);
-  }
-
-  public void setSize(int newWidth, int newHeight) {
-    throw new GLException("Should not call this");
-  }
-
-  public int getWidth() {
-    return getNativeWindow().getWidth();
-  }  
-
-  public int getHeight() {
-    return getNativeWindow().getHeight();
-  }  
-
-  class Context extends X11GLXContext {
-    Context(X11GLXDrawable drawable, GLContext shareWith) {
-      super(drawable, shareWith);
-    }
-
-    protected void create() {
-      createContext(true);
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java
deleted file mode 100644
index e37d27d1a..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import java.nio.*;
-import java.util.*;
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.glx.*;
-import com.sun.nativewindow.impl.x11.*;
-import com.jogamp.gluegen.runtime.ProcAddressTable;
-
-public abstract class X11GLXContext extends GLContextImpl {
-  protected long context;
-  private boolean glXQueryExtensionsStringInitialized;
-  private boolean glXQueryExtensionsStringAvailable;
-  private static final Map/*<String, String>*/ functionNameMap;
-  private GLXExt glXExt;
-  // Table that holds the addresses of the native C-language entry points for
-  // GLX extension functions.
-  private GLXExtProcAddressTable glXExtProcAddressTable;
-
-  static {
-    functionNameMap = new HashMap();
-    functionNameMap.put("glAllocateMemoryNV", "glXAllocateMemoryNV");
-    functionNameMap.put("glFreeMemoryNV", "glXFreeMemoryNV");
-  }
-
-  public X11GLXContext(GLDrawableImpl drawable, GLDrawableImpl drawableRead,
-                      GLContext shareWith) {
-    super(drawable, drawableRead, shareWith);
-  }
-
-  public X11GLXContext(GLDrawableImpl drawable,
-                      GLContext shareWith) {
-    this(drawable, null, shareWith);
-  }
-  
-  public final ProcAddressTable getPlatformExtProcAddressTable() {
-    return getGLXExtProcAddressTable();
-  }
-
-  public final GLXExtProcAddressTable getGLXExtProcAddressTable() {
-    return glXExtProcAddressTable;
-  }
-
-  public Object getPlatformGLExtensions() {
-    return getGLXExt();
-  }
-
-  public GLXExt getGLXExt() {
-    if (glXExt == null) {
-      glXExt = new GLXExtImpl(this);
-    }
-    return glXExt;
-  }
-
-  protected String mapToRealGLFunctionName(String glFunctionName) {
-    String lookup = (String) functionNameMap.get(glFunctionName);
-    if (lookup != null) {
-      return lookup;
-    }
-    return glFunctionName;
-  }
-
-  protected String mapToRealGLExtensionName(String glExtensionName) {
-    return glExtensionName;
-  }
-
-  /** Helper routine which usually just turns around and calls
-   * createContext (except for pbuffers, which use a different context
-   * creation mechanism). Should only be called by {@link
-   * makeCurrentImpl()}.
-   */
-  protected abstract void create();
-
-  /**
-   * Creates and initializes an appropriate OpenGL context. Should only be
-   * called by {@link create()}.
-   * Note: The direct parameter may be overwritten by the direct state of a shared context.
-   */
-  protected void createContext(boolean direct) {
-    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-    if(DEBUG) {
-          System.err.println("X11GLXContext.createContext got "+config);
-    }
-    long display = config.getScreen().getDevice().getHandle();
-
-    X11GLXContext other = (X11GLXContext) GLContextShareSet.getShareContext(this);
-    long share = 0;
-    if (other != null) {
-      share = other.getContext();
-      if (share == 0) {
-        throw new GLException("GLContextShareSet returned an invalid OpenGL context");
-      }
-      direct = GLX.glXIsDirect(display, share);
-    }
-
-    GLCapabilities glCaps = (GLCapabilities) config.getChosenCapabilities();
-    isVendorATI = GLXUtil.isVendorATI(display);
-
-    if(config.getFBConfigID()<0) {
-        // not able to use FBConfig
-        if(glCaps.getGLProfile().isGL3()) {
-          throw new GLException("Unable to create OpenGL >= 3.1 context");
-        }
-        context = GLX.glXCreateContext(display, config.getXVisualInfo(), share, direct);
-        if (context == 0) {
-          throw new GLException("Unable to create OpenGL context");
-        }
-        if (!GLX.glXMakeContextCurrent(display,
-                                       drawable.getNativeWindow().getSurfaceHandle(), 
-                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                       context)) {
-          throw new GLException("Error making temp context (old2) current: display 0x"+Long.toHexString(display)+", context 0x"+Long.toHexString(context)+", drawable "+drawable);
-        }
-        setGLFunctionAvailability(true);
-        if(DEBUG) {
-              System.err.println("X11GLXContext.createContext done (old2 ctx) 0x"+Long.toHexString(context));
-        }
-
-    } else {
-
-        // To use GLX_ARB_create_context, we have to make a temp context current,
-        // so we are able to use GetProcAddress
-        long temp_context = GLX.glXCreateNewContext(display, config.getFBConfig(), GLX.GLX_RGBA_TYPE, share, direct);
-        if (temp_context == 0) {
-            throw new GLException("Unable to create temp OpenGL context");
-        } else {
-            if (!GLX.glXMakeContextCurrent(display,
-                                           drawable.getNativeWindow().getSurfaceHandle(), 
-                                           drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                           temp_context)) {
-              throw new GLException("Error making temp context (old) current: display 0x"+Long.toHexString(display)+", context 0x"+Long.toHexString(context)+", drawable "+drawable);
-            }
-            setGLFunctionAvailability(true);
-
-            if( !isFunctionAvailable("glXCreateContextAttribsARB") ||
-                !isExtensionAvailable("GLX_ARB_create_context") )  {
-                if(glCaps.getGLProfile().isGL3()) {
-                  GLX.glXMakeContextCurrent(display, 0, 0, 0);
-                  GLX.glXDestroyContext(display, temp_context);
-                  throw new GLException("Unable to create OpenGL >= 3.1 context (no GLX_ARB_create_context)");
-                }
-
-                // continue with temp context for GL < 3.0
-                context = temp_context;
-                if(DEBUG) {
-                  System.err.println("X11GLXContext.createContext done (old ctx < 3.0 - no GLX_ARB_create_context) 0x"+Long.toHexString(context));
-                }
-            } else {
-                GLXExt glXExt = getGLXExt();
-
-                // preset with default values
-                int attribs[] = {
-                    /*  0 */ GLX.GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
-                    /*  2 */ GLX.GLX_CONTEXT_MINOR_VERSION_ARB, 0,
-                    /*  4 */ GLX.GLX_RENDER_TYPE,               GLX.GLX_RGBA_TYPE,
-                    /*  6 */ GLX.GLX_CONTEXT_FLAGS_ARB,         0 /* GLX.GLX_CONTEXT_DEBUG_BIT_ARB */,      
-                    /*  8 */ 0,                                 0,
-                    /* 10 */ 0
-                };
-
-                if(glCaps.getGLProfile().isGL3()) {
-                    // Try >= 3.2 core first 
-                    // and verify with a None drawable binding (default framebuffer)
-                    attribs[0+1]  = 3;
-                    attribs[2+1]  = 2;
-                    if(glCaps.getGLProfile().isGL3bc()) {
-                        attribs[8+0]  = GLX.GLX_CONTEXT_PROFILE_MASK_ARB;
-                        attribs[8+1]  = GLX.GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
-                    }
-                    /**
-                     * don't stricten requirements any further, even compatible would be fine
-                     *
-                     } else {
-                        attribs[8+0]  = GLX.GLX_CONTEXT_PROFILE_MASK_ARB;
-                        attribs[8+1]  = GLX.GLX_CONTEXT_CORE_PROFILE_BIT_ARB;
-                     } 
-                     */
-
-                    context = glXExt.glXCreateContextAttribsARB(display, config.getFBConfig(), share, direct, attribs, 0);
-                    if(0!=context) {
-                        if (!GLX.glXMakeContextCurrent(display,
-                                                       drawable.getNativeWindow().getSurfaceHandle(), 
-                                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                                       context)) {
-                            if(DEBUG) {
-                              System.err.println("X11GLXContext.createContext couldn't make >= 3.2 core context current - fallback");
-                            }
-                            GLX.glXMakeContextCurrent(display, 0, 0, 0);
-                            GLX.glXDestroyContext(display, context);
-                            context = 0;
-                        } else if(DEBUG) {
-                          System.err.println("X11GLXContext.createContext >= 3.2 available 0x"+Long.toHexString(context));
-                        }
-                    } else {
-                        if(DEBUG) {
-                          System.err.println("X11GLXContext.createContext couldn't create >= 3.2 core context - fallback");
-                        }
-                    }
-                    if(0==context) {
-                        // Try >= 3.1 forward compatible - last resort for GL3 !
-                        attribs[0+1]  = 3;
-                        attribs[2+1]  = 1;
-                        if(!glCaps.getGLProfile().isGL3bc()) {
-                            attribs[6+1] |= GLX.GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
-                        }
-                        attribs[8+0]  = 0;
-                        attribs[8+1]  = 0;
-                    }
-                }
-                if(0==context) {
-                    // 3.1 or 3.0 ..
-                    context = glXExt.glXCreateContextAttribsARB(display, config.getFBConfig(), share, direct, attribs, 0);
-                    if(0!=context) {
-                        if (!GLX.glXMakeContextCurrent(display,
-                                                       drawable.getNativeWindow().getSurfaceHandle(), 
-                                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                                       context)) {
-                            if(DEBUG) {
-                              System.err.println("X11GLXContext.createContext couldn't make >= 3.0 core context current - fallback");
-                            }
-                            GLX.glXMakeContextCurrent(display, 0, 0, 0);
-                            GLX.glXDestroyContext(display, context);
-                            context = 0;
-                        } else if(DEBUG) {
-                          System.err.println("X11GLXContext.createContext >= 3.0 available 0x"+Long.toHexString(context));
-                        }
-                    } else {
-                        if(DEBUG) {
-                          System.err.println("X11GLXContext.createContext couldn't create >= 3.0 core context - fallback");
-                        }
-                    }
-                }
-
-                if(0==context) {
-                    if(glCaps.getGLProfile().isGL3()) {
-                      GLX.glXMakeContextCurrent(display, 0, 0, 0);
-                      GLX.glXDestroyContext(display, temp_context);
-                      throw new GLException("Unable to create OpenGL >= 3.1 context (have GLX_ARB_create_context)");
-                    }
-
-                    // continue with temp context for GL < 3.0
-                    context = temp_context;
-                    if (!GLX.glXMakeContextCurrent(display,
-                                                   drawable.getNativeWindow().getSurfaceHandle(), 
-                                                   drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                                   context)) {
-                      GLX.glXMakeContextCurrent(display, 0, 0, 0);
-                      GLX.glXDestroyContext(display, temp_context);
-                      throw new GLException("Error making context (old) current: display 0x"+Long.toHexString(display)+", context 0x"+Long.toHexString(context)+", drawable "+drawable);
-                    }
-                    if(DEBUG) {
-                      System.err.println("X11GLXContext.createContext done (old ctx < 3.0 - no 3.0) 0x"+Long.toHexString(context));
-                    }
-                } else {
-                    GLX.glXDestroyContext(display, temp_context);
-
-                    // need to update the GL func table ..
-                    updateGLProcAddressTable();
-                    if(DEBUG) {
-                      System.err.println("X11GLXContext.createContext done (new ctx >= 3.0) 0x"+Long.toHexString(context));
-                    }
-                }
-            }
-        } 
-    } 
-    GLContextShareSet.contextCreated(this);
-  }
-
-  // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
-  protected int makeCurrentImpl() throws GLException {
-    int lockRes = drawable.lockSurface();
-    boolean exceptionOccurred = false;
-    try {
-      if (lockRes == NativeWindow.LOCK_SURFACE_NOT_READY) {
-        return CONTEXT_NOT_CURRENT;
-      }
-      return makeCurrentImplAfterLock();
-    } catch (RuntimeException e) {
-      exceptionOccurred = true;
-      throw e;
-    } finally {
-      if (exceptionOccurred ||
-          (isOptimizable() && lockRes != NativeWindow.LOCK_SURFACE_NOT_READY) && drawable.isSurfaceLocked()) {
-        drawable.unlockSurface();
-      }
-    }
-  }
-
-  // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
-  protected void releaseImpl() throws GLException {
-    try {
-      releaseImplAfterLock();
-    } finally {
-      if (!isOptimizable() && drawable.isSurfaceLocked()) {
-        drawable.unlockSurface();
-      }
-    }
-  }
-
-  protected int makeCurrentImplAfterLock() throws GLException {
-    getDrawableImpl().getFactoryImpl().lockToolkit();
-    try {
-        if (drawable.getNativeWindow().getSurfaceHandle() == 0) {
-            if (DEBUG) {
-              System.err.println("drawable not properly initialized");
-            }
-            return CONTEXT_NOT_CURRENT;
-        }
-        boolean created = false;
-        if (context == 0) {
-          create();
-          if (DEBUG) {
-            System.err.println(getThreadName() + ": !!! Created GL context for " + getClass().getName());
-          }
-          created = true;
-        }
-
-        if (GLX.glXGetCurrentContext() != context) {
-            
-            if (!GLX.glXMakeContextCurrent(drawable.getNativeWindow().getDisplayHandle(), 
-                                           drawable.getNativeWindow().getSurfaceHandle(), 
-                                           drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                           context)) {
-              throw new GLException("Error making context current");
-            }
-            if (DEBUG && (VERBOSE || created)) {
-              System.err.println(getThreadName() + ": glXMakeCurrent(display " + 
-                                 toHexString(drawable.getNativeWindow().getDisplayHandle()) +
-                                 ", drawable " + toHexString(drawable.getNativeWindow().getSurfaceHandle()) +
-                                 ", drawableRead " + toHexString(drawableRead.getNativeWindow().getSurfaceHandle()) +
-                                 ", context " + toHexString(context) + ") succeeded");
-            }
-        }
-
-        if (created) {
-          setGLFunctionAvailability(false);
-          return CONTEXT_CURRENT_NEW;
-        }
-        return CONTEXT_CURRENT;
-    } finally {
-        getDrawableImpl().getFactoryImpl().unlockToolkit();
-    }
-  }
-
-  protected void releaseImplAfterLock() throws GLException {
-    getDrawableImpl().getFactoryImpl().lockToolkit();
-    try {
-        if (!GLX.glXMakeContextCurrent(drawable.getNativeWindow().getDisplayHandle(), 0, 0, 0)) {
-            throw new GLException("Error freeing OpenGL context");
-        }
-    } finally {
-        getDrawableImpl().getFactoryImpl().unlockToolkit();
-    }
-  }
-
-  protected void destroyImpl() throws GLException {
-    getDrawableImpl().getFactoryImpl().lockToolkit();
-    try {
-        if (context != 0) {
-            if (DEBUG) {
-              System.err.println("glXDestroyContext(0x" +
-                                 Long.toHexString(drawable.getNativeWindow().getDisplayHandle()) +
-                                 ", 0x" +
-                                 Long.toHexString(context) + ")");
-            }
-            GLX.glXDestroyContext(drawable.getNativeWindow().getDisplayHandle(), context);
-            if (DEBUG) {
-              System.err.println("!!! Destroyed OpenGL context " + context);
-            }
-            context = 0;
-            GLContextShareSet.contextDestroyed(this);
-        }
-    } finally {
-        getDrawableImpl().getFactoryImpl().unlockToolkit();
-    }
-  }
-
-  public boolean isCreated() {
-    return (context != 0);
-  }
-
-  public void copy(GLContext source, int mask) throws GLException {
-    long dst = getContext();
-    long src = ((X11GLXContext) source).getContext();
-    if (src == 0) {
-      throw new GLException("Source OpenGL context has not been created");
-    }
-    if (dst == 0) {
-      throw new GLException("Destination OpenGL context has not been created");
-    }
-    if (drawable.getNativeWindow().getDisplayHandle() == 0) {
-      throw new GLException("Connection to X display not yet set up");
-    }
-    getDrawableImpl().getFactoryImpl().lockToolkit();
-    try {
-      GLX.glXCopyContext(drawable.getNativeWindow().getDisplayHandle(), src, dst, mask);
-      // Should check for X errors and raise GLException
-    } finally {
-      getDrawableImpl().getFactoryImpl().unlockToolkit();
-    }
-  }
-
-  protected void updateGLProcAddressTable() {
-    if (DEBUG) {
-      System.err.println(getThreadName() + ": !!! Initializing GLX extension address table");
-    }
-    glXQueryExtensionsStringInitialized = false;
-    glXQueryExtensionsStringAvailable = false;
-
-    if (glXExtProcAddressTable == null) {
-      // FIXME: cache ProcAddressTables by capability bits so we can
-      // share them among contexts with the same capabilities
-      glXExtProcAddressTable = new GLXExtProcAddressTable();
-    }          
-    resetProcAddressTable(getGLXExtProcAddressTable());
-    super.updateGLProcAddressTable();
-  }
-
-  public synchronized String getPlatformExtensionsString() {
-    if (!glXQueryExtensionsStringInitialized) {
-      glXQueryExtensionsStringAvailable =
-        getDrawableImpl().getDynamicLookupHelper().dynamicLookupFunction("glXQueryExtensionsString") != 0;
-      glXQueryExtensionsStringInitialized = true;
-    }
-    if (glXQueryExtensionsStringAvailable) {
-      GLDrawableFactoryImpl factory = getDrawableImpl().getFactoryImpl();
-      factory.lockToolkit();
-      try {
-        String ret = GLX.glXQueryExtensionsString(drawable.getNativeWindow().getDisplayHandle(), 
-                                                  drawable.getNativeWindow().getScreenIndex());
-        if (DEBUG) {
-          System.err.println("!!! GLX extensions: " + ret);
-        }
-        return ret;
-      } finally {
-        factory.unlockToolkit();
-      }
-    } else {
-      return "";
-    }
-  }
-
-  public boolean isExtensionAvailable(String glExtensionName) {
-    if (glExtensionName.equals("GL_ARB_pbuffer") ||
-        glExtensionName.equals("GL_ARB_pixel_format")) {
-      return getGLDrawable().getFactory().canCreateGLPbuffer();
-    }
-    return super.isExtensionAvailable(glExtensionName);
-  }
-
-
-  private int hasSwapIntervalSGI = 0;
-
-  protected void setSwapIntervalImpl(int interval) {
-    getDrawableImpl().getFactoryImpl().lockToolkit();
-    try {
-      GLXExt glXExt = getGLXExt();
-      if(0==hasSwapIntervalSGI) {
-        try {
-            hasSwapIntervalSGI = glXExt.isExtensionAvailable("GLX_SGI_swap_control")?1:-1;
-        } catch (Throwable t) { hasSwapIntervalSGI=1; }
-      }
-      if (hasSwapIntervalSGI>0) {
-        try {
-            if( 0 == glXExt.glXSwapIntervalSGI(interval) ) {
-                currentSwapInterval = interval;
-            }
-        } catch (Throwable t) { hasSwapIntervalSGI=-1; }
-      }
-    } finally {
-      getDrawableImpl().getFactoryImpl().unlockToolkit();
-    }
-  }
-
-  public ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3) {
-    return getGLXExt().glXAllocateMemoryNV(arg0, arg1, arg2, arg3);
-  }
-
-  public int getOffscreenContextPixelDataType() {
-    throw new GLException("Should not call this");
-  }
-
-  public int getOffscreenContextReadBuffer() {
-    throw new GLException("Should not call this");
-  }
-
-  public boolean offscreenImageNeedsVerticalFlip() {
-    throw new GLException("Should not call this");
-  }
-
-  public void bindPbufferToTexture() {
-    throw new GLException("Should not call this");
-  }
-
-  public void releasePbufferFromTexture() {
-    throw new GLException("Should not call this");
-  }
-
-  public boolean isOptimizable() {
-    return (super.isOptimizable() && !isVendorATI);
-  }
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  public long getContext() {
-    return context;
-  }
-
-  private boolean isVendorATI = false;
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java
deleted file mode 100644
index 5440685aa..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.x11.*;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
-
-public abstract class X11GLXDrawable extends GLDrawableImpl {
-  protected X11GLXDrawable(GLDrawableFactory factory, NativeWindow comp, boolean realized) {
-    super(factory, comp, realized);
-  }
-
-  public DynamicLookupHelper getDynamicLookupHelper() {
-    return (X11GLXDrawableFactory) getFactoryImpl() ;
-  }
-
-  protected void setRealizedImpl() {
-    if(!realized) {
-        return; // nothing to do 
-    }
-
-    if(NativeWindow.LOCK_SURFACE_NOT_READY == lockSurface()) {
-      throw new GLException("X11GLXDrawable.setRealized(true): lockSurface - surface not ready");
-    }
-    try {
-        X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-        config.updateGraphicsConfiguration();
-
-        if (DEBUG) {
-          System.err.println("!!! X11GLXDrawable.setRealized(true): "+config);
-        }
-    } finally {
-        unlockSurface();
-    }
-  }
-
-  protected void swapBuffersImpl() {
-    boolean didLock = false;
-    try {
-      if ( !isSurfaceLocked() ) {
-          // Usually the surface shall be locked within [makeCurrent .. swap .. release]
-          if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
-              return;
-          }
-          didLock=true;
-      }
-
-      GLX.glXSwapBuffers(component.getDisplayHandle(), component.getSurfaceHandle());
-
-    } finally {
-      if(didLock) {
-          unlockSurface();
-      }
-    }
-  }
-
-  //---------------------------------------------------------------------------
-  // Internals only below this point
-  //
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java
deleted file mode 100644
index eafd68070..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import java.nio.*;
-import java.security.*;
-import java.util.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-import javax.media.opengl.*;
-import com.jogamp.gluegen.runtime.*;
-import com.jogamp.gluegen.runtime.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.glx.*;
-import com.sun.nativewindow.impl.NullWindow;
-import com.sun.nativewindow.impl.NWReflection;
-import com.sun.nativewindow.impl.x11.*;
-
-public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
-  public X11GLXDrawableFactory() {
-    super();
-    // Must initialize GLX support eagerly in case a pbuffer is the
-    // first thing instantiated
-    GLProcAddressHelper.resetProcAddressTable(GLX.getGLXProcAddressTable(), this);
-    // Register our GraphicsConfigurationFactory implementations
-    // The act of constructing them causes them to be registered
-    new X11GLXGraphicsConfigurationFactory();
-    try {
-      NWReflection.createInstance("com.sun.opengl.impl.x11.glx.awt.X11AWTGLXGraphicsConfigurationFactory",
-                                  new Object[] {});
-    } catch (Throwable t) { }
-  }
-
-  public GLDrawableImpl createOnscreenDrawable(NativeWindow target) {
-    if (target == null) {
-      throw new IllegalArgumentException("Null target");
-    }
-    return new X11OnscreenGLXDrawable(this, target);
-  }
-
-  protected GLDrawableImpl createOffscreenDrawable(NativeWindow target) {
-    return new X11OffscreenGLXDrawable(this, target);
-  }
-
-  private boolean pbufferSupportInitialized = false;
-  private boolean canCreateGLPbuffer = false;
-  public boolean canCreateGLPbuffer() {
-    if (!pbufferSupportInitialized) {
-        long display = X11Util.getThreadLocalDefaultDisplay();
-        int[] major = new int[1];
-        int[] minor = new int[1];
-        int screen = 0; // FIXME: provide way to specify this?
-
-        if (!GLX.glXQueryVersion(display, major, 0, minor, 0)) {
-          throw new GLException("glXQueryVersion failed");
-        }
-        if (DEBUG) {
-          System.err.println("!!! GLX version: major " + major[0] +
-                             ", minor " + minor[0]);
-        }
-
-        // Work around bugs in ATI's Linux drivers where they report they
-        // only implement GLX version 1.2 on the server side
-        if (major[0] == 1 && minor[0] == 2) {
-          String str = GLX.glXGetClientString(display, GLX.GLX_VERSION);
-          if (str != null && str.startsWith("1.") &&
-             (str.charAt(2) >= '3')) {
-            canCreateGLPbuffer = true;
-          }
-        } else {
-          canCreateGLPbuffer = ((major[0] > 1) || (minor[0] > 2));
-        }
-
-        pbufferSupportInitialized = true;        
-    }
-    return canCreateGLPbuffer;
-  }
-
-  protected GLDrawableImpl createGLPbufferDrawableImpl(final NativeWindow target) {
-    /** 
-     * FIXME: Think about this ..
-     * should not be necessary ? ..
-    final List returnList = new ArrayList();
-    final GLDrawableFactory factory = this;
-    Runnable r = new Runnable() {
-        public void run() {
-          returnList.add(new X11PbufferGLXDrawable(factory, target));
-        }
-      };
-    maybeDoSingleThreadedWorkaround(r);
-    return (GLDrawableImpl) returnList.get(0);
-    */
-    return new X11PbufferGLXDrawable(this, target);
-  }
-
-
-  protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
-    AbstractGraphicsScreen screen = X11GraphicsScreen.createDefault();
-    NullWindow nw = new NullWindow(X11GLXGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(capabilities, chooser, screen));
-    nw.setSize(width, height);
-    return nw;
-  }
-
-  public GLContext createExternalGLContext() {
-    return X11ExternalGLXContext.create(this, null);
-  }
-
-  public boolean canCreateExternalGLDrawable() {
-    return canCreateGLPbuffer();
-  }
-
-  public GLDrawable createExternalGLDrawable() {
-    return X11ExternalGLXDrawable.create(this, null);
-  }
-
-  public void loadGLULibrary() {
-    X11Lib.dlopen("/usr/lib/libGLU.so");
-  }
-
-  public long dynamicLookupFunction(String glFuncName) {
-    long res = 0;
-    res = GLX.glXGetProcAddressARB(glFuncName);
-    if (res == 0) {
-      // GLU routines aren't known to the OpenGL function lookup
-      res = X11Lib.dlsym(glFuncName);
-    }
-    return res;
-  }
-
-  public boolean canCreateContextOnJava2DSurface() {
-    return false;
-  }
-
-  public GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
-    throws GLException {
-    throw new GLException("Unimplemented on this platform");
-  }
-
-  //----------------------------------------------------------------------
-  // Gamma-related functionality
-  //
-
-  private boolean gotGammaRampLength;
-  private int gammaRampLength;
-  protected synchronized int getGammaRampLength() {
-    if (gotGammaRampLength) {
-      return gammaRampLength;
-    }
-
-    long display = X11Util.getThreadLocalDefaultDisplay();
-    try {
-        X11Lib.XLockDisplay(display);
-        int[] size = new int[1];
-        boolean res = X11Lib.XF86VidModeGetGammaRampSize(display,
-                                                      X11Lib.DefaultScreen(display),
-                                                      size, 0);
-        if (!res) {
-          return 0;
-        }
-        gotGammaRampLength = true;
-        gammaRampLength = size[0];
-        return gammaRampLength;
-    } finally {
-        X11Lib.XUnlockDisplay(display);
-    }
-  }
-
-  protected boolean setGammaRamp(float[] ramp) {
-    int len = ramp.length;
-    short[] rampData = new short[len];
-    for (int i = 0; i < len; i++) {
-      rampData[i] = (short) (ramp[i] * 65535);
-    }
-
-    long display = X11Util.getThreadLocalDefaultDisplay();
-    try {
-        X11Lib.XLockDisplay(display);
-        boolean res = X11Lib.XF86VidModeSetGammaRamp(display,
-                                                  X11Lib.DefaultScreen(display),
-                                                  rampData.length,
-                                                  rampData, 0,
-                                                  rampData, 0,
-                                                  rampData, 0);
-        return res;
-    } finally {
-        X11Lib.XUnlockDisplay(display);
-    }
-  }
-
-  protected Buffer getGammaRamp() {
-    int size = getGammaRampLength();
-    ShortBuffer rampData = ShortBuffer.wrap(new short[3 * size]);
-    rampData.position(0);
-    rampData.limit(size);
-    ShortBuffer redRampData = rampData.slice();
-    rampData.position(size);
-    rampData.limit(2 * size);
-    ShortBuffer greenRampData = rampData.slice();
-    rampData.position(2 * size);
-    rampData.limit(3 * size);
-    ShortBuffer blueRampData = rampData.slice();
-    long display = X11Util.getThreadLocalDefaultDisplay();
-    try {
-        X11Lib.XLockDisplay(display);
-        boolean res = X11Lib.XF86VidModeGetGammaRamp(display,
-                                                  X11Lib.DefaultScreen(display),
-                                                  size,
-                                                  redRampData,
-                                                  greenRampData,
-                                                  blueRampData);
-        if (!res) {
-          return null;
-        }
-        return rampData;
-    } finally {
-        X11Lib.XUnlockDisplay(display);
-    }
-  }
-
-  protected void resetGammaRamp(Buffer originalGammaRamp) {
-    if (originalGammaRamp == null)
-      return; // getGammaRamp failed originally
-    ShortBuffer rampData = (ShortBuffer) originalGammaRamp;
-    int capacity = rampData.capacity();
-    if ((capacity % 3) != 0) {
-      throw new IllegalArgumentException("Must not be the original gamma ramp");
-    }
-    int size = capacity / 3;
-    rampData.position(0);
-    rampData.limit(size);
-    ShortBuffer redRampData = rampData.slice();
-    rampData.position(size);
-    rampData.limit(2 * size);
-    ShortBuffer greenRampData = rampData.slice();
-    rampData.position(2 * size);
-    rampData.limit(3 * size);
-    ShortBuffer blueRampData = rampData.slice();
-    long display = X11Util.getThreadLocalDefaultDisplay();
-    try {
-        X11Lib.XLockDisplay(display);
-        X11Lib.XF86VidModeSetGammaRamp(display,
-                                    X11Lib.DefaultScreen(display),
-                                    size,
-                                    redRampData,
-                                    greenRampData,
-                                    blueRampData);
-    } finally {
-        X11Lib.XUnlockDisplay(display);
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
deleted file mode 100644
index 2d2f7ad33..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import java.util.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
-import com.jogamp.gluegen.runtime.PointerBuffer;
-import com.sun.nativewindow.impl.x11.*;
-
-public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implements Cloneable {
-    protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
-    
-    public static final int MAX_ATTRIBS = 128;
-    private long fbConfig;
-    private int  fbConfigID;
-    private GLCapabilitiesChooser chooser; 
-
-    public X11GLXGraphicsConfiguration(X11GraphicsScreen screen, 
-                                       GLCapabilities capsChosen, GLCapabilities capsRequested, GLCapabilitiesChooser chooser,
-                                       XVisualInfo info, long fbcfg, int fbcfgID) {
-        super(screen, capsChosen, capsRequested, info);
-        this.chooser=chooser;
-        fbConfig = fbcfg;
-        fbConfigID = fbcfgID;
-    }
-
-    public static X11GLXGraphicsConfiguration create(GLProfile glp, X11GraphicsScreen x11Screen, int fbcfgID) {
-      long display = x11Screen.getDevice().getHandle();
-      if(0==display) {
-          throw new GLException("Display null of "+x11Screen);
-      }
-      int screen = x11Screen.getIndex();
-      long fbcfg = glXFBConfigID2FBConfig(display, screen, fbcfgID);
-      if(0==fbcfg) {
-          throw new GLException("FBConfig null of 0x"+Integer.toHexString(fbcfgID));
-      }
-      if(null==glp) {
-        glp = GLProfile.getDefault();
-      }
-      GLCapabilities caps = GLXFBConfig2GLCapabilities(glp, display, fbcfg, true, true, true, GLXUtil.isMultisampleAvailable(display));
-      if(null==caps) {
-          throw new GLException("GLCapabilities null of 0x"+Long.toHexString(fbcfg));
-      }
-      XVisualInfo xvi = GLX.glXGetVisualFromFBConfigCopied(display, fbcfg);
-      if(null==xvi) {
-          throw new GLException("XVisualInfo null of 0x"+Long.toHexString(fbcfg));
-      }
-      return new X11GLXGraphicsConfiguration(x11Screen, caps, caps, new DefaultGLCapabilitiesChooser(), xvi, fbcfg, fbcfgID);
-    }
-
-    public Object clone() {
-        return super.clone();
-    }
-
-    public long getFBConfig()   { return fbConfig; }
-    public int  getFBConfigID() { return fbConfigID; }
-
-    protected void updateGraphicsConfiguration() {
-        X11GLXGraphicsConfiguration newConfig = (X11GLXGraphicsConfiguration)
-            GraphicsConfigurationFactory.getFactory(getScreen().getDevice()).chooseGraphicsConfiguration(getRequestedCapabilities(),
-                                                                                                         chooser,
-                                                                                                         getScreen());
-        if(null!=newConfig) {
-            // FIXME: setScreen( ... );
-            setXVisualInfo(newConfig.getXVisualInfo());
-            setChosenCapabilities(newConfig.getChosenCapabilities());
-            fbConfig = newConfig.getFBConfig();
-            fbConfigID = newConfig.getFBConfigID();
-            if(DEBUG) {
-                System.err.println("!!! updateGraphicsConfiguration: "+this);
-            }
-        }
-    }
-
-    public static int[] GLCapabilities2AttribList(GLCapabilities caps,
-                                                  boolean forFBAttr,
-                                                  boolean isMultisampleAvailable,
-                                                  long display,
-                                                  int screen) 
-    {
-        int colorDepth = (caps.getRedBits() +
-                          caps.getGreenBits() +
-                          caps.getBlueBits());
-        if (colorDepth < 15) {
-          throw new GLException("Bit depths < 15 (i.e., non-true-color) not supported");
-        }
-        int[] res = new int[MAX_ATTRIBS];
-        int idx = 0;
-
-        if (forFBAttr) {
-          res[idx++] = GLX.GLX_DRAWABLE_TYPE;
-          res[idx++] = caps.isOnscreen() ? ( GLX.GLX_WINDOW_BIT ) : ( caps.isPBuffer() ? GLX.GLX_PBUFFER_BIT : GLX.GLX_PIXMAP_BIT ) ;
-        }
-
-        if (forFBAttr) {
-          res[idx++] = GLX.GLX_RENDER_TYPE;
-          res[idx++] = GLX.GLX_RGBA_BIT;
-        } else {
-          res[idx++] = GLX.GLX_RGBA;
-        }
-
-        // FIXME: Still a bug is Mesa: PBUFFER && GLX_STEREO==GL_FALSE ?
-        if (forFBAttr) {
-            res[idx++] = GLX.GLX_DOUBLEBUFFER;
-            res[idx++] = caps.getDoubleBuffered()?GL.GL_TRUE:GL.GL_FALSE;
-            res[idx++] = GLX.GLX_STEREO;
-            res[idx++] = caps.getStereo()?GL.GL_TRUE:GL.GL_FALSE;
-            res[idx++] = GLX.GLX_TRANSPARENT_TYPE;
-            res[idx++] = caps.isBackgroundOpaque()?GLX.GLX_NONE:GLX.GLX_TRANSPARENT_RGB;
-            if(!caps.isBackgroundOpaque()) {
-                res[idx++] = GLX.GLX_TRANSPARENT_RED_VALUE;
-                res[idx++] = caps.getTransparentRedValue()>=0?caps.getTransparentRedValue():(int)GLX.GLX_DONT_CARE;
-                res[idx++] = GLX.GLX_TRANSPARENT_GREEN_VALUE;
-                res[idx++] = caps.getTransparentGreenValue()>=0?caps.getTransparentGreenValue():(int)GLX.GLX_DONT_CARE;
-                res[idx++] = GLX.GLX_TRANSPARENT_BLUE_VALUE;
-                res[idx++] = caps.getTransparentBlueValue()>=0?caps.getTransparentBlueValue():(int)GLX.GLX_DONT_CARE;
-                res[idx++] = GLX.GLX_TRANSPARENT_ALPHA_VALUE;
-                res[idx++] = caps.getTransparentAlphaValue()>=0?caps.getTransparentAlphaValue():(int)GLX.GLX_DONT_CARE;
-            }
-        } else {
-            if (caps.getDoubleBuffered()) {
-              res[idx++] = GLX.GLX_DOUBLEBUFFER;
-            }
-            if (caps.getStereo()) {
-              res[idx++] = GLX.GLX_STEREO;
-            }
-        }
-
-        res[idx++] = GLX.GLX_RED_SIZE;
-        res[idx++] = caps.getRedBits();
-        res[idx++] = GLX.GLX_GREEN_SIZE;
-        res[idx++] = caps.getGreenBits();
-        res[idx++] = GLX.GLX_BLUE_SIZE;
-        res[idx++] = caps.getBlueBits();
-        res[idx++] = GLX.GLX_ALPHA_SIZE;
-        res[idx++] = caps.getAlphaBits();
-        res[idx++] = GLX.GLX_DEPTH_SIZE;
-        res[idx++] = caps.getDepthBits();
-        if (caps.getStencilBits() > 0) {
-          res[idx++] = GLX.GLX_STENCIL_SIZE;
-          res[idx++] = caps.getStencilBits();
-        }
-        if (caps.getAccumRedBits()   > 0 ||
-            caps.getAccumGreenBits() > 0 ||
-            caps.getAccumBlueBits()  > 0 ||
-            caps.getAccumAlphaBits() > 0) {
-          res[idx++] = GLX.GLX_ACCUM_RED_SIZE;
-          res[idx++] = caps.getAccumRedBits();
-          res[idx++] = GLX.GLX_ACCUM_GREEN_SIZE;
-          res[idx++] = caps.getAccumGreenBits();
-          res[idx++] = GLX.GLX_ACCUM_BLUE_SIZE;
-          res[idx++] = caps.getAccumBlueBits();
-          res[idx++] = GLX.GLX_ACCUM_ALPHA_SIZE;
-          res[idx++] = caps.getAccumAlphaBits();
-        }
-        if (isMultisampleAvailable && caps.getSampleBuffers()) {
-          res[idx++] = GLX.GLX_SAMPLE_BUFFERS;
-          res[idx++] = GL.GL_TRUE;
-          res[idx++] = GLX.GLX_SAMPLES;
-          res[idx++] = caps.getNumSamples();
-        }
-        if (caps.isPBuffer()) {
-          if (caps.getPbufferFloatingPointBuffers()) {
-            String glXExtensions = GLX.glXQueryExtensionsString(display, screen);
-            if (glXExtensions == null ||
-                glXExtensions.indexOf("GLX_NV_float_buffer") < 0) {
-              throw new GLException("Floating-point pbuffers on X11 currently require NVidia hardware: "+glXExtensions);
-            }
-            res[idx++] = GLXExt.GLX_FLOAT_COMPONENTS_NV;
-            res[idx++] = GL.GL_TRUE;
-          }
-        }
-        res[idx++] = 0;
-        return res;
-  }
-
-  // FBConfig
-
-  public static boolean GLXFBConfigValid(long display, long fbcfg) {
-    int[] tmp = new int[1];
-    if(GLX.GLX_BAD_ATTRIBUTE == GLX.glXGetFBConfigAttrib(display, fbcfg, GLX.GLX_RENDER_TYPE, tmp, 0)) {
-      return false;
-    }
-    return true;
-  }
-
-  public static boolean GLXFBConfigDrawableTypeVerify(int val, boolean onscreen, boolean usePBuffer) {
-    boolean res;
-
-    if ( onscreen ) {
-        res = ( 0 != (val & GLX.GLX_WINDOW_BIT) ) ;
-    } else {
-        res = ( 0 != (val & GLX.GLX_PIXMAP_BIT) ) || usePBuffer ;
-    }
-    if ( usePBuffer ) {
-        res = res && ( 0 != (val & GLX.GLX_PBUFFER_BIT) ) ;
-    }
-
-    return res;
-  }
-
-  public static GLCapabilities GLXFBConfig2GLCapabilities(GLProfile glp, long display, long fbcfg, 
-                                                          boolean relaxed, boolean onscreen, boolean usePBuffer, boolean isMultisampleEnabled) {
-    int[] tmp = new int[1];
-    int val;
-    val = glXGetFBConfig(display, fbcfg, GLX.GLX_RENDER_TYPE, tmp, 0);
-    if (val != GLX.GLX_RGBA_BIT) {
-      throw new GLException("Visual does not support RGBA");
-    }
-    GLCapabilities res = new GLCapabilities(glp);
-
-    val = glXGetFBConfig(display, fbcfg, GLX.GLX_DRAWABLE_TYPE, tmp, 0);
-    if(GLXFBConfigDrawableTypeVerify(val, onscreen, usePBuffer)) {
-        res.setOnscreen(onscreen);
-        res.setPBuffer(usePBuffer);
-    } else if(relaxed) {
-        res.setOnscreen( 0 != (val & GLX.GLX_WINDOW_BIT) );
-        res.setPBuffer ( 0 != (val & GLX.GLX_PBUFFER_BIT) );
-    } else {
-        throw new GLException("GLX_DRAWABLE_TYPE does not match !!!");
-    }
-    res.setDoubleBuffered(glXGetFBConfig(display, fbcfg, GLX.GLX_DOUBLEBUFFER,     tmp, 0) != 0);
-    res.setStereo        (glXGetFBConfig(display, fbcfg, GLX.GLX_STEREO,           tmp, 0) != 0);
-    res.setHardwareAccelerated(glXGetFBConfig(display, fbcfg, GLX.GLX_CONFIG_CAVEAT, tmp, 0) != GLX.GLX_SLOW_CONFIG);
-    res.setDepthBits     (glXGetFBConfig(display, fbcfg, GLX.GLX_DEPTH_SIZE,       tmp, 0));
-    res.setStencilBits   (glXGetFBConfig(display, fbcfg, GLX.GLX_STENCIL_SIZE,     tmp, 0));
-    res.setRedBits       (glXGetFBConfig(display, fbcfg, GLX.GLX_RED_SIZE,         tmp, 0));
-    res.setGreenBits     (glXGetFBConfig(display, fbcfg, GLX.GLX_GREEN_SIZE,       tmp, 0));
-    res.setBlueBits      (glXGetFBConfig(display, fbcfg, GLX.GLX_BLUE_SIZE,        tmp, 0));
-    res.setAlphaBits     (glXGetFBConfig(display, fbcfg, GLX.GLX_ALPHA_SIZE,       tmp, 0));
-    res.setAccumRedBits  (glXGetFBConfig(display, fbcfg, GLX.GLX_ACCUM_RED_SIZE,   tmp, 0));
-    res.setAccumGreenBits(glXGetFBConfig(display, fbcfg, GLX.GLX_ACCUM_GREEN_SIZE, tmp, 0));
-    res.setAccumBlueBits (glXGetFBConfig(display, fbcfg, GLX.GLX_ACCUM_BLUE_SIZE,  tmp, 0));
-    res.setAccumAlphaBits(glXGetFBConfig(display, fbcfg, GLX.GLX_ACCUM_ALPHA_SIZE, tmp, 0));
-    if (isMultisampleEnabled) {
-      res.setSampleBuffers(glXGetFBConfig(display, fbcfg, GLX.GLX_SAMPLE_BUFFERS, tmp, 0) != 0);
-      res.setNumSamples   (glXGetFBConfig(display, fbcfg, GLX.GLX_SAMPLES,        tmp, 0));
-    }
-    res.setBackgroundOpaque(glXGetFBConfig(display, fbcfg, GLX.GLX_TRANSPARENT_TYPE, tmp, 0) == GLX.GLX_NONE);
-    if(!res.isBackgroundOpaque()) {
-        glXGetFBConfig(display, fbcfg, GLX.GLX_TRANSPARENT_RED_VALUE,  tmp, 0);
-        res.setTransparentRedValue(tmp[0]==GLX.GLX_DONT_CARE?-1:tmp[0]);
-
-        glXGetFBConfig(display, fbcfg, GLX.GLX_TRANSPARENT_GREEN_VALUE,  tmp, 0);
-        res.setTransparentGreenValue(tmp[0]==GLX.GLX_DONT_CARE?-1:tmp[0]);
-
-        glXGetFBConfig(display, fbcfg, GLX.GLX_TRANSPARENT_BLUE_VALUE,  tmp, 0);
-        res.setTransparentBlueValue(tmp[0]==GLX.GLX_DONT_CARE?-1:tmp[0]);
-
-        glXGetFBConfig(display, fbcfg, GLX.GLX_TRANSPARENT_ALPHA_VALUE,  tmp, 0);
-        res.setTransparentAlphaValue(tmp[0]==GLX.GLX_DONT_CARE?-1:tmp[0]);
-    }
-    try { 
-        res.setPbufferFloatingPointBuffers(glXGetFBConfig(display, fbcfg, GLXExt.GLX_FLOAT_COMPONENTS_NV, tmp, 0) != GL.GL_FALSE);
-    } catch (Exception e) {}
-    return res;
-  }
-
-  private static String glXGetFBConfigErrorCode(int err) {
-    switch (err) {
-      case GLX.GLX_NO_EXTENSION:  return "GLX_NO_EXTENSION";
-      case GLX.GLX_BAD_ATTRIBUTE: return "GLX_BAD_ATTRIBUTE";
-      default:                return "Unknown error code " + err;
-    }
-  }
-
-  public static int glXGetFBConfig(long display, long cfg, int attrib, int[] tmp, int tmp_offset) {
-    if (display == 0) {
-      throw new GLException("No display connection");
-    }
-    int res = GLX.glXGetFBConfigAttrib(display, cfg, attrib, tmp, tmp_offset);
-    if (res != 0) {
-      throw new GLException("glXGetFBConfig(0x"+Long.toHexString(attrib)+") failed: error code " + glXGetFBConfigErrorCode(res));
-    }
-    return tmp[tmp_offset];
-  }
-
-  public static int glXFBConfig2FBConfigID(long display, long cfg) {
-      int[] tmpID = new int[1];
-      return glXGetFBConfig(display, cfg, GLX.GLX_FBCONFIG_ID, tmpID, 0);
-  }
-
-  public static long glXFBConfigID2FBConfig(long display, int screen, int id) {
-      int[] attribs = new int[] { GLX.GLX_FBCONFIG_ID, id, 0 };
-      int[] count = { -1 };
-      PointerBuffer fbcfgsL = GLX.glXChooseFBConfigCopied(display, screen, attribs, 0, count, 0);
-      if (fbcfgsL == null || fbcfgsL.limit()<1) {
-          return 0;
-      }
-      return fbcfgsL.get(0);
-  }
-
-  // Visual Info
-
-  public static XVisualInfo XVisualID2XVisualInfo(long display, long visualID) {
-      XVisualInfo res = null;
-      NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-      try{
-          int[] count = new int[1];
-          XVisualInfo template = XVisualInfo.create();
-          template.setVisualid(visualID);
-          XVisualInfo[] infos = X11Lib.XGetVisualInfoCopied(display, X11Lib.VisualIDMask, template, count, 0);
-          if (infos == null || infos.length == 0) {
-            return null;
-          }  
-        res = XVisualInfo.create(infos[0]);
-      } finally {
-          NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
-      }
-      if (DEBUG) {
-        System.err.println("!!! Fetched XVisualInfo for visual ID 0x" + Long.toHexString(visualID));
-        System.err.println("!!! Resulting XVisualInfo: visualid = 0x" + Long.toHexString(res.getVisualid()));
-      }
-      return res;
-  }
-
-  public static GLCapabilities XVisualInfo2GLCapabilities(GLProfile glp, long display, XVisualInfo info, boolean onscreen, boolean usePBuffer, boolean isMultisampleEnabled) {
-    int[] tmp = new int[1];
-    int val = glXGetConfig(display, info, GLX.GLX_USE_GL, tmp, 0);
-    if (val == 0) {
-      throw new GLException("Visual does not support OpenGL");
-    }
-    val = glXGetConfig(display, info, GLX.GLX_RGBA, tmp, 0);
-    if (val == 0) {
-      throw new GLException("Visual does not support RGBA");
-    }
-    GLCapabilities res = new GLCapabilities(glp);
-    res.setOnscreen      (onscreen);
-    res.setPBuffer       (usePBuffer);
-    res.setDoubleBuffered(glXGetConfig(display, info, GLX.GLX_DOUBLEBUFFER,     tmp, 0) != 0);
-    res.setStereo        (glXGetConfig(display, info, GLX.GLX_STEREO,           tmp, 0) != 0);
-    // Note: use of hardware acceleration is determined by
-    // glXCreateContext, not by the XVisualInfo. Optimistically claim
-    // that all GLCapabilities have the capability to be hardware
-    // accelerated.
-    res.setHardwareAccelerated(true);
-    res.setDepthBits     (glXGetConfig(display, info, GLX.GLX_DEPTH_SIZE,       tmp, 0));
-    res.setStencilBits   (glXGetConfig(display, info, GLX.GLX_STENCIL_SIZE,     tmp, 0));
-    res.setRedBits       (glXGetConfig(display, info, GLX.GLX_RED_SIZE,         tmp, 0));
-    res.setGreenBits     (glXGetConfig(display, info, GLX.GLX_GREEN_SIZE,       tmp, 0));
-    res.setBlueBits      (glXGetConfig(display, info, GLX.GLX_BLUE_SIZE,        tmp, 0));
-    res.setAlphaBits     (glXGetConfig(display, info, GLX.GLX_ALPHA_SIZE,       tmp, 0));
-    res.setAccumRedBits  (glXGetConfig(display, info, GLX.GLX_ACCUM_RED_SIZE,   tmp, 0));
-    res.setAccumGreenBits(glXGetConfig(display, info, GLX.GLX_ACCUM_GREEN_SIZE, tmp, 0));
-    res.setAccumBlueBits (glXGetConfig(display, info, GLX.GLX_ACCUM_BLUE_SIZE,  tmp, 0));
-    res.setAccumAlphaBits(glXGetConfig(display, info, GLX.GLX_ACCUM_ALPHA_SIZE, tmp, 0));
-    if (isMultisampleEnabled) {
-      res.setSampleBuffers(glXGetConfig(display, info, GLX.GLX_SAMPLE_BUFFERS, tmp, 0) != 0);
-      res.setNumSamples   (glXGetConfig(display, info, GLX.GLX_SAMPLES,        tmp, 0));
-    }
-    return res;
-  }
-
-  private static String glXGetConfigErrorCode(int err) {
-    switch (err) {
-      case GLX.GLX_NO_EXTENSION:  return "GLX_NO_EXTENSION";
-      case GLX.GLX_BAD_SCREEN:    return "GLX_BAD_SCREEN";
-      case GLX.GLX_BAD_ATTRIBUTE: return "GLX_BAD_ATTRIBUTE";
-      case GLX.GLX_BAD_VISUAL:    return "GLX_BAD_VISUAL";
-      default:                return "Unknown error code " + err;
-    }
-  }
-
-  public static int glXGetConfig(long display, XVisualInfo info, int attrib, int[] tmp, int tmp_offset) {
-    if (display == 0) {
-      throw new GLException("No display connection");
-    }
-    int res = GLX.glXGetConfig(display, info, attrib, tmp, tmp_offset);
-    if (res != 0) {
-      throw new GLException("glXGetConfig(0x"+Long.toHexString(attrib)+") failed: error code " + glXGetConfigErrorCode(res));
-    }
-    return tmp[tmp_offset];
-  }
-
-  public String toString() {
-    return "X11GLXGraphicsConfiguration["+getScreen()+", visualID 0x" + Long.toHexString(getVisualID()) + ", fbConfigID 0x" + Long.toHexString(fbConfigID) + 
-                                        ",\n\trequested " + getRequestedCapabilities()+
-                                        ",\n\tchosen    " + getChosenCapabilities()+
-                                        "]";
-  }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
deleted file mode 100644
index 8a151a074..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-import com.sun.nativewindow.impl.NativeWindowFactoryImpl;
-import com.sun.nativewindow.impl.x11.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.glx.*;
-
-import com.jogamp.gluegen.runtime.PointerBuffer;
-
-/** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
-    are used on X11 platforms. Toolkits will likely need to delegate
-    to this one to change the accepted and returned types of the
-    GraphicsDevice and GraphicsConfiguration abstractions. */
-
-public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
-    protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
-
-    public X11GLXGraphicsConfigurationFactory() {
-        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.x11.X11GraphicsDevice.class, this);
-    }
-
-    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
-                                                                     CapabilitiesChooser chooser,
-                                                                     AbstractGraphicsScreen absScreen) {
-        return chooseGraphicsConfigurationStatic(capabilities, chooser, absScreen);
-    }
-
-    protected static X11GLXGraphicsConfiguration createDefaultGraphicsConfiguration(AbstractGraphicsScreen absScreen, boolean onscreen, boolean usePBuffer) {
-      if (absScreen == null) {
-        throw new IllegalArgumentException("AbstractGraphicsScreen is null");
-      }
-      if (!(absScreen instanceof X11GraphicsScreen)) {
-        throw new IllegalArgumentException("Only X11GraphicsScreen are allowed here");
-      }
-      X11GraphicsScreen x11Screen = (X11GraphicsScreen)absScreen;
-
-      GLProfile glProfile = GLProfile.getDefault();
-      GLCapabilities caps=null;
-      XVisualInfo xvis=null;
-      long fbcfg = 0;
-      int fbid = -1;
-
-      // Utilizing FBConfig
-      //
-      GLCapabilities capsFB = null;
-      long display = x11Screen.getDevice().getHandle();
-      try {
-          NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-          X11Lib.XLockDisplay(display);
-          int screen = x11Screen.getIndex();
-          boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
-
-          long visID = X11Lib.DefaultVisualID(display, x11Screen.getIndex());
-          xvis = X11GLXGraphicsConfiguration.XVisualID2XVisualInfo(display, visID);
-          caps = X11GLXGraphicsConfiguration.XVisualInfo2GLCapabilities(glProfile, display, xvis, onscreen, usePBuffer, isMultisampleAvailable);
-
-          int[] attribs = X11GLXGraphicsConfiguration.GLCapabilities2AttribList(caps, true, isMultisampleAvailable, display, screen);
-          int[] count = { -1 };
-          PointerBuffer fbcfgsL = GLX.glXChooseFBConfigCopied(display, screen, attribs, 0, count, 0);
-          if (fbcfgsL == null || fbcfgsL.limit()<1) {
-              throw new Exception("Could not fetch FBConfig for "+caps);
-          }
-          fbcfg = fbcfgsL.get(0);
-          capsFB = X11GLXGraphicsConfiguration.GLXFBConfig2GLCapabilities(glProfile, display, fbcfg, true, onscreen, usePBuffer, isMultisampleAvailable);
-
-          fbid = X11GLXGraphicsConfiguration.glXFBConfig2FBConfigID(display, fbcfg);
-
-          xvis = GLX.glXGetVisualFromFBConfigCopied(display, fbcfg);
-          if (xvis==null) {
-            throw new GLException("Error: Choosen FBConfig has no visual");
-          }
-      } catch (Throwable t) {
-      } finally {
-          X11Lib.XUnlockDisplay(display);
-          NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
-      }
-
-      return new X11GLXGraphicsConfiguration(x11Screen, (null!=capsFB)?capsFB:caps, caps, null, xvis, fbcfg, fbid);
-    }
-
-    protected static X11GLXGraphicsConfiguration chooseGraphicsConfigurationStatic(Capabilities capabilities,
-                                                                                   CapabilitiesChooser chooser,
-                                                                                   AbstractGraphicsScreen absScreen) {
-        if (absScreen == null) {
-            throw new IllegalArgumentException("AbstractGraphicsScreen is null");
-        }
-        if (!(absScreen instanceof X11GraphicsScreen)) {
-            throw new IllegalArgumentException("Only X11GraphicsScreen are allowed here");
-        }
-        X11GraphicsScreen x11Screen = (X11GraphicsScreen)absScreen;
-
-
-        if (capabilities != null &&
-            !(capabilities instanceof GLCapabilities)) {
-            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilities objects");
-        }
-
-        if (chooser != null &&
-            !(chooser instanceof GLCapabilitiesChooser)) {
-            throw new IllegalArgumentException("This NativeWindowFactory accepts only GLCapabilitiesChooser objects");
-        }
-
-        if (capabilities == null) {
-            capabilities = new GLCapabilities(null);
-        }
-
-        boolean onscreen = capabilities.isOnscreen();
-        boolean usePBuffer = ((GLCapabilities)capabilities).isPBuffer();
-
-        GLCapabilities caps2 = (GLCapabilities) capabilities.clone();
-        if(!caps2.isOnscreen()) {
-            // OFFSCREEN !DOUBLE_BUFFER
-            caps2.setDoubleBuffered(false);
-        }
-    
-        X11GLXGraphicsConfiguration res;
-        res = chooseGraphicsConfigurationFBConfig((GLCapabilities) caps2,
-                                                  (GLCapabilitiesChooser) chooser,
-                                                  x11Screen);
-        if(null==res) {
-            if(usePBuffer) {
-                throw new GLException("Error: Couldn't create X11GLXGraphicsConfiguration based on FBConfig");
-            }
-            res = chooseGraphicsConfigurationXVisual((GLCapabilities) caps2,
-                                                     (GLCapabilitiesChooser) chooser,
-                                                     x11Screen);
-        }
-        if(null==res) {
-            throw new GLException("Error: Couldn't create X11GLXGraphicsConfiguration");
-        }
-        if(DEBUG) {
-            System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationStatic("+x11Screen+","+caps2+"): "+res);
-        }
-        return res;
-    }
-
-    protected static X11GLXGraphicsConfiguration chooseGraphicsConfigurationFBConfig(GLCapabilities capabilities,
-                                                                                     GLCapabilitiesChooser chooser,
-                                                                                     X11GraphicsScreen x11Screen) {
-        int recommendedIndex = -1;
-        GLCapabilities[] caps = null;
-        PointerBuffer fbcfgsL = null;
-        int chosen=-1;
-        int retFBID=-1;
-        XVisualInfo retXVisualInfo = null;
-        GLProfile glProfile = capabilities.getGLProfile();
-        boolean onscreen = capabilities.isOnscreen();
-        boolean usePBuffer = capabilities.isPBuffer();
-
-        // Utilizing FBConfig
-        //
-        AbstractGraphicsDevice absDevice = x11Screen.getDevice();
-        long display = absDevice.getHandle();
-        try {
-            NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-            X11Lib.XLockDisplay(display);
-            int screen = x11Screen.getIndex();
-            boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
-            int[] attribs = X11GLXGraphicsConfiguration.GLCapabilities2AttribList(capabilities, true, isMultisampleAvailable, display, screen);
-            int[] count = { -1 };
-
-            fbcfgsL = GLX.glXChooseFBConfigCopied(display, screen, attribs, 0, count, 0);
-            if (fbcfgsL == null || fbcfgsL.limit()<1) {
-                if(DEBUG) {
-                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed glXChooseFBConfig ("+x11Screen+","+capabilities+"): "+fbcfgsL+", "+count[0]);
-                }
-                return null;
-            }
-            if( !X11GLXGraphicsConfiguration.GLXFBConfigValid( display, fbcfgsL.get(0) ) ) {
-                if(DEBUG) {
-                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed - GLX FBConfig invalid: ("+x11Screen+","+capabilities+"): "+fbcfgsL+", fbcfg: 0x"+Long.toHexString(fbcfgsL.get(0)));
-                }
-                return null;
-            }
-            recommendedIndex = 0; // 1st match is always recommended ..
-            caps = new GLCapabilities[fbcfgsL.limit()];
-            for (int i = 0; i < fbcfgsL.limit(); i++) {
-                caps[i] = X11GLXGraphicsConfiguration.GLXFBConfig2GLCapabilities(glProfile, display, fbcfgsL.get(i), 
-                                                                                 false, onscreen, usePBuffer, isMultisampleAvailable);
-            }
-
-            if(null==chooser) {
-                chosen = recommendedIndex;
-            } else {
-                try {
-                  chosen = chooser.chooseCapabilities(capabilities, caps, recommendedIndex);
-                } catch (NativeWindowException e) {
-                  if(DEBUG) {
-                      e.printStackTrace();
-                  }
-                  chosen = -1;
-                }
-            }
-            if (chosen < 0) {
-              // keep on going ..
-              if(DEBUG) {
-                  System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig Failed .. unable to choose config, using first");
-              }
-              chosen = 0; // default ..
-            } else if (chosen >= caps.length) {
-                throw new GLException("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ")");
-            }
-
-            retFBID = X11GLXGraphicsConfiguration.glXFBConfig2FBConfigID(display, fbcfgsL.get(chosen));
-
-            retXVisualInfo = GLX.glXGetVisualFromFBConfigCopied(display, fbcfgsL.get(chosen));
-            if (retXVisualInfo==null) {
-                if(DEBUG) {
-                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed glXGetVisualFromFBConfig ("+x11Screen+", "+fbcfgsL.get(chosen) +" (Continue: "+(false==caps[chosen].isOnscreen())+"):\n\t"+caps[chosen]);
-                }
-                if(caps[chosen].isOnscreen()) {
-                    // Onscreen drawables shall have a XVisual ..
-                    return null;
-                }
-            }
-        } finally {
-            X11Lib.XUnlockDisplay(display);
-            NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
-        }
-
-        return new X11GLXGraphicsConfiguration(x11Screen, caps[chosen], capabilities, chooser, retXVisualInfo, fbcfgsL.get(chosen), retFBID);
-    }
-
-    protected static X11GLXGraphicsConfiguration chooseGraphicsConfigurationXVisual(GLCapabilities capabilities,
-                                                                                    GLCapabilitiesChooser chooser,
-                                                                                    X11GraphicsScreen x11Screen) {
-        if (chooser == null) {
-            chooser = new DefaultGLCapabilitiesChooser();
-        }
-
-        // Until we have a rock-solid visual selection algorithm written
-        // in pure Java, we're going to provide the underlying window
-        // system's selection to the chooser as a hint
-
-        GLProfile glProfile = capabilities.getGLProfile();
-        boolean onscreen = capabilities.isOnscreen();
-        GLCapabilities[] caps = null;
-        int recommendedIndex = -1;
-        XVisualInfo retXVisualInfo = null;
-        int chosen=-1;
-
-        AbstractGraphicsDevice absDevice = x11Screen.getDevice();
-        long display = absDevice.getHandle();
-        try {
-            NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-            X11Lib.XLockDisplay(display);
-            int screen = x11Screen.getIndex();
-            boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
-            int[] attribs = X11GLXGraphicsConfiguration.GLCapabilities2AttribList(capabilities, false, isMultisampleAvailable, display, screen);
-            XVisualInfo[] infos = null;
-
-            XVisualInfo recommendedVis = GLX.glXChooseVisualCopied(display, screen, attribs, 0);
-            if (DEBUG) {
-                System.err.print("!!! glXChooseVisual recommended ");
-                if (recommendedVis == null) {
-                    System.err.println("null visual");
-                } else {
-                    System.err.println("visual id 0x" + Long.toHexString(recommendedVis.getVisualid()));
-                }
-            }
-            int[] count = new int[1];
-            XVisualInfo template = XVisualInfo.create();
-            template.setScreen(screen);
-            infos = X11Lib.XGetVisualInfoCopied(display, X11Lib.VisualScreenMask, template, count, 0);
-            if (infos == null || infos.length<1) {
-                throw new GLException("Error while enumerating available XVisualInfos");
-            }
-            caps = new GLCapabilities[infos.length];
-            for (int i = 0; i < infos.length; i++) {
-                caps[i] = X11GLXGraphicsConfiguration.XVisualInfo2GLCapabilities(glProfile, display, infos[i], onscreen, false, isMultisampleAvailable);
-                // Attempt to find the visual chosen by glXChooseVisual
-                if (recommendedVis != null && recommendedVis.getVisualid() == infos[i].getVisualid()) {
-                    recommendedIndex = i;
-                }
-            }
-            try {
-              chosen = chooser.chooseCapabilities(capabilities, caps, recommendedIndex);
-            } catch (NativeWindowException e) {
-              if(DEBUG) {
-                  e.printStackTrace();
-              }
-              chosen = -1;
-            }
-            if (chosen < 0) {
-              // keep on going ..
-              if(DEBUG) {
-                  System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationXVisual Failed .. unable to choose config, using first");
-              }
-              chosen = 0; // default ..
-            } else if (chosen >= caps.length) {
-                throw new GLException("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ")");
-            }
-            if (infos[chosen] == null) {
-                throw new GLException("GLCapabilitiesChooser chose an invalid visual");
-            }
-            retXVisualInfo = XVisualInfo.create(infos[chosen]);
-        } finally {
-            X11Lib.XUnlockDisplay(display);
-            NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
-        }
-        return new X11GLXGraphicsConfiguration(x11Screen, caps[chosen], capabilities, chooser, retXVisualInfo, 0, -1);
-    }
-}
-
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXContext.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXContext.java
deleted file mode 100644
index 7a38f0ce1..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXContext.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.*;
-
-public class X11OffscreenGLXContext extends X11GLXContext {
-  private X11OffscreenGLXDrawable drawable;
-
-  public X11OffscreenGLXContext(X11OffscreenGLXDrawable drawable,
-                               GLContext shareWith) {
-    super(drawable, shareWith);
-    this.drawable = drawable;
-  }
-
-  public int getOffscreenContextPixelDataType() {
-    GL gl = getGL();
-    return gl.isGL2()?GL2.GL_UNSIGNED_INT_8_8_8_8_REV:GL.GL_UNSIGNED_SHORT_5_5_5_1;
-  }
-  
-  public int getOffscreenContextReadBuffer() {
-    GLCapabilities caps = (GLCapabilities)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
-    if (caps.getDoubleBuffered()) {
-      return GL.GL_BACK;
-    }
-    return GL.GL_FRONT;
-  }
-
-  public boolean offscreenImageNeedsVerticalFlip() {
-    // There doesn't seem to be a way to do this in the construction
-    // of the Pixmap or GLXPixmap
-    return true;
-  }
-
-  protected void create() {
-    createContext(false);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
deleted file mode 100644
index 30772f8ab..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.x11.*;
-
-public class X11OffscreenGLXDrawable extends X11GLXDrawable {
-  private long pixmap;
-
-  protected X11OffscreenGLXDrawable(GLDrawableFactory factory, NativeWindow target) {
-    super(factory, target, true);
-    create();
-  }
-
-  protected void setRealizedImpl() {
-    if(realized) {
-        create();
-    } else {
-        destroy();
-    }
-  }
-
-  public GLContext createContext(GLContext shareWith) {
-    return new X11OffscreenGLXContext(this, shareWith);
-  }
-  
-  private void create() {
-    NativeWindow nw = getNativeWindow();
-    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration) nw.getGraphicsConfiguration().getNativeGraphicsConfiguration();
-    XVisualInfo vis = config.getXVisualInfo();
-    int bitsPerPixel = vis.getDepth();
-    AbstractGraphicsScreen aScreen = config.getScreen();
-    AbstractGraphicsDevice aDevice = aScreen.getDevice();
-    long dpy = aDevice.getHandle();
-    int screen = aScreen.getIndex();
-
-    getFactoryImpl().lockToolkit();
-    try {
-      X11Lib.XLockDisplay(dpy);
-      pixmap = X11Lib.XCreatePixmap(dpy, (int) X11Lib.RootWindow(dpy, screen), 
-                                    component.getWidth(), component.getHeight(), bitsPerPixel);
-      if (pixmap == 0) {
-        throw new GLException("XCreatePixmap failed");
-      }
-      long drawable = GLX.glXCreateGLXPixmap(dpy, vis, pixmap);
-      if (drawable == 0) {
-        X11Lib.XFreePixmap(dpy, pixmap);
-        pixmap = 0;
-        throw new GLException("glXCreateGLXPixmap failed");
-      }
-      ((SurfaceChangeable)nw).setSurfaceHandle(drawable);
-      if (DEBUG) {
-        System.err.println("Created pixmap " + toHexString(pixmap) +
-                           ", GLXPixmap " + toHexString(drawable) +
-                           ", display " + toHexString(dpy));
-      }
-    } finally {
-      X11Lib.XUnlockDisplay(dpy);
-      getFactoryImpl().unlockToolkit();
-    }
-  }
-
-  public void destroy() {
-    if (pixmap == 0) return;
-
-    NativeWindow nw = getNativeWindow();
-    long display = nw.getDisplayHandle();
-    try {
-      getFactoryImpl().lockToolkit();
-      X11Lib.XLockDisplay(display);
-
-      long drawable = nw.getSurfaceHandle();
-      if (DEBUG) {
-        System.err.println("Destroying pixmap " + toHexString(pixmap) +
-                           ", GLXPixmap " + toHexString(drawable) +
-                           ", display " + toHexString(display));
-      }
-
-      // Must destroy pixmap and GLXPixmap
-
-      if (DEBUG) {
-        long cur = GLX.glXGetCurrentContext();
-        if (cur != 0) {
-          System.err.println("WARNING: found context " + toHexString(cur) + " current during pixmap destruction");
-        }
-      }
-
-      // FIXME: workaround for crashes on NVidia hardware when
-      // destroying pixmap (no context is current at the point of the
-      // crash, at least from the point of view of
-      // glXGetCurrentContext)
-      GLX.glXMakeCurrent(display, 0, 0);
-
-      GLX.glXDestroyGLXPixmap(display, drawable);
-      X11Lib.XFreePixmap(display, pixmap);
-      drawable = 0;
-      pixmap = 0;
-      display = 0;
-      ((SurfaceChangeable)nw).setSurfaceHandle(0);
-    } finally {
-      X11Lib.XUnlockDisplay(display);
-      getFactoryImpl().unlockToolkit();
-    }
-  }
-  protected void swapBuffersImpl() {
-    if(DEBUG) {
-        System.err.println("unhandled swapBuffersImpl() called for: "+this);
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXContext.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXContext.java
deleted file mode 100644
index a73b41146..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXContext.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import java.util.*;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.*;
-
-public class X11OnscreenGLXContext extends X11GLXContext {
-  // This indicates whether the context we have created is indirect
-  // and therefore requires the toolkit to be locked around all GL
-  // calls rather than just all GLX calls
-  protected boolean isIndirect;
-
-  public X11OnscreenGLXContext(X11OnscreenGLXDrawable drawable,
-                              GLContext shareWith) {
-    super(drawable, shareWith);
-  }
-  
-  public boolean isOptimizable() {
-    return super.isOptimizable() && !isIndirect;
-  }
-
-  protected void create() {
-    createContext(true);
-    isIndirect = !GLX.glXIsDirect(drawable.getNativeWindow().getDisplayHandle(), context);
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
deleted file mode 100644
index 4a81448fd..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.*;
-
-public class X11OnscreenGLXDrawable extends X11GLXDrawable {
-  protected X11OnscreenGLXDrawable(GLDrawableFactory factory, NativeWindow component) {
-    super(factory, component, false);
-  }
-
-  public GLContext createContext(GLContext shareWith) {
-    return new X11OnscreenGLXContext(this, shareWith);
-  }
-
-  public int getWidth() {
-    return component.getWidth();
-  }
-
-  public int getHeight() {
-    return component.getHeight();
-  }
-
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXContext.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXContext.java
deleted file mode 100644
index 3938c0ecc..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXContext.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.*;
-
-public class X11PbufferGLXContext extends X11GLXContext {
-  private X11PbufferGLXDrawable drawable;
-
-  public X11PbufferGLXContext(X11PbufferGLXDrawable drawable,
-                             GLContext shareWith) {
-    super(drawable, shareWith);
-    this.drawable = drawable;
-  }
-
-  public void bindPbufferToTexture() {
-    // FIXME: figure out how to implement this
-    throw new GLException("Not yet implemented");
-  }
-
-  public void releasePbufferFromTexture() {
-    // FIXME: figure out how to implement this
-    throw new GLException("Not yet implemented");
-  }
-
-
-  public int getFloatingPointMode() {
-    return drawable.getFloatingPointMode();
-  }
-
-  protected void create() {
-    if (DEBUG) {
-      System.err.println("Creating context for pbuffer " + drawable.getWidth() +
-                         " x " + drawable.getHeight());
-    }
-
-    // Create a gl context for the p-buffer.
-    X11GLXContext other = (X11GLXContext) GLContextShareSet.getShareContext(this);
-    long share = 0;
-    if (other != null) {
-      share = other.getContext();
-      if (share == 0) {
-        throw new GLException("GLContextShareSet returned an invalid OpenGL context");
-      }
-    }
-    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)
-        getGLDrawable().getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-
-    context = GLX.glXCreateNewContext(drawable.getNativeWindow().getDisplayHandle(), 
-                                      config.getFBConfig(), GLX.GLX_RGBA_TYPE, share, true);
-    if (context == 0) {
-      throw new GLException("pbuffer creation error: glXCreateNewContext() failed");
-    }
-    GLContextShareSet.contextCreated(this);
-
-    if (DEBUG) {
-      System.err.println("Created context for pbuffer " + drawable.getWidth() +
-                         " x " + drawable.getHeight());
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
deleted file mode 100644
index e87ef54ac..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.impl.x11.glx;
-
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.glx.*;
-import com.sun.nativewindow.impl.x11.*;
-
-public class X11PbufferGLXDrawable extends X11GLXDrawable {
-  protected X11PbufferGLXDrawable(GLDrawableFactory factory, NativeWindow target) {
-                                  /* GLCapabilities caps, 
-                                  GLCapabilitiesChooser chooser,
-                                  int width, int height */
-    super(factory, target, true);
-
-    if (DEBUG) {
-        System.out.println("Pbuffer config: " + getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration());
-    }
-
-    createPbuffer();
-
-    if (DEBUG) {
-        System.err.println("Created pbuffer " + this);
-    }
-  }
-
-  protected void setRealizedImpl() {
-    if(realized) {
-        createPbuffer();
-    } else {
-        destroy();
-    }
-  }
-
-  public GLContext createContext(GLContext shareWith) {
-    return new X11PbufferGLXContext(this, shareWith);
-  }
-
-  public void destroy() {
-    getFactoryImpl().lockToolkit();
-    try {
-        NativeWindow nw = getNativeWindow();
-        if (nw.getSurfaceHandle() != 0) {
-          GLX.glXDestroyPbuffer(nw.getDisplayHandle(), nw.getSurfaceHandle());
-        }
-        ((SurfaceChangeable)nw).setSurfaceHandle(0);
-    } finally {
-        getFactoryImpl().unlockToolkit();
-    }
-  }
-
-  private void createPbuffer() {
-    getFactoryImpl().lockToolkit();
-    try {
-      X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration) getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-      AbstractGraphicsScreen aScreen = config.getScreen();
-      AbstractGraphicsDevice aDevice = aScreen.getDevice();
-      long display = aDevice.getHandle();
-      int screen = aScreen.getIndex();
-
-      if (display==0) {
-        throw new GLException("Null display");
-      }
-
-      NativeWindow nw = getNativeWindow();
-    
-      GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
-
-      if (capabilities.getPbufferRenderToTexture()) {
-        throw new GLException("Render-to-texture pbuffers not supported yet on X11");
-      }
-
-      if (capabilities.getPbufferRenderToTextureRectangle()) {
-        throw new GLException("Render-to-texture-rectangle pbuffers not supported yet on X11");
-      }
-
-      // Create the p-buffer.
-      int niattribs = 0;
-      int[] iattributes = new int[5];
-
-      iattributes[niattribs++] = GLX.GLX_PBUFFER_WIDTH;
-      iattributes[niattribs++] = nw.getWidth();
-      iattributes[niattribs++] = GLX.GLX_PBUFFER_HEIGHT;
-      iattributes[niattribs++] = nw.getHeight();
-      iattributes[niattribs++] = 0;
-
-      long pbuffer = GLX.glXCreatePbuffer(display, config.getFBConfig(), iattributes, 0);
-      if (pbuffer == 0) {
-        // FIXME: query X error code for detail error message
-        throw new GLException("pbuffer creation error: glXCreatePbuffer() failed");
-      }
-
-      // Set up instance variables
-      ((SurfaceChangeable)nw).setSurfaceHandle(pbuffer);
-      
-      // Determine the actual width and height we were able to create.
-      int[] tmp = new int[1];
-      GLX.glXQueryDrawable(display, pbuffer, GLX.GLX_WIDTH, tmp, 0);
-      int width = tmp[0];
-      GLX.glXQueryDrawable(display, pbuffer, GLX.GLX_HEIGHT, tmp, 0);
-      int height = tmp[0];
-      ((SurfaceChangeable)nw).setSize(width, height);
-    } finally {
-      getFactoryImpl().unlockToolkit();
-    }
-  }
-
-  public int getFloatingPointMode() {
-    // Floating-point pbuffers currently require NVidia hardware on X11
-    return GLPbuffer.NV_FLOAT;
-  }
-
-  protected void swapBuffersImpl() {
-    if(DEBUG) {
-        System.err.println("unhandled swapBuffersImpl() called for: "+this);
-    }
-  }
-}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
deleted file mode 100644
index 1b92e6f86..000000000
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.opengl.impl.x11.glx.awt;
-
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-import javax.media.nativewindow.awt.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.*;
-
-import com.sun.opengl.impl.*;
-import com.sun.nativewindow.impl.jawt.*;
-import com.sun.nativewindow.impl.jawt.x11.*;
-import com.sun.nativewindow.impl.x11.*;
-import com.sun.opengl.impl.x11.*;
-import com.sun.opengl.impl.x11.glx.*;
-
-public class X11AWTGLXGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
-    protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
-
-    public X11AWTGLXGraphicsConfigurationFactory() {
-        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.awt.AWTGraphicsDevice.class, this);
-    }
-
-    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
-                                                                     CapabilitiesChooser chooser,
-                                                                     AbstractGraphicsScreen absScreen) {
-        GraphicsDevice device = null;
-        if (absScreen != null &&
-            !(absScreen instanceof AWTGraphicsScreen)) {
-            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only AWTGraphicsScreen objects");
-        }
-
-        if(null==absScreen) {
-            absScreen = AWTGraphicsScreen.createScreenDevice(-1);
-        }
-        AWTGraphicsScreen awtScreen = (AWTGraphicsScreen) absScreen;
-        device = ((AWTGraphicsDevice)awtScreen.getDevice()).getGraphicsDevice();
-
-        if (capabilities != null &&
-            !(capabilities instanceof GLCapabilities)) {
-            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only GLCapabilities objects");
-        }
-
-        if (chooser != null &&
-            !(chooser instanceof GLCapabilitiesChooser)) {
-            throw new IllegalArgumentException("This GraphicsConfigurationFactory accepts only GLCapabilitiesChooser objects");
-        }
-
-        if(DEBUG) {
-            System.err.println("X11AWTGLXGraphicsConfigurationFactory: got "+absScreen);
-        }
-        
-        GraphicsConfiguration gc;
-        X11GraphicsConfiguration x11Config;
-
-        // Need the lock here, since it could be an AWT owned display connection
-        NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-        try {
-            long displayHandle = X11SunJDKReflection.graphicsDeviceGetDisplay(device);
-            if(0==displayHandle) {
-                displayHandle = X11Util.getThreadLocalDefaultDisplay();
-                if(DEBUG) {
-                    System.err.println("X11AWTGLXGraphicsConfigurationFactory: using a thread local X11 display");
-                }
-            } else {
-                if(DEBUG) {
-                    System.err.println("X11AWTGLXGraphicsConfigurationFactory: using AWT X11 display 0x"+Long.toHexString(displayHandle));
-                }
-            }
-            ((AWTGraphicsDevice)awtScreen.getDevice()).setHandle(displayHandle);
-            X11GraphicsDevice x11Device = new X11GraphicsDevice(displayHandle);
-
-            X11GraphicsScreen x11Screen = new X11GraphicsScreen(x11Device, awtScreen.getIndex());
-            if(DEBUG) {
-                System.err.println("X11AWTGLXGraphicsConfigurationFactory: made "+x11Screen);
-            }
-
-            gc = device.getDefaultConfiguration();
-            AWTGraphicsConfiguration.setupCapabilitiesRGBABits(capabilities, gc);
-            if(DEBUG) {
-                System.err.println("AWT Colormodel compatible: "+capabilities);
-            }
-
-            x11Config = (X11GraphicsConfiguration)
-                GraphicsConfigurationFactory.getFactory(x11Device).chooseGraphicsConfiguration(capabilities,
-                                                                                               chooser,
-                                                                                               x11Screen);
-            if (x11Config == null) {
-                throw new GLException("Unable to choose a GraphicsConfiguration: "+capabilities+",\n\t"+chooser+"\n\t"+x11Screen);
-            }
-
-            long visualID = x11Config.getVisualID();
-            // Now figure out which GraphicsConfiguration corresponds to this
-            // visual by matching the visual ID
-            GraphicsConfiguration[] configs = device.getConfigurations();
-            for (int i = 0; i < configs.length; i++) {
-                GraphicsConfiguration config = configs[i];
-                if (config != null) {
-                    if (X11SunJDKReflection.graphicsConfigurationGetVisualID(config) == visualID) {
-                        return new AWTGraphicsConfiguration(awtScreen, x11Config.getChosenCapabilities(), x11Config.getRequestedCapabilities(), 
-                                                            config, x11Config);
-                    }
-                }
-            }
-        } finally {
-            NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
-        }
-        // Either we weren't able to reflectively introspect on the
-        // X11GraphicsConfig or something went wrong in the steps above;
-        // Let's take the default configuration as used on Windows and MacOSX then ..
-        if(DEBUG) {
-            System.err.println("!!! Using default configuration");
-        }
-        return new AWTGraphicsConfiguration(awtScreen, x11Config.getChosenCapabilities(), x11Config.getRequestedCapabilities(), gc, x11Config);
-    }
-}
-- 
cgit v1.2.3


From f3bc93b003c05684e48d75eee9107c16a9dc7283 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sat, 27 Mar 2010 23:31:01 +0100
Subject: refactoring part 4 (remaining files): renamed com.sun.opengl ->
 com.jogamp.opengl.

---
 doxygen/doxygen-all-pub.cfg                        |  2 +-
 .../classes/com/jogamp/opengl/cg/CgException.java  | 67 ++++++++++++++++++++++
 .../classes/com/sun/opengl/cg/CgException.java     | 67 ----------------------
 src/jogl/classes/com/sun/openmax/OMXInstance.java  | 16 +++---
 .../opengl/test/junit/texture/awt/Texture1.java    | 12 ++--
 .../texture/util/gl2/TextureGL2ListenerDraw1.java  |  8 +--
 .../sun/nativewindow/impl/InternalBufferUtil.java  |  2 +-
 .../com/sun/nativewindow/impl/jawt/JAWTUtil.java   |  2 +-
 .../com/sun/javafx/newt/opengl/GLWindow.java       |  2 +-
 .../javafx/newt/opengl/broadcom/egl/Display.java   |  2 +-
 .../javafx/newt/opengl/broadcom/egl/Window.java    |  2 +-
 .../com/sun/javafx/newt/opengl/kd/KDDisplay.java   |  2 +-
 .../com/sun/javafx/newt/opengl/kd/KDWindow.java    |  2 +-
 test/Issue326Test1.java                            |  6 +-
 test/Issue326Test2.java                            |  2 +-
 test/Issue344Base.java                             |  4 +-
 16 files changed, 99 insertions(+), 99 deletions(-)
 create mode 100644 src/jogl/classes/com/jogamp/opengl/cg/CgException.java
 delete mode 100644 src/jogl/classes/com/sun/opengl/cg/CgException.java

diff --git a/doxygen/doxygen-all-pub.cfg b/doxygen/doxygen-all-pub.cfg
index 8bf4685cb..3cac3e651 100644
--- a/doxygen/doxygen-all-pub.cfg
+++ b/doxygen/doxygen-all-pub.cfg
@@ -461,7 +461,7 @@ WARN_LOGFILE           =
 
 INPUT                 = ../src/jogl/classes/javax
 INPUT                += ../build-x86_64/jogl/gensrc/classes/javax
-INPUT                += ../src/jogl/classes/com/sun/opengl/util
+INPUT                += ../src/jogl/classes/com/jogamp/opengl/util
 INPUT                += ../src/newt/classes/com/sun/javafx/newt
 
 # If the value of the INPUT tag contains directories, you can use the 
diff --git a/src/jogl/classes/com/jogamp/opengl/cg/CgException.java b/src/jogl/classes/com/jogamp/opengl/cg/CgException.java
new file mode 100644
index 000000000..8bfd9e23e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/cg/CgException.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.cg;
+
+/**
+ * A generic exception for errors that occur throughout the NVidia Cg
+ * binding, as a substitute for {@link RuntimeException}.
+ */
+public class CgException extends RuntimeException {
+  /** Constructs a CgException object. */
+  public CgException() {
+    super();
+  }
+
+  /** Constructs a CgException object with the specified detail message. */
+  public CgException(String message) {
+    super(message);
+  }
+
+  /** Constructs a CgException object with the specified detail message and
+      root cause. */
+  public CgException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  /** Constructs a CgException object with the specified root cause. */
+  public CgException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/jogl/classes/com/sun/opengl/cg/CgException.java b/src/jogl/classes/com/sun/opengl/cg/CgException.java
deleted file mode 100644
index 3380bb540..000000000
--- a/src/jogl/classes/com/sun/opengl/cg/CgException.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.cg;
-
-/**
- * A generic exception for errors that occur throughout the NVidia Cg
- * binding, as a substitute for {@link RuntimeException}.
- */
-public class CgException extends RuntimeException {
-  /** Constructs a CgException object. */
-  public CgException() {
-    super();
-  }
-
-  /** Constructs a CgException object with the specified detail message. */
-  public CgException(String message) {
-    super(message);
-  }
-
-  /** Constructs a CgException object with the specified detail message and
-      root cause. */
-  public CgException(String message, Throwable cause) {
-    super(message, cause);
-  }
-
-  /** Constructs a CgException object with the specified root cause. */
-  public CgException(Throwable cause) {
-    super(cause);
-  }
-}
diff --git a/src/jogl/classes/com/sun/openmax/OMXInstance.java b/src/jogl/classes/com/sun/openmax/OMXInstance.java
index 2eff166d2..84bd87809 100644
--- a/src/jogl/classes/com/sun/openmax/OMXInstance.java
+++ b/src/jogl/classes/com/sun/openmax/OMXInstance.java
@@ -3,12 +3,12 @@ package com.sun.openmax;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.*;
 
-import com.sun.opengl.impl.egl.EGL;
-import com.sun.opengl.impl.egl.EGLContext;
-import com.sun.opengl.impl.egl.EGLDrawable;
-import com.sun.opengl.impl.egl.EGLExt;
+import com.jogamp.opengl.impl.egl.EGL;
+import com.jogamp.opengl.impl.egl.EGLContext;
+import com.jogamp.opengl.impl.egl.EGLDrawable;
+import com.jogamp.opengl.impl.egl.EGLExt;
 
 import java.net.URL;
 import java.nio.ByteBuffer;
@@ -50,13 +50,13 @@ public class OMXInstance {
     protected long o_totalFrames = 0; // duration in frames
     
     static class EGLImageTexture {
-        public EGLImageTexture(com.sun.opengl.util.texture.Texture t, long i, long s) {
+        public EGLImageTexture(com.jogamp.opengl.util.texture.Texture t, long i, long s) {
             texture = t; image = i; sync = s;
         }
         public String toString() {
             return "EGLImageTexture[" + texture + ", image " + image + ", sync "+sync+"]";
         }
-        protected com.sun.opengl.util.texture.Texture texture;
+        protected com.jogamp.opengl.util.texture.Texture texture;
         protected long image;
         protected long sync;
     }
@@ -219,7 +219,7 @@ public class OMXInstance {
             _setStreamEGLImageTexture2D(moviePtr, i, tex, image, sync);
 
             eglImgTexs[i] = new EGLImageTexture(
-                com.sun.opengl.util.texture.TextureIO.newTexture(tex,
+                com.jogamp.opengl.util.texture.TextureIO.newTexture(tex,
                                                                  javax.media.opengl.GL2.GL_TEXTURE_2D,
                                                                  width,
                                                                  height,
diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
index 9772d1a99..bf80ec7b3 100755
--- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
+++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
@@ -42,12 +42,12 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
-import com.sun.opengl.util.texture.awt.AWTTextureIO;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
+import com.jogamp.opengl.util.Animator;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;
diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
index cd02d5d25..bdb8bd95a 100755
--- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
+++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
@@ -32,10 +32,10 @@
 
 package com.jogamp.opengl.test.junit.texture.util.gl2;
 
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2ES1;
 import javax.media.opengl.GL2;
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java
index 0425014df..7cf2e3ff5 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java
@@ -37,7 +37,7 @@ import java.lang.reflect.*;
 import java.nio.*;
 
 /** Internal copy of selected routines from BufferUtil to avoid
-    outward dependencies on com.sun.opengl.util package. */
+    outward dependencies on com.jogamp.opengl.util package. */
 public class InternalBufferUtil {
     public static final int SIZEOF_BYTE = 1;
     public static final int SIZEOF_SHORT = 2;
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
index aac01e990..6a8f8cdb2 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
@@ -65,7 +65,7 @@ public class JAWTUtil {
     Method m=null;
     if(!headlessMode) {
         try {
-            jC = Class.forName("com.sun.opengl.impl.awt.Java2D");
+            jC = Class.forName("com.jogamp.opengl.impl.awt.Java2D");
             m = jC.getMethod("isQueueFlusherThread", null);
             ok = true;
         } catch (Exception e) {}
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java
index e809d2cdc..98010b2f1 100644
--- a/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java
@@ -36,7 +36,7 @@ package com.sun.javafx.newt.opengl;
 import com.sun.javafx.newt.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.sun.opengl.impl.GLDrawableHelper;
+import com.jogamp.opengl.impl.GLDrawableHelper;
 import java.util.*;
 
 /**
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java
index debe9e9b9..1b74aebc3 100644
--- a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java
@@ -34,7 +34,7 @@
 package com.sun.javafx.newt.opengl.broadcom.egl;
 
 import com.sun.javafx.newt.impl.*;
-import com.sun.opengl.impl.egl.*;
+import com.jogamp.opengl.impl.egl.*;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
 
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java
index 11672dde3..8446ec20f 100755
--- a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java
@@ -34,7 +34,7 @@
 package com.sun.javafx.newt.opengl.broadcom.egl;
 
 import com.sun.javafx.newt.impl.*;
-import com.sun.opengl.impl.egl.*;
+import com.jogamp.opengl.impl.egl.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLProfile;
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java
index 5aeae75ea..9e328a223 100755
--- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java
@@ -35,7 +35,7 @@ package com.sun.javafx.newt.opengl.kd;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.impl.*;
-import com.sun.opengl.impl.egl.*;
+import com.jogamp.opengl.impl.egl.*;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
 
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java
index 605e9c064..9919d1f6f 100755
--- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java
@@ -35,7 +35,7 @@ package com.sun.javafx.newt.opengl.kd;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.impl.*;
-import com.sun.opengl.impl.egl.*;
+import com.jogamp.opengl.impl.egl.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLProfile;
diff --git a/test/Issue326Test1.java b/test/Issue326Test1.java
index 42b6ec0c7..217c2819b 100755
--- a/test/Issue326Test1.java
+++ b/test/Issue326Test1.java
@@ -13,8 +13,8 @@ import javax.media.opengl.GLCanvas;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.glu.GLU;
 
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.j2d.TextRenderer;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.j2d.TextRenderer;
 
 /** 
  * Demonstrates corruption with older versions of TextRenderer. Two
@@ -65,7 +65,7 @@ public class Issue326Test1 extends Frame implements GLEventListener {
         gl.glLoadIdentity();
 		
         tr.beginRendering(800,800);
-        tr.draw( "die Marktwirtschaft. Da regelt sich – angeblich", 16, 32);
+        tr.draw( "die Marktwirtschaft. Da regelt sich � angeblich", 16, 32);
         tr.draw( "Hello World! This text is scrambled", 16, 16);
         tr.endRendering();
 		
diff --git a/test/Issue326Test2.java b/test/Issue326Test2.java
index f2258c858..10ec4417b 100755
--- a/test/Issue326Test2.java
+++ b/test/Issue326Test2.java
@@ -2,7 +2,7 @@ import java.awt.Font;
 import java.awt.Frame;
 import java.awt.event.*;
 import javax.media.opengl.*;
-import com.sun.opengl.util.j2d.*;
+import com.jogamp.opengl.util.j2d.*;
 
 /**
  * Another test case demonstrating corruption with older version of
diff --git a/test/Issue344Base.java b/test/Issue344Base.java
index 548e3ec21..6d0c99290 100755
--- a/test/Issue344Base.java
+++ b/test/Issue344Base.java
@@ -7,8 +7,8 @@ import java.awt.geom.*;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.j2d.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.j2d.*;
 
 /** Test Code adapted from TextCube.java (in JOGL demos)
  *
-- 
cgit v1.2.3


From ea23f9505e3fcf3a5b928855eba739ad123b64f4 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sat, 27 Mar 2010 23:55:47 +0100
Subject: refactoring part 5, (renaming com.sun.opengl->com.jogamp.opengl)

---
 make/config/jogl/gl-impl-CustomCCode-gl2.c     |  4 ++--
 make/config/jogl/gl-impl-CustomCCode-gl2es12.c |  4 ++--
 make/config/jogl/gl-impl-CustomCCode-gl3.c     |  4 ++--
 make/config/jogl/gl-impl-CustomCCode-gl3bc.c   |  4 ++--
 make/config/jogl/gl-impl-CustomCCode-gles1.c   |  4 ++--
 make/config/jogl/gl-impl-CustomCCode-gles2.c   |  4 ++--
 make/config/jogl/glx-CustomCCode.c             | 16 ++++++++--------
 nbproject/project.xml                          |  5 +++++
 8 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/make/config/jogl/gl-impl-CustomCCode-gl2.c b/make/config/jogl/gl-impl-CustomCCode-gl2.c
index 35bc8be49..91fd0078b 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl2.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl2.c
@@ -4,7 +4,7 @@
  *     C function: void * glMapBuffer(GLenum target, GLenum access);
  */
 JNIEXPORT jlong JNICALL 
-Java_com_sun_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_jogamp_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
   PFNGLMAPBUFFERPROC ptr_glMapBuffer;
   void * _res;
   ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -19,6 +19,6 @@ Java_com_sun_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject
  *     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) {
+Java_com_jogamp_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 a8aa57585..07b821802 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
@@ -4,7 +4,7 @@
  *     C function: void * glMapBuffer(GLenum target, GLenum access);
  */
 JNIEXPORT jlong JNICALL 
-Java_com_sun_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_jogamp_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
   PFNGLMAPBUFFERPROC ptr_glMapBuffer;
   void * _res;
   ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -19,6 +19,6 @@ Java_com_sun_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env,
  *     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) {
+Java_com_jogamp_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-gl3.c b/make/config/jogl/gl-impl-CustomCCode-gl3.c
index adb2f8964..f540a7d4a 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl3.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl3.c
@@ -4,7 +4,7 @@
  *     C function: void * glMapBuffer(GLenum target, GLenum access);
  */
 JNIEXPORT jlong JNICALL 
-Java_com_sun_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_jogamp_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
   PFNGLMAPBUFFERPROC ptr_glMapBuffer;
   void * _res;
   ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -19,6 +19,6 @@ Java_com_sun_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject
  *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
  */
 JNIEXPORT jobject JNICALL
-Java_com_sun_opengl_impl_gl3_GL3Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+Java_com_jogamp_opengl_impl_gl3_GL3Impl_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-gl3bc.c b/make/config/jogl/gl-impl-CustomCCode-gl3bc.c
index 701e3a942..21de8c925 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl3bc.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl3bc.c
@@ -4,7 +4,7 @@
  *     C function: void * glMapBuffer(GLenum target, GLenum access);
  */
 JNIEXPORT jlong JNICALL 
-Java_com_sun_opengl_impl_gl3_GL3bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_jogamp_opengl_impl_gl3_GL3bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
   PFNGLMAPBUFFERPROC ptr_glMapBuffer;
   void * _res;
   ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -19,6 +19,6 @@ Java_com_sun_opengl_impl_gl3_GL3bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobjec
  *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
  */
 JNIEXPORT jobject JNICALL
-Java_com_sun_opengl_impl_gl3_GL3bcImpl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+Java_com_jogamp_opengl_impl_gl3_GL3bcImpl_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 7e875c4d0..a71ca4aae 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gles1.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gles1.c
@@ -5,7 +5,7 @@ typedef GLvoid* (GL_APIENTRY* PFNGLMAPBUFFERPROC) (GLenum target, GLenum access)
  *     C function: void * glMapBuffer(GLenum target, GLenum access);
  */
 JNIEXPORT jlong JNICALL 
-Java_com_sun_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_jogamp_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
   PFNGLMAPBUFFERPROC ptr_glMapBuffer;
   void * _res;
   ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -20,6 +20,6 @@ Java_com_sun_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobjec
  *     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) {
+Java_com_jogamp_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 8dc92049e..f99822d65 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gles2.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gles2.c
@@ -5,7 +5,7 @@ typedef GLvoid* (GL_APIENTRY* PFNGLMAPBUFFERPROC) (GLenum target, GLenum access)
  *     C function: void * glMapBuffer(GLenum target, GLenum access);
  */
 JNIEXPORT jlong JNICALL 
-Java_com_sun_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_jogamp_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
   PFNGLMAPBUFFERPROC ptr_glMapBuffer;
   void * _res;
   ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -20,6 +20,6 @@ Java_com_sun_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobjec
  *     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) {
+Java_com_jogamp_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/glx-CustomCCode.c b/make/config/jogl/glx-CustomCCode.c
index efe4d5351..7dac53fb6 100755
--- a/make/config/jogl/glx-CustomCCode.c
+++ b/make/config/jogl/glx-CustomCCode.c
@@ -30,29 +30,29 @@ static void _initClazzAccess(JNIEnv *env) {
 
     c = (*env)->FindClass(env, clazzNameInternalBufferUtil);
     if(NULL==c) {
-        fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameInternalBufferUtil);
+        fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameInternalBufferUtil);
         (*env)->FatalError(env, clazzNameInternalBufferUtil);
     }
     clazzInternalBufferUtil = (jclass)(*env)->NewGlobalRef(env, c);
     if(NULL==clazzInternalBufferUtil) {
-        fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameInternalBufferUtil);
+        fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameInternalBufferUtil);
         (*env)->FatalError(env, clazzNameInternalBufferUtil);
     }
     c = (*env)->FindClass(env, clazzNameByteBuffer);
     if(NULL==c) {
-        fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameByteBuffer);
+        fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameByteBuffer);
         (*env)->FatalError(env, clazzNameByteBuffer);
     }
     clazzByteBuffer = (jclass)(*env)->NewGlobalRef(env, c);
     if(NULL==c) {
-        fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameByteBuffer);
+        fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameByteBuffer);
         (*env)->FatalError(env, clazzNameByteBuffer);
     }
 
     cstrInternalBufferUtil = (*env)->GetStaticMethodID(env, clazzInternalBufferUtil, 
                             clazzNameInternalBufferUtilStaticCstrName, clazzNameInternalBufferUtilStaticCstrSignature);
     if(NULL==cstrInternalBufferUtil) {
-        fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX:: can't create %s.%s %s\n",
+        fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX:: can't create %s.%s %s\n",
             clazzNameInternalBufferUtil,
             clazzNameInternalBufferUtilStaticCstrName, clazzNameInternalBufferUtilStaticCstrSignature);
         (*env)->FatalError(env, clazzNameInternalBufferUtilStaticCstrName);
@@ -65,7 +65,7 @@ static void _initClazzAccess(JNIEnv *env) {
  *     C function: XVisualInfo *  glXGetVisualFromFBConfig(Display *  dpy, GLXFBConfig config);
  */
 JNIEXPORT jobject JNICALL 
-Java_com_sun_opengl_impl_x11_glx_GLX_glXGetVisualFromFBConfigCopied0__JJ(JNIEnv *env, jclass _unused, jlong dpy, jlong config) {
+Java_com_jogamp_opengl_impl_x11_glx_GLX_glXGetVisualFromFBConfigCopied0__JJ(JNIEnv *env, jclass _unused, jlong dpy, jlong config) {
   XVisualInfo *  _res;
   jobject jbyteSource;
   jobject jbyteCopy;
@@ -90,7 +90,7 @@ Java_com_sun_opengl_impl_x11_glx_GLX_glXGetVisualFromFBConfigCopied0__JJ(JNIEnv
  *     C function: GLXFBConfig *  glXChooseFBConfig(Display *  dpy, int screen, const int *  attribList, int *  nitems);
  */
 JNIEXPORT jobject JNICALL 
-Java_com_sun_opengl_impl_x11_glx_GLX_glXChooseFBConfigCopied1__JILjava_lang_Object_2ILjava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jobject nitems, jint nitems_byte_offset) {
+Java_com_jogamp_opengl_impl_x11_glx_GLX_glXChooseFBConfigCopied1__JILjava_lang_Object_2ILjava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jobject nitems, jint nitems_byte_offset) {
   int * _ptr2 = NULL;
   int * _ptr3 = NULL;
   GLXFBConfig *  _res;
@@ -131,7 +131,7 @@ Java_com_sun_opengl_impl_x11_glx_GLX_glXChooseFBConfigCopied1__JILjava_lang_Obje
  *     C function: XVisualInfo *  glXChooseVisual(Display *  dpy, int screen, int *  attribList);
  */
 JNIEXPORT jobject JNICALL 
-Java_com_sun_opengl_impl_x11_glx_GLX_glXChooseVisualCopied1__JILjava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset) {
+Java_com_jogamp_opengl_impl_x11_glx_GLX_glXChooseVisualCopied1__JILjava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset) {
   int * _ptr2 = NULL;
   XVisualInfo *  _res;
   jobject jbyteSource;
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 0c128d1f1..31339c907 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -75,6 +75,10 @@
                         </arity>
                     </context>
                 </action>
+                <action name="test">
+                    <script>${ant.script}</script>
+                    <target>junit.run</target>
+                </action>
             </ide-actions>
             <export>
                 <type>folder</type>
@@ -112,6 +116,7 @@
                     <ide-action name="build"/>
                     <ide-action name="rebuild"/>
                     <ide-action name="clean"/>
+                    <ide-action name="test"/>
                 </context-menu>
             </view>
             <subprojects/>
-- 
cgit v1.2.3


From 2dc67e8f8faeb418061e0dd450b37d4cb3ce4c2f Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 28 Mar 2010 01:44:42 +0100
Subject: Adaption for gluegen a41f4d504d2f8cf58114d570d23f757ab2659cfc

---
 make/config/jogl/egl.cfg                                             | 2 +-
 src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg
index 26979fb6d..086152b4f 100755
--- a/make/config/jogl/egl.cfg
+++ b/make/config/jogl/egl.cfg
@@ -43,7 +43,7 @@ CustomJavaCode EGL  {
 CustomJavaCode EGL    if (eglGetProcAddressHandle == 0) {
 CustomJavaCode EGL      throw new GLException("Passed null pointer for method \"eglGetProcAddress\"");
 CustomJavaCode EGL    }
-CustomJavaCode EGL    return dispatch_eglGetProcAddress0(procname, eglGetProcAddressHandle);
+CustomJavaCode EGL    return dispatch_eglGetProcAddress1(procname, eglGetProcAddressHandle);
 CustomJavaCode EGL  }
 
 
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
index 00973de89..fed07a15d 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
@@ -226,7 +226,7 @@ public abstract class EGLDynamicLookupHelper implements DynamicLookupHelper {
         // Look up this function name in all known libraries
         for (Iterator iter = glesLibraries.iterator(); iter.hasNext(); ) {
             NativeLibrary lib = (NativeLibrary) iter.next();
-            long addr = lib.lookupFunction(glFuncName);
+            long addr = lib.dynamicLookupFunction(glFuncName);
             if (addr != 0) {
                 return addr;
             }
-- 
cgit v1.2.3


From be452bbfbb101292350cc6a483471a0e98ac937b Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sun, 28 Mar 2010 20:25:31 +0200
Subject: final large refactoring to move to com.jogamp.*.

---
 doc/wiki/FAQ.xml                                   |   6 +-
 doxygen/doxygen-all-dev.cfg                        |   2 +-
 doxygen/doxygen-all-pub.cfg                        |   2 +-
 make/build-jogl.xml                                |  24 +-
 make/build-nativewindow.xml                        |  24 +-
 make/build-newt.xml                                |  40 +-
 make/build-staticglgen.xml                         |   2 +-
 make/build.xml                                     |   6 +-
 make/config/jogl/glu-common.cfg                    |   2 +-
 make/config/jogl/glx-x11.cfg                       |   2 +-
 make/config/jogl/glxext.cfg                        |   2 +-
 .../jawt-DrawingSurfaceInfo-CustomJavaCode.java    |   6 +-
 make/config/nativewindow/jawt-macosx.cfg           |   6 +-
 make/config/nativewindow/jawt-win32.cfg            |   6 +-
 make/config/nativewindow/jawt-x11.cfg              |   6 +-
 make/config/nativewindow/x11-CustomCCode.c         |  26 +-
 make/config/nativewindow/x11-lib.cfg               |   2 +-
 .../jogamp/javafx/audio/windows/waveout/Audio.java |  66 ++
 .../jogamp/javafx/audio/windows/waveout/Mixer.java | 362 ++++++++
 .../javafx/audio/windows/waveout/SoundBuffer.java  | 124 +++
 .../audio/windows/waveout/TestSpatialization.java  |  89 ++
 .../jogamp/javafx/audio/windows/waveout/Track.java | 206 +++++
 .../jogamp/javafx/audio/windows/waveout/Vec3f.java | 212 +++++
 .../com/jogamp/opengl/impl/GLContextImpl.java      |   2 +-
 .../jogamp/opengl/impl/GLDrawableFactoryImpl.java  |   2 +-
 .../com/jogamp/opengl/impl/NativeLibLoader.java    |   2 +-
 .../com/jogamp/opengl/impl/ThreadingImpl.java      |   2 +-
 .../com/jogamp/opengl/impl/awt/AWTUtil.java        |   2 +-
 .../com/jogamp/opengl/impl/egl/EGLDrawable.java    |   2 +-
 .../jogamp/opengl/impl/egl/EGLDrawableFactory.java |   2 +-
 .../opengl/impl/egl/EGLDynamicLookupHelper.java    |   2 +-
 .../opengl/impl/egl/EGLES1DynamicLookupHelper.java |   2 +-
 .../opengl/impl/egl/EGLES2DynamicLookupHelper.java |   2 +-
 .../impl/egl/EGLGraphicsConfigurationFactory.java  |   2 +-
 .../opengl/impl/egl/EGLOnscreenDrawable.java       |   2 +-
 .../impl/macosx/cgl/MacOSXCGLDrawableFactory.java  |   2 +-
 .../cgl/MacOSXCGLGraphicsConfigurationFactory.java |   2 +-
 .../impl/macosx/cgl/MacOSXExternalCGLContext.java  |   2 +-
 .../MacOSXAWTCGLGraphicsConfigurationFactory.java  |   4 +-
 .../impl/windows/wgl/WindowsDummyWGLDrawable.java  |   2 +-
 .../windows/wgl/WindowsExternalWGLContext.java     |   2 +-
 .../windows/wgl/WindowsExternalWGLDrawable.java    |   2 +-
 .../windows/wgl/WindowsOffscreenWGLDrawable.java   |   2 +-
 .../windows/wgl/WindowsWGLDrawableFactory.java     |   4 +-
 .../WindowsWGLGraphicsConfigurationFactory.java    |   2 +-
 .../WindowsAWTWGLGraphicsConfigurationFactory.java |   4 +-
 .../com/jogamp/opengl/impl/x11/glx/GLXUtil.java    |   2 +-
 .../opengl/impl/x11/glx/X11ExternalGLXContext.java |   4 +-
 .../impl/x11/glx/X11ExternalGLXDrawable.java       |   4 +-
 .../jogamp/opengl/impl/x11/glx/X11GLXContext.java  |   2 +-
 .../jogamp/opengl/impl/x11/glx/X11GLXDrawable.java |   2 +-
 .../opengl/impl/x11/glx/X11GLXDrawableFactory.java |   6 +-
 .../impl/x11/glx/X11GLXGraphicsConfiguration.java  |   2 +-
 .../glx/X11GLXGraphicsConfigurationFactory.java    |   4 +-
 .../impl/x11/glx/X11OffscreenGLXDrawable.java      |   2 +-
 .../opengl/impl/x11/glx/X11PbufferGLXDrawable.java |   2 +-
 .../awt/X11AWTGLXGraphicsConfigurationFactory.java |   6 +-
 .../com/jogamp/opengl/util/ImmModeSink.java        |   2 +-
 .../com/jogamp/openmax/OMXEventListener.java       |  14 +
 .../classes/com/jogamp/openmax/OMXInstance.java    | 509 +++++++++++
 .../sun/javafx/audio/windows/waveout/Audio.java    |  66 --
 .../sun/javafx/audio/windows/waveout/Mixer.java    | 362 --------
 .../javafx/audio/windows/waveout/SoundBuffer.java  | 124 ---
 .../audio/windows/waveout/TestSpatialization.java  |  88 --
 .../sun/javafx/audio/windows/waveout/Track.java    | 206 -----
 .../sun/javafx/audio/windows/waveout/Vec3f.java    | 212 -----
 .../classes/com/sun/openmax/OMXEventListener.java  |  14 -
 src/jogl/classes/com/sun/openmax/OMXInstance.java  | 509 -----------
 .../javax/media/opengl/GLDrawableFactory.java      |   2 +-
 src/jogl/classes/javax/media/opengl/GLProfile.java |   4 +-
 src/jogl/native/audio/Mixer.cpp                    |  26 +-
 .../native/openmax/com_sun_openmax_OMXInstance.c   |  30 +-
 .../com/jogamp/nativewindow/impl/Debug.java        | 140 ++++
 .../impl/GraphicsConfigurationFactoryImpl.java     |  43 +
 .../nativewindow/impl/InternalBufferUtil.java      | 124 +++
 .../impl/LockingNativeWindowFactory.java           |  75 ++
 .../com/jogamp/nativewindow/impl/NWReflection.java | 181 ++++
 .../nativewindow/impl/NativeLibLoaderBase.java     | 202 +++++
 .../nativewindow/impl/NativeWindowFactoryImpl.java | 114 +++
 .../com/jogamp/nativewindow/impl/NullWindow.java   | 148 ++++
 .../impl/jawt/JAWTNativeLibLoader.java             |  78 ++
 .../jogamp/nativewindow/impl/jawt/JAWTUtil.java    | 145 ++++
 .../jogamp/nativewindow/impl/jawt/JAWTWindow.java  | 186 +++++
 .../nativewindow/impl/jawt/JAWT_PlatformInfo.java  |  47 ++
 .../impl/jawt/macosx/MacOSXJAWTWindow.java         | 152 ++++
 .../impl/jawt/windows/WindowsJAWTWindow.java       | 170 ++++
 .../nativewindow/impl/jawt/x11/X11JAWTWindow.java  | 136 +++
 .../impl/jawt/x11/X11SunJDKReflection.java         | 132 +++
 .../com/jogamp/nativewindow/impl/jvm/JVMUtil.java  |  72 ++
 .../impl/x11/X11GraphicsConfigurationFactory.java  | 118 +++
 .../com/jogamp/nativewindow/impl/x11/X11Util.java  | 166 ++++
 .../impl/x11/awt/X11AWTNativeWindowFactory.java    |  87 ++
 .../classes/com/sun/nativewindow/impl/Debug.java   | 140 ----
 .../impl/GraphicsConfigurationFactoryImpl.java     |  43 -
 .../sun/nativewindow/impl/InternalBufferUtil.java  | 124 ---
 .../impl/LockingNativeWindowFactory.java           |  75 --
 .../com/sun/nativewindow/impl/NWReflection.java    | 181 ----
 .../sun/nativewindow/impl/NativeLibLoaderBase.java | 202 -----
 .../nativewindow/impl/NativeWindowFactoryImpl.java | 114 ---
 .../com/sun/nativewindow/impl/NullWindow.java      | 148 ----
 .../impl/jawt/JAWTNativeLibLoader.java             |  78 --
 .../com/sun/nativewindow/impl/jawt/JAWTUtil.java   | 145 ----
 .../com/sun/nativewindow/impl/jawt/JAWTWindow.java | 186 -----
 .../nativewindow/impl/jawt/JAWT_PlatformInfo.java  |  47 --
 .../impl/jawt/macosx/MacOSXJAWTWindow.java         | 152 ----
 .../impl/jawt/windows/WindowsJAWTWindow.java       | 170 ----
 .../nativewindow/impl/jawt/x11/X11JAWTWindow.java  | 136 ---
 .../impl/jawt/x11/X11SunJDKReflection.java         | 132 ---
 .../com/sun/nativewindow/impl/jvm/JVMUtil.java     |  72 --
 .../impl/x11/X11GraphicsConfigurationFactory.java  | 118 ---
 .../com/sun/nativewindow/impl/x11/X11Util.java     | 166 ----
 .../impl/x11/awt/X11AWTNativeWindowFactory.java    |  87 --
 .../nativewindow/GraphicsConfigurationFactory.java |   4 +-
 .../media/nativewindow/NativeWindowFactory.java    |   8 +-
 .../nativewindow/awt/AWTGraphicsConfiguration.java |   2 +-
 .../media/nativewindow/awt/AWTGraphicsDevice.java  |   2 +-
 .../media/nativewindow/awt/AWTGraphicsScreen.java  |   2 +-
 .../classes/javax/media/nativewindow/package.html  |   2 +-
 .../nativewindow/x11/X11GraphicsConfiguration.java |   2 +-
 .../media/nativewindow/x11/X11GraphicsScreen.java  |   4 +-
 src/nativewindow/native/JAWT_DrawingSurfaceInfo.c  |   2 +-
 src/nativewindow/native/JVM_Tool.c                 |   2 +-
 .../classes/com/jogamp/javafx/newt/Display.java    | 276 ++++++
 src/newt/classes/com/jogamp/javafx/newt/Event.java |  86 ++
 .../com/jogamp/javafx/newt/EventListener.java      |  44 +
 .../classes/com/jogamp/javafx/newt/InputEvent.java |  97 +++
 .../classes/com/jogamp/javafx/newt/Insets.java     | 105 +++
 .../classes/com/jogamp/javafx/newt/KeyEvent.java   | 738 ++++++++++++++++
 .../com/jogamp/javafx/newt/KeyListener.java        |  42 +
 .../classes/com/jogamp/javafx/newt/MouseEvent.java | 110 +++
 .../com/jogamp/javafx/newt/MouseListener.java      |  47 ++
 .../com/jogamp/javafx/newt/NewtFactory.java        | 181 ++++
 .../com/jogamp/javafx/newt/OffscreenWindow.java    | 108 +++
 .../classes/com/jogamp/javafx/newt/PaintEvent.java |  74 ++
 .../com/jogamp/javafx/newt/PaintListener.java      |  42 +
 .../classes/com/jogamp/javafx/newt/Screen.java     | 147 ++++
 .../classes/com/jogamp/javafx/newt/Window.java     | 929 +++++++++++++++++++++
 .../com/jogamp/javafx/newt/WindowEvent.java        |  67 ++
 .../com/jogamp/javafx/newt/WindowListener.java     |  42 +
 .../com/jogamp/javafx/newt/awt/AWTCanvas.java      | 264 ++++++
 .../com/jogamp/javafx/newt/awt/AWTDisplay.java     | 168 ++++
 .../com/jogamp/javafx/newt/awt/AWTScreen.java      |  65 ++
 .../com/jogamp/javafx/newt/awt/AWTWindow.java      | 429 ++++++++++
 .../classes/com/jogamp/javafx/newt/impl/Debug.java | 140 ++++
 .../jogamp/javafx/newt/impl/NativeLibLoader.java   |  62 ++
 .../com/jogamp/javafx/newt/intel/gdl/Display.java  | 104 +++
 .../com/jogamp/javafx/newt/intel/gdl/Screen.java   |  68 ++
 .../com/jogamp/javafx/newt/intel/gdl/Window.java   | 179 ++++
 .../com/jogamp/javafx/newt/macosx/MacDisplay.java  |  82 ++
 .../com/jogamp/javafx/newt/macosx/MacScreen.java   |  56 ++
 .../com/jogamp/javafx/newt/macosx/MacWindow.java   | 600 +++++++++++++
 .../com/jogamp/javafx/newt/opengl/GLWindow.java    | 628 ++++++++++++++
 .../javafx/newt/opengl/broadcom/egl/Display.java   |  81 ++
 .../javafx/newt/opengl/broadcom/egl/Screen.java    |  63 ++
 .../javafx/newt/opengl/broadcom/egl/Window.java    | 156 ++++
 .../jogamp/javafx/newt/opengl/kd/KDDisplay.java    |  84 ++
 .../com/jogamp/javafx/newt/opengl/kd/KDScreen.java |  57 ++
 .../com/jogamp/javafx/newt/opengl/kd/KDWindow.java | 153 ++++
 .../javafx/newt/util/EventDispatchThread.java      | 240 ++++++
 .../com/jogamp/javafx/newt/util/MainThread.java    | 307 +++++++
 .../jogamp/javafx/newt/windows/WindowsDisplay.java | 105 +++
 .../jogamp/javafx/newt/windows/WindowsScreen.java  |  58 ++
 .../jogamp/javafx/newt/windows/WindowsWindow.java  | 289 +++++++
 .../com/jogamp/javafx/newt/x11/X11Display.java     | 120 +++
 .../com/jogamp/javafx/newt/x11/X11Screen.java      |  71 ++
 .../com/jogamp/javafx/newt/x11/X11Window.java      | 203 +++++
 src/newt/classes/com/sun/javafx/newt/Display.java  | 276 ------
 src/newt/classes/com/sun/javafx/newt/Event.java    |  86 --
 .../classes/com/sun/javafx/newt/EventListener.java |  44 -
 .../classes/com/sun/javafx/newt/InputEvent.java    |  97 ---
 src/newt/classes/com/sun/javafx/newt/Insets.java   | 105 ---
 src/newt/classes/com/sun/javafx/newt/KeyEvent.java | 738 ----------------
 .../classes/com/sun/javafx/newt/KeyListener.java   |  42 -
 .../classes/com/sun/javafx/newt/MouseEvent.java    | 110 ---
 .../classes/com/sun/javafx/newt/MouseListener.java |  47 --
 .../classes/com/sun/javafx/newt/NewtFactory.java   | 181 ----
 .../com/sun/javafx/newt/OffscreenWindow.java       | 108 ---
 .../classes/com/sun/javafx/newt/PaintEvent.java    |  74 --
 .../classes/com/sun/javafx/newt/PaintListener.java |  42 -
 src/newt/classes/com/sun/javafx/newt/Screen.java   | 147 ----
 src/newt/classes/com/sun/javafx/newt/Window.java   | 929 ---------------------
 .../classes/com/sun/javafx/newt/WindowEvent.java   |  67 --
 .../com/sun/javafx/newt/WindowListener.java        |  42 -
 .../classes/com/sun/javafx/newt/awt/AWTCanvas.java | 264 ------
 .../com/sun/javafx/newt/awt/AWTDisplay.java        | 168 ----
 .../classes/com/sun/javafx/newt/awt/AWTScreen.java |  65 --
 .../classes/com/sun/javafx/newt/awt/AWTWindow.java | 429 ----------
 .../classes/com/sun/javafx/newt/impl/Debug.java    | 140 ----
 .../com/sun/javafx/newt/impl/NativeLibLoader.java  |  62 --
 .../com/sun/javafx/newt/intel/gdl/Display.java     | 104 ---
 .../com/sun/javafx/newt/intel/gdl/Screen.java      |  68 --
 .../com/sun/javafx/newt/intel/gdl/Window.java      | 179 ----
 .../com/sun/javafx/newt/macosx/MacDisplay.java     |  82 --
 .../com/sun/javafx/newt/macosx/MacScreen.java      |  56 --
 .../com/sun/javafx/newt/macosx/MacWindow.java      | 600 -------------
 .../com/sun/javafx/newt/opengl/GLWindow.java       | 628 --------------
 .../javafx/newt/opengl/broadcom/egl/Display.java   |  81 --
 .../javafx/newt/opengl/broadcom/egl/Screen.java    |  63 --
 .../javafx/newt/opengl/broadcom/egl/Window.java    | 156 ----
 .../com/sun/javafx/newt/opengl/kd/KDDisplay.java   |  84 --
 .../com/sun/javafx/newt/opengl/kd/KDScreen.java    |  57 --
 .../com/sun/javafx/newt/opengl/kd/KDWindow.java    | 153 ----
 .../sun/javafx/newt/util/EventDispatchThread.java  | 240 ------
 .../com/sun/javafx/newt/util/MainThread.java       | 307 -------
 .../sun/javafx/newt/windows/WindowsDisplay.java    | 105 ---
 .../com/sun/javafx/newt/windows/WindowsScreen.java |  58 --
 .../com/sun/javafx/newt/windows/WindowsWindow.java | 289 -------
 .../com/sun/javafx/newt/x11/X11Display.java        | 120 ---
 .../classes/com/sun/javafx/newt/x11/X11Screen.java |  71 --
 .../classes/com/sun/javafx/newt/x11/X11Window.java | 203 -----
 src/newt/native/BroadcomEGL.c                      |  16 +-
 src/newt/native/IntelGDL.c                         |  24 +-
 src/newt/native/KDWindow.c                         |  20 +-
 src/newt/native/WindowsWindow.c                    |  74 +-
 src/newt/native/X11Window.c                        |  56 +-
 215 files changed, 12333 insertions(+), 12332 deletions(-)
 create mode 100755 src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Audio.java
 create mode 100755 src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Mixer.java
 create mode 100755 src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/SoundBuffer.java
 create mode 100755 src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java
 create mode 100755 src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Track.java
 create mode 100755 src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Vec3f.java
 create mode 100644 src/jogl/classes/com/jogamp/openmax/OMXEventListener.java
 create mode 100644 src/jogl/classes/com/jogamp/openmax/OMXInstance.java
 delete mode 100755 src/jogl/classes/com/sun/javafx/audio/windows/waveout/Audio.java
 delete mode 100755 src/jogl/classes/com/sun/javafx/audio/windows/waveout/Mixer.java
 delete mode 100755 src/jogl/classes/com/sun/javafx/audio/windows/waveout/SoundBuffer.java
 delete mode 100755 src/jogl/classes/com/sun/javafx/audio/windows/waveout/TestSpatialization.java
 delete mode 100755 src/jogl/classes/com/sun/javafx/audio/windows/waveout/Track.java
 delete mode 100755 src/jogl/classes/com/sun/javafx/audio/windows/waveout/Vec3f.java
 delete mode 100644 src/jogl/classes/com/sun/openmax/OMXEventListener.java
 delete mode 100644 src/jogl/classes/com/sun/openmax/OMXInstance.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/Debug.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/GraphicsConfigurationFactoryImpl.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/InternalBufferUtil.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/LockingNativeWindowFactory.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/NWReflection.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeLibLoaderBase.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeWindowFactoryImpl.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/NullWindow.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTNativeLibLoader.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTUtil.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTWindow.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWT_PlatformInfo.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/x11/X11JAWTWindow.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/x11/X11SunJDKReflection.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/jvm/JVMUtil.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/awt/X11AWTNativeWindowFactory.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/Debug.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/GraphicsConfigurationFactoryImpl.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/LockingNativeWindowFactory.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/NWReflection.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/NativeLibLoaderBase.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/NativeWindowFactoryImpl.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTWindow.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWT_PlatformInfo.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11SunJDKReflection.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/jvm/JVMUtil.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11Util.java
 delete mode 100644 src/nativewindow/classes/com/sun/nativewindow/impl/x11/awt/X11AWTNativeWindowFactory.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/Display.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/Event.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/EventListener.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/InputEvent.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/Insets.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/KeyEvent.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/KeyListener.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/MouseEvent.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/MouseListener.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/NewtFactory.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/OffscreenWindow.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/PaintEvent.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/PaintListener.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/Screen.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/Window.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/WindowEvent.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/WindowListener.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/awt/AWTCanvas.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/awt/AWTDisplay.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/awt/AWTScreen.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/awt/AWTWindow.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/impl/Debug.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/impl/NativeLibLoader.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Display.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Screen.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Window.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/macosx/MacDisplay.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/macosx/MacScreen.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/macosx/MacWindow.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/opengl/GLWindow.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Display.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Screen.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Window.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDDisplay.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDScreen.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDWindow.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/util/EventDispatchThread.java
 create mode 100644 src/newt/classes/com/jogamp/javafx/newt/util/MainThread.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/windows/WindowsDisplay.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/windows/WindowsScreen.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/windows/WindowsWindow.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/x11/X11Display.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/x11/X11Screen.java
 create mode 100755 src/newt/classes/com/jogamp/javafx/newt/x11/X11Window.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/Display.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/Event.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/EventListener.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/InputEvent.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/Insets.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/KeyEvent.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/KeyListener.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/MouseEvent.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/MouseListener.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/NewtFactory.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/OffscreenWindow.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/PaintEvent.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/PaintListener.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/Screen.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/Window.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/WindowEvent.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/WindowListener.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/awt/AWTCanvas.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/awt/AWTDisplay.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/awt/AWTScreen.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/awt/AWTWindow.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/impl/Debug.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/intel/gdl/Display.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/intel/gdl/Screen.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/intel/gdl/Window.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/macosx/MacDisplay.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/macosx/MacScreen.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/macosx/MacWindow.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Screen.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/opengl/kd/KDScreen.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/util/EventDispatchThread.java
 delete mode 100644 src/newt/classes/com/sun/javafx/newt/util/MainThread.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/windows/WindowsDisplay.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/windows/WindowsScreen.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/windows/WindowsWindow.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/x11/X11Display.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/x11/X11Screen.java
 delete mode 100755 src/newt/classes/com/sun/javafx/newt/x11/X11Window.java

diff --git a/doc/wiki/FAQ.xml b/doc/wiki/FAQ.xml
index 7ee1f639b..9c14bc7ce 100644
--- a/doc/wiki/FAQ.xml
+++ b/doc/wiki/FAQ.xml
@@ -289,13 +289,13 @@ Below you see the invocation of the ES2 RedSquare jogl-demos utilizing multiple
 * Single thread (Unix, Win32) <pre>java -Djava.awt.headless=true demos.es2.RedSquare -GL2</pre>
 * Single thread (MacOSX) <pre>java -XstartOnFirstThread -Djava.awt.headless=true demos.es2.RedSquare -GL2</pre>
 * Multiple threads & windows (Unix, Win32) <pre>java -Djava.awt.headless=true demos.es2.RedSquare -GL2 -GL2 -GL2 -GL2</pre>
-* Multiple threads & windows (MacOSX) <pre>java -XstartOnFirstThread -Djava.awt.headless=true com.sun.javafx.newt.util.MainThread demos.es2.RedSquare -GL2 -GL2 -GL2 -GL2</pre>
+* Multiple threads & windows (MacOSX) <pre>java -XstartOnFirstThread -Djava.awt.headless=true com.jogamp.javafx.newt.util.MainThread demos.es2.RedSquare -GL2 -GL2 -GL2 -GL2</pre>
 
-The serialization of the main Java class through ''com.sun.javafx.newt.util.MainThread''
+The serialization of the main Java class through ''com.jogamp.javafx.newt.util.MainThread''
 may be used for all platforms, since it only takes effect on ''MacOSX''.
 This allows you an almost platform independent invocation of your multithreaded Java applications.
 
-On ''MacOSX'', ''com.sun.javafx.newt.util.MainThread'' will occupy the main thread and
+On ''MacOSX'', ''com.jogamp.javafx.newt.util.MainThread'' will occupy the main thread and
 serializes all native window related tasks through it.
 This mechanism is thread safe utilizes reentrant locking.
 
diff --git a/doxygen/doxygen-all-dev.cfg b/doxygen/doxygen-all-dev.cfg
index 2425ff403..d047e7182 100644
--- a/doxygen/doxygen-all-dev.cfg
+++ b/doxygen/doxygen-all-dev.cfg
@@ -465,7 +465,7 @@ INPUT                 = ../src/newt/classes
 INPUT                += ../build/jogl/gensrc/classes
 INPUT                += ../build/nativewindow/gensrc/classes
 INPUT                += ../build/newt/gensrc/classes
-INPUT                += ../../gluegen/src/java/com/sun/gluegen/runtime
+INPUT                += ../../gluegen/src/java/com/jogamp/gluegen/runtime
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
diff --git a/doxygen/doxygen-all-pub.cfg b/doxygen/doxygen-all-pub.cfg
index 3cac3e651..a7f4711df 100644
--- a/doxygen/doxygen-all-pub.cfg
+++ b/doxygen/doxygen-all-pub.cfg
@@ -462,7 +462,7 @@ WARN_LOGFILE           =
 INPUT                 = ../src/jogl/classes/javax
 INPUT                += ../build-x86_64/jogl/gensrc/classes/javax
 INPUT                += ../src/jogl/classes/com/jogamp/opengl/util
-INPUT                += ../src/newt/classes/com/sun/javafx/newt
+INPUT                += ../src/newt/classes/com/jogamp/javafx/newt
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 80b106467..c3bc96bd8 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -114,7 +114,7 @@
                   value="com/jogamp/opengl/impl/glu/gl2/** com/jogamp/opengl/impl/glu/nurbs/** com/jogamp/opengl/impl/glu/registry/** javax/media/opengl/glu/gl2/**"/>
 
         <property name="java.part.openmax"
-                  value="com/sun/openmax/**"/>
+                  value="com/jogamp/openmax/**"/>
 
         <property name="java.part.sdk"
                   value="com/jogamp/opengl/util/glsl/sdk/**"/>
@@ -191,10 +191,10 @@
         </condition>
 
         <property name="java.excludes.javadoc.packagenames"
-                  value="com.jogamp.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
+                  value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.javafx.audio.windows.waveout.TestSpatialization"/>
 
         <property name="java.excludes.fixme" 
-                  value="com/jogamp/opengl/impl/gl2/fixme/** com/sun/javafx/audio/windows/waveout/TestSpatialization.java" />
+                  value="com/jogamp/opengl/impl/gl2/fixme/** com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java" />
 
         <property name="java.excludes.cdcfp"
                   value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gl2} ${java.part.gl2.dbg} ${java.part.gl3} ${java.part.gl3.dbg} ${java.part.awt} ${java.part.glugl2} ${java.part.util.awt} ${java.part.util.gl2} com/jogamp/opengl/util/TGAWriter.java"/>
@@ -1465,7 +1465,7 @@
           <!-- FIXME: the Mixer should be moved to another library -->
           <!--include name="${rootrel.src.c}/Mixer.cpp" if="isWindows"/-->
           <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="useOpenMAX"/>
-          <include name="${rootrel.src.c.openmax}/com_sun_openmax_OMXInstance.c"  if="useOpenMAX"/>
+          <include name="${rootrel.src.c.openmax}/com_jogamp_openmax_OMXInstance.c"  if="useOpenMAX"/>
 
           <include name="${rootrel.generated.c.jogl}/gl2/GL2Impl_JNI.c"/>
           <include name="${rootrel.generated.c.jogl}/gl3/GL3Impl_JNI.c"/>
@@ -1484,7 +1484,7 @@
           <!-- FIXME: the Mixer should be moved to another library -->
           <!--include name="${rootrel.src.c}/Mixer.cpp" if="isWindows"/-->
           <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="useOpenMAX"/>
-          <include name="${rootrel.src.c.openmax}/com_sun_openmax_OMXInstance.c"  if="useOpenMAX"/>
+          <include name="${rootrel.src.c.openmax}/com_jogamp_openmax_OMXInstance.c"  if="useOpenMAX"/>
 
           <include name="${rootrel.generated.c.jogl}/gl2es12/GL2ES12Impl_JNI.c"/>
           <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY -->
@@ -1497,7 +1497,7 @@
         <patternset id="c.src.files.jogl.es2">
           <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/>
           <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="useOpenMAX"/>
-          <include name="${rootrel.src.c.openmax}/com_sun_openmax_OMXInstance.c"  if="useOpenMAX"/>
+          <include name="${rootrel.src.c.openmax}/com_jogamp_openmax_OMXInstance.c"  if="useOpenMAX"/>
 
           <include name="${rootrel.generated.c.jogl}/egl/EGL_JNI.c"/>
           <include name="${rootrel.generated.c.jogl}/egl/EGLExtImpl_JNI.c"/>
@@ -1507,7 +1507,7 @@
         <patternset id="c.src.files.jogl.es1">
           <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/>
           <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="useOpenMAX"/>
-          <include name="${rootrel.src.c.openmax}/com_sun_openmax_OMXInstance.c"  if="useOpenMAX"/>
+          <include name="${rootrel.src.c.openmax}/com_jogamp_openmax_OMXInstance.c"  if="useOpenMAX"/>
 
           <include name="${rootrel.generated.c.jogl}/egl/EGL_JNI.c"/>
           <include name="${rootrel.generated.c.jogl}/egl/EGLExtImpl_JNI.c"/>
@@ -1584,13 +1584,13 @@
     </macrodef>  
 
     <target name="c.build.jogl.prepare.openMAX" if="useOpenMAX">
-      <javah destdir="${src.generated.c.openmax}" classpath="${classes-cdc}" class="com.sun.openmax.OMXInstance" />
+      <javah destdir="${src.generated.c.openmax}" classpath="${classes-cdc}" class="com.jogamp.openmax.OMXInstance" />
     </target>
 
     <target name="c.build.jogl.prepare" depends="c.build.jogl.prepare.openMAX">
       <!-- Generate the waveout Mixer header -->
       <!-- FIXME: this is temporary until we move this to another workspace -->
-      <!--javah destdir="${build}/gensrc/native/jogl" classpath="${classes}" class="com.sun.javafx.audio.windows.waveout.Mixer" /-->
+      <!--javah destdir="${build}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.javafx.audio.windows.waveout.Mixer" /-->
     </target>
 
     <target name="c.build.jogl.gl2" unless="setup.nodesktop">
@@ -1822,11 +1822,11 @@
         <jar manifest="${build}/tempversion" destfile="${jogl.all.jar}" filesonly="true">
             <fileset dir="${classes}">
                 <include name="javax/media/opengl/**" />
-                <include name="com/sun/gluegen/runtime/**" />
+                <include name="com/jogamp/gluegen/runtime/**" />
                 <include name="com/jogamp/opengl/**" />
                 <include name="${java.part.openmax}" />
                 <!-- FIXME: this is temporary until we move these classes to another workspace -->
-                <include name="com/sun/javafx/**" />
+                <include name="com/jogamp/javafx/**" />
             </fileset>
             <fileset dir="${src.java}"
                      includes="${java.part.util.fixedfuncemu.shadercode}"/>
@@ -1835,7 +1835,7 @@
     <target name="build-jars-all-noawt" depends="setup-manifestfile">
         <jar manifest="${build}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true">
             <fileset dir="${classes}"
-                includes="javax/media/opengl/** com/sun/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/sun/javafx/**"
+                includes="javax/media/opengl/** com/jogamp/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/jogamp/javafx/**"
                 excludes="${java.part.awt} ${java.part.util.awt}">
             </fileset>
             <fileset dir="${src.java}"
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 776341981..e76c37a84 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -95,13 +95,13 @@
         <!-- partitioning -->
 
         <property name="java.part.core"
-                  value="javax/media/nativewindow/*, javax/media/nativewindow/egl/*, javax/media/nativewindow/macosx/*, javax/media/nativewindow/windows/*, com/sun/nativewindow/impl/*, com/sun/nativewindow/impl/jvm/*"/>
+                  value="javax/media/nativewindow/*, javax/media/nativewindow/egl/*, javax/media/nativewindow/macosx/*, javax/media/nativewindow/windows/*, com/jogamp/nativewindow/impl/*, com/jogamp/nativewindow/impl/jvm/*"/>
 
         <property name="java.part.awt"
-                  value="javax/media/nativewindow/awt/*, com/sun/nativewindow/impl/jawt/**, com/sun/nativewindow/impl/**/awt/**"/>
+                  value="javax/media/nativewindow/awt/*, com/jogamp/nativewindow/impl/jawt/**, com/jogamp/nativewindow/impl/**/awt/**"/>
 
         <property name="java.part.x11"
-                  value="com/sun/nativewindow/impl/x11/** javax/media/nativewindow/x11/*" />
+                  value="com/jogamp/nativewindow/impl/x11/** javax/media/nativewindow/x11/*" />
 
         <!-- condition excludes -->
 
@@ -257,7 +257,7 @@
 
         <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
 
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.nativewindow.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.nativewindow.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
     <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
     </target>
     
@@ -320,13 +320,13 @@
 
         <!-- Now check for the presence of one well-known file -->
         <uptodate property="java.generate.skip.x11windowlib"
-                  targetfile="${src.generated.java}/com/sun/nativewindow/impl/x11/X11Lib.java">
+                  targetfile="${src.generated.java}/com/jogamp/nativewindow/impl/x11/X11Lib.java">
             <srcfiles refid="stub.includes.dependencies.fileset.1" />
             <srcfiles refid="stub.includes.dependencies.fileset.2" />
             <srcfiles refid="stub.includes.dependencies.fileset.3" />
         </uptodate>
         <uptodate property="java.generate.skip.jawt"
-                  targetfile="${src.generated.java}/com/sun/nativewindow/impl/jawt/JAWT.java">
+                  targetfile="${src.generated.java}/com/jogamp/nativewindow/impl/jawt/JAWT.java">
             <srcfiles refid="stub.includes.dependencies.fileset.1" />
             <srcfiles refid="stub.includes.dependencies.fileset.2" />
             <srcfiles refid="stub.includes.dependencies.fileset.3" />
@@ -353,7 +353,7 @@
         </gluegen>
         <copy todir="${src.generated.java-cdc}">
             <fileset dir="${src.generated.java}"
-                     includes="com/sun/nativewindow/impl/x11/**" />
+                     includes="com/jogamp/nativewindow/impl/x11/**" />
         </copy>
     </target>
 
@@ -373,7 +373,7 @@
         </gluegen>
         <copy todir="${src.generated.java-cdc}">
             <fileset dir="${src.generated.java}"
-                     includes="com/sun/nativewindow/impl/jawt/**" />
+                     includes="com/jogamp/nativewindow/impl/jawt/**" />
         </copy>
     </target>
 
@@ -851,8 +851,8 @@
         <jar manifest="tempversion" destfile="${nativewindow.all.jar}" filesonly="true">
             <fileset dir="${classes}">
                 <include name="javax/media/nativewindow/**" />
-                <include name="com/sun/nativewindow/**" />
-                <include name="com/sun/gluegen/runtime/**" />
+                <include name="com/jogamp/nativewindow/**" />
+                <include name="com/jogamp/gluegen/runtime/**" />
                 <exclude name="${java.part.x11}" />
             </fileset>
         </jar>
@@ -861,8 +861,8 @@
         <jar manifest="tempversion-cdc" destfile="${nativewindow.all.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}">
                 <include name="javax/media/nativewindow/**" />
-                <include name="com/sun/nativewindow/**" />
-                <include name="com/sun/gluegen/runtime/**" />
+                <include name="com/jogamp/nativewindow/**" />
+                <include name="com/jogamp/gluegen/runtime/**" />
             </fileset>
         </jar>
     </target>
diff --git a/make/build-newt.xml b/make/build-newt.xml
index df5783319..0bbcf2ccd 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -108,25 +108,25 @@
         <!-- partitioning -->
 
         <property name="java.part.core"
-                  value="com/sun/javafx/newt/*, com/sun/javafx/newt/util/*, com/sun/javafx/newt/impl/*, com/sun/javafx/newt/intel/gdl/*"/>
+                  value="com/jogamp/javafx/newt/*, com/jogamp/javafx/newt/util/*, com/jogamp/javafx/newt/impl/*, com/jogamp/javafx/newt/intel/gdl/*"/>
 
         <property name="java.part.x11"
-                  value="com/sun/javafx/newt/x11/*"/>
+                  value="com/jogamp/javafx/newt/x11/*"/>
 
         <property name="java.part.windows"
-                  value="com/sun/javafx/newt/windows/*"/>
+                  value="com/jogamp/javafx/newt/windows/*"/>
 
         <property name="java.part.macosx"
-                  value="com/sun/javafx/newt/macosx/*"/>
+                  value="com/jogamp/javafx/newt/macosx/*"/>
 
         <property name="java.part.opengl"
-                  value="com/sun/javafx/newt/opengl/*, com/sun/javafx/newt/opengl/kd/*"/>
+                  value="com/jogamp/javafx/newt/opengl/*, com/jogamp/javafx/newt/opengl/kd/*"/>
 
         <property name="java.part.broadcomegl"
-                  value="com/sun/javafx/newt/opengl/broadcom/egl/*"/>
+                  value="com/jogamp/javafx/newt/opengl/broadcom/egl/*"/>
 
         <property name="java.part.awt"
-                  value="com/sun/javafx/newt/awt/*"/>
+                  value="com/jogamp/javafx/newt/awt/*"/>
 
         <!-- condition excludes -->
 
@@ -279,11 +279,11 @@
         <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
         <property name="javadoc.windowtitle" value="NEWT API -- ${newt_base_version} Specification" />
         <property name="javadoc.overview" value="spec-overview.html" />
-        <property name="javadoc.spec.packagenames" value="com.sun.javafx.newt, com.sun.javafx.newt.opengl" />
+        <property name="javadoc.spec.packagenames" value="com.jogamp.javafx.newt, com.jogamp.javafx.newt.opengl" />
 
         <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
 
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.javafx.newt.*" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.javafx.newt.*" />
     <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
     </target>
 
@@ -596,23 +596,23 @@
     </macrodef>
 
     <target name="c.build.newt.prepare.KD" if="useKD">
-      <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="com.sun.javafx.newt.opengl.kd.KDWindow" />
+      <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="com.jogamp.javafx.newt.opengl.kd.KDWindow" />
     </target>
 
     <target name="c.build.newt.prepare.IntelGDL" if="useIntelGDL">
-      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.sun.javafx.newt.intel.gdl.Display" />
-      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.sun.javafx.newt.intel.gdl.Screen" />
-      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.sun.javafx.newt.intel.gdl.Window" />
+      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.javafx.newt.intel.gdl.Display" />
+      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.javafx.newt.intel.gdl.Screen" />
+      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.javafx.newt.intel.gdl.Window" />
     </target>
 
     <target name="c.build.newt.prepare.BroadcomEGL" if="useBroadcomEGL">
-      <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="com.sun.javafx.newt.opengl.broadcom.egl.Window" />
+      <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="com.jogamp.javafx.newt.opengl.broadcom.egl.Window" />
     </target>
 
     <target name="c.build.newt.prepare.desktop" unless="setup.nodesktop">
-      <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="com.sun.javafx.newt.windows.WindowsWindow" />
-      <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="com.sun.javafx.newt.macosx.MacWindow" />
-      <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.sun.javafx.newt.x11.X11Window" />
+      <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="com.jogamp.javafx.newt.windows.WindowsWindow" />
+      <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="com.jogamp.javafx.newt.macosx.MacWindow" />
+      <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.jogamp.javafx.newt.x11.X11Window" />
     </target>
 
     <target name="c.build.newt.prepare" depends="c.build.newt.prepare.KD,c.build.newt.prepare.IntelGDL,c.build.newt.prepare.BroadcomEGL,c.build.newt.prepare.desktop" />
@@ -759,14 +759,14 @@
     <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noall">
         <jar manifest="tempversion" destfile="${newt.all.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="com/sun/javafx/newt/**" />
+                     includes="com/jogamp/javafx/newt/**" />
         </jar>
     </target>
 
     <target name="build-jars-all-noawt" depends="setup-manifestfile">
         <jar manifest="tempversion" destfile="${newt.all-noawt.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="com/sun/javafx/newt/**"
+                     includes="com/jogamp/javafx/newt/**"
                      excludes="${java.part.awt}" />
         </jar>
     </target>
@@ -774,7 +774,7 @@
     <target name="build-jars-all-cdc" depends="setup-manifestfile-cdc">
         <jar manifest="tempversion-cdc" destfile="${newt.all.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
-                     includes="com/sun/javafx/newt/**"
+                     includes="com/jogamp/javafx/newt/**"
                      excludes="${java.excludes.cdcfp}" />
         </jar>
     </target>
diff --git a/make/build-staticglgen.xml b/make/build-staticglgen.xml
index 9ef1147a3..2683b305a 100644
--- a/make/build-staticglgen.xml
+++ b/make/build-staticglgen.xml
@@ -17,7 +17,7 @@
       -->
     <target name="declare" description="Declare properties">
         <!-- The location of the BuildStaticGLInfo source. -->
-        <property name="static.gl.src" value="${src.java}/com/sun/gluegen/opengl" />
+        <property name="static.gl.src" value="${src.java}/com/jogamp/gluegen/opengl" />
     </target>
 
     <!-- ================================================================== -->
diff --git a/make/build.xml b/make/build.xml
index cd3ee2ab9..e73235cac 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -43,12 +43,12 @@
         <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" />
 
         <property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" />
-        <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames},${javadoc.spec.packagenames},com.jogamp.opengl.util.*,com.sun.javafx.newt, com.sun.javafx.newt.opengl" />
+        <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames},${javadoc.spec.packagenames},com.jogamp.opengl.util.*,com.jogamp.javafx.newt, com.jogamp.javafx.newt.opengl" />
 
         <property name="javadoc.dev" value="${project.root}/javadoc_dev" />
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.sun.nativewindow.impl.*,com.sun.javafx.newt.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.jogamp.nativewindow.impl.*,com.jogamp.javafx.newt.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
 
-        <property name="java.excludes.javadoc.packagenames" value="com.jogamp.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
+        <property name="java.excludes.javadoc.packagenames" value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.javafx.audio.windows.waveout.TestSpatialization"/>
         <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
 
         <property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" />
diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg
index 28a075954..8fd053da1 100644
--- a/make/config/jogl/glu-common.cfg
+++ b/make/config/jogl/glu-common.cfg
@@ -15,7 +15,7 @@ Import javax.media.opengl.glu.*
 Import com.jogamp.opengl.impl.*
 Import com.jogamp.opengl.impl.glu.*
 Import com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl
-Import com.sun.nativewindow.impl.NWReflection
+Import com.jogamp.nativewindow.impl.NWReflection
 
 # Raise GLException instead of RuntimeException in glue code
 RuntimeExceptionType GLException
diff --git a/make/config/jogl/glx-x11.cfg b/make/config/jogl/glx-x11.cfg
index 8814f5e2f..bbe805a04 100644
--- a/make/config/jogl/glx-x11.cfg
+++ b/make/config/jogl/glx-x11.cfg
@@ -19,7 +19,7 @@ GetProcAddressTableExpr glxProcAddressTable
 # This must be present for bootstrapping
 SkipProcAddressGen glXGetProcAddressARB
 
-Import com.sun.nativewindow.impl.x11.*
+Import com.jogamp.nativewindow.impl.x11.*
 
 
 CustomJavaCode GLX private static GLXProcAddressTable glxProcAddressTable = new GLXProcAddressTable();
diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg
index f07d5cc1b..1dfc8fccd 100755
--- a/make/config/jogl/glxext.cfg
+++ b/make/config/jogl/glxext.cfg
@@ -20,7 +20,7 @@ EmitProcAddressTable true
 ProcAddressTableClassName GLXExtProcAddressTable
 GetProcAddressTableExpr _context.getGLXExtProcAddressTable()
 
-Import com.sun.nativewindow.impl.x11.*
+Import com.jogamp.nativewindow.impl.x11.*
 
 # Ignore everything that doesn't start with glX or GLX
 IgnoreNot ^(glX|GLX).+
diff --git a/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java b/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java
index dab377ad4..aad0ab261 100755
--- a/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java
+++ b/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java
@@ -16,12 +16,12 @@ private static JAWT_PlatformInfo newPlatformInfo(ByteBuffer buf) {
     try {
       Class factoryClass;
       if (osName.startsWith("wind")) {
-        factoryClass = Class.forName("com.sun.nativewindow.impl.jawt.windows.JAWT_Win32DrawingSurfaceInfo");
+        factoryClass = Class.forName("com.jogamp.nativewindow.impl.jawt.windows.JAWT_Win32DrawingSurfaceInfo");
       } else if (osName.startsWith("mac os x")) {
-        factoryClass = Class.forName("com.sun.nativewindow.impl.jawt.macosx.JAWT_MacOSXDrawingSurfaceInfo");
+        factoryClass = Class.forName("com.jogamp.nativewindow.impl.jawt.macosx.JAWT_MacOSXDrawingSurfaceInfo");
       } else {
         // Assume Linux, Solaris, etc. Should probably test for these explicitly.
-        factoryClass = Class.forName("com.sun.nativewindow.impl.jawt.x11.JAWT_X11DrawingSurfaceInfo");
+        factoryClass = Class.forName("com.jogamp.nativewindow.impl.jawt.x11.JAWT_X11DrawingSurfaceInfo");
       }
       platformInfoFactoryMethod = factoryClass.getMethod("create",
                                                          new Class[] { ByteBuffer.class });
diff --git a/make/config/nativewindow/jawt-macosx.cfg b/make/config/nativewindow/jawt-macosx.cfg
index b047ecdff..dea1a27b7 100644
--- a/make/config/nativewindow/jawt-macosx.cfg
+++ b/make/config/nativewindow/jawt-macosx.cfg
@@ -1,7 +1,7 @@
 # This .cfg file is used to generate the interface to the JAWT, which
 # is used by the MacOSXOnscreenGLContext.
 Style AllStatic
-Package com.sun.nativewindow.impl.jawt
+Package com.jogamp.nativewindow.impl.jawt
 JavaClass JAWTFactory
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/MacOSX
@@ -22,8 +22,8 @@ CustomCCode #include <jawt.h>
 CustomCCode #include </usr/include/machine/types.h>
 
 import java.security.*
-import com.sun.nativewindow.impl.jawt.*
-StructPackage JAWT_MacOSXDrawingSurfaceInfo com.sun.nativewindow.impl.jawt.macosx
+import com.jogamp.nativewindow.impl.jawt.*
+StructPackage JAWT_MacOSXDrawingSurfaceInfo com.jogamp.nativewindow.impl.jawt.macosx
 EmitStruct JAWT_MacOSXDrawingSurfaceInfo
 Implements JAWT_MacOSXDrawingSurfaceInfo JAWT_PlatformInfo
 
diff --git a/make/config/nativewindow/jawt-win32.cfg b/make/config/nativewindow/jawt-win32.cfg
index e7754843e..af0c7ce29 100644
--- a/make/config/nativewindow/jawt-win32.cfg
+++ b/make/config/nativewindow/jawt-win32.cfg
@@ -1,7 +1,7 @@
 # This .cfg file is used to generate the interface to the JAWT, which
 # is used by the WindowsOnscreenGLContext.
 Style AllStatic
-Package com.sun.nativewindow.impl.jawt
+Package com.jogamp.nativewindow.impl.jawt
 JavaClass JAWTFactory
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/Windows
@@ -22,8 +22,8 @@ CustomCCode #include <jawt.h>
 Include ../intptr.cfg
 
 import java.security.*
-import com.sun.nativewindow.impl.jawt.*
-StructPackage JAWT_Win32DrawingSurfaceInfo com.sun.nativewindow.impl.jawt.windows
+import com.jogamp.nativewindow.impl.jawt.*
+StructPackage JAWT_Win32DrawingSurfaceInfo com.jogamp.nativewindow.impl.jawt.windows
 EmitStruct JAWT_Win32DrawingSurfaceInfo
 Implements JAWT_Win32DrawingSurfaceInfo JAWT_PlatformInfo
 
diff --git a/make/config/nativewindow/jawt-x11.cfg b/make/config/nativewindow/jawt-x11.cfg
index 25df57a1f..ccfe009dd 100644
--- a/make/config/nativewindow/jawt-x11.cfg
+++ b/make/config/nativewindow/jawt-x11.cfg
@@ -1,7 +1,7 @@
 # This .cfg file is used to generate the interface to the JAWT, which
 # is used by the X11OnscreenGLContext.
 Style AllStatic
-Package com.sun.nativewindow.impl.jawt
+Package com.jogamp.nativewindow.impl.jawt
 JavaClass JAWTFactory
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/X11
@@ -22,8 +22,8 @@ CustomCCode #include <inttypes.h>
 CustomCCode #include <jawt.h>
 
 import java.security.*
-import com.sun.nativewindow.impl.jawt.*
-StructPackage JAWT_X11DrawingSurfaceInfo com.sun.nativewindow.impl.jawt.x11
+import com.jogamp.nativewindow.impl.jawt.*
+StructPackage JAWT_X11DrawingSurfaceInfo com.jogamp.nativewindow.impl.jawt.x11
 EmitStruct JAWT_X11DrawingSurfaceInfo
 Implements JAWT_X11DrawingSurfaceInfo JAWT_PlatformInfo
 
diff --git a/make/config/nativewindow/x11-CustomCCode.c b/make/config/nativewindow/x11-CustomCCode.c
index c1f66fee1..8eded9aa2 100755
--- a/make/config/nativewindow/x11-CustomCCode.c
+++ b/make/config/nativewindow/x11-CustomCCode.c
@@ -48,22 +48,22 @@ Bool XF86VidModeSetGammaRamp(
 
 /* Need to expose DefaultScreen and RootWindow macros to Java */
 JNIEXPORT jlong JNICALL 
-Java_com_sun_nativewindow_impl_x11_X11Lib_DefaultScreen(JNIEnv *env, jclass _unused, jlong display) {
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_DefaultScreen(JNIEnv *env, jclass _unused, jlong display) {
   return DefaultScreen((Display*) (intptr_t) display);
 }
 
 JNIEXPORT jlong JNICALL 
-Java_com_sun_nativewindow_impl_x11_X11Lib_DefaultVisualID(JNIEnv *env, jclass _unused, jlong display, jint screen) {
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_DefaultVisualID(JNIEnv *env, jclass _unused, jlong display, jint screen) {
   return (jlong) XVisualIDFromVisual( DefaultVisual( (Display*) (intptr_t) display, screen ) );
 }
 
 JNIEXPORT jlong JNICALL 
-Java_com_sun_nativewindow_impl_x11_X11Lib_RootWindow(JNIEnv *env, jclass _unused, jlong display, jint screen) {
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_RootWindow(JNIEnv *env, jclass _unused, jlong display, jint screen) {
   return RootWindow((Display*) (intptr_t) display, screen);
 }
 
 JNIEXPORT jlong JNICALL 
-Java_com_sun_nativewindow_impl_x11_X11Lib_dlopen(JNIEnv *env, jclass _unused, jstring name) {
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_dlopen(JNIEnv *env, jclass _unused, jstring name) {
   const jbyte* chars;
   void* res;
   chars = (*env)->GetStringUTFChars(env, name, NULL);
@@ -73,7 +73,7 @@ Java_com_sun_nativewindow_impl_x11_X11Lib_dlopen(JNIEnv *env, jclass _unused, js
 }
 
 JNIEXPORT jlong JNICALL 
-Java_com_sun_nativewindow_impl_x11_X11Lib_dlsym(JNIEnv *env, jclass _unused, jstring name) {
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_dlsym(JNIEnv *env, jclass _unused, jstring name) {
   const jbyte* chars;
   void* res;
   chars = (*env)->GetStringUTFChars(env, name, NULL);
@@ -85,7 +85,7 @@ Java_com_sun_nativewindow_impl_x11_X11Lib_dlsym(JNIEnv *env, jclass _unused, jst
 /* Need to pull this in as we don't have a stub header for it */
 extern Bool XineramaEnabled(Display* display);
 
-static const char * clazzNameInternalBufferUtil = "com/sun/nativewindow/impl/InternalBufferUtil";
+static const char * clazzNameInternalBufferUtil = "com/jogamp/nativewindow/impl/InternalBufferUtil";
 static const char * clazzNameInternalBufferUtilStaticCstrName = "copyByteBuffer";
 static const char * clazzNameInternalBufferUtilStaticCstrSignature = "(Ljava/nio/ByteBuffer;)Ljava/nio/ByteBuffer;";
 static const char * clazzNameByteBuffer = "java/nio/ByteBuffer";
@@ -100,29 +100,29 @@ static void _initClazzAccess(JNIEnv *env) {
 
     c = (*env)->FindClass(env, clazzNameInternalBufferUtil);
     if(NULL==c) {
-        fprintf(stderr, "FatalError: Java_com_sun_nativewindow_impl_x11_X11Lib: can't find %s\n", clazzNameInternalBufferUtil);
+        fprintf(stderr, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't find %s\n", clazzNameInternalBufferUtil);
         (*env)->FatalError(env, clazzNameInternalBufferUtil);
     }
     clazzInternalBufferUtil = (jclass)(*env)->NewGlobalRef(env, c);
     if(NULL==clazzInternalBufferUtil) {
-        fprintf(stderr, "FatalError: Java_com_sun_nativewindow_impl_x11_X11Lib: can't use %s\n", clazzNameInternalBufferUtil);
+        fprintf(stderr, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't use %s\n", clazzNameInternalBufferUtil);
         (*env)->FatalError(env, clazzNameInternalBufferUtil);
     }
     c = (*env)->FindClass(env, clazzNameByteBuffer);
     if(NULL==c) {
-        fprintf(stderr, "FatalError: Java_com_sun_nativewindow_impl_x11_X11Lib: can't find %s\n", clazzNameByteBuffer);
+        fprintf(stderr, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't find %s\n", clazzNameByteBuffer);
         (*env)->FatalError(env, clazzNameByteBuffer);
     }
     clazzByteBuffer = (jclass)(*env)->NewGlobalRef(env, c);
     if(NULL==c) {
-        fprintf(stderr, "FatalError: Java_com_sun_nativewindow_impl_x11_X11Lib: can't use %s\n", clazzNameByteBuffer);
+        fprintf(stderr, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't use %s\n", clazzNameByteBuffer);
         (*env)->FatalError(env, clazzNameByteBuffer);
     }
 
     cstrInternalBufferUtil = (*env)->GetStaticMethodID(env, clazzInternalBufferUtil, 
                             clazzNameInternalBufferUtilStaticCstrName, clazzNameInternalBufferUtilStaticCstrSignature);
     if(NULL==cstrInternalBufferUtil) {
-        fprintf(stderr, "FatalError: Java_com_sun_nativewindow_impl_x11_X11Lib:: can't create %s.%s %s\n",
+        fprintf(stderr, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib:: can't create %s.%s %s\n",
             clazzNameInternalBufferUtil,
             clazzNameInternalBufferUtilStaticCstrName, clazzNameInternalBufferUtilStaticCstrSignature);
         (*env)->FatalError(env, clazzNameInternalBufferUtilStaticCstrName);
@@ -130,12 +130,12 @@ static void _initClazzAccess(JNIEnv *env) {
 }
 
 /*   Java->C glue code:
- *   Java package: com.sun.nativewindow.impl.x11.X11Lib
+ *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
  *    Java method: XVisualInfo XGetVisualInfo(long arg0, long arg1, XVisualInfo arg2, java.nio.IntBuffer arg3)
  *     C function: XVisualInfo *  XGetVisualInfo(Display * , long, XVisualInfo * , int * );
  */
 JNIEXPORT jobject JNICALL
-Java_com_sun_nativewindow_impl_x11_X11Lib_XGetVisualInfoCopied1__JJLjava_nio_ByteBuffer_2Ljava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jint arg3_byte_offset) {
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_XGetVisualInfoCopied1__JJLjava_nio_ByteBuffer_2Ljava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jint arg3_byte_offset) {
   XVisualInfo * _ptr2 = NULL;
   int * _ptr3 = NULL;
   XVisualInfo *  _res;
diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg
index 321444725..7a64307da 100644
--- a/make/config/nativewindow/x11-lib.cfg
+++ b/make/config/nativewindow/x11-lib.cfg
@@ -1,6 +1,6 @@
 # This .cfg file is used to generate the interface to the GLX routines
 # used internally by the X11GLContext implementation.
-Package com.sun.nativewindow.impl.x11
+Package com.jogamp.nativewindow.impl.x11
 JavaClass X11Lib
 Style allstatic
 
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Audio.java b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Audio.java
new file mode 100755
index 000000000..fe77c7c48
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Audio.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.javafx.audio.windows.waveout;
+
+import java.io.*;
+
+public class Audio {
+    private static Audio instance = null;
+    private Mixer mixer;
+
+    public synchronized static Audio getInstance() {
+        if (instance == null) {
+            instance = new Audio();
+        }
+        return instance;
+    }
+
+    private Audio() {
+        mixer = Mixer.getMixer();
+    }
+
+    public Mixer getMixer() {
+        return mixer;
+    }
+
+    public Track newTrack(File file) throws IOException
+    {
+        Track res = new Track(file);
+        mixer.add(res);
+        return res;
+    }
+
+    public void shutdown() {
+        mixer.shutdown();
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Mixer.java b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Mixer.java
new file mode 100755
index 000000000..59877052f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Mixer.java
@@ -0,0 +1,362 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.javafx.audio.windows.waveout;
+
+import java.io.*;
+import java.nio.*;
+import java.util.*;
+
+// Needed only for NIO workarounds on CVM
+import java.lang.reflect.*;
+
+public class Mixer {
+    // This class is a singleton
+    private static Mixer mixer;
+
+    private volatile boolean shutdown;
+    private volatile Object shutdownLock = new Object();
+    private volatile boolean shutdownDone;
+
+    // Windows Event object
+    private long event;
+
+    private volatile ArrayList/*<Track>*/ tracks = new ArrayList();
+
+    private Vec3f leftSpeakerPosition  = new Vec3f(-1, 0, 0);
+    private Vec3f rightSpeakerPosition = new Vec3f( 1, 0, 0);
+
+    private float falloffFactor = 1.0f;
+
+    static {
+        mixer = new Mixer();
+    }
+
+    private Mixer() {
+        event = CreateEvent();
+        new FillerThread().start();
+        MixerThread m = new MixerThread();
+        m.setPriority(Thread.MAX_PRIORITY - 1);
+        m.start();
+    }
+
+    public static Mixer getMixer() {
+        return mixer;
+    }
+
+    synchronized void add(Track track) {
+        ArrayList/*<Track>*/ newTracks = (ArrayList) tracks.clone();
+        newTracks.add(track);
+        tracks = newTracks;
+    }
+
+    synchronized void remove(Track track) {
+        ArrayList/*<Track>*/ newTracks = (ArrayList) tracks.clone();
+        newTracks.remove(track);
+        tracks = newTracks;
+    }
+
+    // NOTE: due to a bug on the APX device, we only have mono sounds,
+    // so we currently only pay attention to the position of the left
+    // speaker
+    public void setLeftSpeakerPosition(float x, float y, float z) {
+        leftSpeakerPosition.set(x, y, z);
+    }
+
+    // NOTE: due to a bug on the APX device, we only have mono sounds,
+    // so we currently only pay attention to the position of the left
+    // speaker
+    public void setRightSpeakerPosition(float x, float y, float z) {
+        rightSpeakerPosition.set(x, y, z);
+    }
+
+    /** This defines a scale factor of sorts -- the higher the number,
+        the larger an area the sound will affect. Default value is
+        1.0f. Valid values are [1.0f, ...]. The formula for the gain
+        for each channel is
+<PRE>
+     falloffFactor
+  -------------------
+  falloffFactor + r^2
+</PRE>
+*/
+    public void setFalloffFactor(float factor) {
+        falloffFactor = factor;
+    }
+
+    public void shutdown() {
+        synchronized(shutdownLock) {
+            shutdown = true;
+            SetEvent(event);
+            try {
+                shutdownLock.wait();
+            } catch (InterruptedException e) {
+            }
+        }
+    }
+
+    class FillerThread extends Thread {
+        FillerThread() {
+            super("Mixer Thread");
+        }
+
+        public void run() {
+            while (!shutdown) {
+                List/*<Track>*/ curTracks = tracks;
+
+                for (Iterator iter = curTracks.iterator(); iter.hasNext(); ) {
+                    Track track = (Track) iter.next();
+                    try {
+                        track.fill();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        remove(track);
+                    }
+                }
+
+                try {
+                    // Run ten times per second
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    class MixerThread extends Thread {
+        // Temporary mixing buffer
+        // Interleaved left and right channels
+        float[] mixingBuffer;
+        private Vec3f temp = new Vec3f();
+
+        MixerThread() {
+            super("Mixer Thread");
+            if (!initializeWaveOut(event)) {
+                throw new InternalError("Error initializing waveout device");
+            }
+        }
+
+        public void run() {
+            while (!shutdown) {
+                // Get the next buffer
+                long mixerBuffer = getNextMixerBuffer();
+                if (mixerBuffer != 0) {
+                    ByteBuffer buf = getMixerBufferData(mixerBuffer);
+
+                    if (buf == null) {
+                        // This is happening on CVM because
+                        // JNI_NewDirectByteBuffer isn't implemented
+                        // by default and isn't compatible with the
+                        // JSR-239 NIO implementation (apparently)
+                        buf = newDirectByteBuffer(getMixerBufferDataAddress(mixerBuffer),
+                                                  getMixerBufferDataCapacity(mixerBuffer));
+                    }
+
+                    if (buf == null) {
+                        throw new InternalError("Couldn't wrap the native address with a direct byte buffer");
+                    }
+
+                    // System.out.println("Mixing buffer");
+
+                    // If we don't have enough samples in our mixing buffer, expand it
+                    // FIXME: knowledge of native output rendering format
+                    if ((mixingBuffer == null) || (mixingBuffer.length < (buf.capacity() / 2 /* bytes / sample */))) {
+                        mixingBuffer = new float[buf.capacity() / 2];
+                    } else {
+                        // Zap it
+                        for (int i = 0; i < mixingBuffer.length; i++) {
+                            mixingBuffer[i] = 0.0f;
+                        }
+                    }
+
+                    // This assertion should be in place if we have stereo
+                    if ((mixingBuffer.length % 2) != 0) {
+                        String msg = "FATAL ERROR: odd number of samples in the mixing buffer";
+                        System.out.println(msg);
+                        throw new InternalError(msg);
+                    }
+
+                    // Run down all of the registered tracks mixing them in
+                    List/*<Track>*/ curTracks = tracks;
+
+                    for (Iterator iter = curTracks.iterator(); iter.hasNext(); ) {
+                        Track track = (Track) iter.next();
+                        // Consider only playing tracks
+                        if (track.isPlaying()) {
+                            // First recompute its gain
+                            Vec3f pos = track.getPosition();
+                            float leftGain  = gain(pos, leftSpeakerPosition);
+                            float rightGain = gain(pos, rightSpeakerPosition);
+                            // Now mix it in
+                            int i = 0;
+                            while (i < mixingBuffer.length) {
+                                if (track.hasNextSample()) {
+                                    float sample = track.nextSample();
+                                    mixingBuffer[i++] = sample * leftGain;
+                                    mixingBuffer[i++] = sample * rightGain;
+                                } else {
+                                    // This allows tracks to stall without being abruptly cancelled
+                                    if (track.done()) {
+                                        remove(track);
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    // Now that we have our data, send it down to the card
+                    int outPos = 0;
+                    for (int i = 0; i < mixingBuffer.length; i++) {
+                        short val = (short) mixingBuffer[i];
+                        buf.put(outPos++, (byte)  val);
+                        buf.put(outPos++, (byte) (val >> 8));
+                    }
+                    if (!prepareMixerBuffer(mixerBuffer)) {
+                        throw new RuntimeException("Error preparing mixer buffer");
+                    }
+                    if (!writeMixerBuffer(mixerBuffer)) {
+                        throw new RuntimeException("Error writing mixer buffer to device");
+                    }
+                } else {
+                    // System.out.println("No mixer buffer available");
+
+                    // Wait for a buffer to become available
+                    if (!WaitForSingleObject(event)) {
+                        throw new RuntimeException("Error while waiting for event object");
+                    }
+
+                    /*
+                    try {
+                        Thread.sleep(10);
+                    } catch (InterruptedException e) {
+                    }
+                    */
+                }
+            }
+
+            // Need to shut down
+            shutdownWaveOut();
+            synchronized(shutdownLock) {
+                shutdownLock.notifyAll();
+            }
+        }
+
+        // This defines the 3D spatialization gain function.
+        // The function is defined as:
+        //    falloffFactor
+        // -------------------
+        // falloffFactor + r^2
+        private float gain(Vec3f pos, Vec3f speakerPos) {
+            temp.sub(pos, speakerPos);
+            float dotp = temp.dot(temp);
+            return (falloffFactor / (falloffFactor + dotp));
+        }
+    }
+
+    // Initializes waveout device
+    private static native boolean initializeWaveOut(long eventObject);
+    // Shuts down waveout device
+    private static native void shutdownWaveOut();
+
+    // Gets the next (opaque) buffer of data to fill from the native
+    // code, or 0 if none was available yet (it should not happen that
+    // none is available the way the code is written).
+    private static native long getNextMixerBuffer();
+    // Gets the next ByteBuffer to fill out of the mixer buffer. It
+    // requires interleaved left and right channel samples, 16 signed
+    // bits per sample, little endian. Implicit 44.1 kHz sample rate.
+    private static native ByteBuffer getMixerBufferData(long mixerBuffer);
+    // We need these to work around the lack of
+    // JNI_NewDirectByteBuffer in CVM + the JSR 239 NIO classes
+    private static native long getMixerBufferDataAddress(long mixerBuffer);
+    private static native int  getMixerBufferDataCapacity(long mixerBuffer);
+    // Prepares this mixer buffer for writing to the device.
+    private static native boolean prepareMixerBuffer(long mixerBuffer);
+    // Writes this mixer buffer to the device.
+    private static native boolean writeMixerBuffer(long mixerBuffer);
+
+    // Helpers to prevent mixer thread from busy waiting
+    private static native long CreateEvent();
+    private static native boolean WaitForSingleObject(long event);
+    private static native void SetEvent(long event);
+    private static native void CloseHandle(long handle);
+
+    // We need a reflective hack to wrap a direct ByteBuffer around
+    // the native memory because JNI_NewDirectByteBuffer doesn't work
+    // in CVM + JSR-239 NIO
+    private static Class directByteBufferClass;
+    private static Constructor directByteBufferConstructor;
+    private static Map createdBuffers = new HashMap(); // Map Long, ByteBuffer
+
+    private static ByteBuffer newDirectByteBuffer(long address, long capacity) {
+        Long key = new Long(address);
+        ByteBuffer buf = (ByteBuffer) createdBuffers.get(key);
+        if (buf == null) {
+            buf = newDirectByteBufferImpl(address, capacity);
+            if (buf != null) {
+                createdBuffers.put(key, buf);
+            }
+        }
+        return buf;
+    }
+    private static ByteBuffer newDirectByteBufferImpl(long address, long capacity) {
+        if (directByteBufferClass == null) {
+            try {
+                directByteBufferClass = Class.forName("java.nio.DirectByteBuffer");
+                byte[] tmp = new byte[0];
+                directByteBufferConstructor =
+                    directByteBufferClass.getDeclaredConstructor(new Class[] { Integer.TYPE,
+                                                                               tmp.getClass(),
+                                                                               Integer.TYPE });
+                directByteBufferConstructor.setAccessible(true);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        
+        if (directByteBufferConstructor != null) {
+            try {
+                return (ByteBuffer)
+                    directByteBufferConstructor.newInstance(new Object[] {
+                            new Integer((int) capacity),
+                            null,
+                            new Integer((int) address)
+                        });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/SoundBuffer.java b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/SoundBuffer.java
new file mode 100755
index 000000000..6b75450eb
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/SoundBuffer.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.javafx.audio.windows.waveout;
+
+import java.io.*;
+
+class SoundBuffer {
+    private byte[] data;
+    private boolean needsByteSwap;
+    private int numBytes;
+    private int bytesPerSample;
+    private int numSamples;
+    private boolean playing;
+    private boolean empty;
+
+    // Note: needsByteSwap argument makes assumptions about the format
+    SoundBuffer(int size, int bytesPerSample, boolean needsByteSwap) {
+        this.bytesPerSample = bytesPerSample;
+        this.needsByteSwap = needsByteSwap;
+        data = new byte[size * bytesPerSample];
+        empty = true;
+    }
+
+    boolean playing() {
+        return playing;
+    }
+
+    void playing(boolean playing) {
+        this.playing = playing;
+    }
+
+    boolean empty() {
+        return empty;
+    }
+
+    void empty(boolean empty) {
+        this.empty = empty;
+    }
+
+    void fill(InputStream input) throws IOException {
+        synchronized(this) {
+            if (playing) {
+                throw new IllegalStateException("Can not fill a buffer that is playing");
+            }
+        }
+
+        empty(true);
+        int num = input.read(data);
+        if (num > 0) {
+            numBytes = num;
+            numSamples = numBytes / bytesPerSample;
+            empty(false);
+            if ((numBytes % bytesPerSample) != 0) {
+                System.out.println("WARNING: needed integral multiple of " + bytesPerSample +
+                                   " bytes, but read " + numBytes + " bytes");
+            }
+        } else {
+            numBytes = 0;
+        }
+    }
+
+    int numSamples() {
+        return numSamples;
+    }
+
+    // This is called by the mixer and must be extremely fast
+    // FIXME: may want to reconsider use of floating point at this point
+    // FIXME: assumes all sounds are of the same format to avoid normalization
+    float getSample(int sample) {
+        int startByte = sample * bytesPerSample;
+        // FIXME: assumes no more than 4 bytes per sample
+        int res = 0;
+        if (needsByteSwap) {
+            for (int i = startByte + bytesPerSample - 1; i >= startByte; i--) {
+                res <<= 8;
+                res |= (data[i] & 0xff);
+            }
+        } else {
+            int endByte = startByte + bytesPerSample - 1;
+            for (int i = startByte; i <= endByte; i++) {
+                res <<= 8;
+                res |= (data[i] & 0xff);
+            }
+        }
+        // Sign extend
+        if (bytesPerSample == 2) {
+            res = (short) res;
+        } else if (bytesPerSample == 1) {
+            res = (byte) res;
+        }
+
+        return (float) res;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java
new file mode 100755
index 000000000..38e3bb808
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.javafx.audio.windows.waveout;
+
+import java.io.*;
+import javax.media.nativewindow.NativeWindow;
+import javax.media.opengl.GLDrawableFactory;
+
+public class TestSpatialization {
+    public static void main(String[] args) {
+        if (args.length != 1) {
+            System.out.println("Usage: TestSpatialization [file name]");
+            System.exit(1);
+        }
+
+        try {
+            // FIXME: this is a hack to get the native library loaded
+            try {
+                GLDrawableFactory.getFactory(NativeWindow.class);
+            } catch (Exception e) {}
+            // Initialize the audio subsystem
+            Audio audio = Audio.getInstance();
+            // Create a track
+            Track track = audio.newTrack(new File(args[0]));
+            track.setPosition(1, 0, 0);
+            // Run for ten seconds
+            long startTime = System.currentTimeMillis();
+            long duration = 10000;
+            long curTime = 0;
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+            }
+            System.out.println("Playing...");
+            track.setLooping(true);
+            track.play();
+            while ((curTime = System.currentTimeMillis()) < startTime + duration) {
+                // Make one revolution every two seconds
+                float rads = (float) (((2 * Math.PI) * (((float) (curTime - startTime)) / 1000.0f)) / 2);
+                track.setPosition((float) Math.cos(rads), 0, (float) Math.sin(rads));
+                // Would like to make it go in a circle, but since
+                // stereo doesn't work now, make it move along a line
+                // track.setPosition(-1.0f, 0, 2.0f * (float) Math.sin(rads));
+                // Sleep a little between updates
+                try {
+                    Thread.sleep(10);
+                } catch (InterruptedException e) {
+                }
+            }
+            System.out.println("Shutting down audio subsystem");
+            audio.shutdown();
+            System.out.println("Exiting.");
+            System.exit(0);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Track.java b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Track.java
new file mode 100755
index 000000000..40c39e755
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Track.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.javafx.audio.windows.waveout;
+
+import java.io.*;
+import java.nio.*;
+
+public class Track {
+    // Default number of samples per buffer
+    private static final int BUFFER_SIZE = 32768;
+    // Number of bytes per sample (FIXME: dependence on audio format)
+    static final int BYTES_PER_SAMPLE = 2;
+    // Whether we need byte swapping (FIXME: dependence on audio format)
+    static final boolean NEEDS_BYTE_SWAP = true;
+
+    // This is the buffer this track is currently playing from
+    private SoundBuffer activeBuffer;
+    // This is the sample position in the active buffer
+    private int samplePosition;
+    // This is the total number of samples in the file
+    private int totalSamples;
+    // This is the total number of samples we have read
+    private int samplesRead;
+    // This is the buffer that the background filler thread may be filling
+    private SoundBuffer fillingBuffer;
+    // If we're playing the file, this is its input stream
+    private InputStream input;
+    // Keep around the file name
+    private File file;
+    // Whether we're playing this sound
+    private boolean playing;
+    // Whether we're looping this sound
+    private boolean looping;
+    // The position of this sound; defaults to being at the origin
+    private volatile Vec3f position = new Vec3f();
+
+    Track(File file) throws IOException {
+        if (!file.getName().endsWith(".rawsound")) {
+            throw new IOException("Unsupported file format (currently supports only raw sounds)");
+        }
+
+        this.file = file;
+        openInput();
+
+        // Allocate the buffers
+        activeBuffer  = new SoundBuffer(BUFFER_SIZE, BYTES_PER_SAMPLE, NEEDS_BYTE_SWAP);
+        fillingBuffer = new SoundBuffer(BUFFER_SIZE, BYTES_PER_SAMPLE, NEEDS_BYTE_SWAP);
+
+        // Fill the first buffer immediately
+        fill();
+        swapBuffers();
+    }
+
+    private void openInput() throws IOException {
+        input = new BufferedInputStream(new FileInputStream(file));
+        totalSamples = (int) file.length() / BYTES_PER_SAMPLE;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    public synchronized void play() {
+        if (input == null) {
+            try {
+                openInput();
+                // Fill it immediately
+                fill();
+            } catch (IOException e) {
+                e.printStackTrace();
+                return;
+            }
+        }
+
+        playing = true;
+    }
+
+    public synchronized boolean isPlaying() {
+        return playing;
+    }
+
+    public synchronized void setLooping(boolean looping) {
+        this.looping = looping;
+    }
+
+    public synchronized boolean isLooping() {
+        return looping;
+    }
+
+    public void setPosition(float x, float y, float z) {
+        position = new Vec3f(x, y, z);
+    }
+
+    synchronized void fill() throws IOException {
+        if (input == null) {
+            return;
+        }
+        SoundBuffer curBuffer = fillingBuffer;
+        if (!curBuffer.empty()) {
+            return;
+        }
+        curBuffer.fill(input);
+        if (curBuffer.empty()) {
+            // End of file
+            InputStream tmp = null;
+            synchronized(this) {
+                tmp = input;
+                input = null;
+            }
+            tmp.close();
+
+            // If looping, re-open
+            if (isLooping()) {
+                openInput();
+                // and fill
+                fill();
+            }
+        }
+    }
+
+    // These are only for use by the Mixer
+    private float leftGain;
+    private float rightGain;
+    
+    void setLeftGain(float leftGain) {
+        this.leftGain = leftGain;
+    }
+
+    float getLeftGain() {
+        return leftGain;
+    }
+
+    void setRightGain(float rightGain) {
+        this.rightGain = rightGain;
+    }
+
+    float getRightGain() {
+        return rightGain;
+    }
+
+    Vec3f getPosition() {
+        return position;
+    }
+
+    // This is called by the mixer and must be extremely fast
+    // Note this assumes mono sounds (FIXME)
+    boolean hasNextSample() {
+        return (!activeBuffer.empty() && samplePosition < activeBuffer.numSamples());
+    }
+
+    // This is called by the mixer and must be extremely fast
+    float nextSample() {
+        float res = activeBuffer.getSample(samplePosition++);
+        ++samplesRead;
+        if (!hasNextSample()) {
+            swapBuffers();
+            samplePosition = 0;
+            if (done()) {
+                playing = false;
+            }
+        }
+        return res;
+    }
+
+    synchronized void swapBuffers() {
+        SoundBuffer tmp = activeBuffer;
+        activeBuffer = fillingBuffer;
+        fillingBuffer = tmp;
+        fillingBuffer.empty(true);
+    }
+
+    // This provides a more robust termination condition
+    boolean done() {
+        return (samplesRead == totalSamples) && !looping;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Vec3f.java b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Vec3f.java
new file mode 100755
index 000000000..5b480a513
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Vec3f.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.javafx.audio.windows.waveout;
+
+/** 3-element single-precision vector */
+
+class Vec3f {
+  public static final Vec3f X_AXIS     = new Vec3f( 1,  0,  0);
+  public static final Vec3f Y_AXIS     = new Vec3f( 0,  1,  0);
+  public static final Vec3f Z_AXIS     = new Vec3f( 0,  0,  1);
+  public static final Vec3f NEG_X_AXIS = new Vec3f(-1,  0,  0);
+  public static final Vec3f NEG_Y_AXIS = new Vec3f( 0, -1,  0);
+  public static final Vec3f NEG_Z_AXIS = new Vec3f( 0,  0, -1);
+
+  private float x;
+  private float y;
+  private float z;
+
+  public Vec3f() {}
+
+  public Vec3f(Vec3f arg) {
+    set(arg);
+  }
+
+  public Vec3f(float x, float y, float z) {
+    set(x, y, z);
+  }
+
+  public Vec3f copy() {
+    return new Vec3f(this);
+  }
+
+  public void set(Vec3f arg) {
+    set(arg.x, arg.y, arg.z);
+  }
+
+  public void set(float x, float y, float z) {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+  }
+
+  /** Sets the ith component, 0 <= i < 3 */
+  public void set(int i, float val) {
+    switch (i) {
+    case 0: x = val; break;
+    case 1: y = val; break;
+    case 2: z = val; break;
+    default: throw new IndexOutOfBoundsException();
+    }
+  }
+
+  /** Gets the ith component, 0 <= i < 3 */
+  public float get(int i) {
+    switch (i) {
+    case 0: return x;
+    case 1: return y;
+    case 2: return z;
+    default: throw new IndexOutOfBoundsException();
+    }
+  }
+
+  public float x() { return x; }
+  public float y() { return y; }
+  public float z() { return z; }
+
+  public void setX(float x) { this.x = x; }
+  public void setY(float y) { this.y = y; }
+  public void setZ(float z) { this.z = z; }
+
+  public float dot(Vec3f arg) {
+    return x * arg.x + y * arg.y + z * arg.z;
+  }
+
+  public float length() {
+    return (float) Math.sqrt(lengthSquared());
+  }
+
+  public float lengthSquared() {
+    return this.dot(this);
+  }
+
+  public void normalize() {
+    float len = length();
+    if (len == 0.0f) return;
+    scale(1.0f / len);
+  }
+
+  /** Returns this * val; creates new vector */
+  public Vec3f times(float val) {
+    Vec3f tmp = new Vec3f(this);
+    tmp.scale(val);
+    return tmp;
+  }
+
+  /** this = this * val */
+  public void scale(float val) {
+    x *= val;
+    y *= val;
+    z *= val;
+  }
+
+  /** Returns this + arg; creates new vector */
+  public Vec3f plus(Vec3f arg) {
+    Vec3f tmp = new Vec3f();
+    tmp.add(this, arg);
+    return tmp;
+  }
+
+  /** this = this + b */
+  public void add(Vec3f b) {
+    add(this, b);
+  }
+
+  /** this = a + b */
+  public void add(Vec3f a, Vec3f b) {
+    x = a.x + b.x;
+    y = a.y + b.y;
+    z = a.z + b.z;
+  }
+
+  /** Returns this + s * arg; creates new vector */
+  public Vec3f addScaled(float s, Vec3f arg) {
+    Vec3f tmp = new Vec3f();
+    tmp.addScaled(this, s, arg);
+    return tmp;
+  }
+
+  /** this = a + s * b */
+  public void addScaled(Vec3f a, float s, Vec3f b) {
+    x = a.x + s * b.x;
+    y = a.y + s * b.y;
+    z = a.z + s * b.z;
+  }
+
+  /** Returns this - arg; creates new vector */
+  public Vec3f minus(Vec3f arg) {
+    Vec3f tmp = new Vec3f();
+    tmp.sub(this, arg);
+    return tmp;
+  }
+
+  /** this = this - b */
+  public void sub(Vec3f b) {
+    sub(this, b);
+  }
+
+  /** this = a - b */
+  public void sub(Vec3f a, Vec3f b) {
+    x = a.x - b.x;
+    y = a.y - b.y;
+    z = a.z - b.z;
+  }
+
+  /** Returns this cross arg; creates new vector */
+  public Vec3f cross(Vec3f arg) {
+    Vec3f tmp = new Vec3f();
+    tmp.cross(this, arg);
+    return tmp;
+  }
+
+  /** this = a cross b. NOTE: "this" must be a different vector than
+      both a and b. */
+  public void cross(Vec3f a, Vec3f b) {
+    x = a.y * b.z - a.z * b.y;
+    y = a.z * b.x - a.x * b.z;
+    z = a.x * b.y - a.y * b.x;
+  }
+
+  /** Sets each component of this vector to the product of the
+      component with the corresponding component of the argument
+      vector. */
+  public void componentMul(Vec3f arg) {
+    x *= arg.x;
+    y *= arg.y;
+    z *= arg.z;
+  }
+
+  public String toString() {
+    return "(" + x + ", " + y + ", " + z + ")";
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
index 32a32e322..49045910a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
@@ -43,7 +43,7 @@ import java.nio.*;
 import java.lang.reflect.*;
 
 import javax.media.opengl.*;
-import com.sun.nativewindow.impl.NWReflection;
+import com.jogamp.nativewindow.impl.NWReflection;
 import com.jogamp.gluegen.runtime.*;
 import com.jogamp.gluegen.runtime.opengl.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
index 20d0c8072..eaf29df77 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
@@ -43,7 +43,7 @@ import java.nio.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.gluegen.runtime.*;
-import com.sun.nativewindow.impl.NWReflection;
+import com.jogamp.nativewindow.impl.NWReflection;
 import java.lang.reflect.*;
 
 /** Extends GLDrawableFactory with a few methods for handling
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
index aa71a37da..0e5885349 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
@@ -46,7 +46,7 @@ import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.HashSet;
-import com.sun.nativewindow.impl.NativeLibLoaderBase;
+import com.jogamp.nativewindow.impl.NativeLibLoaderBase;
 
 public class NativeLibLoader extends NativeLibLoaderBase {
   public static void loadNEWT() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java
index 2576c8ae8..b32ed51b6 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java
@@ -38,7 +38,7 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 
 import javax.media.nativewindow.NativeWindowFactory;
-import com.sun.nativewindow.impl.NWReflection;
+import com.jogamp.nativewindow.impl.NWReflection;
 import javax.media.opengl.GLException;
 
 /** Implementation of the {@link javax.media.opengl.Threading} class. */
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java b/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java
index 306f6cee7..e5570a8ee 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java
@@ -36,7 +36,7 @@
 
 package com.jogamp.opengl.impl.awt;
 
-import com.sun.nativewindow.impl.jawt.*;
+import com.jogamp.nativewindow.impl.jawt.*;
 
 import com.jogamp.opengl.impl.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
index e48c78301..f3695ed16 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
@@ -36,7 +36,7 @@
 package com.jogamp.opengl.impl.egl;
 
 import com.jogamp.opengl.impl.GLDrawableImpl;
-import com.sun.nativewindow.impl.NWReflection;
+import com.jogamp.nativewindow.impl.NWReflection;
 import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 import javax.media.nativewindow.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
index f6c8b800e..d50f671a3 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
@@ -39,7 +39,7 @@ import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.*;
 import com.jogamp.gluegen.runtime.NativeLibrary;
 
 public class EGLDrawableFactory extends GLDrawableFactoryImpl {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
index beffb513f..4918acbb3 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
@@ -39,7 +39,7 @@ import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.*;
 import com.jogamp.gluegen.runtime.NativeLibrary;
 import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 import java.security.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java
index 0dc9535ce..5c4da5098 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java
@@ -39,7 +39,7 @@ import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.*;
 import com.jogamp.gluegen.runtime.NativeLibrary;
 
 /**
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java
index 595ded538..0b499c204 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java
@@ -39,7 +39,7 @@ import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.*;
 import com.jogamp.gluegen.runtime.NativeLibrary;
 
 /**
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
index 6546ecab7..0a9edd239 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
@@ -35,7 +35,7 @@ package com.jogamp.opengl.impl.egl;
 import java.io.PrintStream;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
-import com.sun.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.*;
 
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
index d37a36fb0..2f5bbf359 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
@@ -43,7 +43,7 @@ import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
+import com.jogamp.nativewindow.impl.NullWindow;
 
 public class EGLOnscreenDrawable extends EGLDrawable {
     protected EGLOnscreenDrawable(EGLDrawableFactory factory, NativeWindow component) throws GLException {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
index c08599964..a3ae6f936 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
@@ -45,7 +45,7 @@ import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.*;
 import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
index ab53e49e9..ada5fb1a7 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
@@ -34,7 +34,7 @@ package com.jogamp.opengl.impl.macosx.cgl;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.macosx.*;
-import com.sun.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.*;
 
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
index 239eedd43..dde77cde6 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
@@ -43,7 +43,7 @@ import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
 
 import javax.media.nativewindow.*;
-import com.sun.nativewindow.impl.NullWindow;
+import com.jogamp.nativewindow.impl.NullWindow;
 
 public class MacOSXExternalCGLContext extends MacOSXCGLContext {
   private boolean firstMakeCurrent = true;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
index 97d5e8d68..0d59da32e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
@@ -43,8 +43,8 @@ import javax.media.opengl.awt.*;
 
 import com.jogamp.opengl.impl.*;
 import com.jogamp.opengl.impl.macosx.cgl.*;
-import com.sun.nativewindow.impl.jawt.*;
-import com.sun.nativewindow.impl.jawt.macosx.*;
+import com.jogamp.nativewindow.impl.jawt.*;
+import com.jogamp.nativewindow.impl.jawt.macosx.*;
 
 public class MacOSXAWTCGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
     protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
index 89a25fe9a..49e646844 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
@@ -41,7 +41,7 @@ package com.jogamp.opengl.impl.windows.wgl;
 
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
+import com.jogamp.nativewindow.impl.NullWindow;
 
 public class WindowsDummyWGLDrawable extends WindowsWGLDrawable {
   private long hwnd, hdc;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
index 25691ab91..da8b70eb8 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
@@ -42,7 +42,7 @@ package com.jogamp.opengl.impl.windows.wgl;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
+import com.jogamp.nativewindow.impl.NullWindow;
 
 public class WindowsExternalWGLContext extends WindowsWGLContext {
   private boolean firstMakeCurrent = true;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
index f5b89842d..74db45932 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
@@ -42,7 +42,7 @@ package com.jogamp.opengl.impl.windows.wgl;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
+import com.jogamp.nativewindow.impl.NullWindow;
 
 public class WindowsExternalWGLDrawable extends WindowsWGLDrawable {
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
index 88bfb3b1c..e0c70bd8c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
@@ -42,7 +42,7 @@ package com.jogamp.opengl.impl.windows.wgl;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
+import com.jogamp.nativewindow.impl.NullWindow;
 
 public class WindowsOffscreenWGLDrawable extends WindowsWGLDrawable {
   private long origbitmap;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
index 38b9bac51..6827c755e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
@@ -44,9 +44,9 @@ import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.NWReflection;
+import com.jogamp.nativewindow.impl.NWReflection;
 import com.jogamp.gluegen.runtime.DynamicLookupHelper;
-import com.sun.nativewindow.impl.NullWindow;
+import com.jogamp.nativewindow.impl.NullWindow;
 
 public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
   private static final boolean VERBOSE = Debug.verbose();
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
index 06590a913..b82535bfe 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
@@ -34,7 +34,7 @@ package com.jogamp.opengl.impl.windows.wgl;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.windows.*;
-import com.sun.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.*;
 
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
index 4458fb1ac..02cfd14c3 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
@@ -43,8 +43,8 @@ import javax.media.opengl.awt.*;
 
 import com.jogamp.opengl.impl.*;
 import com.jogamp.opengl.impl.windows.wgl.*;
-import com.sun.nativewindow.impl.jawt.*;
-import com.sun.nativewindow.impl.jawt.windows.*;
+import com.jogamp.nativewindow.impl.jawt.*;
+import com.jogamp.nativewindow.impl.jawt.windows.*;
 
 public class WindowsAWTWGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
     protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
index cbd98014a..99c54332f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
@@ -36,7 +36,7 @@ import javax.media.opengl.*;
 
 import com.jogamp.opengl.impl.*;
 import javax.media.nativewindow.NativeWindowFactory;
-import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.nativewindow.impl.x11.*;
 
 public class GLXUtil {
     public static boolean isMultisampleAvailable(long display) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
index b94dac1da..783e3278a 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
@@ -43,8 +43,8 @@ import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
-import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.nativewindow.impl.NullWindow;
+import com.jogamp.nativewindow.impl.x11.*;
 
 public class X11ExternalGLXContext extends X11GLXContext {
   private boolean firstMakeCurrent = true;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
index 261b1b370..44aea0fa7 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
@@ -43,8 +43,8 @@ import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.NullWindow;
-import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.nativewindow.impl.NullWindow;
+import com.jogamp.nativewindow.impl.x11.*;
 
 import com.jogamp.gluegen.runtime.PointerBuffer;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
index 629bcb0b9..ce846c0a4 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
@@ -46,7 +46,7 @@ import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
 import com.jogamp.opengl.impl.*;
 import com.jogamp.opengl.impl.x11.glx.*;
-import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.nativewindow.impl.x11.*;
 import com.jogamp.gluegen.runtime.ProcAddressTable;
 
 public abstract class X11GLXContext extends GLContextImpl {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
index fe030af00..ee807c32a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
@@ -42,7 +42,7 @@ package com.jogamp.opengl.impl.x11.glx;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.nativewindow.impl.x11.*;
 import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 public abstract class X11GLXDrawable extends GLDrawableImpl {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
index 089a516ee..cb25e6723 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
@@ -46,9 +46,9 @@ import com.jogamp.gluegen.runtime.*;
 import com.jogamp.gluegen.runtime.opengl.*;
 import com.jogamp.opengl.impl.*;
 import com.jogamp.opengl.impl.x11.glx.*;
-import com.sun.nativewindow.impl.NullWindow;
-import com.sun.nativewindow.impl.NWReflection;
-import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.nativewindow.impl.NullWindow;
+import com.jogamp.nativewindow.impl.NWReflection;
+import com.jogamp.nativewindow.impl.x11.*;
 
 public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
   public X11GLXDrawableFactory() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
index 498605594..f127ec2d0 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
@@ -39,7 +39,7 @@ import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
 import com.jogamp.gluegen.runtime.NativeLibrary;
 import com.jogamp.gluegen.runtime.PointerBuffer;
-import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.nativewindow.impl.x11.*;
 
 public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implements Cloneable {
     protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
index 1ddac9013..eca5fede5 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
@@ -34,8 +34,8 @@ package com.jogamp.opengl.impl.x11.glx;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
-import com.sun.nativewindow.impl.NativeWindowFactoryImpl;
-import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.nativewindow.impl.NativeWindowFactoryImpl;
+import com.jogamp.nativewindow.impl.x11.*;
 
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
index 7d866a200..ea855d28d 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
@@ -42,7 +42,7 @@ package com.jogamp.opengl.impl.x11.glx;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.nativewindow.impl.x11.*;
 
 public class X11OffscreenGLXDrawable extends X11GLXDrawable {
   private long pixmap;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
index 3e012225e..50b32b9ec 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
@@ -43,7 +43,7 @@ import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.jogamp.opengl.impl.*;
 import com.jogamp.opengl.impl.x11.glx.*;
-import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.nativewindow.impl.x11.*;
 
 public class X11PbufferGLXDrawable extends X11GLXDrawable {
   protected X11PbufferGLXDrawable(GLDrawableFactory factory, NativeWindow target) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
index 3b2c8f541..63b350bd3 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
@@ -42,9 +42,9 @@ import javax.media.opengl.*;
 import javax.media.opengl.awt.*;
 
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.jawt.*;
-import com.sun.nativewindow.impl.jawt.x11.*;
-import com.sun.nativewindow.impl.x11.*;
+import com.jogamp.nativewindow.impl.jawt.*;
+import com.jogamp.nativewindow.impl.jawt.x11.*;
+import com.jogamp.nativewindow.impl.x11.*;
 import com.jogamp.opengl.impl.x11.*;
 import com.jogamp.opengl.impl.x11.glx.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
index 98249184d..7c71c4309 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
@@ -3,7 +3,7 @@ package com.jogamp.opengl.util;
 
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
-import com.sun.nativewindow.impl.NWReflection;
+import com.jogamp.nativewindow.impl.NWReflection;
 import java.nio.*;
 import java.util.Iterator;
 import java.util.ArrayList;
diff --git a/src/jogl/classes/com/jogamp/openmax/OMXEventListener.java b/src/jogl/classes/com/jogamp/openmax/OMXEventListener.java
new file mode 100644
index 000000000..08cfeccde
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/openmax/OMXEventListener.java
@@ -0,0 +1,14 @@
+
+package com.jogamp.openmax;
+
+public interface OMXEventListener {
+
+    static final int EVENT_CHANGE_SIZE = 1<<0;
+    static final int EVENT_CHANGE_FPS  = 1<<1;
+    static final int EVENT_CHANGE_BPS  = 1<<2;
+    static final int EVENT_CHANGE_LENGTH  = 1<<3;
+
+    public void changedAttributes(OMXInstance omx, int event_mask);
+
+}
+
diff --git a/src/jogl/classes/com/jogamp/openmax/OMXInstance.java b/src/jogl/classes/com/jogamp/openmax/OMXInstance.java
new file mode 100644
index 000000000..9f5b850ba
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/openmax/OMXInstance.java
@@ -0,0 +1,509 @@
+
+package com.jogamp.openmax;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.util.texture.*;
+
+import com.jogamp.opengl.impl.egl.EGL;
+import com.jogamp.opengl.impl.egl.EGLContext;
+import com.jogamp.opengl.impl.egl.EGLDrawable;
+import com.jogamp.opengl.impl.egl.EGLExt;
+
+import java.net.URL;
+import java.nio.ByteBuffer;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.*;
+
+public class OMXInstance {
+    private long moviePtr = 0;
+
+    protected String path   = null;
+    protected URL url   = null;
+    
+    // *** Texture impl
+    protected Texture texture = null; // holds the last fetched texture
+
+    protected float playSpeed = 1.0f;
+
+    /** 
+     * The following data is set by the setStream function,
+     * and may be set by the native OMX implementation,
+     * in case the stream attributes changes (see attributesUpdated)
+     */
+    protected int width = 0;
+    protected int height = 0;
+    protected int fps = 0; // frames per seconds
+    protected long bps = 0; // bits per seconds
+    protected long totalFrames = 0; // duration in frames
+    protected String acodec = null;
+    protected String vcodec = null;
+
+    /**
+     * Old stream values, before the last attributesUpdated)
+     */
+    protected int o_width = 0;
+    protected int o_height = 0;
+    protected int o_fps = 0; // frames per seconds
+    protected long o_bps = 0; // bits per seconds
+    protected long o_totalFrames = 0; // duration in frames
+    
+    static class EGLImageTexture {
+        public EGLImageTexture(com.jogamp.opengl.util.texture.Texture t, long i, long s) {
+            texture = t; image = i; sync = s;
+        }
+        public String toString() {
+            return "EGLImageTexture[" + texture + ", image " + image + ", sync "+sync+"]";
+        }
+        protected com.jogamp.opengl.util.texture.Texture texture;
+        protected long image;
+        protected long sync;
+    }
+    private EGLImageTexture[] eglImgTexs=null;
+    private HashMap eglImgTexsMap = new HashMap();
+    protected int textureNum;
+    
+    private EGLExt eglExt = null;
+    private long eglSurface = 0;
+    private long eglDisplay = 0;
+    private long eglContext = 0;
+    private int sWidth=0, sHeight=0;
+
+    private GL initGLData(GL gl) {
+        if(null==gl) {
+            throw new RuntimeException("No current GL");
+        }
+        EGLContext eglCtx = (EGLContext) gl.getContext();
+        if(null==eglCtx) {
+            throw new RuntimeException("No current EGL context");
+        }
+        EGLDrawable eglDrawable = (EGLDrawable) eglCtx.getGLDrawable();
+        if(null==eglDrawable) {
+            throw new RuntimeException("No valid drawable");
+        }
+        eglContext = eglCtx.getContext();
+        eglDisplay = eglDrawable.getDisplay();
+        eglSurface = eglDrawable.getSurface();
+        eglExt = eglCtx.getEGLExt();
+        if(null==eglExt) {
+            throw new RuntimeException("No valid EGLExt");
+        }
+
+        int iTmp[] = new int[1];
+        EGL.eglQuerySurface(eglDisplay, eglSurface, EGL.EGL_WIDTH, iTmp, 0);
+        sWidth=iTmp[0];
+        EGL.eglQuerySurface(eglDisplay, eglSurface, EGL.EGL_HEIGHT, iTmp, 0);
+        sHeight=iTmp[0];
+        System.out.println("surface size: "+width+"x"+height);
+        System.out.println(eglDrawable);
+        System.out.println(eglCtx);
+        System.out.println("EGL Extensions : "+EGL.eglQueryString(eglDisplay, EGL.EGL_EXTENSIONS));
+        System.out.println("EGL CLIENT APIs: "+EGL.eglQueryString(eglDisplay, EGL.EGL_CLIENT_APIS));
+        return gl;
+    }
+
+    public OMXInstance() {
+        moviePtr = _createInstance();
+        if(0==moviePtr) {
+            throw new GLException("Couldn't create OMXInstance");
+        }
+    }
+    native long _createInstance();
+
+    public synchronized void setStream(int textureNum, URL u) {
+        if(0==moviePtr) {
+            throw new GLException("OMX native instance null");
+        }
+        this.textureNum=textureNum;
+        url = u;
+        if (url == null) {
+            System.out.println("setURL (null)");
+            stop();
+            return;
+        }
+        path=null;
+        if (url.getProtocol() == null || "file".equals(url.getProtocol())) {
+            // CV only accepts absolute paths
+            try {
+                File file = new File(url.getPath());
+                if (!file.exists()) {
+                    throw new RuntimeException(new FileNotFoundException(file.toString()));
+                }
+                path = file.getCanonicalPath();
+                System.out.println("setURL: path "+path);
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new RuntimeException(e);
+            }
+        }
+        path = replaceAll(path, "\\", "/").trim();
+        if(null==path) {
+            throw new RuntimeException("Couldn't parse stream URL: "+url);
+        }
+        System.out.println("setURL: clean path "+path);
+
+        System.out.println("setURL: p1 "+this);
+        _setStream(moviePtr, textureNum, path);
+        System.out.println("setURL: p2 "+this);
+    }
+    native void _setStream(long moviePtr, int textureNum, String path);
+
+    public synchronized void setStreamAllEGLImageTexture2D(GL gl) {
+        if(0==moviePtr) {
+            throw new GLException("OMX native instance null");
+        }
+        if(null==vcodec) {
+            return;
+        }
+        gl = initGLData(gl);
+
+        if(null!=eglImgTexs) {
+            removeAllEGLImageTexture2D(gl);
+        } else {
+            eglImgTexs = new EGLImageTexture[textureNum];
+        }
+
+        int[] tmp = new int[1];
+        int tex, e;
+
+        errorCheckGL(gl, "i.1");
+        gl.glEnable(gl.GL_TEXTURE_2D);
+        errorCheckGL(gl, "i.2");
+
+        for(int i=0; i<textureNum; i++) {
+            String s0 = String.valueOf(i);
+            gl.glGenTextures(1, tmp, 0);
+            tex=tmp[0];
+            if( (e=gl.glGetError()) != GL.GL_NO_ERROR || 0>tex ) {
+                throw new RuntimeException("TextureName creation failed: "+e);
+            }
+            gl.glBindTexture(gl.GL_TEXTURE_2D, tex);
+
+            // create space for buffer with a texture
+            gl.glTexImage2D(
+                    gl.GL_TEXTURE_2D, // target
+                    0,                // level
+                    gl.GL_RGBA,       // internal format
+                    width,            // width
+                    height,           // height
+                    0,                // border
+                    gl.GL_RGBA,       // format
+                    gl.GL_UNSIGNED_BYTE, // type
+                    null);            // pixels -- will be provided later
+            gl.glTexParameteri(gl.GL_TEXTURE_2D, gl.GL_TEXTURE_MIN_FILTER, gl.GL_NEAREST);
+            gl.glTexParameteri(gl.GL_TEXTURE_2D, gl.GL_TEXTURE_MAG_FILTER, gl.GL_NEAREST);
+
+            long image=0, sync=0;
+
+            // create EGLImage from texture
+            tmp[0] = EGL.EGL_NONE;
+            image = eglExt.eglCreateImageKHR(
+                        eglDisplay,
+                        eglContext,
+                        eglExt.EGL_GL_TEXTURE_2D_KHR,
+                        tex,
+                        tmp, 0);
+            if (0==image) {
+                throw new RuntimeException("EGLImage creation failed: "+EGL.eglGetError()+", dpy "+eglDisplay+", ctx "+eglContext+", tex "+tex);
+            }
+
+            // Create sync object so that we can be sure that gl has finished
+            // rendering the EGLImage texture before we tell OpenMAX to fill
+            // it with a new frame.
+            tmp[0] = EGL.EGL_NONE;
+            sync = eglExt.eglCreateFenceSyncKHR(
+                    eglDisplay,
+                    eglExt.EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR, tmp, 0);
+
+            _setStreamEGLImageTexture2D(moviePtr, i, tex, image, sync);
+
+            eglImgTexs[i] = new EGLImageTexture(
+                com.jogamp.opengl.util.texture.TextureIO.newTexture(tex,
+                                                                 javax.media.opengl.GL2.GL_TEXTURE_2D,
+                                                                 width,
+                                                                 height,
+                                                                 width,
+                                                                 height,
+                                                                 true),
+                image, sync);
+            eglImgTexsMap.put(new Integer(tex), eglImgTexs[i]);
+        }
+        gl.glDisable(gl.GL_TEXTURE_2D);
+    }
+    native void _setStreamEGLImageTexture2D(long moviePtr, int i, int tex, long image, long sync);
+
+    public synchronized void activateStream() {
+        if(0==moviePtr) {
+            throw new GLException("OMX native instance null");
+        }
+        _activateStream(moviePtr);
+    }
+    native void _activateStream(long moviePtr);
+
+    public synchronized void detachVideoRenderer() {
+        if(0==moviePtr) {
+            throw new GLException("OMX native instance null");
+        }
+        _detachVideoRenderer(moviePtr);
+    }
+    native void _detachVideoRenderer(long moviePtr); // stop before
+
+    public synchronized void attachVideoRenderer() {
+        if(0==moviePtr) {
+            throw new GLException("OMX native instance null");
+        }
+        _attachVideoRenderer(moviePtr);
+    }
+    native void _attachVideoRenderer(long moviePtr); // detach before
+
+    public synchronized void setPlaySpeed(float rate) {
+        if(0==moviePtr) {
+            throw new GLException("OMX native instance null");
+        }
+        _setPlaySpeed(moviePtr, rate);
+        playSpeed = rate;
+    }
+    public synchronized float getPlaySpeed() {
+        return playSpeed;
+    }
+    native void _setPlaySpeed(long moviePtr, float rate);
+
+    /** @return time position after issuing the command */
+    public synchronized float play() {
+        if(0==moviePtr) {
+            throw new GLException("OMX native instance null");
+        }
+        return _play(moviePtr);
+    }
+    native float _play(long moviePtr);
+
+    /** @return time position after issuing the command */
+    public synchronized float pause() {
+        if(0==moviePtr) {
+            throw new GLException("OMX native instance null");
+        }
+        return _pause(moviePtr);
+    }
+    native float _pause(long moviePtr);
+
+    /** @return time position after issuing the command */
+    public synchronized float stop() {
+        if(0==moviePtr) {
+            throw new GLException("OMX native instance null");
+        }
+        return _stop(moviePtr);
+    }
+    native float _stop(long moviePtr);
+
+    /** @return time position after issuing the command */
+    public synchronized float seek(float pos) {
+        if(0==moviePtr) {
+            throw new GLException("OMX native instance null");
+        }
+        return _seek(moviePtr, pos);
+    }
+    native float _seek(long moviePtr, float position);
+
+    public synchronized Texture getLastTextureID() {
+        return texture;
+    }
+    public synchronized Texture getNextTextureID() {
+        if(0==moviePtr) {
+            throw new GLException("OMX native instance null");
+        }
+        texture=null;
+        EGLImageTexture eglImgTex = (EGLImageTexture) eglImgTexsMap.get(new Integer(_getNextTextureID(moviePtr)));
+        if(null!=eglImgTex) {
+            texture = eglImgTex.texture;
+        }
+        return texture;
+    }
+    native int  _getNextTextureID(long moviePtr);
+
+    public synchronized float getCurrentPosition() {
+        if(0==moviePtr) {
+            throw new GLException("OMX native instance null");
+        }
+        return _getCurrentPosition(moviePtr);
+    }
+    native float _getCurrentPosition(long moviePtr);
+
+    public synchronized void destroy(GL gl) {
+        removeAllEGLImageTexture2D(gl);
+        if (moviePtr != 0) {
+            long ptr = moviePtr;
+            moviePtr = 0;
+            _destroyInstance(ptr);
+
+            eglExt=null;
+            eglSurface=0;
+            eglDisplay=0;
+            eglContext=0;
+        }
+    }
+    protected synchronized void finalize() {
+        if (moviePtr != 0) {
+            destroy(null);
+        }
+    }
+    native void _destroyInstance(long moviePtr);
+
+    public synchronized boolean isValid() {
+        return (moviePtr != 0);
+    }
+    public synchronized String getPath() {
+        return path;
+    }
+    public synchronized URL getURL() {
+        return url;
+    }
+    public synchronized String getVideoCodec() {
+        return vcodec;
+    }
+    public synchronized String getAudioCodec() {
+        return acodec;
+    }
+    public synchronized long getTotalFrames() {
+        return totalFrames;
+    }
+    public synchronized long getBitrate() {
+        return bps;
+    }
+    public synchronized int getFramerate() {
+        return fps;
+    }
+    public synchronized int getWidth() {
+        return width;
+    }
+    public synchronized int getHeight() {
+        return height;
+    }
+    public synchronized String toString() {
+        return "OMXInstance [ stream [ video [ "+vcodec+", "+width+"x"+height+", "+fps+"fps, "+bps+"bsp, "+totalFrames+"f ] ] ]";
+    }
+
+    /**
+     * Java callback method issued by the native OMX backend
+     */
+    private void saveAttributes() {
+        o_width = width;
+        o_height = height;
+        o_fps = fps;
+        o_bps = bps;
+        o_totalFrames = totalFrames;
+    }
+
+    private void attributesUpdated() {
+        int event_mask = 0;
+        if( o_width != width || o_height != height ) {
+            event_mask |= OMXEventListener.EVENT_CHANGE_SIZE;
+        }   
+        if( o_fps != fps ) {
+            event_mask |= OMXEventListener.EVENT_CHANGE_FPS;
+        }
+        if( o_bps != bps ) {
+            event_mask |= OMXEventListener.EVENT_CHANGE_BPS;
+        }
+        if( o_totalFrames != totalFrames ) {
+            event_mask |= OMXEventListener.EVENT_CHANGE_LENGTH;
+        }
+        if(0==event_mask) {
+            return;
+        }
+
+        ArrayList listeners = null;
+        synchronized(this) {
+            listeners = eventListeners;
+        }
+        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
+            OMXEventListener l = (OMXEventListener) i.next();
+            l.changedAttributes(this, event_mask);
+        }
+    }
+    
+    private String replaceAll(String orig, String search, String repl) {
+        String dest=null;
+        // In case replaceAll / java.util.regex.* is not supported (-> CVM)
+        int i=0,j;
+        dest = new String();
+        while((j=orig.indexOf(search, i))>=0) {
+            dest=dest.concat(orig.substring(i, j));
+            dest=dest.concat(repl);
+            i=j+1;
+        }
+        return dest.concat(orig.substring(i, orig.length()));
+    }
+
+    private void removeAllEGLImageTexture2D(GL gl) {
+        if (moviePtr != 0) {
+            if(null==eglExt) {
+                throw new RuntimeException("No valid EGLExt");
+            }
+
+            texture = null;
+            for(int i=0; i<textureNum; i++) {
+                if(null!=eglImgTexs[i]) {
+                    if(0!=eglImgTexs[i].image) {
+                        eglExt.eglDestroyImageKHR(
+                            eglDisplay,
+                            eglImgTexs[i].image);
+                    }
+                    if(0!=eglImgTexs[i].sync) {
+                        eglExt.eglDestroySyncKHR(eglImgTexs[i].sync);
+                    }
+                    if(null!=gl) {
+                        eglImgTexs[i].texture.destroy(gl);
+                    }
+                    eglImgTexs[i]=null;
+                }
+            }
+            eglImgTexsMap.clear();
+        }
+    }
+
+    private void errorCheckGL(GL gl, String s) {
+        int e;
+        if( (e=gl.glGetError()) != GL.GL_NO_ERROR ) {
+            System.out.println("GL Error: ("+s+"): "+e);
+        }
+    }
+
+    private void errorCheckEGL(String s) {
+        int e;
+        if( (e=EGL.eglGetError()) != EGL.EGL_SUCCESS ) {
+            System.out.println("EGL Error: ("+s+"): "+e);
+        }
+    }
+
+    
+    //
+    // OMXEventListener Support
+    //
+
+    public synchronized void addEventListener(OMXEventListener l) {
+        if(l == null) {
+            return;
+        }
+        ArrayList newEventListeners = (ArrayList) eventListeners.clone();
+        newEventListeners.add(l);
+        eventListeners = newEventListeners;
+    }
+
+    public synchronized void removeEventListener(OMXEventListener l) {
+        if (l == null) {
+            return;
+        }
+        ArrayList newEventListeners = (ArrayList) eventListeners.clone();
+        newEventListeners.remove(l);
+        eventListeners = newEventListeners;
+    }
+
+    public synchronized OMXEventListener[] getEventListeners() {
+        return (OMXEventListener[]) eventListeners.toArray();
+    }
+
+    private ArrayList eventListeners = new ArrayList();
+
+}
+
diff --git a/src/jogl/classes/com/sun/javafx/audio/windows/waveout/Audio.java b/src/jogl/classes/com/sun/javafx/audio/windows/waveout/Audio.java
deleted file mode 100755
index 8e4e97b0c..000000000
--- a/src/jogl/classes/com/sun/javafx/audio/windows/waveout/Audio.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.javafx.audio.windows.waveout;
-
-import java.io.*;
-
-public class Audio {
-    private static Audio instance = null;
-    private Mixer mixer;
-
-    public synchronized static Audio getInstance() {
-        if (instance == null) {
-            instance = new Audio();
-        }
-        return instance;
-    }
-
-    private Audio() {
-        mixer = Mixer.getMixer();
-    }
-
-    public Mixer getMixer() {
-        return mixer;
-    }
-
-    public Track newTrack(File file) throws IOException
-    {
-        Track res = new Track(file);
-        mixer.add(res);
-        return res;
-    }
-
-    public void shutdown() {
-        mixer.shutdown();
-    }
-}
diff --git a/src/jogl/classes/com/sun/javafx/audio/windows/waveout/Mixer.java b/src/jogl/classes/com/sun/javafx/audio/windows/waveout/Mixer.java
deleted file mode 100755
index 814a74a8c..000000000
--- a/src/jogl/classes/com/sun/javafx/audio/windows/waveout/Mixer.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.javafx.audio.windows.waveout;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-
-// Needed only for NIO workarounds on CVM
-import java.lang.reflect.*;
-
-public class Mixer {
-    // This class is a singleton
-    private static Mixer mixer;
-
-    private volatile boolean shutdown;
-    private volatile Object shutdownLock = new Object();
-    private volatile boolean shutdownDone;
-
-    // Windows Event object
-    private long event;
-
-    private volatile ArrayList/*<Track>*/ tracks = new ArrayList();
-
-    private Vec3f leftSpeakerPosition  = new Vec3f(-1, 0, 0);
-    private Vec3f rightSpeakerPosition = new Vec3f( 1, 0, 0);
-
-    private float falloffFactor = 1.0f;
-
-    static {
-        mixer = new Mixer();
-    }
-
-    private Mixer() {
-        event = CreateEvent();
-        new FillerThread().start();
-        MixerThread m = new MixerThread();
-        m.setPriority(Thread.MAX_PRIORITY - 1);
-        m.start();
-    }
-
-    public static Mixer getMixer() {
-        return mixer;
-    }
-
-    synchronized void add(Track track) {
-        ArrayList/*<Track>*/ newTracks = (ArrayList) tracks.clone();
-        newTracks.add(track);
-        tracks = newTracks;
-    }
-
-    synchronized void remove(Track track) {
-        ArrayList/*<Track>*/ newTracks = (ArrayList) tracks.clone();
-        newTracks.remove(track);
-        tracks = newTracks;
-    }
-
-    // NOTE: due to a bug on the APX device, we only have mono sounds,
-    // so we currently only pay attention to the position of the left
-    // speaker
-    public void setLeftSpeakerPosition(float x, float y, float z) {
-        leftSpeakerPosition.set(x, y, z);
-    }
-
-    // NOTE: due to a bug on the APX device, we only have mono sounds,
-    // so we currently only pay attention to the position of the left
-    // speaker
-    public void setRightSpeakerPosition(float x, float y, float z) {
-        rightSpeakerPosition.set(x, y, z);
-    }
-
-    /** This defines a scale factor of sorts -- the higher the number,
-        the larger an area the sound will affect. Default value is
-        1.0f. Valid values are [1.0f, ...]. The formula for the gain
-        for each channel is
-<PRE>
-     falloffFactor
-  -------------------
-  falloffFactor + r^2
-</PRE>
-*/
-    public void setFalloffFactor(float factor) {
-        falloffFactor = factor;
-    }
-
-    public void shutdown() {
-        synchronized(shutdownLock) {
-            shutdown = true;
-            SetEvent(event);
-            try {
-                shutdownLock.wait();
-            } catch (InterruptedException e) {
-            }
-        }
-    }
-
-    class FillerThread extends Thread {
-        FillerThread() {
-            super("Mixer Thread");
-        }
-
-        public void run() {
-            while (!shutdown) {
-                List/*<Track>*/ curTracks = tracks;
-
-                for (Iterator iter = curTracks.iterator(); iter.hasNext(); ) {
-                    Track track = (Track) iter.next();
-                    try {
-                        track.fill();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                        remove(track);
-                    }
-                }
-
-                try {
-                    // Run ten times per second
-                    Thread.sleep(100);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    class MixerThread extends Thread {
-        // Temporary mixing buffer
-        // Interleaved left and right channels
-        float[] mixingBuffer;
-        private Vec3f temp = new Vec3f();
-
-        MixerThread() {
-            super("Mixer Thread");
-            if (!initializeWaveOut(event)) {
-                throw new InternalError("Error initializing waveout device");
-            }
-        }
-
-        public void run() {
-            while (!shutdown) {
-                // Get the next buffer
-                long mixerBuffer = getNextMixerBuffer();
-                if (mixerBuffer != 0) {
-                    ByteBuffer buf = getMixerBufferData(mixerBuffer);
-
-                    if (buf == null) {
-                        // This is happening on CVM because
-                        // JNI_NewDirectByteBuffer isn't implemented
-                        // by default and isn't compatible with the
-                        // JSR-239 NIO implementation (apparently)
-                        buf = newDirectByteBuffer(getMixerBufferDataAddress(mixerBuffer),
-                                                  getMixerBufferDataCapacity(mixerBuffer));
-                    }
-
-                    if (buf == null) {
-                        throw new InternalError("Couldn't wrap the native address with a direct byte buffer");
-                    }
-
-                    // System.out.println("Mixing buffer");
-
-                    // If we don't have enough samples in our mixing buffer, expand it
-                    // FIXME: knowledge of native output rendering format
-                    if ((mixingBuffer == null) || (mixingBuffer.length < (buf.capacity() / 2 /* bytes / sample */))) {
-                        mixingBuffer = new float[buf.capacity() / 2];
-                    } else {
-                        // Zap it
-                        for (int i = 0; i < mixingBuffer.length; i++) {
-                            mixingBuffer[i] = 0.0f;
-                        }
-                    }
-
-                    // This assertion should be in place if we have stereo
-                    if ((mixingBuffer.length % 2) != 0) {
-                        String msg = "FATAL ERROR: odd number of samples in the mixing buffer";
-                        System.out.println(msg);
-                        throw new InternalError(msg);
-                    }
-
-                    // Run down all of the registered tracks mixing them in
-                    List/*<Track>*/ curTracks = tracks;
-
-                    for (Iterator iter = curTracks.iterator(); iter.hasNext(); ) {
-                        Track track = (Track) iter.next();
-                        // Consider only playing tracks
-                        if (track.isPlaying()) {
-                            // First recompute its gain
-                            Vec3f pos = track.getPosition();
-                            float leftGain  = gain(pos, leftSpeakerPosition);
-                            float rightGain = gain(pos, rightSpeakerPosition);
-                            // Now mix it in
-                            int i = 0;
-                            while (i < mixingBuffer.length) {
-                                if (track.hasNextSample()) {
-                                    float sample = track.nextSample();
-                                    mixingBuffer[i++] = sample * leftGain;
-                                    mixingBuffer[i++] = sample * rightGain;
-                                } else {
-                                    // This allows tracks to stall without being abruptly cancelled
-                                    if (track.done()) {
-                                        remove(track);
-                                    }
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    // Now that we have our data, send it down to the card
-                    int outPos = 0;
-                    for (int i = 0; i < mixingBuffer.length; i++) {
-                        short val = (short) mixingBuffer[i];
-                        buf.put(outPos++, (byte)  val);
-                        buf.put(outPos++, (byte) (val >> 8));
-                    }
-                    if (!prepareMixerBuffer(mixerBuffer)) {
-                        throw new RuntimeException("Error preparing mixer buffer");
-                    }
-                    if (!writeMixerBuffer(mixerBuffer)) {
-                        throw new RuntimeException("Error writing mixer buffer to device");
-                    }
-                } else {
-                    // System.out.println("No mixer buffer available");
-
-                    // Wait for a buffer to become available
-                    if (!WaitForSingleObject(event)) {
-                        throw new RuntimeException("Error while waiting for event object");
-                    }
-
-                    /*
-                    try {
-                        Thread.sleep(10);
-                    } catch (InterruptedException e) {
-                    }
-                    */
-                }
-            }
-
-            // Need to shut down
-            shutdownWaveOut();
-            synchronized(shutdownLock) {
-                shutdownLock.notifyAll();
-            }
-        }
-
-        // This defines the 3D spatialization gain function.
-        // The function is defined as:
-        //    falloffFactor
-        // -------------------
-        // falloffFactor + r^2
-        private float gain(Vec3f pos, Vec3f speakerPos) {
-            temp.sub(pos, speakerPos);
-            float dotp = temp.dot(temp);
-            return (falloffFactor / (falloffFactor + dotp));
-        }
-    }
-
-    // Initializes waveout device
-    private static native boolean initializeWaveOut(long eventObject);
-    // Shuts down waveout device
-    private static native void shutdownWaveOut();
-
-    // Gets the next (opaque) buffer of data to fill from the native
-    // code, or 0 if none was available yet (it should not happen that
-    // none is available the way the code is written).
-    private static native long getNextMixerBuffer();
-    // Gets the next ByteBuffer to fill out of the mixer buffer. It
-    // requires interleaved left and right channel samples, 16 signed
-    // bits per sample, little endian. Implicit 44.1 kHz sample rate.
-    private static native ByteBuffer getMixerBufferData(long mixerBuffer);
-    // We need these to work around the lack of
-    // JNI_NewDirectByteBuffer in CVM + the JSR 239 NIO classes
-    private static native long getMixerBufferDataAddress(long mixerBuffer);
-    private static native int  getMixerBufferDataCapacity(long mixerBuffer);
-    // Prepares this mixer buffer for writing to the device.
-    private static native boolean prepareMixerBuffer(long mixerBuffer);
-    // Writes this mixer buffer to the device.
-    private static native boolean writeMixerBuffer(long mixerBuffer);
-
-    // Helpers to prevent mixer thread from busy waiting
-    private static native long CreateEvent();
-    private static native boolean WaitForSingleObject(long event);
-    private static native void SetEvent(long event);
-    private static native void CloseHandle(long handle);
-
-    // We need a reflective hack to wrap a direct ByteBuffer around
-    // the native memory because JNI_NewDirectByteBuffer doesn't work
-    // in CVM + JSR-239 NIO
-    private static Class directByteBufferClass;
-    private static Constructor directByteBufferConstructor;
-    private static Map createdBuffers = new HashMap(); // Map Long, ByteBuffer
-
-    private static ByteBuffer newDirectByteBuffer(long address, long capacity) {
-        Long key = new Long(address);
-        ByteBuffer buf = (ByteBuffer) createdBuffers.get(key);
-        if (buf == null) {
-            buf = newDirectByteBufferImpl(address, capacity);
-            if (buf != null) {
-                createdBuffers.put(key, buf);
-            }
-        }
-        return buf;
-    }
-    private static ByteBuffer newDirectByteBufferImpl(long address, long capacity) {
-        if (directByteBufferClass == null) {
-            try {
-                directByteBufferClass = Class.forName("java.nio.DirectByteBuffer");
-                byte[] tmp = new byte[0];
-                directByteBufferConstructor =
-                    directByteBufferClass.getDeclaredConstructor(new Class[] { Integer.TYPE,
-                                                                               tmp.getClass(),
-                                                                               Integer.TYPE });
-                directByteBufferConstructor.setAccessible(true);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        
-        if (directByteBufferConstructor != null) {
-            try {
-                return (ByteBuffer)
-                    directByteBufferConstructor.newInstance(new Object[] {
-                            new Integer((int) capacity),
-                            null,
-                            new Integer((int) address)
-                        });
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-}
diff --git a/src/jogl/classes/com/sun/javafx/audio/windows/waveout/SoundBuffer.java b/src/jogl/classes/com/sun/javafx/audio/windows/waveout/SoundBuffer.java
deleted file mode 100755
index b0404673e..000000000
--- a/src/jogl/classes/com/sun/javafx/audio/windows/waveout/SoundBuffer.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.javafx.audio.windows.waveout;
-
-import java.io.*;
-
-class SoundBuffer {
-    private byte[] data;
-    private boolean needsByteSwap;
-    private int numBytes;
-    private int bytesPerSample;
-    private int numSamples;
-    private boolean playing;
-    private boolean empty;
-
-    // Note: needsByteSwap argument makes assumptions about the format
-    SoundBuffer(int size, int bytesPerSample, boolean needsByteSwap) {
-        this.bytesPerSample = bytesPerSample;
-        this.needsByteSwap = needsByteSwap;
-        data = new byte[size * bytesPerSample];
-        empty = true;
-    }
-
-    boolean playing() {
-        return playing;
-    }
-
-    void playing(boolean playing) {
-        this.playing = playing;
-    }
-
-    boolean empty() {
-        return empty;
-    }
-
-    void empty(boolean empty) {
-        this.empty = empty;
-    }
-
-    void fill(InputStream input) throws IOException {
-        synchronized(this) {
-            if (playing) {
-                throw new IllegalStateException("Can not fill a buffer that is playing");
-            }
-        }
-
-        empty(true);
-        int num = input.read(data);
-        if (num > 0) {
-            numBytes = num;
-            numSamples = numBytes / bytesPerSample;
-            empty(false);
-            if ((numBytes % bytesPerSample) != 0) {
-                System.out.println("WARNING: needed integral multiple of " + bytesPerSample +
-                                   " bytes, but read " + numBytes + " bytes");
-            }
-        } else {
-            numBytes = 0;
-        }
-    }
-
-    int numSamples() {
-        return numSamples;
-    }
-
-    // This is called by the mixer and must be extremely fast
-    // FIXME: may want to reconsider use of floating point at this point
-    // FIXME: assumes all sounds are of the same format to avoid normalization
-    float getSample(int sample) {
-        int startByte = sample * bytesPerSample;
-        // FIXME: assumes no more than 4 bytes per sample
-        int res = 0;
-        if (needsByteSwap) {
-            for (int i = startByte + bytesPerSample - 1; i >= startByte; i--) {
-                res <<= 8;
-                res |= (data[i] & 0xff);
-            }
-        } else {
-            int endByte = startByte + bytesPerSample - 1;
-            for (int i = startByte; i <= endByte; i++) {
-                res <<= 8;
-                res |= (data[i] & 0xff);
-            }
-        }
-        // Sign extend
-        if (bytesPerSample == 2) {
-            res = (short) res;
-        } else if (bytesPerSample == 1) {
-            res = (byte) res;
-        }
-
-        return (float) res;
-    }
-}
diff --git a/src/jogl/classes/com/sun/javafx/audio/windows/waveout/TestSpatialization.java b/src/jogl/classes/com/sun/javafx/audio/windows/waveout/TestSpatialization.java
deleted file mode 100755
index 4bf967a02..000000000
--- a/src/jogl/classes/com/sun/javafx/audio/windows/waveout/TestSpatialization.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.javafx.audio.windows.waveout;
-
-import java.io.*;
-import javax.media.opengl.GLDrawableFactory;
-
-public class TestSpatialization {
-    public static void main(String[] args) {
-        if (args.length != 1) {
-            System.out.println("Usage: TestSpatialization [file name]");
-            System.exit(1);
-        }
-
-        try {
-            // FIXME: this is a hack to get the native library loaded
-            try {
-                GLDrawableFactory.getFactory(NativeWindow.class);
-            } catch (Exception e) {}
-            // Initialize the audio subsystem
-            Audio audio = Audio.getInstance();
-            // Create a track
-            Track track = audio.newTrack(new File(args[0]));
-            track.setPosition(1, 0, 0);
-            // Run for ten seconds
-            long startTime = System.currentTimeMillis();
-            long duration = 10000;
-            long curTime = 0;
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException e) {
-            }
-            System.out.println("Playing...");
-            track.setLooping(true);
-            track.play();
-            while ((curTime = System.currentTimeMillis()) < startTime + duration) {
-                // Make one revolution every two seconds
-                float rads = (float) (((2 * Math.PI) * (((float) (curTime - startTime)) / 1000.0f)) / 2);
-                track.setPosition((float) Math.cos(rads), 0, (float) Math.sin(rads));
-                // Would like to make it go in a circle, but since
-                // stereo doesn't work now, make it move along a line
-                // track.setPosition(-1.0f, 0, 2.0f * (float) Math.sin(rads));
-                // Sleep a little between updates
-                try {
-                    Thread.sleep(10);
-                } catch (InterruptedException e) {
-                }
-            }
-            System.out.println("Shutting down audio subsystem");
-            audio.shutdown();
-            System.out.println("Exiting.");
-            System.exit(0);
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-}
diff --git a/src/jogl/classes/com/sun/javafx/audio/windows/waveout/Track.java b/src/jogl/classes/com/sun/javafx/audio/windows/waveout/Track.java
deleted file mode 100755
index 190396112..000000000
--- a/src/jogl/classes/com/sun/javafx/audio/windows/waveout/Track.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.javafx.audio.windows.waveout;
-
-import java.io.*;
-import java.nio.*;
-
-public class Track {
-    // Default number of samples per buffer
-    private static final int BUFFER_SIZE = 32768;
-    // Number of bytes per sample (FIXME: dependence on audio format)
-    static final int BYTES_PER_SAMPLE = 2;
-    // Whether we need byte swapping (FIXME: dependence on audio format)
-    static final boolean NEEDS_BYTE_SWAP = true;
-
-    // This is the buffer this track is currently playing from
-    private SoundBuffer activeBuffer;
-    // This is the sample position in the active buffer
-    private int samplePosition;
-    // This is the total number of samples in the file
-    private int totalSamples;
-    // This is the total number of samples we have read
-    private int samplesRead;
-    // This is the buffer that the background filler thread may be filling
-    private SoundBuffer fillingBuffer;
-    // If we're playing the file, this is its input stream
-    private InputStream input;
-    // Keep around the file name
-    private File file;
-    // Whether we're playing this sound
-    private boolean playing;
-    // Whether we're looping this sound
-    private boolean looping;
-    // The position of this sound; defaults to being at the origin
-    private volatile Vec3f position = new Vec3f();
-
-    Track(File file) throws IOException {
-        if (!file.getName().endsWith(".rawsound")) {
-            throw new IOException("Unsupported file format (currently supports only raw sounds)");
-        }
-
-        this.file = file;
-        openInput();
-
-        // Allocate the buffers
-        activeBuffer  = new SoundBuffer(BUFFER_SIZE, BYTES_PER_SAMPLE, NEEDS_BYTE_SWAP);
-        fillingBuffer = new SoundBuffer(BUFFER_SIZE, BYTES_PER_SAMPLE, NEEDS_BYTE_SWAP);
-
-        // Fill the first buffer immediately
-        fill();
-        swapBuffers();
-    }
-
-    private void openInput() throws IOException {
-        input = new BufferedInputStream(new FileInputStream(file));
-        totalSamples = (int) file.length() / BYTES_PER_SAMPLE;
-    }
-
-    public File getFile() {
-        return file;
-    }
-
-    public synchronized void play() {
-        if (input == null) {
-            try {
-                openInput();
-                // Fill it immediately
-                fill();
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
-        }
-
-        playing = true;
-    }
-
-    public synchronized boolean isPlaying() {
-        return playing;
-    }
-
-    public synchronized void setLooping(boolean looping) {
-        this.looping = looping;
-    }
-
-    public synchronized boolean isLooping() {
-        return looping;
-    }
-
-    public void setPosition(float x, float y, float z) {
-        position = new Vec3f(x, y, z);
-    }
-
-    synchronized void fill() throws IOException {
-        if (input == null) {
-            return;
-        }
-        SoundBuffer curBuffer = fillingBuffer;
-        if (!curBuffer.empty()) {
-            return;
-        }
-        curBuffer.fill(input);
-        if (curBuffer.empty()) {
-            // End of file
-            InputStream tmp = null;
-            synchronized(this) {
-                tmp = input;
-                input = null;
-            }
-            tmp.close();
-
-            // If looping, re-open
-            if (isLooping()) {
-                openInput();
-                // and fill
-                fill();
-            }
-        }
-    }
-
-    // These are only for use by the Mixer
-    private float leftGain;
-    private float rightGain;
-    
-    void setLeftGain(float leftGain) {
-        this.leftGain = leftGain;
-    }
-
-    float getLeftGain() {
-        return leftGain;
-    }
-
-    void setRightGain(float rightGain) {
-        this.rightGain = rightGain;
-    }
-
-    float getRightGain() {
-        return rightGain;
-    }
-
-    Vec3f getPosition() {
-        return position;
-    }
-
-    // This is called by the mixer and must be extremely fast
-    // Note this assumes mono sounds (FIXME)
-    boolean hasNextSample() {
-        return (!activeBuffer.empty() && samplePosition < activeBuffer.numSamples());
-    }
-
-    // This is called by the mixer and must be extremely fast
-    float nextSample() {
-        float res = activeBuffer.getSample(samplePosition++);
-        ++samplesRead;
-        if (!hasNextSample()) {
-            swapBuffers();
-            samplePosition = 0;
-            if (done()) {
-                playing = false;
-            }
-        }
-        return res;
-    }
-
-    synchronized void swapBuffers() {
-        SoundBuffer tmp = activeBuffer;
-        activeBuffer = fillingBuffer;
-        fillingBuffer = tmp;
-        fillingBuffer.empty(true);
-    }
-
-    // This provides a more robust termination condition
-    boolean done() {
-        return (samplesRead == totalSamples) && !looping;
-    }
-}
diff --git a/src/jogl/classes/com/sun/javafx/audio/windows/waveout/Vec3f.java b/src/jogl/classes/com/sun/javafx/audio/windows/waveout/Vec3f.java
deleted file mode 100755
index 9a3038e35..000000000
--- a/src/jogl/classes/com/sun/javafx/audio/windows/waveout/Vec3f.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.javafx.audio.windows.waveout;
-
-/** 3-element single-precision vector */
-
-class Vec3f {
-  public static final Vec3f X_AXIS     = new Vec3f( 1,  0,  0);
-  public static final Vec3f Y_AXIS     = new Vec3f( 0,  1,  0);
-  public static final Vec3f Z_AXIS     = new Vec3f( 0,  0,  1);
-  public static final Vec3f NEG_X_AXIS = new Vec3f(-1,  0,  0);
-  public static final Vec3f NEG_Y_AXIS = new Vec3f( 0, -1,  0);
-  public static final Vec3f NEG_Z_AXIS = new Vec3f( 0,  0, -1);
-
-  private float x;
-  private float y;
-  private float z;
-
-  public Vec3f() {}
-
-  public Vec3f(Vec3f arg) {
-    set(arg);
-  }
-
-  public Vec3f(float x, float y, float z) {
-    set(x, y, z);
-  }
-
-  public Vec3f copy() {
-    return new Vec3f(this);
-  }
-
-  public void set(Vec3f arg) {
-    set(arg.x, arg.y, arg.z);
-  }
-
-  public void set(float x, float y, float z) {
-    this.x = x;
-    this.y = y;
-    this.z = z;
-  }
-
-  /** Sets the ith component, 0 <= i < 3 */
-  public void set(int i, float val) {
-    switch (i) {
-    case 0: x = val; break;
-    case 1: y = val; break;
-    case 2: z = val; break;
-    default: throw new IndexOutOfBoundsException();
-    }
-  }
-
-  /** Gets the ith component, 0 <= i < 3 */
-  public float get(int i) {
-    switch (i) {
-    case 0: return x;
-    case 1: return y;
-    case 2: return z;
-    default: throw new IndexOutOfBoundsException();
-    }
-  }
-
-  public float x() { return x; }
-  public float y() { return y; }
-  public float z() { return z; }
-
-  public void setX(float x) { this.x = x; }
-  public void setY(float y) { this.y = y; }
-  public void setZ(float z) { this.z = z; }
-
-  public float dot(Vec3f arg) {
-    return x * arg.x + y * arg.y + z * arg.z;
-  }
-
-  public float length() {
-    return (float) Math.sqrt(lengthSquared());
-  }
-
-  public float lengthSquared() {
-    return this.dot(this);
-  }
-
-  public void normalize() {
-    float len = length();
-    if (len == 0.0f) return;
-    scale(1.0f / len);
-  }
-
-  /** Returns this * val; creates new vector */
-  public Vec3f times(float val) {
-    Vec3f tmp = new Vec3f(this);
-    tmp.scale(val);
-    return tmp;
-  }
-
-  /** this = this * val */
-  public void scale(float val) {
-    x *= val;
-    y *= val;
-    z *= val;
-  }
-
-  /** Returns this + arg; creates new vector */
-  public Vec3f plus(Vec3f arg) {
-    Vec3f tmp = new Vec3f();
-    tmp.add(this, arg);
-    return tmp;
-  }
-
-  /** this = this + b */
-  public void add(Vec3f b) {
-    add(this, b);
-  }
-
-  /** this = a + b */
-  public void add(Vec3f a, Vec3f b) {
-    x = a.x + b.x;
-    y = a.y + b.y;
-    z = a.z + b.z;
-  }
-
-  /** Returns this + s * arg; creates new vector */
-  public Vec3f addScaled(float s, Vec3f arg) {
-    Vec3f tmp = new Vec3f();
-    tmp.addScaled(this, s, arg);
-    return tmp;
-  }
-
-  /** this = a + s * b */
-  public void addScaled(Vec3f a, float s, Vec3f b) {
-    x = a.x + s * b.x;
-    y = a.y + s * b.y;
-    z = a.z + s * b.z;
-  }
-
-  /** Returns this - arg; creates new vector */
-  public Vec3f minus(Vec3f arg) {
-    Vec3f tmp = new Vec3f();
-    tmp.sub(this, arg);
-    return tmp;
-  }
-
-  /** this = this - b */
-  public void sub(Vec3f b) {
-    sub(this, b);
-  }
-
-  /** this = a - b */
-  public void sub(Vec3f a, Vec3f b) {
-    x = a.x - b.x;
-    y = a.y - b.y;
-    z = a.z - b.z;
-  }
-
-  /** Returns this cross arg; creates new vector */
-  public Vec3f cross(Vec3f arg) {
-    Vec3f tmp = new Vec3f();
-    tmp.cross(this, arg);
-    return tmp;
-  }
-
-  /** this = a cross b. NOTE: "this" must be a different vector than
-      both a and b. */
-  public void cross(Vec3f a, Vec3f b) {
-    x = a.y * b.z - a.z * b.y;
-    y = a.z * b.x - a.x * b.z;
-    z = a.x * b.y - a.y * b.x;
-  }
-
-  /** Sets each component of this vector to the product of the
-      component with the corresponding component of the argument
-      vector. */
-  public void componentMul(Vec3f arg) {
-    x *= arg.x;
-    y *= arg.y;
-    z *= arg.z;
-  }
-
-  public String toString() {
-    return "(" + x + ", " + y + ", " + z + ")";
-  }
-}
diff --git a/src/jogl/classes/com/sun/openmax/OMXEventListener.java b/src/jogl/classes/com/sun/openmax/OMXEventListener.java
deleted file mode 100644
index ebbf7129f..000000000
--- a/src/jogl/classes/com/sun/openmax/OMXEventListener.java
+++ /dev/null
@@ -1,14 +0,0 @@
-
-package com.sun.openmax;
-
-public interface OMXEventListener {
-
-    static final int EVENT_CHANGE_SIZE = 1<<0;
-    static final int EVENT_CHANGE_FPS  = 1<<1;
-    static final int EVENT_CHANGE_BPS  = 1<<2;
-    static final int EVENT_CHANGE_LENGTH  = 1<<3;
-
-    public void changedAttributes(OMXInstance omx, int event_mask);
-
-}
-
diff --git a/src/jogl/classes/com/sun/openmax/OMXInstance.java b/src/jogl/classes/com/sun/openmax/OMXInstance.java
deleted file mode 100644
index 84bd87809..000000000
--- a/src/jogl/classes/com/sun/openmax/OMXInstance.java
+++ /dev/null
@@ -1,509 +0,0 @@
-
-package com.sun.openmax;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.GLU;
-import com.jogamp.opengl.util.texture.*;
-
-import com.jogamp.opengl.impl.egl.EGL;
-import com.jogamp.opengl.impl.egl.EGLContext;
-import com.jogamp.opengl.impl.egl.EGLDrawable;
-import com.jogamp.opengl.impl.egl.EGLExt;
-
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.*;
-
-public class OMXInstance {
-    private long moviePtr = 0;
-
-    protected String path   = null;
-    protected URL url   = null;
-    
-    // *** Texture impl
-    protected Texture texture = null; // holds the last fetched texture
-
-    protected float playSpeed = 1.0f;
-
-    /** 
-     * The following data is set by the setStream function,
-     * and may be set by the native OMX implementation,
-     * in case the stream attributes changes (see attributesUpdated)
-     */
-    protected int width = 0;
-    protected int height = 0;
-    protected int fps = 0; // frames per seconds
-    protected long bps = 0; // bits per seconds
-    protected long totalFrames = 0; // duration in frames
-    protected String acodec = null;
-    protected String vcodec = null;
-
-    /**
-     * Old stream values, before the last attributesUpdated)
-     */
-    protected int o_width = 0;
-    protected int o_height = 0;
-    protected int o_fps = 0; // frames per seconds
-    protected long o_bps = 0; // bits per seconds
-    protected long o_totalFrames = 0; // duration in frames
-    
-    static class EGLImageTexture {
-        public EGLImageTexture(com.jogamp.opengl.util.texture.Texture t, long i, long s) {
-            texture = t; image = i; sync = s;
-        }
-        public String toString() {
-            return "EGLImageTexture[" + texture + ", image " + image + ", sync "+sync+"]";
-        }
-        protected com.jogamp.opengl.util.texture.Texture texture;
-        protected long image;
-        protected long sync;
-    }
-    private EGLImageTexture[] eglImgTexs=null;
-    private HashMap eglImgTexsMap = new HashMap();
-    protected int textureNum;
-    
-    private EGLExt eglExt = null;
-    private long eglSurface = 0;
-    private long eglDisplay = 0;
-    private long eglContext = 0;
-    private int sWidth=0, sHeight=0;
-
-    private GL initGLData(GL gl) {
-        if(null==gl) {
-            throw new RuntimeException("No current GL");
-        }
-        EGLContext eglCtx = (EGLContext) gl.getContext();
-        if(null==eglCtx) {
-            throw new RuntimeException("No current EGL context");
-        }
-        EGLDrawable eglDrawable = (EGLDrawable) eglCtx.getGLDrawable();
-        if(null==eglDrawable) {
-            throw new RuntimeException("No valid drawable");
-        }
-        eglContext = eglCtx.getContext();
-        eglDisplay = eglDrawable.getDisplay();
-        eglSurface = eglDrawable.getSurface();
-        eglExt = eglCtx.getEGLExt();
-        if(null==eglExt) {
-            throw new RuntimeException("No valid EGLExt");
-        }
-
-        int iTmp[] = new int[1];
-        EGL.eglQuerySurface(eglDisplay, eglSurface, EGL.EGL_WIDTH, iTmp, 0);
-        sWidth=iTmp[0];
-        EGL.eglQuerySurface(eglDisplay, eglSurface, EGL.EGL_HEIGHT, iTmp, 0);
-        sHeight=iTmp[0];
-        System.out.println("surface size: "+width+"x"+height);
-        System.out.println(eglDrawable);
-        System.out.println(eglCtx);
-        System.out.println("EGL Extensions : "+EGL.eglQueryString(eglDisplay, EGL.EGL_EXTENSIONS));
-        System.out.println("EGL CLIENT APIs: "+EGL.eglQueryString(eglDisplay, EGL.EGL_CLIENT_APIS));
-        return gl;
-    }
-
-    public OMXInstance() {
-        moviePtr = _createInstance();
-        if(0==moviePtr) {
-            throw new GLException("Couldn't create OMXInstance");
-        }
-    }
-    native long _createInstance();
-
-    public synchronized void setStream(int textureNum, URL u) {
-        if(0==moviePtr) {
-            throw new GLException("OMX native instance null");
-        }
-        this.textureNum=textureNum;
-        url = u;
-        if (url == null) {
-            System.out.println("setURL (null)");
-            stop();
-            return;
-        }
-        path=null;
-        if (url.getProtocol() == null || "file".equals(url.getProtocol())) {
-            // CV only accepts absolute paths
-            try {
-                File file = new File(url.getPath());
-                if (!file.exists()) {
-                    throw new RuntimeException(new FileNotFoundException(file.toString()));
-                }
-                path = file.getCanonicalPath();
-                System.out.println("setURL: path "+path);
-            } catch (Exception e) {
-                e.printStackTrace();
-                throw new RuntimeException(e);
-            }
-        }
-        path = replaceAll(path, "\\", "/").trim();
-        if(null==path) {
-            throw new RuntimeException("Couldn't parse stream URL: "+url);
-        }
-        System.out.println("setURL: clean path "+path);
-
-        System.out.println("setURL: p1 "+this);
-        _setStream(moviePtr, textureNum, path);
-        System.out.println("setURL: p2 "+this);
-    }
-    native void _setStream(long moviePtr, int textureNum, String path);
-
-    public synchronized void setStreamAllEGLImageTexture2D(GL gl) {
-        if(0==moviePtr) {
-            throw new GLException("OMX native instance null");
-        }
-        if(null==vcodec) {
-            return;
-        }
-        gl = initGLData(gl);
-
-        if(null!=eglImgTexs) {
-            removeAllEGLImageTexture2D(gl);
-        } else {
-            eglImgTexs = new EGLImageTexture[textureNum];
-        }
-
-        int[] tmp = new int[1];
-        int tex, e;
-
-        errorCheckGL(gl, "i.1");
-        gl.glEnable(gl.GL_TEXTURE_2D);
-        errorCheckGL(gl, "i.2");
-
-        for(int i=0; i<textureNum; i++) {
-            String s0 = String.valueOf(i);
-            gl.glGenTextures(1, tmp, 0);
-            tex=tmp[0];
-            if( (e=gl.glGetError()) != GL.GL_NO_ERROR || 0>tex ) {
-                throw new RuntimeException("TextureName creation failed: "+e);
-            }
-            gl.glBindTexture(gl.GL_TEXTURE_2D, tex);
-
-            // create space for buffer with a texture
-            gl.glTexImage2D(
-                    gl.GL_TEXTURE_2D, // target
-                    0,                // level
-                    gl.GL_RGBA,       // internal format
-                    width,            // width
-                    height,           // height
-                    0,                // border
-                    gl.GL_RGBA,       // format
-                    gl.GL_UNSIGNED_BYTE, // type
-                    null);            // pixels -- will be provided later
-            gl.glTexParameteri(gl.GL_TEXTURE_2D, gl.GL_TEXTURE_MIN_FILTER, gl.GL_NEAREST);
-            gl.glTexParameteri(gl.GL_TEXTURE_2D, gl.GL_TEXTURE_MAG_FILTER, gl.GL_NEAREST);
-
-            long image=0, sync=0;
-
-            // create EGLImage from texture
-            tmp[0] = EGL.EGL_NONE;
-            image = eglExt.eglCreateImageKHR(
-                        eglDisplay,
-                        eglContext,
-                        eglExt.EGL_GL_TEXTURE_2D_KHR,
-                        tex,
-                        tmp, 0);
-            if (0==image) {
-                throw new RuntimeException("EGLImage creation failed: "+EGL.eglGetError()+", dpy "+eglDisplay+", ctx "+eglContext+", tex "+tex);
-            }
-
-            // Create sync object so that we can be sure that gl has finished
-            // rendering the EGLImage texture before we tell OpenMAX to fill
-            // it with a new frame.
-            tmp[0] = EGL.EGL_NONE;
-            sync = eglExt.eglCreateFenceSyncKHR(
-                    eglDisplay,
-                    eglExt.EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR, tmp, 0);
-
-            _setStreamEGLImageTexture2D(moviePtr, i, tex, image, sync);
-
-            eglImgTexs[i] = new EGLImageTexture(
-                com.jogamp.opengl.util.texture.TextureIO.newTexture(tex,
-                                                                 javax.media.opengl.GL2.GL_TEXTURE_2D,
-                                                                 width,
-                                                                 height,
-                                                                 width,
-                                                                 height,
-                                                                 true),
-                image, sync);
-            eglImgTexsMap.put(new Integer(tex), eglImgTexs[i]);
-        }
-        gl.glDisable(gl.GL_TEXTURE_2D);
-    }
-    native void _setStreamEGLImageTexture2D(long moviePtr, int i, int tex, long image, long sync);
-
-    public synchronized void activateStream() {
-        if(0==moviePtr) {
-            throw new GLException("OMX native instance null");
-        }
-        _activateStream(moviePtr);
-    }
-    native void _activateStream(long moviePtr);
-
-    public synchronized void detachVideoRenderer() {
-        if(0==moviePtr) {
-            throw new GLException("OMX native instance null");
-        }
-        _detachVideoRenderer(moviePtr);
-    }
-    native void _detachVideoRenderer(long moviePtr); // stop before
-
-    public synchronized void attachVideoRenderer() {
-        if(0==moviePtr) {
-            throw new GLException("OMX native instance null");
-        }
-        _attachVideoRenderer(moviePtr);
-    }
-    native void _attachVideoRenderer(long moviePtr); // detach before
-
-    public synchronized void setPlaySpeed(float rate) {
-        if(0==moviePtr) {
-            throw new GLException("OMX native instance null");
-        }
-        _setPlaySpeed(moviePtr, rate);
-        playSpeed = rate;
-    }
-    public synchronized float getPlaySpeed() {
-        return playSpeed;
-    }
-    native void _setPlaySpeed(long moviePtr, float rate);
-
-    /** @return time position after issuing the command */
-    public synchronized float play() {
-        if(0==moviePtr) {
-            throw new GLException("OMX native instance null");
-        }
-        return _play(moviePtr);
-    }
-    native float _play(long moviePtr);
-
-    /** @return time position after issuing the command */
-    public synchronized float pause() {
-        if(0==moviePtr) {
-            throw new GLException("OMX native instance null");
-        }
-        return _pause(moviePtr);
-    }
-    native float _pause(long moviePtr);
-
-    /** @return time position after issuing the command */
-    public synchronized float stop() {
-        if(0==moviePtr) {
-            throw new GLException("OMX native instance null");
-        }
-        return _stop(moviePtr);
-    }
-    native float _stop(long moviePtr);
-
-    /** @return time position after issuing the command */
-    public synchronized float seek(float pos) {
-        if(0==moviePtr) {
-            throw new GLException("OMX native instance null");
-        }
-        return _seek(moviePtr, pos);
-    }
-    native float _seek(long moviePtr, float position);
-
-    public synchronized Texture getLastTextureID() {
-        return texture;
-    }
-    public synchronized Texture getNextTextureID() {
-        if(0==moviePtr) {
-            throw new GLException("OMX native instance null");
-        }
-        texture=null;
-        EGLImageTexture eglImgTex = (EGLImageTexture) eglImgTexsMap.get(new Integer(_getNextTextureID(moviePtr)));
-        if(null!=eglImgTex) {
-            texture = eglImgTex.texture;
-        }
-        return texture;
-    }
-    native int  _getNextTextureID(long moviePtr);
-
-    public synchronized float getCurrentPosition() {
-        if(0==moviePtr) {
-            throw new GLException("OMX native instance null");
-        }
-        return _getCurrentPosition(moviePtr);
-    }
-    native float _getCurrentPosition(long moviePtr);
-
-    public synchronized void destroy(GL gl) {
-        removeAllEGLImageTexture2D(gl);
-        if (moviePtr != 0) {
-            long ptr = moviePtr;
-            moviePtr = 0;
-            _destroyInstance(ptr);
-
-            eglExt=null;
-            eglSurface=0;
-            eglDisplay=0;
-            eglContext=0;
-        }
-    }
-    protected synchronized void finalize() {
-        if (moviePtr != 0) {
-            destroy(null);
-        }
-    }
-    native void _destroyInstance(long moviePtr);
-
-    public synchronized boolean isValid() {
-        return (moviePtr != 0);
-    }
-    public synchronized String getPath() {
-        return path;
-    }
-    public synchronized URL getURL() {
-        return url;
-    }
-    public synchronized String getVideoCodec() {
-        return vcodec;
-    }
-    public synchronized String getAudioCodec() {
-        return acodec;
-    }
-    public synchronized long getTotalFrames() {
-        return totalFrames;
-    }
-    public synchronized long getBitrate() {
-        return bps;
-    }
-    public synchronized int getFramerate() {
-        return fps;
-    }
-    public synchronized int getWidth() {
-        return width;
-    }
-    public synchronized int getHeight() {
-        return height;
-    }
-    public synchronized String toString() {
-        return "OMXInstance [ stream [ video [ "+vcodec+", "+width+"x"+height+", "+fps+"fps, "+bps+"bsp, "+totalFrames+"f ] ] ]";
-    }
-
-    /**
-     * Java callback method issued by the native OMX backend
-     */
-    private void saveAttributes() {
-        o_width = width;
-        o_height = height;
-        o_fps = fps;
-        o_bps = bps;
-        o_totalFrames = totalFrames;
-    }
-
-    private void attributesUpdated() {
-        int event_mask = 0;
-        if( o_width != width || o_height != height ) {
-            event_mask |= OMXEventListener.EVENT_CHANGE_SIZE;
-        }   
-        if( o_fps != fps ) {
-            event_mask |= OMXEventListener.EVENT_CHANGE_FPS;
-        }
-        if( o_bps != bps ) {
-            event_mask |= OMXEventListener.EVENT_CHANGE_BPS;
-        }
-        if( o_totalFrames != totalFrames ) {
-            event_mask |= OMXEventListener.EVENT_CHANGE_LENGTH;
-        }
-        if(0==event_mask) {
-            return;
-        }
-
-        ArrayList listeners = null;
-        synchronized(this) {
-            listeners = eventListeners;
-        }
-        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
-            OMXEventListener l = (OMXEventListener) i.next();
-            l.changedAttributes(this, event_mask);
-        }
-    }
-    
-    private String replaceAll(String orig, String search, String repl) {
-        String dest=null;
-        // In case replaceAll / java.util.regex.* is not supported (-> CVM)
-        int i=0,j;
-        dest = new String();
-        while((j=orig.indexOf(search, i))>=0) {
-            dest=dest.concat(orig.substring(i, j));
-            dest=dest.concat(repl);
-            i=j+1;
-        }
-        return dest.concat(orig.substring(i, orig.length()));
-    }
-
-    private void removeAllEGLImageTexture2D(GL gl) {
-        if (moviePtr != 0) {
-            if(null==eglExt) {
-                throw new RuntimeException("No valid EGLExt");
-            }
-
-            texture = null;
-            for(int i=0; i<textureNum; i++) {
-                if(null!=eglImgTexs[i]) {
-                    if(0!=eglImgTexs[i].image) {
-                        eglExt.eglDestroyImageKHR(
-                            eglDisplay,
-                            eglImgTexs[i].image);
-                    }
-                    if(0!=eglImgTexs[i].sync) {
-                        eglExt.eglDestroySyncKHR(eglImgTexs[i].sync);
-                    }
-                    if(null!=gl) {
-                        eglImgTexs[i].texture.destroy(gl);
-                    }
-                    eglImgTexs[i]=null;
-                }
-            }
-            eglImgTexsMap.clear();
-        }
-    }
-
-    private void errorCheckGL(GL gl, String s) {
-        int e;
-        if( (e=gl.glGetError()) != GL.GL_NO_ERROR ) {
-            System.out.println("GL Error: ("+s+"): "+e);
-        }
-    }
-
-    private void errorCheckEGL(String s) {
-        int e;
-        if( (e=EGL.eglGetError()) != EGL.EGL_SUCCESS ) {
-            System.out.println("EGL Error: ("+s+"): "+e);
-        }
-    }
-
-    
-    //
-    // OMXEventListener Support
-    //
-
-    public synchronized void addEventListener(OMXEventListener l) {
-        if(l == null) {
-            return;
-        }
-        ArrayList newEventListeners = (ArrayList) eventListeners.clone();
-        newEventListeners.add(l);
-        eventListeners = newEventListeners;
-    }
-
-    public synchronized void removeEventListener(OMXEventListener l) {
-        if (l == null) {
-            return;
-        }
-        ArrayList newEventListeners = (ArrayList) eventListeners.clone();
-        newEventListeners.remove(l);
-        eventListeners = newEventListeners;
-    }
-
-    public synchronized OMXEventListener[] getEventListeners() {
-        return (OMXEventListener[]) eventListeners.toArray();
-    }
-
-    private ArrayList eventListeners = new ArrayList();
-
-}
-
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index ca6bc9051..58a0fabbc 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -43,7 +43,7 @@ import javax.media.nativewindow.*;
 
 import java.security.*;
 import com.jogamp.opengl.impl.*;
-import com.sun.nativewindow.impl.NWReflection;
+import com.jogamp.nativewindow.impl.NWReflection;
 
 /** <P> Provides a virtual machine- and operating system-independent
     mechanism for creating {@link GLDrawable}s. </P>
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 6719a76a2..755fae73d 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -39,8 +39,8 @@ package javax.media.opengl;
 import com.jogamp.opengl.impl.DRIHack;
 import com.jogamp.opengl.impl.Debug;
 import com.jogamp.opengl.impl.NativeLibLoader;
-import com.sun.nativewindow.impl.NWReflection;
-import com.sun.nativewindow.impl.jvm.JVMUtil;
+import com.jogamp.nativewindow.impl.NWReflection;
+import com.jogamp.nativewindow.impl.jvm.JVMUtil;
 import java.util.HashMap;
 import java.security.AccessControlContext;
 import java.security.AccessController;
diff --git a/src/jogl/native/audio/Mixer.cpp b/src/jogl/native/audio/Mixer.cpp
index 8843c00ec..821a03246 100755
--- a/src/jogl/native/audio/Mixer.cpp
+++ b/src/jogl/native/audio/Mixer.cpp
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <mmsystem.h>
 #include <mmreg.h>
-#include "com_sun_javafx_audio_windows_waveout_Mixer.h"
+#include "com_jogamp_javafx_audio_windows_waveout_Mixer.h"
 
 static HANDLE event = NULL;
 static HWAVEOUT output = NULL;
@@ -57,7 +57,7 @@ void CALLBACK playbackCallback(HWAVEOUT output,
     }
 }
 
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_initializeWaveOut
+JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_initializeWaveOut
   (JNIEnv *env, jclass unused, jlong eventObject)
 {
     event = (HANDLE) eventObject;
@@ -98,7 +98,7 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_initi
     return JNI_TRUE;
 }
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_shutdownWaveOut
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_shutdownWaveOut
   (JNIEnv *env, jclass unused)
 {
     //    writeString("Pausing\n");
@@ -109,7 +109,7 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_shutdownW
     waveOutClose(output);
 }
 
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_getNextMixerBuffer
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getNextMixerBuffer
   (JNIEnv *env, jclass unused)
 {
     WAVEHDR* hdr = NULL;
@@ -123,28 +123,28 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_getNextM
     return (jlong) hdr;
 }
 
-JNIEXPORT jobject JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_getMixerBufferData
+JNIEXPORT jobject JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getMixerBufferData
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     WAVEHDR* hdr = (WAVEHDR*) mixerBuffer;
     return env->NewDirectByteBuffer(hdr->lpData, hdr->dwBufferLength);
 }
 
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_getMixerBufferDataAddress
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getMixerBufferDataAddress
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     WAVEHDR* hdr = (WAVEHDR*) mixerBuffer;
     return (jlong) hdr->lpData;
 }
 
-JNIEXPORT jint JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_getMixerBufferDataCapacity
+JNIEXPORT jint JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getMixerBufferDataCapacity
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     WAVEHDR* hdr = (WAVEHDR*) mixerBuffer;
     return (jint) hdr->dwBufferLength;
 }
 
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_prepareMixerBuffer
+JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_prepareMixerBuffer
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     MMRESULT res = waveOutPrepareHeader(output,
@@ -156,7 +156,7 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_prepa
     return JNI_FALSE;
 }
 
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_writeMixerBuffer
+JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_writeMixerBuffer
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     MMRESULT res = waveOutWrite(output,
@@ -170,13 +170,13 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_write
     return JNI_FALSE;
 }
 
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_CreateEvent
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_CreateEvent
   (JNIEnv *env, jclass unused)
 {
     return (jlong) CreateEvent(NULL, FALSE, TRUE, NULL);
 }
 
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_WaitForSingleObject
+JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_WaitForSingleObject
   (JNIEnv *env, jclass unused, jlong eventObject)
 {
     DWORD res = WaitForSingleObject((HANDLE) eventObject, INFINITE);
@@ -186,13 +186,13 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_WaitF
     return JNI_FALSE;
 }
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_SetEvent
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_SetEvent
   (JNIEnv *env, jclass unused, jlong eventObject)
 {
     SetEvent((HANDLE) eventObject);
 }
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_audio_windows_waveout_Mixer_CloseHandle
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_CloseHandle
   (JNIEnv *env, jclass unused, jlong eventObject)
 {
     CloseHandle((HANDLE) eventObject);
diff --git a/src/jogl/native/openmax/com_sun_openmax_OMXInstance.c b/src/jogl/native/openmax/com_sun_openmax_OMXInstance.c
index c763b0dd6..1ca973097 100644
--- a/src/jogl/native/openmax/com_sun_openmax_OMXInstance.c
+++ b/src/jogl/native/openmax/com_sun_openmax_OMXInstance.c
@@ -13,7 +13,7 @@
 // http://developer.apple.com/qa/qa2001/qa1149.html
 // http://developer.apple.com/qa/qa2001/qa1262.html
 
-#include "com_sun_openmax_OMXInstance.h"
+#include "com_jogamp_openmax_OMXInstance.h"
 #include "omx_tool.h"
 #include <stdarg.h>
 
@@ -105,7 +105,7 @@ void OMXInstance_UpdateJavaAttributes(OMXToolBasicAV_t *pOMXAV, KDboolean issueJ
     }
 }
 
-JNIEXPORT jlong JNICALL Java_com_sun_openmax_OMXInstance__1createInstance
+JNIEXPORT jlong JNICALL Java_com_jogamp_openmax_OMXInstance__1createInstance
   (JNIEnv *env, jobject instance)
 {
     OMXToolBasicAV_t * pOMXAV;
@@ -132,7 +132,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_openmax_OMXInstance__1createInstance
     return (jlong) (intptr_t) (void *)pOMXAV;
 }
 
-JNIEXPORT void JNICALL Java_com_sun_openmax_OMXInstance__1setStream
+JNIEXPORT void JNICALL Java_com_jogamp_openmax_OMXInstance__1setStream
   (JNIEnv *env, jobject instance, jlong ptr, jint vBufferNum, jstring jpath)
 {
     jboolean iscopy;
@@ -150,7 +150,7 @@ JNIEXPORT void JNICALL Java_com_sun_openmax_OMXInstance__1setStream
     fprintf(stdout, "setStream 3 ..\n"); fflush(stdout); // JAU
 }
 
-JNIEXPORT void JNICALL Java_com_sun_openmax_OMXInstance__1setStreamEGLImageTexture2D
+JNIEXPORT void JNICALL Java_com_jogamp_openmax_OMXInstance__1setStreamEGLImageTexture2D
   (JNIEnv *env, jobject instance, jlong ptr, jint i, jint tex, jlong image, jlong sync)
 {
   OMXToolBasicAV_t *pOMXAV = (OMXToolBasicAV_t *)((void *)((intptr_t)ptr));
@@ -161,7 +161,7 @@ JNIEXPORT void JNICALL Java_com_sun_openmax_OMXInstance__1setStreamEGLImageTextu
   }
 }
 
-JNIEXPORT void JNICALL Java_com_sun_openmax_OMXInstance__1activateStream
+JNIEXPORT void JNICALL Java_com_jogamp_openmax_OMXInstance__1activateStream
   (JNIEnv *env, jobject instance, jlong ptr)
 {
     OMXToolBasicAV_t *pOMXAV = (OMXToolBasicAV_t *)((void *)((intptr_t)ptr));
@@ -171,28 +171,28 @@ JNIEXPORT void JNICALL Java_com_sun_openmax_OMXInstance__1activateStream
     }
 }
 
-JNIEXPORT void JNICALL Java_com_sun_openmax_OMXInstance__1attachVideoRenderer
+JNIEXPORT void JNICALL Java_com_jogamp_openmax_OMXInstance__1attachVideoRenderer
   (JNIEnv *env, jobject instance, jlong ptr)
 {
   OMXToolBasicAV_t *pOMXAV = (OMXToolBasicAV_t *)((void *)((intptr_t)ptr));
   OMXToolBasicAV_AttachVideoRenderer(pOMXAV);
 }
 
-JNIEXPORT void JNICALL Java_com_sun_openmax_OMXInstance__1detachVideoRenderer
+JNIEXPORT void JNICALL Java_com_jogamp_openmax_OMXInstance__1detachVideoRenderer
   (JNIEnv *env, jobject instance, jlong ptr)
 {
   OMXToolBasicAV_t *pOMXAV = (OMXToolBasicAV_t *)((void *)((intptr_t)ptr));
   OMXToolBasicAV_DetachVideoRenderer(pOMXAV);
 }
 
-JNIEXPORT void JNICALL Java_com_sun_openmax_OMXInstance__1setPlaySpeed
+JNIEXPORT void JNICALL Java_com_jogamp_openmax_OMXInstance__1setPlaySpeed
   (JNIEnv *env, jobject instance, jlong ptr, jfloat scale)
 {
   OMXToolBasicAV_t *pOMXAV = (OMXToolBasicAV_t *)((void *)((intptr_t)ptr));
   OMXToolBasicAV_SetPlaySpeed(pOMXAV, scale);
 }
 
-JNIEXPORT jfloat JNICALL Java_com_sun_openmax_OMXInstance__1play
+JNIEXPORT jfloat JNICALL Java_com_jogamp_openmax_OMXInstance__1play
   (JNIEnv *env, jobject instance, jlong ptr)
 {
   OMXToolBasicAV_t *pOMXAV = (OMXToolBasicAV_t *)((void *)((intptr_t)ptr));
@@ -200,7 +200,7 @@ JNIEXPORT jfloat JNICALL Java_com_sun_openmax_OMXInstance__1play
   return OMXToolBasicAV_GetCurrentPosition(pOMXAV);
 }
 
-JNIEXPORT jfloat JNICALL Java_com_sun_openmax_OMXInstance__1pause
+JNIEXPORT jfloat JNICALL Java_com_jogamp_openmax_OMXInstance__1pause
   (JNIEnv *env, jobject instance, jlong ptr)
 {
   OMXToolBasicAV_t *pOMXAV = (OMXToolBasicAV_t *)((void *)((intptr_t)ptr));
@@ -208,7 +208,7 @@ JNIEXPORT jfloat JNICALL Java_com_sun_openmax_OMXInstance__1pause
   return OMXToolBasicAV_GetCurrentPosition(pOMXAV);
 }
 
-JNIEXPORT jfloat JNICALL Java_com_sun_openmax_OMXInstance__1stop
+JNIEXPORT jfloat JNICALL Java_com_jogamp_openmax_OMXInstance__1stop
   (JNIEnv *env, jobject instance, jlong ptr)
 {
     OMXToolBasicAV_t *pOMXAV = (OMXToolBasicAV_t *)((void *)((intptr_t)ptr));
@@ -216,7 +216,7 @@ JNIEXPORT jfloat JNICALL Java_com_sun_openmax_OMXInstance__1stop
     return OMXToolBasicAV_GetCurrentPosition(pOMXAV);
 }
 
-JNIEXPORT jfloat JNICALL Java_com_sun_openmax_OMXInstance__1seek
+JNIEXPORT jfloat JNICALL Java_com_jogamp_openmax_OMXInstance__1seek
   (JNIEnv *env, jobject instance, jlong ptr, jfloat pos)
 {
     OMXToolBasicAV_t *pOMXAV = (OMXToolBasicAV_t *)((void *)((intptr_t)ptr));
@@ -224,7 +224,7 @@ JNIEXPORT jfloat JNICALL Java_com_sun_openmax_OMXInstance__1seek
     return OMXToolBasicAV_GetCurrentPosition(pOMXAV);
 }
 
-JNIEXPORT jint JNICALL Java_com_sun_openmax_OMXInstance__1getNextTextureID
+JNIEXPORT jint JNICALL Java_com_jogamp_openmax_OMXInstance__1getNextTextureID
   (JNIEnv *env, jobject instance, jlong ptr)
 {
   jint textureID = 0xffffffff;
@@ -235,7 +235,7 @@ JNIEXPORT jint JNICALL Java_com_sun_openmax_OMXInstance__1getNextTextureID
   return textureID;
 }
 
-JNIEXPORT jfloat JNICALL Java_com_sun_openmax_OMXInstance__1getCurrentPosition
+JNIEXPORT jfloat JNICALL Java_com_jogamp_openmax_OMXInstance__1getCurrentPosition
   (JNIEnv *env, jobject instance, jlong ptr)
 {
     OMXToolBasicAV_t *pOMXAV = (OMXToolBasicAV_t *)((void *)((intptr_t)ptr));
@@ -243,7 +243,7 @@ JNIEXPORT jfloat JNICALL Java_com_sun_openmax_OMXInstance__1getCurrentPosition
 }
 
 
-JNIEXPORT void JNICALL Java_com_sun_openmax_OMXInstance__1destroyInstance
+JNIEXPORT void JNICALL Java_com_jogamp_openmax_OMXInstance__1destroyInstance
   (JNIEnv *env, jobject instance, jlong ptr)
 {
   OMXToolBasicAV_t *pOMXAV = (OMXToolBasicAV_t *)((void *)((intptr_t)ptr));
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/Debug.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/Debug.java
new file mode 100644
index 000000000..edb682392
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/Debug.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.nativewindow.impl;
+
+import java.security.*;
+
+/** Helper routines for logging and debugging. */
+
+public class Debug {
+  // Some common properties
+  private static boolean verbose;
+  private static boolean debugAll;
+  private static AccessControlContext localACC;
+  
+  static {
+    localACC=AccessController.getContext();
+    verbose = isPropertyDefined("nativewindow.verbose", true);
+    debugAll = isPropertyDefined("nativewindow.debug", true);
+    if (verbose) {
+       Package p = Package.getPackage("javax.media.nativewindow");
+       System.err.println("NativeWindow specification version " + p.getSpecificationVersion());
+       System.err.println("NativeWindow implementation version " + p.getImplementationVersion());
+       System.err.println("NativeWindow implementation vendor " + p.getImplementationVendor());
+    }
+  }
+
+  static int getIntProperty(final String property, final boolean jnlpAlias) {
+      return getIntProperty(property, jnlpAlias, localACC);
+  }
+
+  public static int getIntProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    int i=0;
+    try {
+        Integer iv = Integer.valueOf(Debug.getProperty(property, jnlpAlias, acc));
+        i = iv.intValue();
+    } catch (NumberFormatException nfe) {}
+    return i;
+  }
+
+  static boolean getBooleanProperty(final String property, final boolean jnlpAlias) {
+    return getBooleanProperty(property, jnlpAlias, localACC);
+  }
+
+  public static boolean getBooleanProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    Boolean b = Boolean.valueOf(Debug.getProperty(property, jnlpAlias, acc));
+    return b.booleanValue();
+  }
+
+  static boolean isPropertyDefined(final String property, final boolean jnlpAlias) {
+    return isPropertyDefined(property, jnlpAlias, localACC);
+  }
+
+  public static boolean isPropertyDefined(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    return (Debug.getProperty(property, jnlpAlias, acc) != null) ? true : false;
+  }
+
+  static String getProperty(final String property, final boolean jnlpAlias) {
+    return getProperty(property, jnlpAlias, localACC);
+  }
+
+  public static String getProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    String s=null;
+    if(null!=acc && acc.equals(localACC)) {
+        s = (String) AccessController.doPrivileged(new PrivilegedAction() {
+            public Object run() {
+              String val=null;
+              try {
+                  val = System.getProperty(property);
+              } catch (Exception e) {}
+              if(null==val && jnlpAlias && !property.startsWith(jnlp_prefix)) {
+                  try {
+                      val = System.getProperty(jnlp_prefix + property);
+                  } catch (Exception e) {}
+              }
+              return val;
+            }
+          });
+    } else {
+        try {
+            s = System.getProperty(property);
+        } catch (Exception e) {}
+        if(null==s && jnlpAlias && !property.startsWith(jnlp_prefix)) {
+            try {
+                s = System.getProperty(jnlp_prefix + property);
+            } catch (Exception e) {}
+        }
+    }
+    return s;
+  }
+  public static final String jnlp_prefix = "jnlp." ;
+
+  public static boolean verbose() {
+    return verbose;
+  }
+
+  public static boolean debugAll() {
+    return debugAll;
+  }
+
+  public static boolean debug(String subcomponent) {
+    return debugAll() || isPropertyDefined("nativewindow.debug." + subcomponent, true);
+  }
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/GraphicsConfigurationFactoryImpl.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/GraphicsConfigurationFactoryImpl.java
new file mode 100644
index 000000000..22f2d544f
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/GraphicsConfigurationFactoryImpl.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.nativewindow.impl;
+
+import javax.media.nativewindow.*;
+
+public class GraphicsConfigurationFactoryImpl extends GraphicsConfigurationFactory {
+    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
+                                                                     CapabilitiesChooser chooser,
+                                                                     AbstractGraphicsScreen screen) {
+        return new DefaultGraphicsConfiguration(screen, capabilities, capabilities);
+    }
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/InternalBufferUtil.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/InternalBufferUtil.java
new file mode 100644
index 000000000..f590e9b8b
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/InternalBufferUtil.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.nativewindow.impl;
+
+import java.lang.reflect.*;
+import java.nio.*;
+
+/** Internal copy of selected routines from BufferUtil to avoid
+    outward dependencies on com.jogamp.opengl.util package. */
+public class InternalBufferUtil {
+    public static final int SIZEOF_BYTE = 1;
+    public static final int SIZEOF_SHORT = 2;
+    public static final int SIZEOF_INT = 4;
+    public static final int SIZEOF_FLOAT = 4;
+
+    //----------------------------------------------------------------------
+    // Allocation routines
+    //
+
+    /** Allocates a new direct ByteBuffer with the specified number of
+        elements. The returned buffer will have its byte order set to
+        the host platform's native byte order. */
+    public static ByteBuffer newByteBuffer(int numElements) {
+        ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
+        nativeOrder(bb);
+        return bb;
+    }
+    
+    /** Allocates a new direct IntBuffer with the specified number of
+        elements. The returned buffer will have its byte order set to
+        the host platform's native byte order. */
+    public static IntBuffer newIntBuffer(int numElements) {
+        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
+        return bb.asIntBuffer();
+    }
+    
+    //----------------------------------------------------------------------
+    // Copy routines (type-to-type)
+    //
+
+    /** Copies the <i>remaining</i> elements (as defined by
+        <code>limit() - position()</code>) in the passed ByteBuffer into
+        a newly-allocated direct ByteBuffer. The returned buffer will
+        have its byte order set to the host platform's native byte
+        order. The position of the newly-allocated buffer will be zero,
+        and the position of the passed buffer is unchanged (though its
+        mark is changed). */
+    public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
+        ByteBuffer dest = newByteBuffer(orig.remaining());
+        dest.put(orig);
+        dest.rewind();
+        return dest;
+    }
+
+    //----------------------------------------------------------------------
+    // Conversion routines 
+    //
+
+    public static ByteBuffer nativeOrder(ByteBuffer buf) {
+        if (!isCDCFP) {
+            try {
+                if (byteOrderClass == null) {
+                    byteOrderClass = Class.forName("java.nio.ByteOrder");
+                    orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
+                    Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
+                    nativeOrderObject = nativeOrderMethod.invoke(null, null);
+                }
+            } catch (Throwable t) {
+                // Must be running on CDC / FP
+                isCDCFP = true;
+            }
+
+            if (!isCDCFP) {
+                try {
+                    orderMethod.invoke(buf, new Object[] { nativeOrderObject });
+                } catch (Throwable t) {
+                }
+            }
+        }
+        return buf;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    // NOTE that this work must be done reflectively at the present time
+    // because this code must compile and run correctly on both CDC/FP and J2SE
+    private static boolean isCDCFP;
+    private static Class byteOrderClass;
+    private static Object nativeOrderObject;
+    private static Method orderMethod;
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/LockingNativeWindowFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/LockingNativeWindowFactory.java
new file mode 100644
index 000000000..fd2478ab2
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/LockingNativeWindowFactory.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.nativewindow.impl;
+
+import javax.media.nativewindow.*;
+
+public class LockingNativeWindowFactory extends NativeWindowFactoryImpl {
+    // Provides a generic basic and recursive locking mechanism for your discretion.
+    private ToolkitLock toolkitLock = new ToolkitLock() {
+            private Thread owner;
+            private int recursionCount;
+            
+            public synchronized void lock() {
+                Thread cur = Thread.currentThread();
+                if (owner == cur) {
+                    ++recursionCount;
+                    return;
+                }
+                while (owner != null) {
+                    try {
+                        wait();
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+                owner = cur;
+            }
+
+            public synchronized void unlock() {
+                if (owner != Thread.currentThread()) {
+                    throw new RuntimeException("Not owner");
+                }
+                if (recursionCount > 0) {
+                    --recursionCount;
+                    return;
+                }
+                owner = null;
+                notifyAll();
+            }
+        };
+
+    public ToolkitLock getToolkitLock() {
+        return toolkitLock;
+    }
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWReflection.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWReflection.java
new file mode 100644
index 000000000..22bdedac9
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWReflection.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.nativewindow.impl;
+
+import java.lang.reflect.*;
+import javax.media.nativewindow.*;
+
+public final class NWReflection {
+  public static final boolean DEBUG = Debug.debug("NWReflection");
+
+  public static final boolean isClassAvailable(String clazzName) {
+    try {
+        Class clazz = Class.forName(clazzName, false, NWReflection.class.getClassLoader());
+        return null!=clazz;
+    } catch (Throwable e) { }
+    return false;
+  }
+
+  public static final Class getClass(String clazzName, boolean initialize) {
+    try {
+        return Class.forName(clazzName, initialize, NWReflection.class.getClassLoader());
+    } catch (Throwable e) { }
+    return null;
+  }
+
+  public static final Constructor getConstructor(String clazzName, Class[] cstrArgTypes) {
+    Class factoryClass = null;
+    Constructor factory = null;
+
+    try {
+        factoryClass = getClass(clazzName, true);
+        if (factoryClass == null) {
+          throw new NativeWindowException(clazzName + " not available");
+        }
+        return getConstructor(factoryClass, cstrArgTypes);
+    } catch (Throwable e) { 
+      if (DEBUG) {
+          e.printStackTrace();
+      }
+      throw new NativeWindowException(e);
+    }
+  }
+
+  public static final Constructor getConstructor(Class clazz, Class[] cstrArgTypes) {
+    Constructor factory = null;
+
+    try {
+        try {
+            factory = clazz.getDeclaredConstructor( cstrArgTypes );
+        } catch(NoSuchMethodException nsme) {
+          throw new NativeWindowException("Constructor: '" + clazz + "("+cstrArgTypes+")' not found");
+        }
+        return factory;
+    } catch (Throwable e) { 
+      if (DEBUG) {
+          e.printStackTrace();
+      }
+      throw new NativeWindowException(e);
+    }
+  }
+
+  public static final Constructor getConstructor(String clazzName) {
+    return getConstructor(clazzName, new Class[0]);
+  }
+
+  public static final Object createInstance(Class clazz, Class[] cstrArgTypes, Object[] cstrArgs) {
+    Constructor factory = null;
+
+    try {
+        factory = getConstructor(clazz, cstrArgTypes);
+        return factory.newInstance( cstrArgs ) ;
+    } catch (Exception e) {
+      throw new NativeWindowException(e);
+    }
+  }
+
+  public static final Object createInstance(Class clazz, Object[] cstrArgs) {
+    Class[] cstrArgTypes = new Class[cstrArgs.length];
+    for(int i=0; i<cstrArgs.length; i++) {
+        cstrArgTypes[i] = cstrArgs[i].getClass();
+    }
+    return createInstance(clazz, cstrArgTypes, cstrArgs);
+  }
+
+  public static final Object createInstance(String clazzName, Class[] cstrArgTypes, Object[] cstrArgs) {
+    Constructor factory = null;
+
+    try {
+        factory = getConstructor(clazzName, cstrArgTypes);
+        return factory.newInstance( cstrArgs ) ;
+    } catch (Exception e) {
+      throw new NativeWindowException(e);
+    }
+  }
+
+  public static final Object createInstance(String clazzName, Object[] cstrArgs) {
+    Class[] cstrArgTypes = new Class[cstrArgs.length];
+    for(int i=0; i<cstrArgs.length; i++) {
+        cstrArgTypes[i] = cstrArgs[i].getClass();
+    }
+    return createInstance(clazzName, cstrArgTypes, cstrArgs);
+  }
+
+  public static final Object createInstance(String clazzName) {
+    return createInstance(clazzName, new Class[0], null);
+  }
+
+  public static final boolean instanceOf(Object obj, String clazzName) {
+    return instanceOf(obj.getClass(), clazzName);
+  }
+  public static final boolean instanceOf(Class clazz, String clazzName) {
+    do {
+        if(clazz.getName().equals(clazzName)) {
+            return true;
+        }
+        clazz = clazz.getSuperclass();
+    } while (clazz!=null);
+    return false;
+  }
+
+  public static final boolean implementationOf(Object obj, String faceName) {
+    return implementationOf(obj.getClass(), faceName);
+  }
+  public static final boolean implementationOf(Class clazz, String faceName) {
+    do {
+        Class[] clazzes = clazz.getInterfaces();
+        for(int i=clazzes.length-1; i>=0; i--) {
+            Class face = clazzes[i];
+            if(face.getName().equals(faceName)) {
+                return true;
+            }
+        }
+        clazz = clazz.getSuperclass();
+    } while (clazz!=null);
+    return false;
+  }
+
+  public static boolean isAWTComponent(Object target) {
+      return instanceOf(target, "java.awt.Component");
+  }
+
+  public static boolean isAWTComponent(Class clazz) {
+      return instanceOf(clazz, "java.awt.Component");
+  }
+
+}
+
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeLibLoaderBase.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeLibLoaderBase.java
new file mode 100644
index 000000000..0670234d4
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeLibLoaderBase.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.nativewindow.impl;
+
+// FIXME: refactor Java SE dependencies
+//import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.HashSet;
+
+public class NativeLibLoaderBase {
+  public static final boolean DEBUG = Debug.debug("NativeLibLoader");
+
+  public interface LoaderAction {
+    /**
+     * Loads the library specified by libname. Optionally preloads the libraries specified by
+     * preload. The implementation should ignore, if the preload-libraries have already been
+     * loaded.
+     * @param libname the library to load
+     * @param preload the libraries to load before loading the main library if not null
+     * @param preloadIgnoreError true, if errors during loading the preload-libraries should be ignored 
+     */
+    void loadLibrary(String libname, String[] preload, 
+        boolean preloadIgnoreError);
+  }
+  
+  private static class DefaultAction implements LoaderAction {
+    public void loadLibrary(String libname, String[] preload,
+        boolean preloadIgnoreError) {
+      if (null!=preload) {
+        for (int i=0; i<preload.length; i++) {
+          if(!isLoaded(preload[i])) {
+              try {
+                loadLibraryInternal(preload[i]);
+                addLoaded(preload[i]);
+                if(DEBUG) {
+                    System.err.println("NativeLibLoaderBase preloaded "+preload[i]);
+                }
+              }
+              catch (UnsatisfiedLinkError e) {
+                if(DEBUG) e.printStackTrace();
+                if (!preloadIgnoreError && e.getMessage().indexOf("already loaded") < 0) {
+                  throw e;
+                }
+              }
+          }
+        }
+      }
+      loadLibraryInternal(libname);
+      addLoaded(libname);
+      if(DEBUG) {
+          System.err.println("NativeLibLoaderBase    loaded "+libname);
+      }
+    }
+  }
+
+  private static final HashSet loaded = new HashSet();
+  private static LoaderAction loaderAction = new DefaultAction();
+
+  public static boolean isLoaded(String libName) {
+    return loaded.contains(libName);
+  }
+
+  public static void addLoaded(String libName) {
+    loaded.add(libName);
+    if(DEBUG) {
+        System.err.println("NativeLibLoaderBase Loaded Native Library: "+libName);
+    }
+  }
+
+  public static void disableLoading() {
+    setLoadingAction(null);
+  }
+
+  public static void enableLoading() {
+    setLoadingAction(new DefaultAction());
+  }
+  
+  public static synchronized void setLoadingAction(LoaderAction action) {
+    loaderAction = action;
+  }
+
+  protected static synchronized void loadLibrary(String libname, String[] preload, 
+      boolean preloadIgnoreError) {
+    if (loaderAction != null && !isLoaded(libname))
+    {
+      loaderAction.loadLibrary(libname, preload, preloadIgnoreError);    
+    }
+  }
+  
+  public static void loadNativeWindow(final String ossuffix) {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("nativewindow_"+ossuffix, null, false);
+        return null;
+      }
+    });
+  }
+
+
+  private static final Class  customLauncherClass;
+  private static final Method customLoadLibraryMethod;
+
+  static {
+    Class launcherClass = null;
+    Method loadLibraryMethod = null;
+
+    if ( Debug.getBooleanProperty("sun.jnlp.applet.launcher", false) ) {
+        try {
+            launcherClass = Class.forName("org.jdesktop.applet.util.JNLPAppletLauncher");
+            loadLibraryMethod = launcherClass.getDeclaredMethod("loadLibrary", new Class[] { String.class });
+        } catch (Throwable t) { 
+            if(DEBUG) {
+                t.printStackTrace();
+            }
+            launcherClass = null;
+            loadLibraryMethod = null;
+        }
+    }
+
+    if(null==launcherClass) {
+        String launcherClassName = Debug.getProperty("jnlp.launcher.class", false);
+        if(null!=launcherClassName) {
+            try {
+                launcherClass = Class.forName(launcherClassName);
+                loadLibraryMethod = launcherClass.getDeclaredMethod("loadLibrary", new Class[] { String.class });
+            } catch (Throwable t) { 
+                if(DEBUG) {
+                    t.printStackTrace();
+                }
+                launcherClass = null;
+                loadLibraryMethod = null;
+            }
+        }
+    }
+    customLauncherClass = launcherClass;
+    customLoadLibraryMethod = loadLibraryMethod;
+  }
+
+  private static void loadLibraryInternal(String libraryName) {
+    // Note: special-casing JAWT which is built in to the JDK
+    if (null!=customLoadLibraryMethod && !libraryName.equals("jawt")) {
+        try {
+          customLoadLibraryMethod.invoke(null, new Object[] { libraryName });
+        } catch (Exception e) {
+          Throwable t = e;
+          if (t instanceof InvocationTargetException) {
+            t = ((InvocationTargetException) t).getTargetException();
+          }
+          if (t instanceof Error)
+            throw (Error) t;
+          if (t instanceof RuntimeException) {
+            throw (RuntimeException) t;
+          }
+          // Throw UnsatisfiedLinkError for best compatibility with System.loadLibrary()
+          throw (UnsatisfiedLinkError) new UnsatisfiedLinkError().initCause(e);
+        }
+    } else {
+      // System.out.println("sun.boot.library.path=" + Debug.getProperty("sun.boot.library.path", false));
+      System.loadLibrary(libraryName);
+    }
+  }
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeWindowFactoryImpl.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeWindowFactoryImpl.java
new file mode 100644
index 000000000..e84264bd0
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeWindowFactoryImpl.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.nativewindow.impl;
+
+import java.lang.reflect.*;
+import java.security.*;
+
+import javax.media.nativewindow.*;
+
+public class NativeWindowFactoryImpl extends NativeWindowFactory {
+    protected static final boolean DEBUG = Debug.debug("NativeWindowFactoryImpl");
+
+    // This subclass of NativeWindowFactory handles the case of
+    // NativeWindows being passed in
+    protected NativeWindow getNativeWindowImpl(Object winObj, AbstractGraphicsConfiguration config) throws IllegalArgumentException {
+        if (null == winObj) {
+            throw new IllegalArgumentException("winObj is null");
+        }
+        if (winObj instanceof NativeWindow) {
+            // Use the NativeWindow directly
+            return (NativeWindow) winObj;
+        }
+
+        if (null == config) {
+            throw new IllegalArgumentException("AbstractGraphicsConfiguration is null with a non NativeWindow object");
+        }
+
+        if (NWReflection.isAWTComponent(winObj)) {
+            return getAWTNativeWindow(winObj, config);
+        }
+
+        throw new IllegalArgumentException("Target window object type " +
+                                           winObj.getClass().getName() + " is unsupported; expected " +
+                                           "javax.media.nativewindow.NativeWindow or java.awt.Component");
+    }
+    
+    private Constructor nativeWindowConstructor = null;
+
+    private NativeWindow getAWTNativeWindow(Object winObj, AbstractGraphicsConfiguration config) {
+        if (nativeWindowConstructor == null) {
+            try {
+                String osType = getNativeWindowType(true);
+                String windowClassName = null;
+
+                // We break compile-time dependencies on the AWT here to
+                // make it easier to run this code on mobile devices
+
+                if (osType.equals(TYPE_WINDOWS)) {
+                    windowClassName = "com.jogamp.nativewindow.impl.jawt.windows.WindowsJAWTWindow";
+                } else if (osType.equals(TYPE_MACOSX)) {
+                    windowClassName = "com.jogamp.nativewindow.impl.jawt.macosx.MacOSXJAWTWindow";
+                } else if (osType.equals(TYPE_X11)) {
+                    // Assume Linux, Solaris, etc. Should probably test for these explicitly.
+                    windowClassName = "com.jogamp.nativewindow.impl.jawt.x11.X11JAWTWindow";
+                } else {
+                    throw new IllegalArgumentException("OS " + getNativeOSName(false) + " not yet supported");
+                }
+
+                nativeWindowConstructor = NWReflection.getConstructor(windowClassName, new Class[] { Object.class, AbstractGraphicsConfiguration.class });
+            } catch (Exception e) {
+                throw (IllegalArgumentException) new IllegalArgumentException().initCause(e);
+            }
+        }
+
+        try {
+            return (NativeWindow) nativeWindowConstructor.newInstance(new Object[] { winObj, config });
+        } catch (Exception ie) {
+            throw (IllegalArgumentException) new IllegalArgumentException().initCause(ie);
+        }
+    }
+
+    // On most platforms the toolkit lock is a no-op
+    private ToolkitLock toolkitLock = new ToolkitLock() {
+            public void lock() {
+            }
+
+            public void unlock() {
+            }
+        };
+
+    public ToolkitLock getToolkitLock() {
+        return toolkitLock;
+    }
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NullWindow.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NullWindow.java
new file mode 100644
index 000000000..4458d7b3d
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NullWindow.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.nativewindow.impl;
+
+import javax.media.nativewindow.*;
+
+public class NullWindow implements NativeWindow, SurfaceChangeable {
+  private Exception lockedStack = null;
+  protected int width, height, scrnIndex;
+  protected long surfaceHandle, displayHandle;
+  protected AbstractGraphicsConfiguration config;
+
+  public NullWindow(AbstractGraphicsConfiguration cfg) {
+    invalidate();
+    config = cfg;
+    displayHandle=cfg.getScreen().getDevice().getHandle();
+    scrnIndex=cfg.getScreen().getIndex();
+  }
+
+  protected void init(Object windowObject) throws NativeWindowException {
+  }
+
+  protected void initNative() throws NativeWindowException {
+  }
+
+  public void destroy() {
+    invalidate();
+  }
+
+  public synchronized void invalidate() {
+    displayHandle=0;
+    scrnIndex=-1;
+    surfaceHandle=0;
+  }
+
+  public synchronized int lockSurface() throws NativeWindowException {
+    if (null!=lockedStack) {
+      lockedStack.printStackTrace();
+      throw new NativeWindowException("Surface already locked - "+this);
+    }
+    lockedStack = new Exception("NullWindow previously locked by "+Thread.currentThread().getName());
+    return LOCK_SUCCESS;
+  }
+
+  public synchronized void unlockSurface() {
+    if (null!=lockedStack) {
+        lockedStack = null;
+    } else {
+        throw new NativeWindowException("NullWindow not locked");
+    }
+  }
+
+  public synchronized boolean isSurfaceLocked() {
+    return null!=lockedStack;
+  }
+
+  public Exception getLockedStack() {
+    return lockedStack;
+  }
+
+  public boolean surfaceSwap() {
+    return false;
+  }
+
+  public void surfaceUpdated(Object updater, NativeWindow window, long when) { }
+
+  public long getDisplayHandle() {
+    return displayHandle;
+  }
+  public int getScreenIndex() {
+    return scrnIndex;
+  }
+  public long getWindowHandle() {
+    return 0;
+  }
+  public long getSurfaceHandle() {
+    return surfaceHandle;
+  }
+  public void setSurfaceHandle(long surfaceHandle) {
+    this.surfaceHandle=surfaceHandle;
+  }
+  public AbstractGraphicsConfiguration getGraphicsConfiguration() {
+    return config;
+  }
+
+  public Object getWrappedWindow() {
+    return null;
+  }
+
+  public final boolean isTerminalObject() {
+    return true;
+  }
+
+  public void setSize(int width, int height) {
+    this.width=width;
+    this.height=height;
+  }
+
+  public int getWidth() {
+    return width;
+  }
+
+  public int getHeight() {
+    return height;
+  }
+
+  public String toString() {
+    return "NullWindow[config "+config+
+                ", displayHandle 0x"+Long.toHexString(getDisplayHandle())+
+                ", surfaceHandle 0x"+Long.toHexString(getSurfaceHandle())+
+                ", size "+getWidth()+"x"+getHeight()+"]";
+  }
+
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTNativeLibLoader.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTNativeLibLoader.java
new file mode 100644
index 000000000..9be343a7a
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTNativeLibLoader.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.nativewindow.impl.jawt;
+
+import javax.media.nativewindow.NativeWindowFactory;
+import com.jogamp.nativewindow.impl.NativeLibLoaderBase;
+
+import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+public class JAWTNativeLibLoader extends NativeLibLoaderBase {
+  public static void loadAWTImpl() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        // Make sure that awt.dll is loaded before loading jawt.dll. Otherwise
+        // a Dialog with "awt.dll not found" might pop up.
+        // See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4481947.
+        Toolkit.getDefaultToolkit();
+        
+        // Must pre-load JAWT on all non-Mac platforms to
+        // ensure references from jogl_awt shared object
+        // will succeed since JAWT shared object isn't in
+        // default library path
+        if ( ! NativeWindowFactory.TYPE_MACOSX.equals( NativeWindowFactory.getNativeWindowType(false) ) ) {
+            try {
+                loadLibrary("jawt", null, true);
+            } catch (Throwable t) {
+                // It might be ok .. if it's already loaded
+                if(DEBUG) {
+                    t.printStackTrace();
+                }
+            }
+        }
+        return null;
+      }
+    });
+  }
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTUtil.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTUtil.java
new file mode 100644
index 000000000..2c88b308f
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTUtil.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.nativewindow.impl.jawt;
+
+import com.jogamp.nativewindow.impl.*;
+
+import javax.media.nativewindow.*;
+
+import java.awt.GraphicsEnvironment;
+import java.lang.reflect.*;
+
+public class JAWTUtil {
+
+  // See whether we're running in headless mode
+  private static final boolean headlessMode;
+
+  // Java2D magic ..
+  private static final Class j2dClazz;
+  private static final Method isQueueFlusherThread;
+  private static final boolean j2dExist;
+
+  static {
+    JAWTNativeLibLoader.loadAWTImpl();
+    JAWTNativeLibLoader.loadNativeWindow("awt");
+
+    lockedStack   = null;
+    headlessMode = GraphicsEnvironment.isHeadless();
+
+    boolean ok=false;
+    Class jC=null;
+    Method m=null;
+    if(!headlessMode) {
+        try {
+            jC = Class.forName("com.jogamp.opengl.impl.awt.Java2D");
+            m = jC.getMethod("isQueueFlusherThread", null);
+            ok = true;
+        } catch (Exception e) {}
+    }
+    j2dClazz = jC;
+    isQueueFlusherThread = m;
+    j2dExist = ok;
+  }
+
+  private static Exception lockedStack;
+
+  // Just a hook to let this class being initialized,
+  // ie loading the native libraries ..
+  public static void init() { }
+
+  public static final boolean hasJava2D() {
+    return j2dExist;
+  }
+
+  public static final boolean isJava2DQueueFlusherThread() {
+    boolean b = false;
+    if(j2dExist) {
+        try {
+            b = ((Boolean)isQueueFlusherThread.invoke(null, null)).booleanValue();
+        } catch (Exception e) {}
+    }
+    return b;
+  }
+
+  public static boolean isHeadlessMode() {
+    return headlessMode;
+  }
+
+  public static synchronized void lockToolkit() throws NativeWindowException {
+    if (isJava2DQueueFlusherThread()) return;
+
+    if (null!=lockedStack) {
+      lockedStack.printStackTrace();
+      throw new NativeWindowException("JAWT Toolkit already locked - "+Thread.currentThread().getName());
+    }
+    lockedStack = new Exception("JAWT Toolkit already locked by: "+Thread.currentThread().getName());
+
+    if (headlessMode) {
+      // Workaround for running (to some degree) in headless
+      // environments but still supporting rendering via pbuffers
+      // For full correctness, would need to implement a Lock class
+      return;
+    }
+
+    JAWT.getJAWT().Lock();
+  }
+
+  public static synchronized void unlockToolkit() {
+    if (isJava2DQueueFlusherThread()) return;
+
+    if (null!=lockedStack) {
+        lockedStack = null;
+        if (headlessMode) {
+          // Workaround for running (to some degree) in headless
+          // environments but still supporting rendering via pbuffers
+          // For full correctness, would need to implement a Lock class
+          return;
+        }
+
+        JAWT.getJAWT().Unlock();
+    }
+  }
+
+  public static boolean isToolkitLocked() {
+    return null!=lockedStack;
+  }
+
+  public static Exception getLockedStack() {
+    return lockedStack;
+  }
+}
+
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTWindow.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTWindow.java
new file mode 100644
index 000000000..d0529878f
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTWindow.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.nativewindow.impl.jawt;
+
+import com.jogamp.nativewindow.impl.*;
+
+import java.awt.Component;
+import java.awt.Window;
+import java.awt.GraphicsEnvironment;
+import javax.media.nativewindow.*;
+import com.jogamp.nativewindow.impl.*;
+
+public abstract class JAWTWindow implements NativeWindow {
+  protected static final boolean DEBUG = Debug.debug("JAWT");
+
+  // See whether we're running in headless mode
+  private static boolean headlessMode;
+
+  static {
+    headlessMode = GraphicsEnvironment.isHeadless();
+  }
+
+  // lifetime: forever
+  protected Component component;
+  protected AbstractGraphicsConfiguration config;
+
+  // lifetime: valid after lock, forever until invalidate
+  protected long drawable;
+
+  public JAWTWindow(Object comp, AbstractGraphicsConfiguration config) {
+    if (config == null) {
+        throw new NativeWindowException("Error: AbstractGraphicsConfiguration is null");
+    }
+    this.config = config;
+    init((Component)comp);
+  }
+
+  protected void init(Component windowObject) throws NativeWindowException {
+    invalidate();
+    this.component = windowObject;
+    initNative();
+  }
+
+  protected abstract void initNative() throws NativeWindowException;
+
+  public synchronized void invalidate() {
+    component = null;
+    drawable= 0;
+  }
+
+  public synchronized void destroy() {
+    if(null!=component) {
+        if(component instanceof Window) {
+            ((Window)component).dispose();
+        }
+    }
+    invalidate();
+  }
+
+  private volatile Exception lockedStack = null;
+
+  public synchronized int lockSurface() throws NativeWindowException {
+    // We have to be the owner of the JAWT ToolkitLock 'lock' to benefit from it's
+    // recursive and blocking lock capabitlites. 
+    // Otherwise a followup ToolkitLock would deadlock, 
+    // since we already have locked JAWT with the surface lock.
+    NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
+
+    // recursion not necessary here, due to the blocking ToolkitLock ..
+    if (null!=lockedStack) {
+      lockedStack.printStackTrace();
+      throw new NativeWindowException("JAWT Surface already locked - "+Thread.currentThread().getName()+" "+this);
+    }
+    lockedStack = new Exception("JAWT Surface previously locked by "+Thread.currentThread().getName());
+
+    return LOCK_SUCCESS;
+  }
+
+  public synchronized void unlockSurface() {
+    if (null!=lockedStack) {
+        lockedStack = null;
+    } else {
+        throw new NativeWindowException("JAWT Surface not locked");
+    }
+    NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
+  }
+
+  public synchronized boolean isSurfaceLocked() {
+    return null!=lockedStack;
+  }
+
+  public Exception getLockedStack() {
+    return lockedStack;
+  }
+
+  public boolean surfaceSwap() {
+    return false;
+  }
+
+  public void surfaceUpdated(Object updater, NativeWindow window, long when) { }
+
+  public long getDisplayHandle() {
+    return config.getScreen().getDevice().getHandle();
+  }
+  public int getScreenIndex() {
+    return config.getScreen().getIndex();
+  }
+  public long getWindowHandle() {
+    return drawable;
+  }
+  public long getSurfaceHandle() {
+    return drawable;
+  }
+  public AbstractGraphicsConfiguration getGraphicsConfiguration() {
+    return config;
+  }
+
+  public Object getWrappedWindow() {
+    return component;
+  }
+
+  public void setSize(int width, int height) {
+    component.setSize(width, height);
+  }
+
+  public int getWidth() {
+    return component.getWidth();
+  }
+
+  public int getHeight() {
+    return component.getHeight();
+  }
+
+  public String toString() {
+    StringBuffer sb = new StringBuffer();
+
+    sb.append("JAWT-Window["+
+                "windowHandle 0x"+Long.toHexString(getWindowHandle())+
+                ", surfaceHandle 0x"+Long.toHexString(getSurfaceHandle()));
+    if(null!=component) {
+      sb.append(", pos "+component.getX()+"/"+component.getY()+", size "+getWidth()+"x"+getHeight()+
+                ", visible "+component.isVisible());
+    } else {
+      sb.append(", component NULL");
+    }
+    sb.append(", locked "+isSurfaceLocked()+
+              ",\n\tconfig "+config+
+              ",\n\twrappedWindow "+getWrappedWindow()+"]");
+
+    return sb.toString();
+  }
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWT_PlatformInfo.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWT_PlatformInfo.java
new file mode 100644
index 000000000..d49e2f8d0
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWT_PlatformInfo.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.nativewindow.impl.jawt;
+
+import com.jogamp.nativewindow.impl.*;
+
+/** Marker class for all window system-specific JAWT data structures. */
+
+public interface JAWT_PlatformInfo {
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java
new file mode 100644
index 000000000..967d43d60
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.nativewindow.impl.jawt.macosx;
+
+import com.jogamp.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.jawt.*;
+
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+
+import javax.media.nativewindow.*;
+import java.security.*;
+
+public class MacOSXJAWTWindow extends JAWTWindow {
+
+  public MacOSXJAWTWindow(Object comp, AbstractGraphicsConfiguration config) {
+    super(comp, config);
+  }
+
+  protected void initNative() throws NativeWindowException {
+  }
+
+  public int lockSurface() throws NativeWindowException {
+    int ret = super.lockSurface();
+    if(NativeWindow.LOCK_SUCCESS != ret) {
+        return ret;
+    }
+    ds = JAWT.getJAWT().GetDrawingSurface(component);
+    if (ds == null) {
+      // Widget not yet realized
+      super.unlockSurface();
+      return NativeWindow.LOCK_SURFACE_NOT_READY;
+    }
+    int res = ds.Lock();
+    if ((res & JAWTFactory.JAWT_LOCK_ERROR) != 0) {
+      super.unlockSurface();
+      throw new NativeWindowException("Unable to lock surface");
+    }
+    // See whether the surface changed and if so destroy the old
+    // OpenGL context so it will be recreated (NOTE: removeNotify
+    // should handle this case, but it may be possible that race
+    // conditions can cause this code to be triggered -- should test
+    // more)
+    if ((res & JAWTFactory.JAWT_LOCK_SURFACE_CHANGED) != 0) {
+      ret = NativeWindow.LOCK_SURFACE_CHANGED;
+    }
+    if (firstLock) {
+      AccessController.doPrivileged(new PrivilegedAction() {
+          public Object run() {
+            dsi = ds.GetDrawingSurfaceInfo();
+            return null;
+          }
+        });
+    } else {
+      dsi = ds.GetDrawingSurfaceInfo();
+    }
+    if (dsi == null) {
+      // Widget not yet realized
+      ds.Unlock();
+      JAWT.getJAWT().FreeDrawingSurface(ds);
+      ds = null;
+      super.unlockSurface();
+      return NativeWindow.LOCK_SURFACE_NOT_READY;
+    }
+    firstLock = false;
+    macosxdsi = (JAWT_MacOSXDrawingSurfaceInfo) dsi.platformInfo();
+    if (macosxdsi == null) {
+      // Widget not yet realized
+      ds.FreeDrawingSurfaceInfo(dsi);
+      ds.Unlock();
+      JAWT.getJAWT().FreeDrawingSurface(ds);
+      ds = null;
+      dsi = null;
+      super.unlockSurface();
+      return NativeWindow.LOCK_SURFACE_NOT_READY;
+    }
+    drawable = macosxdsi.getCocoaViewRef();
+
+    if (drawable == 0) {
+      // Widget not yet realized
+      ds.FreeDrawingSurfaceInfo(dsi);
+      ds.Unlock();
+      JAWT.getJAWT().FreeDrawingSurface(ds);
+      ds = null;
+      dsi = null;
+      macosxdsi = null;
+      super.unlockSurface();
+      return NativeWindow.LOCK_SURFACE_NOT_READY;
+    }
+    return ret;
+  }
+    
+  public void unlockSurface() throws NativeWindowException {
+    if(!isSurfaceLocked()) {
+        throw new RuntimeException("JAWTWindow not locked");
+    }
+    ds.FreeDrawingSurfaceInfo(dsi);
+    ds.Unlock();
+    JAWT.getJAWT().FreeDrawingSurface(ds);
+    ds = null;
+    dsi = null;
+    macosxdsi = null;
+    super.unlockSurface();
+  }
+
+  // Variables for lockSurface/unlockSurface
+  private JAWT_DrawingSurface ds;
+  private JAWT_DrawingSurfaceInfo dsi;
+  private JAWT_MacOSXDrawingSurfaceInfo macosxdsi;
+
+  // Workaround for instance of 4796548
+  private boolean firstLock = true;
+
+}
+
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java
new file mode 100644
index 000000000..b23ad3f50
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.nativewindow.impl.jawt.windows;
+
+import com.jogamp.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.jawt.*;
+
+import javax.media.nativewindow.*;
+
+public class WindowsJAWTWindow extends JAWTWindow {
+
+  public static final boolean PROFILING = false; // FIXME
+  public static final int PROFILING_TICKS = 600; // FIXME
+
+  public WindowsJAWTWindow(Object comp, AbstractGraphicsConfiguration config) {
+    super(comp, config);
+  }
+
+  protected void initNative() throws NativeWindowException {
+  }
+
+  public int lockSurface() throws NativeWindowException {
+    int ret = super.lockSurface();
+    if(LOCK_SUCCESS != ret) {
+      return ret;
+    }
+
+    long startTime;
+    if (PROFILING) {
+      startTime = System.currentTimeMillis();
+    }
+    ds = JAWT.getJAWT().GetDrawingSurface(component);
+    if (ds == null) {
+      // Widget not yet realized
+      super.unlockSurface();
+      return LOCK_SURFACE_NOT_READY;
+    }
+    int res = ds.Lock();
+    if ((res & JAWTFactory.JAWT_LOCK_ERROR) != 0) {
+      super.unlockSurface();
+      throw new NativeWindowException("Unable to lock surface");
+    }
+    // See whether the surface changed and if so destroy the old
+    // OpenGL context so it will be recreated (NOTE: removeNotify
+    // should handle this case, but it may be possible that race
+    // conditions can cause this code to be triggered -- should test
+    // more)
+    if ((res & JAWTFactory.JAWT_LOCK_SURFACE_CHANGED) != 0) {
+      ret = LOCK_SURFACE_CHANGED;
+    }
+    dsi = ds.GetDrawingSurfaceInfo();
+    if (dsi == null) {
+      // Widget not yet realized
+      ds.Unlock();
+      JAWT.getJAWT().FreeDrawingSurface(ds);
+      ds = null;
+      super.unlockSurface();
+      return LOCK_SURFACE_NOT_READY;
+    }
+    win32dsi = (JAWT_Win32DrawingSurfaceInfo) dsi.platformInfo();
+    if (win32dsi == null) {
+      // Widget not yet realized
+      ds.FreeDrawingSurfaceInfo(dsi);
+      ds.Unlock();
+      JAWT.getJAWT().FreeDrawingSurface(ds);
+      ds = null;
+      dsi = null;
+      super.unlockSurface();
+      return LOCK_SURFACE_NOT_READY;
+    }
+    drawable = win32dsi.getHdc();
+    if (drawable == 0) {
+      // Widget not yet realized
+      ds.FreeDrawingSurfaceInfo(dsi);
+      ds.Unlock();
+      JAWT.getJAWT().FreeDrawingSurface(ds);
+      ds = null;
+      dsi = null;
+      win32dsi = null;
+      super.unlockSurface();
+      return LOCK_SURFACE_NOT_READY;
+    }
+    if (PROFILING) {
+      long endTime = System.currentTimeMillis();
+      profilingLockSurfaceTime += (endTime - startTime);
+      if (++profilingLockSurfaceTicks == PROFILING_TICKS) {
+        System.err.println("LockSurface calls: " + profilingLockSurfaceTime + " ms / " + PROFILING_TICKS + " calls (" +
+                           ((float) profilingLockSurfaceTime / (float) PROFILING_TICKS) + " ms/call)");
+        profilingLockSurfaceTime = 0;
+        profilingLockSurfaceTicks = 0;
+      }
+    }
+    return ret;
+  }
+
+  public void unlockSurface() {
+    if(!isSurfaceLocked()) {
+        throw new RuntimeException("JAWTWindow not locked");
+    }
+    long startTime = 0;
+    if (PROFILING) {
+      startTime = System.currentTimeMillis();
+    }
+    ds.FreeDrawingSurfaceInfo(dsi);
+    ds.Unlock();
+    JAWT.getJAWT().FreeDrawingSurface(ds);
+    ds = null;
+    dsi = null;
+    win32dsi = null;
+    super.unlockSurface();
+    if (PROFILING) {
+      long endTime = System.currentTimeMillis();
+      profilingUnlockSurfaceTime += (endTime - startTime);
+      if (++profilingUnlockSurfaceTicks == PROFILING_TICKS) {
+        System.err.println("UnlockSurface calls: " + profilingUnlockSurfaceTime + " ms / " + PROFILING_TICKS + " calls (" +
+                           ((float) profilingUnlockSurfaceTime / (float) PROFILING_TICKS) + " ms/call)");
+        profilingUnlockSurfaceTime = 0;
+        profilingUnlockSurfaceTicks = 0;
+      }
+    }
+  }
+
+  // Variables for lockSurface/unlockSurface
+  private JAWT_DrawingSurface ds;
+  private JAWT_DrawingSurfaceInfo dsi;
+  private JAWT_Win32DrawingSurfaceInfo win32dsi;
+  private long profilingLockSurfaceTime = 0;
+  private int  profilingLockSurfaceTicks = 0;
+  private long profilingUnlockSurfaceTime = 0;
+  private int  profilingUnlockSurfaceTicks = 0;
+  
+}
+
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/x11/X11JAWTWindow.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/x11/X11JAWTWindow.java
new file mode 100644
index 000000000..f2977e8f0
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/x11/X11JAWTWindow.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.nativewindow.impl.jawt.x11;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+
+import com.jogamp.nativewindow.impl.x11.*;
+import com.jogamp.nativewindow.impl.jawt.*;
+import com.jogamp.nativewindow.impl.*;
+
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+
+public class X11JAWTWindow extends JAWTWindow {
+
+  public X11JAWTWindow(Object comp, AbstractGraphicsConfiguration config) {
+    super(comp, config);
+  }
+
+  protected void initNative() throws NativeWindowException {
+  }
+
+  public synchronized int lockSurface() throws NativeWindowException {
+    int ret = super.lockSurface();
+    if(LOCK_SUCCESS != ret) {
+        return ret;
+    }
+    ds = JAWT.getJAWT().GetDrawingSurface(component);
+    if (ds == null) {
+      // Widget not yet realized
+      super.unlockSurface();
+      return LOCK_SURFACE_NOT_READY;
+    }
+    int res = ds.Lock();
+    if ((res & JAWTFactory.JAWT_LOCK_ERROR) != 0) {
+      super.unlockSurface();
+      throw new NativeWindowException("Unable to lock surface");
+    }
+    // See whether the surface changed and if so destroy the old
+    // OpenGL context so it will be recreated (NOTE: removeNotify
+    // should handle this case, but it may be possible that race
+    // conditions can cause this code to be triggered -- should test
+    // more)
+    if ((res & JAWTFactory.JAWT_LOCK_SURFACE_CHANGED) != 0) {
+      ret = LOCK_SURFACE_CHANGED;
+    }
+    dsi = ds.GetDrawingSurfaceInfo();
+    if (dsi == null) {
+      // Widget not yet realized
+      ds.Unlock();
+      JAWT.getJAWT().FreeDrawingSurface(ds);
+      ds = null;
+      super.unlockSurface();
+      return LOCK_SURFACE_NOT_READY;
+    }
+    x11dsi = (JAWT_X11DrawingSurfaceInfo) dsi.platformInfo();
+    if (x11dsi == null) {
+      // Widget not yet realized
+      ds.FreeDrawingSurfaceInfo(dsi);
+      ds.Unlock();
+      JAWT.getJAWT().FreeDrawingSurface(ds);
+      ds = null;
+      dsi = null;
+      super.unlockSurface();
+      return LOCK_SURFACE_NOT_READY;
+    }
+    drawable = x11dsi.getDrawable();
+    if (drawable == 0) {
+      // Widget not yet realized
+      ds.FreeDrawingSurfaceInfo(dsi);
+      ds.Unlock();
+      JAWT.getJAWT().FreeDrawingSurface(ds);
+      ds = null;
+      dsi = null;
+      x11dsi = null;
+      drawable = 0;
+      super.unlockSurface();
+      return LOCK_SURFACE_NOT_READY;
+    }
+    return ret;
+  }
+
+  public synchronized void unlockSurface() {
+    if(!isSurfaceLocked()) {
+        throw new RuntimeException("JAWTWindow not locked");
+    }
+    ds.FreeDrawingSurfaceInfo(dsi);
+    ds.Unlock();
+    JAWT.getJAWT().FreeDrawingSurface(ds);
+    ds = null;
+    dsi = null;
+    x11dsi = null;
+    super.unlockSurface();
+  }
+
+  // Variables for lockSurface/unlockSurface
+  private JAWT_DrawingSurface ds;
+  private JAWT_DrawingSurfaceInfo dsi;
+  private JAWT_X11DrawingSurfaceInfo x11dsi;
+  
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/x11/X11SunJDKReflection.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/x11/X11SunJDKReflection.java
new file mode 100644
index 000000000..7cca6f9f3
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/x11/X11SunJDKReflection.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.nativewindow.impl.jawt.x11;
+
+import com.jogamp.nativewindow.impl.x11.*;
+
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.lang.reflect.*;
+import java.security.*;
+
+import javax.media.nativewindow.AbstractGraphicsConfiguration;
+import javax.media.nativewindow.awt.AWTGraphicsConfiguration;
+
+/** This class encapsulates the reflection routines necessary to peek
+    inside a few data structures in the AWT implementation on X11 for
+    the purposes of correctly enumerating the available visuals. */
+
+public class X11SunJDKReflection {
+  private static Class   x11GraphicsDeviceClass;
+  private static Method  x11GraphicsDeviceGetScreenMethod;
+  private static Method  x11GraphicsDeviceGetDisplayMethod;
+  private static Class   x11GraphicsConfigClass;
+  private static Method  x11GraphicsConfigGetVisualMethod;
+  private static boolean initted;
+
+  static {
+    AccessController.doPrivileged(new PrivilegedAction() {
+        public Object run() {
+          try {
+            x11GraphicsDeviceClass = Class.forName("sun.awt.X11GraphicsDevice");
+            x11GraphicsDeviceGetScreenMethod = x11GraphicsDeviceClass.getDeclaredMethod("getScreen", new Class[] {});
+            x11GraphicsDeviceGetScreenMethod.setAccessible(true);
+            x11GraphicsDeviceGetDisplayMethod = x11GraphicsDeviceClass.getDeclaredMethod("getDisplay", new Class[] {});
+            x11GraphicsDeviceGetDisplayMethod.setAccessible(true);
+
+            x11GraphicsConfigClass = Class.forName("sun.awt.X11GraphicsConfig");
+            x11GraphicsConfigGetVisualMethod = x11GraphicsConfigClass.getDeclaredMethod("getVisual", new Class[] {});
+            x11GraphicsConfigGetVisualMethod.setAccessible(true);
+            initted = true;
+          } catch (Exception e) {
+            // Either not a Sun JDK or the interfaces have changed since 1.4.2 / 1.5
+          }
+          return null;
+        }
+      });
+  }
+
+  public static int graphicsDeviceGetScreen(GraphicsDevice device) {
+    if (!initted) {
+      return 0;
+    }
+
+    try {
+      return ((Integer) x11GraphicsDeviceGetScreenMethod.invoke(device, new Object[] {})).intValue();
+    } catch (Exception e) {
+      return 0;
+    }
+  }
+
+  public static long graphicsDeviceGetDisplay(GraphicsDevice device) {
+    if (!initted) {
+      return 0;
+    }
+
+    try {
+      return ((Long) x11GraphicsDeviceGetDisplayMethod.invoke(device, new Object[] {})).longValue();
+    } catch (Exception e) {
+      return 0;
+    }
+  }
+
+  public static int graphicsConfigurationGetVisualID(AbstractGraphicsConfiguration config) {
+      try {
+          if (config instanceof AWTGraphicsConfiguration) {
+              return graphicsConfigurationGetVisualID(((AWTGraphicsConfiguration) config).getGraphicsConfiguration());
+          }
+          return 0;
+      } catch (Exception e) {
+          return 0;
+      }
+  }
+
+  public static int graphicsConfigurationGetVisualID(GraphicsConfiguration config) {
+    if (!initted) {
+      return 0;
+    }
+
+    try {
+      return ((Integer) x11GraphicsConfigGetVisualMethod.invoke(config, new Object[] {})).intValue();
+    } catch (Exception e) {
+      return 0;
+    }
+  }
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jvm/JVMUtil.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jvm/JVMUtil.java
new file mode 100644
index 000000000..df703aa55
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jvm/JVMUtil.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.nativewindow.impl.jvm;
+
+import java.nio.ByteBuffer;
+import com.jogamp.nativewindow.impl.*;
+
+/**
+ * Currently this tool works around the Hotspot race condition bugs:
+ <PRE>
+     4395095 JNI access to java.nio DirectBuffer constructor/accessor
+     6852404 Race condition in JNI Direct Buffer access and creation routines
+ </PRE>
+ *
+ * Make sure to initialize this class as soon as possible,
+ * before doing any multithreading work.
+ *
+ */
+public class JVMUtil {
+    private static final boolean DEBUG = Debug.debug("JVMUtil");
+
+    static {
+        NativeLibLoaderBase.loadNativeWindow("jvm");
+
+        ByteBuffer buffer = InternalBufferUtil.newByteBuffer(64);
+        if( ! initialize(buffer) ) {
+            throw new RuntimeException("Failed to initialize the JVMUtil "+Thread.currentThread().getName());
+        }
+        if(DEBUG) {
+            Exception e = new Exception("JVMUtil.initSingleton() .. initialized "+Thread.currentThread().getName());
+            e.printStackTrace();
+        }
+    }
+
+    public static void initSingleton() {
+    }
+
+    private JVMUtil() {}
+
+    private static native boolean initialize(java.nio.ByteBuffer buffer);
+}
+
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java
new file mode 100644
index 000000000..4ffda2fae
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.nativewindow.impl.x11;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+import com.jogamp.nativewindow.impl.x11.XVisualInfo;
+import com.jogamp.nativewindow.impl.x11.X11Lib;
+
+public class X11GraphicsConfigurationFactory extends GraphicsConfigurationFactory {
+    public AbstractGraphicsConfiguration
+        chooseGraphicsConfiguration(Capabilities capabilities,
+                                    CapabilitiesChooser chooser,
+                                    AbstractGraphicsScreen screen)
+        throws IllegalArgumentException, NativeWindowException {
+
+        if(null==screen || !(screen instanceof X11GraphicsScreen)) {
+            throw new NativeWindowException("Only valid X11GraphicsScreen are allowed");
+        }
+        return new X11GraphicsConfiguration((X11GraphicsScreen)screen, capabilities, capabilities, getXVisualInfo(screen, capabilities));
+    }
+
+    public static XVisualInfo getXVisualInfo(AbstractGraphicsScreen screen, long visualID)
+    {
+        XVisualInfo xvi_temp = XVisualInfo.create();
+        xvi_temp.setVisualid(visualID);
+        xvi_temp.setScreen(screen.getIndex());
+        int num[] = { -1 };
+        long display = screen.getDevice().getHandle();
+
+        try {
+            X11Lib.XLockDisplay(display);
+            XVisualInfo[] xvis = X11Lib.XGetVisualInfoCopied(display, X11Lib.VisualIDMask|X11Lib.VisualScreenMask, xvi_temp, num, 0);
+
+            if(xvis==null || num[0]<1) {
+                return null;
+            }
+
+            return XVisualInfo.create(xvis[0]);
+        } finally {
+            X11Lib.XUnlockDisplay(display);
+        }
+
+    }
+
+    public static XVisualInfo getXVisualInfo(AbstractGraphicsScreen screen, Capabilities capabilities)
+    {
+        XVisualInfo xv = getXVisualInfoImpl(screen, capabilities, 4 /* TrueColor */);
+        if(null!=xv) return xv;
+        return getXVisualInfoImpl(screen, capabilities, 5 /* DirectColor */);
+    }
+
+    private static XVisualInfo getXVisualInfoImpl(AbstractGraphicsScreen screen, Capabilities capabilities, int c_class)
+    {
+        XVisualInfo ret = null;
+        int[] num = { -1 };
+
+        XVisualInfo vinfo_template = XVisualInfo.create();
+        vinfo_template.setScreen(screen.getIndex());
+        vinfo_template.setC_class(c_class);
+        long display = screen.getDevice().getHandle();
+
+        try {
+            X11Lib.XLockDisplay(display);
+            XVisualInfo[] vinfos = X11Lib.XGetVisualInfoCopied(display, X11Lib.VisualScreenMask, vinfo_template, num, 0);
+            XVisualInfo best=null;
+            int rdepth = capabilities.getRedBits() + capabilities.getGreenBits() + capabilities.getBlueBits() + capabilities.getAlphaBits();
+            for (int i = 0; vinfos!=null && i < num[0]; i++) {
+                if ( best == null || 
+                     best.getDepth() < vinfos[i].getDepth() )
+                {
+                    best = vinfos[i];
+                    if(rdepth <= best.getDepth())
+                        break;
+                }
+            }
+            if ( null!=best && ( rdepth <= best.getDepth() || 24 == best.getDepth()) ) {
+                ret = XVisualInfo.create(best);
+            }
+            best = null;
+
+            return ret;
+        } finally {
+            X11Lib.XUnlockDisplay(display);
+        }
+    }
+}
+
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java
new file mode 100644
index 000000000..9fc986180
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.nativewindow.impl.x11;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.media.nativewindow.*;
+
+import com.jogamp.nativewindow.impl.*;
+
+/**
+ * Contains a thread safe X11 utility to retrieve thread local display connection,<br>
+ * as well as the static global discplay connection.<br>
+ *
+ * The TLS variant is thread safe per se, but be aware of the memory leak risk 
+ * where an application heavily utilizing this class on temporary new threads.<br>
+ */
+public class X11Util {
+    private static final boolean DEBUG = Debug.debug("X11Util");
+
+    static {
+        NativeLibLoaderBase.loadNativeWindow("x11");
+    }
+
+    private X11Util() {}
+
+    private static ThreadLocal currentDisplayMap = new ThreadLocal();
+
+    public static class NamedDisplay implements Cloneable {
+        private String name;
+        private long   handle;
+
+        protected NamedDisplay(String name, long handle) {
+            this.name=name;
+            this.handle=handle;
+        }
+
+        public String getName() { return name; }
+        public long   getHandle() { return handle; }
+
+        public Object clone() throws CloneNotSupportedException {
+          return super.clone();
+        }
+    }
+
+    /** Returns a clone of the thread local display map, you may {@link Object#wait()} on it */
+    public static Map getCurrentDisplayMap() {
+        return (Map) ((HashMap)getCurrentDisplayMapImpl()).clone();
+    }
+
+    /** Returns this thread current default display.  If it doesn not exist, it is being created */
+    public static long getThreadLocalDefaultDisplay() {
+        return getThreadLocalDisplay(null);
+    }
+
+    /** Returns this thread named display. If it doesn not exist, it is being created */
+    public static long getThreadLocalDisplay(String name) {
+        NamedDisplay namedDpy = getCurrentDisplay(name);
+        if(null==namedDpy) {
+            long dpy = X11Lib.XOpenDisplay(name);
+            if(0==dpy) {
+                throw new NativeWindowException("X11Util.Display: Unable to create a display("+name+") connection in Thread "+Thread.currentThread().getName());
+            }
+            namedDpy = new NamedDisplay(name, dpy);
+            setCurrentDisplay( namedDpy );
+            if(DEBUG) {
+                Exception e = new Exception("X11Util.Display: Created new TLS display("+name+") connection 0x"+Long.toHexString(dpy)+" in thread "+Thread.currentThread().getName());
+                e.printStackTrace();
+            }
+        }
+        return namedDpy.getHandle();
+    }
+
+    /** Closes this thread named display. It returns the handle of the closed display or 0, if it does not exist. */
+    public static long closeThreadLocalDisplay(String name) {
+        NamedDisplay namedDpy = removeCurrentDisplay(name);
+        if(null==namedDpy) {
+            if(DEBUG) {
+                Exception e = new Exception("X11Util.Display: Display("+name+") with given handle is not mapped to TLS in thread "+Thread.currentThread().getName());
+                e.printStackTrace();
+            }
+            return 0;
+        }
+        long dpy = namedDpy.getHandle();
+        X11Lib.XCloseDisplay(dpy);
+        if(DEBUG) {
+            Exception e = new Exception("X11Util.Display: Closed TLS Display("+name+") with handle 0x"+Long.toHexString(dpy)+" in thread "+Thread.currentThread().getName());
+            e.printStackTrace();
+        }
+        return dpy;
+    }
+
+    private static Map getCurrentDisplayMapImpl() {
+        Map displayMap = (Map) currentDisplayMap.get();
+        if(null==displayMap) {
+            displayMap = new HashMap();
+            currentDisplayMap.set( displayMap );
+        }
+        return displayMap;
+    }
+
+    /** maps the given display to the thread local display map
+      * and notifies all threads synchronized to this display map. */
+    private static NamedDisplay setCurrentDisplay(NamedDisplay newDisplay) {
+        Map displayMap = getCurrentDisplayMapImpl();
+        NamedDisplay oldDisplay = null;
+        synchronized(displayMap) {
+            String name = (null==newDisplay.getName())?"nil":newDisplay.getName();
+            oldDisplay = (NamedDisplay) displayMap.put(name, newDisplay);
+            displayMap.notifyAll();
+        }
+        return oldDisplay;
+    }
+
+    /** removes the mapping of the given name from the thread local display map
+      * and notifies all threads synchronized to this display map. */
+    private static NamedDisplay removeCurrentDisplay(String name) {
+        Map displayMap = getCurrentDisplayMapImpl();
+        NamedDisplay oldDisplay = null;
+        synchronized(displayMap) {
+            if(null==name) name="nil";
+            oldDisplay = (NamedDisplay) displayMap.remove(name);
+            displayMap.notifyAll();
+        }
+        return oldDisplay;
+    }
+
+    /** Returns the thread local display mapped to the given name */
+    private static NamedDisplay getCurrentDisplay(String name) {
+        if(null==name) name="nil";
+        Map displayMap = getCurrentDisplayMapImpl();
+        return (NamedDisplay) displayMap.get(name);
+    }
+
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/awt/X11AWTNativeWindowFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/awt/X11AWTNativeWindowFactory.java
new file mode 100644
index 000000000..616220e14
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/awt/X11AWTNativeWindowFactory.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.nativewindow.impl.x11.awt;
+
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import javax.media.nativewindow.*;
+
+import com.jogamp.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.jawt.*;
+import com.jogamp.nativewindow.impl.jawt.x11.*;
+import com.jogamp.nativewindow.impl.x11.*;
+
+public class X11AWTNativeWindowFactory extends NativeWindowFactoryImpl {
+
+    // When running the AWT on X11 platforms, we use the AWT native
+    // interface (JAWT) to lock and unlock the toolkit
+    private ToolkitLock toolkitLock = new ToolkitLock() {
+            private Thread owner;
+            private int recursionCount;
+            
+            public synchronized void lock() {
+                Thread cur = Thread.currentThread();
+                if (owner == cur) {
+                    ++recursionCount;
+                    return;
+                }
+                while (owner != null) {
+                    try {
+                        wait();
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+                owner = cur;
+                JAWTUtil.lockToolkit();
+            }
+
+            public synchronized void unlock() {
+                if (owner != Thread.currentThread()) {
+                    throw new RuntimeException("Not owner");
+                }
+                if (recursionCount > 0) {
+                    --recursionCount;
+                    return;
+                }
+                owner = null;
+                JAWTUtil.unlockToolkit();
+                notifyAll();
+            }
+        };
+
+    public ToolkitLock getToolkitLock() {
+        return toolkitLock;
+    }
+}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/Debug.java b/src/nativewindow/classes/com/sun/nativewindow/impl/Debug.java
deleted file mode 100644
index dd967c71a..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/Debug.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.nativewindow.impl;
-
-import java.security.*;
-
-/** Helper routines for logging and debugging. */
-
-public class Debug {
-  // Some common properties
-  private static boolean verbose;
-  private static boolean debugAll;
-  private static AccessControlContext localACC;
-  
-  static {
-    localACC=AccessController.getContext();
-    verbose = isPropertyDefined("nativewindow.verbose", true);
-    debugAll = isPropertyDefined("nativewindow.debug", true);
-    if (verbose) {
-       Package p = Package.getPackage("javax.media.nativewindow");
-       System.err.println("NativeWindow specification version " + p.getSpecificationVersion());
-       System.err.println("NativeWindow implementation version " + p.getImplementationVersion());
-       System.err.println("NativeWindow implementation vendor " + p.getImplementationVendor());
-    }
-  }
-
-  static int getIntProperty(final String property, final boolean jnlpAlias) {
-      return getIntProperty(property, jnlpAlias, localACC);
-  }
-
-  public static int getIntProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    int i=0;
-    try {
-        Integer iv = Integer.valueOf(Debug.getProperty(property, jnlpAlias, acc));
-        i = iv.intValue();
-    } catch (NumberFormatException nfe) {}
-    return i;
-  }
-
-  static boolean getBooleanProperty(final String property, final boolean jnlpAlias) {
-    return getBooleanProperty(property, jnlpAlias, localACC);
-  }
-
-  public static boolean getBooleanProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    Boolean b = Boolean.valueOf(Debug.getProperty(property, jnlpAlias, acc));
-    return b.booleanValue();
-  }
-
-  static boolean isPropertyDefined(final String property, final boolean jnlpAlias) {
-    return isPropertyDefined(property, jnlpAlias, localACC);
-  }
-
-  public static boolean isPropertyDefined(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    return (Debug.getProperty(property, jnlpAlias, acc) != null) ? true : false;
-  }
-
-  static String getProperty(final String property, final boolean jnlpAlias) {
-    return getProperty(property, jnlpAlias, localACC);
-  }
-
-  public static String getProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    String s=null;
-    if(null!=acc && acc.equals(localACC)) {
-        s = (String) AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-              String val=null;
-              try {
-                  val = System.getProperty(property);
-              } catch (Exception e) {}
-              if(null==val && jnlpAlias && !property.startsWith(jnlp_prefix)) {
-                  try {
-                      val = System.getProperty(jnlp_prefix + property);
-                  } catch (Exception e) {}
-              }
-              return val;
-            }
-          });
-    } else {
-        try {
-            s = System.getProperty(property);
-        } catch (Exception e) {}
-        if(null==s && jnlpAlias && !property.startsWith(jnlp_prefix)) {
-            try {
-                s = System.getProperty(jnlp_prefix + property);
-            } catch (Exception e) {}
-        }
-    }
-    return s;
-  }
-  public static final String jnlp_prefix = "jnlp." ;
-
-  public static boolean verbose() {
-    return verbose;
-  }
-
-  public static boolean debugAll() {
-    return debugAll;
-  }
-
-  public static boolean debug(String subcomponent) {
-    return debugAll() || isPropertyDefined("nativewindow.debug." + subcomponent, true);
-  }
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/GraphicsConfigurationFactoryImpl.java b/src/nativewindow/classes/com/sun/nativewindow/impl/GraphicsConfigurationFactoryImpl.java
deleted file mode 100644
index 4e8e281a8..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/GraphicsConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.nativewindow.impl;
-
-import javax.media.nativewindow.*;
-
-public class GraphicsConfigurationFactoryImpl extends GraphicsConfigurationFactory {
-    public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
-                                                                     CapabilitiesChooser chooser,
-                                                                     AbstractGraphicsScreen screen) {
-        return new DefaultGraphicsConfiguration(screen, capabilities, capabilities);
-    }
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java
deleted file mode 100644
index 7cf2e3ff5..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.nativewindow.impl;
-
-import java.lang.reflect.*;
-import java.nio.*;
-
-/** Internal copy of selected routines from BufferUtil to avoid
-    outward dependencies on com.jogamp.opengl.util package. */
-public class InternalBufferUtil {
-    public static final int SIZEOF_BYTE = 1;
-    public static final int SIZEOF_SHORT = 2;
-    public static final int SIZEOF_INT = 4;
-    public static final int SIZEOF_FLOAT = 4;
-
-    //----------------------------------------------------------------------
-    // Allocation routines
-    //
-
-    /** Allocates a new direct ByteBuffer with the specified number of
-        elements. The returned buffer will have its byte order set to
-        the host platform's native byte order. */
-    public static ByteBuffer newByteBuffer(int numElements) {
-        ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
-        nativeOrder(bb);
-        return bb;
-    }
-    
-    /** Allocates a new direct IntBuffer with the specified number of
-        elements. The returned buffer will have its byte order set to
-        the host platform's native byte order. */
-    public static IntBuffer newIntBuffer(int numElements) {
-        ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
-        return bb.asIntBuffer();
-    }
-    
-    //----------------------------------------------------------------------
-    // Copy routines (type-to-type)
-    //
-
-    /** Copies the <i>remaining</i> elements (as defined by
-        <code>limit() - position()</code>) in the passed ByteBuffer into
-        a newly-allocated direct ByteBuffer. The returned buffer will
-        have its byte order set to the host platform's native byte
-        order. The position of the newly-allocated buffer will be zero,
-        and the position of the passed buffer is unchanged (though its
-        mark is changed). */
-    public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
-        ByteBuffer dest = newByteBuffer(orig.remaining());
-        dest.put(orig);
-        dest.rewind();
-        return dest;
-    }
-
-    //----------------------------------------------------------------------
-    // Conversion routines 
-    //
-
-    public static ByteBuffer nativeOrder(ByteBuffer buf) {
-        if (!isCDCFP) {
-            try {
-                if (byteOrderClass == null) {
-                    byteOrderClass = Class.forName("java.nio.ByteOrder");
-                    orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
-                    Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
-                    nativeOrderObject = nativeOrderMethod.invoke(null, null);
-                }
-            } catch (Throwable t) {
-                // Must be running on CDC / FP
-                isCDCFP = true;
-            }
-
-            if (!isCDCFP) {
-                try {
-                    orderMethod.invoke(buf, new Object[] { nativeOrderObject });
-                } catch (Throwable t) {
-                }
-            }
-        }
-        return buf;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    // NOTE that this work must be done reflectively at the present time
-    // because this code must compile and run correctly on both CDC/FP and J2SE
-    private static boolean isCDCFP;
-    private static Class byteOrderClass;
-    private static Object nativeOrderObject;
-    private static Method orderMethod;
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/LockingNativeWindowFactory.java b/src/nativewindow/classes/com/sun/nativewindow/impl/LockingNativeWindowFactory.java
deleted file mode 100644
index 880fd8c7d..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/LockingNativeWindowFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.nativewindow.impl;
-
-import javax.media.nativewindow.*;
-
-public class LockingNativeWindowFactory extends NativeWindowFactoryImpl {
-    // Provides a generic basic and recursive locking mechanism for your discretion.
-    private ToolkitLock toolkitLock = new ToolkitLock() {
-            private Thread owner;
-            private int recursionCount;
-            
-            public synchronized void lock() {
-                Thread cur = Thread.currentThread();
-                if (owner == cur) {
-                    ++recursionCount;
-                    return;
-                }
-                while (owner != null) {
-                    try {
-                        wait();
-                    } catch (InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-                owner = cur;
-            }
-
-            public synchronized void unlock() {
-                if (owner != Thread.currentThread()) {
-                    throw new RuntimeException("Not owner");
-                }
-                if (recursionCount > 0) {
-                    --recursionCount;
-                    return;
-                }
-                owner = null;
-                notifyAll();
-            }
-        };
-
-    public ToolkitLock getToolkitLock() {
-        return toolkitLock;
-    }
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/NWReflection.java b/src/nativewindow/classes/com/sun/nativewindow/impl/NWReflection.java
deleted file mode 100644
index d86fbdc55..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/NWReflection.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.nativewindow.impl;
-
-import java.lang.reflect.*;
-import javax.media.nativewindow.*;
-
-public final class NWReflection {
-  public static final boolean DEBUG = Debug.debug("NWReflection");
-
-  public static final boolean isClassAvailable(String clazzName) {
-    try {
-        Class clazz = Class.forName(clazzName, false, NWReflection.class.getClassLoader());
-        return null!=clazz;
-    } catch (Throwable e) { }
-    return false;
-  }
-
-  public static final Class getClass(String clazzName, boolean initialize) {
-    try {
-        return Class.forName(clazzName, initialize, NWReflection.class.getClassLoader());
-    } catch (Throwable e) { }
-    return null;
-  }
-
-  public static final Constructor getConstructor(String clazzName, Class[] cstrArgTypes) {
-    Class factoryClass = null;
-    Constructor factory = null;
-
-    try {
-        factoryClass = getClass(clazzName, true);
-        if (factoryClass == null) {
-          throw new NativeWindowException(clazzName + " not available");
-        }
-        return getConstructor(factoryClass, cstrArgTypes);
-    } catch (Throwable e) { 
-      if (DEBUG) {
-          e.printStackTrace();
-      }
-      throw new NativeWindowException(e);
-    }
-  }
-
-  public static final Constructor getConstructor(Class clazz, Class[] cstrArgTypes) {
-    Constructor factory = null;
-
-    try {
-        try {
-            factory = clazz.getDeclaredConstructor( cstrArgTypes );
-        } catch(NoSuchMethodException nsme) {
-          throw new NativeWindowException("Constructor: '" + clazz + "("+cstrArgTypes+")' not found");
-        }
-        return factory;
-    } catch (Throwable e) { 
-      if (DEBUG) {
-          e.printStackTrace();
-      }
-      throw new NativeWindowException(e);
-    }
-  }
-
-  public static final Constructor getConstructor(String clazzName) {
-    return getConstructor(clazzName, new Class[0]);
-  }
-
-  public static final Object createInstance(Class clazz, Class[] cstrArgTypes, Object[] cstrArgs) {
-    Constructor factory = null;
-
-    try {
-        factory = getConstructor(clazz, cstrArgTypes);
-        return factory.newInstance( cstrArgs ) ;
-    } catch (Exception e) {
-      throw new NativeWindowException(e);
-    }
-  }
-
-  public static final Object createInstance(Class clazz, Object[] cstrArgs) {
-    Class[] cstrArgTypes = new Class[cstrArgs.length];
-    for(int i=0; i<cstrArgs.length; i++) {
-        cstrArgTypes[i] = cstrArgs[i].getClass();
-    }
-    return createInstance(clazz, cstrArgTypes, cstrArgs);
-  }
-
-  public static final Object createInstance(String clazzName, Class[] cstrArgTypes, Object[] cstrArgs) {
-    Constructor factory = null;
-
-    try {
-        factory = getConstructor(clazzName, cstrArgTypes);
-        return factory.newInstance( cstrArgs ) ;
-    } catch (Exception e) {
-      throw new NativeWindowException(e);
-    }
-  }
-
-  public static final Object createInstance(String clazzName, Object[] cstrArgs) {
-    Class[] cstrArgTypes = new Class[cstrArgs.length];
-    for(int i=0; i<cstrArgs.length; i++) {
-        cstrArgTypes[i] = cstrArgs[i].getClass();
-    }
-    return createInstance(clazzName, cstrArgTypes, cstrArgs);
-  }
-
-  public static final Object createInstance(String clazzName) {
-    return createInstance(clazzName, new Class[0], null);
-  }
-
-  public static final boolean instanceOf(Object obj, String clazzName) {
-    return instanceOf(obj.getClass(), clazzName);
-  }
-  public static final boolean instanceOf(Class clazz, String clazzName) {
-    do {
-        if(clazz.getName().equals(clazzName)) {
-            return true;
-        }
-        clazz = clazz.getSuperclass();
-    } while (clazz!=null);
-    return false;
-  }
-
-  public static final boolean implementationOf(Object obj, String faceName) {
-    return implementationOf(obj.getClass(), faceName);
-  }
-  public static final boolean implementationOf(Class clazz, String faceName) {
-    do {
-        Class[] clazzes = clazz.getInterfaces();
-        for(int i=clazzes.length-1; i>=0; i--) {
-            Class face = clazzes[i];
-            if(face.getName().equals(faceName)) {
-                return true;
-            }
-        }
-        clazz = clazz.getSuperclass();
-    } while (clazz!=null);
-    return false;
-  }
-
-  public static boolean isAWTComponent(Object target) {
-      return instanceOf(target, "java.awt.Component");
-  }
-
-  public static boolean isAWTComponent(Class clazz) {
-      return instanceOf(clazz, "java.awt.Component");
-  }
-
-}
-
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/NativeLibLoaderBase.java b/src/nativewindow/classes/com/sun/nativewindow/impl/NativeLibLoaderBase.java
deleted file mode 100644
index 570cf1f9d..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/NativeLibLoaderBase.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.nativewindow.impl;
-
-// FIXME: refactor Java SE dependencies
-//import java.awt.Toolkit;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashSet;
-
-public class NativeLibLoaderBase {
-  public static final boolean DEBUG = Debug.debug("NativeLibLoader");
-
-  public interface LoaderAction {
-    /**
-     * Loads the library specified by libname. Optionally preloads the libraries specified by
-     * preload. The implementation should ignore, if the preload-libraries have already been
-     * loaded.
-     * @param libname the library to load
-     * @param preload the libraries to load before loading the main library if not null
-     * @param preloadIgnoreError true, if errors during loading the preload-libraries should be ignored 
-     */
-    void loadLibrary(String libname, String[] preload, 
-        boolean preloadIgnoreError);
-  }
-  
-  private static class DefaultAction implements LoaderAction {
-    public void loadLibrary(String libname, String[] preload,
-        boolean preloadIgnoreError) {
-      if (null!=preload) {
-        for (int i=0; i<preload.length; i++) {
-          if(!isLoaded(preload[i])) {
-              try {
-                loadLibraryInternal(preload[i]);
-                addLoaded(preload[i]);
-                if(DEBUG) {
-                    System.err.println("NativeLibLoaderBase preloaded "+preload[i]);
-                }
-              }
-              catch (UnsatisfiedLinkError e) {
-                if(DEBUG) e.printStackTrace();
-                if (!preloadIgnoreError && e.getMessage().indexOf("already loaded") < 0) {
-                  throw e;
-                }
-              }
-          }
-        }
-      }
-      loadLibraryInternal(libname);
-      addLoaded(libname);
-      if(DEBUG) {
-          System.err.println("NativeLibLoaderBase    loaded "+libname);
-      }
-    }
-  }
-
-  private static final HashSet loaded = new HashSet();
-  private static LoaderAction loaderAction = new DefaultAction();
-
-  public static boolean isLoaded(String libName) {
-    return loaded.contains(libName);
-  }
-
-  public static void addLoaded(String libName) {
-    loaded.add(libName);
-    if(DEBUG) {
-        System.err.println("NativeLibLoaderBase Loaded Native Library: "+libName);
-    }
-  }
-
-  public static void disableLoading() {
-    setLoadingAction(null);
-  }
-
-  public static void enableLoading() {
-    setLoadingAction(new DefaultAction());
-  }
-  
-  public static synchronized void setLoadingAction(LoaderAction action) {
-    loaderAction = action;
-  }
-
-  protected static synchronized void loadLibrary(String libname, String[] preload, 
-      boolean preloadIgnoreError) {
-    if (loaderAction != null && !isLoaded(libname))
-    {
-      loaderAction.loadLibrary(libname, preload, preloadIgnoreError);    
-    }
-  }
-  
-  public static void loadNativeWindow(final String ossuffix) {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("nativewindow_"+ossuffix, null, false);
-        return null;
-      }
-    });
-  }
-
-
-  private static final Class  customLauncherClass;
-  private static final Method customLoadLibraryMethod;
-
-  static {
-    Class launcherClass = null;
-    Method loadLibraryMethod = null;
-
-    if ( Debug.getBooleanProperty("sun.jnlp.applet.launcher", false) ) {
-        try {
-            launcherClass = Class.forName("org.jdesktop.applet.util.JNLPAppletLauncher");
-            loadLibraryMethod = launcherClass.getDeclaredMethod("loadLibrary", new Class[] { String.class });
-        } catch (Throwable t) { 
-            if(DEBUG) {
-                t.printStackTrace();
-            }
-            launcherClass = null;
-            loadLibraryMethod = null;
-        }
-    }
-
-    if(null==launcherClass) {
-        String launcherClassName = Debug.getProperty("jnlp.launcher.class", false);
-        if(null!=launcherClassName) {
-            try {
-                launcherClass = Class.forName(launcherClassName);
-                loadLibraryMethod = launcherClass.getDeclaredMethod("loadLibrary", new Class[] { String.class });
-            } catch (Throwable t) { 
-                if(DEBUG) {
-                    t.printStackTrace();
-                }
-                launcherClass = null;
-                loadLibraryMethod = null;
-            }
-        }
-    }
-    customLauncherClass = launcherClass;
-    customLoadLibraryMethod = loadLibraryMethod;
-  }
-
-  private static void loadLibraryInternal(String libraryName) {
-    // Note: special-casing JAWT which is built in to the JDK
-    if (null!=customLoadLibraryMethod && !libraryName.equals("jawt")) {
-        try {
-          customLoadLibraryMethod.invoke(null, new Object[] { libraryName });
-        } catch (Exception e) {
-          Throwable t = e;
-          if (t instanceof InvocationTargetException) {
-            t = ((InvocationTargetException) t).getTargetException();
-          }
-          if (t instanceof Error)
-            throw (Error) t;
-          if (t instanceof RuntimeException) {
-            throw (RuntimeException) t;
-          }
-          // Throw UnsatisfiedLinkError for best compatibility with System.loadLibrary()
-          throw (UnsatisfiedLinkError) new UnsatisfiedLinkError().initCause(e);
-        }
-    } else {
-      // System.out.println("sun.boot.library.path=" + Debug.getProperty("sun.boot.library.path", false));
-      System.loadLibrary(libraryName);
-    }
-  }
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/NativeWindowFactoryImpl.java b/src/nativewindow/classes/com/sun/nativewindow/impl/NativeWindowFactoryImpl.java
deleted file mode 100644
index c94dab2f6..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/NativeWindowFactoryImpl.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.nativewindow.impl;
-
-import java.lang.reflect.*;
-import java.security.*;
-
-import javax.media.nativewindow.*;
-
-public class NativeWindowFactoryImpl extends NativeWindowFactory {
-    protected static final boolean DEBUG = Debug.debug("NativeWindowFactoryImpl");
-
-    // This subclass of NativeWindowFactory handles the case of
-    // NativeWindows being passed in
-    protected NativeWindow getNativeWindowImpl(Object winObj, AbstractGraphicsConfiguration config) throws IllegalArgumentException {
-        if (null == winObj) {
-            throw new IllegalArgumentException("winObj is null");
-        }
-        if (winObj instanceof NativeWindow) {
-            // Use the NativeWindow directly
-            return (NativeWindow) winObj;
-        }
-
-        if (null == config) {
-            throw new IllegalArgumentException("AbstractGraphicsConfiguration is null with a non NativeWindow object");
-        }
-
-        if (NWReflection.isAWTComponent(winObj)) {
-            return getAWTNativeWindow(winObj, config);
-        }
-
-        throw new IllegalArgumentException("Target window object type " +
-                                           winObj.getClass().getName() + " is unsupported; expected " +
-                                           "javax.media.nativewindow.NativeWindow or java.awt.Component");
-    }
-    
-    private Constructor nativeWindowConstructor = null;
-
-    private NativeWindow getAWTNativeWindow(Object winObj, AbstractGraphicsConfiguration config) {
-        if (nativeWindowConstructor == null) {
-            try {
-                String osType = getNativeWindowType(true);
-                String windowClassName = null;
-
-                // We break compile-time dependencies on the AWT here to
-                // make it easier to run this code on mobile devices
-
-                if (osType.equals(TYPE_WINDOWS)) {
-                    windowClassName = "com.sun.nativewindow.impl.jawt.windows.WindowsJAWTWindow";
-                } else if (osType.equals(TYPE_MACOSX)) {
-                    windowClassName = "com.sun.nativewindow.impl.jawt.macosx.MacOSXJAWTWindow";
-                } else if (osType.equals(TYPE_X11)) {
-                    // Assume Linux, Solaris, etc. Should probably test for these explicitly.
-                    windowClassName = "com.sun.nativewindow.impl.jawt.x11.X11JAWTWindow";
-                } else {
-                    throw new IllegalArgumentException("OS " + getNativeOSName(false) + " not yet supported");
-                }
-
-                nativeWindowConstructor = NWReflection.getConstructor(windowClassName, new Class[] { Object.class, AbstractGraphicsConfiguration.class });
-            } catch (Exception e) {
-                throw (IllegalArgumentException) new IllegalArgumentException().initCause(e);
-            }
-        }
-
-        try {
-            return (NativeWindow) nativeWindowConstructor.newInstance(new Object[] { winObj, config });
-        } catch (Exception ie) {
-            throw (IllegalArgumentException) new IllegalArgumentException().initCause(ie);
-        }
-    }
-
-    // On most platforms the toolkit lock is a no-op
-    private ToolkitLock toolkitLock = new ToolkitLock() {
-            public void lock() {
-            }
-
-            public void unlock() {
-            }
-        };
-
-    public ToolkitLock getToolkitLock() {
-        return toolkitLock;
-    }
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java
deleted file mode 100644
index ca55aa542..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.nativewindow.impl;
-
-import javax.media.nativewindow.*;
-
-public class NullWindow implements NativeWindow, SurfaceChangeable {
-  private Exception lockedStack = null;
-  protected int width, height, scrnIndex;
-  protected long surfaceHandle, displayHandle;
-  protected AbstractGraphicsConfiguration config;
-
-  public NullWindow(AbstractGraphicsConfiguration cfg) {
-    invalidate();
-    config = cfg;
-    displayHandle=cfg.getScreen().getDevice().getHandle();
-    scrnIndex=cfg.getScreen().getIndex();
-  }
-
-  protected void init(Object windowObject) throws NativeWindowException {
-  }
-
-  protected void initNative() throws NativeWindowException {
-  }
-
-  public void destroy() {
-    invalidate();
-  }
-
-  public synchronized void invalidate() {
-    displayHandle=0;
-    scrnIndex=-1;
-    surfaceHandle=0;
-  }
-
-  public synchronized int lockSurface() throws NativeWindowException {
-    if (null!=lockedStack) {
-      lockedStack.printStackTrace();
-      throw new NativeWindowException("Surface already locked - "+this);
-    }
-    lockedStack = new Exception("NullWindow previously locked by "+Thread.currentThread().getName());
-    return LOCK_SUCCESS;
-  }
-
-  public synchronized void unlockSurface() {
-    if (null!=lockedStack) {
-        lockedStack = null;
-    } else {
-        throw new NativeWindowException("NullWindow not locked");
-    }
-  }
-
-  public synchronized boolean isSurfaceLocked() {
-    return null!=lockedStack;
-  }
-
-  public Exception getLockedStack() {
-    return lockedStack;
-  }
-
-  public boolean surfaceSwap() {
-    return false;
-  }
-
-  public void surfaceUpdated(Object updater, NativeWindow window, long when) { }
-
-  public long getDisplayHandle() {
-    return displayHandle;
-  }
-  public int getScreenIndex() {
-    return scrnIndex;
-  }
-  public long getWindowHandle() {
-    return 0;
-  }
-  public long getSurfaceHandle() {
-    return surfaceHandle;
-  }
-  public void setSurfaceHandle(long surfaceHandle) {
-    this.surfaceHandle=surfaceHandle;
-  }
-  public AbstractGraphicsConfiguration getGraphicsConfiguration() {
-    return config;
-  }
-
-  public Object getWrappedWindow() {
-    return null;
-  }
-
-  public final boolean isTerminalObject() {
-    return true;
-  }
-
-  public void setSize(int width, int height) {
-    this.width=width;
-    this.height=height;
-  }
-
-  public int getWidth() {
-    return width;
-  }
-
-  public int getHeight() {
-    return height;
-  }
-
-  public String toString() {
-    return "NullWindow[config "+config+
-                ", displayHandle 0x"+Long.toHexString(getDisplayHandle())+
-                ", surfaceHandle 0x"+Long.toHexString(getSurfaceHandle())+
-                ", size "+getWidth()+"x"+getHeight()+"]";
-  }
-
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java
deleted file mode 100644
index bc963277a..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.nativewindow.impl.jawt;
-
-import javax.media.nativewindow.NativeWindowFactory;
-import com.sun.nativewindow.impl.NativeLibLoaderBase;
-
-import java.awt.Toolkit;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-public class JAWTNativeLibLoader extends NativeLibLoaderBase {
-  public static void loadAWTImpl() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        // Make sure that awt.dll is loaded before loading jawt.dll. Otherwise
-        // a Dialog with "awt.dll not found" might pop up.
-        // See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4481947.
-        Toolkit.getDefaultToolkit();
-        
-        // Must pre-load JAWT on all non-Mac platforms to
-        // ensure references from jogl_awt shared object
-        // will succeed since JAWT shared object isn't in
-        // default library path
-        if ( ! NativeWindowFactory.TYPE_MACOSX.equals( NativeWindowFactory.getNativeWindowType(false) ) ) {
-            try {
-                loadLibrary("jawt", null, true);
-            } catch (Throwable t) {
-                // It might be ok .. if it's already loaded
-                if(DEBUG) {
-                    t.printStackTrace();
-                }
-            }
-        }
-        return null;
-      }
-    });
-  }
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
deleted file mode 100644
index 6a8f8cdb2..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.nativewindow.impl.jawt;
-
-import com.sun.nativewindow.impl.*;
-
-import javax.media.nativewindow.*;
-
-import java.awt.GraphicsEnvironment;
-import java.lang.reflect.*;
-
-public class JAWTUtil {
-
-  // See whether we're running in headless mode
-  private static final boolean headlessMode;
-
-  // Java2D magic ..
-  private static final Class j2dClazz;
-  private static final Method isQueueFlusherThread;
-  private static final boolean j2dExist;
-
-  static {
-    JAWTNativeLibLoader.loadAWTImpl();
-    JAWTNativeLibLoader.loadNativeWindow("awt");
-
-    lockedStack   = null;
-    headlessMode = GraphicsEnvironment.isHeadless();
-
-    boolean ok=false;
-    Class jC=null;
-    Method m=null;
-    if(!headlessMode) {
-        try {
-            jC = Class.forName("com.jogamp.opengl.impl.awt.Java2D");
-            m = jC.getMethod("isQueueFlusherThread", null);
-            ok = true;
-        } catch (Exception e) {}
-    }
-    j2dClazz = jC;
-    isQueueFlusherThread = m;
-    j2dExist = ok;
-  }
-
-  private static Exception lockedStack;
-
-  // Just a hook to let this class being initialized,
-  // ie loading the native libraries ..
-  public static void init() { }
-
-  public static final boolean hasJava2D() {
-    return j2dExist;
-  }
-
-  public static final boolean isJava2DQueueFlusherThread() {
-    boolean b = false;
-    if(j2dExist) {
-        try {
-            b = ((Boolean)isQueueFlusherThread.invoke(null, null)).booleanValue();
-        } catch (Exception e) {}
-    }
-    return b;
-  }
-
-  public static boolean isHeadlessMode() {
-    return headlessMode;
-  }
-
-  public static synchronized void lockToolkit() throws NativeWindowException {
-    if (isJava2DQueueFlusherThread()) return;
-
-    if (null!=lockedStack) {
-      lockedStack.printStackTrace();
-      throw new NativeWindowException("JAWT Toolkit already locked - "+Thread.currentThread().getName());
-    }
-    lockedStack = new Exception("JAWT Toolkit already locked by: "+Thread.currentThread().getName());
-
-    if (headlessMode) {
-      // Workaround for running (to some degree) in headless
-      // environments but still supporting rendering via pbuffers
-      // For full correctness, would need to implement a Lock class
-      return;
-    }
-
-    JAWT.getJAWT().Lock();
-  }
-
-  public static synchronized void unlockToolkit() {
-    if (isJava2DQueueFlusherThread()) return;
-
-    if (null!=lockedStack) {
-        lockedStack = null;
-        if (headlessMode) {
-          // Workaround for running (to some degree) in headless
-          // environments but still supporting rendering via pbuffers
-          // For full correctness, would need to implement a Lock class
-          return;
-        }
-
-        JAWT.getJAWT().Unlock();
-    }
-  }
-
-  public static boolean isToolkitLocked() {
-    return null!=lockedStack;
-  }
-
-  public static Exception getLockedStack() {
-    return lockedStack;
-  }
-}
-
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTWindow.java
deleted file mode 100644
index b0548bb14..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTWindow.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.nativewindow.impl.jawt;
-
-import com.sun.nativewindow.impl.*;
-
-import java.awt.Component;
-import java.awt.Window;
-import java.awt.GraphicsEnvironment;
-import javax.media.nativewindow.*;
-import com.sun.nativewindow.impl.*;
-
-public abstract class JAWTWindow implements NativeWindow {
-  protected static final boolean DEBUG = Debug.debug("JAWT");
-
-  // See whether we're running in headless mode
-  private static boolean headlessMode;
-
-  static {
-    headlessMode = GraphicsEnvironment.isHeadless();
-  }
-
-  // lifetime: forever
-  protected Component component;
-  protected AbstractGraphicsConfiguration config;
-
-  // lifetime: valid after lock, forever until invalidate
-  protected long drawable;
-
-  public JAWTWindow(Object comp, AbstractGraphicsConfiguration config) {
-    if (config == null) {
-        throw new NativeWindowException("Error: AbstractGraphicsConfiguration is null");
-    }
-    this.config = config;
-    init((Component)comp);
-  }
-
-  protected void init(Component windowObject) throws NativeWindowException {
-    invalidate();
-    this.component = windowObject;
-    initNative();
-  }
-
-  protected abstract void initNative() throws NativeWindowException;
-
-  public synchronized void invalidate() {
-    component = null;
-    drawable= 0;
-  }
-
-  public synchronized void destroy() {
-    if(null!=component) {
-        if(component instanceof Window) {
-            ((Window)component).dispose();
-        }
-    }
-    invalidate();
-  }
-
-  private volatile Exception lockedStack = null;
-
-  public synchronized int lockSurface() throws NativeWindowException {
-    // We have to be the owner of the JAWT ToolkitLock 'lock' to benefit from it's
-    // recursive and blocking lock capabitlites. 
-    // Otherwise a followup ToolkitLock would deadlock, 
-    // since we already have locked JAWT with the surface lock.
-    NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-
-    // recursion not necessary here, due to the blocking ToolkitLock ..
-    if (null!=lockedStack) {
-      lockedStack.printStackTrace();
-      throw new NativeWindowException("JAWT Surface already locked - "+Thread.currentThread().getName()+" "+this);
-    }
-    lockedStack = new Exception("JAWT Surface previously locked by "+Thread.currentThread().getName());
-
-    return LOCK_SUCCESS;
-  }
-
-  public synchronized void unlockSurface() {
-    if (null!=lockedStack) {
-        lockedStack = null;
-    } else {
-        throw new NativeWindowException("JAWT Surface not locked");
-    }
-    NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
-  }
-
-  public synchronized boolean isSurfaceLocked() {
-    return null!=lockedStack;
-  }
-
-  public Exception getLockedStack() {
-    return lockedStack;
-  }
-
-  public boolean surfaceSwap() {
-    return false;
-  }
-
-  public void surfaceUpdated(Object updater, NativeWindow window, long when) { }
-
-  public long getDisplayHandle() {
-    return config.getScreen().getDevice().getHandle();
-  }
-  public int getScreenIndex() {
-    return config.getScreen().getIndex();
-  }
-  public long getWindowHandle() {
-    return drawable;
-  }
-  public long getSurfaceHandle() {
-    return drawable;
-  }
-  public AbstractGraphicsConfiguration getGraphicsConfiguration() {
-    return config;
-  }
-
-  public Object getWrappedWindow() {
-    return component;
-  }
-
-  public void setSize(int width, int height) {
-    component.setSize(width, height);
-  }
-
-  public int getWidth() {
-    return component.getWidth();
-  }
-
-  public int getHeight() {
-    return component.getHeight();
-  }
-
-  public String toString() {
-    StringBuffer sb = new StringBuffer();
-
-    sb.append("JAWT-Window["+
-                "windowHandle 0x"+Long.toHexString(getWindowHandle())+
-                ", surfaceHandle 0x"+Long.toHexString(getSurfaceHandle()));
-    if(null!=component) {
-      sb.append(", pos "+component.getX()+"/"+component.getY()+", size "+getWidth()+"x"+getHeight()+
-                ", visible "+component.isVisible());
-    } else {
-      sb.append(", component NULL");
-    }
-    sb.append(", locked "+isSurfaceLocked()+
-              ",\n\tconfig "+config+
-              ",\n\twrappedWindow "+getWrappedWindow()+"]");
-
-    return sb.toString();
-  }
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWT_PlatformInfo.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWT_PlatformInfo.java
deleted file mode 100644
index cc6af7ea4..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWT_PlatformInfo.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.nativewindow.impl.jawt;
-
-import com.sun.nativewindow.impl.*;
-
-/** Marker class for all window system-specific JAWT data structures. */
-
-public interface JAWT_PlatformInfo {
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java
deleted file mode 100644
index 4ecc6aa4d..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.nativewindow.impl.jawt.macosx;
-
-import com.sun.nativewindow.impl.jawt.*;
-import com.sun.nativewindow.impl.*;
-
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-
-import javax.media.nativewindow.*;
-import java.security.*;
-
-public class MacOSXJAWTWindow extends JAWTWindow {
-
-  public MacOSXJAWTWindow(Object comp, AbstractGraphicsConfiguration config) {
-    super(comp, config);
-  }
-
-  protected void initNative() throws NativeWindowException {
-  }
-
-  public int lockSurface() throws NativeWindowException {
-    int ret = super.lockSurface();
-    if(NativeWindow.LOCK_SUCCESS != ret) {
-        return ret;
-    }
-    ds = JAWT.getJAWT().GetDrawingSurface(component);
-    if (ds == null) {
-      // Widget not yet realized
-      super.unlockSurface();
-      return NativeWindow.LOCK_SURFACE_NOT_READY;
-    }
-    int res = ds.Lock();
-    if ((res & JAWTFactory.JAWT_LOCK_ERROR) != 0) {
-      super.unlockSurface();
-      throw new NativeWindowException("Unable to lock surface");
-    }
-    // See whether the surface changed and if so destroy the old
-    // OpenGL context so it will be recreated (NOTE: removeNotify
-    // should handle this case, but it may be possible that race
-    // conditions can cause this code to be triggered -- should test
-    // more)
-    if ((res & JAWTFactory.JAWT_LOCK_SURFACE_CHANGED) != 0) {
-      ret = NativeWindow.LOCK_SURFACE_CHANGED;
-    }
-    if (firstLock) {
-      AccessController.doPrivileged(new PrivilegedAction() {
-          public Object run() {
-            dsi = ds.GetDrawingSurfaceInfo();
-            return null;
-          }
-        });
-    } else {
-      dsi = ds.GetDrawingSurfaceInfo();
-    }
-    if (dsi == null) {
-      // Widget not yet realized
-      ds.Unlock();
-      JAWT.getJAWT().FreeDrawingSurface(ds);
-      ds = null;
-      super.unlockSurface();
-      return NativeWindow.LOCK_SURFACE_NOT_READY;
-    }
-    firstLock = false;
-    macosxdsi = (JAWT_MacOSXDrawingSurfaceInfo) dsi.platformInfo();
-    if (macosxdsi == null) {
-      // Widget not yet realized
-      ds.FreeDrawingSurfaceInfo(dsi);
-      ds.Unlock();
-      JAWT.getJAWT().FreeDrawingSurface(ds);
-      ds = null;
-      dsi = null;
-      super.unlockSurface();
-      return NativeWindow.LOCK_SURFACE_NOT_READY;
-    }
-    drawable = macosxdsi.getCocoaViewRef();
-
-    if (drawable == 0) {
-      // Widget not yet realized
-      ds.FreeDrawingSurfaceInfo(dsi);
-      ds.Unlock();
-      JAWT.getJAWT().FreeDrawingSurface(ds);
-      ds = null;
-      dsi = null;
-      macosxdsi = null;
-      super.unlockSurface();
-      return NativeWindow.LOCK_SURFACE_NOT_READY;
-    }
-    return ret;
-  }
-    
-  public void unlockSurface() throws NativeWindowException {
-    if(!isSurfaceLocked()) {
-        throw new RuntimeException("JAWTWindow not locked");
-    }
-    ds.FreeDrawingSurfaceInfo(dsi);
-    ds.Unlock();
-    JAWT.getJAWT().FreeDrawingSurface(ds);
-    ds = null;
-    dsi = null;
-    macosxdsi = null;
-    super.unlockSurface();
-  }
-
-  // Variables for lockSurface/unlockSurface
-  private JAWT_DrawingSurface ds;
-  private JAWT_DrawingSurfaceInfo dsi;
-  private JAWT_MacOSXDrawingSurfaceInfo macosxdsi;
-
-  // Workaround for instance of 4796548
-  private boolean firstLock = true;
-
-}
-
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java
deleted file mode 100644
index 2b8cab9c4..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.nativewindow.impl.jawt.windows;
-
-import com.sun.nativewindow.impl.*;
-import com.sun.nativewindow.impl.jawt.*;
-
-import javax.media.nativewindow.*;
-
-public class WindowsJAWTWindow extends JAWTWindow {
-
-  public static final boolean PROFILING = false; // FIXME
-  public static final int PROFILING_TICKS = 600; // FIXME
-
-  public WindowsJAWTWindow(Object comp, AbstractGraphicsConfiguration config) {
-    super(comp, config);
-  }
-
-  protected void initNative() throws NativeWindowException {
-  }
-
-  public int lockSurface() throws NativeWindowException {
-    int ret = super.lockSurface();
-    if(LOCK_SUCCESS != ret) {
-      return ret;
-    }
-
-    long startTime;
-    if (PROFILING) {
-      startTime = System.currentTimeMillis();
-    }
-    ds = JAWT.getJAWT().GetDrawingSurface(component);
-    if (ds == null) {
-      // Widget not yet realized
-      super.unlockSurface();
-      return LOCK_SURFACE_NOT_READY;
-    }
-    int res = ds.Lock();
-    if ((res & JAWTFactory.JAWT_LOCK_ERROR) != 0) {
-      super.unlockSurface();
-      throw new NativeWindowException("Unable to lock surface");
-    }
-    // See whether the surface changed and if so destroy the old
-    // OpenGL context so it will be recreated (NOTE: removeNotify
-    // should handle this case, but it may be possible that race
-    // conditions can cause this code to be triggered -- should test
-    // more)
-    if ((res & JAWTFactory.JAWT_LOCK_SURFACE_CHANGED) != 0) {
-      ret = LOCK_SURFACE_CHANGED;
-    }
-    dsi = ds.GetDrawingSurfaceInfo();
-    if (dsi == null) {
-      // Widget not yet realized
-      ds.Unlock();
-      JAWT.getJAWT().FreeDrawingSurface(ds);
-      ds = null;
-      super.unlockSurface();
-      return LOCK_SURFACE_NOT_READY;
-    }
-    win32dsi = (JAWT_Win32DrawingSurfaceInfo) dsi.platformInfo();
-    if (win32dsi == null) {
-      // Widget not yet realized
-      ds.FreeDrawingSurfaceInfo(dsi);
-      ds.Unlock();
-      JAWT.getJAWT().FreeDrawingSurface(ds);
-      ds = null;
-      dsi = null;
-      super.unlockSurface();
-      return LOCK_SURFACE_NOT_READY;
-    }
-    drawable = win32dsi.getHdc();
-    if (drawable == 0) {
-      // Widget not yet realized
-      ds.FreeDrawingSurfaceInfo(dsi);
-      ds.Unlock();
-      JAWT.getJAWT().FreeDrawingSurface(ds);
-      ds = null;
-      dsi = null;
-      win32dsi = null;
-      super.unlockSurface();
-      return LOCK_SURFACE_NOT_READY;
-    }
-    if (PROFILING) {
-      long endTime = System.currentTimeMillis();
-      profilingLockSurfaceTime += (endTime - startTime);
-      if (++profilingLockSurfaceTicks == PROFILING_TICKS) {
-        System.err.println("LockSurface calls: " + profilingLockSurfaceTime + " ms / " + PROFILING_TICKS + " calls (" +
-                           ((float) profilingLockSurfaceTime / (float) PROFILING_TICKS) + " ms/call)");
-        profilingLockSurfaceTime = 0;
-        profilingLockSurfaceTicks = 0;
-      }
-    }
-    return ret;
-  }
-
-  public void unlockSurface() {
-    if(!isSurfaceLocked()) {
-        throw new RuntimeException("JAWTWindow not locked");
-    }
-    long startTime = 0;
-    if (PROFILING) {
-      startTime = System.currentTimeMillis();
-    }
-    ds.FreeDrawingSurfaceInfo(dsi);
-    ds.Unlock();
-    JAWT.getJAWT().FreeDrawingSurface(ds);
-    ds = null;
-    dsi = null;
-    win32dsi = null;
-    super.unlockSurface();
-    if (PROFILING) {
-      long endTime = System.currentTimeMillis();
-      profilingUnlockSurfaceTime += (endTime - startTime);
-      if (++profilingUnlockSurfaceTicks == PROFILING_TICKS) {
-        System.err.println("UnlockSurface calls: " + profilingUnlockSurfaceTime + " ms / " + PROFILING_TICKS + " calls (" +
-                           ((float) profilingUnlockSurfaceTime / (float) PROFILING_TICKS) + " ms/call)");
-        profilingUnlockSurfaceTime = 0;
-        profilingUnlockSurfaceTicks = 0;
-      }
-    }
-  }
-
-  // Variables for lockSurface/unlockSurface
-  private JAWT_DrawingSurface ds;
-  private JAWT_DrawingSurfaceInfo dsi;
-  private JAWT_Win32DrawingSurfaceInfo win32dsi;
-  private long profilingLockSurfaceTime = 0;
-  private int  profilingLockSurfaceTicks = 0;
-  private long profilingUnlockSurfaceTime = 0;
-  private int  profilingUnlockSurfaceTicks = 0;
-  
-}
-
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java
deleted file mode 100644
index af2b7a71c..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.nativewindow.impl.jawt.x11;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-
-import com.sun.nativewindow.impl.x11.*;
-import com.sun.nativewindow.impl.jawt.*;
-import com.sun.nativewindow.impl.*;
-
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-
-public class X11JAWTWindow extends JAWTWindow {
-
-  public X11JAWTWindow(Object comp, AbstractGraphicsConfiguration config) {
-    super(comp, config);
-  }
-
-  protected void initNative() throws NativeWindowException {
-  }
-
-  public synchronized int lockSurface() throws NativeWindowException {
-    int ret = super.lockSurface();
-    if(LOCK_SUCCESS != ret) {
-        return ret;
-    }
-    ds = JAWT.getJAWT().GetDrawingSurface(component);
-    if (ds == null) {
-      // Widget not yet realized
-      super.unlockSurface();
-      return LOCK_SURFACE_NOT_READY;
-    }
-    int res = ds.Lock();
-    if ((res & JAWTFactory.JAWT_LOCK_ERROR) != 0) {
-      super.unlockSurface();
-      throw new NativeWindowException("Unable to lock surface");
-    }
-    // See whether the surface changed and if so destroy the old
-    // OpenGL context so it will be recreated (NOTE: removeNotify
-    // should handle this case, but it may be possible that race
-    // conditions can cause this code to be triggered -- should test
-    // more)
-    if ((res & JAWTFactory.JAWT_LOCK_SURFACE_CHANGED) != 0) {
-      ret = LOCK_SURFACE_CHANGED;
-    }
-    dsi = ds.GetDrawingSurfaceInfo();
-    if (dsi == null) {
-      // Widget not yet realized
-      ds.Unlock();
-      JAWT.getJAWT().FreeDrawingSurface(ds);
-      ds = null;
-      super.unlockSurface();
-      return LOCK_SURFACE_NOT_READY;
-    }
-    x11dsi = (JAWT_X11DrawingSurfaceInfo) dsi.platformInfo();
-    if (x11dsi == null) {
-      // Widget not yet realized
-      ds.FreeDrawingSurfaceInfo(dsi);
-      ds.Unlock();
-      JAWT.getJAWT().FreeDrawingSurface(ds);
-      ds = null;
-      dsi = null;
-      super.unlockSurface();
-      return LOCK_SURFACE_NOT_READY;
-    }
-    drawable = x11dsi.getDrawable();
-    if (drawable == 0) {
-      // Widget not yet realized
-      ds.FreeDrawingSurfaceInfo(dsi);
-      ds.Unlock();
-      JAWT.getJAWT().FreeDrawingSurface(ds);
-      ds = null;
-      dsi = null;
-      x11dsi = null;
-      drawable = 0;
-      super.unlockSurface();
-      return LOCK_SURFACE_NOT_READY;
-    }
-    return ret;
-  }
-
-  public synchronized void unlockSurface() {
-    if(!isSurfaceLocked()) {
-        throw new RuntimeException("JAWTWindow not locked");
-    }
-    ds.FreeDrawingSurfaceInfo(dsi);
-    ds.Unlock();
-    JAWT.getJAWT().FreeDrawingSurface(ds);
-    ds = null;
-    dsi = null;
-    x11dsi = null;
-    super.unlockSurface();
-  }
-
-  // Variables for lockSurface/unlockSurface
-  private JAWT_DrawingSurface ds;
-  private JAWT_DrawingSurfaceInfo dsi;
-  private JAWT_X11DrawingSurfaceInfo x11dsi;
-  
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11SunJDKReflection.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11SunJDKReflection.java
deleted file mode 100644
index ef1f82cee..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11SunJDKReflection.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.nativewindow.impl.jawt.x11;
-
-import com.sun.nativewindow.impl.x11.*;
-
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.lang.reflect.*;
-import java.security.*;
-
-import javax.media.nativewindow.AbstractGraphicsConfiguration;
-import javax.media.nativewindow.awt.AWTGraphicsConfiguration;
-
-/** This class encapsulates the reflection routines necessary to peek
-    inside a few data structures in the AWT implementation on X11 for
-    the purposes of correctly enumerating the available visuals. */
-
-public class X11SunJDKReflection {
-  private static Class   x11GraphicsDeviceClass;
-  private static Method  x11GraphicsDeviceGetScreenMethod;
-  private static Method  x11GraphicsDeviceGetDisplayMethod;
-  private static Class   x11GraphicsConfigClass;
-  private static Method  x11GraphicsConfigGetVisualMethod;
-  private static boolean initted;
-
-  static {
-    AccessController.doPrivileged(new PrivilegedAction() {
-        public Object run() {
-          try {
-            x11GraphicsDeviceClass = Class.forName("sun.awt.X11GraphicsDevice");
-            x11GraphicsDeviceGetScreenMethod = x11GraphicsDeviceClass.getDeclaredMethod("getScreen", new Class[] {});
-            x11GraphicsDeviceGetScreenMethod.setAccessible(true);
-            x11GraphicsDeviceGetDisplayMethod = x11GraphicsDeviceClass.getDeclaredMethod("getDisplay", new Class[] {});
-            x11GraphicsDeviceGetDisplayMethod.setAccessible(true);
-
-            x11GraphicsConfigClass = Class.forName("sun.awt.X11GraphicsConfig");
-            x11GraphicsConfigGetVisualMethod = x11GraphicsConfigClass.getDeclaredMethod("getVisual", new Class[] {});
-            x11GraphicsConfigGetVisualMethod.setAccessible(true);
-            initted = true;
-          } catch (Exception e) {
-            // Either not a Sun JDK or the interfaces have changed since 1.4.2 / 1.5
-          }
-          return null;
-        }
-      });
-  }
-
-  public static int graphicsDeviceGetScreen(GraphicsDevice device) {
-    if (!initted) {
-      return 0;
-    }
-
-    try {
-      return ((Integer) x11GraphicsDeviceGetScreenMethod.invoke(device, new Object[] {})).intValue();
-    } catch (Exception e) {
-      return 0;
-    }
-  }
-
-  public static long graphicsDeviceGetDisplay(GraphicsDevice device) {
-    if (!initted) {
-      return 0;
-    }
-
-    try {
-      return ((Long) x11GraphicsDeviceGetDisplayMethod.invoke(device, new Object[] {})).longValue();
-    } catch (Exception e) {
-      return 0;
-    }
-  }
-
-  public static int graphicsConfigurationGetVisualID(AbstractGraphicsConfiguration config) {
-      try {
-          if (config instanceof AWTGraphicsConfiguration) {
-              return graphicsConfigurationGetVisualID(((AWTGraphicsConfiguration) config).getGraphicsConfiguration());
-          }
-          return 0;
-      } catch (Exception e) {
-          return 0;
-      }
-  }
-
-  public static int graphicsConfigurationGetVisualID(GraphicsConfiguration config) {
-    if (!initted) {
-      return 0;
-    }
-
-    try {
-      return ((Integer) x11GraphicsConfigGetVisualMethod.invoke(config, new Object[] {})).intValue();
-    } catch (Exception e) {
-      return 0;
-    }
-  }
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jvm/JVMUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jvm/JVMUtil.java
deleted file mode 100644
index 3faab68bb..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jvm/JVMUtil.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.nativewindow.impl.jvm;
-
-import java.nio.ByteBuffer;
-import com.sun.nativewindow.impl.*;
-
-/**
- * Currently this tool works around the Hotspot race condition bugs:
- <PRE>
-     4395095 JNI access to java.nio DirectBuffer constructor/accessor
-     6852404 Race condition in JNI Direct Buffer access and creation routines
- </PRE>
- *
- * Make sure to initialize this class as soon as possible,
- * before doing any multithreading work.
- *
- */
-public class JVMUtil {
-    private static final boolean DEBUG = Debug.debug("JVMUtil");
-
-    static {
-        NativeLibLoaderBase.loadNativeWindow("jvm");
-
-        ByteBuffer buffer = InternalBufferUtil.newByteBuffer(64);
-        if( ! initialize(buffer) ) {
-            throw new RuntimeException("Failed to initialize the JVMUtil "+Thread.currentThread().getName());
-        }
-        if(DEBUG) {
-            Exception e = new Exception("JVMUtil.initSingleton() .. initialized "+Thread.currentThread().getName());
-            e.printStackTrace();
-        }
-    }
-
-    public static void initSingleton() {
-    }
-
-    private JVMUtil() {}
-
-    private static native boolean initialize(java.nio.ByteBuffer buffer);
-}
-
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java b/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java
deleted file mode 100644
index 4709e3ef0..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.nativewindow.impl.x11;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-import com.sun.nativewindow.impl.x11.XVisualInfo;
-import com.sun.nativewindow.impl.x11.X11Lib;
-
-public class X11GraphicsConfigurationFactory extends GraphicsConfigurationFactory {
-    public AbstractGraphicsConfiguration
-        chooseGraphicsConfiguration(Capabilities capabilities,
-                                    CapabilitiesChooser chooser,
-                                    AbstractGraphicsScreen screen)
-        throws IllegalArgumentException, NativeWindowException {
-
-        if(null==screen || !(screen instanceof X11GraphicsScreen)) {
-            throw new NativeWindowException("Only valid X11GraphicsScreen are allowed");
-        }
-        return new X11GraphicsConfiguration((X11GraphicsScreen)screen, capabilities, capabilities, getXVisualInfo(screen, capabilities));
-    }
-
-    public static XVisualInfo getXVisualInfo(AbstractGraphicsScreen screen, long visualID)
-    {
-        XVisualInfo xvi_temp = XVisualInfo.create();
-        xvi_temp.setVisualid(visualID);
-        xvi_temp.setScreen(screen.getIndex());
-        int num[] = { -1 };
-        long display = screen.getDevice().getHandle();
-
-        try {
-            X11Lib.XLockDisplay(display);
-            XVisualInfo[] xvis = X11Lib.XGetVisualInfoCopied(display, X11Lib.VisualIDMask|X11Lib.VisualScreenMask, xvi_temp, num, 0);
-
-            if(xvis==null || num[0]<1) {
-                return null;
-            }
-
-            return XVisualInfo.create(xvis[0]);
-        } finally {
-            X11Lib.XUnlockDisplay(display);
-        }
-
-    }
-
-    public static XVisualInfo getXVisualInfo(AbstractGraphicsScreen screen, Capabilities capabilities)
-    {
-        XVisualInfo xv = getXVisualInfoImpl(screen, capabilities, 4 /* TrueColor */);
-        if(null!=xv) return xv;
-        return getXVisualInfoImpl(screen, capabilities, 5 /* DirectColor */);
-    }
-
-    private static XVisualInfo getXVisualInfoImpl(AbstractGraphicsScreen screen, Capabilities capabilities, int c_class)
-    {
-        XVisualInfo ret = null;
-        int[] num = { -1 };
-
-        XVisualInfo vinfo_template = XVisualInfo.create();
-        vinfo_template.setScreen(screen.getIndex());
-        vinfo_template.setC_class(c_class);
-        long display = screen.getDevice().getHandle();
-
-        try {
-            X11Lib.XLockDisplay(display);
-            XVisualInfo[] vinfos = X11Lib.XGetVisualInfoCopied(display, X11Lib.VisualScreenMask, vinfo_template, num, 0);
-            XVisualInfo best=null;
-            int rdepth = capabilities.getRedBits() + capabilities.getGreenBits() + capabilities.getBlueBits() + capabilities.getAlphaBits();
-            for (int i = 0; vinfos!=null && i < num[0]; i++) {
-                if ( best == null || 
-                     best.getDepth() < vinfos[i].getDepth() )
-                {
-                    best = vinfos[i];
-                    if(rdepth <= best.getDepth())
-                        break;
-                }
-            }
-            if ( null!=best && ( rdepth <= best.getDepth() || 24 == best.getDepth()) ) {
-                ret = XVisualInfo.create(best);
-            }
-            best = null;
-
-            return ret;
-        } finally {
-            X11Lib.XUnlockDisplay(display);
-        }
-    }
-}
-
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11Util.java b/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11Util.java
deleted file mode 100644
index 11343f3e1..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11Util.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.nativewindow.impl.x11;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.media.nativewindow.*;
-
-import com.sun.nativewindow.impl.*;
-
-/**
- * Contains a thread safe X11 utility to retrieve thread local display connection,<br>
- * as well as the static global discplay connection.<br>
- *
- * The TLS variant is thread safe per se, but be aware of the memory leak risk 
- * where an application heavily utilizing this class on temporary new threads.<br>
- */
-public class X11Util {
-    private static final boolean DEBUG = Debug.debug("X11Util");
-
-    static {
-        NativeLibLoaderBase.loadNativeWindow("x11");
-    }
-
-    private X11Util() {}
-
-    private static ThreadLocal currentDisplayMap = new ThreadLocal();
-
-    public static class NamedDisplay implements Cloneable {
-        private String name;
-        private long   handle;
-
-        protected NamedDisplay(String name, long handle) {
-            this.name=name;
-            this.handle=handle;
-        }
-
-        public String getName() { return name; }
-        public long   getHandle() { return handle; }
-
-        public Object clone() throws CloneNotSupportedException {
-          return super.clone();
-        }
-    }
-
-    /** Returns a clone of the thread local display map, you may {@link Object#wait()} on it */
-    public static Map getCurrentDisplayMap() {
-        return (Map) ((HashMap)getCurrentDisplayMapImpl()).clone();
-    }
-
-    /** Returns this thread current default display.  If it doesn not exist, it is being created */
-    public static long getThreadLocalDefaultDisplay() {
-        return getThreadLocalDisplay(null);
-    }
-
-    /** Returns this thread named display. If it doesn not exist, it is being created */
-    public static long getThreadLocalDisplay(String name) {
-        NamedDisplay namedDpy = getCurrentDisplay(name);
-        if(null==namedDpy) {
-            long dpy = X11Lib.XOpenDisplay(name);
-            if(0==dpy) {
-                throw new NativeWindowException("X11Util.Display: Unable to create a display("+name+") connection in Thread "+Thread.currentThread().getName());
-            }
-            namedDpy = new NamedDisplay(name, dpy);
-            setCurrentDisplay( namedDpy );
-            if(DEBUG) {
-                Exception e = new Exception("X11Util.Display: Created new TLS display("+name+") connection 0x"+Long.toHexString(dpy)+" in thread "+Thread.currentThread().getName());
-                e.printStackTrace();
-            }
-        }
-        return namedDpy.getHandle();
-    }
-
-    /** Closes this thread named display. It returns the handle of the closed display or 0, if it does not exist. */
-    public static long closeThreadLocalDisplay(String name) {
-        NamedDisplay namedDpy = removeCurrentDisplay(name);
-        if(null==namedDpy) {
-            if(DEBUG) {
-                Exception e = new Exception("X11Util.Display: Display("+name+") with given handle is not mapped to TLS in thread "+Thread.currentThread().getName());
-                e.printStackTrace();
-            }
-            return 0;
-        }
-        long dpy = namedDpy.getHandle();
-        X11Lib.XCloseDisplay(dpy);
-        if(DEBUG) {
-            Exception e = new Exception("X11Util.Display: Closed TLS Display("+name+") with handle 0x"+Long.toHexString(dpy)+" in thread "+Thread.currentThread().getName());
-            e.printStackTrace();
-        }
-        return dpy;
-    }
-
-    private static Map getCurrentDisplayMapImpl() {
-        Map displayMap = (Map) currentDisplayMap.get();
-        if(null==displayMap) {
-            displayMap = new HashMap();
-            currentDisplayMap.set( displayMap );
-        }
-        return displayMap;
-    }
-
-    /** maps the given display to the thread local display map
-      * and notifies all threads synchronized to this display map. */
-    private static NamedDisplay setCurrentDisplay(NamedDisplay newDisplay) {
-        Map displayMap = getCurrentDisplayMapImpl();
-        NamedDisplay oldDisplay = null;
-        synchronized(displayMap) {
-            String name = (null==newDisplay.getName())?"nil":newDisplay.getName();
-            oldDisplay = (NamedDisplay) displayMap.put(name, newDisplay);
-            displayMap.notifyAll();
-        }
-        return oldDisplay;
-    }
-
-    /** removes the mapping of the given name from the thread local display map
-      * and notifies all threads synchronized to this display map. */
-    private static NamedDisplay removeCurrentDisplay(String name) {
-        Map displayMap = getCurrentDisplayMapImpl();
-        NamedDisplay oldDisplay = null;
-        synchronized(displayMap) {
-            if(null==name) name="nil";
-            oldDisplay = (NamedDisplay) displayMap.remove(name);
-            displayMap.notifyAll();
-        }
-        return oldDisplay;
-    }
-
-    /** Returns the thread local display mapped to the given name */
-    private static NamedDisplay getCurrentDisplay(String name) {
-        if(null==name) name="nil";
-        Map displayMap = getCurrentDisplayMapImpl();
-        return (NamedDisplay) displayMap.get(name);
-    }
-
-}
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/x11/awt/X11AWTNativeWindowFactory.java b/src/nativewindow/classes/com/sun/nativewindow/impl/x11/awt/X11AWTNativeWindowFactory.java
deleted file mode 100644
index dff733735..000000000
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/x11/awt/X11AWTNativeWindowFactory.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.sun.nativewindow.impl.x11.awt;
-
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import javax.media.nativewindow.*;
-
-import com.sun.nativewindow.impl.*;
-import com.sun.nativewindow.impl.jawt.*;
-import com.sun.nativewindow.impl.jawt.x11.*;
-import com.sun.nativewindow.impl.x11.*;
-
-public class X11AWTNativeWindowFactory extends NativeWindowFactoryImpl {
-
-    // When running the AWT on X11 platforms, we use the AWT native
-    // interface (JAWT) to lock and unlock the toolkit
-    private ToolkitLock toolkitLock = new ToolkitLock() {
-            private Thread owner;
-            private int recursionCount;
-            
-            public synchronized void lock() {
-                Thread cur = Thread.currentThread();
-                if (owner == cur) {
-                    ++recursionCount;
-                    return;
-                }
-                while (owner != null) {
-                    try {
-                        wait();
-                    } catch (InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-                owner = cur;
-                JAWTUtil.lockToolkit();
-            }
-
-            public synchronized void unlock() {
-                if (owner != Thread.currentThread()) {
-                    throw new RuntimeException("Not owner");
-                }
-                if (recursionCount > 0) {
-                    --recursionCount;
-                    return;
-                }
-                owner = null;
-                JAWTUtil.unlockToolkit();
-                notifyAll();
-            }
-        };
-
-    public ToolkitLock getToolkitLock() {
-        return toolkitLock;
-    }
-}
diff --git a/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java b/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java
index 881499bec..a8b67fddc 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java
@@ -35,7 +35,7 @@ package javax.media.nativewindow;
 import java.lang.reflect.*;
 import java.util.*;
 
-import com.sun.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.*;
 
 /**
  * Provides the mechanism by which the graphics configuration for a
@@ -77,7 +77,7 @@ public abstract class GraphicsConfigurationFactory {
         if (NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(true))) {
             try {
                 GraphicsConfigurationFactory factory = (GraphicsConfigurationFactory)
-                    NWReflection.createInstance("com.sun.nativewindow.impl.x11.X11GraphicsConfigurationFactory", new Object[] {});
+                    NWReflection.createInstance("com.jogamp.nativewindow.impl.x11.X11GraphicsConfigurationFactory", new Object[] {});
                 registerFactory(javax.media.nativewindow.x11.X11GraphicsDevice.class, factory);
             } catch (Exception e) {
                 throw new RuntimeException(e);
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
index cd89e2164..5b1bf54bb 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
@@ -36,8 +36,8 @@ import java.lang.reflect.*;
 import java.security.*;
 import java.util.*;
 
-import com.sun.nativewindow.impl.*;
-import com.sun.nativewindow.impl.jvm.JVMUtil;
+import com.jogamp.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.jvm.JVMUtil;
 
 /** Provides a pluggable mechanism for arbitrary window toolkits to
     adapt their components to the {@link NativeWindow} interface,
@@ -177,7 +177,7 @@ public abstract class NativeWindowFactory {
 
             try {
                 Constructor factoryConstructor =
-                    NWReflection.getConstructor("com.sun.nativewindow.impl.x11.awt.X11AWTNativeWindowFactory", new Class[] {});
+                    NWReflection.getConstructor("com.jogamp.nativewindow.impl.x11.awt.X11AWTNativeWindowFactory", new Class[] {});
                 _factory = (NativeWindowFactory) factoryConstructor.newInstance(null);
             } catch (Exception e) { }
         }
@@ -185,7 +185,7 @@ public abstract class NativeWindowFactory {
         if (toolkitLockForced && null==_factory) {
             try {
                 Constructor factoryConstructor =
-                    NWReflection.getConstructor("com.sun.nativewindow.impl.LockingNativeWindowFactory", new Class[] {});
+                    NWReflection.getConstructor("com.jogamp.nativewindow.impl.LockingNativeWindowFactory", new Class[] {});
                 _factory = (NativeWindowFactory) factoryConstructor.newInstance(null);
             } catch (Exception e) { }
         }
diff --git a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java
index 7373e7b97..9b48f8f6e 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java
@@ -44,7 +44,7 @@ import java.awt.GraphicsConfiguration;
 import java.awt.Transparency;
 import java.awt.image.ColorModel;
 import javax.media.nativewindow.AbstractGraphicsConfiguration;
-import com.sun.nativewindow.impl.Debug;
+import com.jogamp.nativewindow.impl.Debug;
 
 /** A wrapper for an AWT GraphicsConfiguration allowing it to be
     handled in a toolkit-independent manner. */
diff --git a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsDevice.java b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsDevice.java
index 077cbf8aa..d326b9159 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsDevice.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsDevice.java
@@ -43,7 +43,7 @@ import javax.media.nativewindow.*;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import javax.media.nativewindow.AbstractGraphicsDevice;
-import com.sun.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.*;
 
 /** A wrapper for an AWT GraphicsDevice allowing it to be
     handled in a toolkit-independent manner. */
diff --git a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsScreen.java b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsScreen.java
index 2ad8a99af..6cbf2ee71 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsScreen.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsScreen.java
@@ -43,7 +43,7 @@ import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.AbstractGraphicsDevice;
-import com.sun.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.*;
 
 /** A wrapper for an AWT GraphicsDevice (screen) allowing it to be
     handled in a toolkit-independent manner. */
diff --git a/src/nativewindow/classes/javax/media/nativewindow/package.html b/src/nativewindow/classes/javax/media/nativewindow/package.html
index ce9dbbb7a..d30b4a8df 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/package.html
+++ b/src/nativewindow/classes/javax/media/nativewindow/package.html
@@ -41,7 +41,7 @@
   </ul><br>
   This protocol <i>does not</i> describe how to <i>create</i> native windows, but how to <i>bind</i> a native window to an implementation of
   {@link javax.media.nativewindow.NativeWindow NativeWindow}.<br>
-  However, an implementation of this protocol (e.g. {@link com.sun.javafx.newt}) may support the creation.<br>
+  However, an implementation of this protocol (e.g. {@link com.jogamp.javafx.newt}) may support the creation.<br>
    
 <h3>Dependencies</h3>
   This binding has dependencies to the following:<br><br>
diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java
index 49d5f2d83..5659dcdcc 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java
@@ -33,7 +33,7 @@
 package javax.media.nativewindow.x11;
 
 import javax.media.nativewindow.*;
-import com.sun.nativewindow.impl.x11.XVisualInfo;
+import com.jogamp.nativewindow.impl.x11.XVisualInfo;
 
 /** Encapsulates a graphics configuration, or OpenGL pixel format, on
     X11 platforms. Objects of this type are returned from {@link
diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java
index 614d26a61..52f48660a 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java
@@ -33,8 +33,8 @@
 package javax.media.nativewindow.x11;
 
 import javax.media.nativewindow.*;
-import com.sun.nativewindow.impl.x11.X11Util;
-import com.sun.nativewindow.impl.x11.X11Lib;
+import com.jogamp.nativewindow.impl.x11.X11Util;
+import com.jogamp.nativewindow.impl.x11.X11Lib;
 
 /** Encapsulates a screen index on X11
     platforms. Objects of this type are passed to {@link
diff --git a/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c b/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c
index e4afbdb70..a0422fa8e 100644
--- a/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c
+++ b/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c
@@ -50,7 +50,7 @@
 #endif
 
 JNIEXPORT jobject JNICALL
-Java_com_sun_nativewindow_impl_jawt_JAWT_1DrawingSurfaceInfo_platformInfo0(JNIEnv* env, jobject unused, jobject jthis0) {
+Java_com_jogamp_nativewindow_impl_jawt_JAWT_1DrawingSurfaceInfo_platformInfo0(JNIEnv* env, jobject unused, jobject jthis0) {
   JAWT_DrawingSurfaceInfo* dsi;
   dsi = (*env)->GetDirectBufferAddress(env, jthis0);
   if (dsi == NULL) {
diff --git a/src/nativewindow/native/JVM_Tool.c b/src/nativewindow/native/JVM_Tool.c
index e04032aa2..ce827129c 100644
--- a/src/nativewindow/native/JVM_Tool.c
+++ b/src/nativewindow/native/JVM_Tool.c
@@ -40,7 +40,7 @@
 #include <jni.h>
 
 JNIEXPORT jboolean JNICALL
-Java_com_sun_nativewindow_impl_jvm_JVMUtil_initialize(JNIEnv *env, jclass _unused, jobject nioBuffer) {
+Java_com_jogamp_nativewindow_impl_jvm_JVMUtil_initialize(JNIEnv *env, jclass _unused, jobject nioBuffer) {
   int res;
   void * ptr = NULL;
   if (nioBuffer != NULL) {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Display.java b/src/newt/classes/com/jogamp/javafx/newt/Display.java
new file mode 100755
index 000000000..5c5db0338
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/Display.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+import javax.media.nativewindow.*;
+import com.jogamp.javafx.newt.impl.Debug;
+import com.jogamp.javafx.newt.util.EventDispatchThread;
+import java.util.*;
+
+public abstract class Display {
+    public static final boolean DEBUG = Debug.debug("Display");
+
+    private static Class getDisplayClass(String type) 
+        throws ClassNotFoundException 
+    {
+        Class displayClass = NewtFactory.getCustomClass(type, "Display");
+        if(null==displayClass) {
+            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
+                displayClass = Class.forName("com.jogamp.javafx.newt.opengl.kd.KDDisplay");
+            } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
+                displayClass = Class.forName("com.jogamp.javafx.newt.windows.WindowsDisplay");
+            } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
+                displayClass = Class.forName("com.jogamp.javafx.newt.macosx.MacDisplay");
+            } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
+                displayClass = Class.forName("com.jogamp.javafx.newt.x11.X11Display");
+            } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
+                displayClass = Class.forName("com.jogamp.javafx.newt.awt.AWTDisplay");
+            } else {
+                throw new RuntimeException("Unknown display type \"" + type + "\"");
+            }
+        }
+        return displayClass;
+    }
+
+    // Unique Display for each thread
+    private static ThreadLocal currentDisplayMap = new ThreadLocal();
+
+    /** Returns the thread local display map */
+    public static Map getCurrentDisplayMap() {
+        Map displayMap = (Map) currentDisplayMap.get();
+        if(null==displayMap) {
+            displayMap = new HashMap();
+            currentDisplayMap.set( displayMap );
+        }
+        return displayMap;
+    }
+
+    /** maps the given display to the thread local display map
+      * and notifies all threads synchronized to this display map. */
+    protected static Display setCurrentDisplay(Display display) {
+        Map displayMap = getCurrentDisplayMap();
+        Display oldDisplay = null;
+        synchronized(displayMap) {
+            String name = display.getName();
+            if(null==name) name="nil";
+            oldDisplay = (Display) displayMap.put(name, display);
+            displayMap.notifyAll();
+        }
+        return oldDisplay;
+    }
+
+    /** removes the mapping of the given name from the thread local display map
+      * and notifies all threads synchronized to this display map. */
+    protected static Display removeCurrentDisplay(String name) {
+        if(null==name) name="nil";
+        Map displayMap = getCurrentDisplayMap();
+        Display oldDisplay = null;
+        synchronized(displayMap) {
+            oldDisplay = (Display) displayMap.remove(name);
+            displayMap.notifyAll();
+        }
+        return oldDisplay;
+    }
+
+    /** Returns the thread local display mapped to the given name */
+    public static Display getCurrentDisplay(String name) {
+        if(null==name) name="nil";
+        Map displayMap = getCurrentDisplayMap();
+        Display display = (Display) displayMap.get(name);
+        return display;
+    }
+
+    public static void dumpDisplayMap(String prefix) {
+        Map displayMap = getCurrentDisplayMap();
+        Set entrySet = displayMap.entrySet();
+        Iterator i = entrySet.iterator();
+        System.err.println(prefix+" DisplayMap["+entrySet.size()+"] "+Thread.currentThread());
+        for(int j=0; i.hasNext(); j++) {
+            Map.Entry entry = (Map.Entry) i.next();
+            System.err.println("  ["+j+"] "+entry.getKey()+" -> "+entry.getValue());
+        }
+    }
+
+    /** Returns the thread local display collection */
+    public static Collection getCurrentDisplays() {
+        return getCurrentDisplayMap().values();
+    }
+
+    /** Make sure to reuse a Display with the same name */
+    protected static Display create(String type, String name) {
+        try {
+            if(DEBUG) {
+                dumpDisplayMap("Display.create("+name+") BEGIN");
+            }
+            Display display = getCurrentDisplay(name);
+            if(null==display) {
+                Class displayClass = getDisplayClass(type);
+                display = (Display) displayClass.newInstance();
+                display.name=name;
+                display.refCount=1;
+
+                if(NewtFactory.useEDT()) {
+                    Thread current = Thread.currentThread();
+                    display.eventDispatchThread = new EventDispatchThread(display, current.getThreadGroup(), current.getName());
+                    display.eventDispatchThread.start();
+                    final Display f_dpy = display;
+                    display.eventDispatchThread.invokeAndWait(new Runnable() {
+                        public void run() {
+                            f_dpy.createNative();
+                        }
+                    } );
+                } else {
+                    display.createNative();
+                }
+                if(null==display.aDevice) {
+                    throw new RuntimeException("Display.createNative() failed to instanciate an AbstractGraphicsDevice");
+                }
+                setCurrentDisplay(display);
+                if(DEBUG) {
+                    System.err.println("Display.create("+name+") NEW: "+display+" "+Thread.currentThread());
+                }
+            } else {
+                synchronized(display) {
+                    display.refCount++;
+                    if(DEBUG) {
+                        System.err.println("Display.create("+name+") REUSE: refCount "+display.refCount+", "+display+" "+Thread.currentThread());
+                    }
+                }
+            }
+            if(DEBUG) {
+                dumpDisplayMap("Display.create("+name+") END");
+            }
+            return display;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected static Display wrapHandle(String type, String name, AbstractGraphicsDevice aDevice) {
+        try {
+            Class displayClass = getDisplayClass(type);
+            Display display = (Display) displayClass.newInstance();
+            display.name=name;
+            display.aDevice=aDevice;
+            return display;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public EventDispatchThread getEDT() { return eventDispatchThread; }
+
+    public synchronized void destroy() {
+        if(DEBUG) {
+            dumpDisplayMap("Display.destroy("+name+") BEGIN");
+        }
+        refCount--;
+        if(0==refCount) {
+            removeCurrentDisplay(name);
+            if(DEBUG) {
+                System.err.println("Display.destroy("+name+") REMOVE: "+this+" "+Thread.currentThread());
+            }
+            if(null!=eventDispatchThread) {
+                final Display f_dpy = this;
+                final EventDispatchThread f_edt = eventDispatchThread;
+                eventDispatchThread.invokeAndWait(new Runnable() {
+                    public void run() {
+                        f_dpy.closeNative();
+                        f_edt.stop();
+                    }
+                } );
+            } else {
+                closeNative();
+            }
+            if(null!=eventDispatchThread) { 
+                eventDispatchThread.waitUntilStopped();
+                eventDispatchThread=null;
+            }
+            aDevice = null;
+        } else {
+            if(DEBUG) {
+                System.err.println("Display.destroy("+name+") KEEP: refCount "+refCount+", "+this+" "+Thread.currentThread());
+            }
+        }
+        if(DEBUG) {
+            dumpDisplayMap("Display.destroy("+name+") END");
+        }
+    }
+
+    protected abstract void createNative();
+    protected abstract void closeNative();
+
+    public String getName() {
+        return name;
+    }
+
+    public long getHandle() {
+        if(null!=aDevice) {
+            return aDevice.getHandle();
+        }
+        return 0;
+    }
+
+    public AbstractGraphicsDevice getGraphicsDevice() {
+        return aDevice;
+    }
+
+    public void pumpMessages() {
+        if(null!=eventDispatchThread) { 
+            dispatchMessages();
+        } else {
+            synchronized(this) {
+                dispatchMessages();
+            }
+        }
+    }
+
+    public String toString() {
+        return "NEWT-Display["+name+", refCount "+refCount+", "+aDevice+"]";
+    }
+
+    protected abstract void dispatchMessages();
+
+    /** Default impl. nop - Currently only X11 needs a Display lock */
+    protected void lockDisplay() { }
+
+    /** Default impl. nop - Currently only X11 needs a Display lock */
+    protected void unlockDisplay() { }
+
+    protected EventDispatchThread eventDispatchThread = null;
+    protected String name;
+    protected int refCount;
+    protected AbstractGraphicsDevice aDevice;
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Event.java b/src/newt/classes/com/jogamp/javafx/newt/Event.java
new file mode 100644
index 000000000..4274454ab
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/Event.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+public class Event {
+    private boolean isSystemEvent;
+    private int eventType;
+    private Window source;
+    private long when;
+
+    Event(boolean isSystemEvent, int eventType, Window source, long when) {
+        this.isSystemEvent = isSystemEvent;
+        this.eventType = eventType;
+        this.source = source;
+        this.when = when;
+    }
+
+    protected Event(int eventType, Window source, long when) {
+        this(false, eventType, source, when);
+    }
+
+    /** Indicates whether this event was produced by the system or
+        generated by user code. */
+    public final boolean isSystemEvent() {
+        return isSystemEvent;
+    }
+
+    /** Returns the event type of this event. */
+    public final int getEventType() {
+        return eventType;
+    }
+
+    /** Returns the source Window which produced this Event. */
+    public final Window getSource() {
+        return source;
+    }
+
+    /** Returns the timestamp, in milliseconds, of this event. */
+    public final long getWhen()  {
+        return when;
+    }
+
+    public String toString() {
+        return "Event[sys:"+isSystemEvent()+", source:"+getSource()+", when:"+getWhen()+"]";
+    }
+
+    public static String toHexString(int hex) {
+        return "0x" + Integer.toHexString(hex);
+    }
+
+    public static String toHexString(long hex) {
+        return "0x" + Long.toHexString(hex);
+    }
+
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/EventListener.java b/src/newt/classes/com/jogamp/javafx/newt/EventListener.java
new file mode 100644
index 000000000..065cc1de3
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/EventListener.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+public interface EventListener
+{
+    public static final int WINDOW  = 1 << 0;
+    public static final int MOUSE   = 1 << 1;
+    public static final int KEY     = 1 << 2;
+    public static final int SURFACE = 1 << 3;
+
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/InputEvent.java b/src/newt/classes/com/jogamp/javafx/newt/InputEvent.java
new file mode 100644
index 000000000..0cfaaa4c0
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/InputEvent.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+public abstract class InputEvent extends Event
+{
+ public static final int  SHIFT_MASK     = 1 << 0;
+ public static final int  CTRL_MASK      = 1 << 1;
+ public static final int  META_MASK      = 1 << 2;
+ public static final int  ALT_MASK       = 1 << 3;
+ public static final int  ALT_GRAPH_MASK = 1 << 5;
+ public static final int  BUTTON1_MASK   = 1 << 6;
+ public static final int  BUTTON2_MASK   = 1 << 7;
+ public static final int  BUTTON3_MASK   = 1 << 8;
+
+ protected InputEvent(boolean sysEvent, int eventType, Window source, long when, int modifiers) {
+    super(sysEvent, eventType, source, when);
+    this.consumed=false;
+    this.modifiers=modifiers;
+ }
+
+ public void consume() {
+    consumed=true;
+ }
+
+ public boolean isConsumed() {
+    return consumed;
+ }
+ public int getModifiers() {
+    return modifiers;
+ }
+ public boolean isAltDown() {
+    return (modifiers&ALT_MASK)!=0;
+ }
+ public boolean isAltGraphDown() {
+    return (modifiers&ALT_GRAPH_MASK)!=0;
+ }
+ public boolean isControlDown() {
+    return (modifiers&CTRL_MASK)!=0;
+ }
+ public boolean isMetaDown() {
+    return (modifiers&META_MASK)!=0;
+ }
+ public boolean isShiftDown()  {
+    return (modifiers&SHIFT_MASK)!=0;
+ }
+
+ public boolean isButton1Down()  {
+    return (modifiers&BUTTON1_MASK)!=0;
+ }
+
+ public boolean isButton2Down()  {
+    return (modifiers&BUTTON2_MASK)!=0;
+ }
+
+ public boolean isButton3Down()  {
+    return (modifiers&BUTTON3_MASK)!=0;
+ }
+
+ public String toString() {
+     return "InputEvent[modifiers:"+modifiers+"]";
+ }
+
+ private boolean consumed;
+ private int modifiers;
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Insets.java b/src/newt/classes/com/jogamp/javafx/newt/Insets.java
new file mode 100644
index 000000000..5c91847f4
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/Insets.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ */
+package com.jogamp.javafx.newt;
+
+/**
+ * Simple class representing insets.
+ * 
+ * @author tdv
+ */
+public class Insets implements Cloneable {
+    public int top;
+    public int left;
+    public int bottom;
+    public int right;
+
+    /**
+     * Creates and initializes a new <code>Insets</code> object with the
+     * specified top, left, bottom, and right insets.
+     * @param       top   the inset from the top.
+     * @param       left   the inset from the left.
+     * @param       bottom   the inset from the bottom.
+     * @param       right   the inset from the right.
+     */
+    public Insets(int top, int left, int bottom, int right) {
+        this.top = top;
+        this.left = left;
+        this.bottom = bottom;
+        this.right = right;
+    }
+
+    /**
+     * Checks whether two insets objects are equal. Two instances
+     * of <code>Insets</code> are equal if the four integer values
+     * of the fields <code>top</code>, <code>left</code>,
+     * <code>bottom</code>, and <code>right</code> are all equal.
+     * @return      <code>true</code> if the two insets are equal;
+     *                          otherwise <code>false</code>.
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof Insets) {
+            Insets insets = (Insets)obj;
+            return ((top == insets.top) && (left == insets.left) &&
+                (bottom == insets.bottom) && (right == insets.right));
+        }
+        return false;
+    }
+
+    /**
+     * Returns the hash code for this Insets.
+     *
+     * @return    a hash code for this Insets.
+     */
+    public int hashCode() {
+        int sum1 = left + bottom;
+        int sum2 = right + top;
+        int val1 = sum1 * (sum1 + 1)/2 + left;
+        int val2 = sum2 * (sum2 + 1)/2 + top;
+        int sum3 = val1 + val2;
+        return sum3 * (sum3 + 1)/2 + val2;
+    }
+
+    public String toString() {
+    	return getClass().getName() + "[top="  + top + ",left=" + left +
+            ",bottom=" + bottom + ",right=" + right + "]";
+    }
+
+    public Object clone() {
+        try {
+            return super.clone();
+        } catch (CloneNotSupportedException ex) {
+            throw new InternalError();
+        }
+    }
+
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/KeyEvent.java b/src/newt/classes/com/jogamp/javafx/newt/KeyEvent.java
new file mode 100644
index 000000000..8ae92464c
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/KeyEvent.java
@@ -0,0 +1,738 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+public class KeyEvent extends InputEvent
+{
+ KeyEvent(boolean sysEvent, int eventType, Window source, long when, int modifiers, int keyCode, char keyChar) {
+     super(sysEvent, eventType, source, when, modifiers); 
+     this.keyCode=keyCode;
+     this.keyChar=keyChar;
+ }
+ public KeyEvent(int eventType, Window source, long when, int modifiers, int keyCode, char keyChar) {
+     this(false, eventType, source, when, modifiers, keyCode, keyChar);
+ }
+
+ public char getKeyChar() {
+    return keyChar;
+ }
+ public int getKeyCode() {
+    return keyCode;
+ }
+
+ public String toString() {
+    return "KeyEvent["+getEventTypeString(getEventType())+
+                     ", code "+keyCode+"("+toHexString(keyCode)+"), char <"+keyChar+"> ("+toHexString((int)keyChar)+"), isActionKey "+isActionKey()+", "+super.toString()+"]";
+ }
+
+ public static String getEventTypeString(int type) {
+    switch(type) {
+        case EVENT_KEY_PRESSED: return "EVENT_KEY_PRESSED";
+        case EVENT_KEY_RELEASED: return "EVENT_KEY_RELEASED";
+        case EVENT_KEY_TYPED: return "EVENT_KEY_TYPED";
+        default: return "unknown (" + type + ")";
+    }
+ }
+
+ public boolean   isActionKey() {
+    switch (keyCode) {
+      case VK_HOME:
+      case VK_END:
+      case VK_PAGE_UP:
+      case VK_PAGE_DOWN:
+      case VK_UP:
+      case VK_DOWN:
+      case VK_LEFT:
+      case VK_RIGHT:
+
+      case VK_F1:
+      case VK_F2:
+      case VK_F3:
+      case VK_F4:
+      case VK_F5:
+      case VK_F6:
+      case VK_F7:
+      case VK_F8:
+      case VK_F9:
+      case VK_F10:
+      case VK_F11:
+      case VK_F12:
+      case VK_F13:
+      case VK_F14:
+      case VK_F15:
+      case VK_F16:
+      case VK_F17:
+      case VK_F18:
+      case VK_F19:
+      case VK_F20:
+      case VK_F21:
+      case VK_F22:
+      case VK_F23:
+      case VK_F24:
+      case VK_PRINTSCREEN:
+      case VK_CAPS_LOCK:
+      case VK_PAUSE:
+      case VK_INSERT:
+
+      case VK_HELP:
+      case VK_WINDOWS:
+          return true;
+    }
+    return false;
+ }
+
+    private int keyCode;
+    private char keyChar;
+
+    public static final int EVENT_KEY_PRESSED = 300;
+    public static final int EVENT_KEY_RELEASED= 301;
+    public static final int EVENT_KEY_TYPED   = 302;
+
+    /* Virtual key codes. */
+
+    public static final int VK_ENTER          = '\n';
+    public static final int VK_BACK_SPACE     = '\b';
+    public static final int VK_TAB            = '\t';
+    public static final int VK_CANCEL         = 0x03;
+    public static final int VK_CLEAR          = 0x0C;
+    public static final int VK_SHIFT          = 0x10;
+    public static final int VK_CONTROL        = 0x11;
+    public static final int VK_ALT            = 0x12;
+    public static final int VK_PAUSE          = 0x13;
+    public static final int VK_CAPS_LOCK      = 0x14;
+    public static final int VK_ESCAPE         = 0x1B;
+    public static final int VK_SPACE          = 0x20;
+    public static final int VK_PAGE_UP        = 0x21;
+    public static final int VK_PAGE_DOWN      = 0x22;
+    public static final int VK_END            = 0x23;
+    public static final int VK_HOME           = 0x24;
+
+    /**
+     * Constant for the non-numpad <b>left</b> arrow key.
+     * @see #VK_KP_LEFT
+     */
+    public static final int VK_LEFT           = 0x25;
+
+    /**
+     * Constant for the non-numpad <b>up</b> arrow key.
+     * @see #VK_KP_UP
+     */
+    public static final int VK_UP             = 0x26;
+
+    /**
+     * Constant for the non-numpad <b>right</b> arrow key.
+     * @see #VK_KP_RIGHT
+     */
+    public static final int VK_RIGHT          = 0x27;
+
+    /**
+     * Constant for the non-numpad <b>down</b> arrow key.
+     * @see #VK_KP_DOWN
+     */
+    public static final int VK_DOWN           = 0x28;
+
+    /**
+     * Constant for the comma key, ","
+     */
+    public static final int VK_COMMA          = 0x2C;
+
+    /**
+     * Constant for the minus key, "-"
+     * @since 1.2
+     */
+    public static final int VK_MINUS          = 0x2D;
+
+    /**
+     * Constant for the period key, "."
+     */
+    public static final int VK_PERIOD         = 0x2E;
+
+    /**
+     * Constant for the forward slash key, "/"
+     */
+    public static final int VK_SLASH          = 0x2F;
+
+    /** VK_0 thru VK_9 are the same as ASCII '0' thru '9' (0x30 - 0x39) */
+    public static final int VK_0              = 0x30;
+    public static final int VK_1              = 0x31;
+    public static final int VK_2              = 0x32;
+    public static final int VK_3              = 0x33;
+    public static final int VK_4              = 0x34;
+    public static final int VK_5              = 0x35;
+    public static final int VK_6              = 0x36;
+    public static final int VK_7              = 0x37;
+    public static final int VK_8              = 0x38;
+    public static final int VK_9              = 0x39;
+
+    /**
+     * Constant for the semicolon key, ";"
+     */
+    public static final int VK_SEMICOLON      = 0x3B;
+
+    /**
+     * Constant for the equals key, "="
+     */
+    public static final int VK_EQUALS         = 0x3D;
+
+    /** VK_A thru VK_Z are the same as ASCII 'A' thru 'Z' (0x41 - 0x5A) */
+    public static final int VK_A              = 0x41;
+    public static final int VK_B              = 0x42;
+    public static final int VK_C              = 0x43;
+    public static final int VK_D              = 0x44;
+    public static final int VK_E              = 0x45;
+    public static final int VK_F              = 0x46;
+    public static final int VK_G              = 0x47;
+    public static final int VK_H              = 0x48;
+    public static final int VK_I              = 0x49;
+    public static final int VK_J              = 0x4A;
+    public static final int VK_K              = 0x4B;
+    public static final int VK_L              = 0x4C;
+    public static final int VK_M              = 0x4D;
+    public static final int VK_N              = 0x4E;
+    public static final int VK_O              = 0x4F;
+    public static final int VK_P              = 0x50;
+    public static final int VK_Q              = 0x51;
+    public static final int VK_R              = 0x52;
+    public static final int VK_S              = 0x53;
+    public static final int VK_T              = 0x54;
+    public static final int VK_U              = 0x55;
+    public static final int VK_V              = 0x56;
+    public static final int VK_W              = 0x57;
+    public static final int VK_X              = 0x58;
+    public static final int VK_Y              = 0x59;
+    public static final int VK_Z              = 0x5A;
+
+    /**
+     * Constant for the open bracket key, "["
+     */
+    public static final int VK_OPEN_BRACKET   = 0x5B;
+
+    /**
+     * Constant for the back slash key, "\"
+     */
+    public static final int VK_BACK_SLASH     = 0x5C;
+
+    /**
+     * Constant for the close bracket key, "]"
+     */
+    public static final int VK_CLOSE_BRACKET  = 0x5D;
+
+    public static final int VK_NUMPAD0        = 0x60;
+    public static final int VK_NUMPAD1        = 0x61;
+    public static final int VK_NUMPAD2        = 0x62;
+    public static final int VK_NUMPAD3        = 0x63;
+    public static final int VK_NUMPAD4        = 0x64;
+    public static final int VK_NUMPAD5        = 0x65;
+    public static final int VK_NUMPAD6        = 0x66;
+    public static final int VK_NUMPAD7        = 0x67;
+    public static final int VK_NUMPAD8        = 0x68;
+    public static final int VK_NUMPAD9        = 0x69;
+    public static final int VK_MULTIPLY       = 0x6A;
+    public static final int VK_ADD            = 0x6B;
+
+    /** 
+     * This constant is obsolete, and is included only for backwards
+     * compatibility.
+     * @see #VK_SEPARATOR
+     */
+    public static final int VK_SEPARATER      = 0x6C;
+
+    /** 
+     * Constant for the Numpad Separator key. 
+     * @since 1.4
+     */
+    public static final int VK_SEPARATOR      = VK_SEPARATER;
+
+    public static final int VK_SUBTRACT       = 0x6D;
+    public static final int VK_DECIMAL        = 0x6E;
+    public static final int VK_DIVIDE         = 0x6F;
+    public static final int VK_DELETE         = 0x7F; /* ASCII DEL */
+    public static final int VK_NUM_LOCK       = 0x90;
+    public static final int VK_SCROLL_LOCK    = 0x91;
+
+    /** Constant for the F1 function key. */
+    public static final int VK_F1             = 0x70;
+
+    /** Constant for the F2 function key. */
+    public static final int VK_F2             = 0x71;
+
+    /** Constant for the F3 function key. */
+    public static final int VK_F3             = 0x72;
+
+    /** Constant for the F4 function key. */
+    public static final int VK_F4             = 0x73;
+
+    /** Constant for the F5 function key. */
+    public static final int VK_F5             = 0x74;
+
+    /** Constant for the F6 function key. */
+    public static final int VK_F6             = 0x75;
+
+    /** Constant for the F7 function key. */
+    public static final int VK_F7             = 0x76;
+
+    /** Constant for the F8 function key. */
+    public static final int VK_F8             = 0x77;
+
+    /** Constant for the F9 function key. */
+    public static final int VK_F9             = 0x78;
+
+    /** Constant for the F10 function key. */
+    public static final int VK_F10            = 0x79;
+
+    /** Constant for the F11 function key. */
+    public static final int VK_F11            = 0x7A;
+
+    /** Constant for the F12 function key. */
+    public static final int VK_F12            = 0x7B;
+
+    /**
+     * Constant for the F13 function key.
+     * @since 1.2
+     */
+    /* F13 - F24 are used on IBM 3270 keyboard; use random range for constants. */
+    public static final int VK_F13            = 0xF000;
+ 
+    /**
+     * Constant for the F14 function key.
+     * @since 1.2
+     */
+    public static final int VK_F14            = 0xF001;
+ 
+    /**
+     * Constant for the F15 function key.
+     * @since 1.2
+     */
+    public static final int VK_F15            = 0xF002;
+ 
+    /**
+     * Constant for the F16 function key.
+     * @since 1.2
+     */
+    public static final int VK_F16            = 0xF003;
+ 
+    /**
+     * Constant for the F17 function key.
+     * @since 1.2
+     */
+    public static final int VK_F17            = 0xF004;
+ 
+    /**
+     * Constant for the F18 function key.
+     * @since 1.2
+     */
+    public static final int VK_F18            = 0xF005;
+ 
+    /**
+     * Constant for the F19 function key.
+     * @since 1.2
+     */
+    public static final int VK_F19            = 0xF006;
+ 
+    /**
+     * Constant for the F20 function key.
+     * @since 1.2
+     */
+    public static final int VK_F20            = 0xF007;
+ 
+    /**
+     * Constant for the F21 function key.
+     * @since 1.2
+     */
+    public static final int VK_F21            = 0xF008;
+ 
+    /**
+     * Constant for the F22 function key.
+     * @since 1.2
+     */
+    public static final int VK_F22            = 0xF009;
+ 
+    /**
+     * Constant for the F23 function key.
+     * @since 1.2
+     */
+    public static final int VK_F23            = 0xF00A;
+ 
+    /**
+     * Constant for the F24 function key.
+     * @since 1.2
+     */
+    public static final int VK_F24            = 0xF00B;
+ 
+    public static final int VK_PRINTSCREEN    = 0x9A;
+    public static final int VK_INSERT         = 0x9B;
+    public static final int VK_HELP           = 0x9C;
+    public static final int VK_META           = 0x9D;
+
+    public static final int VK_BACK_QUOTE     = 0xC0;
+    public static final int VK_QUOTE          = 0xDE;
+
+    /**
+     * Constant for the numeric keypad <b>up</b> arrow key.
+     * @see #VK_UP
+     * @since 1.2
+     */
+    public static final int VK_KP_UP          = 0xE0;
+
+    /**
+     * Constant for the numeric keypad <b>down</b> arrow key.
+     * @see #VK_DOWN
+     * @since 1.2
+     */
+    public static final int VK_KP_DOWN        = 0xE1;
+
+    /**
+     * Constant for the numeric keypad <b>left</b> arrow key.
+     * @see #VK_LEFT
+     * @since 1.2
+     */
+    public static final int VK_KP_LEFT        = 0xE2;
+
+    /**
+     * Constant for the numeric keypad <b>right</b> arrow key.
+     * @see #VK_RIGHT
+     * @since 1.2
+     */
+    public static final int VK_KP_RIGHT       = 0xE3;
+    
+    /* For European keyboards */
+    /** @since 1.2 */
+    public static final int VK_DEAD_GRAVE               = 0x80;
+    /** @since 1.2 */
+    public static final int VK_DEAD_ACUTE               = 0x81;
+    /** @since 1.2 */
+    public static final int VK_DEAD_CIRCUMFLEX          = 0x82;
+    /** @since 1.2 */
+    public static final int VK_DEAD_TILDE               = 0x83;
+    /** @since 1.2 */
+    public static final int VK_DEAD_MACRON              = 0x84;
+    /** @since 1.2 */
+    public static final int VK_DEAD_BREVE               = 0x85;
+    /** @since 1.2 */
+    public static final int VK_DEAD_ABOVEDOT            = 0x86;
+    /** @since 1.2 */
+    public static final int VK_DEAD_DIAERESIS           = 0x87;
+    /** @since 1.2 */
+    public static final int VK_DEAD_ABOVERING           = 0x88;
+    /** @since 1.2 */
+    public static final int VK_DEAD_DOUBLEACUTE         = 0x89;
+    /** @since 1.2 */
+    public static final int VK_DEAD_CARON               = 0x8a;
+    /** @since 1.2 */
+    public static final int VK_DEAD_CEDILLA             = 0x8b;
+    /** @since 1.2 */
+    public static final int VK_DEAD_OGONEK              = 0x8c;
+    /** @since 1.2 */
+    public static final int VK_DEAD_IOTA                = 0x8d;
+    /** @since 1.2 */
+    public static final int VK_DEAD_VOICED_SOUND        = 0x8e;
+    /** @since 1.2 */
+    public static final int VK_DEAD_SEMIVOICED_SOUND    = 0x8f;
+
+    /** @since 1.2 */
+    public static final int VK_AMPERSAND                = 0x96;
+    /** @since 1.2 */
+    public static final int VK_ASTERISK                 = 0x97;
+    /** @since 1.2 */
+    public static final int VK_QUOTEDBL                 = 0x98;
+    /** @since 1.2 */
+    public static final int VK_LESS                     = 0x99;
+
+    /** @since 1.2 */
+    public static final int VK_GREATER                  = 0xa0;
+    /** @since 1.2 */
+    public static final int VK_BRACELEFT                = 0xa1;
+    /** @since 1.2 */
+    public static final int VK_BRACERIGHT               = 0xa2;
+
+    /**
+     * Constant for the "@" key.
+     * @since 1.2
+     */
+    public static final int VK_AT                       = 0x0200;
+ 
+    /**
+     * Constant for the ":" key.
+     * @since 1.2
+     */
+    public static final int VK_COLON                    = 0x0201;
+ 
+    /**
+     * Constant for the "^" key.
+     * @since 1.2
+     */
+    public static final int VK_CIRCUMFLEX               = 0x0202;
+ 
+    /**
+     * Constant for the "$" key.
+     * @since 1.2
+     */
+    public static final int VK_DOLLAR                   = 0x0203;
+ 
+    /**
+     * Constant for the Euro currency sign key.
+     * @since 1.2
+     */
+    public static final int VK_EURO_SIGN                = 0x0204;
+ 
+    /**
+     * Constant for the "!" key.
+     * @since 1.2
+     */
+    public static final int VK_EXCLAMATION_MARK         = 0x0205;
+ 
+    /**
+     * Constant for the inverted exclamation mark key.
+     * @since 1.2
+     */
+    public static final int VK_INVERTED_EXCLAMATION_MARK = 0x0206;
+ 
+    /**
+     * Constant for the "(" key.
+     * @since 1.2
+     */
+    public static final int VK_LEFT_PARENTHESIS         = 0x0207;
+ 
+    /**
+     * Constant for the "#" key.
+     * @since 1.2
+     */
+    public static final int VK_NUMBER_SIGN              = 0x0208;
+ 
+    /**
+     * Constant for the "+" key.
+     * @since 1.2
+     */
+    public static final int VK_PLUS                     = 0x0209;
+ 
+    /**
+     * Constant for the ")" key.
+     * @since 1.2
+     */
+    public static final int VK_RIGHT_PARENTHESIS        = 0x020A;
+ 
+    /**
+     * Constant for the "_" key.
+     * @since 1.2
+     */
+    public static final int VK_UNDERSCORE               = 0x020B;
+ 
+    /**
+     * Constant for the Microsoft Windows "Windows" key.
+     * It is used for both the left and right version of the key.  
+     * @see #getKeyLocation()
+     * @since 1.5
+     */
+    public static final int VK_WINDOWS                  = 0x020C;
+ 
+    /**
+     * Constant for the Microsoft Windows Context Menu key.
+     * @since 1.5
+     */
+    public static final int VK_CONTEXT_MENU             = 0x020D;
+ 
+    /* for input method support on Asian Keyboards */
+
+    /* not clear what this means - listed in Microsoft Windows API */
+    public static final int VK_FINAL                    = 0x0018;
+    
+    /** Constant for the Convert function key. */
+    /* Japanese PC 106 keyboard, Japanese Solaris keyboard: henkan */
+    public static final int VK_CONVERT                  = 0x001C;
+
+    /** Constant for the Don't Convert function key. */
+    /* Japanese PC 106 keyboard: muhenkan */
+    public static final int VK_NONCONVERT               = 0x001D;
+    
+    /** Constant for the Accept or Commit function key. */
+    /* Japanese Solaris keyboard: kakutei */
+    public static final int VK_ACCEPT                   = 0x001E;
+
+    /* not clear what this means - listed in Microsoft Windows API */
+    public static final int VK_MODECHANGE               = 0x001F;
+
+    /* replaced by VK_KANA_LOCK for Microsoft Windows and Solaris; 
+       might still be used on other platforms */
+    public static final int VK_KANA                     = 0x0015;
+
+    /* replaced by VK_INPUT_METHOD_ON_OFF for Microsoft Windows and Solaris; 
+       might still be used for other platforms */
+    public static final int VK_KANJI                    = 0x0019;
+
+    /**
+     * Constant for the Alphanumeric function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard: eisuu */
+    public static final int VK_ALPHANUMERIC             = 0x00F0;
+ 
+    /**
+     * Constant for the Katakana function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard: katakana */
+    public static final int VK_KATAKANA                 = 0x00F1;
+ 
+    /**
+     * Constant for the Hiragana function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard: hiragana */
+    public static final int VK_HIRAGANA                 = 0x00F2;
+ 
+    /**
+     * Constant for the Full-Width Characters function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard: zenkaku */
+    public static final int VK_FULL_WIDTH               = 0x00F3;
+ 
+    /**
+     * Constant for the Half-Width Characters function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard: hankaku */
+    public static final int VK_HALF_WIDTH               = 0x00F4;
+ 
+    /**
+     * Constant for the Roman Characters function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard: roumaji */
+    public static final int VK_ROMAN_CHARACTERS         = 0x00F5;
+ 
+    /**
+     * Constant for the All Candidates function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard - VK_CONVERT + ALT: zenkouho */
+    public static final int VK_ALL_CANDIDATES           = 0x0100;
+ 
+    /**
+     * Constant for the Previous Candidate function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard - VK_CONVERT + SHIFT: maekouho */
+    public static final int VK_PREVIOUS_CANDIDATE       = 0x0101;
+ 
+    /**
+     * Constant for the Code Input function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard - VK_ALPHANUMERIC + ALT: kanji bangou */
+    public static final int VK_CODE_INPUT               = 0x0102;
+ 
+    /**
+     * Constant for the Japanese-Katakana function key.
+     * This key switches to a Japanese input method and selects its Katakana input mode.
+     * @since 1.2
+     */
+    /* Japanese Macintosh keyboard - VK_JAPANESE_HIRAGANA + SHIFT */
+    public static final int VK_JAPANESE_KATAKANA        = 0x0103;
+ 
+    /**
+     * Constant for the Japanese-Hiragana function key.
+     * This key switches to a Japanese input method and selects its Hiragana input mode.
+     * @since 1.2
+     */
+    /* Japanese Macintosh keyboard */
+    public static final int VK_JAPANESE_HIRAGANA        = 0x0104;
+ 
+    /**
+     * Constant for the Japanese-Roman function key.
+     * This key switches to a Japanese input method and selects its Roman-Direct input mode.
+     * @since 1.2
+     */
+    /* Japanese Macintosh keyboard */
+    public static final int VK_JAPANESE_ROMAN           = 0x0105;
+
+    /**
+     * Constant for the locking Kana function key.
+     * This key locks the keyboard into a Kana layout.
+     * @since 1.3
+     */
+    /* Japanese PC 106 keyboard with special Windows driver - eisuu + Control; Japanese Solaris keyboard: kana */
+    public static final int VK_KANA_LOCK                = 0x0106;
+
+    /**
+     * Constant for the input method on/off key.
+     * @since 1.3
+     */
+    /* Japanese PC 106 keyboard: kanji. Japanese Solaris keyboard: nihongo */
+    public static final int VK_INPUT_METHOD_ON_OFF      = 0x0107;
+
+    /* for Sun keyboards */
+    /** @since 1.2 */
+    public static final int VK_CUT                      = 0xFFD1;
+    /** @since 1.2 */
+    public static final int VK_COPY                     = 0xFFCD;
+    /** @since 1.2 */
+    public static final int VK_PASTE                    = 0xFFCF;
+    /** @since 1.2 */
+    public static final int VK_UNDO                     = 0xFFCB;
+    /** @since 1.2 */
+    public static final int VK_AGAIN                    = 0xFFC9;
+    /** @since 1.2 */
+    public static final int VK_FIND                     = 0xFFD0;
+    /** @since 1.2 */
+    public static final int VK_PROPS                    = 0xFFCA;
+    /** @since 1.2 */
+    public static final int VK_STOP                     = 0xFFC8;
+    
+    /**
+     * Constant for the Compose function key.
+     * @since 1.2
+     */
+    public static final int VK_COMPOSE                  = 0xFF20;
+ 
+    /**
+     * Constant for the AltGraph function key.
+     * @since 1.2
+     */
+    public static final int VK_ALT_GRAPH                = 0xFF7E;
+
+    /**
+     * Constant for the Begin key.
+     * @since 1.5
+     */
+    public static final int VK_BEGIN                    = 0xFF58;
+
+    /**
+     * This value is used to indicate that the keyCode is unknown.
+     * KEY_TYPED events do not have a keyCode value; this value 
+     * is used instead.  
+     */
+    public static final int VK_UNDEFINED      = 0x0;
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/KeyListener.java b/src/newt/classes/com/jogamp/javafx/newt/KeyListener.java
new file mode 100644
index 000000000..7921a0a97
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/KeyListener.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+public interface KeyListener extends EventListener
+{
+ public void keyPressed(KeyEvent e);
+ public void keyReleased(KeyEvent e);
+ public void keyTyped(KeyEvent e) ;
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/MouseEvent.java b/src/newt/classes/com/jogamp/javafx/newt/MouseEvent.java
new file mode 100644
index 000000000..82989e216
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/MouseEvent.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+public class MouseEvent extends InputEvent
+{
+  public static final int BUTTON1 = 1;
+  public static final int BUTTON2 = 2;
+  public static final int BUTTON3 = 3;
+  public static final int BUTTON4 = 4;
+  public static final int BUTTON5 = 5;
+  public static final int BUTTON6 = 6;
+  public static final int BUTTON_NUMBER = 6;
+
+ protected MouseEvent(boolean sysEvent, int eventType, Window source, long when,
+                      int modifiers, int x, int y, int clickCount, int button,
+                      int rotation)
+ {
+     super(sysEvent, eventType, source, when, modifiers); 
+     this.x=x;
+     this.y=y;
+     this.clickCount=clickCount;
+     this.button=button;
+     this.wheelRotation = rotation;
+ }
+ public MouseEvent(int eventType, Window source, long when, int modifiers,
+                   int x, int y, int clickCount, int button, int rotation) {
+     this(false, eventType, source, when, modifiers, x, y, clickCount, button,
+          rotation);
+ }
+
+ public int getButton() {
+    return button;
+ }
+ public int getClickCount() {
+    return clickCount;
+ }
+ public int getX() {
+    return x;
+ }
+ public int getY() {
+    return y;
+ }
+ public int getWheelRotation() {
+    return wheelRotation;
+ }
+ 
+ public String toString() {
+    return "MouseEvent["+getEventTypeString(getEventType())+
+                       ", "+x+"/"+y+", button "+button+", count "+clickCount+
+                       ", wheel rotation "+wheelRotation+
+                       ", "+super.toString()+"]";
+ }
+
+ public static String getEventTypeString(int type) {
+    switch(type) {
+        case EVENT_MOUSE_CLICKED: return "EVENT_MOUSE_CLICKED";
+        case EVENT_MOUSE_ENTERED: return "EVENT_MOUSE_ENTERED";
+        case EVENT_MOUSE_EXITED: return "EVENT_MOUSE_EXITED";
+        case EVENT_MOUSE_PRESSED: return "EVENT_MOUSE_PRESSED";
+        case EVENT_MOUSE_RELEASED: return "EVENT_MOUSE_RELEASED";
+        case EVENT_MOUSE_MOVED: return "EVENT_MOUSE_MOVED";
+        case EVENT_MOUSE_DRAGGED: return "EVENT_MOUSE_DRAGGED";
+        case EVENT_MOUSE_WHEEL_MOVED: return "EVENT_MOUSE_WHEEL_MOVED";
+        default: return "unknown (" + type + ")";
+    }
+ }
+
+ private int x, y, clickCount, button, wheelRotation;
+
+ public static final int EVENT_MOUSE_CLICKED  = 200;
+ public static final int EVENT_MOUSE_ENTERED  = 201;
+ public static final int EVENT_MOUSE_EXITED   = 202;
+ public static final int EVENT_MOUSE_PRESSED  = 203;
+ public static final int EVENT_MOUSE_RELEASED = 204;
+ public static final int EVENT_MOUSE_MOVED    = 205;
+ public static final int EVENT_MOUSE_DRAGGED  = 206;
+ public static final int EVENT_MOUSE_WHEEL_MOVED = 207;
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/MouseListener.java b/src/newt/classes/com/jogamp/javafx/newt/MouseListener.java
new file mode 100644
index 000000000..a0d42f738
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/MouseListener.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+public interface MouseListener extends EventListener
+{
+ public void mouseClicked(MouseEvent e);
+ public void mouseEntered(MouseEvent e);
+ public void mouseExited(MouseEvent e);
+ public void mousePressed(MouseEvent e);
+ public void mouseReleased(MouseEvent e);
+ public void mouseMoved(MouseEvent e);
+ public void mouseDragged(MouseEvent e);
+ public void mouseWheelMoved(MouseEvent e);
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/NewtFactory.java b/src/newt/classes/com/jogamp/javafx/newt/NewtFactory.java
new file mode 100755
index 000000000..aae51aaf6
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/NewtFactory.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+import javax.media.nativewindow.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import com.jogamp.nativewindow.impl.jvm.JVMUtil;
+
+public abstract class NewtFactory {
+    // Work-around for initialization order problems on Mac OS X
+    // between native Newt and (apparently) Fmod
+    static {
+        JVMUtil.initSingleton();
+        Window.init(NativeWindowFactory.getNativeWindowType(true));
+    }
+
+    static Class getCustomClass(String packageName, String classBaseName) {
+        Class clazz = null;
+        if(packageName!=null || classBaseName!=null) {
+            String clazzName = packageName + "." + classBaseName ;
+            try {
+                clazz = Class.forName(clazzName);
+            } catch (Throwable t) {}
+        }
+        return clazz;
+    }
+
+    private static boolean useEDT = true;
+
+    /** 
+     * Toggles the usage of an EventDispatchThread while creating a Display.<br>
+     * The default is enabled.<br>
+     * The EventDispatchThread is thread local to the Display instance.<br>
+     */
+    public static synchronized void setUseEDT(boolean onoff) {
+        useEDT = onoff;
+    }
+
+    /** @see #setUseEDT(boolean) */
+    public static boolean useEDT() { return useEDT; }
+
+    /**
+     * Create a Display entity, incl native creation
+     */
+    public static Display createDisplay(String name) {
+      return Display.create(NativeWindowFactory.getNativeWindowType(true), name);
+    }
+
+    /**
+     * Create a Display entity using the given implementation type, incl native creation
+     */
+    public static Display createDisplay(String type, String name) {
+      return Display.create(type, name);
+    }
+
+    /**
+     * Create a Screen entity, incl native creation
+     */
+    public static Screen createScreen(Display display, int index) {
+      return Screen.create(NativeWindowFactory.getNativeWindowType(true), display, index);
+    }
+
+    /**
+     * Create a Screen entity using the given implementation type, incl native creation
+     */
+    public static Screen createScreen(String type, Display display, int index) {
+      return Screen.create(type, display, index);
+    }
+
+    /**
+     * Create a Window entity, incl native creation
+     */
+    public static Window createWindow(Screen screen, Capabilities caps) {
+        return Window.create(NativeWindowFactory.getNativeWindowType(true), 0, screen, caps, false);
+    }
+
+    public static Window createWindow(Screen screen, Capabilities caps, boolean undecorated) {
+        return Window.create(NativeWindowFactory.getNativeWindowType(true), 0, screen, caps, undecorated);
+    }
+
+    public static Window createWindow(long parentWindowHandle, Screen screen, Capabilities caps, boolean undecorated) {
+        return Window.create(NativeWindowFactory.getNativeWindowType(true), parentWindowHandle, screen, caps, undecorated);
+    }
+
+    /**
+     * Ability to try a Window type with a construnctor argument, if supported ..<p>
+     * Currently only valid is <code> AWTWindow(Frame frame) </code>,
+     * to support an external created AWT Frame, ie the browsers embedded frame.
+     */
+    public static Window createWindow(Object[] cstrArguments, Screen screen, Capabilities caps, boolean undecorated) {
+        return Window.create(NativeWindowFactory.getNativeWindowType(true), cstrArguments, screen, caps, undecorated);
+    }
+
+    /**
+     * Create a Window entity using the given implementation type, incl native creation
+     */
+    public static Window createWindow(String type, Screen screen, Capabilities caps) {
+        return Window.create(type, 0, screen, caps, false);
+    }
+
+    public static Window createWindow(String type, Screen screen, Capabilities caps, boolean undecorated) {
+        return Window.create(type, 0, screen, caps, undecorated);
+    }
+
+    public static Window createWindow(String type, long parentWindowHandle, Screen screen, Capabilities caps, boolean undecorated) {
+        return Window.create(type, parentWindowHandle, screen, caps, undecorated);
+    }
+
+    public static Window createWindow(String type, Object[] cstrArguments, Screen screen, Capabilities caps, boolean undecorated) {
+        return Window.create(type, cstrArguments, screen, caps, undecorated);
+    }
+
+    /**
+     * Instantiate a Display entity using the native handle.
+     */
+    public static Display wrapDisplay(String name, AbstractGraphicsDevice device) {
+      return Display.wrapHandle(NativeWindowFactory.getNativeWindowType(true), name, device);
+    }
+
+    /**
+     * Instantiate a Screen entity using the native handle.
+     */
+    public static Screen wrapScreen(Display display, AbstractGraphicsScreen screen) {
+      return Screen.wrapHandle(NativeWindowFactory.getNativeWindowType(true), display, screen);
+    }
+
+    /**
+     * Instantiate a Window entity using the native handle.
+     */
+    public static Window wrapWindow(Screen screen, AbstractGraphicsConfiguration config,
+                                    long windowHandle, boolean fullscreen, boolean visible, 
+                                    int x, int y, int width, int height) {
+      return Window.wrapHandle(NativeWindowFactory.getNativeWindowType(true), screen, config,
+                               windowHandle, fullscreen, visible, x, y, width, height);
+    }
+
+    private static final boolean instanceOf(Object obj, String clazzName) {
+        Class clazz = obj.getClass();
+        do {
+            if(clazz.getName().equals(clazzName)) {
+                return true;
+            }
+            clazz = clazz.getSuperclass();
+        } while (clazz!=null);
+        return false;
+    }
+
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/OffscreenWindow.java b/src/newt/classes/com/jogamp/javafx/newt/OffscreenWindow.java
new file mode 100644
index 000000000..015e9b8d2
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/OffscreenWindow.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+import javax.media.nativewindow.*;
+
+public class OffscreenWindow extends Window implements SurfaceChangeable {
+
+    long surfaceHandle = 0;
+
+    public OffscreenWindow() {
+    }
+
+    static long nextWindowHandle = 0x100; // start here - a marker
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        if(0!=parentWindowHandle) {
+            throw new NativeWindowException("OffscreenWindow does not support window parenting");
+        }
+        if(caps.isOnscreen()) {
+            throw new NativeWindowException("Capabilities is onscreen");
+        }
+        AbstractGraphicsScreen aScreen = screen.getGraphicsScreen();
+        config = GraphicsConfigurationFactory.getFactory(aScreen.getDevice()).chooseGraphicsConfiguration(caps, null, aScreen);
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+
+        synchronized(OffscreenWindow.class) {
+            windowHandle = nextWindowHandle++;
+        }
+    }
+
+    protected void closeNative() {
+        // nop
+    }
+
+    public void invalidate() {
+        super.invalidate();
+        surfaceHandle = 0;
+    }
+
+    public synchronized void destroy() {
+        surfaceHandle = 0;
+    }
+
+    public void setSurfaceHandle(long handle) {
+        surfaceHandle = handle ;
+    }
+
+    public long getSurfaceHandle() {
+        return surfaceHandle;
+    }
+
+    public void setVisible(boolean visible) {
+        if(!visible) {
+            this.visible = visible;
+        }
+    }
+
+    public void setSize(int width, int height) {
+        if(!visible) {
+            this.width = width;
+            this.height = height;
+        }
+    }
+
+    public void setPosition(int x, int y) {
+        // nop
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        // nop
+        return false;
+    }
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/PaintEvent.java b/src/newt/classes/com/jogamp/javafx/newt/PaintEvent.java
new file mode 100755
index 000000000..8543246a7
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/PaintEvent.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ */
+
+package com.jogamp.javafx.newt;
+
+/**
+ *
+ * @author tdv
+ */
+public class PaintEvent extends Event {
+
+    // bounds of the damage region
+    private int x, y, width, height;
+    public PaintEvent(int eventType, Window source,
+                       long when, int x, int y, int w, int h)
+    {
+        super(true, eventType, source, when);
+        this.x = x;
+        this.y = y;
+        this.width = w;
+        this.height = h;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public String toString() {
+        return "ExposeEvent[modifiers: x="+x+" y="+y+" w="+width+" h="+height +"]";
+    }
+
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/PaintListener.java b/src/newt/classes/com/jogamp/javafx/newt/PaintListener.java
new file mode 100755
index 000000000..adfd78f18
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/PaintListener.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ */
+
+package com.jogamp.javafx.newt;
+
+/**
+ *
+ * @author tdv
+ */
+public interface PaintListener {
+    public void exposed(PaintEvent e);
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Screen.java b/src/newt/classes/com/jogamp/javafx/newt/Screen.java
new file mode 100755
index 000000000..b02a7ef00
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/Screen.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+import com.jogamp.javafx.newt.impl.*;
+
+import javax.media.nativewindow.*;
+import java.security.*;
+
+public abstract class Screen {
+
+    private static Class getScreenClass(String type) 
+        throws ClassNotFoundException 
+    {
+        Class screenClass = NewtFactory.getCustomClass(type, "Screen");
+        if(null==screenClass) {
+            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
+                screenClass = Class.forName("com.jogamp.javafx.newt.opengl.kd.KDScreen");
+            } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
+                screenClass = Class.forName("com.jogamp.javafx.newt.windows.WindowsScreen");
+            } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
+                screenClass = Class.forName("com.jogamp.javafx.newt.macosx.MacScreen");
+            } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
+                screenClass = Class.forName("com.jogamp.javafx.newt.x11.X11Screen");
+            } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
+                screenClass = Class.forName("com.jogamp.javafx.newt.awt.AWTScreen");
+            } else {
+                throw new RuntimeException("Unknown window type \"" + type + "\"");
+            }
+        }
+        return screenClass;
+    }
+
+    protected static Screen create(String type, Display display, int idx) {
+        try {
+            if(usrWidth<0 || usrHeight<0) {
+                usrWidth  = Debug.getIntProperty("newt.ws.swidth", true, localACC);
+                usrHeight = Debug.getIntProperty("newt.ws.sheight", true, localACC);
+                System.out.println("User screen size "+usrWidth+"x"+usrHeight);
+            }
+            Class screenClass = getScreenClass(type);
+            Screen screen  = (Screen) screenClass.newInstance();
+            screen.display = display;
+            screen.createNative(idx);
+            if(null==screen.aScreen) {
+                throw new RuntimeException("Screen.createNative() failed to instanciate an AbstractGraphicsScreen");
+            }
+            return screen;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public synchronized void destroy() {
+        closeNative();
+        display = null;
+        aScreen = null;
+    }
+
+    protected static Screen wrapHandle(String type, Display display, AbstractGraphicsScreen aScreen) {
+        try {
+            Class screenClass = getScreenClass(type);
+            Screen screen  = (Screen) screenClass.newInstance();
+            screen.display = display;
+            screen.aScreen = aScreen;
+            return screen;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected abstract void createNative(int index);
+    protected abstract void closeNative();
+
+    protected void setScreenSize(int w, int h) {
+        System.out.println("Detected screen size "+w+"x"+h);
+        width=w; height=h;
+    }
+
+    public Display getDisplay() {
+        return display;
+    }
+
+    public int getIndex() {
+        return aScreen.getIndex();
+    }
+
+    public AbstractGraphicsScreen getGraphicsScreen() {
+        return aScreen;
+    }
+
+    /**
+     * The actual implementation shall return the detected display value,
+     * if not we return 800.
+     * This can be overwritten with the user property 'newt.ws.swidth',
+     */
+    public int getWidth() {
+        return (usrWidth>0) ? usrWidth : (width>0) ? width : 480;
+    }
+
+    /**
+     * The actual implementation shall return the detected display value,
+     * if not we return 480.
+     * This can be overwritten with the user property 'newt.ws.sheight',
+     */
+    public int getHeight() {
+        return (usrHeight>0) ? usrHeight : (height>0) ? height : 480;
+    }
+
+    protected Display display;
+    protected AbstractGraphicsScreen aScreen;
+    protected int width=-1, height=-1; // detected values: set using setScreenSize
+    protected static int usrWidth=-1, usrHeight=-1; // property values: newt.ws.swidth and newt.ws.sheight
+    private static AccessControlContext localACC = AccessController.getContext();
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Window.java b/src/newt/classes/com/jogamp/javafx/newt/Window.java
new file mode 100755
index 000000000..2d9341e13
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/Window.java
@@ -0,0 +1,929 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+import com.jogamp.javafx.newt.impl.Debug;
+import com.jogamp.javafx.newt.util.EventDispatchThread;
+
+import javax.media.nativewindow.*;
+import com.jogamp.nativewindow.impl.NWReflection;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.lang.reflect.Method;
+
+public abstract class Window implements NativeWindow
+{
+    public static final boolean DEBUG_MOUSE_EVENT = Debug.debug("Window.MouseEvent");
+    public static final boolean DEBUG_KEY_EVENT = Debug.debug("Window.KeyEvent");
+    public static final boolean DEBUG_WINDOW_EVENT = Debug.debug("Window.WindowEvent");
+    public static final boolean DEBUG_IMPLEMENTATION = Debug.debug("Window");
+    
+    // Workaround for initialization order problems on Mac OS X
+    // between native Newt and (apparently) Fmod -- if Fmod is
+    // initialized first then the connection to the window server
+    // breaks, leading to errors from deep within the AppKit
+    static void init(String type) {
+        if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
+            try {
+                getWindowClass(type);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private static Class getWindowClass(String type) 
+        throws ClassNotFoundException 
+    {
+        Class windowClass = NewtFactory.getCustomClass(type, "Window");
+        if(null==windowClass) {
+            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
+                windowClass = Class.forName("com.jogamp.javafx.newt.opengl.kd.KDWindow");
+            } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
+                windowClass = Class.forName("com.jogamp.javafx.newt.windows.WindowsWindow");
+            } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
+                windowClass = Class.forName("com.jogamp.javafx.newt.macosx.MacWindow");
+            } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
+                windowClass = Class.forName("com.jogamp.javafx.newt.x11.X11Window");
+            } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
+                windowClass = Class.forName("com.jogamp.javafx.newt.awt.AWTWindow");
+            } else {
+                throw new NativeWindowException("Unknown window type \"" + type + "\"");
+            }
+        }
+        return windowClass;
+    }
+
+    protected static Window create(String type, final long parentWindowHandle, Screen screen, final Capabilities caps, boolean undecorated) {
+        try {
+            Class windowClass;
+            if(caps.isOnscreen()) {
+                windowClass = getWindowClass(type);
+            } else {
+                windowClass = OffscreenWindow.class;
+            }
+            Window window = (Window) windowClass.newInstance();
+            window.invalidate();
+            window.screen   = screen;
+            window.setUndecorated(undecorated||0!=parentWindowHandle);
+            EventDispatchThread edt = screen.getDisplay().getEDT();
+            if(null!=edt) {
+                final Window f_win = window;
+                edt.invokeAndWait(new Runnable() {
+                    public void run() {
+                        f_win.createNative(parentWindowHandle, caps);
+                    }
+                } );
+            } else {
+                window.createNative(parentWindowHandle, caps);
+            }
+            return window;
+        } catch (Throwable t) {
+            t.printStackTrace();
+            throw new NativeWindowException(t);
+        }
+    }
+
+    protected static Window create(String type, Object[] cstrArguments, Screen screen, final Capabilities caps, boolean undecorated) {
+        try {
+            Class windowClass = getWindowClass(type);
+            Class[] cstrArgumentTypes = getCustomConstructorArgumentTypes(windowClass);
+            if(null==cstrArgumentTypes) {
+                throw new NativeWindowException("WindowClass "+windowClass+" doesn't support custom arguments in constructor");
+            }
+            int argsChecked = verifyConstructorArgumentTypes(cstrArgumentTypes, cstrArguments);
+            if ( argsChecked < cstrArguments.length ) {
+                throw new NativeWindowException("WindowClass "+windowClass+" constructor mismatch at argument #"+argsChecked+"; Constructor: "+getTypeStrList(cstrArgumentTypes)+", arguments: "+getArgsStrList(cstrArguments));
+            }
+            Window window = (Window) NWReflection.createInstance( windowClass, cstrArgumentTypes, cstrArguments ) ;
+            window.invalidate();
+            window.screen   = screen;
+            window.setUndecorated(undecorated);
+            EventDispatchThread edt = screen.getDisplay().getEDT();
+            if(null!=edt) {
+                final Window f_win = window;
+                edt.invokeAndWait(new Runnable() {
+                    public void run() {
+                        f_win.createNative(0, caps);
+                    }
+                } );
+            } else {
+                window.createNative(0, caps);
+            }
+            return window;
+        } catch (Throwable t) {
+            t.printStackTrace();
+            throw new NativeWindowException(t);
+        }
+    }
+
+    protected static Window wrapHandle(String type, Screen screen, AbstractGraphicsConfiguration config, 
+                                 long windowHandle, boolean fullscreen, boolean visible, 
+                                 int x, int y, int width, int height) 
+    {
+        try {
+            Class windowClass = getWindowClass(type);
+            Window window = (Window) windowClass.newInstance();
+            window.invalidate();
+            window.screen   = screen;
+            window.config = config;
+            window.windowHandle = windowHandle;
+            window.fullscreen=fullscreen;
+            window.visible=visible;
+            window.x=x;
+            window.y=y;
+            window.width=width;
+            window.height=height;
+            return window;
+        } catch (Throwable t) {
+            t.printStackTrace();
+            throw new NativeWindowException(t);
+        }
+    }
+
+    public static String toHexString(int hex) {
+        return "0x" + Integer.toHexString(hex);
+    }
+
+    public static String toHexString(long hex) {
+        return "0x" + Long.toHexString(hex);
+    }
+
+    protected Screen screen;
+
+    protected AbstractGraphicsConfiguration config;
+    protected long   windowHandle;
+    protected boolean fullscreen, visible;
+    protected int width, height, x, y;
+    protected int     eventMask;
+
+    protected String title = "Newt Window";
+    protected boolean undecorated = false;
+
+    /**
+     * Create native windowHandle, ie creates a new native invisible window.
+     *
+     * The parentWindowHandle may be null, in which case no window parenting 
+     * is requested.
+     *
+     * Shall use the capabilities to determine the graphics configuration
+     * and shall set the chosen capabilities.
+     */
+    protected abstract void createNative(long parentWindowHandle, Capabilities caps);
+
+    protected abstract void closeNative();
+
+    public Screen getScreen() {
+        return screen;
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+
+        sb.append(getClass().getName()+"[config "+config+
+                    ", windowHandle "+toHexString(getWindowHandle())+
+                    ", surfaceHandle "+toHexString(getSurfaceHandle())+
+                    ", pos "+getX()+"/"+getY()+", size "+getWidth()+"x"+getHeight()+
+                    ", visible "+isVisible()+
+                    ", undecorated "+undecorated+
+                    ", fullscreen "+fullscreen+
+                    ", "+screen+
+                    ", wrappedWindow "+getWrappedWindow());
+
+        sb.append(", SurfaceUpdatedListeners num "+surfaceUpdatedListeners.size()+" [");
+        for (Iterator iter = surfaceUpdatedListeners.iterator(); iter.hasNext(); ) {
+          sb.append(iter.next()+", ");
+        }
+        sb.append("], WindowListeners num "+windowListeners.size()+" [");
+        for (Iterator iter = windowListeners.iterator(); iter.hasNext(); ) {
+          sb.append(iter.next()+", ");
+        }
+        sb.append("], MouseListeners num "+mouseListeners.size()+" [");
+        for (Iterator iter = mouseListeners.iterator(); iter.hasNext(); ) {
+          sb.append(iter.next()+", ");
+        }
+        sb.append("], KeyListeners num "+keyListeners.size()+" [");
+        for (Iterator iter = keyListeners.iterator(); iter.hasNext(); ) {
+          sb.append(iter.next()+", ");
+        }
+        sb.append("] ]");
+        return sb.toString();
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setUndecorated(boolean value) {
+        undecorated = value;
+    }
+
+    public boolean isUndecorated() {
+        return undecorated;
+    }
+
+    public void requestFocus() {
+    }
+
+    //
+    // NativeWindow impl
+    //
+    private Thread owner;
+    private int recursionCount;
+    protected Exception lockedStack = null;
+
+    /** Recursive and blocking lockSurface() implementation */
+    public synchronized int lockSurface() {
+        // We leave the ToolkitLock lock to the specializtion's discretion, 
+        // ie the implicit JAWTWindow in case of AWTWindow
+        Thread cur = Thread.currentThread();
+        if (owner == cur) {
+            ++recursionCount;
+            return LOCK_SUCCESS;
+        }
+        while (owner != null) {
+            try {
+                wait();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        owner = cur;
+        lockedStack = new Exception("NEWT Surface previously locked by "+Thread.currentThread());
+        screen.getDisplay().lockDisplay();
+        return LOCK_SUCCESS;
+    }
+
+    /** Recursive and unblocking unlockSurface() implementation */
+    public synchronized void unlockSurface() throws NativeWindowException {
+        Thread cur = Thread.currentThread();
+        if (owner != cur) {
+            lockedStack.printStackTrace();
+            throw new NativeWindowException(cur+": Not owner, owner is "+owner);
+        }
+        if (recursionCount > 0) {
+            --recursionCount;
+            return;
+        }
+        owner = null;
+        lockedStack = null;
+        screen.getDisplay().unlockDisplay();
+        notifyAll();
+        // We leave the ToolkitLock unlock to the specializtion's discretion, 
+        // ie the implicit JAWTWindow in case of AWTWindow
+    }
+
+    public synchronized boolean isSurfaceLocked() {
+        return null!=owner;
+    }
+
+    public synchronized Thread getSurfaceLockOwner() {
+        return owner;
+    }
+
+    public synchronized Exception getLockedStack() {
+        return lockedStack;
+    }
+
+    public synchronized void destroy() {
+        destroy(false);
+    }
+
+    /** @param deep If true, the linked Screen and Display will be destroyed as well. */
+    public synchronized void destroy(boolean deep) {
+        if(DEBUG_WINDOW_EVENT) {
+            System.out.println("Window.destroy() start (deep "+deep+" - "+Thread.currentThread());
+        }
+        synchronized(surfaceUpdatedListeners) {
+            surfaceUpdatedListeners = new ArrayList();
+        }
+        synchronized(windowListeners) {
+            windowListeners = new ArrayList();
+        }
+        synchronized(mouseListeners) {
+            mouseListeners = new ArrayList();
+        }
+        synchronized(keyListeners) {
+            keyListeners = new ArrayList();
+        }
+        Screen scr = screen;
+        Display dpy = (null!=screen) ? screen.getDisplay() : null;
+        EventDispatchThread edt = (null!=dpy) ? dpy.getEDT() : null;
+        if(null!=edt) {
+            final Window f_win = this;
+            edt.invokeAndWait(new Runnable() {
+                public void run() {
+                    f_win.closeNative();
+                }
+            } );
+        } else {
+            closeNative();
+        }
+        invalidate();
+        if(deep) {
+            if(null!=scr) {
+                scr.destroy();
+            }
+            if(null!=dpy) {
+                dpy.destroy();
+            }
+        }
+        if(DEBUG_WINDOW_EVENT) {
+            System.out.println("Window.destroy() end "+Thread.currentThread());
+        }
+    }
+
+    public void invalidate() {
+        if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+            Exception e = new Exception("!!! Window Invalidate "+Thread.currentThread());
+            e.printStackTrace();
+        }
+        screen   = null;
+        windowHandle = 0;
+        fullscreen=false;
+        visible=false;
+        eventMask = 0;
+
+        // Default position and dimension will be re-set immediately by user
+        width  = 100;
+        height = 100;
+        x=0;
+        y=0;
+    }
+
+    public boolean surfaceSwap() { 
+        return false;
+    }
+
+    protected void clearEventMask() {
+        eventMask=0;
+    }
+
+    public long getDisplayHandle() {
+        return screen.getDisplay().getHandle();
+    }
+
+    public int  getScreenIndex() {
+        return screen.getIndex();
+    }
+
+    public long getWindowHandle() {
+        return windowHandle;
+    }
+
+    public long getSurfaceHandle() {
+        return windowHandle; // default: return window handle
+    }
+
+    public AbstractGraphicsConfiguration getGraphicsConfiguration() {
+        return config;
+    }
+
+    /**
+     * Returns the width of the client area of this window
+     * @return width of the client area
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * Returns the height of the client area of this window
+     * @return height of the client area
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * Returns the insets for this native window (the difference between the
+     * size of the toplevel window with the decorations and the client area).
+     * 
+     * @return insets for this platform window
+     */
+    // this probably belongs to NativeWindow interface
+    public Insets getInsets() {
+        return new Insets(0,0,0,0);
+    }
+
+    /** If this Window actually wraps one from another toolkit such as
+        the AWT, this will return a non-null value. */
+    public Object getWrappedWindow() {
+        return null;
+    }
+
+    //
+    // Additional methods
+    //
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public boolean isVisible() {
+        return visible;
+    }
+
+    public boolean isFullscreen() {
+        return fullscreen;
+    }
+
+    private boolean autoDrawableMember = false;
+
+    /** If the implementation is capable of detecting a device change
+        return true and clear the status/reason of the change. */
+    public boolean hasDeviceChanged() {
+        return false;
+    }
+
+    /**
+     * If set to true, 
+     * certain action will be performed by the owning
+     * AutoDrawable, ie the destroy() call within windowDestroyNotify()
+     */
+    public void setAutoDrawableClient(boolean b) {
+        autoDrawableMember = b;
+    }
+
+    protected void windowDestroyNotify() {
+        if(DEBUG_WINDOW_EVENT) {
+            System.out.println("Window.windowDestroyeNotify start "+Thread.currentThread());
+        }
+
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY);
+
+        if(!autoDrawableMember) {
+            destroy();
+        }
+
+        if(DEBUG_WINDOW_EVENT) {
+            System.out.println("Window.windowDestroyeNotify end "+Thread.currentThread());
+        }
+    }
+
+    protected void windowDestroyed() {
+        if(DEBUG_WINDOW_EVENT) {
+            System.out.println("Window.windowDestroyed "+Thread.currentThread());
+        }
+        invalidate();
+    }
+
+    public abstract void    setVisible(boolean visible);
+    /**
+     * Sets the size of the client area of the window, excluding decorations
+     * Total size of the window will be
+     * {@code width+insets.left+insets.right, height+insets.top+insets.bottom}
+     * @param width of the client area of the window
+     * @param height of the client area of the window
+     */
+    public abstract void    setSize(int width, int height);
+    /**
+     * Sets the location of the top left corner of the window, including
+     * decorations (so the client area will be placed at
+     * {@code x+insets.left,y+insets.top}.
+     * @param x coord of the top left corner
+     * @param y coord of the top left corner
+     */
+    public abstract void    setPosition(int x, int y);
+    public abstract boolean setFullscreen(boolean fullscreen);
+
+    //
+    // SurfaceUpdatedListener Support
+    //
+    private ArrayList surfaceUpdatedListeners = new ArrayList();
+
+    public void addSurfaceUpdatedListener(SurfaceUpdatedListener l) {
+        if(l == null) {
+            return;
+        }
+        synchronized(surfaceUpdatedListeners) {
+            ArrayList newSurfaceUpdatedListeners = (ArrayList) surfaceUpdatedListeners.clone();
+            newSurfaceUpdatedListeners.add(l);
+            surfaceUpdatedListeners = newSurfaceUpdatedListeners;
+        }
+    }
+
+    public void removeSurfaceUpdatedListener(SurfaceUpdatedListener l) {
+        if (l == null) {
+            return;
+        }
+        synchronized(surfaceUpdatedListeners) {
+            ArrayList newSurfaceUpdatedListeners = (ArrayList) surfaceUpdatedListeners.clone();
+            newSurfaceUpdatedListeners.remove(l);
+            surfaceUpdatedListeners = newSurfaceUpdatedListeners;
+        }
+    }
+
+    public SurfaceUpdatedListener[] getSurfaceUpdatedListener() {
+        synchronized(surfaceUpdatedListeners) {
+            return (SurfaceUpdatedListener[]) surfaceUpdatedListeners.toArray();
+        }
+    }
+
+    public void surfaceUpdated(Object updater, NativeWindow window, long when) { 
+        ArrayList listeners = null;
+        synchronized(surfaceUpdatedListeners) {
+            listeners = surfaceUpdatedListeners;
+        }
+        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
+            SurfaceUpdatedListener l = (SurfaceUpdatedListener) i.next();
+            l.surfaceUpdated(updater, window, when);
+        }
+    }
+
+    //
+    // MouseListener Support
+    //
+
+    public void addMouseListener(MouseListener l) {
+        if(l == null) {
+            return;
+        }
+        synchronized(mouseListeners) {
+            ArrayList newMouseListeners = (ArrayList) mouseListeners.clone();
+            newMouseListeners.add(l);
+            mouseListeners = newMouseListeners;
+        }
+    }
+
+    public void removeMouseListener(MouseListener l) {
+        if (l == null) {
+            return;
+        }
+        synchronized(mouseListeners) {
+            ArrayList newMouseListeners = (ArrayList) mouseListeners.clone();
+            newMouseListeners.remove(l);
+            mouseListeners = newMouseListeners;
+        }
+    }
+
+    public MouseListener[] getMouseListeners() {
+        synchronized(mouseListeners) {
+            return (MouseListener[]) mouseListeners.toArray();
+        }
+    }
+
+    private ArrayList mouseListeners = new ArrayList();
+    private int  mouseButtonPressed = 0; // current pressed mouse button number
+    private long lastMousePressed = 0; // last time when a mouse button was pressed
+    private int  lastMouseClickCount = 0; // last mouse button click count
+    public  static final int ClickTimeout = 300;
+
+    protected void sendMouseEvent(int eventType, int modifiers,
+                                  int x, int y, int button, int rotation) {
+        if(x<0||y<0||x>=width||y>=height) {
+            return; // .. invalid ..
+        }
+        if(DEBUG_MOUSE_EVENT) {
+            System.out.println("sendMouseEvent: "+MouseEvent.getEventTypeString(eventType)+
+                               ", mod "+modifiers+", pos "+x+"/"+y+", button "+button);
+        }
+        if(button<0||button>MouseEvent.BUTTON_NUMBER) {
+            throw new NativeWindowException("Invalid mouse button number" + button);
+        }
+        long when = System.currentTimeMillis();
+        MouseEvent eClicked = null;
+        MouseEvent e = null;
+
+        if(MouseEvent.EVENT_MOUSE_PRESSED==eventType) {
+            if(when-lastMousePressed<ClickTimeout) {
+                lastMouseClickCount++;
+            } else {
+                lastMouseClickCount=1;
+            }
+            lastMousePressed=when;
+            mouseButtonPressed=button;
+            e = new MouseEvent(true, eventType, this, when,
+                               modifiers, x, y, lastMouseClickCount, button, 0);
+        } else if(MouseEvent.EVENT_MOUSE_RELEASED==eventType) {
+            e = new MouseEvent(true, eventType, this, when,
+                               modifiers, x, y, lastMouseClickCount, button, 0);
+            if(when-lastMousePressed<ClickTimeout) {
+                eClicked = new MouseEvent(true, MouseEvent.EVENT_MOUSE_CLICKED, this, when,
+                                          modifiers, x, y, lastMouseClickCount, button, 0);
+            } else {
+                lastMouseClickCount=0;
+                lastMousePressed=0;
+            }
+            mouseButtonPressed=0;
+        } else if(MouseEvent.EVENT_MOUSE_MOVED==eventType) {
+            if (mouseButtonPressed>0) {
+                e = new MouseEvent(true, MouseEvent.EVENT_MOUSE_DRAGGED, this, when,
+                                   modifiers, x, y, 1, mouseButtonPressed, 0);
+            } else {
+                e = new MouseEvent(true, eventType, this, when,
+                                   modifiers, x, y, 0, button, 0);
+            }
+        } else if(MouseEvent.EVENT_MOUSE_WHEEL_MOVED==eventType) {
+            e = new MouseEvent(true, eventType, this, when, modifiers, x, y, 0, button, rotation);
+        } else {
+            e = new MouseEvent(true, eventType, this, when, modifiers, x, y, 0, button, 0);
+        }
+
+        if(DEBUG_MOUSE_EVENT) {
+            System.out.println("sendMouseEvent: event:         "+e);
+            if(null!=eClicked) {
+                System.out.println("sendMouseEvent: event Clicked: "+eClicked);
+            }
+        }
+
+        ArrayList listeners = null;
+        synchronized(mouseListeners) {
+            listeners = mouseListeners;
+        }
+        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
+            MouseListener l = (MouseListener) i.next();
+            switch(e.getEventType()) {
+                case MouseEvent.EVENT_MOUSE_CLICKED:
+                    l.mouseClicked(e);
+                    break;
+                case MouseEvent.EVENT_MOUSE_ENTERED:
+                    l.mouseEntered(e);
+                    break;
+                case MouseEvent.EVENT_MOUSE_EXITED:
+                    l.mouseExited(e);
+                    break;
+                case MouseEvent.EVENT_MOUSE_PRESSED:
+                    l.mousePressed(e);
+                    break;
+                case MouseEvent.EVENT_MOUSE_RELEASED:
+                    l.mouseReleased(e);
+                    if(null!=eClicked) {
+                        l.mouseClicked(eClicked);
+                    }
+                    break;
+                case MouseEvent.EVENT_MOUSE_MOVED:
+                    l.mouseMoved(e);
+                    break;
+                case MouseEvent.EVENT_MOUSE_DRAGGED:
+                    l.mouseDragged(e);
+                    break;
+                case MouseEvent.EVENT_MOUSE_WHEEL_MOVED:
+                    l.mouseWheelMoved(e);
+                    break;
+                default:
+                    throw new NativeWindowException("Unexpected mouse event type " + e.getEventType());
+            }
+        }
+    }
+
+    //
+    // KeyListener Support
+    //
+
+    public void addKeyListener(KeyListener l) {
+        if(l == null) {
+            return;
+        }
+        synchronized(keyListeners) {
+            ArrayList newKeyListeners = (ArrayList) keyListeners.clone();
+            newKeyListeners.add(l);
+            keyListeners = newKeyListeners;
+        }
+    }
+
+    public void removeKeyListener(KeyListener l) {
+        if (l == null) {
+            return;
+        }
+        synchronized(keyListeners) {
+            ArrayList newKeyListeners = (ArrayList) keyListeners.clone();
+            newKeyListeners.remove(l);
+            keyListeners = newKeyListeners;
+        }
+    }
+
+    public KeyListener[] getKeyListeners() {
+        synchronized(keyListeners) {
+            return (KeyListener[]) keyListeners.toArray();
+        }
+    }
+
+    private ArrayList keyListeners = new ArrayList();
+
+    protected void sendKeyEvent(int eventType, int modifiers, int keyCode, char keyChar) {
+        KeyEvent e = new KeyEvent(true, eventType, this, System.currentTimeMillis(),
+                                      modifiers, keyCode, keyChar);
+        if(DEBUG_KEY_EVENT) {
+            System.out.println("sendKeyEvent: "+e);
+        }
+        ArrayList listeners = null;
+        synchronized(keyListeners) {
+            listeners = keyListeners;
+        }
+        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
+            KeyListener l = (KeyListener) i.next();
+            switch(eventType) {
+                case KeyEvent.EVENT_KEY_PRESSED:
+                    l.keyPressed(e);
+                    break;
+                case KeyEvent.EVENT_KEY_RELEASED:
+                    l.keyReleased(e);
+                    break;
+                case KeyEvent.EVENT_KEY_TYPED:
+                    l.keyTyped(e);
+                    break;
+                default:
+                    throw new NativeWindowException("Unexpected key event type " + e.getEventType());
+            }
+        }
+    }
+
+    //
+    // WindowListener Support
+    //
+
+    private ArrayList windowListeners = new ArrayList();
+
+    public void addWindowListener(WindowListener l) {
+        if(l == null) {
+            return;
+        }
+        synchronized(windowListeners) {
+            ArrayList newWindowListeners = (ArrayList) windowListeners.clone();
+            newWindowListeners.add(l);
+            windowListeners = newWindowListeners;
+        }
+    }
+
+    public void removeWindowListener(WindowListener l) {
+        if (l == null) {
+            return;
+        }
+        synchronized(windowListeners) {
+            ArrayList newWindowListeners = (ArrayList) windowListeners.clone();
+            newWindowListeners.remove(l);
+            windowListeners = newWindowListeners;
+        }
+    }
+
+    public WindowListener[] getWindowListeners() {
+        synchronized(windowListeners) {
+            return (WindowListener[]) windowListeners.toArray();
+        }
+    }
+
+    protected void sendWindowEvent(int eventType) {
+        WindowEvent e = new WindowEvent(true, eventType, this, System.currentTimeMillis());
+        if(DEBUG_WINDOW_EVENT) {
+            System.out.println("sendWindowEvent: "+e);
+        }
+        ArrayList listeners = null;
+        synchronized(windowListeners) {
+            listeners = windowListeners;
+        }
+        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
+            WindowListener l = (WindowListener) i.next();
+            switch(eventType) {
+                case WindowEvent.EVENT_WINDOW_RESIZED:
+                    l.windowResized(e);
+                    break;
+                case WindowEvent.EVENT_WINDOW_MOVED:
+                    l.windowMoved(e);
+                    break;
+                case WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY:
+                    l.windowDestroyNotify(e);
+                    break;
+                case WindowEvent.EVENT_WINDOW_GAINED_FOCUS:
+                    l.windowGainedFocus(e);
+                    break;
+                case WindowEvent.EVENT_WINDOW_LOST_FOCUS:
+                    l.windowLostFocus(e);
+                    break;
+                default:
+                    throw 
+                        new NativeWindowException("Unexpected window event type "
+                                                  + e.getEventType());
+            }
+        }
+    }
+
+
+    //
+    // WindowListener Support
+    //
+
+    private ArrayList paintListeners = new ArrayList();
+
+    public void addPaintListener(PaintListener l) {
+        if(l == null) {
+            return;
+        }
+        synchronized(paintListeners) {
+            ArrayList newPaintListeners = (ArrayList) paintListeners.clone();
+            newPaintListeners.add(l);
+            paintListeners = newPaintListeners;
+        }
+    }
+
+    public void removePaintListener(PaintListener l) {
+        if (l == null) {
+            return;
+        }
+        synchronized(paintListeners) {
+            ArrayList newPaintListeners = (ArrayList) paintListeners.clone();
+            newPaintListeners.remove(l);
+            paintListeners = newPaintListeners;
+        }
+    }
+
+    protected void sendPaintEvent(int eventType, int x, int y, int w, int h) {
+        PaintEvent e =
+            new PaintEvent(eventType, this, System.currentTimeMillis(), x, y, w, h);
+        ArrayList listeners = null;
+        synchronized(paintListeners) {
+            listeners = paintListeners;
+        }
+        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
+            PaintListener l = (PaintListener) i.next();
+            l.exposed(e);
+        }
+    }
+
+    //
+    // Reflection helper ..
+    //
+
+    private static Class[] getCustomConstructorArgumentTypes(Class windowClass) {
+        Class[] argTypes = null;
+        try {
+            Method m = windowClass.getDeclaredMethod("getCustomConstructorArgumentTypes", new Class[] {});
+            argTypes = (Class[]) m.invoke(null, null);
+        } catch (Throwable t) {}
+        return argTypes;
+    }
+
+    private static int verifyConstructorArgumentTypes(Class[] types, Object[] args) {
+        if(types.length != args.length) {
+            return -1;
+        }
+        for(int i=0; i<args.length; i++) {
+            if(!types[i].isInstance(args[i])) {
+                return i;
+            }
+        }
+        return args.length;
+    }
+
+    private static String getArgsStrList(Object[] args) {
+        StringBuffer sb = new StringBuffer();
+        for(int i=0; i<args.length; i++) {
+            sb.append(args[i].getClass());
+            if(i<args.length) {
+                sb.append(", ");
+            }
+        }
+        return sb.toString();
+    }
+
+    private static String getTypeStrList(Class[] types) {
+        StringBuffer sb = new StringBuffer();
+        for(int i=0; i<types.length; i++) {
+            sb.append(types[i]);
+            if(i<types.length) {
+                sb.append(", ");
+            }
+        }
+        return sb.toString();
+    }
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/WindowEvent.java b/src/newt/classes/com/jogamp/javafx/newt/WindowEvent.java
new file mode 100644
index 000000000..74edfc564
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/WindowEvent.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+public class WindowEvent extends Event {
+    public static final int EVENT_WINDOW_RESIZED = 100;
+    public static final int EVENT_WINDOW_MOVED   = 101; 
+    public static final int EVENT_WINDOW_DESTROY_NOTIFY = 102;
+    public static final int EVENT_WINDOW_GAINED_FOCUS = 103;
+    public static final int EVENT_WINDOW_LOST_FOCUS = 104;
+    // public static final int EVENT_WINDOW_REPAINT = 105; // TODO
+
+    public WindowEvent(int eventType, Window source, long when) {
+        this(false, eventType, source, when);
+    }
+
+    WindowEvent(boolean isSystemEvent, int eventType, Window source, long when) {
+        super(isSystemEvent, eventType, source, when);
+    }
+
+    public static String getEventTypeString(int type) {
+        switch(type) {
+            case EVENT_WINDOW_RESIZED: return "WINDOW_RESIZED";
+            case EVENT_WINDOW_MOVED:   return "WINDOW_MOVED";
+            case EVENT_WINDOW_DESTROY_NOTIFY:   return "EVENT_WINDOW_DESTROY_NOTIFY";
+            case EVENT_WINDOW_GAINED_FOCUS:   return "EVENT_WINDOW_GAINED_FOCUS";
+            case EVENT_WINDOW_LOST_FOCUS:   return "EVENT_WINDOW_LOST_FOCUS";
+            // case EVENT_WINDOW_REPAINT:   return "EVENT_WINDOW_REPAINT";
+            default: return "unknown (" + type + ")";
+        }
+    }
+    public String toString() {
+        return "WindowEvent["+getEventTypeString(getEventType()) +
+            ", " + super.toString() + "]";
+    }
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/WindowListener.java b/src/newt/classes/com/jogamp/javafx/newt/WindowListener.java
new file mode 100644
index 000000000..c4e79781c
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/WindowListener.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt;
+
+public interface WindowListener extends EventListener {
+    public void windowResized(WindowEvent e);
+    public void windowMoved(WindowEvent e);
+    public void windowDestroyNotify(WindowEvent e);
+    public void windowGainedFocus(WindowEvent e);
+    public void windowLostFocus(WindowEvent e);
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTCanvas.java b/src/newt/classes/com/jogamp/javafx/newt/awt/AWTCanvas.java
new file mode 100644
index 000000000..fef30f385
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/awt/AWTCanvas.java
@@ -0,0 +1,264 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.awt;
+
+import com.jogamp.javafx.newt.Window;
+
+import java.awt.Canvas;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.GraphicsConfiguration;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.awt.*;
+import com.jogamp.javafx.newt.impl.Debug;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+public class AWTCanvas extends Canvas {
+  private GraphicsDevice device;
+  private GraphicsConfiguration chosen;
+  private AWTGraphicsConfiguration awtConfig;
+
+  private Capabilities capabilities;
+
+  private boolean displayConfigChanged=false;
+
+  public AWTCanvas(Capabilities capabilities) {
+    super();
+
+    if(null==capabilities) {
+        throw new NativeWindowException("Capabilities null");
+    }
+    this.capabilities=capabilities;
+  }
+
+  public AWTGraphicsConfiguration getAWTGraphicsConfiguration() {
+    return awtConfig;
+  }
+
+  public boolean hasDeviceChanged() {
+    boolean res = displayConfigChanged;
+    displayConfigChanged=false;
+    return res;
+  }
+
+  public void addNotify() {
+    super.addNotify();
+
+    disableBackgroundErase();
+
+    GraphicsConfiguration gc = super.getGraphicsConfiguration();
+    if(null!=gc) {
+        device = gc.getDevice();
+    }
+
+    /*
+     * Save the chosen capabilities for use in getGraphicsConfiguration().
+     */
+    awtConfig = chooseGraphicsConfiguration(capabilities, device);
+    if(Window.DEBUG_IMPLEMENTATION) {
+        Exception e = new Exception("Created Config: "+awtConfig);
+        e.printStackTrace();
+    }
+    if(null!=awtConfig) {
+      // update ..
+      chosen = awtConfig.getGraphicsConfiguration();
+    }
+    if(null==awtConfig) {
+          throw new NativeWindowException("Error: AWTGraphicsConfiguration is null");
+    }
+  }
+
+  /**
+   * Overridden to choose a GraphicsConfiguration on a parent container's
+   * GraphicsDevice because both devices
+   */
+  public GraphicsConfiguration getGraphicsConfiguration() {
+    /*
+     * Workaround for problems with Xinerama and java.awt.Component.checkGD
+     * when adding to a container on a different graphics device than the
+     * one that this Canvas is associated with.
+     * 
+     * GC will be null unless:
+     *   - A native peer has assigned it. This means we have a native
+     *     peer, and are already comitted to a graphics configuration.
+     *   - This canvas has been added to a component hierarchy and has
+     *     an ancestor with a non-null GC, but the native peer has not
+     *     yet been created. This means we can still choose the GC on
+     *     all platforms since the peer hasn't been created.
+     */
+    final GraphicsConfiguration gc = super.getGraphicsConfiguration();
+    /*
+     * chosen is only non-null on platforms where the GLDrawableFactory
+     * returns a non-null GraphicsConfiguration (in the GLCanvas
+     * constructor).
+     * 
+     * if gc is from this Canvas' native peer then it should equal chosen,
+     * otherwise it is from an ancestor component that this Canvas is being
+     * added to, and we go into this block.
+     */
+    if (gc != null && chosen != null && !chosen.equals(gc)) {
+      /*
+       * Check for compatibility with gc. If they differ by only the
+       * device then return a new GCconfig with the super-class' GDevice
+       * (and presumably the same visual ID in Xinerama).
+       * 
+       */
+      if (!chosen.getDevice().getIDstring().equals(gc.getDevice().getIDstring())) {
+        /*
+         * Here we select a GraphicsConfiguration on the alternate
+         * device that is presumably identical to the chosen
+         * configuration, but on the other device.
+         * 
+         * Should really check to ensure that we select a configuration
+         * with the same X visual ID for Xinerama screens, otherwise the
+         * GLDrawable may have the wrong visual ID (I don't think this
+         * ever gets updated). May need to add a method to
+         * X11GLDrawableFactory to do this in a platform specific
+         * manner.
+         * 
+         * However, on platforms where we can actually get into this
+         * block, both devices should have the same visual list, and the
+         * same configuration should be selected here.
+         */
+        AWTGraphicsConfiguration config = chooseGraphicsConfiguration((Capabilities)awtConfig.getRequestedCapabilities(), gc.getDevice());
+        final GraphicsConfiguration compatible = (null!=config)?config.getGraphicsConfiguration():null;
+        if(Window.DEBUG_IMPLEMENTATION) {
+            Exception e = new Exception("Call Stack: "+Thread.currentThread().getName());
+            e.printStackTrace();
+            System.err.println("!!! Created Config (n): HAVE    GC "+chosen);
+            System.err.println("!!! Created Config (n): THIS    GC "+gc);
+            System.err.println("!!! Created Config (n): Choosen GC "+compatible);
+            System.err.println("!!! Created Config (n): HAVE    CF "+awtConfig);
+            System.err.println("!!! Created Config (n): Choosen CF "+config);
+            System.err.println("!!! Created Config (n): EQUALS CAPS "+config.getChosenCapabilities().equals(awtConfig.getChosenCapabilities()));
+        }
+
+        if (compatible != null) {
+          /*
+           * Save the new GC for equals test above, and to return to
+           * any outside callers of this method.
+           */
+          chosen = compatible;
+          if( !config.getChosenCapabilities().equals(awtConfig.getChosenCapabilities())) {
+              displayConfigChanged=true;
+          } 
+          awtConfig = config;
+        }
+      }
+
+      /*
+       * If a compatible GC was not found in the block above, this will
+       * return the GC that was selected in the constructor (and might
+       * cause an exception in Component.checkGD when adding to a
+       * container, but in this case that would be the desired behavior).
+       * 
+       */
+      return chosen;
+    } else if (gc == null) {
+      /*
+       * The GC is null, which means we have no native peer, and are not
+       * part of a (realized) component hierarchy. So we return the
+       * desired visual that was selected in the constructor (possibly
+       * null).
+       */
+      return chosen;
+    }
+
+    /*
+     * Otherwise we have not explicitly selected a GC in the constructor, so
+     * just return what Canvas would have.
+     */
+    return gc;
+  }
+
+  private static AWTGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
+                                                                      GraphicsDevice device) {
+    AbstractGraphicsScreen aScreen = AWTGraphicsScreen.createScreenDevice(device);
+    AWTGraphicsConfiguration config = (AWTGraphicsConfiguration)
+      GraphicsConfigurationFactory.getFactory(AWTGraphicsDevice.class).chooseGraphicsConfiguration(capabilities,
+                                                                                                   null,
+                                                                                                   aScreen);
+    if (config == null) {
+      throw new NativeWindowException("Error: Couldn't fetch AWTGraphicsConfiguration");
+    }
+
+    return config;
+  }
+
+  // Disables the AWT's erasing of this Canvas's background on Windows
+  // in Java SE 6. This internal API is not available in previous
+  // releases, but the system property
+  // -Dsun.awt.noerasebackground=true can be specified to get similar
+  // results globally in previous releases.
+  private static boolean disableBackgroundEraseInitialized;
+  private static Method  disableBackgroundEraseMethod;
+  private void disableBackgroundErase() {
+    if (!disableBackgroundEraseInitialized) {
+      try {
+        AccessController.doPrivileged(new PrivilegedAction() {
+            public Object run() {
+              try {
+                Class clazz = getToolkit().getClass();
+                while (clazz != null && disableBackgroundEraseMethod == null) {
+                  try {
+                    disableBackgroundEraseMethod =
+                      clazz.getDeclaredMethod("disableBackgroundErase",
+                                              new Class[] { Canvas.class });
+                    disableBackgroundEraseMethod.setAccessible(true);
+                  } catch (Exception e) {
+                    clazz = clazz.getSuperclass();
+                  }
+                }
+              } catch (Exception e) {
+              }
+              return null;
+            }
+          });
+      } catch (Exception e) {
+      }
+      disableBackgroundEraseInitialized = true;
+    }
+    if (disableBackgroundEraseMethod != null) {
+      try {
+        disableBackgroundEraseMethod.invoke(getToolkit(), new Object[] { this });
+      } catch (Exception e) {
+        // FIXME: workaround for 6504460 (incorrect backport of 6333613 in 5.0u10)
+        // throw new GLException(e);
+      }
+    }
+  }
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTDisplay.java b/src/newt/classes/com/jogamp/javafx/newt/awt/AWTDisplay.java
new file mode 100644
index 000000000..be36df2a4
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/awt/AWTDisplay.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.awt;
+
+import java.awt.event.*;
+import com.jogamp.javafx.newt.Display;
+import com.jogamp.javafx.newt.Window;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.awt.*;
+import java.util.*;
+
+public class AWTDisplay extends Display {
+    public AWTDisplay() {
+    }
+
+    protected void createNative() {
+        aDevice = (AWTGraphicsDevice) AWTGraphicsDevice.createDevice(null); // default 
+    }
+
+    protected void setAWTGraphicsDevice(AWTGraphicsDevice d) {
+        aDevice = d;
+    }
+
+    protected void closeNative() { }
+
+    public void dispatchMessages() {
+        AWTEventWrapper w;
+        do {
+            synchronized(this) {
+                if (!events.isEmpty()) {
+                    w = (AWTEventWrapper) events.removeFirst();
+                } else {
+                    w = null;
+                }
+            }
+            if (w != null) {
+                switch (w.getType()) {
+                    case com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_RESIZED:
+                    case com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_MOVED:
+                    case com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY:
+                        w.getWindow().sendWindowEvent(w.getType());
+                        break;
+
+                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_CLICKED:
+                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_ENTERED:
+                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_EXITED:
+                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_PRESSED:
+                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_RELEASED:
+                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_MOVED:
+                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_DRAGGED:
+                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_WHEEL_MOVED:
+                        {
+                            MouseEvent e = (MouseEvent) w.getEvent();
+                            int rotation = 0;
+                            if (e instanceof MouseWheelEvent) {
+                                rotation = ((MouseWheelEvent)e).getWheelRotation();
+                            }
+                            w.getWindow().sendMouseEvent(w.getType(), convertModifiers(e),
+                                                         e.getX(), e.getY(), convertButton(e),
+                                                         rotation);
+                        }
+                        break;
+
+                    case com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_PRESSED:
+                    case com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_RELEASED:
+                    case com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_TYPED:
+                        {
+                            KeyEvent e = (KeyEvent) w.getEvent();
+                            w.getWindow().sendKeyEvent(w.getType(), convertModifiers(e),
+                                                       e.getKeyCode(), e.getKeyChar());
+                        }
+                        break;
+
+                    default:
+                        throw new NativeWindowException("Unknown event type " + w.getType());
+                }
+                if(Window.DEBUG_MOUSE_EVENT) {
+                    System.out.println("dispatchMessages: "+w.getWindow()+" in event:"+w.getEvent());
+                }
+            }
+        } while (w != null);
+    }
+
+    protected void enqueueEvent(AWTWindow w, int type, InputEvent e) {
+        AWTEventWrapper wrapper = new AWTEventWrapper(w, type, e);
+        synchronized(this) {
+            events.add(wrapper);
+        }
+    }
+
+    private LinkedList/*<AWTEventWrapper>*/ events = new LinkedList();
+
+    static class AWTEventWrapper {
+        AWTWindow window;
+        int type;
+        InputEvent e;
+
+        AWTEventWrapper(AWTWindow w, int type, InputEvent e) {
+            this.window = w;
+            this.type = type;
+            this.e = e;
+        }
+
+        public AWTWindow getWindow() {
+            return window;
+        }
+
+        public int getType() {
+            return type;
+        }
+
+        public InputEvent getEvent() {
+            return e;
+        }
+    }
+
+    private static int convertModifiers(InputEvent e) {
+        int newtMods = 0;
+        int mods = e.getModifiers();
+        if ((mods & InputEvent.SHIFT_MASK) != 0)     newtMods |= com.jogamp.javafx.newt.InputEvent.SHIFT_MASK;
+        if ((mods & InputEvent.CTRL_MASK) != 0)      newtMods |= com.jogamp.javafx.newt.InputEvent.CTRL_MASK;
+        if ((mods & InputEvent.META_MASK) != 0)      newtMods |= com.jogamp.javafx.newt.InputEvent.META_MASK;
+        if ((mods & InputEvent.ALT_MASK) != 0)       newtMods |= com.jogamp.javafx.newt.InputEvent.ALT_MASK;
+        if ((mods & InputEvent.ALT_GRAPH_MASK) != 0) newtMods |= com.jogamp.javafx.newt.InputEvent.ALT_GRAPH_MASK;
+        return newtMods;
+    }
+
+    private static int convertButton(MouseEvent e) {
+        switch (e.getButton()) {
+            case MouseEvent.BUTTON1: return com.jogamp.javafx.newt.MouseEvent.BUTTON1;
+            case MouseEvent.BUTTON2: return com.jogamp.javafx.newt.MouseEvent.BUTTON2;
+            case MouseEvent.BUTTON3: return com.jogamp.javafx.newt.MouseEvent.BUTTON3;
+        }
+        return 0;
+    }
+
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTScreen.java b/src/newt/classes/com/jogamp/javafx/newt/awt/AWTScreen.java
new file mode 100644
index 000000000..00da66078
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/awt/AWTScreen.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.awt;
+
+import com.jogamp.javafx.newt.*;
+import java.awt.DisplayMode;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.awt.*;
+
+public class AWTScreen extends Screen {
+    public AWTScreen() {
+    }
+
+    protected void createNative(int index) {
+        aScreen = new AWTGraphicsScreen((AWTGraphicsDevice)display.getGraphicsDevice());
+        
+        DisplayMode mode = ((AWTGraphicsDevice)getDisplay().getGraphicsDevice()).getGraphicsDevice().getDisplayMode();
+        int w = mode.getWidth();
+        int h = mode.getHeight();
+        setScreenSize(w, h);
+    }
+
+    protected void setAWTGraphicsScreen(AWTGraphicsScreen s) {
+        aScreen = s;
+    }
+
+    // done by AWTWindow ..
+    protected void setScreenSize(int w, int h) {
+        super.setScreenSize(w, h);
+    }
+
+    protected void closeNative() { }
+
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTWindow.java b/src/newt/classes/com/jogamp/javafx/newt/awt/AWTWindow.java
new file mode 100644
index 000000000..a0c2b6a89
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/awt/AWTWindow.java
@@ -0,0 +1,429 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.awt;
+
+import java.awt.BorderLayout;
+import java.awt.Canvas;
+import java.awt.Container;
+import java.awt.DisplayMode;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.awt.event.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.*;
+import com.jogamp.javafx.newt.Window;
+import java.awt.Insets;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.awt.*;
+
+/** An implementation of the Newt Window class built using the
+    AWT. This is provided for convenience of porting to platforms
+    supporting Java SE. */
+
+public class AWTWindow extends Window {
+
+    public AWTWindow() {
+        this(null);
+    }
+
+    public static Class[] getCustomConstructorArgumentTypes() {
+        return new Class[] { Container.class } ;
+    }
+
+    public AWTWindow(Container container) {
+        super();
+        title = "AWT NewtWindow";
+        this.container = container;
+        if(container instanceof Frame) {
+            frame = (Frame) container;
+        }
+    }
+
+    private boolean owningFrame;
+    private Container container = null;
+    private Frame frame = null; // same instance as container, just for impl. convenience
+    private AWTCanvas canvas;
+    // non fullscreen dimensions ..
+    private int nfs_width, nfs_height, nfs_x, nfs_y;
+
+    public void setTitle(final String title) {
+        super.setTitle(title);
+        runOnEDT(true, new Runnable() {
+                public void run() {
+                    if (frame != null) {
+                        frame.setTitle(title);
+                    }
+                }
+            });
+    }
+
+    protected void createNative(long parentWindowHandle, final Capabilities caps) {
+
+        if(0!=parentWindowHandle) {
+            throw new RuntimeException("Window parenting not supported in AWT, use AWTWindow(Frame) cstr for wrapping instead");
+        }
+
+        final AWTWindow awtWindow = this;
+
+        runOnEDT(true, new Runnable() {
+                public void run() {
+                    if(null==container) {
+                        frame = new Frame();
+                        container = frame;
+                        owningFrame=true;
+                    } else {
+                        owningFrame=false;
+                        width = container.getWidth();
+                        height = container.getHeight();
+                        x = container.getX();
+                        y = container.getY();
+                    }
+                    if(null!=frame) {
+                        frame.setTitle(getTitle());
+                    }
+                    container.setLayout(new BorderLayout());
+                    canvas = new AWTCanvas(caps);
+                    Listener listener = new Listener(awtWindow);
+                    canvas.addMouseListener(listener);
+                    canvas.addMouseMotionListener(listener);
+                    canvas.addKeyListener(listener);
+                    canvas.addComponentListener(listener);
+                    container.add(canvas, BorderLayout.CENTER);
+                    container.setSize(width, height);
+                    container.setLocation(x, y);
+                    container.addComponentListener(new MoveListener(awtWindow));
+                    if(null!=frame) {
+                        frame.setUndecorated(undecorated||fullscreen);
+                        frame.addWindowListener(new WindowEventListener(awtWindow));
+                    }
+                }
+            });
+    }
+
+    protected void closeNative() {
+        runOnEDT(true, new Runnable() {
+                public void run() {
+                    if(owningFrame && null!=frame) {
+                        frame.dispose();
+                        owningFrame=false;
+                    }
+                    frame = null;
+                }
+            });
+    }
+
+    public boolean hasDeviceChanged() {
+        boolean res = canvas.hasDeviceChanged();
+        if(res) {
+            config = canvas.getAWTGraphicsConfiguration();
+            if (config == null) {
+                throw new NativeWindowException("Error Device change null GraphicsConfiguration: "+this);
+            }
+            updateDeviceData();
+        }
+        return res;
+    }
+
+    public void setVisible(final boolean visible) {
+        runOnEDT(true, new Runnable() {
+                public void run() {
+                    container.setVisible(visible);
+                }
+            });
+
+        config = canvas.getAWTGraphicsConfiguration();
+
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+
+        updateDeviceData();
+    }
+
+    private void updateDeviceData() {
+        // propagate new info ..
+        ((AWTScreen)getScreen()).setAWTGraphicsScreen((AWTGraphicsScreen)config.getScreen());
+        ((AWTDisplay)getScreen().getDisplay()).setAWTGraphicsDevice((AWTGraphicsDevice)config.getScreen().getDevice());
+
+        DisplayMode mode = ((AWTGraphicsDevice)config.getScreen().getDevice()).getGraphicsDevice().getDisplayMode();
+        int w = mode.getWidth();
+        int h = mode.getHeight();
+        ((AWTScreen)screen).setScreenSize(w, h);
+    }
+
+    public void setSize(final int width, final int height) {
+        this.width = width;
+        this.height = height;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        }
+        /** An AWT event on setSize() would bring us in a deadlock situation, hence invokeLater() */
+        runOnEDT(false, new Runnable() {
+                public void run() {
+                    Insets insets = container.getInsets();
+                    container.setSize(width + insets.left + insets.right,
+                                      height + insets.top + insets.bottom);
+                }
+            });
+    }
+
+    public com.jogamp.javafx.newt.Insets getInsets() {
+        final int insets[] = new int[] { 0, 0, 0, 0 };
+        runOnEDT(true, new Runnable() {
+                public void run() {
+                    Insets contInsets = container.getInsets();
+                    insets[0] = contInsets.top;
+                    insets[1] = contInsets.left;
+                    insets[2] = contInsets.bottom;
+                    insets[3] = contInsets.right;
+                }
+            });
+        return new com.jogamp.javafx.newt.
+            Insets(insets[0],insets[1],insets[2],insets[3]);
+    }
+
+    public void setPosition(final int x, final int y) {
+        this.x = x;
+        this.y = y;
+        if(!fullscreen) {
+            nfs_x=x;
+            nfs_y=y;
+        }
+        runOnEDT(true, new Runnable() {
+                public void run() {
+                    container.setLocation(x, y);
+                }
+            });
+    }
+
+    public boolean setFullscreen(final boolean fullscreen) {
+        if(this.fullscreen!=fullscreen) {
+            final int x,y,w,h;
+            this.fullscreen=fullscreen;
+            if(fullscreen) {
+                x = 0; y = 0;
+                w = screen.getWidth();
+                h = screen.getHeight();
+            } else {
+                x = nfs_x;
+                y = nfs_y;
+                w = nfs_width;
+                h = nfs_height;
+            }
+            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                System.err.println("AWTWindow fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
+            }
+            /** An AWT event on setSize() would bring us in a deadlock situation, hence invokeLater() */
+            runOnEDT(false, new Runnable() {
+                    public void run() {
+                        if(null!=frame) {
+                            if(!container.isDisplayable()) {
+                                frame.setUndecorated(undecorated||fullscreen);
+                            } else {
+                                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                                    System.err.println("AWTWindow can't undecorate already created frame");
+                                }
+                            }
+                        }
+                        container.setLocation(x, y);
+                        container.setSize(w, h);
+                    }
+                });
+        }
+        return true;
+    }
+
+    public Object getWrappedWindow() {
+        return canvas;
+    }
+
+    protected void sendWindowEvent(int eventType) {
+        super.sendWindowEvent(eventType);
+    }
+
+    protected void sendKeyEvent(int eventType, int modifiers, int keyCode, char keyChar) {
+        super.sendKeyEvent(eventType, modifiers, keyCode, keyChar);
+    }
+
+    protected void sendMouseEvent(int eventType, int modifiers,
+                                  int x, int y, int button, int rotation) {
+        super.sendMouseEvent(eventType, modifiers, x, y, button, rotation);
+    }
+
+    private static void runOnEDT(boolean wait, Runnable r) {
+        if (EventQueue.isDispatchThread()) {
+            r.run();
+        } else {
+            try {
+                if(wait) {
+                    EventQueue.invokeAndWait(r);
+                } else {
+                    EventQueue.invokeLater(r);
+                }
+            } catch (Exception e) {
+                throw new NativeWindowException(e);
+            }
+        }
+    }
+
+    private static final int WINDOW_EVENT = 1;
+    private static final int KEY_EVENT = 2;
+    private static final int MOUSE_EVENT = 3;
+
+    class MoveListener implements ComponentListener {
+        private AWTWindow window;
+        private AWTDisplay display;
+
+        public MoveListener(AWTWindow w) {
+            window = w;
+            display = (AWTDisplay)window.getScreen().getDisplay();
+        }
+
+        public void componentResized(ComponentEvent e) {
+        }
+
+        public void componentMoved(ComponentEvent e) {
+            if(null!=container) {
+                x = container.getX();
+                y = container.getY();
+            }
+            display.enqueueEvent(window, com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_MOVED, null);
+        }
+
+        public void componentShown(ComponentEvent e) {
+        }
+
+        public void componentHidden(ComponentEvent e) {
+        }
+
+    }
+
+    class Listener implements ComponentListener, MouseListener, MouseMotionListener, KeyListener {
+        private AWTWindow window;
+        private AWTDisplay display;
+
+        public Listener(AWTWindow w) {
+            window = w;
+            display = (AWTDisplay)window.getScreen().getDisplay();
+        }
+
+        public void componentResized(ComponentEvent e) {
+            width = canvas.getWidth();
+            height = canvas.getHeight();
+            display.enqueueEvent(window, com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_RESIZED, null);
+        }
+
+        public void componentMoved(ComponentEvent e) {
+        }
+
+        public void componentShown(ComponentEvent e) {
+        }
+
+        public void componentHidden(ComponentEvent e) {
+        }
+
+        public void mouseClicked(MouseEvent e) {
+            // We ignore these as we synthesize them ourselves out of
+            // mouse pressed and released events
+        }
+
+        public void mouseEntered(MouseEvent e) {
+            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_ENTERED, e);
+        }
+
+        public void mouseExited(MouseEvent e) {
+            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_EXITED, e);
+        }
+
+        public void mousePressed(MouseEvent e) {
+            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_PRESSED, e);
+        }
+
+        public void mouseReleased(MouseEvent e) {
+            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_RELEASED, e);
+        }
+
+        public void mouseMoved(MouseEvent e) {
+            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_MOVED, e);
+        }
+
+        public void mouseDragged(MouseEvent e) {
+            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_DRAGGED, e);
+        }
+
+        public void keyPressed(KeyEvent e) {
+            display.enqueueEvent(window, com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_PRESSED, e);
+        }
+
+        public void keyReleased(KeyEvent e) {
+            display.enqueueEvent(window, com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_RELEASED, e);
+        }
+
+        public void keyTyped(KeyEvent e)  {
+            display.enqueueEvent(window, com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_TYPED, e);
+        }
+    }
+
+    class WindowEventListener implements WindowListener {
+        private AWTWindow window;
+        private AWTDisplay display;
+
+        public WindowEventListener(AWTWindow w) {
+            window = w;
+            display = (AWTDisplay)window.getScreen().getDisplay();
+        }
+
+        public void windowActivated(WindowEvent e) {
+        }
+        public void windowClosed(WindowEvent e) {
+        }
+        public void windowClosing(WindowEvent e) {
+            display.enqueueEvent(window, com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY, null);
+        }
+        public void windowDeactivated(WindowEvent e) {
+        }
+        public void windowDeiconified(WindowEvent e) {
+        }
+        public void windowIconified(WindowEvent e) {
+        }
+        public void windowOpened(WindowEvent e) {
+        }
+    }
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/impl/Debug.java b/src/newt/classes/com/jogamp/javafx/newt/impl/Debug.java
new file mode 100644
index 000000000..bbabe72df
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/impl/Debug.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.javafx.newt.impl;
+
+import java.security.*;
+
+/** Helper routines for logging and debugging. */
+
+public class Debug {
+  // Some common properties
+  private static boolean verbose;
+  private static boolean debugAll;
+  private static AccessControlContext localACC;
+  
+  static {
+    localACC=AccessController.getContext();
+    verbose = isPropertyDefined("newt.verbose", true);
+    debugAll = isPropertyDefined("newt.debug", true);
+    if (verbose) {
+       Package p = Package.getPackage("com.jogamp.javafx.newt");
+       System.err.println("NEWT specification version " + p.getSpecificationVersion());
+       System.err.println("NEWT implementation version " + p.getImplementationVersion());
+       System.err.println("NEWT implementation vendor " + p.getImplementationVendor());
+    }
+  }
+
+  static int getIntProperty(final String property, final boolean jnlpAlias) {
+      return getIntProperty(property, jnlpAlias, localACC);
+  }
+
+  public static int getIntProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    int i=0;
+    try {
+        Integer iv = Integer.valueOf(Debug.getProperty(property, jnlpAlias, acc));
+        i = iv.intValue();
+    } catch (NumberFormatException nfe) {}
+    return i;
+  }
+
+  static boolean getBooleanProperty(final String property, final boolean jnlpAlias) {
+    return getBooleanProperty(property, jnlpAlias, localACC);
+  }
+
+  public static boolean getBooleanProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    Boolean b = Boolean.valueOf(Debug.getProperty(property, jnlpAlias, acc));
+    return b.booleanValue();
+  }
+
+  static boolean isPropertyDefined(final String property, final boolean jnlpAlias) {
+    return isPropertyDefined(property, jnlpAlias, localACC);
+  }
+
+  public static boolean isPropertyDefined(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    return (Debug.getProperty(property, jnlpAlias, acc) != null) ? true : false;
+  }
+
+  static String getProperty(final String property, final boolean jnlpAlias) {
+    return getProperty(property, jnlpAlias, localACC);
+  }
+
+  public static String getProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    String s=null;
+    if(null!=acc && acc.equals(localACC)) {
+        s = (String) AccessController.doPrivileged(new PrivilegedAction() {
+            public Object run() {
+              String val=null;
+              try {
+                  val = System.getProperty(property);
+              } catch (Exception e) {}
+              if(null==val && jnlpAlias && !property.startsWith(jnlp_prefix)) {
+                  try {
+                      val = System.getProperty(jnlp_prefix + property);
+                  } catch (Exception e) {}
+              }
+              return val;
+            }
+          });
+    } else {
+        try {
+            s = System.getProperty(property);
+        } catch (Exception e) {}
+        if(null==s && jnlpAlias && !property.startsWith(jnlp_prefix)) {
+            try {
+                s = System.getProperty(jnlp_prefix + property);
+            } catch (Exception e) {}
+        }
+    }
+    return s;
+  }
+  public static final String jnlp_prefix = "jnlp." ;
+
+  public static boolean verbose() {
+    return verbose;
+  }
+
+  public static boolean debugAll() {
+    return debugAll;
+  }
+
+  public static boolean debug(String subcomponent) {
+    return debugAll() || isPropertyDefined("newt.debug." + subcomponent, true);
+  }
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/impl/NativeLibLoader.java b/src/newt/classes/com/jogamp/javafx/newt/impl/NativeLibLoader.java
new file mode 100644
index 000000000..9bbfc5921
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/impl/NativeLibLoader.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.javafx.newt.impl;
+
+// FIXME: refactor Java SE dependencies
+//import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.HashSet;
+import com.jogamp.nativewindow.impl.NativeLibLoaderBase;
+
+public class NativeLibLoader extends NativeLibLoaderBase {
+  
+  public static void loadNEWT() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("newt", null, true);
+        return null;
+      }
+    });
+  }
+
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Display.java b/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Display.java
new file mode 100644
index 000000000..3198c7511
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Display.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.intel.gdl;
+
+import com.jogamp.javafx.newt.impl.*;
+import javax.media.nativewindow.*;
+
+public class Display extends com.jogamp.javafx.newt.Display {
+    static int initCounter = 0;
+
+    static {
+        NativeLibLoader.loadNEWT();
+
+        if (!Screen.initIDs()) {
+            throw new NativeWindowException("Failed to initialize GDL Screen jmethodIDs");
+        }
+        if (!Window.initIDs()) {
+            throw new NativeWindowException("Failed to initialize GDL Window jmethodIDs");
+        }
+    }
+
+    public static void initSingleton() {
+        // just exist to ensure static init has been run
+    }
+
+
+    public Display() {
+    }
+
+    protected void createNative() {
+        synchronized(Display.class) {
+            if(0==initCounter) {
+                displayHandle = CreateDisplay();
+                if(0==displayHandle) {
+                    throw new NativeWindowException("Couldn't initialize GDL Display");
+                }
+            }
+            initCounter++;
+        }
+        aDevice = new DefaultGraphicsDevice(NativeWindowFactory.TYPE_DEFAULT, displayHandle);
+    }
+
+    protected void closeNative() {
+        if(0==displayHandle) {
+            throw new NativeWindowException("displayHandle null; initCnt "+initCounter);
+        }
+        synchronized(Display.class) {
+            if(initCounter>0) {
+                initCounter--;
+                if(0==initCounter) {
+                    DestroyDisplay(displayHandle);
+                }
+            }
+        }
+    }
+
+    protected void dispatchMessages() {
+        if(0!=displayHandle) {
+            DispatchMessages(displayHandle, focusedWindow);
+        }
+    }
+
+    protected void setFocus(Window focus) {
+        focusedWindow = focus;
+    }
+
+    private long displayHandle = 0;
+    private Window focusedWindow = null;
+    private native long CreateDisplay();
+    private native void DestroyDisplay(long displayHandle);
+    private native void DispatchMessages(long displayHandle, Window focusedWindow);
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Screen.java b/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Screen.java
new file mode 100644
index 000000000..a09b1e790
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Screen.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.intel.gdl;
+
+import com.jogamp.javafx.newt.impl.*;
+import javax.media.nativewindow.*;
+
+public class Screen extends com.jogamp.javafx.newt.Screen {
+
+    static {
+        Display.initSingleton();
+    }
+
+    public Screen() {
+    }
+
+    protected void createNative(int index) {
+        AbstractGraphicsDevice adevice = getDisplay().getGraphicsDevice();
+        GetScreenInfo(adevice.getHandle(), index);
+        aScreen = new DefaultGraphicsScreen(adevice, index);
+    }
+
+    protected void closeNative() { }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    protected static native boolean initIDs();
+    private          native void GetScreenInfo(long displayHandle, int screen_idx);
+
+    // called by GetScreenInfo() ..
+    private void screenCreated(int width, int height) {
+        setScreenSize(width, height);
+    }
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Window.java b/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Window.java
new file mode 100644
index 000000000..28ffa1296
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Window.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.intel.gdl;
+
+import javax.media.nativewindow.*;
+
+public class Window extends com.jogamp.javafx.newt.Window {
+    static {
+        Display.initSingleton();
+    }
+
+    public Window() {
+    }
+
+    static long nextWindowHandle = 1;
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        if(0!=parentWindowHandle) {
+            throw new NativeWindowException("GDL Window does not support window parenting");
+        }
+        AbstractGraphicsScreen aScreen = screen.getGraphicsScreen();
+        AbstractGraphicsDevice aDevice = screen.getDisplay().getGraphicsDevice();
+
+        config = GraphicsConfigurationFactory.getFactory(aDevice).chooseGraphicsConfiguration(caps, null, aScreen);
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+
+        synchronized(Window.class) {
+            windowHandle = nextWindowHandle++;
+        }
+    }
+
+    protected void closeNative() {
+        if(0!=surfaceHandle) {
+            synchronized(Window.class) {
+                CloseSurface(getDisplayHandle(), surfaceHandle);
+            }
+            surfaceHandle = 0;
+            ((Display)screen.getDisplay()).setFocus(null);
+        }
+    }
+
+    public void setVisible(boolean visible) {
+        if(this.visible!=visible) {
+            this.visible=visible;
+            if(visible && 0==surfaceHandle) {
+                synchronized(Window.class) {
+                    AbstractGraphicsDevice aDevice = screen.getDisplay().getGraphicsDevice();
+                    surfaceHandle = CreateSurface(aDevice.getHandle(), screen.getWidth(), screen.getHeight(), x, y, width, height);
+                }
+                if (surfaceHandle == 0) {
+                    throw new NativeWindowException("Error creating window");
+                }
+                ((Display)screen.getDisplay()).setFocus(this);
+            }
+        }
+    }
+
+    public void setSize(int width, int height) {
+        Screen  screen = (Screen) getScreen();
+        if((x+width)>screen.getWidth()) {
+            width=screen.getWidth()-x;
+        }
+        if((y+height)>screen.getHeight()) {
+            height=screen.getHeight()-y;
+        }
+        this.width = width;
+        this.height = height;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        }
+        if(0!=surfaceHandle) {
+            SetBounds0(surfaceHandle, screen.getWidth(), screen.getHeight(), x, y, width, height);
+        }
+    }
+
+    public void setPosition(int x, int y) {
+        Screen  screen = (Screen) getScreen();
+        if((x+width)>screen.getWidth()) {
+            x=screen.getWidth()-width;
+        }
+        if((y+height)>screen.getHeight()) {
+            y=screen.getHeight()-height;
+        }
+        this.x = x;
+        this.y = y;
+        if(!fullscreen) {
+            nfs_x=x;
+            nfs_y=y;
+        }
+        if(0!=surfaceHandle) {
+            SetBounds0(surfaceHandle, screen.getWidth(), screen.getHeight(), x, y, width, height);
+        }
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        if(this.fullscreen!=fullscreen) {
+            int x,y,w,h;
+            this.fullscreen=fullscreen;
+            if(fullscreen) {
+                x = 0; y = 0;
+                w = screen.getWidth();
+                h = screen.getHeight();
+            } else {
+                x = nfs_x;
+                y = nfs_y;
+                w = nfs_width;
+                h = nfs_height;
+            }
+            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                System.err.println("IntelGDL Window fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
+            }
+            if(0!=surfaceHandle) {
+                SetBounds0(surfaceHandle, screen.getWidth(), screen.getHeight(), x, y, w, h);
+            }
+        }
+        return fullscreen;
+    }
+
+    public void requestFocus() {
+        ((Display)screen.getDisplay()).setFocus(this);
+    }
+
+    public long getSurfaceHandle() {
+        return surfaceHandle;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    protected static native boolean initIDs();
+    private        native long CreateSurface(long displayHandle, int scrn_width, int scrn_height, int x, int y, int width, int height);
+    private        native void CloseSurface(long displayHandle, long surfaceHandle);
+    private        native void SetBounds0(long surfaceHandle, int scrn_width, int scrn_height, int x, int y, int width, int height);
+
+    private void updateBounds(int x, int y, int width, int height) {
+        this.x = x;
+        this.y = y;
+        this.width = width;
+        this.height = height;
+    }
+
+    private long   surfaceHandle;
+    private int nfs_width, nfs_height, nfs_x, nfs_y;
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacDisplay.java b/src/newt/classes/com/jogamp/javafx/newt/macosx/MacDisplay.java
new file mode 100755
index 000000000..4d78358d7
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/macosx/MacDisplay.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.macosx;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.macosx.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.javafx.newt.util.MainThread;
+
+public class MacDisplay extends Display {
+    static {
+        NativeLibLoader.loadNEWT();
+
+        if(!initNSApplication()) {
+            throw new NativeWindowException("Failed to initialize native Application hook");
+        }
+        if(!MacWindow.initIDs()) {
+            throw new NativeWindowException("Failed to initialize jmethodIDs");
+        }
+        if(DEBUG) System.out.println("MacDisplay.init App and IDs OK "+Thread.currentThread().getName());
+    }
+
+    public static void initSingleton() {
+        // just exist to ensure static init has been run
+    }
+    
+    public MacDisplay() {
+    }
+
+    class DispatchAction implements Runnable {
+        public void run() {
+            dispatchMessages0();
+        }
+    }
+    private DispatchAction dispatchAction = new DispatchAction();
+
+    public void dispatchMessages() {
+        MainThread.invoke(false, dispatchAction);
+    }
+    
+    protected void createNative() {
+        aDevice = new MacOSXGraphicsDevice();
+    }
+
+    protected void closeNative() { }
+
+    private static native boolean initNSApplication();
+    protected native void dispatchMessages0();
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacScreen.java b/src/newt/classes/com/jogamp/javafx/newt/macosx/MacScreen.java
new file mode 100755
index 000000000..8d0be80dc
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/macosx/MacScreen.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.macosx;
+
+import com.jogamp.javafx.newt.*;
+import javax.media.nativewindow.*;
+
+public class MacScreen extends Screen {
+    static {
+        MacDisplay.initSingleton();
+    }
+
+    public MacScreen() {
+    }
+
+    protected void createNative(int index) {
+        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
+        setScreenSize(getWidthImpl(getIndex()), getHeightImpl(getIndex()));
+    }
+
+    protected void closeNative() { }
+
+    private static native int getWidthImpl(int scrn_idx);
+    private static native int getHeightImpl(int scrn_idx);
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacWindow.java b/src/newt/classes/com/jogamp/javafx/newt/macosx/MacWindow.java
new file mode 100755
index 000000000..f1698bfcd
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/macosx/MacWindow.java
@@ -0,0 +1,600 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.macosx;
+
+import javax.media.nativewindow.*;
+
+import com.jogamp.javafx.newt.util.MainThread;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.impl.*;
+
+public class MacWindow extends Window {
+    
+    // Window styles
+    private static final int NSBorderlessWindowMask     = 0;
+    private static final int NSTitledWindowMask         = 1 << 0;
+    private static final int NSClosableWindowMask       = 1 << 1;
+    private static final int NSMiniaturizableWindowMask = 1 << 2;
+    private static final int NSResizableWindowMask      = 1 << 3;
+
+    // Window backing store types
+    private static final int NSBackingStoreRetained     = 0;
+    private static final int NSBackingStoreNonretained  = 1;
+    private static final int NSBackingStoreBuffered     = 2;
+
+    // Key constants handled differently on Mac OS X than other platforms
+    private static final int NSUpArrowFunctionKey        = 0xF700;
+    private static final int NSDownArrowFunctionKey      = 0xF701;
+    private static final int NSLeftArrowFunctionKey      = 0xF702;
+    private static final int NSRightArrowFunctionKey     = 0xF703;
+    private static final int NSF1FunctionKey             = 0xF704;
+    private static final int NSF2FunctionKey             = 0xF705;
+    private static final int NSF3FunctionKey             = 0xF706;
+    private static final int NSF4FunctionKey             = 0xF707;
+    private static final int NSF5FunctionKey             = 0xF708;
+    private static final int NSF6FunctionKey             = 0xF709;
+    private static final int NSF7FunctionKey             = 0xF70A;
+    private static final int NSF8FunctionKey             = 0xF70B;
+    private static final int NSF9FunctionKey             = 0xF70C;
+    private static final int NSF10FunctionKey            = 0xF70D;
+    private static final int NSF11FunctionKey            = 0xF70E;
+    private static final int NSF12FunctionKey            = 0xF70F;
+    private static final int NSF13FunctionKey            = 0xF710;
+    private static final int NSF14FunctionKey            = 0xF711;
+    private static final int NSF15FunctionKey            = 0xF712;
+    private static final int NSF16FunctionKey            = 0xF713;
+    private static final int NSF17FunctionKey            = 0xF714;
+    private static final int NSF18FunctionKey            = 0xF715;
+    private static final int NSF19FunctionKey            = 0xF716;
+    private static final int NSF20FunctionKey            = 0xF717;
+    private static final int NSF21FunctionKey            = 0xF718;
+    private static final int NSF22FunctionKey            = 0xF719;
+    private static final int NSF23FunctionKey            = 0xF71A;
+    private static final int NSF24FunctionKey            = 0xF71B;
+    private static final int NSF25FunctionKey            = 0xF71C;
+    private static final int NSF26FunctionKey            = 0xF71D;
+    private static final int NSF27FunctionKey            = 0xF71E;
+    private static final int NSF28FunctionKey            = 0xF71F;
+    private static final int NSF29FunctionKey            = 0xF720;
+    private static final int NSF30FunctionKey            = 0xF721;
+    private static final int NSF31FunctionKey            = 0xF722;
+    private static final int NSF32FunctionKey            = 0xF723;
+    private static final int NSF33FunctionKey            = 0xF724;
+    private static final int NSF34FunctionKey            = 0xF725;
+    private static final int NSF35FunctionKey            = 0xF726;
+    private static final int NSInsertFunctionKey         = 0xF727;
+    private static final int NSDeleteFunctionKey         = 0xF728;
+    private static final int NSHomeFunctionKey           = 0xF729;
+    private static final int NSBeginFunctionKey          = 0xF72A;
+    private static final int NSEndFunctionKey            = 0xF72B;
+    private static final int NSPageUpFunctionKey         = 0xF72C;
+    private static final int NSPageDownFunctionKey       = 0xF72D;
+    private static final int NSPrintScreenFunctionKey    = 0xF72E;
+    private static final int NSScrollLockFunctionKey     = 0xF72F;
+    private static final int NSPauseFunctionKey          = 0xF730;
+    private static final int NSSysReqFunctionKey         = 0xF731;
+    private static final int NSBreakFunctionKey          = 0xF732;
+    private static final int NSResetFunctionKey          = 0xF733;
+    private static final int NSStopFunctionKey           = 0xF734;
+    private static final int NSMenuFunctionKey           = 0xF735;
+    private static final int NSUserFunctionKey           = 0xF736;
+    private static final int NSSystemFunctionKey         = 0xF737;
+    private static final int NSPrintFunctionKey          = 0xF738;
+    private static final int NSClearLineFunctionKey      = 0xF739;
+    private static final int NSClearDisplayFunctionKey   = 0xF73A;
+    private static final int NSInsertLineFunctionKey     = 0xF73B;
+    private static final int NSDeleteLineFunctionKey     = 0xF73C;
+    private static final int NSInsertCharFunctionKey     = 0xF73D;
+    private static final int NSDeleteCharFunctionKey     = 0xF73E;
+    private static final int NSPrevFunctionKey           = 0xF73F;
+    private static final int NSNextFunctionKey           = 0xF740;
+    private static final int NSSelectFunctionKey         = 0xF741;
+    private static final int NSExecuteFunctionKey        = 0xF742;
+    private static final int NSUndoFunctionKey           = 0xF743;
+    private static final int NSRedoFunctionKey           = 0xF744;
+    private static final int NSFindFunctionKey           = 0xF745;
+    private static final int NSHelpFunctionKey           = 0xF746;
+    private static final int NSModeSwitchFunctionKey     = 0xF747;
+
+    private volatile long surfaceHandle;
+    private long parentWindowHandle;
+
+    // non fullscreen dimensions ..
+    private int nfs_width, nfs_height, nfs_x, nfs_y;
+    private final Insets insets = new Insets(0,0,0,0);
+
+    static {
+        MacDisplay.initSingleton();
+    }
+
+    public MacWindow() {
+    }
+    
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        this.parentWindowHandle=parentWindowHandle;
+        config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, getScreen().getGraphicsScreen());
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+    }
+
+    class CloseAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if(DEBUG_IMPLEMENTATION) System.out.println("MacWindow.CloseAction "+Thread.currentThread().getName());
+                if (windowHandle != 0) {
+                    close0(windowHandle);
+                    windowHandle = 0;
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private CloseAction closeAction = new CloseAction();
+
+    protected void closeNative() {
+        MainThread.invoke(true, closeAction);
+    }
+    
+    public long getWindowHandle() {
+        nsViewLock.lock();
+        try {
+            return windowHandle;
+        } finally {
+            nsViewLock.unlock();
+        }
+    }
+
+    public long getSurfaceHandle() {
+        nsViewLock.lock();
+        try {
+            return surfaceHandle;
+        } finally {
+            nsViewLock.unlock();
+        }
+    }
+
+    class EnsureWindowCreatedAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                createWindow(parentWindowHandle, false);
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private EnsureWindowCreatedAction ensureWindowCreatedAction =
+        new EnsureWindowCreatedAction();
+
+    public Insets getInsets() {
+        // in order to properly calculate insets we need the window to be
+        // created
+        MainThread.invoke(true, ensureWindowCreatedAction);
+        nsViewLock.lock();
+        try {
+            return (Insets) insets.clone();
+        } finally {
+            nsViewLock.unlock();
+        }
+    }
+
+    private ToolkitLock nsViewLock = new ToolkitLock() {
+            private Thread owner;
+            private int recursionCount;
+            
+            public synchronized void lock() {
+                Thread cur = Thread.currentThread();
+                if (owner == cur) {
+                    ++recursionCount;
+                    return;
+                }
+                while (owner != null) {
+                    try {
+                        wait();
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+                owner = cur;
+            }
+
+            public synchronized void unlock() {
+                if (owner != Thread.currentThread()) {
+                    throw new RuntimeException("Not owner");
+                }
+                if (recursionCount > 0) {
+                    --recursionCount;
+                    return;
+                }
+                owner = null;
+                notifyAll();
+            }
+        };
+
+    public synchronized int lockSurface() throws NativeWindowException {
+        nsViewLock.lock();
+        return super.lockSurface();
+    }
+
+    public void unlockSurface() {
+        super.unlockSurface();
+        nsViewLock.unlock();
+    }
+
+    class VisibleAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if(DEBUG_IMPLEMENTATION) System.out.println("MacWindow.VisibleAction "+visible+" "+Thread.currentThread().getName());
+                if (visible) {
+                    createWindow(parentWindowHandle, false);
+                    if (windowHandle != 0) {
+                        makeKeyAndOrderFront(windowHandle);
+                    }
+                } else {
+                    if (windowHandle != 0) {
+                        orderOut(windowHandle);
+                    }
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private VisibleAction visibleAction = new VisibleAction();
+
+    public void setVisible(boolean visible) {
+        this.visible = visible;
+        MainThread.invoke(true, visibleAction);
+    }
+
+    class TitleAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if (windowHandle != 0) {
+                    setTitle0(windowHandle, title);
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private TitleAction titleAction = new TitleAction();
+
+    public void setTitle(String title) {
+        super.setTitle(title);
+        MainThread.invoke(true, titleAction);
+    }
+
+    class FocusAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if (windowHandle != 0) {
+                    makeKey(windowHandle);
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private FocusAction focusAction = new FocusAction();
+
+    public void requestFocus() {
+        super.requestFocus();
+        MainThread.invoke(true, focusAction);
+    }
+    
+    class SizeAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if (windowHandle != 0) {
+                    setContentSize(windowHandle, width, height);
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private SizeAction sizeAction = new SizeAction();
+
+    public void setSize(int width, int height) {
+        this.width=width;
+        this.height=height;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        }
+        MainThread.invoke(true, sizeAction);
+    }
+    
+    class PositionAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if (windowHandle != 0) {
+                    setFrameTopLeftPoint(parentWindowHandle, windowHandle, x, y);
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private PositionAction positionAction = new PositionAction();
+
+    public void setPosition(int x, int y) {
+        this.x=x;
+        this.y=y;
+        if(!fullscreen) {
+            nfs_x=x;
+            nfs_y=y;
+        }
+        MainThread.invoke(true, positionAction);
+    }
+    
+    class FullscreenAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                    System.err.println("MacWindow fs: "+fullscreen+" "+x+"/"+y+" "+width+"x"+height);
+                }
+                createWindow(parentWindowHandle, true);
+                if (windowHandle != 0) {
+                    makeKeyAndOrderFront(windowHandle);
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private FullscreenAction fullscreenAction = new FullscreenAction();
+
+    public boolean setFullscreen(boolean fullscreen) {
+        if(this.fullscreen!=fullscreen) {
+            this.fullscreen=fullscreen;
+            if(fullscreen) {
+                x = 0; 
+                y = 0;
+                width = screen.getWidth();
+                height = screen.getHeight();
+            } else {
+                x = nfs_x;
+                y = nfs_y;
+                width = nfs_width;
+                height = nfs_height;
+            }
+            MainThread.invoke(true, fullscreenAction);
+        }
+        return fullscreen;
+    }
+    
+    private void sizeChanged(int newWidth, int newHeight) {
+        if (DEBUG_IMPLEMENTATION) {
+            System.out.println(Thread.currentThread().getName()+" Size changed to " + newWidth + ", " + newHeight);
+        }
+        width = newWidth;
+        height = newHeight;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        }
+        if (DEBUG_IMPLEMENTATION) {
+            System.out.println("  Posted WINDOW_RESIZED event");
+        }
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
+    }
+
+    private void insetsChanged(int left, int top, int right, int bottom) {
+        if (DEBUG_IMPLEMENTATION) {
+            System.out.println(Thread.currentThread().getName()+
+                " Insets changed to " + left + ", " + top + ", " + right + ", " + bottom);
+        }
+        if (left != -1 && top != -1 && right != -1 && bottom != -1) {
+            insets.left = left;
+            insets.top = top;
+            insets.right = right;
+            insets.bottom = bottom;
+        }
+    }
+
+    private void positionChanged(int newX, int newY) {
+        if (DEBUG_IMPLEMENTATION) {
+            System.out.println(Thread.currentThread().getName()+" Position changed to " + newX + ", " + newY);
+        }
+        x = newX;
+        y = newY;
+        if(!fullscreen) {
+            nfs_x=x;
+            nfs_y=y;
+        }
+        if (DEBUG_IMPLEMENTATION) {
+            System.out.println("  Posted WINDOW_MOVED event");
+        }
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
+    }
+
+    private void focusChanged(boolean focusGained) {
+        if (focusGained) {
+            sendWindowEvent(WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
+        } else {
+            sendWindowEvent(WindowEvent.EVENT_WINDOW_LOST_FOCUS);
+        }
+    }
+
+    private char convertKeyChar(char keyChar) {
+        if (keyChar == '\r') {
+            // Turn these into \n
+            return '\n';
+        }
+
+        if (keyChar >= NSUpArrowFunctionKey && keyChar <= NSModeSwitchFunctionKey) {
+            switch (keyChar) {
+                case NSUpArrowFunctionKey:     return KeyEvent.VK_UP;
+                case NSDownArrowFunctionKey:   return KeyEvent.VK_DOWN;
+                case NSLeftArrowFunctionKey:   return KeyEvent.VK_LEFT;
+                case NSRightArrowFunctionKey:  return KeyEvent.VK_RIGHT;
+                case NSF1FunctionKey:          return KeyEvent.VK_F1;
+                case NSF2FunctionKey:          return KeyEvent.VK_F2;
+                case NSF3FunctionKey:          return KeyEvent.VK_F3;
+                case NSF4FunctionKey:          return KeyEvent.VK_F4;
+                case NSF5FunctionKey:          return KeyEvent.VK_F5;
+                case NSF6FunctionKey:          return KeyEvent.VK_F6;
+                case NSF7FunctionKey:          return KeyEvent.VK_F7;
+                case NSF8FunctionKey:          return KeyEvent.VK_F8;
+                case NSF9FunctionKey:          return KeyEvent.VK_F9;
+                case NSF10FunctionKey:         return KeyEvent.VK_F10;
+                case NSF11FunctionKey:         return KeyEvent.VK_F11;
+                case NSF12FunctionKey:         return KeyEvent.VK_F12;
+                case NSF13FunctionKey:         return KeyEvent.VK_F13;
+                case NSF14FunctionKey:         return KeyEvent.VK_F14;
+                case NSF15FunctionKey:         return KeyEvent.VK_F15;
+                case NSF16FunctionKey:         return KeyEvent.VK_F16;
+                case NSF17FunctionKey:         return KeyEvent.VK_F17;
+                case NSF18FunctionKey:         return KeyEvent.VK_F18;
+                case NSF19FunctionKey:         return KeyEvent.VK_F19;
+                case NSF20FunctionKey:         return KeyEvent.VK_F20;
+                case NSF21FunctionKey:         return KeyEvent.VK_F21;
+                case NSF22FunctionKey:         return KeyEvent.VK_F22;
+                case NSF23FunctionKey:         return KeyEvent.VK_F23;
+                case NSF24FunctionKey:         return KeyEvent.VK_F24;
+                case NSInsertFunctionKey:      return KeyEvent.VK_INSERT;
+                case NSDeleteFunctionKey:      return KeyEvent.VK_DELETE;
+                case NSHomeFunctionKey:        return KeyEvent.VK_HOME;
+                case NSBeginFunctionKey:       return KeyEvent.VK_BEGIN;
+                case NSEndFunctionKey:         return KeyEvent.VK_END;
+                case NSPageUpFunctionKey:      return KeyEvent.VK_PAGE_UP;
+                case NSPageDownFunctionKey:    return KeyEvent.VK_PAGE_DOWN;
+                case NSPrintScreenFunctionKey: return KeyEvent.VK_PRINTSCREEN;
+                case NSScrollLockFunctionKey:  return KeyEvent.VK_SCROLL_LOCK;
+                case NSPauseFunctionKey:       return KeyEvent.VK_PAUSE;
+                // Not handled:
+                // NSSysReqFunctionKey
+                // NSBreakFunctionKey
+                // NSResetFunctionKey
+                case NSStopFunctionKey:        return KeyEvent.VK_STOP;
+                // Not handled:
+                // NSMenuFunctionKey
+                // NSUserFunctionKey
+                // NSSystemFunctionKey
+                // NSPrintFunctionKey
+                // NSClearLineFunctionKey
+                // NSClearDisplayFunctionKey
+                // NSInsertLineFunctionKey
+                // NSDeleteLineFunctionKey
+                // NSInsertCharFunctionKey
+                // NSDeleteCharFunctionKey
+                // NSPrevFunctionKey
+                // NSNextFunctionKey
+                // NSSelectFunctionKey
+                // NSExecuteFunctionKey
+                // NSUndoFunctionKey
+                // NSRedoFunctionKey
+                // NSFindFunctionKey
+                // NSHelpFunctionKey
+                // NSModeSwitchFunctionKey
+                default: break;
+            }
+        }
+
+        // NSEvent's charactersIgnoringModifiers doesn't ignore the shift key
+        if (keyChar >= 'a' && keyChar <= 'z') {
+            return Character.toUpperCase(keyChar);
+        }
+
+        return keyChar;
+    }
+
+    protected void sendKeyEvent(int eventType, int modifiers, int keyCode, char keyChar) {
+        int key = convertKeyChar(keyChar);
+        if(DEBUG_IMPLEMENTATION) System.out.println("MacWindow.sendKeyEvent "+Thread.currentThread().getName());
+        // Note that we send the key char for the key code on this
+        // platform -- we do not get any useful key codes out of the system
+        super.sendKeyEvent(eventType, modifiers, key, keyChar);
+    }
+
+    private void createWindow(long parentWindowHandle, boolean recreate) {
+        if(0!=windowHandle && !recreate) {
+            return;
+        }
+        if(0!=windowHandle) {
+            // save the view .. close the window
+            surfaceHandle = changeContentView(parentWindowHandle, windowHandle, 0);
+            if(recreate && 0==surfaceHandle) {
+                throw new NativeWindowException("Internal Error - recreate, window but no view");
+            }
+            close0(windowHandle);
+            windowHandle=0;
+        } else {
+            surfaceHandle = 0;
+        }
+        windowHandle = createWindow0(parentWindowHandle, 
+                                     getX(), getY(), getWidth(), getHeight(), fullscreen,
+                                     (isUndecorated() ?
+                                     NSBorderlessWindowMask :
+                                     NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask),
+                                     NSBackingStoreBuffered, 
+                                     getScreen().getIndex(), surfaceHandle);
+        if (windowHandle == 0) {
+            throw new NativeWindowException("Could create native window "+Thread.currentThread().getName()+" "+this);
+        }
+        surfaceHandle = contentView(windowHandle);
+        setTitle0(windowHandle, getTitle());
+        // don't make the window visible on window creation
+//        makeKeyAndOrderFront(windowHandle);
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
+    }
+    
+    protected static native boolean initIDs();
+    private native long createWindow0(long parentWindowHandle, int x, int y, int w, int h,
+                                     boolean fullscreen, int windowStyle,
+                                     int backingStoreType,
+                                     int screen_idx, long view);
+    private native void makeKeyAndOrderFront(long window);
+    private native void makeKey(long window);
+    private native void orderOut(long window);
+    private native void close0(long window);
+    private native void setTitle0(long window, String title);
+    private native long contentView(long window);
+    private native long changeContentView(long parentWindowHandle, long window, long view);
+    private native void setContentSize(long window, int w, int h);
+    private native void setFrameTopLeftPoint(long parentWindowHandle, long window, int x, int y);
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/GLWindow.java
new file mode 100644
index 000000000..b299d011e
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/opengl/GLWindow.java
@@ -0,0 +1,628 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.opengl;
+
+import com.jogamp.javafx.newt.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.GLDrawableHelper;
+import java.util.*;
+
+/**
+ * An implementation of {@link Window} which is customized for OpenGL
+ * use, and which implements the {@link javax.media.opengl.GLAutoDrawable} interface.
+ * <P>
+ * This implementation does not make the OpenGL context current<br>
+ * before calling the various input EventListener callbacks (MouseListener, KeyListener,
+ * etc.).<br>
+ * This design decision is made to favor a more performant and simplified
+ * implementation, as well as the event dispatcher shall be allowed
+ * not having a notion about OpenGL.
+ * <p>
+ */
+public class GLWindow extends Window implements GLAutoDrawable {
+    private static List/*GLWindow*/ glwindows = new ArrayList();
+
+    private boolean ownerOfWinScrDpy;
+    private Window window;
+    private boolean runPumpMessages;
+
+    /** Constructor. Do not call this directly -- use {@link
+        create()} instead. */
+    protected GLWindow(Window window, boolean ownerOfWinScrDpy) {
+        this.ownerOfWinScrDpy = ownerOfWinScrDpy;
+        this.window = window;
+        this.window.setAutoDrawableClient(true);
+        this.runPumpMessages = ( null == getScreen().getDisplay().getEDT() ) ;
+        window.addWindowListener(new WindowListener() {
+                public void windowResized(WindowEvent e) {
+                    sendReshape = true;
+                }
+
+                public void windowMoved(WindowEvent e) {
+                }
+
+                public void windowGainedFocus(WindowEvent e) {
+                }
+
+                public void windowLostFocus(WindowEvent e) {
+                }
+
+                public void windowDestroyNotify(WindowEvent e) {
+                    sendDestroy = true;
+                }
+            });
+
+        List newglw = (List) ((ArrayList) glwindows).clone();
+        newglw.add(this);
+        glwindows=newglw;
+    }
+
+    /** Creates a new GLWindow on the local display, screen 0, with a
+        dummy visual ID, and with the default GLCapabilities. */
+    public static GLWindow create() {
+        return create(null, null, false);
+    }
+
+    public static GLWindow create(boolean undecorated) {
+        return create(null, null, undecorated);
+    }
+
+    /** Creates a new GLWindow referring to the given window. */
+    public static GLWindow create(Window window) {
+        return create(window, null, false);
+    }
+    public static GLWindow create(GLCapabilities caps) {
+        return create(null, caps, false);
+    }
+
+    /** Creates a new GLWindow on the local display, screen 0, with a
+        dummy visual ID, and with the given GLCapabilities. */
+    public static GLWindow create(GLCapabilities caps, boolean undecorated) {
+        return create(null, caps, undecorated);
+    }
+
+    /** Either or: window (prio), or caps and undecorated (2nd choice) */
+    private static GLWindow create(Window window, 
+                                   GLCapabilities caps,
+                                   boolean undecorated) {
+        Display display;
+        boolean ownerOfWinScrDpy=false;
+        if (window == null) {
+            if (caps == null) {
+                caps = new GLCapabilities(null); // default ..
+            }
+            ownerOfWinScrDpy = true;
+            display = NewtFactory.createDisplay(null); // local display
+            Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+            window = NewtFactory.createWindow(screen, caps, undecorated);
+        }
+
+        return new GLWindow(window, ownerOfWinScrDpy);
+    }
+    
+    /** 
+     * EXPERIMENTAL<br> 
+     * Enable or disables running the {@link Display#pumpMessages} in the {@link #display()} call.<br>
+     * The default behavior is to run {@link Display#pumpMessages}.<P>
+     *
+     * The idea was that in a single threaded environment with one {@link Display} and many {@link Window}'s,
+     * a performance benefit was expected while disabling the implicit {@link Display#pumpMessages} and
+     * do it once via {@link GLWindow#runCurrentThreadPumpMessage()} <br>
+     * This could not have been verified. No measurable difference could have been recognized.<P>
+     *
+     * Best performance has been achieved with one GLWindow per thread.<br> 
+     *
+     * Enabling local pump messages while using the EDT, 
+     * {@link com.jogamp.javafx.newt.NewtFactory#setUseEDT(boolean)},
+     * will result in an exception.
+     *
+     * @deprecated EXPERIMENTAL, semantic is about to be removed after further verification.
+     */
+    public void setRunPumpMessages(boolean onoff) {
+        if( onoff && null!=getScreen().getDisplay().getEDT() ) {
+            throw new GLException("GLWindow.setRunPumpMessages(true) - Can't do with EDT on");
+        }
+        runPumpMessages = onoff;
+    }
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        shouldNotCallThis();
+    }
+
+    protected void closeNative() {
+        shouldNotCallThis();
+    }
+
+    protected void dispose(boolean regenerate, boolean sendEvent) {
+        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
+            Exception e1 = new Exception("GLWindow.dispose("+regenerate+") "+Thread.currentThread()+", 1");
+            e1.printStackTrace();
+        }
+
+        if(sendEvent) {
+            sendDisposeEvent();
+        }
+
+        if (context != null) {
+            context.destroy();
+        }
+        if (drawable != null) {
+            drawable.setRealized(false);
+        }
+
+        if(regenerate) {
+            if(null==window) {
+                throw new GLException("GLWindow.dispose(true): null window");
+            }
+
+            // recreate GLDrawable, to reflect the new graphics configurations
+            NativeWindow nw;
+            if (window.getWrappedWindow() != null) {
+                nw = NativeWindowFactory.getNativeWindow(window.getWrappedWindow(), window.getGraphicsConfiguration());
+            } else {
+                nw = window;
+            }
+            drawable = factory.createGLDrawable(nw);
+            drawable.setRealized(true);
+            context = drawable.createContext(null);
+            sendReshape = true; // ensure a reshape event is send ..
+        }
+
+        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
+            System.out.println("GLWindow.dispose("+regenerate+") "+Thread.currentThread()+", fin: "+this);
+        }
+    }
+
+    public synchronized void destroy() {
+        destroy(true);
+    }
+
+    /** @param sendDisposeEvent should be false in a [time,reliable] critical shutdown */
+    public synchronized void destroy(boolean sendDisposeEvent) {
+        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
+            Exception e1 = new Exception("GLWindow.destroy "+Thread.currentThread()+", 1: "+this);
+            e1.printStackTrace();
+        }
+
+        List newglw = (List) ((ArrayList) glwindows).clone();
+        newglw.remove(this);
+        glwindows=newglw;
+
+        dispose(false, sendDisposeEvent);
+
+        if(null!=window) {
+            if(ownerOfWinScrDpy) {
+                window.destroy(true);
+            }
+        }
+
+        drawable = null;
+        context = null;
+        window = null;
+
+        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
+            System.out.println("GLWindow.destroy "+Thread.currentThread()+", fin: "+this);
+        }
+    }
+
+    public boolean getPerfLogEnabled() { return perfLog; }
+
+    public void enablePerfLog(boolean v) {
+        perfLog = v;
+    }
+
+    public void setVisible(boolean visible) {
+        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
+            System.out.println(Thread.currentThread()+" GLWindow.setVisible("+visible+") START ; isVisible "+this.visible+" ; has context "+(null!=context));
+        }
+        this.visible=visible;
+        window.setVisible(visible);
+        if (visible && context == null) {
+            NativeWindow nw;
+            if (window.getWrappedWindow() != null) {
+                nw = NativeWindowFactory.getNativeWindow(window.getWrappedWindow(), window.getGraphicsConfiguration());
+            } else {
+                nw = window;
+            }
+            GLCapabilities glCaps = (GLCapabilities) nw.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
+            factory = GLDrawableFactory.getFactory(glCaps.getGLProfile());
+            drawable = factory.createGLDrawable(nw);
+            drawable.setRealized(true);
+            context = drawable.createContext(null);
+            sendReshape = true; // ensure a reshape event is send ..
+        }
+        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
+            System.out.println(Thread.currentThread()+" GLWindow.setVisible("+visible+") END  ; has context "+(null!=context));
+        }
+    }
+
+    public Screen getScreen() {
+        return window.getScreen();
+    }
+
+    public void setTitle(String title) {
+        window.setTitle(title);
+    }
+
+    public String getTitle() {
+        return window.getTitle();
+    }
+
+    public void setUndecorated(boolean value) {
+        window.setUndecorated(value);
+    }
+
+    public boolean isUndecorated() {
+        return window.isUndecorated();
+    }
+
+    public void setSize(int width, int height) {
+        window.setSize(width, height);
+    }
+
+    public void setPosition(int x, int y) {
+        window.setPosition(x, y);
+    }
+
+    public Insets getInsets() {
+        return window.getInsets();
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        return window.setFullscreen(fullscreen);
+    }
+
+    public boolean isVisible() {
+        return window.isVisible();
+    }
+
+    public int getX() {
+        return window.getX();
+    }
+
+    public int getY() {
+        return window.getY();
+    }
+
+    public int getWidth() {
+        return window.getWidth();
+    }
+
+    public int getHeight() {
+        return window.getHeight();
+    }
+
+    public boolean isFullscreen() {
+        return window.isFullscreen();
+    }
+
+    public void addSurfaceUpdatedListener(SurfaceUpdatedListener l) {
+        window.addSurfaceUpdatedListener(l);
+    }
+    public void removeSurfaceUpdatedListener(SurfaceUpdatedListener l) {
+        window.removeSurfaceUpdatedListener(l);
+    }
+    public SurfaceUpdatedListener[] getSurfaceUpdatedListener() {
+        return window.getSurfaceUpdatedListener();
+    }
+    public void surfaceUpdated(Object updater, NativeWindow window0, long when) { 
+        window.surfaceUpdated(updater, window, when);
+    }
+
+    public void addMouseListener(MouseListener l) {
+        window.addMouseListener(l);
+    }
+
+    public void removeMouseListener(MouseListener l) {
+        window.removeMouseListener(l);
+    }
+
+    public MouseListener[] getMouseListeners() {
+        return window.getMouseListeners();
+    }
+
+    public void addKeyListener(KeyListener l) {
+        window.addKeyListener(l);
+    }
+
+    public void removeKeyListener(KeyListener l) {
+        window.removeKeyListener(l);
+    }
+
+    public KeyListener[] getKeyListeners() {
+        return window.getKeyListeners();
+    }
+
+    public void addWindowListener(WindowListener l) {
+        window.addWindowListener(l);
+    }
+
+    public void removeWindowListener(WindowListener l) {
+        window.removeWindowListener(l);
+    }
+
+    public WindowListener[] getWindowListeners() {
+        return window.getWindowListeners();
+    }
+
+    public String toString() {
+        return "NEWT-GLWindow[ \n\tDrawable: "+drawable+", \n\tWindow: "+window+", \n\tHelper: "+helper+", \n\tFactory: "+factory+"]";
+    }
+
+    //----------------------------------------------------------------------
+    // OpenGL-related methods and state
+    //
+
+    private GLDrawableFactory factory;
+    private GLDrawable drawable;
+    private GLContext context;
+    private GLDrawableHelper helper = new GLDrawableHelper();
+    // To make reshape events be sent immediately before a display event
+    private boolean sendReshape=false;
+    private boolean sendDestroy=false;
+    private boolean perfLog = false;
+
+    public GLDrawableFactory getFactory() {
+        return factory;
+    }
+
+    public void setContext(GLContext newCtx) {
+        context = newCtx;
+    }
+
+    public GLContext getContext() {
+        return context;
+    }
+
+    public GL getGL() {
+        if (context == null) {
+            return null;
+        }
+        return context.getGL();
+    }
+
+    public GL setGL(GL gl) {
+        if (context != null) {
+            context.setGL(gl);
+            return gl;
+        }
+        return null;
+    }
+
+    public void addGLEventListener(GLEventListener listener) {
+        helper.addGLEventListener(listener);
+    }
+
+    public void removeGLEventListener(GLEventListener listener) {
+        helper.removeGLEventListener(listener);
+    }
+
+    public void display() {
+        display(false);
+    }
+
+    public void display(boolean forceReshape) {
+        if(window!=null && drawable!=null && context != null) {
+            if(runPumpMessages) {
+                window.getScreen().getDisplay().pumpMessages();
+            }
+            if(window.hasDeviceChanged() && GLAutoDrawable.SCREEN_CHANGE_ACTION_ENABLED) {
+                dispose(true, true);
+            }
+            if (sendDestroy) {
+                destroy();
+                sendDestroy=false;
+            } else {
+                if(forceReshape) {
+                    sendReshape = true;
+                }
+                helper.invokeGL(drawable, context, displayAction, initAction);
+            }
+        }
+    }
+
+    private void sendDisposeEvent() {
+        if(drawable!=null && context != null) {
+            helper.invokeGL(drawable, context, disposeAction, null);
+        }
+    }
+
+    /** This implementation uses a static value */
+    public void setAutoSwapBufferMode(boolean onOrOff) {
+        helper.setAutoSwapBufferMode(onOrOff);
+    }
+
+    /** This implementation uses a static value */
+    public boolean getAutoSwapBufferMode() {
+        return helper.getAutoSwapBufferMode();
+    }
+
+    public void swapBuffers() {
+        if(drawable!=null && context != null) {
+            if (context != GLContext.getCurrent()) {
+                // Assume we should try to make the context current before swapping the buffers
+                helper.invokeGL(drawable, context, swapBuffersAction, initAction);
+            } else {
+                drawable.swapBuffers();
+            }
+        }
+    }
+
+    class InitAction implements Runnable {
+        public void run() {
+            helper.init(GLWindow.this);
+            startTime = System.currentTimeMillis();
+            curTime   = startTime;
+            if(perfLog) {
+                lastCheck  = startTime;
+                totalFrames = 0; lastFrames = 0;
+            }
+        }
+    }
+    private InitAction initAction = new InitAction();
+
+    class DisposeAction implements Runnable {
+        public void run() {
+            helper.dispose(GLWindow.this);
+        }
+    }
+    private DisposeAction disposeAction = new DisposeAction();
+
+    class DisplayAction implements Runnable {
+        public void run() {
+            if (sendReshape) {
+                int width = getWidth();
+                int height = getHeight();
+                getGL().glViewport(0, 0, width, height);
+                helper.reshape(GLWindow.this, 0, 0, width, height);
+                sendReshape = false;
+            }
+
+            helper.display(GLWindow.this);
+
+            curTime = System.currentTimeMillis();
+            totalFrames++;
+
+            if(perfLog) {
+                long dt0, dt1;
+                lastFrames++;
+                dt0 = curTime-lastCheck;
+                if ( dt0 > 5000 ) {
+                    dt1 = curTime-startTime;
+                    System.out.println(dt0/1000 +"s: "+ lastFrames + "f, " + (lastFrames*1000)/dt0 + " fps, "+dt0/lastFrames+" ms/f; "+
+                                       "total: "+ dt1/1000+"s, "+(totalFrames*1000)/dt1 + " fps, "+dt1/totalFrames+" ms/f");
+                    lastCheck=curTime;
+                    lastFrames=0;
+                }
+            }
+        }
+    }
+    private DisplayAction displayAction = new DisplayAction();
+
+    public long getStartTime()   { return startTime; }
+    public long getCurrentTime() { return curTime; }
+    public long getDuration()    { return curTime-startTime; }
+    public int  getTotalFrames() { return totalFrames; }
+
+    private long startTime = 0;
+    private long curTime = 0;
+    private long lastCheck  = 0;
+    private int  totalFrames = 0, lastFrames = 0;
+
+    class SwapBuffersAction implements Runnable {
+        public void run() {
+            drawable.swapBuffers();
+        }
+    }
+    private SwapBuffersAction swapBuffersAction = new SwapBuffersAction();
+
+    //----------------------------------------------------------------------
+    // GLDrawable methods
+    //
+
+    public NativeWindow getNativeWindow() {
+        return null!=drawable ? drawable.getNativeWindow() : null;
+    }
+
+    public synchronized int lockSurface() throws NativeWindowException {
+        if(null!=drawable) return drawable.getNativeWindow().lockSurface();
+        return NativeWindow.LOCK_SURFACE_NOT_READY;
+    }
+
+    public synchronized void unlockSurface() {
+        if(null!=drawable) drawable.getNativeWindow().unlockSurface();
+        else throw new NativeWindowException("NEWT-GLWindow not locked");
+    }
+
+    public synchronized boolean isSurfaceLocked() {
+        if(null!=drawable) return drawable.getNativeWindow().isSurfaceLocked();
+        return false;
+    }
+
+    public synchronized Exception getLockedStack() {
+        if(null!=drawable) return drawable.getNativeWindow().getLockedStack();
+        return null;
+    }
+
+    public boolean surfaceSwap() { 
+        if(null!=drawable) return drawable.getNativeWindow().surfaceSwap();
+        return super.surfaceSwap();
+    }
+
+    public long getWindowHandle() {
+        if(null!=drawable) return drawable.getNativeWindow().getWindowHandle();
+        return super.getWindowHandle();
+    }
+
+    public long getSurfaceHandle() {
+        if(null!=drawable) return drawable.getNativeWindow().getSurfaceHandle();
+        return super.getSurfaceHandle();
+    }
+
+    //----------------------------------------------------------------------
+    // GLDrawable methods that are not really needed
+    //
+
+    public GLContext createContext(GLContext shareWith) {
+        return drawable.createContext(shareWith);
+    }
+
+    public void setRealized(boolean realized) {
+    }
+
+    public GLCapabilities getChosenGLCapabilities() {
+        if (drawable == null) {
+            throw new GLException("No drawable yet");
+        }
+
+        return drawable.getChosenGLCapabilities();
+    }
+
+    public GLProfile getGLProfile() {
+        if (drawable == null) {
+            throw new GLException("No drawable yet");
+        }
+
+        return drawable.getGLProfile();
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    private void shouldNotCallThis() {
+        throw new NativeWindowException("Should not call this");
+    }
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Display.java
new file mode 100644
index 000000000..c0c1ee5fd
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Display.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.opengl.broadcom.egl;
+
+import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.opengl.impl.egl.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.egl.*;
+
+public class Display extends com.jogamp.javafx.newt.Display {
+
+    static {
+        NativeLibLoader.loadNEWT();
+
+        if (!Window.initIDs()) {
+            throw new NativeWindowException("Failed to initialize BCEGL Window jmethodIDs");
+        }
+    }
+
+    public static void initSingleton() {
+        // just exist to ensure static init has been run
+    }
+
+
+    public Display() {
+    }
+
+    protected void createNative() {
+        long handle = CreateDisplay(Screen.fixedWidth, Screen.fixedHeight);
+        if (handle == EGL.EGL_NO_DISPLAY) {
+            throw new NativeWindowException("BC EGL CreateDisplay failed");
+        }
+        aDevice = new EGLGraphicsDevice(handle);
+    }
+
+    protected void closeNative() {
+        if (aDevice.getHandle() != EGL.EGL_NO_DISPLAY) {
+            DestroyDisplay(aDevice.getHandle());
+        }
+    }
+
+    protected void dispatchMessages() {
+        // n/a .. DispatchMessages();
+    }
+
+    private native long CreateDisplay(int width, int height);
+    private native void DestroyDisplay(long dpy);
+    private native void DispatchMessages();
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Screen.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Screen.java
new file mode 100755
index 000000000..f7abe3836
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Screen.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.opengl.broadcom.egl;
+
+import com.jogamp.javafx.newt.impl.*;
+import javax.media.nativewindow.*;
+
+public class Screen extends com.jogamp.javafx.newt.Screen {
+
+    static {
+        Display.initSingleton();
+    }
+
+
+    public Screen() {
+    }
+
+    protected void createNative(int index) {
+        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
+        setScreenSize(fixedWidth, fixedHeight);
+    }
+
+    protected void closeNative() { }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    static final int fixedWidth = 1920;
+    static final int fixedHeight = 1080;
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Window.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Window.java
new file mode 100755
index 000000000..bd2d7930e
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Window.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.opengl.broadcom.egl;
+
+import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.opengl.impl.egl.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLProfile;
+import javax.media.nativewindow.NativeWindowException;
+
+public class Window extends com.jogamp.javafx.newt.Window {
+    static {
+        Display.initSingleton();
+    }
+
+    public Window() {
+    }
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        if(0!=parentWindowHandle) {
+            throw new RuntimeException("Window parenting not supported (yet)");
+        }
+        // query a good configuration .. even thought we drop this one 
+        // and reuse the EGLUtil choosen one later.
+        config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, getScreen().getGraphicsScreen());
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+        setSizeImpl(getScreen().getWidth(), getScreen().getHeight());
+    }
+
+    protected void closeNative() {
+        if(0!=windowHandleClose) {
+            CloseWindow(getDisplayHandle(), windowHandleClose);
+        }
+    }
+
+    public void setVisible(boolean visible) {
+        if(this.visible!=visible) {
+            this.visible=visible;
+            if ( 0==windowHandle ) {
+                windowHandle = realizeWindow(true, width, height);
+                if (0 == windowHandle) {
+                    throw new NativeWindowException("Error native Window Handle is null");
+                }
+            }
+            clearEventMask();
+        }
+    }
+
+    public void setSize(int width, int height) {
+        System.err.println("setSize "+width+"x"+height+" n/a in BroadcomEGL");
+    }
+
+    void setSizeImpl(int width, int height) {
+        if(0!=windowHandle) {
+            // n/a in BroadcomEGL
+            System.err.println("BCEGL Window.setSizeImpl n/a in BroadcomEGL with realized window");
+        } else {
+            if(DEBUG_IMPLEMENTATION) {
+                Exception e = new Exception("BCEGL Window.setSizeImpl() "+this.width+"x"+this.height+" -> "+width+"x"+height);
+                e.printStackTrace();
+            }
+            this.width = width;
+            this.height = height;
+        }
+    }
+
+    public void setPosition(int x, int y) {
+        // n/a in BroadcomEGL
+        System.err.println("setPosition n/a in BroadcomEGL");
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        // n/a in BroadcomEGL
+        System.err.println("setFullscreen n/a in BroadcomEGL");
+        return false;
+    }
+
+    public boolean surfaceSwap() {
+        if ( 0!=windowHandle ) {
+            SwapWindow(getDisplayHandle(), windowHandle);
+            return true;
+        }
+        return false;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    protected static native boolean initIDs();
+    private        native long CreateWindow(long eglDisplayHandle, boolean chromaKey, int width, int height);
+    private        native void CloseWindow(long eglDisplayHandle, long eglWindowHandle);
+    private        native void SwapWindow(long eglDisplayHandle, long eglWindowHandle);
+
+
+    private long realizeWindow(boolean chromaKey, int width, int height) {
+        if(DEBUG_IMPLEMENTATION) {
+            System.out.println("BCEGL Window.realizeWindow() with: chroma "+chromaKey+", "+width+"x"+height+", "+config);
+        }
+        long handle = CreateWindow(getDisplayHandle(), chromaKey, width, height);
+        if (0 == handle) {
+            throw new NativeWindowException("Error native Window Handle is null");
+        }
+        windowHandleClose = handle;
+        return handle;
+    }
+
+    private void windowCreated(int cfgID, int width, int height) {
+        this.width = width;
+        this.height = height;
+        GLCapabilities capsReq = (GLCapabilities) config.getRequestedCapabilities();
+        config = EGLGraphicsConfiguration.create(capsReq, screen.getGraphicsScreen(), cfgID);
+        if (config == null) {
+            throw new NativeWindowException("Error creating EGLGraphicsConfiguration from id: "+cfgID+", "+this);
+        }
+        if(DEBUG_IMPLEMENTATION) {
+            System.out.println("BCEGL Window.windowCreated(): "+toHexString(cfgID)+", "+width+"x"+height+", "+config);
+        }
+    }
+
+    private long   windowHandleClose;
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDDisplay.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDDisplay.java
new file mode 100755
index 000000000..40a37115d
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDDisplay.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.opengl.kd;
+
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.opengl.impl.egl.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.egl.*;
+
+public class KDDisplay extends Display {
+
+    static {
+        NativeLibLoader.loadNEWT();
+
+        if (!KDWindow.initIDs()) {
+            throw new NativeWindowException("Failed to initialize KDWindow jmethodIDs");
+        }
+    }
+
+    public static void initSingleton() {
+        // just exist to ensure static init has been run
+    }
+
+
+    public KDDisplay() {
+    }
+
+    protected void createNative() {
+        // FIXME: map name to EGL_*_DISPLAY
+        long handle = EGL.eglGetDisplay(EGL.EGL_DEFAULT_DISPLAY);
+        if (handle == EGL.EGL_NO_DISPLAY) {
+            throw new NativeWindowException("eglGetDisplay failed");
+        }
+        if (!EGL.eglInitialize(handle, null, null)) {
+            throw new NativeWindowException("eglInitialize failed");
+        }
+        aDevice = new EGLGraphicsDevice(handle);
+    }
+
+    protected void closeNative() {
+        if (aDevice.getHandle() != EGL.EGL_NO_DISPLAY) {
+            EGL.eglTerminate(aDevice.getHandle());
+        }
+    }
+
+    protected void dispatchMessages() {
+        DispatchMessages();
+    }
+
+    private native void DispatchMessages();
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDScreen.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDScreen.java
new file mode 100755
index 000000000..4bc7f8257
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDScreen.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.opengl.kd;
+
+import com.jogamp.javafx.newt.*;
+import javax.media.nativewindow.*;
+
+public class KDScreen extends Screen {
+    static {
+        KDDisplay.initSingleton();
+    }
+
+    public KDScreen() {
+    }
+
+    protected void createNative(int index) {
+        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
+    }
+
+    protected void closeNative() { }
+
+    // elevate access to this package ..
+    protected void setScreenSize(int w, int h) {
+        super.setScreenSize(w, h);
+    }
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDWindow.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDWindow.java
new file mode 100755
index 000000000..d5be2207c
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDWindow.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.opengl.kd;
+
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.opengl.impl.egl.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLProfile;
+import javax.media.nativewindow.NativeWindowException;
+
+public class KDWindow extends Window {
+    private static final String WINDOW_CLASS_NAME = "NewtWindow";
+    // non fullscreen dimensions ..
+    private int nfs_width, nfs_height, nfs_x, nfs_y;
+
+    static {
+        KDDisplay.initSingleton();
+    }
+
+    public KDWindow() {
+    }
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        if(0!=parentWindowHandle) {
+            throw new RuntimeException("Window parenting not supported (yet)");
+        }
+        config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, getScreen().getGraphicsScreen());
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+
+        GLCapabilities eglCaps = (GLCapabilities)config.getChosenCapabilities();
+        int[] eglAttribs = EGLGraphicsConfiguration.GLCapabilities2AttribList(eglCaps);
+
+        windowHandle = 0;
+        eglWindowHandle = CreateWindow(getDisplayHandle(), eglAttribs);
+        if (eglWindowHandle == 0) {
+            throw new NativeWindowException("Error creating egl window: "+config);
+        }
+        setVisible0(eglWindowHandle, false);
+        windowHandleClose = eglWindowHandle;
+    }
+
+    protected void closeNative() {
+        if(0!=windowHandleClose) {
+            CloseWindow(windowHandleClose, windowUserData);
+            windowUserData=0;
+        }
+    }
+
+    public void setVisible(boolean visible) {
+        if(0!=eglWindowHandle && this.visible!=visible) {
+            this.visible=visible;
+            setVisible0(eglWindowHandle, visible);
+            if ( 0==windowHandle ) {
+                windowHandle = RealizeWindow(eglWindowHandle);
+                if (0 == windowHandle) {
+                    throw new NativeWindowException("Error native Window Handle is null");
+                }
+            }
+            clearEventMask();
+        }
+    }
+
+    public void setSize(int width, int height) {
+        if(0!=eglWindowHandle) {
+            setSize0(eglWindowHandle, width, height);
+        }
+    }
+
+    public void setPosition(int x, int y) {
+        // n/a in KD
+        System.err.println("setPosition n/a in KD");
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        if(0!=eglWindowHandle && this.fullscreen!=fullscreen) {
+            this.fullscreen=fullscreen;
+            if(this.fullscreen) {
+                setFullScreen0(eglWindowHandle, true);
+            } else {
+                setFullScreen0(eglWindowHandle, false);
+                setSize0(eglWindowHandle, nfs_width, nfs_height);
+            }
+        }
+        return true;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    protected static native boolean initIDs();
+    private        native long CreateWindow(long displayHandle, int[] attributes);
+    private        native long RealizeWindow(long eglWindowHandle);
+    private        native int  CloseWindow(long eglWindowHandle, long userData);
+    private        native void setVisible0(long eglWindowHandle, boolean visible);
+    private        native void setSize0(long eglWindowHandle, int width, int height);
+    private        native void setFullScreen0(long eglWindowHandle, boolean fullscreen);
+
+    private void windowCreated(long userData) {
+        windowUserData=userData;
+    }
+
+    private void sizeChanged(int newWidth, int newHeight) {
+        width = newWidth;
+        height = newHeight;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        } else {
+            ((KDScreen)screen).setScreenSize(width, height);
+        }
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
+    }
+
+    private long   eglWindowHandle;
+    private long   windowHandleClose;
+    private long   windowUserData;
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/util/EventDispatchThread.java b/src/newt/classes/com/jogamp/javafx/newt/util/EventDispatchThread.java
new file mode 100644
index 000000000..db3f97ee6
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/util/EventDispatchThread.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.javafx.newt.util;
+
+import com.jogamp.javafx.newt.Display;
+import com.jogamp.javafx.newt.impl.Debug;
+import java.util.*;
+
+public class EventDispatchThread {
+    public static final boolean DEBUG = Debug.debug("EDT");
+
+    private ThreadGroup threadGroup; 
+    private volatile boolean shouldStop = false;
+    private TaskWorker taskWorker = null;
+    private Object taskWorkerLock = new Object();
+    private ArrayList tasks = new ArrayList(); // one shot tasks
+    private Display display = null;
+    private String name;
+    private long edtPollGranularity = 10;
+
+    public EventDispatchThread(Display display, ThreadGroup tg, String name) {
+        this.display = display;
+        this.threadGroup = tg;
+        this.name=new String("EDT-Display_"+display.getName()+"-"+name);
+    }
+
+    public String getName() { return name; }
+
+    public ThreadGroup getThreadGroup() { return threadGroup; }
+
+    public void start() {
+        start(false);
+    }
+
+    /**
+     * @param externalStimuli true indicates that another thread stimulates, 
+     *                        ie. calls this TaskManager's run() loop method.
+     *                        Hence no own thread is started in this case.
+     *
+     * @return The started Runnable, which handles the run-loop.
+     *         Usefull in combination with externalStimuli=true,
+     *         so an external stimuli can call it.
+     */
+    public Runnable start(boolean externalStimuli) {
+        synchronized(taskWorkerLock) { 
+            if(null==taskWorker) {
+                taskWorker = new TaskWorker(threadGroup, name);
+            }
+            if(!taskWorker.isRunning()) {
+                shouldStop = false;
+                taskWorker.start(externalStimuli);
+            }
+            taskWorkerLock.notifyAll();
+        }
+        return taskWorker;
+    }
+
+    public void stop() {
+        synchronized(taskWorkerLock) { 
+            if(null!=taskWorker && taskWorker.isRunning()) {
+                shouldStop = true;
+            }
+            taskWorkerLock.notifyAll();
+            if(DEBUG) {
+                System.out.println(Thread.currentThread()+": EDT signal STOP");
+            }
+        }
+    }
+
+    public boolean isThreadEDT(Thread thread) {
+        return null!=taskWorker && taskWorker == thread;
+    }
+
+    public boolean isCurrentThreadEDT() {
+        return null!=taskWorker && taskWorker == Thread.currentThread();
+    }
+
+    public boolean isRunning() {
+        return null!=taskWorker && taskWorker.isRunning() ;
+    }
+
+    public void invokeLater(Runnable task) {
+        if(task == null) {
+            return;
+        }
+        synchronized(taskWorkerLock) {
+            if(null!=taskWorker && taskWorker.isRunning() && taskWorker != Thread.currentThread() ) {
+                tasks.add(task);
+                taskWorkerLock.notifyAll();
+            } else {
+                // if !running or isEDTThread, do it right away
+                task.run();
+            }
+        }
+    }
+
+    public void invokeAndWait(Runnable task) {
+        if(task == null) {
+            return;
+        }
+        invokeLater(task);
+        waitOnWorker();
+    }
+
+    public void waitOnWorker() {
+        synchronized(taskWorkerLock) {
+            if(null!=taskWorker && taskWorker.isRunning() && tasks.size()>0 && taskWorker != Thread.currentThread() ) {
+                try {
+                    taskWorkerLock.wait();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public void waitUntilStopped() {
+        synchronized(taskWorkerLock) {
+            while(null!=taskWorker && taskWorker.isRunning() && taskWorker != Thread.currentThread() ) {
+                try {
+                    taskWorkerLock.wait();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    class TaskWorker extends Thread {
+        boolean isRunning = false;
+        boolean externalStimuli = false;
+
+        public TaskWorker(ThreadGroup tg, String name) {
+            super(tg, name);
+        }
+
+        public synchronized boolean isRunning() {
+            return isRunning;
+        }
+
+        public void start(boolean externalStimuli) throws IllegalThreadStateException {
+            synchronized(this) {
+                this.externalStimuli = externalStimuli;
+                isRunning = true;
+            }
+            if(!externalStimuli) {
+                super.start();
+            }
+        }
+
+        /** 
+         * Utilizing taskWorkerLock only for local resources and task execution,
+         * not for event dispatching.
+         */
+        public void run() {
+            if(DEBUG) {
+                System.out.println(Thread.currentThread()+": EDT run() START");
+            }
+            while(!shouldStop) {
+                try {
+                    // wait for something todo
+                    while(!shouldStop && tasks.size()==0) {
+                        synchronized(taskWorkerLock) {
+                            if(!shouldStop && tasks.size()==0) {
+                                try {
+                                    taskWorkerLock.wait(edtPollGranularity);
+                                } catch (InterruptedException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                        display.pumpMessages(); // event dispatch
+                    }
+                    if(!shouldStop && tasks.size()>0) {
+                        synchronized(taskWorkerLock) {
+                            if(!shouldStop && tasks.size()>0) {
+                                Runnable task = (Runnable) tasks.remove(0);
+                                task.run();
+                                taskWorkerLock.notifyAll();
+                            }
+                        }
+                        display.pumpMessages(); // event dispatch
+                    }
+                } catch (Throwable t) {
+                    // handle errors ..
+                    t.printStackTrace();
+                } finally {
+                    // epilog - unlock locked stuff
+                }
+                if(externalStimuli) break; // no loop if called by external stimuli
+            }
+            synchronized(this) {
+                isRunning = !shouldStop;
+            }
+            if(!isRunning) {
+                synchronized(taskWorkerLock) {
+                    taskWorkerLock.notifyAll();
+                }
+            }
+            if(DEBUG) {
+                System.out.println(Thread.currentThread()+": EDT run() EXIT");
+            }
+        }
+    }
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/util/MainThread.java b/src/newt/classes/com/jogamp/javafx/newt/util/MainThread.java
new file mode 100644
index 000000000..9bf25098f
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/util/MainThread.java
@@ -0,0 +1,307 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.javafx.newt.util;
+
+import java.util.*;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.security.*;
+
+import javax.media.nativewindow.*;
+
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.javafx.newt.macosx.MacDisplay;
+import com.jogamp.nativewindow.impl.NWReflection;
+
+/**
+ * NEWT Utility class MainThread<P>
+ *
+ * This class provides a startup singleton <i>main thread</i>,
+ * from which a new thread with the users main class is launched.<br>
+ *
+ * Such behavior is necessary for native windowing toolkits,
+ * where the windowing management must happen on the so called
+ * <i>main thread</i> e.g. for Mac OS X !<br>
+ *
+ * Utilizing this class as a launchpad, now you are able to
+ * use a NEWT multithreaded application with window handling within the different threads,
+ * even on these restricted platforms.<br>
+ *
+ * To support your NEWT Window platform, 
+ * you have to pass your <i>main thread</i> actions to {@link #invoke invoke(..)},
+ * have a look at the {@link com.jogamp.javafx.newt.macosx.MacWindow MacWindow} implementation.<br>
+ * <i>TODO</i>: Some hardcoded dependencies exist in this implementation, 
+ * where you have to patch this code or factor it out. <P>
+ * 
+ * If your platform is not Mac OS X, but you want to test your code without modifying
+ * this class, you have to set the system property <code>newt.MainThread.force</code> to <code>true</code>.<P>
+ *
+ * The code is compatible with all other platform, which support multithreaded windowing handling.
+ * Since those platforms won't trigger the <i>main thread</i> serialization, the main method 
+ * will be simply executed, in case you haven't set <code>newt.MainThread.force</code> to <code>true</code>.<P>
+ *
+ * Test case on Mac OS X (or any other platform):
+ <PRE>
+    java -XstartOnFirstThread com.jogamp.javafx.newt.util.MainThread demos.es1.RedSquare -GL2 -GL2 -GL2 -GL2
+ </PRE>
+ * Which starts 4 threads, each with a window and OpenGL rendering.<br>
+ */
+public class MainThread {
+    private static AccessControlContext localACC = AccessController.getContext();
+    public static final boolean USE_MAIN_THREAD = NativeWindowFactory.TYPE_MACOSX.equals(NativeWindowFactory.getNativeWindowType(false)) ||
+                                                  Debug.getBooleanProperty("newt.MainThread.force", true, localACC);
+
+    protected static final boolean DEBUG = Debug.debug("MainThread");
+
+    private static boolean isExit=false;
+    private static volatile boolean isRunning=false;
+    private static Object taskWorkerLock=new Object();
+    private static boolean shouldStop;
+    private static ArrayList tasks;
+    private static ArrayList tasksBlock;
+    private static Thread mainThread;
+
+    static class MainAction extends Thread {
+        private String mainClassName;
+        private String[] mainClassArgs;
+
+        private Class mainClass;
+        private Method mainClassMain;
+
+        public MainAction(String mainClassName, String[] mainClassArgs) {
+            this.mainClassName=mainClassName;
+            this.mainClassArgs=mainClassArgs;
+        }
+
+        public void run() {
+            if ( USE_MAIN_THREAD ) {
+                // we have to start first to provide the service ..
+                MainThread.waitUntilRunning();
+            }
+
+            // start user app ..
+            try {
+                Class mainClass = NWReflection.getClass(mainClassName, true);
+                if(null==mainClass) {
+                    throw new RuntimeException(new ClassNotFoundException("MainThread couldn't find main class "+mainClassName));
+                }
+                try {
+                    mainClassMain = mainClass.getDeclaredMethod("main", new Class[] { String[].class });
+                    mainClassMain.setAccessible(true);
+                } catch (Throwable t) {
+                    throw new RuntimeException(t);
+                }
+                if(DEBUG) System.err.println("MainAction.run(): "+Thread.currentThread().getName()+" invoke "+mainClassName);
+                mainClassMain.invoke(null, new Object[] { mainClassArgs } );
+            } catch (InvocationTargetException ite) {
+                ite.getTargetException().printStackTrace();
+            } catch (Throwable t) {
+                t.printStackTrace();
+            }
+
+            if(DEBUG) System.err.println("MainAction.run(): "+Thread.currentThread().getName()+" user app fin");
+
+            if ( USE_MAIN_THREAD ) {
+                MainThread.exit();
+                if(DEBUG) System.err.println("MainAction.run(): "+Thread.currentThread().getName()+" MainThread fin - exit");
+                System.exit(0);
+            }
+        }
+    }
+    private static MainAction mainAction;
+
+    /** Your new java application main entry, which pipelines your application */
+    public static void main(String[] args) {
+        if(DEBUG) System.err.println("MainThread.main(): "+Thread.currentThread().getName()+" USE_MAIN_THREAD "+ USE_MAIN_THREAD );
+
+        if(args.length==0) {
+            return;
+        }
+
+        String mainClassName=args[0];
+        String[] mainClassArgs=new String[args.length-1];
+        if(args.length>1) {
+            System.arraycopy(args, 1, mainClassArgs, 0, args.length-1);
+        }
+
+        NativeLibLoader.loadNEWT();
+        
+        shouldStop = false;
+        tasks = new ArrayList();
+        tasksBlock = new ArrayList();
+        mainThread = Thread.currentThread();
+
+        mainAction = new MainAction(mainClassName, mainClassArgs);
+
+        if(NativeWindowFactory.TYPE_MACOSX.equals(NativeWindowFactory.getNativeWindowType(false))) {
+            MacDisplay.initSingleton();
+        }
+
+        if ( USE_MAIN_THREAD ) {
+            // dispatch user's main thread ..
+            mainAction.start();
+
+            // do our main thread task scheduling
+            run();
+        } else {
+            // run user's main in this thread 
+            mainAction.run();
+        }
+    }
+
+    /** invokes the given Runnable */
+    public static void invoke(boolean wait, Runnable r) {
+        if(r == null) {
+            return;
+        }
+
+        // if this main thread is not being used or
+        // if this is already the main thread .. just execute.
+        if( !isRunning() || mainThread == Thread.currentThread() ) {
+            r.run();
+            return;
+        }
+
+        synchronized(taskWorkerLock) {
+            tasks.add(r);
+            if(wait) {
+                tasksBlock.add(r);
+            }
+            taskWorkerLock.notifyAll();
+            if(wait) {
+                while(tasksBlock.size()>0) {
+                    try {
+                        taskWorkerLock.wait();
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+
+    public static void exit() {
+        if(DEBUG) System.err.println("MainThread.exit(): "+Thread.currentThread().getName()+" start");
+        synchronized(taskWorkerLock) { 
+            if(isRunning) {
+                shouldStop = true;
+            }
+            taskWorkerLock.notifyAll();
+        }
+        if(DEBUG) System.err.println("MainThread.exit(): "+Thread.currentThread().getName()+" end");
+    }
+
+    public static boolean isRunning() {
+        synchronized(taskWorkerLock) { 
+            return isRunning;
+        }
+    }
+
+    private static void waitUntilRunning() {
+        synchronized(taskWorkerLock) {
+            if(isExit) return;
+
+            while(!isRunning) {
+                try {
+                    taskWorkerLock.wait();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public static void run() {
+        if(DEBUG) System.err.println("MainThread.run(): "+Thread.currentThread().getName());
+        synchronized(taskWorkerLock) {
+            isRunning = true;
+            taskWorkerLock.notifyAll();
+        }
+        while(!shouldStop) {
+            try {
+                ArrayList localTasks=null;
+
+                // wait for something todo ..
+                synchronized(taskWorkerLock) {
+                    while(!shouldStop && tasks.size()==0) {
+                        try {
+                            taskWorkerLock.wait();
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    // seq. process all tasks until no blocking one exists in the list
+                    for(Iterator i = tasks.iterator(); tasksBlock.size()>0 && i.hasNext(); ) {
+                        Runnable task = (Runnable) i.next();
+                        task.run();
+                        i.remove();
+                        tasksBlock.remove(task);
+                    }
+
+                    // take over the tasks ..
+                    if(tasks.size()>0) {
+                        localTasks = tasks;
+                        tasks = new ArrayList();
+                    }
+                    taskWorkerLock.notifyAll();
+                }
+
+                // seq. process all unblocking tasks ..
+                if(null!=localTasks) {
+                    for(Iterator i = localTasks.iterator(); i.hasNext(); ) {
+                        Runnable task = (Runnable) i.next();
+                        task.run();
+                    }
+                }
+            } catch (Throwable t) {
+                // handle errors ..
+                t.printStackTrace();
+            } finally {
+                // epilog - unlock locked stuff
+            }
+        }
+        if(DEBUG) System.err.println("MainThread.run(): "+Thread.currentThread().getName()+" fin");
+        synchronized(taskWorkerLock) {
+            isRunning = false;
+            isExit = true;
+            taskWorkerLock.notifyAll();
+        }
+    }
+}
+
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsDisplay.java b/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsDisplay.java
new file mode 100755
index 000000000..f2e8d21ef
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsDisplay.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.windows;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.windows.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.impl.*;
+
+public class WindowsDisplay extends Display {
+
+    protected static final String WINDOW_CLASS_NAME = "NewtWindowClass";
+    private static int windowClassAtom;
+    private static long hInstance;
+
+    static {
+        NativeLibLoader.loadNEWT();
+
+        if (!WindowsWindow.initIDs()) {
+            throw new NativeWindowException("Failed to initialize WindowsWindow jmethodIDs");
+        }
+    }
+
+    public static void initSingleton() {
+        // just exist to ensure static init has been run
+    }
+
+
+    public WindowsDisplay() {
+    }
+
+    protected void createNative() {
+        aDevice = new WindowsGraphicsDevice();
+    }
+
+    protected void closeNative() { 
+        // Can't do .. only at application shutdown 
+        // UnregisterWindowClass(getWindowClassAtom(), getHInstance());
+    }
+
+    protected void dispatchMessages() {
+        DispatchMessages();
+    }
+
+    protected static synchronized int getWindowClassAtom() {
+        if(0 == windowClassAtom) {
+            windowClassAtom = RegisterWindowClass(WINDOW_CLASS_NAME, getHInstance());
+            if (0 == windowClassAtom) {
+                throw new NativeWindowException("Error while registering window class");
+            }
+        }
+        return windowClassAtom;
+    }
+
+    protected static synchronized long getHInstance() {
+        if(0 == hInstance) {
+            hInstance = LoadLibraryW("newt");
+            if (0 == hInstance) {
+                throw new NativeWindowException("Error finding HINSTANCE for \"newt\"");
+            }
+        }
+        return hInstance;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+    private static native long LoadLibraryW(String libraryName);
+    private static native int  RegisterWindowClass(String windowClassName, long hInstance);
+    private static native void UnregisterWindowClass(int wndClassAtom, long hInstance);
+
+    private static native void DispatchMessages();
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsScreen.java b/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsScreen.java
new file mode 100755
index 000000000..ab11f97dd
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsScreen.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.windows;
+
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.impl.*;
+import javax.media.nativewindow.*;
+
+public class WindowsScreen extends Screen {
+    static {
+        WindowsDisplay.initSingleton();
+    }
+
+
+    public WindowsScreen() {
+    }
+
+    protected void createNative(int index) {
+        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
+        setScreenSize(getWidthImpl(getIndex()), getHeightImpl(getIndex()));
+    }
+
+    protected void closeNative() { }
+
+    private        native int getWidthImpl(int scrn_idx);
+    private        native int getHeightImpl(int scrn_idx);
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsWindow.java b/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsWindow.java
new file mode 100755
index 000000000..7c8864190
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsWindow.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.windows;
+
+import javax.media.nativewindow.*;
+import com.jogamp.javafx.newt.*;
+
+public class WindowsWindow extends Window {
+
+    private long hmon;
+    private long hdc;
+    private long windowHandleClose;
+    private long parentWindowHandle;
+    // non fullscreen dimensions ..
+    private int nfs_width, nfs_height, nfs_x, nfs_y;
+    private final Insets insets = new Insets(0, 0, 0, 0);
+
+    static {
+        WindowsDisplay.initSingleton();
+    }
+
+    public WindowsWindow() {
+    }
+
+    Thread hdcOwner = null;
+
+    public synchronized int lockSurface() throws NativeWindowException {
+        int res = super.lockSurface(); 
+        if(LOCK_SUCCESS==res && 0!=windowHandle) {
+            if(hdc!=0) {
+                throw new NativeWindowException("NEWT Surface handle set HDC "+toHexString(hdc)+" - "+Thread.currentThread().getName()+" ; "+this);
+            }
+            hdc = GetDC(windowHandle);
+            hmon = MonitorFromWindow(windowHandle);
+            hdcOwner = Thread.currentThread();
+        }
+        return res;
+    }
+
+    public synchronized void unlockSurface() {
+        // prevalidate, before we change data ..
+        Thread cur = Thread.currentThread();
+        if ( getSurfaceLockOwner() != cur ) {
+            getLockedStack().printStackTrace();
+            throw new NativeWindowException(cur+": Not owner, owner is "+getSurfaceLockOwner());
+        }
+        if (0!=hdc && 0!=windowHandle) {
+            if(hdcOwner != cur) {
+                throw new NativeWindowException("NEWT Surface handle set HDC "+toHexString(hdc)+" by other thread "+hdcOwner+", this "+cur+" ; "+this);
+            }
+            ReleaseDC(windowHandle, hdc);
+            hdc=0;
+            hdcOwner=null;
+        }
+        super.unlockSurface();
+    }
+
+    public long getSurfaceHandle() {
+        return hdc;
+    }
+
+    public boolean hasDeviceChanged() {
+        if(0!=windowHandle) {
+            long _hmon = MonitorFromWindow(windowHandle);
+            if (hmon != _hmon) {
+                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                    Exception e = new Exception("!!! Window Device Changed "+Thread.currentThread().getName()+
+                                                ", HMON "+toHexString(hmon)+" -> "+toHexString(_hmon));
+                    e.printStackTrace();
+                }
+                hmon = _hmon;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        WindowsScreen  screen = (WindowsScreen) getScreen();
+        WindowsDisplay display = (WindowsDisplay) screen.getDisplay();
+        config = GraphicsConfigurationFactory.getFactory(display.getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, screen.getGraphicsScreen());
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+        windowHandle = CreateWindow(parentWindowHandle, 
+                                    display.getWindowClassAtom(), display.WINDOW_CLASS_NAME, display.getHInstance(), 
+                                    0, undecorated, x, y, width, height);
+        if (windowHandle == 0) {
+            throw new NativeWindowException("Error creating window");
+        }
+        this.parentWindowHandle = parentWindowHandle;
+        windowHandleClose = windowHandle;
+        if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+            Exception e = new Exception("!!! Window new window handle "+Thread.currentThread().getName()+
+                                        " (Parent HWND "+toHexString(parentWindowHandle)+
+                                        ") : HWND "+toHexString(windowHandle)+", "+Thread.currentThread());
+            e.printStackTrace();
+        }
+    }
+
+    protected void closeNative() {
+        if (hdc != 0) {
+            if(windowHandleClose != 0) {
+                ReleaseDC(windowHandleClose, hdc);
+            }
+            hdc = 0;
+        }
+        if(windowHandleClose != 0) {
+            DestroyWindow(windowHandleClose);
+            windowHandleClose = 0;
+        }
+    }
+
+    protected void windowDestroyed() {
+        windowHandleClose = 0;
+        super.windowDestroyed();
+    }
+
+    public void setVisible(boolean visible) {
+        if(this.visible!=visible && 0!=windowHandle) {
+            this.visible=visible;
+            setVisible0(windowHandle, visible);
+        }
+    }
+
+    // @Override
+    public void setSize(int width, int height) {
+        if (0!=windowHandle && (width != this.width || this.height != height)) {
+            if(!fullscreen) {
+                nfs_width=width;
+                nfs_height=height;
+            }
+            this.width = width;
+            this.height = height;
+            setSize0(parentWindowHandle, windowHandle, x, y, width, height);
+        }
+    }
+
+    //@Override
+    public void setPosition(int x, int y) {
+        if (0!=windowHandle && (this.x != x || this.y != y)) {
+            if(!fullscreen) {
+                nfs_x=x;
+                nfs_y=y;
+            }
+            this.x = x;
+            this.y = y;
+            setPosition(parentWindowHandle, windowHandle, x , y);
+        }
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        if(0!=windowHandle && (this.fullscreen!=fullscreen)) {
+            int x,y,w,h;
+            this.fullscreen=fullscreen;
+            if(fullscreen) {
+                x = 0; y = 0;
+                w = screen.getWidth();
+                h = screen.getHeight();
+            } else {
+                x = nfs_x;
+                y = nfs_y;
+                w = nfs_width;
+                h = nfs_height;
+            }
+            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                System.err.println("WindowsWindow fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
+            }
+            setFullscreen0(parentWindowHandle, windowHandle, x, y, w, h, undecorated, fullscreen);
+        }
+        return fullscreen;
+    }
+
+    // @Override
+    public void requestFocus() {
+        super.requestFocus();
+        if (windowHandle != 0L) {
+            requestFocus(windowHandle);
+        }
+    }
+
+    // @Override
+    public void setTitle(String title) {
+        if (title == null) {
+            title = "";
+        }
+        if (0!=windowHandle && !title.equals(getTitle())) {
+            super.setTitle(title);
+            setTitle(windowHandle, title);
+        }
+    }
+
+    public Insets getInsets() {
+        return (Insets)insets.clone();
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+    protected static native boolean initIDs();
+    private        native long CreateWindow(long parentWindowHandle, 
+                                            int wndClassAtom, String wndName, 
+                                            long hInstance, long visualID,
+                                            boolean isUndecorated,
+                                            int x, int y, int width, int height);
+    private        native void DestroyWindow(long windowHandle);
+    private        native long GetDC(long windowHandle);
+    private        native void ReleaseDC(long windowHandle, long hdc);
+    private        native long MonitorFromWindow(long windowHandle);
+    private static native void setVisible0(long windowHandle, boolean visible);
+    private        native void setSize0(long parentWindowHandle, long windowHandle, int x, int y, int width, int height);
+    private        native void setPosition(long parentWindowHandle, long windowHandle, int x, int y);
+    private        native void setFullscreen0(long parentWindowHandle, long windowHandle, int x, int y, int width, int height, boolean isUndecorated, boolean on);
+    private static native void setTitle(long windowHandle, String title);
+    private static native void requestFocus(long windowHandle);
+
+    private void insetsChanged(int left, int top, int right, int bottom) {
+        if (left != -1 && top != -1 && right != -1 && bottom != -1) {
+            insets.left = left;
+            insets.top = top;
+            insets.right = right;
+            insets.bottom = bottom;
+        }
+    }
+    private void sizeChanged(int newWidth, int newHeight) {
+        width = newWidth;
+        height = newHeight;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        }
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
+    }
+
+    private void positionChanged(int newX, int newY) {
+        x = newX;
+        y = newY;
+        if(!fullscreen) {
+            nfs_x=x;
+            nfs_y=y;
+        }
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
+    }
+
+    /**
+     *
+     * @param focusOwner if focusGained is true, focusOwner is the previous
+     * focus owner, if focusGained is false, focusOwner is the new focus owner
+     * @param focusGained
+     */
+    private void focusChanged(long focusOwner, boolean focusGained) {
+        if (focusGained) {
+            sendWindowEvent(WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
+        } else {
+            sendWindowEvent(WindowEvent.EVENT_WINDOW_LOST_FOCUS);
+        }
+    }
+}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Display.java b/src/newt/classes/com/jogamp/javafx/newt/x11/X11Display.java
new file mode 100755
index 000000000..96d55c082
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/x11/X11Display.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.x11;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.nativewindow.impl.x11.X11Util;
+
+public class X11Display extends Display {
+    static {
+        NativeLibLoader.loadNEWT();
+
+        if (!initIDs()) {
+            throw new NativeWindowException("Failed to initialize X11Display jmethodIDs");
+        }
+
+        if (!X11Window.initIDs()) {
+            throw new NativeWindowException("Failed to initialize X11Window jmethodIDs");
+        }
+    }
+
+    public static void initSingleton() {
+        // just exist to ensure static init has been run
+    }
+
+
+    public X11Display() {
+    }
+
+    protected void createNative() {
+        long handle= X11Util.getThreadLocalDisplay(name);
+        if (handle == 0 ) {
+            throw new RuntimeException("Error creating display: "+name);
+        }
+        try {
+            CompleteDisplay(handle);
+        } catch(RuntimeException e) {
+            X11Util.closeThreadLocalDisplay(name);
+            throw e;
+        }
+        aDevice = new X11GraphicsDevice(handle);
+    }
+
+    protected void closeNative() {
+        if(0==X11Util.closeThreadLocalDisplay(name)) {
+            throw new NativeWindowException(this+" was not mapped");
+        }
+    }
+
+    protected void dispatchMessages() {
+        DispatchMessages(getHandle(), javaObjectAtom, windowDeleteAtom);
+    }
+
+    protected void lockDisplay() {
+        super.lockDisplay();
+        LockDisplay(getHandle());
+    }
+
+    protected void unlockDisplay() {
+        UnlockDisplay(getHandle());
+        super.unlockDisplay();
+    }
+
+    protected long getJavaObjectAtom() { return javaObjectAtom; }
+    protected long getWindowDeleteAtom() { return windowDeleteAtom; }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+    private static native boolean initIDs();
+
+    private native void LockDisplay(long handle);
+    private native void UnlockDisplay(long handle);
+
+    private native void CompleteDisplay(long handle);
+
+    private native void DispatchMessages(long display, long javaObjectAtom, long windowDeleteAtom);
+
+    private void displayCompleted(long javaObjectAtom, long windowDeleteAtom) {
+        this.javaObjectAtom=javaObjectAtom;
+        this.windowDeleteAtom=windowDeleteAtom;
+    }
+
+    private long windowDeleteAtom;
+    private long javaObjectAtom;
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Screen.java b/src/newt/classes/com/jogamp/javafx/newt/x11/X11Screen.java
new file mode 100755
index 000000000..d90b1868d
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/x11/X11Screen.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.x11;
+
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.impl.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+
+public class X11Screen extends Screen {
+
+    static {
+        X11Display.initSingleton();
+    }
+
+
+    public X11Screen() {
+    }
+
+    protected void createNative(int index) {
+        long handle = GetScreen(display.getHandle(), index);
+        if (handle == 0 ) {
+            throw new RuntimeException("Error creating screen: "+index);
+        }
+        aScreen = new X11GraphicsScreen((X11GraphicsDevice)getDisplay().getGraphicsDevice(), index);
+        setScreenSize(getWidth0(display.getHandle(), index),
+                      getHeight0(display.getHandle(), index));
+    }
+
+    protected void closeNative() { }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    private native long GetScreen(long dpy, int scrn_idx);
+    private native int  getWidth0(long display, int scrn_idx);
+    private native int  getHeight0(long display, int scrn_idx);
+}
+
diff --git a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Window.java b/src/newt/classes/com/jogamp/javafx/newt/x11/X11Window.java
new file mode 100755
index 000000000..8387160c9
--- /dev/null
+++ b/src/newt/classes/com/jogamp/javafx/newt/x11/X11Window.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.javafx.newt.x11;
+
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.impl.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+
+public class X11Window extends Window {
+    private static final String WINDOW_CLASS_NAME = "NewtWindow";
+    // non fullscreen dimensions ..
+    private int nfs_width, nfs_height, nfs_x, nfs_y;
+
+    static {
+        X11Display.initSingleton();
+    }
+
+    public X11Window() {
+    }
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        X11Screen screen = (X11Screen) getScreen();
+        X11Display display = (X11Display) screen.getDisplay();
+        config = GraphicsConfigurationFactory.getFactory(display.getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, screen.getGraphicsScreen());
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+        X11GraphicsConfiguration x11config = (X11GraphicsConfiguration) config;
+        long visualID = x11config.getVisualID();
+        long w = CreateWindow(parentWindowHandle, 
+                              display.getHandle(), screen.getIndex(), visualID, 
+                              display.getJavaObjectAtom(), display.getWindowDeleteAtom(), x, y, width, height);
+        if (w == 0 || w!=windowHandle) {
+            throw new NativeWindowException("Error creating window: "+w);
+        }
+        this.parentWindowHandle = parentWindowHandle;
+        windowHandleClose = windowHandle;
+        displayHandleClose = display.getHandle();
+    }
+
+    protected void closeNative() {
+        if(0!=displayHandleClose && 0!=windowHandleClose && null!=getScreen() ) {
+            X11Display display = (X11Display) getScreen().getDisplay();
+            CloseWindow(displayHandleClose, windowHandleClose, display.getJavaObjectAtom());
+            windowHandleClose = 0;
+            displayHandleClose = 0;
+        }
+    }
+
+    protected void windowDestroyed() {
+        windowHandleClose = 0;
+        displayHandleClose = 0;
+        super.windowDestroyed();
+    }
+
+    public void setVisible(boolean visible) {
+        if(0!=windowHandle && this.visible!=visible) {
+            this.visible=visible;
+            setVisible0(getDisplayHandle(), windowHandle, visible);
+            clearEventMask();
+        }
+    }
+
+    public void requestFocus() {
+        super.requestFocus();
+    }
+
+    public void setSize(int width, int height) {
+        if(DEBUG_IMPLEMENTATION) {
+            System.err.println("X11Window setSize: "+this.x+"/"+this.y+" "+this.width+"x"+this.height+" -> "+width+"x"+height);
+            // Exception e = new Exception("XXXXXXXXXX");
+            // e.printStackTrace();
+        }
+        this.width = width;
+        this.height = height;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        }
+        if(0!=windowHandle) {
+            setSize0(parentWindowHandle, getDisplayHandle(), getScreenIndex(), windowHandle, x, y, width, height, (undecorated||fullscreen)?-1:1, false);
+        }
+    }
+
+    public void setPosition(int x, int y) {
+        if(DEBUG_IMPLEMENTATION) {
+            System.err.println("X11Window setPosition: "+this.x+"/"+this.y+" -> "+x+"/"+y);
+            // Exception e = new Exception("XXXXXXXXXX");
+            // e.printStackTrace();
+        }
+        this.x = x;
+        this.y = y;
+        if(!fullscreen) {
+            nfs_x=x;
+            nfs_y=y;
+        }
+        if(0!=windowHandle) {
+            setPosition0(getDisplayHandle(), windowHandle, x, y);
+        }
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        if(0!=windowHandle && this.fullscreen!=fullscreen) {
+            int x,y,w,h;
+            this.fullscreen=fullscreen;
+            if(fullscreen) {
+                x = 0; y = 0;
+                w = screen.getWidth();
+                h = screen.getHeight();
+            } else {
+                x = nfs_x;
+                y = nfs_y;
+                w = nfs_width;
+                h = nfs_height;
+            }
+            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                System.err.println("X11Window fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
+            }
+            setSize0(parentWindowHandle, getDisplayHandle(), getScreenIndex(), windowHandle, x, y, w, h, (undecorated||fullscreen)?-1:1, false);
+        }
+        return fullscreen;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    protected static native boolean initIDs();
+    private        native long CreateWindow(long parentWindowHandle, long display, int screen_index, 
+                                            long visualID, long javaObjectAtom, long windowDeleteAtom, int x, int y, int width, int height);
+    private        native void CloseWindow(long display, long windowHandle, long javaObjectAtom);
+    private        native void setVisible0(long display, long windowHandle, boolean visible);
+    private        native void setSize0(long parentWindowHandle, long display, int screen_index, long windowHandle, 
+                                        int x, int y, int width, int height, int decorationToggle, boolean setVisible);
+    private        native void setPosition0(long display, long windowHandle, int x, int y);
+
+    private void windowChanged(int newX, int newY, int newWidth, int newHeight) {
+        if(width != newWidth || height != newHeight) {
+            if(DEBUG_IMPLEMENTATION) {
+                System.err.println("X11Window windowChanged size: "+this.width+"x"+this.height+" -> "+newWidth+"x"+newHeight);
+            }
+            width = newWidth;
+            height = newHeight;
+            if(!fullscreen) {
+                nfs_width=width;
+                nfs_height=height;
+            }
+            sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
+        }
+        if( 0==parentWindowHandle && ( x != newX || y != newY ) ) {
+            if(DEBUG_IMPLEMENTATION) {
+                System.err.println("X11Window windowChanged position: "+this.x+"/"+this.y+" -> "+newX+"x"+newY);
+            }
+            x = newX;
+            y = newY;
+            if(!fullscreen) {
+                nfs_x=x;
+                nfs_y=y;
+            }
+            sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
+        }
+    }
+
+    private void windowCreated(long windowHandle) {
+        this.windowHandle = windowHandle;
+    }
+
+    private long   windowHandleClose;
+    private long   displayHandleClose;
+    private long   parentWindowHandle;
+}
diff --git a/src/newt/classes/com/sun/javafx/newt/Display.java b/src/newt/classes/com/sun/javafx/newt/Display.java
deleted file mode 100755
index a4b7a4f51..000000000
--- a/src/newt/classes/com/sun/javafx/newt/Display.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-import javax.media.nativewindow.*;
-import com.sun.javafx.newt.impl.Debug;
-import com.sun.javafx.newt.util.EventDispatchThread;
-import java.util.*;
-
-public abstract class Display {
-    public static final boolean DEBUG = Debug.debug("Display");
-
-    private static Class getDisplayClass(String type) 
-        throws ClassNotFoundException 
-    {
-        Class displayClass = NewtFactory.getCustomClass(type, "Display");
-        if(null==displayClass) {
-            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
-                displayClass = Class.forName("com.sun.javafx.newt.opengl.kd.KDDisplay");
-            } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
-                displayClass = Class.forName("com.sun.javafx.newt.windows.WindowsDisplay");
-            } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-                displayClass = Class.forName("com.sun.javafx.newt.macosx.MacDisplay");
-            } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
-                displayClass = Class.forName("com.sun.javafx.newt.x11.X11Display");
-            } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
-                displayClass = Class.forName("com.sun.javafx.newt.awt.AWTDisplay");
-            } else {
-                throw new RuntimeException("Unknown display type \"" + type + "\"");
-            }
-        }
-        return displayClass;
-    }
-
-    // Unique Display for each thread
-    private static ThreadLocal currentDisplayMap = new ThreadLocal();
-
-    /** Returns the thread local display map */
-    public static Map getCurrentDisplayMap() {
-        Map displayMap = (Map) currentDisplayMap.get();
-        if(null==displayMap) {
-            displayMap = new HashMap();
-            currentDisplayMap.set( displayMap );
-        }
-        return displayMap;
-    }
-
-    /** maps the given display to the thread local display map
-      * and notifies all threads synchronized to this display map. */
-    protected static Display setCurrentDisplay(Display display) {
-        Map displayMap = getCurrentDisplayMap();
-        Display oldDisplay = null;
-        synchronized(displayMap) {
-            String name = display.getName();
-            if(null==name) name="nil";
-            oldDisplay = (Display) displayMap.put(name, display);
-            displayMap.notifyAll();
-        }
-        return oldDisplay;
-    }
-
-    /** removes the mapping of the given name from the thread local display map
-      * and notifies all threads synchronized to this display map. */
-    protected static Display removeCurrentDisplay(String name) {
-        if(null==name) name="nil";
-        Map displayMap = getCurrentDisplayMap();
-        Display oldDisplay = null;
-        synchronized(displayMap) {
-            oldDisplay = (Display) displayMap.remove(name);
-            displayMap.notifyAll();
-        }
-        return oldDisplay;
-    }
-
-    /** Returns the thread local display mapped to the given name */
-    public static Display getCurrentDisplay(String name) {
-        if(null==name) name="nil";
-        Map displayMap = getCurrentDisplayMap();
-        Display display = (Display) displayMap.get(name);
-        return display;
-    }
-
-    public static void dumpDisplayMap(String prefix) {
-        Map displayMap = getCurrentDisplayMap();
-        Set entrySet = displayMap.entrySet();
-        Iterator i = entrySet.iterator();
-        System.err.println(prefix+" DisplayMap["+entrySet.size()+"] "+Thread.currentThread());
-        for(int j=0; i.hasNext(); j++) {
-            Map.Entry entry = (Map.Entry) i.next();
-            System.err.println("  ["+j+"] "+entry.getKey()+" -> "+entry.getValue());
-        }
-    }
-
-    /** Returns the thread local display collection */
-    public static Collection getCurrentDisplays() {
-        return getCurrentDisplayMap().values();
-    }
-
-    /** Make sure to reuse a Display with the same name */
-    protected static Display create(String type, String name) {
-        try {
-            if(DEBUG) {
-                dumpDisplayMap("Display.create("+name+") BEGIN");
-            }
-            Display display = getCurrentDisplay(name);
-            if(null==display) {
-                Class displayClass = getDisplayClass(type);
-                display = (Display) displayClass.newInstance();
-                display.name=name;
-                display.refCount=1;
-
-                if(NewtFactory.useEDT()) {
-                    Thread current = Thread.currentThread();
-                    display.eventDispatchThread = new EventDispatchThread(display, current.getThreadGroup(), current.getName());
-                    display.eventDispatchThread.start();
-                    final Display f_dpy = display;
-                    display.eventDispatchThread.invokeAndWait(new Runnable() {
-                        public void run() {
-                            f_dpy.createNative();
-                        }
-                    } );
-                } else {
-                    display.createNative();
-                }
-                if(null==display.aDevice) {
-                    throw new RuntimeException("Display.createNative() failed to instanciate an AbstractGraphicsDevice");
-                }
-                setCurrentDisplay(display);
-                if(DEBUG) {
-                    System.err.println("Display.create("+name+") NEW: "+display+" "+Thread.currentThread());
-                }
-            } else {
-                synchronized(display) {
-                    display.refCount++;
-                    if(DEBUG) {
-                        System.err.println("Display.create("+name+") REUSE: refCount "+display.refCount+", "+display+" "+Thread.currentThread());
-                    }
-                }
-            }
-            if(DEBUG) {
-                dumpDisplayMap("Display.create("+name+") END");
-            }
-            return display;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    protected static Display wrapHandle(String type, String name, AbstractGraphicsDevice aDevice) {
-        try {
-            Class displayClass = getDisplayClass(type);
-            Display display = (Display) displayClass.newInstance();
-            display.name=name;
-            display.aDevice=aDevice;
-            return display;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public EventDispatchThread getEDT() { return eventDispatchThread; }
-
-    public synchronized void destroy() {
-        if(DEBUG) {
-            dumpDisplayMap("Display.destroy("+name+") BEGIN");
-        }
-        refCount--;
-        if(0==refCount) {
-            removeCurrentDisplay(name);
-            if(DEBUG) {
-                System.err.println("Display.destroy("+name+") REMOVE: "+this+" "+Thread.currentThread());
-            }
-            if(null!=eventDispatchThread) {
-                final Display f_dpy = this;
-                final EventDispatchThread f_edt = eventDispatchThread;
-                eventDispatchThread.invokeAndWait(new Runnable() {
-                    public void run() {
-                        f_dpy.closeNative();
-                        f_edt.stop();
-                    }
-                } );
-            } else {
-                closeNative();
-            }
-            if(null!=eventDispatchThread) { 
-                eventDispatchThread.waitUntilStopped();
-                eventDispatchThread=null;
-            }
-            aDevice = null;
-        } else {
-            if(DEBUG) {
-                System.err.println("Display.destroy("+name+") KEEP: refCount "+refCount+", "+this+" "+Thread.currentThread());
-            }
-        }
-        if(DEBUG) {
-            dumpDisplayMap("Display.destroy("+name+") END");
-        }
-    }
-
-    protected abstract void createNative();
-    protected abstract void closeNative();
-
-    public String getName() {
-        return name;
-    }
-
-    public long getHandle() {
-        if(null!=aDevice) {
-            return aDevice.getHandle();
-        }
-        return 0;
-    }
-
-    public AbstractGraphicsDevice getGraphicsDevice() {
-        return aDevice;
-    }
-
-    public void pumpMessages() {
-        if(null!=eventDispatchThread) { 
-            dispatchMessages();
-        } else {
-            synchronized(this) {
-                dispatchMessages();
-            }
-        }
-    }
-
-    public String toString() {
-        return "NEWT-Display["+name+", refCount "+refCount+", "+aDevice+"]";
-    }
-
-    protected abstract void dispatchMessages();
-
-    /** Default impl. nop - Currently only X11 needs a Display lock */
-    protected void lockDisplay() { }
-
-    /** Default impl. nop - Currently only X11 needs a Display lock */
-    protected void unlockDisplay() { }
-
-    protected EventDispatchThread eventDispatchThread = null;
-    protected String name;
-    protected int refCount;
-    protected AbstractGraphicsDevice aDevice;
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/Event.java b/src/newt/classes/com/sun/javafx/newt/Event.java
deleted file mode 100644
index 3c045c52b..000000000
--- a/src/newt/classes/com/sun/javafx/newt/Event.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-public class Event {
-    private boolean isSystemEvent;
-    private int eventType;
-    private Window source;
-    private long when;
-
-    Event(boolean isSystemEvent, int eventType, Window source, long when) {
-        this.isSystemEvent = isSystemEvent;
-        this.eventType = eventType;
-        this.source = source;
-        this.when = when;
-    }
-
-    protected Event(int eventType, Window source, long when) {
-        this(false, eventType, source, when);
-    }
-
-    /** Indicates whether this event was produced by the system or
-        generated by user code. */
-    public final boolean isSystemEvent() {
-        return isSystemEvent;
-    }
-
-    /** Returns the event type of this event. */
-    public final int getEventType() {
-        return eventType;
-    }
-
-    /** Returns the source Window which produced this Event. */
-    public final Window getSource() {
-        return source;
-    }
-
-    /** Returns the timestamp, in milliseconds, of this event. */
-    public final long getWhen()  {
-        return when;
-    }
-
-    public String toString() {
-        return "Event[sys:"+isSystemEvent()+", source:"+getSource()+", when:"+getWhen()+"]";
-    }
-
-    public static String toHexString(int hex) {
-        return "0x" + Integer.toHexString(hex);
-    }
-
-    public static String toHexString(long hex) {
-        return "0x" + Long.toHexString(hex);
-    }
-
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/EventListener.java b/src/newt/classes/com/sun/javafx/newt/EventListener.java
deleted file mode 100644
index a312752fe..000000000
--- a/src/newt/classes/com/sun/javafx/newt/EventListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-public interface EventListener
-{
-    public static final int WINDOW  = 1 << 0;
-    public static final int MOUSE   = 1 << 1;
-    public static final int KEY     = 1 << 2;
-    public static final int SURFACE = 1 << 3;
-
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/InputEvent.java b/src/newt/classes/com/sun/javafx/newt/InputEvent.java
deleted file mode 100644
index b49c72e75..000000000
--- a/src/newt/classes/com/sun/javafx/newt/InputEvent.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-public abstract class InputEvent extends Event
-{
- public static final int  SHIFT_MASK     = 1 << 0;
- public static final int  CTRL_MASK      = 1 << 1;
- public static final int  META_MASK      = 1 << 2;
- public static final int  ALT_MASK       = 1 << 3;
- public static final int  ALT_GRAPH_MASK = 1 << 5;
- public static final int  BUTTON1_MASK   = 1 << 6;
- public static final int  BUTTON2_MASK   = 1 << 7;
- public static final int  BUTTON3_MASK   = 1 << 8;
-
- protected InputEvent(boolean sysEvent, int eventType, Window source, long when, int modifiers) {
-    super(sysEvent, eventType, source, when);
-    this.consumed=false;
-    this.modifiers=modifiers;
- }
-
- public void consume() {
-    consumed=true;
- }
-
- public boolean isConsumed() {
-    return consumed;
- }
- public int getModifiers() {
-    return modifiers;
- }
- public boolean isAltDown() {
-    return (modifiers&ALT_MASK)!=0;
- }
- public boolean isAltGraphDown() {
-    return (modifiers&ALT_GRAPH_MASK)!=0;
- }
- public boolean isControlDown() {
-    return (modifiers&CTRL_MASK)!=0;
- }
- public boolean isMetaDown() {
-    return (modifiers&META_MASK)!=0;
- }
- public boolean isShiftDown()  {
-    return (modifiers&SHIFT_MASK)!=0;
- }
-
- public boolean isButton1Down()  {
-    return (modifiers&BUTTON1_MASK)!=0;
- }
-
- public boolean isButton2Down()  {
-    return (modifiers&BUTTON2_MASK)!=0;
- }
-
- public boolean isButton3Down()  {
-    return (modifiers&BUTTON3_MASK)!=0;
- }
-
- public String toString() {
-     return "InputEvent[modifiers:"+modifiers+"]";
- }
-
- private boolean consumed;
- private int modifiers;
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/Insets.java b/src/newt/classes/com/sun/javafx/newt/Insets.java
deleted file mode 100644
index 7d379cd92..000000000
--- a/src/newt/classes/com/sun/javafx/newt/Insets.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- *
- */
-package com.sun.javafx.newt;
-
-/**
- * Simple class representing insets.
- * 
- * @author tdv
- */
-public class Insets implements Cloneable {
-    public int top;
-    public int left;
-    public int bottom;
-    public int right;
-
-    /**
-     * Creates and initializes a new <code>Insets</code> object with the
-     * specified top, left, bottom, and right insets.
-     * @param       top   the inset from the top.
-     * @param       left   the inset from the left.
-     * @param       bottom   the inset from the bottom.
-     * @param       right   the inset from the right.
-     */
-    public Insets(int top, int left, int bottom, int right) {
-        this.top = top;
-        this.left = left;
-        this.bottom = bottom;
-        this.right = right;
-    }
-
-    /**
-     * Checks whether two insets objects are equal. Two instances
-     * of <code>Insets</code> are equal if the four integer values
-     * of the fields <code>top</code>, <code>left</code>,
-     * <code>bottom</code>, and <code>right</code> are all equal.
-     * @return      <code>true</code> if the two insets are equal;
-     *                          otherwise <code>false</code>.
-     */
-    public boolean equals(Object obj) {
-        if (obj instanceof Insets) {
-            Insets insets = (Insets)obj;
-            return ((top == insets.top) && (left == insets.left) &&
-                (bottom == insets.bottom) && (right == insets.right));
-        }
-        return false;
-    }
-
-    /**
-     * Returns the hash code for this Insets.
-     *
-     * @return    a hash code for this Insets.
-     */
-    public int hashCode() {
-        int sum1 = left + bottom;
-        int sum2 = right + top;
-        int val1 = sum1 * (sum1 + 1)/2 + left;
-        int val2 = sum2 * (sum2 + 1)/2 + top;
-        int sum3 = val1 + val2;
-        return sum3 * (sum3 + 1)/2 + val2;
-    }
-
-    public String toString() {
-    	return getClass().getName() + "[top="  + top + ",left=" + left +
-            ",bottom=" + bottom + ",right=" + right + "]";
-    }
-
-    public Object clone() {
-        try {
-            return super.clone();
-        } catch (CloneNotSupportedException ex) {
-            throw new InternalError();
-        }
-    }
-
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/KeyEvent.java b/src/newt/classes/com/sun/javafx/newt/KeyEvent.java
deleted file mode 100644
index c7450da67..000000000
--- a/src/newt/classes/com/sun/javafx/newt/KeyEvent.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-public class KeyEvent extends InputEvent
-{
- KeyEvent(boolean sysEvent, int eventType, Window source, long when, int modifiers, int keyCode, char keyChar) {
-     super(sysEvent, eventType, source, when, modifiers); 
-     this.keyCode=keyCode;
-     this.keyChar=keyChar;
- }
- public KeyEvent(int eventType, Window source, long when, int modifiers, int keyCode, char keyChar) {
-     this(false, eventType, source, when, modifiers, keyCode, keyChar);
- }
-
- public char getKeyChar() {
-    return keyChar;
- }
- public int getKeyCode() {
-    return keyCode;
- }
-
- public String toString() {
-    return "KeyEvent["+getEventTypeString(getEventType())+
-                     ", code "+keyCode+"("+toHexString(keyCode)+"), char <"+keyChar+"> ("+toHexString((int)keyChar)+"), isActionKey "+isActionKey()+", "+super.toString()+"]";
- }
-
- public static String getEventTypeString(int type) {
-    switch(type) {
-        case EVENT_KEY_PRESSED: return "EVENT_KEY_PRESSED";
-        case EVENT_KEY_RELEASED: return "EVENT_KEY_RELEASED";
-        case EVENT_KEY_TYPED: return "EVENT_KEY_TYPED";
-        default: return "unknown (" + type + ")";
-    }
- }
-
- public boolean   isActionKey() {
-    switch (keyCode) {
-      case VK_HOME:
-      case VK_END:
-      case VK_PAGE_UP:
-      case VK_PAGE_DOWN:
-      case VK_UP:
-      case VK_DOWN:
-      case VK_LEFT:
-      case VK_RIGHT:
-
-      case VK_F1:
-      case VK_F2:
-      case VK_F3:
-      case VK_F4:
-      case VK_F5:
-      case VK_F6:
-      case VK_F7:
-      case VK_F8:
-      case VK_F9:
-      case VK_F10:
-      case VK_F11:
-      case VK_F12:
-      case VK_F13:
-      case VK_F14:
-      case VK_F15:
-      case VK_F16:
-      case VK_F17:
-      case VK_F18:
-      case VK_F19:
-      case VK_F20:
-      case VK_F21:
-      case VK_F22:
-      case VK_F23:
-      case VK_F24:
-      case VK_PRINTSCREEN:
-      case VK_CAPS_LOCK:
-      case VK_PAUSE:
-      case VK_INSERT:
-
-      case VK_HELP:
-      case VK_WINDOWS:
-          return true;
-    }
-    return false;
- }
-
-    private int keyCode;
-    private char keyChar;
-
-    public static final int EVENT_KEY_PRESSED = 300;
-    public static final int EVENT_KEY_RELEASED= 301;
-    public static final int EVENT_KEY_TYPED   = 302;
-
-    /* Virtual key codes. */
-
-    public static final int VK_ENTER          = '\n';
-    public static final int VK_BACK_SPACE     = '\b';
-    public static final int VK_TAB            = '\t';
-    public static final int VK_CANCEL         = 0x03;
-    public static final int VK_CLEAR          = 0x0C;
-    public static final int VK_SHIFT          = 0x10;
-    public static final int VK_CONTROL        = 0x11;
-    public static final int VK_ALT            = 0x12;
-    public static final int VK_PAUSE          = 0x13;
-    public static final int VK_CAPS_LOCK      = 0x14;
-    public static final int VK_ESCAPE         = 0x1B;
-    public static final int VK_SPACE          = 0x20;
-    public static final int VK_PAGE_UP        = 0x21;
-    public static final int VK_PAGE_DOWN      = 0x22;
-    public static final int VK_END            = 0x23;
-    public static final int VK_HOME           = 0x24;
-
-    /**
-     * Constant for the non-numpad <b>left</b> arrow key.
-     * @see #VK_KP_LEFT
-     */
-    public static final int VK_LEFT           = 0x25;
-
-    /**
-     * Constant for the non-numpad <b>up</b> arrow key.
-     * @see #VK_KP_UP
-     */
-    public static final int VK_UP             = 0x26;
-
-    /**
-     * Constant for the non-numpad <b>right</b> arrow key.
-     * @see #VK_KP_RIGHT
-     */
-    public static final int VK_RIGHT          = 0x27;
-
-    /**
-     * Constant for the non-numpad <b>down</b> arrow key.
-     * @see #VK_KP_DOWN
-     */
-    public static final int VK_DOWN           = 0x28;
-
-    /**
-     * Constant for the comma key, ","
-     */
-    public static final int VK_COMMA          = 0x2C;
-
-    /**
-     * Constant for the minus key, "-"
-     * @since 1.2
-     */
-    public static final int VK_MINUS          = 0x2D;
-
-    /**
-     * Constant for the period key, "."
-     */
-    public static final int VK_PERIOD         = 0x2E;
-
-    /**
-     * Constant for the forward slash key, "/"
-     */
-    public static final int VK_SLASH          = 0x2F;
-
-    /** VK_0 thru VK_9 are the same as ASCII '0' thru '9' (0x30 - 0x39) */
-    public static final int VK_0              = 0x30;
-    public static final int VK_1              = 0x31;
-    public static final int VK_2              = 0x32;
-    public static final int VK_3              = 0x33;
-    public static final int VK_4              = 0x34;
-    public static final int VK_5              = 0x35;
-    public static final int VK_6              = 0x36;
-    public static final int VK_7              = 0x37;
-    public static final int VK_8              = 0x38;
-    public static final int VK_9              = 0x39;
-
-    /**
-     * Constant for the semicolon key, ";"
-     */
-    public static final int VK_SEMICOLON      = 0x3B;
-
-    /**
-     * Constant for the equals key, "="
-     */
-    public static final int VK_EQUALS         = 0x3D;
-
-    /** VK_A thru VK_Z are the same as ASCII 'A' thru 'Z' (0x41 - 0x5A) */
-    public static final int VK_A              = 0x41;
-    public static final int VK_B              = 0x42;
-    public static final int VK_C              = 0x43;
-    public static final int VK_D              = 0x44;
-    public static final int VK_E              = 0x45;
-    public static final int VK_F              = 0x46;
-    public static final int VK_G              = 0x47;
-    public static final int VK_H              = 0x48;
-    public static final int VK_I              = 0x49;
-    public static final int VK_J              = 0x4A;
-    public static final int VK_K              = 0x4B;
-    public static final int VK_L              = 0x4C;
-    public static final int VK_M              = 0x4D;
-    public static final int VK_N              = 0x4E;
-    public static final int VK_O              = 0x4F;
-    public static final int VK_P              = 0x50;
-    public static final int VK_Q              = 0x51;
-    public static final int VK_R              = 0x52;
-    public static final int VK_S              = 0x53;
-    public static final int VK_T              = 0x54;
-    public static final int VK_U              = 0x55;
-    public static final int VK_V              = 0x56;
-    public static final int VK_W              = 0x57;
-    public static final int VK_X              = 0x58;
-    public static final int VK_Y              = 0x59;
-    public static final int VK_Z              = 0x5A;
-
-    /**
-     * Constant for the open bracket key, "["
-     */
-    public static final int VK_OPEN_BRACKET   = 0x5B;
-
-    /**
-     * Constant for the back slash key, "\"
-     */
-    public static final int VK_BACK_SLASH     = 0x5C;
-
-    /**
-     * Constant for the close bracket key, "]"
-     */
-    public static final int VK_CLOSE_BRACKET  = 0x5D;
-
-    public static final int VK_NUMPAD0        = 0x60;
-    public static final int VK_NUMPAD1        = 0x61;
-    public static final int VK_NUMPAD2        = 0x62;
-    public static final int VK_NUMPAD3        = 0x63;
-    public static final int VK_NUMPAD4        = 0x64;
-    public static final int VK_NUMPAD5        = 0x65;
-    public static final int VK_NUMPAD6        = 0x66;
-    public static final int VK_NUMPAD7        = 0x67;
-    public static final int VK_NUMPAD8        = 0x68;
-    public static final int VK_NUMPAD9        = 0x69;
-    public static final int VK_MULTIPLY       = 0x6A;
-    public static final int VK_ADD            = 0x6B;
-
-    /** 
-     * This constant is obsolete, and is included only for backwards
-     * compatibility.
-     * @see #VK_SEPARATOR
-     */
-    public static final int VK_SEPARATER      = 0x6C;
-
-    /** 
-     * Constant for the Numpad Separator key. 
-     * @since 1.4
-     */
-    public static final int VK_SEPARATOR      = VK_SEPARATER;
-
-    public static final int VK_SUBTRACT       = 0x6D;
-    public static final int VK_DECIMAL        = 0x6E;
-    public static final int VK_DIVIDE         = 0x6F;
-    public static final int VK_DELETE         = 0x7F; /* ASCII DEL */
-    public static final int VK_NUM_LOCK       = 0x90;
-    public static final int VK_SCROLL_LOCK    = 0x91;
-
-    /** Constant for the F1 function key. */
-    public static final int VK_F1             = 0x70;
-
-    /** Constant for the F2 function key. */
-    public static final int VK_F2             = 0x71;
-
-    /** Constant for the F3 function key. */
-    public static final int VK_F3             = 0x72;
-
-    /** Constant for the F4 function key. */
-    public static final int VK_F4             = 0x73;
-
-    /** Constant for the F5 function key. */
-    public static final int VK_F5             = 0x74;
-
-    /** Constant for the F6 function key. */
-    public static final int VK_F6             = 0x75;
-
-    /** Constant for the F7 function key. */
-    public static final int VK_F7             = 0x76;
-
-    /** Constant for the F8 function key. */
-    public static final int VK_F8             = 0x77;
-
-    /** Constant for the F9 function key. */
-    public static final int VK_F9             = 0x78;
-
-    /** Constant for the F10 function key. */
-    public static final int VK_F10            = 0x79;
-
-    /** Constant for the F11 function key. */
-    public static final int VK_F11            = 0x7A;
-
-    /** Constant for the F12 function key. */
-    public static final int VK_F12            = 0x7B;
-
-    /**
-     * Constant for the F13 function key.
-     * @since 1.2
-     */
-    /* F13 - F24 are used on IBM 3270 keyboard; use random range for constants. */
-    public static final int VK_F13            = 0xF000;
- 
-    /**
-     * Constant for the F14 function key.
-     * @since 1.2
-     */
-    public static final int VK_F14            = 0xF001;
- 
-    /**
-     * Constant for the F15 function key.
-     * @since 1.2
-     */
-    public static final int VK_F15            = 0xF002;
- 
-    /**
-     * Constant for the F16 function key.
-     * @since 1.2
-     */
-    public static final int VK_F16            = 0xF003;
- 
-    /**
-     * Constant for the F17 function key.
-     * @since 1.2
-     */
-    public static final int VK_F17            = 0xF004;
- 
-    /**
-     * Constant for the F18 function key.
-     * @since 1.2
-     */
-    public static final int VK_F18            = 0xF005;
- 
-    /**
-     * Constant for the F19 function key.
-     * @since 1.2
-     */
-    public static final int VK_F19            = 0xF006;
- 
-    /**
-     * Constant for the F20 function key.
-     * @since 1.2
-     */
-    public static final int VK_F20            = 0xF007;
- 
-    /**
-     * Constant for the F21 function key.
-     * @since 1.2
-     */
-    public static final int VK_F21            = 0xF008;
- 
-    /**
-     * Constant for the F22 function key.
-     * @since 1.2
-     */
-    public static final int VK_F22            = 0xF009;
- 
-    /**
-     * Constant for the F23 function key.
-     * @since 1.2
-     */
-    public static final int VK_F23            = 0xF00A;
- 
-    /**
-     * Constant for the F24 function key.
-     * @since 1.2
-     */
-    public static final int VK_F24            = 0xF00B;
- 
-    public static final int VK_PRINTSCREEN    = 0x9A;
-    public static final int VK_INSERT         = 0x9B;
-    public static final int VK_HELP           = 0x9C;
-    public static final int VK_META           = 0x9D;
-
-    public static final int VK_BACK_QUOTE     = 0xC0;
-    public static final int VK_QUOTE          = 0xDE;
-
-    /**
-     * Constant for the numeric keypad <b>up</b> arrow key.
-     * @see #VK_UP
-     * @since 1.2
-     */
-    public static final int VK_KP_UP          = 0xE0;
-
-    /**
-     * Constant for the numeric keypad <b>down</b> arrow key.
-     * @see #VK_DOWN
-     * @since 1.2
-     */
-    public static final int VK_KP_DOWN        = 0xE1;
-
-    /**
-     * Constant for the numeric keypad <b>left</b> arrow key.
-     * @see #VK_LEFT
-     * @since 1.2
-     */
-    public static final int VK_KP_LEFT        = 0xE2;
-
-    /**
-     * Constant for the numeric keypad <b>right</b> arrow key.
-     * @see #VK_RIGHT
-     * @since 1.2
-     */
-    public static final int VK_KP_RIGHT       = 0xE3;
-    
-    /* For European keyboards */
-    /** @since 1.2 */
-    public static final int VK_DEAD_GRAVE               = 0x80;
-    /** @since 1.2 */
-    public static final int VK_DEAD_ACUTE               = 0x81;
-    /** @since 1.2 */
-    public static final int VK_DEAD_CIRCUMFLEX          = 0x82;
-    /** @since 1.2 */
-    public static final int VK_DEAD_TILDE               = 0x83;
-    /** @since 1.2 */
-    public static final int VK_DEAD_MACRON              = 0x84;
-    /** @since 1.2 */
-    public static final int VK_DEAD_BREVE               = 0x85;
-    /** @since 1.2 */
-    public static final int VK_DEAD_ABOVEDOT            = 0x86;
-    /** @since 1.2 */
-    public static final int VK_DEAD_DIAERESIS           = 0x87;
-    /** @since 1.2 */
-    public static final int VK_DEAD_ABOVERING           = 0x88;
-    /** @since 1.2 */
-    public static final int VK_DEAD_DOUBLEACUTE         = 0x89;
-    /** @since 1.2 */
-    public static final int VK_DEAD_CARON               = 0x8a;
-    /** @since 1.2 */
-    public static final int VK_DEAD_CEDILLA             = 0x8b;
-    /** @since 1.2 */
-    public static final int VK_DEAD_OGONEK              = 0x8c;
-    /** @since 1.2 */
-    public static final int VK_DEAD_IOTA                = 0x8d;
-    /** @since 1.2 */
-    public static final int VK_DEAD_VOICED_SOUND        = 0x8e;
-    /** @since 1.2 */
-    public static final int VK_DEAD_SEMIVOICED_SOUND    = 0x8f;
-
-    /** @since 1.2 */
-    public static final int VK_AMPERSAND                = 0x96;
-    /** @since 1.2 */
-    public static final int VK_ASTERISK                 = 0x97;
-    /** @since 1.2 */
-    public static final int VK_QUOTEDBL                 = 0x98;
-    /** @since 1.2 */
-    public static final int VK_LESS                     = 0x99;
-
-    /** @since 1.2 */
-    public static final int VK_GREATER                  = 0xa0;
-    /** @since 1.2 */
-    public static final int VK_BRACELEFT                = 0xa1;
-    /** @since 1.2 */
-    public static final int VK_BRACERIGHT               = 0xa2;
-
-    /**
-     * Constant for the "@" key.
-     * @since 1.2
-     */
-    public static final int VK_AT                       = 0x0200;
- 
-    /**
-     * Constant for the ":" key.
-     * @since 1.2
-     */
-    public static final int VK_COLON                    = 0x0201;
- 
-    /**
-     * Constant for the "^" key.
-     * @since 1.2
-     */
-    public static final int VK_CIRCUMFLEX               = 0x0202;
- 
-    /**
-     * Constant for the "$" key.
-     * @since 1.2
-     */
-    public static final int VK_DOLLAR                   = 0x0203;
- 
-    /**
-     * Constant for the Euro currency sign key.
-     * @since 1.2
-     */
-    public static final int VK_EURO_SIGN                = 0x0204;
- 
-    /**
-     * Constant for the "!" key.
-     * @since 1.2
-     */
-    public static final int VK_EXCLAMATION_MARK         = 0x0205;
- 
-    /**
-     * Constant for the inverted exclamation mark key.
-     * @since 1.2
-     */
-    public static final int VK_INVERTED_EXCLAMATION_MARK = 0x0206;
- 
-    /**
-     * Constant for the "(" key.
-     * @since 1.2
-     */
-    public static final int VK_LEFT_PARENTHESIS         = 0x0207;
- 
-    /**
-     * Constant for the "#" key.
-     * @since 1.2
-     */
-    public static final int VK_NUMBER_SIGN              = 0x0208;
- 
-    /**
-     * Constant for the "+" key.
-     * @since 1.2
-     */
-    public static final int VK_PLUS                     = 0x0209;
- 
-    /**
-     * Constant for the ")" key.
-     * @since 1.2
-     */
-    public static final int VK_RIGHT_PARENTHESIS        = 0x020A;
- 
-    /**
-     * Constant for the "_" key.
-     * @since 1.2
-     */
-    public static final int VK_UNDERSCORE               = 0x020B;
- 
-    /**
-     * Constant for the Microsoft Windows "Windows" key.
-     * It is used for both the left and right version of the key.  
-     * @see #getKeyLocation()
-     * @since 1.5
-     */
-    public static final int VK_WINDOWS                  = 0x020C;
- 
-    /**
-     * Constant for the Microsoft Windows Context Menu key.
-     * @since 1.5
-     */
-    public static final int VK_CONTEXT_MENU             = 0x020D;
- 
-    /* for input method support on Asian Keyboards */
-
-    /* not clear what this means - listed in Microsoft Windows API */
-    public static final int VK_FINAL                    = 0x0018;
-    
-    /** Constant for the Convert function key. */
-    /* Japanese PC 106 keyboard, Japanese Solaris keyboard: henkan */
-    public static final int VK_CONVERT                  = 0x001C;
-
-    /** Constant for the Don't Convert function key. */
-    /* Japanese PC 106 keyboard: muhenkan */
-    public static final int VK_NONCONVERT               = 0x001D;
-    
-    /** Constant for the Accept or Commit function key. */
-    /* Japanese Solaris keyboard: kakutei */
-    public static final int VK_ACCEPT                   = 0x001E;
-
-    /* not clear what this means - listed in Microsoft Windows API */
-    public static final int VK_MODECHANGE               = 0x001F;
-
-    /* replaced by VK_KANA_LOCK for Microsoft Windows and Solaris; 
-       might still be used on other platforms */
-    public static final int VK_KANA                     = 0x0015;
-
-    /* replaced by VK_INPUT_METHOD_ON_OFF for Microsoft Windows and Solaris; 
-       might still be used for other platforms */
-    public static final int VK_KANJI                    = 0x0019;
-
-    /**
-     * Constant for the Alphanumeric function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard: eisuu */
-    public static final int VK_ALPHANUMERIC             = 0x00F0;
- 
-    /**
-     * Constant for the Katakana function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard: katakana */
-    public static final int VK_KATAKANA                 = 0x00F1;
- 
-    /**
-     * Constant for the Hiragana function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard: hiragana */
-    public static final int VK_HIRAGANA                 = 0x00F2;
- 
-    /**
-     * Constant for the Full-Width Characters function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard: zenkaku */
-    public static final int VK_FULL_WIDTH               = 0x00F3;
- 
-    /**
-     * Constant for the Half-Width Characters function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard: hankaku */
-    public static final int VK_HALF_WIDTH               = 0x00F4;
- 
-    /**
-     * Constant for the Roman Characters function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard: roumaji */
-    public static final int VK_ROMAN_CHARACTERS         = 0x00F5;
- 
-    /**
-     * Constant for the All Candidates function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard - VK_CONVERT + ALT: zenkouho */
-    public static final int VK_ALL_CANDIDATES           = 0x0100;
- 
-    /**
-     * Constant for the Previous Candidate function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard - VK_CONVERT + SHIFT: maekouho */
-    public static final int VK_PREVIOUS_CANDIDATE       = 0x0101;
- 
-    /**
-     * Constant for the Code Input function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard - VK_ALPHANUMERIC + ALT: kanji bangou */
-    public static final int VK_CODE_INPUT               = 0x0102;
- 
-    /**
-     * Constant for the Japanese-Katakana function key.
-     * This key switches to a Japanese input method and selects its Katakana input mode.
-     * @since 1.2
-     */
-    /* Japanese Macintosh keyboard - VK_JAPANESE_HIRAGANA + SHIFT */
-    public static final int VK_JAPANESE_KATAKANA        = 0x0103;
- 
-    /**
-     * Constant for the Japanese-Hiragana function key.
-     * This key switches to a Japanese input method and selects its Hiragana input mode.
-     * @since 1.2
-     */
-    /* Japanese Macintosh keyboard */
-    public static final int VK_JAPANESE_HIRAGANA        = 0x0104;
- 
-    /**
-     * Constant for the Japanese-Roman function key.
-     * This key switches to a Japanese input method and selects its Roman-Direct input mode.
-     * @since 1.2
-     */
-    /* Japanese Macintosh keyboard */
-    public static final int VK_JAPANESE_ROMAN           = 0x0105;
-
-    /**
-     * Constant for the locking Kana function key.
-     * This key locks the keyboard into a Kana layout.
-     * @since 1.3
-     */
-    /* Japanese PC 106 keyboard with special Windows driver - eisuu + Control; Japanese Solaris keyboard: kana */
-    public static final int VK_KANA_LOCK                = 0x0106;
-
-    /**
-     * Constant for the input method on/off key.
-     * @since 1.3
-     */
-    /* Japanese PC 106 keyboard: kanji. Japanese Solaris keyboard: nihongo */
-    public static final int VK_INPUT_METHOD_ON_OFF      = 0x0107;
-
-    /* for Sun keyboards */
-    /** @since 1.2 */
-    public static final int VK_CUT                      = 0xFFD1;
-    /** @since 1.2 */
-    public static final int VK_COPY                     = 0xFFCD;
-    /** @since 1.2 */
-    public static final int VK_PASTE                    = 0xFFCF;
-    /** @since 1.2 */
-    public static final int VK_UNDO                     = 0xFFCB;
-    /** @since 1.2 */
-    public static final int VK_AGAIN                    = 0xFFC9;
-    /** @since 1.2 */
-    public static final int VK_FIND                     = 0xFFD0;
-    /** @since 1.2 */
-    public static final int VK_PROPS                    = 0xFFCA;
-    /** @since 1.2 */
-    public static final int VK_STOP                     = 0xFFC8;
-    
-    /**
-     * Constant for the Compose function key.
-     * @since 1.2
-     */
-    public static final int VK_COMPOSE                  = 0xFF20;
- 
-    /**
-     * Constant for the AltGraph function key.
-     * @since 1.2
-     */
-    public static final int VK_ALT_GRAPH                = 0xFF7E;
-
-    /**
-     * Constant for the Begin key.
-     * @since 1.5
-     */
-    public static final int VK_BEGIN                    = 0xFF58;
-
-    /**
-     * This value is used to indicate that the keyCode is unknown.
-     * KEY_TYPED events do not have a keyCode value; this value 
-     * is used instead.  
-     */
-    public static final int VK_UNDEFINED      = 0x0;
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/KeyListener.java b/src/newt/classes/com/sun/javafx/newt/KeyListener.java
deleted file mode 100644
index 6f022c45a..000000000
--- a/src/newt/classes/com/sun/javafx/newt/KeyListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-public interface KeyListener extends EventListener
-{
- public void keyPressed(KeyEvent e);
- public void keyReleased(KeyEvent e);
- public void keyTyped(KeyEvent e) ;
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/MouseEvent.java b/src/newt/classes/com/sun/javafx/newt/MouseEvent.java
deleted file mode 100644
index ede193e1c..000000000
--- a/src/newt/classes/com/sun/javafx/newt/MouseEvent.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-public class MouseEvent extends InputEvent
-{
-  public static final int BUTTON1 = 1;
-  public static final int BUTTON2 = 2;
-  public static final int BUTTON3 = 3;
-  public static final int BUTTON4 = 4;
-  public static final int BUTTON5 = 5;
-  public static final int BUTTON6 = 6;
-  public static final int BUTTON_NUMBER = 6;
-
- protected MouseEvent(boolean sysEvent, int eventType, Window source, long when,
-                      int modifiers, int x, int y, int clickCount, int button,
-                      int rotation)
- {
-     super(sysEvent, eventType, source, when, modifiers); 
-     this.x=x;
-     this.y=y;
-     this.clickCount=clickCount;
-     this.button=button;
-     this.wheelRotation = rotation;
- }
- public MouseEvent(int eventType, Window source, long when, int modifiers,
-                   int x, int y, int clickCount, int button, int rotation) {
-     this(false, eventType, source, when, modifiers, x, y, clickCount, button,
-          rotation);
- }
-
- public int getButton() {
-    return button;
- }
- public int getClickCount() {
-    return clickCount;
- }
- public int getX() {
-    return x;
- }
- public int getY() {
-    return y;
- }
- public int getWheelRotation() {
-    return wheelRotation;
- }
- 
- public String toString() {
-    return "MouseEvent["+getEventTypeString(getEventType())+
-                       ", "+x+"/"+y+", button "+button+", count "+clickCount+
-                       ", wheel rotation "+wheelRotation+
-                       ", "+super.toString()+"]";
- }
-
- public static String getEventTypeString(int type) {
-    switch(type) {
-        case EVENT_MOUSE_CLICKED: return "EVENT_MOUSE_CLICKED";
-        case EVENT_MOUSE_ENTERED: return "EVENT_MOUSE_ENTERED";
-        case EVENT_MOUSE_EXITED: return "EVENT_MOUSE_EXITED";
-        case EVENT_MOUSE_PRESSED: return "EVENT_MOUSE_PRESSED";
-        case EVENT_MOUSE_RELEASED: return "EVENT_MOUSE_RELEASED";
-        case EVENT_MOUSE_MOVED: return "EVENT_MOUSE_MOVED";
-        case EVENT_MOUSE_DRAGGED: return "EVENT_MOUSE_DRAGGED";
-        case EVENT_MOUSE_WHEEL_MOVED: return "EVENT_MOUSE_WHEEL_MOVED";
-        default: return "unknown (" + type + ")";
-    }
- }
-
- private int x, y, clickCount, button, wheelRotation;
-
- public static final int EVENT_MOUSE_CLICKED  = 200;
- public static final int EVENT_MOUSE_ENTERED  = 201;
- public static final int EVENT_MOUSE_EXITED   = 202;
- public static final int EVENT_MOUSE_PRESSED  = 203;
- public static final int EVENT_MOUSE_RELEASED = 204;
- public static final int EVENT_MOUSE_MOVED    = 205;
- public static final int EVENT_MOUSE_DRAGGED  = 206;
- public static final int EVENT_MOUSE_WHEEL_MOVED = 207;
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/MouseListener.java b/src/newt/classes/com/sun/javafx/newt/MouseListener.java
deleted file mode 100644
index 3d2031f2a..000000000
--- a/src/newt/classes/com/sun/javafx/newt/MouseListener.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-public interface MouseListener extends EventListener
-{
- public void mouseClicked(MouseEvent e);
- public void mouseEntered(MouseEvent e);
- public void mouseExited(MouseEvent e);
- public void mousePressed(MouseEvent e);
- public void mouseReleased(MouseEvent e);
- public void mouseMoved(MouseEvent e);
- public void mouseDragged(MouseEvent e);
- public void mouseWheelMoved(MouseEvent e);
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/NewtFactory.java b/src/newt/classes/com/sun/javafx/newt/NewtFactory.java
deleted file mode 100755
index 6e25b19eb..000000000
--- a/src/newt/classes/com/sun/javafx/newt/NewtFactory.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-import javax.media.nativewindow.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-import com.sun.nativewindow.impl.jvm.JVMUtil;
-
-public abstract class NewtFactory {
-    // Work-around for initialization order problems on Mac OS X
-    // between native Newt and (apparently) Fmod
-    static {
-        JVMUtil.initSingleton();
-        Window.init(NativeWindowFactory.getNativeWindowType(true));
-    }
-
-    static Class getCustomClass(String packageName, String classBaseName) {
-        Class clazz = null;
-        if(packageName!=null || classBaseName!=null) {
-            String clazzName = packageName + "." + classBaseName ;
-            try {
-                clazz = Class.forName(clazzName);
-            } catch (Throwable t) {}
-        }
-        return clazz;
-    }
-
-    private static boolean useEDT = true;
-
-    /** 
-     * Toggles the usage of an EventDispatchThread while creating a Display.<br>
-     * The default is enabled.<br>
-     * The EventDispatchThread is thread local to the Display instance.<br>
-     */
-    public static synchronized void setUseEDT(boolean onoff) {
-        useEDT = onoff;
-    }
-
-    /** @see #setUseEDT(boolean) */
-    public static boolean useEDT() { return useEDT; }
-
-    /**
-     * Create a Display entity, incl native creation
-     */
-    public static Display createDisplay(String name) {
-      return Display.create(NativeWindowFactory.getNativeWindowType(true), name);
-    }
-
-    /**
-     * Create a Display entity using the given implementation type, incl native creation
-     */
-    public static Display createDisplay(String type, String name) {
-      return Display.create(type, name);
-    }
-
-    /**
-     * Create a Screen entity, incl native creation
-     */
-    public static Screen createScreen(Display display, int index) {
-      return Screen.create(NativeWindowFactory.getNativeWindowType(true), display, index);
-    }
-
-    /**
-     * Create a Screen entity using the given implementation type, incl native creation
-     */
-    public static Screen createScreen(String type, Display display, int index) {
-      return Screen.create(type, display, index);
-    }
-
-    /**
-     * Create a Window entity, incl native creation
-     */
-    public static Window createWindow(Screen screen, Capabilities caps) {
-        return Window.create(NativeWindowFactory.getNativeWindowType(true), 0, screen, caps, false);
-    }
-
-    public static Window createWindow(Screen screen, Capabilities caps, boolean undecorated) {
-        return Window.create(NativeWindowFactory.getNativeWindowType(true), 0, screen, caps, undecorated);
-    }
-
-    public static Window createWindow(long parentWindowHandle, Screen screen, Capabilities caps, boolean undecorated) {
-        return Window.create(NativeWindowFactory.getNativeWindowType(true), parentWindowHandle, screen, caps, undecorated);
-    }
-
-    /**
-     * Ability to try a Window type with a construnctor argument, if supported ..<p>
-     * Currently only valid is <code> AWTWindow(Frame frame) </code>,
-     * to support an external created AWT Frame, ie the browsers embedded frame.
-     */
-    public static Window createWindow(Object[] cstrArguments, Screen screen, Capabilities caps, boolean undecorated) {
-        return Window.create(NativeWindowFactory.getNativeWindowType(true), cstrArguments, screen, caps, undecorated);
-    }
-
-    /**
-     * Create a Window entity using the given implementation type, incl native creation
-     */
-    public static Window createWindow(String type, Screen screen, Capabilities caps) {
-        return Window.create(type, 0, screen, caps, false);
-    }
-
-    public static Window createWindow(String type, Screen screen, Capabilities caps, boolean undecorated) {
-        return Window.create(type, 0, screen, caps, undecorated);
-    }
-
-    public static Window createWindow(String type, long parentWindowHandle, Screen screen, Capabilities caps, boolean undecorated) {
-        return Window.create(type, parentWindowHandle, screen, caps, undecorated);
-    }
-
-    public static Window createWindow(String type, Object[] cstrArguments, Screen screen, Capabilities caps, boolean undecorated) {
-        return Window.create(type, cstrArguments, screen, caps, undecorated);
-    }
-
-    /**
-     * Instantiate a Display entity using the native handle.
-     */
-    public static Display wrapDisplay(String name, AbstractGraphicsDevice device) {
-      return Display.wrapHandle(NativeWindowFactory.getNativeWindowType(true), name, device);
-    }
-
-    /**
-     * Instantiate a Screen entity using the native handle.
-     */
-    public static Screen wrapScreen(Display display, AbstractGraphicsScreen screen) {
-      return Screen.wrapHandle(NativeWindowFactory.getNativeWindowType(true), display, screen);
-    }
-
-    /**
-     * Instantiate a Window entity using the native handle.
-     */
-    public static Window wrapWindow(Screen screen, AbstractGraphicsConfiguration config,
-                                    long windowHandle, boolean fullscreen, boolean visible, 
-                                    int x, int y, int width, int height) {
-      return Window.wrapHandle(NativeWindowFactory.getNativeWindowType(true), screen, config,
-                               windowHandle, fullscreen, visible, x, y, width, height);
-    }
-
-    private static final boolean instanceOf(Object obj, String clazzName) {
-        Class clazz = obj.getClass();
-        do {
-            if(clazz.getName().equals(clazzName)) {
-                return true;
-            }
-            clazz = clazz.getSuperclass();
-        } while (clazz!=null);
-        return false;
-    }
-
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/OffscreenWindow.java b/src/newt/classes/com/sun/javafx/newt/OffscreenWindow.java
deleted file mode 100644
index 11ce8e6c7..000000000
--- a/src/newt/classes/com/sun/javafx/newt/OffscreenWindow.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-import javax.media.nativewindow.*;
-
-public class OffscreenWindow extends Window implements SurfaceChangeable {
-
-    long surfaceHandle = 0;
-
-    public OffscreenWindow() {
-    }
-
-    static long nextWindowHandle = 0x100; // start here - a marker
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        if(0!=parentWindowHandle) {
-            throw new NativeWindowException("OffscreenWindow does not support window parenting");
-        }
-        if(caps.isOnscreen()) {
-            throw new NativeWindowException("Capabilities is onscreen");
-        }
-        AbstractGraphicsScreen aScreen = screen.getGraphicsScreen();
-        config = GraphicsConfigurationFactory.getFactory(aScreen.getDevice()).chooseGraphicsConfiguration(caps, null, aScreen);
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-
-        synchronized(OffscreenWindow.class) {
-            windowHandle = nextWindowHandle++;
-        }
-    }
-
-    protected void closeNative() {
-        // nop
-    }
-
-    public void invalidate() {
-        super.invalidate();
-        surfaceHandle = 0;
-    }
-
-    public synchronized void destroy() {
-        surfaceHandle = 0;
-    }
-
-    public void setSurfaceHandle(long handle) {
-        surfaceHandle = handle ;
-    }
-
-    public long getSurfaceHandle() {
-        return surfaceHandle;
-    }
-
-    public void setVisible(boolean visible) {
-        if(!visible) {
-            this.visible = visible;
-        }
-    }
-
-    public void setSize(int width, int height) {
-        if(!visible) {
-            this.width = width;
-            this.height = height;
-        }
-    }
-
-    public void setPosition(int x, int y) {
-        // nop
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        // nop
-        return false;
-    }
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/PaintEvent.java b/src/newt/classes/com/sun/javafx/newt/PaintEvent.java
deleted file mode 100755
index b27b969da..000000000
--- a/src/newt/classes/com/sun/javafx/newt/PaintEvent.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- *
- */
-
-package com.sun.javafx.newt;
-
-/**
- *
- * @author tdv
- */
-public class PaintEvent extends Event {
-
-    // bounds of the damage region
-    private int x, y, width, height;
-    public PaintEvent(int eventType, Window source,
-                       long when, int x, int y, int w, int h)
-    {
-        super(true, eventType, source, when);
-        this.x = x;
-        this.y = y;
-        this.width = w;
-        this.height = h;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    public int getWidth() {
-        return width;
-    }
-
-    public int getX() {
-        return x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public String toString() {
-        return "ExposeEvent[modifiers: x="+x+" y="+y+" w="+width+" h="+height +"]";
-    }
-
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/PaintListener.java b/src/newt/classes/com/sun/javafx/newt/PaintListener.java
deleted file mode 100755
index fab5fa35c..000000000
--- a/src/newt/classes/com/sun/javafx/newt/PaintListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- *
- */
-
-package com.sun.javafx.newt;
-
-/**
- *
- * @author tdv
- */
-public interface PaintListener {
-    public void exposed(PaintEvent e);
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/Screen.java b/src/newt/classes/com/sun/javafx/newt/Screen.java
deleted file mode 100755
index 9edd0b719..000000000
--- a/src/newt/classes/com/sun/javafx/newt/Screen.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-import com.sun.javafx.newt.impl.*;
-
-import javax.media.nativewindow.*;
-import java.security.*;
-
-public abstract class Screen {
-
-    private static Class getScreenClass(String type) 
-        throws ClassNotFoundException 
-    {
-        Class screenClass = NewtFactory.getCustomClass(type, "Screen");
-        if(null==screenClass) {
-            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
-                screenClass = Class.forName("com.sun.javafx.newt.opengl.kd.KDScreen");
-            } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
-                screenClass = Class.forName("com.sun.javafx.newt.windows.WindowsScreen");
-            } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-                screenClass = Class.forName("com.sun.javafx.newt.macosx.MacScreen");
-            } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
-                screenClass = Class.forName("com.sun.javafx.newt.x11.X11Screen");
-            } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
-                screenClass = Class.forName("com.sun.javafx.newt.awt.AWTScreen");
-            } else {
-                throw new RuntimeException("Unknown window type \"" + type + "\"");
-            }
-        }
-        return screenClass;
-    }
-
-    protected static Screen create(String type, Display display, int idx) {
-        try {
-            if(usrWidth<0 || usrHeight<0) {
-                usrWidth  = Debug.getIntProperty("newt.ws.swidth", true, localACC);
-                usrHeight = Debug.getIntProperty("newt.ws.sheight", true, localACC);
-                System.out.println("User screen size "+usrWidth+"x"+usrHeight);
-            }
-            Class screenClass = getScreenClass(type);
-            Screen screen  = (Screen) screenClass.newInstance();
-            screen.display = display;
-            screen.createNative(idx);
-            if(null==screen.aScreen) {
-                throw new RuntimeException("Screen.createNative() failed to instanciate an AbstractGraphicsScreen");
-            }
-            return screen;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public synchronized void destroy() {
-        closeNative();
-        display = null;
-        aScreen = null;
-    }
-
-    protected static Screen wrapHandle(String type, Display display, AbstractGraphicsScreen aScreen) {
-        try {
-            Class screenClass = getScreenClass(type);
-            Screen screen  = (Screen) screenClass.newInstance();
-            screen.display = display;
-            screen.aScreen = aScreen;
-            return screen;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    protected abstract void createNative(int index);
-    protected abstract void closeNative();
-
-    protected void setScreenSize(int w, int h) {
-        System.out.println("Detected screen size "+w+"x"+h);
-        width=w; height=h;
-    }
-
-    public Display getDisplay() {
-        return display;
-    }
-
-    public int getIndex() {
-        return aScreen.getIndex();
-    }
-
-    public AbstractGraphicsScreen getGraphicsScreen() {
-        return aScreen;
-    }
-
-    /**
-     * The actual implementation shall return the detected display value,
-     * if not we return 800.
-     * This can be overwritten with the user property 'newt.ws.swidth',
-     */
-    public int getWidth() {
-        return (usrWidth>0) ? usrWidth : (width>0) ? width : 480;
-    }
-
-    /**
-     * The actual implementation shall return the detected display value,
-     * if not we return 480.
-     * This can be overwritten with the user property 'newt.ws.sheight',
-     */
-    public int getHeight() {
-        return (usrHeight>0) ? usrHeight : (height>0) ? height : 480;
-    }
-
-    protected Display display;
-    protected AbstractGraphicsScreen aScreen;
-    protected int width=-1, height=-1; // detected values: set using setScreenSize
-    protected static int usrWidth=-1, usrHeight=-1; // property values: newt.ws.swidth and newt.ws.sheight
-    private static AccessControlContext localACC = AccessController.getContext();
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/Window.java b/src/newt/classes/com/sun/javafx/newt/Window.java
deleted file mode 100755
index 58bd251d2..000000000
--- a/src/newt/classes/com/sun/javafx/newt/Window.java
+++ /dev/null
@@ -1,929 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-import com.sun.javafx.newt.impl.Debug;
-import com.sun.javafx.newt.util.EventDispatchThread;
-
-import javax.media.nativewindow.*;
-import com.sun.nativewindow.impl.NWReflection;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.lang.reflect.Method;
-
-public abstract class Window implements NativeWindow
-{
-    public static final boolean DEBUG_MOUSE_EVENT = Debug.debug("Window.MouseEvent");
-    public static final boolean DEBUG_KEY_EVENT = Debug.debug("Window.KeyEvent");
-    public static final boolean DEBUG_WINDOW_EVENT = Debug.debug("Window.WindowEvent");
-    public static final boolean DEBUG_IMPLEMENTATION = Debug.debug("Window");
-    
-    // Workaround for initialization order problems on Mac OS X
-    // between native Newt and (apparently) Fmod -- if Fmod is
-    // initialized first then the connection to the window server
-    // breaks, leading to errors from deep within the AppKit
-    static void init(String type) {
-        if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-            try {
-                getWindowClass(type);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static Class getWindowClass(String type) 
-        throws ClassNotFoundException 
-    {
-        Class windowClass = NewtFactory.getCustomClass(type, "Window");
-        if(null==windowClass) {
-            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
-                windowClass = Class.forName("com.sun.javafx.newt.opengl.kd.KDWindow");
-            } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
-                windowClass = Class.forName("com.sun.javafx.newt.windows.WindowsWindow");
-            } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-                windowClass = Class.forName("com.sun.javafx.newt.macosx.MacWindow");
-            } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
-                windowClass = Class.forName("com.sun.javafx.newt.x11.X11Window");
-            } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
-                windowClass = Class.forName("com.sun.javafx.newt.awt.AWTWindow");
-            } else {
-                throw new NativeWindowException("Unknown window type \"" + type + "\"");
-            }
-        }
-        return windowClass;
-    }
-
-    protected static Window create(String type, final long parentWindowHandle, Screen screen, final Capabilities caps, boolean undecorated) {
-        try {
-            Class windowClass;
-            if(caps.isOnscreen()) {
-                windowClass = getWindowClass(type);
-            } else {
-                windowClass = OffscreenWindow.class;
-            }
-            Window window = (Window) windowClass.newInstance();
-            window.invalidate();
-            window.screen   = screen;
-            window.setUndecorated(undecorated||0!=parentWindowHandle);
-            EventDispatchThread edt = screen.getDisplay().getEDT();
-            if(null!=edt) {
-                final Window f_win = window;
-                edt.invokeAndWait(new Runnable() {
-                    public void run() {
-                        f_win.createNative(parentWindowHandle, caps);
-                    }
-                } );
-            } else {
-                window.createNative(parentWindowHandle, caps);
-            }
-            return window;
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw new NativeWindowException(t);
-        }
-    }
-
-    protected static Window create(String type, Object[] cstrArguments, Screen screen, final Capabilities caps, boolean undecorated) {
-        try {
-            Class windowClass = getWindowClass(type);
-            Class[] cstrArgumentTypes = getCustomConstructorArgumentTypes(windowClass);
-            if(null==cstrArgumentTypes) {
-                throw new NativeWindowException("WindowClass "+windowClass+" doesn't support custom arguments in constructor");
-            }
-            int argsChecked = verifyConstructorArgumentTypes(cstrArgumentTypes, cstrArguments);
-            if ( argsChecked < cstrArguments.length ) {
-                throw new NativeWindowException("WindowClass "+windowClass+" constructor mismatch at argument #"+argsChecked+"; Constructor: "+getTypeStrList(cstrArgumentTypes)+", arguments: "+getArgsStrList(cstrArguments));
-            }
-            Window window = (Window) NWReflection.createInstance( windowClass, cstrArgumentTypes, cstrArguments ) ;
-            window.invalidate();
-            window.screen   = screen;
-            window.setUndecorated(undecorated);
-            EventDispatchThread edt = screen.getDisplay().getEDT();
-            if(null!=edt) {
-                final Window f_win = window;
-                edt.invokeAndWait(new Runnable() {
-                    public void run() {
-                        f_win.createNative(0, caps);
-                    }
-                } );
-            } else {
-                window.createNative(0, caps);
-            }
-            return window;
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw new NativeWindowException(t);
-        }
-    }
-
-    protected static Window wrapHandle(String type, Screen screen, AbstractGraphicsConfiguration config, 
-                                 long windowHandle, boolean fullscreen, boolean visible, 
-                                 int x, int y, int width, int height) 
-    {
-        try {
-            Class windowClass = getWindowClass(type);
-            Window window = (Window) windowClass.newInstance();
-            window.invalidate();
-            window.screen   = screen;
-            window.config = config;
-            window.windowHandle = windowHandle;
-            window.fullscreen=fullscreen;
-            window.visible=visible;
-            window.x=x;
-            window.y=y;
-            window.width=width;
-            window.height=height;
-            return window;
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw new NativeWindowException(t);
-        }
-    }
-
-    public static String toHexString(int hex) {
-        return "0x" + Integer.toHexString(hex);
-    }
-
-    public static String toHexString(long hex) {
-        return "0x" + Long.toHexString(hex);
-    }
-
-    protected Screen screen;
-
-    protected AbstractGraphicsConfiguration config;
-    protected long   windowHandle;
-    protected boolean fullscreen, visible;
-    protected int width, height, x, y;
-    protected int     eventMask;
-
-    protected String title = "Newt Window";
-    protected boolean undecorated = false;
-
-    /**
-     * Create native windowHandle, ie creates a new native invisible window.
-     *
-     * The parentWindowHandle may be null, in which case no window parenting 
-     * is requested.
-     *
-     * Shall use the capabilities to determine the graphics configuration
-     * and shall set the chosen capabilities.
-     */
-    protected abstract void createNative(long parentWindowHandle, Capabilities caps);
-
-    protected abstract void closeNative();
-
-    public Screen getScreen() {
-        return screen;
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append(getClass().getName()+"[config "+config+
-                    ", windowHandle "+toHexString(getWindowHandle())+
-                    ", surfaceHandle "+toHexString(getSurfaceHandle())+
-                    ", pos "+getX()+"/"+getY()+", size "+getWidth()+"x"+getHeight()+
-                    ", visible "+isVisible()+
-                    ", undecorated "+undecorated+
-                    ", fullscreen "+fullscreen+
-                    ", "+screen+
-                    ", wrappedWindow "+getWrappedWindow());
-
-        sb.append(", SurfaceUpdatedListeners num "+surfaceUpdatedListeners.size()+" [");
-        for (Iterator iter = surfaceUpdatedListeners.iterator(); iter.hasNext(); ) {
-          sb.append(iter.next()+", ");
-        }
-        sb.append("], WindowListeners num "+windowListeners.size()+" [");
-        for (Iterator iter = windowListeners.iterator(); iter.hasNext(); ) {
-          sb.append(iter.next()+", ");
-        }
-        sb.append("], MouseListeners num "+mouseListeners.size()+" [");
-        for (Iterator iter = mouseListeners.iterator(); iter.hasNext(); ) {
-          sb.append(iter.next()+", ");
-        }
-        sb.append("], KeyListeners num "+keyListeners.size()+" [");
-        for (Iterator iter = keyListeners.iterator(); iter.hasNext(); ) {
-          sb.append(iter.next()+", ");
-        }
-        sb.append("] ]");
-        return sb.toString();
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public void setUndecorated(boolean value) {
-        undecorated = value;
-    }
-
-    public boolean isUndecorated() {
-        return undecorated;
-    }
-
-    public void requestFocus() {
-    }
-
-    //
-    // NativeWindow impl
-    //
-    private Thread owner;
-    private int recursionCount;
-    protected Exception lockedStack = null;
-
-    /** Recursive and blocking lockSurface() implementation */
-    public synchronized int lockSurface() {
-        // We leave the ToolkitLock lock to the specializtion's discretion, 
-        // ie the implicit JAWTWindow in case of AWTWindow
-        Thread cur = Thread.currentThread();
-        if (owner == cur) {
-            ++recursionCount;
-            return LOCK_SUCCESS;
-        }
-        while (owner != null) {
-            try {
-                wait();
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        owner = cur;
-        lockedStack = new Exception("NEWT Surface previously locked by "+Thread.currentThread());
-        screen.getDisplay().lockDisplay();
-        return LOCK_SUCCESS;
-    }
-
-    /** Recursive and unblocking unlockSurface() implementation */
-    public synchronized void unlockSurface() throws NativeWindowException {
-        Thread cur = Thread.currentThread();
-        if (owner != cur) {
-            lockedStack.printStackTrace();
-            throw new NativeWindowException(cur+": Not owner, owner is "+owner);
-        }
-        if (recursionCount > 0) {
-            --recursionCount;
-            return;
-        }
-        owner = null;
-        lockedStack = null;
-        screen.getDisplay().unlockDisplay();
-        notifyAll();
-        // We leave the ToolkitLock unlock to the specializtion's discretion, 
-        // ie the implicit JAWTWindow in case of AWTWindow
-    }
-
-    public synchronized boolean isSurfaceLocked() {
-        return null!=owner;
-    }
-
-    public synchronized Thread getSurfaceLockOwner() {
-        return owner;
-    }
-
-    public synchronized Exception getLockedStack() {
-        return lockedStack;
-    }
-
-    public synchronized void destroy() {
-        destroy(false);
-    }
-
-    /** @param deep If true, the linked Screen and Display will be destroyed as well. */
-    public synchronized void destroy(boolean deep) {
-        if(DEBUG_WINDOW_EVENT) {
-            System.out.println("Window.destroy() start (deep "+deep+" - "+Thread.currentThread());
-        }
-        synchronized(surfaceUpdatedListeners) {
-            surfaceUpdatedListeners = new ArrayList();
-        }
-        synchronized(windowListeners) {
-            windowListeners = new ArrayList();
-        }
-        synchronized(mouseListeners) {
-            mouseListeners = new ArrayList();
-        }
-        synchronized(keyListeners) {
-            keyListeners = new ArrayList();
-        }
-        Screen scr = screen;
-        Display dpy = (null!=screen) ? screen.getDisplay() : null;
-        EventDispatchThread edt = (null!=dpy) ? dpy.getEDT() : null;
-        if(null!=edt) {
-            final Window f_win = this;
-            edt.invokeAndWait(new Runnable() {
-                public void run() {
-                    f_win.closeNative();
-                }
-            } );
-        } else {
-            closeNative();
-        }
-        invalidate();
-        if(deep) {
-            if(null!=scr) {
-                scr.destroy();
-            }
-            if(null!=dpy) {
-                dpy.destroy();
-            }
-        }
-        if(DEBUG_WINDOW_EVENT) {
-            System.out.println("Window.destroy() end "+Thread.currentThread());
-        }
-    }
-
-    public void invalidate() {
-        if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-            Exception e = new Exception("!!! Window Invalidate "+Thread.currentThread());
-            e.printStackTrace();
-        }
-        screen   = null;
-        windowHandle = 0;
-        fullscreen=false;
-        visible=false;
-        eventMask = 0;
-
-        // Default position and dimension will be re-set immediately by user
-        width  = 100;
-        height = 100;
-        x=0;
-        y=0;
-    }
-
-    public boolean surfaceSwap() { 
-        return false;
-    }
-
-    protected void clearEventMask() {
-        eventMask=0;
-    }
-
-    public long getDisplayHandle() {
-        return screen.getDisplay().getHandle();
-    }
-
-    public int  getScreenIndex() {
-        return screen.getIndex();
-    }
-
-    public long getWindowHandle() {
-        return windowHandle;
-    }
-
-    public long getSurfaceHandle() {
-        return windowHandle; // default: return window handle
-    }
-
-    public AbstractGraphicsConfiguration getGraphicsConfiguration() {
-        return config;
-    }
-
-    /**
-     * Returns the width of the client area of this window
-     * @return width of the client area
-     */
-    public int getWidth() {
-        return width;
-    }
-
-    /**
-     * Returns the height of the client area of this window
-     * @return height of the client area
-     */
-    public int getHeight() {
-        return height;
-    }
-
-    /**
-     * Returns the insets for this native window (the difference between the
-     * size of the toplevel window with the decorations and the client area).
-     * 
-     * @return insets for this platform window
-     */
-    // this probably belongs to NativeWindow interface
-    public Insets getInsets() {
-        return new Insets(0,0,0,0);
-    }
-
-    /** If this Window actually wraps one from another toolkit such as
-        the AWT, this will return a non-null value. */
-    public Object getWrappedWindow() {
-        return null;
-    }
-
-    //
-    // Additional methods
-    //
-
-    public int getX() {
-        return x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public boolean isVisible() {
-        return visible;
-    }
-
-    public boolean isFullscreen() {
-        return fullscreen;
-    }
-
-    private boolean autoDrawableMember = false;
-
-    /** If the implementation is capable of detecting a device change
-        return true and clear the status/reason of the change. */
-    public boolean hasDeviceChanged() {
-        return false;
-    }
-
-    /**
-     * If set to true, 
-     * certain action will be performed by the owning
-     * AutoDrawable, ie the destroy() call within windowDestroyNotify()
-     */
-    public void setAutoDrawableClient(boolean b) {
-        autoDrawableMember = b;
-    }
-
-    protected void windowDestroyNotify() {
-        if(DEBUG_WINDOW_EVENT) {
-            System.out.println("Window.windowDestroyeNotify start "+Thread.currentThread());
-        }
-
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY);
-
-        if(!autoDrawableMember) {
-            destroy();
-        }
-
-        if(DEBUG_WINDOW_EVENT) {
-            System.out.println("Window.windowDestroyeNotify end "+Thread.currentThread());
-        }
-    }
-
-    protected void windowDestroyed() {
-        if(DEBUG_WINDOW_EVENT) {
-            System.out.println("Window.windowDestroyed "+Thread.currentThread());
-        }
-        invalidate();
-    }
-
-    public abstract void    setVisible(boolean visible);
-    /**
-     * Sets the size of the client area of the window, excluding decorations
-     * Total size of the window will be
-     * {@code width+insets.left+insets.right, height+insets.top+insets.bottom}
-     * @param width of the client area of the window
-     * @param height of the client area of the window
-     */
-    public abstract void    setSize(int width, int height);
-    /**
-     * Sets the location of the top left corner of the window, including
-     * decorations (so the client area will be placed at
-     * {@code x+insets.left,y+insets.top}.
-     * @param x coord of the top left corner
-     * @param y coord of the top left corner
-     */
-    public abstract void    setPosition(int x, int y);
-    public abstract boolean setFullscreen(boolean fullscreen);
-
-    //
-    // SurfaceUpdatedListener Support
-    //
-    private ArrayList surfaceUpdatedListeners = new ArrayList();
-
-    public void addSurfaceUpdatedListener(SurfaceUpdatedListener l) {
-        if(l == null) {
-            return;
-        }
-        synchronized(surfaceUpdatedListeners) {
-            ArrayList newSurfaceUpdatedListeners = (ArrayList) surfaceUpdatedListeners.clone();
-            newSurfaceUpdatedListeners.add(l);
-            surfaceUpdatedListeners = newSurfaceUpdatedListeners;
-        }
-    }
-
-    public void removeSurfaceUpdatedListener(SurfaceUpdatedListener l) {
-        if (l == null) {
-            return;
-        }
-        synchronized(surfaceUpdatedListeners) {
-            ArrayList newSurfaceUpdatedListeners = (ArrayList) surfaceUpdatedListeners.clone();
-            newSurfaceUpdatedListeners.remove(l);
-            surfaceUpdatedListeners = newSurfaceUpdatedListeners;
-        }
-    }
-
-    public SurfaceUpdatedListener[] getSurfaceUpdatedListener() {
-        synchronized(surfaceUpdatedListeners) {
-            return (SurfaceUpdatedListener[]) surfaceUpdatedListeners.toArray();
-        }
-    }
-
-    public void surfaceUpdated(Object updater, NativeWindow window, long when) { 
-        ArrayList listeners = null;
-        synchronized(surfaceUpdatedListeners) {
-            listeners = surfaceUpdatedListeners;
-        }
-        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
-            SurfaceUpdatedListener l = (SurfaceUpdatedListener) i.next();
-            l.surfaceUpdated(updater, window, when);
-        }
-    }
-
-    //
-    // MouseListener Support
-    //
-
-    public void addMouseListener(MouseListener l) {
-        if(l == null) {
-            return;
-        }
-        synchronized(mouseListeners) {
-            ArrayList newMouseListeners = (ArrayList) mouseListeners.clone();
-            newMouseListeners.add(l);
-            mouseListeners = newMouseListeners;
-        }
-    }
-
-    public void removeMouseListener(MouseListener l) {
-        if (l == null) {
-            return;
-        }
-        synchronized(mouseListeners) {
-            ArrayList newMouseListeners = (ArrayList) mouseListeners.clone();
-            newMouseListeners.remove(l);
-            mouseListeners = newMouseListeners;
-        }
-    }
-
-    public MouseListener[] getMouseListeners() {
-        synchronized(mouseListeners) {
-            return (MouseListener[]) mouseListeners.toArray();
-        }
-    }
-
-    private ArrayList mouseListeners = new ArrayList();
-    private int  mouseButtonPressed = 0; // current pressed mouse button number
-    private long lastMousePressed = 0; // last time when a mouse button was pressed
-    private int  lastMouseClickCount = 0; // last mouse button click count
-    public  static final int ClickTimeout = 300;
-
-    protected void sendMouseEvent(int eventType, int modifiers,
-                                  int x, int y, int button, int rotation) {
-        if(x<0||y<0||x>=width||y>=height) {
-            return; // .. invalid ..
-        }
-        if(DEBUG_MOUSE_EVENT) {
-            System.out.println("sendMouseEvent: "+MouseEvent.getEventTypeString(eventType)+
-                               ", mod "+modifiers+", pos "+x+"/"+y+", button "+button);
-        }
-        if(button<0||button>MouseEvent.BUTTON_NUMBER) {
-            throw new NativeWindowException("Invalid mouse button number" + button);
-        }
-        long when = System.currentTimeMillis();
-        MouseEvent eClicked = null;
-        MouseEvent e = null;
-
-        if(MouseEvent.EVENT_MOUSE_PRESSED==eventType) {
-            if(when-lastMousePressed<ClickTimeout) {
-                lastMouseClickCount++;
-            } else {
-                lastMouseClickCount=1;
-            }
-            lastMousePressed=when;
-            mouseButtonPressed=button;
-            e = new MouseEvent(true, eventType, this, when,
-                               modifiers, x, y, lastMouseClickCount, button, 0);
-        } else if(MouseEvent.EVENT_MOUSE_RELEASED==eventType) {
-            e = new MouseEvent(true, eventType, this, when,
-                               modifiers, x, y, lastMouseClickCount, button, 0);
-            if(when-lastMousePressed<ClickTimeout) {
-                eClicked = new MouseEvent(true, MouseEvent.EVENT_MOUSE_CLICKED, this, when,
-                                          modifiers, x, y, lastMouseClickCount, button, 0);
-            } else {
-                lastMouseClickCount=0;
-                lastMousePressed=0;
-            }
-            mouseButtonPressed=0;
-        } else if(MouseEvent.EVENT_MOUSE_MOVED==eventType) {
-            if (mouseButtonPressed>0) {
-                e = new MouseEvent(true, MouseEvent.EVENT_MOUSE_DRAGGED, this, when,
-                                   modifiers, x, y, 1, mouseButtonPressed, 0);
-            } else {
-                e = new MouseEvent(true, eventType, this, when,
-                                   modifiers, x, y, 0, button, 0);
-            }
-        } else if(MouseEvent.EVENT_MOUSE_WHEEL_MOVED==eventType) {
-            e = new MouseEvent(true, eventType, this, when, modifiers, x, y, 0, button, rotation);
-        } else {
-            e = new MouseEvent(true, eventType, this, when, modifiers, x, y, 0, button, 0);
-        }
-
-        if(DEBUG_MOUSE_EVENT) {
-            System.out.println("sendMouseEvent: event:         "+e);
-            if(null!=eClicked) {
-                System.out.println("sendMouseEvent: event Clicked: "+eClicked);
-            }
-        }
-
-        ArrayList listeners = null;
-        synchronized(mouseListeners) {
-            listeners = mouseListeners;
-        }
-        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
-            MouseListener l = (MouseListener) i.next();
-            switch(e.getEventType()) {
-                case MouseEvent.EVENT_MOUSE_CLICKED:
-                    l.mouseClicked(e);
-                    break;
-                case MouseEvent.EVENT_MOUSE_ENTERED:
-                    l.mouseEntered(e);
-                    break;
-                case MouseEvent.EVENT_MOUSE_EXITED:
-                    l.mouseExited(e);
-                    break;
-                case MouseEvent.EVENT_MOUSE_PRESSED:
-                    l.mousePressed(e);
-                    break;
-                case MouseEvent.EVENT_MOUSE_RELEASED:
-                    l.mouseReleased(e);
-                    if(null!=eClicked) {
-                        l.mouseClicked(eClicked);
-                    }
-                    break;
-                case MouseEvent.EVENT_MOUSE_MOVED:
-                    l.mouseMoved(e);
-                    break;
-                case MouseEvent.EVENT_MOUSE_DRAGGED:
-                    l.mouseDragged(e);
-                    break;
-                case MouseEvent.EVENT_MOUSE_WHEEL_MOVED:
-                    l.mouseWheelMoved(e);
-                    break;
-                default:
-                    throw new NativeWindowException("Unexpected mouse event type " + e.getEventType());
-            }
-        }
-    }
-
-    //
-    // KeyListener Support
-    //
-
-    public void addKeyListener(KeyListener l) {
-        if(l == null) {
-            return;
-        }
-        synchronized(keyListeners) {
-            ArrayList newKeyListeners = (ArrayList) keyListeners.clone();
-            newKeyListeners.add(l);
-            keyListeners = newKeyListeners;
-        }
-    }
-
-    public void removeKeyListener(KeyListener l) {
-        if (l == null) {
-            return;
-        }
-        synchronized(keyListeners) {
-            ArrayList newKeyListeners = (ArrayList) keyListeners.clone();
-            newKeyListeners.remove(l);
-            keyListeners = newKeyListeners;
-        }
-    }
-
-    public KeyListener[] getKeyListeners() {
-        synchronized(keyListeners) {
-            return (KeyListener[]) keyListeners.toArray();
-        }
-    }
-
-    private ArrayList keyListeners = new ArrayList();
-
-    protected void sendKeyEvent(int eventType, int modifiers, int keyCode, char keyChar) {
-        KeyEvent e = new KeyEvent(true, eventType, this, System.currentTimeMillis(),
-                                      modifiers, keyCode, keyChar);
-        if(DEBUG_KEY_EVENT) {
-            System.out.println("sendKeyEvent: "+e);
-        }
-        ArrayList listeners = null;
-        synchronized(keyListeners) {
-            listeners = keyListeners;
-        }
-        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
-            KeyListener l = (KeyListener) i.next();
-            switch(eventType) {
-                case KeyEvent.EVENT_KEY_PRESSED:
-                    l.keyPressed(e);
-                    break;
-                case KeyEvent.EVENT_KEY_RELEASED:
-                    l.keyReleased(e);
-                    break;
-                case KeyEvent.EVENT_KEY_TYPED:
-                    l.keyTyped(e);
-                    break;
-                default:
-                    throw new NativeWindowException("Unexpected key event type " + e.getEventType());
-            }
-        }
-    }
-
-    //
-    // WindowListener Support
-    //
-
-    private ArrayList windowListeners = new ArrayList();
-
-    public void addWindowListener(WindowListener l) {
-        if(l == null) {
-            return;
-        }
-        synchronized(windowListeners) {
-            ArrayList newWindowListeners = (ArrayList) windowListeners.clone();
-            newWindowListeners.add(l);
-            windowListeners = newWindowListeners;
-        }
-    }
-
-    public void removeWindowListener(WindowListener l) {
-        if (l == null) {
-            return;
-        }
-        synchronized(windowListeners) {
-            ArrayList newWindowListeners = (ArrayList) windowListeners.clone();
-            newWindowListeners.remove(l);
-            windowListeners = newWindowListeners;
-        }
-    }
-
-    public WindowListener[] getWindowListeners() {
-        synchronized(windowListeners) {
-            return (WindowListener[]) windowListeners.toArray();
-        }
-    }
-
-    protected void sendWindowEvent(int eventType) {
-        WindowEvent e = new WindowEvent(true, eventType, this, System.currentTimeMillis());
-        if(DEBUG_WINDOW_EVENT) {
-            System.out.println("sendWindowEvent: "+e);
-        }
-        ArrayList listeners = null;
-        synchronized(windowListeners) {
-            listeners = windowListeners;
-        }
-        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
-            WindowListener l = (WindowListener) i.next();
-            switch(eventType) {
-                case WindowEvent.EVENT_WINDOW_RESIZED:
-                    l.windowResized(e);
-                    break;
-                case WindowEvent.EVENT_WINDOW_MOVED:
-                    l.windowMoved(e);
-                    break;
-                case WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY:
-                    l.windowDestroyNotify(e);
-                    break;
-                case WindowEvent.EVENT_WINDOW_GAINED_FOCUS:
-                    l.windowGainedFocus(e);
-                    break;
-                case WindowEvent.EVENT_WINDOW_LOST_FOCUS:
-                    l.windowLostFocus(e);
-                    break;
-                default:
-                    throw 
-                        new NativeWindowException("Unexpected window event type "
-                                                  + e.getEventType());
-            }
-        }
-    }
-
-
-    //
-    // WindowListener Support
-    //
-
-    private ArrayList paintListeners = new ArrayList();
-
-    public void addPaintListener(PaintListener l) {
-        if(l == null) {
-            return;
-        }
-        synchronized(paintListeners) {
-            ArrayList newPaintListeners = (ArrayList) paintListeners.clone();
-            newPaintListeners.add(l);
-            paintListeners = newPaintListeners;
-        }
-    }
-
-    public void removePaintListener(PaintListener l) {
-        if (l == null) {
-            return;
-        }
-        synchronized(paintListeners) {
-            ArrayList newPaintListeners = (ArrayList) paintListeners.clone();
-            newPaintListeners.remove(l);
-            paintListeners = newPaintListeners;
-        }
-    }
-
-    protected void sendPaintEvent(int eventType, int x, int y, int w, int h) {
-        PaintEvent e =
-            new PaintEvent(eventType, this, System.currentTimeMillis(), x, y, w, h);
-        ArrayList listeners = null;
-        synchronized(paintListeners) {
-            listeners = paintListeners;
-        }
-        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
-            PaintListener l = (PaintListener) i.next();
-            l.exposed(e);
-        }
-    }
-
-    //
-    // Reflection helper ..
-    //
-
-    private static Class[] getCustomConstructorArgumentTypes(Class windowClass) {
-        Class[] argTypes = null;
-        try {
-            Method m = windowClass.getDeclaredMethod("getCustomConstructorArgumentTypes", new Class[] {});
-            argTypes = (Class[]) m.invoke(null, null);
-        } catch (Throwable t) {}
-        return argTypes;
-    }
-
-    private static int verifyConstructorArgumentTypes(Class[] types, Object[] args) {
-        if(types.length != args.length) {
-            return -1;
-        }
-        for(int i=0; i<args.length; i++) {
-            if(!types[i].isInstance(args[i])) {
-                return i;
-            }
-        }
-        return args.length;
-    }
-
-    private static String getArgsStrList(Object[] args) {
-        StringBuffer sb = new StringBuffer();
-        for(int i=0; i<args.length; i++) {
-            sb.append(args[i].getClass());
-            if(i<args.length) {
-                sb.append(", ");
-            }
-        }
-        return sb.toString();
-    }
-
-    private static String getTypeStrList(Class[] types) {
-        StringBuffer sb = new StringBuffer();
-        for(int i=0; i<types.length; i++) {
-            sb.append(types[i]);
-            if(i<types.length) {
-                sb.append(", ");
-            }
-        }
-        return sb.toString();
-    }
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/WindowEvent.java b/src/newt/classes/com/sun/javafx/newt/WindowEvent.java
deleted file mode 100644
index c5aa65e3d..000000000
--- a/src/newt/classes/com/sun/javafx/newt/WindowEvent.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-public class WindowEvent extends Event {
-    public static final int EVENT_WINDOW_RESIZED = 100;
-    public static final int EVENT_WINDOW_MOVED   = 101; 
-    public static final int EVENT_WINDOW_DESTROY_NOTIFY = 102;
-    public static final int EVENT_WINDOW_GAINED_FOCUS = 103;
-    public static final int EVENT_WINDOW_LOST_FOCUS = 104;
-    // public static final int EVENT_WINDOW_REPAINT = 105; // TODO
-
-    public WindowEvent(int eventType, Window source, long when) {
-        this(false, eventType, source, when);
-    }
-
-    WindowEvent(boolean isSystemEvent, int eventType, Window source, long when) {
-        super(isSystemEvent, eventType, source, when);
-    }
-
-    public static String getEventTypeString(int type) {
-        switch(type) {
-            case EVENT_WINDOW_RESIZED: return "WINDOW_RESIZED";
-            case EVENT_WINDOW_MOVED:   return "WINDOW_MOVED";
-            case EVENT_WINDOW_DESTROY_NOTIFY:   return "EVENT_WINDOW_DESTROY_NOTIFY";
-            case EVENT_WINDOW_GAINED_FOCUS:   return "EVENT_WINDOW_GAINED_FOCUS";
-            case EVENT_WINDOW_LOST_FOCUS:   return "EVENT_WINDOW_LOST_FOCUS";
-            // case EVENT_WINDOW_REPAINT:   return "EVENT_WINDOW_REPAINT";
-            default: return "unknown (" + type + ")";
-        }
-    }
-    public String toString() {
-        return "WindowEvent["+getEventTypeString(getEventType()) +
-            ", " + super.toString() + "]";
-    }
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/WindowListener.java b/src/newt/classes/com/sun/javafx/newt/WindowListener.java
deleted file mode 100644
index 81624fa75..000000000
--- a/src/newt/classes/com/sun/javafx/newt/WindowListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt;
-
-public interface WindowListener extends EventListener {
-    public void windowResized(WindowEvent e);
-    public void windowMoved(WindowEvent e);
-    public void windowDestroyNotify(WindowEvent e);
-    public void windowGainedFocus(WindowEvent e);
-    public void windowLostFocus(WindowEvent e);
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/awt/AWTCanvas.java b/src/newt/classes/com/sun/javafx/newt/awt/AWTCanvas.java
deleted file mode 100644
index 6b8fc43c7..000000000
--- a/src/newt/classes/com/sun/javafx/newt/awt/AWTCanvas.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.awt;
-
-import com.sun.javafx.newt.Window;
-
-import java.awt.Canvas;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.GraphicsConfiguration;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.awt.*;
-import com.sun.javafx.newt.impl.Debug;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-public class AWTCanvas extends Canvas {
-  private GraphicsDevice device;
-  private GraphicsConfiguration chosen;
-  private AWTGraphicsConfiguration awtConfig;
-
-  private Capabilities capabilities;
-
-  private boolean displayConfigChanged=false;
-
-  public AWTCanvas(Capabilities capabilities) {
-    super();
-
-    if(null==capabilities) {
-        throw new NativeWindowException("Capabilities null");
-    }
-    this.capabilities=capabilities;
-  }
-
-  public AWTGraphicsConfiguration getAWTGraphicsConfiguration() {
-    return awtConfig;
-  }
-
-  public boolean hasDeviceChanged() {
-    boolean res = displayConfigChanged;
-    displayConfigChanged=false;
-    return res;
-  }
-
-  public void addNotify() {
-    super.addNotify();
-
-    disableBackgroundErase();
-
-    GraphicsConfiguration gc = super.getGraphicsConfiguration();
-    if(null!=gc) {
-        device = gc.getDevice();
-    }
-
-    /*
-     * Save the chosen capabilities for use in getGraphicsConfiguration().
-     */
-    awtConfig = chooseGraphicsConfiguration(capabilities, device);
-    if(Window.DEBUG_IMPLEMENTATION) {
-        Exception e = new Exception("Created Config: "+awtConfig);
-        e.printStackTrace();
-    }
-    if(null!=awtConfig) {
-      // update ..
-      chosen = awtConfig.getGraphicsConfiguration();
-    }
-    if(null==awtConfig) {
-          throw new NativeWindowException("Error: AWTGraphicsConfiguration is null");
-    }
-  }
-
-  /**
-   * Overridden to choose a GraphicsConfiguration on a parent container's
-   * GraphicsDevice because both devices
-   */
-  public GraphicsConfiguration getGraphicsConfiguration() {
-    /*
-     * Workaround for problems with Xinerama and java.awt.Component.checkGD
-     * when adding to a container on a different graphics device than the
-     * one that this Canvas is associated with.
-     * 
-     * GC will be null unless:
-     *   - A native peer has assigned it. This means we have a native
-     *     peer, and are already comitted to a graphics configuration.
-     *   - This canvas has been added to a component hierarchy and has
-     *     an ancestor with a non-null GC, but the native peer has not
-     *     yet been created. This means we can still choose the GC on
-     *     all platforms since the peer hasn't been created.
-     */
-    final GraphicsConfiguration gc = super.getGraphicsConfiguration();
-    /*
-     * chosen is only non-null on platforms where the GLDrawableFactory
-     * returns a non-null GraphicsConfiguration (in the GLCanvas
-     * constructor).
-     * 
-     * if gc is from this Canvas' native peer then it should equal chosen,
-     * otherwise it is from an ancestor component that this Canvas is being
-     * added to, and we go into this block.
-     */
-    if (gc != null && chosen != null && !chosen.equals(gc)) {
-      /*
-       * Check for compatibility with gc. If they differ by only the
-       * device then return a new GCconfig with the super-class' GDevice
-       * (and presumably the same visual ID in Xinerama).
-       * 
-       */
-      if (!chosen.getDevice().getIDstring().equals(gc.getDevice().getIDstring())) {
-        /*
-         * Here we select a GraphicsConfiguration on the alternate
-         * device that is presumably identical to the chosen
-         * configuration, but on the other device.
-         * 
-         * Should really check to ensure that we select a configuration
-         * with the same X visual ID for Xinerama screens, otherwise the
-         * GLDrawable may have the wrong visual ID (I don't think this
-         * ever gets updated). May need to add a method to
-         * X11GLDrawableFactory to do this in a platform specific
-         * manner.
-         * 
-         * However, on platforms where we can actually get into this
-         * block, both devices should have the same visual list, and the
-         * same configuration should be selected here.
-         */
-        AWTGraphicsConfiguration config = chooseGraphicsConfiguration((Capabilities)awtConfig.getRequestedCapabilities(), gc.getDevice());
-        final GraphicsConfiguration compatible = (null!=config)?config.getGraphicsConfiguration():null;
-        if(Window.DEBUG_IMPLEMENTATION) {
-            Exception e = new Exception("Call Stack: "+Thread.currentThread().getName());
-            e.printStackTrace();
-            System.err.println("!!! Created Config (n): HAVE    GC "+chosen);
-            System.err.println("!!! Created Config (n): THIS    GC "+gc);
-            System.err.println("!!! Created Config (n): Choosen GC "+compatible);
-            System.err.println("!!! Created Config (n): HAVE    CF "+awtConfig);
-            System.err.println("!!! Created Config (n): Choosen CF "+config);
-            System.err.println("!!! Created Config (n): EQUALS CAPS "+config.getChosenCapabilities().equals(awtConfig.getChosenCapabilities()));
-        }
-
-        if (compatible != null) {
-          /*
-           * Save the new GC for equals test above, and to return to
-           * any outside callers of this method.
-           */
-          chosen = compatible;
-          if( !config.getChosenCapabilities().equals(awtConfig.getChosenCapabilities())) {
-              displayConfigChanged=true;
-          } 
-          awtConfig = config;
-        }
-      }
-
-      /*
-       * If a compatible GC was not found in the block above, this will
-       * return the GC that was selected in the constructor (and might
-       * cause an exception in Component.checkGD when adding to a
-       * container, but in this case that would be the desired behavior).
-       * 
-       */
-      return chosen;
-    } else if (gc == null) {
-      /*
-       * The GC is null, which means we have no native peer, and are not
-       * part of a (realized) component hierarchy. So we return the
-       * desired visual that was selected in the constructor (possibly
-       * null).
-       */
-      return chosen;
-    }
-
-    /*
-     * Otherwise we have not explicitly selected a GC in the constructor, so
-     * just return what Canvas would have.
-     */
-    return gc;
-  }
-
-  private static AWTGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
-                                                                      GraphicsDevice device) {
-    AbstractGraphicsScreen aScreen = AWTGraphicsScreen.createScreenDevice(device);
-    AWTGraphicsConfiguration config = (AWTGraphicsConfiguration)
-      GraphicsConfigurationFactory.getFactory(AWTGraphicsDevice.class).chooseGraphicsConfiguration(capabilities,
-                                                                                                   null,
-                                                                                                   aScreen);
-    if (config == null) {
-      throw new NativeWindowException("Error: Couldn't fetch AWTGraphicsConfiguration");
-    }
-
-    return config;
-  }
-
-  // Disables the AWT's erasing of this Canvas's background on Windows
-  // in Java SE 6. This internal API is not available in previous
-  // releases, but the system property
-  // -Dsun.awt.noerasebackground=true can be specified to get similar
-  // results globally in previous releases.
-  private static boolean disableBackgroundEraseInitialized;
-  private static Method  disableBackgroundEraseMethod;
-  private void disableBackgroundErase() {
-    if (!disableBackgroundEraseInitialized) {
-      try {
-        AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-              try {
-                Class clazz = getToolkit().getClass();
-                while (clazz != null && disableBackgroundEraseMethod == null) {
-                  try {
-                    disableBackgroundEraseMethod =
-                      clazz.getDeclaredMethod("disableBackgroundErase",
-                                              new Class[] { Canvas.class });
-                    disableBackgroundEraseMethod.setAccessible(true);
-                  } catch (Exception e) {
-                    clazz = clazz.getSuperclass();
-                  }
-                }
-              } catch (Exception e) {
-              }
-              return null;
-            }
-          });
-      } catch (Exception e) {
-      }
-      disableBackgroundEraseInitialized = true;
-    }
-    if (disableBackgroundEraseMethod != null) {
-      try {
-        disableBackgroundEraseMethod.invoke(getToolkit(), new Object[] { this });
-      } catch (Exception e) {
-        // FIXME: workaround for 6504460 (incorrect backport of 6333613 in 5.0u10)
-        // throw new GLException(e);
-      }
-    }
-  }
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/awt/AWTDisplay.java b/src/newt/classes/com/sun/javafx/newt/awt/AWTDisplay.java
deleted file mode 100644
index 19f3ed1a8..000000000
--- a/src/newt/classes/com/sun/javafx/newt/awt/AWTDisplay.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.awt;
-
-import java.awt.event.*;
-import com.sun.javafx.newt.Display;
-import com.sun.javafx.newt.Window;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.awt.*;
-import java.util.*;
-
-public class AWTDisplay extends Display {
-    public AWTDisplay() {
-    }
-
-    protected void createNative() {
-        aDevice = (AWTGraphicsDevice) AWTGraphicsDevice.createDevice(null); // default 
-    }
-
-    protected void setAWTGraphicsDevice(AWTGraphicsDevice d) {
-        aDevice = d;
-    }
-
-    protected void closeNative() { }
-
-    public void dispatchMessages() {
-        AWTEventWrapper w;
-        do {
-            synchronized(this) {
-                if (!events.isEmpty()) {
-                    w = (AWTEventWrapper) events.removeFirst();
-                } else {
-                    w = null;
-                }
-            }
-            if (w != null) {
-                switch (w.getType()) {
-                    case com.sun.javafx.newt.WindowEvent.EVENT_WINDOW_RESIZED:
-                    case com.sun.javafx.newt.WindowEvent.EVENT_WINDOW_MOVED:
-                    case com.sun.javafx.newt.WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY:
-                        w.getWindow().sendWindowEvent(w.getType());
-                        break;
-
-                    case com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_CLICKED:
-                    case com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_ENTERED:
-                    case com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_EXITED:
-                    case com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_PRESSED:
-                    case com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_RELEASED:
-                    case com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_MOVED:
-                    case com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_DRAGGED:
-                    case com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_WHEEL_MOVED:
-                        {
-                            MouseEvent e = (MouseEvent) w.getEvent();
-                            int rotation = 0;
-                            if (e instanceof MouseWheelEvent) {
-                                rotation = ((MouseWheelEvent)e).getWheelRotation();
-                            }
-                            w.getWindow().sendMouseEvent(w.getType(), convertModifiers(e),
-                                                         e.getX(), e.getY(), convertButton(e),
-                                                         rotation);
-                        }
-                        break;
-
-                    case com.sun.javafx.newt.KeyEvent.EVENT_KEY_PRESSED:
-                    case com.sun.javafx.newt.KeyEvent.EVENT_KEY_RELEASED:
-                    case com.sun.javafx.newt.KeyEvent.EVENT_KEY_TYPED:
-                        {
-                            KeyEvent e = (KeyEvent) w.getEvent();
-                            w.getWindow().sendKeyEvent(w.getType(), convertModifiers(e),
-                                                       e.getKeyCode(), e.getKeyChar());
-                        }
-                        break;
-
-                    default:
-                        throw new NativeWindowException("Unknown event type " + w.getType());
-                }
-                if(Window.DEBUG_MOUSE_EVENT) {
-                    System.out.println("dispatchMessages: "+w.getWindow()+" in event:"+w.getEvent());
-                }
-            }
-        } while (w != null);
-    }
-
-    protected void enqueueEvent(AWTWindow w, int type, InputEvent e) {
-        AWTEventWrapper wrapper = new AWTEventWrapper(w, type, e);
-        synchronized(this) {
-            events.add(wrapper);
-        }
-    }
-
-    private LinkedList/*<AWTEventWrapper>*/ events = new LinkedList();
-
-    static class AWTEventWrapper {
-        AWTWindow window;
-        int type;
-        InputEvent e;
-
-        AWTEventWrapper(AWTWindow w, int type, InputEvent e) {
-            this.window = w;
-            this.type = type;
-            this.e = e;
-        }
-
-        public AWTWindow getWindow() {
-            return window;
-        }
-
-        public int getType() {
-            return type;
-        }
-
-        public InputEvent getEvent() {
-            return e;
-        }
-    }
-
-    private static int convertModifiers(InputEvent e) {
-        int newtMods = 0;
-        int mods = e.getModifiers();
-        if ((mods & InputEvent.SHIFT_MASK) != 0)     newtMods |= com.sun.javafx.newt.InputEvent.SHIFT_MASK;
-        if ((mods & InputEvent.CTRL_MASK) != 0)      newtMods |= com.sun.javafx.newt.InputEvent.CTRL_MASK;
-        if ((mods & InputEvent.META_MASK) != 0)      newtMods |= com.sun.javafx.newt.InputEvent.META_MASK;
-        if ((mods & InputEvent.ALT_MASK) != 0)       newtMods |= com.sun.javafx.newt.InputEvent.ALT_MASK;
-        if ((mods & InputEvent.ALT_GRAPH_MASK) != 0) newtMods |= com.sun.javafx.newt.InputEvent.ALT_GRAPH_MASK;
-        return newtMods;
-    }
-
-    private static int convertButton(MouseEvent e) {
-        switch (e.getButton()) {
-            case MouseEvent.BUTTON1: return com.sun.javafx.newt.MouseEvent.BUTTON1;
-            case MouseEvent.BUTTON2: return com.sun.javafx.newt.MouseEvent.BUTTON2;
-            case MouseEvent.BUTTON3: return com.sun.javafx.newt.MouseEvent.BUTTON3;
-        }
-        return 0;
-    }
-
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/awt/AWTScreen.java b/src/newt/classes/com/sun/javafx/newt/awt/AWTScreen.java
deleted file mode 100644
index 9bda5893b..000000000
--- a/src/newt/classes/com/sun/javafx/newt/awt/AWTScreen.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.awt;
-
-import com.sun.javafx.newt.*;
-import java.awt.DisplayMode;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.awt.*;
-
-public class AWTScreen extends Screen {
-    public AWTScreen() {
-    }
-
-    protected void createNative(int index) {
-        aScreen = new AWTGraphicsScreen((AWTGraphicsDevice)display.getGraphicsDevice());
-        
-        DisplayMode mode = ((AWTGraphicsDevice)getDisplay().getGraphicsDevice()).getGraphicsDevice().getDisplayMode();
-        int w = mode.getWidth();
-        int h = mode.getHeight();
-        setScreenSize(w, h);
-    }
-
-    protected void setAWTGraphicsScreen(AWTGraphicsScreen s) {
-        aScreen = s;
-    }
-
-    // done by AWTWindow ..
-    protected void setScreenSize(int w, int h) {
-        super.setScreenSize(w, h);
-    }
-
-    protected void closeNative() { }
-
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/awt/AWTWindow.java b/src/newt/classes/com/sun/javafx/newt/awt/AWTWindow.java
deleted file mode 100644
index 9725cf08b..000000000
--- a/src/newt/classes/com/sun/javafx/newt/awt/AWTWindow.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.awt;
-
-import java.awt.BorderLayout;
-import java.awt.Canvas;
-import java.awt.Container;
-import java.awt.DisplayMode;
-import java.awt.EventQueue;
-import java.awt.Frame;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.awt.event.*;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.*;
-import com.sun.javafx.newt.Window;
-import java.awt.Insets;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.awt.*;
-
-/** An implementation of the Newt Window class built using the
-    AWT. This is provided for convenience of porting to platforms
-    supporting Java SE. */
-
-public class AWTWindow extends Window {
-
-    public AWTWindow() {
-        this(null);
-    }
-
-    public static Class[] getCustomConstructorArgumentTypes() {
-        return new Class[] { Container.class } ;
-    }
-
-    public AWTWindow(Container container) {
-        super();
-        title = "AWT NewtWindow";
-        this.container = container;
-        if(container instanceof Frame) {
-            frame = (Frame) container;
-        }
-    }
-
-    private boolean owningFrame;
-    private Container container = null;
-    private Frame frame = null; // same instance as container, just for impl. convenience
-    private AWTCanvas canvas;
-    // non fullscreen dimensions ..
-    private int nfs_width, nfs_height, nfs_x, nfs_y;
-
-    public void setTitle(final String title) {
-        super.setTitle(title);
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    if (frame != null) {
-                        frame.setTitle(title);
-                    }
-                }
-            });
-    }
-
-    protected void createNative(long parentWindowHandle, final Capabilities caps) {
-
-        if(0!=parentWindowHandle) {
-            throw new RuntimeException("Window parenting not supported in AWT, use AWTWindow(Frame) cstr for wrapping instead");
-        }
-
-        final AWTWindow awtWindow = this;
-
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    if(null==container) {
-                        frame = new Frame();
-                        container = frame;
-                        owningFrame=true;
-                    } else {
-                        owningFrame=false;
-                        width = container.getWidth();
-                        height = container.getHeight();
-                        x = container.getX();
-                        y = container.getY();
-                    }
-                    if(null!=frame) {
-                        frame.setTitle(getTitle());
-                    }
-                    container.setLayout(new BorderLayout());
-                    canvas = new AWTCanvas(caps);
-                    Listener listener = new Listener(awtWindow);
-                    canvas.addMouseListener(listener);
-                    canvas.addMouseMotionListener(listener);
-                    canvas.addKeyListener(listener);
-                    canvas.addComponentListener(listener);
-                    container.add(canvas, BorderLayout.CENTER);
-                    container.setSize(width, height);
-                    container.setLocation(x, y);
-                    container.addComponentListener(new MoveListener(awtWindow));
-                    if(null!=frame) {
-                        frame.setUndecorated(undecorated||fullscreen);
-                        frame.addWindowListener(new WindowEventListener(awtWindow));
-                    }
-                }
-            });
-    }
-
-    protected void closeNative() {
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    if(owningFrame && null!=frame) {
-                        frame.dispose();
-                        owningFrame=false;
-                    }
-                    frame = null;
-                }
-            });
-    }
-
-    public boolean hasDeviceChanged() {
-        boolean res = canvas.hasDeviceChanged();
-        if(res) {
-            config = canvas.getAWTGraphicsConfiguration();
-            if (config == null) {
-                throw new NativeWindowException("Error Device change null GraphicsConfiguration: "+this);
-            }
-            updateDeviceData();
-        }
-        return res;
-    }
-
-    public void setVisible(final boolean visible) {
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    container.setVisible(visible);
-                }
-            });
-
-        config = canvas.getAWTGraphicsConfiguration();
-
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-
-        updateDeviceData();
-    }
-
-    private void updateDeviceData() {
-        // propagate new info ..
-        ((AWTScreen)getScreen()).setAWTGraphicsScreen((AWTGraphicsScreen)config.getScreen());
-        ((AWTDisplay)getScreen().getDisplay()).setAWTGraphicsDevice((AWTGraphicsDevice)config.getScreen().getDevice());
-
-        DisplayMode mode = ((AWTGraphicsDevice)config.getScreen().getDevice()).getGraphicsDevice().getDisplayMode();
-        int w = mode.getWidth();
-        int h = mode.getHeight();
-        ((AWTScreen)screen).setScreenSize(w, h);
-    }
-
-    public void setSize(final int width, final int height) {
-        this.width = width;
-        this.height = height;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        }
-        /** An AWT event on setSize() would bring us in a deadlock situation, hence invokeLater() */
-        runOnEDT(false, new Runnable() {
-                public void run() {
-                    Insets insets = container.getInsets();
-                    container.setSize(width + insets.left + insets.right,
-                                      height + insets.top + insets.bottom);
-                }
-            });
-    }
-
-    public com.sun.javafx.newt.Insets getInsets() {
-        final int insets[] = new int[] { 0, 0, 0, 0 };
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    Insets contInsets = container.getInsets();
-                    insets[0] = contInsets.top;
-                    insets[1] = contInsets.left;
-                    insets[2] = contInsets.bottom;
-                    insets[3] = contInsets.right;
-                }
-            });
-        return new com.sun.javafx.newt.
-            Insets(insets[0],insets[1],insets[2],insets[3]);
-    }
-
-    public void setPosition(final int x, final int y) {
-        this.x = x;
-        this.y = y;
-        if(!fullscreen) {
-            nfs_x=x;
-            nfs_y=y;
-        }
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    container.setLocation(x, y);
-                }
-            });
-    }
-
-    public boolean setFullscreen(final boolean fullscreen) {
-        if(this.fullscreen!=fullscreen) {
-            final int x,y,w,h;
-            this.fullscreen=fullscreen;
-            if(fullscreen) {
-                x = 0; y = 0;
-                w = screen.getWidth();
-                h = screen.getHeight();
-            } else {
-                x = nfs_x;
-                y = nfs_y;
-                w = nfs_width;
-                h = nfs_height;
-            }
-            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                System.err.println("AWTWindow fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
-            }
-            /** An AWT event on setSize() would bring us in a deadlock situation, hence invokeLater() */
-            runOnEDT(false, new Runnable() {
-                    public void run() {
-                        if(null!=frame) {
-                            if(!container.isDisplayable()) {
-                                frame.setUndecorated(undecorated||fullscreen);
-                            } else {
-                                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                                    System.err.println("AWTWindow can't undecorate already created frame");
-                                }
-                            }
-                        }
-                        container.setLocation(x, y);
-                        container.setSize(w, h);
-                    }
-                });
-        }
-        return true;
-    }
-
-    public Object getWrappedWindow() {
-        return canvas;
-    }
-
-    protected void sendWindowEvent(int eventType) {
-        super.sendWindowEvent(eventType);
-    }
-
-    protected void sendKeyEvent(int eventType, int modifiers, int keyCode, char keyChar) {
-        super.sendKeyEvent(eventType, modifiers, keyCode, keyChar);
-    }
-
-    protected void sendMouseEvent(int eventType, int modifiers,
-                                  int x, int y, int button, int rotation) {
-        super.sendMouseEvent(eventType, modifiers, x, y, button, rotation);
-    }
-
-    private static void runOnEDT(boolean wait, Runnable r) {
-        if (EventQueue.isDispatchThread()) {
-            r.run();
-        } else {
-            try {
-                if(wait) {
-                    EventQueue.invokeAndWait(r);
-                } else {
-                    EventQueue.invokeLater(r);
-                }
-            } catch (Exception e) {
-                throw new NativeWindowException(e);
-            }
-        }
-    }
-
-    private static final int WINDOW_EVENT = 1;
-    private static final int KEY_EVENT = 2;
-    private static final int MOUSE_EVENT = 3;
-
-    class MoveListener implements ComponentListener {
-        private AWTWindow window;
-        private AWTDisplay display;
-
-        public MoveListener(AWTWindow w) {
-            window = w;
-            display = (AWTDisplay)window.getScreen().getDisplay();
-        }
-
-        public void componentResized(ComponentEvent e) {
-        }
-
-        public void componentMoved(ComponentEvent e) {
-            if(null!=container) {
-                x = container.getX();
-                y = container.getY();
-            }
-            display.enqueueEvent(window, com.sun.javafx.newt.WindowEvent.EVENT_WINDOW_MOVED, null);
-        }
-
-        public void componentShown(ComponentEvent e) {
-        }
-
-        public void componentHidden(ComponentEvent e) {
-        }
-
-    }
-
-    class Listener implements ComponentListener, MouseListener, MouseMotionListener, KeyListener {
-        private AWTWindow window;
-        private AWTDisplay display;
-
-        public Listener(AWTWindow w) {
-            window = w;
-            display = (AWTDisplay)window.getScreen().getDisplay();
-        }
-
-        public void componentResized(ComponentEvent e) {
-            width = canvas.getWidth();
-            height = canvas.getHeight();
-            display.enqueueEvent(window, com.sun.javafx.newt.WindowEvent.EVENT_WINDOW_RESIZED, null);
-        }
-
-        public void componentMoved(ComponentEvent e) {
-        }
-
-        public void componentShown(ComponentEvent e) {
-        }
-
-        public void componentHidden(ComponentEvent e) {
-        }
-
-        public void mouseClicked(MouseEvent e) {
-            // We ignore these as we synthesize them ourselves out of
-            // mouse pressed and released events
-        }
-
-        public void mouseEntered(MouseEvent e) {
-            display.enqueueEvent(window, com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_ENTERED, e);
-        }
-
-        public void mouseExited(MouseEvent e) {
-            display.enqueueEvent(window, com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_EXITED, e);
-        }
-
-        public void mousePressed(MouseEvent e) {
-            display.enqueueEvent(window, com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_PRESSED, e);
-        }
-
-        public void mouseReleased(MouseEvent e) {
-            display.enqueueEvent(window, com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_RELEASED, e);
-        }
-
-        public void mouseMoved(MouseEvent e) {
-            display.enqueueEvent(window, com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_MOVED, e);
-        }
-
-        public void mouseDragged(MouseEvent e) {
-            display.enqueueEvent(window, com.sun.javafx.newt.MouseEvent.EVENT_MOUSE_DRAGGED, e);
-        }
-
-        public void keyPressed(KeyEvent e) {
-            display.enqueueEvent(window, com.sun.javafx.newt.KeyEvent.EVENT_KEY_PRESSED, e);
-        }
-
-        public void keyReleased(KeyEvent e) {
-            display.enqueueEvent(window, com.sun.javafx.newt.KeyEvent.EVENT_KEY_RELEASED, e);
-        }
-
-        public void keyTyped(KeyEvent e)  {
-            display.enqueueEvent(window, com.sun.javafx.newt.KeyEvent.EVENT_KEY_TYPED, e);
-        }
-    }
-
-    class WindowEventListener implements WindowListener {
-        private AWTWindow window;
-        private AWTDisplay display;
-
-        public WindowEventListener(AWTWindow w) {
-            window = w;
-            display = (AWTDisplay)window.getScreen().getDisplay();
-        }
-
-        public void windowActivated(WindowEvent e) {
-        }
-        public void windowClosed(WindowEvent e) {
-        }
-        public void windowClosing(WindowEvent e) {
-            display.enqueueEvent(window, com.sun.javafx.newt.WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY, null);
-        }
-        public void windowDeactivated(WindowEvent e) {
-        }
-        public void windowDeiconified(WindowEvent e) {
-        }
-        public void windowIconified(WindowEvent e) {
-        }
-        public void windowOpened(WindowEvent e) {
-        }
-    }
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/impl/Debug.java b/src/newt/classes/com/sun/javafx/newt/impl/Debug.java
deleted file mode 100644
index 202d9d5b3..000000000
--- a/src/newt/classes/com/sun/javafx/newt/impl/Debug.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.javafx.newt.impl;
-
-import java.security.*;
-
-/** Helper routines for logging and debugging. */
-
-public class Debug {
-  // Some common properties
-  private static boolean verbose;
-  private static boolean debugAll;
-  private static AccessControlContext localACC;
-  
-  static {
-    localACC=AccessController.getContext();
-    verbose = isPropertyDefined("newt.verbose", true);
-    debugAll = isPropertyDefined("newt.debug", true);
-    if (verbose) {
-       Package p = Package.getPackage("com.sun.javafx.newt");
-       System.err.println("NEWT specification version " + p.getSpecificationVersion());
-       System.err.println("NEWT implementation version " + p.getImplementationVersion());
-       System.err.println("NEWT implementation vendor " + p.getImplementationVendor());
-    }
-  }
-
-  static int getIntProperty(final String property, final boolean jnlpAlias) {
-      return getIntProperty(property, jnlpAlias, localACC);
-  }
-
-  public static int getIntProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    int i=0;
-    try {
-        Integer iv = Integer.valueOf(Debug.getProperty(property, jnlpAlias, acc));
-        i = iv.intValue();
-    } catch (NumberFormatException nfe) {}
-    return i;
-  }
-
-  static boolean getBooleanProperty(final String property, final boolean jnlpAlias) {
-    return getBooleanProperty(property, jnlpAlias, localACC);
-  }
-
-  public static boolean getBooleanProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    Boolean b = Boolean.valueOf(Debug.getProperty(property, jnlpAlias, acc));
-    return b.booleanValue();
-  }
-
-  static boolean isPropertyDefined(final String property, final boolean jnlpAlias) {
-    return isPropertyDefined(property, jnlpAlias, localACC);
-  }
-
-  public static boolean isPropertyDefined(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    return (Debug.getProperty(property, jnlpAlias, acc) != null) ? true : false;
-  }
-
-  static String getProperty(final String property, final boolean jnlpAlias) {
-    return getProperty(property, jnlpAlias, localACC);
-  }
-
-  public static String getProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    String s=null;
-    if(null!=acc && acc.equals(localACC)) {
-        s = (String) AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-              String val=null;
-              try {
-                  val = System.getProperty(property);
-              } catch (Exception e) {}
-              if(null==val && jnlpAlias && !property.startsWith(jnlp_prefix)) {
-                  try {
-                      val = System.getProperty(jnlp_prefix + property);
-                  } catch (Exception e) {}
-              }
-              return val;
-            }
-          });
-    } else {
-        try {
-            s = System.getProperty(property);
-        } catch (Exception e) {}
-        if(null==s && jnlpAlias && !property.startsWith(jnlp_prefix)) {
-            try {
-                s = System.getProperty(jnlp_prefix + property);
-            } catch (Exception e) {}
-        }
-    }
-    return s;
-  }
-  public static final String jnlp_prefix = "jnlp." ;
-
-  public static boolean verbose() {
-    return verbose;
-  }
-
-  public static boolean debugAll() {
-    return debugAll;
-  }
-
-  public static boolean debug(String subcomponent) {
-    return debugAll() || isPropertyDefined("newt.debug." + subcomponent, true);
-  }
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java b/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java
deleted file mode 100644
index d96c56f6e..000000000
--- a/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.javafx.newt.impl;
-
-// FIXME: refactor Java SE dependencies
-//import java.awt.Toolkit;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashSet;
-import com.sun.nativewindow.impl.NativeLibLoaderBase;
-
-public class NativeLibLoader extends NativeLibLoaderBase {
-  
-  public static void loadNEWT() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("newt", null, true);
-        return null;
-      }
-    });
-  }
-
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/intel/gdl/Display.java b/src/newt/classes/com/sun/javafx/newt/intel/gdl/Display.java
deleted file mode 100644
index b1f0ac6d2..000000000
--- a/src/newt/classes/com/sun/javafx/newt/intel/gdl/Display.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.intel.gdl;
-
-import com.sun.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
-
-public class Display extends com.sun.javafx.newt.Display {
-    static int initCounter = 0;
-
-    static {
-        NativeLibLoader.loadNEWT();
-
-        if (!Screen.initIDs()) {
-            throw new NativeWindowException("Failed to initialize GDL Screen jmethodIDs");
-        }
-        if (!Window.initIDs()) {
-            throw new NativeWindowException("Failed to initialize GDL Window jmethodIDs");
-        }
-    }
-
-    public static void initSingleton() {
-        // just exist to ensure static init has been run
-    }
-
-
-    public Display() {
-    }
-
-    protected void createNative() {
-        synchronized(Display.class) {
-            if(0==initCounter) {
-                displayHandle = CreateDisplay();
-                if(0==displayHandle) {
-                    throw new NativeWindowException("Couldn't initialize GDL Display");
-                }
-            }
-            initCounter++;
-        }
-        aDevice = new DefaultGraphicsDevice(NativeWindowFactory.TYPE_DEFAULT, displayHandle);
-    }
-
-    protected void closeNative() {
-        if(0==displayHandle) {
-            throw new NativeWindowException("displayHandle null; initCnt "+initCounter);
-        }
-        synchronized(Display.class) {
-            if(initCounter>0) {
-                initCounter--;
-                if(0==initCounter) {
-                    DestroyDisplay(displayHandle);
-                }
-            }
-        }
-    }
-
-    protected void dispatchMessages() {
-        if(0!=displayHandle) {
-            DispatchMessages(displayHandle, focusedWindow);
-        }
-    }
-
-    protected void setFocus(Window focus) {
-        focusedWindow = focus;
-    }
-
-    private long displayHandle = 0;
-    private Window focusedWindow = null;
-    private native long CreateDisplay();
-    private native void DestroyDisplay(long displayHandle);
-    private native void DispatchMessages(long displayHandle, Window focusedWindow);
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/intel/gdl/Screen.java b/src/newt/classes/com/sun/javafx/newt/intel/gdl/Screen.java
deleted file mode 100644
index 83d9074e2..000000000
--- a/src/newt/classes/com/sun/javafx/newt/intel/gdl/Screen.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.intel.gdl;
-
-import com.sun.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
-
-public class Screen extends com.sun.javafx.newt.Screen {
-
-    static {
-        Display.initSingleton();
-    }
-
-    public Screen() {
-    }
-
-    protected void createNative(int index) {
-        AbstractGraphicsDevice adevice = getDisplay().getGraphicsDevice();
-        GetScreenInfo(adevice.getHandle(), index);
-        aScreen = new DefaultGraphicsScreen(adevice, index);
-    }
-
-    protected void closeNative() { }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    protected static native boolean initIDs();
-    private          native void GetScreenInfo(long displayHandle, int screen_idx);
-
-    // called by GetScreenInfo() ..
-    private void screenCreated(int width, int height) {
-        setScreenSize(width, height);
-    }
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/intel/gdl/Window.java b/src/newt/classes/com/sun/javafx/newt/intel/gdl/Window.java
deleted file mode 100644
index 0332f442a..000000000
--- a/src/newt/classes/com/sun/javafx/newt/intel/gdl/Window.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.intel.gdl;
-
-import javax.media.nativewindow.*;
-
-public class Window extends com.sun.javafx.newt.Window {
-    static {
-        Display.initSingleton();
-    }
-
-    public Window() {
-    }
-
-    static long nextWindowHandle = 1;
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        if(0!=parentWindowHandle) {
-            throw new NativeWindowException("GDL Window does not support window parenting");
-        }
-        AbstractGraphicsScreen aScreen = screen.getGraphicsScreen();
-        AbstractGraphicsDevice aDevice = screen.getDisplay().getGraphicsDevice();
-
-        config = GraphicsConfigurationFactory.getFactory(aDevice).chooseGraphicsConfiguration(caps, null, aScreen);
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-
-        synchronized(Window.class) {
-            windowHandle = nextWindowHandle++;
-        }
-    }
-
-    protected void closeNative() {
-        if(0!=surfaceHandle) {
-            synchronized(Window.class) {
-                CloseSurface(getDisplayHandle(), surfaceHandle);
-            }
-            surfaceHandle = 0;
-            ((Display)screen.getDisplay()).setFocus(null);
-        }
-    }
-
-    public void setVisible(boolean visible) {
-        if(this.visible!=visible) {
-            this.visible=visible;
-            if(visible && 0==surfaceHandle) {
-                synchronized(Window.class) {
-                    AbstractGraphicsDevice aDevice = screen.getDisplay().getGraphicsDevice();
-                    surfaceHandle = CreateSurface(aDevice.getHandle(), screen.getWidth(), screen.getHeight(), x, y, width, height);
-                }
-                if (surfaceHandle == 0) {
-                    throw new NativeWindowException("Error creating window");
-                }
-                ((Display)screen.getDisplay()).setFocus(this);
-            }
-        }
-    }
-
-    public void setSize(int width, int height) {
-        Screen  screen = (Screen) getScreen();
-        if((x+width)>screen.getWidth()) {
-            width=screen.getWidth()-x;
-        }
-        if((y+height)>screen.getHeight()) {
-            height=screen.getHeight()-y;
-        }
-        this.width = width;
-        this.height = height;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        }
-        if(0!=surfaceHandle) {
-            SetBounds0(surfaceHandle, screen.getWidth(), screen.getHeight(), x, y, width, height);
-        }
-    }
-
-    public void setPosition(int x, int y) {
-        Screen  screen = (Screen) getScreen();
-        if((x+width)>screen.getWidth()) {
-            x=screen.getWidth()-width;
-        }
-        if((y+height)>screen.getHeight()) {
-            y=screen.getHeight()-height;
-        }
-        this.x = x;
-        this.y = y;
-        if(!fullscreen) {
-            nfs_x=x;
-            nfs_y=y;
-        }
-        if(0!=surfaceHandle) {
-            SetBounds0(surfaceHandle, screen.getWidth(), screen.getHeight(), x, y, width, height);
-        }
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        if(this.fullscreen!=fullscreen) {
-            int x,y,w,h;
-            this.fullscreen=fullscreen;
-            if(fullscreen) {
-                x = 0; y = 0;
-                w = screen.getWidth();
-                h = screen.getHeight();
-            } else {
-                x = nfs_x;
-                y = nfs_y;
-                w = nfs_width;
-                h = nfs_height;
-            }
-            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                System.err.println("IntelGDL Window fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
-            }
-            if(0!=surfaceHandle) {
-                SetBounds0(surfaceHandle, screen.getWidth(), screen.getHeight(), x, y, w, h);
-            }
-        }
-        return fullscreen;
-    }
-
-    public void requestFocus() {
-        ((Display)screen.getDisplay()).setFocus(this);
-    }
-
-    public long getSurfaceHandle() {
-        return surfaceHandle;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    protected static native boolean initIDs();
-    private        native long CreateSurface(long displayHandle, int scrn_width, int scrn_height, int x, int y, int width, int height);
-    private        native void CloseSurface(long displayHandle, long surfaceHandle);
-    private        native void SetBounds0(long surfaceHandle, int scrn_width, int scrn_height, int x, int y, int width, int height);
-
-    private void updateBounds(int x, int y, int width, int height) {
-        this.x = x;
-        this.y = y;
-        this.width = width;
-        this.height = height;
-    }
-
-    private long   surfaceHandle;
-    private int nfs_width, nfs_height, nfs_x, nfs_y;
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/macosx/MacDisplay.java b/src/newt/classes/com/sun/javafx/newt/macosx/MacDisplay.java
deleted file mode 100755
index cd22b2b36..000000000
--- a/src/newt/classes/com/sun/javafx/newt/macosx/MacDisplay.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.macosx;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.macosx.*;
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.impl.*;
-import com.sun.javafx.newt.util.MainThread;
-
-public class MacDisplay extends Display {
-    static {
-        NativeLibLoader.loadNEWT();
-
-        if(!initNSApplication()) {
-            throw new NativeWindowException("Failed to initialize native Application hook");
-        }
-        if(!MacWindow.initIDs()) {
-            throw new NativeWindowException("Failed to initialize jmethodIDs");
-        }
-        if(DEBUG) System.out.println("MacDisplay.init App and IDs OK "+Thread.currentThread().getName());
-    }
-
-    public static void initSingleton() {
-        // just exist to ensure static init has been run
-    }
-    
-    public MacDisplay() {
-    }
-
-    class DispatchAction implements Runnable {
-        public void run() {
-            dispatchMessages0();
-        }
-    }
-    private DispatchAction dispatchAction = new DispatchAction();
-
-    public void dispatchMessages() {
-        MainThread.invoke(false, dispatchAction);
-    }
-    
-    protected void createNative() {
-        aDevice = new MacOSXGraphicsDevice();
-    }
-
-    protected void closeNative() { }
-
-    private static native boolean initNSApplication();
-    protected native void dispatchMessages0();
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/macosx/MacScreen.java b/src/newt/classes/com/sun/javafx/newt/macosx/MacScreen.java
deleted file mode 100755
index 8983b8803..000000000
--- a/src/newt/classes/com/sun/javafx/newt/macosx/MacScreen.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.macosx;
-
-import com.sun.javafx.newt.*;
-import javax.media.nativewindow.*;
-
-public class MacScreen extends Screen {
-    static {
-        MacDisplay.initSingleton();
-    }
-
-    public MacScreen() {
-    }
-
-    protected void createNative(int index) {
-        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
-        setScreenSize(getWidthImpl(getIndex()), getHeightImpl(getIndex()));
-    }
-
-    protected void closeNative() { }
-
-    private static native int getWidthImpl(int scrn_idx);
-    private static native int getHeightImpl(int scrn_idx);
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/macosx/MacWindow.java b/src/newt/classes/com/sun/javafx/newt/macosx/MacWindow.java
deleted file mode 100755
index 9f501ac9b..000000000
--- a/src/newt/classes/com/sun/javafx/newt/macosx/MacWindow.java
+++ /dev/null
@@ -1,600 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.macosx;
-
-import javax.media.nativewindow.*;
-
-import com.sun.javafx.newt.util.MainThread;
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.impl.*;
-
-public class MacWindow extends Window {
-    
-    // Window styles
-    private static final int NSBorderlessWindowMask     = 0;
-    private static final int NSTitledWindowMask         = 1 << 0;
-    private static final int NSClosableWindowMask       = 1 << 1;
-    private static final int NSMiniaturizableWindowMask = 1 << 2;
-    private static final int NSResizableWindowMask      = 1 << 3;
-
-    // Window backing store types
-    private static final int NSBackingStoreRetained     = 0;
-    private static final int NSBackingStoreNonretained  = 1;
-    private static final int NSBackingStoreBuffered     = 2;
-
-    // Key constants handled differently on Mac OS X than other platforms
-    private static final int NSUpArrowFunctionKey        = 0xF700;
-    private static final int NSDownArrowFunctionKey      = 0xF701;
-    private static final int NSLeftArrowFunctionKey      = 0xF702;
-    private static final int NSRightArrowFunctionKey     = 0xF703;
-    private static final int NSF1FunctionKey             = 0xF704;
-    private static final int NSF2FunctionKey             = 0xF705;
-    private static final int NSF3FunctionKey             = 0xF706;
-    private static final int NSF4FunctionKey             = 0xF707;
-    private static final int NSF5FunctionKey             = 0xF708;
-    private static final int NSF6FunctionKey             = 0xF709;
-    private static final int NSF7FunctionKey             = 0xF70A;
-    private static final int NSF8FunctionKey             = 0xF70B;
-    private static final int NSF9FunctionKey             = 0xF70C;
-    private static final int NSF10FunctionKey            = 0xF70D;
-    private static final int NSF11FunctionKey            = 0xF70E;
-    private static final int NSF12FunctionKey            = 0xF70F;
-    private static final int NSF13FunctionKey            = 0xF710;
-    private static final int NSF14FunctionKey            = 0xF711;
-    private static final int NSF15FunctionKey            = 0xF712;
-    private static final int NSF16FunctionKey            = 0xF713;
-    private static final int NSF17FunctionKey            = 0xF714;
-    private static final int NSF18FunctionKey            = 0xF715;
-    private static final int NSF19FunctionKey            = 0xF716;
-    private static final int NSF20FunctionKey            = 0xF717;
-    private static final int NSF21FunctionKey            = 0xF718;
-    private static final int NSF22FunctionKey            = 0xF719;
-    private static final int NSF23FunctionKey            = 0xF71A;
-    private static final int NSF24FunctionKey            = 0xF71B;
-    private static final int NSF25FunctionKey            = 0xF71C;
-    private static final int NSF26FunctionKey            = 0xF71D;
-    private static final int NSF27FunctionKey            = 0xF71E;
-    private static final int NSF28FunctionKey            = 0xF71F;
-    private static final int NSF29FunctionKey            = 0xF720;
-    private static final int NSF30FunctionKey            = 0xF721;
-    private static final int NSF31FunctionKey            = 0xF722;
-    private static final int NSF32FunctionKey            = 0xF723;
-    private static final int NSF33FunctionKey            = 0xF724;
-    private static final int NSF34FunctionKey            = 0xF725;
-    private static final int NSF35FunctionKey            = 0xF726;
-    private static final int NSInsertFunctionKey         = 0xF727;
-    private static final int NSDeleteFunctionKey         = 0xF728;
-    private static final int NSHomeFunctionKey           = 0xF729;
-    private static final int NSBeginFunctionKey          = 0xF72A;
-    private static final int NSEndFunctionKey            = 0xF72B;
-    private static final int NSPageUpFunctionKey         = 0xF72C;
-    private static final int NSPageDownFunctionKey       = 0xF72D;
-    private static final int NSPrintScreenFunctionKey    = 0xF72E;
-    private static final int NSScrollLockFunctionKey     = 0xF72F;
-    private static final int NSPauseFunctionKey          = 0xF730;
-    private static final int NSSysReqFunctionKey         = 0xF731;
-    private static final int NSBreakFunctionKey          = 0xF732;
-    private static final int NSResetFunctionKey          = 0xF733;
-    private static final int NSStopFunctionKey           = 0xF734;
-    private static final int NSMenuFunctionKey           = 0xF735;
-    private static final int NSUserFunctionKey           = 0xF736;
-    private static final int NSSystemFunctionKey         = 0xF737;
-    private static final int NSPrintFunctionKey          = 0xF738;
-    private static final int NSClearLineFunctionKey      = 0xF739;
-    private static final int NSClearDisplayFunctionKey   = 0xF73A;
-    private static final int NSInsertLineFunctionKey     = 0xF73B;
-    private static final int NSDeleteLineFunctionKey     = 0xF73C;
-    private static final int NSInsertCharFunctionKey     = 0xF73D;
-    private static final int NSDeleteCharFunctionKey     = 0xF73E;
-    private static final int NSPrevFunctionKey           = 0xF73F;
-    private static final int NSNextFunctionKey           = 0xF740;
-    private static final int NSSelectFunctionKey         = 0xF741;
-    private static final int NSExecuteFunctionKey        = 0xF742;
-    private static final int NSUndoFunctionKey           = 0xF743;
-    private static final int NSRedoFunctionKey           = 0xF744;
-    private static final int NSFindFunctionKey           = 0xF745;
-    private static final int NSHelpFunctionKey           = 0xF746;
-    private static final int NSModeSwitchFunctionKey     = 0xF747;
-
-    private volatile long surfaceHandle;
-    private long parentWindowHandle;
-
-    // non fullscreen dimensions ..
-    private int nfs_width, nfs_height, nfs_x, nfs_y;
-    private final Insets insets = new Insets(0,0,0,0);
-
-    static {
-        MacDisplay.initSingleton();
-    }
-
-    public MacWindow() {
-    }
-    
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        this.parentWindowHandle=parentWindowHandle;
-        config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, getScreen().getGraphicsScreen());
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-    }
-
-    class CloseAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if(DEBUG_IMPLEMENTATION) System.out.println("MacWindow.CloseAction "+Thread.currentThread().getName());
-                if (windowHandle != 0) {
-                    close0(windowHandle);
-                    windowHandle = 0;
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private CloseAction closeAction = new CloseAction();
-
-    protected void closeNative() {
-        MainThread.invoke(true, closeAction);
-    }
-    
-    public long getWindowHandle() {
-        nsViewLock.lock();
-        try {
-            return windowHandle;
-        } finally {
-            nsViewLock.unlock();
-        }
-    }
-
-    public long getSurfaceHandle() {
-        nsViewLock.lock();
-        try {
-            return surfaceHandle;
-        } finally {
-            nsViewLock.unlock();
-        }
-    }
-
-    class EnsureWindowCreatedAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                createWindow(parentWindowHandle, false);
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private EnsureWindowCreatedAction ensureWindowCreatedAction =
-        new EnsureWindowCreatedAction();
-
-    public Insets getInsets() {
-        // in order to properly calculate insets we need the window to be
-        // created
-        MainThread.invoke(true, ensureWindowCreatedAction);
-        nsViewLock.lock();
-        try {
-            return (Insets) insets.clone();
-        } finally {
-            nsViewLock.unlock();
-        }
-    }
-
-    private ToolkitLock nsViewLock = new ToolkitLock() {
-            private Thread owner;
-            private int recursionCount;
-            
-            public synchronized void lock() {
-                Thread cur = Thread.currentThread();
-                if (owner == cur) {
-                    ++recursionCount;
-                    return;
-                }
-                while (owner != null) {
-                    try {
-                        wait();
-                    } catch (InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-                owner = cur;
-            }
-
-            public synchronized void unlock() {
-                if (owner != Thread.currentThread()) {
-                    throw new RuntimeException("Not owner");
-                }
-                if (recursionCount > 0) {
-                    --recursionCount;
-                    return;
-                }
-                owner = null;
-                notifyAll();
-            }
-        };
-
-    public synchronized int lockSurface() throws NativeWindowException {
-        nsViewLock.lock();
-        return super.lockSurface();
-    }
-
-    public void unlockSurface() {
-        super.unlockSurface();
-        nsViewLock.unlock();
-    }
-
-    class VisibleAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if(DEBUG_IMPLEMENTATION) System.out.println("MacWindow.VisibleAction "+visible+" "+Thread.currentThread().getName());
-                if (visible) {
-                    createWindow(parentWindowHandle, false);
-                    if (windowHandle != 0) {
-                        makeKeyAndOrderFront(windowHandle);
-                    }
-                } else {
-                    if (windowHandle != 0) {
-                        orderOut(windowHandle);
-                    }
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private VisibleAction visibleAction = new VisibleAction();
-
-    public void setVisible(boolean visible) {
-        this.visible = visible;
-        MainThread.invoke(true, visibleAction);
-    }
-
-    class TitleAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if (windowHandle != 0) {
-                    setTitle0(windowHandle, title);
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private TitleAction titleAction = new TitleAction();
-
-    public void setTitle(String title) {
-        super.setTitle(title);
-        MainThread.invoke(true, titleAction);
-    }
-
-    class FocusAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if (windowHandle != 0) {
-                    makeKey(windowHandle);
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private FocusAction focusAction = new FocusAction();
-
-    public void requestFocus() {
-        super.requestFocus();
-        MainThread.invoke(true, focusAction);
-    }
-    
-    class SizeAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if (windowHandle != 0) {
-                    setContentSize(windowHandle, width, height);
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private SizeAction sizeAction = new SizeAction();
-
-    public void setSize(int width, int height) {
-        this.width=width;
-        this.height=height;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        }
-        MainThread.invoke(true, sizeAction);
-    }
-    
-    class PositionAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if (windowHandle != 0) {
-                    setFrameTopLeftPoint(parentWindowHandle, windowHandle, x, y);
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private PositionAction positionAction = new PositionAction();
-
-    public void setPosition(int x, int y) {
-        this.x=x;
-        this.y=y;
-        if(!fullscreen) {
-            nfs_x=x;
-            nfs_y=y;
-        }
-        MainThread.invoke(true, positionAction);
-    }
-    
-    class FullscreenAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                    System.err.println("MacWindow fs: "+fullscreen+" "+x+"/"+y+" "+width+"x"+height);
-                }
-                createWindow(parentWindowHandle, true);
-                if (windowHandle != 0) {
-                    makeKeyAndOrderFront(windowHandle);
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private FullscreenAction fullscreenAction = new FullscreenAction();
-
-    public boolean setFullscreen(boolean fullscreen) {
-        if(this.fullscreen!=fullscreen) {
-            this.fullscreen=fullscreen;
-            if(fullscreen) {
-                x = 0; 
-                y = 0;
-                width = screen.getWidth();
-                height = screen.getHeight();
-            } else {
-                x = nfs_x;
-                y = nfs_y;
-                width = nfs_width;
-                height = nfs_height;
-            }
-            MainThread.invoke(true, fullscreenAction);
-        }
-        return fullscreen;
-    }
-    
-    private void sizeChanged(int newWidth, int newHeight) {
-        if (DEBUG_IMPLEMENTATION) {
-            System.out.println(Thread.currentThread().getName()+" Size changed to " + newWidth + ", " + newHeight);
-        }
-        width = newWidth;
-        height = newHeight;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        }
-        if (DEBUG_IMPLEMENTATION) {
-            System.out.println("  Posted WINDOW_RESIZED event");
-        }
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
-    }
-
-    private void insetsChanged(int left, int top, int right, int bottom) {
-        if (DEBUG_IMPLEMENTATION) {
-            System.out.println(Thread.currentThread().getName()+
-                " Insets changed to " + left + ", " + top + ", " + right + ", " + bottom);
-        }
-        if (left != -1 && top != -1 && right != -1 && bottom != -1) {
-            insets.left = left;
-            insets.top = top;
-            insets.right = right;
-            insets.bottom = bottom;
-        }
-    }
-
-    private void positionChanged(int newX, int newY) {
-        if (DEBUG_IMPLEMENTATION) {
-            System.out.println(Thread.currentThread().getName()+" Position changed to " + newX + ", " + newY);
-        }
-        x = newX;
-        y = newY;
-        if(!fullscreen) {
-            nfs_x=x;
-            nfs_y=y;
-        }
-        if (DEBUG_IMPLEMENTATION) {
-            System.out.println("  Posted WINDOW_MOVED event");
-        }
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
-    }
-
-    private void focusChanged(boolean focusGained) {
-        if (focusGained) {
-            sendWindowEvent(WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
-        } else {
-            sendWindowEvent(WindowEvent.EVENT_WINDOW_LOST_FOCUS);
-        }
-    }
-
-    private char convertKeyChar(char keyChar) {
-        if (keyChar == '\r') {
-            // Turn these into \n
-            return '\n';
-        }
-
-        if (keyChar >= NSUpArrowFunctionKey && keyChar <= NSModeSwitchFunctionKey) {
-            switch (keyChar) {
-                case NSUpArrowFunctionKey:     return KeyEvent.VK_UP;
-                case NSDownArrowFunctionKey:   return KeyEvent.VK_DOWN;
-                case NSLeftArrowFunctionKey:   return KeyEvent.VK_LEFT;
-                case NSRightArrowFunctionKey:  return KeyEvent.VK_RIGHT;
-                case NSF1FunctionKey:          return KeyEvent.VK_F1;
-                case NSF2FunctionKey:          return KeyEvent.VK_F2;
-                case NSF3FunctionKey:          return KeyEvent.VK_F3;
-                case NSF4FunctionKey:          return KeyEvent.VK_F4;
-                case NSF5FunctionKey:          return KeyEvent.VK_F5;
-                case NSF6FunctionKey:          return KeyEvent.VK_F6;
-                case NSF7FunctionKey:          return KeyEvent.VK_F7;
-                case NSF8FunctionKey:          return KeyEvent.VK_F8;
-                case NSF9FunctionKey:          return KeyEvent.VK_F9;
-                case NSF10FunctionKey:         return KeyEvent.VK_F10;
-                case NSF11FunctionKey:         return KeyEvent.VK_F11;
-                case NSF12FunctionKey:         return KeyEvent.VK_F12;
-                case NSF13FunctionKey:         return KeyEvent.VK_F13;
-                case NSF14FunctionKey:         return KeyEvent.VK_F14;
-                case NSF15FunctionKey:         return KeyEvent.VK_F15;
-                case NSF16FunctionKey:         return KeyEvent.VK_F16;
-                case NSF17FunctionKey:         return KeyEvent.VK_F17;
-                case NSF18FunctionKey:         return KeyEvent.VK_F18;
-                case NSF19FunctionKey:         return KeyEvent.VK_F19;
-                case NSF20FunctionKey:         return KeyEvent.VK_F20;
-                case NSF21FunctionKey:         return KeyEvent.VK_F21;
-                case NSF22FunctionKey:         return KeyEvent.VK_F22;
-                case NSF23FunctionKey:         return KeyEvent.VK_F23;
-                case NSF24FunctionKey:         return KeyEvent.VK_F24;
-                case NSInsertFunctionKey:      return KeyEvent.VK_INSERT;
-                case NSDeleteFunctionKey:      return KeyEvent.VK_DELETE;
-                case NSHomeFunctionKey:        return KeyEvent.VK_HOME;
-                case NSBeginFunctionKey:       return KeyEvent.VK_BEGIN;
-                case NSEndFunctionKey:         return KeyEvent.VK_END;
-                case NSPageUpFunctionKey:      return KeyEvent.VK_PAGE_UP;
-                case NSPageDownFunctionKey:    return KeyEvent.VK_PAGE_DOWN;
-                case NSPrintScreenFunctionKey: return KeyEvent.VK_PRINTSCREEN;
-                case NSScrollLockFunctionKey:  return KeyEvent.VK_SCROLL_LOCK;
-                case NSPauseFunctionKey:       return KeyEvent.VK_PAUSE;
-                // Not handled:
-                // NSSysReqFunctionKey
-                // NSBreakFunctionKey
-                // NSResetFunctionKey
-                case NSStopFunctionKey:        return KeyEvent.VK_STOP;
-                // Not handled:
-                // NSMenuFunctionKey
-                // NSUserFunctionKey
-                // NSSystemFunctionKey
-                // NSPrintFunctionKey
-                // NSClearLineFunctionKey
-                // NSClearDisplayFunctionKey
-                // NSInsertLineFunctionKey
-                // NSDeleteLineFunctionKey
-                // NSInsertCharFunctionKey
-                // NSDeleteCharFunctionKey
-                // NSPrevFunctionKey
-                // NSNextFunctionKey
-                // NSSelectFunctionKey
-                // NSExecuteFunctionKey
-                // NSUndoFunctionKey
-                // NSRedoFunctionKey
-                // NSFindFunctionKey
-                // NSHelpFunctionKey
-                // NSModeSwitchFunctionKey
-                default: break;
-            }
-        }
-
-        // NSEvent's charactersIgnoringModifiers doesn't ignore the shift key
-        if (keyChar >= 'a' && keyChar <= 'z') {
-            return Character.toUpperCase(keyChar);
-        }
-
-        return keyChar;
-    }
-
-    protected void sendKeyEvent(int eventType, int modifiers, int keyCode, char keyChar) {
-        int key = convertKeyChar(keyChar);
-        if(DEBUG_IMPLEMENTATION) System.out.println("MacWindow.sendKeyEvent "+Thread.currentThread().getName());
-        // Note that we send the key char for the key code on this
-        // platform -- we do not get any useful key codes out of the system
-        super.sendKeyEvent(eventType, modifiers, key, keyChar);
-    }
-
-    private void createWindow(long parentWindowHandle, boolean recreate) {
-        if(0!=windowHandle && !recreate) {
-            return;
-        }
-        if(0!=windowHandle) {
-            // save the view .. close the window
-            surfaceHandle = changeContentView(parentWindowHandle, windowHandle, 0);
-            if(recreate && 0==surfaceHandle) {
-                throw new NativeWindowException("Internal Error - recreate, window but no view");
-            }
-            close0(windowHandle);
-            windowHandle=0;
-        } else {
-            surfaceHandle = 0;
-        }
-        windowHandle = createWindow0(parentWindowHandle, 
-                                     getX(), getY(), getWidth(), getHeight(), fullscreen,
-                                     (isUndecorated() ?
-                                     NSBorderlessWindowMask :
-                                     NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask),
-                                     NSBackingStoreBuffered, 
-                                     getScreen().getIndex(), surfaceHandle);
-        if (windowHandle == 0) {
-            throw new NativeWindowException("Could create native window "+Thread.currentThread().getName()+" "+this);
-        }
-        surfaceHandle = contentView(windowHandle);
-        setTitle0(windowHandle, getTitle());
-        // don't make the window visible on window creation
-//        makeKeyAndOrderFront(windowHandle);
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
-    }
-    
-    protected static native boolean initIDs();
-    private native long createWindow0(long parentWindowHandle, int x, int y, int w, int h,
-                                     boolean fullscreen, int windowStyle,
-                                     int backingStoreType,
-                                     int screen_idx, long view);
-    private native void makeKeyAndOrderFront(long window);
-    private native void makeKey(long window);
-    private native void orderOut(long window);
-    private native void close0(long window);
-    private native void setTitle0(long window, String title);
-    private native long contentView(long window);
-    private native long changeContentView(long parentWindowHandle, long window, long view);
-    private native void setContentSize(long window, int w, int h);
-    private native void setFrameTopLeftPoint(long parentWindowHandle, long window, int x, int y);
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java
deleted file mode 100644
index 98010b2f1..000000000
--- a/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.opengl;
-
-import com.sun.javafx.newt.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.jogamp.opengl.impl.GLDrawableHelper;
-import java.util.*;
-
-/**
- * An implementation of {@link Window} which is customized for OpenGL
- * use, and which implements the {@link javax.media.opengl.GLAutoDrawable} interface.
- * <P>
- * This implementation does not make the OpenGL context current<br>
- * before calling the various input EventListener callbacks (MouseListener, KeyListener,
- * etc.).<br>
- * This design decision is made to favor a more performant and simplified
- * implementation, as well as the event dispatcher shall be allowed
- * not having a notion about OpenGL.
- * <p>
- */
-public class GLWindow extends Window implements GLAutoDrawable {
-    private static List/*GLWindow*/ glwindows = new ArrayList();
-
-    private boolean ownerOfWinScrDpy;
-    private Window window;
-    private boolean runPumpMessages;
-
-    /** Constructor. Do not call this directly -- use {@link
-        create()} instead. */
-    protected GLWindow(Window window, boolean ownerOfWinScrDpy) {
-        this.ownerOfWinScrDpy = ownerOfWinScrDpy;
-        this.window = window;
-        this.window.setAutoDrawableClient(true);
-        this.runPumpMessages = ( null == getScreen().getDisplay().getEDT() ) ;
-        window.addWindowListener(new WindowListener() {
-                public void windowResized(WindowEvent e) {
-                    sendReshape = true;
-                }
-
-                public void windowMoved(WindowEvent e) {
-                }
-
-                public void windowGainedFocus(WindowEvent e) {
-                }
-
-                public void windowLostFocus(WindowEvent e) {
-                }
-
-                public void windowDestroyNotify(WindowEvent e) {
-                    sendDestroy = true;
-                }
-            });
-
-        List newglw = (List) ((ArrayList) glwindows).clone();
-        newglw.add(this);
-        glwindows=newglw;
-    }
-
-    /** Creates a new GLWindow on the local display, screen 0, with a
-        dummy visual ID, and with the default GLCapabilities. */
-    public static GLWindow create() {
-        return create(null, null, false);
-    }
-
-    public static GLWindow create(boolean undecorated) {
-        return create(null, null, undecorated);
-    }
-
-    /** Creates a new GLWindow referring to the given window. */
-    public static GLWindow create(Window window) {
-        return create(window, null, false);
-    }
-    public static GLWindow create(GLCapabilities caps) {
-        return create(null, caps, false);
-    }
-
-    /** Creates a new GLWindow on the local display, screen 0, with a
-        dummy visual ID, and with the given GLCapabilities. */
-    public static GLWindow create(GLCapabilities caps, boolean undecorated) {
-        return create(null, caps, undecorated);
-    }
-
-    /** Either or: window (prio), or caps and undecorated (2nd choice) */
-    private static GLWindow create(Window window, 
-                                   GLCapabilities caps,
-                                   boolean undecorated) {
-        Display display;
-        boolean ownerOfWinScrDpy=false;
-        if (window == null) {
-            if (caps == null) {
-                caps = new GLCapabilities(null); // default ..
-            }
-            ownerOfWinScrDpy = true;
-            display = NewtFactory.createDisplay(null); // local display
-            Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
-            window = NewtFactory.createWindow(screen, caps, undecorated);
-        }
-
-        return new GLWindow(window, ownerOfWinScrDpy);
-    }
-    
-    /** 
-     * EXPERIMENTAL<br> 
-     * Enable or disables running the {@link Display#pumpMessages} in the {@link #display()} call.<br>
-     * The default behavior is to run {@link Display#pumpMessages}.<P>
-     *
-     * The idea was that in a single threaded environment with one {@link Display} and many {@link Window}'s,
-     * a performance benefit was expected while disabling the implicit {@link Display#pumpMessages} and
-     * do it once via {@link GLWindow#runCurrentThreadPumpMessage()} <br>
-     * This could not have been verified. No measurable difference could have been recognized.<P>
-     *
-     * Best performance has been achieved with one GLWindow per thread.<br> 
-     *
-     * Enabling local pump messages while using the EDT, 
-     * {@link com.sun.javafx.newt.NewtFactory#setUseEDT(boolean)},
-     * will result in an exception.
-     *
-     * @deprecated EXPERIMENTAL, semantic is about to be removed after further verification.
-     */
-    public void setRunPumpMessages(boolean onoff) {
-        if( onoff && null!=getScreen().getDisplay().getEDT() ) {
-            throw new GLException("GLWindow.setRunPumpMessages(true) - Can't do with EDT on");
-        }
-        runPumpMessages = onoff;
-    }
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        shouldNotCallThis();
-    }
-
-    protected void closeNative() {
-        shouldNotCallThis();
-    }
-
-    protected void dispose(boolean regenerate, boolean sendEvent) {
-        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
-            Exception e1 = new Exception("GLWindow.dispose("+regenerate+") "+Thread.currentThread()+", 1");
-            e1.printStackTrace();
-        }
-
-        if(sendEvent) {
-            sendDisposeEvent();
-        }
-
-        if (context != null) {
-            context.destroy();
-        }
-        if (drawable != null) {
-            drawable.setRealized(false);
-        }
-
-        if(regenerate) {
-            if(null==window) {
-                throw new GLException("GLWindow.dispose(true): null window");
-            }
-
-            // recreate GLDrawable, to reflect the new graphics configurations
-            NativeWindow nw;
-            if (window.getWrappedWindow() != null) {
-                nw = NativeWindowFactory.getNativeWindow(window.getWrappedWindow(), window.getGraphicsConfiguration());
-            } else {
-                nw = window;
-            }
-            drawable = factory.createGLDrawable(nw);
-            drawable.setRealized(true);
-            context = drawable.createContext(null);
-            sendReshape = true; // ensure a reshape event is send ..
-        }
-
-        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
-            System.out.println("GLWindow.dispose("+regenerate+") "+Thread.currentThread()+", fin: "+this);
-        }
-    }
-
-    public synchronized void destroy() {
-        destroy(true);
-    }
-
-    /** @param sendDisposeEvent should be false in a [time,reliable] critical shutdown */
-    public synchronized void destroy(boolean sendDisposeEvent) {
-        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
-            Exception e1 = new Exception("GLWindow.destroy "+Thread.currentThread()+", 1: "+this);
-            e1.printStackTrace();
-        }
-
-        List newglw = (List) ((ArrayList) glwindows).clone();
-        newglw.remove(this);
-        glwindows=newglw;
-
-        dispose(false, sendDisposeEvent);
-
-        if(null!=window) {
-            if(ownerOfWinScrDpy) {
-                window.destroy(true);
-            }
-        }
-
-        drawable = null;
-        context = null;
-        window = null;
-
-        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
-            System.out.println("GLWindow.destroy "+Thread.currentThread()+", fin: "+this);
-        }
-    }
-
-    public boolean getPerfLogEnabled() { return perfLog; }
-
-    public void enablePerfLog(boolean v) {
-        perfLog = v;
-    }
-
-    public void setVisible(boolean visible) {
-        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
-            System.out.println(Thread.currentThread()+" GLWindow.setVisible("+visible+") START ; isVisible "+this.visible+" ; has context "+(null!=context));
-        }
-        this.visible=visible;
-        window.setVisible(visible);
-        if (visible && context == null) {
-            NativeWindow nw;
-            if (window.getWrappedWindow() != null) {
-                nw = NativeWindowFactory.getNativeWindow(window.getWrappedWindow(), window.getGraphicsConfiguration());
-            } else {
-                nw = window;
-            }
-            GLCapabilities glCaps = (GLCapabilities) nw.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
-            factory = GLDrawableFactory.getFactory(glCaps.getGLProfile());
-            drawable = factory.createGLDrawable(nw);
-            drawable.setRealized(true);
-            context = drawable.createContext(null);
-            sendReshape = true; // ensure a reshape event is send ..
-        }
-        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
-            System.out.println(Thread.currentThread()+" GLWindow.setVisible("+visible+") END  ; has context "+(null!=context));
-        }
-    }
-
-    public Screen getScreen() {
-        return window.getScreen();
-    }
-
-    public void setTitle(String title) {
-        window.setTitle(title);
-    }
-
-    public String getTitle() {
-        return window.getTitle();
-    }
-
-    public void setUndecorated(boolean value) {
-        window.setUndecorated(value);
-    }
-
-    public boolean isUndecorated() {
-        return window.isUndecorated();
-    }
-
-    public void setSize(int width, int height) {
-        window.setSize(width, height);
-    }
-
-    public void setPosition(int x, int y) {
-        window.setPosition(x, y);
-    }
-
-    public Insets getInsets() {
-        return window.getInsets();
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        return window.setFullscreen(fullscreen);
-    }
-
-    public boolean isVisible() {
-        return window.isVisible();
-    }
-
-    public int getX() {
-        return window.getX();
-    }
-
-    public int getY() {
-        return window.getY();
-    }
-
-    public int getWidth() {
-        return window.getWidth();
-    }
-
-    public int getHeight() {
-        return window.getHeight();
-    }
-
-    public boolean isFullscreen() {
-        return window.isFullscreen();
-    }
-
-    public void addSurfaceUpdatedListener(SurfaceUpdatedListener l) {
-        window.addSurfaceUpdatedListener(l);
-    }
-    public void removeSurfaceUpdatedListener(SurfaceUpdatedListener l) {
-        window.removeSurfaceUpdatedListener(l);
-    }
-    public SurfaceUpdatedListener[] getSurfaceUpdatedListener() {
-        return window.getSurfaceUpdatedListener();
-    }
-    public void surfaceUpdated(Object updater, NativeWindow window0, long when) { 
-        window.surfaceUpdated(updater, window, when);
-    }
-
-    public void addMouseListener(MouseListener l) {
-        window.addMouseListener(l);
-    }
-
-    public void removeMouseListener(MouseListener l) {
-        window.removeMouseListener(l);
-    }
-
-    public MouseListener[] getMouseListeners() {
-        return window.getMouseListeners();
-    }
-
-    public void addKeyListener(KeyListener l) {
-        window.addKeyListener(l);
-    }
-
-    public void removeKeyListener(KeyListener l) {
-        window.removeKeyListener(l);
-    }
-
-    public KeyListener[] getKeyListeners() {
-        return window.getKeyListeners();
-    }
-
-    public void addWindowListener(WindowListener l) {
-        window.addWindowListener(l);
-    }
-
-    public void removeWindowListener(WindowListener l) {
-        window.removeWindowListener(l);
-    }
-
-    public WindowListener[] getWindowListeners() {
-        return window.getWindowListeners();
-    }
-
-    public String toString() {
-        return "NEWT-GLWindow[ \n\tDrawable: "+drawable+", \n\tWindow: "+window+", \n\tHelper: "+helper+", \n\tFactory: "+factory+"]";
-    }
-
-    //----------------------------------------------------------------------
-    // OpenGL-related methods and state
-    //
-
-    private GLDrawableFactory factory;
-    private GLDrawable drawable;
-    private GLContext context;
-    private GLDrawableHelper helper = new GLDrawableHelper();
-    // To make reshape events be sent immediately before a display event
-    private boolean sendReshape=false;
-    private boolean sendDestroy=false;
-    private boolean perfLog = false;
-
-    public GLDrawableFactory getFactory() {
-        return factory;
-    }
-
-    public void setContext(GLContext newCtx) {
-        context = newCtx;
-    }
-
-    public GLContext getContext() {
-        return context;
-    }
-
-    public GL getGL() {
-        if (context == null) {
-            return null;
-        }
-        return context.getGL();
-    }
-
-    public GL setGL(GL gl) {
-        if (context != null) {
-            context.setGL(gl);
-            return gl;
-        }
-        return null;
-    }
-
-    public void addGLEventListener(GLEventListener listener) {
-        helper.addGLEventListener(listener);
-    }
-
-    public void removeGLEventListener(GLEventListener listener) {
-        helper.removeGLEventListener(listener);
-    }
-
-    public void display() {
-        display(false);
-    }
-
-    public void display(boolean forceReshape) {
-        if(window!=null && drawable!=null && context != null) {
-            if(runPumpMessages) {
-                window.getScreen().getDisplay().pumpMessages();
-            }
-            if(window.hasDeviceChanged() && GLAutoDrawable.SCREEN_CHANGE_ACTION_ENABLED) {
-                dispose(true, true);
-            }
-            if (sendDestroy) {
-                destroy();
-                sendDestroy=false;
-            } else {
-                if(forceReshape) {
-                    sendReshape = true;
-                }
-                helper.invokeGL(drawable, context, displayAction, initAction);
-            }
-        }
-    }
-
-    private void sendDisposeEvent() {
-        if(drawable!=null && context != null) {
-            helper.invokeGL(drawable, context, disposeAction, null);
-        }
-    }
-
-    /** This implementation uses a static value */
-    public void setAutoSwapBufferMode(boolean onOrOff) {
-        helper.setAutoSwapBufferMode(onOrOff);
-    }
-
-    /** This implementation uses a static value */
-    public boolean getAutoSwapBufferMode() {
-        return helper.getAutoSwapBufferMode();
-    }
-
-    public void swapBuffers() {
-        if(drawable!=null && context != null) {
-            if (context != GLContext.getCurrent()) {
-                // Assume we should try to make the context current before swapping the buffers
-                helper.invokeGL(drawable, context, swapBuffersAction, initAction);
-            } else {
-                drawable.swapBuffers();
-            }
-        }
-    }
-
-    class InitAction implements Runnable {
-        public void run() {
-            helper.init(GLWindow.this);
-            startTime = System.currentTimeMillis();
-            curTime   = startTime;
-            if(perfLog) {
-                lastCheck  = startTime;
-                totalFrames = 0; lastFrames = 0;
-            }
-        }
-    }
-    private InitAction initAction = new InitAction();
-
-    class DisposeAction implements Runnable {
-        public void run() {
-            helper.dispose(GLWindow.this);
-        }
-    }
-    private DisposeAction disposeAction = new DisposeAction();
-
-    class DisplayAction implements Runnable {
-        public void run() {
-            if (sendReshape) {
-                int width = getWidth();
-                int height = getHeight();
-                getGL().glViewport(0, 0, width, height);
-                helper.reshape(GLWindow.this, 0, 0, width, height);
-                sendReshape = false;
-            }
-
-            helper.display(GLWindow.this);
-
-            curTime = System.currentTimeMillis();
-            totalFrames++;
-
-            if(perfLog) {
-                long dt0, dt1;
-                lastFrames++;
-                dt0 = curTime-lastCheck;
-                if ( dt0 > 5000 ) {
-                    dt1 = curTime-startTime;
-                    System.out.println(dt0/1000 +"s: "+ lastFrames + "f, " + (lastFrames*1000)/dt0 + " fps, "+dt0/lastFrames+" ms/f; "+
-                                       "total: "+ dt1/1000+"s, "+(totalFrames*1000)/dt1 + " fps, "+dt1/totalFrames+" ms/f");
-                    lastCheck=curTime;
-                    lastFrames=0;
-                }
-            }
-        }
-    }
-    private DisplayAction displayAction = new DisplayAction();
-
-    public long getStartTime()   { return startTime; }
-    public long getCurrentTime() { return curTime; }
-    public long getDuration()    { return curTime-startTime; }
-    public int  getTotalFrames() { return totalFrames; }
-
-    private long startTime = 0;
-    private long curTime = 0;
-    private long lastCheck  = 0;
-    private int  totalFrames = 0, lastFrames = 0;
-
-    class SwapBuffersAction implements Runnable {
-        public void run() {
-            drawable.swapBuffers();
-        }
-    }
-    private SwapBuffersAction swapBuffersAction = new SwapBuffersAction();
-
-    //----------------------------------------------------------------------
-    // GLDrawable methods
-    //
-
-    public NativeWindow getNativeWindow() {
-        return null!=drawable ? drawable.getNativeWindow() : null;
-    }
-
-    public synchronized int lockSurface() throws NativeWindowException {
-        if(null!=drawable) return drawable.getNativeWindow().lockSurface();
-        return NativeWindow.LOCK_SURFACE_NOT_READY;
-    }
-
-    public synchronized void unlockSurface() {
-        if(null!=drawable) drawable.getNativeWindow().unlockSurface();
-        else throw new NativeWindowException("NEWT-GLWindow not locked");
-    }
-
-    public synchronized boolean isSurfaceLocked() {
-        if(null!=drawable) return drawable.getNativeWindow().isSurfaceLocked();
-        return false;
-    }
-
-    public synchronized Exception getLockedStack() {
-        if(null!=drawable) return drawable.getNativeWindow().getLockedStack();
-        return null;
-    }
-
-    public boolean surfaceSwap() { 
-        if(null!=drawable) return drawable.getNativeWindow().surfaceSwap();
-        return super.surfaceSwap();
-    }
-
-    public long getWindowHandle() {
-        if(null!=drawable) return drawable.getNativeWindow().getWindowHandle();
-        return super.getWindowHandle();
-    }
-
-    public long getSurfaceHandle() {
-        if(null!=drawable) return drawable.getNativeWindow().getSurfaceHandle();
-        return super.getSurfaceHandle();
-    }
-
-    //----------------------------------------------------------------------
-    // GLDrawable methods that are not really needed
-    //
-
-    public GLContext createContext(GLContext shareWith) {
-        return drawable.createContext(shareWith);
-    }
-
-    public void setRealized(boolean realized) {
-    }
-
-    public GLCapabilities getChosenGLCapabilities() {
-        if (drawable == null) {
-            throw new GLException("No drawable yet");
-        }
-
-        return drawable.getChosenGLCapabilities();
-    }
-
-    public GLProfile getGLProfile() {
-        if (drawable == null) {
-            throw new GLException("No drawable yet");
-        }
-
-        return drawable.getGLProfile();
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    private void shouldNotCallThis() {
-        throw new NativeWindowException("Should not call this");
-    }
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java
deleted file mode 100644
index 1b74aebc3..000000000
--- a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.opengl.broadcom.egl;
-
-import com.sun.javafx.newt.impl.*;
-import com.jogamp.opengl.impl.egl.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.egl.*;
-
-public class Display extends com.sun.javafx.newt.Display {
-
-    static {
-        NativeLibLoader.loadNEWT();
-
-        if (!Window.initIDs()) {
-            throw new NativeWindowException("Failed to initialize BCEGL Window jmethodIDs");
-        }
-    }
-
-    public static void initSingleton() {
-        // just exist to ensure static init has been run
-    }
-
-
-    public Display() {
-    }
-
-    protected void createNative() {
-        long handle = CreateDisplay(Screen.fixedWidth, Screen.fixedHeight);
-        if (handle == EGL.EGL_NO_DISPLAY) {
-            throw new NativeWindowException("BC EGL CreateDisplay failed");
-        }
-        aDevice = new EGLGraphicsDevice(handle);
-    }
-
-    protected void closeNative() {
-        if (aDevice.getHandle() != EGL.EGL_NO_DISPLAY) {
-            DestroyDisplay(aDevice.getHandle());
-        }
-    }
-
-    protected void dispatchMessages() {
-        // n/a .. DispatchMessages();
-    }
-
-    private native long CreateDisplay(int width, int height);
-    private native void DestroyDisplay(long dpy);
-    private native void DispatchMessages();
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Screen.java b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Screen.java
deleted file mode 100755
index 28f7211c3..000000000
--- a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Screen.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.opengl.broadcom.egl;
-
-import com.sun.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
-
-public class Screen extends com.sun.javafx.newt.Screen {
-
-    static {
-        Display.initSingleton();
-    }
-
-
-    public Screen() {
-    }
-
-    protected void createNative(int index) {
-        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
-        setScreenSize(fixedWidth, fixedHeight);
-    }
-
-    protected void closeNative() { }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    static final int fixedWidth = 1920;
-    static final int fixedHeight = 1080;
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java
deleted file mode 100755
index 8446ec20f..000000000
--- a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.opengl.broadcom.egl;
-
-import com.sun.javafx.newt.impl.*;
-import com.jogamp.opengl.impl.egl.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLProfile;
-import javax.media.nativewindow.NativeWindowException;
-
-public class Window extends com.sun.javafx.newt.Window {
-    static {
-        Display.initSingleton();
-    }
-
-    public Window() {
-    }
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        if(0!=parentWindowHandle) {
-            throw new RuntimeException("Window parenting not supported (yet)");
-        }
-        // query a good configuration .. even thought we drop this one 
-        // and reuse the EGLUtil choosen one later.
-        config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, getScreen().getGraphicsScreen());
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-        setSizeImpl(getScreen().getWidth(), getScreen().getHeight());
-    }
-
-    protected void closeNative() {
-        if(0!=windowHandleClose) {
-            CloseWindow(getDisplayHandle(), windowHandleClose);
-        }
-    }
-
-    public void setVisible(boolean visible) {
-        if(this.visible!=visible) {
-            this.visible=visible;
-            if ( 0==windowHandle ) {
-                windowHandle = realizeWindow(true, width, height);
-                if (0 == windowHandle) {
-                    throw new NativeWindowException("Error native Window Handle is null");
-                }
-            }
-            clearEventMask();
-        }
-    }
-
-    public void setSize(int width, int height) {
-        System.err.println("setSize "+width+"x"+height+" n/a in BroadcomEGL");
-    }
-
-    void setSizeImpl(int width, int height) {
-        if(0!=windowHandle) {
-            // n/a in BroadcomEGL
-            System.err.println("BCEGL Window.setSizeImpl n/a in BroadcomEGL with realized window");
-        } else {
-            if(DEBUG_IMPLEMENTATION) {
-                Exception e = new Exception("BCEGL Window.setSizeImpl() "+this.width+"x"+this.height+" -> "+width+"x"+height);
-                e.printStackTrace();
-            }
-            this.width = width;
-            this.height = height;
-        }
-    }
-
-    public void setPosition(int x, int y) {
-        // n/a in BroadcomEGL
-        System.err.println("setPosition n/a in BroadcomEGL");
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        // n/a in BroadcomEGL
-        System.err.println("setFullscreen n/a in BroadcomEGL");
-        return false;
-    }
-
-    public boolean surfaceSwap() {
-        if ( 0!=windowHandle ) {
-            SwapWindow(getDisplayHandle(), windowHandle);
-            return true;
-        }
-        return false;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    protected static native boolean initIDs();
-    private        native long CreateWindow(long eglDisplayHandle, boolean chromaKey, int width, int height);
-    private        native void CloseWindow(long eglDisplayHandle, long eglWindowHandle);
-    private        native void SwapWindow(long eglDisplayHandle, long eglWindowHandle);
-
-
-    private long realizeWindow(boolean chromaKey, int width, int height) {
-        if(DEBUG_IMPLEMENTATION) {
-            System.out.println("BCEGL Window.realizeWindow() with: chroma "+chromaKey+", "+width+"x"+height+", "+config);
-        }
-        long handle = CreateWindow(getDisplayHandle(), chromaKey, width, height);
-        if (0 == handle) {
-            throw new NativeWindowException("Error native Window Handle is null");
-        }
-        windowHandleClose = handle;
-        return handle;
-    }
-
-    private void windowCreated(int cfgID, int width, int height) {
-        this.width = width;
-        this.height = height;
-        GLCapabilities capsReq = (GLCapabilities) config.getRequestedCapabilities();
-        config = EGLGraphicsConfiguration.create(capsReq, screen.getGraphicsScreen(), cfgID);
-        if (config == null) {
-            throw new NativeWindowException("Error creating EGLGraphicsConfiguration from id: "+cfgID+", "+this);
-        }
-        if(DEBUG_IMPLEMENTATION) {
-            System.out.println("BCEGL Window.windowCreated(): "+toHexString(cfgID)+", "+width+"x"+height+", "+config);
-        }
-    }
-
-    private long   windowHandleClose;
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java
deleted file mode 100755
index 9e328a223..000000000
--- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.opengl.kd;
-
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.impl.*;
-import com.jogamp.opengl.impl.egl.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.egl.*;
-
-public class KDDisplay extends Display {
-
-    static {
-        NativeLibLoader.loadNEWT();
-
-        if (!KDWindow.initIDs()) {
-            throw new NativeWindowException("Failed to initialize KDWindow jmethodIDs");
-        }
-    }
-
-    public static void initSingleton() {
-        // just exist to ensure static init has been run
-    }
-
-
-    public KDDisplay() {
-    }
-
-    protected void createNative() {
-        // FIXME: map name to EGL_*_DISPLAY
-        long handle = EGL.eglGetDisplay(EGL.EGL_DEFAULT_DISPLAY);
-        if (handle == EGL.EGL_NO_DISPLAY) {
-            throw new NativeWindowException("eglGetDisplay failed");
-        }
-        if (!EGL.eglInitialize(handle, null, null)) {
-            throw new NativeWindowException("eglInitialize failed");
-        }
-        aDevice = new EGLGraphicsDevice(handle);
-    }
-
-    protected void closeNative() {
-        if (aDevice.getHandle() != EGL.EGL_NO_DISPLAY) {
-            EGL.eglTerminate(aDevice.getHandle());
-        }
-    }
-
-    protected void dispatchMessages() {
-        DispatchMessages();
-    }
-
-    private native void DispatchMessages();
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDScreen.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDScreen.java
deleted file mode 100755
index 1767c1240..000000000
--- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDScreen.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.opengl.kd;
-
-import com.sun.javafx.newt.*;
-import javax.media.nativewindow.*;
-
-public class KDScreen extends Screen {
-    static {
-        KDDisplay.initSingleton();
-    }
-
-    public KDScreen() {
-    }
-
-    protected void createNative(int index) {
-        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
-    }
-
-    protected void closeNative() { }
-
-    // elevate access to this package ..
-    protected void setScreenSize(int w, int h) {
-        super.setScreenSize(w, h);
-    }
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java
deleted file mode 100755
index 9919d1f6f..000000000
--- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.opengl.kd;
-
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.impl.*;
-import com.jogamp.opengl.impl.egl.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLProfile;
-import javax.media.nativewindow.NativeWindowException;
-
-public class KDWindow extends Window {
-    private static final String WINDOW_CLASS_NAME = "NewtWindow";
-    // non fullscreen dimensions ..
-    private int nfs_width, nfs_height, nfs_x, nfs_y;
-
-    static {
-        KDDisplay.initSingleton();
-    }
-
-    public KDWindow() {
-    }
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        if(0!=parentWindowHandle) {
-            throw new RuntimeException("Window parenting not supported (yet)");
-        }
-        config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, getScreen().getGraphicsScreen());
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-
-        GLCapabilities eglCaps = (GLCapabilities)config.getChosenCapabilities();
-        int[] eglAttribs = EGLGraphicsConfiguration.GLCapabilities2AttribList(eglCaps);
-
-        windowHandle = 0;
-        eglWindowHandle = CreateWindow(getDisplayHandle(), eglAttribs);
-        if (eglWindowHandle == 0) {
-            throw new NativeWindowException("Error creating egl window: "+config);
-        }
-        setVisible0(eglWindowHandle, false);
-        windowHandleClose = eglWindowHandle;
-    }
-
-    protected void closeNative() {
-        if(0!=windowHandleClose) {
-            CloseWindow(windowHandleClose, windowUserData);
-            windowUserData=0;
-        }
-    }
-
-    public void setVisible(boolean visible) {
-        if(0!=eglWindowHandle && this.visible!=visible) {
-            this.visible=visible;
-            setVisible0(eglWindowHandle, visible);
-            if ( 0==windowHandle ) {
-                windowHandle = RealizeWindow(eglWindowHandle);
-                if (0 == windowHandle) {
-                    throw new NativeWindowException("Error native Window Handle is null");
-                }
-            }
-            clearEventMask();
-        }
-    }
-
-    public void setSize(int width, int height) {
-        if(0!=eglWindowHandle) {
-            setSize0(eglWindowHandle, width, height);
-        }
-    }
-
-    public void setPosition(int x, int y) {
-        // n/a in KD
-        System.err.println("setPosition n/a in KD");
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        if(0!=eglWindowHandle && this.fullscreen!=fullscreen) {
-            this.fullscreen=fullscreen;
-            if(this.fullscreen) {
-                setFullScreen0(eglWindowHandle, true);
-            } else {
-                setFullScreen0(eglWindowHandle, false);
-                setSize0(eglWindowHandle, nfs_width, nfs_height);
-            }
-        }
-        return true;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    protected static native boolean initIDs();
-    private        native long CreateWindow(long displayHandle, int[] attributes);
-    private        native long RealizeWindow(long eglWindowHandle);
-    private        native int  CloseWindow(long eglWindowHandle, long userData);
-    private        native void setVisible0(long eglWindowHandle, boolean visible);
-    private        native void setSize0(long eglWindowHandle, int width, int height);
-    private        native void setFullScreen0(long eglWindowHandle, boolean fullscreen);
-
-    private void windowCreated(long userData) {
-        windowUserData=userData;
-    }
-
-    private void sizeChanged(int newWidth, int newHeight) {
-        width = newWidth;
-        height = newHeight;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        } else {
-            ((KDScreen)screen).setScreenSize(width, height);
-        }
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
-    }
-
-    private long   eglWindowHandle;
-    private long   windowHandleClose;
-    private long   windowUserData;
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/util/EventDispatchThread.java b/src/newt/classes/com/sun/javafx/newt/util/EventDispatchThread.java
deleted file mode 100644
index a98ebab93..000000000
--- a/src/newt/classes/com/sun/javafx/newt/util/EventDispatchThread.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.javafx.newt.util;
-
-import com.sun.javafx.newt.Display;
-import com.sun.javafx.newt.impl.Debug;
-import java.util.*;
-
-public class EventDispatchThread {
-    public static final boolean DEBUG = Debug.debug("EDT");
-
-    private ThreadGroup threadGroup; 
-    private volatile boolean shouldStop = false;
-    private TaskWorker taskWorker = null;
-    private Object taskWorkerLock = new Object();
-    private ArrayList tasks = new ArrayList(); // one shot tasks
-    private Display display = null;
-    private String name;
-    private long edtPollGranularity = 10;
-
-    public EventDispatchThread(Display display, ThreadGroup tg, String name) {
-        this.display = display;
-        this.threadGroup = tg;
-        this.name=new String("EDT-Display_"+display.getName()+"-"+name);
-    }
-
-    public String getName() { return name; }
-
-    public ThreadGroup getThreadGroup() { return threadGroup; }
-
-    public void start() {
-        start(false);
-    }
-
-    /**
-     * @param externalStimuli true indicates that another thread stimulates, 
-     *                        ie. calls this TaskManager's run() loop method.
-     *                        Hence no own thread is started in this case.
-     *
-     * @return The started Runnable, which handles the run-loop.
-     *         Usefull in combination with externalStimuli=true,
-     *         so an external stimuli can call it.
-     */
-    public Runnable start(boolean externalStimuli) {
-        synchronized(taskWorkerLock) { 
-            if(null==taskWorker) {
-                taskWorker = new TaskWorker(threadGroup, name);
-            }
-            if(!taskWorker.isRunning()) {
-                shouldStop = false;
-                taskWorker.start(externalStimuli);
-            }
-            taskWorkerLock.notifyAll();
-        }
-        return taskWorker;
-    }
-
-    public void stop() {
-        synchronized(taskWorkerLock) { 
-            if(null!=taskWorker && taskWorker.isRunning()) {
-                shouldStop = true;
-            }
-            taskWorkerLock.notifyAll();
-            if(DEBUG) {
-                System.out.println(Thread.currentThread()+": EDT signal STOP");
-            }
-        }
-    }
-
-    public boolean isThreadEDT(Thread thread) {
-        return null!=taskWorker && taskWorker == thread;
-    }
-
-    public boolean isCurrentThreadEDT() {
-        return null!=taskWorker && taskWorker == Thread.currentThread();
-    }
-
-    public boolean isRunning() {
-        return null!=taskWorker && taskWorker.isRunning() ;
-    }
-
-    public void invokeLater(Runnable task) {
-        if(task == null) {
-            return;
-        }
-        synchronized(taskWorkerLock) {
-            if(null!=taskWorker && taskWorker.isRunning() && taskWorker != Thread.currentThread() ) {
-                tasks.add(task);
-                taskWorkerLock.notifyAll();
-            } else {
-                // if !running or isEDTThread, do it right away
-                task.run();
-            }
-        }
-    }
-
-    public void invokeAndWait(Runnable task) {
-        if(task == null) {
-            return;
-        }
-        invokeLater(task);
-        waitOnWorker();
-    }
-
-    public void waitOnWorker() {
-        synchronized(taskWorkerLock) {
-            if(null!=taskWorker && taskWorker.isRunning() && tasks.size()>0 && taskWorker != Thread.currentThread() ) {
-                try {
-                    taskWorkerLock.wait();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public void waitUntilStopped() {
-        synchronized(taskWorkerLock) {
-            while(null!=taskWorker && taskWorker.isRunning() && taskWorker != Thread.currentThread() ) {
-                try {
-                    taskWorkerLock.wait();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    class TaskWorker extends Thread {
-        boolean isRunning = false;
-        boolean externalStimuli = false;
-
-        public TaskWorker(ThreadGroup tg, String name) {
-            super(tg, name);
-        }
-
-        public synchronized boolean isRunning() {
-            return isRunning;
-        }
-
-        public void start(boolean externalStimuli) throws IllegalThreadStateException {
-            synchronized(this) {
-                this.externalStimuli = externalStimuli;
-                isRunning = true;
-            }
-            if(!externalStimuli) {
-                super.start();
-            }
-        }
-
-        /** 
-         * Utilizing taskWorkerLock only for local resources and task execution,
-         * not for event dispatching.
-         */
-        public void run() {
-            if(DEBUG) {
-                System.out.println(Thread.currentThread()+": EDT run() START");
-            }
-            while(!shouldStop) {
-                try {
-                    // wait for something todo
-                    while(!shouldStop && tasks.size()==0) {
-                        synchronized(taskWorkerLock) {
-                            if(!shouldStop && tasks.size()==0) {
-                                try {
-                                    taskWorkerLock.wait(edtPollGranularity);
-                                } catch (InterruptedException e) {
-                                    e.printStackTrace();
-                                }
-                            }
-                        }
-                        display.pumpMessages(); // event dispatch
-                    }
-                    if(!shouldStop && tasks.size()>0) {
-                        synchronized(taskWorkerLock) {
-                            if(!shouldStop && tasks.size()>0) {
-                                Runnable task = (Runnable) tasks.remove(0);
-                                task.run();
-                                taskWorkerLock.notifyAll();
-                            }
-                        }
-                        display.pumpMessages(); // event dispatch
-                    }
-                } catch (Throwable t) {
-                    // handle errors ..
-                    t.printStackTrace();
-                } finally {
-                    // epilog - unlock locked stuff
-                }
-                if(externalStimuli) break; // no loop if called by external stimuli
-            }
-            synchronized(this) {
-                isRunning = !shouldStop;
-            }
-            if(!isRunning) {
-                synchronized(taskWorkerLock) {
-                    taskWorkerLock.notifyAll();
-                }
-            }
-            if(DEBUG) {
-                System.out.println(Thread.currentThread()+": EDT run() EXIT");
-            }
-        }
-    }
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/util/MainThread.java b/src/newt/classes/com/sun/javafx/newt/util/MainThread.java
deleted file mode 100644
index abfe3f0c7..000000000
--- a/src/newt/classes/com/sun/javafx/newt/util/MainThread.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.sun.javafx.newt.util;
-
-import java.util.*;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.security.*;
-
-import javax.media.nativewindow.*;
-
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.impl.*;
-import com.sun.javafx.newt.macosx.MacDisplay;
-import com.sun.nativewindow.impl.NWReflection;
-
-/**
- * NEWT Utility class MainThread<P>
- *
- * This class provides a startup singleton <i>main thread</i>,
- * from which a new thread with the users main class is launched.<br>
- *
- * Such behavior is necessary for native windowing toolkits,
- * where the windowing management must happen on the so called
- * <i>main thread</i> e.g. for Mac OS X !<br>
- *
- * Utilizing this class as a launchpad, now you are able to
- * use a NEWT multithreaded application with window handling within the different threads,
- * even on these restricted platforms.<br>
- *
- * To support your NEWT Window platform, 
- * you have to pass your <i>main thread</i> actions to {@link #invoke invoke(..)},
- * have a look at the {@link com.sun.javafx.newt.macosx.MacWindow MacWindow} implementation.<br>
- * <i>TODO</i>: Some hardcoded dependencies exist in this implementation, 
- * where you have to patch this code or factor it out. <P>
- * 
- * If your platform is not Mac OS X, but you want to test your code without modifying
- * this class, you have to set the system property <code>newt.MainThread.force</code> to <code>true</code>.<P>
- *
- * The code is compatible with all other platform, which support multithreaded windowing handling.
- * Since those platforms won't trigger the <i>main thread</i> serialization, the main method 
- * will be simply executed, in case you haven't set <code>newt.MainThread.force</code> to <code>true</code>.<P>
- *
- * Test case on Mac OS X (or any other platform):
- <PRE>
-    java -XstartOnFirstThread com.sun.javafx.newt.util.MainThread demos.es1.RedSquare -GL2 -GL2 -GL2 -GL2
- </PRE>
- * Which starts 4 threads, each with a window and OpenGL rendering.<br>
- */
-public class MainThread {
-    private static AccessControlContext localACC = AccessController.getContext();
-    public static final boolean USE_MAIN_THREAD = NativeWindowFactory.TYPE_MACOSX.equals(NativeWindowFactory.getNativeWindowType(false)) ||
-                                                  Debug.getBooleanProperty("newt.MainThread.force", true, localACC);
-
-    protected static final boolean DEBUG = Debug.debug("MainThread");
-
-    private static boolean isExit=false;
-    private static volatile boolean isRunning=false;
-    private static Object taskWorkerLock=new Object();
-    private static boolean shouldStop;
-    private static ArrayList tasks;
-    private static ArrayList tasksBlock;
-    private static Thread mainThread;
-
-    static class MainAction extends Thread {
-        private String mainClassName;
-        private String[] mainClassArgs;
-
-        private Class mainClass;
-        private Method mainClassMain;
-
-        public MainAction(String mainClassName, String[] mainClassArgs) {
-            this.mainClassName=mainClassName;
-            this.mainClassArgs=mainClassArgs;
-        }
-
-        public void run() {
-            if ( USE_MAIN_THREAD ) {
-                // we have to start first to provide the service ..
-                MainThread.waitUntilRunning();
-            }
-
-            // start user app ..
-            try {
-                Class mainClass = NWReflection.getClass(mainClassName, true);
-                if(null==mainClass) {
-                    throw new RuntimeException(new ClassNotFoundException("MainThread couldn't find main class "+mainClassName));
-                }
-                try {
-                    mainClassMain = mainClass.getDeclaredMethod("main", new Class[] { String[].class });
-                    mainClassMain.setAccessible(true);
-                } catch (Throwable t) {
-                    throw new RuntimeException(t);
-                }
-                if(DEBUG) System.err.println("MainAction.run(): "+Thread.currentThread().getName()+" invoke "+mainClassName);
-                mainClassMain.invoke(null, new Object[] { mainClassArgs } );
-            } catch (InvocationTargetException ite) {
-                ite.getTargetException().printStackTrace();
-            } catch (Throwable t) {
-                t.printStackTrace();
-            }
-
-            if(DEBUG) System.err.println("MainAction.run(): "+Thread.currentThread().getName()+" user app fin");
-
-            if ( USE_MAIN_THREAD ) {
-                MainThread.exit();
-                if(DEBUG) System.err.println("MainAction.run(): "+Thread.currentThread().getName()+" MainThread fin - exit");
-                System.exit(0);
-            }
-        }
-    }
-    private static MainAction mainAction;
-
-    /** Your new java application main entry, which pipelines your application */
-    public static void main(String[] args) {
-        if(DEBUG) System.err.println("MainThread.main(): "+Thread.currentThread().getName()+" USE_MAIN_THREAD "+ USE_MAIN_THREAD );
-
-        if(args.length==0) {
-            return;
-        }
-
-        String mainClassName=args[0];
-        String[] mainClassArgs=new String[args.length-1];
-        if(args.length>1) {
-            System.arraycopy(args, 1, mainClassArgs, 0, args.length-1);
-        }
-
-        NativeLibLoader.loadNEWT();
-        
-        shouldStop = false;
-        tasks = new ArrayList();
-        tasksBlock = new ArrayList();
-        mainThread = Thread.currentThread();
-
-        mainAction = new MainAction(mainClassName, mainClassArgs);
-
-        if(NativeWindowFactory.TYPE_MACOSX.equals(NativeWindowFactory.getNativeWindowType(false))) {
-            MacDisplay.initSingleton();
-        }
-
-        if ( USE_MAIN_THREAD ) {
-            // dispatch user's main thread ..
-            mainAction.start();
-
-            // do our main thread task scheduling
-            run();
-        } else {
-            // run user's main in this thread 
-            mainAction.run();
-        }
-    }
-
-    /** invokes the given Runnable */
-    public static void invoke(boolean wait, Runnable r) {
-        if(r == null) {
-            return;
-        }
-
-        // if this main thread is not being used or
-        // if this is already the main thread .. just execute.
-        if( !isRunning() || mainThread == Thread.currentThread() ) {
-            r.run();
-            return;
-        }
-
-        synchronized(taskWorkerLock) {
-            tasks.add(r);
-            if(wait) {
-                tasksBlock.add(r);
-            }
-            taskWorkerLock.notifyAll();
-            if(wait) {
-                while(tasksBlock.size()>0) {
-                    try {
-                        taskWorkerLock.wait();
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }
-    }
-
-    public static void exit() {
-        if(DEBUG) System.err.println("MainThread.exit(): "+Thread.currentThread().getName()+" start");
-        synchronized(taskWorkerLock) { 
-            if(isRunning) {
-                shouldStop = true;
-            }
-            taskWorkerLock.notifyAll();
-        }
-        if(DEBUG) System.err.println("MainThread.exit(): "+Thread.currentThread().getName()+" end");
-    }
-
-    public static boolean isRunning() {
-        synchronized(taskWorkerLock) { 
-            return isRunning;
-        }
-    }
-
-    private static void waitUntilRunning() {
-        synchronized(taskWorkerLock) {
-            if(isExit) return;
-
-            while(!isRunning) {
-                try {
-                    taskWorkerLock.wait();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public static void run() {
-        if(DEBUG) System.err.println("MainThread.run(): "+Thread.currentThread().getName());
-        synchronized(taskWorkerLock) {
-            isRunning = true;
-            taskWorkerLock.notifyAll();
-        }
-        while(!shouldStop) {
-            try {
-                ArrayList localTasks=null;
-
-                // wait for something todo ..
-                synchronized(taskWorkerLock) {
-                    while(!shouldStop && tasks.size()==0) {
-                        try {
-                            taskWorkerLock.wait();
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    // seq. process all tasks until no blocking one exists in the list
-                    for(Iterator i = tasks.iterator(); tasksBlock.size()>0 && i.hasNext(); ) {
-                        Runnable task = (Runnable) i.next();
-                        task.run();
-                        i.remove();
-                        tasksBlock.remove(task);
-                    }
-
-                    // take over the tasks ..
-                    if(tasks.size()>0) {
-                        localTasks = tasks;
-                        tasks = new ArrayList();
-                    }
-                    taskWorkerLock.notifyAll();
-                }
-
-                // seq. process all unblocking tasks ..
-                if(null!=localTasks) {
-                    for(Iterator i = localTasks.iterator(); i.hasNext(); ) {
-                        Runnable task = (Runnable) i.next();
-                        task.run();
-                    }
-                }
-            } catch (Throwable t) {
-                // handle errors ..
-                t.printStackTrace();
-            } finally {
-                // epilog - unlock locked stuff
-            }
-        }
-        if(DEBUG) System.err.println("MainThread.run(): "+Thread.currentThread().getName()+" fin");
-        synchronized(taskWorkerLock) {
-            isRunning = false;
-            isExit = true;
-            taskWorkerLock.notifyAll();
-        }
-    }
-}
-
-
diff --git a/src/newt/classes/com/sun/javafx/newt/windows/WindowsDisplay.java b/src/newt/classes/com/sun/javafx/newt/windows/WindowsDisplay.java
deleted file mode 100755
index 80485ed67..000000000
--- a/src/newt/classes/com/sun/javafx/newt/windows/WindowsDisplay.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.windows;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.windows.*;
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.impl.*;
-
-public class WindowsDisplay extends Display {
-
-    protected static final String WINDOW_CLASS_NAME = "NewtWindowClass";
-    private static int windowClassAtom;
-    private static long hInstance;
-
-    static {
-        NativeLibLoader.loadNEWT();
-
-        if (!WindowsWindow.initIDs()) {
-            throw new NativeWindowException("Failed to initialize WindowsWindow jmethodIDs");
-        }
-    }
-
-    public static void initSingleton() {
-        // just exist to ensure static init has been run
-    }
-
-
-    public WindowsDisplay() {
-    }
-
-    protected void createNative() {
-        aDevice = new WindowsGraphicsDevice();
-    }
-
-    protected void closeNative() { 
-        // Can't do .. only at application shutdown 
-        // UnregisterWindowClass(getWindowClassAtom(), getHInstance());
-    }
-
-    protected void dispatchMessages() {
-        DispatchMessages();
-    }
-
-    protected static synchronized int getWindowClassAtom() {
-        if(0 == windowClassAtom) {
-            windowClassAtom = RegisterWindowClass(WINDOW_CLASS_NAME, getHInstance());
-            if (0 == windowClassAtom) {
-                throw new NativeWindowException("Error while registering window class");
-            }
-        }
-        return windowClassAtom;
-    }
-
-    protected static synchronized long getHInstance() {
-        if(0 == hInstance) {
-            hInstance = LoadLibraryW("newt");
-            if (0 == hInstance) {
-                throw new NativeWindowException("Error finding HINSTANCE for \"newt\"");
-            }
-        }
-        return hInstance;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-    private static native long LoadLibraryW(String libraryName);
-    private static native int  RegisterWindowClass(String windowClassName, long hInstance);
-    private static native void UnregisterWindowClass(int wndClassAtom, long hInstance);
-
-    private static native void DispatchMessages();
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/windows/WindowsScreen.java b/src/newt/classes/com/sun/javafx/newt/windows/WindowsScreen.java
deleted file mode 100755
index 87ae1b49d..000000000
--- a/src/newt/classes/com/sun/javafx/newt/windows/WindowsScreen.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.windows;
-
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
-
-public class WindowsScreen extends Screen {
-    static {
-        WindowsDisplay.initSingleton();
-    }
-
-
-    public WindowsScreen() {
-    }
-
-    protected void createNative(int index) {
-        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
-        setScreenSize(getWidthImpl(getIndex()), getHeightImpl(getIndex()));
-    }
-
-    protected void closeNative() { }
-
-    private        native int getWidthImpl(int scrn_idx);
-    private        native int getHeightImpl(int scrn_idx);
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/windows/WindowsWindow.java b/src/newt/classes/com/sun/javafx/newt/windows/WindowsWindow.java
deleted file mode 100755
index 1b5bf80cf..000000000
--- a/src/newt/classes/com/sun/javafx/newt/windows/WindowsWindow.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.windows;
-
-import javax.media.nativewindow.*;
-import com.sun.javafx.newt.*;
-
-public class WindowsWindow extends Window {
-
-    private long hmon;
-    private long hdc;
-    private long windowHandleClose;
-    private long parentWindowHandle;
-    // non fullscreen dimensions ..
-    private int nfs_width, nfs_height, nfs_x, nfs_y;
-    private final Insets insets = new Insets(0, 0, 0, 0);
-
-    static {
-        WindowsDisplay.initSingleton();
-    }
-
-    public WindowsWindow() {
-    }
-
-    Thread hdcOwner = null;
-
-    public synchronized int lockSurface() throws NativeWindowException {
-        int res = super.lockSurface(); 
-        if(LOCK_SUCCESS==res && 0!=windowHandle) {
-            if(hdc!=0) {
-                throw new NativeWindowException("NEWT Surface handle set HDC "+toHexString(hdc)+" - "+Thread.currentThread().getName()+" ; "+this);
-            }
-            hdc = GetDC(windowHandle);
-            hmon = MonitorFromWindow(windowHandle);
-            hdcOwner = Thread.currentThread();
-        }
-        return res;
-    }
-
-    public synchronized void unlockSurface() {
-        // prevalidate, before we change data ..
-        Thread cur = Thread.currentThread();
-        if ( getSurfaceLockOwner() != cur ) {
-            getLockedStack().printStackTrace();
-            throw new NativeWindowException(cur+": Not owner, owner is "+getSurfaceLockOwner());
-        }
-        if (0!=hdc && 0!=windowHandle) {
-            if(hdcOwner != cur) {
-                throw new NativeWindowException("NEWT Surface handle set HDC "+toHexString(hdc)+" by other thread "+hdcOwner+", this "+cur+" ; "+this);
-            }
-            ReleaseDC(windowHandle, hdc);
-            hdc=0;
-            hdcOwner=null;
-        }
-        super.unlockSurface();
-    }
-
-    public long getSurfaceHandle() {
-        return hdc;
-    }
-
-    public boolean hasDeviceChanged() {
-        if(0!=windowHandle) {
-            long _hmon = MonitorFromWindow(windowHandle);
-            if (hmon != _hmon) {
-                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                    Exception e = new Exception("!!! Window Device Changed "+Thread.currentThread().getName()+
-                                                ", HMON "+toHexString(hmon)+" -> "+toHexString(_hmon));
-                    e.printStackTrace();
-                }
-                hmon = _hmon;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        WindowsScreen  screen = (WindowsScreen) getScreen();
-        WindowsDisplay display = (WindowsDisplay) screen.getDisplay();
-        config = GraphicsConfigurationFactory.getFactory(display.getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, screen.getGraphicsScreen());
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-        windowHandle = CreateWindow(parentWindowHandle, 
-                                    display.getWindowClassAtom(), display.WINDOW_CLASS_NAME, display.getHInstance(), 
-                                    0, undecorated, x, y, width, height);
-        if (windowHandle == 0) {
-            throw new NativeWindowException("Error creating window");
-        }
-        this.parentWindowHandle = parentWindowHandle;
-        windowHandleClose = windowHandle;
-        if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-            Exception e = new Exception("!!! Window new window handle "+Thread.currentThread().getName()+
-                                        " (Parent HWND "+toHexString(parentWindowHandle)+
-                                        ") : HWND "+toHexString(windowHandle)+", "+Thread.currentThread());
-            e.printStackTrace();
-        }
-    }
-
-    protected void closeNative() {
-        if (hdc != 0) {
-            if(windowHandleClose != 0) {
-                ReleaseDC(windowHandleClose, hdc);
-            }
-            hdc = 0;
-        }
-        if(windowHandleClose != 0) {
-            DestroyWindow(windowHandleClose);
-            windowHandleClose = 0;
-        }
-    }
-
-    protected void windowDestroyed() {
-        windowHandleClose = 0;
-        super.windowDestroyed();
-    }
-
-    public void setVisible(boolean visible) {
-        if(this.visible!=visible && 0!=windowHandle) {
-            this.visible=visible;
-            setVisible0(windowHandle, visible);
-        }
-    }
-
-    // @Override
-    public void setSize(int width, int height) {
-        if (0!=windowHandle && (width != this.width || this.height != height)) {
-            if(!fullscreen) {
-                nfs_width=width;
-                nfs_height=height;
-            }
-            this.width = width;
-            this.height = height;
-            setSize0(parentWindowHandle, windowHandle, x, y, width, height);
-        }
-    }
-
-    //@Override
-    public void setPosition(int x, int y) {
-        if (0!=windowHandle && (this.x != x || this.y != y)) {
-            if(!fullscreen) {
-                nfs_x=x;
-                nfs_y=y;
-            }
-            this.x = x;
-            this.y = y;
-            setPosition(parentWindowHandle, windowHandle, x , y);
-        }
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        if(0!=windowHandle && (this.fullscreen!=fullscreen)) {
-            int x,y,w,h;
-            this.fullscreen=fullscreen;
-            if(fullscreen) {
-                x = 0; y = 0;
-                w = screen.getWidth();
-                h = screen.getHeight();
-            } else {
-                x = nfs_x;
-                y = nfs_y;
-                w = nfs_width;
-                h = nfs_height;
-            }
-            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                System.err.println("WindowsWindow fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
-            }
-            setFullscreen0(parentWindowHandle, windowHandle, x, y, w, h, undecorated, fullscreen);
-        }
-        return fullscreen;
-    }
-
-    // @Override
-    public void requestFocus() {
-        super.requestFocus();
-        if (windowHandle != 0L) {
-            requestFocus(windowHandle);
-        }
-    }
-
-    // @Override
-    public void setTitle(String title) {
-        if (title == null) {
-            title = "";
-        }
-        if (0!=windowHandle && !title.equals(getTitle())) {
-            super.setTitle(title);
-            setTitle(windowHandle, title);
-        }
-    }
-
-    public Insets getInsets() {
-        return (Insets)insets.clone();
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-    protected static native boolean initIDs();
-    private        native long CreateWindow(long parentWindowHandle, 
-                                            int wndClassAtom, String wndName, 
-                                            long hInstance, long visualID,
-                                            boolean isUndecorated,
-                                            int x, int y, int width, int height);
-    private        native void DestroyWindow(long windowHandle);
-    private        native long GetDC(long windowHandle);
-    private        native void ReleaseDC(long windowHandle, long hdc);
-    private        native long MonitorFromWindow(long windowHandle);
-    private static native void setVisible0(long windowHandle, boolean visible);
-    private        native void setSize0(long parentWindowHandle, long windowHandle, int x, int y, int width, int height);
-    private        native void setPosition(long parentWindowHandle, long windowHandle, int x, int y);
-    private        native void setFullscreen0(long parentWindowHandle, long windowHandle, int x, int y, int width, int height, boolean isUndecorated, boolean on);
-    private static native void setTitle(long windowHandle, String title);
-    private static native void requestFocus(long windowHandle);
-
-    private void insetsChanged(int left, int top, int right, int bottom) {
-        if (left != -1 && top != -1 && right != -1 && bottom != -1) {
-            insets.left = left;
-            insets.top = top;
-            insets.right = right;
-            insets.bottom = bottom;
-        }
-    }
-    private void sizeChanged(int newWidth, int newHeight) {
-        width = newWidth;
-        height = newHeight;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        }
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
-    }
-
-    private void positionChanged(int newX, int newY) {
-        x = newX;
-        y = newY;
-        if(!fullscreen) {
-            nfs_x=x;
-            nfs_y=y;
-        }
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
-    }
-
-    /**
-     *
-     * @param focusOwner if focusGained is true, focusOwner is the previous
-     * focus owner, if focusGained is false, focusOwner is the new focus owner
-     * @param focusGained
-     */
-    private void focusChanged(long focusOwner, boolean focusGained) {
-        if (focusGained) {
-            sendWindowEvent(WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
-        } else {
-            sendWindowEvent(WindowEvent.EVENT_WINDOW_LOST_FOCUS);
-        }
-    }
-}
diff --git a/src/newt/classes/com/sun/javafx/newt/x11/X11Display.java b/src/newt/classes/com/sun/javafx/newt/x11/X11Display.java
deleted file mode 100755
index ae23c4423..000000000
--- a/src/newt/classes/com/sun/javafx/newt/x11/X11Display.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.x11;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.impl.*;
-import com.sun.nativewindow.impl.x11.X11Util;
-
-public class X11Display extends Display {
-    static {
-        NativeLibLoader.loadNEWT();
-
-        if (!initIDs()) {
-            throw new NativeWindowException("Failed to initialize X11Display jmethodIDs");
-        }
-
-        if (!X11Window.initIDs()) {
-            throw new NativeWindowException("Failed to initialize X11Window jmethodIDs");
-        }
-    }
-
-    public static void initSingleton() {
-        // just exist to ensure static init has been run
-    }
-
-
-    public X11Display() {
-    }
-
-    protected void createNative() {
-        long handle= X11Util.getThreadLocalDisplay(name);
-        if (handle == 0 ) {
-            throw new RuntimeException("Error creating display: "+name);
-        }
-        try {
-            CompleteDisplay(handle);
-        } catch(RuntimeException e) {
-            X11Util.closeThreadLocalDisplay(name);
-            throw e;
-        }
-        aDevice = new X11GraphicsDevice(handle);
-    }
-
-    protected void closeNative() {
-        if(0==X11Util.closeThreadLocalDisplay(name)) {
-            throw new NativeWindowException(this+" was not mapped");
-        }
-    }
-
-    protected void dispatchMessages() {
-        DispatchMessages(getHandle(), javaObjectAtom, windowDeleteAtom);
-    }
-
-    protected void lockDisplay() {
-        super.lockDisplay();
-        LockDisplay(getHandle());
-    }
-
-    protected void unlockDisplay() {
-        UnlockDisplay(getHandle());
-        super.unlockDisplay();
-    }
-
-    protected long getJavaObjectAtom() { return javaObjectAtom; }
-    protected long getWindowDeleteAtom() { return windowDeleteAtom; }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-    private static native boolean initIDs();
-
-    private native void LockDisplay(long handle);
-    private native void UnlockDisplay(long handle);
-
-    private native void CompleteDisplay(long handle);
-
-    private native void DispatchMessages(long display, long javaObjectAtom, long windowDeleteAtom);
-
-    private void displayCompleted(long javaObjectAtom, long windowDeleteAtom) {
-        this.javaObjectAtom=javaObjectAtom;
-        this.windowDeleteAtom=windowDeleteAtom;
-    }
-
-    private long windowDeleteAtom;
-    private long javaObjectAtom;
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/x11/X11Screen.java b/src/newt/classes/com/sun/javafx/newt/x11/X11Screen.java
deleted file mode 100755
index cee576e2c..000000000
--- a/src/newt/classes/com/sun/javafx/newt/x11/X11Screen.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.x11;
-
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-
-public class X11Screen extends Screen {
-
-    static {
-        X11Display.initSingleton();
-    }
-
-
-    public X11Screen() {
-    }
-
-    protected void createNative(int index) {
-        long handle = GetScreen(display.getHandle(), index);
-        if (handle == 0 ) {
-            throw new RuntimeException("Error creating screen: "+index);
-        }
-        aScreen = new X11GraphicsScreen((X11GraphicsDevice)getDisplay().getGraphicsDevice(), index);
-        setScreenSize(getWidth0(display.getHandle(), index),
-                      getHeight0(display.getHandle(), index));
-    }
-
-    protected void closeNative() { }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    private native long GetScreen(long dpy, int scrn_idx);
-    private native int  getWidth0(long display, int scrn_idx);
-    private native int  getHeight0(long display, int scrn_idx);
-}
-
diff --git a/src/newt/classes/com/sun/javafx/newt/x11/X11Window.java b/src/newt/classes/com/sun/javafx/newt/x11/X11Window.java
deleted file mode 100755
index f46ae9564..000000000
--- a/src/newt/classes/com/sun/javafx/newt/x11/X11Window.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.sun.javafx.newt.x11;
-
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-
-public class X11Window extends Window {
-    private static final String WINDOW_CLASS_NAME = "NewtWindow";
-    // non fullscreen dimensions ..
-    private int nfs_width, nfs_height, nfs_x, nfs_y;
-
-    static {
-        X11Display.initSingleton();
-    }
-
-    public X11Window() {
-    }
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        X11Screen screen = (X11Screen) getScreen();
-        X11Display display = (X11Display) screen.getDisplay();
-        config = GraphicsConfigurationFactory.getFactory(display.getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, screen.getGraphicsScreen());
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-        X11GraphicsConfiguration x11config = (X11GraphicsConfiguration) config;
-        long visualID = x11config.getVisualID();
-        long w = CreateWindow(parentWindowHandle, 
-                              display.getHandle(), screen.getIndex(), visualID, 
-                              display.getJavaObjectAtom(), display.getWindowDeleteAtom(), x, y, width, height);
-        if (w == 0 || w!=windowHandle) {
-            throw new NativeWindowException("Error creating window: "+w);
-        }
-        this.parentWindowHandle = parentWindowHandle;
-        windowHandleClose = windowHandle;
-        displayHandleClose = display.getHandle();
-    }
-
-    protected void closeNative() {
-        if(0!=displayHandleClose && 0!=windowHandleClose && null!=getScreen() ) {
-            X11Display display = (X11Display) getScreen().getDisplay();
-            CloseWindow(displayHandleClose, windowHandleClose, display.getJavaObjectAtom());
-            windowHandleClose = 0;
-            displayHandleClose = 0;
-        }
-    }
-
-    protected void windowDestroyed() {
-        windowHandleClose = 0;
-        displayHandleClose = 0;
-        super.windowDestroyed();
-    }
-
-    public void setVisible(boolean visible) {
-        if(0!=windowHandle && this.visible!=visible) {
-            this.visible=visible;
-            setVisible0(getDisplayHandle(), windowHandle, visible);
-            clearEventMask();
-        }
-    }
-
-    public void requestFocus() {
-        super.requestFocus();
-    }
-
-    public void setSize(int width, int height) {
-        if(DEBUG_IMPLEMENTATION) {
-            System.err.println("X11Window setSize: "+this.x+"/"+this.y+" "+this.width+"x"+this.height+" -> "+width+"x"+height);
-            // Exception e = new Exception("XXXXXXXXXX");
-            // e.printStackTrace();
-        }
-        this.width = width;
-        this.height = height;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        }
-        if(0!=windowHandle) {
-            setSize0(parentWindowHandle, getDisplayHandle(), getScreenIndex(), windowHandle, x, y, width, height, (undecorated||fullscreen)?-1:1, false);
-        }
-    }
-
-    public void setPosition(int x, int y) {
-        if(DEBUG_IMPLEMENTATION) {
-            System.err.println("X11Window setPosition: "+this.x+"/"+this.y+" -> "+x+"/"+y);
-            // Exception e = new Exception("XXXXXXXXXX");
-            // e.printStackTrace();
-        }
-        this.x = x;
-        this.y = y;
-        if(!fullscreen) {
-            nfs_x=x;
-            nfs_y=y;
-        }
-        if(0!=windowHandle) {
-            setPosition0(getDisplayHandle(), windowHandle, x, y);
-        }
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        if(0!=windowHandle && this.fullscreen!=fullscreen) {
-            int x,y,w,h;
-            this.fullscreen=fullscreen;
-            if(fullscreen) {
-                x = 0; y = 0;
-                w = screen.getWidth();
-                h = screen.getHeight();
-            } else {
-                x = nfs_x;
-                y = nfs_y;
-                w = nfs_width;
-                h = nfs_height;
-            }
-            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                System.err.println("X11Window fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
-            }
-            setSize0(parentWindowHandle, getDisplayHandle(), getScreenIndex(), windowHandle, x, y, w, h, (undecorated||fullscreen)?-1:1, false);
-        }
-        return fullscreen;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    protected static native boolean initIDs();
-    private        native long CreateWindow(long parentWindowHandle, long display, int screen_index, 
-                                            long visualID, long javaObjectAtom, long windowDeleteAtom, int x, int y, int width, int height);
-    private        native void CloseWindow(long display, long windowHandle, long javaObjectAtom);
-    private        native void setVisible0(long display, long windowHandle, boolean visible);
-    private        native void setSize0(long parentWindowHandle, long display, int screen_index, long windowHandle, 
-                                        int x, int y, int width, int height, int decorationToggle, boolean setVisible);
-    private        native void setPosition0(long display, long windowHandle, int x, int y);
-
-    private void windowChanged(int newX, int newY, int newWidth, int newHeight) {
-        if(width != newWidth || height != newHeight) {
-            if(DEBUG_IMPLEMENTATION) {
-                System.err.println("X11Window windowChanged size: "+this.width+"x"+this.height+" -> "+newWidth+"x"+newHeight);
-            }
-            width = newWidth;
-            height = newHeight;
-            if(!fullscreen) {
-                nfs_width=width;
-                nfs_height=height;
-            }
-            sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
-        }
-        if( 0==parentWindowHandle && ( x != newX || y != newY ) ) {
-            if(DEBUG_IMPLEMENTATION) {
-                System.err.println("X11Window windowChanged position: "+this.x+"/"+this.y+" -> "+newX+"x"+newY);
-            }
-            x = newX;
-            y = newY;
-            if(!fullscreen) {
-                nfs_x=x;
-                nfs_y=y;
-            }
-            sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
-        }
-    }
-
-    private void windowCreated(long windowHandle) {
-        this.windowHandle = windowHandle;
-    }
-
-    private long   windowHandleClose;
-    private long   displayHandleClose;
-    private long   parentWindowHandle;
-}
diff --git a/src/newt/native/BroadcomEGL.c b/src/newt/native/BroadcomEGL.c
index 55688f9d1..8a9c5f948 100755
--- a/src/newt/native/BroadcomEGL.c
+++ b/src/newt/native/BroadcomEGL.c
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "com_sun_javafx_newt_opengl_broadcom_egl_Window.h"
+#include "com_jogamp_javafx_newt_opengl_broadcom_egl_Window.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -72,7 +72,7 @@ static jmethodID windowCreatedID = NULL;
  * Display
  */
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Display_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_DispatchMessages
   (JNIEnv *env, jobject obj)
 {
     // FIXME: n/a
@@ -80,7 +80,7 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Display_Disp
     (void) obj;
 }
 
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Display_CreateDisplay
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_CreateDisplay
   (JNIEnv *env, jobject obj, jint width, jint height)
 {
     (void) env;
@@ -94,7 +94,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Display_Cre
     return (jlong) (intptr_t) dpy;
 }
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Display_DestroyDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_DestroyDisplay
   (JNIEnv *env, jobject obj, jlong display)
 {
     EGLDisplay dpy  = (EGLDisplay)(intptr_t)display;
@@ -111,7 +111,7 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Display_Dest
  * Window
  */
 
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Window_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_initIDs
   (JNIEnv *env, jclass clazz)
 {
     windowCreatedID = (*env)->GetMethodID(env, clazz, "windowCreated", "(III)V");
@@ -123,7 +123,7 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Window_i
     return JNI_TRUE;
 }
 
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Window_CreateWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_CreateWindow
   (JNIEnv *env, jobject obj, jlong display, jboolean chromaKey, jint width, jint height)
 {
     EGLDisplay dpy  = (EGLDisplay)(intptr_t)display;
@@ -167,7 +167,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Window_Crea
     return (jlong) (intptr_t) window;
 }
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Window_CloseWindow
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_CloseWindow
   (JNIEnv *env, jobject obj, jlong display, jlong window)
 {
     EGLDisplay dpy  = (EGLDisplay) (intptr_t) display;
@@ -180,7 +180,7 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Window_Close
     DBG_PRINT( "[CloseWindow] X\n");
 }
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_broadcom_egl_Window_SwapWindow
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_SwapWindow
   (JNIEnv *env, jobject obj, jlong display, jlong window)
 {
     EGLDisplay dpy  = (EGLDisplay) (intptr_t) display;
diff --git a/src/newt/native/IntelGDL.c b/src/newt/native/IntelGDL.c
index 1bc43cd0e..77f582885 100644
--- a/src/newt/native/IntelGDL.c
+++ b/src/newt/native/IntelGDL.c
@@ -37,9 +37,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "com_sun_javafx_newt_intel_gdl_Display.h"
-#include "com_sun_javafx_newt_intel_gdl_Screen.h"
-#include "com_sun_javafx_newt_intel_gdl_Window.h"
+#include "com_jogamp_javafx_newt_intel_gdl_Display.h"
+#include "com_jogamp_javafx_newt_intel_gdl_Screen.h"
+#include "com_jogamp_javafx_newt_intel_gdl_Window.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -123,7 +123,7 @@ static void JNI_ThrowNew(JNIEnv *env, const char *throwable, const char* message
  * Display
  */
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_intel_gdl_Display_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_DispatchMessages
   (JNIEnv *env, jobject obj, jlong displayHandle, jobject focusedWindow)
 {
     // FIXME: n/a
@@ -138,7 +138,7 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_intel_gdl_Display_DispatchMessag
     } */
 }
 
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_intel_gdl_Display_CreateDisplay
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_CreateDisplay
   (JNIEnv *env, jobject obj)
 {
     gdl_ret_t retval;
@@ -171,7 +171,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_intel_gdl_Display_CreateDisplay
     return (jlong) (intptr_t) p_driver_info;
 }
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_intel_gdl_Display_DestroyDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_DestroyDisplay
   (JNIEnv *env, jobject obj, jlong displayHandle)
 {
     gdl_driver_info_t * p_driver_info = (gdl_driver_info_t *) (intptr_t) displayHandle;
@@ -190,7 +190,7 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_intel_gdl_Display_DestroyDisplay
  * Screen
  */
 
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_intel_gdl_Screen_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Screen_initIDs
   (JNIEnv *env, jclass clazz)
 {
     screenCreatedID = (*env)->GetMethodID(env, clazz, "screenCreated", "(II)V");
@@ -202,7 +202,7 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_intel_gdl_Screen_initIDs
     return JNI_TRUE;
 }
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_intel_gdl_Screen_GetScreenInfo
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Screen_GetScreenInfo
   (JNIEnv *env, jobject obj, jlong displayHandle, jint idx)
 {
     gdl_driver_info_t * p_driver_info = (gdl_driver_info_t *) (intptr_t) displayHandle;
@@ -234,7 +234,7 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_intel_gdl_Screen_GetScreenInfo
  * Window
  */
 
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_intel_gdl_Window_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_initIDs
   (JNIEnv *env, jclass clazz)
 {
     updateBoundsID = (*env)->GetMethodID(env, clazz, "updateBounds", "(IIII)V");
@@ -246,7 +246,7 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_intel_gdl_Window_initIDs
     return JNI_TRUE;
 }
 
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_intel_gdl_Window_CreateSurface
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_CreateSurface
   (JNIEnv *env, jobject obj, jlong displayHandle, jint scr_width, jint scr_height, jint x, jint y, jint width, jint height) {
 
     gdl_driver_info_t * p_driver_info = (gdl_driver_info_t *) (intptr_t) displayHandle;
@@ -339,7 +339,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_intel_gdl_Window_CreateSurface
     return (jlong) (intptr_t) plane;
 }
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_intel_gdl_Window_CloseSurface
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_CloseSurface
   (JNIEnv *env, jobject obj, jlong display, jlong surface)
 {
     gdl_plane_id_t plane = (gdl_plane_id_t) (intptr_t) surface ;
@@ -348,7 +348,7 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_intel_gdl_Window_CloseSurface
     DBG_PRINT("[CloseSurface] plane %d\n", plane);
 }
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_intel_gdl_Window_SetBounds0
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_SetBounds0
   (JNIEnv *env, jobject obj, jlong surface, jint scr_width, jint scr_height, jint x, jint y, jint width, jint height) {
 
     gdl_plane_id_t plane = (gdl_plane_id_t) (intptr_t) surface ;
diff --git a/src/newt/native/KDWindow.c b/src/newt/native/KDWindow.c
index 6c7aa7731..31e8017f4 100755
--- a/src/newt/native/KDWindow.c
+++ b/src/newt/native/KDWindow.c
@@ -64,7 +64,7 @@
 #include <KD/kd.h>
 #include <KD/NV_extwindowprops.h>
 
-#include "com_sun_javafx_newt_opengl_kd_KDWindow.h"
+#include "com_jogamp_javafx_newt_opengl_kd_KDWindow.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -103,7 +103,7 @@ static jmethodID sendKeyEventID = NULL;
  * Display
  */
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_kd_KDDisplay_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDDisplay_DispatchMessages
   (JNIEnv *env, jobject obj)
 {
     const KDEvent * evt;
@@ -200,7 +200,7 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_kd_KDDisplay_DispatchMess
  * Window
  */
 
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_initIDs
   (JNIEnv *env, jclass clazz)
 {
 #ifdef VERBOSE_ON
@@ -228,7 +228,7 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_initIDs
     return JNI_TRUE;
 }
 
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_CreateWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_CreateWindow
   (JNIEnv *env, jobject obj, jlong display, jintArray jAttrs)
 {
     jint * attrs = NULL;
@@ -270,7 +270,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_CreateWindow
     return (jlong) (intptr_t) window;
 }
 
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_RealizeWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_RealizeWindow
   (JNIEnv *env, jobject obj, jlong window)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -285,7 +285,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_RealizeWindo
     return (jlong) (intptr_t) nativeWindow;
 }
 
-JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_CloseWindow
+JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_CloseWindow
   (JNIEnv *env, jobject obj, jlong window, jlong juserData)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -299,11 +299,11 @@ JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_CloseWindow
 }
 
 /*
- * Class:     com_sun_javafx_newt_opengl_kd_KDWindow
+ * Class:     com_jogamp_javafx_newt_opengl_kd_KDWindow
  * Method:    setVisible0
  * Signature: (JJZ)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_setVisible0
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setVisible0
   (JNIEnv *env, jobject obj, jlong window, jboolean visible)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -312,7 +312,7 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_setVisible0
     DBG_PRINT( "[setVisible] v=%d\n", visible);
 }
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_setFullScreen0
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setFullScreen0
   (JNIEnv *env, jobject obj, jlong window, jboolean fullscreen)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -323,7 +323,7 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_setFullScreen
     (void)res;
 }
 
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_opengl_kd_KDWindow_setSize0
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setSize0
   (JNIEnv *env, jobject obj, jlong window, jint width, jint height)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
diff --git a/src/newt/native/WindowsWindow.c b/src/newt/native/WindowsWindow.c
index 5445ca372..d39b96d0b 100755
--- a/src/newt/native/WindowsWindow.c
+++ b/src/newt/native/WindowsWindow.c
@@ -89,7 +89,7 @@
 #define MONITOR_DEFAULTTONEAREST 2
 #endif
 
-#include "com_sun_javafx_newt_windows_WindowsWindow.h"
+#include "com_jogamp_javafx_newt_windows_WindowsWindow.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -902,11 +902,11 @@ static LRESULT CALLBACK wndProc(HWND wnd, UINT message,
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsDisplay
+ * Class:     com_jogamp_javafx_newt_windows_WindowsDisplay
  * Method:    DispatchMessages
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsDisplay_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_DispatchMessages
   (JNIEnv *env, jclass clazz)
 {
     int i = 0;
@@ -925,11 +925,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsDisplay_DispatchM
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsDisplay
+ * Class:     com_jogamp_javafx_newt_windows_WindowsDisplay
  * Method:    LoadLibraryW
  * Signature: (Ljava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_windows_WindowsDisplay_LoadLibraryW
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_LoadLibraryW
   (JNIEnv *env, jclass clazz, jstring dllName)
 {
     jchar* _dllName = GetNullTerminatedStringChars(env, dllName);
@@ -939,11 +939,11 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_windows_WindowsDisplay_LoadLibr
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsDisplay
+ * Class:     com_jogamp_javafx_newt_windows_WindowsDisplay
  * Method:    RegisterWindowClass
  * Signature: (Ljava/lang/String;J)I
  */
-JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_windows_WindowsDisplay_RegisterWindowClass
+JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_RegisterWindowClass
   (JNIEnv *env, jclass clazz, jstring wndClassName, jlong hInstance)
 {
     ATOM res;
@@ -979,44 +979,44 @@ JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_windows_WindowsDisplay_RegisterW
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsDisplay
+ * Class:     com_jogamp_javafx_newt_windows_WindowsDisplay
  * Method:    CleanupWindowResources
  * Signature: (java/lang/String;J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsDisplay_UnregisterWindowClass
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_UnregisterWindowClass
   (JNIEnv *env, jclass clazz, jint wndClassAtom, jlong hInstance)
 {
     UnregisterClass(MAKEINTATOM(wndClassAtom), (HINSTANCE) (intptr_t) hInstance);
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsScreen
+ * Class:     com_jogamp_javafx_newt_windows_WindowsScreen
  * Method:    getWidthImpl
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_windows_WindowsScreen_getWidthImpl
+JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_windows_WindowsScreen_getWidthImpl
   (JNIEnv *env, jobject obj, jint scrn_idx)
 {
     return (jint)GetSystemMetrics(SM_CXSCREEN);
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsScreen
+ * Class:     com_jogamp_javafx_newt_windows_WindowsScreen
  * Method:    getWidthImpl
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_windows_WindowsScreen_getHeightImpl
+JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_windows_WindowsScreen_getHeightImpl
   (JNIEnv *env, jobject obj, jint scrn_idx)
 {
     return (jint)GetSystemMetrics(SM_CYSCREEN);
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_initIDs
   (JNIEnv *env, jclass clazz)
 {
     sizeChangedID = (*env)->GetMethodID(env, clazz, "sizeChanged", "(II)V");
@@ -1045,11 +1045,11 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_initID
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
  * Method:    CreateWindow
  * Signature: (JILjava/lang/String;JJZIIII)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_CreateWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_CreateWindow
   (JNIEnv *env, jobject obj, jlong parent, jint wndClassAtom, jstring jWndName, jlong hInstance, jlong visualID,
         jboolean bIsUndecorated,
         jint jx, jint jy, jint defaultWidth, jint defaultHeight)
@@ -1113,44 +1113,44 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_CreateWin
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
  * Method:    DestroyWindow
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_DestroyWindow
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_DestroyWindow
   (JNIEnv *env, jobject obj, jlong window)
 {
     DestroyWindow((HWND) (intptr_t) window);
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
  * Method:    GetDC
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_GetDC
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_GetDC
   (JNIEnv *env, jobject obj, jlong window)
 {
     return (jlong) (intptr_t) GetDC((HWND) (intptr_t) window);
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
  * Method:    ReleaseDC
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_ReleaseDC
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_ReleaseDC
   (JNIEnv *env, jobject obj, jlong window, jlong dc)
 {
     ReleaseDC((HWND) (intptr_t) window, (HDC) (intptr_t) dc);
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
  * Method:    MonitorFromWindow
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_MonitorFromWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_MonitorFromWindow
   (JNIEnv *env, jobject obj, jlong window)
 {
     #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410 || WINVER >= 0x0500) && !defined(_WIN32_WCE)
@@ -1161,11 +1161,11 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_MonitorFr
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
  * Method:    setVisible0
  * Signature: (JZ)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_setVisible0
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setVisible0
   (JNIEnv *_env, jclass clazz, jlong window, jboolean visible)
 {
     HWND hWnd = (HWND) (intptr_t) window;
@@ -1178,11 +1178,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_setVisible
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
  * Method:    setSize0
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_setSize0
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setSize0
   (JNIEnv *env, jobject obj, jlong parent, jlong window, jint x, jint y, jint width, jint height)
 {
     HWND hwndP = (HWND) (intptr_t) parent;
@@ -1215,11 +1215,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_setSize0
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
  * Method:    setPosition
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_setPosition
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setPosition
   (JNIEnv *env, jobject obj, jlong parent, jlong window, jint x, jint y)
 {
     UINT flags = SWP_NOACTIVATE | SWP_NOSIZE;
@@ -1236,11 +1236,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_setPositio
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
  * Method:    setFullscreen
  * Signature: (JIIIIZZ)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_setFullscreen0
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setFullscreen0
   (JNIEnv *env, jobject obj, jlong parent, jlong window, jint x, jint y, jint width, jint height, jboolean bIsUndecorated, jboolean on)
 {
     UINT flags;
@@ -1272,11 +1272,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_setFullscr
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
  * Method:    setTitle
  * Signature: (JLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_setTitle
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setTitle
   (JNIEnv *env, jclass clazz, jlong window, jstring title)
 {
     HWND hwnd = (HWND) (intptr_t) window;
@@ -1290,11 +1290,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_setTitle
 }
 
 /*
- * Class:     com_sun_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
  * Method:    requestFocus
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_requestFocus
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_requestFocus
   (JNIEnv *env, jclass clazz, jlong window)
 {
     HWND hwnd = (HWND) (intptr_t) window;
diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index b6b2bbe26..682184da0 100755
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -46,7 +46,7 @@
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
-#include "com_sun_javafx_newt_x11_X11Window.h"
+#include "com_jogamp_javafx_newt_x11_X11Window.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -154,7 +154,7 @@ static const char * const ClazzNameRuntimeException =
 static jclass    runtimeExceptionClz=NULL;
 
 static const char * const ClazzNameNewtWindow = 
-                            "com/sun/javafx/newt/Window";
+                            "com/jogamp/javafx/newt/Window";
 static jclass    newtWindowClz=NULL;
 
 static jmethodID windowChangedID = NULL;
@@ -187,11 +187,11 @@ static void _throwNewRuntimeException(Display * unlockDisplay, JNIEnv *env, cons
  */
 
 /*
- * Class:     com_sun_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_javafx_newt_x11_X11Display
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_x11_X11Display_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_initIDs
   (JNIEnv *env, jclass clazz)
 {
     jclass c;
@@ -237,11 +237,11 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_x11_X11Display_initIDs
 }
 
 /*
- * Class:     com_sun_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_javafx_newt_x11_X11Display
  * Method:    LockDisplay
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Display_LockDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_LockDisplay
   (JNIEnv *env, jobject obj, jlong display)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -253,11 +253,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Display_LockDisplay
 
 
 /*
- * Class:     com_sun_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_javafx_newt_x11_X11Display
  * Method:    UnlockDisplay
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Display_UnlockDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_UnlockDisplay
   (JNIEnv *env, jobject obj, jlong display)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -269,11 +269,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Display_UnlockDisplay
 
 
 /*
- * Class:     com_sun_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_javafx_newt_x11_X11Display
  * Method:    CompleteDisplay
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Display_CompleteDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_CompleteDisplay
   (JNIEnv *env, jobject obj, jlong display)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -381,11 +381,11 @@ static jobject getJavaWindowProperty(JNIEnv *env, Display *dpy, Window window, j
 }
 
 /*
- * Class:     com_sun_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_javafx_newt_x11_X11Display
  * Method:    DispatchMessages
  * Signature: (JIJJ)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Display_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_DispatchMessages
   (JNIEnv *env, jobject obj, jlong display, jlong javaObjectAtom, jlong wmDeleteAtom)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -532,11 +532,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Display_DispatchMessages
  */
 
 /*
- * Class:     com_sun_javafx_newt_x11_X11Screen
+ * Class:     com_jogamp_javafx_newt_x11_X11Screen
  * Method:    GetScreen
  * Signature: (JI)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_x11_X11Screen_GetScreen
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_GetScreen
   (JNIEnv *env, jobject obj, jlong display, jint screen_index)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -559,14 +559,14 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_x11_X11Screen_GetScreen
     return (jlong) (intptr_t) scrn;
 }
 
-JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_x11_X11Screen_getWidth0
+JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_getWidth0
   (JNIEnv *env, jobject obj, jlong display, jint scrn_idx)
 {
     Display * dpy = (Display *) (intptr_t) display;
     return (jint) XDisplayWidth( dpy, scrn_idx);
 }
 
-JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_x11_X11Screen_getHeight0
+JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_getHeight0
   (JNIEnv *env, jobject obj, jlong display, jint scrn_idx)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -579,11 +579,11 @@ JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_x11_X11Screen_getHeight0
  */
 
 /*
- * Class:     com_sun_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_javafx_newt_x11_X11Window
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_x11_X11Window_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_initIDs
   (JNIEnv *env, jclass clazz)
 {
     windowChangedID = (*env)->GetMethodID(env, clazz, "windowChanged", "(IIII)V");
@@ -605,11 +605,11 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_x11_X11Window_initIDs
 }
 
 /*
- * Class:     com_sun_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_javafx_newt_x11_X11Window
  * Method:    CreateWindow
  * Signature: (JJIJIIII)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_x11_X11Window_CreateWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_CreateWindow
   (JNIEnv *env, jobject obj, jlong parent, jlong display, jint screen_index, 
                              jlong visualID, 
                              jlong javaObjectAtom, jlong windowDeleteAtom, 
@@ -734,11 +734,11 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_x11_X11Window_CreateWindow
 }
 
 /*
- * Class:     com_sun_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_javafx_newt_x11_X11Window
  * Method:    CloseWindow
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Window_CloseWindow
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_CloseWindow
   (JNIEnv *env, jobject obj, jlong display, jlong window, jlong javaObjectAtom)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -779,11 +779,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Window_CloseWindow
 }
 
 /*
- * Class:     com_sun_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_javafx_newt_x11_X11Window
  * Method:    setVisible0
  * Signature: (JJZ)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Window_setVisible0
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setVisible0
   (JNIEnv *env, jobject obj, jlong display, jlong window, jboolean visible)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -823,11 +823,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Window_setVisible0
 #endif
 
 /*
- * Class:     com_sun_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_javafx_newt_x11_X11Window
  * Method:    setSize0
  * Signature: (JIJIIIIIZ)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Window_setSize0
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setSize0
   (JNIEnv *env, jobject obj, jlong jparent, jlong display, jint screen_index, jlong window, jint x, jint y, jint width, jint height, jint decorationToggle, jboolean setVisible)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -887,11 +887,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Window_setSize0
 }
 
 /*
- * Class:     com_sun_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_javafx_newt_x11_X11Window
  * Method:    setPosition0
  * Signature: (JJII)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_x11_X11Window_setPosition0
+JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setPosition0
   (JNIEnv *env, jobject obj, jlong display, jlong window, jint x, jint y)
 {
     Display * dpy = (Display *) (intptr_t) display;
-- 
cgit v1.2.3


From 2d6a05d512be1c8ba5e3a8c421c7305cc8b13570 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Mon, 29 Mar 2010 04:10:37 +0200
Subject: changes due to BufferFactory -> Buffers renaming in gluegen.

---
 make/config/jogl/glx-CustomJavaCode.java               |  4 ++--
 make/config/nativewindow/x11-CustomJavaCode.java       |  4 ++--
 .../opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/make/config/jogl/glx-CustomJavaCode.java b/make/config/jogl/glx-CustomJavaCode.java
index 56057377a..6ed31990e 100644
--- a/make/config/jogl/glx-CustomJavaCode.java
+++ b/make/config/jogl/glx-CustomJavaCode.java
@@ -20,7 +20,7 @@
     if(nitems != null && nitems.length <= nitems_offset)
       throw new GLException("array offset argument \"nitems_offset\" (" + nitems_offset + ") equals or exceeds array length (" + nitems.length + ")");
     java.nio.ByteBuffer _res;
-    _res = glXChooseFBConfigCopied1(dpy, screen, attribList, BufferFactory.SIZEOF_INT * attribList_offset, nitems, BufferFactory.SIZEOF_INT * nitems_offset);
+    _res = glXChooseFBConfigCopied1(dpy, screen, attribList, Buffers.SIZEOF_INT * attribList_offset, nitems, Buffers.SIZEOF_INT * nitems_offset);
 
     if (_res == null) return null;
     return PointerBuffer.wrap(_res);
@@ -35,7 +35,7 @@
     if(attribList != null && attribList.length <= attribList_offset)
       throw new GLException("array offset argument \"attribList_offset\" (" + attribList_offset + ") equals or exceeds array length (" + attribList.length + ")");
     java.nio.ByteBuffer _res;
-    _res = glXChooseVisualCopied1(dpy, screen, attribList, BufferFactory.SIZEOF_INT * attribList_offset);
+    _res = glXChooseVisualCopied1(dpy, screen, attribList, Buffers.SIZEOF_INT * attribList_offset);
 
     if (_res == null) return null;
     return XVisualInfo.create(_res);
diff --git a/make/config/nativewindow/x11-CustomJavaCode.java b/make/config/nativewindow/x11-CustomJavaCode.java
index b1ee3a6c3..5c269c6c8 100644
--- a/make/config/nativewindow/x11-CustomJavaCode.java
+++ b/make/config/nativewindow/x11-CustomJavaCode.java
@@ -5,10 +5,10 @@
     if(arg3 != null && arg3.length <= arg3_offset)
       throw new RuntimeException("array offset argument \"arg3_offset\" (" + arg3_offset + ") equals or exceeds array length (" + arg3.length + ")");
     java.nio.ByteBuffer _res;
-    _res = XGetVisualInfoCopied1(arg0, arg1, ((arg2 == null) ? null : arg2.getBuffer()), arg3, BufferFactory.SIZEOF_INT * arg3_offset);
+    _res = XGetVisualInfoCopied1(arg0, arg1, ((arg2 == null) ? null : arg2.getBuffer()), arg3, Buffers.SIZEOF_INT * arg3_offset);
 
     if (_res == null) return null;
-    BufferFactory.nativeOrder(_res);
+    Buffers.nativeOrder(_res);
     XVisualInfo[] _retarray = new XVisualInfo[getFirstElement(arg3, arg3_offset)];
     for (int _count = 0; _count < getFirstElement(arg3, arg3_offset); _count++) {
       _res.position(_count * XVisualInfo.size());
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
index c03ee8e30..6e5bd2eb2 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
@@ -7,7 +7,7 @@ package com.jogamp.opengl.util.glsl.fixedfunc.impl;
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
 import javax.media.opengl.glu.*;
-import com.jogamp.gluegen.runtime.BufferFactory;
+import com.jogamp.gluegen.runtime.Buffers;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.*;
 import java.nio.*;
@@ -206,8 +206,8 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
           if(gl.glIsVBOArrayEnabled()) {
             throw new GLException("VBO array is not disabled: "+array);
           }
-          BufferFactory.rangeCheck(array.getBuffer(), 1);
-          if (!BufferFactory.isDirect(array.getBuffer())) {
+          Buffers.rangeCheck(array.getBuffer(), 1);
+          if (!Buffers.isDirect(array.getBuffer())) {
             throw new GLException("Argument \"pointer\" was not a direct buffer"); }
       }
       fixedFunction.glVertexPointer(gl, array);
@@ -234,8 +234,8 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
           if(gl.glIsVBOArrayEnabled()) {
             throw new GLException("VBO array is not disabled: "+array);
           }
-          BufferFactory.rangeCheck(array.getBuffer(), 1);
-          if (!BufferFactory.isDirect(array.getBuffer())) {
+          Buffers.rangeCheck(array.getBuffer(), 1);
+          if (!Buffers.isDirect(array.getBuffer())) {
             throw new GLException("Argument \"pointer\" was not a direct buffer"); }
       }
       fixedFunction.glColorPointer(gl, array);
@@ -265,8 +265,8 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
           if(gl.glIsVBOArrayEnabled()) {
             throw new GLException("VBO array is not disabled: "+array);
           }
-          BufferFactory.rangeCheck(array.getBuffer(), 1);
-          if (!BufferFactory.isDirect(array.getBuffer())) {
+          Buffers.rangeCheck(array.getBuffer(), 1);
+          if (!Buffers.isDirect(array.getBuffer())) {
             throw new GLException("Argument \"pointer\" was not a direct buffer"); }
       }
       fixedFunction.glNormalPointer(gl, array);
@@ -293,8 +293,8 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
           if(gl.glIsVBOArrayEnabled()) {
             throw new GLException("VBO array is not disabled: "+array);
           }
-          BufferFactory.rangeCheck(array.getBuffer(), 1);
-          if (!BufferFactory.isDirect(array.getBuffer())) {
+          Buffers.rangeCheck(array.getBuffer(), 1);
+          if (!Buffers.isDirect(array.getBuffer())) {
             throw new GLException("Argument \"pointer\" was not a direct buffer"); }
       }
       fixedFunction.glTexCoordPointer(gl, array);
-- 
cgit v1.2.3


From 2d57c25287542dcbad59c6b4782e87f86bd0fbc6 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Mon, 29 Mar 2010 04:40:53 +0200
Subject: moved com.jogamp.javafx.* to com.jogamp.*.

---
 doc/wiki/FAQ.xml                                   |   6 +-
 doxygen/doxygen-all-pub.cfg                        |   2 +-
 make/build-jogl.xml                                |  10 +-
 make/build-newt.xml                                |  40 +-
 make/build.xml                                     |   6 +-
 make/newtRIversion                                 |   2 +-
 make/newtRIversion-cdc                             |   2 +-
 make/newtversion                                   |   2 +-
 make/newtversion-cdc                               |   2 +-
 .../com/jogamp/audio/windows/waveout/Audio.java    |  66 ++
 .../com/jogamp/audio/windows/waveout/Mixer.java    | 362 ++++++++
 .../jogamp/audio/windows/waveout/SoundBuffer.java  | 124 +++
 .../audio/windows/waveout/TestSpatialization.java  |  89 ++
 .../com/jogamp/audio/windows/waveout/Track.java    | 206 +++++
 .../com/jogamp/audio/windows/waveout/Vec3f.java    | 212 +++++
 .../jogamp/javafx/audio/windows/waveout/Audio.java |  66 --
 .../jogamp/javafx/audio/windows/waveout/Mixer.java | 362 --------
 .../javafx/audio/windows/waveout/SoundBuffer.java  | 124 ---
 .../audio/windows/waveout/TestSpatialization.java  |  89 --
 .../jogamp/javafx/audio/windows/waveout/Track.java | 206 -----
 .../jogamp/javafx/audio/windows/waveout/Vec3f.java | 212 -----
 src/jogl/native/audio/Mixer.cpp                    |  26 +-
 .../native/openmax/com_sun_openmax_OMXInstance.c   |   6 +-
 .../classes/javax/media/nativewindow/package.html  |   2 +-
 .../classes/com/jogamp/javafx/newt/Display.java    | 276 ------
 src/newt/classes/com/jogamp/javafx/newt/Event.java |  86 --
 .../com/jogamp/javafx/newt/EventListener.java      |  44 -
 .../classes/com/jogamp/javafx/newt/InputEvent.java |  97 ---
 .../classes/com/jogamp/javafx/newt/Insets.java     | 105 ---
 .../classes/com/jogamp/javafx/newt/KeyEvent.java   | 738 ----------------
 .../com/jogamp/javafx/newt/KeyListener.java        |  42 -
 .../classes/com/jogamp/javafx/newt/MouseEvent.java | 110 ---
 .../com/jogamp/javafx/newt/MouseListener.java      |  47 --
 .../com/jogamp/javafx/newt/NewtFactory.java        | 181 ----
 .../com/jogamp/javafx/newt/OffscreenWindow.java    | 108 ---
 .../classes/com/jogamp/javafx/newt/PaintEvent.java |  74 --
 .../com/jogamp/javafx/newt/PaintListener.java      |  42 -
 .../classes/com/jogamp/javafx/newt/Screen.java     | 147 ----
 .../classes/com/jogamp/javafx/newt/Window.java     | 929 ---------------------
 .../com/jogamp/javafx/newt/WindowEvent.java        |  67 --
 .../com/jogamp/javafx/newt/WindowListener.java     |  42 -
 .../com/jogamp/javafx/newt/awt/AWTCanvas.java      | 264 ------
 .../com/jogamp/javafx/newt/awt/AWTDisplay.java     | 168 ----
 .../com/jogamp/javafx/newt/awt/AWTScreen.java      |  65 --
 .../com/jogamp/javafx/newt/awt/AWTWindow.java      | 429 ----------
 .../classes/com/jogamp/javafx/newt/impl/Debug.java | 140 ----
 .../jogamp/javafx/newt/impl/NativeLibLoader.java   |  62 --
 .../com/jogamp/javafx/newt/intel/gdl/Display.java  | 104 ---
 .../com/jogamp/javafx/newt/intel/gdl/Screen.java   |  68 --
 .../com/jogamp/javafx/newt/intel/gdl/Window.java   | 179 ----
 .../com/jogamp/javafx/newt/macosx/MacDisplay.java  |  82 --
 .../com/jogamp/javafx/newt/macosx/MacScreen.java   |  56 --
 .../com/jogamp/javafx/newt/macosx/MacWindow.java   | 600 -------------
 .../com/jogamp/javafx/newt/opengl/GLWindow.java    | 628 --------------
 .../javafx/newt/opengl/broadcom/egl/Display.java   |  81 --
 .../javafx/newt/opengl/broadcom/egl/Screen.java    |  63 --
 .../javafx/newt/opengl/broadcom/egl/Window.java    | 156 ----
 .../jogamp/javafx/newt/opengl/kd/KDDisplay.java    |  84 --
 .../com/jogamp/javafx/newt/opengl/kd/KDScreen.java |  57 --
 .../com/jogamp/javafx/newt/opengl/kd/KDWindow.java | 153 ----
 .../javafx/newt/util/EventDispatchThread.java      | 240 ------
 .../com/jogamp/javafx/newt/util/MainThread.java    | 307 -------
 .../jogamp/javafx/newt/windows/WindowsDisplay.java | 105 ---
 .../jogamp/javafx/newt/windows/WindowsScreen.java  |  58 --
 .../jogamp/javafx/newt/windows/WindowsWindow.java  | 289 -------
 .../com/jogamp/javafx/newt/x11/X11Display.java     | 120 ---
 .../com/jogamp/javafx/newt/x11/X11Screen.java      |  71 --
 .../com/jogamp/javafx/newt/x11/X11Window.java      | 203 -----
 src/newt/classes/com/jogamp/newt/Display.java      | 276 ++++++
 src/newt/classes/com/jogamp/newt/Event.java        |  86 ++
 .../classes/com/jogamp/newt/EventListener.java     |  44 +
 src/newt/classes/com/jogamp/newt/InputEvent.java   |  97 +++
 src/newt/classes/com/jogamp/newt/Insets.java       | 105 +++
 src/newt/classes/com/jogamp/newt/KeyEvent.java     | 738 ++++++++++++++++
 src/newt/classes/com/jogamp/newt/KeyListener.java  |  42 +
 src/newt/classes/com/jogamp/newt/MouseEvent.java   | 110 +++
 .../classes/com/jogamp/newt/MouseListener.java     |  47 ++
 src/newt/classes/com/jogamp/newt/NewtFactory.java  | 181 ++++
 .../classes/com/jogamp/newt/OffscreenWindow.java   | 108 +++
 src/newt/classes/com/jogamp/newt/PaintEvent.java   |  74 ++
 .../classes/com/jogamp/newt/PaintListener.java     |  42 +
 src/newt/classes/com/jogamp/newt/Screen.java       | 147 ++++
 src/newt/classes/com/jogamp/newt/Window.java       | 929 +++++++++++++++++++++
 src/newt/classes/com/jogamp/newt/WindowEvent.java  |  67 ++
 .../classes/com/jogamp/newt/WindowListener.java    |  42 +
 .../classes/com/jogamp/newt/awt/AWTCanvas.java     | 264 ++++++
 .../classes/com/jogamp/newt/awt/AWTDisplay.java    | 168 ++++
 .../classes/com/jogamp/newt/awt/AWTScreen.java     |  65 ++
 .../classes/com/jogamp/newt/awt/AWTWindow.java     | 429 ++++++++++
 src/newt/classes/com/jogamp/newt/impl/Debug.java   | 140 ++++
 .../com/jogamp/newt/impl/NativeLibLoader.java      |  62 ++
 .../classes/com/jogamp/newt/intel/gdl/Display.java | 104 +++
 .../classes/com/jogamp/newt/intel/gdl/Screen.java  |  68 ++
 .../classes/com/jogamp/newt/intel/gdl/Window.java  | 179 ++++
 .../classes/com/jogamp/newt/macosx/MacDisplay.java |  82 ++
 .../classes/com/jogamp/newt/macosx/MacScreen.java  |  56 ++
 .../classes/com/jogamp/newt/macosx/MacWindow.java  | 600 +++++++++++++
 .../classes/com/jogamp/newt/opengl/GLWindow.java   | 628 ++++++++++++++
 .../jogamp/newt/opengl/broadcom/egl/Display.java   |  81 ++
 .../jogamp/newt/opengl/broadcom/egl/Screen.java    |  62 ++
 .../jogamp/newt/opengl/broadcom/egl/Window.java    | 154 ++++
 .../com/jogamp/newt/opengl/kd/KDDisplay.java       |  84 ++
 .../com/jogamp/newt/opengl/kd/KDScreen.java        |  57 ++
 .../com/jogamp/newt/opengl/kd/KDWindow.java        | 153 ++++
 .../com/jogamp/newt/util/EventDispatchThread.java  | 240 ++++++
 .../classes/com/jogamp/newt/util/MainThread.java   | 307 +++++++
 .../com/jogamp/newt/windows/WindowsDisplay.java    | 105 +++
 .../com/jogamp/newt/windows/WindowsScreen.java     |  57 ++
 .../com/jogamp/newt/windows/WindowsWindow.java     | 289 +++++++
 .../classes/com/jogamp/newt/x11/X11Display.java    | 120 +++
 .../classes/com/jogamp/newt/x11/X11Screen.java     |  69 ++
 .../classes/com/jogamp/newt/x11/X11Window.java     | 202 +++++
 src/newt/native/BroadcomEGL.c                      |  16 +-
 src/newt/native/IntelGDL.c                         |  24 +-
 src/newt/native/KDWindow.c                         |  20 +-
 src/newt/native/MacWindow.m                        |  62 +-
 src/newt/native/WindowsWindow.c                    |  74 +-
 src/newt/native/X11Window.c                        |  56 +-
 118 files changed, 9198 insertions(+), 9205 deletions(-)
 create mode 100755 src/jogl/classes/com/jogamp/audio/windows/waveout/Audio.java
 create mode 100755 src/jogl/classes/com/jogamp/audio/windows/waveout/Mixer.java
 create mode 100755 src/jogl/classes/com/jogamp/audio/windows/waveout/SoundBuffer.java
 create mode 100755 src/jogl/classes/com/jogamp/audio/windows/waveout/TestSpatialization.java
 create mode 100755 src/jogl/classes/com/jogamp/audio/windows/waveout/Track.java
 create mode 100755 src/jogl/classes/com/jogamp/audio/windows/waveout/Vec3f.java
 delete mode 100755 src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Audio.java
 delete mode 100755 src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Mixer.java
 delete mode 100755 src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/SoundBuffer.java
 delete mode 100755 src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java
 delete mode 100755 src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Track.java
 delete mode 100755 src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Vec3f.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/Display.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/Event.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/EventListener.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/InputEvent.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/Insets.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/KeyEvent.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/KeyListener.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/MouseEvent.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/MouseListener.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/NewtFactory.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/OffscreenWindow.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/PaintEvent.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/PaintListener.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/Screen.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/Window.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/WindowEvent.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/WindowListener.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/awt/AWTCanvas.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/awt/AWTDisplay.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/awt/AWTScreen.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/awt/AWTWindow.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/impl/Debug.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/impl/NativeLibLoader.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Display.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Screen.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Window.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/macosx/MacDisplay.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/macosx/MacScreen.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/macosx/MacWindow.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/opengl/GLWindow.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Display.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Screen.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Window.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDDisplay.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDScreen.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDWindow.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/util/EventDispatchThread.java
 delete mode 100644 src/newt/classes/com/jogamp/javafx/newt/util/MainThread.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/windows/WindowsDisplay.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/windows/WindowsScreen.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/windows/WindowsWindow.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/x11/X11Display.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/x11/X11Screen.java
 delete mode 100755 src/newt/classes/com/jogamp/javafx/newt/x11/X11Window.java
 create mode 100755 src/newt/classes/com/jogamp/newt/Display.java
 create mode 100644 src/newt/classes/com/jogamp/newt/Event.java
 create mode 100644 src/newt/classes/com/jogamp/newt/EventListener.java
 create mode 100644 src/newt/classes/com/jogamp/newt/InputEvent.java
 create mode 100644 src/newt/classes/com/jogamp/newt/Insets.java
 create mode 100644 src/newt/classes/com/jogamp/newt/KeyEvent.java
 create mode 100644 src/newt/classes/com/jogamp/newt/KeyListener.java
 create mode 100644 src/newt/classes/com/jogamp/newt/MouseEvent.java
 create mode 100644 src/newt/classes/com/jogamp/newt/MouseListener.java
 create mode 100755 src/newt/classes/com/jogamp/newt/NewtFactory.java
 create mode 100644 src/newt/classes/com/jogamp/newt/OffscreenWindow.java
 create mode 100755 src/newt/classes/com/jogamp/newt/PaintEvent.java
 create mode 100755 src/newt/classes/com/jogamp/newt/PaintListener.java
 create mode 100755 src/newt/classes/com/jogamp/newt/Screen.java
 create mode 100755 src/newt/classes/com/jogamp/newt/Window.java
 create mode 100644 src/newt/classes/com/jogamp/newt/WindowEvent.java
 create mode 100644 src/newt/classes/com/jogamp/newt/WindowListener.java
 create mode 100644 src/newt/classes/com/jogamp/newt/awt/AWTCanvas.java
 create mode 100644 src/newt/classes/com/jogamp/newt/awt/AWTDisplay.java
 create mode 100644 src/newt/classes/com/jogamp/newt/awt/AWTScreen.java
 create mode 100644 src/newt/classes/com/jogamp/newt/awt/AWTWindow.java
 create mode 100644 src/newt/classes/com/jogamp/newt/impl/Debug.java
 create mode 100644 src/newt/classes/com/jogamp/newt/impl/NativeLibLoader.java
 create mode 100644 src/newt/classes/com/jogamp/newt/intel/gdl/Display.java
 create mode 100644 src/newt/classes/com/jogamp/newt/intel/gdl/Screen.java
 create mode 100644 src/newt/classes/com/jogamp/newt/intel/gdl/Window.java
 create mode 100755 src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java
 create mode 100755 src/newt/classes/com/jogamp/newt/macosx/MacScreen.java
 create mode 100755 src/newt/classes/com/jogamp/newt/macosx/MacWindow.java
 create mode 100644 src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
 create mode 100644 src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java
 create mode 100755 src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Screen.java
 create mode 100755 src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Window.java
 create mode 100755 src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java
 create mode 100755 src/newt/classes/com/jogamp/newt/opengl/kd/KDScreen.java
 create mode 100755 src/newt/classes/com/jogamp/newt/opengl/kd/KDWindow.java
 create mode 100644 src/newt/classes/com/jogamp/newt/util/EventDispatchThread.java
 create mode 100644 src/newt/classes/com/jogamp/newt/util/MainThread.java
 create mode 100755 src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java
 create mode 100755 src/newt/classes/com/jogamp/newt/windows/WindowsScreen.java
 create mode 100755 src/newt/classes/com/jogamp/newt/windows/WindowsWindow.java
 create mode 100755 src/newt/classes/com/jogamp/newt/x11/X11Display.java
 create mode 100755 src/newt/classes/com/jogamp/newt/x11/X11Screen.java
 create mode 100755 src/newt/classes/com/jogamp/newt/x11/X11Window.java

diff --git a/doc/wiki/FAQ.xml b/doc/wiki/FAQ.xml
index 9c14bc7ce..d01413d50 100644
--- a/doc/wiki/FAQ.xml
+++ b/doc/wiki/FAQ.xml
@@ -289,13 +289,13 @@ Below you see the invocation of the ES2 RedSquare jogl-demos utilizing multiple
 * Single thread (Unix, Win32) <pre>java -Djava.awt.headless=true demos.es2.RedSquare -GL2</pre>
 * Single thread (MacOSX) <pre>java -XstartOnFirstThread -Djava.awt.headless=true demos.es2.RedSquare -GL2</pre>
 * Multiple threads & windows (Unix, Win32) <pre>java -Djava.awt.headless=true demos.es2.RedSquare -GL2 -GL2 -GL2 -GL2</pre>
-* Multiple threads & windows (MacOSX) <pre>java -XstartOnFirstThread -Djava.awt.headless=true com.jogamp.javafx.newt.util.MainThread demos.es2.RedSquare -GL2 -GL2 -GL2 -GL2</pre>
+* Multiple threads & windows (MacOSX) <pre>java -XstartOnFirstThread -Djava.awt.headless=true com.jogamp.newt.util.MainThread demos.es2.RedSquare -GL2 -GL2 -GL2 -GL2</pre>
 
-The serialization of the main Java class through ''com.jogamp.javafx.newt.util.MainThread''
+The serialization of the main Java class through ''com.jogamp.newt.util.MainThread''
 may be used for all platforms, since it only takes effect on ''MacOSX''.
 This allows you an almost platform independent invocation of your multithreaded Java applications.
 
-On ''MacOSX'', ''com.jogamp.javafx.newt.util.MainThread'' will occupy the main thread and
+On ''MacOSX'', ''com.jogamp.newt.util.MainThread'' will occupy the main thread and
 serializes all native window related tasks through it.
 This mechanism is thread safe utilizes reentrant locking.
 
diff --git a/doxygen/doxygen-all-pub.cfg b/doxygen/doxygen-all-pub.cfg
index a7f4711df..a94c49fb0 100644
--- a/doxygen/doxygen-all-pub.cfg
+++ b/doxygen/doxygen-all-pub.cfg
@@ -462,7 +462,7 @@ WARN_LOGFILE           =
 INPUT                 = ../src/jogl/classes/javax
 INPUT                += ../build-x86_64/jogl/gensrc/classes/javax
 INPUT                += ../src/jogl/classes/com/jogamp/opengl/util
-INPUT                += ../src/newt/classes/com/jogamp/javafx/newt
+INPUT                += ../src/newt/classes/com/jogamp/newt
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index c3bc96bd8..4a0bac4d5 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -191,10 +191,10 @@
         </condition>
 
         <property name="java.excludes.javadoc.packagenames"
-                  value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.javafx.audio.windows.waveout.TestSpatialization"/>
+                  value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
 
         <property name="java.excludes.fixme" 
-                  value="com/jogamp/opengl/impl/gl2/fixme/** com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java" />
+                  value="com/jogamp/opengl/impl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" />
 
         <property name="java.excludes.cdcfp"
                   value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gl2} ${java.part.gl2.dbg} ${java.part.gl3} ${java.part.gl3.dbg} ${java.part.awt} ${java.part.glugl2} ${java.part.util.awt} ${java.part.util.gl2} com/jogamp/opengl/util/TGAWriter.java"/>
@@ -1590,7 +1590,7 @@
     <target name="c.build.jogl.prepare" depends="c.build.jogl.prepare.openMAX">
       <!-- Generate the waveout Mixer header -->
       <!-- FIXME: this is temporary until we move this to another workspace -->
-      <!--javah destdir="${build}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.javafx.audio.windows.waveout.Mixer" /-->
+      <!--javah destdir="${build}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.audio.windows.waveout.Mixer" /-->
     </target>
 
     <target name="c.build.jogl.gl2" unless="setup.nodesktop">
@@ -1826,7 +1826,7 @@
                 <include name="com/jogamp/opengl/**" />
                 <include name="${java.part.openmax}" />
                 <!-- FIXME: this is temporary until we move these classes to another workspace -->
-                <include name="com/jogamp/javafx/**" />
+                <include name="com/jogamp/**" />
             </fileset>
             <fileset dir="${src.java}"
                      includes="${java.part.util.fixedfuncemu.shadercode}"/>
@@ -1835,7 +1835,7 @@
     <target name="build-jars-all-noawt" depends="setup-manifestfile">
         <jar manifest="${build}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true">
             <fileset dir="${classes}"
-                includes="javax/media/opengl/** com/jogamp/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/jogamp/javafx/**"
+                includes="javax/media/opengl/** com/jogamp/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/jogamp/**"
                 excludes="${java.part.awt} ${java.part.util.awt}">
             </fileset>
             <fileset dir="${src.java}"
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 0bbcf2ccd..eddbf609f 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -108,25 +108,25 @@
         <!-- partitioning -->
 
         <property name="java.part.core"
-                  value="com/jogamp/javafx/newt/*, com/jogamp/javafx/newt/util/*, com/jogamp/javafx/newt/impl/*, com/jogamp/javafx/newt/intel/gdl/*"/>
+                  value="com/jogamp/newt/*, com/jogamp/newt/util/*, com/jogamp/newt/impl/*, com/jogamp/newt/intel/gdl/*"/>
 
         <property name="java.part.x11"
-                  value="com/jogamp/javafx/newt/x11/*"/>
+                  value="com/jogamp/newt/x11/*"/>
 
         <property name="java.part.windows"
-                  value="com/jogamp/javafx/newt/windows/*"/>
+                  value="com/jogamp/newt/windows/*"/>
 
         <property name="java.part.macosx"
-                  value="com/jogamp/javafx/newt/macosx/*"/>
+                  value="com/jogamp/newt/macosx/*"/>
 
         <property name="java.part.opengl"
-                  value="com/jogamp/javafx/newt/opengl/*, com/jogamp/javafx/newt/opengl/kd/*"/>
+                  value="com/jogamp/newt/opengl/*, com/jogamp/newt/opengl/kd/*"/>
 
         <property name="java.part.broadcomegl"
-                  value="com/jogamp/javafx/newt/opengl/broadcom/egl/*"/>
+                  value="com/jogamp/newt/opengl/broadcom/egl/*"/>
 
         <property name="java.part.awt"
-                  value="com/jogamp/javafx/newt/awt/*"/>
+                  value="com/jogamp/newt/awt/*"/>
 
         <!-- condition excludes -->
 
@@ -279,11 +279,11 @@
         <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
         <property name="javadoc.windowtitle" value="NEWT API -- ${newt_base_version} Specification" />
         <property name="javadoc.overview" value="spec-overview.html" />
-        <property name="javadoc.spec.packagenames" value="com.jogamp.javafx.newt, com.jogamp.javafx.newt.opengl" />
+        <property name="javadoc.spec.packagenames" value="com.jogamp.newt, com.jogamp.newt.opengl" />
 
         <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
 
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.javafx.newt.*" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.newt.*" />
     <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
     </target>
 
@@ -596,23 +596,23 @@
     </macrodef>
 
     <target name="c.build.newt.prepare.KD" if="useKD">
-      <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="com.jogamp.javafx.newt.opengl.kd.KDWindow" />
+      <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="com.jogamp.newt.opengl.kd.KDWindow" />
     </target>
 
     <target name="c.build.newt.prepare.IntelGDL" if="useIntelGDL">
-      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.javafx.newt.intel.gdl.Display" />
-      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.javafx.newt.intel.gdl.Screen" />
-      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.javafx.newt.intel.gdl.Window" />
+      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.newt.intel.gdl.Display" />
+      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.newt.intel.gdl.Screen" />
+      <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.newt.intel.gdl.Window" />
     </target>
 
     <target name="c.build.newt.prepare.BroadcomEGL" if="useBroadcomEGL">
-      <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="com.jogamp.javafx.newt.opengl.broadcom.egl.Window" />
+      <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="com.jogamp.newt.opengl.broadcom.egl.Window" />
     </target>
 
     <target name="c.build.newt.prepare.desktop" unless="setup.nodesktop">
-      <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="com.jogamp.javafx.newt.windows.WindowsWindow" />
-      <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="com.jogamp.javafx.newt.macosx.MacWindow" />
-      <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.jogamp.javafx.newt.x11.X11Window" />
+      <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="com.jogamp.newt.windows.WindowsWindow" />
+      <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="com.jogamp.newt.macosx.MacWindow" />
+      <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.jogamp.newt.x11.X11Window" />
     </target>
 
     <target name="c.build.newt.prepare" depends="c.build.newt.prepare.KD,c.build.newt.prepare.IntelGDL,c.build.newt.prepare.BroadcomEGL,c.build.newt.prepare.desktop" />
@@ -759,14 +759,14 @@
     <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noall">
         <jar manifest="tempversion" destfile="${newt.all.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="com/jogamp/javafx/newt/**" />
+                     includes="com/jogamp/newt/**" />
         </jar>
     </target>
 
     <target name="build-jars-all-noawt" depends="setup-manifestfile">
         <jar manifest="tempversion" destfile="${newt.all-noawt.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="com/jogamp/javafx/newt/**"
+                     includes="com/jogamp/newt/**"
                      excludes="${java.part.awt}" />
         </jar>
     </target>
@@ -774,7 +774,7 @@
     <target name="build-jars-all-cdc" depends="setup-manifestfile-cdc">
         <jar manifest="tempversion-cdc" destfile="${newt.all.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
-                     includes="com/jogamp/javafx/newt/**"
+                     includes="com/jogamp/newt/**"
                      excludes="${java.excludes.cdcfp}" />
         </jar>
     </target>
diff --git a/make/build.xml b/make/build.xml
index e73235cac..54b6a8e67 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -43,12 +43,12 @@
         <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" />
 
         <property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" />
-        <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames},${javadoc.spec.packagenames},com.jogamp.opengl.util.*,com.jogamp.javafx.newt, com.jogamp.javafx.newt.opengl" />
+        <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames},${javadoc.spec.packagenames},com.jogamp.opengl.util.*,com.jogamp.newt, com.jogamp.newt.opengl" />
 
         <property name="javadoc.dev" value="${project.root}/javadoc_dev" />
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.jogamp.nativewindow.impl.*,com.jogamp.javafx.newt.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.jogamp.nativewindow.impl.*,com.jogamp.newt.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
 
-        <property name="java.excludes.javadoc.packagenames" value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.javafx.audio.windows.waveout.TestSpatialization"/>
+        <property name="java.excludes.javadoc.packagenames" value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
         <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
 
         <property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" />
diff --git a/make/newtRIversion b/make/newtRIversion
index 7b8608290..82cc0c0e9 100644
--- a/make/newtRIversion
+++ b/make/newtRIversion
@@ -4,5 +4,5 @@ Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: NEWT Runtime Environment
 Implementation-Version: @BASEVERSION@
 Implementation-Vendor: Sun Microsystems, Inc.
-Extension-Name: com.sun.javafx.newt
+Extension-Name: com.sun.newt
 Implementation-Vendor-Id: com.sun
diff --git a/make/newtRIversion-cdc b/make/newtRIversion-cdc
index 0dd17ee93..5dcfecad8 100644
--- a/make/newtRIversion-cdc
+++ b/make/newtRIversion-cdc
@@ -4,5 +4,5 @@ Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: NEWT Runtime Environment CDC
 Implementation-Version: @BASEVERSION@
 Implementation-Vendor: Sun Microsystems, Inc.
-Extension-Name: com.sun.javafx.newt
+Extension-Name: com.sun.newt
 Implementation-Vendor-Id: com.sun
diff --git a/make/newtversion b/make/newtversion
index 3c9335cf5..d1734f756 100644
--- a/make/newtversion
+++ b/make/newtversion
@@ -4,5 +4,5 @@ Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: NEWT Runtime Environment
 Implementation-Version: @VERSION@
 Implementation-Vendor: java.net JOGL community
-Extension-Name: com.sun.javafx.newt
+Extension-Name: com.sun.newt
 Implementation-Vendor-Id: com.sun
diff --git a/make/newtversion-cdc b/make/newtversion-cdc
index 624111760..8227a4d42 100644
--- a/make/newtversion-cdc
+++ b/make/newtversion-cdc
@@ -4,5 +4,5 @@ Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: NEWT Runtime Environment CDC
 Implementation-Version: @VERSION@
 Implementation-Vendor: java.net JOGL community
-Extension-Name: com.sun.javafx.newt
+Extension-Name: com.sun.newt
 Implementation-Vendor-Id: com.sun
diff --git a/src/jogl/classes/com/jogamp/audio/windows/waveout/Audio.java b/src/jogl/classes/com/jogamp/audio/windows/waveout/Audio.java
new file mode 100755
index 000000000..2b51be164
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/audio/windows/waveout/Audio.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.audio.windows.waveout;
+
+import java.io.*;
+
+public class Audio {
+    private static Audio instance = null;
+    private Mixer mixer;
+
+    public synchronized static Audio getInstance() {
+        if (instance == null) {
+            instance = new Audio();
+        }
+        return instance;
+    }
+
+    private Audio() {
+        mixer = Mixer.getMixer();
+    }
+
+    public Mixer getMixer() {
+        return mixer;
+    }
+
+    public Track newTrack(File file) throws IOException
+    {
+        Track res = new Track(file);
+        mixer.add(res);
+        return res;
+    }
+
+    public void shutdown() {
+        mixer.shutdown();
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/audio/windows/waveout/Mixer.java b/src/jogl/classes/com/jogamp/audio/windows/waveout/Mixer.java
new file mode 100755
index 000000000..60972873e
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/audio/windows/waveout/Mixer.java
@@ -0,0 +1,362 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.audio.windows.waveout;
+
+import java.io.*;
+import java.nio.*;
+import java.util.*;
+
+// Needed only for NIO workarounds on CVM
+import java.lang.reflect.*;
+
+public class Mixer {
+    // This class is a singleton
+    private static Mixer mixer;
+
+    private volatile boolean shutdown;
+    private volatile Object shutdownLock = new Object();
+    private volatile boolean shutdownDone;
+
+    // Windows Event object
+    private long event;
+
+    private volatile ArrayList/*<Track>*/ tracks = new ArrayList();
+
+    private Vec3f leftSpeakerPosition  = new Vec3f(-1, 0, 0);
+    private Vec3f rightSpeakerPosition = new Vec3f( 1, 0, 0);
+
+    private float falloffFactor = 1.0f;
+
+    static {
+        mixer = new Mixer();
+    }
+
+    private Mixer() {
+        event = CreateEvent();
+        new FillerThread().start();
+        MixerThread m = new MixerThread();
+        m.setPriority(Thread.MAX_PRIORITY - 1);
+        m.start();
+    }
+
+    public static Mixer getMixer() {
+        return mixer;
+    }
+
+    synchronized void add(Track track) {
+        ArrayList/*<Track>*/ newTracks = (ArrayList) tracks.clone();
+        newTracks.add(track);
+        tracks = newTracks;
+    }
+
+    synchronized void remove(Track track) {
+        ArrayList/*<Track>*/ newTracks = (ArrayList) tracks.clone();
+        newTracks.remove(track);
+        tracks = newTracks;
+    }
+
+    // NOTE: due to a bug on the APX device, we only have mono sounds,
+    // so we currently only pay attention to the position of the left
+    // speaker
+    public void setLeftSpeakerPosition(float x, float y, float z) {
+        leftSpeakerPosition.set(x, y, z);
+    }
+
+    // NOTE: due to a bug on the APX device, we only have mono sounds,
+    // so we currently only pay attention to the position of the left
+    // speaker
+    public void setRightSpeakerPosition(float x, float y, float z) {
+        rightSpeakerPosition.set(x, y, z);
+    }
+
+    /** This defines a scale factor of sorts -- the higher the number,
+        the larger an area the sound will affect. Default value is
+        1.0f. Valid values are [1.0f, ...]. The formula for the gain
+        for each channel is
+<PRE>
+     falloffFactor
+  -------------------
+  falloffFactor + r^2
+</PRE>
+*/
+    public void setFalloffFactor(float factor) {
+        falloffFactor = factor;
+    }
+
+    public void shutdown() {
+        synchronized(shutdownLock) {
+            shutdown = true;
+            SetEvent(event);
+            try {
+                shutdownLock.wait();
+            } catch (InterruptedException e) {
+            }
+        }
+    }
+
+    class FillerThread extends Thread {
+        FillerThread() {
+            super("Mixer Thread");
+        }
+
+        public void run() {
+            while (!shutdown) {
+                List/*<Track>*/ curTracks = tracks;
+
+                for (Iterator iter = curTracks.iterator(); iter.hasNext(); ) {
+                    Track track = (Track) iter.next();
+                    try {
+                        track.fill();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        remove(track);
+                    }
+                }
+
+                try {
+                    // Run ten times per second
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    class MixerThread extends Thread {
+        // Temporary mixing buffer
+        // Interleaved left and right channels
+        float[] mixingBuffer;
+        private Vec3f temp = new Vec3f();
+
+        MixerThread() {
+            super("Mixer Thread");
+            if (!initializeWaveOut(event)) {
+                throw new InternalError("Error initializing waveout device");
+            }
+        }
+
+        public void run() {
+            while (!shutdown) {
+                // Get the next buffer
+                long mixerBuffer = getNextMixerBuffer();
+                if (mixerBuffer != 0) {
+                    ByteBuffer buf = getMixerBufferData(mixerBuffer);
+
+                    if (buf == null) {
+                        // This is happening on CVM because
+                        // JNI_NewDirectByteBuffer isn't implemented
+                        // by default and isn't compatible with the
+                        // JSR-239 NIO implementation (apparently)
+                        buf = newDirectByteBuffer(getMixerBufferDataAddress(mixerBuffer),
+                                                  getMixerBufferDataCapacity(mixerBuffer));
+                    }
+
+                    if (buf == null) {
+                        throw new InternalError("Couldn't wrap the native address with a direct byte buffer");
+                    }
+
+                    // System.out.println("Mixing buffer");
+
+                    // If we don't have enough samples in our mixing buffer, expand it
+                    // FIXME: knowledge of native output rendering format
+                    if ((mixingBuffer == null) || (mixingBuffer.length < (buf.capacity() / 2 /* bytes / sample */))) {
+                        mixingBuffer = new float[buf.capacity() / 2];
+                    } else {
+                        // Zap it
+                        for (int i = 0; i < mixingBuffer.length; i++) {
+                            mixingBuffer[i] = 0.0f;
+                        }
+                    }
+
+                    // This assertion should be in place if we have stereo
+                    if ((mixingBuffer.length % 2) != 0) {
+                        String msg = "FATAL ERROR: odd number of samples in the mixing buffer";
+                        System.out.println(msg);
+                        throw new InternalError(msg);
+                    }
+
+                    // Run down all of the registered tracks mixing them in
+                    List/*<Track>*/ curTracks = tracks;
+
+                    for (Iterator iter = curTracks.iterator(); iter.hasNext(); ) {
+                        Track track = (Track) iter.next();
+                        // Consider only playing tracks
+                        if (track.isPlaying()) {
+                            // First recompute its gain
+                            Vec3f pos = track.getPosition();
+                            float leftGain  = gain(pos, leftSpeakerPosition);
+                            float rightGain = gain(pos, rightSpeakerPosition);
+                            // Now mix it in
+                            int i = 0;
+                            while (i < mixingBuffer.length) {
+                                if (track.hasNextSample()) {
+                                    float sample = track.nextSample();
+                                    mixingBuffer[i++] = sample * leftGain;
+                                    mixingBuffer[i++] = sample * rightGain;
+                                } else {
+                                    // This allows tracks to stall without being abruptly cancelled
+                                    if (track.done()) {
+                                        remove(track);
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    // Now that we have our data, send it down to the card
+                    int outPos = 0;
+                    for (int i = 0; i < mixingBuffer.length; i++) {
+                        short val = (short) mixingBuffer[i];
+                        buf.put(outPos++, (byte)  val);
+                        buf.put(outPos++, (byte) (val >> 8));
+                    }
+                    if (!prepareMixerBuffer(mixerBuffer)) {
+                        throw new RuntimeException("Error preparing mixer buffer");
+                    }
+                    if (!writeMixerBuffer(mixerBuffer)) {
+                        throw new RuntimeException("Error writing mixer buffer to device");
+                    }
+                } else {
+                    // System.out.println("No mixer buffer available");
+
+                    // Wait for a buffer to become available
+                    if (!WaitForSingleObject(event)) {
+                        throw new RuntimeException("Error while waiting for event object");
+                    }
+
+                    /*
+                    try {
+                        Thread.sleep(10);
+                    } catch (InterruptedException e) {
+                    }
+                    */
+                }
+            }
+
+            // Need to shut down
+            shutdownWaveOut();
+            synchronized(shutdownLock) {
+                shutdownLock.notifyAll();
+            }
+        }
+
+        // This defines the 3D spatialization gain function.
+        // The function is defined as:
+        //    falloffFactor
+        // -------------------
+        // falloffFactor + r^2
+        private float gain(Vec3f pos, Vec3f speakerPos) {
+            temp.sub(pos, speakerPos);
+            float dotp = temp.dot(temp);
+            return (falloffFactor / (falloffFactor + dotp));
+        }
+    }
+
+    // Initializes waveout device
+    private static native boolean initializeWaveOut(long eventObject);
+    // Shuts down waveout device
+    private static native void shutdownWaveOut();
+
+    // Gets the next (opaque) buffer of data to fill from the native
+    // code, or 0 if none was available yet (it should not happen that
+    // none is available the way the code is written).
+    private static native long getNextMixerBuffer();
+    // Gets the next ByteBuffer to fill out of the mixer buffer. It
+    // requires interleaved left and right channel samples, 16 signed
+    // bits per sample, little endian. Implicit 44.1 kHz sample rate.
+    private static native ByteBuffer getMixerBufferData(long mixerBuffer);
+    // We need these to work around the lack of
+    // JNI_NewDirectByteBuffer in CVM + the JSR 239 NIO classes
+    private static native long getMixerBufferDataAddress(long mixerBuffer);
+    private static native int  getMixerBufferDataCapacity(long mixerBuffer);
+    // Prepares this mixer buffer for writing to the device.
+    private static native boolean prepareMixerBuffer(long mixerBuffer);
+    // Writes this mixer buffer to the device.
+    private static native boolean writeMixerBuffer(long mixerBuffer);
+
+    // Helpers to prevent mixer thread from busy waiting
+    private static native long CreateEvent();
+    private static native boolean WaitForSingleObject(long event);
+    private static native void SetEvent(long event);
+    private static native void CloseHandle(long handle);
+
+    // We need a reflective hack to wrap a direct ByteBuffer around
+    // the native memory because JNI_NewDirectByteBuffer doesn't work
+    // in CVM + JSR-239 NIO
+    private static Class directByteBufferClass;
+    private static Constructor directByteBufferConstructor;
+    private static Map createdBuffers = new HashMap(); // Map Long, ByteBuffer
+
+    private static ByteBuffer newDirectByteBuffer(long address, long capacity) {
+        Long key = new Long(address);
+        ByteBuffer buf = (ByteBuffer) createdBuffers.get(key);
+        if (buf == null) {
+            buf = newDirectByteBufferImpl(address, capacity);
+            if (buf != null) {
+                createdBuffers.put(key, buf);
+            }
+        }
+        return buf;
+    }
+    private static ByteBuffer newDirectByteBufferImpl(long address, long capacity) {
+        if (directByteBufferClass == null) {
+            try {
+                directByteBufferClass = Class.forName("java.nio.DirectByteBuffer");
+                byte[] tmp = new byte[0];
+                directByteBufferConstructor =
+                    directByteBufferClass.getDeclaredConstructor(new Class[] { Integer.TYPE,
+                                                                               tmp.getClass(),
+                                                                               Integer.TYPE });
+                directByteBufferConstructor.setAccessible(true);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        
+        if (directByteBufferConstructor != null) {
+            try {
+                return (ByteBuffer)
+                    directByteBufferConstructor.newInstance(new Object[] {
+                            new Integer((int) capacity),
+                            null,
+                            new Integer((int) address)
+                        });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/audio/windows/waveout/SoundBuffer.java b/src/jogl/classes/com/jogamp/audio/windows/waveout/SoundBuffer.java
new file mode 100755
index 000000000..c45430d23
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/audio/windows/waveout/SoundBuffer.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.audio.windows.waveout;
+
+import java.io.*;
+
+class SoundBuffer {
+    private byte[] data;
+    private boolean needsByteSwap;
+    private int numBytes;
+    private int bytesPerSample;
+    private int numSamples;
+    private boolean playing;
+    private boolean empty;
+
+    // Note: needsByteSwap argument makes assumptions about the format
+    SoundBuffer(int size, int bytesPerSample, boolean needsByteSwap) {
+        this.bytesPerSample = bytesPerSample;
+        this.needsByteSwap = needsByteSwap;
+        data = new byte[size * bytesPerSample];
+        empty = true;
+    }
+
+    boolean playing() {
+        return playing;
+    }
+
+    void playing(boolean playing) {
+        this.playing = playing;
+    }
+
+    boolean empty() {
+        return empty;
+    }
+
+    void empty(boolean empty) {
+        this.empty = empty;
+    }
+
+    void fill(InputStream input) throws IOException {
+        synchronized(this) {
+            if (playing) {
+                throw new IllegalStateException("Can not fill a buffer that is playing");
+            }
+        }
+
+        empty(true);
+        int num = input.read(data);
+        if (num > 0) {
+            numBytes = num;
+            numSamples = numBytes / bytesPerSample;
+            empty(false);
+            if ((numBytes % bytesPerSample) != 0) {
+                System.out.println("WARNING: needed integral multiple of " + bytesPerSample +
+                                   " bytes, but read " + numBytes + " bytes");
+            }
+        } else {
+            numBytes = 0;
+        }
+    }
+
+    int numSamples() {
+        return numSamples;
+    }
+
+    // This is called by the mixer and must be extremely fast
+    // FIXME: may want to reconsider use of floating point at this point
+    // FIXME: assumes all sounds are of the same format to avoid normalization
+    float getSample(int sample) {
+        int startByte = sample * bytesPerSample;
+        // FIXME: assumes no more than 4 bytes per sample
+        int res = 0;
+        if (needsByteSwap) {
+            for (int i = startByte + bytesPerSample - 1; i >= startByte; i--) {
+                res <<= 8;
+                res |= (data[i] & 0xff);
+            }
+        } else {
+            int endByte = startByte + bytesPerSample - 1;
+            for (int i = startByte; i <= endByte; i++) {
+                res <<= 8;
+                res |= (data[i] & 0xff);
+            }
+        }
+        // Sign extend
+        if (bytesPerSample == 2) {
+            res = (short) res;
+        } else if (bytesPerSample == 1) {
+            res = (byte) res;
+        }
+
+        return (float) res;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/audio/windows/waveout/TestSpatialization.java b/src/jogl/classes/com/jogamp/audio/windows/waveout/TestSpatialization.java
new file mode 100755
index 000000000..78fb3493f
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/audio/windows/waveout/TestSpatialization.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.audio.windows.waveout;
+
+import java.io.*;
+import javax.media.nativewindow.NativeWindow;
+import javax.media.opengl.GLDrawableFactory;
+
+public class TestSpatialization {
+    public static void main(String[] args) {
+        if (args.length != 1) {
+            System.out.println("Usage: TestSpatialization [file name]");
+            System.exit(1);
+        }
+
+        try {
+            // FIXME: this is a hack to get the native library loaded
+            try {
+                GLDrawableFactory.getFactory(NativeWindow.class);
+            } catch (Exception e) {}
+            // Initialize the audio subsystem
+            Audio audio = Audio.getInstance();
+            // Create a track
+            Track track = audio.newTrack(new File(args[0]));
+            track.setPosition(1, 0, 0);
+            // Run for ten seconds
+            long startTime = System.currentTimeMillis();
+            long duration = 10000;
+            long curTime = 0;
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+            }
+            System.out.println("Playing...");
+            track.setLooping(true);
+            track.play();
+            while ((curTime = System.currentTimeMillis()) < startTime + duration) {
+                // Make one revolution every two seconds
+                float rads = (float) (((2 * Math.PI) * (((float) (curTime - startTime)) / 1000.0f)) / 2);
+                track.setPosition((float) Math.cos(rads), 0, (float) Math.sin(rads));
+                // Would like to make it go in a circle, but since
+                // stereo doesn't work now, make it move along a line
+                // track.setPosition(-1.0f, 0, 2.0f * (float) Math.sin(rads));
+                // Sleep a little between updates
+                try {
+                    Thread.sleep(10);
+                } catch (InterruptedException e) {
+                }
+            }
+            System.out.println("Shutting down audio subsystem");
+            audio.shutdown();
+            System.out.println("Exiting.");
+            System.exit(0);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/audio/windows/waveout/Track.java b/src/jogl/classes/com/jogamp/audio/windows/waveout/Track.java
new file mode 100755
index 000000000..b57bf1dc6
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/audio/windows/waveout/Track.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.audio.windows.waveout;
+
+import java.io.*;
+import java.nio.*;
+
+public class Track {
+    // Default number of samples per buffer
+    private static final int BUFFER_SIZE = 32768;
+    // Number of bytes per sample (FIXME: dependence on audio format)
+    static final int BYTES_PER_SAMPLE = 2;
+    // Whether we need byte swapping (FIXME: dependence on audio format)
+    static final boolean NEEDS_BYTE_SWAP = true;
+
+    // This is the buffer this track is currently playing from
+    private SoundBuffer activeBuffer;
+    // This is the sample position in the active buffer
+    private int samplePosition;
+    // This is the total number of samples in the file
+    private int totalSamples;
+    // This is the total number of samples we have read
+    private int samplesRead;
+    // This is the buffer that the background filler thread may be filling
+    private SoundBuffer fillingBuffer;
+    // If we're playing the file, this is its input stream
+    private InputStream input;
+    // Keep around the file name
+    private File file;
+    // Whether we're playing this sound
+    private boolean playing;
+    // Whether we're looping this sound
+    private boolean looping;
+    // The position of this sound; defaults to being at the origin
+    private volatile Vec3f position = new Vec3f();
+
+    Track(File file) throws IOException {
+        if (!file.getName().endsWith(".rawsound")) {
+            throw new IOException("Unsupported file format (currently supports only raw sounds)");
+        }
+
+        this.file = file;
+        openInput();
+
+        // Allocate the buffers
+        activeBuffer  = new SoundBuffer(BUFFER_SIZE, BYTES_PER_SAMPLE, NEEDS_BYTE_SWAP);
+        fillingBuffer = new SoundBuffer(BUFFER_SIZE, BYTES_PER_SAMPLE, NEEDS_BYTE_SWAP);
+
+        // Fill the first buffer immediately
+        fill();
+        swapBuffers();
+    }
+
+    private void openInput() throws IOException {
+        input = new BufferedInputStream(new FileInputStream(file));
+        totalSamples = (int) file.length() / BYTES_PER_SAMPLE;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    public synchronized void play() {
+        if (input == null) {
+            try {
+                openInput();
+                // Fill it immediately
+                fill();
+            } catch (IOException e) {
+                e.printStackTrace();
+                return;
+            }
+        }
+
+        playing = true;
+    }
+
+    public synchronized boolean isPlaying() {
+        return playing;
+    }
+
+    public synchronized void setLooping(boolean looping) {
+        this.looping = looping;
+    }
+
+    public synchronized boolean isLooping() {
+        return looping;
+    }
+
+    public void setPosition(float x, float y, float z) {
+        position = new Vec3f(x, y, z);
+    }
+
+    synchronized void fill() throws IOException {
+        if (input == null) {
+            return;
+        }
+        SoundBuffer curBuffer = fillingBuffer;
+        if (!curBuffer.empty()) {
+            return;
+        }
+        curBuffer.fill(input);
+        if (curBuffer.empty()) {
+            // End of file
+            InputStream tmp = null;
+            synchronized(this) {
+                tmp = input;
+                input = null;
+            }
+            tmp.close();
+
+            // If looping, re-open
+            if (isLooping()) {
+                openInput();
+                // and fill
+                fill();
+            }
+        }
+    }
+
+    // These are only for use by the Mixer
+    private float leftGain;
+    private float rightGain;
+    
+    void setLeftGain(float leftGain) {
+        this.leftGain = leftGain;
+    }
+
+    float getLeftGain() {
+        return leftGain;
+    }
+
+    void setRightGain(float rightGain) {
+        this.rightGain = rightGain;
+    }
+
+    float getRightGain() {
+        return rightGain;
+    }
+
+    Vec3f getPosition() {
+        return position;
+    }
+
+    // This is called by the mixer and must be extremely fast
+    // Note this assumes mono sounds (FIXME)
+    boolean hasNextSample() {
+        return (!activeBuffer.empty() && samplePosition < activeBuffer.numSamples());
+    }
+
+    // This is called by the mixer and must be extremely fast
+    float nextSample() {
+        float res = activeBuffer.getSample(samplePosition++);
+        ++samplesRead;
+        if (!hasNextSample()) {
+            swapBuffers();
+            samplePosition = 0;
+            if (done()) {
+                playing = false;
+            }
+        }
+        return res;
+    }
+
+    synchronized void swapBuffers() {
+        SoundBuffer tmp = activeBuffer;
+        activeBuffer = fillingBuffer;
+        fillingBuffer = tmp;
+        fillingBuffer.empty(true);
+    }
+
+    // This provides a more robust termination condition
+    boolean done() {
+        return (samplesRead == totalSamples) && !looping;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/audio/windows/waveout/Vec3f.java b/src/jogl/classes/com/jogamp/audio/windows/waveout/Vec3f.java
new file mode 100755
index 000000000..1afdaf081
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/audio/windows/waveout/Vec3f.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.audio.windows.waveout;
+
+/** 3-element single-precision vector */
+
+class Vec3f {
+  public static final Vec3f X_AXIS     = new Vec3f( 1,  0,  0);
+  public static final Vec3f Y_AXIS     = new Vec3f( 0,  1,  0);
+  public static final Vec3f Z_AXIS     = new Vec3f( 0,  0,  1);
+  public static final Vec3f NEG_X_AXIS = new Vec3f(-1,  0,  0);
+  public static final Vec3f NEG_Y_AXIS = new Vec3f( 0, -1,  0);
+  public static final Vec3f NEG_Z_AXIS = new Vec3f( 0,  0, -1);
+
+  private float x;
+  private float y;
+  private float z;
+
+  public Vec3f() {}
+
+  public Vec3f(Vec3f arg) {
+    set(arg);
+  }
+
+  public Vec3f(float x, float y, float z) {
+    set(x, y, z);
+  }
+
+  public Vec3f copy() {
+    return new Vec3f(this);
+  }
+
+  public void set(Vec3f arg) {
+    set(arg.x, arg.y, arg.z);
+  }
+
+  public void set(float x, float y, float z) {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+  }
+
+  /** Sets the ith component, 0 <= i < 3 */
+  public void set(int i, float val) {
+    switch (i) {
+    case 0: x = val; break;
+    case 1: y = val; break;
+    case 2: z = val; break;
+    default: throw new IndexOutOfBoundsException();
+    }
+  }
+
+  /** Gets the ith component, 0 <= i < 3 */
+  public float get(int i) {
+    switch (i) {
+    case 0: return x;
+    case 1: return y;
+    case 2: return z;
+    default: throw new IndexOutOfBoundsException();
+    }
+  }
+
+  public float x() { return x; }
+  public float y() { return y; }
+  public float z() { return z; }
+
+  public void setX(float x) { this.x = x; }
+  public void setY(float y) { this.y = y; }
+  public void setZ(float z) { this.z = z; }
+
+  public float dot(Vec3f arg) {
+    return x * arg.x + y * arg.y + z * arg.z;
+  }
+
+  public float length() {
+    return (float) Math.sqrt(lengthSquared());
+  }
+
+  public float lengthSquared() {
+    return this.dot(this);
+  }
+
+  public void normalize() {
+    float len = length();
+    if (len == 0.0f) return;
+    scale(1.0f / len);
+  }
+
+  /** Returns this * val; creates new vector */
+  public Vec3f times(float val) {
+    Vec3f tmp = new Vec3f(this);
+    tmp.scale(val);
+    return tmp;
+  }
+
+  /** this = this * val */
+  public void scale(float val) {
+    x *= val;
+    y *= val;
+    z *= val;
+  }
+
+  /** Returns this + arg; creates new vector */
+  public Vec3f plus(Vec3f arg) {
+    Vec3f tmp = new Vec3f();
+    tmp.add(this, arg);
+    return tmp;
+  }
+
+  /** this = this + b */
+  public void add(Vec3f b) {
+    add(this, b);
+  }
+
+  /** this = a + b */
+  public void add(Vec3f a, Vec3f b) {
+    x = a.x + b.x;
+    y = a.y + b.y;
+    z = a.z + b.z;
+  }
+
+  /** Returns this + s * arg; creates new vector */
+  public Vec3f addScaled(float s, Vec3f arg) {
+    Vec3f tmp = new Vec3f();
+    tmp.addScaled(this, s, arg);
+    return tmp;
+  }
+
+  /** this = a + s * b */
+  public void addScaled(Vec3f a, float s, Vec3f b) {
+    x = a.x + s * b.x;
+    y = a.y + s * b.y;
+    z = a.z + s * b.z;
+  }
+
+  /** Returns this - arg; creates new vector */
+  public Vec3f minus(Vec3f arg) {
+    Vec3f tmp = new Vec3f();
+    tmp.sub(this, arg);
+    return tmp;
+  }
+
+  /** this = this - b */
+  public void sub(Vec3f b) {
+    sub(this, b);
+  }
+
+  /** this = a - b */
+  public void sub(Vec3f a, Vec3f b) {
+    x = a.x - b.x;
+    y = a.y - b.y;
+    z = a.z - b.z;
+  }
+
+  /** Returns this cross arg; creates new vector */
+  public Vec3f cross(Vec3f arg) {
+    Vec3f tmp = new Vec3f();
+    tmp.cross(this, arg);
+    return tmp;
+  }
+
+  /** this = a cross b. NOTE: "this" must be a different vector than
+      both a and b. */
+  public void cross(Vec3f a, Vec3f b) {
+    x = a.y * b.z - a.z * b.y;
+    y = a.z * b.x - a.x * b.z;
+    z = a.x * b.y - a.y * b.x;
+  }
+
+  /** Sets each component of this vector to the product of the
+      component with the corresponding component of the argument
+      vector. */
+  public void componentMul(Vec3f arg) {
+    x *= arg.x;
+    y *= arg.y;
+    z *= arg.z;
+  }
+
+  public String toString() {
+    return "(" + x + ", " + y + ", " + z + ")";
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Audio.java b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Audio.java
deleted file mode 100755
index fe77c7c48..000000000
--- a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Audio.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.jogamp.javafx.audio.windows.waveout;
-
-import java.io.*;
-
-public class Audio {
-    private static Audio instance = null;
-    private Mixer mixer;
-
-    public synchronized static Audio getInstance() {
-        if (instance == null) {
-            instance = new Audio();
-        }
-        return instance;
-    }
-
-    private Audio() {
-        mixer = Mixer.getMixer();
-    }
-
-    public Mixer getMixer() {
-        return mixer;
-    }
-
-    public Track newTrack(File file) throws IOException
-    {
-        Track res = new Track(file);
-        mixer.add(res);
-        return res;
-    }
-
-    public void shutdown() {
-        mixer.shutdown();
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Mixer.java b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Mixer.java
deleted file mode 100755
index 59877052f..000000000
--- a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Mixer.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.jogamp.javafx.audio.windows.waveout;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-
-// Needed only for NIO workarounds on CVM
-import java.lang.reflect.*;
-
-public class Mixer {
-    // This class is a singleton
-    private static Mixer mixer;
-
-    private volatile boolean shutdown;
-    private volatile Object shutdownLock = new Object();
-    private volatile boolean shutdownDone;
-
-    // Windows Event object
-    private long event;
-
-    private volatile ArrayList/*<Track>*/ tracks = new ArrayList();
-
-    private Vec3f leftSpeakerPosition  = new Vec3f(-1, 0, 0);
-    private Vec3f rightSpeakerPosition = new Vec3f( 1, 0, 0);
-
-    private float falloffFactor = 1.0f;
-
-    static {
-        mixer = new Mixer();
-    }
-
-    private Mixer() {
-        event = CreateEvent();
-        new FillerThread().start();
-        MixerThread m = new MixerThread();
-        m.setPriority(Thread.MAX_PRIORITY - 1);
-        m.start();
-    }
-
-    public static Mixer getMixer() {
-        return mixer;
-    }
-
-    synchronized void add(Track track) {
-        ArrayList/*<Track>*/ newTracks = (ArrayList) tracks.clone();
-        newTracks.add(track);
-        tracks = newTracks;
-    }
-
-    synchronized void remove(Track track) {
-        ArrayList/*<Track>*/ newTracks = (ArrayList) tracks.clone();
-        newTracks.remove(track);
-        tracks = newTracks;
-    }
-
-    // NOTE: due to a bug on the APX device, we only have mono sounds,
-    // so we currently only pay attention to the position of the left
-    // speaker
-    public void setLeftSpeakerPosition(float x, float y, float z) {
-        leftSpeakerPosition.set(x, y, z);
-    }
-
-    // NOTE: due to a bug on the APX device, we only have mono sounds,
-    // so we currently only pay attention to the position of the left
-    // speaker
-    public void setRightSpeakerPosition(float x, float y, float z) {
-        rightSpeakerPosition.set(x, y, z);
-    }
-
-    /** This defines a scale factor of sorts -- the higher the number,
-        the larger an area the sound will affect. Default value is
-        1.0f. Valid values are [1.0f, ...]. The formula for the gain
-        for each channel is
-<PRE>
-     falloffFactor
-  -------------------
-  falloffFactor + r^2
-</PRE>
-*/
-    public void setFalloffFactor(float factor) {
-        falloffFactor = factor;
-    }
-
-    public void shutdown() {
-        synchronized(shutdownLock) {
-            shutdown = true;
-            SetEvent(event);
-            try {
-                shutdownLock.wait();
-            } catch (InterruptedException e) {
-            }
-        }
-    }
-
-    class FillerThread extends Thread {
-        FillerThread() {
-            super("Mixer Thread");
-        }
-
-        public void run() {
-            while (!shutdown) {
-                List/*<Track>*/ curTracks = tracks;
-
-                for (Iterator iter = curTracks.iterator(); iter.hasNext(); ) {
-                    Track track = (Track) iter.next();
-                    try {
-                        track.fill();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                        remove(track);
-                    }
-                }
-
-                try {
-                    // Run ten times per second
-                    Thread.sleep(100);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    class MixerThread extends Thread {
-        // Temporary mixing buffer
-        // Interleaved left and right channels
-        float[] mixingBuffer;
-        private Vec3f temp = new Vec3f();
-
-        MixerThread() {
-            super("Mixer Thread");
-            if (!initializeWaveOut(event)) {
-                throw new InternalError("Error initializing waveout device");
-            }
-        }
-
-        public void run() {
-            while (!shutdown) {
-                // Get the next buffer
-                long mixerBuffer = getNextMixerBuffer();
-                if (mixerBuffer != 0) {
-                    ByteBuffer buf = getMixerBufferData(mixerBuffer);
-
-                    if (buf == null) {
-                        // This is happening on CVM because
-                        // JNI_NewDirectByteBuffer isn't implemented
-                        // by default and isn't compatible with the
-                        // JSR-239 NIO implementation (apparently)
-                        buf = newDirectByteBuffer(getMixerBufferDataAddress(mixerBuffer),
-                                                  getMixerBufferDataCapacity(mixerBuffer));
-                    }
-
-                    if (buf == null) {
-                        throw new InternalError("Couldn't wrap the native address with a direct byte buffer");
-                    }
-
-                    // System.out.println("Mixing buffer");
-
-                    // If we don't have enough samples in our mixing buffer, expand it
-                    // FIXME: knowledge of native output rendering format
-                    if ((mixingBuffer == null) || (mixingBuffer.length < (buf.capacity() / 2 /* bytes / sample */))) {
-                        mixingBuffer = new float[buf.capacity() / 2];
-                    } else {
-                        // Zap it
-                        for (int i = 0; i < mixingBuffer.length; i++) {
-                            mixingBuffer[i] = 0.0f;
-                        }
-                    }
-
-                    // This assertion should be in place if we have stereo
-                    if ((mixingBuffer.length % 2) != 0) {
-                        String msg = "FATAL ERROR: odd number of samples in the mixing buffer";
-                        System.out.println(msg);
-                        throw new InternalError(msg);
-                    }
-
-                    // Run down all of the registered tracks mixing them in
-                    List/*<Track>*/ curTracks = tracks;
-
-                    for (Iterator iter = curTracks.iterator(); iter.hasNext(); ) {
-                        Track track = (Track) iter.next();
-                        // Consider only playing tracks
-                        if (track.isPlaying()) {
-                            // First recompute its gain
-                            Vec3f pos = track.getPosition();
-                            float leftGain  = gain(pos, leftSpeakerPosition);
-                            float rightGain = gain(pos, rightSpeakerPosition);
-                            // Now mix it in
-                            int i = 0;
-                            while (i < mixingBuffer.length) {
-                                if (track.hasNextSample()) {
-                                    float sample = track.nextSample();
-                                    mixingBuffer[i++] = sample * leftGain;
-                                    mixingBuffer[i++] = sample * rightGain;
-                                } else {
-                                    // This allows tracks to stall without being abruptly cancelled
-                                    if (track.done()) {
-                                        remove(track);
-                                    }
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    // Now that we have our data, send it down to the card
-                    int outPos = 0;
-                    for (int i = 0; i < mixingBuffer.length; i++) {
-                        short val = (short) mixingBuffer[i];
-                        buf.put(outPos++, (byte)  val);
-                        buf.put(outPos++, (byte) (val >> 8));
-                    }
-                    if (!prepareMixerBuffer(mixerBuffer)) {
-                        throw new RuntimeException("Error preparing mixer buffer");
-                    }
-                    if (!writeMixerBuffer(mixerBuffer)) {
-                        throw new RuntimeException("Error writing mixer buffer to device");
-                    }
-                } else {
-                    // System.out.println("No mixer buffer available");
-
-                    // Wait for a buffer to become available
-                    if (!WaitForSingleObject(event)) {
-                        throw new RuntimeException("Error while waiting for event object");
-                    }
-
-                    /*
-                    try {
-                        Thread.sleep(10);
-                    } catch (InterruptedException e) {
-                    }
-                    */
-                }
-            }
-
-            // Need to shut down
-            shutdownWaveOut();
-            synchronized(shutdownLock) {
-                shutdownLock.notifyAll();
-            }
-        }
-
-        // This defines the 3D spatialization gain function.
-        // The function is defined as:
-        //    falloffFactor
-        // -------------------
-        // falloffFactor + r^2
-        private float gain(Vec3f pos, Vec3f speakerPos) {
-            temp.sub(pos, speakerPos);
-            float dotp = temp.dot(temp);
-            return (falloffFactor / (falloffFactor + dotp));
-        }
-    }
-
-    // Initializes waveout device
-    private static native boolean initializeWaveOut(long eventObject);
-    // Shuts down waveout device
-    private static native void shutdownWaveOut();
-
-    // Gets the next (opaque) buffer of data to fill from the native
-    // code, or 0 if none was available yet (it should not happen that
-    // none is available the way the code is written).
-    private static native long getNextMixerBuffer();
-    // Gets the next ByteBuffer to fill out of the mixer buffer. It
-    // requires interleaved left and right channel samples, 16 signed
-    // bits per sample, little endian. Implicit 44.1 kHz sample rate.
-    private static native ByteBuffer getMixerBufferData(long mixerBuffer);
-    // We need these to work around the lack of
-    // JNI_NewDirectByteBuffer in CVM + the JSR 239 NIO classes
-    private static native long getMixerBufferDataAddress(long mixerBuffer);
-    private static native int  getMixerBufferDataCapacity(long mixerBuffer);
-    // Prepares this mixer buffer for writing to the device.
-    private static native boolean prepareMixerBuffer(long mixerBuffer);
-    // Writes this mixer buffer to the device.
-    private static native boolean writeMixerBuffer(long mixerBuffer);
-
-    // Helpers to prevent mixer thread from busy waiting
-    private static native long CreateEvent();
-    private static native boolean WaitForSingleObject(long event);
-    private static native void SetEvent(long event);
-    private static native void CloseHandle(long handle);
-
-    // We need a reflective hack to wrap a direct ByteBuffer around
-    // the native memory because JNI_NewDirectByteBuffer doesn't work
-    // in CVM + JSR-239 NIO
-    private static Class directByteBufferClass;
-    private static Constructor directByteBufferConstructor;
-    private static Map createdBuffers = new HashMap(); // Map Long, ByteBuffer
-
-    private static ByteBuffer newDirectByteBuffer(long address, long capacity) {
-        Long key = new Long(address);
-        ByteBuffer buf = (ByteBuffer) createdBuffers.get(key);
-        if (buf == null) {
-            buf = newDirectByteBufferImpl(address, capacity);
-            if (buf != null) {
-                createdBuffers.put(key, buf);
-            }
-        }
-        return buf;
-    }
-    private static ByteBuffer newDirectByteBufferImpl(long address, long capacity) {
-        if (directByteBufferClass == null) {
-            try {
-                directByteBufferClass = Class.forName("java.nio.DirectByteBuffer");
-                byte[] tmp = new byte[0];
-                directByteBufferConstructor =
-                    directByteBufferClass.getDeclaredConstructor(new Class[] { Integer.TYPE,
-                                                                               tmp.getClass(),
-                                                                               Integer.TYPE });
-                directByteBufferConstructor.setAccessible(true);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        
-        if (directByteBufferConstructor != null) {
-            try {
-                return (ByteBuffer)
-                    directByteBufferConstructor.newInstance(new Object[] {
-                            new Integer((int) capacity),
-                            null,
-                            new Integer((int) address)
-                        });
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/SoundBuffer.java b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/SoundBuffer.java
deleted file mode 100755
index 6b75450eb..000000000
--- a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/SoundBuffer.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.jogamp.javafx.audio.windows.waveout;
-
-import java.io.*;
-
-class SoundBuffer {
-    private byte[] data;
-    private boolean needsByteSwap;
-    private int numBytes;
-    private int bytesPerSample;
-    private int numSamples;
-    private boolean playing;
-    private boolean empty;
-
-    // Note: needsByteSwap argument makes assumptions about the format
-    SoundBuffer(int size, int bytesPerSample, boolean needsByteSwap) {
-        this.bytesPerSample = bytesPerSample;
-        this.needsByteSwap = needsByteSwap;
-        data = new byte[size * bytesPerSample];
-        empty = true;
-    }
-
-    boolean playing() {
-        return playing;
-    }
-
-    void playing(boolean playing) {
-        this.playing = playing;
-    }
-
-    boolean empty() {
-        return empty;
-    }
-
-    void empty(boolean empty) {
-        this.empty = empty;
-    }
-
-    void fill(InputStream input) throws IOException {
-        synchronized(this) {
-            if (playing) {
-                throw new IllegalStateException("Can not fill a buffer that is playing");
-            }
-        }
-
-        empty(true);
-        int num = input.read(data);
-        if (num > 0) {
-            numBytes = num;
-            numSamples = numBytes / bytesPerSample;
-            empty(false);
-            if ((numBytes % bytesPerSample) != 0) {
-                System.out.println("WARNING: needed integral multiple of " + bytesPerSample +
-                                   " bytes, but read " + numBytes + " bytes");
-            }
-        } else {
-            numBytes = 0;
-        }
-    }
-
-    int numSamples() {
-        return numSamples;
-    }
-
-    // This is called by the mixer and must be extremely fast
-    // FIXME: may want to reconsider use of floating point at this point
-    // FIXME: assumes all sounds are of the same format to avoid normalization
-    float getSample(int sample) {
-        int startByte = sample * bytesPerSample;
-        // FIXME: assumes no more than 4 bytes per sample
-        int res = 0;
-        if (needsByteSwap) {
-            for (int i = startByte + bytesPerSample - 1; i >= startByte; i--) {
-                res <<= 8;
-                res |= (data[i] & 0xff);
-            }
-        } else {
-            int endByte = startByte + bytesPerSample - 1;
-            for (int i = startByte; i <= endByte; i++) {
-                res <<= 8;
-                res |= (data[i] & 0xff);
-            }
-        }
-        // Sign extend
-        if (bytesPerSample == 2) {
-            res = (short) res;
-        } else if (bytesPerSample == 1) {
-            res = (byte) res;
-        }
-
-        return (float) res;
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java
deleted file mode 100755
index 38e3bb808..000000000
--- a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.jogamp.javafx.audio.windows.waveout;
-
-import java.io.*;
-import javax.media.nativewindow.NativeWindow;
-import javax.media.opengl.GLDrawableFactory;
-
-public class TestSpatialization {
-    public static void main(String[] args) {
-        if (args.length != 1) {
-            System.out.println("Usage: TestSpatialization [file name]");
-            System.exit(1);
-        }
-
-        try {
-            // FIXME: this is a hack to get the native library loaded
-            try {
-                GLDrawableFactory.getFactory(NativeWindow.class);
-            } catch (Exception e) {}
-            // Initialize the audio subsystem
-            Audio audio = Audio.getInstance();
-            // Create a track
-            Track track = audio.newTrack(new File(args[0]));
-            track.setPosition(1, 0, 0);
-            // Run for ten seconds
-            long startTime = System.currentTimeMillis();
-            long duration = 10000;
-            long curTime = 0;
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException e) {
-            }
-            System.out.println("Playing...");
-            track.setLooping(true);
-            track.play();
-            while ((curTime = System.currentTimeMillis()) < startTime + duration) {
-                // Make one revolution every two seconds
-                float rads = (float) (((2 * Math.PI) * (((float) (curTime - startTime)) / 1000.0f)) / 2);
-                track.setPosition((float) Math.cos(rads), 0, (float) Math.sin(rads));
-                // Would like to make it go in a circle, but since
-                // stereo doesn't work now, make it move along a line
-                // track.setPosition(-1.0f, 0, 2.0f * (float) Math.sin(rads));
-                // Sleep a little between updates
-                try {
-                    Thread.sleep(10);
-                } catch (InterruptedException e) {
-                }
-            }
-            System.out.println("Shutting down audio subsystem");
-            audio.shutdown();
-            System.out.println("Exiting.");
-            System.exit(0);
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Track.java b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Track.java
deleted file mode 100755
index 40c39e755..000000000
--- a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Track.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.jogamp.javafx.audio.windows.waveout;
-
-import java.io.*;
-import java.nio.*;
-
-public class Track {
-    // Default number of samples per buffer
-    private static final int BUFFER_SIZE = 32768;
-    // Number of bytes per sample (FIXME: dependence on audio format)
-    static final int BYTES_PER_SAMPLE = 2;
-    // Whether we need byte swapping (FIXME: dependence on audio format)
-    static final boolean NEEDS_BYTE_SWAP = true;
-
-    // This is the buffer this track is currently playing from
-    private SoundBuffer activeBuffer;
-    // This is the sample position in the active buffer
-    private int samplePosition;
-    // This is the total number of samples in the file
-    private int totalSamples;
-    // This is the total number of samples we have read
-    private int samplesRead;
-    // This is the buffer that the background filler thread may be filling
-    private SoundBuffer fillingBuffer;
-    // If we're playing the file, this is its input stream
-    private InputStream input;
-    // Keep around the file name
-    private File file;
-    // Whether we're playing this sound
-    private boolean playing;
-    // Whether we're looping this sound
-    private boolean looping;
-    // The position of this sound; defaults to being at the origin
-    private volatile Vec3f position = new Vec3f();
-
-    Track(File file) throws IOException {
-        if (!file.getName().endsWith(".rawsound")) {
-            throw new IOException("Unsupported file format (currently supports only raw sounds)");
-        }
-
-        this.file = file;
-        openInput();
-
-        // Allocate the buffers
-        activeBuffer  = new SoundBuffer(BUFFER_SIZE, BYTES_PER_SAMPLE, NEEDS_BYTE_SWAP);
-        fillingBuffer = new SoundBuffer(BUFFER_SIZE, BYTES_PER_SAMPLE, NEEDS_BYTE_SWAP);
-
-        // Fill the first buffer immediately
-        fill();
-        swapBuffers();
-    }
-
-    private void openInput() throws IOException {
-        input = new BufferedInputStream(new FileInputStream(file));
-        totalSamples = (int) file.length() / BYTES_PER_SAMPLE;
-    }
-
-    public File getFile() {
-        return file;
-    }
-
-    public synchronized void play() {
-        if (input == null) {
-            try {
-                openInput();
-                // Fill it immediately
-                fill();
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
-        }
-
-        playing = true;
-    }
-
-    public synchronized boolean isPlaying() {
-        return playing;
-    }
-
-    public synchronized void setLooping(boolean looping) {
-        this.looping = looping;
-    }
-
-    public synchronized boolean isLooping() {
-        return looping;
-    }
-
-    public void setPosition(float x, float y, float z) {
-        position = new Vec3f(x, y, z);
-    }
-
-    synchronized void fill() throws IOException {
-        if (input == null) {
-            return;
-        }
-        SoundBuffer curBuffer = fillingBuffer;
-        if (!curBuffer.empty()) {
-            return;
-        }
-        curBuffer.fill(input);
-        if (curBuffer.empty()) {
-            // End of file
-            InputStream tmp = null;
-            synchronized(this) {
-                tmp = input;
-                input = null;
-            }
-            tmp.close();
-
-            // If looping, re-open
-            if (isLooping()) {
-                openInput();
-                // and fill
-                fill();
-            }
-        }
-    }
-
-    // These are only for use by the Mixer
-    private float leftGain;
-    private float rightGain;
-    
-    void setLeftGain(float leftGain) {
-        this.leftGain = leftGain;
-    }
-
-    float getLeftGain() {
-        return leftGain;
-    }
-
-    void setRightGain(float rightGain) {
-        this.rightGain = rightGain;
-    }
-
-    float getRightGain() {
-        return rightGain;
-    }
-
-    Vec3f getPosition() {
-        return position;
-    }
-
-    // This is called by the mixer and must be extremely fast
-    // Note this assumes mono sounds (FIXME)
-    boolean hasNextSample() {
-        return (!activeBuffer.empty() && samplePosition < activeBuffer.numSamples());
-    }
-
-    // This is called by the mixer and must be extremely fast
-    float nextSample() {
-        float res = activeBuffer.getSample(samplePosition++);
-        ++samplesRead;
-        if (!hasNextSample()) {
-            swapBuffers();
-            samplePosition = 0;
-            if (done()) {
-                playing = false;
-            }
-        }
-        return res;
-    }
-
-    synchronized void swapBuffers() {
-        SoundBuffer tmp = activeBuffer;
-        activeBuffer = fillingBuffer;
-        fillingBuffer = tmp;
-        fillingBuffer.empty(true);
-    }
-
-    // This provides a more robust termination condition
-    boolean done() {
-        return (samplesRead == totalSamples) && !looping;
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Vec3f.java b/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Vec3f.java
deleted file mode 100755
index 5b480a513..000000000
--- a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Vec3f.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.jogamp.javafx.audio.windows.waveout;
-
-/** 3-element single-precision vector */
-
-class Vec3f {
-  public static final Vec3f X_AXIS     = new Vec3f( 1,  0,  0);
-  public static final Vec3f Y_AXIS     = new Vec3f( 0,  1,  0);
-  public static final Vec3f Z_AXIS     = new Vec3f( 0,  0,  1);
-  public static final Vec3f NEG_X_AXIS = new Vec3f(-1,  0,  0);
-  public static final Vec3f NEG_Y_AXIS = new Vec3f( 0, -1,  0);
-  public static final Vec3f NEG_Z_AXIS = new Vec3f( 0,  0, -1);
-
-  private float x;
-  private float y;
-  private float z;
-
-  public Vec3f() {}
-
-  public Vec3f(Vec3f arg) {
-    set(arg);
-  }
-
-  public Vec3f(float x, float y, float z) {
-    set(x, y, z);
-  }
-
-  public Vec3f copy() {
-    return new Vec3f(this);
-  }
-
-  public void set(Vec3f arg) {
-    set(arg.x, arg.y, arg.z);
-  }
-
-  public void set(float x, float y, float z) {
-    this.x = x;
-    this.y = y;
-    this.z = z;
-  }
-
-  /** Sets the ith component, 0 <= i < 3 */
-  public void set(int i, float val) {
-    switch (i) {
-    case 0: x = val; break;
-    case 1: y = val; break;
-    case 2: z = val; break;
-    default: throw new IndexOutOfBoundsException();
-    }
-  }
-
-  /** Gets the ith component, 0 <= i < 3 */
-  public float get(int i) {
-    switch (i) {
-    case 0: return x;
-    case 1: return y;
-    case 2: return z;
-    default: throw new IndexOutOfBoundsException();
-    }
-  }
-
-  public float x() { return x; }
-  public float y() { return y; }
-  public float z() { return z; }
-
-  public void setX(float x) { this.x = x; }
-  public void setY(float y) { this.y = y; }
-  public void setZ(float z) { this.z = z; }
-
-  public float dot(Vec3f arg) {
-    return x * arg.x + y * arg.y + z * arg.z;
-  }
-
-  public float length() {
-    return (float) Math.sqrt(lengthSquared());
-  }
-
-  public float lengthSquared() {
-    return this.dot(this);
-  }
-
-  public void normalize() {
-    float len = length();
-    if (len == 0.0f) return;
-    scale(1.0f / len);
-  }
-
-  /** Returns this * val; creates new vector */
-  public Vec3f times(float val) {
-    Vec3f tmp = new Vec3f(this);
-    tmp.scale(val);
-    return tmp;
-  }
-
-  /** this = this * val */
-  public void scale(float val) {
-    x *= val;
-    y *= val;
-    z *= val;
-  }
-
-  /** Returns this + arg; creates new vector */
-  public Vec3f plus(Vec3f arg) {
-    Vec3f tmp = new Vec3f();
-    tmp.add(this, arg);
-    return tmp;
-  }
-
-  /** this = this + b */
-  public void add(Vec3f b) {
-    add(this, b);
-  }
-
-  /** this = a + b */
-  public void add(Vec3f a, Vec3f b) {
-    x = a.x + b.x;
-    y = a.y + b.y;
-    z = a.z + b.z;
-  }
-
-  /** Returns this + s * arg; creates new vector */
-  public Vec3f addScaled(float s, Vec3f arg) {
-    Vec3f tmp = new Vec3f();
-    tmp.addScaled(this, s, arg);
-    return tmp;
-  }
-
-  /** this = a + s * b */
-  public void addScaled(Vec3f a, float s, Vec3f b) {
-    x = a.x + s * b.x;
-    y = a.y + s * b.y;
-    z = a.z + s * b.z;
-  }
-
-  /** Returns this - arg; creates new vector */
-  public Vec3f minus(Vec3f arg) {
-    Vec3f tmp = new Vec3f();
-    tmp.sub(this, arg);
-    return tmp;
-  }
-
-  /** this = this - b */
-  public void sub(Vec3f b) {
-    sub(this, b);
-  }
-
-  /** this = a - b */
-  public void sub(Vec3f a, Vec3f b) {
-    x = a.x - b.x;
-    y = a.y - b.y;
-    z = a.z - b.z;
-  }
-
-  /** Returns this cross arg; creates new vector */
-  public Vec3f cross(Vec3f arg) {
-    Vec3f tmp = new Vec3f();
-    tmp.cross(this, arg);
-    return tmp;
-  }
-
-  /** this = a cross b. NOTE: "this" must be a different vector than
-      both a and b. */
-  public void cross(Vec3f a, Vec3f b) {
-    x = a.y * b.z - a.z * b.y;
-    y = a.z * b.x - a.x * b.z;
-    z = a.x * b.y - a.y * b.x;
-  }
-
-  /** Sets each component of this vector to the product of the
-      component with the corresponding component of the argument
-      vector. */
-  public void componentMul(Vec3f arg) {
-    x *= arg.x;
-    y *= arg.y;
-    z *= arg.z;
-  }
-
-  public String toString() {
-    return "(" + x + ", " + y + ", " + z + ")";
-  }
-}
diff --git a/src/jogl/native/audio/Mixer.cpp b/src/jogl/native/audio/Mixer.cpp
index 821a03246..9fa5b61bc 100755
--- a/src/jogl/native/audio/Mixer.cpp
+++ b/src/jogl/native/audio/Mixer.cpp
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <mmsystem.h>
 #include <mmreg.h>
-#include "com_jogamp_javafx_audio_windows_waveout_Mixer.h"
+#include "com_jogamp_audio_windows_waveout_Mixer.h"
 
 static HANDLE event = NULL;
 static HWAVEOUT output = NULL;
@@ -57,7 +57,7 @@ void CALLBACK playbackCallback(HWAVEOUT output,
     }
 }
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_initializeWaveOut
+JNIEXPORT jboolean JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_initializeWaveOut
   (JNIEnv *env, jclass unused, jlong eventObject)
 {
     event = (HANDLE) eventObject;
@@ -98,7 +98,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_in
     return JNI_TRUE;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_shutdownWaveOut
+JNIEXPORT void JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_shutdownWaveOut
   (JNIEnv *env, jclass unused)
 {
     //    writeString("Pausing\n");
@@ -109,7 +109,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_shutdo
     waveOutClose(output);
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getNextMixerBuffer
+JNIEXPORT jlong JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_getNextMixerBuffer
   (JNIEnv *env, jclass unused)
 {
     WAVEHDR* hdr = NULL;
@@ -123,28 +123,28 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getNe
     return (jlong) hdr;
 }
 
-JNIEXPORT jobject JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getMixerBufferData
+JNIEXPORT jobject JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_getMixerBufferData
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     WAVEHDR* hdr = (WAVEHDR*) mixerBuffer;
     return env->NewDirectByteBuffer(hdr->lpData, hdr->dwBufferLength);
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getMixerBufferDataAddress
+JNIEXPORT jlong JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_getMixerBufferDataAddress
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     WAVEHDR* hdr = (WAVEHDR*) mixerBuffer;
     return (jlong) hdr->lpData;
 }
 
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getMixerBufferDataCapacity
+JNIEXPORT jint JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_getMixerBufferDataCapacity
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     WAVEHDR* hdr = (WAVEHDR*) mixerBuffer;
     return (jint) hdr->dwBufferLength;
 }
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_prepareMixerBuffer
+JNIEXPORT jboolean JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_prepareMixerBuffer
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     MMRESULT res = waveOutPrepareHeader(output,
@@ -156,7 +156,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_pr
     return JNI_FALSE;
 }
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_writeMixerBuffer
+JNIEXPORT jboolean JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_writeMixerBuffer
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     MMRESULT res = waveOutWrite(output,
@@ -170,13 +170,13 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_wr
     return JNI_FALSE;
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_CreateEvent
+JNIEXPORT jlong JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_CreateEvent
   (JNIEnv *env, jclass unused)
 {
     return (jlong) CreateEvent(NULL, FALSE, TRUE, NULL);
 }
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_WaitForSingleObject
+JNIEXPORT jboolean JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_WaitForSingleObject
   (JNIEnv *env, jclass unused, jlong eventObject)
 {
     DWORD res = WaitForSingleObject((HANDLE) eventObject, INFINITE);
@@ -186,13 +186,13 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_Wa
     return JNI_FALSE;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_SetEvent
+JNIEXPORT void JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_SetEvent
   (JNIEnv *env, jclass unused, jlong eventObject)
 {
     SetEvent((HANDLE) eventObject);
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_CloseHandle
+JNIEXPORT void JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_CloseHandle
   (JNIEnv *env, jclass unused, jlong eventObject)
 {
     CloseHandle((HANDLE) eventObject);
diff --git a/src/jogl/native/openmax/com_sun_openmax_OMXInstance.c b/src/jogl/native/openmax/com_sun_openmax_OMXInstance.c
index 1ca973097..5317c2abc 100644
--- a/src/jogl/native/openmax/com_sun_openmax_OMXInstance.c
+++ b/src/jogl/native/openmax/com_sun_openmax_OMXInstance.c
@@ -1,5 +1,5 @@
 /*
- *  javafx_media_video_Movie.c
+ *  media_video_Movie.c
  *  JFXFramework
  *
  *  Created by sun on 17/02/08.
@@ -21,8 +21,8 @@ static const char * const ClazzNameRuntimeException =
                             "java/lang/RuntimeException";
 static jclass    runtimeExceptionClz=NULL;
 #ifdef _WIN32_WCE
-    #define STDOUT_FILE "\\Storage Card\\javafx_demos\\stdout.txt"
-    #define STDERR_FILE "\\Storage Card\\javafx_demos\\stderr.txt"
+    #define STDOUT_FILE "\\Storage Card\\demos\\stdout.txt"
+    #define STDERR_FILE "\\Storage Card\\demos\\stderr.txt"
 #endif
 
 static void _initStatics(JNIEnv *env)
diff --git a/src/nativewindow/classes/javax/media/nativewindow/package.html b/src/nativewindow/classes/javax/media/nativewindow/package.html
index d30b4a8df..fa422b2ab 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/package.html
+++ b/src/nativewindow/classes/javax/media/nativewindow/package.html
@@ -41,7 +41,7 @@
   </ul><br>
   This protocol <i>does not</i> describe how to <i>create</i> native windows, but how to <i>bind</i> a native window to an implementation of
   {@link javax.media.nativewindow.NativeWindow NativeWindow}.<br>
-  However, an implementation of this protocol (e.g. {@link com.jogamp.javafx.newt}) may support the creation.<br>
+  However, an implementation of this protocol (e.g. {@link com.jogamp.newt}) may support the creation.<br>
    
 <h3>Dependencies</h3>
   This binding has dependencies to the following:<br><br>
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Display.java b/src/newt/classes/com/jogamp/javafx/newt/Display.java
deleted file mode 100755
index 5c5db0338..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/Display.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-import javax.media.nativewindow.*;
-import com.jogamp.javafx.newt.impl.Debug;
-import com.jogamp.javafx.newt.util.EventDispatchThread;
-import java.util.*;
-
-public abstract class Display {
-    public static final boolean DEBUG = Debug.debug("Display");
-
-    private static Class getDisplayClass(String type) 
-        throws ClassNotFoundException 
-    {
-        Class displayClass = NewtFactory.getCustomClass(type, "Display");
-        if(null==displayClass) {
-            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
-                displayClass = Class.forName("com.jogamp.javafx.newt.opengl.kd.KDDisplay");
-            } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
-                displayClass = Class.forName("com.jogamp.javafx.newt.windows.WindowsDisplay");
-            } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-                displayClass = Class.forName("com.jogamp.javafx.newt.macosx.MacDisplay");
-            } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
-                displayClass = Class.forName("com.jogamp.javafx.newt.x11.X11Display");
-            } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
-                displayClass = Class.forName("com.jogamp.javafx.newt.awt.AWTDisplay");
-            } else {
-                throw new RuntimeException("Unknown display type \"" + type + "\"");
-            }
-        }
-        return displayClass;
-    }
-
-    // Unique Display for each thread
-    private static ThreadLocal currentDisplayMap = new ThreadLocal();
-
-    /** Returns the thread local display map */
-    public static Map getCurrentDisplayMap() {
-        Map displayMap = (Map) currentDisplayMap.get();
-        if(null==displayMap) {
-            displayMap = new HashMap();
-            currentDisplayMap.set( displayMap );
-        }
-        return displayMap;
-    }
-
-    /** maps the given display to the thread local display map
-      * and notifies all threads synchronized to this display map. */
-    protected static Display setCurrentDisplay(Display display) {
-        Map displayMap = getCurrentDisplayMap();
-        Display oldDisplay = null;
-        synchronized(displayMap) {
-            String name = display.getName();
-            if(null==name) name="nil";
-            oldDisplay = (Display) displayMap.put(name, display);
-            displayMap.notifyAll();
-        }
-        return oldDisplay;
-    }
-
-    /** removes the mapping of the given name from the thread local display map
-      * and notifies all threads synchronized to this display map. */
-    protected static Display removeCurrentDisplay(String name) {
-        if(null==name) name="nil";
-        Map displayMap = getCurrentDisplayMap();
-        Display oldDisplay = null;
-        synchronized(displayMap) {
-            oldDisplay = (Display) displayMap.remove(name);
-            displayMap.notifyAll();
-        }
-        return oldDisplay;
-    }
-
-    /** Returns the thread local display mapped to the given name */
-    public static Display getCurrentDisplay(String name) {
-        if(null==name) name="nil";
-        Map displayMap = getCurrentDisplayMap();
-        Display display = (Display) displayMap.get(name);
-        return display;
-    }
-
-    public static void dumpDisplayMap(String prefix) {
-        Map displayMap = getCurrentDisplayMap();
-        Set entrySet = displayMap.entrySet();
-        Iterator i = entrySet.iterator();
-        System.err.println(prefix+" DisplayMap["+entrySet.size()+"] "+Thread.currentThread());
-        for(int j=0; i.hasNext(); j++) {
-            Map.Entry entry = (Map.Entry) i.next();
-            System.err.println("  ["+j+"] "+entry.getKey()+" -> "+entry.getValue());
-        }
-    }
-
-    /** Returns the thread local display collection */
-    public static Collection getCurrentDisplays() {
-        return getCurrentDisplayMap().values();
-    }
-
-    /** Make sure to reuse a Display with the same name */
-    protected static Display create(String type, String name) {
-        try {
-            if(DEBUG) {
-                dumpDisplayMap("Display.create("+name+") BEGIN");
-            }
-            Display display = getCurrentDisplay(name);
-            if(null==display) {
-                Class displayClass = getDisplayClass(type);
-                display = (Display) displayClass.newInstance();
-                display.name=name;
-                display.refCount=1;
-
-                if(NewtFactory.useEDT()) {
-                    Thread current = Thread.currentThread();
-                    display.eventDispatchThread = new EventDispatchThread(display, current.getThreadGroup(), current.getName());
-                    display.eventDispatchThread.start();
-                    final Display f_dpy = display;
-                    display.eventDispatchThread.invokeAndWait(new Runnable() {
-                        public void run() {
-                            f_dpy.createNative();
-                        }
-                    } );
-                } else {
-                    display.createNative();
-                }
-                if(null==display.aDevice) {
-                    throw new RuntimeException("Display.createNative() failed to instanciate an AbstractGraphicsDevice");
-                }
-                setCurrentDisplay(display);
-                if(DEBUG) {
-                    System.err.println("Display.create("+name+") NEW: "+display+" "+Thread.currentThread());
-                }
-            } else {
-                synchronized(display) {
-                    display.refCount++;
-                    if(DEBUG) {
-                        System.err.println("Display.create("+name+") REUSE: refCount "+display.refCount+", "+display+" "+Thread.currentThread());
-                    }
-                }
-            }
-            if(DEBUG) {
-                dumpDisplayMap("Display.create("+name+") END");
-            }
-            return display;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    protected static Display wrapHandle(String type, String name, AbstractGraphicsDevice aDevice) {
-        try {
-            Class displayClass = getDisplayClass(type);
-            Display display = (Display) displayClass.newInstance();
-            display.name=name;
-            display.aDevice=aDevice;
-            return display;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public EventDispatchThread getEDT() { return eventDispatchThread; }
-
-    public synchronized void destroy() {
-        if(DEBUG) {
-            dumpDisplayMap("Display.destroy("+name+") BEGIN");
-        }
-        refCount--;
-        if(0==refCount) {
-            removeCurrentDisplay(name);
-            if(DEBUG) {
-                System.err.println("Display.destroy("+name+") REMOVE: "+this+" "+Thread.currentThread());
-            }
-            if(null!=eventDispatchThread) {
-                final Display f_dpy = this;
-                final EventDispatchThread f_edt = eventDispatchThread;
-                eventDispatchThread.invokeAndWait(new Runnable() {
-                    public void run() {
-                        f_dpy.closeNative();
-                        f_edt.stop();
-                    }
-                } );
-            } else {
-                closeNative();
-            }
-            if(null!=eventDispatchThread) { 
-                eventDispatchThread.waitUntilStopped();
-                eventDispatchThread=null;
-            }
-            aDevice = null;
-        } else {
-            if(DEBUG) {
-                System.err.println("Display.destroy("+name+") KEEP: refCount "+refCount+", "+this+" "+Thread.currentThread());
-            }
-        }
-        if(DEBUG) {
-            dumpDisplayMap("Display.destroy("+name+") END");
-        }
-    }
-
-    protected abstract void createNative();
-    protected abstract void closeNative();
-
-    public String getName() {
-        return name;
-    }
-
-    public long getHandle() {
-        if(null!=aDevice) {
-            return aDevice.getHandle();
-        }
-        return 0;
-    }
-
-    public AbstractGraphicsDevice getGraphicsDevice() {
-        return aDevice;
-    }
-
-    public void pumpMessages() {
-        if(null!=eventDispatchThread) { 
-            dispatchMessages();
-        } else {
-            synchronized(this) {
-                dispatchMessages();
-            }
-        }
-    }
-
-    public String toString() {
-        return "NEWT-Display["+name+", refCount "+refCount+", "+aDevice+"]";
-    }
-
-    protected abstract void dispatchMessages();
-
-    /** Default impl. nop - Currently only X11 needs a Display lock */
-    protected void lockDisplay() { }
-
-    /** Default impl. nop - Currently only X11 needs a Display lock */
-    protected void unlockDisplay() { }
-
-    protected EventDispatchThread eventDispatchThread = null;
-    protected String name;
-    protected int refCount;
-    protected AbstractGraphicsDevice aDevice;
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Event.java b/src/newt/classes/com/jogamp/javafx/newt/Event.java
deleted file mode 100644
index 4274454ab..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/Event.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-public class Event {
-    private boolean isSystemEvent;
-    private int eventType;
-    private Window source;
-    private long when;
-
-    Event(boolean isSystemEvent, int eventType, Window source, long when) {
-        this.isSystemEvent = isSystemEvent;
-        this.eventType = eventType;
-        this.source = source;
-        this.when = when;
-    }
-
-    protected Event(int eventType, Window source, long when) {
-        this(false, eventType, source, when);
-    }
-
-    /** Indicates whether this event was produced by the system or
-        generated by user code. */
-    public final boolean isSystemEvent() {
-        return isSystemEvent;
-    }
-
-    /** Returns the event type of this event. */
-    public final int getEventType() {
-        return eventType;
-    }
-
-    /** Returns the source Window which produced this Event. */
-    public final Window getSource() {
-        return source;
-    }
-
-    /** Returns the timestamp, in milliseconds, of this event. */
-    public final long getWhen()  {
-        return when;
-    }
-
-    public String toString() {
-        return "Event[sys:"+isSystemEvent()+", source:"+getSource()+", when:"+getWhen()+"]";
-    }
-
-    public static String toHexString(int hex) {
-        return "0x" + Integer.toHexString(hex);
-    }
-
-    public static String toHexString(long hex) {
-        return "0x" + Long.toHexString(hex);
-    }
-
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/EventListener.java b/src/newt/classes/com/jogamp/javafx/newt/EventListener.java
deleted file mode 100644
index 065cc1de3..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/EventListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-public interface EventListener
-{
-    public static final int WINDOW  = 1 << 0;
-    public static final int MOUSE   = 1 << 1;
-    public static final int KEY     = 1 << 2;
-    public static final int SURFACE = 1 << 3;
-
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/InputEvent.java b/src/newt/classes/com/jogamp/javafx/newt/InputEvent.java
deleted file mode 100644
index 0cfaaa4c0..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/InputEvent.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-public abstract class InputEvent extends Event
-{
- public static final int  SHIFT_MASK     = 1 << 0;
- public static final int  CTRL_MASK      = 1 << 1;
- public static final int  META_MASK      = 1 << 2;
- public static final int  ALT_MASK       = 1 << 3;
- public static final int  ALT_GRAPH_MASK = 1 << 5;
- public static final int  BUTTON1_MASK   = 1 << 6;
- public static final int  BUTTON2_MASK   = 1 << 7;
- public static final int  BUTTON3_MASK   = 1 << 8;
-
- protected InputEvent(boolean sysEvent, int eventType, Window source, long when, int modifiers) {
-    super(sysEvent, eventType, source, when);
-    this.consumed=false;
-    this.modifiers=modifiers;
- }
-
- public void consume() {
-    consumed=true;
- }
-
- public boolean isConsumed() {
-    return consumed;
- }
- public int getModifiers() {
-    return modifiers;
- }
- public boolean isAltDown() {
-    return (modifiers&ALT_MASK)!=0;
- }
- public boolean isAltGraphDown() {
-    return (modifiers&ALT_GRAPH_MASK)!=0;
- }
- public boolean isControlDown() {
-    return (modifiers&CTRL_MASK)!=0;
- }
- public boolean isMetaDown() {
-    return (modifiers&META_MASK)!=0;
- }
- public boolean isShiftDown()  {
-    return (modifiers&SHIFT_MASK)!=0;
- }
-
- public boolean isButton1Down()  {
-    return (modifiers&BUTTON1_MASK)!=0;
- }
-
- public boolean isButton2Down()  {
-    return (modifiers&BUTTON2_MASK)!=0;
- }
-
- public boolean isButton3Down()  {
-    return (modifiers&BUTTON3_MASK)!=0;
- }
-
- public String toString() {
-     return "InputEvent[modifiers:"+modifiers+"]";
- }
-
- private boolean consumed;
- private int modifiers;
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Insets.java b/src/newt/classes/com/jogamp/javafx/newt/Insets.java
deleted file mode 100644
index 5c91847f4..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/Insets.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- *
- */
-package com.jogamp.javafx.newt;
-
-/**
- * Simple class representing insets.
- * 
- * @author tdv
- */
-public class Insets implements Cloneable {
-    public int top;
-    public int left;
-    public int bottom;
-    public int right;
-
-    /**
-     * Creates and initializes a new <code>Insets</code> object with the
-     * specified top, left, bottom, and right insets.
-     * @param       top   the inset from the top.
-     * @param       left   the inset from the left.
-     * @param       bottom   the inset from the bottom.
-     * @param       right   the inset from the right.
-     */
-    public Insets(int top, int left, int bottom, int right) {
-        this.top = top;
-        this.left = left;
-        this.bottom = bottom;
-        this.right = right;
-    }
-
-    /**
-     * Checks whether two insets objects are equal. Two instances
-     * of <code>Insets</code> are equal if the four integer values
-     * of the fields <code>top</code>, <code>left</code>,
-     * <code>bottom</code>, and <code>right</code> are all equal.
-     * @return      <code>true</code> if the two insets are equal;
-     *                          otherwise <code>false</code>.
-     */
-    public boolean equals(Object obj) {
-        if (obj instanceof Insets) {
-            Insets insets = (Insets)obj;
-            return ((top == insets.top) && (left == insets.left) &&
-                (bottom == insets.bottom) && (right == insets.right));
-        }
-        return false;
-    }
-
-    /**
-     * Returns the hash code for this Insets.
-     *
-     * @return    a hash code for this Insets.
-     */
-    public int hashCode() {
-        int sum1 = left + bottom;
-        int sum2 = right + top;
-        int val1 = sum1 * (sum1 + 1)/2 + left;
-        int val2 = sum2 * (sum2 + 1)/2 + top;
-        int sum3 = val1 + val2;
-        return sum3 * (sum3 + 1)/2 + val2;
-    }
-
-    public String toString() {
-    	return getClass().getName() + "[top="  + top + ",left=" + left +
-            ",bottom=" + bottom + ",right=" + right + "]";
-    }
-
-    public Object clone() {
-        try {
-            return super.clone();
-        } catch (CloneNotSupportedException ex) {
-            throw new InternalError();
-        }
-    }
-
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/KeyEvent.java b/src/newt/classes/com/jogamp/javafx/newt/KeyEvent.java
deleted file mode 100644
index 8ae92464c..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/KeyEvent.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-public class KeyEvent extends InputEvent
-{
- KeyEvent(boolean sysEvent, int eventType, Window source, long when, int modifiers, int keyCode, char keyChar) {
-     super(sysEvent, eventType, source, when, modifiers); 
-     this.keyCode=keyCode;
-     this.keyChar=keyChar;
- }
- public KeyEvent(int eventType, Window source, long when, int modifiers, int keyCode, char keyChar) {
-     this(false, eventType, source, when, modifiers, keyCode, keyChar);
- }
-
- public char getKeyChar() {
-    return keyChar;
- }
- public int getKeyCode() {
-    return keyCode;
- }
-
- public String toString() {
-    return "KeyEvent["+getEventTypeString(getEventType())+
-                     ", code "+keyCode+"("+toHexString(keyCode)+"), char <"+keyChar+"> ("+toHexString((int)keyChar)+"), isActionKey "+isActionKey()+", "+super.toString()+"]";
- }
-
- public static String getEventTypeString(int type) {
-    switch(type) {
-        case EVENT_KEY_PRESSED: return "EVENT_KEY_PRESSED";
-        case EVENT_KEY_RELEASED: return "EVENT_KEY_RELEASED";
-        case EVENT_KEY_TYPED: return "EVENT_KEY_TYPED";
-        default: return "unknown (" + type + ")";
-    }
- }
-
- public boolean   isActionKey() {
-    switch (keyCode) {
-      case VK_HOME:
-      case VK_END:
-      case VK_PAGE_UP:
-      case VK_PAGE_DOWN:
-      case VK_UP:
-      case VK_DOWN:
-      case VK_LEFT:
-      case VK_RIGHT:
-
-      case VK_F1:
-      case VK_F2:
-      case VK_F3:
-      case VK_F4:
-      case VK_F5:
-      case VK_F6:
-      case VK_F7:
-      case VK_F8:
-      case VK_F9:
-      case VK_F10:
-      case VK_F11:
-      case VK_F12:
-      case VK_F13:
-      case VK_F14:
-      case VK_F15:
-      case VK_F16:
-      case VK_F17:
-      case VK_F18:
-      case VK_F19:
-      case VK_F20:
-      case VK_F21:
-      case VK_F22:
-      case VK_F23:
-      case VK_F24:
-      case VK_PRINTSCREEN:
-      case VK_CAPS_LOCK:
-      case VK_PAUSE:
-      case VK_INSERT:
-
-      case VK_HELP:
-      case VK_WINDOWS:
-          return true;
-    }
-    return false;
- }
-
-    private int keyCode;
-    private char keyChar;
-
-    public static final int EVENT_KEY_PRESSED = 300;
-    public static final int EVENT_KEY_RELEASED= 301;
-    public static final int EVENT_KEY_TYPED   = 302;
-
-    /* Virtual key codes. */
-
-    public static final int VK_ENTER          = '\n';
-    public static final int VK_BACK_SPACE     = '\b';
-    public static final int VK_TAB            = '\t';
-    public static final int VK_CANCEL         = 0x03;
-    public static final int VK_CLEAR          = 0x0C;
-    public static final int VK_SHIFT          = 0x10;
-    public static final int VK_CONTROL        = 0x11;
-    public static final int VK_ALT            = 0x12;
-    public static final int VK_PAUSE          = 0x13;
-    public static final int VK_CAPS_LOCK      = 0x14;
-    public static final int VK_ESCAPE         = 0x1B;
-    public static final int VK_SPACE          = 0x20;
-    public static final int VK_PAGE_UP        = 0x21;
-    public static final int VK_PAGE_DOWN      = 0x22;
-    public static final int VK_END            = 0x23;
-    public static final int VK_HOME           = 0x24;
-
-    /**
-     * Constant for the non-numpad <b>left</b> arrow key.
-     * @see #VK_KP_LEFT
-     */
-    public static final int VK_LEFT           = 0x25;
-
-    /**
-     * Constant for the non-numpad <b>up</b> arrow key.
-     * @see #VK_KP_UP
-     */
-    public static final int VK_UP             = 0x26;
-
-    /**
-     * Constant for the non-numpad <b>right</b> arrow key.
-     * @see #VK_KP_RIGHT
-     */
-    public static final int VK_RIGHT          = 0x27;
-
-    /**
-     * Constant for the non-numpad <b>down</b> arrow key.
-     * @see #VK_KP_DOWN
-     */
-    public static final int VK_DOWN           = 0x28;
-
-    /**
-     * Constant for the comma key, ","
-     */
-    public static final int VK_COMMA          = 0x2C;
-
-    /**
-     * Constant for the minus key, "-"
-     * @since 1.2
-     */
-    public static final int VK_MINUS          = 0x2D;
-
-    /**
-     * Constant for the period key, "."
-     */
-    public static final int VK_PERIOD         = 0x2E;
-
-    /**
-     * Constant for the forward slash key, "/"
-     */
-    public static final int VK_SLASH          = 0x2F;
-
-    /** VK_0 thru VK_9 are the same as ASCII '0' thru '9' (0x30 - 0x39) */
-    public static final int VK_0              = 0x30;
-    public static final int VK_1              = 0x31;
-    public static final int VK_2              = 0x32;
-    public static final int VK_3              = 0x33;
-    public static final int VK_4              = 0x34;
-    public static final int VK_5              = 0x35;
-    public static final int VK_6              = 0x36;
-    public static final int VK_7              = 0x37;
-    public static final int VK_8              = 0x38;
-    public static final int VK_9              = 0x39;
-
-    /**
-     * Constant for the semicolon key, ";"
-     */
-    public static final int VK_SEMICOLON      = 0x3B;
-
-    /**
-     * Constant for the equals key, "="
-     */
-    public static final int VK_EQUALS         = 0x3D;
-
-    /** VK_A thru VK_Z are the same as ASCII 'A' thru 'Z' (0x41 - 0x5A) */
-    public static final int VK_A              = 0x41;
-    public static final int VK_B              = 0x42;
-    public static final int VK_C              = 0x43;
-    public static final int VK_D              = 0x44;
-    public static final int VK_E              = 0x45;
-    public static final int VK_F              = 0x46;
-    public static final int VK_G              = 0x47;
-    public static final int VK_H              = 0x48;
-    public static final int VK_I              = 0x49;
-    public static final int VK_J              = 0x4A;
-    public static final int VK_K              = 0x4B;
-    public static final int VK_L              = 0x4C;
-    public static final int VK_M              = 0x4D;
-    public static final int VK_N              = 0x4E;
-    public static final int VK_O              = 0x4F;
-    public static final int VK_P              = 0x50;
-    public static final int VK_Q              = 0x51;
-    public static final int VK_R              = 0x52;
-    public static final int VK_S              = 0x53;
-    public static final int VK_T              = 0x54;
-    public static final int VK_U              = 0x55;
-    public static final int VK_V              = 0x56;
-    public static final int VK_W              = 0x57;
-    public static final int VK_X              = 0x58;
-    public static final int VK_Y              = 0x59;
-    public static final int VK_Z              = 0x5A;
-
-    /**
-     * Constant for the open bracket key, "["
-     */
-    public static final int VK_OPEN_BRACKET   = 0x5B;
-
-    /**
-     * Constant for the back slash key, "\"
-     */
-    public static final int VK_BACK_SLASH     = 0x5C;
-
-    /**
-     * Constant for the close bracket key, "]"
-     */
-    public static final int VK_CLOSE_BRACKET  = 0x5D;
-
-    public static final int VK_NUMPAD0        = 0x60;
-    public static final int VK_NUMPAD1        = 0x61;
-    public static final int VK_NUMPAD2        = 0x62;
-    public static final int VK_NUMPAD3        = 0x63;
-    public static final int VK_NUMPAD4        = 0x64;
-    public static final int VK_NUMPAD5        = 0x65;
-    public static final int VK_NUMPAD6        = 0x66;
-    public static final int VK_NUMPAD7        = 0x67;
-    public static final int VK_NUMPAD8        = 0x68;
-    public static final int VK_NUMPAD9        = 0x69;
-    public static final int VK_MULTIPLY       = 0x6A;
-    public static final int VK_ADD            = 0x6B;
-
-    /** 
-     * This constant is obsolete, and is included only for backwards
-     * compatibility.
-     * @see #VK_SEPARATOR
-     */
-    public static final int VK_SEPARATER      = 0x6C;
-
-    /** 
-     * Constant for the Numpad Separator key. 
-     * @since 1.4
-     */
-    public static final int VK_SEPARATOR      = VK_SEPARATER;
-
-    public static final int VK_SUBTRACT       = 0x6D;
-    public static final int VK_DECIMAL        = 0x6E;
-    public static final int VK_DIVIDE         = 0x6F;
-    public static final int VK_DELETE         = 0x7F; /* ASCII DEL */
-    public static final int VK_NUM_LOCK       = 0x90;
-    public static final int VK_SCROLL_LOCK    = 0x91;
-
-    /** Constant for the F1 function key. */
-    public static final int VK_F1             = 0x70;
-
-    /** Constant for the F2 function key. */
-    public static final int VK_F2             = 0x71;
-
-    /** Constant for the F3 function key. */
-    public static final int VK_F3             = 0x72;
-
-    /** Constant for the F4 function key. */
-    public static final int VK_F4             = 0x73;
-
-    /** Constant for the F5 function key. */
-    public static final int VK_F5             = 0x74;
-
-    /** Constant for the F6 function key. */
-    public static final int VK_F6             = 0x75;
-
-    /** Constant for the F7 function key. */
-    public static final int VK_F7             = 0x76;
-
-    /** Constant for the F8 function key. */
-    public static final int VK_F8             = 0x77;
-
-    /** Constant for the F9 function key. */
-    public static final int VK_F9             = 0x78;
-
-    /** Constant for the F10 function key. */
-    public static final int VK_F10            = 0x79;
-
-    /** Constant for the F11 function key. */
-    public static final int VK_F11            = 0x7A;
-
-    /** Constant for the F12 function key. */
-    public static final int VK_F12            = 0x7B;
-
-    /**
-     * Constant for the F13 function key.
-     * @since 1.2
-     */
-    /* F13 - F24 are used on IBM 3270 keyboard; use random range for constants. */
-    public static final int VK_F13            = 0xF000;
- 
-    /**
-     * Constant for the F14 function key.
-     * @since 1.2
-     */
-    public static final int VK_F14            = 0xF001;
- 
-    /**
-     * Constant for the F15 function key.
-     * @since 1.2
-     */
-    public static final int VK_F15            = 0xF002;
- 
-    /**
-     * Constant for the F16 function key.
-     * @since 1.2
-     */
-    public static final int VK_F16            = 0xF003;
- 
-    /**
-     * Constant for the F17 function key.
-     * @since 1.2
-     */
-    public static final int VK_F17            = 0xF004;
- 
-    /**
-     * Constant for the F18 function key.
-     * @since 1.2
-     */
-    public static final int VK_F18            = 0xF005;
- 
-    /**
-     * Constant for the F19 function key.
-     * @since 1.2
-     */
-    public static final int VK_F19            = 0xF006;
- 
-    /**
-     * Constant for the F20 function key.
-     * @since 1.2
-     */
-    public static final int VK_F20            = 0xF007;
- 
-    /**
-     * Constant for the F21 function key.
-     * @since 1.2
-     */
-    public static final int VK_F21            = 0xF008;
- 
-    /**
-     * Constant for the F22 function key.
-     * @since 1.2
-     */
-    public static final int VK_F22            = 0xF009;
- 
-    /**
-     * Constant for the F23 function key.
-     * @since 1.2
-     */
-    public static final int VK_F23            = 0xF00A;
- 
-    /**
-     * Constant for the F24 function key.
-     * @since 1.2
-     */
-    public static final int VK_F24            = 0xF00B;
- 
-    public static final int VK_PRINTSCREEN    = 0x9A;
-    public static final int VK_INSERT         = 0x9B;
-    public static final int VK_HELP           = 0x9C;
-    public static final int VK_META           = 0x9D;
-
-    public static final int VK_BACK_QUOTE     = 0xC0;
-    public static final int VK_QUOTE          = 0xDE;
-
-    /**
-     * Constant for the numeric keypad <b>up</b> arrow key.
-     * @see #VK_UP
-     * @since 1.2
-     */
-    public static final int VK_KP_UP          = 0xE0;
-
-    /**
-     * Constant for the numeric keypad <b>down</b> arrow key.
-     * @see #VK_DOWN
-     * @since 1.2
-     */
-    public static final int VK_KP_DOWN        = 0xE1;
-
-    /**
-     * Constant for the numeric keypad <b>left</b> arrow key.
-     * @see #VK_LEFT
-     * @since 1.2
-     */
-    public static final int VK_KP_LEFT        = 0xE2;
-
-    /**
-     * Constant for the numeric keypad <b>right</b> arrow key.
-     * @see #VK_RIGHT
-     * @since 1.2
-     */
-    public static final int VK_KP_RIGHT       = 0xE3;
-    
-    /* For European keyboards */
-    /** @since 1.2 */
-    public static final int VK_DEAD_GRAVE               = 0x80;
-    /** @since 1.2 */
-    public static final int VK_DEAD_ACUTE               = 0x81;
-    /** @since 1.2 */
-    public static final int VK_DEAD_CIRCUMFLEX          = 0x82;
-    /** @since 1.2 */
-    public static final int VK_DEAD_TILDE               = 0x83;
-    /** @since 1.2 */
-    public static final int VK_DEAD_MACRON              = 0x84;
-    /** @since 1.2 */
-    public static final int VK_DEAD_BREVE               = 0x85;
-    /** @since 1.2 */
-    public static final int VK_DEAD_ABOVEDOT            = 0x86;
-    /** @since 1.2 */
-    public static final int VK_DEAD_DIAERESIS           = 0x87;
-    /** @since 1.2 */
-    public static final int VK_DEAD_ABOVERING           = 0x88;
-    /** @since 1.2 */
-    public static final int VK_DEAD_DOUBLEACUTE         = 0x89;
-    /** @since 1.2 */
-    public static final int VK_DEAD_CARON               = 0x8a;
-    /** @since 1.2 */
-    public static final int VK_DEAD_CEDILLA             = 0x8b;
-    /** @since 1.2 */
-    public static final int VK_DEAD_OGONEK              = 0x8c;
-    /** @since 1.2 */
-    public static final int VK_DEAD_IOTA                = 0x8d;
-    /** @since 1.2 */
-    public static final int VK_DEAD_VOICED_SOUND        = 0x8e;
-    /** @since 1.2 */
-    public static final int VK_DEAD_SEMIVOICED_SOUND    = 0x8f;
-
-    /** @since 1.2 */
-    public static final int VK_AMPERSAND                = 0x96;
-    /** @since 1.2 */
-    public static final int VK_ASTERISK                 = 0x97;
-    /** @since 1.2 */
-    public static final int VK_QUOTEDBL                 = 0x98;
-    /** @since 1.2 */
-    public static final int VK_LESS                     = 0x99;
-
-    /** @since 1.2 */
-    public static final int VK_GREATER                  = 0xa0;
-    /** @since 1.2 */
-    public static final int VK_BRACELEFT                = 0xa1;
-    /** @since 1.2 */
-    public static final int VK_BRACERIGHT               = 0xa2;
-
-    /**
-     * Constant for the "@" key.
-     * @since 1.2
-     */
-    public static final int VK_AT                       = 0x0200;
- 
-    /**
-     * Constant for the ":" key.
-     * @since 1.2
-     */
-    public static final int VK_COLON                    = 0x0201;
- 
-    /**
-     * Constant for the "^" key.
-     * @since 1.2
-     */
-    public static final int VK_CIRCUMFLEX               = 0x0202;
- 
-    /**
-     * Constant for the "$" key.
-     * @since 1.2
-     */
-    public static final int VK_DOLLAR                   = 0x0203;
- 
-    /**
-     * Constant for the Euro currency sign key.
-     * @since 1.2
-     */
-    public static final int VK_EURO_SIGN                = 0x0204;
- 
-    /**
-     * Constant for the "!" key.
-     * @since 1.2
-     */
-    public static final int VK_EXCLAMATION_MARK         = 0x0205;
- 
-    /**
-     * Constant for the inverted exclamation mark key.
-     * @since 1.2
-     */
-    public static final int VK_INVERTED_EXCLAMATION_MARK = 0x0206;
- 
-    /**
-     * Constant for the "(" key.
-     * @since 1.2
-     */
-    public static final int VK_LEFT_PARENTHESIS         = 0x0207;
- 
-    /**
-     * Constant for the "#" key.
-     * @since 1.2
-     */
-    public static final int VK_NUMBER_SIGN              = 0x0208;
- 
-    /**
-     * Constant for the "+" key.
-     * @since 1.2
-     */
-    public static final int VK_PLUS                     = 0x0209;
- 
-    /**
-     * Constant for the ")" key.
-     * @since 1.2
-     */
-    public static final int VK_RIGHT_PARENTHESIS        = 0x020A;
- 
-    /**
-     * Constant for the "_" key.
-     * @since 1.2
-     */
-    public static final int VK_UNDERSCORE               = 0x020B;
- 
-    /**
-     * Constant for the Microsoft Windows "Windows" key.
-     * It is used for both the left and right version of the key.  
-     * @see #getKeyLocation()
-     * @since 1.5
-     */
-    public static final int VK_WINDOWS                  = 0x020C;
- 
-    /**
-     * Constant for the Microsoft Windows Context Menu key.
-     * @since 1.5
-     */
-    public static final int VK_CONTEXT_MENU             = 0x020D;
- 
-    /* for input method support on Asian Keyboards */
-
-    /* not clear what this means - listed in Microsoft Windows API */
-    public static final int VK_FINAL                    = 0x0018;
-    
-    /** Constant for the Convert function key. */
-    /* Japanese PC 106 keyboard, Japanese Solaris keyboard: henkan */
-    public static final int VK_CONVERT                  = 0x001C;
-
-    /** Constant for the Don't Convert function key. */
-    /* Japanese PC 106 keyboard: muhenkan */
-    public static final int VK_NONCONVERT               = 0x001D;
-    
-    /** Constant for the Accept or Commit function key. */
-    /* Japanese Solaris keyboard: kakutei */
-    public static final int VK_ACCEPT                   = 0x001E;
-
-    /* not clear what this means - listed in Microsoft Windows API */
-    public static final int VK_MODECHANGE               = 0x001F;
-
-    /* replaced by VK_KANA_LOCK for Microsoft Windows and Solaris; 
-       might still be used on other platforms */
-    public static final int VK_KANA                     = 0x0015;
-
-    /* replaced by VK_INPUT_METHOD_ON_OFF for Microsoft Windows and Solaris; 
-       might still be used for other platforms */
-    public static final int VK_KANJI                    = 0x0019;
-
-    /**
-     * Constant for the Alphanumeric function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard: eisuu */
-    public static final int VK_ALPHANUMERIC             = 0x00F0;
- 
-    /**
-     * Constant for the Katakana function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard: katakana */
-    public static final int VK_KATAKANA                 = 0x00F1;
- 
-    /**
-     * Constant for the Hiragana function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard: hiragana */
-    public static final int VK_HIRAGANA                 = 0x00F2;
- 
-    /**
-     * Constant for the Full-Width Characters function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard: zenkaku */
-    public static final int VK_FULL_WIDTH               = 0x00F3;
- 
-    /**
-     * Constant for the Half-Width Characters function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard: hankaku */
-    public static final int VK_HALF_WIDTH               = 0x00F4;
- 
-    /**
-     * Constant for the Roman Characters function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard: roumaji */
-    public static final int VK_ROMAN_CHARACTERS         = 0x00F5;
- 
-    /**
-     * Constant for the All Candidates function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard - VK_CONVERT + ALT: zenkouho */
-    public static final int VK_ALL_CANDIDATES           = 0x0100;
- 
-    /**
-     * Constant for the Previous Candidate function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard - VK_CONVERT + SHIFT: maekouho */
-    public static final int VK_PREVIOUS_CANDIDATE       = 0x0101;
- 
-    /**
-     * Constant for the Code Input function key.
-     * @since 1.2
-     */
-    /* Japanese PC 106 keyboard - VK_ALPHANUMERIC + ALT: kanji bangou */
-    public static final int VK_CODE_INPUT               = 0x0102;
- 
-    /**
-     * Constant for the Japanese-Katakana function key.
-     * This key switches to a Japanese input method and selects its Katakana input mode.
-     * @since 1.2
-     */
-    /* Japanese Macintosh keyboard - VK_JAPANESE_HIRAGANA + SHIFT */
-    public static final int VK_JAPANESE_KATAKANA        = 0x0103;
- 
-    /**
-     * Constant for the Japanese-Hiragana function key.
-     * This key switches to a Japanese input method and selects its Hiragana input mode.
-     * @since 1.2
-     */
-    /* Japanese Macintosh keyboard */
-    public static final int VK_JAPANESE_HIRAGANA        = 0x0104;
- 
-    /**
-     * Constant for the Japanese-Roman function key.
-     * This key switches to a Japanese input method and selects its Roman-Direct input mode.
-     * @since 1.2
-     */
-    /* Japanese Macintosh keyboard */
-    public static final int VK_JAPANESE_ROMAN           = 0x0105;
-
-    /**
-     * Constant for the locking Kana function key.
-     * This key locks the keyboard into a Kana layout.
-     * @since 1.3
-     */
-    /* Japanese PC 106 keyboard with special Windows driver - eisuu + Control; Japanese Solaris keyboard: kana */
-    public static final int VK_KANA_LOCK                = 0x0106;
-
-    /**
-     * Constant for the input method on/off key.
-     * @since 1.3
-     */
-    /* Japanese PC 106 keyboard: kanji. Japanese Solaris keyboard: nihongo */
-    public static final int VK_INPUT_METHOD_ON_OFF      = 0x0107;
-
-    /* for Sun keyboards */
-    /** @since 1.2 */
-    public static final int VK_CUT                      = 0xFFD1;
-    /** @since 1.2 */
-    public static final int VK_COPY                     = 0xFFCD;
-    /** @since 1.2 */
-    public static final int VK_PASTE                    = 0xFFCF;
-    /** @since 1.2 */
-    public static final int VK_UNDO                     = 0xFFCB;
-    /** @since 1.2 */
-    public static final int VK_AGAIN                    = 0xFFC9;
-    /** @since 1.2 */
-    public static final int VK_FIND                     = 0xFFD0;
-    /** @since 1.2 */
-    public static final int VK_PROPS                    = 0xFFCA;
-    /** @since 1.2 */
-    public static final int VK_STOP                     = 0xFFC8;
-    
-    /**
-     * Constant for the Compose function key.
-     * @since 1.2
-     */
-    public static final int VK_COMPOSE                  = 0xFF20;
- 
-    /**
-     * Constant for the AltGraph function key.
-     * @since 1.2
-     */
-    public static final int VK_ALT_GRAPH                = 0xFF7E;
-
-    /**
-     * Constant for the Begin key.
-     * @since 1.5
-     */
-    public static final int VK_BEGIN                    = 0xFF58;
-
-    /**
-     * This value is used to indicate that the keyCode is unknown.
-     * KEY_TYPED events do not have a keyCode value; this value 
-     * is used instead.  
-     */
-    public static final int VK_UNDEFINED      = 0x0;
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/KeyListener.java b/src/newt/classes/com/jogamp/javafx/newt/KeyListener.java
deleted file mode 100644
index 7921a0a97..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/KeyListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-public interface KeyListener extends EventListener
-{
- public void keyPressed(KeyEvent e);
- public void keyReleased(KeyEvent e);
- public void keyTyped(KeyEvent e) ;
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/MouseEvent.java b/src/newt/classes/com/jogamp/javafx/newt/MouseEvent.java
deleted file mode 100644
index 82989e216..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/MouseEvent.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-public class MouseEvent extends InputEvent
-{
-  public static final int BUTTON1 = 1;
-  public static final int BUTTON2 = 2;
-  public static final int BUTTON3 = 3;
-  public static final int BUTTON4 = 4;
-  public static final int BUTTON5 = 5;
-  public static final int BUTTON6 = 6;
-  public static final int BUTTON_NUMBER = 6;
-
- protected MouseEvent(boolean sysEvent, int eventType, Window source, long when,
-                      int modifiers, int x, int y, int clickCount, int button,
-                      int rotation)
- {
-     super(sysEvent, eventType, source, when, modifiers); 
-     this.x=x;
-     this.y=y;
-     this.clickCount=clickCount;
-     this.button=button;
-     this.wheelRotation = rotation;
- }
- public MouseEvent(int eventType, Window source, long when, int modifiers,
-                   int x, int y, int clickCount, int button, int rotation) {
-     this(false, eventType, source, when, modifiers, x, y, clickCount, button,
-          rotation);
- }
-
- public int getButton() {
-    return button;
- }
- public int getClickCount() {
-    return clickCount;
- }
- public int getX() {
-    return x;
- }
- public int getY() {
-    return y;
- }
- public int getWheelRotation() {
-    return wheelRotation;
- }
- 
- public String toString() {
-    return "MouseEvent["+getEventTypeString(getEventType())+
-                       ", "+x+"/"+y+", button "+button+", count "+clickCount+
-                       ", wheel rotation "+wheelRotation+
-                       ", "+super.toString()+"]";
- }
-
- public static String getEventTypeString(int type) {
-    switch(type) {
-        case EVENT_MOUSE_CLICKED: return "EVENT_MOUSE_CLICKED";
-        case EVENT_MOUSE_ENTERED: return "EVENT_MOUSE_ENTERED";
-        case EVENT_MOUSE_EXITED: return "EVENT_MOUSE_EXITED";
-        case EVENT_MOUSE_PRESSED: return "EVENT_MOUSE_PRESSED";
-        case EVENT_MOUSE_RELEASED: return "EVENT_MOUSE_RELEASED";
-        case EVENT_MOUSE_MOVED: return "EVENT_MOUSE_MOVED";
-        case EVENT_MOUSE_DRAGGED: return "EVENT_MOUSE_DRAGGED";
-        case EVENT_MOUSE_WHEEL_MOVED: return "EVENT_MOUSE_WHEEL_MOVED";
-        default: return "unknown (" + type + ")";
-    }
- }
-
- private int x, y, clickCount, button, wheelRotation;
-
- public static final int EVENT_MOUSE_CLICKED  = 200;
- public static final int EVENT_MOUSE_ENTERED  = 201;
- public static final int EVENT_MOUSE_EXITED   = 202;
- public static final int EVENT_MOUSE_PRESSED  = 203;
- public static final int EVENT_MOUSE_RELEASED = 204;
- public static final int EVENT_MOUSE_MOVED    = 205;
- public static final int EVENT_MOUSE_DRAGGED  = 206;
- public static final int EVENT_MOUSE_WHEEL_MOVED = 207;
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/MouseListener.java b/src/newt/classes/com/jogamp/javafx/newt/MouseListener.java
deleted file mode 100644
index a0d42f738..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/MouseListener.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-public interface MouseListener extends EventListener
-{
- public void mouseClicked(MouseEvent e);
- public void mouseEntered(MouseEvent e);
- public void mouseExited(MouseEvent e);
- public void mousePressed(MouseEvent e);
- public void mouseReleased(MouseEvent e);
- public void mouseMoved(MouseEvent e);
- public void mouseDragged(MouseEvent e);
- public void mouseWheelMoved(MouseEvent e);
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/NewtFactory.java b/src/newt/classes/com/jogamp/javafx/newt/NewtFactory.java
deleted file mode 100755
index aae51aaf6..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/NewtFactory.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-import javax.media.nativewindow.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-import com.jogamp.nativewindow.impl.jvm.JVMUtil;
-
-public abstract class NewtFactory {
-    // Work-around for initialization order problems on Mac OS X
-    // between native Newt and (apparently) Fmod
-    static {
-        JVMUtil.initSingleton();
-        Window.init(NativeWindowFactory.getNativeWindowType(true));
-    }
-
-    static Class getCustomClass(String packageName, String classBaseName) {
-        Class clazz = null;
-        if(packageName!=null || classBaseName!=null) {
-            String clazzName = packageName + "." + classBaseName ;
-            try {
-                clazz = Class.forName(clazzName);
-            } catch (Throwable t) {}
-        }
-        return clazz;
-    }
-
-    private static boolean useEDT = true;
-
-    /** 
-     * Toggles the usage of an EventDispatchThread while creating a Display.<br>
-     * The default is enabled.<br>
-     * The EventDispatchThread is thread local to the Display instance.<br>
-     */
-    public static synchronized void setUseEDT(boolean onoff) {
-        useEDT = onoff;
-    }
-
-    /** @see #setUseEDT(boolean) */
-    public static boolean useEDT() { return useEDT; }
-
-    /**
-     * Create a Display entity, incl native creation
-     */
-    public static Display createDisplay(String name) {
-      return Display.create(NativeWindowFactory.getNativeWindowType(true), name);
-    }
-
-    /**
-     * Create a Display entity using the given implementation type, incl native creation
-     */
-    public static Display createDisplay(String type, String name) {
-      return Display.create(type, name);
-    }
-
-    /**
-     * Create a Screen entity, incl native creation
-     */
-    public static Screen createScreen(Display display, int index) {
-      return Screen.create(NativeWindowFactory.getNativeWindowType(true), display, index);
-    }
-
-    /**
-     * Create a Screen entity using the given implementation type, incl native creation
-     */
-    public static Screen createScreen(String type, Display display, int index) {
-      return Screen.create(type, display, index);
-    }
-
-    /**
-     * Create a Window entity, incl native creation
-     */
-    public static Window createWindow(Screen screen, Capabilities caps) {
-        return Window.create(NativeWindowFactory.getNativeWindowType(true), 0, screen, caps, false);
-    }
-
-    public static Window createWindow(Screen screen, Capabilities caps, boolean undecorated) {
-        return Window.create(NativeWindowFactory.getNativeWindowType(true), 0, screen, caps, undecorated);
-    }
-
-    public static Window createWindow(long parentWindowHandle, Screen screen, Capabilities caps, boolean undecorated) {
-        return Window.create(NativeWindowFactory.getNativeWindowType(true), parentWindowHandle, screen, caps, undecorated);
-    }
-
-    /**
-     * Ability to try a Window type with a construnctor argument, if supported ..<p>
-     * Currently only valid is <code> AWTWindow(Frame frame) </code>,
-     * to support an external created AWT Frame, ie the browsers embedded frame.
-     */
-    public static Window createWindow(Object[] cstrArguments, Screen screen, Capabilities caps, boolean undecorated) {
-        return Window.create(NativeWindowFactory.getNativeWindowType(true), cstrArguments, screen, caps, undecorated);
-    }
-
-    /**
-     * Create a Window entity using the given implementation type, incl native creation
-     */
-    public static Window createWindow(String type, Screen screen, Capabilities caps) {
-        return Window.create(type, 0, screen, caps, false);
-    }
-
-    public static Window createWindow(String type, Screen screen, Capabilities caps, boolean undecorated) {
-        return Window.create(type, 0, screen, caps, undecorated);
-    }
-
-    public static Window createWindow(String type, long parentWindowHandle, Screen screen, Capabilities caps, boolean undecorated) {
-        return Window.create(type, parentWindowHandle, screen, caps, undecorated);
-    }
-
-    public static Window createWindow(String type, Object[] cstrArguments, Screen screen, Capabilities caps, boolean undecorated) {
-        return Window.create(type, cstrArguments, screen, caps, undecorated);
-    }
-
-    /**
-     * Instantiate a Display entity using the native handle.
-     */
-    public static Display wrapDisplay(String name, AbstractGraphicsDevice device) {
-      return Display.wrapHandle(NativeWindowFactory.getNativeWindowType(true), name, device);
-    }
-
-    /**
-     * Instantiate a Screen entity using the native handle.
-     */
-    public static Screen wrapScreen(Display display, AbstractGraphicsScreen screen) {
-      return Screen.wrapHandle(NativeWindowFactory.getNativeWindowType(true), display, screen);
-    }
-
-    /**
-     * Instantiate a Window entity using the native handle.
-     */
-    public static Window wrapWindow(Screen screen, AbstractGraphicsConfiguration config,
-                                    long windowHandle, boolean fullscreen, boolean visible, 
-                                    int x, int y, int width, int height) {
-      return Window.wrapHandle(NativeWindowFactory.getNativeWindowType(true), screen, config,
-                               windowHandle, fullscreen, visible, x, y, width, height);
-    }
-
-    private static final boolean instanceOf(Object obj, String clazzName) {
-        Class clazz = obj.getClass();
-        do {
-            if(clazz.getName().equals(clazzName)) {
-                return true;
-            }
-            clazz = clazz.getSuperclass();
-        } while (clazz!=null);
-        return false;
-    }
-
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/OffscreenWindow.java b/src/newt/classes/com/jogamp/javafx/newt/OffscreenWindow.java
deleted file mode 100644
index 015e9b8d2..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/OffscreenWindow.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-import javax.media.nativewindow.*;
-
-public class OffscreenWindow extends Window implements SurfaceChangeable {
-
-    long surfaceHandle = 0;
-
-    public OffscreenWindow() {
-    }
-
-    static long nextWindowHandle = 0x100; // start here - a marker
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        if(0!=parentWindowHandle) {
-            throw new NativeWindowException("OffscreenWindow does not support window parenting");
-        }
-        if(caps.isOnscreen()) {
-            throw new NativeWindowException("Capabilities is onscreen");
-        }
-        AbstractGraphicsScreen aScreen = screen.getGraphicsScreen();
-        config = GraphicsConfigurationFactory.getFactory(aScreen.getDevice()).chooseGraphicsConfiguration(caps, null, aScreen);
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-
-        synchronized(OffscreenWindow.class) {
-            windowHandle = nextWindowHandle++;
-        }
-    }
-
-    protected void closeNative() {
-        // nop
-    }
-
-    public void invalidate() {
-        super.invalidate();
-        surfaceHandle = 0;
-    }
-
-    public synchronized void destroy() {
-        surfaceHandle = 0;
-    }
-
-    public void setSurfaceHandle(long handle) {
-        surfaceHandle = handle ;
-    }
-
-    public long getSurfaceHandle() {
-        return surfaceHandle;
-    }
-
-    public void setVisible(boolean visible) {
-        if(!visible) {
-            this.visible = visible;
-        }
-    }
-
-    public void setSize(int width, int height) {
-        if(!visible) {
-            this.width = width;
-            this.height = height;
-        }
-    }
-
-    public void setPosition(int x, int y) {
-        // nop
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        // nop
-        return false;
-    }
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/PaintEvent.java b/src/newt/classes/com/jogamp/javafx/newt/PaintEvent.java
deleted file mode 100755
index 8543246a7..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/PaintEvent.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- *
- */
-
-package com.jogamp.javafx.newt;
-
-/**
- *
- * @author tdv
- */
-public class PaintEvent extends Event {
-
-    // bounds of the damage region
-    private int x, y, width, height;
-    public PaintEvent(int eventType, Window source,
-                       long when, int x, int y, int w, int h)
-    {
-        super(true, eventType, source, when);
-        this.x = x;
-        this.y = y;
-        this.width = w;
-        this.height = h;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    public int getWidth() {
-        return width;
-    }
-
-    public int getX() {
-        return x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public String toString() {
-        return "ExposeEvent[modifiers: x="+x+" y="+y+" w="+width+" h="+height +"]";
-    }
-
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/PaintListener.java b/src/newt/classes/com/jogamp/javafx/newt/PaintListener.java
deleted file mode 100755
index adfd78f18..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/PaintListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- *
- */
-
-package com.jogamp.javafx.newt;
-
-/**
- *
- * @author tdv
- */
-public interface PaintListener {
-    public void exposed(PaintEvent e);
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Screen.java b/src/newt/classes/com/jogamp/javafx/newt/Screen.java
deleted file mode 100755
index b02a7ef00..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/Screen.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-import com.jogamp.javafx.newt.impl.*;
-
-import javax.media.nativewindow.*;
-import java.security.*;
-
-public abstract class Screen {
-
-    private static Class getScreenClass(String type) 
-        throws ClassNotFoundException 
-    {
-        Class screenClass = NewtFactory.getCustomClass(type, "Screen");
-        if(null==screenClass) {
-            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
-                screenClass = Class.forName("com.jogamp.javafx.newt.opengl.kd.KDScreen");
-            } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
-                screenClass = Class.forName("com.jogamp.javafx.newt.windows.WindowsScreen");
-            } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-                screenClass = Class.forName("com.jogamp.javafx.newt.macosx.MacScreen");
-            } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
-                screenClass = Class.forName("com.jogamp.javafx.newt.x11.X11Screen");
-            } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
-                screenClass = Class.forName("com.jogamp.javafx.newt.awt.AWTScreen");
-            } else {
-                throw new RuntimeException("Unknown window type \"" + type + "\"");
-            }
-        }
-        return screenClass;
-    }
-
-    protected static Screen create(String type, Display display, int idx) {
-        try {
-            if(usrWidth<0 || usrHeight<0) {
-                usrWidth  = Debug.getIntProperty("newt.ws.swidth", true, localACC);
-                usrHeight = Debug.getIntProperty("newt.ws.sheight", true, localACC);
-                System.out.println("User screen size "+usrWidth+"x"+usrHeight);
-            }
-            Class screenClass = getScreenClass(type);
-            Screen screen  = (Screen) screenClass.newInstance();
-            screen.display = display;
-            screen.createNative(idx);
-            if(null==screen.aScreen) {
-                throw new RuntimeException("Screen.createNative() failed to instanciate an AbstractGraphicsScreen");
-            }
-            return screen;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public synchronized void destroy() {
-        closeNative();
-        display = null;
-        aScreen = null;
-    }
-
-    protected static Screen wrapHandle(String type, Display display, AbstractGraphicsScreen aScreen) {
-        try {
-            Class screenClass = getScreenClass(type);
-            Screen screen  = (Screen) screenClass.newInstance();
-            screen.display = display;
-            screen.aScreen = aScreen;
-            return screen;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    protected abstract void createNative(int index);
-    protected abstract void closeNative();
-
-    protected void setScreenSize(int w, int h) {
-        System.out.println("Detected screen size "+w+"x"+h);
-        width=w; height=h;
-    }
-
-    public Display getDisplay() {
-        return display;
-    }
-
-    public int getIndex() {
-        return aScreen.getIndex();
-    }
-
-    public AbstractGraphicsScreen getGraphicsScreen() {
-        return aScreen;
-    }
-
-    /**
-     * The actual implementation shall return the detected display value,
-     * if not we return 800.
-     * This can be overwritten with the user property 'newt.ws.swidth',
-     */
-    public int getWidth() {
-        return (usrWidth>0) ? usrWidth : (width>0) ? width : 480;
-    }
-
-    /**
-     * The actual implementation shall return the detected display value,
-     * if not we return 480.
-     * This can be overwritten with the user property 'newt.ws.sheight',
-     */
-    public int getHeight() {
-        return (usrHeight>0) ? usrHeight : (height>0) ? height : 480;
-    }
-
-    protected Display display;
-    protected AbstractGraphicsScreen aScreen;
-    protected int width=-1, height=-1; // detected values: set using setScreenSize
-    protected static int usrWidth=-1, usrHeight=-1; // property values: newt.ws.swidth and newt.ws.sheight
-    private static AccessControlContext localACC = AccessController.getContext();
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Window.java b/src/newt/classes/com/jogamp/javafx/newt/Window.java
deleted file mode 100755
index 2d9341e13..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/Window.java
+++ /dev/null
@@ -1,929 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-import com.jogamp.javafx.newt.impl.Debug;
-import com.jogamp.javafx.newt.util.EventDispatchThread;
-
-import javax.media.nativewindow.*;
-import com.jogamp.nativewindow.impl.NWReflection;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.lang.reflect.Method;
-
-public abstract class Window implements NativeWindow
-{
-    public static final boolean DEBUG_MOUSE_EVENT = Debug.debug("Window.MouseEvent");
-    public static final boolean DEBUG_KEY_EVENT = Debug.debug("Window.KeyEvent");
-    public static final boolean DEBUG_WINDOW_EVENT = Debug.debug("Window.WindowEvent");
-    public static final boolean DEBUG_IMPLEMENTATION = Debug.debug("Window");
-    
-    // Workaround for initialization order problems on Mac OS X
-    // between native Newt and (apparently) Fmod -- if Fmod is
-    // initialized first then the connection to the window server
-    // breaks, leading to errors from deep within the AppKit
-    static void init(String type) {
-        if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-            try {
-                getWindowClass(type);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static Class getWindowClass(String type) 
-        throws ClassNotFoundException 
-    {
-        Class windowClass = NewtFactory.getCustomClass(type, "Window");
-        if(null==windowClass) {
-            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
-                windowClass = Class.forName("com.jogamp.javafx.newt.opengl.kd.KDWindow");
-            } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
-                windowClass = Class.forName("com.jogamp.javafx.newt.windows.WindowsWindow");
-            } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-                windowClass = Class.forName("com.jogamp.javafx.newt.macosx.MacWindow");
-            } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
-                windowClass = Class.forName("com.jogamp.javafx.newt.x11.X11Window");
-            } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
-                windowClass = Class.forName("com.jogamp.javafx.newt.awt.AWTWindow");
-            } else {
-                throw new NativeWindowException("Unknown window type \"" + type + "\"");
-            }
-        }
-        return windowClass;
-    }
-
-    protected static Window create(String type, final long parentWindowHandle, Screen screen, final Capabilities caps, boolean undecorated) {
-        try {
-            Class windowClass;
-            if(caps.isOnscreen()) {
-                windowClass = getWindowClass(type);
-            } else {
-                windowClass = OffscreenWindow.class;
-            }
-            Window window = (Window) windowClass.newInstance();
-            window.invalidate();
-            window.screen   = screen;
-            window.setUndecorated(undecorated||0!=parentWindowHandle);
-            EventDispatchThread edt = screen.getDisplay().getEDT();
-            if(null!=edt) {
-                final Window f_win = window;
-                edt.invokeAndWait(new Runnable() {
-                    public void run() {
-                        f_win.createNative(parentWindowHandle, caps);
-                    }
-                } );
-            } else {
-                window.createNative(parentWindowHandle, caps);
-            }
-            return window;
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw new NativeWindowException(t);
-        }
-    }
-
-    protected static Window create(String type, Object[] cstrArguments, Screen screen, final Capabilities caps, boolean undecorated) {
-        try {
-            Class windowClass = getWindowClass(type);
-            Class[] cstrArgumentTypes = getCustomConstructorArgumentTypes(windowClass);
-            if(null==cstrArgumentTypes) {
-                throw new NativeWindowException("WindowClass "+windowClass+" doesn't support custom arguments in constructor");
-            }
-            int argsChecked = verifyConstructorArgumentTypes(cstrArgumentTypes, cstrArguments);
-            if ( argsChecked < cstrArguments.length ) {
-                throw new NativeWindowException("WindowClass "+windowClass+" constructor mismatch at argument #"+argsChecked+"; Constructor: "+getTypeStrList(cstrArgumentTypes)+", arguments: "+getArgsStrList(cstrArguments));
-            }
-            Window window = (Window) NWReflection.createInstance( windowClass, cstrArgumentTypes, cstrArguments ) ;
-            window.invalidate();
-            window.screen   = screen;
-            window.setUndecorated(undecorated);
-            EventDispatchThread edt = screen.getDisplay().getEDT();
-            if(null!=edt) {
-                final Window f_win = window;
-                edt.invokeAndWait(new Runnable() {
-                    public void run() {
-                        f_win.createNative(0, caps);
-                    }
-                } );
-            } else {
-                window.createNative(0, caps);
-            }
-            return window;
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw new NativeWindowException(t);
-        }
-    }
-
-    protected static Window wrapHandle(String type, Screen screen, AbstractGraphicsConfiguration config, 
-                                 long windowHandle, boolean fullscreen, boolean visible, 
-                                 int x, int y, int width, int height) 
-    {
-        try {
-            Class windowClass = getWindowClass(type);
-            Window window = (Window) windowClass.newInstance();
-            window.invalidate();
-            window.screen   = screen;
-            window.config = config;
-            window.windowHandle = windowHandle;
-            window.fullscreen=fullscreen;
-            window.visible=visible;
-            window.x=x;
-            window.y=y;
-            window.width=width;
-            window.height=height;
-            return window;
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw new NativeWindowException(t);
-        }
-    }
-
-    public static String toHexString(int hex) {
-        return "0x" + Integer.toHexString(hex);
-    }
-
-    public static String toHexString(long hex) {
-        return "0x" + Long.toHexString(hex);
-    }
-
-    protected Screen screen;
-
-    protected AbstractGraphicsConfiguration config;
-    protected long   windowHandle;
-    protected boolean fullscreen, visible;
-    protected int width, height, x, y;
-    protected int     eventMask;
-
-    protected String title = "Newt Window";
-    protected boolean undecorated = false;
-
-    /**
-     * Create native windowHandle, ie creates a new native invisible window.
-     *
-     * The parentWindowHandle may be null, in which case no window parenting 
-     * is requested.
-     *
-     * Shall use the capabilities to determine the graphics configuration
-     * and shall set the chosen capabilities.
-     */
-    protected abstract void createNative(long parentWindowHandle, Capabilities caps);
-
-    protected abstract void closeNative();
-
-    public Screen getScreen() {
-        return screen;
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append(getClass().getName()+"[config "+config+
-                    ", windowHandle "+toHexString(getWindowHandle())+
-                    ", surfaceHandle "+toHexString(getSurfaceHandle())+
-                    ", pos "+getX()+"/"+getY()+", size "+getWidth()+"x"+getHeight()+
-                    ", visible "+isVisible()+
-                    ", undecorated "+undecorated+
-                    ", fullscreen "+fullscreen+
-                    ", "+screen+
-                    ", wrappedWindow "+getWrappedWindow());
-
-        sb.append(", SurfaceUpdatedListeners num "+surfaceUpdatedListeners.size()+" [");
-        for (Iterator iter = surfaceUpdatedListeners.iterator(); iter.hasNext(); ) {
-          sb.append(iter.next()+", ");
-        }
-        sb.append("], WindowListeners num "+windowListeners.size()+" [");
-        for (Iterator iter = windowListeners.iterator(); iter.hasNext(); ) {
-          sb.append(iter.next()+", ");
-        }
-        sb.append("], MouseListeners num "+mouseListeners.size()+" [");
-        for (Iterator iter = mouseListeners.iterator(); iter.hasNext(); ) {
-          sb.append(iter.next()+", ");
-        }
-        sb.append("], KeyListeners num "+keyListeners.size()+" [");
-        for (Iterator iter = keyListeners.iterator(); iter.hasNext(); ) {
-          sb.append(iter.next()+", ");
-        }
-        sb.append("] ]");
-        return sb.toString();
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public void setUndecorated(boolean value) {
-        undecorated = value;
-    }
-
-    public boolean isUndecorated() {
-        return undecorated;
-    }
-
-    public void requestFocus() {
-    }
-
-    //
-    // NativeWindow impl
-    //
-    private Thread owner;
-    private int recursionCount;
-    protected Exception lockedStack = null;
-
-    /** Recursive and blocking lockSurface() implementation */
-    public synchronized int lockSurface() {
-        // We leave the ToolkitLock lock to the specializtion's discretion, 
-        // ie the implicit JAWTWindow in case of AWTWindow
-        Thread cur = Thread.currentThread();
-        if (owner == cur) {
-            ++recursionCount;
-            return LOCK_SUCCESS;
-        }
-        while (owner != null) {
-            try {
-                wait();
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        owner = cur;
-        lockedStack = new Exception("NEWT Surface previously locked by "+Thread.currentThread());
-        screen.getDisplay().lockDisplay();
-        return LOCK_SUCCESS;
-    }
-
-    /** Recursive and unblocking unlockSurface() implementation */
-    public synchronized void unlockSurface() throws NativeWindowException {
-        Thread cur = Thread.currentThread();
-        if (owner != cur) {
-            lockedStack.printStackTrace();
-            throw new NativeWindowException(cur+": Not owner, owner is "+owner);
-        }
-        if (recursionCount > 0) {
-            --recursionCount;
-            return;
-        }
-        owner = null;
-        lockedStack = null;
-        screen.getDisplay().unlockDisplay();
-        notifyAll();
-        // We leave the ToolkitLock unlock to the specializtion's discretion, 
-        // ie the implicit JAWTWindow in case of AWTWindow
-    }
-
-    public synchronized boolean isSurfaceLocked() {
-        return null!=owner;
-    }
-
-    public synchronized Thread getSurfaceLockOwner() {
-        return owner;
-    }
-
-    public synchronized Exception getLockedStack() {
-        return lockedStack;
-    }
-
-    public synchronized void destroy() {
-        destroy(false);
-    }
-
-    /** @param deep If true, the linked Screen and Display will be destroyed as well. */
-    public synchronized void destroy(boolean deep) {
-        if(DEBUG_WINDOW_EVENT) {
-            System.out.println("Window.destroy() start (deep "+deep+" - "+Thread.currentThread());
-        }
-        synchronized(surfaceUpdatedListeners) {
-            surfaceUpdatedListeners = new ArrayList();
-        }
-        synchronized(windowListeners) {
-            windowListeners = new ArrayList();
-        }
-        synchronized(mouseListeners) {
-            mouseListeners = new ArrayList();
-        }
-        synchronized(keyListeners) {
-            keyListeners = new ArrayList();
-        }
-        Screen scr = screen;
-        Display dpy = (null!=screen) ? screen.getDisplay() : null;
-        EventDispatchThread edt = (null!=dpy) ? dpy.getEDT() : null;
-        if(null!=edt) {
-            final Window f_win = this;
-            edt.invokeAndWait(new Runnable() {
-                public void run() {
-                    f_win.closeNative();
-                }
-            } );
-        } else {
-            closeNative();
-        }
-        invalidate();
-        if(deep) {
-            if(null!=scr) {
-                scr.destroy();
-            }
-            if(null!=dpy) {
-                dpy.destroy();
-            }
-        }
-        if(DEBUG_WINDOW_EVENT) {
-            System.out.println("Window.destroy() end "+Thread.currentThread());
-        }
-    }
-
-    public void invalidate() {
-        if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-            Exception e = new Exception("!!! Window Invalidate "+Thread.currentThread());
-            e.printStackTrace();
-        }
-        screen   = null;
-        windowHandle = 0;
-        fullscreen=false;
-        visible=false;
-        eventMask = 0;
-
-        // Default position and dimension will be re-set immediately by user
-        width  = 100;
-        height = 100;
-        x=0;
-        y=0;
-    }
-
-    public boolean surfaceSwap() { 
-        return false;
-    }
-
-    protected void clearEventMask() {
-        eventMask=0;
-    }
-
-    public long getDisplayHandle() {
-        return screen.getDisplay().getHandle();
-    }
-
-    public int  getScreenIndex() {
-        return screen.getIndex();
-    }
-
-    public long getWindowHandle() {
-        return windowHandle;
-    }
-
-    public long getSurfaceHandle() {
-        return windowHandle; // default: return window handle
-    }
-
-    public AbstractGraphicsConfiguration getGraphicsConfiguration() {
-        return config;
-    }
-
-    /**
-     * Returns the width of the client area of this window
-     * @return width of the client area
-     */
-    public int getWidth() {
-        return width;
-    }
-
-    /**
-     * Returns the height of the client area of this window
-     * @return height of the client area
-     */
-    public int getHeight() {
-        return height;
-    }
-
-    /**
-     * Returns the insets for this native window (the difference between the
-     * size of the toplevel window with the decorations and the client area).
-     * 
-     * @return insets for this platform window
-     */
-    // this probably belongs to NativeWindow interface
-    public Insets getInsets() {
-        return new Insets(0,0,0,0);
-    }
-
-    /** If this Window actually wraps one from another toolkit such as
-        the AWT, this will return a non-null value. */
-    public Object getWrappedWindow() {
-        return null;
-    }
-
-    //
-    // Additional methods
-    //
-
-    public int getX() {
-        return x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public boolean isVisible() {
-        return visible;
-    }
-
-    public boolean isFullscreen() {
-        return fullscreen;
-    }
-
-    private boolean autoDrawableMember = false;
-
-    /** If the implementation is capable of detecting a device change
-        return true and clear the status/reason of the change. */
-    public boolean hasDeviceChanged() {
-        return false;
-    }
-
-    /**
-     * If set to true, 
-     * certain action will be performed by the owning
-     * AutoDrawable, ie the destroy() call within windowDestroyNotify()
-     */
-    public void setAutoDrawableClient(boolean b) {
-        autoDrawableMember = b;
-    }
-
-    protected void windowDestroyNotify() {
-        if(DEBUG_WINDOW_EVENT) {
-            System.out.println("Window.windowDestroyeNotify start "+Thread.currentThread());
-        }
-
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY);
-
-        if(!autoDrawableMember) {
-            destroy();
-        }
-
-        if(DEBUG_WINDOW_EVENT) {
-            System.out.println("Window.windowDestroyeNotify end "+Thread.currentThread());
-        }
-    }
-
-    protected void windowDestroyed() {
-        if(DEBUG_WINDOW_EVENT) {
-            System.out.println("Window.windowDestroyed "+Thread.currentThread());
-        }
-        invalidate();
-    }
-
-    public abstract void    setVisible(boolean visible);
-    /**
-     * Sets the size of the client area of the window, excluding decorations
-     * Total size of the window will be
-     * {@code width+insets.left+insets.right, height+insets.top+insets.bottom}
-     * @param width of the client area of the window
-     * @param height of the client area of the window
-     */
-    public abstract void    setSize(int width, int height);
-    /**
-     * Sets the location of the top left corner of the window, including
-     * decorations (so the client area will be placed at
-     * {@code x+insets.left,y+insets.top}.
-     * @param x coord of the top left corner
-     * @param y coord of the top left corner
-     */
-    public abstract void    setPosition(int x, int y);
-    public abstract boolean setFullscreen(boolean fullscreen);
-
-    //
-    // SurfaceUpdatedListener Support
-    //
-    private ArrayList surfaceUpdatedListeners = new ArrayList();
-
-    public void addSurfaceUpdatedListener(SurfaceUpdatedListener l) {
-        if(l == null) {
-            return;
-        }
-        synchronized(surfaceUpdatedListeners) {
-            ArrayList newSurfaceUpdatedListeners = (ArrayList) surfaceUpdatedListeners.clone();
-            newSurfaceUpdatedListeners.add(l);
-            surfaceUpdatedListeners = newSurfaceUpdatedListeners;
-        }
-    }
-
-    public void removeSurfaceUpdatedListener(SurfaceUpdatedListener l) {
-        if (l == null) {
-            return;
-        }
-        synchronized(surfaceUpdatedListeners) {
-            ArrayList newSurfaceUpdatedListeners = (ArrayList) surfaceUpdatedListeners.clone();
-            newSurfaceUpdatedListeners.remove(l);
-            surfaceUpdatedListeners = newSurfaceUpdatedListeners;
-        }
-    }
-
-    public SurfaceUpdatedListener[] getSurfaceUpdatedListener() {
-        synchronized(surfaceUpdatedListeners) {
-            return (SurfaceUpdatedListener[]) surfaceUpdatedListeners.toArray();
-        }
-    }
-
-    public void surfaceUpdated(Object updater, NativeWindow window, long when) { 
-        ArrayList listeners = null;
-        synchronized(surfaceUpdatedListeners) {
-            listeners = surfaceUpdatedListeners;
-        }
-        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
-            SurfaceUpdatedListener l = (SurfaceUpdatedListener) i.next();
-            l.surfaceUpdated(updater, window, when);
-        }
-    }
-
-    //
-    // MouseListener Support
-    //
-
-    public void addMouseListener(MouseListener l) {
-        if(l == null) {
-            return;
-        }
-        synchronized(mouseListeners) {
-            ArrayList newMouseListeners = (ArrayList) mouseListeners.clone();
-            newMouseListeners.add(l);
-            mouseListeners = newMouseListeners;
-        }
-    }
-
-    public void removeMouseListener(MouseListener l) {
-        if (l == null) {
-            return;
-        }
-        synchronized(mouseListeners) {
-            ArrayList newMouseListeners = (ArrayList) mouseListeners.clone();
-            newMouseListeners.remove(l);
-            mouseListeners = newMouseListeners;
-        }
-    }
-
-    public MouseListener[] getMouseListeners() {
-        synchronized(mouseListeners) {
-            return (MouseListener[]) mouseListeners.toArray();
-        }
-    }
-
-    private ArrayList mouseListeners = new ArrayList();
-    private int  mouseButtonPressed = 0; // current pressed mouse button number
-    private long lastMousePressed = 0; // last time when a mouse button was pressed
-    private int  lastMouseClickCount = 0; // last mouse button click count
-    public  static final int ClickTimeout = 300;
-
-    protected void sendMouseEvent(int eventType, int modifiers,
-                                  int x, int y, int button, int rotation) {
-        if(x<0||y<0||x>=width||y>=height) {
-            return; // .. invalid ..
-        }
-        if(DEBUG_MOUSE_EVENT) {
-            System.out.println("sendMouseEvent: "+MouseEvent.getEventTypeString(eventType)+
-                               ", mod "+modifiers+", pos "+x+"/"+y+", button "+button);
-        }
-        if(button<0||button>MouseEvent.BUTTON_NUMBER) {
-            throw new NativeWindowException("Invalid mouse button number" + button);
-        }
-        long when = System.currentTimeMillis();
-        MouseEvent eClicked = null;
-        MouseEvent e = null;
-
-        if(MouseEvent.EVENT_MOUSE_PRESSED==eventType) {
-            if(when-lastMousePressed<ClickTimeout) {
-                lastMouseClickCount++;
-            } else {
-                lastMouseClickCount=1;
-            }
-            lastMousePressed=when;
-            mouseButtonPressed=button;
-            e = new MouseEvent(true, eventType, this, when,
-                               modifiers, x, y, lastMouseClickCount, button, 0);
-        } else if(MouseEvent.EVENT_MOUSE_RELEASED==eventType) {
-            e = new MouseEvent(true, eventType, this, when,
-                               modifiers, x, y, lastMouseClickCount, button, 0);
-            if(when-lastMousePressed<ClickTimeout) {
-                eClicked = new MouseEvent(true, MouseEvent.EVENT_MOUSE_CLICKED, this, when,
-                                          modifiers, x, y, lastMouseClickCount, button, 0);
-            } else {
-                lastMouseClickCount=0;
-                lastMousePressed=0;
-            }
-            mouseButtonPressed=0;
-        } else if(MouseEvent.EVENT_MOUSE_MOVED==eventType) {
-            if (mouseButtonPressed>0) {
-                e = new MouseEvent(true, MouseEvent.EVENT_MOUSE_DRAGGED, this, when,
-                                   modifiers, x, y, 1, mouseButtonPressed, 0);
-            } else {
-                e = new MouseEvent(true, eventType, this, when,
-                                   modifiers, x, y, 0, button, 0);
-            }
-        } else if(MouseEvent.EVENT_MOUSE_WHEEL_MOVED==eventType) {
-            e = new MouseEvent(true, eventType, this, when, modifiers, x, y, 0, button, rotation);
-        } else {
-            e = new MouseEvent(true, eventType, this, when, modifiers, x, y, 0, button, 0);
-        }
-
-        if(DEBUG_MOUSE_EVENT) {
-            System.out.println("sendMouseEvent: event:         "+e);
-            if(null!=eClicked) {
-                System.out.println("sendMouseEvent: event Clicked: "+eClicked);
-            }
-        }
-
-        ArrayList listeners = null;
-        synchronized(mouseListeners) {
-            listeners = mouseListeners;
-        }
-        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
-            MouseListener l = (MouseListener) i.next();
-            switch(e.getEventType()) {
-                case MouseEvent.EVENT_MOUSE_CLICKED:
-                    l.mouseClicked(e);
-                    break;
-                case MouseEvent.EVENT_MOUSE_ENTERED:
-                    l.mouseEntered(e);
-                    break;
-                case MouseEvent.EVENT_MOUSE_EXITED:
-                    l.mouseExited(e);
-                    break;
-                case MouseEvent.EVENT_MOUSE_PRESSED:
-                    l.mousePressed(e);
-                    break;
-                case MouseEvent.EVENT_MOUSE_RELEASED:
-                    l.mouseReleased(e);
-                    if(null!=eClicked) {
-                        l.mouseClicked(eClicked);
-                    }
-                    break;
-                case MouseEvent.EVENT_MOUSE_MOVED:
-                    l.mouseMoved(e);
-                    break;
-                case MouseEvent.EVENT_MOUSE_DRAGGED:
-                    l.mouseDragged(e);
-                    break;
-                case MouseEvent.EVENT_MOUSE_WHEEL_MOVED:
-                    l.mouseWheelMoved(e);
-                    break;
-                default:
-                    throw new NativeWindowException("Unexpected mouse event type " + e.getEventType());
-            }
-        }
-    }
-
-    //
-    // KeyListener Support
-    //
-
-    public void addKeyListener(KeyListener l) {
-        if(l == null) {
-            return;
-        }
-        synchronized(keyListeners) {
-            ArrayList newKeyListeners = (ArrayList) keyListeners.clone();
-            newKeyListeners.add(l);
-            keyListeners = newKeyListeners;
-        }
-    }
-
-    public void removeKeyListener(KeyListener l) {
-        if (l == null) {
-            return;
-        }
-        synchronized(keyListeners) {
-            ArrayList newKeyListeners = (ArrayList) keyListeners.clone();
-            newKeyListeners.remove(l);
-            keyListeners = newKeyListeners;
-        }
-    }
-
-    public KeyListener[] getKeyListeners() {
-        synchronized(keyListeners) {
-            return (KeyListener[]) keyListeners.toArray();
-        }
-    }
-
-    private ArrayList keyListeners = new ArrayList();
-
-    protected void sendKeyEvent(int eventType, int modifiers, int keyCode, char keyChar) {
-        KeyEvent e = new KeyEvent(true, eventType, this, System.currentTimeMillis(),
-                                      modifiers, keyCode, keyChar);
-        if(DEBUG_KEY_EVENT) {
-            System.out.println("sendKeyEvent: "+e);
-        }
-        ArrayList listeners = null;
-        synchronized(keyListeners) {
-            listeners = keyListeners;
-        }
-        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
-            KeyListener l = (KeyListener) i.next();
-            switch(eventType) {
-                case KeyEvent.EVENT_KEY_PRESSED:
-                    l.keyPressed(e);
-                    break;
-                case KeyEvent.EVENT_KEY_RELEASED:
-                    l.keyReleased(e);
-                    break;
-                case KeyEvent.EVENT_KEY_TYPED:
-                    l.keyTyped(e);
-                    break;
-                default:
-                    throw new NativeWindowException("Unexpected key event type " + e.getEventType());
-            }
-        }
-    }
-
-    //
-    // WindowListener Support
-    //
-
-    private ArrayList windowListeners = new ArrayList();
-
-    public void addWindowListener(WindowListener l) {
-        if(l == null) {
-            return;
-        }
-        synchronized(windowListeners) {
-            ArrayList newWindowListeners = (ArrayList) windowListeners.clone();
-            newWindowListeners.add(l);
-            windowListeners = newWindowListeners;
-        }
-    }
-
-    public void removeWindowListener(WindowListener l) {
-        if (l == null) {
-            return;
-        }
-        synchronized(windowListeners) {
-            ArrayList newWindowListeners = (ArrayList) windowListeners.clone();
-            newWindowListeners.remove(l);
-            windowListeners = newWindowListeners;
-        }
-    }
-
-    public WindowListener[] getWindowListeners() {
-        synchronized(windowListeners) {
-            return (WindowListener[]) windowListeners.toArray();
-        }
-    }
-
-    protected void sendWindowEvent(int eventType) {
-        WindowEvent e = new WindowEvent(true, eventType, this, System.currentTimeMillis());
-        if(DEBUG_WINDOW_EVENT) {
-            System.out.println("sendWindowEvent: "+e);
-        }
-        ArrayList listeners = null;
-        synchronized(windowListeners) {
-            listeners = windowListeners;
-        }
-        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
-            WindowListener l = (WindowListener) i.next();
-            switch(eventType) {
-                case WindowEvent.EVENT_WINDOW_RESIZED:
-                    l.windowResized(e);
-                    break;
-                case WindowEvent.EVENT_WINDOW_MOVED:
-                    l.windowMoved(e);
-                    break;
-                case WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY:
-                    l.windowDestroyNotify(e);
-                    break;
-                case WindowEvent.EVENT_WINDOW_GAINED_FOCUS:
-                    l.windowGainedFocus(e);
-                    break;
-                case WindowEvent.EVENT_WINDOW_LOST_FOCUS:
-                    l.windowLostFocus(e);
-                    break;
-                default:
-                    throw 
-                        new NativeWindowException("Unexpected window event type "
-                                                  + e.getEventType());
-            }
-        }
-    }
-
-
-    //
-    // WindowListener Support
-    //
-
-    private ArrayList paintListeners = new ArrayList();
-
-    public void addPaintListener(PaintListener l) {
-        if(l == null) {
-            return;
-        }
-        synchronized(paintListeners) {
-            ArrayList newPaintListeners = (ArrayList) paintListeners.clone();
-            newPaintListeners.add(l);
-            paintListeners = newPaintListeners;
-        }
-    }
-
-    public void removePaintListener(PaintListener l) {
-        if (l == null) {
-            return;
-        }
-        synchronized(paintListeners) {
-            ArrayList newPaintListeners = (ArrayList) paintListeners.clone();
-            newPaintListeners.remove(l);
-            paintListeners = newPaintListeners;
-        }
-    }
-
-    protected void sendPaintEvent(int eventType, int x, int y, int w, int h) {
-        PaintEvent e =
-            new PaintEvent(eventType, this, System.currentTimeMillis(), x, y, w, h);
-        ArrayList listeners = null;
-        synchronized(paintListeners) {
-            listeners = paintListeners;
-        }
-        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
-            PaintListener l = (PaintListener) i.next();
-            l.exposed(e);
-        }
-    }
-
-    //
-    // Reflection helper ..
-    //
-
-    private static Class[] getCustomConstructorArgumentTypes(Class windowClass) {
-        Class[] argTypes = null;
-        try {
-            Method m = windowClass.getDeclaredMethod("getCustomConstructorArgumentTypes", new Class[] {});
-            argTypes = (Class[]) m.invoke(null, null);
-        } catch (Throwable t) {}
-        return argTypes;
-    }
-
-    private static int verifyConstructorArgumentTypes(Class[] types, Object[] args) {
-        if(types.length != args.length) {
-            return -1;
-        }
-        for(int i=0; i<args.length; i++) {
-            if(!types[i].isInstance(args[i])) {
-                return i;
-            }
-        }
-        return args.length;
-    }
-
-    private static String getArgsStrList(Object[] args) {
-        StringBuffer sb = new StringBuffer();
-        for(int i=0; i<args.length; i++) {
-            sb.append(args[i].getClass());
-            if(i<args.length) {
-                sb.append(", ");
-            }
-        }
-        return sb.toString();
-    }
-
-    private static String getTypeStrList(Class[] types) {
-        StringBuffer sb = new StringBuffer();
-        for(int i=0; i<types.length; i++) {
-            sb.append(types[i]);
-            if(i<types.length) {
-                sb.append(", ");
-            }
-        }
-        return sb.toString();
-    }
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/WindowEvent.java b/src/newt/classes/com/jogamp/javafx/newt/WindowEvent.java
deleted file mode 100644
index 74edfc564..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/WindowEvent.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-public class WindowEvent extends Event {
-    public static final int EVENT_WINDOW_RESIZED = 100;
-    public static final int EVENT_WINDOW_MOVED   = 101; 
-    public static final int EVENT_WINDOW_DESTROY_NOTIFY = 102;
-    public static final int EVENT_WINDOW_GAINED_FOCUS = 103;
-    public static final int EVENT_WINDOW_LOST_FOCUS = 104;
-    // public static final int EVENT_WINDOW_REPAINT = 105; // TODO
-
-    public WindowEvent(int eventType, Window source, long when) {
-        this(false, eventType, source, when);
-    }
-
-    WindowEvent(boolean isSystemEvent, int eventType, Window source, long when) {
-        super(isSystemEvent, eventType, source, when);
-    }
-
-    public static String getEventTypeString(int type) {
-        switch(type) {
-            case EVENT_WINDOW_RESIZED: return "WINDOW_RESIZED";
-            case EVENT_WINDOW_MOVED:   return "WINDOW_MOVED";
-            case EVENT_WINDOW_DESTROY_NOTIFY:   return "EVENT_WINDOW_DESTROY_NOTIFY";
-            case EVENT_WINDOW_GAINED_FOCUS:   return "EVENT_WINDOW_GAINED_FOCUS";
-            case EVENT_WINDOW_LOST_FOCUS:   return "EVENT_WINDOW_LOST_FOCUS";
-            // case EVENT_WINDOW_REPAINT:   return "EVENT_WINDOW_REPAINT";
-            default: return "unknown (" + type + ")";
-        }
-    }
-    public String toString() {
-        return "WindowEvent["+getEventTypeString(getEventType()) +
-            ", " + super.toString() + "]";
-    }
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/WindowListener.java b/src/newt/classes/com/jogamp/javafx/newt/WindowListener.java
deleted file mode 100644
index c4e79781c..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/WindowListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt;
-
-public interface WindowListener extends EventListener {
-    public void windowResized(WindowEvent e);
-    public void windowMoved(WindowEvent e);
-    public void windowDestroyNotify(WindowEvent e);
-    public void windowGainedFocus(WindowEvent e);
-    public void windowLostFocus(WindowEvent e);
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTCanvas.java b/src/newt/classes/com/jogamp/javafx/newt/awt/AWTCanvas.java
deleted file mode 100644
index fef30f385..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTCanvas.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.awt;
-
-import com.jogamp.javafx.newt.Window;
-
-import java.awt.Canvas;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.GraphicsConfiguration;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.awt.*;
-import com.jogamp.javafx.newt.impl.Debug;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-public class AWTCanvas extends Canvas {
-  private GraphicsDevice device;
-  private GraphicsConfiguration chosen;
-  private AWTGraphicsConfiguration awtConfig;
-
-  private Capabilities capabilities;
-
-  private boolean displayConfigChanged=false;
-
-  public AWTCanvas(Capabilities capabilities) {
-    super();
-
-    if(null==capabilities) {
-        throw new NativeWindowException("Capabilities null");
-    }
-    this.capabilities=capabilities;
-  }
-
-  public AWTGraphicsConfiguration getAWTGraphicsConfiguration() {
-    return awtConfig;
-  }
-
-  public boolean hasDeviceChanged() {
-    boolean res = displayConfigChanged;
-    displayConfigChanged=false;
-    return res;
-  }
-
-  public void addNotify() {
-    super.addNotify();
-
-    disableBackgroundErase();
-
-    GraphicsConfiguration gc = super.getGraphicsConfiguration();
-    if(null!=gc) {
-        device = gc.getDevice();
-    }
-
-    /*
-     * Save the chosen capabilities for use in getGraphicsConfiguration().
-     */
-    awtConfig = chooseGraphicsConfiguration(capabilities, device);
-    if(Window.DEBUG_IMPLEMENTATION) {
-        Exception e = new Exception("Created Config: "+awtConfig);
-        e.printStackTrace();
-    }
-    if(null!=awtConfig) {
-      // update ..
-      chosen = awtConfig.getGraphicsConfiguration();
-    }
-    if(null==awtConfig) {
-          throw new NativeWindowException("Error: AWTGraphicsConfiguration is null");
-    }
-  }
-
-  /**
-   * Overridden to choose a GraphicsConfiguration on a parent container's
-   * GraphicsDevice because both devices
-   */
-  public GraphicsConfiguration getGraphicsConfiguration() {
-    /*
-     * Workaround for problems with Xinerama and java.awt.Component.checkGD
-     * when adding to a container on a different graphics device than the
-     * one that this Canvas is associated with.
-     * 
-     * GC will be null unless:
-     *   - A native peer has assigned it. This means we have a native
-     *     peer, and are already comitted to a graphics configuration.
-     *   - This canvas has been added to a component hierarchy and has
-     *     an ancestor with a non-null GC, but the native peer has not
-     *     yet been created. This means we can still choose the GC on
-     *     all platforms since the peer hasn't been created.
-     */
-    final GraphicsConfiguration gc = super.getGraphicsConfiguration();
-    /*
-     * chosen is only non-null on platforms where the GLDrawableFactory
-     * returns a non-null GraphicsConfiguration (in the GLCanvas
-     * constructor).
-     * 
-     * if gc is from this Canvas' native peer then it should equal chosen,
-     * otherwise it is from an ancestor component that this Canvas is being
-     * added to, and we go into this block.
-     */
-    if (gc != null && chosen != null && !chosen.equals(gc)) {
-      /*
-       * Check for compatibility with gc. If they differ by only the
-       * device then return a new GCconfig with the super-class' GDevice
-       * (and presumably the same visual ID in Xinerama).
-       * 
-       */
-      if (!chosen.getDevice().getIDstring().equals(gc.getDevice().getIDstring())) {
-        /*
-         * Here we select a GraphicsConfiguration on the alternate
-         * device that is presumably identical to the chosen
-         * configuration, but on the other device.
-         * 
-         * Should really check to ensure that we select a configuration
-         * with the same X visual ID for Xinerama screens, otherwise the
-         * GLDrawable may have the wrong visual ID (I don't think this
-         * ever gets updated). May need to add a method to
-         * X11GLDrawableFactory to do this in a platform specific
-         * manner.
-         * 
-         * However, on platforms where we can actually get into this
-         * block, both devices should have the same visual list, and the
-         * same configuration should be selected here.
-         */
-        AWTGraphicsConfiguration config = chooseGraphicsConfiguration((Capabilities)awtConfig.getRequestedCapabilities(), gc.getDevice());
-        final GraphicsConfiguration compatible = (null!=config)?config.getGraphicsConfiguration():null;
-        if(Window.DEBUG_IMPLEMENTATION) {
-            Exception e = new Exception("Call Stack: "+Thread.currentThread().getName());
-            e.printStackTrace();
-            System.err.println("!!! Created Config (n): HAVE    GC "+chosen);
-            System.err.println("!!! Created Config (n): THIS    GC "+gc);
-            System.err.println("!!! Created Config (n): Choosen GC "+compatible);
-            System.err.println("!!! Created Config (n): HAVE    CF "+awtConfig);
-            System.err.println("!!! Created Config (n): Choosen CF "+config);
-            System.err.println("!!! Created Config (n): EQUALS CAPS "+config.getChosenCapabilities().equals(awtConfig.getChosenCapabilities()));
-        }
-
-        if (compatible != null) {
-          /*
-           * Save the new GC for equals test above, and to return to
-           * any outside callers of this method.
-           */
-          chosen = compatible;
-          if( !config.getChosenCapabilities().equals(awtConfig.getChosenCapabilities())) {
-              displayConfigChanged=true;
-          } 
-          awtConfig = config;
-        }
-      }
-
-      /*
-       * If a compatible GC was not found in the block above, this will
-       * return the GC that was selected in the constructor (and might
-       * cause an exception in Component.checkGD when adding to a
-       * container, but in this case that would be the desired behavior).
-       * 
-       */
-      return chosen;
-    } else if (gc == null) {
-      /*
-       * The GC is null, which means we have no native peer, and are not
-       * part of a (realized) component hierarchy. So we return the
-       * desired visual that was selected in the constructor (possibly
-       * null).
-       */
-      return chosen;
-    }
-
-    /*
-     * Otherwise we have not explicitly selected a GC in the constructor, so
-     * just return what Canvas would have.
-     */
-    return gc;
-  }
-
-  private static AWTGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
-                                                                      GraphicsDevice device) {
-    AbstractGraphicsScreen aScreen = AWTGraphicsScreen.createScreenDevice(device);
-    AWTGraphicsConfiguration config = (AWTGraphicsConfiguration)
-      GraphicsConfigurationFactory.getFactory(AWTGraphicsDevice.class).chooseGraphicsConfiguration(capabilities,
-                                                                                                   null,
-                                                                                                   aScreen);
-    if (config == null) {
-      throw new NativeWindowException("Error: Couldn't fetch AWTGraphicsConfiguration");
-    }
-
-    return config;
-  }
-
-  // Disables the AWT's erasing of this Canvas's background on Windows
-  // in Java SE 6. This internal API is not available in previous
-  // releases, but the system property
-  // -Dsun.awt.noerasebackground=true can be specified to get similar
-  // results globally in previous releases.
-  private static boolean disableBackgroundEraseInitialized;
-  private static Method  disableBackgroundEraseMethod;
-  private void disableBackgroundErase() {
-    if (!disableBackgroundEraseInitialized) {
-      try {
-        AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-              try {
-                Class clazz = getToolkit().getClass();
-                while (clazz != null && disableBackgroundEraseMethod == null) {
-                  try {
-                    disableBackgroundEraseMethod =
-                      clazz.getDeclaredMethod("disableBackgroundErase",
-                                              new Class[] { Canvas.class });
-                    disableBackgroundEraseMethod.setAccessible(true);
-                  } catch (Exception e) {
-                    clazz = clazz.getSuperclass();
-                  }
-                }
-              } catch (Exception e) {
-              }
-              return null;
-            }
-          });
-      } catch (Exception e) {
-      }
-      disableBackgroundEraseInitialized = true;
-    }
-    if (disableBackgroundEraseMethod != null) {
-      try {
-        disableBackgroundEraseMethod.invoke(getToolkit(), new Object[] { this });
-      } catch (Exception e) {
-        // FIXME: workaround for 6504460 (incorrect backport of 6333613 in 5.0u10)
-        // throw new GLException(e);
-      }
-    }
-  }
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTDisplay.java b/src/newt/classes/com/jogamp/javafx/newt/awt/AWTDisplay.java
deleted file mode 100644
index be36df2a4..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTDisplay.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.awt;
-
-import java.awt.event.*;
-import com.jogamp.javafx.newt.Display;
-import com.jogamp.javafx.newt.Window;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.awt.*;
-import java.util.*;
-
-public class AWTDisplay extends Display {
-    public AWTDisplay() {
-    }
-
-    protected void createNative() {
-        aDevice = (AWTGraphicsDevice) AWTGraphicsDevice.createDevice(null); // default 
-    }
-
-    protected void setAWTGraphicsDevice(AWTGraphicsDevice d) {
-        aDevice = d;
-    }
-
-    protected void closeNative() { }
-
-    public void dispatchMessages() {
-        AWTEventWrapper w;
-        do {
-            synchronized(this) {
-                if (!events.isEmpty()) {
-                    w = (AWTEventWrapper) events.removeFirst();
-                } else {
-                    w = null;
-                }
-            }
-            if (w != null) {
-                switch (w.getType()) {
-                    case com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_RESIZED:
-                    case com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_MOVED:
-                    case com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY:
-                        w.getWindow().sendWindowEvent(w.getType());
-                        break;
-
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_CLICKED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_ENTERED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_EXITED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_PRESSED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_RELEASED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_MOVED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_DRAGGED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_WHEEL_MOVED:
-                        {
-                            MouseEvent e = (MouseEvent) w.getEvent();
-                            int rotation = 0;
-                            if (e instanceof MouseWheelEvent) {
-                                rotation = ((MouseWheelEvent)e).getWheelRotation();
-                            }
-                            w.getWindow().sendMouseEvent(w.getType(), convertModifiers(e),
-                                                         e.getX(), e.getY(), convertButton(e),
-                                                         rotation);
-                        }
-                        break;
-
-                    case com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_PRESSED:
-                    case com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_RELEASED:
-                    case com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_TYPED:
-                        {
-                            KeyEvent e = (KeyEvent) w.getEvent();
-                            w.getWindow().sendKeyEvent(w.getType(), convertModifiers(e),
-                                                       e.getKeyCode(), e.getKeyChar());
-                        }
-                        break;
-
-                    default:
-                        throw new NativeWindowException("Unknown event type " + w.getType());
-                }
-                if(Window.DEBUG_MOUSE_EVENT) {
-                    System.out.println("dispatchMessages: "+w.getWindow()+" in event:"+w.getEvent());
-                }
-            }
-        } while (w != null);
-    }
-
-    protected void enqueueEvent(AWTWindow w, int type, InputEvent e) {
-        AWTEventWrapper wrapper = new AWTEventWrapper(w, type, e);
-        synchronized(this) {
-            events.add(wrapper);
-        }
-    }
-
-    private LinkedList/*<AWTEventWrapper>*/ events = new LinkedList();
-
-    static class AWTEventWrapper {
-        AWTWindow window;
-        int type;
-        InputEvent e;
-
-        AWTEventWrapper(AWTWindow w, int type, InputEvent e) {
-            this.window = w;
-            this.type = type;
-            this.e = e;
-        }
-
-        public AWTWindow getWindow() {
-            return window;
-        }
-
-        public int getType() {
-            return type;
-        }
-
-        public InputEvent getEvent() {
-            return e;
-        }
-    }
-
-    private static int convertModifiers(InputEvent e) {
-        int newtMods = 0;
-        int mods = e.getModifiers();
-        if ((mods & InputEvent.SHIFT_MASK) != 0)     newtMods |= com.jogamp.javafx.newt.InputEvent.SHIFT_MASK;
-        if ((mods & InputEvent.CTRL_MASK) != 0)      newtMods |= com.jogamp.javafx.newt.InputEvent.CTRL_MASK;
-        if ((mods & InputEvent.META_MASK) != 0)      newtMods |= com.jogamp.javafx.newt.InputEvent.META_MASK;
-        if ((mods & InputEvent.ALT_MASK) != 0)       newtMods |= com.jogamp.javafx.newt.InputEvent.ALT_MASK;
-        if ((mods & InputEvent.ALT_GRAPH_MASK) != 0) newtMods |= com.jogamp.javafx.newt.InputEvent.ALT_GRAPH_MASK;
-        return newtMods;
-    }
-
-    private static int convertButton(MouseEvent e) {
-        switch (e.getButton()) {
-            case MouseEvent.BUTTON1: return com.jogamp.javafx.newt.MouseEvent.BUTTON1;
-            case MouseEvent.BUTTON2: return com.jogamp.javafx.newt.MouseEvent.BUTTON2;
-            case MouseEvent.BUTTON3: return com.jogamp.javafx.newt.MouseEvent.BUTTON3;
-        }
-        return 0;
-    }
-
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTScreen.java b/src/newt/classes/com/jogamp/javafx/newt/awt/AWTScreen.java
deleted file mode 100644
index 00da66078..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTScreen.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.awt;
-
-import com.jogamp.javafx.newt.*;
-import java.awt.DisplayMode;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.awt.*;
-
-public class AWTScreen extends Screen {
-    public AWTScreen() {
-    }
-
-    protected void createNative(int index) {
-        aScreen = new AWTGraphicsScreen((AWTGraphicsDevice)display.getGraphicsDevice());
-        
-        DisplayMode mode = ((AWTGraphicsDevice)getDisplay().getGraphicsDevice()).getGraphicsDevice().getDisplayMode();
-        int w = mode.getWidth();
-        int h = mode.getHeight();
-        setScreenSize(w, h);
-    }
-
-    protected void setAWTGraphicsScreen(AWTGraphicsScreen s) {
-        aScreen = s;
-    }
-
-    // done by AWTWindow ..
-    protected void setScreenSize(int w, int h) {
-        super.setScreenSize(w, h);
-    }
-
-    protected void closeNative() { }
-
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTWindow.java b/src/newt/classes/com/jogamp/javafx/newt/awt/AWTWindow.java
deleted file mode 100644
index a0c2b6a89..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTWindow.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.awt;
-
-import java.awt.BorderLayout;
-import java.awt.Canvas;
-import java.awt.Container;
-import java.awt.DisplayMode;
-import java.awt.EventQueue;
-import java.awt.Frame;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.awt.event.*;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.*;
-import com.jogamp.javafx.newt.Window;
-import java.awt.Insets;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.awt.*;
-
-/** An implementation of the Newt Window class built using the
-    AWT. This is provided for convenience of porting to platforms
-    supporting Java SE. */
-
-public class AWTWindow extends Window {
-
-    public AWTWindow() {
-        this(null);
-    }
-
-    public static Class[] getCustomConstructorArgumentTypes() {
-        return new Class[] { Container.class } ;
-    }
-
-    public AWTWindow(Container container) {
-        super();
-        title = "AWT NewtWindow";
-        this.container = container;
-        if(container instanceof Frame) {
-            frame = (Frame) container;
-        }
-    }
-
-    private boolean owningFrame;
-    private Container container = null;
-    private Frame frame = null; // same instance as container, just for impl. convenience
-    private AWTCanvas canvas;
-    // non fullscreen dimensions ..
-    private int nfs_width, nfs_height, nfs_x, nfs_y;
-
-    public void setTitle(final String title) {
-        super.setTitle(title);
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    if (frame != null) {
-                        frame.setTitle(title);
-                    }
-                }
-            });
-    }
-
-    protected void createNative(long parentWindowHandle, final Capabilities caps) {
-
-        if(0!=parentWindowHandle) {
-            throw new RuntimeException("Window parenting not supported in AWT, use AWTWindow(Frame) cstr for wrapping instead");
-        }
-
-        final AWTWindow awtWindow = this;
-
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    if(null==container) {
-                        frame = new Frame();
-                        container = frame;
-                        owningFrame=true;
-                    } else {
-                        owningFrame=false;
-                        width = container.getWidth();
-                        height = container.getHeight();
-                        x = container.getX();
-                        y = container.getY();
-                    }
-                    if(null!=frame) {
-                        frame.setTitle(getTitle());
-                    }
-                    container.setLayout(new BorderLayout());
-                    canvas = new AWTCanvas(caps);
-                    Listener listener = new Listener(awtWindow);
-                    canvas.addMouseListener(listener);
-                    canvas.addMouseMotionListener(listener);
-                    canvas.addKeyListener(listener);
-                    canvas.addComponentListener(listener);
-                    container.add(canvas, BorderLayout.CENTER);
-                    container.setSize(width, height);
-                    container.setLocation(x, y);
-                    container.addComponentListener(new MoveListener(awtWindow));
-                    if(null!=frame) {
-                        frame.setUndecorated(undecorated||fullscreen);
-                        frame.addWindowListener(new WindowEventListener(awtWindow));
-                    }
-                }
-            });
-    }
-
-    protected void closeNative() {
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    if(owningFrame && null!=frame) {
-                        frame.dispose();
-                        owningFrame=false;
-                    }
-                    frame = null;
-                }
-            });
-    }
-
-    public boolean hasDeviceChanged() {
-        boolean res = canvas.hasDeviceChanged();
-        if(res) {
-            config = canvas.getAWTGraphicsConfiguration();
-            if (config == null) {
-                throw new NativeWindowException("Error Device change null GraphicsConfiguration: "+this);
-            }
-            updateDeviceData();
-        }
-        return res;
-    }
-
-    public void setVisible(final boolean visible) {
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    container.setVisible(visible);
-                }
-            });
-
-        config = canvas.getAWTGraphicsConfiguration();
-
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-
-        updateDeviceData();
-    }
-
-    private void updateDeviceData() {
-        // propagate new info ..
-        ((AWTScreen)getScreen()).setAWTGraphicsScreen((AWTGraphicsScreen)config.getScreen());
-        ((AWTDisplay)getScreen().getDisplay()).setAWTGraphicsDevice((AWTGraphicsDevice)config.getScreen().getDevice());
-
-        DisplayMode mode = ((AWTGraphicsDevice)config.getScreen().getDevice()).getGraphicsDevice().getDisplayMode();
-        int w = mode.getWidth();
-        int h = mode.getHeight();
-        ((AWTScreen)screen).setScreenSize(w, h);
-    }
-
-    public void setSize(final int width, final int height) {
-        this.width = width;
-        this.height = height;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        }
-        /** An AWT event on setSize() would bring us in a deadlock situation, hence invokeLater() */
-        runOnEDT(false, new Runnable() {
-                public void run() {
-                    Insets insets = container.getInsets();
-                    container.setSize(width + insets.left + insets.right,
-                                      height + insets.top + insets.bottom);
-                }
-            });
-    }
-
-    public com.jogamp.javafx.newt.Insets getInsets() {
-        final int insets[] = new int[] { 0, 0, 0, 0 };
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    Insets contInsets = container.getInsets();
-                    insets[0] = contInsets.top;
-                    insets[1] = contInsets.left;
-                    insets[2] = contInsets.bottom;
-                    insets[3] = contInsets.right;
-                }
-            });
-        return new com.jogamp.javafx.newt.
-            Insets(insets[0],insets[1],insets[2],insets[3]);
-    }
-
-    public void setPosition(final int x, final int y) {
-        this.x = x;
-        this.y = y;
-        if(!fullscreen) {
-            nfs_x=x;
-            nfs_y=y;
-        }
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    container.setLocation(x, y);
-                }
-            });
-    }
-
-    public boolean setFullscreen(final boolean fullscreen) {
-        if(this.fullscreen!=fullscreen) {
-            final int x,y,w,h;
-            this.fullscreen=fullscreen;
-            if(fullscreen) {
-                x = 0; y = 0;
-                w = screen.getWidth();
-                h = screen.getHeight();
-            } else {
-                x = nfs_x;
-                y = nfs_y;
-                w = nfs_width;
-                h = nfs_height;
-            }
-            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                System.err.println("AWTWindow fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
-            }
-            /** An AWT event on setSize() would bring us in a deadlock situation, hence invokeLater() */
-            runOnEDT(false, new Runnable() {
-                    public void run() {
-                        if(null!=frame) {
-                            if(!container.isDisplayable()) {
-                                frame.setUndecorated(undecorated||fullscreen);
-                            } else {
-                                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                                    System.err.println("AWTWindow can't undecorate already created frame");
-                                }
-                            }
-                        }
-                        container.setLocation(x, y);
-                        container.setSize(w, h);
-                    }
-                });
-        }
-        return true;
-    }
-
-    public Object getWrappedWindow() {
-        return canvas;
-    }
-
-    protected void sendWindowEvent(int eventType) {
-        super.sendWindowEvent(eventType);
-    }
-
-    protected void sendKeyEvent(int eventType, int modifiers, int keyCode, char keyChar) {
-        super.sendKeyEvent(eventType, modifiers, keyCode, keyChar);
-    }
-
-    protected void sendMouseEvent(int eventType, int modifiers,
-                                  int x, int y, int button, int rotation) {
-        super.sendMouseEvent(eventType, modifiers, x, y, button, rotation);
-    }
-
-    private static void runOnEDT(boolean wait, Runnable r) {
-        if (EventQueue.isDispatchThread()) {
-            r.run();
-        } else {
-            try {
-                if(wait) {
-                    EventQueue.invokeAndWait(r);
-                } else {
-                    EventQueue.invokeLater(r);
-                }
-            } catch (Exception e) {
-                throw new NativeWindowException(e);
-            }
-        }
-    }
-
-    private static final int WINDOW_EVENT = 1;
-    private static final int KEY_EVENT = 2;
-    private static final int MOUSE_EVENT = 3;
-
-    class MoveListener implements ComponentListener {
-        private AWTWindow window;
-        private AWTDisplay display;
-
-        public MoveListener(AWTWindow w) {
-            window = w;
-            display = (AWTDisplay)window.getScreen().getDisplay();
-        }
-
-        public void componentResized(ComponentEvent e) {
-        }
-
-        public void componentMoved(ComponentEvent e) {
-            if(null!=container) {
-                x = container.getX();
-                y = container.getY();
-            }
-            display.enqueueEvent(window, com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_MOVED, null);
-        }
-
-        public void componentShown(ComponentEvent e) {
-        }
-
-        public void componentHidden(ComponentEvent e) {
-        }
-
-    }
-
-    class Listener implements ComponentListener, MouseListener, MouseMotionListener, KeyListener {
-        private AWTWindow window;
-        private AWTDisplay display;
-
-        public Listener(AWTWindow w) {
-            window = w;
-            display = (AWTDisplay)window.getScreen().getDisplay();
-        }
-
-        public void componentResized(ComponentEvent e) {
-            width = canvas.getWidth();
-            height = canvas.getHeight();
-            display.enqueueEvent(window, com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_RESIZED, null);
-        }
-
-        public void componentMoved(ComponentEvent e) {
-        }
-
-        public void componentShown(ComponentEvent e) {
-        }
-
-        public void componentHidden(ComponentEvent e) {
-        }
-
-        public void mouseClicked(MouseEvent e) {
-            // We ignore these as we synthesize them ourselves out of
-            // mouse pressed and released events
-        }
-
-        public void mouseEntered(MouseEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_ENTERED, e);
-        }
-
-        public void mouseExited(MouseEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_EXITED, e);
-        }
-
-        public void mousePressed(MouseEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_PRESSED, e);
-        }
-
-        public void mouseReleased(MouseEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_RELEASED, e);
-        }
-
-        public void mouseMoved(MouseEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_MOVED, e);
-        }
-
-        public void mouseDragged(MouseEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_DRAGGED, e);
-        }
-
-        public void keyPressed(KeyEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_PRESSED, e);
-        }
-
-        public void keyReleased(KeyEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_RELEASED, e);
-        }
-
-        public void keyTyped(KeyEvent e)  {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_TYPED, e);
-        }
-    }
-
-    class WindowEventListener implements WindowListener {
-        private AWTWindow window;
-        private AWTDisplay display;
-
-        public WindowEventListener(AWTWindow w) {
-            window = w;
-            display = (AWTDisplay)window.getScreen().getDisplay();
-        }
-
-        public void windowActivated(WindowEvent e) {
-        }
-        public void windowClosed(WindowEvent e) {
-        }
-        public void windowClosing(WindowEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY, null);
-        }
-        public void windowDeactivated(WindowEvent e) {
-        }
-        public void windowDeiconified(WindowEvent e) {
-        }
-        public void windowIconified(WindowEvent e) {
-        }
-        public void windowOpened(WindowEvent e) {
-        }
-    }
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/impl/Debug.java b/src/newt/classes/com/jogamp/javafx/newt/impl/Debug.java
deleted file mode 100644
index bbabe72df..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/impl/Debug.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.jogamp.javafx.newt.impl;
-
-import java.security.*;
-
-/** Helper routines for logging and debugging. */
-
-public class Debug {
-  // Some common properties
-  private static boolean verbose;
-  private static boolean debugAll;
-  private static AccessControlContext localACC;
-  
-  static {
-    localACC=AccessController.getContext();
-    verbose = isPropertyDefined("newt.verbose", true);
-    debugAll = isPropertyDefined("newt.debug", true);
-    if (verbose) {
-       Package p = Package.getPackage("com.jogamp.javafx.newt");
-       System.err.println("NEWT specification version " + p.getSpecificationVersion());
-       System.err.println("NEWT implementation version " + p.getImplementationVersion());
-       System.err.println("NEWT implementation vendor " + p.getImplementationVendor());
-    }
-  }
-
-  static int getIntProperty(final String property, final boolean jnlpAlias) {
-      return getIntProperty(property, jnlpAlias, localACC);
-  }
-
-  public static int getIntProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    int i=0;
-    try {
-        Integer iv = Integer.valueOf(Debug.getProperty(property, jnlpAlias, acc));
-        i = iv.intValue();
-    } catch (NumberFormatException nfe) {}
-    return i;
-  }
-
-  static boolean getBooleanProperty(final String property, final boolean jnlpAlias) {
-    return getBooleanProperty(property, jnlpAlias, localACC);
-  }
-
-  public static boolean getBooleanProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    Boolean b = Boolean.valueOf(Debug.getProperty(property, jnlpAlias, acc));
-    return b.booleanValue();
-  }
-
-  static boolean isPropertyDefined(final String property, final boolean jnlpAlias) {
-    return isPropertyDefined(property, jnlpAlias, localACC);
-  }
-
-  public static boolean isPropertyDefined(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    return (Debug.getProperty(property, jnlpAlias, acc) != null) ? true : false;
-  }
-
-  static String getProperty(final String property, final boolean jnlpAlias) {
-    return getProperty(property, jnlpAlias, localACC);
-  }
-
-  public static String getProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
-    String s=null;
-    if(null!=acc && acc.equals(localACC)) {
-        s = (String) AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-              String val=null;
-              try {
-                  val = System.getProperty(property);
-              } catch (Exception e) {}
-              if(null==val && jnlpAlias && !property.startsWith(jnlp_prefix)) {
-                  try {
-                      val = System.getProperty(jnlp_prefix + property);
-                  } catch (Exception e) {}
-              }
-              return val;
-            }
-          });
-    } else {
-        try {
-            s = System.getProperty(property);
-        } catch (Exception e) {}
-        if(null==s && jnlpAlias && !property.startsWith(jnlp_prefix)) {
-            try {
-                s = System.getProperty(jnlp_prefix + property);
-            } catch (Exception e) {}
-        }
-    }
-    return s;
-  }
-  public static final String jnlp_prefix = "jnlp." ;
-
-  public static boolean verbose() {
-    return verbose;
-  }
-
-  public static boolean debugAll() {
-    return debugAll;
-  }
-
-  public static boolean debug(String subcomponent) {
-    return debugAll() || isPropertyDefined("newt.debug." + subcomponent, true);
-  }
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/impl/NativeLibLoader.java b/src/newt/classes/com/jogamp/javafx/newt/impl/NativeLibLoader.java
deleted file mode 100644
index 9bbfc5921..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/impl/NativeLibLoader.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.jogamp.javafx.newt.impl;
-
-// FIXME: refactor Java SE dependencies
-//import java.awt.Toolkit;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashSet;
-import com.jogamp.nativewindow.impl.NativeLibLoaderBase;
-
-public class NativeLibLoader extends NativeLibLoaderBase {
-  
-  public static void loadNEWT() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("newt", null, true);
-        return null;
-      }
-    });
-  }
-
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Display.java b/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Display.java
deleted file mode 100644
index 3198c7511..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Display.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.intel.gdl;
-
-import com.jogamp.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
-
-public class Display extends com.jogamp.javafx.newt.Display {
-    static int initCounter = 0;
-
-    static {
-        NativeLibLoader.loadNEWT();
-
-        if (!Screen.initIDs()) {
-            throw new NativeWindowException("Failed to initialize GDL Screen jmethodIDs");
-        }
-        if (!Window.initIDs()) {
-            throw new NativeWindowException("Failed to initialize GDL Window jmethodIDs");
-        }
-    }
-
-    public static void initSingleton() {
-        // just exist to ensure static init has been run
-    }
-
-
-    public Display() {
-    }
-
-    protected void createNative() {
-        synchronized(Display.class) {
-            if(0==initCounter) {
-                displayHandle = CreateDisplay();
-                if(0==displayHandle) {
-                    throw new NativeWindowException("Couldn't initialize GDL Display");
-                }
-            }
-            initCounter++;
-        }
-        aDevice = new DefaultGraphicsDevice(NativeWindowFactory.TYPE_DEFAULT, displayHandle);
-    }
-
-    protected void closeNative() {
-        if(0==displayHandle) {
-            throw new NativeWindowException("displayHandle null; initCnt "+initCounter);
-        }
-        synchronized(Display.class) {
-            if(initCounter>0) {
-                initCounter--;
-                if(0==initCounter) {
-                    DestroyDisplay(displayHandle);
-                }
-            }
-        }
-    }
-
-    protected void dispatchMessages() {
-        if(0!=displayHandle) {
-            DispatchMessages(displayHandle, focusedWindow);
-        }
-    }
-
-    protected void setFocus(Window focus) {
-        focusedWindow = focus;
-    }
-
-    private long displayHandle = 0;
-    private Window focusedWindow = null;
-    private native long CreateDisplay();
-    private native void DestroyDisplay(long displayHandle);
-    private native void DispatchMessages(long displayHandle, Window focusedWindow);
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Screen.java b/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Screen.java
deleted file mode 100644
index a09b1e790..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Screen.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.intel.gdl;
-
-import com.jogamp.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
-
-public class Screen extends com.jogamp.javafx.newt.Screen {
-
-    static {
-        Display.initSingleton();
-    }
-
-    public Screen() {
-    }
-
-    protected void createNative(int index) {
-        AbstractGraphicsDevice adevice = getDisplay().getGraphicsDevice();
-        GetScreenInfo(adevice.getHandle(), index);
-        aScreen = new DefaultGraphicsScreen(adevice, index);
-    }
-
-    protected void closeNative() { }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    protected static native boolean initIDs();
-    private          native void GetScreenInfo(long displayHandle, int screen_idx);
-
-    // called by GetScreenInfo() ..
-    private void screenCreated(int width, int height) {
-        setScreenSize(width, height);
-    }
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Window.java b/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Window.java
deleted file mode 100644
index 28ffa1296..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Window.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.intel.gdl;
-
-import javax.media.nativewindow.*;
-
-public class Window extends com.jogamp.javafx.newt.Window {
-    static {
-        Display.initSingleton();
-    }
-
-    public Window() {
-    }
-
-    static long nextWindowHandle = 1;
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        if(0!=parentWindowHandle) {
-            throw new NativeWindowException("GDL Window does not support window parenting");
-        }
-        AbstractGraphicsScreen aScreen = screen.getGraphicsScreen();
-        AbstractGraphicsDevice aDevice = screen.getDisplay().getGraphicsDevice();
-
-        config = GraphicsConfigurationFactory.getFactory(aDevice).chooseGraphicsConfiguration(caps, null, aScreen);
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-
-        synchronized(Window.class) {
-            windowHandle = nextWindowHandle++;
-        }
-    }
-
-    protected void closeNative() {
-        if(0!=surfaceHandle) {
-            synchronized(Window.class) {
-                CloseSurface(getDisplayHandle(), surfaceHandle);
-            }
-            surfaceHandle = 0;
-            ((Display)screen.getDisplay()).setFocus(null);
-        }
-    }
-
-    public void setVisible(boolean visible) {
-        if(this.visible!=visible) {
-            this.visible=visible;
-            if(visible && 0==surfaceHandle) {
-                synchronized(Window.class) {
-                    AbstractGraphicsDevice aDevice = screen.getDisplay().getGraphicsDevice();
-                    surfaceHandle = CreateSurface(aDevice.getHandle(), screen.getWidth(), screen.getHeight(), x, y, width, height);
-                }
-                if (surfaceHandle == 0) {
-                    throw new NativeWindowException("Error creating window");
-                }
-                ((Display)screen.getDisplay()).setFocus(this);
-            }
-        }
-    }
-
-    public void setSize(int width, int height) {
-        Screen  screen = (Screen) getScreen();
-        if((x+width)>screen.getWidth()) {
-            width=screen.getWidth()-x;
-        }
-        if((y+height)>screen.getHeight()) {
-            height=screen.getHeight()-y;
-        }
-        this.width = width;
-        this.height = height;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        }
-        if(0!=surfaceHandle) {
-            SetBounds0(surfaceHandle, screen.getWidth(), screen.getHeight(), x, y, width, height);
-        }
-    }
-
-    public void setPosition(int x, int y) {
-        Screen  screen = (Screen) getScreen();
-        if((x+width)>screen.getWidth()) {
-            x=screen.getWidth()-width;
-        }
-        if((y+height)>screen.getHeight()) {
-            y=screen.getHeight()-height;
-        }
-        this.x = x;
-        this.y = y;
-        if(!fullscreen) {
-            nfs_x=x;
-            nfs_y=y;
-        }
-        if(0!=surfaceHandle) {
-            SetBounds0(surfaceHandle, screen.getWidth(), screen.getHeight(), x, y, width, height);
-        }
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        if(this.fullscreen!=fullscreen) {
-            int x,y,w,h;
-            this.fullscreen=fullscreen;
-            if(fullscreen) {
-                x = 0; y = 0;
-                w = screen.getWidth();
-                h = screen.getHeight();
-            } else {
-                x = nfs_x;
-                y = nfs_y;
-                w = nfs_width;
-                h = nfs_height;
-            }
-            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                System.err.println("IntelGDL Window fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
-            }
-            if(0!=surfaceHandle) {
-                SetBounds0(surfaceHandle, screen.getWidth(), screen.getHeight(), x, y, w, h);
-            }
-        }
-        return fullscreen;
-    }
-
-    public void requestFocus() {
-        ((Display)screen.getDisplay()).setFocus(this);
-    }
-
-    public long getSurfaceHandle() {
-        return surfaceHandle;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    protected static native boolean initIDs();
-    private        native long CreateSurface(long displayHandle, int scrn_width, int scrn_height, int x, int y, int width, int height);
-    private        native void CloseSurface(long displayHandle, long surfaceHandle);
-    private        native void SetBounds0(long surfaceHandle, int scrn_width, int scrn_height, int x, int y, int width, int height);
-
-    private void updateBounds(int x, int y, int width, int height) {
-        this.x = x;
-        this.y = y;
-        this.width = width;
-        this.height = height;
-    }
-
-    private long   surfaceHandle;
-    private int nfs_width, nfs_height, nfs_x, nfs_y;
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacDisplay.java b/src/newt/classes/com/jogamp/javafx/newt/macosx/MacDisplay.java
deleted file mode 100755
index 4d78358d7..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacDisplay.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.macosx;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.macosx.*;
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-import com.jogamp.javafx.newt.util.MainThread;
-
-public class MacDisplay extends Display {
-    static {
-        NativeLibLoader.loadNEWT();
-
-        if(!initNSApplication()) {
-            throw new NativeWindowException("Failed to initialize native Application hook");
-        }
-        if(!MacWindow.initIDs()) {
-            throw new NativeWindowException("Failed to initialize jmethodIDs");
-        }
-        if(DEBUG) System.out.println("MacDisplay.init App and IDs OK "+Thread.currentThread().getName());
-    }
-
-    public static void initSingleton() {
-        // just exist to ensure static init has been run
-    }
-    
-    public MacDisplay() {
-    }
-
-    class DispatchAction implements Runnable {
-        public void run() {
-            dispatchMessages0();
-        }
-    }
-    private DispatchAction dispatchAction = new DispatchAction();
-
-    public void dispatchMessages() {
-        MainThread.invoke(false, dispatchAction);
-    }
-    
-    protected void createNative() {
-        aDevice = new MacOSXGraphicsDevice();
-    }
-
-    protected void closeNative() { }
-
-    private static native boolean initNSApplication();
-    protected native void dispatchMessages0();
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacScreen.java b/src/newt/classes/com/jogamp/javafx/newt/macosx/MacScreen.java
deleted file mode 100755
index 8d0be80dc..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacScreen.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.macosx;
-
-import com.jogamp.javafx.newt.*;
-import javax.media.nativewindow.*;
-
-public class MacScreen extends Screen {
-    static {
-        MacDisplay.initSingleton();
-    }
-
-    public MacScreen() {
-    }
-
-    protected void createNative(int index) {
-        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
-        setScreenSize(getWidthImpl(getIndex()), getHeightImpl(getIndex()));
-    }
-
-    protected void closeNative() { }
-
-    private static native int getWidthImpl(int scrn_idx);
-    private static native int getHeightImpl(int scrn_idx);
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacWindow.java b/src/newt/classes/com/jogamp/javafx/newt/macosx/MacWindow.java
deleted file mode 100755
index f1698bfcd..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacWindow.java
+++ /dev/null
@@ -1,600 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.macosx;
-
-import javax.media.nativewindow.*;
-
-import com.jogamp.javafx.newt.util.MainThread;
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-
-public class MacWindow extends Window {
-    
-    // Window styles
-    private static final int NSBorderlessWindowMask     = 0;
-    private static final int NSTitledWindowMask         = 1 << 0;
-    private static final int NSClosableWindowMask       = 1 << 1;
-    private static final int NSMiniaturizableWindowMask = 1 << 2;
-    private static final int NSResizableWindowMask      = 1 << 3;
-
-    // Window backing store types
-    private static final int NSBackingStoreRetained     = 0;
-    private static final int NSBackingStoreNonretained  = 1;
-    private static final int NSBackingStoreBuffered     = 2;
-
-    // Key constants handled differently on Mac OS X than other platforms
-    private static final int NSUpArrowFunctionKey        = 0xF700;
-    private static final int NSDownArrowFunctionKey      = 0xF701;
-    private static final int NSLeftArrowFunctionKey      = 0xF702;
-    private static final int NSRightArrowFunctionKey     = 0xF703;
-    private static final int NSF1FunctionKey             = 0xF704;
-    private static final int NSF2FunctionKey             = 0xF705;
-    private static final int NSF3FunctionKey             = 0xF706;
-    private static final int NSF4FunctionKey             = 0xF707;
-    private static final int NSF5FunctionKey             = 0xF708;
-    private static final int NSF6FunctionKey             = 0xF709;
-    private static final int NSF7FunctionKey             = 0xF70A;
-    private static final int NSF8FunctionKey             = 0xF70B;
-    private static final int NSF9FunctionKey             = 0xF70C;
-    private static final int NSF10FunctionKey            = 0xF70D;
-    private static final int NSF11FunctionKey            = 0xF70E;
-    private static final int NSF12FunctionKey            = 0xF70F;
-    private static final int NSF13FunctionKey            = 0xF710;
-    private static final int NSF14FunctionKey            = 0xF711;
-    private static final int NSF15FunctionKey            = 0xF712;
-    private static final int NSF16FunctionKey            = 0xF713;
-    private static final int NSF17FunctionKey            = 0xF714;
-    private static final int NSF18FunctionKey            = 0xF715;
-    private static final int NSF19FunctionKey            = 0xF716;
-    private static final int NSF20FunctionKey            = 0xF717;
-    private static final int NSF21FunctionKey            = 0xF718;
-    private static final int NSF22FunctionKey            = 0xF719;
-    private static final int NSF23FunctionKey            = 0xF71A;
-    private static final int NSF24FunctionKey            = 0xF71B;
-    private static final int NSF25FunctionKey            = 0xF71C;
-    private static final int NSF26FunctionKey            = 0xF71D;
-    private static final int NSF27FunctionKey            = 0xF71E;
-    private static final int NSF28FunctionKey            = 0xF71F;
-    private static final int NSF29FunctionKey            = 0xF720;
-    private static final int NSF30FunctionKey            = 0xF721;
-    private static final int NSF31FunctionKey            = 0xF722;
-    private static final int NSF32FunctionKey            = 0xF723;
-    private static final int NSF33FunctionKey            = 0xF724;
-    private static final int NSF34FunctionKey            = 0xF725;
-    private static final int NSF35FunctionKey            = 0xF726;
-    private static final int NSInsertFunctionKey         = 0xF727;
-    private static final int NSDeleteFunctionKey         = 0xF728;
-    private static final int NSHomeFunctionKey           = 0xF729;
-    private static final int NSBeginFunctionKey          = 0xF72A;
-    private static final int NSEndFunctionKey            = 0xF72B;
-    private static final int NSPageUpFunctionKey         = 0xF72C;
-    private static final int NSPageDownFunctionKey       = 0xF72D;
-    private static final int NSPrintScreenFunctionKey    = 0xF72E;
-    private static final int NSScrollLockFunctionKey     = 0xF72F;
-    private static final int NSPauseFunctionKey          = 0xF730;
-    private static final int NSSysReqFunctionKey         = 0xF731;
-    private static final int NSBreakFunctionKey          = 0xF732;
-    private static final int NSResetFunctionKey          = 0xF733;
-    private static final int NSStopFunctionKey           = 0xF734;
-    private static final int NSMenuFunctionKey           = 0xF735;
-    private static final int NSUserFunctionKey           = 0xF736;
-    private static final int NSSystemFunctionKey         = 0xF737;
-    private static final int NSPrintFunctionKey          = 0xF738;
-    private static final int NSClearLineFunctionKey      = 0xF739;
-    private static final int NSClearDisplayFunctionKey   = 0xF73A;
-    private static final int NSInsertLineFunctionKey     = 0xF73B;
-    private static final int NSDeleteLineFunctionKey     = 0xF73C;
-    private static final int NSInsertCharFunctionKey     = 0xF73D;
-    private static final int NSDeleteCharFunctionKey     = 0xF73E;
-    private static final int NSPrevFunctionKey           = 0xF73F;
-    private static final int NSNextFunctionKey           = 0xF740;
-    private static final int NSSelectFunctionKey         = 0xF741;
-    private static final int NSExecuteFunctionKey        = 0xF742;
-    private static final int NSUndoFunctionKey           = 0xF743;
-    private static final int NSRedoFunctionKey           = 0xF744;
-    private static final int NSFindFunctionKey           = 0xF745;
-    private static final int NSHelpFunctionKey           = 0xF746;
-    private static final int NSModeSwitchFunctionKey     = 0xF747;
-
-    private volatile long surfaceHandle;
-    private long parentWindowHandle;
-
-    // non fullscreen dimensions ..
-    private int nfs_width, nfs_height, nfs_x, nfs_y;
-    private final Insets insets = new Insets(0,0,0,0);
-
-    static {
-        MacDisplay.initSingleton();
-    }
-
-    public MacWindow() {
-    }
-    
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        this.parentWindowHandle=parentWindowHandle;
-        config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, getScreen().getGraphicsScreen());
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-    }
-
-    class CloseAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if(DEBUG_IMPLEMENTATION) System.out.println("MacWindow.CloseAction "+Thread.currentThread().getName());
-                if (windowHandle != 0) {
-                    close0(windowHandle);
-                    windowHandle = 0;
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private CloseAction closeAction = new CloseAction();
-
-    protected void closeNative() {
-        MainThread.invoke(true, closeAction);
-    }
-    
-    public long getWindowHandle() {
-        nsViewLock.lock();
-        try {
-            return windowHandle;
-        } finally {
-            nsViewLock.unlock();
-        }
-    }
-
-    public long getSurfaceHandle() {
-        nsViewLock.lock();
-        try {
-            return surfaceHandle;
-        } finally {
-            nsViewLock.unlock();
-        }
-    }
-
-    class EnsureWindowCreatedAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                createWindow(parentWindowHandle, false);
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private EnsureWindowCreatedAction ensureWindowCreatedAction =
-        new EnsureWindowCreatedAction();
-
-    public Insets getInsets() {
-        // in order to properly calculate insets we need the window to be
-        // created
-        MainThread.invoke(true, ensureWindowCreatedAction);
-        nsViewLock.lock();
-        try {
-            return (Insets) insets.clone();
-        } finally {
-            nsViewLock.unlock();
-        }
-    }
-
-    private ToolkitLock nsViewLock = new ToolkitLock() {
-            private Thread owner;
-            private int recursionCount;
-            
-            public synchronized void lock() {
-                Thread cur = Thread.currentThread();
-                if (owner == cur) {
-                    ++recursionCount;
-                    return;
-                }
-                while (owner != null) {
-                    try {
-                        wait();
-                    } catch (InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-                owner = cur;
-            }
-
-            public synchronized void unlock() {
-                if (owner != Thread.currentThread()) {
-                    throw new RuntimeException("Not owner");
-                }
-                if (recursionCount > 0) {
-                    --recursionCount;
-                    return;
-                }
-                owner = null;
-                notifyAll();
-            }
-        };
-
-    public synchronized int lockSurface() throws NativeWindowException {
-        nsViewLock.lock();
-        return super.lockSurface();
-    }
-
-    public void unlockSurface() {
-        super.unlockSurface();
-        nsViewLock.unlock();
-    }
-
-    class VisibleAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if(DEBUG_IMPLEMENTATION) System.out.println("MacWindow.VisibleAction "+visible+" "+Thread.currentThread().getName());
-                if (visible) {
-                    createWindow(parentWindowHandle, false);
-                    if (windowHandle != 0) {
-                        makeKeyAndOrderFront(windowHandle);
-                    }
-                } else {
-                    if (windowHandle != 0) {
-                        orderOut(windowHandle);
-                    }
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private VisibleAction visibleAction = new VisibleAction();
-
-    public void setVisible(boolean visible) {
-        this.visible = visible;
-        MainThread.invoke(true, visibleAction);
-    }
-
-    class TitleAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if (windowHandle != 0) {
-                    setTitle0(windowHandle, title);
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private TitleAction titleAction = new TitleAction();
-
-    public void setTitle(String title) {
-        super.setTitle(title);
-        MainThread.invoke(true, titleAction);
-    }
-
-    class FocusAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if (windowHandle != 0) {
-                    makeKey(windowHandle);
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private FocusAction focusAction = new FocusAction();
-
-    public void requestFocus() {
-        super.requestFocus();
-        MainThread.invoke(true, focusAction);
-    }
-    
-    class SizeAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if (windowHandle != 0) {
-                    setContentSize(windowHandle, width, height);
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private SizeAction sizeAction = new SizeAction();
-
-    public void setSize(int width, int height) {
-        this.width=width;
-        this.height=height;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        }
-        MainThread.invoke(true, sizeAction);
-    }
-    
-    class PositionAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if (windowHandle != 0) {
-                    setFrameTopLeftPoint(parentWindowHandle, windowHandle, x, y);
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private PositionAction positionAction = new PositionAction();
-
-    public void setPosition(int x, int y) {
-        this.x=x;
-        this.y=y;
-        if(!fullscreen) {
-            nfs_x=x;
-            nfs_y=y;
-        }
-        MainThread.invoke(true, positionAction);
-    }
-    
-    class FullscreenAction implements Runnable {
-        public void run() {
-            nsViewLock.lock();
-            try {
-                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                    System.err.println("MacWindow fs: "+fullscreen+" "+x+"/"+y+" "+width+"x"+height);
-                }
-                createWindow(parentWindowHandle, true);
-                if (windowHandle != 0) {
-                    makeKeyAndOrderFront(windowHandle);
-                }
-            } finally {
-                nsViewLock.unlock();
-            }
-        }
-    }
-    private FullscreenAction fullscreenAction = new FullscreenAction();
-
-    public boolean setFullscreen(boolean fullscreen) {
-        if(this.fullscreen!=fullscreen) {
-            this.fullscreen=fullscreen;
-            if(fullscreen) {
-                x = 0; 
-                y = 0;
-                width = screen.getWidth();
-                height = screen.getHeight();
-            } else {
-                x = nfs_x;
-                y = nfs_y;
-                width = nfs_width;
-                height = nfs_height;
-            }
-            MainThread.invoke(true, fullscreenAction);
-        }
-        return fullscreen;
-    }
-    
-    private void sizeChanged(int newWidth, int newHeight) {
-        if (DEBUG_IMPLEMENTATION) {
-            System.out.println(Thread.currentThread().getName()+" Size changed to " + newWidth + ", " + newHeight);
-        }
-        width = newWidth;
-        height = newHeight;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        }
-        if (DEBUG_IMPLEMENTATION) {
-            System.out.println("  Posted WINDOW_RESIZED event");
-        }
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
-    }
-
-    private void insetsChanged(int left, int top, int right, int bottom) {
-        if (DEBUG_IMPLEMENTATION) {
-            System.out.println(Thread.currentThread().getName()+
-                " Insets changed to " + left + ", " + top + ", " + right + ", " + bottom);
-        }
-        if (left != -1 && top != -1 && right != -1 && bottom != -1) {
-            insets.left = left;
-            insets.top = top;
-            insets.right = right;
-            insets.bottom = bottom;
-        }
-    }
-
-    private void positionChanged(int newX, int newY) {
-        if (DEBUG_IMPLEMENTATION) {
-            System.out.println(Thread.currentThread().getName()+" Position changed to " + newX + ", " + newY);
-        }
-        x = newX;
-        y = newY;
-        if(!fullscreen) {
-            nfs_x=x;
-            nfs_y=y;
-        }
-        if (DEBUG_IMPLEMENTATION) {
-            System.out.println("  Posted WINDOW_MOVED event");
-        }
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
-    }
-
-    private void focusChanged(boolean focusGained) {
-        if (focusGained) {
-            sendWindowEvent(WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
-        } else {
-            sendWindowEvent(WindowEvent.EVENT_WINDOW_LOST_FOCUS);
-        }
-    }
-
-    private char convertKeyChar(char keyChar) {
-        if (keyChar == '\r') {
-            // Turn these into \n
-            return '\n';
-        }
-
-        if (keyChar >= NSUpArrowFunctionKey && keyChar <= NSModeSwitchFunctionKey) {
-            switch (keyChar) {
-                case NSUpArrowFunctionKey:     return KeyEvent.VK_UP;
-                case NSDownArrowFunctionKey:   return KeyEvent.VK_DOWN;
-                case NSLeftArrowFunctionKey:   return KeyEvent.VK_LEFT;
-                case NSRightArrowFunctionKey:  return KeyEvent.VK_RIGHT;
-                case NSF1FunctionKey:          return KeyEvent.VK_F1;
-                case NSF2FunctionKey:          return KeyEvent.VK_F2;
-                case NSF3FunctionKey:          return KeyEvent.VK_F3;
-                case NSF4FunctionKey:          return KeyEvent.VK_F4;
-                case NSF5FunctionKey:          return KeyEvent.VK_F5;
-                case NSF6FunctionKey:          return KeyEvent.VK_F6;
-                case NSF7FunctionKey:          return KeyEvent.VK_F7;
-                case NSF8FunctionKey:          return KeyEvent.VK_F8;
-                case NSF9FunctionKey:          return KeyEvent.VK_F9;
-                case NSF10FunctionKey:         return KeyEvent.VK_F10;
-                case NSF11FunctionKey:         return KeyEvent.VK_F11;
-                case NSF12FunctionKey:         return KeyEvent.VK_F12;
-                case NSF13FunctionKey:         return KeyEvent.VK_F13;
-                case NSF14FunctionKey:         return KeyEvent.VK_F14;
-                case NSF15FunctionKey:         return KeyEvent.VK_F15;
-                case NSF16FunctionKey:         return KeyEvent.VK_F16;
-                case NSF17FunctionKey:         return KeyEvent.VK_F17;
-                case NSF18FunctionKey:         return KeyEvent.VK_F18;
-                case NSF19FunctionKey:         return KeyEvent.VK_F19;
-                case NSF20FunctionKey:         return KeyEvent.VK_F20;
-                case NSF21FunctionKey:         return KeyEvent.VK_F21;
-                case NSF22FunctionKey:         return KeyEvent.VK_F22;
-                case NSF23FunctionKey:         return KeyEvent.VK_F23;
-                case NSF24FunctionKey:         return KeyEvent.VK_F24;
-                case NSInsertFunctionKey:      return KeyEvent.VK_INSERT;
-                case NSDeleteFunctionKey:      return KeyEvent.VK_DELETE;
-                case NSHomeFunctionKey:        return KeyEvent.VK_HOME;
-                case NSBeginFunctionKey:       return KeyEvent.VK_BEGIN;
-                case NSEndFunctionKey:         return KeyEvent.VK_END;
-                case NSPageUpFunctionKey:      return KeyEvent.VK_PAGE_UP;
-                case NSPageDownFunctionKey:    return KeyEvent.VK_PAGE_DOWN;
-                case NSPrintScreenFunctionKey: return KeyEvent.VK_PRINTSCREEN;
-                case NSScrollLockFunctionKey:  return KeyEvent.VK_SCROLL_LOCK;
-                case NSPauseFunctionKey:       return KeyEvent.VK_PAUSE;
-                // Not handled:
-                // NSSysReqFunctionKey
-                // NSBreakFunctionKey
-                // NSResetFunctionKey
-                case NSStopFunctionKey:        return KeyEvent.VK_STOP;
-                // Not handled:
-                // NSMenuFunctionKey
-                // NSUserFunctionKey
-                // NSSystemFunctionKey
-                // NSPrintFunctionKey
-                // NSClearLineFunctionKey
-                // NSClearDisplayFunctionKey
-                // NSInsertLineFunctionKey
-                // NSDeleteLineFunctionKey
-                // NSInsertCharFunctionKey
-                // NSDeleteCharFunctionKey
-                // NSPrevFunctionKey
-                // NSNextFunctionKey
-                // NSSelectFunctionKey
-                // NSExecuteFunctionKey
-                // NSUndoFunctionKey
-                // NSRedoFunctionKey
-                // NSFindFunctionKey
-                // NSHelpFunctionKey
-                // NSModeSwitchFunctionKey
-                default: break;
-            }
-        }
-
-        // NSEvent's charactersIgnoringModifiers doesn't ignore the shift key
-        if (keyChar >= 'a' && keyChar <= 'z') {
-            return Character.toUpperCase(keyChar);
-        }
-
-        return keyChar;
-    }
-
-    protected void sendKeyEvent(int eventType, int modifiers, int keyCode, char keyChar) {
-        int key = convertKeyChar(keyChar);
-        if(DEBUG_IMPLEMENTATION) System.out.println("MacWindow.sendKeyEvent "+Thread.currentThread().getName());
-        // Note that we send the key char for the key code on this
-        // platform -- we do not get any useful key codes out of the system
-        super.sendKeyEvent(eventType, modifiers, key, keyChar);
-    }
-
-    private void createWindow(long parentWindowHandle, boolean recreate) {
-        if(0!=windowHandle && !recreate) {
-            return;
-        }
-        if(0!=windowHandle) {
-            // save the view .. close the window
-            surfaceHandle = changeContentView(parentWindowHandle, windowHandle, 0);
-            if(recreate && 0==surfaceHandle) {
-                throw new NativeWindowException("Internal Error - recreate, window but no view");
-            }
-            close0(windowHandle);
-            windowHandle=0;
-        } else {
-            surfaceHandle = 0;
-        }
-        windowHandle = createWindow0(parentWindowHandle, 
-                                     getX(), getY(), getWidth(), getHeight(), fullscreen,
-                                     (isUndecorated() ?
-                                     NSBorderlessWindowMask :
-                                     NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask),
-                                     NSBackingStoreBuffered, 
-                                     getScreen().getIndex(), surfaceHandle);
-        if (windowHandle == 0) {
-            throw new NativeWindowException("Could create native window "+Thread.currentThread().getName()+" "+this);
-        }
-        surfaceHandle = contentView(windowHandle);
-        setTitle0(windowHandle, getTitle());
-        // don't make the window visible on window creation
-//        makeKeyAndOrderFront(windowHandle);
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
-    }
-    
-    protected static native boolean initIDs();
-    private native long createWindow0(long parentWindowHandle, int x, int y, int w, int h,
-                                     boolean fullscreen, int windowStyle,
-                                     int backingStoreType,
-                                     int screen_idx, long view);
-    private native void makeKeyAndOrderFront(long window);
-    private native void makeKey(long window);
-    private native void orderOut(long window);
-    private native void close0(long window);
-    private native void setTitle0(long window, String title);
-    private native long contentView(long window);
-    private native long changeContentView(long parentWindowHandle, long window, long view);
-    private native void setContentSize(long window, int w, int h);
-    private native void setFrameTopLeftPoint(long parentWindowHandle, long window, int x, int y);
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/GLWindow.java
deleted file mode 100644
index b299d011e..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/GLWindow.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.opengl;
-
-import com.jogamp.javafx.newt.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.jogamp.opengl.impl.GLDrawableHelper;
-import java.util.*;
-
-/**
- * An implementation of {@link Window} which is customized for OpenGL
- * use, and which implements the {@link javax.media.opengl.GLAutoDrawable} interface.
- * <P>
- * This implementation does not make the OpenGL context current<br>
- * before calling the various input EventListener callbacks (MouseListener, KeyListener,
- * etc.).<br>
- * This design decision is made to favor a more performant and simplified
- * implementation, as well as the event dispatcher shall be allowed
- * not having a notion about OpenGL.
- * <p>
- */
-public class GLWindow extends Window implements GLAutoDrawable {
-    private static List/*GLWindow*/ glwindows = new ArrayList();
-
-    private boolean ownerOfWinScrDpy;
-    private Window window;
-    private boolean runPumpMessages;
-
-    /** Constructor. Do not call this directly -- use {@link
-        create()} instead. */
-    protected GLWindow(Window window, boolean ownerOfWinScrDpy) {
-        this.ownerOfWinScrDpy = ownerOfWinScrDpy;
-        this.window = window;
-        this.window.setAutoDrawableClient(true);
-        this.runPumpMessages = ( null == getScreen().getDisplay().getEDT() ) ;
-        window.addWindowListener(new WindowListener() {
-                public void windowResized(WindowEvent e) {
-                    sendReshape = true;
-                }
-
-                public void windowMoved(WindowEvent e) {
-                }
-
-                public void windowGainedFocus(WindowEvent e) {
-                }
-
-                public void windowLostFocus(WindowEvent e) {
-                }
-
-                public void windowDestroyNotify(WindowEvent e) {
-                    sendDestroy = true;
-                }
-            });
-
-        List newglw = (List) ((ArrayList) glwindows).clone();
-        newglw.add(this);
-        glwindows=newglw;
-    }
-
-    /** Creates a new GLWindow on the local display, screen 0, with a
-        dummy visual ID, and with the default GLCapabilities. */
-    public static GLWindow create() {
-        return create(null, null, false);
-    }
-
-    public static GLWindow create(boolean undecorated) {
-        return create(null, null, undecorated);
-    }
-
-    /** Creates a new GLWindow referring to the given window. */
-    public static GLWindow create(Window window) {
-        return create(window, null, false);
-    }
-    public static GLWindow create(GLCapabilities caps) {
-        return create(null, caps, false);
-    }
-
-    /** Creates a new GLWindow on the local display, screen 0, with a
-        dummy visual ID, and with the given GLCapabilities. */
-    public static GLWindow create(GLCapabilities caps, boolean undecorated) {
-        return create(null, caps, undecorated);
-    }
-
-    /** Either or: window (prio), or caps and undecorated (2nd choice) */
-    private static GLWindow create(Window window, 
-                                   GLCapabilities caps,
-                                   boolean undecorated) {
-        Display display;
-        boolean ownerOfWinScrDpy=false;
-        if (window == null) {
-            if (caps == null) {
-                caps = new GLCapabilities(null); // default ..
-            }
-            ownerOfWinScrDpy = true;
-            display = NewtFactory.createDisplay(null); // local display
-            Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
-            window = NewtFactory.createWindow(screen, caps, undecorated);
-        }
-
-        return new GLWindow(window, ownerOfWinScrDpy);
-    }
-    
-    /** 
-     * EXPERIMENTAL<br> 
-     * Enable or disables running the {@link Display#pumpMessages} in the {@link #display()} call.<br>
-     * The default behavior is to run {@link Display#pumpMessages}.<P>
-     *
-     * The idea was that in a single threaded environment with one {@link Display} and many {@link Window}'s,
-     * a performance benefit was expected while disabling the implicit {@link Display#pumpMessages} and
-     * do it once via {@link GLWindow#runCurrentThreadPumpMessage()} <br>
-     * This could not have been verified. No measurable difference could have been recognized.<P>
-     *
-     * Best performance has been achieved with one GLWindow per thread.<br> 
-     *
-     * Enabling local pump messages while using the EDT, 
-     * {@link com.jogamp.javafx.newt.NewtFactory#setUseEDT(boolean)},
-     * will result in an exception.
-     *
-     * @deprecated EXPERIMENTAL, semantic is about to be removed after further verification.
-     */
-    public void setRunPumpMessages(boolean onoff) {
-        if( onoff && null!=getScreen().getDisplay().getEDT() ) {
-            throw new GLException("GLWindow.setRunPumpMessages(true) - Can't do with EDT on");
-        }
-        runPumpMessages = onoff;
-    }
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        shouldNotCallThis();
-    }
-
-    protected void closeNative() {
-        shouldNotCallThis();
-    }
-
-    protected void dispose(boolean regenerate, boolean sendEvent) {
-        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
-            Exception e1 = new Exception("GLWindow.dispose("+regenerate+") "+Thread.currentThread()+", 1");
-            e1.printStackTrace();
-        }
-
-        if(sendEvent) {
-            sendDisposeEvent();
-        }
-
-        if (context != null) {
-            context.destroy();
-        }
-        if (drawable != null) {
-            drawable.setRealized(false);
-        }
-
-        if(regenerate) {
-            if(null==window) {
-                throw new GLException("GLWindow.dispose(true): null window");
-            }
-
-            // recreate GLDrawable, to reflect the new graphics configurations
-            NativeWindow nw;
-            if (window.getWrappedWindow() != null) {
-                nw = NativeWindowFactory.getNativeWindow(window.getWrappedWindow(), window.getGraphicsConfiguration());
-            } else {
-                nw = window;
-            }
-            drawable = factory.createGLDrawable(nw);
-            drawable.setRealized(true);
-            context = drawable.createContext(null);
-            sendReshape = true; // ensure a reshape event is send ..
-        }
-
-        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
-            System.out.println("GLWindow.dispose("+regenerate+") "+Thread.currentThread()+", fin: "+this);
-        }
-    }
-
-    public synchronized void destroy() {
-        destroy(true);
-    }
-
-    /** @param sendDisposeEvent should be false in a [time,reliable] critical shutdown */
-    public synchronized void destroy(boolean sendDisposeEvent) {
-        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
-            Exception e1 = new Exception("GLWindow.destroy "+Thread.currentThread()+", 1: "+this);
-            e1.printStackTrace();
-        }
-
-        List newglw = (List) ((ArrayList) glwindows).clone();
-        newglw.remove(this);
-        glwindows=newglw;
-
-        dispose(false, sendDisposeEvent);
-
-        if(null!=window) {
-            if(ownerOfWinScrDpy) {
-                window.destroy(true);
-            }
-        }
-
-        drawable = null;
-        context = null;
-        window = null;
-
-        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
-            System.out.println("GLWindow.destroy "+Thread.currentThread()+", fin: "+this);
-        }
-    }
-
-    public boolean getPerfLogEnabled() { return perfLog; }
-
-    public void enablePerfLog(boolean v) {
-        perfLog = v;
-    }
-
-    public void setVisible(boolean visible) {
-        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
-            System.out.println(Thread.currentThread()+" GLWindow.setVisible("+visible+") START ; isVisible "+this.visible+" ; has context "+(null!=context));
-        }
-        this.visible=visible;
-        window.setVisible(visible);
-        if (visible && context == null) {
-            NativeWindow nw;
-            if (window.getWrappedWindow() != null) {
-                nw = NativeWindowFactory.getNativeWindow(window.getWrappedWindow(), window.getGraphicsConfiguration());
-            } else {
-                nw = window;
-            }
-            GLCapabilities glCaps = (GLCapabilities) nw.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
-            factory = GLDrawableFactory.getFactory(glCaps.getGLProfile());
-            drawable = factory.createGLDrawable(nw);
-            drawable.setRealized(true);
-            context = drawable.createContext(null);
-            sendReshape = true; // ensure a reshape event is send ..
-        }
-        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
-            System.out.println(Thread.currentThread()+" GLWindow.setVisible("+visible+") END  ; has context "+(null!=context));
-        }
-    }
-
-    public Screen getScreen() {
-        return window.getScreen();
-    }
-
-    public void setTitle(String title) {
-        window.setTitle(title);
-    }
-
-    public String getTitle() {
-        return window.getTitle();
-    }
-
-    public void setUndecorated(boolean value) {
-        window.setUndecorated(value);
-    }
-
-    public boolean isUndecorated() {
-        return window.isUndecorated();
-    }
-
-    public void setSize(int width, int height) {
-        window.setSize(width, height);
-    }
-
-    public void setPosition(int x, int y) {
-        window.setPosition(x, y);
-    }
-
-    public Insets getInsets() {
-        return window.getInsets();
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        return window.setFullscreen(fullscreen);
-    }
-
-    public boolean isVisible() {
-        return window.isVisible();
-    }
-
-    public int getX() {
-        return window.getX();
-    }
-
-    public int getY() {
-        return window.getY();
-    }
-
-    public int getWidth() {
-        return window.getWidth();
-    }
-
-    public int getHeight() {
-        return window.getHeight();
-    }
-
-    public boolean isFullscreen() {
-        return window.isFullscreen();
-    }
-
-    public void addSurfaceUpdatedListener(SurfaceUpdatedListener l) {
-        window.addSurfaceUpdatedListener(l);
-    }
-    public void removeSurfaceUpdatedListener(SurfaceUpdatedListener l) {
-        window.removeSurfaceUpdatedListener(l);
-    }
-    public SurfaceUpdatedListener[] getSurfaceUpdatedListener() {
-        return window.getSurfaceUpdatedListener();
-    }
-    public void surfaceUpdated(Object updater, NativeWindow window0, long when) { 
-        window.surfaceUpdated(updater, window, when);
-    }
-
-    public void addMouseListener(MouseListener l) {
-        window.addMouseListener(l);
-    }
-
-    public void removeMouseListener(MouseListener l) {
-        window.removeMouseListener(l);
-    }
-
-    public MouseListener[] getMouseListeners() {
-        return window.getMouseListeners();
-    }
-
-    public void addKeyListener(KeyListener l) {
-        window.addKeyListener(l);
-    }
-
-    public void removeKeyListener(KeyListener l) {
-        window.removeKeyListener(l);
-    }
-
-    public KeyListener[] getKeyListeners() {
-        return window.getKeyListeners();
-    }
-
-    public void addWindowListener(WindowListener l) {
-        window.addWindowListener(l);
-    }
-
-    public void removeWindowListener(WindowListener l) {
-        window.removeWindowListener(l);
-    }
-
-    public WindowListener[] getWindowListeners() {
-        return window.getWindowListeners();
-    }
-
-    public String toString() {
-        return "NEWT-GLWindow[ \n\tDrawable: "+drawable+", \n\tWindow: "+window+", \n\tHelper: "+helper+", \n\tFactory: "+factory+"]";
-    }
-
-    //----------------------------------------------------------------------
-    // OpenGL-related methods and state
-    //
-
-    private GLDrawableFactory factory;
-    private GLDrawable drawable;
-    private GLContext context;
-    private GLDrawableHelper helper = new GLDrawableHelper();
-    // To make reshape events be sent immediately before a display event
-    private boolean sendReshape=false;
-    private boolean sendDestroy=false;
-    private boolean perfLog = false;
-
-    public GLDrawableFactory getFactory() {
-        return factory;
-    }
-
-    public void setContext(GLContext newCtx) {
-        context = newCtx;
-    }
-
-    public GLContext getContext() {
-        return context;
-    }
-
-    public GL getGL() {
-        if (context == null) {
-            return null;
-        }
-        return context.getGL();
-    }
-
-    public GL setGL(GL gl) {
-        if (context != null) {
-            context.setGL(gl);
-            return gl;
-        }
-        return null;
-    }
-
-    public void addGLEventListener(GLEventListener listener) {
-        helper.addGLEventListener(listener);
-    }
-
-    public void removeGLEventListener(GLEventListener listener) {
-        helper.removeGLEventListener(listener);
-    }
-
-    public void display() {
-        display(false);
-    }
-
-    public void display(boolean forceReshape) {
-        if(window!=null && drawable!=null && context != null) {
-            if(runPumpMessages) {
-                window.getScreen().getDisplay().pumpMessages();
-            }
-            if(window.hasDeviceChanged() && GLAutoDrawable.SCREEN_CHANGE_ACTION_ENABLED) {
-                dispose(true, true);
-            }
-            if (sendDestroy) {
-                destroy();
-                sendDestroy=false;
-            } else {
-                if(forceReshape) {
-                    sendReshape = true;
-                }
-                helper.invokeGL(drawable, context, displayAction, initAction);
-            }
-        }
-    }
-
-    private void sendDisposeEvent() {
-        if(drawable!=null && context != null) {
-            helper.invokeGL(drawable, context, disposeAction, null);
-        }
-    }
-
-    /** This implementation uses a static value */
-    public void setAutoSwapBufferMode(boolean onOrOff) {
-        helper.setAutoSwapBufferMode(onOrOff);
-    }
-
-    /** This implementation uses a static value */
-    public boolean getAutoSwapBufferMode() {
-        return helper.getAutoSwapBufferMode();
-    }
-
-    public void swapBuffers() {
-        if(drawable!=null && context != null) {
-            if (context != GLContext.getCurrent()) {
-                // Assume we should try to make the context current before swapping the buffers
-                helper.invokeGL(drawable, context, swapBuffersAction, initAction);
-            } else {
-                drawable.swapBuffers();
-            }
-        }
-    }
-
-    class InitAction implements Runnable {
-        public void run() {
-            helper.init(GLWindow.this);
-            startTime = System.currentTimeMillis();
-            curTime   = startTime;
-            if(perfLog) {
-                lastCheck  = startTime;
-                totalFrames = 0; lastFrames = 0;
-            }
-        }
-    }
-    private InitAction initAction = new InitAction();
-
-    class DisposeAction implements Runnable {
-        public void run() {
-            helper.dispose(GLWindow.this);
-        }
-    }
-    private DisposeAction disposeAction = new DisposeAction();
-
-    class DisplayAction implements Runnable {
-        public void run() {
-            if (sendReshape) {
-                int width = getWidth();
-                int height = getHeight();
-                getGL().glViewport(0, 0, width, height);
-                helper.reshape(GLWindow.this, 0, 0, width, height);
-                sendReshape = false;
-            }
-
-            helper.display(GLWindow.this);
-
-            curTime = System.currentTimeMillis();
-            totalFrames++;
-
-            if(perfLog) {
-                long dt0, dt1;
-                lastFrames++;
-                dt0 = curTime-lastCheck;
-                if ( dt0 > 5000 ) {
-                    dt1 = curTime-startTime;
-                    System.out.println(dt0/1000 +"s: "+ lastFrames + "f, " + (lastFrames*1000)/dt0 + " fps, "+dt0/lastFrames+" ms/f; "+
-                                       "total: "+ dt1/1000+"s, "+(totalFrames*1000)/dt1 + " fps, "+dt1/totalFrames+" ms/f");
-                    lastCheck=curTime;
-                    lastFrames=0;
-                }
-            }
-        }
-    }
-    private DisplayAction displayAction = new DisplayAction();
-
-    public long getStartTime()   { return startTime; }
-    public long getCurrentTime() { return curTime; }
-    public long getDuration()    { return curTime-startTime; }
-    public int  getTotalFrames() { return totalFrames; }
-
-    private long startTime = 0;
-    private long curTime = 0;
-    private long lastCheck  = 0;
-    private int  totalFrames = 0, lastFrames = 0;
-
-    class SwapBuffersAction implements Runnable {
-        public void run() {
-            drawable.swapBuffers();
-        }
-    }
-    private SwapBuffersAction swapBuffersAction = new SwapBuffersAction();
-
-    //----------------------------------------------------------------------
-    // GLDrawable methods
-    //
-
-    public NativeWindow getNativeWindow() {
-        return null!=drawable ? drawable.getNativeWindow() : null;
-    }
-
-    public synchronized int lockSurface() throws NativeWindowException {
-        if(null!=drawable) return drawable.getNativeWindow().lockSurface();
-        return NativeWindow.LOCK_SURFACE_NOT_READY;
-    }
-
-    public synchronized void unlockSurface() {
-        if(null!=drawable) drawable.getNativeWindow().unlockSurface();
-        else throw new NativeWindowException("NEWT-GLWindow not locked");
-    }
-
-    public synchronized boolean isSurfaceLocked() {
-        if(null!=drawable) return drawable.getNativeWindow().isSurfaceLocked();
-        return false;
-    }
-
-    public synchronized Exception getLockedStack() {
-        if(null!=drawable) return drawable.getNativeWindow().getLockedStack();
-        return null;
-    }
-
-    public boolean surfaceSwap() { 
-        if(null!=drawable) return drawable.getNativeWindow().surfaceSwap();
-        return super.surfaceSwap();
-    }
-
-    public long getWindowHandle() {
-        if(null!=drawable) return drawable.getNativeWindow().getWindowHandle();
-        return super.getWindowHandle();
-    }
-
-    public long getSurfaceHandle() {
-        if(null!=drawable) return drawable.getNativeWindow().getSurfaceHandle();
-        return super.getSurfaceHandle();
-    }
-
-    //----------------------------------------------------------------------
-    // GLDrawable methods that are not really needed
-    //
-
-    public GLContext createContext(GLContext shareWith) {
-        return drawable.createContext(shareWith);
-    }
-
-    public void setRealized(boolean realized) {
-    }
-
-    public GLCapabilities getChosenGLCapabilities() {
-        if (drawable == null) {
-            throw new GLException("No drawable yet");
-        }
-
-        return drawable.getChosenGLCapabilities();
-    }
-
-    public GLProfile getGLProfile() {
-        if (drawable == null) {
-            throw new GLException("No drawable yet");
-        }
-
-        return drawable.getGLProfile();
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    private void shouldNotCallThis() {
-        throw new NativeWindowException("Should not call this");
-    }
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Display.java
deleted file mode 100644
index c0c1ee5fd..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Display.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.opengl.broadcom.egl;
-
-import com.jogamp.javafx.newt.impl.*;
-import com.jogamp.opengl.impl.egl.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.egl.*;
-
-public class Display extends com.jogamp.javafx.newt.Display {
-
-    static {
-        NativeLibLoader.loadNEWT();
-
-        if (!Window.initIDs()) {
-            throw new NativeWindowException("Failed to initialize BCEGL Window jmethodIDs");
-        }
-    }
-
-    public static void initSingleton() {
-        // just exist to ensure static init has been run
-    }
-
-
-    public Display() {
-    }
-
-    protected void createNative() {
-        long handle = CreateDisplay(Screen.fixedWidth, Screen.fixedHeight);
-        if (handle == EGL.EGL_NO_DISPLAY) {
-            throw new NativeWindowException("BC EGL CreateDisplay failed");
-        }
-        aDevice = new EGLGraphicsDevice(handle);
-    }
-
-    protected void closeNative() {
-        if (aDevice.getHandle() != EGL.EGL_NO_DISPLAY) {
-            DestroyDisplay(aDevice.getHandle());
-        }
-    }
-
-    protected void dispatchMessages() {
-        // n/a .. DispatchMessages();
-    }
-
-    private native long CreateDisplay(int width, int height);
-    private native void DestroyDisplay(long dpy);
-    private native void DispatchMessages();
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Screen.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Screen.java
deleted file mode 100755
index f7abe3836..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Screen.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.opengl.broadcom.egl;
-
-import com.jogamp.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
-
-public class Screen extends com.jogamp.javafx.newt.Screen {
-
-    static {
-        Display.initSingleton();
-    }
-
-
-    public Screen() {
-    }
-
-    protected void createNative(int index) {
-        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
-        setScreenSize(fixedWidth, fixedHeight);
-    }
-
-    protected void closeNative() { }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    static final int fixedWidth = 1920;
-    static final int fixedHeight = 1080;
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Window.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Window.java
deleted file mode 100755
index bd2d7930e..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Window.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.opengl.broadcom.egl;
-
-import com.jogamp.javafx.newt.impl.*;
-import com.jogamp.opengl.impl.egl.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLProfile;
-import javax.media.nativewindow.NativeWindowException;
-
-public class Window extends com.jogamp.javafx.newt.Window {
-    static {
-        Display.initSingleton();
-    }
-
-    public Window() {
-    }
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        if(0!=parentWindowHandle) {
-            throw new RuntimeException("Window parenting not supported (yet)");
-        }
-        // query a good configuration .. even thought we drop this one 
-        // and reuse the EGLUtil choosen one later.
-        config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, getScreen().getGraphicsScreen());
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-        setSizeImpl(getScreen().getWidth(), getScreen().getHeight());
-    }
-
-    protected void closeNative() {
-        if(0!=windowHandleClose) {
-            CloseWindow(getDisplayHandle(), windowHandleClose);
-        }
-    }
-
-    public void setVisible(boolean visible) {
-        if(this.visible!=visible) {
-            this.visible=visible;
-            if ( 0==windowHandle ) {
-                windowHandle = realizeWindow(true, width, height);
-                if (0 == windowHandle) {
-                    throw new NativeWindowException("Error native Window Handle is null");
-                }
-            }
-            clearEventMask();
-        }
-    }
-
-    public void setSize(int width, int height) {
-        System.err.println("setSize "+width+"x"+height+" n/a in BroadcomEGL");
-    }
-
-    void setSizeImpl(int width, int height) {
-        if(0!=windowHandle) {
-            // n/a in BroadcomEGL
-            System.err.println("BCEGL Window.setSizeImpl n/a in BroadcomEGL with realized window");
-        } else {
-            if(DEBUG_IMPLEMENTATION) {
-                Exception e = new Exception("BCEGL Window.setSizeImpl() "+this.width+"x"+this.height+" -> "+width+"x"+height);
-                e.printStackTrace();
-            }
-            this.width = width;
-            this.height = height;
-        }
-    }
-
-    public void setPosition(int x, int y) {
-        // n/a in BroadcomEGL
-        System.err.println("setPosition n/a in BroadcomEGL");
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        // n/a in BroadcomEGL
-        System.err.println("setFullscreen n/a in BroadcomEGL");
-        return false;
-    }
-
-    public boolean surfaceSwap() {
-        if ( 0!=windowHandle ) {
-            SwapWindow(getDisplayHandle(), windowHandle);
-            return true;
-        }
-        return false;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    protected static native boolean initIDs();
-    private        native long CreateWindow(long eglDisplayHandle, boolean chromaKey, int width, int height);
-    private        native void CloseWindow(long eglDisplayHandle, long eglWindowHandle);
-    private        native void SwapWindow(long eglDisplayHandle, long eglWindowHandle);
-
-
-    private long realizeWindow(boolean chromaKey, int width, int height) {
-        if(DEBUG_IMPLEMENTATION) {
-            System.out.println("BCEGL Window.realizeWindow() with: chroma "+chromaKey+", "+width+"x"+height+", "+config);
-        }
-        long handle = CreateWindow(getDisplayHandle(), chromaKey, width, height);
-        if (0 == handle) {
-            throw new NativeWindowException("Error native Window Handle is null");
-        }
-        windowHandleClose = handle;
-        return handle;
-    }
-
-    private void windowCreated(int cfgID, int width, int height) {
-        this.width = width;
-        this.height = height;
-        GLCapabilities capsReq = (GLCapabilities) config.getRequestedCapabilities();
-        config = EGLGraphicsConfiguration.create(capsReq, screen.getGraphicsScreen(), cfgID);
-        if (config == null) {
-            throw new NativeWindowException("Error creating EGLGraphicsConfiguration from id: "+cfgID+", "+this);
-        }
-        if(DEBUG_IMPLEMENTATION) {
-            System.out.println("BCEGL Window.windowCreated(): "+toHexString(cfgID)+", "+width+"x"+height+", "+config);
-        }
-    }
-
-    private long   windowHandleClose;
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDDisplay.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDDisplay.java
deleted file mode 100755
index 40a37115d..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDDisplay.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.opengl.kd;
-
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-import com.jogamp.opengl.impl.egl.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.egl.*;
-
-public class KDDisplay extends Display {
-
-    static {
-        NativeLibLoader.loadNEWT();
-
-        if (!KDWindow.initIDs()) {
-            throw new NativeWindowException("Failed to initialize KDWindow jmethodIDs");
-        }
-    }
-
-    public static void initSingleton() {
-        // just exist to ensure static init has been run
-    }
-
-
-    public KDDisplay() {
-    }
-
-    protected void createNative() {
-        // FIXME: map name to EGL_*_DISPLAY
-        long handle = EGL.eglGetDisplay(EGL.EGL_DEFAULT_DISPLAY);
-        if (handle == EGL.EGL_NO_DISPLAY) {
-            throw new NativeWindowException("eglGetDisplay failed");
-        }
-        if (!EGL.eglInitialize(handle, null, null)) {
-            throw new NativeWindowException("eglInitialize failed");
-        }
-        aDevice = new EGLGraphicsDevice(handle);
-    }
-
-    protected void closeNative() {
-        if (aDevice.getHandle() != EGL.EGL_NO_DISPLAY) {
-            EGL.eglTerminate(aDevice.getHandle());
-        }
-    }
-
-    protected void dispatchMessages() {
-        DispatchMessages();
-    }
-
-    private native void DispatchMessages();
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDScreen.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDScreen.java
deleted file mode 100755
index 4bc7f8257..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDScreen.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.opengl.kd;
-
-import com.jogamp.javafx.newt.*;
-import javax.media.nativewindow.*;
-
-public class KDScreen extends Screen {
-    static {
-        KDDisplay.initSingleton();
-    }
-
-    public KDScreen() {
-    }
-
-    protected void createNative(int index) {
-        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
-    }
-
-    protected void closeNative() { }
-
-    // elevate access to this package ..
-    protected void setScreenSize(int w, int h) {
-        super.setScreenSize(w, h);
-    }
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDWindow.java b/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDWindow.java
deleted file mode 100755
index d5be2207c..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDWindow.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.opengl.kd;
-
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-import com.jogamp.opengl.impl.egl.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLProfile;
-import javax.media.nativewindow.NativeWindowException;
-
-public class KDWindow extends Window {
-    private static final String WINDOW_CLASS_NAME = "NewtWindow";
-    // non fullscreen dimensions ..
-    private int nfs_width, nfs_height, nfs_x, nfs_y;
-
-    static {
-        KDDisplay.initSingleton();
-    }
-
-    public KDWindow() {
-    }
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        if(0!=parentWindowHandle) {
-            throw new RuntimeException("Window parenting not supported (yet)");
-        }
-        config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, getScreen().getGraphicsScreen());
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-
-        GLCapabilities eglCaps = (GLCapabilities)config.getChosenCapabilities();
-        int[] eglAttribs = EGLGraphicsConfiguration.GLCapabilities2AttribList(eglCaps);
-
-        windowHandle = 0;
-        eglWindowHandle = CreateWindow(getDisplayHandle(), eglAttribs);
-        if (eglWindowHandle == 0) {
-            throw new NativeWindowException("Error creating egl window: "+config);
-        }
-        setVisible0(eglWindowHandle, false);
-        windowHandleClose = eglWindowHandle;
-    }
-
-    protected void closeNative() {
-        if(0!=windowHandleClose) {
-            CloseWindow(windowHandleClose, windowUserData);
-            windowUserData=0;
-        }
-    }
-
-    public void setVisible(boolean visible) {
-        if(0!=eglWindowHandle && this.visible!=visible) {
-            this.visible=visible;
-            setVisible0(eglWindowHandle, visible);
-            if ( 0==windowHandle ) {
-                windowHandle = RealizeWindow(eglWindowHandle);
-                if (0 == windowHandle) {
-                    throw new NativeWindowException("Error native Window Handle is null");
-                }
-            }
-            clearEventMask();
-        }
-    }
-
-    public void setSize(int width, int height) {
-        if(0!=eglWindowHandle) {
-            setSize0(eglWindowHandle, width, height);
-        }
-    }
-
-    public void setPosition(int x, int y) {
-        // n/a in KD
-        System.err.println("setPosition n/a in KD");
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        if(0!=eglWindowHandle && this.fullscreen!=fullscreen) {
-            this.fullscreen=fullscreen;
-            if(this.fullscreen) {
-                setFullScreen0(eglWindowHandle, true);
-            } else {
-                setFullScreen0(eglWindowHandle, false);
-                setSize0(eglWindowHandle, nfs_width, nfs_height);
-            }
-        }
-        return true;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    protected static native boolean initIDs();
-    private        native long CreateWindow(long displayHandle, int[] attributes);
-    private        native long RealizeWindow(long eglWindowHandle);
-    private        native int  CloseWindow(long eglWindowHandle, long userData);
-    private        native void setVisible0(long eglWindowHandle, boolean visible);
-    private        native void setSize0(long eglWindowHandle, int width, int height);
-    private        native void setFullScreen0(long eglWindowHandle, boolean fullscreen);
-
-    private void windowCreated(long userData) {
-        windowUserData=userData;
-    }
-
-    private void sizeChanged(int newWidth, int newHeight) {
-        width = newWidth;
-        height = newHeight;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        } else {
-            ((KDScreen)screen).setScreenSize(width, height);
-        }
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
-    }
-
-    private long   eglWindowHandle;
-    private long   windowHandleClose;
-    private long   windowUserData;
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/util/EventDispatchThread.java b/src/newt/classes/com/jogamp/javafx/newt/util/EventDispatchThread.java
deleted file mode 100644
index db3f97ee6..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/util/EventDispatchThread.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.jogamp.javafx.newt.util;
-
-import com.jogamp.javafx.newt.Display;
-import com.jogamp.javafx.newt.impl.Debug;
-import java.util.*;
-
-public class EventDispatchThread {
-    public static final boolean DEBUG = Debug.debug("EDT");
-
-    private ThreadGroup threadGroup; 
-    private volatile boolean shouldStop = false;
-    private TaskWorker taskWorker = null;
-    private Object taskWorkerLock = new Object();
-    private ArrayList tasks = new ArrayList(); // one shot tasks
-    private Display display = null;
-    private String name;
-    private long edtPollGranularity = 10;
-
-    public EventDispatchThread(Display display, ThreadGroup tg, String name) {
-        this.display = display;
-        this.threadGroup = tg;
-        this.name=new String("EDT-Display_"+display.getName()+"-"+name);
-    }
-
-    public String getName() { return name; }
-
-    public ThreadGroup getThreadGroup() { return threadGroup; }
-
-    public void start() {
-        start(false);
-    }
-
-    /**
-     * @param externalStimuli true indicates that another thread stimulates, 
-     *                        ie. calls this TaskManager's run() loop method.
-     *                        Hence no own thread is started in this case.
-     *
-     * @return The started Runnable, which handles the run-loop.
-     *         Usefull in combination with externalStimuli=true,
-     *         so an external stimuli can call it.
-     */
-    public Runnable start(boolean externalStimuli) {
-        synchronized(taskWorkerLock) { 
-            if(null==taskWorker) {
-                taskWorker = new TaskWorker(threadGroup, name);
-            }
-            if(!taskWorker.isRunning()) {
-                shouldStop = false;
-                taskWorker.start(externalStimuli);
-            }
-            taskWorkerLock.notifyAll();
-        }
-        return taskWorker;
-    }
-
-    public void stop() {
-        synchronized(taskWorkerLock) { 
-            if(null!=taskWorker && taskWorker.isRunning()) {
-                shouldStop = true;
-            }
-            taskWorkerLock.notifyAll();
-            if(DEBUG) {
-                System.out.println(Thread.currentThread()+": EDT signal STOP");
-            }
-        }
-    }
-
-    public boolean isThreadEDT(Thread thread) {
-        return null!=taskWorker && taskWorker == thread;
-    }
-
-    public boolean isCurrentThreadEDT() {
-        return null!=taskWorker && taskWorker == Thread.currentThread();
-    }
-
-    public boolean isRunning() {
-        return null!=taskWorker && taskWorker.isRunning() ;
-    }
-
-    public void invokeLater(Runnable task) {
-        if(task == null) {
-            return;
-        }
-        synchronized(taskWorkerLock) {
-            if(null!=taskWorker && taskWorker.isRunning() && taskWorker != Thread.currentThread() ) {
-                tasks.add(task);
-                taskWorkerLock.notifyAll();
-            } else {
-                // if !running or isEDTThread, do it right away
-                task.run();
-            }
-        }
-    }
-
-    public void invokeAndWait(Runnable task) {
-        if(task == null) {
-            return;
-        }
-        invokeLater(task);
-        waitOnWorker();
-    }
-
-    public void waitOnWorker() {
-        synchronized(taskWorkerLock) {
-            if(null!=taskWorker && taskWorker.isRunning() && tasks.size()>0 && taskWorker != Thread.currentThread() ) {
-                try {
-                    taskWorkerLock.wait();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public void waitUntilStopped() {
-        synchronized(taskWorkerLock) {
-            while(null!=taskWorker && taskWorker.isRunning() && taskWorker != Thread.currentThread() ) {
-                try {
-                    taskWorkerLock.wait();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    class TaskWorker extends Thread {
-        boolean isRunning = false;
-        boolean externalStimuli = false;
-
-        public TaskWorker(ThreadGroup tg, String name) {
-            super(tg, name);
-        }
-
-        public synchronized boolean isRunning() {
-            return isRunning;
-        }
-
-        public void start(boolean externalStimuli) throws IllegalThreadStateException {
-            synchronized(this) {
-                this.externalStimuli = externalStimuli;
-                isRunning = true;
-            }
-            if(!externalStimuli) {
-                super.start();
-            }
-        }
-
-        /** 
-         * Utilizing taskWorkerLock only for local resources and task execution,
-         * not for event dispatching.
-         */
-        public void run() {
-            if(DEBUG) {
-                System.out.println(Thread.currentThread()+": EDT run() START");
-            }
-            while(!shouldStop) {
-                try {
-                    // wait for something todo
-                    while(!shouldStop && tasks.size()==0) {
-                        synchronized(taskWorkerLock) {
-                            if(!shouldStop && tasks.size()==0) {
-                                try {
-                                    taskWorkerLock.wait(edtPollGranularity);
-                                } catch (InterruptedException e) {
-                                    e.printStackTrace();
-                                }
-                            }
-                        }
-                        display.pumpMessages(); // event dispatch
-                    }
-                    if(!shouldStop && tasks.size()>0) {
-                        synchronized(taskWorkerLock) {
-                            if(!shouldStop && tasks.size()>0) {
-                                Runnable task = (Runnable) tasks.remove(0);
-                                task.run();
-                                taskWorkerLock.notifyAll();
-                            }
-                        }
-                        display.pumpMessages(); // event dispatch
-                    }
-                } catch (Throwable t) {
-                    // handle errors ..
-                    t.printStackTrace();
-                } finally {
-                    // epilog - unlock locked stuff
-                }
-                if(externalStimuli) break; // no loop if called by external stimuli
-            }
-            synchronized(this) {
-                isRunning = !shouldStop;
-            }
-            if(!isRunning) {
-                synchronized(taskWorkerLock) {
-                    taskWorkerLock.notifyAll();
-                }
-            }
-            if(DEBUG) {
-                System.out.println(Thread.currentThread()+": EDT run() EXIT");
-            }
-        }
-    }
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/util/MainThread.java b/src/newt/classes/com/jogamp/javafx/newt/util/MainThread.java
deleted file mode 100644
index 9bf25098f..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/util/MainThread.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.jogamp.javafx.newt.util;
-
-import java.util.*;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.security.*;
-
-import javax.media.nativewindow.*;
-
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-import com.jogamp.javafx.newt.macosx.MacDisplay;
-import com.jogamp.nativewindow.impl.NWReflection;
-
-/**
- * NEWT Utility class MainThread<P>
- *
- * This class provides a startup singleton <i>main thread</i>,
- * from which a new thread with the users main class is launched.<br>
- *
- * Such behavior is necessary for native windowing toolkits,
- * where the windowing management must happen on the so called
- * <i>main thread</i> e.g. for Mac OS X !<br>
- *
- * Utilizing this class as a launchpad, now you are able to
- * use a NEWT multithreaded application with window handling within the different threads,
- * even on these restricted platforms.<br>
- *
- * To support your NEWT Window platform, 
- * you have to pass your <i>main thread</i> actions to {@link #invoke invoke(..)},
- * have a look at the {@link com.jogamp.javafx.newt.macosx.MacWindow MacWindow} implementation.<br>
- * <i>TODO</i>: Some hardcoded dependencies exist in this implementation, 
- * where you have to patch this code or factor it out. <P>
- * 
- * If your platform is not Mac OS X, but you want to test your code without modifying
- * this class, you have to set the system property <code>newt.MainThread.force</code> to <code>true</code>.<P>
- *
- * The code is compatible with all other platform, which support multithreaded windowing handling.
- * Since those platforms won't trigger the <i>main thread</i> serialization, the main method 
- * will be simply executed, in case you haven't set <code>newt.MainThread.force</code> to <code>true</code>.<P>
- *
- * Test case on Mac OS X (or any other platform):
- <PRE>
-    java -XstartOnFirstThread com.jogamp.javafx.newt.util.MainThread demos.es1.RedSquare -GL2 -GL2 -GL2 -GL2
- </PRE>
- * Which starts 4 threads, each with a window and OpenGL rendering.<br>
- */
-public class MainThread {
-    private static AccessControlContext localACC = AccessController.getContext();
-    public static final boolean USE_MAIN_THREAD = NativeWindowFactory.TYPE_MACOSX.equals(NativeWindowFactory.getNativeWindowType(false)) ||
-                                                  Debug.getBooleanProperty("newt.MainThread.force", true, localACC);
-
-    protected static final boolean DEBUG = Debug.debug("MainThread");
-
-    private static boolean isExit=false;
-    private static volatile boolean isRunning=false;
-    private static Object taskWorkerLock=new Object();
-    private static boolean shouldStop;
-    private static ArrayList tasks;
-    private static ArrayList tasksBlock;
-    private static Thread mainThread;
-
-    static class MainAction extends Thread {
-        private String mainClassName;
-        private String[] mainClassArgs;
-
-        private Class mainClass;
-        private Method mainClassMain;
-
-        public MainAction(String mainClassName, String[] mainClassArgs) {
-            this.mainClassName=mainClassName;
-            this.mainClassArgs=mainClassArgs;
-        }
-
-        public void run() {
-            if ( USE_MAIN_THREAD ) {
-                // we have to start first to provide the service ..
-                MainThread.waitUntilRunning();
-            }
-
-            // start user app ..
-            try {
-                Class mainClass = NWReflection.getClass(mainClassName, true);
-                if(null==mainClass) {
-                    throw new RuntimeException(new ClassNotFoundException("MainThread couldn't find main class "+mainClassName));
-                }
-                try {
-                    mainClassMain = mainClass.getDeclaredMethod("main", new Class[] { String[].class });
-                    mainClassMain.setAccessible(true);
-                } catch (Throwable t) {
-                    throw new RuntimeException(t);
-                }
-                if(DEBUG) System.err.println("MainAction.run(): "+Thread.currentThread().getName()+" invoke "+mainClassName);
-                mainClassMain.invoke(null, new Object[] { mainClassArgs } );
-            } catch (InvocationTargetException ite) {
-                ite.getTargetException().printStackTrace();
-            } catch (Throwable t) {
-                t.printStackTrace();
-            }
-
-            if(DEBUG) System.err.println("MainAction.run(): "+Thread.currentThread().getName()+" user app fin");
-
-            if ( USE_MAIN_THREAD ) {
-                MainThread.exit();
-                if(DEBUG) System.err.println("MainAction.run(): "+Thread.currentThread().getName()+" MainThread fin - exit");
-                System.exit(0);
-            }
-        }
-    }
-    private static MainAction mainAction;
-
-    /** Your new java application main entry, which pipelines your application */
-    public static void main(String[] args) {
-        if(DEBUG) System.err.println("MainThread.main(): "+Thread.currentThread().getName()+" USE_MAIN_THREAD "+ USE_MAIN_THREAD );
-
-        if(args.length==0) {
-            return;
-        }
-
-        String mainClassName=args[0];
-        String[] mainClassArgs=new String[args.length-1];
-        if(args.length>1) {
-            System.arraycopy(args, 1, mainClassArgs, 0, args.length-1);
-        }
-
-        NativeLibLoader.loadNEWT();
-        
-        shouldStop = false;
-        tasks = new ArrayList();
-        tasksBlock = new ArrayList();
-        mainThread = Thread.currentThread();
-
-        mainAction = new MainAction(mainClassName, mainClassArgs);
-
-        if(NativeWindowFactory.TYPE_MACOSX.equals(NativeWindowFactory.getNativeWindowType(false))) {
-            MacDisplay.initSingleton();
-        }
-
-        if ( USE_MAIN_THREAD ) {
-            // dispatch user's main thread ..
-            mainAction.start();
-
-            // do our main thread task scheduling
-            run();
-        } else {
-            // run user's main in this thread 
-            mainAction.run();
-        }
-    }
-
-    /** invokes the given Runnable */
-    public static void invoke(boolean wait, Runnable r) {
-        if(r == null) {
-            return;
-        }
-
-        // if this main thread is not being used or
-        // if this is already the main thread .. just execute.
-        if( !isRunning() || mainThread == Thread.currentThread() ) {
-            r.run();
-            return;
-        }
-
-        synchronized(taskWorkerLock) {
-            tasks.add(r);
-            if(wait) {
-                tasksBlock.add(r);
-            }
-            taskWorkerLock.notifyAll();
-            if(wait) {
-                while(tasksBlock.size()>0) {
-                    try {
-                        taskWorkerLock.wait();
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }
-    }
-
-    public static void exit() {
-        if(DEBUG) System.err.println("MainThread.exit(): "+Thread.currentThread().getName()+" start");
-        synchronized(taskWorkerLock) { 
-            if(isRunning) {
-                shouldStop = true;
-            }
-            taskWorkerLock.notifyAll();
-        }
-        if(DEBUG) System.err.println("MainThread.exit(): "+Thread.currentThread().getName()+" end");
-    }
-
-    public static boolean isRunning() {
-        synchronized(taskWorkerLock) { 
-            return isRunning;
-        }
-    }
-
-    private static void waitUntilRunning() {
-        synchronized(taskWorkerLock) {
-            if(isExit) return;
-
-            while(!isRunning) {
-                try {
-                    taskWorkerLock.wait();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public static void run() {
-        if(DEBUG) System.err.println("MainThread.run(): "+Thread.currentThread().getName());
-        synchronized(taskWorkerLock) {
-            isRunning = true;
-            taskWorkerLock.notifyAll();
-        }
-        while(!shouldStop) {
-            try {
-                ArrayList localTasks=null;
-
-                // wait for something todo ..
-                synchronized(taskWorkerLock) {
-                    while(!shouldStop && tasks.size()==0) {
-                        try {
-                            taskWorkerLock.wait();
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    // seq. process all tasks until no blocking one exists in the list
-                    for(Iterator i = tasks.iterator(); tasksBlock.size()>0 && i.hasNext(); ) {
-                        Runnable task = (Runnable) i.next();
-                        task.run();
-                        i.remove();
-                        tasksBlock.remove(task);
-                    }
-
-                    // take over the tasks ..
-                    if(tasks.size()>0) {
-                        localTasks = tasks;
-                        tasks = new ArrayList();
-                    }
-                    taskWorkerLock.notifyAll();
-                }
-
-                // seq. process all unblocking tasks ..
-                if(null!=localTasks) {
-                    for(Iterator i = localTasks.iterator(); i.hasNext(); ) {
-                        Runnable task = (Runnable) i.next();
-                        task.run();
-                    }
-                }
-            } catch (Throwable t) {
-                // handle errors ..
-                t.printStackTrace();
-            } finally {
-                // epilog - unlock locked stuff
-            }
-        }
-        if(DEBUG) System.err.println("MainThread.run(): "+Thread.currentThread().getName()+" fin");
-        synchronized(taskWorkerLock) {
-            isRunning = false;
-            isExit = true;
-            taskWorkerLock.notifyAll();
-        }
-    }
-}
-
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsDisplay.java b/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsDisplay.java
deleted file mode 100755
index f2e8d21ef..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsDisplay.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.windows;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.windows.*;
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-
-public class WindowsDisplay extends Display {
-
-    protected static final String WINDOW_CLASS_NAME = "NewtWindowClass";
-    private static int windowClassAtom;
-    private static long hInstance;
-
-    static {
-        NativeLibLoader.loadNEWT();
-
-        if (!WindowsWindow.initIDs()) {
-            throw new NativeWindowException("Failed to initialize WindowsWindow jmethodIDs");
-        }
-    }
-
-    public static void initSingleton() {
-        // just exist to ensure static init has been run
-    }
-
-
-    public WindowsDisplay() {
-    }
-
-    protected void createNative() {
-        aDevice = new WindowsGraphicsDevice();
-    }
-
-    protected void closeNative() { 
-        // Can't do .. only at application shutdown 
-        // UnregisterWindowClass(getWindowClassAtom(), getHInstance());
-    }
-
-    protected void dispatchMessages() {
-        DispatchMessages();
-    }
-
-    protected static synchronized int getWindowClassAtom() {
-        if(0 == windowClassAtom) {
-            windowClassAtom = RegisterWindowClass(WINDOW_CLASS_NAME, getHInstance());
-            if (0 == windowClassAtom) {
-                throw new NativeWindowException("Error while registering window class");
-            }
-        }
-        return windowClassAtom;
-    }
-
-    protected static synchronized long getHInstance() {
-        if(0 == hInstance) {
-            hInstance = LoadLibraryW("newt");
-            if (0 == hInstance) {
-                throw new NativeWindowException("Error finding HINSTANCE for \"newt\"");
-            }
-        }
-        return hInstance;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-    private static native long LoadLibraryW(String libraryName);
-    private static native int  RegisterWindowClass(String windowClassName, long hInstance);
-    private static native void UnregisterWindowClass(int wndClassAtom, long hInstance);
-
-    private static native void DispatchMessages();
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsScreen.java b/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsScreen.java
deleted file mode 100755
index ab11f97dd..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsScreen.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.windows;
-
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
-
-public class WindowsScreen extends Screen {
-    static {
-        WindowsDisplay.initSingleton();
-    }
-
-
-    public WindowsScreen() {
-    }
-
-    protected void createNative(int index) {
-        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
-        setScreenSize(getWidthImpl(getIndex()), getHeightImpl(getIndex()));
-    }
-
-    protected void closeNative() { }
-
-    private        native int getWidthImpl(int scrn_idx);
-    private        native int getHeightImpl(int scrn_idx);
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsWindow.java b/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsWindow.java
deleted file mode 100755
index 7c8864190..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsWindow.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.windows;
-
-import javax.media.nativewindow.*;
-import com.jogamp.javafx.newt.*;
-
-public class WindowsWindow extends Window {
-
-    private long hmon;
-    private long hdc;
-    private long windowHandleClose;
-    private long parentWindowHandle;
-    // non fullscreen dimensions ..
-    private int nfs_width, nfs_height, nfs_x, nfs_y;
-    private final Insets insets = new Insets(0, 0, 0, 0);
-
-    static {
-        WindowsDisplay.initSingleton();
-    }
-
-    public WindowsWindow() {
-    }
-
-    Thread hdcOwner = null;
-
-    public synchronized int lockSurface() throws NativeWindowException {
-        int res = super.lockSurface(); 
-        if(LOCK_SUCCESS==res && 0!=windowHandle) {
-            if(hdc!=0) {
-                throw new NativeWindowException("NEWT Surface handle set HDC "+toHexString(hdc)+" - "+Thread.currentThread().getName()+" ; "+this);
-            }
-            hdc = GetDC(windowHandle);
-            hmon = MonitorFromWindow(windowHandle);
-            hdcOwner = Thread.currentThread();
-        }
-        return res;
-    }
-
-    public synchronized void unlockSurface() {
-        // prevalidate, before we change data ..
-        Thread cur = Thread.currentThread();
-        if ( getSurfaceLockOwner() != cur ) {
-            getLockedStack().printStackTrace();
-            throw new NativeWindowException(cur+": Not owner, owner is "+getSurfaceLockOwner());
-        }
-        if (0!=hdc && 0!=windowHandle) {
-            if(hdcOwner != cur) {
-                throw new NativeWindowException("NEWT Surface handle set HDC "+toHexString(hdc)+" by other thread "+hdcOwner+", this "+cur+" ; "+this);
-            }
-            ReleaseDC(windowHandle, hdc);
-            hdc=0;
-            hdcOwner=null;
-        }
-        super.unlockSurface();
-    }
-
-    public long getSurfaceHandle() {
-        return hdc;
-    }
-
-    public boolean hasDeviceChanged() {
-        if(0!=windowHandle) {
-            long _hmon = MonitorFromWindow(windowHandle);
-            if (hmon != _hmon) {
-                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                    Exception e = new Exception("!!! Window Device Changed "+Thread.currentThread().getName()+
-                                                ", HMON "+toHexString(hmon)+" -> "+toHexString(_hmon));
-                    e.printStackTrace();
-                }
-                hmon = _hmon;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        WindowsScreen  screen = (WindowsScreen) getScreen();
-        WindowsDisplay display = (WindowsDisplay) screen.getDisplay();
-        config = GraphicsConfigurationFactory.getFactory(display.getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, screen.getGraphicsScreen());
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-        windowHandle = CreateWindow(parentWindowHandle, 
-                                    display.getWindowClassAtom(), display.WINDOW_CLASS_NAME, display.getHInstance(), 
-                                    0, undecorated, x, y, width, height);
-        if (windowHandle == 0) {
-            throw new NativeWindowException("Error creating window");
-        }
-        this.parentWindowHandle = parentWindowHandle;
-        windowHandleClose = windowHandle;
-        if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-            Exception e = new Exception("!!! Window new window handle "+Thread.currentThread().getName()+
-                                        " (Parent HWND "+toHexString(parentWindowHandle)+
-                                        ") : HWND "+toHexString(windowHandle)+", "+Thread.currentThread());
-            e.printStackTrace();
-        }
-    }
-
-    protected void closeNative() {
-        if (hdc != 0) {
-            if(windowHandleClose != 0) {
-                ReleaseDC(windowHandleClose, hdc);
-            }
-            hdc = 0;
-        }
-        if(windowHandleClose != 0) {
-            DestroyWindow(windowHandleClose);
-            windowHandleClose = 0;
-        }
-    }
-
-    protected void windowDestroyed() {
-        windowHandleClose = 0;
-        super.windowDestroyed();
-    }
-
-    public void setVisible(boolean visible) {
-        if(this.visible!=visible && 0!=windowHandle) {
-            this.visible=visible;
-            setVisible0(windowHandle, visible);
-        }
-    }
-
-    // @Override
-    public void setSize(int width, int height) {
-        if (0!=windowHandle && (width != this.width || this.height != height)) {
-            if(!fullscreen) {
-                nfs_width=width;
-                nfs_height=height;
-            }
-            this.width = width;
-            this.height = height;
-            setSize0(parentWindowHandle, windowHandle, x, y, width, height);
-        }
-    }
-
-    //@Override
-    public void setPosition(int x, int y) {
-        if (0!=windowHandle && (this.x != x || this.y != y)) {
-            if(!fullscreen) {
-                nfs_x=x;
-                nfs_y=y;
-            }
-            this.x = x;
-            this.y = y;
-            setPosition(parentWindowHandle, windowHandle, x , y);
-        }
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        if(0!=windowHandle && (this.fullscreen!=fullscreen)) {
-            int x,y,w,h;
-            this.fullscreen=fullscreen;
-            if(fullscreen) {
-                x = 0; y = 0;
-                w = screen.getWidth();
-                h = screen.getHeight();
-            } else {
-                x = nfs_x;
-                y = nfs_y;
-                w = nfs_width;
-                h = nfs_height;
-            }
-            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                System.err.println("WindowsWindow fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
-            }
-            setFullscreen0(parentWindowHandle, windowHandle, x, y, w, h, undecorated, fullscreen);
-        }
-        return fullscreen;
-    }
-
-    // @Override
-    public void requestFocus() {
-        super.requestFocus();
-        if (windowHandle != 0L) {
-            requestFocus(windowHandle);
-        }
-    }
-
-    // @Override
-    public void setTitle(String title) {
-        if (title == null) {
-            title = "";
-        }
-        if (0!=windowHandle && !title.equals(getTitle())) {
-            super.setTitle(title);
-            setTitle(windowHandle, title);
-        }
-    }
-
-    public Insets getInsets() {
-        return (Insets)insets.clone();
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-    protected static native boolean initIDs();
-    private        native long CreateWindow(long parentWindowHandle, 
-                                            int wndClassAtom, String wndName, 
-                                            long hInstance, long visualID,
-                                            boolean isUndecorated,
-                                            int x, int y, int width, int height);
-    private        native void DestroyWindow(long windowHandle);
-    private        native long GetDC(long windowHandle);
-    private        native void ReleaseDC(long windowHandle, long hdc);
-    private        native long MonitorFromWindow(long windowHandle);
-    private static native void setVisible0(long windowHandle, boolean visible);
-    private        native void setSize0(long parentWindowHandle, long windowHandle, int x, int y, int width, int height);
-    private        native void setPosition(long parentWindowHandle, long windowHandle, int x, int y);
-    private        native void setFullscreen0(long parentWindowHandle, long windowHandle, int x, int y, int width, int height, boolean isUndecorated, boolean on);
-    private static native void setTitle(long windowHandle, String title);
-    private static native void requestFocus(long windowHandle);
-
-    private void insetsChanged(int left, int top, int right, int bottom) {
-        if (left != -1 && top != -1 && right != -1 && bottom != -1) {
-            insets.left = left;
-            insets.top = top;
-            insets.right = right;
-            insets.bottom = bottom;
-        }
-    }
-    private void sizeChanged(int newWidth, int newHeight) {
-        width = newWidth;
-        height = newHeight;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        }
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
-    }
-
-    private void positionChanged(int newX, int newY) {
-        x = newX;
-        y = newY;
-        if(!fullscreen) {
-            nfs_x=x;
-            nfs_y=y;
-        }
-        sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
-    }
-
-    /**
-     *
-     * @param focusOwner if focusGained is true, focusOwner is the previous
-     * focus owner, if focusGained is false, focusOwner is the new focus owner
-     * @param focusGained
-     */
-    private void focusChanged(long focusOwner, boolean focusGained) {
-        if (focusGained) {
-            sendWindowEvent(WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
-        } else {
-            sendWindowEvent(WindowEvent.EVENT_WINDOW_LOST_FOCUS);
-        }
-    }
-}
diff --git a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Display.java b/src/newt/classes/com/jogamp/javafx/newt/x11/X11Display.java
deleted file mode 100755
index 96d55c082..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Display.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.x11;
-
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-import com.jogamp.nativewindow.impl.x11.X11Util;
-
-public class X11Display extends Display {
-    static {
-        NativeLibLoader.loadNEWT();
-
-        if (!initIDs()) {
-            throw new NativeWindowException("Failed to initialize X11Display jmethodIDs");
-        }
-
-        if (!X11Window.initIDs()) {
-            throw new NativeWindowException("Failed to initialize X11Window jmethodIDs");
-        }
-    }
-
-    public static void initSingleton() {
-        // just exist to ensure static init has been run
-    }
-
-
-    public X11Display() {
-    }
-
-    protected void createNative() {
-        long handle= X11Util.getThreadLocalDisplay(name);
-        if (handle == 0 ) {
-            throw new RuntimeException("Error creating display: "+name);
-        }
-        try {
-            CompleteDisplay(handle);
-        } catch(RuntimeException e) {
-            X11Util.closeThreadLocalDisplay(name);
-            throw e;
-        }
-        aDevice = new X11GraphicsDevice(handle);
-    }
-
-    protected void closeNative() {
-        if(0==X11Util.closeThreadLocalDisplay(name)) {
-            throw new NativeWindowException(this+" was not mapped");
-        }
-    }
-
-    protected void dispatchMessages() {
-        DispatchMessages(getHandle(), javaObjectAtom, windowDeleteAtom);
-    }
-
-    protected void lockDisplay() {
-        super.lockDisplay();
-        LockDisplay(getHandle());
-    }
-
-    protected void unlockDisplay() {
-        UnlockDisplay(getHandle());
-        super.unlockDisplay();
-    }
-
-    protected long getJavaObjectAtom() { return javaObjectAtom; }
-    protected long getWindowDeleteAtom() { return windowDeleteAtom; }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-    private static native boolean initIDs();
-
-    private native void LockDisplay(long handle);
-    private native void UnlockDisplay(long handle);
-
-    private native void CompleteDisplay(long handle);
-
-    private native void DispatchMessages(long display, long javaObjectAtom, long windowDeleteAtom);
-
-    private void displayCompleted(long javaObjectAtom, long windowDeleteAtom) {
-        this.javaObjectAtom=javaObjectAtom;
-        this.windowDeleteAtom=windowDeleteAtom;
-    }
-
-    private long windowDeleteAtom;
-    private long javaObjectAtom;
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Screen.java b/src/newt/classes/com/jogamp/javafx/newt/x11/X11Screen.java
deleted file mode 100755
index d90b1868d..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Screen.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.x11;
-
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-
-public class X11Screen extends Screen {
-
-    static {
-        X11Display.initSingleton();
-    }
-
-
-    public X11Screen() {
-    }
-
-    protected void createNative(int index) {
-        long handle = GetScreen(display.getHandle(), index);
-        if (handle == 0 ) {
-            throw new RuntimeException("Error creating screen: "+index);
-        }
-        aScreen = new X11GraphicsScreen((X11GraphicsDevice)getDisplay().getGraphicsDevice(), index);
-        setScreenSize(getWidth0(display.getHandle(), index),
-                      getHeight0(display.getHandle(), index));
-    }
-
-    protected void closeNative() { }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    private native long GetScreen(long dpy, int scrn_idx);
-    private native int  getWidth0(long display, int scrn_idx);
-    private native int  getHeight0(long display, int scrn_idx);
-}
-
diff --git a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Window.java b/src/newt/classes/com/jogamp/javafx/newt/x11/X11Window.java
deleted file mode 100755
index 8387160c9..000000000
--- a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Window.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- */
-
-package com.jogamp.javafx.newt.x11;
-
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
-import javax.media.nativewindow.x11.*;
-
-public class X11Window extends Window {
-    private static final String WINDOW_CLASS_NAME = "NewtWindow";
-    // non fullscreen dimensions ..
-    private int nfs_width, nfs_height, nfs_x, nfs_y;
-
-    static {
-        X11Display.initSingleton();
-    }
-
-    public X11Window() {
-    }
-
-    protected void createNative(long parentWindowHandle, Capabilities caps) {
-        X11Screen screen = (X11Screen) getScreen();
-        X11Display display = (X11Display) screen.getDisplay();
-        config = GraphicsConfigurationFactory.getFactory(display.getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, screen.getGraphicsScreen());
-        if (config == null) {
-            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
-        }
-        X11GraphicsConfiguration x11config = (X11GraphicsConfiguration) config;
-        long visualID = x11config.getVisualID();
-        long w = CreateWindow(parentWindowHandle, 
-                              display.getHandle(), screen.getIndex(), visualID, 
-                              display.getJavaObjectAtom(), display.getWindowDeleteAtom(), x, y, width, height);
-        if (w == 0 || w!=windowHandle) {
-            throw new NativeWindowException("Error creating window: "+w);
-        }
-        this.parentWindowHandle = parentWindowHandle;
-        windowHandleClose = windowHandle;
-        displayHandleClose = display.getHandle();
-    }
-
-    protected void closeNative() {
-        if(0!=displayHandleClose && 0!=windowHandleClose && null!=getScreen() ) {
-            X11Display display = (X11Display) getScreen().getDisplay();
-            CloseWindow(displayHandleClose, windowHandleClose, display.getJavaObjectAtom());
-            windowHandleClose = 0;
-            displayHandleClose = 0;
-        }
-    }
-
-    protected void windowDestroyed() {
-        windowHandleClose = 0;
-        displayHandleClose = 0;
-        super.windowDestroyed();
-    }
-
-    public void setVisible(boolean visible) {
-        if(0!=windowHandle && this.visible!=visible) {
-            this.visible=visible;
-            setVisible0(getDisplayHandle(), windowHandle, visible);
-            clearEventMask();
-        }
-    }
-
-    public void requestFocus() {
-        super.requestFocus();
-    }
-
-    public void setSize(int width, int height) {
-        if(DEBUG_IMPLEMENTATION) {
-            System.err.println("X11Window setSize: "+this.x+"/"+this.y+" "+this.width+"x"+this.height+" -> "+width+"x"+height);
-            // Exception e = new Exception("XXXXXXXXXX");
-            // e.printStackTrace();
-        }
-        this.width = width;
-        this.height = height;
-        if(!fullscreen) {
-            nfs_width=width;
-            nfs_height=height;
-        }
-        if(0!=windowHandle) {
-            setSize0(parentWindowHandle, getDisplayHandle(), getScreenIndex(), windowHandle, x, y, width, height, (undecorated||fullscreen)?-1:1, false);
-        }
-    }
-
-    public void setPosition(int x, int y) {
-        if(DEBUG_IMPLEMENTATION) {
-            System.err.println("X11Window setPosition: "+this.x+"/"+this.y+" -> "+x+"/"+y);
-            // Exception e = new Exception("XXXXXXXXXX");
-            // e.printStackTrace();
-        }
-        this.x = x;
-        this.y = y;
-        if(!fullscreen) {
-            nfs_x=x;
-            nfs_y=y;
-        }
-        if(0!=windowHandle) {
-            setPosition0(getDisplayHandle(), windowHandle, x, y);
-        }
-    }
-
-    public boolean setFullscreen(boolean fullscreen) {
-        if(0!=windowHandle && this.fullscreen!=fullscreen) {
-            int x,y,w,h;
-            this.fullscreen=fullscreen;
-            if(fullscreen) {
-                x = 0; y = 0;
-                w = screen.getWidth();
-                h = screen.getHeight();
-            } else {
-                x = nfs_x;
-                y = nfs_y;
-                w = nfs_width;
-                h = nfs_height;
-            }
-            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
-                System.err.println("X11Window fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
-            }
-            setSize0(parentWindowHandle, getDisplayHandle(), getScreenIndex(), windowHandle, x, y, w, h, (undecorated||fullscreen)?-1:1, false);
-        }
-        return fullscreen;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only
-    //
-
-    protected static native boolean initIDs();
-    private        native long CreateWindow(long parentWindowHandle, long display, int screen_index, 
-                                            long visualID, long javaObjectAtom, long windowDeleteAtom, int x, int y, int width, int height);
-    private        native void CloseWindow(long display, long windowHandle, long javaObjectAtom);
-    private        native void setVisible0(long display, long windowHandle, boolean visible);
-    private        native void setSize0(long parentWindowHandle, long display, int screen_index, long windowHandle, 
-                                        int x, int y, int width, int height, int decorationToggle, boolean setVisible);
-    private        native void setPosition0(long display, long windowHandle, int x, int y);
-
-    private void windowChanged(int newX, int newY, int newWidth, int newHeight) {
-        if(width != newWidth || height != newHeight) {
-            if(DEBUG_IMPLEMENTATION) {
-                System.err.println("X11Window windowChanged size: "+this.width+"x"+this.height+" -> "+newWidth+"x"+newHeight);
-            }
-            width = newWidth;
-            height = newHeight;
-            if(!fullscreen) {
-                nfs_width=width;
-                nfs_height=height;
-            }
-            sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
-        }
-        if( 0==parentWindowHandle && ( x != newX || y != newY ) ) {
-            if(DEBUG_IMPLEMENTATION) {
-                System.err.println("X11Window windowChanged position: "+this.x+"/"+this.y+" -> "+newX+"x"+newY);
-            }
-            x = newX;
-            y = newY;
-            if(!fullscreen) {
-                nfs_x=x;
-                nfs_y=y;
-            }
-            sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
-        }
-    }
-
-    private void windowCreated(long windowHandle) {
-        this.windowHandle = windowHandle;
-    }
-
-    private long   windowHandleClose;
-    private long   displayHandleClose;
-    private long   parentWindowHandle;
-}
diff --git a/src/newt/classes/com/jogamp/newt/Display.java b/src/newt/classes/com/jogamp/newt/Display.java
new file mode 100755
index 000000000..88f6dd34b
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/Display.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+import javax.media.nativewindow.*;
+import com.jogamp.newt.impl.Debug;
+import com.jogamp.newt.util.EventDispatchThread;
+import java.util.*;
+
+public abstract class Display {
+    public static final boolean DEBUG = Debug.debug("Display");
+
+    private static Class getDisplayClass(String type) 
+        throws ClassNotFoundException 
+    {
+        Class displayClass = NewtFactory.getCustomClass(type, "Display");
+        if(null==displayClass) {
+            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
+                displayClass = Class.forName("com.jogamp.newt.opengl.kd.KDDisplay");
+            } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
+                displayClass = Class.forName("com.jogamp.newt.windows.WindowsDisplay");
+            } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
+                displayClass = Class.forName("com.jogamp.newt.macosx.MacDisplay");
+            } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
+                displayClass = Class.forName("com.jogamp.newt.x11.X11Display");
+            } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
+                displayClass = Class.forName("com.jogamp.newt.awt.AWTDisplay");
+            } else {
+                throw new RuntimeException("Unknown display type \"" + type + "\"");
+            }
+        }
+        return displayClass;
+    }
+
+    // Unique Display for each thread
+    private static ThreadLocal currentDisplayMap = new ThreadLocal();
+
+    /** Returns the thread local display map */
+    public static Map getCurrentDisplayMap() {
+        Map displayMap = (Map) currentDisplayMap.get();
+        if(null==displayMap) {
+            displayMap = new HashMap();
+            currentDisplayMap.set( displayMap );
+        }
+        return displayMap;
+    }
+
+    /** maps the given display to the thread local display map
+      * and notifies all threads synchronized to this display map. */
+    protected static Display setCurrentDisplay(Display display) {
+        Map displayMap = getCurrentDisplayMap();
+        Display oldDisplay = null;
+        synchronized(displayMap) {
+            String name = display.getName();
+            if(null==name) name="nil";
+            oldDisplay = (Display) displayMap.put(name, display);
+            displayMap.notifyAll();
+        }
+        return oldDisplay;
+    }
+
+    /** removes the mapping of the given name from the thread local display map
+      * and notifies all threads synchronized to this display map. */
+    protected static Display removeCurrentDisplay(String name) {
+        if(null==name) name="nil";
+        Map displayMap = getCurrentDisplayMap();
+        Display oldDisplay = null;
+        synchronized(displayMap) {
+            oldDisplay = (Display) displayMap.remove(name);
+            displayMap.notifyAll();
+        }
+        return oldDisplay;
+    }
+
+    /** Returns the thread local display mapped to the given name */
+    public static Display getCurrentDisplay(String name) {
+        if(null==name) name="nil";
+        Map displayMap = getCurrentDisplayMap();
+        Display display = (Display) displayMap.get(name);
+        return display;
+    }
+
+    public static void dumpDisplayMap(String prefix) {
+        Map displayMap = getCurrentDisplayMap();
+        Set entrySet = displayMap.entrySet();
+        Iterator i = entrySet.iterator();
+        System.err.println(prefix+" DisplayMap["+entrySet.size()+"] "+Thread.currentThread());
+        for(int j=0; i.hasNext(); j++) {
+            Map.Entry entry = (Map.Entry) i.next();
+            System.err.println("  ["+j+"] "+entry.getKey()+" -> "+entry.getValue());
+        }
+    }
+
+    /** Returns the thread local display collection */
+    public static Collection getCurrentDisplays() {
+        return getCurrentDisplayMap().values();
+    }
+
+    /** Make sure to reuse a Display with the same name */
+    protected static Display create(String type, String name) {
+        try {
+            if(DEBUG) {
+                dumpDisplayMap("Display.create("+name+") BEGIN");
+            }
+            Display display = getCurrentDisplay(name);
+            if(null==display) {
+                Class displayClass = getDisplayClass(type);
+                display = (Display) displayClass.newInstance();
+                display.name=name;
+                display.refCount=1;
+
+                if(NewtFactory.useEDT()) {
+                    Thread current = Thread.currentThread();
+                    display.eventDispatchThread = new EventDispatchThread(display, current.getThreadGroup(), current.getName());
+                    display.eventDispatchThread.start();
+                    final Display f_dpy = display;
+                    display.eventDispatchThread.invokeAndWait(new Runnable() {
+                        public void run() {
+                            f_dpy.createNative();
+                        }
+                    } );
+                } else {
+                    display.createNative();
+                }
+                if(null==display.aDevice) {
+                    throw new RuntimeException("Display.createNative() failed to instanciate an AbstractGraphicsDevice");
+                }
+                setCurrentDisplay(display);
+                if(DEBUG) {
+                    System.err.println("Display.create("+name+") NEW: "+display+" "+Thread.currentThread());
+                }
+            } else {
+                synchronized(display) {
+                    display.refCount++;
+                    if(DEBUG) {
+                        System.err.println("Display.create("+name+") REUSE: refCount "+display.refCount+", "+display+" "+Thread.currentThread());
+                    }
+                }
+            }
+            if(DEBUG) {
+                dumpDisplayMap("Display.create("+name+") END");
+            }
+            return display;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected static Display wrapHandle(String type, String name, AbstractGraphicsDevice aDevice) {
+        try {
+            Class displayClass = getDisplayClass(type);
+            Display display = (Display) displayClass.newInstance();
+            display.name=name;
+            display.aDevice=aDevice;
+            return display;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public EventDispatchThread getEDT() { return eventDispatchThread; }
+
+    public synchronized void destroy() {
+        if(DEBUG) {
+            dumpDisplayMap("Display.destroy("+name+") BEGIN");
+        }
+        refCount--;
+        if(0==refCount) {
+            removeCurrentDisplay(name);
+            if(DEBUG) {
+                System.err.println("Display.destroy("+name+") REMOVE: "+this+" "+Thread.currentThread());
+            }
+            if(null!=eventDispatchThread) {
+                final Display f_dpy = this;
+                final EventDispatchThread f_edt = eventDispatchThread;
+                eventDispatchThread.invokeAndWait(new Runnable() {
+                    public void run() {
+                        f_dpy.closeNative();
+                        f_edt.stop();
+                    }
+                } );
+            } else {
+                closeNative();
+            }
+            if(null!=eventDispatchThread) { 
+                eventDispatchThread.waitUntilStopped();
+                eventDispatchThread=null;
+            }
+            aDevice = null;
+        } else {
+            if(DEBUG) {
+                System.err.println("Display.destroy("+name+") KEEP: refCount "+refCount+", "+this+" "+Thread.currentThread());
+            }
+        }
+        if(DEBUG) {
+            dumpDisplayMap("Display.destroy("+name+") END");
+        }
+    }
+
+    protected abstract void createNative();
+    protected abstract void closeNative();
+
+    public String getName() {
+        return name;
+    }
+
+    public long getHandle() {
+        if(null!=aDevice) {
+            return aDevice.getHandle();
+        }
+        return 0;
+    }
+
+    public AbstractGraphicsDevice getGraphicsDevice() {
+        return aDevice;
+    }
+
+    public void pumpMessages() {
+        if(null!=eventDispatchThread) { 
+            dispatchMessages();
+        } else {
+            synchronized(this) {
+                dispatchMessages();
+            }
+        }
+    }
+
+    public String toString() {
+        return "NEWT-Display["+name+", refCount "+refCount+", "+aDevice+"]";
+    }
+
+    protected abstract void dispatchMessages();
+
+    /** Default impl. nop - Currently only X11 needs a Display lock */
+    protected void lockDisplay() { }
+
+    /** Default impl. nop - Currently only X11 needs a Display lock */
+    protected void unlockDisplay() { }
+
+    protected EventDispatchThread eventDispatchThread = null;
+    protected String name;
+    protected int refCount;
+    protected AbstractGraphicsDevice aDevice;
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/Event.java b/src/newt/classes/com/jogamp/newt/Event.java
new file mode 100644
index 000000000..d42a95735
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/Event.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+public class Event {
+    private boolean isSystemEvent;
+    private int eventType;
+    private Window source;
+    private long when;
+
+    Event(boolean isSystemEvent, int eventType, Window source, long when) {
+        this.isSystemEvent = isSystemEvent;
+        this.eventType = eventType;
+        this.source = source;
+        this.when = when;
+    }
+
+    protected Event(int eventType, Window source, long when) {
+        this(false, eventType, source, when);
+    }
+
+    /** Indicates whether this event was produced by the system or
+        generated by user code. */
+    public final boolean isSystemEvent() {
+        return isSystemEvent;
+    }
+
+    /** Returns the event type of this event. */
+    public final int getEventType() {
+        return eventType;
+    }
+
+    /** Returns the source Window which produced this Event. */
+    public final Window getSource() {
+        return source;
+    }
+
+    /** Returns the timestamp, in milliseconds, of this event. */
+    public final long getWhen()  {
+        return when;
+    }
+
+    public String toString() {
+        return "Event[sys:"+isSystemEvent()+", source:"+getSource()+", when:"+getWhen()+"]";
+    }
+
+    public static String toHexString(int hex) {
+        return "0x" + Integer.toHexString(hex);
+    }
+
+    public static String toHexString(long hex) {
+        return "0x" + Long.toHexString(hex);
+    }
+
+}
diff --git a/src/newt/classes/com/jogamp/newt/EventListener.java b/src/newt/classes/com/jogamp/newt/EventListener.java
new file mode 100644
index 000000000..75cb487dd
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/EventListener.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+public interface EventListener
+{
+    public static final int WINDOW  = 1 << 0;
+    public static final int MOUSE   = 1 << 1;
+    public static final int KEY     = 1 << 2;
+    public static final int SURFACE = 1 << 3;
+
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/InputEvent.java b/src/newt/classes/com/jogamp/newt/InputEvent.java
new file mode 100644
index 000000000..d4c3f6905
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/InputEvent.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+public abstract class InputEvent extends Event
+{
+ public static final int  SHIFT_MASK     = 1 << 0;
+ public static final int  CTRL_MASK      = 1 << 1;
+ public static final int  META_MASK      = 1 << 2;
+ public static final int  ALT_MASK       = 1 << 3;
+ public static final int  ALT_GRAPH_MASK = 1 << 5;
+ public static final int  BUTTON1_MASK   = 1 << 6;
+ public static final int  BUTTON2_MASK   = 1 << 7;
+ public static final int  BUTTON3_MASK   = 1 << 8;
+
+ protected InputEvent(boolean sysEvent, int eventType, Window source, long when, int modifiers) {
+    super(sysEvent, eventType, source, when);
+    this.consumed=false;
+    this.modifiers=modifiers;
+ }
+
+ public void consume() {
+    consumed=true;
+ }
+
+ public boolean isConsumed() {
+    return consumed;
+ }
+ public int getModifiers() {
+    return modifiers;
+ }
+ public boolean isAltDown() {
+    return (modifiers&ALT_MASK)!=0;
+ }
+ public boolean isAltGraphDown() {
+    return (modifiers&ALT_GRAPH_MASK)!=0;
+ }
+ public boolean isControlDown() {
+    return (modifiers&CTRL_MASK)!=0;
+ }
+ public boolean isMetaDown() {
+    return (modifiers&META_MASK)!=0;
+ }
+ public boolean isShiftDown()  {
+    return (modifiers&SHIFT_MASK)!=0;
+ }
+
+ public boolean isButton1Down()  {
+    return (modifiers&BUTTON1_MASK)!=0;
+ }
+
+ public boolean isButton2Down()  {
+    return (modifiers&BUTTON2_MASK)!=0;
+ }
+
+ public boolean isButton3Down()  {
+    return (modifiers&BUTTON3_MASK)!=0;
+ }
+
+ public String toString() {
+     return "InputEvent[modifiers:"+modifiers+"]";
+ }
+
+ private boolean consumed;
+ private int modifiers;
+}
diff --git a/src/newt/classes/com/jogamp/newt/Insets.java b/src/newt/classes/com/jogamp/newt/Insets.java
new file mode 100644
index 000000000..e440892f0
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/Insets.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ */
+package com.jogamp.newt;
+
+/**
+ * Simple class representing insets.
+ * 
+ * @author tdv
+ */
+public class Insets implements Cloneable {
+    public int top;
+    public int left;
+    public int bottom;
+    public int right;
+
+    /**
+     * Creates and initializes a new <code>Insets</code> object with the
+     * specified top, left, bottom, and right insets.
+     * @param       top   the inset from the top.
+     * @param       left   the inset from the left.
+     * @param       bottom   the inset from the bottom.
+     * @param       right   the inset from the right.
+     */
+    public Insets(int top, int left, int bottom, int right) {
+        this.top = top;
+        this.left = left;
+        this.bottom = bottom;
+        this.right = right;
+    }
+
+    /**
+     * Checks whether two insets objects are equal. Two instances
+     * of <code>Insets</code> are equal if the four integer values
+     * of the fields <code>top</code>, <code>left</code>,
+     * <code>bottom</code>, and <code>right</code> are all equal.
+     * @return      <code>true</code> if the two insets are equal;
+     *                          otherwise <code>false</code>.
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof Insets) {
+            Insets insets = (Insets)obj;
+            return ((top == insets.top) && (left == insets.left) &&
+                (bottom == insets.bottom) && (right == insets.right));
+        }
+        return false;
+    }
+
+    /**
+     * Returns the hash code for this Insets.
+     *
+     * @return    a hash code for this Insets.
+     */
+    public int hashCode() {
+        int sum1 = left + bottom;
+        int sum2 = right + top;
+        int val1 = sum1 * (sum1 + 1)/2 + left;
+        int val2 = sum2 * (sum2 + 1)/2 + top;
+        int sum3 = val1 + val2;
+        return sum3 * (sum3 + 1)/2 + val2;
+    }
+
+    public String toString() {
+    	return getClass().getName() + "[top="  + top + ",left=" + left +
+            ",bottom=" + bottom + ",right=" + right + "]";
+    }
+
+    public Object clone() {
+        try {
+            return super.clone();
+        } catch (CloneNotSupportedException ex) {
+            throw new InternalError();
+        }
+    }
+
+}
diff --git a/src/newt/classes/com/jogamp/newt/KeyEvent.java b/src/newt/classes/com/jogamp/newt/KeyEvent.java
new file mode 100644
index 000000000..bec77160b
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/KeyEvent.java
@@ -0,0 +1,738 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+public class KeyEvent extends InputEvent
+{
+ KeyEvent(boolean sysEvent, int eventType, Window source, long when, int modifiers, int keyCode, char keyChar) {
+     super(sysEvent, eventType, source, when, modifiers); 
+     this.keyCode=keyCode;
+     this.keyChar=keyChar;
+ }
+ public KeyEvent(int eventType, Window source, long when, int modifiers, int keyCode, char keyChar) {
+     this(false, eventType, source, when, modifiers, keyCode, keyChar);
+ }
+
+ public char getKeyChar() {
+    return keyChar;
+ }
+ public int getKeyCode() {
+    return keyCode;
+ }
+
+ public String toString() {
+    return "KeyEvent["+getEventTypeString(getEventType())+
+                     ", code "+keyCode+"("+toHexString(keyCode)+"), char <"+keyChar+"> ("+toHexString((int)keyChar)+"), isActionKey "+isActionKey()+", "+super.toString()+"]";
+ }
+
+ public static String getEventTypeString(int type) {
+    switch(type) {
+        case EVENT_KEY_PRESSED: return "EVENT_KEY_PRESSED";
+        case EVENT_KEY_RELEASED: return "EVENT_KEY_RELEASED";
+        case EVENT_KEY_TYPED: return "EVENT_KEY_TYPED";
+        default: return "unknown (" + type + ")";
+    }
+ }
+
+ public boolean   isActionKey() {
+    switch (keyCode) {
+      case VK_HOME:
+      case VK_END:
+      case VK_PAGE_UP:
+      case VK_PAGE_DOWN:
+      case VK_UP:
+      case VK_DOWN:
+      case VK_LEFT:
+      case VK_RIGHT:
+
+      case VK_F1:
+      case VK_F2:
+      case VK_F3:
+      case VK_F4:
+      case VK_F5:
+      case VK_F6:
+      case VK_F7:
+      case VK_F8:
+      case VK_F9:
+      case VK_F10:
+      case VK_F11:
+      case VK_F12:
+      case VK_F13:
+      case VK_F14:
+      case VK_F15:
+      case VK_F16:
+      case VK_F17:
+      case VK_F18:
+      case VK_F19:
+      case VK_F20:
+      case VK_F21:
+      case VK_F22:
+      case VK_F23:
+      case VK_F24:
+      case VK_PRINTSCREEN:
+      case VK_CAPS_LOCK:
+      case VK_PAUSE:
+      case VK_INSERT:
+
+      case VK_HELP:
+      case VK_WINDOWS:
+          return true;
+    }
+    return false;
+ }
+
+    private int keyCode;
+    private char keyChar;
+
+    public static final int EVENT_KEY_PRESSED = 300;
+    public static final int EVENT_KEY_RELEASED= 301;
+    public static final int EVENT_KEY_TYPED   = 302;
+
+    /* Virtual key codes. */
+
+    public static final int VK_ENTER          = '\n';
+    public static final int VK_BACK_SPACE     = '\b';
+    public static final int VK_TAB            = '\t';
+    public static final int VK_CANCEL         = 0x03;
+    public static final int VK_CLEAR          = 0x0C;
+    public static final int VK_SHIFT          = 0x10;
+    public static final int VK_CONTROL        = 0x11;
+    public static final int VK_ALT            = 0x12;
+    public static final int VK_PAUSE          = 0x13;
+    public static final int VK_CAPS_LOCK      = 0x14;
+    public static final int VK_ESCAPE         = 0x1B;
+    public static final int VK_SPACE          = 0x20;
+    public static final int VK_PAGE_UP        = 0x21;
+    public static final int VK_PAGE_DOWN      = 0x22;
+    public static final int VK_END            = 0x23;
+    public static final int VK_HOME           = 0x24;
+
+    /**
+     * Constant for the non-numpad <b>left</b> arrow key.
+     * @see #VK_KP_LEFT
+     */
+    public static final int VK_LEFT           = 0x25;
+
+    /**
+     * Constant for the non-numpad <b>up</b> arrow key.
+     * @see #VK_KP_UP
+     */
+    public static final int VK_UP             = 0x26;
+
+    /**
+     * Constant for the non-numpad <b>right</b> arrow key.
+     * @see #VK_KP_RIGHT
+     */
+    public static final int VK_RIGHT          = 0x27;
+
+    /**
+     * Constant for the non-numpad <b>down</b> arrow key.
+     * @see #VK_KP_DOWN
+     */
+    public static final int VK_DOWN           = 0x28;
+
+    /**
+     * Constant for the comma key, ","
+     */
+    public static final int VK_COMMA          = 0x2C;
+
+    /**
+     * Constant for the minus key, "-"
+     * @since 1.2
+     */
+    public static final int VK_MINUS          = 0x2D;
+
+    /**
+     * Constant for the period key, "."
+     */
+    public static final int VK_PERIOD         = 0x2E;
+
+    /**
+     * Constant for the forward slash key, "/"
+     */
+    public static final int VK_SLASH          = 0x2F;
+
+    /** VK_0 thru VK_9 are the same as ASCII '0' thru '9' (0x30 - 0x39) */
+    public static final int VK_0              = 0x30;
+    public static final int VK_1              = 0x31;
+    public static final int VK_2              = 0x32;
+    public static final int VK_3              = 0x33;
+    public static final int VK_4              = 0x34;
+    public static final int VK_5              = 0x35;
+    public static final int VK_6              = 0x36;
+    public static final int VK_7              = 0x37;
+    public static final int VK_8              = 0x38;
+    public static final int VK_9              = 0x39;
+
+    /**
+     * Constant for the semicolon key, ";"
+     */
+    public static final int VK_SEMICOLON      = 0x3B;
+
+    /**
+     * Constant for the equals key, "="
+     */
+    public static final int VK_EQUALS         = 0x3D;
+
+    /** VK_A thru VK_Z are the same as ASCII 'A' thru 'Z' (0x41 - 0x5A) */
+    public static final int VK_A              = 0x41;
+    public static final int VK_B              = 0x42;
+    public static final int VK_C              = 0x43;
+    public static final int VK_D              = 0x44;
+    public static final int VK_E              = 0x45;
+    public static final int VK_F              = 0x46;
+    public static final int VK_G              = 0x47;
+    public static final int VK_H              = 0x48;
+    public static final int VK_I              = 0x49;
+    public static final int VK_J              = 0x4A;
+    public static final int VK_K              = 0x4B;
+    public static final int VK_L              = 0x4C;
+    public static final int VK_M              = 0x4D;
+    public static final int VK_N              = 0x4E;
+    public static final int VK_O              = 0x4F;
+    public static final int VK_P              = 0x50;
+    public static final int VK_Q              = 0x51;
+    public static final int VK_R              = 0x52;
+    public static final int VK_S              = 0x53;
+    public static final int VK_T              = 0x54;
+    public static final int VK_U              = 0x55;
+    public static final int VK_V              = 0x56;
+    public static final int VK_W              = 0x57;
+    public static final int VK_X              = 0x58;
+    public static final int VK_Y              = 0x59;
+    public static final int VK_Z              = 0x5A;
+
+    /**
+     * Constant for the open bracket key, "["
+     */
+    public static final int VK_OPEN_BRACKET   = 0x5B;
+
+    /**
+     * Constant for the back slash key, "\"
+     */
+    public static final int VK_BACK_SLASH     = 0x5C;
+
+    /**
+     * Constant for the close bracket key, "]"
+     */
+    public static final int VK_CLOSE_BRACKET  = 0x5D;
+
+    public static final int VK_NUMPAD0        = 0x60;
+    public static final int VK_NUMPAD1        = 0x61;
+    public static final int VK_NUMPAD2        = 0x62;
+    public static final int VK_NUMPAD3        = 0x63;
+    public static final int VK_NUMPAD4        = 0x64;
+    public static final int VK_NUMPAD5        = 0x65;
+    public static final int VK_NUMPAD6        = 0x66;
+    public static final int VK_NUMPAD7        = 0x67;
+    public static final int VK_NUMPAD8        = 0x68;
+    public static final int VK_NUMPAD9        = 0x69;
+    public static final int VK_MULTIPLY       = 0x6A;
+    public static final int VK_ADD            = 0x6B;
+
+    /** 
+     * This constant is obsolete, and is included only for backwards
+     * compatibility.
+     * @see #VK_SEPARATOR
+     */
+    public static final int VK_SEPARATER      = 0x6C;
+
+    /** 
+     * Constant for the Numpad Separator key. 
+     * @since 1.4
+     */
+    public static final int VK_SEPARATOR      = VK_SEPARATER;
+
+    public static final int VK_SUBTRACT       = 0x6D;
+    public static final int VK_DECIMAL        = 0x6E;
+    public static final int VK_DIVIDE         = 0x6F;
+    public static final int VK_DELETE         = 0x7F; /* ASCII DEL */
+    public static final int VK_NUM_LOCK       = 0x90;
+    public static final int VK_SCROLL_LOCK    = 0x91;
+
+    /** Constant for the F1 function key. */
+    public static final int VK_F1             = 0x70;
+
+    /** Constant for the F2 function key. */
+    public static final int VK_F2             = 0x71;
+
+    /** Constant for the F3 function key. */
+    public static final int VK_F3             = 0x72;
+
+    /** Constant for the F4 function key. */
+    public static final int VK_F4             = 0x73;
+
+    /** Constant for the F5 function key. */
+    public static final int VK_F5             = 0x74;
+
+    /** Constant for the F6 function key. */
+    public static final int VK_F6             = 0x75;
+
+    /** Constant for the F7 function key. */
+    public static final int VK_F7             = 0x76;
+
+    /** Constant for the F8 function key. */
+    public static final int VK_F8             = 0x77;
+
+    /** Constant for the F9 function key. */
+    public static final int VK_F9             = 0x78;
+
+    /** Constant for the F10 function key. */
+    public static final int VK_F10            = 0x79;
+
+    /** Constant for the F11 function key. */
+    public static final int VK_F11            = 0x7A;
+
+    /** Constant for the F12 function key. */
+    public static final int VK_F12            = 0x7B;
+
+    /**
+     * Constant for the F13 function key.
+     * @since 1.2
+     */
+    /* F13 - F24 are used on IBM 3270 keyboard; use random range for constants. */
+    public static final int VK_F13            = 0xF000;
+ 
+    /**
+     * Constant for the F14 function key.
+     * @since 1.2
+     */
+    public static final int VK_F14            = 0xF001;
+ 
+    /**
+     * Constant for the F15 function key.
+     * @since 1.2
+     */
+    public static final int VK_F15            = 0xF002;
+ 
+    /**
+     * Constant for the F16 function key.
+     * @since 1.2
+     */
+    public static final int VK_F16            = 0xF003;
+ 
+    /**
+     * Constant for the F17 function key.
+     * @since 1.2
+     */
+    public static final int VK_F17            = 0xF004;
+ 
+    /**
+     * Constant for the F18 function key.
+     * @since 1.2
+     */
+    public static final int VK_F18            = 0xF005;
+ 
+    /**
+     * Constant for the F19 function key.
+     * @since 1.2
+     */
+    public static final int VK_F19            = 0xF006;
+ 
+    /**
+     * Constant for the F20 function key.
+     * @since 1.2
+     */
+    public static final int VK_F20            = 0xF007;
+ 
+    /**
+     * Constant for the F21 function key.
+     * @since 1.2
+     */
+    public static final int VK_F21            = 0xF008;
+ 
+    /**
+     * Constant for the F22 function key.
+     * @since 1.2
+     */
+    public static final int VK_F22            = 0xF009;
+ 
+    /**
+     * Constant for the F23 function key.
+     * @since 1.2
+     */
+    public static final int VK_F23            = 0xF00A;
+ 
+    /**
+     * Constant for the F24 function key.
+     * @since 1.2
+     */
+    public static final int VK_F24            = 0xF00B;
+ 
+    public static final int VK_PRINTSCREEN    = 0x9A;
+    public static final int VK_INSERT         = 0x9B;
+    public static final int VK_HELP           = 0x9C;
+    public static final int VK_META           = 0x9D;
+
+    public static final int VK_BACK_QUOTE     = 0xC0;
+    public static final int VK_QUOTE          = 0xDE;
+
+    /**
+     * Constant for the numeric keypad <b>up</b> arrow key.
+     * @see #VK_UP
+     * @since 1.2
+     */
+    public static final int VK_KP_UP          = 0xE0;
+
+    /**
+     * Constant for the numeric keypad <b>down</b> arrow key.
+     * @see #VK_DOWN
+     * @since 1.2
+     */
+    public static final int VK_KP_DOWN        = 0xE1;
+
+    /**
+     * Constant for the numeric keypad <b>left</b> arrow key.
+     * @see #VK_LEFT
+     * @since 1.2
+     */
+    public static final int VK_KP_LEFT        = 0xE2;
+
+    /**
+     * Constant for the numeric keypad <b>right</b> arrow key.
+     * @see #VK_RIGHT
+     * @since 1.2
+     */
+    public static final int VK_KP_RIGHT       = 0xE3;
+    
+    /* For European keyboards */
+    /** @since 1.2 */
+    public static final int VK_DEAD_GRAVE               = 0x80;
+    /** @since 1.2 */
+    public static final int VK_DEAD_ACUTE               = 0x81;
+    /** @since 1.2 */
+    public static final int VK_DEAD_CIRCUMFLEX          = 0x82;
+    /** @since 1.2 */
+    public static final int VK_DEAD_TILDE               = 0x83;
+    /** @since 1.2 */
+    public static final int VK_DEAD_MACRON              = 0x84;
+    /** @since 1.2 */
+    public static final int VK_DEAD_BREVE               = 0x85;
+    /** @since 1.2 */
+    public static final int VK_DEAD_ABOVEDOT            = 0x86;
+    /** @since 1.2 */
+    public static final int VK_DEAD_DIAERESIS           = 0x87;
+    /** @since 1.2 */
+    public static final int VK_DEAD_ABOVERING           = 0x88;
+    /** @since 1.2 */
+    public static final int VK_DEAD_DOUBLEACUTE         = 0x89;
+    /** @since 1.2 */
+    public static final int VK_DEAD_CARON               = 0x8a;
+    /** @since 1.2 */
+    public static final int VK_DEAD_CEDILLA             = 0x8b;
+    /** @since 1.2 */
+    public static final int VK_DEAD_OGONEK              = 0x8c;
+    /** @since 1.2 */
+    public static final int VK_DEAD_IOTA                = 0x8d;
+    /** @since 1.2 */
+    public static final int VK_DEAD_VOICED_SOUND        = 0x8e;
+    /** @since 1.2 */
+    public static final int VK_DEAD_SEMIVOICED_SOUND    = 0x8f;
+
+    /** @since 1.2 */
+    public static final int VK_AMPERSAND                = 0x96;
+    /** @since 1.2 */
+    public static final int VK_ASTERISK                 = 0x97;
+    /** @since 1.2 */
+    public static final int VK_QUOTEDBL                 = 0x98;
+    /** @since 1.2 */
+    public static final int VK_LESS                     = 0x99;
+
+    /** @since 1.2 */
+    public static final int VK_GREATER                  = 0xa0;
+    /** @since 1.2 */
+    public static final int VK_BRACELEFT                = 0xa1;
+    /** @since 1.2 */
+    public static final int VK_BRACERIGHT               = 0xa2;
+
+    /**
+     * Constant for the "@" key.
+     * @since 1.2
+     */
+    public static final int VK_AT                       = 0x0200;
+ 
+    /**
+     * Constant for the ":" key.
+     * @since 1.2
+     */
+    public static final int VK_COLON                    = 0x0201;
+ 
+    /**
+     * Constant for the "^" key.
+     * @since 1.2
+     */
+    public static final int VK_CIRCUMFLEX               = 0x0202;
+ 
+    /**
+     * Constant for the "$" key.
+     * @since 1.2
+     */
+    public static final int VK_DOLLAR                   = 0x0203;
+ 
+    /**
+     * Constant for the Euro currency sign key.
+     * @since 1.2
+     */
+    public static final int VK_EURO_SIGN                = 0x0204;
+ 
+    /**
+     * Constant for the "!" key.
+     * @since 1.2
+     */
+    public static final int VK_EXCLAMATION_MARK         = 0x0205;
+ 
+    /**
+     * Constant for the inverted exclamation mark key.
+     * @since 1.2
+     */
+    public static final int VK_INVERTED_EXCLAMATION_MARK = 0x0206;
+ 
+    /**
+     * Constant for the "(" key.
+     * @since 1.2
+     */
+    public static final int VK_LEFT_PARENTHESIS         = 0x0207;
+ 
+    /**
+     * Constant for the "#" key.
+     * @since 1.2
+     */
+    public static final int VK_NUMBER_SIGN              = 0x0208;
+ 
+    /**
+     * Constant for the "+" key.
+     * @since 1.2
+     */
+    public static final int VK_PLUS                     = 0x0209;
+ 
+    /**
+     * Constant for the ")" key.
+     * @since 1.2
+     */
+    public static final int VK_RIGHT_PARENTHESIS        = 0x020A;
+ 
+    /**
+     * Constant for the "_" key.
+     * @since 1.2
+     */
+    public static final int VK_UNDERSCORE               = 0x020B;
+ 
+    /**
+     * Constant for the Microsoft Windows "Windows" key.
+     * It is used for both the left and right version of the key.  
+     * @see #getKeyLocation()
+     * @since 1.5
+     */
+    public static final int VK_WINDOWS                  = 0x020C;
+ 
+    /**
+     * Constant for the Microsoft Windows Context Menu key.
+     * @since 1.5
+     */
+    public static final int VK_CONTEXT_MENU             = 0x020D;
+ 
+    /* for input method support on Asian Keyboards */
+
+    /* not clear what this means - listed in Microsoft Windows API */
+    public static final int VK_FINAL                    = 0x0018;
+    
+    /** Constant for the Convert function key. */
+    /* Japanese PC 106 keyboard, Japanese Solaris keyboard: henkan */
+    public static final int VK_CONVERT                  = 0x001C;
+
+    /** Constant for the Don't Convert function key. */
+    /* Japanese PC 106 keyboard: muhenkan */
+    public static final int VK_NONCONVERT               = 0x001D;
+    
+    /** Constant for the Accept or Commit function key. */
+    /* Japanese Solaris keyboard: kakutei */
+    public static final int VK_ACCEPT                   = 0x001E;
+
+    /* not clear what this means - listed in Microsoft Windows API */
+    public static final int VK_MODECHANGE               = 0x001F;
+
+    /* replaced by VK_KANA_LOCK for Microsoft Windows and Solaris; 
+       might still be used on other platforms */
+    public static final int VK_KANA                     = 0x0015;
+
+    /* replaced by VK_INPUT_METHOD_ON_OFF for Microsoft Windows and Solaris; 
+       might still be used for other platforms */
+    public static final int VK_KANJI                    = 0x0019;
+
+    /**
+     * Constant for the Alphanumeric function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard: eisuu */
+    public static final int VK_ALPHANUMERIC             = 0x00F0;
+ 
+    /**
+     * Constant for the Katakana function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard: katakana */
+    public static final int VK_KATAKANA                 = 0x00F1;
+ 
+    /**
+     * Constant for the Hiragana function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard: hiragana */
+    public static final int VK_HIRAGANA                 = 0x00F2;
+ 
+    /**
+     * Constant for the Full-Width Characters function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard: zenkaku */
+    public static final int VK_FULL_WIDTH               = 0x00F3;
+ 
+    /**
+     * Constant for the Half-Width Characters function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard: hankaku */
+    public static final int VK_HALF_WIDTH               = 0x00F4;
+ 
+    /**
+     * Constant for the Roman Characters function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard: roumaji */
+    public static final int VK_ROMAN_CHARACTERS         = 0x00F5;
+ 
+    /**
+     * Constant for the All Candidates function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard - VK_CONVERT + ALT: zenkouho */
+    public static final int VK_ALL_CANDIDATES           = 0x0100;
+ 
+    /**
+     * Constant for the Previous Candidate function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard - VK_CONVERT + SHIFT: maekouho */
+    public static final int VK_PREVIOUS_CANDIDATE       = 0x0101;
+ 
+    /**
+     * Constant for the Code Input function key.
+     * @since 1.2
+     */
+    /* Japanese PC 106 keyboard - VK_ALPHANUMERIC + ALT: kanji bangou */
+    public static final int VK_CODE_INPUT               = 0x0102;
+ 
+    /**
+     * Constant for the Japanese-Katakana function key.
+     * This key switches to a Japanese input method and selects its Katakana input mode.
+     * @since 1.2
+     */
+    /* Japanese Macintosh keyboard - VK_JAPANESE_HIRAGANA + SHIFT */
+    public static final int VK_JAPANESE_KATAKANA        = 0x0103;
+ 
+    /**
+     * Constant for the Japanese-Hiragana function key.
+     * This key switches to a Japanese input method and selects its Hiragana input mode.
+     * @since 1.2
+     */
+    /* Japanese Macintosh keyboard */
+    public static final int VK_JAPANESE_HIRAGANA        = 0x0104;
+ 
+    /**
+     * Constant for the Japanese-Roman function key.
+     * This key switches to a Japanese input method and selects its Roman-Direct input mode.
+     * @since 1.2
+     */
+    /* Japanese Macintosh keyboard */
+    public static final int VK_JAPANESE_ROMAN           = 0x0105;
+
+    /**
+     * Constant for the locking Kana function key.
+     * This key locks the keyboard into a Kana layout.
+     * @since 1.3
+     */
+    /* Japanese PC 106 keyboard with special Windows driver - eisuu + Control; Japanese Solaris keyboard: kana */
+    public static final int VK_KANA_LOCK                = 0x0106;
+
+    /**
+     * Constant for the input method on/off key.
+     * @since 1.3
+     */
+    /* Japanese PC 106 keyboard: kanji. Japanese Solaris keyboard: nihongo */
+    public static final int VK_INPUT_METHOD_ON_OFF      = 0x0107;
+
+    /* for Sun keyboards */
+    /** @since 1.2 */
+    public static final int VK_CUT                      = 0xFFD1;
+    /** @since 1.2 */
+    public static final int VK_COPY                     = 0xFFCD;
+    /** @since 1.2 */
+    public static final int VK_PASTE                    = 0xFFCF;
+    /** @since 1.2 */
+    public static final int VK_UNDO                     = 0xFFCB;
+    /** @since 1.2 */
+    public static final int VK_AGAIN                    = 0xFFC9;
+    /** @since 1.2 */
+    public static final int VK_FIND                     = 0xFFD0;
+    /** @since 1.2 */
+    public static final int VK_PROPS                    = 0xFFCA;
+    /** @since 1.2 */
+    public static final int VK_STOP                     = 0xFFC8;
+    
+    /**
+     * Constant for the Compose function key.
+     * @since 1.2
+     */
+    public static final int VK_COMPOSE                  = 0xFF20;
+ 
+    /**
+     * Constant for the AltGraph function key.
+     * @since 1.2
+     */
+    public static final int VK_ALT_GRAPH                = 0xFF7E;
+
+    /**
+     * Constant for the Begin key.
+     * @since 1.5
+     */
+    public static final int VK_BEGIN                    = 0xFF58;
+
+    /**
+     * This value is used to indicate that the keyCode is unknown.
+     * KEY_TYPED events do not have a keyCode value; this value 
+     * is used instead.  
+     */
+    public static final int VK_UNDEFINED      = 0x0;
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/KeyListener.java b/src/newt/classes/com/jogamp/newt/KeyListener.java
new file mode 100644
index 000000000..28e2b833b
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/KeyListener.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+public interface KeyListener extends EventListener
+{
+ public void keyPressed(KeyEvent e);
+ public void keyReleased(KeyEvent e);
+ public void keyTyped(KeyEvent e) ;
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/MouseEvent.java b/src/newt/classes/com/jogamp/newt/MouseEvent.java
new file mode 100644
index 000000000..d5412c0cc
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/MouseEvent.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+public class MouseEvent extends InputEvent
+{
+  public static final int BUTTON1 = 1;
+  public static final int BUTTON2 = 2;
+  public static final int BUTTON3 = 3;
+  public static final int BUTTON4 = 4;
+  public static final int BUTTON5 = 5;
+  public static final int BUTTON6 = 6;
+  public static final int BUTTON_NUMBER = 6;
+
+ protected MouseEvent(boolean sysEvent, int eventType, Window source, long when,
+                      int modifiers, int x, int y, int clickCount, int button,
+                      int rotation)
+ {
+     super(sysEvent, eventType, source, when, modifiers); 
+     this.x=x;
+     this.y=y;
+     this.clickCount=clickCount;
+     this.button=button;
+     this.wheelRotation = rotation;
+ }
+ public MouseEvent(int eventType, Window source, long when, int modifiers,
+                   int x, int y, int clickCount, int button, int rotation) {
+     this(false, eventType, source, when, modifiers, x, y, clickCount, button,
+          rotation);
+ }
+
+ public int getButton() {
+    return button;
+ }
+ public int getClickCount() {
+    return clickCount;
+ }
+ public int getX() {
+    return x;
+ }
+ public int getY() {
+    return y;
+ }
+ public int getWheelRotation() {
+    return wheelRotation;
+ }
+ 
+ public String toString() {
+    return "MouseEvent["+getEventTypeString(getEventType())+
+                       ", "+x+"/"+y+", button "+button+", count "+clickCount+
+                       ", wheel rotation "+wheelRotation+
+                       ", "+super.toString()+"]";
+ }
+
+ public static String getEventTypeString(int type) {
+    switch(type) {
+        case EVENT_MOUSE_CLICKED: return "EVENT_MOUSE_CLICKED";
+        case EVENT_MOUSE_ENTERED: return "EVENT_MOUSE_ENTERED";
+        case EVENT_MOUSE_EXITED: return "EVENT_MOUSE_EXITED";
+        case EVENT_MOUSE_PRESSED: return "EVENT_MOUSE_PRESSED";
+        case EVENT_MOUSE_RELEASED: return "EVENT_MOUSE_RELEASED";
+        case EVENT_MOUSE_MOVED: return "EVENT_MOUSE_MOVED";
+        case EVENT_MOUSE_DRAGGED: return "EVENT_MOUSE_DRAGGED";
+        case EVENT_MOUSE_WHEEL_MOVED: return "EVENT_MOUSE_WHEEL_MOVED";
+        default: return "unknown (" + type + ")";
+    }
+ }
+
+ private int x, y, clickCount, button, wheelRotation;
+
+ public static final int EVENT_MOUSE_CLICKED  = 200;
+ public static final int EVENT_MOUSE_ENTERED  = 201;
+ public static final int EVENT_MOUSE_EXITED   = 202;
+ public static final int EVENT_MOUSE_PRESSED  = 203;
+ public static final int EVENT_MOUSE_RELEASED = 204;
+ public static final int EVENT_MOUSE_MOVED    = 205;
+ public static final int EVENT_MOUSE_DRAGGED  = 206;
+ public static final int EVENT_MOUSE_WHEEL_MOVED = 207;
+}
diff --git a/src/newt/classes/com/jogamp/newt/MouseListener.java b/src/newt/classes/com/jogamp/newt/MouseListener.java
new file mode 100644
index 000000000..6d931dd31
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/MouseListener.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+public interface MouseListener extends EventListener
+{
+ public void mouseClicked(MouseEvent e);
+ public void mouseEntered(MouseEvent e);
+ public void mouseExited(MouseEvent e);
+ public void mousePressed(MouseEvent e);
+ public void mouseReleased(MouseEvent e);
+ public void mouseMoved(MouseEvent e);
+ public void mouseDragged(MouseEvent e);
+ public void mouseWheelMoved(MouseEvent e);
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/NewtFactory.java b/src/newt/classes/com/jogamp/newt/NewtFactory.java
new file mode 100755
index 000000000..2a696aa07
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/NewtFactory.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+import javax.media.nativewindow.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import com.jogamp.nativewindow.impl.jvm.JVMUtil;
+
+public abstract class NewtFactory {
+    // Work-around for initialization order problems on Mac OS X
+    // between native Newt and (apparently) Fmod
+    static {
+        JVMUtil.initSingleton();
+        Window.init(NativeWindowFactory.getNativeWindowType(true));
+    }
+
+    static Class getCustomClass(String packageName, String classBaseName) {
+        Class clazz = null;
+        if(packageName!=null || classBaseName!=null) {
+            String clazzName = packageName + "." + classBaseName ;
+            try {
+                clazz = Class.forName(clazzName);
+            } catch (Throwable t) {}
+        }
+        return clazz;
+    }
+
+    private static boolean useEDT = true;
+
+    /** 
+     * Toggles the usage of an EventDispatchThread while creating a Display.<br>
+     * The default is enabled.<br>
+     * The EventDispatchThread is thread local to the Display instance.<br>
+     */
+    public static synchronized void setUseEDT(boolean onoff) {
+        useEDT = onoff;
+    }
+
+    /** @see #setUseEDT(boolean) */
+    public static boolean useEDT() { return useEDT; }
+
+    /**
+     * Create a Display entity, incl native creation
+     */
+    public static Display createDisplay(String name) {
+      return Display.create(NativeWindowFactory.getNativeWindowType(true), name);
+    }
+
+    /**
+     * Create a Display entity using the given implementation type, incl native creation
+     */
+    public static Display createDisplay(String type, String name) {
+      return Display.create(type, name);
+    }
+
+    /**
+     * Create a Screen entity, incl native creation
+     */
+    public static Screen createScreen(Display display, int index) {
+      return Screen.create(NativeWindowFactory.getNativeWindowType(true), display, index);
+    }
+
+    /**
+     * Create a Screen entity using the given implementation type, incl native creation
+     */
+    public static Screen createScreen(String type, Display display, int index) {
+      return Screen.create(type, display, index);
+    }
+
+    /**
+     * Create a Window entity, incl native creation
+     */
+    public static Window createWindow(Screen screen, Capabilities caps) {
+        return Window.create(NativeWindowFactory.getNativeWindowType(true), 0, screen, caps, false);
+    }
+
+    public static Window createWindow(Screen screen, Capabilities caps, boolean undecorated) {
+        return Window.create(NativeWindowFactory.getNativeWindowType(true), 0, screen, caps, undecorated);
+    }
+
+    public static Window createWindow(long parentWindowHandle, Screen screen, Capabilities caps, boolean undecorated) {
+        return Window.create(NativeWindowFactory.getNativeWindowType(true), parentWindowHandle, screen, caps, undecorated);
+    }
+
+    /**
+     * Ability to try a Window type with a construnctor argument, if supported ..<p>
+     * Currently only valid is <code> AWTWindow(Frame frame) </code>,
+     * to support an external created AWT Frame, ie the browsers embedded frame.
+     */
+    public static Window createWindow(Object[] cstrArguments, Screen screen, Capabilities caps, boolean undecorated) {
+        return Window.create(NativeWindowFactory.getNativeWindowType(true), cstrArguments, screen, caps, undecorated);
+    }
+
+    /**
+     * Create a Window entity using the given implementation type, incl native creation
+     */
+    public static Window createWindow(String type, Screen screen, Capabilities caps) {
+        return Window.create(type, 0, screen, caps, false);
+    }
+
+    public static Window createWindow(String type, Screen screen, Capabilities caps, boolean undecorated) {
+        return Window.create(type, 0, screen, caps, undecorated);
+    }
+
+    public static Window createWindow(String type, long parentWindowHandle, Screen screen, Capabilities caps, boolean undecorated) {
+        return Window.create(type, parentWindowHandle, screen, caps, undecorated);
+    }
+
+    public static Window createWindow(String type, Object[] cstrArguments, Screen screen, Capabilities caps, boolean undecorated) {
+        return Window.create(type, cstrArguments, screen, caps, undecorated);
+    }
+
+    /**
+     * Instantiate a Display entity using the native handle.
+     */
+    public static Display wrapDisplay(String name, AbstractGraphicsDevice device) {
+      return Display.wrapHandle(NativeWindowFactory.getNativeWindowType(true), name, device);
+    }
+
+    /**
+     * Instantiate a Screen entity using the native handle.
+     */
+    public static Screen wrapScreen(Display display, AbstractGraphicsScreen screen) {
+      return Screen.wrapHandle(NativeWindowFactory.getNativeWindowType(true), display, screen);
+    }
+
+    /**
+     * Instantiate a Window entity using the native handle.
+     */
+    public static Window wrapWindow(Screen screen, AbstractGraphicsConfiguration config,
+                                    long windowHandle, boolean fullscreen, boolean visible, 
+                                    int x, int y, int width, int height) {
+      return Window.wrapHandle(NativeWindowFactory.getNativeWindowType(true), screen, config,
+                               windowHandle, fullscreen, visible, x, y, width, height);
+    }
+
+    private static final boolean instanceOf(Object obj, String clazzName) {
+        Class clazz = obj.getClass();
+        do {
+            if(clazz.getName().equals(clazzName)) {
+                return true;
+            }
+            clazz = clazz.getSuperclass();
+        } while (clazz!=null);
+        return false;
+    }
+
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/OffscreenWindow.java b/src/newt/classes/com/jogamp/newt/OffscreenWindow.java
new file mode 100644
index 000000000..c9c56fc61
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/OffscreenWindow.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+import javax.media.nativewindow.*;
+
+public class OffscreenWindow extends Window implements SurfaceChangeable {
+
+    long surfaceHandle = 0;
+
+    public OffscreenWindow() {
+    }
+
+    static long nextWindowHandle = 0x100; // start here - a marker
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        if(0!=parentWindowHandle) {
+            throw new NativeWindowException("OffscreenWindow does not support window parenting");
+        }
+        if(caps.isOnscreen()) {
+            throw new NativeWindowException("Capabilities is onscreen");
+        }
+        AbstractGraphicsScreen aScreen = screen.getGraphicsScreen();
+        config = GraphicsConfigurationFactory.getFactory(aScreen.getDevice()).chooseGraphicsConfiguration(caps, null, aScreen);
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+
+        synchronized(OffscreenWindow.class) {
+            windowHandle = nextWindowHandle++;
+        }
+    }
+
+    protected void closeNative() {
+        // nop
+    }
+
+    public void invalidate() {
+        super.invalidate();
+        surfaceHandle = 0;
+    }
+
+    public synchronized void destroy() {
+        surfaceHandle = 0;
+    }
+
+    public void setSurfaceHandle(long handle) {
+        surfaceHandle = handle ;
+    }
+
+    public long getSurfaceHandle() {
+        return surfaceHandle;
+    }
+
+    public void setVisible(boolean visible) {
+        if(!visible) {
+            this.visible = visible;
+        }
+    }
+
+    public void setSize(int width, int height) {
+        if(!visible) {
+            this.width = width;
+            this.height = height;
+        }
+    }
+
+    public void setPosition(int x, int y) {
+        // nop
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        // nop
+        return false;
+    }
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/PaintEvent.java b/src/newt/classes/com/jogamp/newt/PaintEvent.java
new file mode 100755
index 000000000..51c43725a
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/PaintEvent.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ */
+
+package com.jogamp.newt;
+
+/**
+ *
+ * @author tdv
+ */
+public class PaintEvent extends Event {
+
+    // bounds of the damage region
+    private int x, y, width, height;
+    public PaintEvent(int eventType, Window source,
+                       long when, int x, int y, int w, int h)
+    {
+        super(true, eventType, source, when);
+        this.x = x;
+        this.y = y;
+        this.width = w;
+        this.height = h;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public String toString() {
+        return "ExposeEvent[modifiers: x="+x+" y="+y+" w="+width+" h="+height +"]";
+    }
+
+}
diff --git a/src/newt/classes/com/jogamp/newt/PaintListener.java b/src/newt/classes/com/jogamp/newt/PaintListener.java
new file mode 100755
index 000000000..6fbc9c8fc
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/PaintListener.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ */
+
+package com.jogamp.newt;
+
+/**
+ *
+ * @author tdv
+ */
+public interface PaintListener {
+    public void exposed(PaintEvent e);
+}
diff --git a/src/newt/classes/com/jogamp/newt/Screen.java b/src/newt/classes/com/jogamp/newt/Screen.java
new file mode 100755
index 000000000..b393d30de
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/Screen.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+import com.jogamp.newt.impl.*;
+
+import javax.media.nativewindow.*;
+import java.security.*;
+
+public abstract class Screen {
+
+    private static Class getScreenClass(String type) 
+        throws ClassNotFoundException 
+    {
+        Class screenClass = NewtFactory.getCustomClass(type, "Screen");
+        if(null==screenClass) {
+            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
+                screenClass = Class.forName("com.jogamp.newt.opengl.kd.KDScreen");
+            } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
+                screenClass = Class.forName("com.jogamp.newt.windows.WindowsScreen");
+            } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
+                screenClass = Class.forName("com.jogamp.newt.macosx.MacScreen");
+            } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
+                screenClass = Class.forName("com.jogamp.newt.x11.X11Screen");
+            } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
+                screenClass = Class.forName("com.jogamp.newt.awt.AWTScreen");
+            } else {
+                throw new RuntimeException("Unknown window type \"" + type + "\"");
+            }
+        }
+        return screenClass;
+    }
+
+    protected static Screen create(String type, Display display, int idx) {
+        try {
+            if(usrWidth<0 || usrHeight<0) {
+                usrWidth  = Debug.getIntProperty("newt.ws.swidth", true, localACC);
+                usrHeight = Debug.getIntProperty("newt.ws.sheight", true, localACC);
+                System.out.println("User screen size "+usrWidth+"x"+usrHeight);
+            }
+            Class screenClass = getScreenClass(type);
+            Screen screen  = (Screen) screenClass.newInstance();
+            screen.display = display;
+            screen.createNative(idx);
+            if(null==screen.aScreen) {
+                throw new RuntimeException("Screen.createNative() failed to instanciate an AbstractGraphicsScreen");
+            }
+            return screen;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public synchronized void destroy() {
+        closeNative();
+        display = null;
+        aScreen = null;
+    }
+
+    protected static Screen wrapHandle(String type, Display display, AbstractGraphicsScreen aScreen) {
+        try {
+            Class screenClass = getScreenClass(type);
+            Screen screen  = (Screen) screenClass.newInstance();
+            screen.display = display;
+            screen.aScreen = aScreen;
+            return screen;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected abstract void createNative(int index);
+    protected abstract void closeNative();
+
+    protected void setScreenSize(int w, int h) {
+        System.out.println("Detected screen size "+w+"x"+h);
+        width=w; height=h;
+    }
+
+    public Display getDisplay() {
+        return display;
+    }
+
+    public int getIndex() {
+        return aScreen.getIndex();
+    }
+
+    public AbstractGraphicsScreen getGraphicsScreen() {
+        return aScreen;
+    }
+
+    /**
+     * The actual implementation shall return the detected display value,
+     * if not we return 800.
+     * This can be overwritten with the user property 'newt.ws.swidth',
+     */
+    public int getWidth() {
+        return (usrWidth>0) ? usrWidth : (width>0) ? width : 480;
+    }
+
+    /**
+     * The actual implementation shall return the detected display value,
+     * if not we return 480.
+     * This can be overwritten with the user property 'newt.ws.sheight',
+     */
+    public int getHeight() {
+        return (usrHeight>0) ? usrHeight : (height>0) ? height : 480;
+    }
+
+    protected Display display;
+    protected AbstractGraphicsScreen aScreen;
+    protected int width=-1, height=-1; // detected values: set using setScreenSize
+    protected static int usrWidth=-1, usrHeight=-1; // property values: newt.ws.swidth and newt.ws.sheight
+    private static AccessControlContext localACC = AccessController.getContext();
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java
new file mode 100755
index 000000000..410144653
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/Window.java
@@ -0,0 +1,929 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+import com.jogamp.newt.impl.Debug;
+import com.jogamp.newt.util.EventDispatchThread;
+
+import javax.media.nativewindow.*;
+import com.jogamp.nativewindow.impl.NWReflection;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.lang.reflect.Method;
+
+public abstract class Window implements NativeWindow
+{
+    public static final boolean DEBUG_MOUSE_EVENT = Debug.debug("Window.MouseEvent");
+    public static final boolean DEBUG_KEY_EVENT = Debug.debug("Window.KeyEvent");
+    public static final boolean DEBUG_WINDOW_EVENT = Debug.debug("Window.WindowEvent");
+    public static final boolean DEBUG_IMPLEMENTATION = Debug.debug("Window");
+    
+    // Workaround for initialization order problems on Mac OS X
+    // between native Newt and (apparently) Fmod -- if Fmod is
+    // initialized first then the connection to the window server
+    // breaks, leading to errors from deep within the AppKit
+    static void init(String type) {
+        if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
+            try {
+                getWindowClass(type);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private static Class getWindowClass(String type) 
+        throws ClassNotFoundException 
+    {
+        Class windowClass = NewtFactory.getCustomClass(type, "Window");
+        if(null==windowClass) {
+            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
+                windowClass = Class.forName("com.jogamp.newt.opengl.kd.KDWindow");
+            } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
+                windowClass = Class.forName("com.jogamp.newt.windows.WindowsWindow");
+            } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
+                windowClass = Class.forName("com.jogamp.newt.macosx.MacWindow");
+            } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
+                windowClass = Class.forName("com.jogamp.newt.x11.X11Window");
+            } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
+                windowClass = Class.forName("com.jogamp.newt.awt.AWTWindow");
+            } else {
+                throw new NativeWindowException("Unknown window type \"" + type + "\"");
+            }
+        }
+        return windowClass;
+    }
+
+    protected static Window create(String type, final long parentWindowHandle, Screen screen, final Capabilities caps, boolean undecorated) {
+        try {
+            Class windowClass;
+            if(caps.isOnscreen()) {
+                windowClass = getWindowClass(type);
+            } else {
+                windowClass = OffscreenWindow.class;
+            }
+            Window window = (Window) windowClass.newInstance();
+            window.invalidate();
+            window.screen   = screen;
+            window.setUndecorated(undecorated||0!=parentWindowHandle);
+            EventDispatchThread edt = screen.getDisplay().getEDT();
+            if(null!=edt) {
+                final Window f_win = window;
+                edt.invokeAndWait(new Runnable() {
+                    public void run() {
+                        f_win.createNative(parentWindowHandle, caps);
+                    }
+                } );
+            } else {
+                window.createNative(parentWindowHandle, caps);
+            }
+            return window;
+        } catch (Throwable t) {
+            t.printStackTrace();
+            throw new NativeWindowException(t);
+        }
+    }
+
+    protected static Window create(String type, Object[] cstrArguments, Screen screen, final Capabilities caps, boolean undecorated) {
+        try {
+            Class windowClass = getWindowClass(type);
+            Class[] cstrArgumentTypes = getCustomConstructorArgumentTypes(windowClass);
+            if(null==cstrArgumentTypes) {
+                throw new NativeWindowException("WindowClass "+windowClass+" doesn't support custom arguments in constructor");
+            }
+            int argsChecked = verifyConstructorArgumentTypes(cstrArgumentTypes, cstrArguments);
+            if ( argsChecked < cstrArguments.length ) {
+                throw new NativeWindowException("WindowClass "+windowClass+" constructor mismatch at argument #"+argsChecked+"; Constructor: "+getTypeStrList(cstrArgumentTypes)+", arguments: "+getArgsStrList(cstrArguments));
+            }
+            Window window = (Window) NWReflection.createInstance( windowClass, cstrArgumentTypes, cstrArguments ) ;
+            window.invalidate();
+            window.screen   = screen;
+            window.setUndecorated(undecorated);
+            EventDispatchThread edt = screen.getDisplay().getEDT();
+            if(null!=edt) {
+                final Window f_win = window;
+                edt.invokeAndWait(new Runnable() {
+                    public void run() {
+                        f_win.createNative(0, caps);
+                    }
+                } );
+            } else {
+                window.createNative(0, caps);
+            }
+            return window;
+        } catch (Throwable t) {
+            t.printStackTrace();
+            throw new NativeWindowException(t);
+        }
+    }
+
+    protected static Window wrapHandle(String type, Screen screen, AbstractGraphicsConfiguration config, 
+                                 long windowHandle, boolean fullscreen, boolean visible, 
+                                 int x, int y, int width, int height) 
+    {
+        try {
+            Class windowClass = getWindowClass(type);
+            Window window = (Window) windowClass.newInstance();
+            window.invalidate();
+            window.screen   = screen;
+            window.config = config;
+            window.windowHandle = windowHandle;
+            window.fullscreen=fullscreen;
+            window.visible=visible;
+            window.x=x;
+            window.y=y;
+            window.width=width;
+            window.height=height;
+            return window;
+        } catch (Throwable t) {
+            t.printStackTrace();
+            throw new NativeWindowException(t);
+        }
+    }
+
+    public static String toHexString(int hex) {
+        return "0x" + Integer.toHexString(hex);
+    }
+
+    public static String toHexString(long hex) {
+        return "0x" + Long.toHexString(hex);
+    }
+
+    protected Screen screen;
+
+    protected AbstractGraphicsConfiguration config;
+    protected long   windowHandle;
+    protected boolean fullscreen, visible;
+    protected int width, height, x, y;
+    protected int     eventMask;
+
+    protected String title = "Newt Window";
+    protected boolean undecorated = false;
+
+    /**
+     * Create native windowHandle, ie creates a new native invisible window.
+     *
+     * The parentWindowHandle may be null, in which case no window parenting 
+     * is requested.
+     *
+     * Shall use the capabilities to determine the graphics configuration
+     * and shall set the chosen capabilities.
+     */
+    protected abstract void createNative(long parentWindowHandle, Capabilities caps);
+
+    protected abstract void closeNative();
+
+    public Screen getScreen() {
+        return screen;
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+
+        sb.append(getClass().getName()+"[config "+config+
+                    ", windowHandle "+toHexString(getWindowHandle())+
+                    ", surfaceHandle "+toHexString(getSurfaceHandle())+
+                    ", pos "+getX()+"/"+getY()+", size "+getWidth()+"x"+getHeight()+
+                    ", visible "+isVisible()+
+                    ", undecorated "+undecorated+
+                    ", fullscreen "+fullscreen+
+                    ", "+screen+
+                    ", wrappedWindow "+getWrappedWindow());
+
+        sb.append(", SurfaceUpdatedListeners num "+surfaceUpdatedListeners.size()+" [");
+        for (Iterator iter = surfaceUpdatedListeners.iterator(); iter.hasNext(); ) {
+          sb.append(iter.next()+", ");
+        }
+        sb.append("], WindowListeners num "+windowListeners.size()+" [");
+        for (Iterator iter = windowListeners.iterator(); iter.hasNext(); ) {
+          sb.append(iter.next()+", ");
+        }
+        sb.append("], MouseListeners num "+mouseListeners.size()+" [");
+        for (Iterator iter = mouseListeners.iterator(); iter.hasNext(); ) {
+          sb.append(iter.next()+", ");
+        }
+        sb.append("], KeyListeners num "+keyListeners.size()+" [");
+        for (Iterator iter = keyListeners.iterator(); iter.hasNext(); ) {
+          sb.append(iter.next()+", ");
+        }
+        sb.append("] ]");
+        return sb.toString();
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setUndecorated(boolean value) {
+        undecorated = value;
+    }
+
+    public boolean isUndecorated() {
+        return undecorated;
+    }
+
+    public void requestFocus() {
+    }
+
+    //
+    // NativeWindow impl
+    //
+    private Thread owner;
+    private int recursionCount;
+    protected Exception lockedStack = null;
+
+    /** Recursive and blocking lockSurface() implementation */
+    public synchronized int lockSurface() {
+        // We leave the ToolkitLock lock to the specializtion's discretion, 
+        // ie the implicit JAWTWindow in case of AWTWindow
+        Thread cur = Thread.currentThread();
+        if (owner == cur) {
+            ++recursionCount;
+            return LOCK_SUCCESS;
+        }
+        while (owner != null) {
+            try {
+                wait();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        owner = cur;
+        lockedStack = new Exception("NEWT Surface previously locked by "+Thread.currentThread());
+        screen.getDisplay().lockDisplay();
+        return LOCK_SUCCESS;
+    }
+
+    /** Recursive and unblocking unlockSurface() implementation */
+    public synchronized void unlockSurface() throws NativeWindowException {
+        Thread cur = Thread.currentThread();
+        if (owner != cur) {
+            lockedStack.printStackTrace();
+            throw new NativeWindowException(cur+": Not owner, owner is "+owner);
+        }
+        if (recursionCount > 0) {
+            --recursionCount;
+            return;
+        }
+        owner = null;
+        lockedStack = null;
+        screen.getDisplay().unlockDisplay();
+        notifyAll();
+        // We leave the ToolkitLock unlock to the specializtion's discretion, 
+        // ie the implicit JAWTWindow in case of AWTWindow
+    }
+
+    public synchronized boolean isSurfaceLocked() {
+        return null!=owner;
+    }
+
+    public synchronized Thread getSurfaceLockOwner() {
+        return owner;
+    }
+
+    public synchronized Exception getLockedStack() {
+        return lockedStack;
+    }
+
+    public synchronized void destroy() {
+        destroy(false);
+    }
+
+    /** @param deep If true, the linked Screen and Display will be destroyed as well. */
+    public synchronized void destroy(boolean deep) {
+        if(DEBUG_WINDOW_EVENT) {
+            System.out.println("Window.destroy() start (deep "+deep+" - "+Thread.currentThread());
+        }
+        synchronized(surfaceUpdatedListeners) {
+            surfaceUpdatedListeners = new ArrayList();
+        }
+        synchronized(windowListeners) {
+            windowListeners = new ArrayList();
+        }
+        synchronized(mouseListeners) {
+            mouseListeners = new ArrayList();
+        }
+        synchronized(keyListeners) {
+            keyListeners = new ArrayList();
+        }
+        Screen scr = screen;
+        Display dpy = (null!=screen) ? screen.getDisplay() : null;
+        EventDispatchThread edt = (null!=dpy) ? dpy.getEDT() : null;
+        if(null!=edt) {
+            final Window f_win = this;
+            edt.invokeAndWait(new Runnable() {
+                public void run() {
+                    f_win.closeNative();
+                }
+            } );
+        } else {
+            closeNative();
+        }
+        invalidate();
+        if(deep) {
+            if(null!=scr) {
+                scr.destroy();
+            }
+            if(null!=dpy) {
+                dpy.destroy();
+            }
+        }
+        if(DEBUG_WINDOW_EVENT) {
+            System.out.println("Window.destroy() end "+Thread.currentThread());
+        }
+    }
+
+    public void invalidate() {
+        if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+            Exception e = new Exception("!!! Window Invalidate "+Thread.currentThread());
+            e.printStackTrace();
+        }
+        screen   = null;
+        windowHandle = 0;
+        fullscreen=false;
+        visible=false;
+        eventMask = 0;
+
+        // Default position and dimension will be re-set immediately by user
+        width  = 100;
+        height = 100;
+        x=0;
+        y=0;
+    }
+
+    public boolean surfaceSwap() { 
+        return false;
+    }
+
+    protected void clearEventMask() {
+        eventMask=0;
+    }
+
+    public long getDisplayHandle() {
+        return screen.getDisplay().getHandle();
+    }
+
+    public int  getScreenIndex() {
+        return screen.getIndex();
+    }
+
+    public long getWindowHandle() {
+        return windowHandle;
+    }
+
+    public long getSurfaceHandle() {
+        return windowHandle; // default: return window handle
+    }
+
+    public AbstractGraphicsConfiguration getGraphicsConfiguration() {
+        return config;
+    }
+
+    /**
+     * Returns the width of the client area of this window
+     * @return width of the client area
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * Returns the height of the client area of this window
+     * @return height of the client area
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * Returns the insets for this native window (the difference between the
+     * size of the toplevel window with the decorations and the client area).
+     * 
+     * @return insets for this platform window
+     */
+    // this probably belongs to NativeWindow interface
+    public Insets getInsets() {
+        return new Insets(0,0,0,0);
+    }
+
+    /** If this Window actually wraps one from another toolkit such as
+        the AWT, this will return a non-null value. */
+    public Object getWrappedWindow() {
+        return null;
+    }
+
+    //
+    // Additional methods
+    //
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public boolean isVisible() {
+        return visible;
+    }
+
+    public boolean isFullscreen() {
+        return fullscreen;
+    }
+
+    private boolean autoDrawableMember = false;
+
+    /** If the implementation is capable of detecting a device change
+        return true and clear the status/reason of the change. */
+    public boolean hasDeviceChanged() {
+        return false;
+    }
+
+    /**
+     * If set to true, 
+     * certain action will be performed by the owning
+     * AutoDrawable, ie the destroy() call within windowDestroyNotify()
+     */
+    public void setAutoDrawableClient(boolean b) {
+        autoDrawableMember = b;
+    }
+
+    protected void windowDestroyNotify() {
+        if(DEBUG_WINDOW_EVENT) {
+            System.out.println("Window.windowDestroyeNotify start "+Thread.currentThread());
+        }
+
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY);
+
+        if(!autoDrawableMember) {
+            destroy();
+        }
+
+        if(DEBUG_WINDOW_EVENT) {
+            System.out.println("Window.windowDestroyeNotify end "+Thread.currentThread());
+        }
+    }
+
+    protected void windowDestroyed() {
+        if(DEBUG_WINDOW_EVENT) {
+            System.out.println("Window.windowDestroyed "+Thread.currentThread());
+        }
+        invalidate();
+    }
+
+    public abstract void    setVisible(boolean visible);
+    /**
+     * Sets the size of the client area of the window, excluding decorations
+     * Total size of the window will be
+     * {@code width+insets.left+insets.right, height+insets.top+insets.bottom}
+     * @param width of the client area of the window
+     * @param height of the client area of the window
+     */
+    public abstract void    setSize(int width, int height);
+    /**
+     * Sets the location of the top left corner of the window, including
+     * decorations (so the client area will be placed at
+     * {@code x+insets.left,y+insets.top}.
+     * @param x coord of the top left corner
+     * @param y coord of the top left corner
+     */
+    public abstract void    setPosition(int x, int y);
+    public abstract boolean setFullscreen(boolean fullscreen);
+
+    //
+    // SurfaceUpdatedListener Support
+    //
+    private ArrayList surfaceUpdatedListeners = new ArrayList();
+
+    public void addSurfaceUpdatedListener(SurfaceUpdatedListener l) {
+        if(l == null) {
+            return;
+        }
+        synchronized(surfaceUpdatedListeners) {
+            ArrayList newSurfaceUpdatedListeners = (ArrayList) surfaceUpdatedListeners.clone();
+            newSurfaceUpdatedListeners.add(l);
+            surfaceUpdatedListeners = newSurfaceUpdatedListeners;
+        }
+    }
+
+    public void removeSurfaceUpdatedListener(SurfaceUpdatedListener l) {
+        if (l == null) {
+            return;
+        }
+        synchronized(surfaceUpdatedListeners) {
+            ArrayList newSurfaceUpdatedListeners = (ArrayList) surfaceUpdatedListeners.clone();
+            newSurfaceUpdatedListeners.remove(l);
+            surfaceUpdatedListeners = newSurfaceUpdatedListeners;
+        }
+    }
+
+    public SurfaceUpdatedListener[] getSurfaceUpdatedListener() {
+        synchronized(surfaceUpdatedListeners) {
+            return (SurfaceUpdatedListener[]) surfaceUpdatedListeners.toArray();
+        }
+    }
+
+    public void surfaceUpdated(Object updater, NativeWindow window, long when) { 
+        ArrayList listeners = null;
+        synchronized(surfaceUpdatedListeners) {
+            listeners = surfaceUpdatedListeners;
+        }
+        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
+            SurfaceUpdatedListener l = (SurfaceUpdatedListener) i.next();
+            l.surfaceUpdated(updater, window, when);
+        }
+    }
+
+    //
+    // MouseListener Support
+    //
+
+    public void addMouseListener(MouseListener l) {
+        if(l == null) {
+            return;
+        }
+        synchronized(mouseListeners) {
+            ArrayList newMouseListeners = (ArrayList) mouseListeners.clone();
+            newMouseListeners.add(l);
+            mouseListeners = newMouseListeners;
+        }
+    }
+
+    public void removeMouseListener(MouseListener l) {
+        if (l == null) {
+            return;
+        }
+        synchronized(mouseListeners) {
+            ArrayList newMouseListeners = (ArrayList) mouseListeners.clone();
+            newMouseListeners.remove(l);
+            mouseListeners = newMouseListeners;
+        }
+    }
+
+    public MouseListener[] getMouseListeners() {
+        synchronized(mouseListeners) {
+            return (MouseListener[]) mouseListeners.toArray();
+        }
+    }
+
+    private ArrayList mouseListeners = new ArrayList();
+    private int  mouseButtonPressed = 0; // current pressed mouse button number
+    private long lastMousePressed = 0; // last time when a mouse button was pressed
+    private int  lastMouseClickCount = 0; // last mouse button click count
+    public  static final int ClickTimeout = 300;
+
+    protected void sendMouseEvent(int eventType, int modifiers,
+                                  int x, int y, int button, int rotation) {
+        if(x<0||y<0||x>=width||y>=height) {
+            return; // .. invalid ..
+        }
+        if(DEBUG_MOUSE_EVENT) {
+            System.out.println("sendMouseEvent: "+MouseEvent.getEventTypeString(eventType)+
+                               ", mod "+modifiers+", pos "+x+"/"+y+", button "+button);
+        }
+        if(button<0||button>MouseEvent.BUTTON_NUMBER) {
+            throw new NativeWindowException("Invalid mouse button number" + button);
+        }
+        long when = System.currentTimeMillis();
+        MouseEvent eClicked = null;
+        MouseEvent e = null;
+
+        if(MouseEvent.EVENT_MOUSE_PRESSED==eventType) {
+            if(when-lastMousePressed<ClickTimeout) {
+                lastMouseClickCount++;
+            } else {
+                lastMouseClickCount=1;
+            }
+            lastMousePressed=when;
+            mouseButtonPressed=button;
+            e = new MouseEvent(true, eventType, this, when,
+                               modifiers, x, y, lastMouseClickCount, button, 0);
+        } else if(MouseEvent.EVENT_MOUSE_RELEASED==eventType) {
+            e = new MouseEvent(true, eventType, this, when,
+                               modifiers, x, y, lastMouseClickCount, button, 0);
+            if(when-lastMousePressed<ClickTimeout) {
+                eClicked = new MouseEvent(true, MouseEvent.EVENT_MOUSE_CLICKED, this, when,
+                                          modifiers, x, y, lastMouseClickCount, button, 0);
+            } else {
+                lastMouseClickCount=0;
+                lastMousePressed=0;
+            }
+            mouseButtonPressed=0;
+        } else if(MouseEvent.EVENT_MOUSE_MOVED==eventType) {
+            if (mouseButtonPressed>0) {
+                e = new MouseEvent(true, MouseEvent.EVENT_MOUSE_DRAGGED, this, when,
+                                   modifiers, x, y, 1, mouseButtonPressed, 0);
+            } else {
+                e = new MouseEvent(true, eventType, this, when,
+                                   modifiers, x, y, 0, button, 0);
+            }
+        } else if(MouseEvent.EVENT_MOUSE_WHEEL_MOVED==eventType) {
+            e = new MouseEvent(true, eventType, this, when, modifiers, x, y, 0, button, rotation);
+        } else {
+            e = new MouseEvent(true, eventType, this, when, modifiers, x, y, 0, button, 0);
+        }
+
+        if(DEBUG_MOUSE_EVENT) {
+            System.out.println("sendMouseEvent: event:         "+e);
+            if(null!=eClicked) {
+                System.out.println("sendMouseEvent: event Clicked: "+eClicked);
+            }
+        }
+
+        ArrayList listeners = null;
+        synchronized(mouseListeners) {
+            listeners = mouseListeners;
+        }
+        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
+            MouseListener l = (MouseListener) i.next();
+            switch(e.getEventType()) {
+                case MouseEvent.EVENT_MOUSE_CLICKED:
+                    l.mouseClicked(e);
+                    break;
+                case MouseEvent.EVENT_MOUSE_ENTERED:
+                    l.mouseEntered(e);
+                    break;
+                case MouseEvent.EVENT_MOUSE_EXITED:
+                    l.mouseExited(e);
+                    break;
+                case MouseEvent.EVENT_MOUSE_PRESSED:
+                    l.mousePressed(e);
+                    break;
+                case MouseEvent.EVENT_MOUSE_RELEASED:
+                    l.mouseReleased(e);
+                    if(null!=eClicked) {
+                        l.mouseClicked(eClicked);
+                    }
+                    break;
+                case MouseEvent.EVENT_MOUSE_MOVED:
+                    l.mouseMoved(e);
+                    break;
+                case MouseEvent.EVENT_MOUSE_DRAGGED:
+                    l.mouseDragged(e);
+                    break;
+                case MouseEvent.EVENT_MOUSE_WHEEL_MOVED:
+                    l.mouseWheelMoved(e);
+                    break;
+                default:
+                    throw new NativeWindowException("Unexpected mouse event type " + e.getEventType());
+            }
+        }
+    }
+
+    //
+    // KeyListener Support
+    //
+
+    public void addKeyListener(KeyListener l) {
+        if(l == null) {
+            return;
+        }
+        synchronized(keyListeners) {
+            ArrayList newKeyListeners = (ArrayList) keyListeners.clone();
+            newKeyListeners.add(l);
+            keyListeners = newKeyListeners;
+        }
+    }
+
+    public void removeKeyListener(KeyListener l) {
+        if (l == null) {
+            return;
+        }
+        synchronized(keyListeners) {
+            ArrayList newKeyListeners = (ArrayList) keyListeners.clone();
+            newKeyListeners.remove(l);
+            keyListeners = newKeyListeners;
+        }
+    }
+
+    public KeyListener[] getKeyListeners() {
+        synchronized(keyListeners) {
+            return (KeyListener[]) keyListeners.toArray();
+        }
+    }
+
+    private ArrayList keyListeners = new ArrayList();
+
+    protected void sendKeyEvent(int eventType, int modifiers, int keyCode, char keyChar) {
+        KeyEvent e = new KeyEvent(true, eventType, this, System.currentTimeMillis(),
+                                      modifiers, keyCode, keyChar);
+        if(DEBUG_KEY_EVENT) {
+            System.out.println("sendKeyEvent: "+e);
+        }
+        ArrayList listeners = null;
+        synchronized(keyListeners) {
+            listeners = keyListeners;
+        }
+        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
+            KeyListener l = (KeyListener) i.next();
+            switch(eventType) {
+                case KeyEvent.EVENT_KEY_PRESSED:
+                    l.keyPressed(e);
+                    break;
+                case KeyEvent.EVENT_KEY_RELEASED:
+                    l.keyReleased(e);
+                    break;
+                case KeyEvent.EVENT_KEY_TYPED:
+                    l.keyTyped(e);
+                    break;
+                default:
+                    throw new NativeWindowException("Unexpected key event type " + e.getEventType());
+            }
+        }
+    }
+
+    //
+    // WindowListener Support
+    //
+
+    private ArrayList windowListeners = new ArrayList();
+
+    public void addWindowListener(WindowListener l) {
+        if(l == null) {
+            return;
+        }
+        synchronized(windowListeners) {
+            ArrayList newWindowListeners = (ArrayList) windowListeners.clone();
+            newWindowListeners.add(l);
+            windowListeners = newWindowListeners;
+        }
+    }
+
+    public void removeWindowListener(WindowListener l) {
+        if (l == null) {
+            return;
+        }
+        synchronized(windowListeners) {
+            ArrayList newWindowListeners = (ArrayList) windowListeners.clone();
+            newWindowListeners.remove(l);
+            windowListeners = newWindowListeners;
+        }
+    }
+
+    public WindowListener[] getWindowListeners() {
+        synchronized(windowListeners) {
+            return (WindowListener[]) windowListeners.toArray();
+        }
+    }
+
+    protected void sendWindowEvent(int eventType) {
+        WindowEvent e = new WindowEvent(true, eventType, this, System.currentTimeMillis());
+        if(DEBUG_WINDOW_EVENT) {
+            System.out.println("sendWindowEvent: "+e);
+        }
+        ArrayList listeners = null;
+        synchronized(windowListeners) {
+            listeners = windowListeners;
+        }
+        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
+            WindowListener l = (WindowListener) i.next();
+            switch(eventType) {
+                case WindowEvent.EVENT_WINDOW_RESIZED:
+                    l.windowResized(e);
+                    break;
+                case WindowEvent.EVENT_WINDOW_MOVED:
+                    l.windowMoved(e);
+                    break;
+                case WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY:
+                    l.windowDestroyNotify(e);
+                    break;
+                case WindowEvent.EVENT_WINDOW_GAINED_FOCUS:
+                    l.windowGainedFocus(e);
+                    break;
+                case WindowEvent.EVENT_WINDOW_LOST_FOCUS:
+                    l.windowLostFocus(e);
+                    break;
+                default:
+                    throw 
+                        new NativeWindowException("Unexpected window event type "
+                                                  + e.getEventType());
+            }
+        }
+    }
+
+
+    //
+    // WindowListener Support
+    //
+
+    private ArrayList paintListeners = new ArrayList();
+
+    public void addPaintListener(PaintListener l) {
+        if(l == null) {
+            return;
+        }
+        synchronized(paintListeners) {
+            ArrayList newPaintListeners = (ArrayList) paintListeners.clone();
+            newPaintListeners.add(l);
+            paintListeners = newPaintListeners;
+        }
+    }
+
+    public void removePaintListener(PaintListener l) {
+        if (l == null) {
+            return;
+        }
+        synchronized(paintListeners) {
+            ArrayList newPaintListeners = (ArrayList) paintListeners.clone();
+            newPaintListeners.remove(l);
+            paintListeners = newPaintListeners;
+        }
+    }
+
+    protected void sendPaintEvent(int eventType, int x, int y, int w, int h) {
+        PaintEvent e =
+            new PaintEvent(eventType, this, System.currentTimeMillis(), x, y, w, h);
+        ArrayList listeners = null;
+        synchronized(paintListeners) {
+            listeners = paintListeners;
+        }
+        for(Iterator i = listeners.iterator(); i.hasNext(); ) {
+            PaintListener l = (PaintListener) i.next();
+            l.exposed(e);
+        }
+    }
+
+    //
+    // Reflection helper ..
+    //
+
+    private static Class[] getCustomConstructorArgumentTypes(Class windowClass) {
+        Class[] argTypes = null;
+        try {
+            Method m = windowClass.getDeclaredMethod("getCustomConstructorArgumentTypes", new Class[] {});
+            argTypes = (Class[]) m.invoke(null, null);
+        } catch (Throwable t) {}
+        return argTypes;
+    }
+
+    private static int verifyConstructorArgumentTypes(Class[] types, Object[] args) {
+        if(types.length != args.length) {
+            return -1;
+        }
+        for(int i=0; i<args.length; i++) {
+            if(!types[i].isInstance(args[i])) {
+                return i;
+            }
+        }
+        return args.length;
+    }
+
+    private static String getArgsStrList(Object[] args) {
+        StringBuffer sb = new StringBuffer();
+        for(int i=0; i<args.length; i++) {
+            sb.append(args[i].getClass());
+            if(i<args.length) {
+                sb.append(", ");
+            }
+        }
+        return sb.toString();
+    }
+
+    private static String getTypeStrList(Class[] types) {
+        StringBuffer sb = new StringBuffer();
+        for(int i=0; i<types.length; i++) {
+            sb.append(types[i]);
+            if(i<types.length) {
+                sb.append(", ");
+            }
+        }
+        return sb.toString();
+    }
+}
diff --git a/src/newt/classes/com/jogamp/newt/WindowEvent.java b/src/newt/classes/com/jogamp/newt/WindowEvent.java
new file mode 100644
index 000000000..1189401af
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/WindowEvent.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+public class WindowEvent extends Event {
+    public static final int EVENT_WINDOW_RESIZED = 100;
+    public static final int EVENT_WINDOW_MOVED   = 101; 
+    public static final int EVENT_WINDOW_DESTROY_NOTIFY = 102;
+    public static final int EVENT_WINDOW_GAINED_FOCUS = 103;
+    public static final int EVENT_WINDOW_LOST_FOCUS = 104;
+    // public static final int EVENT_WINDOW_REPAINT = 105; // TODO
+
+    public WindowEvent(int eventType, Window source, long when) {
+        this(false, eventType, source, when);
+    }
+
+    WindowEvent(boolean isSystemEvent, int eventType, Window source, long when) {
+        super(isSystemEvent, eventType, source, when);
+    }
+
+    public static String getEventTypeString(int type) {
+        switch(type) {
+            case EVENT_WINDOW_RESIZED: return "WINDOW_RESIZED";
+            case EVENT_WINDOW_MOVED:   return "WINDOW_MOVED";
+            case EVENT_WINDOW_DESTROY_NOTIFY:   return "EVENT_WINDOW_DESTROY_NOTIFY";
+            case EVENT_WINDOW_GAINED_FOCUS:   return "EVENT_WINDOW_GAINED_FOCUS";
+            case EVENT_WINDOW_LOST_FOCUS:   return "EVENT_WINDOW_LOST_FOCUS";
+            // case EVENT_WINDOW_REPAINT:   return "EVENT_WINDOW_REPAINT";
+            default: return "unknown (" + type + ")";
+        }
+    }
+    public String toString() {
+        return "WindowEvent["+getEventTypeString(getEventType()) +
+            ", " + super.toString() + "]";
+    }
+}
diff --git a/src/newt/classes/com/jogamp/newt/WindowListener.java b/src/newt/classes/com/jogamp/newt/WindowListener.java
new file mode 100644
index 000000000..0ec63435c
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/WindowListener.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt;
+
+public interface WindowListener extends EventListener {
+    public void windowResized(WindowEvent e);
+    public void windowMoved(WindowEvent e);
+    public void windowDestroyNotify(WindowEvent e);
+    public void windowGainedFocus(WindowEvent e);
+    public void windowLostFocus(WindowEvent e);
+}
diff --git a/src/newt/classes/com/jogamp/newt/awt/AWTCanvas.java b/src/newt/classes/com/jogamp/newt/awt/AWTCanvas.java
new file mode 100644
index 000000000..f6ea9acc3
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/awt/AWTCanvas.java
@@ -0,0 +1,264 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.awt;
+
+import com.jogamp.newt.Window;
+
+import java.awt.Canvas;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.GraphicsConfiguration;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.awt.*;
+import com.jogamp.newt.impl.Debug;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+public class AWTCanvas extends Canvas {
+  private GraphicsDevice device;
+  private GraphicsConfiguration chosen;
+  private AWTGraphicsConfiguration awtConfig;
+
+  private Capabilities capabilities;
+
+  private boolean displayConfigChanged=false;
+
+  public AWTCanvas(Capabilities capabilities) {
+    super();
+
+    if(null==capabilities) {
+        throw new NativeWindowException("Capabilities null");
+    }
+    this.capabilities=capabilities;
+  }
+
+  public AWTGraphicsConfiguration getAWTGraphicsConfiguration() {
+    return awtConfig;
+  }
+
+  public boolean hasDeviceChanged() {
+    boolean res = displayConfigChanged;
+    displayConfigChanged=false;
+    return res;
+  }
+
+  public void addNotify() {
+    super.addNotify();
+
+    disableBackgroundErase();
+
+    GraphicsConfiguration gc = super.getGraphicsConfiguration();
+    if(null!=gc) {
+        device = gc.getDevice();
+    }
+
+    /*
+     * Save the chosen capabilities for use in getGraphicsConfiguration().
+     */
+    awtConfig = chooseGraphicsConfiguration(capabilities, device);
+    if(Window.DEBUG_IMPLEMENTATION) {
+        Exception e = new Exception("Created Config: "+awtConfig);
+        e.printStackTrace();
+    }
+    if(null!=awtConfig) {
+      // update ..
+      chosen = awtConfig.getGraphicsConfiguration();
+    }
+    if(null==awtConfig) {
+          throw new NativeWindowException("Error: AWTGraphicsConfiguration is null");
+    }
+  }
+
+  /**
+   * Overridden to choose a GraphicsConfiguration on a parent container's
+   * GraphicsDevice because both devices
+   */
+  public GraphicsConfiguration getGraphicsConfiguration() {
+    /*
+     * Workaround for problems with Xinerama and java.awt.Component.checkGD
+     * when adding to a container on a different graphics device than the
+     * one that this Canvas is associated with.
+     * 
+     * GC will be null unless:
+     *   - A native peer has assigned it. This means we have a native
+     *     peer, and are already comitted to a graphics configuration.
+     *   - This canvas has been added to a component hierarchy and has
+     *     an ancestor with a non-null GC, but the native peer has not
+     *     yet been created. This means we can still choose the GC on
+     *     all platforms since the peer hasn't been created.
+     */
+    final GraphicsConfiguration gc = super.getGraphicsConfiguration();
+    /*
+     * chosen is only non-null on platforms where the GLDrawableFactory
+     * returns a non-null GraphicsConfiguration (in the GLCanvas
+     * constructor).
+     * 
+     * if gc is from this Canvas' native peer then it should equal chosen,
+     * otherwise it is from an ancestor component that this Canvas is being
+     * added to, and we go into this block.
+     */
+    if (gc != null && chosen != null && !chosen.equals(gc)) {
+      /*
+       * Check for compatibility with gc. If they differ by only the
+       * device then return a new GCconfig with the super-class' GDevice
+       * (and presumably the same visual ID in Xinerama).
+       * 
+       */
+      if (!chosen.getDevice().getIDstring().equals(gc.getDevice().getIDstring())) {
+        /*
+         * Here we select a GraphicsConfiguration on the alternate
+         * device that is presumably identical to the chosen
+         * configuration, but on the other device.
+         * 
+         * Should really check to ensure that we select a configuration
+         * with the same X visual ID for Xinerama screens, otherwise the
+         * GLDrawable may have the wrong visual ID (I don't think this
+         * ever gets updated). May need to add a method to
+         * X11GLDrawableFactory to do this in a platform specific
+         * manner.
+         * 
+         * However, on platforms where we can actually get into this
+         * block, both devices should have the same visual list, and the
+         * same configuration should be selected here.
+         */
+        AWTGraphicsConfiguration config = chooseGraphicsConfiguration((Capabilities)awtConfig.getRequestedCapabilities(), gc.getDevice());
+        final GraphicsConfiguration compatible = (null!=config)?config.getGraphicsConfiguration():null;
+        if(Window.DEBUG_IMPLEMENTATION) {
+            Exception e = new Exception("Call Stack: "+Thread.currentThread().getName());
+            e.printStackTrace();
+            System.err.println("!!! Created Config (n): HAVE    GC "+chosen);
+            System.err.println("!!! Created Config (n): THIS    GC "+gc);
+            System.err.println("!!! Created Config (n): Choosen GC "+compatible);
+            System.err.println("!!! Created Config (n): HAVE    CF "+awtConfig);
+            System.err.println("!!! Created Config (n): Choosen CF "+config);
+            System.err.println("!!! Created Config (n): EQUALS CAPS "+config.getChosenCapabilities().equals(awtConfig.getChosenCapabilities()));
+        }
+
+        if (compatible != null) {
+          /*
+           * Save the new GC for equals test above, and to return to
+           * any outside callers of this method.
+           */
+          chosen = compatible;
+          if( !config.getChosenCapabilities().equals(awtConfig.getChosenCapabilities())) {
+              displayConfigChanged=true;
+          } 
+          awtConfig = config;
+        }
+      }
+
+      /*
+       * If a compatible GC was not found in the block above, this will
+       * return the GC that was selected in the constructor (and might
+       * cause an exception in Component.checkGD when adding to a
+       * container, but in this case that would be the desired behavior).
+       * 
+       */
+      return chosen;
+    } else if (gc == null) {
+      /*
+       * The GC is null, which means we have no native peer, and are not
+       * part of a (realized) component hierarchy. So we return the
+       * desired visual that was selected in the constructor (possibly
+       * null).
+       */
+      return chosen;
+    }
+
+    /*
+     * Otherwise we have not explicitly selected a GC in the constructor, so
+     * just return what Canvas would have.
+     */
+    return gc;
+  }
+
+  private static AWTGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
+                                                                      GraphicsDevice device) {
+    AbstractGraphicsScreen aScreen = AWTGraphicsScreen.createScreenDevice(device);
+    AWTGraphicsConfiguration config = (AWTGraphicsConfiguration)
+      GraphicsConfigurationFactory.getFactory(AWTGraphicsDevice.class).chooseGraphicsConfiguration(capabilities,
+                                                                                                   null,
+                                                                                                   aScreen);
+    if (config == null) {
+      throw new NativeWindowException("Error: Couldn't fetch AWTGraphicsConfiguration");
+    }
+
+    return config;
+  }
+
+  // Disables the AWT's erasing of this Canvas's background on Windows
+  // in Java SE 6. This internal API is not available in previous
+  // releases, but the system property
+  // -Dsun.awt.noerasebackground=true can be specified to get similar
+  // results globally in previous releases.
+  private static boolean disableBackgroundEraseInitialized;
+  private static Method  disableBackgroundEraseMethod;
+  private void disableBackgroundErase() {
+    if (!disableBackgroundEraseInitialized) {
+      try {
+        AccessController.doPrivileged(new PrivilegedAction() {
+            public Object run() {
+              try {
+                Class clazz = getToolkit().getClass();
+                while (clazz != null && disableBackgroundEraseMethod == null) {
+                  try {
+                    disableBackgroundEraseMethod =
+                      clazz.getDeclaredMethod("disableBackgroundErase",
+                                              new Class[] { Canvas.class });
+                    disableBackgroundEraseMethod.setAccessible(true);
+                  } catch (Exception e) {
+                    clazz = clazz.getSuperclass();
+                  }
+                }
+              } catch (Exception e) {
+              }
+              return null;
+            }
+          });
+      } catch (Exception e) {
+      }
+      disableBackgroundEraseInitialized = true;
+    }
+    if (disableBackgroundEraseMethod != null) {
+      try {
+        disableBackgroundEraseMethod.invoke(getToolkit(), new Object[] { this });
+      } catch (Exception e) {
+        // FIXME: workaround for 6504460 (incorrect backport of 6333613 in 5.0u10)
+        // throw new GLException(e);
+      }
+    }
+  }
+}
diff --git a/src/newt/classes/com/jogamp/newt/awt/AWTDisplay.java b/src/newt/classes/com/jogamp/newt/awt/AWTDisplay.java
new file mode 100644
index 000000000..09ce10017
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/awt/AWTDisplay.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.awt;
+
+import java.awt.event.*;
+import com.jogamp.newt.Display;
+import com.jogamp.newt.Window;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.awt.*;
+import java.util.*;
+
+public class AWTDisplay extends Display {
+    public AWTDisplay() {
+    }
+
+    protected void createNative() {
+        aDevice = (AWTGraphicsDevice) AWTGraphicsDevice.createDevice(null); // default 
+    }
+
+    protected void setAWTGraphicsDevice(AWTGraphicsDevice d) {
+        aDevice = d;
+    }
+
+    protected void closeNative() { }
+
+    public void dispatchMessages() {
+        AWTEventWrapper w;
+        do {
+            synchronized(this) {
+                if (!events.isEmpty()) {
+                    w = (AWTEventWrapper) events.removeFirst();
+                } else {
+                    w = null;
+                }
+            }
+            if (w != null) {
+                switch (w.getType()) {
+                    case com.jogamp.newt.WindowEvent.EVENT_WINDOW_RESIZED:
+                    case com.jogamp.newt.WindowEvent.EVENT_WINDOW_MOVED:
+                    case com.jogamp.newt.WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY:
+                        w.getWindow().sendWindowEvent(w.getType());
+                        break;
+
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_CLICKED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_ENTERED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_EXITED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_PRESSED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_RELEASED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_MOVED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_DRAGGED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_WHEEL_MOVED:
+                        {
+                            MouseEvent e = (MouseEvent) w.getEvent();
+                            int rotation = 0;
+                            if (e instanceof MouseWheelEvent) {
+                                rotation = ((MouseWheelEvent)e).getWheelRotation();
+                            }
+                            w.getWindow().sendMouseEvent(w.getType(), convertModifiers(e),
+                                                         e.getX(), e.getY(), convertButton(e),
+                                                         rotation);
+                        }
+                        break;
+
+                    case com.jogamp.newt.KeyEvent.EVENT_KEY_PRESSED:
+                    case com.jogamp.newt.KeyEvent.EVENT_KEY_RELEASED:
+                    case com.jogamp.newt.KeyEvent.EVENT_KEY_TYPED:
+                        {
+                            KeyEvent e = (KeyEvent) w.getEvent();
+                            w.getWindow().sendKeyEvent(w.getType(), convertModifiers(e),
+                                                       e.getKeyCode(), e.getKeyChar());
+                        }
+                        break;
+
+                    default:
+                        throw new NativeWindowException("Unknown event type " + w.getType());
+                }
+                if(Window.DEBUG_MOUSE_EVENT) {
+                    System.out.println("dispatchMessages: "+w.getWindow()+" in event:"+w.getEvent());
+                }
+            }
+        } while (w != null);
+    }
+
+    protected void enqueueEvent(AWTWindow w, int type, InputEvent e) {
+        AWTEventWrapper wrapper = new AWTEventWrapper(w, type, e);
+        synchronized(this) {
+            events.add(wrapper);
+        }
+    }
+
+    private LinkedList/*<AWTEventWrapper>*/ events = new LinkedList();
+
+    static class AWTEventWrapper {
+        AWTWindow window;
+        int type;
+        InputEvent e;
+
+        AWTEventWrapper(AWTWindow w, int type, InputEvent e) {
+            this.window = w;
+            this.type = type;
+            this.e = e;
+        }
+
+        public AWTWindow getWindow() {
+            return window;
+        }
+
+        public int getType() {
+            return type;
+        }
+
+        public InputEvent getEvent() {
+            return e;
+        }
+    }
+
+    private static int convertModifiers(InputEvent e) {
+        int newtMods = 0;
+        int mods = e.getModifiers();
+        if ((mods & InputEvent.SHIFT_MASK) != 0)     newtMods |= com.jogamp.newt.InputEvent.SHIFT_MASK;
+        if ((mods & InputEvent.CTRL_MASK) != 0)      newtMods |= com.jogamp.newt.InputEvent.CTRL_MASK;
+        if ((mods & InputEvent.META_MASK) != 0)      newtMods |= com.jogamp.newt.InputEvent.META_MASK;
+        if ((mods & InputEvent.ALT_MASK) != 0)       newtMods |= com.jogamp.newt.InputEvent.ALT_MASK;
+        if ((mods & InputEvent.ALT_GRAPH_MASK) != 0) newtMods |= com.jogamp.newt.InputEvent.ALT_GRAPH_MASK;
+        return newtMods;
+    }
+
+    private static int convertButton(MouseEvent e) {
+        switch (e.getButton()) {
+            case MouseEvent.BUTTON1: return com.jogamp.newt.MouseEvent.BUTTON1;
+            case MouseEvent.BUTTON2: return com.jogamp.newt.MouseEvent.BUTTON2;
+            case MouseEvent.BUTTON3: return com.jogamp.newt.MouseEvent.BUTTON3;
+        }
+        return 0;
+    }
+
+}
diff --git a/src/newt/classes/com/jogamp/newt/awt/AWTScreen.java b/src/newt/classes/com/jogamp/newt/awt/AWTScreen.java
new file mode 100644
index 000000000..c804bce06
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/awt/AWTScreen.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.awt;
+
+import com.jogamp.newt.*;
+import java.awt.DisplayMode;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.awt.*;
+
+public class AWTScreen extends Screen {
+    public AWTScreen() {
+    }
+
+    protected void createNative(int index) {
+        aScreen = new AWTGraphicsScreen((AWTGraphicsDevice)display.getGraphicsDevice());
+        
+        DisplayMode mode = ((AWTGraphicsDevice)getDisplay().getGraphicsDevice()).getGraphicsDevice().getDisplayMode();
+        int w = mode.getWidth();
+        int h = mode.getHeight();
+        setScreenSize(w, h);
+    }
+
+    protected void setAWTGraphicsScreen(AWTGraphicsScreen s) {
+        aScreen = s;
+    }
+
+    // done by AWTWindow ..
+    protected void setScreenSize(int w, int h) {
+        super.setScreenSize(w, h);
+    }
+
+    protected void closeNative() { }
+
+}
diff --git a/src/newt/classes/com/jogamp/newt/awt/AWTWindow.java b/src/newt/classes/com/jogamp/newt/awt/AWTWindow.java
new file mode 100644
index 000000000..98cd64ab8
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/awt/AWTWindow.java
@@ -0,0 +1,429 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.awt;
+
+import java.awt.BorderLayout;
+import java.awt.Canvas;
+import java.awt.Container;
+import java.awt.DisplayMode;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.awt.event.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.*;
+import com.jogamp.newt.Window;
+import java.awt.Insets;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.awt.*;
+
+/** An implementation of the Newt Window class built using the
+    AWT. This is provided for convenience of porting to platforms
+    supporting Java SE. */
+
+public class AWTWindow extends Window {
+
+    public AWTWindow() {
+        this(null);
+    }
+
+    public static Class[] getCustomConstructorArgumentTypes() {
+        return new Class[] { Container.class } ;
+    }
+
+    public AWTWindow(Container container) {
+        super();
+        title = "AWT NewtWindow";
+        this.container = container;
+        if(container instanceof Frame) {
+            frame = (Frame) container;
+        }
+    }
+
+    private boolean owningFrame;
+    private Container container = null;
+    private Frame frame = null; // same instance as container, just for impl. convenience
+    private AWTCanvas canvas;
+    // non fullscreen dimensions ..
+    private int nfs_width, nfs_height, nfs_x, nfs_y;
+
+    public void setTitle(final String title) {
+        super.setTitle(title);
+        runOnEDT(true, new Runnable() {
+                public void run() {
+                    if (frame != null) {
+                        frame.setTitle(title);
+                    }
+                }
+            });
+    }
+
+    protected void createNative(long parentWindowHandle, final Capabilities caps) {
+
+        if(0!=parentWindowHandle) {
+            throw new RuntimeException("Window parenting not supported in AWT, use AWTWindow(Frame) cstr for wrapping instead");
+        }
+
+        final AWTWindow awtWindow = this;
+
+        runOnEDT(true, new Runnable() {
+                public void run() {
+                    if(null==container) {
+                        frame = new Frame();
+                        container = frame;
+                        owningFrame=true;
+                    } else {
+                        owningFrame=false;
+                        width = container.getWidth();
+                        height = container.getHeight();
+                        x = container.getX();
+                        y = container.getY();
+                    }
+                    if(null!=frame) {
+                        frame.setTitle(getTitle());
+                    }
+                    container.setLayout(new BorderLayout());
+                    canvas = new AWTCanvas(caps);
+                    Listener listener = new Listener(awtWindow);
+                    canvas.addMouseListener(listener);
+                    canvas.addMouseMotionListener(listener);
+                    canvas.addKeyListener(listener);
+                    canvas.addComponentListener(listener);
+                    container.add(canvas, BorderLayout.CENTER);
+                    container.setSize(width, height);
+                    container.setLocation(x, y);
+                    container.addComponentListener(new MoveListener(awtWindow));
+                    if(null!=frame) {
+                        frame.setUndecorated(undecorated||fullscreen);
+                        frame.addWindowListener(new WindowEventListener(awtWindow));
+                    }
+                }
+            });
+    }
+
+    protected void closeNative() {
+        runOnEDT(true, new Runnable() {
+                public void run() {
+                    if(owningFrame && null!=frame) {
+                        frame.dispose();
+                        owningFrame=false;
+                    }
+                    frame = null;
+                }
+            });
+    }
+
+    public boolean hasDeviceChanged() {
+        boolean res = canvas.hasDeviceChanged();
+        if(res) {
+            config = canvas.getAWTGraphicsConfiguration();
+            if (config == null) {
+                throw new NativeWindowException("Error Device change null GraphicsConfiguration: "+this);
+            }
+            updateDeviceData();
+        }
+        return res;
+    }
+
+    public void setVisible(final boolean visible) {
+        runOnEDT(true, new Runnable() {
+                public void run() {
+                    container.setVisible(visible);
+                }
+            });
+
+        config = canvas.getAWTGraphicsConfiguration();
+
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+
+        updateDeviceData();
+    }
+
+    private void updateDeviceData() {
+        // propagate new info ..
+        ((AWTScreen)getScreen()).setAWTGraphicsScreen((AWTGraphicsScreen)config.getScreen());
+        ((AWTDisplay)getScreen().getDisplay()).setAWTGraphicsDevice((AWTGraphicsDevice)config.getScreen().getDevice());
+
+        DisplayMode mode = ((AWTGraphicsDevice)config.getScreen().getDevice()).getGraphicsDevice().getDisplayMode();
+        int w = mode.getWidth();
+        int h = mode.getHeight();
+        ((AWTScreen)screen).setScreenSize(w, h);
+    }
+
+    public void setSize(final int width, final int height) {
+        this.width = width;
+        this.height = height;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        }
+        /** An AWT event on setSize() would bring us in a deadlock situation, hence invokeLater() */
+        runOnEDT(false, new Runnable() {
+                public void run() {
+                    Insets insets = container.getInsets();
+                    container.setSize(width + insets.left + insets.right,
+                                      height + insets.top + insets.bottom);
+                }
+            });
+    }
+
+    public com.jogamp.newt.Insets getInsets() {
+        final int insets[] = new int[] { 0, 0, 0, 0 };
+        runOnEDT(true, new Runnable() {
+                public void run() {
+                    Insets contInsets = container.getInsets();
+                    insets[0] = contInsets.top;
+                    insets[1] = contInsets.left;
+                    insets[2] = contInsets.bottom;
+                    insets[3] = contInsets.right;
+                }
+            });
+        return new com.jogamp.newt.
+            Insets(insets[0],insets[1],insets[2],insets[3]);
+    }
+
+    public void setPosition(final int x, final int y) {
+        this.x = x;
+        this.y = y;
+        if(!fullscreen) {
+            nfs_x=x;
+            nfs_y=y;
+        }
+        runOnEDT(true, new Runnable() {
+                public void run() {
+                    container.setLocation(x, y);
+                }
+            });
+    }
+
+    public boolean setFullscreen(final boolean fullscreen) {
+        if(this.fullscreen!=fullscreen) {
+            final int x,y,w,h;
+            this.fullscreen=fullscreen;
+            if(fullscreen) {
+                x = 0; y = 0;
+                w = screen.getWidth();
+                h = screen.getHeight();
+            } else {
+                x = nfs_x;
+                y = nfs_y;
+                w = nfs_width;
+                h = nfs_height;
+            }
+            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                System.err.println("AWTWindow fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
+            }
+            /** An AWT event on setSize() would bring us in a deadlock situation, hence invokeLater() */
+            runOnEDT(false, new Runnable() {
+                    public void run() {
+                        if(null!=frame) {
+                            if(!container.isDisplayable()) {
+                                frame.setUndecorated(undecorated||fullscreen);
+                            } else {
+                                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                                    System.err.println("AWTWindow can't undecorate already created frame");
+                                }
+                            }
+                        }
+                        container.setLocation(x, y);
+                        container.setSize(w, h);
+                    }
+                });
+        }
+        return true;
+    }
+
+    public Object getWrappedWindow() {
+        return canvas;
+    }
+
+    protected void sendWindowEvent(int eventType) {
+        super.sendWindowEvent(eventType);
+    }
+
+    protected void sendKeyEvent(int eventType, int modifiers, int keyCode, char keyChar) {
+        super.sendKeyEvent(eventType, modifiers, keyCode, keyChar);
+    }
+
+    protected void sendMouseEvent(int eventType, int modifiers,
+                                  int x, int y, int button, int rotation) {
+        super.sendMouseEvent(eventType, modifiers, x, y, button, rotation);
+    }
+
+    private static void runOnEDT(boolean wait, Runnable r) {
+        if (EventQueue.isDispatchThread()) {
+            r.run();
+        } else {
+            try {
+                if(wait) {
+                    EventQueue.invokeAndWait(r);
+                } else {
+                    EventQueue.invokeLater(r);
+                }
+            } catch (Exception e) {
+                throw new NativeWindowException(e);
+            }
+        }
+    }
+
+    private static final int WINDOW_EVENT = 1;
+    private static final int KEY_EVENT = 2;
+    private static final int MOUSE_EVENT = 3;
+
+    class MoveListener implements ComponentListener {
+        private AWTWindow window;
+        private AWTDisplay display;
+
+        public MoveListener(AWTWindow w) {
+            window = w;
+            display = (AWTDisplay)window.getScreen().getDisplay();
+        }
+
+        public void componentResized(ComponentEvent e) {
+        }
+
+        public void componentMoved(ComponentEvent e) {
+            if(null!=container) {
+                x = container.getX();
+                y = container.getY();
+            }
+            display.enqueueEvent(window, com.jogamp.newt.WindowEvent.EVENT_WINDOW_MOVED, null);
+        }
+
+        public void componentShown(ComponentEvent e) {
+        }
+
+        public void componentHidden(ComponentEvent e) {
+        }
+
+    }
+
+    class Listener implements ComponentListener, MouseListener, MouseMotionListener, KeyListener {
+        private AWTWindow window;
+        private AWTDisplay display;
+
+        public Listener(AWTWindow w) {
+            window = w;
+            display = (AWTDisplay)window.getScreen().getDisplay();
+        }
+
+        public void componentResized(ComponentEvent e) {
+            width = canvas.getWidth();
+            height = canvas.getHeight();
+            display.enqueueEvent(window, com.jogamp.newt.WindowEvent.EVENT_WINDOW_RESIZED, null);
+        }
+
+        public void componentMoved(ComponentEvent e) {
+        }
+
+        public void componentShown(ComponentEvent e) {
+        }
+
+        public void componentHidden(ComponentEvent e) {
+        }
+
+        public void mouseClicked(MouseEvent e) {
+            // We ignore these as we synthesize them ourselves out of
+            // mouse pressed and released events
+        }
+
+        public void mouseEntered(MouseEvent e) {
+            display.enqueueEvent(window, com.jogamp.newt.MouseEvent.EVENT_MOUSE_ENTERED, e);
+        }
+
+        public void mouseExited(MouseEvent e) {
+            display.enqueueEvent(window, com.jogamp.newt.MouseEvent.EVENT_MOUSE_EXITED, e);
+        }
+
+        public void mousePressed(MouseEvent e) {
+            display.enqueueEvent(window, com.jogamp.newt.MouseEvent.EVENT_MOUSE_PRESSED, e);
+        }
+
+        public void mouseReleased(MouseEvent e) {
+            display.enqueueEvent(window, com.jogamp.newt.MouseEvent.EVENT_MOUSE_RELEASED, e);
+        }
+
+        public void mouseMoved(MouseEvent e) {
+            display.enqueueEvent(window, com.jogamp.newt.MouseEvent.EVENT_MOUSE_MOVED, e);
+        }
+
+        public void mouseDragged(MouseEvent e) {
+            display.enqueueEvent(window, com.jogamp.newt.MouseEvent.EVENT_MOUSE_DRAGGED, e);
+        }
+
+        public void keyPressed(KeyEvent e) {
+            display.enqueueEvent(window, com.jogamp.newt.KeyEvent.EVENT_KEY_PRESSED, e);
+        }
+
+        public void keyReleased(KeyEvent e) {
+            display.enqueueEvent(window, com.jogamp.newt.KeyEvent.EVENT_KEY_RELEASED, e);
+        }
+
+        public void keyTyped(KeyEvent e)  {
+            display.enqueueEvent(window, com.jogamp.newt.KeyEvent.EVENT_KEY_TYPED, e);
+        }
+    }
+
+    class WindowEventListener implements WindowListener {
+        private AWTWindow window;
+        private AWTDisplay display;
+
+        public WindowEventListener(AWTWindow w) {
+            window = w;
+            display = (AWTDisplay)window.getScreen().getDisplay();
+        }
+
+        public void windowActivated(WindowEvent e) {
+        }
+        public void windowClosed(WindowEvent e) {
+        }
+        public void windowClosing(WindowEvent e) {
+            display.enqueueEvent(window, com.jogamp.newt.WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY, null);
+        }
+        public void windowDeactivated(WindowEvent e) {
+        }
+        public void windowDeiconified(WindowEvent e) {
+        }
+        public void windowIconified(WindowEvent e) {
+        }
+        public void windowOpened(WindowEvent e) {
+        }
+    }
+}
diff --git a/src/newt/classes/com/jogamp/newt/impl/Debug.java b/src/newt/classes/com/jogamp/newt/impl/Debug.java
new file mode 100644
index 000000000..62c261d2e
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/impl/Debug.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.newt.impl;
+
+import java.security.*;
+
+/** Helper routines for logging and debugging. */
+
+public class Debug {
+  // Some common properties
+  private static boolean verbose;
+  private static boolean debugAll;
+  private static AccessControlContext localACC;
+  
+  static {
+    localACC=AccessController.getContext();
+    verbose = isPropertyDefined("newt.verbose", true);
+    debugAll = isPropertyDefined("newt.debug", true);
+    if (verbose) {
+       Package p = Package.getPackage("com.jogamp.newt");
+       System.err.println("NEWT specification version " + p.getSpecificationVersion());
+       System.err.println("NEWT implementation version " + p.getImplementationVersion());
+       System.err.println("NEWT implementation vendor " + p.getImplementationVendor());
+    }
+  }
+
+  static int getIntProperty(final String property, final boolean jnlpAlias) {
+      return getIntProperty(property, jnlpAlias, localACC);
+  }
+
+  public static int getIntProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    int i=0;
+    try {
+        Integer iv = Integer.valueOf(Debug.getProperty(property, jnlpAlias, acc));
+        i = iv.intValue();
+    } catch (NumberFormatException nfe) {}
+    return i;
+  }
+
+  static boolean getBooleanProperty(final String property, final boolean jnlpAlias) {
+    return getBooleanProperty(property, jnlpAlias, localACC);
+  }
+
+  public static boolean getBooleanProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    Boolean b = Boolean.valueOf(Debug.getProperty(property, jnlpAlias, acc));
+    return b.booleanValue();
+  }
+
+  static boolean isPropertyDefined(final String property, final boolean jnlpAlias) {
+    return isPropertyDefined(property, jnlpAlias, localACC);
+  }
+
+  public static boolean isPropertyDefined(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    return (Debug.getProperty(property, jnlpAlias, acc) != null) ? true : false;
+  }
+
+  static String getProperty(final String property, final boolean jnlpAlias) {
+    return getProperty(property, jnlpAlias, localACC);
+  }
+
+  public static String getProperty(final String property, final boolean jnlpAlias, final AccessControlContext acc) {
+    String s=null;
+    if(null!=acc && acc.equals(localACC)) {
+        s = (String) AccessController.doPrivileged(new PrivilegedAction() {
+            public Object run() {
+              String val=null;
+              try {
+                  val = System.getProperty(property);
+              } catch (Exception e) {}
+              if(null==val && jnlpAlias && !property.startsWith(jnlp_prefix)) {
+                  try {
+                      val = System.getProperty(jnlp_prefix + property);
+                  } catch (Exception e) {}
+              }
+              return val;
+            }
+          });
+    } else {
+        try {
+            s = System.getProperty(property);
+        } catch (Exception e) {}
+        if(null==s && jnlpAlias && !property.startsWith(jnlp_prefix)) {
+            try {
+                s = System.getProperty(jnlp_prefix + property);
+            } catch (Exception e) {}
+        }
+    }
+    return s;
+  }
+  public static final String jnlp_prefix = "jnlp." ;
+
+  public static boolean verbose() {
+    return verbose;
+  }
+
+  public static boolean debugAll() {
+    return debugAll;
+  }
+
+  public static boolean debug(String subcomponent) {
+    return debugAll() || isPropertyDefined("newt.debug." + subcomponent, true);
+  }
+}
diff --git a/src/newt/classes/com/jogamp/newt/impl/NativeLibLoader.java b/src/newt/classes/com/jogamp/newt/impl/NativeLibLoader.java
new file mode 100644
index 000000000..52e4c0dc3
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/impl/NativeLibLoader.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.newt.impl;
+
+// FIXME: refactor Java SE dependencies
+//import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.HashSet;
+import com.jogamp.nativewindow.impl.NativeLibLoaderBase;
+
+public class NativeLibLoader extends NativeLibLoaderBase {
+  
+  public static void loadNEWT() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("newt", null, true);
+        return null;
+      }
+    });
+  }
+
+}
diff --git a/src/newt/classes/com/jogamp/newt/intel/gdl/Display.java b/src/newt/classes/com/jogamp/newt/intel/gdl/Display.java
new file mode 100644
index 000000000..eb93943ee
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/intel/gdl/Display.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.intel.gdl;
+
+import com.jogamp.newt.impl.*;
+import javax.media.nativewindow.*;
+
+public class Display extends com.jogamp.newt.Display {
+    static int initCounter = 0;
+
+    static {
+        NativeLibLoader.loadNEWT();
+
+        if (!Screen.initIDs()) {
+            throw new NativeWindowException("Failed to initialize GDL Screen jmethodIDs");
+        }
+        if (!Window.initIDs()) {
+            throw new NativeWindowException("Failed to initialize GDL Window jmethodIDs");
+        }
+    }
+
+    public static void initSingleton() {
+        // just exist to ensure static init has been run
+    }
+
+
+    public Display() {
+    }
+
+    protected void createNative() {
+        synchronized(Display.class) {
+            if(0==initCounter) {
+                displayHandle = CreateDisplay();
+                if(0==displayHandle) {
+                    throw new NativeWindowException("Couldn't initialize GDL Display");
+                }
+            }
+            initCounter++;
+        }
+        aDevice = new DefaultGraphicsDevice(NativeWindowFactory.TYPE_DEFAULT, displayHandle);
+    }
+
+    protected void closeNative() {
+        if(0==displayHandle) {
+            throw new NativeWindowException("displayHandle null; initCnt "+initCounter);
+        }
+        synchronized(Display.class) {
+            if(initCounter>0) {
+                initCounter--;
+                if(0==initCounter) {
+                    DestroyDisplay(displayHandle);
+                }
+            }
+        }
+    }
+
+    protected void dispatchMessages() {
+        if(0!=displayHandle) {
+            DispatchMessages(displayHandle, focusedWindow);
+        }
+    }
+
+    protected void setFocus(Window focus) {
+        focusedWindow = focus;
+    }
+
+    private long displayHandle = 0;
+    private Window focusedWindow = null;
+    private native long CreateDisplay();
+    private native void DestroyDisplay(long displayHandle);
+    private native void DispatchMessages(long displayHandle, Window focusedWindow);
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/intel/gdl/Screen.java b/src/newt/classes/com/jogamp/newt/intel/gdl/Screen.java
new file mode 100644
index 000000000..873d1d009
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/intel/gdl/Screen.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.intel.gdl;
+
+import com.jogamp.newt.impl.*;
+import javax.media.nativewindow.*;
+
+public class Screen extends com.jogamp.newt.Screen {
+
+    static {
+        Display.initSingleton();
+    }
+
+    public Screen() {
+    }
+
+    protected void createNative(int index) {
+        AbstractGraphicsDevice adevice = getDisplay().getGraphicsDevice();
+        GetScreenInfo(adevice.getHandle(), index);
+        aScreen = new DefaultGraphicsScreen(adevice, index);
+    }
+
+    protected void closeNative() { }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    protected static native boolean initIDs();
+    private          native void GetScreenInfo(long displayHandle, int screen_idx);
+
+    // called by GetScreenInfo() ..
+    private void screenCreated(int width, int height) {
+        setScreenSize(width, height);
+    }
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/intel/gdl/Window.java b/src/newt/classes/com/jogamp/newt/intel/gdl/Window.java
new file mode 100644
index 000000000..879fc6134
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/intel/gdl/Window.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.intel.gdl;
+
+import javax.media.nativewindow.*;
+
+public class Window extends com.jogamp.newt.Window {
+    static {
+        Display.initSingleton();
+    }
+
+    public Window() {
+    }
+
+    static long nextWindowHandle = 1;
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        if(0!=parentWindowHandle) {
+            throw new NativeWindowException("GDL Window does not support window parenting");
+        }
+        AbstractGraphicsScreen aScreen = screen.getGraphicsScreen();
+        AbstractGraphicsDevice aDevice = screen.getDisplay().getGraphicsDevice();
+
+        config = GraphicsConfigurationFactory.getFactory(aDevice).chooseGraphicsConfiguration(caps, null, aScreen);
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+
+        synchronized(Window.class) {
+            windowHandle = nextWindowHandle++;
+        }
+    }
+
+    protected void closeNative() {
+        if(0!=surfaceHandle) {
+            synchronized(Window.class) {
+                CloseSurface(getDisplayHandle(), surfaceHandle);
+            }
+            surfaceHandle = 0;
+            ((Display)screen.getDisplay()).setFocus(null);
+        }
+    }
+
+    public void setVisible(boolean visible) {
+        if(this.visible!=visible) {
+            this.visible=visible;
+            if(visible && 0==surfaceHandle) {
+                synchronized(Window.class) {
+                    AbstractGraphicsDevice aDevice = screen.getDisplay().getGraphicsDevice();
+                    surfaceHandle = CreateSurface(aDevice.getHandle(), screen.getWidth(), screen.getHeight(), x, y, width, height);
+                }
+                if (surfaceHandle == 0) {
+                    throw new NativeWindowException("Error creating window");
+                }
+                ((Display)screen.getDisplay()).setFocus(this);
+            }
+        }
+    }
+
+    public void setSize(int width, int height) {
+        Screen  screen = (Screen) getScreen();
+        if((x+width)>screen.getWidth()) {
+            width=screen.getWidth()-x;
+        }
+        if((y+height)>screen.getHeight()) {
+            height=screen.getHeight()-y;
+        }
+        this.width = width;
+        this.height = height;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        }
+        if(0!=surfaceHandle) {
+            SetBounds0(surfaceHandle, screen.getWidth(), screen.getHeight(), x, y, width, height);
+        }
+    }
+
+    public void setPosition(int x, int y) {
+        Screen  screen = (Screen) getScreen();
+        if((x+width)>screen.getWidth()) {
+            x=screen.getWidth()-width;
+        }
+        if((y+height)>screen.getHeight()) {
+            y=screen.getHeight()-height;
+        }
+        this.x = x;
+        this.y = y;
+        if(!fullscreen) {
+            nfs_x=x;
+            nfs_y=y;
+        }
+        if(0!=surfaceHandle) {
+            SetBounds0(surfaceHandle, screen.getWidth(), screen.getHeight(), x, y, width, height);
+        }
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        if(this.fullscreen!=fullscreen) {
+            int x,y,w,h;
+            this.fullscreen=fullscreen;
+            if(fullscreen) {
+                x = 0; y = 0;
+                w = screen.getWidth();
+                h = screen.getHeight();
+            } else {
+                x = nfs_x;
+                y = nfs_y;
+                w = nfs_width;
+                h = nfs_height;
+            }
+            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                System.err.println("IntelGDL Window fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
+            }
+            if(0!=surfaceHandle) {
+                SetBounds0(surfaceHandle, screen.getWidth(), screen.getHeight(), x, y, w, h);
+            }
+        }
+        return fullscreen;
+    }
+
+    public void requestFocus() {
+        ((Display)screen.getDisplay()).setFocus(this);
+    }
+
+    public long getSurfaceHandle() {
+        return surfaceHandle;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    protected static native boolean initIDs();
+    private        native long CreateSurface(long displayHandle, int scrn_width, int scrn_height, int x, int y, int width, int height);
+    private        native void CloseSurface(long displayHandle, long surfaceHandle);
+    private        native void SetBounds0(long surfaceHandle, int scrn_width, int scrn_height, int x, int y, int width, int height);
+
+    private void updateBounds(int x, int y, int width, int height) {
+        this.x = x;
+        this.y = y;
+        this.width = width;
+        this.height = height;
+    }
+
+    private long   surfaceHandle;
+    private int nfs_width, nfs_height, nfs_x, nfs_y;
+}
diff --git a/src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java b/src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java
new file mode 100755
index 000000000..2f86125f8
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.macosx;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.macosx.*;
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
+import com.jogamp.newt.util.MainThread;
+
+public class MacDisplay extends Display {
+    static {
+        NativeLibLoader.loadNEWT();
+
+        if(!initNSApplication()) {
+            throw new NativeWindowException("Failed to initialize native Application hook");
+        }
+        if(!MacWindow.initIDs()) {
+            throw new NativeWindowException("Failed to initialize jmethodIDs");
+        }
+        if(DEBUG) System.out.println("MacDisplay.init App and IDs OK "+Thread.currentThread().getName());
+    }
+
+    public static void initSingleton() {
+        // just exist to ensure static init has been run
+    }
+    
+    public MacDisplay() {
+    }
+
+    class DispatchAction implements Runnable {
+        public void run() {
+            dispatchMessages0();
+        }
+    }
+    private DispatchAction dispatchAction = new DispatchAction();
+
+    public void dispatchMessages() {
+        MainThread.invoke(false, dispatchAction);
+    }
+    
+    protected void createNative() {
+        aDevice = new MacOSXGraphicsDevice();
+    }
+
+    protected void closeNative() { }
+
+    private static native boolean initNSApplication();
+    protected native void dispatchMessages0();
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/macosx/MacScreen.java b/src/newt/classes/com/jogamp/newt/macosx/MacScreen.java
new file mode 100755
index 000000000..92f8e908c
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/macosx/MacScreen.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.macosx;
+
+import com.jogamp.newt.*;
+import javax.media.nativewindow.*;
+
+public class MacScreen extends Screen {
+    static {
+        MacDisplay.initSingleton();
+    }
+
+    public MacScreen() {
+    }
+
+    protected void createNative(int index) {
+        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
+        setScreenSize(getWidthImpl(getIndex()), getHeightImpl(getIndex()));
+    }
+
+    protected void closeNative() { }
+
+    private static native int getWidthImpl(int scrn_idx);
+    private static native int getHeightImpl(int scrn_idx);
+}
diff --git a/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java b/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java
new file mode 100755
index 000000000..06e73caa5
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java
@@ -0,0 +1,600 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.macosx;
+
+import javax.media.nativewindow.*;
+
+import com.jogamp.newt.util.MainThread;
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
+
+public class MacWindow extends Window {
+    
+    // Window styles
+    private static final int NSBorderlessWindowMask     = 0;
+    private static final int NSTitledWindowMask         = 1 << 0;
+    private static final int NSClosableWindowMask       = 1 << 1;
+    private static final int NSMiniaturizableWindowMask = 1 << 2;
+    private static final int NSResizableWindowMask      = 1 << 3;
+
+    // Window backing store types
+    private static final int NSBackingStoreRetained     = 0;
+    private static final int NSBackingStoreNonretained  = 1;
+    private static final int NSBackingStoreBuffered     = 2;
+
+    // Key constants handled differently on Mac OS X than other platforms
+    private static final int NSUpArrowFunctionKey        = 0xF700;
+    private static final int NSDownArrowFunctionKey      = 0xF701;
+    private static final int NSLeftArrowFunctionKey      = 0xF702;
+    private static final int NSRightArrowFunctionKey     = 0xF703;
+    private static final int NSF1FunctionKey             = 0xF704;
+    private static final int NSF2FunctionKey             = 0xF705;
+    private static final int NSF3FunctionKey             = 0xF706;
+    private static final int NSF4FunctionKey             = 0xF707;
+    private static final int NSF5FunctionKey             = 0xF708;
+    private static final int NSF6FunctionKey             = 0xF709;
+    private static final int NSF7FunctionKey             = 0xF70A;
+    private static final int NSF8FunctionKey             = 0xF70B;
+    private static final int NSF9FunctionKey             = 0xF70C;
+    private static final int NSF10FunctionKey            = 0xF70D;
+    private static final int NSF11FunctionKey            = 0xF70E;
+    private static final int NSF12FunctionKey            = 0xF70F;
+    private static final int NSF13FunctionKey            = 0xF710;
+    private static final int NSF14FunctionKey            = 0xF711;
+    private static final int NSF15FunctionKey            = 0xF712;
+    private static final int NSF16FunctionKey            = 0xF713;
+    private static final int NSF17FunctionKey            = 0xF714;
+    private static final int NSF18FunctionKey            = 0xF715;
+    private static final int NSF19FunctionKey            = 0xF716;
+    private static final int NSF20FunctionKey            = 0xF717;
+    private static final int NSF21FunctionKey            = 0xF718;
+    private static final int NSF22FunctionKey            = 0xF719;
+    private static final int NSF23FunctionKey            = 0xF71A;
+    private static final int NSF24FunctionKey            = 0xF71B;
+    private static final int NSF25FunctionKey            = 0xF71C;
+    private static final int NSF26FunctionKey            = 0xF71D;
+    private static final int NSF27FunctionKey            = 0xF71E;
+    private static final int NSF28FunctionKey            = 0xF71F;
+    private static final int NSF29FunctionKey            = 0xF720;
+    private static final int NSF30FunctionKey            = 0xF721;
+    private static final int NSF31FunctionKey            = 0xF722;
+    private static final int NSF32FunctionKey            = 0xF723;
+    private static final int NSF33FunctionKey            = 0xF724;
+    private static final int NSF34FunctionKey            = 0xF725;
+    private static final int NSF35FunctionKey            = 0xF726;
+    private static final int NSInsertFunctionKey         = 0xF727;
+    private static final int NSDeleteFunctionKey         = 0xF728;
+    private static final int NSHomeFunctionKey           = 0xF729;
+    private static final int NSBeginFunctionKey          = 0xF72A;
+    private static final int NSEndFunctionKey            = 0xF72B;
+    private static final int NSPageUpFunctionKey         = 0xF72C;
+    private static final int NSPageDownFunctionKey       = 0xF72D;
+    private static final int NSPrintScreenFunctionKey    = 0xF72E;
+    private static final int NSScrollLockFunctionKey     = 0xF72F;
+    private static final int NSPauseFunctionKey          = 0xF730;
+    private static final int NSSysReqFunctionKey         = 0xF731;
+    private static final int NSBreakFunctionKey          = 0xF732;
+    private static final int NSResetFunctionKey          = 0xF733;
+    private static final int NSStopFunctionKey           = 0xF734;
+    private static final int NSMenuFunctionKey           = 0xF735;
+    private static final int NSUserFunctionKey           = 0xF736;
+    private static final int NSSystemFunctionKey         = 0xF737;
+    private static final int NSPrintFunctionKey          = 0xF738;
+    private static final int NSClearLineFunctionKey      = 0xF739;
+    private static final int NSClearDisplayFunctionKey   = 0xF73A;
+    private static final int NSInsertLineFunctionKey     = 0xF73B;
+    private static final int NSDeleteLineFunctionKey     = 0xF73C;
+    private static final int NSInsertCharFunctionKey     = 0xF73D;
+    private static final int NSDeleteCharFunctionKey     = 0xF73E;
+    private static final int NSPrevFunctionKey           = 0xF73F;
+    private static final int NSNextFunctionKey           = 0xF740;
+    private static final int NSSelectFunctionKey         = 0xF741;
+    private static final int NSExecuteFunctionKey        = 0xF742;
+    private static final int NSUndoFunctionKey           = 0xF743;
+    private static final int NSRedoFunctionKey           = 0xF744;
+    private static final int NSFindFunctionKey           = 0xF745;
+    private static final int NSHelpFunctionKey           = 0xF746;
+    private static final int NSModeSwitchFunctionKey     = 0xF747;
+
+    private volatile long surfaceHandle;
+    private long parentWindowHandle;
+
+    // non fullscreen dimensions ..
+    private int nfs_width, nfs_height, nfs_x, nfs_y;
+    private final Insets insets = new Insets(0,0,0,0);
+
+    static {
+        MacDisplay.initSingleton();
+    }
+
+    public MacWindow() {
+    }
+    
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        this.parentWindowHandle=parentWindowHandle;
+        config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, getScreen().getGraphicsScreen());
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+    }
+
+    class CloseAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if(DEBUG_IMPLEMENTATION) System.out.println("MacWindow.CloseAction "+Thread.currentThread().getName());
+                if (windowHandle != 0) {
+                    close0(windowHandle);
+                    windowHandle = 0;
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private CloseAction closeAction = new CloseAction();
+
+    protected void closeNative() {
+        MainThread.invoke(true, closeAction);
+    }
+    
+    public long getWindowHandle() {
+        nsViewLock.lock();
+        try {
+            return windowHandle;
+        } finally {
+            nsViewLock.unlock();
+        }
+    }
+
+    public long getSurfaceHandle() {
+        nsViewLock.lock();
+        try {
+            return surfaceHandle;
+        } finally {
+            nsViewLock.unlock();
+        }
+    }
+
+    class EnsureWindowCreatedAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                createWindow(parentWindowHandle, false);
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private EnsureWindowCreatedAction ensureWindowCreatedAction =
+        new EnsureWindowCreatedAction();
+
+    public Insets getInsets() {
+        // in order to properly calculate insets we need the window to be
+        // created
+        MainThread.invoke(true, ensureWindowCreatedAction);
+        nsViewLock.lock();
+        try {
+            return (Insets) insets.clone();
+        } finally {
+            nsViewLock.unlock();
+        }
+    }
+
+    private ToolkitLock nsViewLock = new ToolkitLock() {
+            private Thread owner;
+            private int recursionCount;
+            
+            public synchronized void lock() {
+                Thread cur = Thread.currentThread();
+                if (owner == cur) {
+                    ++recursionCount;
+                    return;
+                }
+                while (owner != null) {
+                    try {
+                        wait();
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+                owner = cur;
+            }
+
+            public synchronized void unlock() {
+                if (owner != Thread.currentThread()) {
+                    throw new RuntimeException("Not owner");
+                }
+                if (recursionCount > 0) {
+                    --recursionCount;
+                    return;
+                }
+                owner = null;
+                notifyAll();
+            }
+        };
+
+    public synchronized int lockSurface() throws NativeWindowException {
+        nsViewLock.lock();
+        return super.lockSurface();
+    }
+
+    public void unlockSurface() {
+        super.unlockSurface();
+        nsViewLock.unlock();
+    }
+
+    class VisibleAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if(DEBUG_IMPLEMENTATION) System.out.println("MacWindow.VisibleAction "+visible+" "+Thread.currentThread().getName());
+                if (visible) {
+                    createWindow(parentWindowHandle, false);
+                    if (windowHandle != 0) {
+                        makeKeyAndOrderFront(windowHandle);
+                    }
+                } else {
+                    if (windowHandle != 0) {
+                        orderOut(windowHandle);
+                    }
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private VisibleAction visibleAction = new VisibleAction();
+
+    public void setVisible(boolean visible) {
+        this.visible = visible;
+        MainThread.invoke(true, visibleAction);
+    }
+
+    class TitleAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if (windowHandle != 0) {
+                    setTitle0(windowHandle, title);
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private TitleAction titleAction = new TitleAction();
+
+    public void setTitle(String title) {
+        super.setTitle(title);
+        MainThread.invoke(true, titleAction);
+    }
+
+    class FocusAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if (windowHandle != 0) {
+                    makeKey(windowHandle);
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private FocusAction focusAction = new FocusAction();
+
+    public void requestFocus() {
+        super.requestFocus();
+        MainThread.invoke(true, focusAction);
+    }
+    
+    class SizeAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if (windowHandle != 0) {
+                    setContentSize(windowHandle, width, height);
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private SizeAction sizeAction = new SizeAction();
+
+    public void setSize(int width, int height) {
+        this.width=width;
+        this.height=height;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        }
+        MainThread.invoke(true, sizeAction);
+    }
+    
+    class PositionAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if (windowHandle != 0) {
+                    setFrameTopLeftPoint(parentWindowHandle, windowHandle, x, y);
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private PositionAction positionAction = new PositionAction();
+
+    public void setPosition(int x, int y) {
+        this.x=x;
+        this.y=y;
+        if(!fullscreen) {
+            nfs_x=x;
+            nfs_y=y;
+        }
+        MainThread.invoke(true, positionAction);
+    }
+    
+    class FullscreenAction implements Runnable {
+        public void run() {
+            nsViewLock.lock();
+            try {
+                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                    System.err.println("MacWindow fs: "+fullscreen+" "+x+"/"+y+" "+width+"x"+height);
+                }
+                createWindow(parentWindowHandle, true);
+                if (windowHandle != 0) {
+                    makeKeyAndOrderFront(windowHandle);
+                }
+            } finally {
+                nsViewLock.unlock();
+            }
+        }
+    }
+    private FullscreenAction fullscreenAction = new FullscreenAction();
+
+    public boolean setFullscreen(boolean fullscreen) {
+        if(this.fullscreen!=fullscreen) {
+            this.fullscreen=fullscreen;
+            if(fullscreen) {
+                x = 0; 
+                y = 0;
+                width = screen.getWidth();
+                height = screen.getHeight();
+            } else {
+                x = nfs_x;
+                y = nfs_y;
+                width = nfs_width;
+                height = nfs_height;
+            }
+            MainThread.invoke(true, fullscreenAction);
+        }
+        return fullscreen;
+    }
+    
+    private void sizeChanged(int newWidth, int newHeight) {
+        if (DEBUG_IMPLEMENTATION) {
+            System.out.println(Thread.currentThread().getName()+" Size changed to " + newWidth + ", " + newHeight);
+        }
+        width = newWidth;
+        height = newHeight;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        }
+        if (DEBUG_IMPLEMENTATION) {
+            System.out.println("  Posted WINDOW_RESIZED event");
+        }
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
+    }
+
+    private void insetsChanged(int left, int top, int right, int bottom) {
+        if (DEBUG_IMPLEMENTATION) {
+            System.out.println(Thread.currentThread().getName()+
+                " Insets changed to " + left + ", " + top + ", " + right + ", " + bottom);
+        }
+        if (left != -1 && top != -1 && right != -1 && bottom != -1) {
+            insets.left = left;
+            insets.top = top;
+            insets.right = right;
+            insets.bottom = bottom;
+        }
+    }
+
+    private void positionChanged(int newX, int newY) {
+        if (DEBUG_IMPLEMENTATION) {
+            System.out.println(Thread.currentThread().getName()+" Position changed to " + newX + ", " + newY);
+        }
+        x = newX;
+        y = newY;
+        if(!fullscreen) {
+            nfs_x=x;
+            nfs_y=y;
+        }
+        if (DEBUG_IMPLEMENTATION) {
+            System.out.println("  Posted WINDOW_MOVED event");
+        }
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
+    }
+
+    private void focusChanged(boolean focusGained) {
+        if (focusGained) {
+            sendWindowEvent(WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
+        } else {
+            sendWindowEvent(WindowEvent.EVENT_WINDOW_LOST_FOCUS);
+        }
+    }
+
+    private char convertKeyChar(char keyChar) {
+        if (keyChar == '\r') {
+            // Turn these into \n
+            return '\n';
+        }
+
+        if (keyChar >= NSUpArrowFunctionKey && keyChar <= NSModeSwitchFunctionKey) {
+            switch (keyChar) {
+                case NSUpArrowFunctionKey:     return KeyEvent.VK_UP;
+                case NSDownArrowFunctionKey:   return KeyEvent.VK_DOWN;
+                case NSLeftArrowFunctionKey:   return KeyEvent.VK_LEFT;
+                case NSRightArrowFunctionKey:  return KeyEvent.VK_RIGHT;
+                case NSF1FunctionKey:          return KeyEvent.VK_F1;
+                case NSF2FunctionKey:          return KeyEvent.VK_F2;
+                case NSF3FunctionKey:          return KeyEvent.VK_F3;
+                case NSF4FunctionKey:          return KeyEvent.VK_F4;
+                case NSF5FunctionKey:          return KeyEvent.VK_F5;
+                case NSF6FunctionKey:          return KeyEvent.VK_F6;
+                case NSF7FunctionKey:          return KeyEvent.VK_F7;
+                case NSF8FunctionKey:          return KeyEvent.VK_F8;
+                case NSF9FunctionKey:          return KeyEvent.VK_F9;
+                case NSF10FunctionKey:         return KeyEvent.VK_F10;
+                case NSF11FunctionKey:         return KeyEvent.VK_F11;
+                case NSF12FunctionKey:         return KeyEvent.VK_F12;
+                case NSF13FunctionKey:         return KeyEvent.VK_F13;
+                case NSF14FunctionKey:         return KeyEvent.VK_F14;
+                case NSF15FunctionKey:         return KeyEvent.VK_F15;
+                case NSF16FunctionKey:         return KeyEvent.VK_F16;
+                case NSF17FunctionKey:         return KeyEvent.VK_F17;
+                case NSF18FunctionKey:         return KeyEvent.VK_F18;
+                case NSF19FunctionKey:         return KeyEvent.VK_F19;
+                case NSF20FunctionKey:         return KeyEvent.VK_F20;
+                case NSF21FunctionKey:         return KeyEvent.VK_F21;
+                case NSF22FunctionKey:         return KeyEvent.VK_F22;
+                case NSF23FunctionKey:         return KeyEvent.VK_F23;
+                case NSF24FunctionKey:         return KeyEvent.VK_F24;
+                case NSInsertFunctionKey:      return KeyEvent.VK_INSERT;
+                case NSDeleteFunctionKey:      return KeyEvent.VK_DELETE;
+                case NSHomeFunctionKey:        return KeyEvent.VK_HOME;
+                case NSBeginFunctionKey:       return KeyEvent.VK_BEGIN;
+                case NSEndFunctionKey:         return KeyEvent.VK_END;
+                case NSPageUpFunctionKey:      return KeyEvent.VK_PAGE_UP;
+                case NSPageDownFunctionKey:    return KeyEvent.VK_PAGE_DOWN;
+                case NSPrintScreenFunctionKey: return KeyEvent.VK_PRINTSCREEN;
+                case NSScrollLockFunctionKey:  return KeyEvent.VK_SCROLL_LOCK;
+                case NSPauseFunctionKey:       return KeyEvent.VK_PAUSE;
+                // Not handled:
+                // NSSysReqFunctionKey
+                // NSBreakFunctionKey
+                // NSResetFunctionKey
+                case NSStopFunctionKey:        return KeyEvent.VK_STOP;
+                // Not handled:
+                // NSMenuFunctionKey
+                // NSUserFunctionKey
+                // NSSystemFunctionKey
+                // NSPrintFunctionKey
+                // NSClearLineFunctionKey
+                // NSClearDisplayFunctionKey
+                // NSInsertLineFunctionKey
+                // NSDeleteLineFunctionKey
+                // NSInsertCharFunctionKey
+                // NSDeleteCharFunctionKey
+                // NSPrevFunctionKey
+                // NSNextFunctionKey
+                // NSSelectFunctionKey
+                // NSExecuteFunctionKey
+                // NSUndoFunctionKey
+                // NSRedoFunctionKey
+                // NSFindFunctionKey
+                // NSHelpFunctionKey
+                // NSModeSwitchFunctionKey
+                default: break;
+            }
+        }
+
+        // NSEvent's charactersIgnoringModifiers doesn't ignore the shift key
+        if (keyChar >= 'a' && keyChar <= 'z') {
+            return Character.toUpperCase(keyChar);
+        }
+
+        return keyChar;
+    }
+
+    protected void sendKeyEvent(int eventType, int modifiers, int keyCode, char keyChar) {
+        int key = convertKeyChar(keyChar);
+        if(DEBUG_IMPLEMENTATION) System.out.println("MacWindow.sendKeyEvent "+Thread.currentThread().getName());
+        // Note that we send the key char for the key code on this
+        // platform -- we do not get any useful key codes out of the system
+        super.sendKeyEvent(eventType, modifiers, key, keyChar);
+    }
+
+    private void createWindow(long parentWindowHandle, boolean recreate) {
+        if(0!=windowHandle && !recreate) {
+            return;
+        }
+        if(0!=windowHandle) {
+            // save the view .. close the window
+            surfaceHandle = changeContentView(parentWindowHandle, windowHandle, 0);
+            if(recreate && 0==surfaceHandle) {
+                throw new NativeWindowException("Internal Error - recreate, window but no view");
+            }
+            close0(windowHandle);
+            windowHandle=0;
+        } else {
+            surfaceHandle = 0;
+        }
+        windowHandle = createWindow0(parentWindowHandle, 
+                                     getX(), getY(), getWidth(), getHeight(), fullscreen,
+                                     (isUndecorated() ?
+                                     NSBorderlessWindowMask :
+                                     NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask),
+                                     NSBackingStoreBuffered, 
+                                     getScreen().getIndex(), surfaceHandle);
+        if (windowHandle == 0) {
+            throw new NativeWindowException("Could create native window "+Thread.currentThread().getName()+" "+this);
+        }
+        surfaceHandle = contentView(windowHandle);
+        setTitle0(windowHandle, getTitle());
+        // don't make the window visible on window creation
+//        makeKeyAndOrderFront(windowHandle);
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
+    }
+    
+    protected static native boolean initIDs();
+    private native long createWindow0(long parentWindowHandle, int x, int y, int w, int h,
+                                     boolean fullscreen, int windowStyle,
+                                     int backingStoreType,
+                                     int screen_idx, long view);
+    private native void makeKeyAndOrderFront(long window);
+    private native void makeKey(long window);
+    private native void orderOut(long window);
+    private native void close0(long window);
+    private native void setTitle0(long window, String title);
+    private native long contentView(long window);
+    private native long changeContentView(long parentWindowHandle, long window, long view);
+    private native void setContentSize(long window, int w, int h);
+    private native void setFrameTopLeftPoint(long parentWindowHandle, long window, int x, int y);
+}
diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
new file mode 100644
index 000000000..800e38105
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
@@ -0,0 +1,628 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.opengl;
+
+import com.jogamp.newt.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.GLDrawableHelper;
+import java.util.*;
+
+/**
+ * An implementation of {@link Window} which is customized for OpenGL
+ * use, and which implements the {@link javax.media.opengl.GLAutoDrawable} interface.
+ * <P>
+ * This implementation does not make the OpenGL context current<br>
+ * before calling the various input EventListener callbacks (MouseListener, KeyListener,
+ * etc.).<br>
+ * This design decision is made to favor a more performant and simplified
+ * implementation, as well as the event dispatcher shall be allowed
+ * not having a notion about OpenGL.
+ * <p>
+ */
+public class GLWindow extends Window implements GLAutoDrawable {
+    private static List/*GLWindow*/ glwindows = new ArrayList();
+
+    private boolean ownerOfWinScrDpy;
+    private Window window;
+    private boolean runPumpMessages;
+
+    /** Constructor. Do not call this directly -- use {@link
+        create()} instead. */
+    protected GLWindow(Window window, boolean ownerOfWinScrDpy) {
+        this.ownerOfWinScrDpy = ownerOfWinScrDpy;
+        this.window = window;
+        this.window.setAutoDrawableClient(true);
+        this.runPumpMessages = ( null == getScreen().getDisplay().getEDT() ) ;
+        window.addWindowListener(new WindowListener() {
+                public void windowResized(WindowEvent e) {
+                    sendReshape = true;
+                }
+
+                public void windowMoved(WindowEvent e) {
+                }
+
+                public void windowGainedFocus(WindowEvent e) {
+                }
+
+                public void windowLostFocus(WindowEvent e) {
+                }
+
+                public void windowDestroyNotify(WindowEvent e) {
+                    sendDestroy = true;
+                }
+            });
+
+        List newglw = (List) ((ArrayList) glwindows).clone();
+        newglw.add(this);
+        glwindows=newglw;
+    }
+
+    /** Creates a new GLWindow on the local display, screen 0, with a
+        dummy visual ID, and with the default GLCapabilities. */
+    public static GLWindow create() {
+        return create(null, null, false);
+    }
+
+    public static GLWindow create(boolean undecorated) {
+        return create(null, null, undecorated);
+    }
+
+    /** Creates a new GLWindow referring to the given window. */
+    public static GLWindow create(Window window) {
+        return create(window, null, false);
+    }
+    public static GLWindow create(GLCapabilities caps) {
+        return create(null, caps, false);
+    }
+
+    /** Creates a new GLWindow on the local display, screen 0, with a
+        dummy visual ID, and with the given GLCapabilities. */
+    public static GLWindow create(GLCapabilities caps, boolean undecorated) {
+        return create(null, caps, undecorated);
+    }
+
+    /** Either or: window (prio), or caps and undecorated (2nd choice) */
+    private static GLWindow create(Window window, 
+                                   GLCapabilities caps,
+                                   boolean undecorated) {
+        Display display;
+        boolean ownerOfWinScrDpy=false;
+        if (window == null) {
+            if (caps == null) {
+                caps = new GLCapabilities(null); // default ..
+            }
+            ownerOfWinScrDpy = true;
+            display = NewtFactory.createDisplay(null); // local display
+            Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+            window = NewtFactory.createWindow(screen, caps, undecorated);
+        }
+
+        return new GLWindow(window, ownerOfWinScrDpy);
+    }
+    
+    /** 
+     * EXPERIMENTAL<br> 
+     * Enable or disables running the {@link Display#pumpMessages} in the {@link #display()} call.<br>
+     * The default behavior is to run {@link Display#pumpMessages}.<P>
+     *
+     * The idea was that in a single threaded environment with one {@link Display} and many {@link Window}'s,
+     * a performance benefit was expected while disabling the implicit {@link Display#pumpMessages} and
+     * do it once via {@link GLWindow#runCurrentThreadPumpMessage()} <br>
+     * This could not have been verified. No measurable difference could have been recognized.<P>
+     *
+     * Best performance has been achieved with one GLWindow per thread.<br> 
+     *
+     * Enabling local pump messages while using the EDT, 
+     * {@link com.jogamp.newt.NewtFactory#setUseEDT(boolean)},
+     * will result in an exception.
+     *
+     * @deprecated EXPERIMENTAL, semantic is about to be removed after further verification.
+     */
+    public void setRunPumpMessages(boolean onoff) {
+        if( onoff && null!=getScreen().getDisplay().getEDT() ) {
+            throw new GLException("GLWindow.setRunPumpMessages(true) - Can't do with EDT on");
+        }
+        runPumpMessages = onoff;
+    }
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        shouldNotCallThis();
+    }
+
+    protected void closeNative() {
+        shouldNotCallThis();
+    }
+
+    protected void dispose(boolean regenerate, boolean sendEvent) {
+        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
+            Exception e1 = new Exception("GLWindow.dispose("+regenerate+") "+Thread.currentThread()+", 1");
+            e1.printStackTrace();
+        }
+
+        if(sendEvent) {
+            sendDisposeEvent();
+        }
+
+        if (context != null) {
+            context.destroy();
+        }
+        if (drawable != null) {
+            drawable.setRealized(false);
+        }
+
+        if(regenerate) {
+            if(null==window) {
+                throw new GLException("GLWindow.dispose(true): null window");
+            }
+
+            // recreate GLDrawable, to reflect the new graphics configurations
+            NativeWindow nw;
+            if (window.getWrappedWindow() != null) {
+                nw = NativeWindowFactory.getNativeWindow(window.getWrappedWindow(), window.getGraphicsConfiguration());
+            } else {
+                nw = window;
+            }
+            drawable = factory.createGLDrawable(nw);
+            drawable.setRealized(true);
+            context = drawable.createContext(null);
+            sendReshape = true; // ensure a reshape event is send ..
+        }
+
+        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
+            System.out.println("GLWindow.dispose("+regenerate+") "+Thread.currentThread()+", fin: "+this);
+        }
+    }
+
+    public synchronized void destroy() {
+        destroy(true);
+    }
+
+    /** @param sendDisposeEvent should be false in a [time,reliable] critical shutdown */
+    public synchronized void destroy(boolean sendDisposeEvent) {
+        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
+            Exception e1 = new Exception("GLWindow.destroy "+Thread.currentThread()+", 1: "+this);
+            e1.printStackTrace();
+        }
+
+        List newglw = (List) ((ArrayList) glwindows).clone();
+        newglw.remove(this);
+        glwindows=newglw;
+
+        dispose(false, sendDisposeEvent);
+
+        if(null!=window) {
+            if(ownerOfWinScrDpy) {
+                window.destroy(true);
+            }
+        }
+
+        drawable = null;
+        context = null;
+        window = null;
+
+        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
+            System.out.println("GLWindow.destroy "+Thread.currentThread()+", fin: "+this);
+        }
+    }
+
+    public boolean getPerfLogEnabled() { return perfLog; }
+
+    public void enablePerfLog(boolean v) {
+        perfLog = v;
+    }
+
+    public void setVisible(boolean visible) {
+        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
+            System.out.println(Thread.currentThread()+" GLWindow.setVisible("+visible+") START ; isVisible "+this.visible+" ; has context "+(null!=context));
+        }
+        this.visible=visible;
+        window.setVisible(visible);
+        if (visible && context == null) {
+            NativeWindow nw;
+            if (window.getWrappedWindow() != null) {
+                nw = NativeWindowFactory.getNativeWindow(window.getWrappedWindow(), window.getGraphicsConfiguration());
+            } else {
+                nw = window;
+            }
+            GLCapabilities glCaps = (GLCapabilities) nw.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
+            factory = GLDrawableFactory.getFactory(glCaps.getGLProfile());
+            drawable = factory.createGLDrawable(nw);
+            drawable.setRealized(true);
+            context = drawable.createContext(null);
+            sendReshape = true; // ensure a reshape event is send ..
+        }
+        if(Window.DEBUG_WINDOW_EVENT || window.DEBUG_IMPLEMENTATION) {
+            System.out.println(Thread.currentThread()+" GLWindow.setVisible("+visible+") END  ; has context "+(null!=context));
+        }
+    }
+
+    public Screen getScreen() {
+        return window.getScreen();
+    }
+
+    public void setTitle(String title) {
+        window.setTitle(title);
+    }
+
+    public String getTitle() {
+        return window.getTitle();
+    }
+
+    public void setUndecorated(boolean value) {
+        window.setUndecorated(value);
+    }
+
+    public boolean isUndecorated() {
+        return window.isUndecorated();
+    }
+
+    public void setSize(int width, int height) {
+        window.setSize(width, height);
+    }
+
+    public void setPosition(int x, int y) {
+        window.setPosition(x, y);
+    }
+
+    public Insets getInsets() {
+        return window.getInsets();
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        return window.setFullscreen(fullscreen);
+    }
+
+    public boolean isVisible() {
+        return window.isVisible();
+    }
+
+    public int getX() {
+        return window.getX();
+    }
+
+    public int getY() {
+        return window.getY();
+    }
+
+    public int getWidth() {
+        return window.getWidth();
+    }
+
+    public int getHeight() {
+        return window.getHeight();
+    }
+
+    public boolean isFullscreen() {
+        return window.isFullscreen();
+    }
+
+    public void addSurfaceUpdatedListener(SurfaceUpdatedListener l) {
+        window.addSurfaceUpdatedListener(l);
+    }
+    public void removeSurfaceUpdatedListener(SurfaceUpdatedListener l) {
+        window.removeSurfaceUpdatedListener(l);
+    }
+    public SurfaceUpdatedListener[] getSurfaceUpdatedListener() {
+        return window.getSurfaceUpdatedListener();
+    }
+    public void surfaceUpdated(Object updater, NativeWindow window0, long when) { 
+        window.surfaceUpdated(updater, window, when);
+    }
+
+    public void addMouseListener(MouseListener l) {
+        window.addMouseListener(l);
+    }
+
+    public void removeMouseListener(MouseListener l) {
+        window.removeMouseListener(l);
+    }
+
+    public MouseListener[] getMouseListeners() {
+        return window.getMouseListeners();
+    }
+
+    public void addKeyListener(KeyListener l) {
+        window.addKeyListener(l);
+    }
+
+    public void removeKeyListener(KeyListener l) {
+        window.removeKeyListener(l);
+    }
+
+    public KeyListener[] getKeyListeners() {
+        return window.getKeyListeners();
+    }
+
+    public void addWindowListener(WindowListener l) {
+        window.addWindowListener(l);
+    }
+
+    public void removeWindowListener(WindowListener l) {
+        window.removeWindowListener(l);
+    }
+
+    public WindowListener[] getWindowListeners() {
+        return window.getWindowListeners();
+    }
+
+    public String toString() {
+        return "NEWT-GLWindow[ \n\tDrawable: "+drawable+", \n\tWindow: "+window+", \n\tHelper: "+helper+", \n\tFactory: "+factory+"]";
+    }
+
+    //----------------------------------------------------------------------
+    // OpenGL-related methods and state
+    //
+
+    private GLDrawableFactory factory;
+    private GLDrawable drawable;
+    private GLContext context;
+    private GLDrawableHelper helper = new GLDrawableHelper();
+    // To make reshape events be sent immediately before a display event
+    private boolean sendReshape=false;
+    private boolean sendDestroy=false;
+    private boolean perfLog = false;
+
+    public GLDrawableFactory getFactory() {
+        return factory;
+    }
+
+    public void setContext(GLContext newCtx) {
+        context = newCtx;
+    }
+
+    public GLContext getContext() {
+        return context;
+    }
+
+    public GL getGL() {
+        if (context == null) {
+            return null;
+        }
+        return context.getGL();
+    }
+
+    public GL setGL(GL gl) {
+        if (context != null) {
+            context.setGL(gl);
+            return gl;
+        }
+        return null;
+    }
+
+    public void addGLEventListener(GLEventListener listener) {
+        helper.addGLEventListener(listener);
+    }
+
+    public void removeGLEventListener(GLEventListener listener) {
+        helper.removeGLEventListener(listener);
+    }
+
+    public void display() {
+        display(false);
+    }
+
+    public void display(boolean forceReshape) {
+        if(window!=null && drawable!=null && context != null) {
+            if(runPumpMessages) {
+                window.getScreen().getDisplay().pumpMessages();
+            }
+            if(window.hasDeviceChanged() && GLAutoDrawable.SCREEN_CHANGE_ACTION_ENABLED) {
+                dispose(true, true);
+            }
+            if (sendDestroy) {
+                destroy();
+                sendDestroy=false;
+            } else {
+                if(forceReshape) {
+                    sendReshape = true;
+                }
+                helper.invokeGL(drawable, context, displayAction, initAction);
+            }
+        }
+    }
+
+    private void sendDisposeEvent() {
+        if(drawable!=null && context != null) {
+            helper.invokeGL(drawable, context, disposeAction, null);
+        }
+    }
+
+    /** This implementation uses a static value */
+    public void setAutoSwapBufferMode(boolean onOrOff) {
+        helper.setAutoSwapBufferMode(onOrOff);
+    }
+
+    /** This implementation uses a static value */
+    public boolean getAutoSwapBufferMode() {
+        return helper.getAutoSwapBufferMode();
+    }
+
+    public void swapBuffers() {
+        if(drawable!=null && context != null) {
+            if (context != GLContext.getCurrent()) {
+                // Assume we should try to make the context current before swapping the buffers
+                helper.invokeGL(drawable, context, swapBuffersAction, initAction);
+            } else {
+                drawable.swapBuffers();
+            }
+        }
+    }
+
+    class InitAction implements Runnable {
+        public void run() {
+            helper.init(GLWindow.this);
+            startTime = System.currentTimeMillis();
+            curTime   = startTime;
+            if(perfLog) {
+                lastCheck  = startTime;
+                totalFrames = 0; lastFrames = 0;
+            }
+        }
+    }
+    private InitAction initAction = new InitAction();
+
+    class DisposeAction implements Runnable {
+        public void run() {
+            helper.dispose(GLWindow.this);
+        }
+    }
+    private DisposeAction disposeAction = new DisposeAction();
+
+    class DisplayAction implements Runnable {
+        public void run() {
+            if (sendReshape) {
+                int width = getWidth();
+                int height = getHeight();
+                getGL().glViewport(0, 0, width, height);
+                helper.reshape(GLWindow.this, 0, 0, width, height);
+                sendReshape = false;
+            }
+
+            helper.display(GLWindow.this);
+
+            curTime = System.currentTimeMillis();
+            totalFrames++;
+
+            if(perfLog) {
+                long dt0, dt1;
+                lastFrames++;
+                dt0 = curTime-lastCheck;
+                if ( dt0 > 5000 ) {
+                    dt1 = curTime-startTime;
+                    System.out.println(dt0/1000 +"s: "+ lastFrames + "f, " + (lastFrames*1000)/dt0 + " fps, "+dt0/lastFrames+" ms/f; "+
+                                       "total: "+ dt1/1000+"s, "+(totalFrames*1000)/dt1 + " fps, "+dt1/totalFrames+" ms/f");
+                    lastCheck=curTime;
+                    lastFrames=0;
+                }
+            }
+        }
+    }
+    private DisplayAction displayAction = new DisplayAction();
+
+    public long getStartTime()   { return startTime; }
+    public long getCurrentTime() { return curTime; }
+    public long getDuration()    { return curTime-startTime; }
+    public int  getTotalFrames() { return totalFrames; }
+
+    private long startTime = 0;
+    private long curTime = 0;
+    private long lastCheck  = 0;
+    private int  totalFrames = 0, lastFrames = 0;
+
+    class SwapBuffersAction implements Runnable {
+        public void run() {
+            drawable.swapBuffers();
+        }
+    }
+    private SwapBuffersAction swapBuffersAction = new SwapBuffersAction();
+
+    //----------------------------------------------------------------------
+    // GLDrawable methods
+    //
+
+    public NativeWindow getNativeWindow() {
+        return null!=drawable ? drawable.getNativeWindow() : null;
+    }
+
+    public synchronized int lockSurface() throws NativeWindowException {
+        if(null!=drawable) return drawable.getNativeWindow().lockSurface();
+        return NativeWindow.LOCK_SURFACE_NOT_READY;
+    }
+
+    public synchronized void unlockSurface() {
+        if(null!=drawable) drawable.getNativeWindow().unlockSurface();
+        else throw new NativeWindowException("NEWT-GLWindow not locked");
+    }
+
+    public synchronized boolean isSurfaceLocked() {
+        if(null!=drawable) return drawable.getNativeWindow().isSurfaceLocked();
+        return false;
+    }
+
+    public synchronized Exception getLockedStack() {
+        if(null!=drawable) return drawable.getNativeWindow().getLockedStack();
+        return null;
+    }
+
+    public boolean surfaceSwap() { 
+        if(null!=drawable) return drawable.getNativeWindow().surfaceSwap();
+        return super.surfaceSwap();
+    }
+
+    public long getWindowHandle() {
+        if(null!=drawable) return drawable.getNativeWindow().getWindowHandle();
+        return super.getWindowHandle();
+    }
+
+    public long getSurfaceHandle() {
+        if(null!=drawable) return drawable.getNativeWindow().getSurfaceHandle();
+        return super.getSurfaceHandle();
+    }
+
+    //----------------------------------------------------------------------
+    // GLDrawable methods that are not really needed
+    //
+
+    public GLContext createContext(GLContext shareWith) {
+        return drawable.createContext(shareWith);
+    }
+
+    public void setRealized(boolean realized) {
+    }
+
+    public GLCapabilities getChosenGLCapabilities() {
+        if (drawable == null) {
+            throw new GLException("No drawable yet");
+        }
+
+        return drawable.getChosenGLCapabilities();
+    }
+
+    public GLProfile getGLProfile() {
+        if (drawable == null) {
+            throw new GLException("No drawable yet");
+        }
+
+        return drawable.getGLProfile();
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    private void shouldNotCallThis() {
+        throw new NativeWindowException("Should not call this");
+    }
+}
diff --git a/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java
new file mode 100644
index 000000000..a375181ac
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.opengl.broadcom.egl;
+
+import com.jogamp.newt.impl.*;
+import com.jogamp.opengl.impl.egl.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.egl.*;
+
+public class Display extends com.jogamp.newt.Display {
+
+    static {
+        NativeLibLoader.loadNEWT();
+
+        if (!Window.initIDs()) {
+            throw new NativeWindowException("Failed to initialize BCEGL Window jmethodIDs");
+        }
+    }
+
+    public static void initSingleton() {
+        // just exist to ensure static init has been run
+    }
+
+
+    public Display() {
+    }
+
+    protected void createNative() {
+        long handle = CreateDisplay(Screen.fixedWidth, Screen.fixedHeight);
+        if (handle == EGL.EGL_NO_DISPLAY) {
+            throw new NativeWindowException("BC EGL CreateDisplay failed");
+        }
+        aDevice = new EGLGraphicsDevice(handle);
+    }
+
+    protected void closeNative() {
+        if (aDevice.getHandle() != EGL.EGL_NO_DISPLAY) {
+            DestroyDisplay(aDevice.getHandle());
+        }
+    }
+
+    protected void dispatchMessages() {
+        // n/a .. DispatchMessages();
+    }
+
+    private native long CreateDisplay(int width, int height);
+    private native void DestroyDisplay(long dpy);
+    private native void DispatchMessages();
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Screen.java b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Screen.java
new file mode 100755
index 000000000..b4f07599b
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Screen.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.opengl.broadcom.egl;
+
+import javax.media.nativewindow.*;
+
+public class Screen extends com.jogamp.newt.Screen {
+
+    static {
+        Display.initSingleton();
+    }
+
+
+    public Screen() {
+    }
+
+    protected void createNative(int index) {
+        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
+        setScreenSize(fixedWidth, fixedHeight);
+    }
+
+    protected void closeNative() { }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    static final int fixedWidth = 1920;
+    static final int fixedHeight = 1080;
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Window.java b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Window.java
new file mode 100755
index 000000000..185dc97b9
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Window.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.opengl.broadcom.egl;
+
+import com.jogamp.opengl.impl.egl.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.GLCapabilities;
+import javax.media.nativewindow.NativeWindowException;
+
+public class Window extends com.jogamp.newt.Window {
+    static {
+        Display.initSingleton();
+    }
+
+    public Window() {
+    }
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        if(0!=parentWindowHandle) {
+            throw new RuntimeException("Window parenting not supported (yet)");
+        }
+        // query a good configuration .. even thought we drop this one 
+        // and reuse the EGLUtil choosen one later.
+        config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, getScreen().getGraphicsScreen());
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+        setSizeImpl(getScreen().getWidth(), getScreen().getHeight());
+    }
+
+    protected void closeNative() {
+        if(0!=windowHandleClose) {
+            CloseWindow(getDisplayHandle(), windowHandleClose);
+        }
+    }
+
+    public void setVisible(boolean visible) {
+        if(this.visible!=visible) {
+            this.visible=visible;
+            if ( 0==windowHandle ) {
+                windowHandle = realizeWindow(true, width, height);
+                if (0 == windowHandle) {
+                    throw new NativeWindowException("Error native Window Handle is null");
+                }
+            }
+            clearEventMask();
+        }
+    }
+
+    public void setSize(int width, int height) {
+        System.err.println("setSize "+width+"x"+height+" n/a in BroadcomEGL");
+    }
+
+    void setSizeImpl(int width, int height) {
+        if(0!=windowHandle) {
+            // n/a in BroadcomEGL
+            System.err.println("BCEGL Window.setSizeImpl n/a in BroadcomEGL with realized window");
+        } else {
+            if(DEBUG_IMPLEMENTATION) {
+                Exception e = new Exception("BCEGL Window.setSizeImpl() "+this.width+"x"+this.height+" -> "+width+"x"+height);
+                e.printStackTrace();
+            }
+            this.width = width;
+            this.height = height;
+        }
+    }
+
+    public void setPosition(int x, int y) {
+        // n/a in BroadcomEGL
+        System.err.println("setPosition n/a in BroadcomEGL");
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        // n/a in BroadcomEGL
+        System.err.println("setFullscreen n/a in BroadcomEGL");
+        return false;
+    }
+
+    public boolean surfaceSwap() {
+        if ( 0!=windowHandle ) {
+            SwapWindow(getDisplayHandle(), windowHandle);
+            return true;
+        }
+        return false;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    protected static native boolean initIDs();
+    private        native long CreateWindow(long eglDisplayHandle, boolean chromaKey, int width, int height);
+    private        native void CloseWindow(long eglDisplayHandle, long eglWindowHandle);
+    private        native void SwapWindow(long eglDisplayHandle, long eglWindowHandle);
+
+
+    private long realizeWindow(boolean chromaKey, int width, int height) {
+        if(DEBUG_IMPLEMENTATION) {
+            System.out.println("BCEGL Window.realizeWindow() with: chroma "+chromaKey+", "+width+"x"+height+", "+config);
+        }
+        long handle = CreateWindow(getDisplayHandle(), chromaKey, width, height);
+        if (0 == handle) {
+            throw new NativeWindowException("Error native Window Handle is null");
+        }
+        windowHandleClose = handle;
+        return handle;
+    }
+
+    private void windowCreated(int cfgID, int width, int height) {
+        this.width = width;
+        this.height = height;
+        GLCapabilities capsReq = (GLCapabilities) config.getRequestedCapabilities();
+        config = EGLGraphicsConfiguration.create(capsReq, screen.getGraphicsScreen(), cfgID);
+        if (config == null) {
+            throw new NativeWindowException("Error creating EGLGraphicsConfiguration from id: "+cfgID+", "+this);
+        }
+        if(DEBUG_IMPLEMENTATION) {
+            System.out.println("BCEGL Window.windowCreated(): "+toHexString(cfgID)+", "+width+"x"+height+", "+config);
+        }
+    }
+
+    private long   windowHandleClose;
+}
diff --git a/src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java b/src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java
new file mode 100755
index 000000000..b09568237
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.opengl.kd;
+
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
+import com.jogamp.opengl.impl.egl.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.egl.*;
+
+public class KDDisplay extends Display {
+
+    static {
+        NativeLibLoader.loadNEWT();
+
+        if (!KDWindow.initIDs()) {
+            throw new NativeWindowException("Failed to initialize KDWindow jmethodIDs");
+        }
+    }
+
+    public static void initSingleton() {
+        // just exist to ensure static init has been run
+    }
+
+
+    public KDDisplay() {
+    }
+
+    protected void createNative() {
+        // FIXME: map name to EGL_*_DISPLAY
+        long handle = EGL.eglGetDisplay(EGL.EGL_DEFAULT_DISPLAY);
+        if (handle == EGL.EGL_NO_DISPLAY) {
+            throw new NativeWindowException("eglGetDisplay failed");
+        }
+        if (!EGL.eglInitialize(handle, null, null)) {
+            throw new NativeWindowException("eglInitialize failed");
+        }
+        aDevice = new EGLGraphicsDevice(handle);
+    }
+
+    protected void closeNative() {
+        if (aDevice.getHandle() != EGL.EGL_NO_DISPLAY) {
+            EGL.eglTerminate(aDevice.getHandle());
+        }
+    }
+
+    protected void dispatchMessages() {
+        DispatchMessages();
+    }
+
+    private native void DispatchMessages();
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/opengl/kd/KDScreen.java b/src/newt/classes/com/jogamp/newt/opengl/kd/KDScreen.java
new file mode 100755
index 000000000..cd53c8152
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/opengl/kd/KDScreen.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.opengl.kd;
+
+import com.jogamp.newt.*;
+import javax.media.nativewindow.*;
+
+public class KDScreen extends Screen {
+    static {
+        KDDisplay.initSingleton();
+    }
+
+    public KDScreen() {
+    }
+
+    protected void createNative(int index) {
+        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
+    }
+
+    protected void closeNative() { }
+
+    // elevate access to this package ..
+    protected void setScreenSize(int w, int h) {
+        super.setScreenSize(w, h);
+    }
+}
diff --git a/src/newt/classes/com/jogamp/newt/opengl/kd/KDWindow.java b/src/newt/classes/com/jogamp/newt/opengl/kd/KDWindow.java
new file mode 100755
index 000000000..555f54599
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/opengl/kd/KDWindow.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.opengl.kd;
+
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
+import com.jogamp.opengl.impl.egl.*;
+import javax.media.nativewindow.*;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLProfile;
+import javax.media.nativewindow.NativeWindowException;
+
+public class KDWindow extends Window {
+    private static final String WINDOW_CLASS_NAME = "NewtWindow";
+    // non fullscreen dimensions ..
+    private int nfs_width, nfs_height, nfs_x, nfs_y;
+
+    static {
+        KDDisplay.initSingleton();
+    }
+
+    public KDWindow() {
+    }
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        if(0!=parentWindowHandle) {
+            throw new RuntimeException("Window parenting not supported (yet)");
+        }
+        config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, getScreen().getGraphicsScreen());
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+
+        GLCapabilities eglCaps = (GLCapabilities)config.getChosenCapabilities();
+        int[] eglAttribs = EGLGraphicsConfiguration.GLCapabilities2AttribList(eglCaps);
+
+        windowHandle = 0;
+        eglWindowHandle = CreateWindow(getDisplayHandle(), eglAttribs);
+        if (eglWindowHandle == 0) {
+            throw new NativeWindowException("Error creating egl window: "+config);
+        }
+        setVisible0(eglWindowHandle, false);
+        windowHandleClose = eglWindowHandle;
+    }
+
+    protected void closeNative() {
+        if(0!=windowHandleClose) {
+            CloseWindow(windowHandleClose, windowUserData);
+            windowUserData=0;
+        }
+    }
+
+    public void setVisible(boolean visible) {
+        if(0!=eglWindowHandle && this.visible!=visible) {
+            this.visible=visible;
+            setVisible0(eglWindowHandle, visible);
+            if ( 0==windowHandle ) {
+                windowHandle = RealizeWindow(eglWindowHandle);
+                if (0 == windowHandle) {
+                    throw new NativeWindowException("Error native Window Handle is null");
+                }
+            }
+            clearEventMask();
+        }
+    }
+
+    public void setSize(int width, int height) {
+        if(0!=eglWindowHandle) {
+            setSize0(eglWindowHandle, width, height);
+        }
+    }
+
+    public void setPosition(int x, int y) {
+        // n/a in KD
+        System.err.println("setPosition n/a in KD");
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        if(0!=eglWindowHandle && this.fullscreen!=fullscreen) {
+            this.fullscreen=fullscreen;
+            if(this.fullscreen) {
+                setFullScreen0(eglWindowHandle, true);
+            } else {
+                setFullScreen0(eglWindowHandle, false);
+                setSize0(eglWindowHandle, nfs_width, nfs_height);
+            }
+        }
+        return true;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    protected static native boolean initIDs();
+    private        native long CreateWindow(long displayHandle, int[] attributes);
+    private        native long RealizeWindow(long eglWindowHandle);
+    private        native int  CloseWindow(long eglWindowHandle, long userData);
+    private        native void setVisible0(long eglWindowHandle, boolean visible);
+    private        native void setSize0(long eglWindowHandle, int width, int height);
+    private        native void setFullScreen0(long eglWindowHandle, boolean fullscreen);
+
+    private void windowCreated(long userData) {
+        windowUserData=userData;
+    }
+
+    private void sizeChanged(int newWidth, int newHeight) {
+        width = newWidth;
+        height = newHeight;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        } else {
+            ((KDScreen)screen).setScreenSize(width, height);
+        }
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
+    }
+
+    private long   eglWindowHandle;
+    private long   windowHandleClose;
+    private long   windowUserData;
+}
diff --git a/src/newt/classes/com/jogamp/newt/util/EventDispatchThread.java b/src/newt/classes/com/jogamp/newt/util/EventDispatchThread.java
new file mode 100644
index 000000000..675c6f322
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/util/EventDispatchThread.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.newt.util;
+
+import com.jogamp.newt.Display;
+import com.jogamp.newt.impl.Debug;
+import java.util.*;
+
+public class EventDispatchThread {
+    public static final boolean DEBUG = Debug.debug("EDT");
+
+    private ThreadGroup threadGroup; 
+    private volatile boolean shouldStop = false;
+    private TaskWorker taskWorker = null;
+    private Object taskWorkerLock = new Object();
+    private ArrayList tasks = new ArrayList(); // one shot tasks
+    private Display display = null;
+    private String name;
+    private long edtPollGranularity = 10;
+
+    public EventDispatchThread(Display display, ThreadGroup tg, String name) {
+        this.display = display;
+        this.threadGroup = tg;
+        this.name=new String("EDT-Display_"+display.getName()+"-"+name);
+    }
+
+    public String getName() { return name; }
+
+    public ThreadGroup getThreadGroup() { return threadGroup; }
+
+    public void start() {
+        start(false);
+    }
+
+    /**
+     * @param externalStimuli true indicates that another thread stimulates, 
+     *                        ie. calls this TaskManager's run() loop method.
+     *                        Hence no own thread is started in this case.
+     *
+     * @return The started Runnable, which handles the run-loop.
+     *         Usefull in combination with externalStimuli=true,
+     *         so an external stimuli can call it.
+     */
+    public Runnable start(boolean externalStimuli) {
+        synchronized(taskWorkerLock) { 
+            if(null==taskWorker) {
+                taskWorker = new TaskWorker(threadGroup, name);
+            }
+            if(!taskWorker.isRunning()) {
+                shouldStop = false;
+                taskWorker.start(externalStimuli);
+            }
+            taskWorkerLock.notifyAll();
+        }
+        return taskWorker;
+    }
+
+    public void stop() {
+        synchronized(taskWorkerLock) { 
+            if(null!=taskWorker && taskWorker.isRunning()) {
+                shouldStop = true;
+            }
+            taskWorkerLock.notifyAll();
+            if(DEBUG) {
+                System.out.println(Thread.currentThread()+": EDT signal STOP");
+            }
+        }
+    }
+
+    public boolean isThreadEDT(Thread thread) {
+        return null!=taskWorker && taskWorker == thread;
+    }
+
+    public boolean isCurrentThreadEDT() {
+        return null!=taskWorker && taskWorker == Thread.currentThread();
+    }
+
+    public boolean isRunning() {
+        return null!=taskWorker && taskWorker.isRunning() ;
+    }
+
+    public void invokeLater(Runnable task) {
+        if(task == null) {
+            return;
+        }
+        synchronized(taskWorkerLock) {
+            if(null!=taskWorker && taskWorker.isRunning() && taskWorker != Thread.currentThread() ) {
+                tasks.add(task);
+                taskWorkerLock.notifyAll();
+            } else {
+                // if !running or isEDTThread, do it right away
+                task.run();
+            }
+        }
+    }
+
+    public void invokeAndWait(Runnable task) {
+        if(task == null) {
+            return;
+        }
+        invokeLater(task);
+        waitOnWorker();
+    }
+
+    public void waitOnWorker() {
+        synchronized(taskWorkerLock) {
+            if(null!=taskWorker && taskWorker.isRunning() && tasks.size()>0 && taskWorker != Thread.currentThread() ) {
+                try {
+                    taskWorkerLock.wait();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public void waitUntilStopped() {
+        synchronized(taskWorkerLock) {
+            while(null!=taskWorker && taskWorker.isRunning() && taskWorker != Thread.currentThread() ) {
+                try {
+                    taskWorkerLock.wait();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    class TaskWorker extends Thread {
+        boolean isRunning = false;
+        boolean externalStimuli = false;
+
+        public TaskWorker(ThreadGroup tg, String name) {
+            super(tg, name);
+        }
+
+        public synchronized boolean isRunning() {
+            return isRunning;
+        }
+
+        public void start(boolean externalStimuli) throws IllegalThreadStateException {
+            synchronized(this) {
+                this.externalStimuli = externalStimuli;
+                isRunning = true;
+            }
+            if(!externalStimuli) {
+                super.start();
+            }
+        }
+
+        /** 
+         * Utilizing taskWorkerLock only for local resources and task execution,
+         * not for event dispatching.
+         */
+        public void run() {
+            if(DEBUG) {
+                System.out.println(Thread.currentThread()+": EDT run() START");
+            }
+            while(!shouldStop) {
+                try {
+                    // wait for something todo
+                    while(!shouldStop && tasks.size()==0) {
+                        synchronized(taskWorkerLock) {
+                            if(!shouldStop && tasks.size()==0) {
+                                try {
+                                    taskWorkerLock.wait(edtPollGranularity);
+                                } catch (InterruptedException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                        display.pumpMessages(); // event dispatch
+                    }
+                    if(!shouldStop && tasks.size()>0) {
+                        synchronized(taskWorkerLock) {
+                            if(!shouldStop && tasks.size()>0) {
+                                Runnable task = (Runnable) tasks.remove(0);
+                                task.run();
+                                taskWorkerLock.notifyAll();
+                            }
+                        }
+                        display.pumpMessages(); // event dispatch
+                    }
+                } catch (Throwable t) {
+                    // handle errors ..
+                    t.printStackTrace();
+                } finally {
+                    // epilog - unlock locked stuff
+                }
+                if(externalStimuli) break; // no loop if called by external stimuli
+            }
+            synchronized(this) {
+                isRunning = !shouldStop;
+            }
+            if(!isRunning) {
+                synchronized(taskWorkerLock) {
+                    taskWorkerLock.notifyAll();
+                }
+            }
+            if(DEBUG) {
+                System.out.println(Thread.currentThread()+": EDT run() EXIT");
+            }
+        }
+    }
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/util/MainThread.java b/src/newt/classes/com/jogamp/newt/util/MainThread.java
new file mode 100644
index 000000000..6cd4f8c69
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/util/MainThread.java
@@ -0,0 +1,307 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.newt.util;
+
+import java.util.*;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.security.*;
+
+import javax.media.nativewindow.*;
+
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
+import com.jogamp.newt.macosx.MacDisplay;
+import com.jogamp.nativewindow.impl.NWReflection;
+
+/**
+ * NEWT Utility class MainThread<P>
+ *
+ * This class provides a startup singleton <i>main thread</i>,
+ * from which a new thread with the users main class is launched.<br>
+ *
+ * Such behavior is necessary for native windowing toolkits,
+ * where the windowing management must happen on the so called
+ * <i>main thread</i> e.g. for Mac OS X !<br>
+ *
+ * Utilizing this class as a launchpad, now you are able to
+ * use a NEWT multithreaded application with window handling within the different threads,
+ * even on these restricted platforms.<br>
+ *
+ * To support your NEWT Window platform, 
+ * you have to pass your <i>main thread</i> actions to {@link #invoke invoke(..)},
+ * have a look at the {@link com.jogamp.newt.macosx.MacWindow MacWindow} implementation.<br>
+ * <i>TODO</i>: Some hardcoded dependencies exist in this implementation, 
+ * where you have to patch this code or factor it out. <P>
+ * 
+ * If your platform is not Mac OS X, but you want to test your code without modifying
+ * this class, you have to set the system property <code>newt.MainThread.force</code> to <code>true</code>.<P>
+ *
+ * The code is compatible with all other platform, which support multithreaded windowing handling.
+ * Since those platforms won't trigger the <i>main thread</i> serialization, the main method 
+ * will be simply executed, in case you haven't set <code>newt.MainThread.force</code> to <code>true</code>.<P>
+ *
+ * Test case on Mac OS X (or any other platform):
+ <PRE>
+    java -XstartOnFirstThread com.jogamp.newt.util.MainThread demos.es1.RedSquare -GL2 -GL2 -GL2 -GL2
+ </PRE>
+ * Which starts 4 threads, each with a window and OpenGL rendering.<br>
+ */
+public class MainThread {
+    private static AccessControlContext localACC = AccessController.getContext();
+    public static final boolean USE_MAIN_THREAD = NativeWindowFactory.TYPE_MACOSX.equals(NativeWindowFactory.getNativeWindowType(false)) ||
+                                                  Debug.getBooleanProperty("newt.MainThread.force", true, localACC);
+
+    protected static final boolean DEBUG = Debug.debug("MainThread");
+
+    private static boolean isExit=false;
+    private static volatile boolean isRunning=false;
+    private static Object taskWorkerLock=new Object();
+    private static boolean shouldStop;
+    private static ArrayList tasks;
+    private static ArrayList tasksBlock;
+    private static Thread mainThread;
+
+    static class MainAction extends Thread {
+        private String mainClassName;
+        private String[] mainClassArgs;
+
+        private Class mainClass;
+        private Method mainClassMain;
+
+        public MainAction(String mainClassName, String[] mainClassArgs) {
+            this.mainClassName=mainClassName;
+            this.mainClassArgs=mainClassArgs;
+        }
+
+        public void run() {
+            if ( USE_MAIN_THREAD ) {
+                // we have to start first to provide the service ..
+                MainThread.waitUntilRunning();
+            }
+
+            // start user app ..
+            try {
+                Class mainClass = NWReflection.getClass(mainClassName, true);
+                if(null==mainClass) {
+                    throw new RuntimeException(new ClassNotFoundException("MainThread couldn't find main class "+mainClassName));
+                }
+                try {
+                    mainClassMain = mainClass.getDeclaredMethod("main", new Class[] { String[].class });
+                    mainClassMain.setAccessible(true);
+                } catch (Throwable t) {
+                    throw new RuntimeException(t);
+                }
+                if(DEBUG) System.err.println("MainAction.run(): "+Thread.currentThread().getName()+" invoke "+mainClassName);
+                mainClassMain.invoke(null, new Object[] { mainClassArgs } );
+            } catch (InvocationTargetException ite) {
+                ite.getTargetException().printStackTrace();
+            } catch (Throwable t) {
+                t.printStackTrace();
+            }
+
+            if(DEBUG) System.err.println("MainAction.run(): "+Thread.currentThread().getName()+" user app fin");
+
+            if ( USE_MAIN_THREAD ) {
+                MainThread.exit();
+                if(DEBUG) System.err.println("MainAction.run(): "+Thread.currentThread().getName()+" MainThread fin - exit");
+                System.exit(0);
+            }
+        }
+    }
+    private static MainAction mainAction;
+
+    /** Your new java application main entry, which pipelines your application */
+    public static void main(String[] args) {
+        if(DEBUG) System.err.println("MainThread.main(): "+Thread.currentThread().getName()+" USE_MAIN_THREAD "+ USE_MAIN_THREAD );
+
+        if(args.length==0) {
+            return;
+        }
+
+        String mainClassName=args[0];
+        String[] mainClassArgs=new String[args.length-1];
+        if(args.length>1) {
+            System.arraycopy(args, 1, mainClassArgs, 0, args.length-1);
+        }
+
+        NativeLibLoader.loadNEWT();
+        
+        shouldStop = false;
+        tasks = new ArrayList();
+        tasksBlock = new ArrayList();
+        mainThread = Thread.currentThread();
+
+        mainAction = new MainAction(mainClassName, mainClassArgs);
+
+        if(NativeWindowFactory.TYPE_MACOSX.equals(NativeWindowFactory.getNativeWindowType(false))) {
+            MacDisplay.initSingleton();
+        }
+
+        if ( USE_MAIN_THREAD ) {
+            // dispatch user's main thread ..
+            mainAction.start();
+
+            // do our main thread task scheduling
+            run();
+        } else {
+            // run user's main in this thread 
+            mainAction.run();
+        }
+    }
+
+    /** invokes the given Runnable */
+    public static void invoke(boolean wait, Runnable r) {
+        if(r == null) {
+            return;
+        }
+
+        // if this main thread is not being used or
+        // if this is already the main thread .. just execute.
+        if( !isRunning() || mainThread == Thread.currentThread() ) {
+            r.run();
+            return;
+        }
+
+        synchronized(taskWorkerLock) {
+            tasks.add(r);
+            if(wait) {
+                tasksBlock.add(r);
+            }
+            taskWorkerLock.notifyAll();
+            if(wait) {
+                while(tasksBlock.size()>0) {
+                    try {
+                        taskWorkerLock.wait();
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+
+    public static void exit() {
+        if(DEBUG) System.err.println("MainThread.exit(): "+Thread.currentThread().getName()+" start");
+        synchronized(taskWorkerLock) { 
+            if(isRunning) {
+                shouldStop = true;
+            }
+            taskWorkerLock.notifyAll();
+        }
+        if(DEBUG) System.err.println("MainThread.exit(): "+Thread.currentThread().getName()+" end");
+    }
+
+    public static boolean isRunning() {
+        synchronized(taskWorkerLock) { 
+            return isRunning;
+        }
+    }
+
+    private static void waitUntilRunning() {
+        synchronized(taskWorkerLock) {
+            if(isExit) return;
+
+            while(!isRunning) {
+                try {
+                    taskWorkerLock.wait();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public static void run() {
+        if(DEBUG) System.err.println("MainThread.run(): "+Thread.currentThread().getName());
+        synchronized(taskWorkerLock) {
+            isRunning = true;
+            taskWorkerLock.notifyAll();
+        }
+        while(!shouldStop) {
+            try {
+                ArrayList localTasks=null;
+
+                // wait for something todo ..
+                synchronized(taskWorkerLock) {
+                    while(!shouldStop && tasks.size()==0) {
+                        try {
+                            taskWorkerLock.wait();
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    // seq. process all tasks until no blocking one exists in the list
+                    for(Iterator i = tasks.iterator(); tasksBlock.size()>0 && i.hasNext(); ) {
+                        Runnable task = (Runnable) i.next();
+                        task.run();
+                        i.remove();
+                        tasksBlock.remove(task);
+                    }
+
+                    // take over the tasks ..
+                    if(tasks.size()>0) {
+                        localTasks = tasks;
+                        tasks = new ArrayList();
+                    }
+                    taskWorkerLock.notifyAll();
+                }
+
+                // seq. process all unblocking tasks ..
+                if(null!=localTasks) {
+                    for(Iterator i = localTasks.iterator(); i.hasNext(); ) {
+                        Runnable task = (Runnable) i.next();
+                        task.run();
+                    }
+                }
+            } catch (Throwable t) {
+                // handle errors ..
+                t.printStackTrace();
+            } finally {
+                // epilog - unlock locked stuff
+            }
+        }
+        if(DEBUG) System.err.println("MainThread.run(): "+Thread.currentThread().getName()+" fin");
+        synchronized(taskWorkerLock) {
+            isRunning = false;
+            isExit = true;
+            taskWorkerLock.notifyAll();
+        }
+    }
+}
+
+
diff --git a/src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java b/src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java
new file mode 100755
index 000000000..05cab1a0a
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.windows;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.windows.*;
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
+
+public class WindowsDisplay extends Display {
+
+    protected static final String WINDOW_CLASS_NAME = "NewtWindowClass";
+    private static int windowClassAtom;
+    private static long hInstance;
+
+    static {
+        NativeLibLoader.loadNEWT();
+
+        if (!WindowsWindow.initIDs()) {
+            throw new NativeWindowException("Failed to initialize WindowsWindow jmethodIDs");
+        }
+    }
+
+    public static void initSingleton() {
+        // just exist to ensure static init has been run
+    }
+
+
+    public WindowsDisplay() {
+    }
+
+    protected void createNative() {
+        aDevice = new WindowsGraphicsDevice();
+    }
+
+    protected void closeNative() { 
+        // Can't do .. only at application shutdown 
+        // UnregisterWindowClass(getWindowClassAtom(), getHInstance());
+    }
+
+    protected void dispatchMessages() {
+        DispatchMessages();
+    }
+
+    protected static synchronized int getWindowClassAtom() {
+        if(0 == windowClassAtom) {
+            windowClassAtom = RegisterWindowClass(WINDOW_CLASS_NAME, getHInstance());
+            if (0 == windowClassAtom) {
+                throw new NativeWindowException("Error while registering window class");
+            }
+        }
+        return windowClassAtom;
+    }
+
+    protected static synchronized long getHInstance() {
+        if(0 == hInstance) {
+            hInstance = LoadLibraryW("newt");
+            if (0 == hInstance) {
+                throw new NativeWindowException("Error finding HINSTANCE for \"newt\"");
+            }
+        }
+        return hInstance;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+    private static native long LoadLibraryW(String libraryName);
+    private static native int  RegisterWindowClass(String windowClassName, long hInstance);
+    private static native void UnregisterWindowClass(int wndClassAtom, long hInstance);
+
+    private static native void DispatchMessages();
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/windows/WindowsScreen.java b/src/newt/classes/com/jogamp/newt/windows/WindowsScreen.java
new file mode 100755
index 000000000..aea3cd439
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/windows/WindowsScreen.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.windows;
+
+import com.jogamp.newt.*;
+import javax.media.nativewindow.*;
+
+public class WindowsScreen extends Screen {
+    static {
+        WindowsDisplay.initSingleton();
+    }
+
+
+    public WindowsScreen() {
+    }
+
+    protected void createNative(int index) {
+        aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), index);
+        setScreenSize(getWidthImpl(getIndex()), getHeightImpl(getIndex()));
+    }
+
+    protected void closeNative() { }
+
+    private        native int getWidthImpl(int scrn_idx);
+    private        native int getHeightImpl(int scrn_idx);
+}
diff --git a/src/newt/classes/com/jogamp/newt/windows/WindowsWindow.java b/src/newt/classes/com/jogamp/newt/windows/WindowsWindow.java
new file mode 100755
index 000000000..4a468ae86
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/windows/WindowsWindow.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.windows;
+
+import javax.media.nativewindow.*;
+import com.jogamp.newt.*;
+
+public class WindowsWindow extends Window {
+
+    private long hmon;
+    private long hdc;
+    private long windowHandleClose;
+    private long parentWindowHandle;
+    // non fullscreen dimensions ..
+    private int nfs_width, nfs_height, nfs_x, nfs_y;
+    private final Insets insets = new Insets(0, 0, 0, 0);
+
+    static {
+        WindowsDisplay.initSingleton();
+    }
+
+    public WindowsWindow() {
+    }
+
+    Thread hdcOwner = null;
+
+    public synchronized int lockSurface() throws NativeWindowException {
+        int res = super.lockSurface(); 
+        if(LOCK_SUCCESS==res && 0!=windowHandle) {
+            if(hdc!=0) {
+                throw new NativeWindowException("NEWT Surface handle set HDC "+toHexString(hdc)+" - "+Thread.currentThread().getName()+" ; "+this);
+            }
+            hdc = GetDC(windowHandle);
+            hmon = MonitorFromWindow(windowHandle);
+            hdcOwner = Thread.currentThread();
+        }
+        return res;
+    }
+
+    public synchronized void unlockSurface() {
+        // prevalidate, before we change data ..
+        Thread cur = Thread.currentThread();
+        if ( getSurfaceLockOwner() != cur ) {
+            getLockedStack().printStackTrace();
+            throw new NativeWindowException(cur+": Not owner, owner is "+getSurfaceLockOwner());
+        }
+        if (0!=hdc && 0!=windowHandle) {
+            if(hdcOwner != cur) {
+                throw new NativeWindowException("NEWT Surface handle set HDC "+toHexString(hdc)+" by other thread "+hdcOwner+", this "+cur+" ; "+this);
+            }
+            ReleaseDC(windowHandle, hdc);
+            hdc=0;
+            hdcOwner=null;
+        }
+        super.unlockSurface();
+    }
+
+    public long getSurfaceHandle() {
+        return hdc;
+    }
+
+    public boolean hasDeviceChanged() {
+        if(0!=windowHandle) {
+            long _hmon = MonitorFromWindow(windowHandle);
+            if (hmon != _hmon) {
+                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                    Exception e = new Exception("!!! Window Device Changed "+Thread.currentThread().getName()+
+                                                ", HMON "+toHexString(hmon)+" -> "+toHexString(_hmon));
+                    e.printStackTrace();
+                }
+                hmon = _hmon;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        WindowsScreen  screen = (WindowsScreen) getScreen();
+        WindowsDisplay display = (WindowsDisplay) screen.getDisplay();
+        config = GraphicsConfigurationFactory.getFactory(display.getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, screen.getGraphicsScreen());
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+        windowHandle = CreateWindow(parentWindowHandle, 
+                                    display.getWindowClassAtom(), display.WINDOW_CLASS_NAME, display.getHInstance(), 
+                                    0, undecorated, x, y, width, height);
+        if (windowHandle == 0) {
+            throw new NativeWindowException("Error creating window");
+        }
+        this.parentWindowHandle = parentWindowHandle;
+        windowHandleClose = windowHandle;
+        if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+            Exception e = new Exception("!!! Window new window handle "+Thread.currentThread().getName()+
+                                        " (Parent HWND "+toHexString(parentWindowHandle)+
+                                        ") : HWND "+toHexString(windowHandle)+", "+Thread.currentThread());
+            e.printStackTrace();
+        }
+    }
+
+    protected void closeNative() {
+        if (hdc != 0) {
+            if(windowHandleClose != 0) {
+                ReleaseDC(windowHandleClose, hdc);
+            }
+            hdc = 0;
+        }
+        if(windowHandleClose != 0) {
+            DestroyWindow(windowHandleClose);
+            windowHandleClose = 0;
+        }
+    }
+
+    protected void windowDestroyed() {
+        windowHandleClose = 0;
+        super.windowDestroyed();
+    }
+
+    public void setVisible(boolean visible) {
+        if(this.visible!=visible && 0!=windowHandle) {
+            this.visible=visible;
+            setVisible0(windowHandle, visible);
+        }
+    }
+
+    // @Override
+    public void setSize(int width, int height) {
+        if (0!=windowHandle && (width != this.width || this.height != height)) {
+            if(!fullscreen) {
+                nfs_width=width;
+                nfs_height=height;
+            }
+            this.width = width;
+            this.height = height;
+            setSize0(parentWindowHandle, windowHandle, x, y, width, height);
+        }
+    }
+
+    //@Override
+    public void setPosition(int x, int y) {
+        if (0!=windowHandle && (this.x != x || this.y != y)) {
+            if(!fullscreen) {
+                nfs_x=x;
+                nfs_y=y;
+            }
+            this.x = x;
+            this.y = y;
+            setPosition(parentWindowHandle, windowHandle, x , y);
+        }
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        if(0!=windowHandle && (this.fullscreen!=fullscreen)) {
+            int x,y,w,h;
+            this.fullscreen=fullscreen;
+            if(fullscreen) {
+                x = 0; y = 0;
+                w = screen.getWidth();
+                h = screen.getHeight();
+            } else {
+                x = nfs_x;
+                y = nfs_y;
+                w = nfs_width;
+                h = nfs_height;
+            }
+            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                System.err.println("WindowsWindow fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
+            }
+            setFullscreen0(parentWindowHandle, windowHandle, x, y, w, h, undecorated, fullscreen);
+        }
+        return fullscreen;
+    }
+
+    // @Override
+    public void requestFocus() {
+        super.requestFocus();
+        if (windowHandle != 0L) {
+            requestFocus(windowHandle);
+        }
+    }
+
+    // @Override
+    public void setTitle(String title) {
+        if (title == null) {
+            title = "";
+        }
+        if (0!=windowHandle && !title.equals(getTitle())) {
+            super.setTitle(title);
+            setTitle(windowHandle, title);
+        }
+    }
+
+    public Insets getInsets() {
+        return (Insets)insets.clone();
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+    protected static native boolean initIDs();
+    private        native long CreateWindow(long parentWindowHandle, 
+                                            int wndClassAtom, String wndName, 
+                                            long hInstance, long visualID,
+                                            boolean isUndecorated,
+                                            int x, int y, int width, int height);
+    private        native void DestroyWindow(long windowHandle);
+    private        native long GetDC(long windowHandle);
+    private        native void ReleaseDC(long windowHandle, long hdc);
+    private        native long MonitorFromWindow(long windowHandle);
+    private static native void setVisible0(long windowHandle, boolean visible);
+    private        native void setSize0(long parentWindowHandle, long windowHandle, int x, int y, int width, int height);
+    private        native void setPosition(long parentWindowHandle, long windowHandle, int x, int y);
+    private        native void setFullscreen0(long parentWindowHandle, long windowHandle, int x, int y, int width, int height, boolean isUndecorated, boolean on);
+    private static native void setTitle(long windowHandle, String title);
+    private static native void requestFocus(long windowHandle);
+
+    private void insetsChanged(int left, int top, int right, int bottom) {
+        if (left != -1 && top != -1 && right != -1 && bottom != -1) {
+            insets.left = left;
+            insets.top = top;
+            insets.right = right;
+            insets.bottom = bottom;
+        }
+    }
+    private void sizeChanged(int newWidth, int newHeight) {
+        width = newWidth;
+        height = newHeight;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        }
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
+    }
+
+    private void positionChanged(int newX, int newY) {
+        x = newX;
+        y = newY;
+        if(!fullscreen) {
+            nfs_x=x;
+            nfs_y=y;
+        }
+        sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
+    }
+
+    /**
+     *
+     * @param focusOwner if focusGained is true, focusOwner is the previous
+     * focus owner, if focusGained is false, focusOwner is the new focus owner
+     * @param focusGained
+     */
+    private void focusChanged(long focusOwner, boolean focusGained) {
+        if (focusGained) {
+            sendWindowEvent(WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
+        } else {
+            sendWindowEvent(WindowEvent.EVENT_WINDOW_LOST_FOCUS);
+        }
+    }
+}
diff --git a/src/newt/classes/com/jogamp/newt/x11/X11Display.java b/src/newt/classes/com/jogamp/newt/x11/X11Display.java
new file mode 100755
index 000000000..b8eb80b39
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/x11/X11Display.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.x11;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
+import com.jogamp.nativewindow.impl.x11.X11Util;
+
+public class X11Display extends Display {
+    static {
+        NativeLibLoader.loadNEWT();
+
+        if (!initIDs()) {
+            throw new NativeWindowException("Failed to initialize X11Display jmethodIDs");
+        }
+
+        if (!X11Window.initIDs()) {
+            throw new NativeWindowException("Failed to initialize X11Window jmethodIDs");
+        }
+    }
+
+    public static void initSingleton() {
+        // just exist to ensure static init has been run
+    }
+
+
+    public X11Display() {
+    }
+
+    protected void createNative() {
+        long handle= X11Util.getThreadLocalDisplay(name);
+        if (handle == 0 ) {
+            throw new RuntimeException("Error creating display: "+name);
+        }
+        try {
+            CompleteDisplay(handle);
+        } catch(RuntimeException e) {
+            X11Util.closeThreadLocalDisplay(name);
+            throw e;
+        }
+        aDevice = new X11GraphicsDevice(handle);
+    }
+
+    protected void closeNative() {
+        if(0==X11Util.closeThreadLocalDisplay(name)) {
+            throw new NativeWindowException(this+" was not mapped");
+        }
+    }
+
+    protected void dispatchMessages() {
+        DispatchMessages(getHandle(), javaObjectAtom, windowDeleteAtom);
+    }
+
+    protected void lockDisplay() {
+        super.lockDisplay();
+        LockDisplay(getHandle());
+    }
+
+    protected void unlockDisplay() {
+        UnlockDisplay(getHandle());
+        super.unlockDisplay();
+    }
+
+    protected long getJavaObjectAtom() { return javaObjectAtom; }
+    protected long getWindowDeleteAtom() { return windowDeleteAtom; }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+    private static native boolean initIDs();
+
+    private native void LockDisplay(long handle);
+    private native void UnlockDisplay(long handle);
+
+    private native void CompleteDisplay(long handle);
+
+    private native void DispatchMessages(long display, long javaObjectAtom, long windowDeleteAtom);
+
+    private void displayCompleted(long javaObjectAtom, long windowDeleteAtom) {
+        this.javaObjectAtom=javaObjectAtom;
+        this.windowDeleteAtom=windowDeleteAtom;
+    }
+
+    private long windowDeleteAtom;
+    private long javaObjectAtom;
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/x11/X11Screen.java b/src/newt/classes/com/jogamp/newt/x11/X11Screen.java
new file mode 100755
index 000000000..e053d99c0
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/x11/X11Screen.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.x11;
+
+import com.jogamp.newt.*;
+import javax.media.nativewindow.x11.*;
+
+public class X11Screen extends Screen {
+
+    static {
+        X11Display.initSingleton();
+    }
+
+
+    public X11Screen() {
+    }
+
+    protected void createNative(int index) {
+        long handle = GetScreen(display.getHandle(), index);
+        if (handle == 0 ) {
+            throw new RuntimeException("Error creating screen: "+index);
+        }
+        aScreen = new X11GraphicsScreen((X11GraphicsDevice)getDisplay().getGraphicsDevice(), index);
+        setScreenSize(getWidth0(display.getHandle(), index),
+                      getHeight0(display.getHandle(), index));
+    }
+
+    protected void closeNative() { }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    private native long GetScreen(long dpy, int scrn_idx);
+    private native int  getWidth0(long display, int scrn_idx);
+    private native int  getHeight0(long display, int scrn_idx);
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/x11/X11Window.java b/src/newt/classes/com/jogamp/newt/x11/X11Window.java
new file mode 100755
index 000000000..cc3aa58a2
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/x11/X11Window.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ */
+
+package com.jogamp.newt.x11;
+
+import com.jogamp.newt.*;
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+
+public class X11Window extends Window {
+    private static final String WINDOW_CLASS_NAME = "NewtWindow";
+    // non fullscreen dimensions ..
+    private int nfs_width, nfs_height, nfs_x, nfs_y;
+
+    static {
+        X11Display.initSingleton();
+    }
+
+    public X11Window() {
+    }
+
+    protected void createNative(long parentWindowHandle, Capabilities caps) {
+        X11Screen screen = (X11Screen) getScreen();
+        X11Display display = (X11Display) screen.getDisplay();
+        config = GraphicsConfigurationFactory.getFactory(display.getGraphicsDevice()).chooseGraphicsConfiguration(caps, null, screen.getGraphicsScreen());
+        if (config == null) {
+            throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
+        }
+        X11GraphicsConfiguration x11config = (X11GraphicsConfiguration) config;
+        long visualID = x11config.getVisualID();
+        long w = CreateWindow(parentWindowHandle, 
+                              display.getHandle(), screen.getIndex(), visualID, 
+                              display.getJavaObjectAtom(), display.getWindowDeleteAtom(), x, y, width, height);
+        if (w == 0 || w!=windowHandle) {
+            throw new NativeWindowException("Error creating window: "+w);
+        }
+        this.parentWindowHandle = parentWindowHandle;
+        windowHandleClose = windowHandle;
+        displayHandleClose = display.getHandle();
+    }
+
+    protected void closeNative() {
+        if(0!=displayHandleClose && 0!=windowHandleClose && null!=getScreen() ) {
+            X11Display display = (X11Display) getScreen().getDisplay();
+            CloseWindow(displayHandleClose, windowHandleClose, display.getJavaObjectAtom());
+            windowHandleClose = 0;
+            displayHandleClose = 0;
+        }
+    }
+
+    protected void windowDestroyed() {
+        windowHandleClose = 0;
+        displayHandleClose = 0;
+        super.windowDestroyed();
+    }
+
+    public void setVisible(boolean visible) {
+        if(0!=windowHandle && this.visible!=visible) {
+            this.visible=visible;
+            setVisible0(getDisplayHandle(), windowHandle, visible);
+            clearEventMask();
+        }
+    }
+
+    public void requestFocus() {
+        super.requestFocus();
+    }
+
+    public void setSize(int width, int height) {
+        if(DEBUG_IMPLEMENTATION) {
+            System.err.println("X11Window setSize: "+this.x+"/"+this.y+" "+this.width+"x"+this.height+" -> "+width+"x"+height);
+            // Exception e = new Exception("XXXXXXXXXX");
+            // e.printStackTrace();
+        }
+        this.width = width;
+        this.height = height;
+        if(!fullscreen) {
+            nfs_width=width;
+            nfs_height=height;
+        }
+        if(0!=windowHandle) {
+            setSize0(parentWindowHandle, getDisplayHandle(), getScreenIndex(), windowHandle, x, y, width, height, (undecorated||fullscreen)?-1:1, false);
+        }
+    }
+
+    public void setPosition(int x, int y) {
+        if(DEBUG_IMPLEMENTATION) {
+            System.err.println("X11Window setPosition: "+this.x+"/"+this.y+" -> "+x+"/"+y);
+            // Exception e = new Exception("XXXXXXXXXX");
+            // e.printStackTrace();
+        }
+        this.x = x;
+        this.y = y;
+        if(!fullscreen) {
+            nfs_x=x;
+            nfs_y=y;
+        }
+        if(0!=windowHandle) {
+            setPosition0(getDisplayHandle(), windowHandle, x, y);
+        }
+    }
+
+    public boolean setFullscreen(boolean fullscreen) {
+        if(0!=windowHandle && this.fullscreen!=fullscreen) {
+            int x,y,w,h;
+            this.fullscreen=fullscreen;
+            if(fullscreen) {
+                x = 0; y = 0;
+                w = screen.getWidth();
+                h = screen.getHeight();
+            } else {
+                x = nfs_x;
+                y = nfs_y;
+                w = nfs_width;
+                h = nfs_height;
+            }
+            if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
+                System.err.println("X11Window fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h);
+            }
+            setSize0(parentWindowHandle, getDisplayHandle(), getScreenIndex(), windowHandle, x, y, w, h, (undecorated||fullscreen)?-1:1, false);
+        }
+        return fullscreen;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only
+    //
+
+    protected static native boolean initIDs();
+    private        native long CreateWindow(long parentWindowHandle, long display, int screen_index, 
+                                            long visualID, long javaObjectAtom, long windowDeleteAtom, int x, int y, int width, int height);
+    private        native void CloseWindow(long display, long windowHandle, long javaObjectAtom);
+    private        native void setVisible0(long display, long windowHandle, boolean visible);
+    private        native void setSize0(long parentWindowHandle, long display, int screen_index, long windowHandle, 
+                                        int x, int y, int width, int height, int decorationToggle, boolean setVisible);
+    private        native void setPosition0(long display, long windowHandle, int x, int y);
+
+    private void windowChanged(int newX, int newY, int newWidth, int newHeight) {
+        if(width != newWidth || height != newHeight) {
+            if(DEBUG_IMPLEMENTATION) {
+                System.err.println("X11Window windowChanged size: "+this.width+"x"+this.height+" -> "+newWidth+"x"+newHeight);
+            }
+            width = newWidth;
+            height = newHeight;
+            if(!fullscreen) {
+                nfs_width=width;
+                nfs_height=height;
+            }
+            sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED);
+        }
+        if( 0==parentWindowHandle && ( x != newX || y != newY ) ) {
+            if(DEBUG_IMPLEMENTATION) {
+                System.err.println("X11Window windowChanged position: "+this.x+"/"+this.y+" -> "+newX+"x"+newY);
+            }
+            x = newX;
+            y = newY;
+            if(!fullscreen) {
+                nfs_x=x;
+                nfs_y=y;
+            }
+            sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED);
+        }
+    }
+
+    private void windowCreated(long windowHandle) {
+        this.windowHandle = windowHandle;
+    }
+
+    private long   windowHandleClose;
+    private long   displayHandleClose;
+    private long   parentWindowHandle;
+}
diff --git a/src/newt/native/BroadcomEGL.c b/src/newt/native/BroadcomEGL.c
index 8a9c5f948..9aac90abb 100755
--- a/src/newt/native/BroadcomEGL.c
+++ b/src/newt/native/BroadcomEGL.c
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "com_jogamp_javafx_newt_opengl_broadcom_egl_Window.h"
+#include "com_jogamp_newt_opengl_broadcom_egl_Window.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -72,7 +72,7 @@ static jmethodID windowCreatedID = NULL;
  * Display
  */
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Display_DispatchMessages
   (JNIEnv *env, jobject obj)
 {
     // FIXME: n/a
@@ -80,7 +80,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_D
     (void) obj;
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_CreateDisplay
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Display_CreateDisplay
   (JNIEnv *env, jobject obj, jint width, jint height)
 {
     (void) env;
@@ -94,7 +94,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_
     return (jlong) (intptr_t) dpy;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_DestroyDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Display_DestroyDisplay
   (JNIEnv *env, jobject obj, jlong display)
 {
     EGLDisplay dpy  = (EGLDisplay)(intptr_t)display;
@@ -111,7 +111,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_D
  * Window
  */
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Window_initIDs
   (JNIEnv *env, jclass clazz)
 {
     windowCreatedID = (*env)->GetMethodID(env, clazz, "windowCreated", "(III)V");
@@ -123,7 +123,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Windo
     return JNI_TRUE;
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_CreateWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Window_CreateWindow
   (JNIEnv *env, jobject obj, jlong display, jboolean chromaKey, jint width, jint height)
 {
     EGLDisplay dpy  = (EGLDisplay)(intptr_t)display;
@@ -167,7 +167,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_C
     return (jlong) (intptr_t) window;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_CloseWindow
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Window_CloseWindow
   (JNIEnv *env, jobject obj, jlong display, jlong window)
 {
     EGLDisplay dpy  = (EGLDisplay) (intptr_t) display;
@@ -180,7 +180,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_Cl
     DBG_PRINT( "[CloseWindow] X\n");
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_SwapWindow
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Window_SwapWindow
   (JNIEnv *env, jobject obj, jlong display, jlong window)
 {
     EGLDisplay dpy  = (EGLDisplay) (intptr_t) display;
diff --git a/src/newt/native/IntelGDL.c b/src/newt/native/IntelGDL.c
index 77f582885..7857b594f 100644
--- a/src/newt/native/IntelGDL.c
+++ b/src/newt/native/IntelGDL.c
@@ -37,9 +37,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "com_jogamp_javafx_newt_intel_gdl_Display.h"
-#include "com_jogamp_javafx_newt_intel_gdl_Screen.h"
-#include "com_jogamp_javafx_newt_intel_gdl_Window.h"
+#include "com_jogamp_newt_intel_gdl_Display.h"
+#include "com_jogamp_newt_intel_gdl_Screen.h"
+#include "com_jogamp_newt_intel_gdl_Window.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -123,7 +123,7 @@ static void JNI_ThrowNew(JNIEnv *env, const char *throwable, const char* message
  * Display
  */
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_newt_intel_gdl_Display_DispatchMessages
   (JNIEnv *env, jobject obj, jlong displayHandle, jobject focusedWindow)
 {
     // FIXME: n/a
@@ -138,7 +138,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_DispatchMes
     } */
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_CreateDisplay
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_intel_gdl_Display_CreateDisplay
   (JNIEnv *env, jobject obj)
 {
     gdl_ret_t retval;
@@ -171,7 +171,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_CreateDisp
     return (jlong) (intptr_t) p_driver_info;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_DestroyDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_newt_intel_gdl_Display_DestroyDisplay
   (JNIEnv *env, jobject obj, jlong displayHandle)
 {
     gdl_driver_info_t * p_driver_info = (gdl_driver_info_t *) (intptr_t) displayHandle;
@@ -190,7 +190,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_DestroyDisp
  * Screen
  */
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Screen_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_intel_gdl_Screen_initIDs
   (JNIEnv *env, jclass clazz)
 {
     screenCreatedID = (*env)->GetMethodID(env, clazz, "screenCreated", "(II)V");
@@ -202,7 +202,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Screen_initIDs
     return JNI_TRUE;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Screen_GetScreenInfo
+JNIEXPORT void JNICALL Java_com_jogamp_newt_intel_gdl_Screen_GetScreenInfo
   (JNIEnv *env, jobject obj, jlong displayHandle, jint idx)
 {
     gdl_driver_info_t * p_driver_info = (gdl_driver_info_t *) (intptr_t) displayHandle;
@@ -234,7 +234,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Screen_GetScreenInf
  * Window
  */
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_intel_gdl_Window_initIDs
   (JNIEnv *env, jclass clazz)
 {
     updateBoundsID = (*env)->GetMethodID(env, clazz, "updateBounds", "(IIII)V");
@@ -246,7 +246,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_initIDs
     return JNI_TRUE;
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_CreateSurface
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_intel_gdl_Window_CreateSurface
   (JNIEnv *env, jobject obj, jlong displayHandle, jint scr_width, jint scr_height, jint x, jint y, jint width, jint height) {
 
     gdl_driver_info_t * p_driver_info = (gdl_driver_info_t *) (intptr_t) displayHandle;
@@ -339,7 +339,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_CreateSurfa
     return (jlong) (intptr_t) plane;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_CloseSurface
+JNIEXPORT void JNICALL Java_com_jogamp_newt_intel_gdl_Window_CloseSurface
   (JNIEnv *env, jobject obj, jlong display, jlong surface)
 {
     gdl_plane_id_t plane = (gdl_plane_id_t) (intptr_t) surface ;
@@ -348,7 +348,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_CloseSurface
     DBG_PRINT("[CloseSurface] plane %d\n", plane);
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_SetBounds0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_intel_gdl_Window_SetBounds0
   (JNIEnv *env, jobject obj, jlong surface, jint scr_width, jint scr_height, jint x, jint y, jint width, jint height) {
 
     gdl_plane_id_t plane = (gdl_plane_id_t) (intptr_t) surface ;
diff --git a/src/newt/native/KDWindow.c b/src/newt/native/KDWindow.c
index 31e8017f4..15bef7582 100755
--- a/src/newt/native/KDWindow.c
+++ b/src/newt/native/KDWindow.c
@@ -64,7 +64,7 @@
 #include <KD/kd.h>
 #include <KD/NV_extwindowprops.h>
 
-#include "com_jogamp_javafx_newt_opengl_kd_KDWindow.h"
+#include "com_jogamp_newt_opengl_kd_KDWindow.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -103,7 +103,7 @@ static jmethodID sendKeyEventID = NULL;
  * Display
  */
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDDisplay_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_kd_KDDisplay_DispatchMessages
   (JNIEnv *env, jobject obj)
 {
     const KDEvent * evt;
@@ -200,7 +200,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDDisplay_DispatchM
  * Window
  */
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_initIDs
   (JNIEnv *env, jclass clazz)
 {
 #ifdef VERBOSE_ON
@@ -228,7 +228,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_initID
     return JNI_TRUE;
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_CreateWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_CreateWindow
   (JNIEnv *env, jobject obj, jlong display, jintArray jAttrs)
 {
     jint * attrs = NULL;
@@ -270,7 +270,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_CreateWin
     return (jlong) (intptr_t) window;
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_RealizeWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_RealizeWindow
   (JNIEnv *env, jobject obj, jlong window)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -285,7 +285,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_RealizeWi
     return (jlong) (intptr_t) nativeWindow;
 }
 
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_CloseWindow
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_CloseWindow
   (JNIEnv *env, jobject obj, jlong window, jlong juserData)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -299,11 +299,11 @@ JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_CloseWindo
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_opengl_kd_KDWindow
+ * Class:     com_jogamp_newt_opengl_kd_KDWindow
  * Method:    setVisible0
  * Signature: (JJZ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setVisible0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_setVisible0
   (JNIEnv *env, jobject obj, jlong window, jboolean visible)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -312,7 +312,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setVisible
     DBG_PRINT( "[setVisible] v=%d\n", visible);
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setFullScreen0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_setFullScreen0
   (JNIEnv *env, jobject obj, jlong window, jboolean fullscreen)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -323,7 +323,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setFullScr
     (void)res;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setSize0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_setSize0
   (JNIEnv *env, jobject obj, jlong window, jint width, jint height)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
diff --git a/src/newt/native/MacWindow.m b/src/newt/native/MacWindow.m
index 1749805c8..01563a0d1 100644
--- a/src/newt/native/MacWindow.m
+++ b/src/newt/native/MacWindow.m
@@ -33,7 +33,7 @@
 
 #import <inttypes.h>
 
-#import "com_sun_javafx_newt_macosx_MacWindow.h"
+#import "com_sun_newt_macosx_MacWindow.h"
 #import "NewtMacWindow.h"
 
 #import "EventListener.h"
@@ -121,11 +121,11 @@ NS_ENDHANDLER
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacDisplay
+ * Class:     com_sun_newt_macosx_MacDisplay
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_macosx_MacDisplay_initNSApplication
+JNIEXPORT jboolean JNICALL Java_com_sun_newt_macosx_MacDisplay_initNSApplication
   (JNIEnv *env, jclass clazz)
 {
     static int initialized = 0;
@@ -155,11 +155,11 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_macosx_MacDisplay_initNSAppl
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacDisplay
+ * Class:     com_sun_newt_macosx_MacDisplay
  * Method:    dispatchMessages0
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacDisplay_dispatchMessages0
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacDisplay_dispatchMessages0
   (JNIEnv *env, jobject unused, jlong window, jint eventMask)
 {
     NSEvent* event = NULL;
@@ -195,11 +195,11 @@ NS_ENDHANDLER
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacScreen
+ * Class:     com_sun_newt_macosx_MacScreen
  * Method:    getWidthImpl
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_macosx_MacScreen_getWidthImpl
+JNIEXPORT jint JNICALL Java_com_sun_newt_macosx_MacScreen_getWidthImpl
   (JNIEnv *env, jclass clazz, jint screen_idx)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -216,11 +216,11 @@ JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_macosx_MacScreen_getWidthImpl
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacScreen
+ * Class:     com_sun_newt_macosx_MacScreen
  * Method:    getHeightImpl
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_macosx_MacScreen_getHeightImpl
+JNIEXPORT jint JNICALL Java_com_sun_newt_macosx_MacScreen_getHeightImpl
   (JNIEnv *env, jclass clazz, jint screen_idx)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -237,11 +237,11 @@ JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_macosx_MacScreen_getHeightImpl
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_initIDs
+JNIEXPORT jboolean JNICALL Java_com_sun_newt_macosx_MacWindow_initIDs
   (JNIEnv *env, jclass clazz)
 {
     static int initialized = 0;
@@ -258,11 +258,11 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_initIDs
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    createWindow0
  * Signature: (JIIIIZIIIJ)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_createWindow0
+JNIEXPORT jlong JNICALL Java_com_sun_newt_macosx_MacWindow_createWindow0
   (JNIEnv *env, jobject jthis, jlong parent, jint x, jint y, jint w, jint h, jboolean fullscreen, jint styleMask, 
    jint bufferingType, jint screen_idx, jlong jview)
 {
@@ -334,11 +334,11 @@ NS_ENDHANDLER
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    makeKeyAndOrderFront
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_makeKeyAndOrderFront
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_makeKeyAndOrderFront
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -348,11 +348,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_makeKeyAndOrder
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    makeKey
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_makeKey
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_makeKey
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -362,11 +362,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_makeKey
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    orderOut
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_orderOut
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_orderOut
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -376,11 +376,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_orderOut
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    close0
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_close0
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_close0
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -401,11 +401,11 @@ NS_ENDHANDLER
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    setTitle0
  * Signature: (JLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_setTitle0
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_setTitle0
   (JNIEnv *env, jobject unused, jlong window, jstring title)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -417,11 +417,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_setTitle0
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    contentView
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_contentView
+JNIEXPORT jlong JNICALL Java_com_sun_newt_macosx_MacWindow_contentView
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -432,11 +432,11 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_contentView
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    changeContentView
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_changeContentView
+JNIEXPORT jlong JNICALL Java_com_sun_newt_macosx_MacWindow_changeContentView
   (JNIEnv *env, jobject jthis, jlong parent, jlong window, jlong jview)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -452,11 +452,11 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_changeContentV
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    setContentSize
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_setContentSize
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_setContentSize
   (JNIEnv *env, jobject unused, jlong window, jint w, jint h)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -467,11 +467,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_setContentSize
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    setFrameTopLeftPoint
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_setFrameTopLeftPoint
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_setFrameTopLeftPoint
   (JNIEnv *env, jobject unused, jlong parent, jlong window, jint x, jint y)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
diff --git a/src/newt/native/WindowsWindow.c b/src/newt/native/WindowsWindow.c
index d39b96d0b..67da99b1f 100755
--- a/src/newt/native/WindowsWindow.c
+++ b/src/newt/native/WindowsWindow.c
@@ -89,7 +89,7 @@
 #define MONITOR_DEFAULTTONEAREST 2
 #endif
 
-#include "com_jogamp_javafx_newt_windows_WindowsWindow.h"
+#include "com_jogamp_newt_windows_WindowsWindow.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -902,11 +902,11 @@ static LRESULT CALLBACK wndProc(HWND wnd, UINT message,
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsDisplay
+ * Class:     com_jogamp_newt_windows_WindowsDisplay
  * Method:    DispatchMessages
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsDisplay_DispatchMessages
   (JNIEnv *env, jclass clazz)
 {
     int i = 0;
@@ -925,11 +925,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_Dispat
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsDisplay
+ * Class:     com_jogamp_newt_windows_WindowsDisplay
  * Method:    LoadLibraryW
  * Signature: (Ljava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_LoadLibraryW
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_windows_WindowsDisplay_LoadLibraryW
   (JNIEnv *env, jclass clazz, jstring dllName)
 {
     jchar* _dllName = GetNullTerminatedStringChars(env, dllName);
@@ -939,11 +939,11 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_LoadL
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsDisplay
+ * Class:     com_jogamp_newt_windows_WindowsDisplay
  * Method:    RegisterWindowClass
  * Signature: (Ljava/lang/String;J)I
  */
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_RegisterWindowClass
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_windows_WindowsDisplay_RegisterWindowClass
   (JNIEnv *env, jclass clazz, jstring wndClassName, jlong hInstance)
 {
     ATOM res;
@@ -979,44 +979,44 @@ JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_Regist
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsDisplay
+ * Class:     com_jogamp_newt_windows_WindowsDisplay
  * Method:    CleanupWindowResources
  * Signature: (java/lang/String;J)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_UnregisterWindowClass
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsDisplay_UnregisterWindowClass
   (JNIEnv *env, jclass clazz, jint wndClassAtom, jlong hInstance)
 {
     UnregisterClass(MAKEINTATOM(wndClassAtom), (HINSTANCE) (intptr_t) hInstance);
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsScreen
+ * Class:     com_jogamp_newt_windows_WindowsScreen
  * Method:    getWidthImpl
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_windows_WindowsScreen_getWidthImpl
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_windows_WindowsScreen_getWidthImpl
   (JNIEnv *env, jobject obj, jint scrn_idx)
 {
     return (jint)GetSystemMetrics(SM_CXSCREEN);
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsScreen
+ * Class:     com_jogamp_newt_windows_WindowsScreen
  * Method:    getWidthImpl
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_windows_WindowsScreen_getHeightImpl
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_windows_WindowsScreen_getHeightImpl
   (JNIEnv *env, jobject obj, jint scrn_idx)
 {
     return (jint)GetSystemMetrics(SM_CYSCREEN);
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_windows_WindowsWindow_initIDs
   (JNIEnv *env, jclass clazz)
 {
     sizeChangedID = (*env)->GetMethodID(env, clazz, "sizeChanged", "(II)V");
@@ -1045,11 +1045,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_ini
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    CreateWindow
  * Signature: (JILjava/lang/String;JJZIIII)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_CreateWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_windows_WindowsWindow_CreateWindow
   (JNIEnv *env, jobject obj, jlong parent, jint wndClassAtom, jstring jWndName, jlong hInstance, jlong visualID,
         jboolean bIsUndecorated,
         jint jx, jint jy, jint defaultWidth, jint defaultHeight)
@@ -1113,44 +1113,44 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_Create
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    DestroyWindow
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_DestroyWindow
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_DestroyWindow
   (JNIEnv *env, jobject obj, jlong window)
 {
     DestroyWindow((HWND) (intptr_t) window);
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    GetDC
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_GetDC
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_windows_WindowsWindow_GetDC
   (JNIEnv *env, jobject obj, jlong window)
 {
     return (jlong) (intptr_t) GetDC((HWND) (intptr_t) window);
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    ReleaseDC
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_ReleaseDC
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_ReleaseDC
   (JNIEnv *env, jobject obj, jlong window, jlong dc)
 {
     ReleaseDC((HWND) (intptr_t) window, (HDC) (intptr_t) dc);
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    MonitorFromWindow
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_MonitorFromWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_windows_WindowsWindow_MonitorFromWindow
   (JNIEnv *env, jobject obj, jlong window)
 {
     #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410 || WINVER >= 0x0500) && !defined(_WIN32_WCE)
@@ -1161,11 +1161,11 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_Monito
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    setVisible0
  * Signature: (JZ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setVisible0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_setVisible0
   (JNIEnv *_env, jclass clazz, jlong window, jboolean visible)
 {
     HWND hWnd = (HWND) (intptr_t) window;
@@ -1178,11 +1178,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setVisi
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    setSize0
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setSize0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_setSize0
   (JNIEnv *env, jobject obj, jlong parent, jlong window, jint x, jint y, jint width, jint height)
 {
     HWND hwndP = (HWND) (intptr_t) parent;
@@ -1215,11 +1215,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setSize
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    setPosition
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setPosition
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_setPosition
   (JNIEnv *env, jobject obj, jlong parent, jlong window, jint x, jint y)
 {
     UINT flags = SWP_NOACTIVATE | SWP_NOSIZE;
@@ -1236,11 +1236,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setPosi
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    setFullscreen
  * Signature: (JIIIIZZ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setFullscreen0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_setFullscreen0
   (JNIEnv *env, jobject obj, jlong parent, jlong window, jint x, jint y, jint width, jint height, jboolean bIsUndecorated, jboolean on)
 {
     UINT flags;
@@ -1272,11 +1272,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setFull
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    setTitle
  * Signature: (JLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setTitle
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_setTitle
   (JNIEnv *env, jclass clazz, jlong window, jstring title)
 {
     HWND hwnd = (HWND) (intptr_t) window;
@@ -1290,11 +1290,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setTitl
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    requestFocus
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_requestFocus
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_requestFocus
   (JNIEnv *env, jclass clazz, jlong window)
 {
     HWND hwnd = (HWND) (intptr_t) window;
diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index 682184da0..11f7d0f6c 100755
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -46,7 +46,7 @@
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
-#include "com_jogamp_javafx_newt_x11_X11Window.h"
+#include "com_jogamp_newt_x11_X11Window.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -154,7 +154,7 @@ static const char * const ClazzNameRuntimeException =
 static jclass    runtimeExceptionClz=NULL;
 
 static const char * const ClazzNameNewtWindow = 
-                            "com/jogamp/javafx/newt/Window";
+                            "com/jogamp/newt/Window";
 static jclass    newtWindowClz=NULL;
 
 static jmethodID windowChangedID = NULL;
@@ -187,11 +187,11 @@ static void _throwNewRuntimeException(Display * unlockDisplay, JNIEnv *env, cons
  */
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_newt_x11_X11Display
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_x11_X11Display_initIDs
   (JNIEnv *env, jclass clazz)
 {
     jclass c;
@@ -237,11 +237,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_initIDs
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_newt_x11_X11Display
  * Method:    LockDisplay
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_LockDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_LockDisplay
   (JNIEnv *env, jobject obj, jlong display)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -253,11 +253,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_LockDisplay
 
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_newt_x11_X11Display
  * Method:    UnlockDisplay
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_UnlockDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_UnlockDisplay
   (JNIEnv *env, jobject obj, jlong display)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -269,11 +269,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_UnlockDisplay
 
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_newt_x11_X11Display
  * Method:    CompleteDisplay
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_CompleteDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_CompleteDisplay
   (JNIEnv *env, jobject obj, jlong display)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -381,11 +381,11 @@ static jobject getJavaWindowProperty(JNIEnv *env, Display *dpy, Window window, j
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_newt_x11_X11Display
  * Method:    DispatchMessages
  * Signature: (JIJJ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
   (JNIEnv *env, jobject obj, jlong display, jlong javaObjectAtom, jlong wmDeleteAtom)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -532,11 +532,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_DispatchMessag
  */
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Screen
+ * Class:     com_jogamp_newt_x11_X11Screen
  * Method:    GetScreen
  * Signature: (JI)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_GetScreen
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_x11_X11Screen_GetScreen
   (JNIEnv *env, jobject obj, jlong display, jint screen_index)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -559,14 +559,14 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_GetScreen
     return (jlong) (intptr_t) scrn;
 }
 
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_getWidth0
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_x11_X11Screen_getWidth0
   (JNIEnv *env, jobject obj, jlong display, jint scrn_idx)
 {
     Display * dpy = (Display *) (intptr_t) display;
     return (jint) XDisplayWidth( dpy, scrn_idx);
 }
 
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_getHeight0
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_x11_X11Screen_getHeight0
   (JNIEnv *env, jobject obj, jlong display, jint scrn_idx)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -579,11 +579,11 @@ JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_getHeight0
  */
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_newt_x11_X11Window
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_x11_X11Window_initIDs
   (JNIEnv *env, jclass clazz)
 {
     windowChangedID = (*env)->GetMethodID(env, clazz, "windowChanged", "(IIII)V");
@@ -605,11 +605,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_initIDs
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_newt_x11_X11Window
  * Method:    CreateWindow
  * Signature: (JJIJIIII)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_CreateWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_x11_X11Window_CreateWindow
   (JNIEnv *env, jobject obj, jlong parent, jlong display, jint screen_index, 
                              jlong visualID, 
                              jlong javaObjectAtom, jlong windowDeleteAtom, 
@@ -734,11 +734,11 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_CreateWindow
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_newt_x11_X11Window
  * Method:    CloseWindow
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_CloseWindow
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_CloseWindow
   (JNIEnv *env, jobject obj, jlong display, jlong window, jlong javaObjectAtom)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -779,11 +779,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_CloseWindow
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_newt_x11_X11Window
  * Method:    setVisible0
  * Signature: (JJZ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setVisible0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_setVisible0
   (JNIEnv *env, jobject obj, jlong display, jlong window, jboolean visible)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -823,11 +823,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setVisible0
 #endif
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_newt_x11_X11Window
  * Method:    setSize0
  * Signature: (JIJIIIIIZ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setSize0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_setSize0
   (JNIEnv *env, jobject obj, jlong jparent, jlong display, jint screen_index, jlong window, jint x, jint y, jint width, jint height, jint decorationToggle, jboolean setVisible)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -887,11 +887,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setSize0
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_newt_x11_X11Window
  * Method:    setPosition0
  * Signature: (JJII)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setPosition0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_setPosition0
   (JNIEnv *env, jobject obj, jlong display, jlong window, jint x, jint y)
 {
     Display * dpy = (Display *) (intptr_t) display;
-- 
cgit v1.2.3


From 49b145b3fb10b2dd070615c60613d69ca44d4548 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 29 Mar 2010 04:51:09 +0200
Subject: Add uint32_t

---
 make/stub_includes/opengl/gl3-64bit-types.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/make/stub_includes/opengl/gl3-64bit-types.h b/make/stub_includes/opengl/gl3-64bit-types.h
index fc8b4ce05..64f12398a 100644
--- a/make/stub_includes/opengl/gl3-64bit-types.h
+++ b/make/stub_includes/opengl/gl3-64bit-types.h
@@ -25,12 +25,14 @@
         #include <stdint.h>
     #elif defined(__UNIXOS2__) || defined(__SOL64__)
         typedef long int int32_t;
+        typedef unsigned long int uint32_t;
         typedef long long int int64_t;
         typedef unsigned long long int uint64_t;
     #elif defined(WIN32) && defined(__GNUC__)
         #include <stdint.h>
     #elif defined(_WIN32)
         typedef __int32 int32_t;
+        typedef unsigned __int32 uint32_t;
         typedef __int64 int64_t;
         typedef unsigned __int64 uint64_t;
     #else
-- 
cgit v1.2.3


From b0405165d42a826cb4bfb818592f2db1b08c074d Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Mon, 29 Mar 2010 04:59:41 +0200
Subject: renamed platform dependent BufferUtil into java file.

---
 make/build-jogl.xml                                |   4 +-
 .../classes/com/jogamp/opengl/util/BufferUtil.java | 499 +++++++++++++++++++++
 .../opengl/util/BufferUtil.java.javame_cdc_fp      | 449 ------------------
 .../com/jogamp/opengl/util/BufferUtil.java.javase  | 499 ---------------------
 4 files changed, 500 insertions(+), 951 deletions(-)
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java
 delete mode 100755 src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp
 delete mode 100755 src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 4a0bac4d5..ec91df36a 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -499,7 +499,6 @@
 
     <target name="setup.javacdc">
         <copy file="../src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/impl/SystemUtil.java" />
-        <copy file="../src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/BufferUtil.java" />
         <copy file="../src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/impl/InternalBufferUtil.java" />
         <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/TextureIO.java" />
         <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/spi/DDSImage.java" />
@@ -508,7 +507,6 @@
 
     <target name="setup.javase">
         <copy file="../src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/impl/SystemUtil.java" />
-        <copy file="../src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/BufferUtil.java" />
         <copy file="../src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/impl/InternalBufferUtil.java" />
         <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/TextureIO.java" />
         <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/spi/DDSImage.java" />
@@ -1193,12 +1191,12 @@
         </javac>
     </target>
 
+           <!--    bootclasspath="${javac.bootclasspath-cdc.jar}" -->
     <target name="java.compile.secondpass.javacdc" unless="setup.noCDC">
         <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
         <javac destdir="${classes-cdc}"
                excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all},${java.excludes.cdcfp}"
                source="${jogl.sourcelevel}"
-               bootclasspath="${javac.bootclasspath-cdc.jar}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
diff --git a/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java
new file mode 100755
index 000000000..fde1e8681
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java
@@ -0,0 +1,499 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.util;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
+import javax.media.opengl.GL2ES2;
+import javax.media.opengl.GLException;
+import javax.media.opengl.GLProfile;
+
+import java.nio.*;
+import java.util.*;
+
+import java.lang.reflect.*;
+
+/** Utility routines for dealing with direct buffers. */
+
+public class BufferUtil {
+  public static final int SIZEOF_BYTE = 1;
+  public static final int SIZEOF_SHORT = 2;
+  public static final int SIZEOF_INT = 4;
+  public static final int SIZEOF_FLOAT = 4;
+  public static final int SIZEOF_LONG = 8;
+  public static final int SIZEOF_DOUBLE = 8;
+
+  public static final int sizeOfGLType(int glType) {
+        switch (glType) {
+            case GL.GL_UNSIGNED_BYTE:
+                return SIZEOF_BYTE;
+            case GL.GL_BYTE:
+                return SIZEOF_BYTE;
+            case GL.GL_UNSIGNED_SHORT:
+                return SIZEOF_SHORT;
+            case GL.GL_SHORT:
+                return SIZEOF_SHORT;
+            case GL.GL_FLOAT:
+                return SIZEOF_FLOAT;
+            case GL.GL_FIXED:
+                return SIZEOF_INT;
+            case GL2ES2.GL_INT:
+                return SIZEOF_INT;
+            case GL2ES2.GL_UNSIGNED_INT:
+                return SIZEOF_INT;
+            case GL2.GL_DOUBLE:
+                return SIZEOF_DOUBLE;
+        }
+        return -1;
+  }
+
+  public static final int sizeOfBufferElem(Buffer buffer) {
+        if (buffer == null) {
+            return 0;
+        }
+        if (buffer instanceof ByteBuffer) {
+            return BufferUtil.SIZEOF_BYTE;
+        } else if (buffer instanceof IntBuffer) {
+            return BufferUtil.SIZEOF_INT;
+        } else if (buffer instanceof ShortBuffer) {
+            return BufferUtil.SIZEOF_SHORT;
+        } else if (buffer instanceof FloatBuffer) {
+            return BufferUtil.SIZEOF_FLOAT;
+        } else if (buffer instanceof DoubleBuffer) {
+            return BufferUtil.SIZEOF_DOUBLE;
+        }
+        throw new RuntimeException("Unexpected buffer type " +
+                                   buffer.getClass().getName());
+  }
+
+  private BufferUtil() {}
+
+  //----------------------------------------------------------------------
+  // Allocation routines
+  //
+
+  public static final Buffer newGLBuffer(int glType, int numElements) {
+        switch (glType) {
+            case GL.GL_UNSIGNED_BYTE:
+            case GL.GL_BYTE:
+                return newByteBuffer(numElements);
+            case GL.GL_UNSIGNED_SHORT:
+            case GL.GL_SHORT:
+                return newShortBuffer(numElements);
+            case GL.GL_FLOAT:
+                return newFloatBuffer(numElements);
+            case GL.GL_FIXED:
+            case GL2ES2.GL_INT:
+            case GL2ES2.GL_UNSIGNED_INT:
+                return newIntBuffer(numElements);
+            case GL2.GL_DOUBLE:
+                return newDoubleBuffer(numElements);
+        }
+        return null;
+  }
+
+  public static final Buffer sliceGLBuffer(ByteBuffer parent, int bytePos, int byteLen, int glType) {
+        if(parent==null || byteLen==0) return null;
+        parent.position(bytePos);
+        parent.limit(bytePos + byteLen);
+
+        switch (glType) {
+            case GL.GL_UNSIGNED_BYTE:
+            case GL.GL_BYTE:
+                return parent.slice();
+            case GL.GL_UNSIGNED_SHORT:
+            case GL.GL_SHORT:
+                return parent.asShortBuffer();
+            case GL.GL_FLOAT:
+                return parent.asFloatBuffer();
+            case GL.GL_FIXED:
+            case GL2ES2.GL_INT:
+            case GL2ES2.GL_UNSIGNED_INT:
+                return parent.asIntBuffer();
+            case GL2.GL_DOUBLE:
+                return parent.asDoubleBuffer();
+        }
+        return null;
+  }
+
+  /** Allocates a new direct ByteBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static ByteBuffer newByteBuffer(int numElements) {
+    ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
+    nativeOrder(bb);
+    return bb;
+  }
+    
+  public static ByteBuffer newByteBuffer(byte[] values, int offset, int len) {
+    ByteBuffer bb = newByteBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static ByteBuffer newByteBuffer(byte[] values, int offset) {
+    return newByteBuffer(values, offset, values.length-offset);
+  }
+    
+  public static ByteBuffer newByteBuffer(byte[] values) {
+    return newByteBuffer(values, 0);
+  }
+    
+    
+  /** Allocates a new direct DoubleBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static DoubleBuffer newDoubleBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_DOUBLE);
+    return bb.asDoubleBuffer();
+  }
+
+  public static DoubleBuffer newDoubleBuffer(double[] values, int offset) {
+    int len = values.length-offset;
+    DoubleBuffer bb = newDoubleBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static DoubleBuffer newDoubleBuffer(double[] values) {
+    return newDoubleBuffer(values, 0);
+  }
+    
+
+  /** Allocates a new direct FloatBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static FloatBuffer newFloatBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_FLOAT);
+    return bb.asFloatBuffer();
+  }
+    
+  public static FloatBuffer newFloatBuffer(float[] values, int offset, int len) {
+    FloatBuffer bb = newFloatBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static FloatBuffer newFloatBuffer(float[] values, int offset) {
+    return newFloatBuffer(values, 0, values.length-offset);
+  }
+
+  public static FloatBuffer newFloatBuffer(float[] values) {
+    return newFloatBuffer(values, 0);
+  }
+    
+    
+  /** Allocates a new direct IntBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static IntBuffer newIntBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
+    return bb.asIntBuffer();
+  }
+    
+  public static IntBuffer newIntBuffer(int[] values, int offset, int len) {
+    IntBuffer bb = newIntBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static IntBuffer newIntBuffer(int[] values, int offset) {
+    return newIntBuffer(values, 0, values.length-offset);
+  }
+
+  public static IntBuffer newIntBuffer(int[] values) {
+    return newIntBuffer(values, 0);
+  }
+    
+  /** Allocates a new direct LongBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static LongBuffer newLongBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_LONG);
+    return bb.asLongBuffer();
+  }
+
+  /** Allocates a new direct ShortBuffer with the specified number of
+      elements. The returned buffer will have its byte order set to
+      the host platform's native byte order. */
+  public static ShortBuffer newShortBuffer(int numElements) {
+    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_SHORT);
+    return bb.asShortBuffer();
+  }
+
+  public static ShortBuffer newShortBuffer(short[] values, int offset, int len) {
+    ShortBuffer bb = newShortBuffer(len);
+    bb.put(values, offset, len);
+    bb.rewind();
+    return bb;
+  }
+    
+  public static ShortBuffer newShortBuffer(short[] values, int offset) {
+    return newShortBuffer(values, 0, values.length-offset);
+  }
+
+  public static ShortBuffer newShortBuffer(short[] values) {
+    return newShortBuffer(values, 0);
+  }
+    
+  //----------------------------------------------------------------------
+  // Copy routines (type-to-type)
+  //
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed ByteBuffer into
+      a newly-allocated direct ByteBuffer. The returned buffer will
+      have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
+    ByteBuffer dest = newByteBuffer(orig.remaining());
+    dest.put(orig);
+    dest.rewind();
+    return dest;
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed FloatBuffer
+      into a newly-allocated direct FloatBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static FloatBuffer copyFloatBuffer(FloatBuffer orig) {
+    return copyFloatBufferAsByteBuffer(orig).asFloatBuffer();
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed IntBuffer
+      into a newly-allocated direct IntBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static IntBuffer copyIntBuffer(IntBuffer orig) {
+    return copyIntBufferAsByteBuffer(orig).asIntBuffer();
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed ShortBuffer
+      into a newly-allocated direct ShortBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ShortBuffer copyShortBuffer(ShortBuffer orig) {
+    return copyShortBufferAsByteBuffer(orig).asShortBuffer();
+  }
+  
+  //----------------------------------------------------------------------
+  // Copy routines (type-to-ByteBuffer)
+  //
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed FloatBuffer
+      into a newly-allocated direct ByteBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ByteBuffer copyFloatBufferAsByteBuffer(FloatBuffer orig) {
+    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_FLOAT);
+    dest.asFloatBuffer().put(orig);
+    dest.rewind();
+    return dest;
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed IntBuffer into
+      a newly-allocated direct ByteBuffer. The returned buffer will
+      have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ByteBuffer copyIntBufferAsByteBuffer(IntBuffer orig) {
+    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_INT);
+    dest.asIntBuffer().put(orig);
+    dest.rewind();
+    return dest;
+  }
+  
+  /** Copies the <i>remaining</i> elements (as defined by
+      <code>limit() - position()</code>) in the passed ShortBuffer
+      into a newly-allocated direct ByteBuffer. The returned buffer
+      will have its byte order set to the host platform's native byte
+      order. The position of the newly-allocated buffer will be zero,
+      and the position of the passed buffer is unchanged (though its
+      mark is changed). */
+  public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
+    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_SHORT);
+    dest.asShortBuffer().put(orig);
+    dest.rewind();
+    return dest;
+  }
+
+  //----------------------------------------------------------------------
+  // Conversion routines 
+  //
+  
+  public final static float[] getFloatArray(double[] source) {
+      int i=source.length;
+      float[] dest = new float[i--];
+      while(i>=0) { dest[i]=(float)source[i]; i--; }
+      return dest;
+  }
+
+  public final static FloatBuffer getFloatBuffer(DoubleBuffer source) {
+      source.rewind();
+      FloatBuffer dest = BufferUtil.newFloatBuffer(source.limit());
+      while(source.hasRemaining()) { dest.put((float)source.get()); }
+      return dest;
+  }
+
+  public static ByteBuffer nativeOrder(ByteBuffer buf) {
+    if (!isCDCFP) {
+      try {
+        if (byteOrderClass == null) {
+          byteOrderClass = Class.forName("java.nio.ByteOrder");
+          orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
+          Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
+          nativeOrderObject = nativeOrderMethod.invoke(null, null);
+        }
+      } catch (Throwable t) {
+        // Must be running on CDC / FP
+        isCDCFP = true;
+      }
+
+      if (!isCDCFP) {
+        try {
+          orderMethod.invoke(buf, new Object[] { nativeOrderObject });
+        } catch (Throwable t) {
+        }
+      }
+    }
+    return buf;
+  }
+
+  //----------------------------------------------------------------------
+  // Convenient GL put methods with generic target Buffer
+  //
+  public static void put(Buffer dest, Buffer v) {
+    if((dest instanceof ByteBuffer) && (v instanceof ByteBuffer)) {
+        ((ByteBuffer)dest).put((ByteBuffer)v);
+    } else if((dest instanceof ShortBuffer) && (v instanceof ShortBuffer)) {
+        ((ShortBuffer)dest).put((ShortBuffer)v);
+    } else if((dest instanceof IntBuffer) && (v instanceof IntBuffer)) {
+        ((IntBuffer)dest).put((IntBuffer)v);
+    } else if((dest instanceof FloatBuffer) && (v instanceof FloatBuffer)) {
+        ((FloatBuffer)dest).put((FloatBuffer)v);
+    } else {
+        throw new GLException("Incompatible Buffer classes: dest = "+dest.getClass().getName() + ", src = " + v.getClass().getName());
+    }
+  }
+
+  public static void putb(Buffer dest, byte v) {
+    if(dest instanceof ByteBuffer) {
+        ((ByteBuffer)dest).put(v);
+    } else if(dest instanceof ShortBuffer) {
+        ((ShortBuffer)dest).put((short)v);
+    } else if(dest instanceof IntBuffer) {
+        ((IntBuffer)dest).put((int)v);
+    } else {
+        throw new GLException("Byte doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  public static void puts(Buffer dest, short v) {
+    if(dest instanceof ShortBuffer) {
+        ((ShortBuffer)dest).put(v);
+    } else if(dest instanceof IntBuffer) {
+        ((IntBuffer)dest).put((int)v);
+    } else {
+        throw new GLException("Short doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  public static void puti(Buffer dest, int v) {
+    if(dest instanceof IntBuffer) {
+        ((IntBuffer)dest).put(v);
+    } else {
+        throw new GLException("Integer doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  public static void putx(Buffer dest, int v) {
+    puti(dest, v);
+  }
+
+  public static void putf(Buffer dest, float v) {
+    if(dest instanceof FloatBuffer) {
+        ((FloatBuffer)dest).put(v);
+    } else if(dest instanceof IntBuffer) {
+        ((IntBuffer)dest).put(FixedPoint.toFixed(v));
+    } else {
+        throw new GLException("Float doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  public static void putd(Buffer dest, double v) {
+    if(dest instanceof FloatBuffer) {
+        ((FloatBuffer)dest).put((float)v);
+    } else {
+        throw new GLException("Double doesn't match Buffer Class: "+dest);
+    }
+  }
+
+  //----------------------------------------------------------------------
+  // Internals only below this point
+  //
+
+  // NOTE that this work must be done reflectively at the present time
+  // because this code must compile and run correctly on both CDC/FP and J2SE
+  private static boolean isCDCFP;
+  private static Class byteOrderClass;
+  private static Object nativeOrderObject;
+  private static Method orderMethod;
+
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp
deleted file mode 100755
index 2f82487f8..000000000
--- a/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.jogamp.opengl.util;
-
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GL2ES2;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLProfile;
-
-import java.nio.*;
-import java.util.*;
-
-import java.lang.reflect.*;
-
-/** Utility routines for dealing with direct buffers. */
-
-public class BufferUtil {
-  public static final int SIZEOF_BYTE = 1;
-  public static final int SIZEOF_SHORT = 2;
-  public static final int SIZEOF_INT = 4;
-  public static final int SIZEOF_FLOAT = 4;
-  public static final int SIZEOF_LONG = -1;    // not supported
-  public static final int SIZEOF_DOUBLE = -1;  // not supported
-
-  public static final int sizeOfGLType(int glType) {
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-                return SIZEOF_BYTE;
-            case GL.GL_BYTE:
-                return SIZEOF_BYTE;
-            case GL.GL_UNSIGNED_SHORT:
-                return SIZEOF_SHORT;
-            case GL.GL_SHORT:
-                return SIZEOF_SHORT;
-            case GL.GL_FLOAT:
-                return SIZEOF_FLOAT;
-            case GL.GL_FIXED:
-                return SIZEOF_INT;
-            case GL2ES2.GL_INT:
-                return SIZEOF_INT;
-            case GL2ES2.GL_UNSIGNED_INT:
-                return SIZEOF_INT;
-            case GL2.GL_DOUBLE:
-                return SIZEOF_DOUBLE;
-        }
-        return -1;
-  }
-
-  public static final int sizeOfBufferElem(Buffer buffer) {
-        if (buffer == null) {
-            return 0;
-        }
-        if (buffer instanceof ByteBuffer) {
-            return BufferUtil.SIZEOF_BYTE;
-        } else if (buffer instanceof IntBuffer) {
-            return BufferUtil.SIZEOF_INT;
-        } else if (buffer instanceof ShortBuffer) {
-            return BufferUtil.SIZEOF_SHORT;
-        } else if (buffer instanceof FloatBuffer) {
-            return BufferUtil.SIZEOF_FLOAT;
-        }
-        throw new RuntimeException("Unexpected buffer type " +
-                                   buffer.getClass().getName());
-  }
-
-  private BufferUtil() {}
-
-  //----------------------------------------------------------------------
-  // Allocation routines
-  //
-
-  public static final Buffer newGLBuffer(int glType, int numElements) {
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-            case GL.GL_BYTE:
-                return newByteBuffer(numElements);
-            case GL.GL_UNSIGNED_SHORT:
-            case GL.GL_SHORT:
-                return newShortBuffer(numElements);
-            case GL.GL_FLOAT:
-                return newFloatBuffer(numElements);
-            case GL.GL_FIXED:
-            case GL2ES2.GL_INT:
-            case GL2ES2.GL_UNSIGNED_INT:
-                return newIntBuffer(numElements);
-        }
-        return null;
-  }
-
-  public static final Buffer sliceGLBuffer(ByteBuffer parent, int bytePos, int byteLen, int glType) {
-        if(parent==null || byteLen==0) return null;
-        parent.position(bytePos);
-        parent.limit(bytePos + byteLen);
-
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-            case GL.GL_BYTE:
-                return parent.slice();
-            case GL.GL_UNSIGNED_SHORT:
-            case GL.GL_SHORT:
-                return parent.asShortBuffer();
-            case GL.GL_FLOAT:
-                return parent.asFloatBuffer();
-            case GL.GL_FIXED:
-            case GL2ES2.GL_INT:
-            case GL2ES2.GL_UNSIGNED_INT:
-                return parent.asIntBuffer();
-        }
-        return null;
-  }
-
-  /** Allocates a new direct ByteBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static ByteBuffer newByteBuffer(int numElements) {
-    ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
-    nativeOrder(bb);
-    return bb;
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values, int offset, int len) {
-    ByteBuffer bb = newByteBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values, int offset) {
-    return newByteBuffer(values, offset, values.length-offset);
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values) {
-    return newByteBuffer(values, 0);
-  }
-    
-  /** Allocates a new direct FloatBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static FloatBuffer newFloatBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_FLOAT);
-    return bb.asFloatBuffer();
-  }
-    
-  public static FloatBuffer newFloatBuffer(float[] values, int offset, int len) {
-    FloatBuffer bb = newFloatBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static FloatBuffer newFloatBuffer(float[] values, int offset) {
-    return newFloatBuffer(values, 0, values.length-offset);
-  }
-
-  public static FloatBuffer newFloatBuffer(float[] values) {
-    return newFloatBuffer(values, 0);
-  }
-    
-  /** Allocates a new direct IntBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static IntBuffer newIntBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
-    return bb.asIntBuffer();
-  }
-    
-  public static IntBuffer newIntBuffer(int[] values, int offset, int len) {
-    IntBuffer bb = newIntBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static IntBuffer newIntBuffer(int[] values, int offset) {
-    return newIntBuffer(values, 0, values.length-offset);
-  }
-
-  public static IntBuffer newIntBuffer(int[] values) {
-    return newIntBuffer(values, 0);
-  }
-    
-    
-  /** Allocates a new direct ShortBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static ShortBuffer newShortBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_SHORT);
-    return bb.asShortBuffer();
-  }
-
-  public static ShortBuffer newShortBuffer(short[] values, int offset, int len) {
-    ShortBuffer bb = newShortBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static ShortBuffer newShortBuffer(short[] values, int offset) {
-    return newShortBuffer(values, 0, values.length-offset);
-  }
-
-  public static ShortBuffer newShortBuffer(short[] values) {
-    return newShortBuffer(values, 0);
-  }
-    
-    
-  //----------------------------------------------------------------------
-  // Copy routines (type-to-type)
-  //
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ByteBuffer into
-      a newly-allocated direct ByteBuffer. The returned buffer will
-      have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining());
-    dest.put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed FloatBuffer
-      into a newly-allocated direct FloatBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static FloatBuffer copyFloatBuffer(FloatBuffer orig) {
-    return copyFloatBufferAsByteBuffer(orig).asFloatBuffer();
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed IntBuffer
-      into a newly-allocated direct IntBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static IntBuffer copyIntBuffer(IntBuffer orig) {
-    return copyIntBufferAsByteBuffer(orig).asIntBuffer();
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ShortBuffer
-      into a newly-allocated direct ShortBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ShortBuffer copyShortBuffer(ShortBuffer orig) {
-    return copyShortBufferAsByteBuffer(orig).asShortBuffer();
-  }
-  
-  //----------------------------------------------------------------------
-  // Copy routines (type-to-ByteBuffer)
-  //
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed FloatBuffer
-      into a newly-allocated direct ByteBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyFloatBufferAsByteBuffer(FloatBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_FLOAT);
-    dest.asFloatBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed IntBuffer into
-      a newly-allocated direct ByteBuffer. The returned buffer will
-      have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyIntBufferAsByteBuffer(IntBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_INT);
-    dest.asIntBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ShortBuffer
-      into a newly-allocated direct ByteBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_SHORT);
-    dest.asShortBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-
-  //----------------------------------------------------------------------
-  // Conversion routines 
-  //
-
-  public final static float[] getFloatArray(double[] source) {
-      int i=source.length;
-      float[] dest = new float[i--];
-      while(i>=0) { dest[i]=(float)source[i]; i--; }
-      return dest;
-  }
-
-  public static ByteBuffer nativeOrder(ByteBuffer buf) {
-    if (!isCDCFP) {
-      try {
-        if (byteOrderClass == null) {
-          byteOrderClass = Class.forName("java.nio.ByteOrder");
-          orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
-          Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
-          nativeOrderObject = nativeOrderMethod.invoke(null, null);
-        }
-      } catch (Throwable t) {
-        // Must be running on CDC / FP
-        isCDCFP = true;
-      }
-
-      if (!isCDCFP) {
-        try {
-          orderMethod.invoke(buf, new Object[] { nativeOrderObject });
-        } catch (Throwable t) {
-        }
-      }
-    }
-    return buf;
-  }
-
-  //----------------------------------------------------------------------
-  // Convenient GL put methods with generic target Buffer
-  //
-  public static void put(Buffer dest, Buffer v) {
-    if((dest instanceof ByteBuffer) && (v instanceof ByteBuffer)) {
-        ((ByteBuffer)dest).put((ByteBuffer)v);
-    } else if((dest instanceof ShortBuffer) && (v instanceof ShortBuffer)) {
-        ((ShortBuffer)dest).put((ShortBuffer)v);
-    } else if((dest instanceof IntBuffer) && (v instanceof IntBuffer)) {
-        ((IntBuffer)dest).put((IntBuffer)v);
-    } else if((dest instanceof FloatBuffer) && (v instanceof FloatBuffer)) {
-        ((FloatBuffer)dest).put((FloatBuffer)v);
-    } else {
-        throw new GLException("Incompatible Buffer classes: dest = "+dest.getClass().getName() + ", src = " + v.getClass().getName());
-    }
-  }
-
-  public static void putb(Buffer dest, byte v) {
-    if(dest instanceof ByteBuffer) {
-        ((ByteBuffer)dest).put(v);
-    } else if(dest instanceof ShortBuffer) {
-        ((ShortBuffer)dest).put((short)v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put((int)v);
-    } else {
-        throw new GLException("Byte doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void puts(Buffer dest, short v) {
-    if(dest instanceof ShortBuffer) {
-        ((ShortBuffer)dest).put(v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put((int)v);
-    } else {
-        throw new GLException("Short doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void puti(Buffer dest, int v) {
-    if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put(v);
-    } else {
-        throw new GLException("Integer doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void putx(Buffer dest, int v) {
-    puti(dest, v);
-  }
-
-  public static void putf(Buffer dest, float v) {
-    if(dest instanceof FloatBuffer) {
-        ((FloatBuffer)dest).put(v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put(FixedPoint.toFixed(v));
-    } else {
-        throw new GLException("Float doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  // NOTE that this work must be done reflectively at the present time
-  // because this code must compile and run correctly on both CDC/FP and J2SE
-  private static boolean isCDCFP;
-  private static Class byteOrderClass;
-  private static Object nativeOrderObject;
-  private static Method orderMethod;
-
-}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase
deleted file mode 100755
index fde1e8681..000000000
--- a/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.jogamp.opengl.util;
-
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GL2ES2;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLProfile;
-
-import java.nio.*;
-import java.util.*;
-
-import java.lang.reflect.*;
-
-/** Utility routines for dealing with direct buffers. */
-
-public class BufferUtil {
-  public static final int SIZEOF_BYTE = 1;
-  public static final int SIZEOF_SHORT = 2;
-  public static final int SIZEOF_INT = 4;
-  public static final int SIZEOF_FLOAT = 4;
-  public static final int SIZEOF_LONG = 8;
-  public static final int SIZEOF_DOUBLE = 8;
-
-  public static final int sizeOfGLType(int glType) {
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-                return SIZEOF_BYTE;
-            case GL.GL_BYTE:
-                return SIZEOF_BYTE;
-            case GL.GL_UNSIGNED_SHORT:
-                return SIZEOF_SHORT;
-            case GL.GL_SHORT:
-                return SIZEOF_SHORT;
-            case GL.GL_FLOAT:
-                return SIZEOF_FLOAT;
-            case GL.GL_FIXED:
-                return SIZEOF_INT;
-            case GL2ES2.GL_INT:
-                return SIZEOF_INT;
-            case GL2ES2.GL_UNSIGNED_INT:
-                return SIZEOF_INT;
-            case GL2.GL_DOUBLE:
-                return SIZEOF_DOUBLE;
-        }
-        return -1;
-  }
-
-  public static final int sizeOfBufferElem(Buffer buffer) {
-        if (buffer == null) {
-            return 0;
-        }
-        if (buffer instanceof ByteBuffer) {
-            return BufferUtil.SIZEOF_BYTE;
-        } else if (buffer instanceof IntBuffer) {
-            return BufferUtil.SIZEOF_INT;
-        } else if (buffer instanceof ShortBuffer) {
-            return BufferUtil.SIZEOF_SHORT;
-        } else if (buffer instanceof FloatBuffer) {
-            return BufferUtil.SIZEOF_FLOAT;
-        } else if (buffer instanceof DoubleBuffer) {
-            return BufferUtil.SIZEOF_DOUBLE;
-        }
-        throw new RuntimeException("Unexpected buffer type " +
-                                   buffer.getClass().getName());
-  }
-
-  private BufferUtil() {}
-
-  //----------------------------------------------------------------------
-  // Allocation routines
-  //
-
-  public static final Buffer newGLBuffer(int glType, int numElements) {
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-            case GL.GL_BYTE:
-                return newByteBuffer(numElements);
-            case GL.GL_UNSIGNED_SHORT:
-            case GL.GL_SHORT:
-                return newShortBuffer(numElements);
-            case GL.GL_FLOAT:
-                return newFloatBuffer(numElements);
-            case GL.GL_FIXED:
-            case GL2ES2.GL_INT:
-            case GL2ES2.GL_UNSIGNED_INT:
-                return newIntBuffer(numElements);
-            case GL2.GL_DOUBLE:
-                return newDoubleBuffer(numElements);
-        }
-        return null;
-  }
-
-  public static final Buffer sliceGLBuffer(ByteBuffer parent, int bytePos, int byteLen, int glType) {
-        if(parent==null || byteLen==0) return null;
-        parent.position(bytePos);
-        parent.limit(bytePos + byteLen);
-
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-            case GL.GL_BYTE:
-                return parent.slice();
-            case GL.GL_UNSIGNED_SHORT:
-            case GL.GL_SHORT:
-                return parent.asShortBuffer();
-            case GL.GL_FLOAT:
-                return parent.asFloatBuffer();
-            case GL.GL_FIXED:
-            case GL2ES2.GL_INT:
-            case GL2ES2.GL_UNSIGNED_INT:
-                return parent.asIntBuffer();
-            case GL2.GL_DOUBLE:
-                return parent.asDoubleBuffer();
-        }
-        return null;
-  }
-
-  /** Allocates a new direct ByteBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static ByteBuffer newByteBuffer(int numElements) {
-    ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
-    nativeOrder(bb);
-    return bb;
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values, int offset, int len) {
-    ByteBuffer bb = newByteBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values, int offset) {
-    return newByteBuffer(values, offset, values.length-offset);
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values) {
-    return newByteBuffer(values, 0);
-  }
-    
-    
-  /** Allocates a new direct DoubleBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static DoubleBuffer newDoubleBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_DOUBLE);
-    return bb.asDoubleBuffer();
-  }
-
-  public static DoubleBuffer newDoubleBuffer(double[] values, int offset) {
-    int len = values.length-offset;
-    DoubleBuffer bb = newDoubleBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static DoubleBuffer newDoubleBuffer(double[] values) {
-    return newDoubleBuffer(values, 0);
-  }
-    
-
-  /** Allocates a new direct FloatBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static FloatBuffer newFloatBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_FLOAT);
-    return bb.asFloatBuffer();
-  }
-    
-  public static FloatBuffer newFloatBuffer(float[] values, int offset, int len) {
-    FloatBuffer bb = newFloatBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static FloatBuffer newFloatBuffer(float[] values, int offset) {
-    return newFloatBuffer(values, 0, values.length-offset);
-  }
-
-  public static FloatBuffer newFloatBuffer(float[] values) {
-    return newFloatBuffer(values, 0);
-  }
-    
-    
-  /** Allocates a new direct IntBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static IntBuffer newIntBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
-    return bb.asIntBuffer();
-  }
-    
-  public static IntBuffer newIntBuffer(int[] values, int offset, int len) {
-    IntBuffer bb = newIntBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static IntBuffer newIntBuffer(int[] values, int offset) {
-    return newIntBuffer(values, 0, values.length-offset);
-  }
-
-  public static IntBuffer newIntBuffer(int[] values) {
-    return newIntBuffer(values, 0);
-  }
-    
-  /** Allocates a new direct LongBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static LongBuffer newLongBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_LONG);
-    return bb.asLongBuffer();
-  }
-
-  /** Allocates a new direct ShortBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static ShortBuffer newShortBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_SHORT);
-    return bb.asShortBuffer();
-  }
-
-  public static ShortBuffer newShortBuffer(short[] values, int offset, int len) {
-    ShortBuffer bb = newShortBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static ShortBuffer newShortBuffer(short[] values, int offset) {
-    return newShortBuffer(values, 0, values.length-offset);
-  }
-
-  public static ShortBuffer newShortBuffer(short[] values) {
-    return newShortBuffer(values, 0);
-  }
-    
-  //----------------------------------------------------------------------
-  // Copy routines (type-to-type)
-  //
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ByteBuffer into
-      a newly-allocated direct ByteBuffer. The returned buffer will
-      have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining());
-    dest.put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed FloatBuffer
-      into a newly-allocated direct FloatBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static FloatBuffer copyFloatBuffer(FloatBuffer orig) {
-    return copyFloatBufferAsByteBuffer(orig).asFloatBuffer();
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed IntBuffer
-      into a newly-allocated direct IntBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static IntBuffer copyIntBuffer(IntBuffer orig) {
-    return copyIntBufferAsByteBuffer(orig).asIntBuffer();
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ShortBuffer
-      into a newly-allocated direct ShortBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ShortBuffer copyShortBuffer(ShortBuffer orig) {
-    return copyShortBufferAsByteBuffer(orig).asShortBuffer();
-  }
-  
-  //----------------------------------------------------------------------
-  // Copy routines (type-to-ByteBuffer)
-  //
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed FloatBuffer
-      into a newly-allocated direct ByteBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyFloatBufferAsByteBuffer(FloatBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_FLOAT);
-    dest.asFloatBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed IntBuffer into
-      a newly-allocated direct ByteBuffer. The returned buffer will
-      have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyIntBufferAsByteBuffer(IntBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_INT);
-    dest.asIntBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ShortBuffer
-      into a newly-allocated direct ByteBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_SHORT);
-    dest.asShortBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-
-  //----------------------------------------------------------------------
-  // Conversion routines 
-  //
-  
-  public final static float[] getFloatArray(double[] source) {
-      int i=source.length;
-      float[] dest = new float[i--];
-      while(i>=0) { dest[i]=(float)source[i]; i--; }
-      return dest;
-  }
-
-  public final static FloatBuffer getFloatBuffer(DoubleBuffer source) {
-      source.rewind();
-      FloatBuffer dest = BufferUtil.newFloatBuffer(source.limit());
-      while(source.hasRemaining()) { dest.put((float)source.get()); }
-      return dest;
-  }
-
-  public static ByteBuffer nativeOrder(ByteBuffer buf) {
-    if (!isCDCFP) {
-      try {
-        if (byteOrderClass == null) {
-          byteOrderClass = Class.forName("java.nio.ByteOrder");
-          orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
-          Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
-          nativeOrderObject = nativeOrderMethod.invoke(null, null);
-        }
-      } catch (Throwable t) {
-        // Must be running on CDC / FP
-        isCDCFP = true;
-      }
-
-      if (!isCDCFP) {
-        try {
-          orderMethod.invoke(buf, new Object[] { nativeOrderObject });
-        } catch (Throwable t) {
-        }
-      }
-    }
-    return buf;
-  }
-
-  //----------------------------------------------------------------------
-  // Convenient GL put methods with generic target Buffer
-  //
-  public static void put(Buffer dest, Buffer v) {
-    if((dest instanceof ByteBuffer) && (v instanceof ByteBuffer)) {
-        ((ByteBuffer)dest).put((ByteBuffer)v);
-    } else if((dest instanceof ShortBuffer) && (v instanceof ShortBuffer)) {
-        ((ShortBuffer)dest).put((ShortBuffer)v);
-    } else if((dest instanceof IntBuffer) && (v instanceof IntBuffer)) {
-        ((IntBuffer)dest).put((IntBuffer)v);
-    } else if((dest instanceof FloatBuffer) && (v instanceof FloatBuffer)) {
-        ((FloatBuffer)dest).put((FloatBuffer)v);
-    } else {
-        throw new GLException("Incompatible Buffer classes: dest = "+dest.getClass().getName() + ", src = " + v.getClass().getName());
-    }
-  }
-
-  public static void putb(Buffer dest, byte v) {
-    if(dest instanceof ByteBuffer) {
-        ((ByteBuffer)dest).put(v);
-    } else if(dest instanceof ShortBuffer) {
-        ((ShortBuffer)dest).put((short)v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put((int)v);
-    } else {
-        throw new GLException("Byte doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void puts(Buffer dest, short v) {
-    if(dest instanceof ShortBuffer) {
-        ((ShortBuffer)dest).put(v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put((int)v);
-    } else {
-        throw new GLException("Short doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void puti(Buffer dest, int v) {
-    if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put(v);
-    } else {
-        throw new GLException("Integer doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void putx(Buffer dest, int v) {
-    puti(dest, v);
-  }
-
-  public static void putf(Buffer dest, float v) {
-    if(dest instanceof FloatBuffer) {
-        ((FloatBuffer)dest).put(v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put(FixedPoint.toFixed(v));
-    } else {
-        throw new GLException("Float doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void putd(Buffer dest, double v) {
-    if(dest instanceof FloatBuffer) {
-        ((FloatBuffer)dest).put((float)v);
-    } else {
-        throw new GLException("Double doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  // NOTE that this work must be done reflectively at the present time
-  // because this code must compile and run correctly on both CDC/FP and J2SE
-  private static boolean isCDCFP;
-  private static Class byteOrderClass;
-  private static Object nativeOrderObject;
-  private static Method orderMethod;
-
-}
-- 
cgit v1.2.3


From e5d63fe78dfe6760de7997e5303aada7ab8b570e Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Mon, 29 Mar 2010 14:07:26 +0200
Subject: com.jogamp.opengl.util.BufferUtil extends
 com.jogamp.gluegen.runtime.Buffers. removed all redundant methods from
 BufferUtil.

---
 .../classes/com/jogamp/opengl/util/BufferUtil.java | 413 ++-------------------
 .../com/jogamp/opengl/util/GLArrayDataClient.java  |  21 +-
 .../com/jogamp/opengl/util/ImmModeSink.java        |   2 +-
 .../classes/com/jogamp/opengl/util/PMVMatrix.java  |   9 +-
 .../classes/com/jogamp/opengl/util/StreamUtil.java |   2 +-
 .../com/jogamp/opengl/util/awt/TextRenderer.java   |   5 +-
 .../com/jogamp/opengl/util/glsl/ShaderCode.java    |   5 +-
 .../util/glsl/fixedfunc/impl/FixedFuncHook.java    |  12 +-
 .../glsl/fixedfunc/impl/FixedFuncPipeline.java     |  22 +-
 .../util/texture/spi/DDSImage.java.javame_cdc_fp   |   2 +-
 .../opengl/util/texture/spi/DDSImage.java.javase   |   2 +-
 11 files changed, 78 insertions(+), 417 deletions(-)

diff --git a/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java
index fde1e8681..41baf03d7 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java
@@ -36,31 +36,23 @@
  * Sun gratefully acknowledges that this software was originally authored
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
-
 package com.jogamp.opengl.util;
 
+import com.jogamp.gluegen.runtime.Buffers;
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2;
 import javax.media.opengl.GL2ES2;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLProfile;
 
 import java.nio.*;
-import java.util.*;
-
-import java.lang.reflect.*;
-
-/** Utility routines for dealing with direct buffers. */
 
-public class BufferUtil {
-  public static final int SIZEOF_BYTE = 1;
-  public static final int SIZEOF_SHORT = 2;
-  public static final int SIZEOF_INT = 4;
-  public static final int SIZEOF_FLOAT = 4;
-  public static final int SIZEOF_LONG = 8;
-  public static final int SIZEOF_DOUBLE = 8;
+/**
+ * Utility routines for dealing with direct buffers.
+ * @author Kenneth Russel
+ * @author Michael Bien
+ */
+public class BufferUtil extends Buffers {
 
-  public static final int sizeOfGLType(int glType) {
+    public static final int sizeOfGLType(int glType) {
         switch (glType) {
             case GL.GL_UNSIGNED_BYTE:
                 return SIZEOF_BYTE;
@@ -82,9 +74,9 @@ public class BufferUtil {
                 return SIZEOF_DOUBLE;
         }
         return -1;
-  }
+    }
 
-  public static final int sizeOfBufferElem(Buffer buffer) {
+    public static final int sizeOfBufferElem(Buffer buffer) {
         if (buffer == null) {
             return 0;
         }
@@ -99,38 +91,34 @@ public class BufferUtil {
         } else if (buffer instanceof DoubleBuffer) {
             return BufferUtil.SIZEOF_DOUBLE;
         }
-        throw new RuntimeException("Unexpected buffer type " +
-                                   buffer.getClass().getName());
-  }
-
-  private BufferUtil() {}
-
-  //----------------------------------------------------------------------
-  // Allocation routines
-  //
+        throw new RuntimeException("Unexpected buffer type "
+                + buffer.getClass().getName());
+    }
 
-  public static final Buffer newGLBuffer(int glType, int numElements) {
+    public static final Buffer newDirectGLBuffer(int glType, int numElements) {
         switch (glType) {
             case GL.GL_UNSIGNED_BYTE:
             case GL.GL_BYTE:
-                return newByteBuffer(numElements);
+                return newDirectByteBuffer(numElements);
             case GL.GL_UNSIGNED_SHORT:
             case GL.GL_SHORT:
-                return newShortBuffer(numElements);
+                return newDirectShortBuffer(numElements);
             case GL.GL_FLOAT:
-                return newFloatBuffer(numElements);
+                return newDirectFloatBuffer(numElements);
             case GL.GL_FIXED:
             case GL2ES2.GL_INT:
             case GL2ES2.GL_UNSIGNED_INT:
-                return newIntBuffer(numElements);
+                return newDirectIntBuffer(numElements);
             case GL2.GL_DOUBLE:
-                return newDoubleBuffer(numElements);
+                return newDirectDoubleBuffer(numElements);
         }
         return null;
-  }
+    }
 
-  public static final Buffer sliceGLBuffer(ByteBuffer parent, int bytePos, int byteLen, int glType) {
-        if(parent==null || byteLen==0) return null;
+    public static final Buffer sliceGLBuffer(ByteBuffer parent, int bytePos, int byteLen, int glType) {
+        if (parent == null || byteLen == 0) {
+            return null;
+        }
         parent.position(bytePos);
         parent.limit(bytePos + byteLen);
 
@@ -151,349 +139,18 @@ public class BufferUtil {
                 return parent.asDoubleBuffer();
         }
         return null;
-  }
-
-  /** Allocates a new direct ByteBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static ByteBuffer newByteBuffer(int numElements) {
-    ByteBuffer bb = ByteBuffer.allocateDirect(numElements);
-    nativeOrder(bb);
-    return bb;
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values, int offset, int len) {
-    ByteBuffer bb = newByteBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values, int offset) {
-    return newByteBuffer(values, offset, values.length-offset);
-  }
-    
-  public static ByteBuffer newByteBuffer(byte[] values) {
-    return newByteBuffer(values, 0);
-  }
-    
-    
-  /** Allocates a new direct DoubleBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static DoubleBuffer newDoubleBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_DOUBLE);
-    return bb.asDoubleBuffer();
-  }
-
-  public static DoubleBuffer newDoubleBuffer(double[] values, int offset) {
-    int len = values.length-offset;
-    DoubleBuffer bb = newDoubleBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static DoubleBuffer newDoubleBuffer(double[] values) {
-    return newDoubleBuffer(values, 0);
-  }
-    
-
-  /** Allocates a new direct FloatBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static FloatBuffer newFloatBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_FLOAT);
-    return bb.asFloatBuffer();
-  }
-    
-  public static FloatBuffer newFloatBuffer(float[] values, int offset, int len) {
-    FloatBuffer bb = newFloatBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static FloatBuffer newFloatBuffer(float[] values, int offset) {
-    return newFloatBuffer(values, 0, values.length-offset);
-  }
-
-  public static FloatBuffer newFloatBuffer(float[] values) {
-    return newFloatBuffer(values, 0);
-  }
-    
-    
-  /** Allocates a new direct IntBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static IntBuffer newIntBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_INT);
-    return bb.asIntBuffer();
-  }
-    
-  public static IntBuffer newIntBuffer(int[] values, int offset, int len) {
-    IntBuffer bb = newIntBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static IntBuffer newIntBuffer(int[] values, int offset) {
-    return newIntBuffer(values, 0, values.length-offset);
-  }
-
-  public static IntBuffer newIntBuffer(int[] values) {
-    return newIntBuffer(values, 0);
-  }
-    
-  /** Allocates a new direct LongBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static LongBuffer newLongBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_LONG);
-    return bb.asLongBuffer();
-  }
-
-  /** Allocates a new direct ShortBuffer with the specified number of
-      elements. The returned buffer will have its byte order set to
-      the host platform's native byte order. */
-  public static ShortBuffer newShortBuffer(int numElements) {
-    ByteBuffer bb = newByteBuffer(numElements * SIZEOF_SHORT);
-    return bb.asShortBuffer();
-  }
-
-  public static ShortBuffer newShortBuffer(short[] values, int offset, int len) {
-    ShortBuffer bb = newShortBuffer(len);
-    bb.put(values, offset, len);
-    bb.rewind();
-    return bb;
-  }
-    
-  public static ShortBuffer newShortBuffer(short[] values, int offset) {
-    return newShortBuffer(values, 0, values.length-offset);
-  }
-
-  public static ShortBuffer newShortBuffer(short[] values) {
-    return newShortBuffer(values, 0);
-  }
-    
-  //----------------------------------------------------------------------
-  // Copy routines (type-to-type)
-  //
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ByteBuffer into
-      a newly-allocated direct ByteBuffer. The returned buffer will
-      have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyByteBuffer(ByteBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining());
-    dest.put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed FloatBuffer
-      into a newly-allocated direct FloatBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static FloatBuffer copyFloatBuffer(FloatBuffer orig) {
-    return copyFloatBufferAsByteBuffer(orig).asFloatBuffer();
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed IntBuffer
-      into a newly-allocated direct IntBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static IntBuffer copyIntBuffer(IntBuffer orig) {
-    return copyIntBufferAsByteBuffer(orig).asIntBuffer();
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ShortBuffer
-      into a newly-allocated direct ShortBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ShortBuffer copyShortBuffer(ShortBuffer orig) {
-    return copyShortBufferAsByteBuffer(orig).asShortBuffer();
-  }
-  
-  //----------------------------------------------------------------------
-  // Copy routines (type-to-ByteBuffer)
-  //
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed FloatBuffer
-      into a newly-allocated direct ByteBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyFloatBufferAsByteBuffer(FloatBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_FLOAT);
-    dest.asFloatBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed IntBuffer into
-      a newly-allocated direct ByteBuffer. The returned buffer will
-      have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyIntBufferAsByteBuffer(IntBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_INT);
-    dest.asIntBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-  
-  /** Copies the <i>remaining</i> elements (as defined by
-      <code>limit() - position()</code>) in the passed ShortBuffer
-      into a newly-allocated direct ByteBuffer. The returned buffer
-      will have its byte order set to the host platform's native byte
-      order. The position of the newly-allocated buffer will be zero,
-      and the position of the passed buffer is unchanged (though its
-      mark is changed). */
-  public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
-    ByteBuffer dest = newByteBuffer(orig.remaining() * SIZEOF_SHORT);
-    dest.asShortBuffer().put(orig);
-    dest.rewind();
-    return dest;
-  }
-
-  //----------------------------------------------------------------------
-  // Conversion routines 
-  //
-  
-  public final static float[] getFloatArray(double[] source) {
-      int i=source.length;
-      float[] dest = new float[i--];
-      while(i>=0) { dest[i]=(float)source[i]; i--; }
-      return dest;
-  }
-
-  public final static FloatBuffer getFloatBuffer(DoubleBuffer source) {
-      source.rewind();
-      FloatBuffer dest = BufferUtil.newFloatBuffer(source.limit());
-      while(source.hasRemaining()) { dest.put((float)source.get()); }
-      return dest;
-  }
-
-  public static ByteBuffer nativeOrder(ByteBuffer buf) {
-    if (!isCDCFP) {
-      try {
-        if (byteOrderClass == null) {
-          byteOrderClass = Class.forName("java.nio.ByteOrder");
-          orderMethod = ByteBuffer.class.getMethod("order", new Class[] { byteOrderClass });
-          Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", null);
-          nativeOrderObject = nativeOrderMethod.invoke(null, null);
-        }
-      } catch (Throwable t) {
-        // Must be running on CDC / FP
-        isCDCFP = true;
-      }
-
-      if (!isCDCFP) {
-        try {
-          orderMethod.invoke(buf, new Object[] { nativeOrderObject });
-        } catch (Throwable t) {
-        }
-      }
-    }
-    return buf;
-  }
-
-  //----------------------------------------------------------------------
-  // Convenient GL put methods with generic target Buffer
-  //
-  public static void put(Buffer dest, Buffer v) {
-    if((dest instanceof ByteBuffer) && (v instanceof ByteBuffer)) {
-        ((ByteBuffer)dest).put((ByteBuffer)v);
-    } else if((dest instanceof ShortBuffer) && (v instanceof ShortBuffer)) {
-        ((ShortBuffer)dest).put((ShortBuffer)v);
-    } else if((dest instanceof IntBuffer) && (v instanceof IntBuffer)) {
-        ((IntBuffer)dest).put((IntBuffer)v);
-    } else if((dest instanceof FloatBuffer) && (v instanceof FloatBuffer)) {
-        ((FloatBuffer)dest).put((FloatBuffer)v);
-    } else {
-        throw new GLException("Incompatible Buffer classes: dest = "+dest.getClass().getName() + ", src = " + v.getClass().getName());
-    }
-  }
-
-  public static void putb(Buffer dest, byte v) {
-    if(dest instanceof ByteBuffer) {
-        ((ByteBuffer)dest).put(v);
-    } else if(dest instanceof ShortBuffer) {
-        ((ShortBuffer)dest).put((short)v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put((int)v);
-    } else {
-        throw new GLException("Byte doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void puts(Buffer dest, short v) {
-    if(dest instanceof ShortBuffer) {
-        ((ShortBuffer)dest).put(v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put((int)v);
-    } else {
-        throw new GLException("Short doesn't match Buffer Class: "+dest);
     }
-  }
 
-  public static void puti(Buffer dest, int v) {
-    if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put(v);
-    } else {
-        throw new GLException("Integer doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void putx(Buffer dest, int v) {
-    puti(dest, v);
-  }
-
-  public static void putf(Buffer dest, float v) {
-    if(dest instanceof FloatBuffer) {
-        ((FloatBuffer)dest).put(v);
-    } else if(dest instanceof IntBuffer) {
-        ((IntBuffer)dest).put(FixedPoint.toFixed(v));
-    } else {
-        throw new GLException("Float doesn't match Buffer Class: "+dest);
-    }
-  }
-
-  public static void putd(Buffer dest, double v) {
-    if(dest instanceof FloatBuffer) {
-        ((FloatBuffer)dest).put((float)v);
-    } else {
-        throw new GLException("Double doesn't match Buffer Class: "+dest);
+    //----------------------------------------------------------------------
+    // Conversion routines
+    //
+    public final static float[] getFloatArray(double[] source) {
+        int i = source.length;
+        float[] dest = new float[i--];
+        while (i >= 0) {
+            dest[i] = (float) source[i];
+            i--;
+        }
+        return dest;
     }
-  }
-
-  //----------------------------------------------------------------------
-  // Internals only below this point
-  //
-
-  // NOTE that this work must be done reflectively at the present time
-  // because this code must compile and run correctly on both CDC/FP and J2SE
-  private static boolean isCDCFP;
-  private static Class byteOrderClass;
-  private static Object nativeOrderObject;
-  private static Method orderMethod;
-
 }
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
index f8951f0fd..d41e4b922 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
@@ -1,6 +1,7 @@
 
 package com.jogamp.opengl.util;
 
+import com.jogamp.gluegen.runtime.Buffers;
 import java.security.*;
 
 import javax.media.opengl.*;
@@ -189,7 +190,7 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData
   public void padding(int done) {
     if ( buffer==null || sealed ) return;
     while(done<strideL) {
-        BufferUtil.putb(buffer, (byte)0);
+        Buffers.putb(buffer, (byte)0);
         done++;
     }
   }
@@ -206,25 +207,25 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData
         throw new GLException("Buffer length ("+v.remaining()+") is not a multiple of component-stride:\n\t"+this);
     }
     growBufferIfNecessary(v.remaining());
-    BufferUtil.put(buffer, v);
+    Buffers.put(buffer, v);
   }
 
   public void putb(byte v) {
     if ( buffer==null || sealed ) return;
     growBufferIfNecessary(1);
-    BufferUtil.putb(buffer, v);
+    Buffers.putb(buffer, v);
   }
 
   public void puts(short v) {
     if ( buffer==null || sealed ) return;
     growBufferIfNecessary(1);
-    BufferUtil.puts(buffer, v);
+    Buffers.puts(buffer, v);
   }
 
   public void puti(int v) {
     if ( buffer==null || sealed ) return;
     growBufferIfNecessary(1);
-    BufferUtil.puti(buffer, v);
+    Buffers.puti(buffer, v);
   }
 
   public void putx(int v) {
@@ -234,7 +235,7 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData
   public void putf(float v) {
     if ( buffer==null || sealed ) return;
     growBufferIfNecessary(1);
-    BufferUtil.putf(buffer, v);
+    Buffers.putf(buffer, v);
   }
 
   public String toString() {
@@ -274,28 +275,28 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData
     if(components>0) {
         int osize = (buffer!=null)?buffer.capacity():0;
         if(clazz==ByteBuffer.class) {
-            ByteBuffer newBBuffer = BufferUtil.newByteBuffer( (osize+additional) * components );
+            ByteBuffer newBBuffer = Buffers.newDirectByteBuffer( (osize+additional) * components );
             if(buffer!=null) {
                 buffer.flip();
                 newBBuffer.put((ByteBuffer)buffer);
             }
             buffer = newBBuffer;
         } else if(clazz==ShortBuffer.class) {
-            ShortBuffer newSBuffer = BufferUtil.newShortBuffer( (osize+additional) * components );
+            ShortBuffer newSBuffer = Buffers.newDirectShortBuffer( (osize+additional) * components );
             if(buffer!=null) {
                 buffer.flip();
                 newSBuffer.put((ShortBuffer)buffer);
             }
             buffer = newSBuffer;
         } else if(clazz==IntBuffer.class) {
-            IntBuffer newIBuffer = BufferUtil.newIntBuffer( (osize+additional) * components );
+            IntBuffer newIBuffer = Buffers.newDirectIntBuffer( (osize+additional) * components );
             if(buffer!=null) {
                 buffer.flip();
                 newIBuffer.put((IntBuffer)buffer);
             }
             buffer = newIBuffer;
         } else if(clazz==FloatBuffer.class) {
-            FloatBuffer newFBuffer = BufferUtil.newFloatBuffer( (osize+additional) * components );
+            FloatBuffer newFBuffer = Buffers.newDirectFloatBuffer( (osize+additional) * components );
             if(buffer!=null) {
                 buffer.flip();
                 newFBuffer.put((FloatBuffer)buffer);
diff --git a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
index 7c71c4309..22a2d8a9f 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
@@ -817,7 +817,7 @@ public class ImmModeSink {
         count  = elements;
         bSize  = count * ( vWidth + cWidth + nWidth + tWidth ) ;
 
-        buffer = BufferUtil.newByteBuffer(bSize);
+        buffer = BufferUtil.newDirectByteBuffer(bSize);
 
         int pos = 0;
         int size= count * vWidth ;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
index 9cf41804f..f6d5f1999 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
@@ -33,6 +33,7 @@
 
 package com.jogamp.opengl.util;
 
+import com.jogamp.gluegen.runtime.Buffers;
 import com.jogamp.opengl.impl.ProjectFloat;
 
 import java.nio.*;
@@ -47,7 +48,7 @@ public class PMVMatrix implements GLMatrixFunc {
     public PMVMatrix() {
           projectFloat = new ProjectFloat();
 
-          matrixIdent = BufferUtil.newFloatBuffer(1*16);
+          matrixIdent = Buffers.newDirectFloatBuffer(1*16);
           projectFloat.gluMakeIdentityf(matrixIdent);
           matrixIdent.rewind();
 
@@ -57,7 +58,7 @@ public class PMVMatrix implements GLMatrixFunc {
           // Mvi  Modelview-Inverse
           // Mvit Modelview-Inverse-Transpose
           // Pmv  P * Mv
-          matrixTPMvMvitPmv = BufferUtil.newFloatBuffer(6*16);     // grouping T + P  + Mv + Mvi + Mvit + Pmv
+          matrixTPMvMvitPmv = Buffers.newDirectFloatBuffer(6*16);     // grouping T + P  + Mv + Mvi + Mvit + Pmv
           matrixPMvMvitPmv = slice(matrixTPMvMvitPmv, 1*16, 5*16); // grouping     P  + Mv + Mvi + Mvit + Pmv
           matrixT       = slice(matrixTPMvMvitPmv, 0*16, 1*16);    //          T
           matrixPMvMvit = slice(matrixTPMvMvitPmv, 1*16, 4*16);    // grouping     P  + Mv + Mvi + Mvit
@@ -70,9 +71,9 @@ public class PMVMatrix implements GLMatrixFunc {
           matrixPmv     = slice(matrixTPMvMvitPmv, 5*16, 1*16);    //                                     Pmv
           matrixTPMvMvitPmv.rewind();
 
-          matrixMvit3 = BufferUtil.newFloatBuffer(3*3);
+          matrixMvit3 = Buffers.newDirectFloatBuffer(3*3);
 
-          localBuf = BufferUtil.newFloatBuffer(6*16);
+          localBuf = Buffers.newDirectFloatBuffer(6*16);
 
           matrixMult=slice(localBuf, 0*16, 16);
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java b/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java
index 294f86303..83186f6a0 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java
@@ -59,7 +59,7 @@ public class StreamUtil {
 
     public static ByteBuffer readAll2Buffer(InputStream stream) throws IOException {
         BytesRead bytesRead = readAllImpl(stream);
-        return BufferUtil.newByteBuffer(bytesRead.data, 0, bytesRead.payloadLen);
+        return BufferUtil.newDirectByteBuffer(bytesRead.data, 0, bytesRead.payloadLen);
     }
 
     private static BytesRead readAllImpl(InputStream stream) throws IOException {
diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
index 1fbdade4e..4de2e5974 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
@@ -38,6 +38,7 @@
  */
 package com.jogamp.opengl.util.awt;
 
+import com.jogamp.gluegen.runtime.Buffers;
 import com.jogamp.opengl.impl.Debug;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.packrect.*;
@@ -1707,8 +1708,8 @@ public class TextRenderer {
 
         Pipelined_QuadRenderer() {
             GL2 gl = GLContext.getCurrentGL().getGL2();
-            mVertCoords = BufferUtil.newFloatBuffer(kTotalBufferSizeCoordsVerts);
-            mTexCoords = BufferUtil.newFloatBuffer(kTotalBufferSizeCoordsTex);
+            mVertCoords = Buffers.newDirectFloatBuffer(kTotalBufferSizeCoordsVerts);
+            mTexCoords = Buffers.newDirectFloatBuffer(kTotalBufferSizeCoordsTex);
 
             usingVBOs = is15Available(gl);
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
index 01b94d0d9..94b329cd5 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
@@ -1,6 +1,7 @@
 
 package com.jogamp.opengl.util.glsl;
 
+import com.jogamp.gluegen.runtime.Buffers;
 import javax.media.opengl.*;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.impl.Debug;
@@ -34,7 +35,7 @@ public class ShaderCode {
         shaderBinaryFormat = -1;
         shaderBinary = null;
         shaderType   = type;
-        shader = BufferUtil.newIntBuffer(number);
+        shader = Buffers.newDirectIntBuffer(number);
         id = getNextID();
 
         if(DEBUG_CODE) {
@@ -55,7 +56,7 @@ public class ShaderCode {
         shaderBinaryFormat = binFormat;
         shaderBinary = binary;
         shaderType   = type;
-        shader = BufferUtil.newIntBuffer(number);
+        shader = Buffers.newDirectIntBuffer(number);
         id = getNextID();
     }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
index 6e5bd2eb2..b69cc2b72 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
@@ -128,7 +128,7 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
         pmvMatrix.glLoadMatrixf(m);
     }
     public void glLoadMatrixf(float[] m, int m_offset) {
-        glLoadMatrixf(BufferUtil.newFloatBuffer(m, m_offset));
+        glLoadMatrixf(BufferUtil.newDirectFloatBuffer(m, m_offset));
     }
     public void glPopMatrix() {
         pmvMatrix.glPopMatrix();
@@ -143,7 +143,7 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
         pmvMatrix.glMultMatrixf(m);
     }
     public void glMultMatrixf(float[] m, int m_offset) {
-        glMultMatrixf(BufferUtil.newFloatBuffer(m, m_offset));
+        glMultMatrixf(BufferUtil.newDirectFloatBuffer(m, m_offset));
     }
     public void glTranslatef(float x, float y, float z) {
         pmvMatrix.glTranslatef(x, y, z);
@@ -165,23 +165,23 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
     // LightingIf
     //
     public void glColor4f(float red, float green, float blue, float alpha) {
-      fixedFunction.glColor4fv(gl, BufferUtil.newFloatBuffer(new float[] { red, green, blue, alpha })); 
+      fixedFunction.glColor4fv(gl, BufferUtil.newDirectFloatBuffer(new float[] { red, green, blue, alpha }));
     }
 
     public void glLightfv(int light, int pname, java.nio.FloatBuffer params) {
       fixedFunction.glLightfv(gl, light, pname, params);
     }
     public void glLightfv(int light, int pname, float[] params, int params_offset) {
-        glLightfv(light, pname, BufferUtil.newFloatBuffer(params, params_offset));
+        glLightfv(light, pname, BufferUtil.newDirectFloatBuffer(params, params_offset));
     }
     public void glMaterialfv(int face, int pname, java.nio.FloatBuffer params) {
       fixedFunction.glMaterialfv(gl, face, pname, params);
     }
     public void glMaterialfv(int face, int pname, float[] params, int params_offset) {
-        glMaterialfv(face, pname, BufferUtil.newFloatBuffer(params, params_offset));
+        glMaterialfv(face, pname, BufferUtil.newDirectFloatBuffer(params, params_offset));
     }
     public void glMaterialf(int face, int pname, float param) {
-        glMaterialfv(face, pname, BufferUtil.newFloatBuffer(new float[] { param }));
+        glMaterialfv(face, pname, BufferUtil.newDirectFloatBuffer(new float[] { param }));
     }
     public void glShadeModel(int mode) {
       fixedFunction.glShadeModel(gl, mode);
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
index 1a60ab21e..9ead6c4eb 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
@@ -1,11 +1,11 @@
 
 package com.jogamp.opengl.util.glsl.fixedfunc.impl;
 
+import com.jogamp.gluegen.runtime.Buffers;
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.*;
-import com.jogamp.opengl.util.glsl.fixedfunc.*;
 import java.nio.*;
 
 public class FixedFuncPipeline {
@@ -490,14 +490,14 @@ public class FixedFuncPipeline {
     protected boolean verbose=false;
 
     protected boolean textureEnabled=false;
-    protected IntBuffer textureCoordsEnabled = BufferUtil.newIntBuffer(new int[] { 0, 0, 0, 0, 0, 0, 0, 0 });
+    protected IntBuffer textureCoordsEnabled = Buffers.newDirectIntBuffer(new int[] { 0, 0, 0, 0, 0, 0, 0, 0 });
     protected boolean textureCoordsEnabledDirty = false;
     protected int     activeTextureUnit=0;
 
     protected int cullFace=-2; // <=0 disabled, 1: front, 2: back (default, but disabled), 3: front & back
 
     protected boolean lightingEnabled=false;
-    protected IntBuffer lightsEnabled = BufferUtil.newIntBuffer(new int[] { 0, 0, 0, 0, 0, 0, 0, 0 });
+    protected IntBuffer lightsEnabled = Buffers.newDirectIntBuffer(new int[] { 0, 0, 0, 0, 0, 0, 0, 0 });
     protected boolean   lightsEnabledDirty = false;
 
     protected PMVMatrix pmvMatrix;
@@ -525,23 +525,23 @@ public class FixedFuncPipeline {
 
     protected static final String mgl_CullFace         = "mgl_CullFace";   //  1i
 
-    protected static final FloatBuffer zero4f     = BufferUtil.newFloatBuffer(new float[] { 0.0f, 0.0f, 0.0f, 0.0f });
+    protected static final FloatBuffer zero4f     = Buffers.newDirectFloatBuffer(new float[] { 0.0f, 0.0f, 0.0f, 0.0f });
 
-    public static final FloatBuffer defAmbient = BufferUtil.newFloatBuffer(new float[] { 0f, 0f, 0f, 1f });
+    public static final FloatBuffer defAmbient = Buffers.newDirectFloatBuffer(new float[] { 0f, 0f, 0f, 1f });
     public static final FloatBuffer defDiffuse = zero4f;
     public static final FloatBuffer defSpecular= zero4f;
-    public static final FloatBuffer defPosition= BufferUtil.newFloatBuffer(new float[] { 0f, 0f, 1f, 0f });
-    public static final FloatBuffer defSpotDir = BufferUtil.newFloatBuffer(new float[] { 0f, 0f, -1f });
+    public static final FloatBuffer defPosition= Buffers.newDirectFloatBuffer(new float[] { 0f, 0f, 1f, 0f });
+    public static final FloatBuffer defSpotDir = Buffers.newDirectFloatBuffer(new float[] { 0f, 0f, -1f });
     public static final float defSpotExponent  = 0f;
     public static final float defSpotCutoff    = 180f;
     public static final float defConstantAtten = 1f;
     public static final float defLinearAtten   = 0f;
     public static final float defQuadraticAtten= 0f;
 
-    public static final FloatBuffer defMatAmbient = BufferUtil.newFloatBuffer(new float[] { 0.2f, 0.2f, 0.2f, 1.0f });
-    public static final FloatBuffer defMatDiffuse = BufferUtil.newFloatBuffer(new float[] { 0.8f, 0.8f, 0.8f, 1.0f });
-    public static final FloatBuffer defMatSpecular= BufferUtil.newFloatBuffer(new float[] { 0f, 0f, 0f, 1f});
-    public static final FloatBuffer defMatEmission= BufferUtil.newFloatBuffer(new float[] { 0f, 0f, 0f, 1f});
+    public static final FloatBuffer defMatAmbient = Buffers.newDirectFloatBuffer(new float[] { 0.2f, 0.2f, 0.2f, 1.0f });
+    public static final FloatBuffer defMatDiffuse = Buffers.newDirectFloatBuffer(new float[] { 0.8f, 0.8f, 0.8f, 1.0f });
+    public static final FloatBuffer defMatSpecular= Buffers.newDirectFloatBuffer(new float[] { 0f, 0f, 0f, 1f});
+    public static final FloatBuffer defMatEmission= Buffers.newDirectFloatBuffer(new float[] { 0f, 0f, 0f, 1f});
     public static final float       defMatShininess = 0f;
 
     protected static final String vertexColorFileDef          = "FixedFuncColor";
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
index 4feeb9f4e..2ed1299da 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
@@ -478,7 +478,7 @@ public class DDSImage {
         }
         if (size == 0)
             size = 1;
-        return BufferUtil.newByteBuffer(size);
+        return BufferUtil.newDirectByteBuffer(size);
     }
 
     public void debugPrint() {
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase
index b1f18cc9e..4e9294870 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase
@@ -503,7 +503,7 @@ public class DDSImage {
         }
         if (size == 0)
             size = 1;
-        return BufferUtil.newByteBuffer(size);
+        return BufferUtil.newDirectByteBuffer(size);
     }
 
     public void debugPrint() {
-- 
cgit v1.2.3


From 273fb3383a04408725ee2bda632af0edf6e8421f Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Mon, 29 Mar 2010 15:35:45 +0200
Subject: renamed BufferUtil to GLBuffers.

---
 .../classes/com/jogamp/opengl/util/BufferUtil.java | 156 ---------------------
 .../com/jogamp/opengl/util/GLArrayDataWrapper.java |   8 +-
 .../classes/com/jogamp/opengl/util/GLBuffers.java  | 137 ++++++++++++++++++
 .../com/jogamp/opengl/util/ImmModeSink.java        | 156 ++++++++++-----------
 .../classes/com/jogamp/opengl/util/StreamUtil.java |   2 +-
 .../util/glsl/fixedfunc/impl/FixedFuncHook.java    |  12 +-
 .../jogamp/opengl/util/texture/TextureData.java    |   2 +-
 .../util/texture/spi/DDSImage.java.javame_cdc_fp   |   2 +-
 .../opengl/util/texture/spi/DDSImage.java.javase   |   2 +-
 9 files changed, 229 insertions(+), 248 deletions(-)
 delete mode 100755 src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java
 create mode 100755 src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java

diff --git a/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java
deleted file mode 100755
index 41baf03d7..000000000
--- a/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-package com.jogamp.opengl.util;
-
-import com.jogamp.gluegen.runtime.Buffers;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GL2ES2;
-
-import java.nio.*;
-
-/**
- * Utility routines for dealing with direct buffers.
- * @author Kenneth Russel
- * @author Michael Bien
- */
-public class BufferUtil extends Buffers {
-
-    public static final int sizeOfGLType(int glType) {
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-                return SIZEOF_BYTE;
-            case GL.GL_BYTE:
-                return SIZEOF_BYTE;
-            case GL.GL_UNSIGNED_SHORT:
-                return SIZEOF_SHORT;
-            case GL.GL_SHORT:
-                return SIZEOF_SHORT;
-            case GL.GL_FLOAT:
-                return SIZEOF_FLOAT;
-            case GL.GL_FIXED:
-                return SIZEOF_INT;
-            case GL2ES2.GL_INT:
-                return SIZEOF_INT;
-            case GL2ES2.GL_UNSIGNED_INT:
-                return SIZEOF_INT;
-            case GL2.GL_DOUBLE:
-                return SIZEOF_DOUBLE;
-        }
-        return -1;
-    }
-
-    public static final int sizeOfBufferElem(Buffer buffer) {
-        if (buffer == null) {
-            return 0;
-        }
-        if (buffer instanceof ByteBuffer) {
-            return BufferUtil.SIZEOF_BYTE;
-        } else if (buffer instanceof IntBuffer) {
-            return BufferUtil.SIZEOF_INT;
-        } else if (buffer instanceof ShortBuffer) {
-            return BufferUtil.SIZEOF_SHORT;
-        } else if (buffer instanceof FloatBuffer) {
-            return BufferUtil.SIZEOF_FLOAT;
-        } else if (buffer instanceof DoubleBuffer) {
-            return BufferUtil.SIZEOF_DOUBLE;
-        }
-        throw new RuntimeException("Unexpected buffer type "
-                + buffer.getClass().getName());
-    }
-
-    public static final Buffer newDirectGLBuffer(int glType, int numElements) {
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-            case GL.GL_BYTE:
-                return newDirectByteBuffer(numElements);
-            case GL.GL_UNSIGNED_SHORT:
-            case GL.GL_SHORT:
-                return newDirectShortBuffer(numElements);
-            case GL.GL_FLOAT:
-                return newDirectFloatBuffer(numElements);
-            case GL.GL_FIXED:
-            case GL2ES2.GL_INT:
-            case GL2ES2.GL_UNSIGNED_INT:
-                return newDirectIntBuffer(numElements);
-            case GL2.GL_DOUBLE:
-                return newDirectDoubleBuffer(numElements);
-        }
-        return null;
-    }
-
-    public static final Buffer sliceGLBuffer(ByteBuffer parent, int bytePos, int byteLen, int glType) {
-        if (parent == null || byteLen == 0) {
-            return null;
-        }
-        parent.position(bytePos);
-        parent.limit(bytePos + byteLen);
-
-        switch (glType) {
-            case GL.GL_UNSIGNED_BYTE:
-            case GL.GL_BYTE:
-                return parent.slice();
-            case GL.GL_UNSIGNED_SHORT:
-            case GL.GL_SHORT:
-                return parent.asShortBuffer();
-            case GL.GL_FLOAT:
-                return parent.asFloatBuffer();
-            case GL.GL_FIXED:
-            case GL2ES2.GL_INT:
-            case GL2ES2.GL_UNSIGNED_INT:
-                return parent.asIntBuffer();
-            case GL2.GL_DOUBLE:
-                return parent.asDoubleBuffer();
-        }
-        return null;
-    }
-
-    //----------------------------------------------------------------------
-    // Conversion routines
-    //
-    public final static float[] getFloatArray(double[] source) {
-        int i = source.length;
-        float[] dest = new float[i--];
-        while (i >= 0) {
-            dest[i] = (float) source[i];
-            i--;
-        }
-        return dest;
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
index aa3059800..2ab77fa1b 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
@@ -65,16 +65,16 @@ public class GLArrayDataWrapper implements GLArrayData {
 
   public final int getComponentSize() {
     if(clazz==ByteBuffer.class) {
-        return BufferUtil.SIZEOF_BYTE;
+        return GLBuffers.SIZEOF_BYTE;
     }
     if(clazz==ShortBuffer.class) {
-        return BufferUtil.SIZEOF_SHORT;
+        return GLBuffers.SIZEOF_SHORT;
     }
     if(clazz==IntBuffer.class) {
-        return BufferUtil.SIZEOF_INT;
+        return GLBuffers.SIZEOF_INT;
     }
     if(clazz==FloatBuffer.class) {
-        return BufferUtil.SIZEOF_FLOAT;
+        return GLBuffers.SIZEOF_FLOAT;
     }
     throw new GLException("Given Buffer Class not supported: "+clazz+":\n\t"+this);
   }
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java b/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java
new file mode 100755
index 000000000..b49bb3364
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+package com.jogamp.opengl.util;
+
+import com.jogamp.gluegen.runtime.Buffers;
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
+import javax.media.opengl.GL2ES2;
+
+import java.nio.*;
+
+/**
+ * Utility routines for dealing with direct buffers.
+ * @author Kenneth Russel
+ * @author Michael Bien
+ */
+public class GLBuffers extends Buffers {
+
+    public static final int sizeOfGLType(int glType) {
+        switch (glType) {
+            case GL.GL_UNSIGNED_BYTE:
+                return SIZEOF_BYTE;
+            case GL.GL_BYTE:
+                return SIZEOF_BYTE;
+            case GL.GL_UNSIGNED_SHORT:
+                return SIZEOF_SHORT;
+            case GL.GL_SHORT:
+                return SIZEOF_SHORT;
+            case GL.GL_FLOAT:
+                return SIZEOF_FLOAT;
+            case GL.GL_FIXED:
+                return SIZEOF_INT;
+            case GL2ES2.GL_INT:
+                return SIZEOF_INT;
+            case GL2ES2.GL_UNSIGNED_INT:
+                return SIZEOF_INT;
+            case GL2.GL_DOUBLE:
+                return SIZEOF_DOUBLE;
+        }
+        return -1;
+    }
+
+    public static final Buffer newDirectGLBuffer(int glType, int numElements) {
+        switch (glType) {
+            case GL.GL_UNSIGNED_BYTE:
+            case GL.GL_BYTE:
+                return newDirectByteBuffer(numElements);
+            case GL.GL_UNSIGNED_SHORT:
+            case GL.GL_SHORT:
+                return newDirectShortBuffer(numElements);
+            case GL.GL_FLOAT:
+                return newDirectFloatBuffer(numElements);
+            case GL.GL_FIXED:
+            case GL2ES2.GL_INT:
+            case GL2ES2.GL_UNSIGNED_INT:
+                return newDirectIntBuffer(numElements);
+            case GL2.GL_DOUBLE:
+                return newDirectDoubleBuffer(numElements);
+        }
+        return null;
+    }
+
+    public static final Buffer sliceGLBuffer(ByteBuffer parent, int bytePos, int byteLen, int glType) {
+        if (parent == null || byteLen == 0) {
+            return null;
+        }
+        parent.position(bytePos);
+        parent.limit(bytePos + byteLen);
+
+        switch (glType) {
+            case GL.GL_UNSIGNED_BYTE:
+            case GL.GL_BYTE:
+                return parent.slice();
+            case GL.GL_UNSIGNED_SHORT:
+            case GL.GL_SHORT:
+                return parent.asShortBuffer();
+            case GL.GL_FLOAT:
+                return parent.asFloatBuffer();
+            case GL.GL_FIXED:
+            case GL2ES2.GL_INT:
+            case GL2ES2.GL_UNSIGNED_INT:
+                return parent.asIntBuffer();
+            case GL2.GL_DOUBLE:
+                return parent.asDoubleBuffer();
+        }
+        return null;
+    }
+
+    //----------------------------------------------------------------------
+    // Conversion routines
+    //
+    public final static float[] getFloatArray(double[] source) {
+        int i = source.length;
+        float[] dest = new float[i--];
+        while (i >= 0) {
+            dest[i] = (float) source[i];
+            i--;
+        }
+        return dest;
+    }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
index 22a2d8a9f..126a303ab 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
@@ -361,79 +361,79 @@ public class ImmModeSink {
 
     public void glVertexv(Buffer v) {
         checkSeal(false);
-        BufferUtil.put(vertexArray, v);
+        GLBuffers.put(vertexArray, v);
     }
     public void glNormalv(Buffer v) {
         checkSeal(false);
-        BufferUtil.put(normalArray, v);
+        GLBuffers.put(normalArray, v);
     }
     public void glColorv(Buffer v) {
         checkSeal(false);
-        BufferUtil.put(colorArray, v);
+        GLBuffers.put(colorArray, v);
     }
     public void glTexCoordv(Buffer v) {
         checkSeal(false);
-        BufferUtil.put(textCoordArray, v);
+        GLBuffers.put(textCoordArray, v);
     }
 
     public void glVertex2b(byte x, byte y) {
         checkSeal(false);
         growBufferIfNecessary(VERTEX, 2);
         if(vComps>0) 
-            BufferUtil.putb(vertexArray, x);
+            GLBuffers.putb(vertexArray, x);
         if(vComps>1) 
-            BufferUtil.putb(vertexArray, y);
+            GLBuffers.putb(vertexArray, y);
         padding(VERTEX, vComps-2);
     }
     public void glVertex3b(byte x, byte y, byte z) {
         checkSeal(false);
         growBufferIfNecessary(VERTEX, 3);
         if(vComps>0) 
-            BufferUtil.putb(vertexArray, x);
+            GLBuffers.putb(vertexArray, x);
         if(vComps>1) 
-            BufferUtil.putb(vertexArray, y);
+            GLBuffers.putb(vertexArray, y);
         if(vComps>2) 
-            BufferUtil.putb(vertexArray, z);
+            GLBuffers.putb(vertexArray, z);
         padding(VERTEX, vComps-3);
     }
     public void glVertex2s(short x, short y) {
         checkSeal(false);
         growBufferIfNecessary(VERTEX, 2);
         if(vComps>0) 
-            BufferUtil.puts(vertexArray, x);
+            GLBuffers.puts(vertexArray, x);
         if(vComps>1) 
-            BufferUtil.puts(vertexArray, y);
+            GLBuffers.puts(vertexArray, y);
         padding(VERTEX, vComps-2);
     }
     public void glVertex3s(short x, short y, short z) {
         checkSeal(false);
         growBufferIfNecessary(VERTEX, 3);
         if(vComps>0) 
-            BufferUtil.puts(vertexArray, x);
+            GLBuffers.puts(vertexArray, x);
         if(vComps>1) 
-            BufferUtil.puts(vertexArray, y);
+            GLBuffers.puts(vertexArray, y);
         if(vComps>2) 
-            BufferUtil.puts(vertexArray, z);
+            GLBuffers.puts(vertexArray, z);
         padding(VERTEX, vComps-3);
     }
     public void glVertex2f(float x, float y) {
         checkSeal(false);
         growBufferIfNecessary(VERTEX, 2);
         if(vComps>0) 
-            BufferUtil.putf(vertexArray, x);
+            GLBuffers.putf(vertexArray, x);
         if(vComps>1) 
-            BufferUtil.putf(vertexArray, y);
+            GLBuffers.putf(vertexArray, y);
         padding(VERTEX, vComps-2);
     }
     public void glVertex3f(float x, float y, float z) {
         checkSeal(false);
         growBufferIfNecessary(VERTEX, 3);
         if(vComps>0) 
-            BufferUtil.putf(vertexArray, x);
+            GLBuffers.putf(vertexArray, x);
         if(vComps>1) 
-            BufferUtil.putf(vertexArray, y);
+            GLBuffers.putf(vertexArray, y);
         if(vComps>2) 
-            BufferUtil.putf(vertexArray, z);
+            GLBuffers.putf(vertexArray, z);
         padding(VERTEX, vComps-3);
     }
 
@@ -441,33 +441,33 @@ public class ImmModeSink {
         checkSeal(false);
         growBufferIfNecessary(NORMAL, 3);
         if(nComps>0) 
-            BufferUtil.putb(normalArray, x);
+            GLBuffers.putb(normalArray, x);
         if(nComps>1) 
-            BufferUtil.putb(normalArray, y);
+            GLBuffers.putb(normalArray, y);
         if(nComps>2) 
-            BufferUtil.putb(normalArray, z);
+            GLBuffers.putb(normalArray, z);
         padding(NORMAL, nComps-3);
     }
     public void glNormal3s(short x, short y, short z) {
         checkSeal(false);
         growBufferIfNecessary(NORMAL, 3);
         if(nComps>0) 
-            BufferUtil.puts(normalArray, x);
+            GLBuffers.puts(normalArray, x);
         if(nComps>1) 
-            BufferUtil.puts(normalArray, y);
+            GLBuffers.puts(normalArray, y);
         if(nComps>2) 
-            BufferUtil.puts(normalArray, z);
+            GLBuffers.puts(normalArray, z);
         padding(NORMAL, nComps-3);
     }
     public void glNormal3f(float x, float y, float z) {
         checkSeal(false);
         growBufferIfNecessary(NORMAL, 3);
         if(nComps>0) 
-            BufferUtil.putf(normalArray, x);
+            GLBuffers.putf(normalArray, x);
         if(nComps>1) 
-            BufferUtil.putf(normalArray, y);
+            GLBuffers.putf(normalArray, y);
         if(nComps>2) 
-            BufferUtil.putf(normalArray, z);
+            GLBuffers.putf(normalArray, z);
         padding(NORMAL, nComps-3);
     }
 
@@ -475,72 +475,72 @@ public class ImmModeSink {
         checkSeal(false);
         growBufferIfNecessary(COLOR, 3);
         if(cComps>0) 
-            BufferUtil.putb(colorArray, r);
+            GLBuffers.putb(colorArray, r);
         if(cComps>1) 
-            BufferUtil.putb(colorArray, g);
+            GLBuffers.putb(colorArray, g);
         if(cComps>2) 
-            BufferUtil.putb(colorArray, b);
+            GLBuffers.putb(colorArray, b);
         padding(COLOR, cComps-3);
     }
     public void glColor4b(byte r, byte g, byte b, byte a) {
         checkSeal(false);
         growBufferIfNecessary(COLOR, 4);
         if(cComps>0) 
-            BufferUtil.putb(colorArray, r);
+            GLBuffers.putb(colorArray, r);
         if(cComps>1) 
-            BufferUtil.putb(colorArray, g);
+            GLBuffers.putb(colorArray, g);
         if(cComps>2) 
-            BufferUtil.putb(colorArray, b);
+            GLBuffers.putb(colorArray, b);
         if(cComps>3) 
-            BufferUtil.putb(colorArray, a);
+            GLBuffers.putb(colorArray, a);
         padding(COLOR, cComps-4);
     }
     public void glColor3s(short r, short g, short b) {
         checkSeal(false);
         growBufferIfNecessary(COLOR, 3);
         if(cComps>0) 
-            BufferUtil.puts(colorArray, r);
+            GLBuffers.puts(colorArray, r);
         if(cComps>1) 
-            BufferUtil.puts(colorArray, g);
+            GLBuffers.puts(colorArray, g);
         if(cComps>2) 
-            BufferUtil.puts(colorArray, b);
+            GLBuffers.puts(colorArray, b);
         padding(COLOR, cComps-3);
     }
     public void glColor4s(short r, short g, short b, short a) {
         checkSeal(false);
         growBufferIfNecessary(COLOR, 4);
         if(cComps>0) 
-            BufferUtil.puts(colorArray, r);
+            GLBuffers.puts(colorArray, r);
         if(cComps>1) 
-            BufferUtil.puts(colorArray, g);
+            GLBuffers.puts(colorArray, g);
         if(cComps>2) 
-            BufferUtil.puts(colorArray, b);
+            GLBuffers.puts(colorArray, b);
         if(cComps>3) 
-            BufferUtil.puts(colorArray, a);
+            GLBuffers.puts(colorArray, a);
         padding(COLOR, cComps-4);
     }
     public void glColor3f(float r, float g, float b) {
         checkSeal(false);
         growBufferIfNecessary(COLOR, 3);
         if(cComps>0) 
-            BufferUtil.putf(colorArray, r);
+            GLBuffers.putf(colorArray, r);
         if(cComps>1) 
-            BufferUtil.putf(colorArray, g);
+            GLBuffers.putf(colorArray, g);
         if(cComps>2) 
-            BufferUtil.putf(colorArray, b);
+            GLBuffers.putf(colorArray, b);
         padding(COLOR, cComps-3);
     }
     public void glColor4f(float r, float g, float b, float a) {
         checkSeal(false);
         growBufferIfNecessary(COLOR, 4);
         if(cComps>0) 
-            BufferUtil.putf(colorArray, r);
+            GLBuffers.putf(colorArray, r);
         if(cComps>1) 
-            BufferUtil.putf(colorArray, g);
+            GLBuffers.putf(colorArray, g);
         if(cComps>2) 
-            BufferUtil.putf(colorArray, b);
+            GLBuffers.putf(colorArray, b);
         if(cComps>3) 
-            BufferUtil.putf(colorArray, a);
+            GLBuffers.putf(colorArray, a);
         padding(COLOR, cComps-4);
     }
 
@@ -548,60 +548,60 @@ public class ImmModeSink {
         checkSeal(false);
         growBufferIfNecessary(TEXTCOORD, 2);
         if(tComps>0) 
-            BufferUtil.putb(textCoordArray, x);
+            GLBuffers.putb(textCoordArray, x);
         if(tComps>1) 
-            BufferUtil.putb(textCoordArray, y);
+            GLBuffers.putb(textCoordArray, y);
         padding(TEXTCOORD, tComps-2);
     }
     public void glTexCoord3b(byte x, byte y, byte z) {
         checkSeal(false);
         growBufferIfNecessary(TEXTCOORD, 3);
         if(tComps>0) 
-            BufferUtil.putb(textCoordArray, x);
+            GLBuffers.putb(textCoordArray, x);
         if(tComps>1) 
-            BufferUtil.putb(textCoordArray, y);
+            GLBuffers.putb(textCoordArray, y);
         if(tComps>2) 
-            BufferUtil.putb(textCoordArray, z);
+            GLBuffers.putb(textCoordArray, z);
         padding(TEXTCOORD, tComps-3);
     }
     public void glTexCoord2s(short x, short y) {
         checkSeal(false);
         growBufferIfNecessary(TEXTCOORD, 2);
         if(tComps>0) 
-            BufferUtil.puts(textCoordArray, x);
+            GLBuffers.puts(textCoordArray, x);
         if(tComps>1) 
-            BufferUtil.puts(textCoordArray, y);
+            GLBuffers.puts(textCoordArray, y);
         padding(TEXTCOORD, tComps-2);
     }
     public void glTexCoord3s(short x, short y, short z) {
         checkSeal(false);
         growBufferIfNecessary(TEXTCOORD, 3);
         if(tComps>0) 
-            BufferUtil.puts(textCoordArray, x);
+            GLBuffers.puts(textCoordArray, x);
         if(tComps>1) 
-            BufferUtil.puts(textCoordArray, y);
+            GLBuffers.puts(textCoordArray, y);
         if(tComps>2) 
-            BufferUtil.puts(textCoordArray, z);
+            GLBuffers.puts(textCoordArray, z);
         padding(TEXTCOORD, tComps-3);
     }
     public void glTexCoord2f(float x, float y) {
         checkSeal(false);
         growBufferIfNecessary(TEXTCOORD, 2);
         if(tComps>0) 
-            BufferUtil.putf(textCoordArray, x);
+            GLBuffers.putf(textCoordArray, x);
         if(tComps>1) 
-            BufferUtil.putf(textCoordArray, y);
+            GLBuffers.putf(textCoordArray, y);
         padding(TEXTCOORD, tComps-2);
     }
     public void glTexCoord3f(float x, float y, float z) {
         checkSeal(false);
         growBufferIfNecessary(TEXTCOORD, 3);
         if(tComps>0) 
-            BufferUtil.putf(textCoordArray, x);
+            GLBuffers.putf(textCoordArray, x);
         if(tComps>1) 
-            BufferUtil.putf(textCoordArray, y);
+            GLBuffers.putf(textCoordArray, y);
         if(tComps>2) 
-            BufferUtil.putf(textCoordArray, z);
+            GLBuffers.putf(textCoordArray, z);
         padding(TEXTCOORD, tComps-3);
     }
 
@@ -809,20 +809,20 @@ public class ImmModeSink {
     // non public matters
 
     protected void allocateBuffer(int elements) {
-        int vWidth = vComps * BufferUtil.sizeOfGLType(vDataType);
-        int cWidth = cComps * BufferUtil.sizeOfGLType(cDataType);
-        int nWidth = nComps * BufferUtil.sizeOfGLType(nDataType);
-        int tWidth = tComps * BufferUtil.sizeOfGLType(tDataType);
+        int vWidth = vComps * GLBuffers.sizeOfGLType(vDataType);
+        int cWidth = cComps * GLBuffers.sizeOfGLType(cDataType);
+        int nWidth = nComps * GLBuffers.sizeOfGLType(nDataType);
+        int tWidth = tComps * GLBuffers.sizeOfGLType(tDataType);
 
         count  = elements;
         bSize  = count * ( vWidth + cWidth + nWidth + tWidth ) ;
 
-        buffer = BufferUtil.newDirectByteBuffer(bSize);
+        buffer = GLBuffers.newDirectByteBuffer(bSize);
 
         int pos = 0;
         int size= count * vWidth ;
         if(size>0) {
-            vertexArray = BufferUtil.sliceGLBuffer(buffer, pos, size, vDataType);
+            vertexArray = GLBuffers.sliceGLBuffer(buffer, pos, size, vDataType);
         } else {
             vertexArray = null;
         }
@@ -831,7 +831,7 @@ public class ImmModeSink {
 
         size= count * cWidth ;
         if(size>0) {
-            colorArray = BufferUtil.sliceGLBuffer(buffer, pos, size, cDataType);
+            colorArray = GLBuffers.sliceGLBuffer(buffer, pos, size, cDataType);
         } else {
             colorArray = null;
         }
@@ -840,7 +840,7 @@ public class ImmModeSink {
 
         size= count * nWidth ;
         if(size>0) {
-            normalArray = BufferUtil.sliceGLBuffer(buffer, pos, size, nDataType);
+            normalArray = GLBuffers.sliceGLBuffer(buffer, pos, size, nDataType);
         } else {
             normalArray = null;
         }
@@ -849,7 +849,7 @@ public class ImmModeSink {
 
         size= count * tWidth ;
         if(size>0) {
-            textCoordArray = BufferUtil.sliceGLBuffer(buffer, pos, size, tDataType);
+            textCoordArray = GLBuffers.sliceGLBuffer(buffer, pos, size, tDataType);
         } else {
             textCoordArray = null;
         }
@@ -905,19 +905,19 @@ public class ImmModeSink {
 
         if(null!=_vertexArray) {
             _vertexArray.flip();
-            BufferUtil.put(vertexArray, _vertexArray);
+            GLBuffers.put(vertexArray, _vertexArray);
         }
         if(null!=_colorArray) {
             _colorArray.flip();
-            BufferUtil.put(colorArray, _colorArray);
+            GLBuffers.put(colorArray, _colorArray);
         }
         if(null!=_normalArray) {
             _normalArray.flip();
-            BufferUtil.put(normalArray, _normalArray);
+            GLBuffers.put(normalArray, _normalArray);
         }
         if(null!=_textCoordArray) {
             _textCoordArray.flip();
-            BufferUtil.put(textCoordArray, _textCoordArray);
+            GLBuffers.put(textCoordArray, _textCoordArray);
         }
     }
 
@@ -944,7 +944,7 @@ public class ImmModeSink {
         if ( null==dest ) return;
 
         while((fill--)>0) {
-            BufferUtil.putb(dest, (byte)0);
+            GLBuffers.putb(dest, (byte)0);
         }
     }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java b/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java
index 83186f6a0..4cf8cb1f0 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java
@@ -59,7 +59,7 @@ public class StreamUtil {
 
     public static ByteBuffer readAll2Buffer(InputStream stream) throws IOException {
         BytesRead bytesRead = readAllImpl(stream);
-        return BufferUtil.newDirectByteBuffer(bytesRead.data, 0, bytesRead.payloadLen);
+        return GLBuffers.newDirectByteBuffer(bytesRead.data, 0, bytesRead.payloadLen);
     }
 
     private static BytesRead readAllImpl(InputStream stream) throws IOException {
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
index b69cc2b72..2276cc835 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
@@ -128,7 +128,7 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
         pmvMatrix.glLoadMatrixf(m);
     }
     public void glLoadMatrixf(float[] m, int m_offset) {
-        glLoadMatrixf(BufferUtil.newDirectFloatBuffer(m, m_offset));
+        glLoadMatrixf(GLBuffers.newDirectFloatBuffer(m, m_offset));
     }
     public void glPopMatrix() {
         pmvMatrix.glPopMatrix();
@@ -143,7 +143,7 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
         pmvMatrix.glMultMatrixf(m);
     }
     public void glMultMatrixf(float[] m, int m_offset) {
-        glMultMatrixf(BufferUtil.newDirectFloatBuffer(m, m_offset));
+        glMultMatrixf(GLBuffers.newDirectFloatBuffer(m, m_offset));
     }
     public void glTranslatef(float x, float y, float z) {
         pmvMatrix.glTranslatef(x, y, z);
@@ -165,23 +165,23 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
     // LightingIf
     //
     public void glColor4f(float red, float green, float blue, float alpha) {
-      fixedFunction.glColor4fv(gl, BufferUtil.newDirectFloatBuffer(new float[] { red, green, blue, alpha }));
+      fixedFunction.glColor4fv(gl, GLBuffers.newDirectFloatBuffer(new float[] { red, green, blue, alpha }));
     }
 
     public void glLightfv(int light, int pname, java.nio.FloatBuffer params) {
       fixedFunction.glLightfv(gl, light, pname, params);
     }
     public void glLightfv(int light, int pname, float[] params, int params_offset) {
-        glLightfv(light, pname, BufferUtil.newDirectFloatBuffer(params, params_offset));
+        glLightfv(light, pname, GLBuffers.newDirectFloatBuffer(params, params_offset));
     }
     public void glMaterialfv(int face, int pname, java.nio.FloatBuffer params) {
       fixedFunction.glMaterialfv(gl, face, pname, params);
     }
     public void glMaterialfv(int face, int pname, float[] params, int params_offset) {
-        glMaterialfv(face, pname, BufferUtil.newDirectFloatBuffer(params, params_offset));
+        glMaterialfv(face, pname, GLBuffers.newDirectFloatBuffer(params, params_offset));
     }
     public void glMaterialf(int face, int pname, float param) {
-        glMaterialfv(face, pname, BufferUtil.newDirectFloatBuffer(new float[] { param }));
+        glMaterialfv(face, pname, GLBuffers.newDirectFloatBuffer(new float[] { param }));
     }
     public void glShadeModel(int mode) {
       fixedFunction.glShadeModel(gl, mode);
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureData.java b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureData.java
index 9a28f3316..f598422bf 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureData.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureData.java
@@ -365,6 +365,6 @@ public class TextureData {
         if (buffer == null) {
             return 0;
         }
-        return buffer.capacity() * BufferUtil.sizeOfBufferElem(buffer);
+        return buffer.capacity() * GLBuffers.sizeOfBufferElem(buffer);
     }
 }
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
index 2ed1299da..b18991dfc 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
@@ -478,7 +478,7 @@ public class DDSImage {
         }
         if (size == 0)
             size = 1;
-        return BufferUtil.newDirectByteBuffer(size);
+        return GLBuffers.newDirectByteBuffer(size);
     }
 
     public void debugPrint() {
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase
index 4e9294870..e3092162d 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase
@@ -503,7 +503,7 @@ public class DDSImage {
         }
         if (size == 0)
             size = 1;
-        return BufferUtil.newDirectByteBuffer(size);
+        return GLBuffers.newDirectByteBuffer(size);
     }
 
     public void debugPrint() {
-- 
cgit v1.2.3


From 476d1d755b6d9c5650779aedda1265917a6dec6e Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Mon, 29 Mar 2010 22:33:06 +0200
Subject: fixed a bunch of javadoc warnings.

---
 nbproject/project.xml                              |  5 ++
 .../com/jogamp/opengl/util/ImmModeSink.java        |  4 +-
 .../classes/com/jogamp/opengl/util/PMVMatrix.java  |  2 +-
 .../classes/com/jogamp/opengl/util/TGAWriter.java  |  8 ++-
 .../com/jogamp/opengl/util/glsl/ShaderProgram.java | 13 +++--
 .../com/jogamp/opengl/util/glsl/ShaderState.java   | 59 ++++++++++------------
 .../opengl/util/glsl/fixedfunc/FixedFuncUtil.java  |  8 +--
 .../jogamp/opengl/util/glsl/sdk/CompileShader.java | 21 ++++----
 .../classes/javax/media/opengl/GLArrayData.java    | 10 ++--
 src/jogl/classes/javax/media/opengl/GLBase.java    |  2 +-
 src/jogl/classes/javax/media/opengl/GLContext.java |  6 +--
 .../javax/media/opengl/GLDrawableFactory.java      |  4 +-
 .../classes/javax/media/opengl/GLUniformData.java  |  2 -
 .../javax/media/opengl/fixedfunc/GLMatrixFunc.java |  4 +-
 .../classes/com/jogamp/newt/opengl/GLWindow.java   |  5 +-
 15 files changed, 77 insertions(+), 76 deletions(-)

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 31339c907..9f8a897bd 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -79,6 +79,10 @@
                     <script>${ant.script}</script>
                     <target>junit.run</target>
                 </action>
+                <action name="javadoc">
+                    <script>${ant.script}</script>
+                    <target>javadoc</target>
+                </action>
             </ide-actions>
             <export>
                 <type>folder</type>
@@ -116,6 +120,7 @@
                     <ide-action name="build"/>
                     <ide-action name="rebuild"/>
                     <ide-action name="clean"/>
+                    <ide-action name="javadoc"/>
                     <ide-action name="test"/>
                 </context-menu>
             </view>
diff --git a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
index 126a303ab..ad230a415 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
@@ -35,8 +35,8 @@ public class ImmModeSink {
    * a ShaderState must be current, using ShaderState.glUseProgram().
    *
    * @see #draw(GL, boolean)
-   * @see javax.media.opengl.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
-   * @see javax.media.opengl.glsl.ShaderState#getCurrent()
+   * @see com.jogamp.opengl.util.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
+   * @see com.jogamp.opengl.util.glsl.ShaderState#getCurrent()
    */
   public static ImmModeSink createGLSL(GL gl, int glBufferUsage, int initialSize,
                                        int vComps, int vDataType,
diff --git a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
index f6d5f1999..4ca8ff197 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
@@ -295,7 +295,7 @@ public class PMVMatrix implements GLMatrixFunc {
     }
 
   /**
-   * @param pname GL_MODELVIEW, GL_PROJECTION or GL.GL_TEXTURE
+   * @param matrixName GL_MODELVIEW, GL_PROJECTION or GL.GL_TEXTURE
    * @return the given matrix
    */
     public final FloatBuffer glGetMatrixf(final int matrixName) {
diff --git a/src/jogl/classes/com/jogamp/opengl/util/TGAWriter.java b/src/jogl/classes/com/jogamp/opengl/util/TGAWriter.java
index c53cafdcb..b949f0e39 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/TGAWriter.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/TGAWriter.java
@@ -42,13 +42,11 @@ import java.nio.channels.*;
 
 /**
  * Utility class which helps take fast screenshots of OpenGL rendering
- * results into Targa-format files. Used by the {@link
- * com.jogamp.opengl.util.gl2.Screenshot Screenshot} class; can also be used
- * in conjunction with the {@link com.jogamp.opengl.util.gl2.TileRenderer
- * TileRenderer} class. <P>
+ * results into Targa-format files. Used by the {@link com.jogamp.opengl.util.awt.Screenshot}
+ * class; can also be used in conjunction with the {@link com.jogamp.opengl.util.gl2.TileRenderer} class.
  */
-
 public class TGAWriter {
+    
   private static final int TARGA_HEADER_SIZE = 18;
 
   private FileChannel ch;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java
index 49a341cc6..430ed08ce 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java
@@ -5,7 +5,6 @@ import javax.media.opengl.*;
 
 import java.util.HashMap;
 import java.util.Iterator;
-import java.nio.*;
 import java.io.PrintStream;
 
 public class ShaderProgram {
@@ -104,16 +103,20 @@ public class ShaderProgram {
      * Refetches all previously bin/get attribute names
      * and resets all attribute data as well
      *
-     * @see getAttribLocation
      * @param gl 
      * @param oldShaderID the to be replace Shader
      * @param newShader   the new ShaderCode
      * @param verboseOut  the optional verbose outputstream
      * @throws GLException is the program is not linked
      *
-     * @see #glRefetchAttribLocations
-     * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
+     * @see ShaderState#glEnableVertexAttribArray
+     * @see ShaderState#glDisableVertexAttribArray
+     * @see ShaderState#glVertexAttribPointer
+     * @see ShaderState#getVertexAttribPointer
+     * @see ShaderState#glReleaseAllVertexAttributes
+     * @see ShaderState#glResetAllVertexAttributes
+     * @see ShaderState#glResetAllVertexAttributes
+     * @see ShaderState#glResetAllVertexAttributes
      */
     public synchronized boolean glReplaceShader(GL2ES2 gl, int oldShaderID, ShaderCode newShader, PrintStream verboseOut) {
         if(!programLinked) throw new GLException("Program is not linked");
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
index 33f6e210b..86f9251b7 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
@@ -2,14 +2,11 @@
 package com.jogamp.opengl.util.glsl;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.impl.Debug;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.nio.*;
-import java.io.PrintStream;
 import java.security.*;
 
 public class ShaderState {
@@ -25,8 +22,8 @@ public class ShaderState {
     /**
      * Fetches the current shader state from the thread local storage (TLS)
      *
-     * @see javax.media.opengl.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
-     * @see javax.media.opengl.glsl.ShaderState#getCurrent()
+     * @see com.jogamp.opengl.util.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
+     * @see com.jogamp.opengl.util.glsl.ShaderState#getCurrent()
      */
     public static synchronized ShaderState getCurrent() { 
         GLContext current = GLContext.getCurrent();
@@ -41,8 +38,8 @@ public class ShaderState {
      * Puts this ShaderState to to the thread local storage (TLS),
      * if <code>on</code> is <code>true</code>.
      *
-     * @see javax.media.opengl.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
-     * @see javax.media.opengl.glsl.ShaderState#getCurrent()
+     * @see com.jogamp.opengl.util.glsl.ShaderState#glUseProgram(GL2ES2, boolean)
+     * @see com.jogamp.opengl.util.glsl.ShaderState#getCurrent()
      */
     public synchronized void glUseProgram(GL2ES2 gl, boolean on) {
         if(on) {
@@ -178,7 +175,7 @@ public class ShaderState {
      * @see #glGetAttribLocation
      * @see javax.media.opengl.GL2ES2#glGetAttribLocation
      * @see #getAttribLocation
-     * @see #glReplaceShader
+     * @see ShaderProgram#glReplaceShader
      */
     public void glBindAttribLocation(GL2ES2 gl, int index, String name) {
         if(null==shaderProgram) throw new GLException("No program is attached");
@@ -203,7 +200,7 @@ public class ShaderState {
      * @see #glGetAttribLocation
      * @see javax.media.opengl.GL2ES2#glGetAttribLocation
      * @see #getAttribLocation
-     * @see #glReplaceShader
+     * @see ShaderProgram#glReplaceShader
      */
     public int glGetAttribLocation(GL2ES2 gl, String name) {
         if(!shaderProgram.linked()) throw new GLException("Program is not linked");
@@ -240,17 +237,17 @@ public class ShaderState {
      * Even if the attribute is not found in the current shader,
      * it is stored in this state.
      *
-     * @returns false, if the name is not found, otherwise true
+     * @return false, if the name is not found, otherwise true
      *
      * @throws GLException if the program is not in use
      *
      * @see #glEnableVertexAttribArray
      * @see #glDisableVertexAttribArray
      * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
+     * @see #getVertexAttribPointer
      * @see #glReleaseAllVertexAttributes
      * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
+     * @see ShaderProgram#glReplaceShader
      */
     public boolean glEnableVertexAttribArray(GL2ES2 gl, String name) {
         if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
@@ -281,17 +278,17 @@ public class ShaderState {
      * Even if the attribute is not found in the current shader,
      * it is removed from this state.
      *
-     * @returns false, if the name is not found, otherwise true
+     * @return false, if the name is not found, otherwise true
      *
      * @throws GLException if the program is not in use
      *
      * @see #glEnableVertexAttribArray
      * @see #glDisableVertexAttribArray
      * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
+     * @see #getVertexAttribPointer
      * @see #glReleaseAllVertexAttributes
      * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
+     * @see ShaderProgram#glReplaceShader
      */
     public boolean glDisableVertexAttribArray(GL2ES2 gl, String name) {
         if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
@@ -322,17 +319,17 @@ public class ShaderState {
      *      it's index will be set with the attribute's location,
      *      if found.
      *
-     * @returns false, if the name is not found, otherwise true
+     * @return false, if the name is not found, otherwise true
      *
      * @throws GLException if the program is not in use
      *
      * @see #glEnableVertexAttribArray
      * @see #glDisableVertexAttribArray
      * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
+     * @see #getVertexAttribPointer
      * @see #glReleaseAllVertexAttributes
      * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
+     * @see ShaderProgram#glReplaceShader
      */
     public boolean glVertexAttribPointer(GL2ES2 gl, GLArrayData data) {
         if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
@@ -367,15 +364,15 @@ public class ShaderState {
     /**
      * Get the vertex attribute data, previously set.
      *
-     * @returns the GLArrayData object, null if not previously set.
+     * @return the GLArrayData object, null if not previously set.
      *
      * @see #glEnableVertexAttribArray
      * @see #glDisableVertexAttribArray
      * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
+     * @see #getVertexAttribPointer
      * @see #glReleaseAllVertexAttributes
      * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
+     * @see ShaderProgram#glReplaceShader
      */
     public GLArrayData getVertexAttribPointer(String name) {
         return (GLArrayData) vertexAttribMap2Data.get(name);
@@ -390,11 +387,11 @@ public class ShaderState {
      * @see #glEnableVertexAttribArray
      * @see #glDisableVertexAttribArray
      * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
+     * @see #getVertexAttribPointer
      * @see #glReleaseAllVertexAttributes
      * @see #glResetAllVertexAttributes
      * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
+     * @see ShaderProgram#glReplaceShader
      */
     public void glReleaseAllVertexAttributes(GL2ES2 gl) {
         if(null!=shaderProgram) {
@@ -428,11 +425,11 @@ public class ShaderState {
      * @see #glEnableVertexAttribArray
      * @see #glDisableVertexAttribArray
      * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
+     * @see #getVertexAttribPointer
      * @see #glReleaseAllVertexAttributes
      * @see #glResetAllVertexAttributes
      * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
+     * @see ShaderProgram#glReplaceShader
      */
     public void glDisableAllVertexAttributeArrays(GL2ES2 gl, boolean removeFromState) {
         if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
@@ -458,10 +455,10 @@ public class ShaderState {
      * @see #glEnableVertexAttribArray
      * @see #glDisableVertexAttribArray
      * @see #glVertexAttribPointer
-     * @see #getVertexAttributePointer
+     * @see #getVertexAttribPointer
      * @see #glReleaseAllVertexAttributes
      * @see #glResetAllVertexAttributes
-     * @see #glReplaceShader
+     * @see ShaderProgram#glReplaceShader
      */
     public void glResetAllVertexAttributes(GL2ES2 gl) {
         if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
@@ -520,7 +517,7 @@ public class ShaderState {
      * @see #glGetUniformLocation
      * @see javax.media.opengl.GL2ES2#glGetUniformLocation
      * @see #getUniformLocation
-     * @see #glReplaceShader
+     * @see ShaderProgram#glReplaceShader
      */
     protected int glGetUniformLocation(GL2ES2 gl, String name) {
         if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
@@ -554,14 +551,14 @@ public class ShaderState {
      *      if found.
      *
      *
-     * @returns false, if the name is not found, otherwise true
+     * @return false, if the name is not found, otherwise true
      *
      * @throws GLException if the program is not in use
      *
      * @see #glGetUniformLocation
      * @see javax.media.opengl.GL2ES2#glGetUniformLocation
      * @see #getUniformLocation
-     * @see #glReplaceShader
+     * @see ShaderProgram#glReplaceShader
      */
     public boolean glUniform(GL2ES2 gl, GLUniformData data) {
         if(!shaderProgram.inUse()) throw new GLException("Program is not in use");
@@ -581,7 +578,7 @@ public class ShaderState {
     /**
      * Get the uniform data, previously set.
      *
-     * @returns the GLUniformData object, null if not previously set.
+     * @return the GLUniformData object, null if not previously set.
      */
     public GLUniformData getUniform(String name) {
         return (GLUniformData) uniformMap2Data.get(name);
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
index a7042c47a..f00357bfb 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
@@ -66,25 +66,25 @@ public class FixedFuncUtil {
 
     /**
      * String name for
-     * @see javax.media.opengl.GL#GL_VERTEX_ARRAY
+     * @see javax.media.opengl.GL2#GL_VERTEX_ARRAY
      */
     public static final String mgl_Vertex = FixedFuncPipeline.mgl_Vertex;
 
     /**
      * String name for
-     * @see javax.media.opengl.GL#GL_NORMAL_ARRAY
+     * @see javax.media.opengl.GL2#GL_NORMAL_ARRAY
      */
     public static final String mgl_Normal = FixedFuncPipeline.mgl_Normal;
 
     /**
      * String name for
-     * @see javax.media.opengl.GL#GL_COLOR_ARRAY
+     * @see javax.media.opengl.GL2#GL_COLOR_ARRAY
      */
     public static final String mgl_Color = FixedFuncPipeline.mgl_Color;
 
     /**
      * String name for
-     * @see javax.media.opengl.GL#GL_TEXTURE_COORD_ARRAY
+     * @see javax.media.opengl.GL2#GL_TEXTURE_COORD_ARRAY
      */
     public static final String mgl_MultiTexCoord = FixedFuncPipeline.mgl_MultiTexCoord;
 }
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java
index 9741da737..a0eed50ea 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java
@@ -7,16 +7,17 @@ import com.jogamp.opengl.util.glsl.*;
 import java.io.*;
 import java.net.*;
 
-/** Precompiles a shader into a vendor binary format. Input is the
-    resource name of the shader, such as
-    "com/jogamp/opengl/impl/glsl/fixed/shader/a.fp".
-    Output is "com/jogamp/opengl/impl/glsl/fixed/shader/bin/nvidia/a.bfp".
-
-    All path and suffixes are determined by the ShaderCode class,
-    which ensures runtime compatibility.
-
-    @see javax.media.opengl.glsl.ShaderCode
-  */
+/**
+ * Precompiles a shader into a vendor binary format. Input is the
+ * resource name of the shader, such as
+ * "com/jogamp/opengl/impl/glsl/fixed/shader/a.fp".
+ * Output is "com/jogamp/opengl/impl/glsl/fixed/shader/bin/nvidia/a.bfp".
+ *
+ * All path and suffixes are determined by the ShaderCode class,
+ * which ensures runtime compatibility.
+ *
+ * @see com.jogamp.opengl.util.glsl.ShaderCode
+ */
 
 public abstract class CompileShader {
 
diff --git a/src/jogl/classes/javax/media/opengl/GLArrayData.java b/src/jogl/classes/javax/media/opengl/GLArrayData.java
index d17ee6a06..088c71bd8 100644
--- a/src/jogl/classes/javax/media/opengl/GLArrayData.java
+++ b/src/jogl/classes/javax/media/opengl/GLArrayData.java
@@ -21,10 +21,10 @@ public interface GLArrayData {
      * The index of the predefined array index, see list below,
      * or -1 in case of a shader attribute array.
      *
-     * @see javax.media.opengl.GL#GL_VERTEX_ARRAY
-     * @see javax.media.opengl.GL#GL_NORMAL_ARRAY
-     * @see javax.media.opengl.GL#GL_COLOR_ARRAY
-     * @see javax.media.opengl.GL#GL_TEXTURE_COORD_ARRAY
+     * @see javax.media.opengl.GL2#GL_VERTEX_ARRAY
+     * @see javax.media.opengl.GL2#GL_NORMAL_ARRAY
+     * @see javax.media.opengl.GL2#GL_COLOR_ARRAY
+     * @see javax.media.opengl.GL2#GL_TEXTURE_COORD_ARRAY
      */
     public int getIndex();
 
@@ -49,7 +49,7 @@ public interface GLArrayData {
      * Sets the determined location of the shader attribute
      * This is usually done within ShaderState.
      *
-     * @see javax.media.opengl.glsl.ShaderState#glVertexAttribPointer(GL2ES2, GLArrayData)
+     * @see com.jogamp.opengl.util.glsl.ShaderState#glVertexAttribPointer(GL2ES2, GLArrayData)
      */
     public void setLocation(int v);
 
diff --git a/src/jogl/classes/javax/media/opengl/GLBase.java b/src/jogl/classes/javax/media/opengl/GLBase.java
index be5a6dc4f..369907c22 100644
--- a/src/jogl/classes/javax/media/opengl/GLBase.java
+++ b/src/jogl/classes/javax/media/opengl/GLBase.java
@@ -220,7 +220,7 @@ public interface GLBase {
     * 
     * @param glFunctionName the name of the OpenGL function (e.g., use
     * "glBindRenderbufferEXT" or "glBindRenderbuffer" to check if {@link
-    * #glBindRenderbuffer(int,int)} is available).
+    * GL#glBindRenderbuffer(int,int)} is available).
     */
    public boolean isFunctionAvailable(String glFunctionName);
 
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index 3ca1cd317..1e52c2a65 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -137,14 +137,14 @@ public abstract class GLContext {
    * copied. <code>mask</code> contains the bitwise OR of the same
    * symbolic names that are passed to the GL command {@link
    * GL#glPushAttrib glPushAttrib}. The single symbolic constant
-   * {@link GL#GL_ALL_ATTRIB_BITS GL_ALL_ATTRIB_BITS} can be used to
+   * {@link GL2#GL_ALL_ATTRIB_BITS GL_ALL_ATTRIB_BITS} can be used to
    * copy the maximum possible portion of rendering state. <P>
    *
    * Not all values for GL state can be copied. For example, pixel
    * pack and unpack state, render mode state, and select and feedback
    * state are not copied. The state that can be copied is exactly the
    * state that is manipulated by the GL command {@link
-   * GL#glPushAttrib glPushAttrib}. <P>
+   * GL2#glPushAttrib glPushAttrib}. <P>
    *
    * On most platforms, this context may not be current to any thread,
    * including the calling thread, when this method is called. Some
@@ -165,7 +165,7 @@ public abstract class GLContext {
    * If no context is current, throw an GLException
    *
    * @return the current context's GL object on this thread
-   * @thows GLException if no context is current
+   * @throws GLException if no context is current
    */
   public static GL getCurrentGL() throws GLException {
     GLContext glc = getCurrent();
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index 58a0fabbc..d61ceb1f4 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -186,10 +186,10 @@ public abstract class GLDrawableFactory {
    * The native platform's chosen Capabilties are referenced within the target
    * NativeWindow's AbstractGraphicsConfiguration.<p>
    *
-   * In case {@link javax.media.nativewindow.Capabilties#isOnscreen()} is true,<br>
+   * In case {@link javax.media.nativewindow.Capabilities#isOnscreen()} is true,<br>
    * an onscreen GLDrawable will be realized.
    * <p>
-   * In case {@link javax.media.nativewindow.Capabilties#isOnscreen()} is false,<br>
+   * In case {@link javax.media.nativewindow.Capabilities#isOnscreen()} is false,<br>
    * either a Pbuffer drawable is created if {@link javax.media.opengl.GLCapabilities#isPBuffer()} is true,<br>
    * or a simple offscreen drawable is creates. The latter is unlikely to be hardware accelerated.<br>
    * <p>
diff --git a/src/jogl/classes/javax/media/opengl/GLUniformData.java b/src/jogl/classes/javax/media/opengl/GLUniformData.java
index f628ce35a..9b0d5f151 100644
--- a/src/jogl/classes/javax/media/opengl/GLUniformData.java
+++ b/src/jogl/classes/javax/media/opengl/GLUniformData.java
@@ -10,7 +10,6 @@ public class GLUniformData {
      *
      * Number of objects is 1
      *
-     * @param components number of elements of one object, ie 4 for GL_FLOAT_VEC4,
      */
     public GLUniformData(String name, int val) {
         init(name, 1, new Integer(val));
@@ -21,7 +20,6 @@ public class GLUniformData {
      *
      * Number of objects is 1
      *
-     * @param components number of elements of one object, ie 4 for GL_FLOAT_VEC4,
      */
     public GLUniformData(String name, float val) {
         init(name, 1, new Float(val));
diff --git a/src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java b/src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
index 61757abde..b899f3c0a 100644
--- a/src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
+++ b/src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
@@ -6,8 +6,6 @@ package javax.media.opengl.fixedfunc;
 
 import java.nio.*;
 
-import javax.media.opengl.*;
-
 public interface GLMatrixFunc {
 
   public static final int GL_MATRIX_MODE = 0x0BA0;
@@ -56,7 +54,7 @@ public interface GLMatrixFunc {
 
   /**
    * glMultMatrixf
-   * @param params the FloatBuffer's position remains unchanged,
+   * @param m the FloatBuffer's position remains unchanged,
    *        which is the same behavior than the native JOGL GL impl
    */
   public void glMultMatrixf(java.nio.FloatBuffer m) ;
diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
index 800e38105..29a392f04 100644
--- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
@@ -58,8 +58,9 @@ public class GLWindow extends Window implements GLAutoDrawable {
     private Window window;
     private boolean runPumpMessages;
 
-    /** Constructor. Do not call this directly -- use {@link
-        create()} instead. */
+    /**
+     * Constructor. Do not call this directly -- use {@link #create()} instead.
+     */
     protected GLWindow(Window window, boolean ownerOfWinScrDpy) {
         this.ownerOfWinScrDpy = ownerOfWinScrDpy;
         this.window = window;
-- 
cgit v1.2.3


From f250183bc3d8eb4ef87cecb3311eae554dcafe53 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Mon, 29 Mar 2010 23:39:50 +0200
Subject: fixed bug where gl3 impl package was placed in jogl.gl2.x11.jar.
 build creates now jogl.gl3.<os>.jar for each os.

---
 make/build-jogl.xml | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index ec91df36a..d516c21eb 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -396,7 +396,7 @@
           <pathelement location="${classes}" />
         </path>
 
-        <!-- The resulting J2SE jogl.jar. -->
+        <!-- The resulting Java SE jogl.jar. -->
         <property name="jogl.core.jar" value="${build}/jogl.core.jar" />
         <property name="jogl.cg.jar" value="${build}/jogl.cg.jar" />
         <property name="jogl.gles1.jar" value="${build}/jogl.gles1.jar" />
@@ -407,13 +407,20 @@
         <property name="jogl.glutess.jar" value="${build}/jogl.glu.tess.jar" />
         <property name="jogl.glumipmap.jar" value="${build}/jogl.glu.mipmap.jar" />
         <property name="jogl.glugl2.jar"    value="${build}/jogl.glu.gl2.jar" />
+
         <property name="jogl.gl2es12.x11.jar" value="${build}/jogl.gl2es12.x11.jar" />
         <property name="jogl.gl2es12.win.jar" value="${build}/jogl.gl2es12.win.jar" />
         <property name="jogl.gl2es12.osx.jar" value="${build}/jogl.gl2es12.osx.jar" />
+
         <property name="jogl.gl2.x11.jar" value="${build}/jogl.gl2.x11.jar" />
         <property name="jogl.gl2.win.jar" value="${build}/jogl.gl2.win.jar" />
         <property name="jogl.gl2.osx.jar" value="${build}/jogl.gl2.osx.jar" />
         <property name="jogl.gl2.dbg.jar" value="${build}/jogl.gl2.dbg.jar" />
+        <property name="jogl.gl3.x11.jar" value="${build}/jogl.gl3.x11.jar" />
+        <property name="jogl.gl3.win.jar" value="${build}/jogl.gl3.win.jar" />
+        <property name="jogl.gl3.osx.jar" value="${build}/jogl.gl3.osx.jar" />
+        <property name="jogl.gl3.dbg.jar" value="${build}/jogl.gl3.dbg.jar" />
+
         <property name="jogl.awt.jar" value="${build}/jogl.awt.jar" />
         <property name="jogl.util.jar" value="${build}/jogl.util.jar" />
         <property name="jogl.util.gl2.jar" value="${build}/jogl.util.gl2.jar" />
@@ -1879,21 +1886,41 @@
     </target>
 
     <target name="build-jars-desktop-javase" depends="setup-manifestfile" unless="setup.nodesktop">
+        <!--os specific gl2-->
         <jar manifest="${build}/tempversion" destfile="${jogl.gl2.x11.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.glx}, ${java.part.gl2}, ${java.part.gl3}, ${java.part.openmax}"
+                     includes="${java.part.glx}, ${java.part.gl2}, ${java.part.openmax}"
                      excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.glugl2}"/>
         </jar>
         <jar manifest="${build}/tempversion" destfile="${jogl.gl2.win.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.wgl}, ${java.part.gl2}, $${java.part.gl3}, {java.part.openmax}"
+                     includes="${java.part.wgl}, ${java.part.gl2}, {java.part.openmax}"
                      excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.glugl2}"/>
         </jar>
         <jar manifest="${build}/tempversion" destfile="${jogl.gl2.osx.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.cgl}, ${java.part.gl2}, $${java.part.gl3}, {java.part.openmax}"
+                     includes="${java.part.cgl}, ${java.part.gl2}, {java.part.openmax}"
                      excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.glugl2}"/>
         </jar>
+
+        <!--os specific gl3-->
+        <jar manifest="${build}/tempversion" destfile="${jogl.gl3.x11.jar}" filesonly="true">
+            <fileset dir="${classes}"
+                     includes="${java.part.glx}, ${java.part.gl3}, ${java.part.openmax}"
+                     excludes="${java.part.gl2.dbg}, ${java.part.gl2.dbg}, ${java.part.glugl2}"/>
+        </jar>
+        <jar manifest="${build}/tempversion" destfile="${jogl.gl3.win.jar}" filesonly="true">
+            <fileset dir="${classes}"
+                     includes="${java.part.wgl}, ${java.part.gl3}, {java.part.openmax}"
+                     excludes="${java.part.gl2.dbg}, ${java.part.gl2.dbg}, ${java.part.glugl2}"/>
+        </jar>
+        <jar manifest="${build}/tempversion" destfile="${jogl.gl3.osx.jar}" filesonly="true">
+            <fileset dir="${classes}"
+                     includes="${java.part.cgl}, ${java.part.gl3}, {java.part.openmax}"
+                     excludes="${java.part.gl2.dbg}, ${java.part.gl2.dbg}, ${java.part.glugl2}"/>
+        </jar>
+
+        <!-- misc -->
         <jar manifest="${build}/tempversion" destfile="${jogl.gl2.dbg.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.gl2.dbg} ${java.part.gl3.dbg}"/>
-- 
cgit v1.2.3


From 1a2a54a83a9adb95b4bfe9c337751acbef0cb0d3 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 30 Mar 2010 02:01:15 +0200
Subject: Adaptions to     http://www.jogamp.org/bugzilla/show_bug.cgi?id=392  
   7220416bcef3140883d3966d921442feae3107c4

---
 make/stub_includes/egl/EGL/egl.h                   |  8 +--
 .../com/jogamp/opengl/impl/egl/EGLContext.java     |  4 +-
 .../com/jogamp/opengl/impl/egl/EGLDrawable.java    |  2 +-
 .../opengl/impl/egl/EGLGraphicsConfiguration.java  | 57 +++++++++++-----------
 .../impl/egl/EGLGraphicsConfigurationFactory.java  | 20 ++++----
 .../opengl/impl/egl/EGLOnscreenDrawable.java       |  2 +-
 .../jogamp/opengl/impl/egl/EGLPbufferDrawable.java |  2 +-
 .../impl/macosx/cgl/MacOSXPbufferCGLContext.java   | 15 +++---
 .../impl/macosx/cgl/MacOSXPbufferCGLDrawable.java  |  7 +--
 .../windows/wgl/WindowsOffscreenWGLDrawable.java   |  2 +-
 10 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/make/stub_includes/egl/EGL/egl.h b/make/stub_includes/egl/EGL/egl.h
index fc6cc4c87..a384bab48 100755
--- a/make/stub_includes/egl/EGL/egl.h
+++ b/make/stub_includes/egl/EGL/egl.h
@@ -20,13 +20,7 @@ extern "C" {
 typedef int32_t EGLint;
 typedef unsigned int EGLBoolean;
 typedef unsigned int EGLenum;
-#ifdef USE_GLUEGEN
-    /* GlueGen currently needs this form of typedef to produce distinct
-       types for each of these pointer types */
-    typedef struct {} _EGLConfig, *EGLConfig;
-#else
-    typedef void *EGLConfig;
-#endif
+typedef void *EGLConfig;
 typedef void *EGLContext;
 typedef void *EGLDisplay;
 typedef void *EGLSurface;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
index 42d4588b5..ec2677559 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
@@ -158,13 +158,13 @@ public abstract class EGLContext extends GLContextImpl {
         long eglDisplay = ((EGLDrawable)drawable).getDisplay();
         EGLGraphicsConfiguration config = ((EGLDrawable)drawable).getGraphicsConfiguration();
         GLProfile glProfile = drawable.getGLProfile();
-        _EGLConfig eglConfig = config.getNativeConfig();
+        long eglConfig = config.getNativeConfig();
         long shareWith = EGL.EGL_NO_CONTEXT;
 
         if (eglDisplay == 0) {
             throw new GLException("Error: attempted to create an OpenGL context without a display connection");
         }
-        if (eglConfig == null) {
+        if (eglConfig == 0) {
             throw new GLException("Error: attempted to create an OpenGL context without a graphics configuration");
         }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
index f3695ed16..db5ee6ac6 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
@@ -75,7 +75,7 @@ public abstract class EGLDrawable extends GLDrawableImpl {
 
     public abstract GLContext createContext(GLContext shareWith);
 
-    protected abstract long createSurface(long eglDpy, _EGLConfig eglNativeCfg, long surfaceHandle);
+    protected abstract long createSurface(long eglDpy, long eglNativeCfg, long surfaceHandle);
 
     private void recreateSurface() {
         // create a new EGLSurface ..
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
index 33f9db140..43c99a422 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
@@ -41,12 +41,13 @@ import javax.media.nativewindow.egl.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
 import com.jogamp.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.PointerBuffer;
 
 public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
     protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
 
-    public _EGLConfig getNativeConfig() {
-        return _config;
+    public long getNativeConfig() {
+        return config;
     }
 
     public int getNativeConfigID() {
@@ -55,10 +56,10 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
 
     public EGLGraphicsConfiguration(AbstractGraphicsScreen absScreen, 
                                     GLCapabilities capsChosen, GLCapabilities capsRequested, GLCapabilitiesChooser chooser,
-                                    _EGLConfig cfg, int cfgID) {
+                                    long cfg, int cfgID) {
         super(absScreen, capsChosen, capsRequested);
         this.chooser = chooser;
-        _config = cfg;
+        config = cfg;
         configID = cfgID;
     }
 
@@ -72,9 +73,9 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
             throw new GLException("Invalid EGL display: "+absDevice);
         }
         GLProfile glp = capsRequested.getGLProfile();
-        _EGLConfig _cfg = EGLConfigId2EGLConfig(glp, dpy, cfgID);
-        GLCapabilities caps = EGLConfig2Capabilities(glp, dpy, _cfg, false, capsRequested.isOnscreen(), capsRequested.isPBuffer());
-        return new EGLGraphicsConfiguration(absScreen, caps, capsRequested, new DefaultGLCapabilitiesChooser(), _cfg, cfgID);
+        long cfg = EGLConfigId2EGLConfig(glp, dpy, cfgID);
+        GLCapabilities caps = EGLConfig2Capabilities(glp, dpy, cfg, false, capsRequested.isOnscreen(), capsRequested.isPBuffer());
+        return new EGLGraphicsConfiguration(absScreen, caps, capsRequested, new DefaultGLCapabilitiesChooser(), cfg, cfgID);
     }
 
     public Object clone() {
@@ -89,7 +90,7 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
         if(null!=newConfig) {
             // FIXME: setScreen( ... );
             setChosenCapabilities(newConfig.getChosenCapabilities());
-            _config = newConfig.getNativeConfig();
+            config = newConfig.getNativeConfig();
             configID = newConfig.getNativeConfigID();
             if(DEBUG) {
                 System.err.println("!!! updateGraphicsConfiguration: "+this);
@@ -97,23 +98,23 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
         }
     }
 
-    public static _EGLConfig EGLConfigId2EGLConfig(GLProfile glp, long display, int configID) {
+    public static long EGLConfigId2EGLConfig(GLProfile glp, long display, int configID) {
         int[] attrs = new int[] {
                 EGL.EGL_CONFIG_ID, configID,
                 EGL.EGL_NONE
             };
-        _EGLConfig[] configs = new _EGLConfig[1];
+        PointerBuffer configs = PointerBuffer.allocateDirect(1);
         int[] numConfigs = new int[1];
         if (!EGL.eglChooseConfig(display,
                                  attrs, 0,
                                  configs, 1,
                                  numConfigs, 0)) {
-            return null;
+            return 0;
         }
         if (numConfigs[0] == 0) {
-            return null;
+            return 0;
         }
-        return configs[0];
+        return configs.get(0);
     }
 
     public static boolean EGLConfigDrawableTypeVerify(int val, boolean onscreen, boolean usePBuffer) {
@@ -131,53 +132,53 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
         return res;
     }
 
-    public static GLCapabilities EGLConfig2Capabilities(GLProfile glp, long display, _EGLConfig _config, 
+    public static GLCapabilities EGLConfig2Capabilities(GLProfile glp, long display, long config, 
                                                         boolean relaxed, boolean onscreen, boolean usePBuffer) {
         GLCapabilities caps = new GLCapabilities(glp);
         int[] val = new int[1];
 
         // Read the actual configuration into the choosen caps
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_RED_SIZE, val, 0)) {
+        if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_RED_SIZE, val, 0)) {
             caps.setRedBits(val[0]);
         }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_GREEN_SIZE, val, 0)) {
+        if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_GREEN_SIZE, val, 0)) {
             caps.setGreenBits(val[0]);
         }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_BLUE_SIZE, val, 0)) {
+        if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_BLUE_SIZE, val, 0)) {
             caps.setBlueBits(val[0]);
         }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_ALPHA_SIZE, val, 0)) {
+        if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_ALPHA_SIZE, val, 0)) {
             caps.setAlphaBits(val[0]);
         }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_STENCIL_SIZE, val, 0)) {
+        if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_STENCIL_SIZE, val, 0)) {
             caps.setStencilBits(val[0]);
         }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_DEPTH_SIZE, val, 0)) {
+        if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_DEPTH_SIZE, val, 0)) {
             caps.setDepthBits(val[0]);
         }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_SAMPLES, val, 0)) {
+        if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_SAMPLES, val, 0)) {
             caps.setSampleBuffers(val[0]>0?true:false);
             caps.setNumSamples(val[0]);
         }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_TYPE, val, 0)) {
+        if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_TRANSPARENT_TYPE, val, 0)) {
             caps.setBackgroundOpaque(val[0] != EGL.EGL_TRANSPARENT_RGB);
         }
         if(!caps.isBackgroundOpaque()) {
-            if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_RED_VALUE, val, 0)) {
+            if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_TRANSPARENT_RED_VALUE, val, 0)) {
                 caps.setTransparentRedValue(val[0]==EGL.EGL_DONT_CARE?-1:val[0]);
             }
-            if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_GREEN_VALUE, val, 0)) {
+            if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_TRANSPARENT_GREEN_VALUE, val, 0)) {
                 caps.setTransparentGreenValue(val[0]==EGL.EGL_DONT_CARE?-1:val[0]);
             }
-            if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_BLUE_VALUE, val, 0)) {
+            if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_TRANSPARENT_BLUE_VALUE, val, 0)) {
                 caps.setTransparentBlueValue(val[0]==EGL.EGL_DONT_CARE?-1:val[0]);
             }
             /** Not defined in EGL 
-            if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_TRANSPARENT_ALPHA_VALUE, val, 0)) {
+            if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_TRANSPARENT_ALPHA_VALUE, val, 0)) {
                 caps.setTransparentAlphaValue(val[0]==EGL.EGL_DONT_CARE?-1:val[0]);
             } */
         }
-        if(EGL.eglGetConfigAttrib(display, _config, EGL.EGL_SURFACE_TYPE, val, 0)) {
+        if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_SURFACE_TYPE, val, 0)) {
             if(EGLConfigDrawableTypeVerify(val[0], onscreen, usePBuffer)) {
                 caps.setDoubleBuffered(onscreen);
                 caps.setOnscreen(onscreen);
@@ -300,7 +301,7 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
     }
 
     private GLCapabilitiesChooser chooser;
-    private _EGLConfig _config;
+    private long config;
     private int configID;
 }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
index 0a9edd239..f315a514c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
@@ -40,6 +40,8 @@ import com.jogamp.nativewindow.impl.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
 
+import com.jogamp.gluegen.runtime.PointerBuffer;
+
 /** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
     are used on X11 platforms. Toolkits will likely need to delegate
     to this one to change the accepted and returned types of the
@@ -115,10 +117,10 @@ public class EGLGraphicsConfigurationFactory extends GraphicsConfigurationFactor
             chooser = new DefaultGLCapabilitiesChooser();
         }
 
-        _EGLConfig[] configs = new _EGLConfig[10];
+        PointerBuffer configs = PointerBuffer.allocateDirect(10);
         int[] numConfigs = new int[1];
 
-        if(!EGL.eglGetConfigs(eglDisplay, configs, configs.length, numConfigs, 0)) {
+        if(!EGL.eglGetConfigs(eglDisplay, configs, configs.capacity(), numConfigs, 0)) {
             throw new GLException("Graphics configuration fetch (eglGetConfigs) failed");
         }
         if (numConfigs[0] == 0) {
@@ -205,11 +207,11 @@ public class EGLGraphicsConfigurationFactory extends GraphicsConfigurationFactor
                                                               AbstractGraphicsScreen absScreen) {
         GLProfile glp = capsChosen0.getGLProfile();
         int[] attrs = EGLGraphicsConfiguration.GLCapabilities2AttribList(capsChosen0);
-        _EGLConfig[] configs = new _EGLConfig[1];
+        PointerBuffer configs = PointerBuffer.allocateDirect(1);
         int[] numConfigs = new int[1];
         if (!EGL.eglChooseConfig(eglDisplay,
                                  attrs, 0,
-                                 configs, configs.length,
+                                 configs, configs.capacity(),
                                  numConfigs, 0)) {
             throw new GLException("Graphics configuration selection (eglChooseConfig) failed for "+capsChosen0);
         }
@@ -222,14 +224,14 @@ public class EGLGraphicsConfigurationFactory extends GraphicsConfigurationFactor
             }
             int[] val = new int[1];
             // get the configID 
-            if(!EGL.eglGetConfigAttrib(eglDisplay, configs[0], EGL.EGL_CONFIG_ID, val, 0)) {
+            if(!EGL.eglGetConfigAttrib(eglDisplay, configs.get(0), EGL.EGL_CONFIG_ID, val, 0)) {
                 if(DEBUG) {
                     // FIXME: this happens on a ATI PC Emulation ..
                     System.err.println("EGL couldn't retrieve ConfigID for already chosen eglConfig "+capsChosen0+", error 0x"+Integer.toHexString(EGL.eglGetError()));
                 }
                 return null;
             }
-            GLCapabilities capsChosen1 = EGLGraphicsConfiguration.EGLConfig2Capabilities(glp, eglDisplay, configs[0],
+            GLCapabilities capsChosen1 = EGLGraphicsConfiguration.EGLConfig2Capabilities(glp, eglDisplay, configs.get(0),
                                                                     true, capsChosen0.isOnscreen(), capsChosen0.isPBuffer());
             if(null!=capsChosen1) {
                 if(DEBUG) {
@@ -237,7 +239,7 @@ public class EGLGraphicsConfigurationFactory extends GraphicsConfigurationFactor
                                                             ", eglConfig ID 0x"+Integer.toHexString(val[0])+
                                                             ", "+capsChosen0+" -> "+capsChosen1);
                 }
-                return new EGLGraphicsConfiguration(absScreen, capsChosen1, capsRequested, chooser, configs[0], val[0]);
+                return new EGLGraphicsConfiguration(absScreen, capsChosen1, capsRequested, chooser, configs.get(0), val[0]);
             }
             if(DEBUG) {
                 System.err.println("eglChooseConfig couldn't verify: eglDisplay 0x"+Long.toHexString(eglDisplay)+
@@ -253,11 +255,11 @@ public class EGLGraphicsConfigurationFactory extends GraphicsConfigurationFactor
         return null;
     }
 
-    protected static GLCapabilities[] eglConfigs2GLCaps(GLProfile glp, long eglDisplay, _EGLConfig[] configs, int num,
+    protected static GLCapabilities[] eglConfigs2GLCaps(GLProfile glp, long eglDisplay, PointerBuffer configs, int num,
                                                         boolean onscreen, boolean usePBuffer) {
         GLCapabilities[] caps = new GLCapabilities[num];
         for(int i=0; i<num; i++) {
-            caps[i] = EGLGraphicsConfiguration.EGLConfig2Capabilities(glp, eglDisplay, configs[i],
+            caps[i] = EGLGraphicsConfiguration.EGLConfig2Capabilities(glp, eglDisplay, configs.get(i),
                                             true, onscreen, usePBuffer);
         }
         return caps;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
index 2f5bbf359..3286367e5 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
@@ -54,7 +54,7 @@ public class EGLOnscreenDrawable extends EGLDrawable {
         return new EGLOnscreenContext(this, shareWith);
     }
 
-    protected long createSurface(long eglDpy, _EGLConfig eglNativeCfg, long surfaceHandle) {
+    protected long createSurface(long eglDpy, long eglNativeCfg, long surfaceHandle) {
         return EGL.eglCreateWindowSurface(eglDpy, eglNativeCfg, surfaceHandle, null);
     }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java
index a86045789..03b02b77e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java
@@ -73,7 +73,7 @@ public class EGLPbufferDrawable extends EGLDrawable {
 
     }
 
-    protected long createSurface(long eglDpy, _EGLConfig eglNativeCfg, long surfaceHandle) {
+    protected long createSurface(long eglDpy, long eglNativeCfg, long surfaceHandle) {
         NativeWindow nw = getNativeWindow();
         int[] attrs = EGLGraphicsConfiguration.CreatePBufferSurfaceAttribList(nw.getWidth(), nw.getHeight(), texFormat);
         long surf = EGL.eglCreatePbufferSurface(eglDpy, eglNativeCfg, attrs, 0);
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
index 131375338..aacd2c38e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
@@ -6,6 +6,7 @@ import java.util.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.PointerBuffer;
 
 public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
   protected MacOSXPbufferCGLDrawable drawable;
@@ -312,29 +313,29 @@ public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
       }
 
       // Use attribute array to select pixel format
-      long[] fmt = new long[1];
+      PointerBuffer fmt = PointerBuffer.allocateDirect(1);
       long[] numScreens = new long[1];
-      int res = CGL.CGLChoosePixelFormat(attrs, 0, fmt, 0, numScreens, 0);
+      int res = CGL.CGLChoosePixelFormat(attrs, 0, fmt, numScreens, 0);
       if (res != CGL.kCGLNoError) {
         throw new GLException("Error code " + res + " while choosing pixel format");
       }
       
       // Create new context
-      long[] ctx = new long[1];
+      PointerBuffer ctx = PointerBuffer.allocateDirect(1);
       if (DEBUG) {
         System.err.println("Share context for CGL-based pbuffer context is " + toHexString(share));
       }
-      res = CGL.CGLCreateContext(fmt[0], share, ctx, 0);
-      CGL.CGLDestroyPixelFormat(fmt[0]);
+      res = CGL.CGLCreateContext(fmt.get(0), share, ctx);
+      CGL.CGLDestroyPixelFormat(fmt.get(0));
       if (res != CGL.kCGLNoError) {
         throw new GLException("Error code " + res + " while creating context");
       }
       // Attach newly-created context to the pbuffer
-      res = CGL.CGLSetPBuffer(ctx[0], drawable.getPbuffer(), 0, 0, 0);
+      res = CGL.CGLSetPBuffer(ctx.get(0), drawable.getPbuffer(), 0, 0, 0);
       if (res != CGL.kCGLNoError) {
         throw new GLException("Error code " + res + " while attaching context to pbuffer");
       }
-      return ctx[0];
+      return ctx.get(0);
     }
     
     public boolean destroy(long ctx) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
index eb6de929d..95609aee5 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
@@ -42,6 +42,7 @@ package com.jogamp.opengl.impl.macosx.cgl;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.PointerBuffer;
 
 public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
   private static final boolean DEBUG = Debug.debug("MacOSXPbufferCGLDrawable");
@@ -232,12 +233,12 @@ public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
   // CGL implementation
   class CGLImpl implements Impl {
     public long create(int renderTarget, int internalFormat, int width, int height) {
-      long[] pbuffer = new long[1];
-      int res = CGL.CGLCreatePBuffer(width, height, renderTarget, internalFormat, 0, pbuffer, 0);
+      PointerBuffer pbuffer = PointerBuffer.allocateDirect(1);
+      int res = CGL.CGLCreatePBuffer(width, height, renderTarget, internalFormat, 0, pbuffer);
       if (res != CGL.kCGLNoError) {
         throw new GLException("Error creating CGL-based pbuffer: error code " + res);
       }
-      return pbuffer[0];
+      return pbuffer.get(0);
     }
 
     public void destroy(long pbuffer) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
index e0c70bd8c..bf466d455 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
@@ -99,7 +99,7 @@ public class WindowsOffscreenWGLDrawable extends WindowsWGLDrawable {
     }
     ((SurfaceChangeable)nw).setSurfaceHandle(hdc);
 
-    hbitmap = WGL.CreateDIBSection(hdc, info, WGL.DIB_RGB_COLORS, 0, 0, 0);
+    hbitmap = WGL.CreateDIBSection(hdc, info, WGL.DIB_RGB_COLORS, null, 0, 0);
     if (hbitmap == 0) {
       WGL.DeleteDC(hdc);
       hdc = 0;
-- 
cgit v1.2.3


From 3046f4a785d8be1dcd491d864c17c92b6c52fbdd Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Wed, 31 Mar 2010 23:57:06 +0200
Subject: modifications due to class movement in gluegen. updated joglversion
 files.

---
 make/config/jogl/glx-CustomJavaCode.java                             | 2 +-
 make/joglversion                                                     | 4 ++--
 make/joglversion-cdc                                                 | 4 ++--
 src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java                 | 2 +-
 src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java           | 2 +-
 src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java          | 2 +-
 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java         | 3 +--
 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java  | 2 --
 .../classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java   | 5 ++---
 .../com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java        | 5 -----
 .../com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java        | 5 -----
 .../classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java | 3 +--
 .../com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java  | 4 +---
 .../classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java | 2 +-
 .../com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java  | 4 +---
 .../com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java   | 2 +-
 .../com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java  | 2 +-
 .../com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java       | 2 +-
 .../jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java    | 2 +-
 .../opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java     | 2 --
 .../com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java       | 2 --
 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java  | 3 +--
 .../com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java        | 5 +----
 .../com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java  | 4 +---
 .../opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java      | 4 +---
 src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java       | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java               | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java               | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java        | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java         | 2 +-
 .../com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java    | 2 +-
 .../jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java    | 2 +-
 32 files changed, 30 insertions(+), 61 deletions(-)

diff --git a/make/config/jogl/glx-CustomJavaCode.java b/make/config/jogl/glx-CustomJavaCode.java
index 6ed31990e..fe81cd64a 100644
--- a/make/config/jogl/glx-CustomJavaCode.java
+++ b/make/config/jogl/glx-CustomJavaCode.java
@@ -13,7 +13,7 @@
 
 
   /** Interface to C language function: <br> - Alias for: <br> <code> GLXFBConfig *  glXChooseFBConfigSGIX, glXChooseFBConfig(Display *  dpy, int screen, const int *  attribList, int *  nitems); </code>    */
-  public static com.jogamp.gluegen.runtime.PointerBuffer glXChooseFBConfigCopied(long dpy, int screen, int[] attribList, int attribList_offset, int[] nitems, int nitems_offset)
+  public static com.jogamp.common.nio.PointerBuffer glXChooseFBConfigCopied(long dpy, int screen, int[] attribList, int attribList_offset, int[] nitems, int nitems_offset)
   {
     if(attribList != null && attribList.length <= attribList_offset)
       throw new GLException("array offset argument \"attribList_offset\" (" + attribList_offset + ") equals or exceeds array length (" + attribList.length + ")");
diff --git a/make/joglversion b/make/joglversion
index d013d0967..b65b6e3b6 100644
--- a/make/joglversion
+++ b/make/joglversion
@@ -3,6 +3,6 @@ Specification-Version: @BASEVERSION@
 Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: Java Bindings for OpenGL Runtime Environment
 Implementation-Version: @VERSION@
-Implementation-Vendor: java.net JOGL community
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.opengl
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
diff --git a/make/joglversion-cdc b/make/joglversion-cdc
index 5a2950b55..5056fbaf3 100644
--- a/make/joglversion-cdc
+++ b/make/joglversion-cdc
@@ -3,6 +3,6 @@ Specification-Version: @BASEVERSION@
 Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: Java Bindings for OpenGL Runtime Environment CDC
 Implementation-Version: @VERSION@
-Implementation-Vendor: java.net JOGL community
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.opengl
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java b/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java
index ede966259..e845ef160 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java
@@ -39,9 +39,9 @@
 
 package com.jogamp.opengl.impl;
 
+import com.jogamp.common.os.NativeLibrary;
 import java.io.*;
 import java.security.*;
-import com.jogamp.gluegen.runtime.*;
 
 /**
  * Helper class for working around problems with open-source DRI
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
index 49045910a..893827a8c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
@@ -39,8 +39,8 @@
 
 package com.jogamp.opengl.impl;
 
+import com.jogamp.common.os.DynamicLookupHelper;
 import java.nio.*;
-import java.lang.reflect.*;
 
 import javax.media.opengl.*;
 import com.jogamp.nativewindow.impl.NWReflection;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
index 20bf20c20..10c70db99 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
@@ -39,9 +39,9 @@
 
 package com.jogamp.opengl.impl;
 
+import com.jogamp.common.os.DynamicLookupHelper;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 public abstract class GLDrawableImpl implements GLDrawable {
   protected static final boolean DEBUG = Debug.debug("GLDrawable");
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
index db5ee6ac6..dcfe06bdc 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
@@ -35,9 +35,8 @@
 
 package com.jogamp.opengl.impl.egl;
 
+import com.jogamp.common.os.DynamicLookupHelper;
 import com.jogamp.opengl.impl.GLDrawableImpl;
-import com.jogamp.nativewindow.impl.NWReflection;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
index d50f671a3..34b039b3a 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
@@ -35,12 +35,10 @@
 
 package com.jogamp.opengl.impl.egl;
 
-import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
 import com.jogamp.nativewindow.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
 
 public class EGLDrawableFactory extends GLDrawableFactoryImpl {
   
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
index 4918acbb3..70f0540bf 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
@@ -35,13 +35,12 @@
 
 package com.jogamp.opengl.impl.egl;
 
+import com.jogamp.common.os.DynamicLookupHelper;
+import com.jogamp.common.os.NativeLibrary;
 import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 import java.security.*;
 
 /**
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java
index 5c4da5098..e5740a4f0 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java
@@ -36,11 +36,6 @@
 package com.jogamp.opengl.impl.egl;
 
 import java.util.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
 
 /**
  * Implementation of the EGLDynamicLookupHelper for ES1.
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java
index 0b499c204..c4fc66630 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java
@@ -36,11 +36,6 @@
 package com.jogamp.opengl.impl.egl;
 
 import java.util.*;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
 
 /**
  * Implementation of the EGLDynamicLookupHelper for ES2.
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
index 43c99a422..c8bc4fe0d 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
@@ -35,13 +35,12 @@
 
 package com.jogamp.opengl.impl.egl;
 
+import com.jogamp.common.nio.PointerBuffer;
 import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
-import com.jogamp.gluegen.runtime.PointerBuffer;
 
 public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
     protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
index f315a514c..f22661238 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
@@ -32,15 +32,13 @@
 
 package com.jogamp.opengl.impl.egl;
 
+import com.jogamp.common.nio.PointerBuffer;
 import java.io.PrintStream;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
-import com.jogamp.nativewindow.impl.*;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
 
-import com.jogamp.gluegen.runtime.PointerBuffer;
 
 /** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
     are used on X11 platforms. Toolkits will likely need to delegate
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
index 2b91eb5d3..5816b2101 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
@@ -42,7 +42,7 @@ package com.jogamp.opengl.impl.macosx.cgl;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.common.os.DynamicLookupHelper;
 
 public abstract class MacOSXCGLDrawable extends GLDrawableImpl {
   // The Java2D/OpenGL pipeline on OS X uses low-level CGLContextObjs
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
index a3ae6f936..641e482bc 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
@@ -39,14 +39,12 @@
 
 package com.jogamp.opengl.impl.macosx.cgl;
 
-import java.lang.reflect.InvocationTargetException;
+import com.jogamp.common.os.DynamicLookupHelper;
 import java.nio.*;
-import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
 import com.jogamp.nativewindow.impl.*;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
   public MacOSXCGLDrawableFactory() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
index aacd2c38e..446f457be 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
@@ -1,12 +1,12 @@
 package com.jogamp.opengl.impl.macosx.cgl;
 
+import com.jogamp.common.nio.PointerBuffer;
 import java.security.*;
 import java.util.*;
 
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.gluegen.runtime.PointerBuffer;
 
 public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
   protected MacOSXPbufferCGLDrawable drawable;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
index 95609aee5..b02cea03e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
@@ -39,10 +39,10 @@
 
 package com.jogamp.opengl.impl.macosx.cgl;
 
+import com.jogamp.common.nio.PointerBuffer;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.gluegen.runtime.PointerBuffer;
 
 public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
   private static final boolean DEBUG = Debug.debug("MacOSXPbufferCGLDrawable");
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java
index c76766b2e..fe0945139 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java
@@ -39,10 +39,10 @@
 
 package com.jogamp.opengl.impl.windows.wgl;
 
+import com.jogamp.common.os.DynamicLookupHelper;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 
 public abstract class WindowsWGLDrawable extends GLDrawableImpl {
   private static final int MAX_SET_PIXEL_FORMAT_FAIL_COUNT = 5;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
index 6827c755e..9e458c8d0 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
@@ -39,13 +39,13 @@
 
 package com.jogamp.opengl.impl.windows.wgl;
 
+import com.jogamp.common.os.DynamicLookupHelper;
 import java.nio.*;
 import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
 import com.jogamp.nativewindow.impl.NWReflection;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
 import com.jogamp.nativewindow.impl.NullWindow;
 
 public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
index bb59434b7..5b34e40e1 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
@@ -32,11 +32,9 @@
 
 package com.jogamp.opengl.impl.windows.wgl;
 
-import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
 
 public class WindowsWGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
     // Keep this under the same debug flag as the drawable factory for convenience
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
index 44aea0fa7..f10bd38c6 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
@@ -44,9 +44,7 @@ import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
 import com.jogamp.nativewindow.impl.NullWindow;
-import com.jogamp.nativewindow.impl.x11.*;
 
-import com.jogamp.gluegen.runtime.PointerBuffer;
 
 public class X11ExternalGLXDrawable extends X11GLXDrawable {
   private int fbConfigID;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
index ee807c32a..2dabe774c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
@@ -42,8 +42,7 @@ package com.jogamp.opengl.impl.x11.glx;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.x11.*;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.common.os.DynamicLookupHelper;
 
 public abstract class X11GLXDrawable extends GLDrawableImpl {
   protected X11GLXDrawable(GLDrawableFactory factory, NativeWindow comp, boolean realized) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
index cb25e6723..1a254843e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
@@ -36,16 +36,13 @@
 
 package com.jogamp.opengl.impl.x11.glx;
 
+import com.jogamp.common.os.DynamicLookupHelper;
 import java.nio.*;
-import java.security.*;
-import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
-import com.jogamp.gluegen.runtime.*;
 import com.jogamp.gluegen.runtime.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.opengl.impl.x11.glx.*;
 import com.jogamp.nativewindow.impl.NullWindow;
 import com.jogamp.nativewindow.impl.NWReflection;
 import com.jogamp.nativewindow.impl.x11.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
index f127ec2d0..b3a6e5b8c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
@@ -32,13 +32,11 @@
 
 package com.jogamp.opengl.impl.x11.glx;
 
-import java.util.*;
+import com.jogamp.common.nio.PointerBuffer;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.gluegen.runtime.NativeLibrary;
-import com.jogamp.gluegen.runtime.PointerBuffer;
 import com.jogamp.nativewindow.impl.x11.*;
 
 public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implements Cloneable {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
index eca5fede5..5f438cb7f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
@@ -32,16 +32,14 @@
 
 package com.jogamp.opengl.impl.x11.glx;
 
+import com.jogamp.common.nio.PointerBuffer;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
-import com.jogamp.nativewindow.impl.NativeWindowFactoryImpl;
 import com.jogamp.nativewindow.impl.x11.*;
 
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.opengl.impl.x11.glx.*;
 
-import com.jogamp.gluegen.runtime.PointerBuffer;
 
 /** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
     are used on X11 platforms. Toolkits will likely need to delegate
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
index d41e4b922..1141f6624 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
@@ -1,7 +1,7 @@
 
 package com.jogamp.opengl.util;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import java.security.*;
 
 import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java b/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java
index b49bb3364..efe3a7675 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java
@@ -38,7 +38,7 @@
  */
 package com.jogamp.opengl.util;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2;
 import javax.media.opengl.GL2ES2;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
index 4ca8ff197..47de8ce0a 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
@@ -33,7 +33,7 @@
 
 package com.jogamp.opengl.util;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import com.jogamp.opengl.impl.ProjectFloat;
 
 import java.nio.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
index 4de2e5974..bac9f88ea 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
@@ -38,7 +38,7 @@
  */
 package com.jogamp.opengl.util.awt;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import com.jogamp.opengl.impl.Debug;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.packrect.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
index 94b329cd5..d0e7ea29d 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
@@ -1,7 +1,7 @@
 
 package com.jogamp.opengl.util.glsl;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import javax.media.opengl.*;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.impl.Debug;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
index 2276cc835..b8e3922a4 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
@@ -7,7 +7,7 @@ package com.jogamp.opengl.util.glsl.fixedfunc.impl;
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
 import javax.media.opengl.glu.*;
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.*;
 import java.nio.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
index 9ead6c4eb..529e4567b 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
@@ -1,7 +1,7 @@
 
 package com.jogamp.opengl.util.glsl.fixedfunc.impl;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
 import com.jogamp.opengl.util.*;
-- 
cgit v1.2.3


From e76ebd8a98dfc60af05a490cae6e2e057a5c351d Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Thu, 8 Apr 2010 01:39:38 +0200
Subject: removed duplicated imports in config files due to changes in gluegen.

---
 make/config/jogl/cg-common.cfg  | 4 ----
 make/config/jogl/egl-common.cfg | 1 -
 make/config/jogl/gl-common.cfg  | 1 -
 make/config/jogl/glu-common.cfg | 1 -
 4 files changed, 7 deletions(-)

diff --git a/make/config/jogl/cg-common.cfg b/make/config/jogl/cg-common.cfg
index e9ff9d907..927d233a8 100644
--- a/make/config/jogl/cg-common.cfg
+++ b/make/config/jogl/cg-common.cfg
@@ -92,10 +92,6 @@ Ignore cgGetIntStateAssignmentValues
 Ignore cgGetParameterValues
 Ignore cgGetProgramOptions
 
-#
-# Need to import New IO for Buffer classes
-#
-Import java.nio.*
 # And NativeLibLoader for help loading the native libraries
 Import com.jogamp.opengl.impl.*
 
diff --git a/make/config/jogl/egl-common.cfg b/make/config/jogl/egl-common.cfg
index 01b681b87..fd65d5c10 100644
--- a/make/config/jogl/egl-common.cfg
+++ b/make/config/jogl/egl-common.cfg
@@ -4,7 +4,6 @@ GLHeader EGL/egl.h
 GLHeader EGL/eglext.h
 
 # Imports needed by all glue code
-Import java.nio.*
 Import java.util.*
 Import javax.media.opengl.*
 Import javax.media.opengl.fixedfunc.*
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index 022c272df..0f6529167 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -8,7 +8,6 @@ RuntimeExceptionType GLException
 UnsupportedExceptionType GLException
 
 # Imports needed by all glue code
-Import java.nio.*
 Import java.util.*
 Import javax.media.opengl.*
 Import javax.media.opengl.fixedfunc.*
diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg
index 8fd053da1..937ca0348 100644
--- a/make/config/jogl/glu-common.cfg
+++ b/make/config/jogl/glu-common.cfg
@@ -9,7 +9,6 @@ TagNativeBinding true
 #
 # Imports needed by all glue code
 #
-Import java.nio.*
 Import javax.media.opengl.*
 Import javax.media.opengl.glu.*
 Import com.jogamp.opengl.impl.*
-- 
cgit v1.2.3


From 35bd7f95ace4654a13a94222d443c14e74280879 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Thu, 8 Apr 2010 01:41:57 +0200
Subject: added intelliJ modules for jogl, newt and nativewindow. Removed other
 projectfiles.

---
 .idea/compiler.xml                    |  24 -------
 .idea/copyright/profiles_settings.xml |   5 --
 .idea/encodings.xml                   |   5 --
 .idea/misc.xml                        |  33 ---------
 .idea/modules.xml                     |  11 ---
 .idea/uiDesigner.xml                  | 125 ----------------------------------
 .idea/vcs.xml                         |   7 --
 jogl.iml                              |  19 ++++++
 nativewindow.iml                      |  18 +++++
 newt.iml                              |  15 ++++
 src/jogl/Jogl.iml                     |  13 ----
 src/nativewindow/Nativewindow.iml     |  12 ----
 src/newt/Newt.iml                     |  13 ----
 13 files changed, 52 insertions(+), 248 deletions(-)
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/copyright/profiles_settings.xml
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/uiDesigner.xml
 delete mode 100644 .idea/vcs.xml
 create mode 100644 jogl.iml
 create mode 100644 nativewindow.iml
 create mode 100644 newt.iml
 delete mode 100644 src/jogl/Jogl.iml
 delete mode 100644 src/nativewindow/Nativewindow.iml
 delete mode 100644 src/newt/Newt.iml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 97c9ca5c8..000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions>
-      <entry name=".+\.(properties|xml|html|dtd|tld)" />
-      <entry name=".+\.(gif|png|jpeg|jpg)" />
-    </resourceExtensions>
-    <wildcardResourcePatterns>
-      <entry name="?*.properties" />
-      <entry name="?*.xml" />
-      <entry name="?*.gif" />
-      <entry name="?*.png" />
-      <entry name="?*.jpeg" />
-      <entry name="?*.jpg" />
-      <entry name="?*.html" />
-      <entry name="?*.dtd" />
-      <entry name="?*.tld" />
-      <entry name="?*.ftl" />
-    </wildcardResourcePatterns>
-    <annotationProcessing enabled="false" useClasspath="true" />
-  </component>
-</project>
-
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index 3572571ad..000000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="">
-    <module2copyright />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index e206d70d8..000000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index ef58a04bc..000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-  </component>
-  <component name="ProjectDetails">
-    <option name="projectName" value="jogl" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="SvnBranchConfigurationManager">
-    <option name="mySupportsUserInfoFilter" value="true" />
-  </component>
-</project>
-
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 61474230d..000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/src/jogl/Jogl.iml" filepath="$PROJECT_DIR$/src/jogl/Jogl.iml" />
-      <module fileurl="file://$PROJECT_DIR$/src/nativewindow/Nativewindow.iml" filepath="$PROJECT_DIR$/src/nativewindow/Nativewindow.iml" />
-      <module fileurl="file://$PROJECT_DIR$/src/newt/Newt.iml" filepath="$PROJECT_DIR$/src/newt/Newt.iml" />
-    </modules>
-  </component>
-</project>
-
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b0002030..000000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 275077f82..000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
-
diff --git a/jogl.iml b/jogl.iml
new file mode 100644
index 000000000..419fbc916
--- /dev/null
+++ b/jogl.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/jogl/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jogl/junit" isTestSource="true" />
+    </content>
+    <content url="file://$MODULE_DIR$/build/jogl">
+      <sourceFolder url="file://$MODULE_DIR$/build/jogl/gensrc/classes-cdc" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/jogl/gensrc/classes" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="gluegen" />
+    <orderEntry type="library" name="junit" level="application" />
+  </component>
+</module>
+
diff --git a/nativewindow.iml b/nativewindow.iml
new file mode 100644
index 000000000..8e058bffe
--- /dev/null
+++ b/nativewindow.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/build/nativewindow">
+      <sourceFolder url="file://$MODULE_DIR$/build/nativewindow/gensrc/classes-cdc" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/nativewindow/gensrc/classes" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/src/nativewindow">
+      <sourceFolder url="file://$MODULE_DIR$/src/nativewindow/classes" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="gluegen" />
+    <orderEntry type="library" name="junit" level="application" />
+  </component>
+</module>
+
diff --git a/newt.iml b/newt.iml
new file mode 100644
index 000000000..cfaabf195
--- /dev/null
+++ b/newt.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/src/newt">
+      <sourceFolder url="file://$MODULE_DIR$/src/newt/classes" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="nativewindow" />
+    <orderEntry type="module" module-name="gluegen" />
+    <orderEntry type="library" name="junit" level="application" />
+  </component>
+</module>
+
diff --git a/src/jogl/Jogl.iml b/src/jogl/Jogl.iml
deleted file mode 100644
index 7811f4280..000000000
--- a/src/jogl/Jogl.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/junit" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/classes" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/src/nativewindow/Nativewindow.iml b/src/nativewindow/Nativewindow.iml
deleted file mode 100644
index 673f8d17c..000000000
--- a/src/nativewindow/Nativewindow.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/classes" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/src/newt/Newt.iml b/src/newt/Newt.iml
deleted file mode 100644
index ab8359299..000000000
--- a/src/newt/Newt.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/classes" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Nativewindow" />
-  </component>
-</module>
-
-- 
cgit v1.2.3


From f8cbd63d360a8d138a82d31bb53e65485ae64b42 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 8 Apr 2010 04:11:07 +0200
Subject: Added doc/deployment:     JOGL-JAR-BUNDELING.txt         A first FAQ
 about the (new) JAR partitioning.

    lstjars/lstjars.linux_amd64-20100406.log
        A first deployment payload measurement in kBytes :)

New JAR Partitioning:

    All-In-One (*all*):
        - with AWT
        - without AWT

        See JOGL-JAR-BUNDELING.txt

    Atomic:
        See JOGL-JAR-BUNDELING.txt

    - Removed property setup.noall, since the *all* targets are mandatory now.
      Currently

    - Added gl4 part (still empty)

    - Fixed make/lstjars.sh and etc/profile.jogl (new JAR bundles)

    - Fixed make/lstjars.sh to produce JAR and PACK200 numbers,
      and using the *all* bundles if possible.

MacOsX:
    - Fix missing refactoring in src/newt/native/MacWindow.m
    - Adding missing NSWindowDelegate protocol to NewtMacWindow
      as mandatory since 10.3.6

Misc:
    - Applied: 'gluegen.cpptasks.striplibs' to all native libraries.

    - Use path.seperator (ant)  and system.env.library.path (gluegen),
      for junit runs.
---
 doc/deployment/JOGL-JAR-BUNDELING.txt              | 138 ++++++
 .../lstjars/lstjars.linux_amd64-20100406.log       | 540 +++++++++++++++++++++
 etc/profile.jogl                                   |  22 +-
 make/build-jogl.xml                                | 199 ++++----
 make/build-nativewindow.xml                        |  44 +-
 make/build-newt.xml                                |  43 +-
 make/jogl.properties                               |   2 +-
 make/lstjars.sh                                    | 129 ++---
 make/make.jogl.all.linux-x86_64.sh                 |   5 +-
 make/make.jogl.all.win32.bat                       |  14 +-
 .../com/jogamp/opengl/impl/NativeLibLoader.java    |   2 +-
 .../opengl/test/junit/texture/awt/Texture1.java    |   4 +
 src/newt/native/MacWindow.m                        |   2 +-
 src/newt/native/NewtMacWindow.h                    |   2 +-
 14 files changed, 922 insertions(+), 224 deletions(-)
 create mode 100644 doc/deployment/JOGL-JAR-BUNDELING.txt
 create mode 100644 doc/deployment/lstjars/lstjars.linux_amd64-20100406.log

diff --git a/doc/deployment/JOGL-JAR-BUNDELING.txt b/doc/deployment/JOGL-JAR-BUNDELING.txt
new file mode 100644
index 000000000..cf4edd7a3
--- /dev/null
+++ b/doc/deployment/JOGL-JAR-BUNDELING.txt
@@ -0,0 +1,138 @@
+
++++++++++++++++++++++++++++++
++++ Native Libraries ++++++++
++++++++++++++++++++++++++++++
+
+Gluegen native libraries
+    libgluegen-rt.so
+
+NativeWindow native libraries
+    libnativewindow_awt.so
+    libnativewindow_jvm.so
+    libnativewindow_x11.so
+
+
+JOGL native libraries
+    libjogl_desktop.so  
+    libjogl_gl2es12.so
+    libjogl_es1.so  
+    libjogl_es2.so  
+    libjogl_cg.so  
+
+NEWT native libraries
+    libnewt.so
+
++++++++++++++++++++++++++++++
++++ Gluegen - Mandatory +++++
++++++++++++++++++++++++++++++
+
+Gluegen JAR - Always
+
+    Core [pick 1]
+        gluegen-rt.jar
+
++++++++++++++++++++++++++++++
++++ All In One Deployment +++
++++++++++++++++++++++++++++++
+
+This might be the best solution
+for desktop (maybe webstart).
+
+It is much faster to download
+a (maybe bigger) file once and cache 
+it for most purposes, than to download
+tens of files where its cache might not 
+be reuseable.
+
+
+With AWT:
+    nativewindow.all.jar
+    jogl.all.jar
+    newt.all.jar (optional, if AWT is used only)
+
+
+Without AWT
+    nativewindow.all-noawt.jar
+    jogl.all-noawt.jar
+    newt.all-noawt.jar
+
+
++++++++++++++++++++++++++++++
++++ Atomic Deployment +++++++
++++++++++++++++++++++++++++++
+
+This is a fine tuned solution 
+where every byte counts.
+
+It is also possible to use this 
+strategy as a starting point for
+efficient manual deployment.
+
+Cores:
+    nativewindow.core.jar
+    jogl.core.jar
+
+    Newt (optional):
+        newt.core.jar
+        newt.ogl.jar  (to use NEWT with JOGL)
+
+
+Platform (x11/win/osx/embedded)
+
+    Chose the same platform for all picks :)
+
+    NativeWindow [pick 0..1]:
+        nativewindow.os.x11.jar
+
+    Jogl [pick 1]:
+        jogl.egl.jar
+        jogl.os.x11.jar
+        jogl.os.win.jar
+        jogl.os.osx.jar
+
+    Newt [pick 0..1] (optional):
+        newt.os.x11.jar
+        newt.os.win.jar
+        newt.os.osx.jar
+
+
+Jogl GL [pick 1..n]
+    jogl.gles1.jar
+    jogl.gles1.dbg.jar
+    jogl.gles2.jar
+    jogl.gles2.dbg.jar
+
+    jogl.gl2es12.jar
+
+    jogl.gl2.jar
+    jogl.gl2.dbg.jar
+
+    jogl.gl3.jar
+    jogl.gl3.dbg.jar
+
+    jogl.gl4.jar
+    jogl.gl4.dbg.jar
+
+
+Jogl Toolkits/Misc [pick n] (optional):
+    jogl.util.jar
+    jogl.util.gl2.jar
+    jogl.util.fixedfuncemu.jar
+
+
+AWT [pick n] (optional):
+    nativewindow.awt.jar
+
+    jogl.awt.jar
+    jogl.util.awt.jar (if using jogl.util)
+
+    newt.awt.jar
+
+GLU [pick n] (optional):
+    jogl.glutess.jar
+    jogl.glumipmap.jar
+    jogl.glugl2.jar
+
+
+
+
diff --git a/doc/deployment/lstjars/lstjars.linux_amd64-20100406.log b/doc/deployment/lstjars/lstjars.linux_amd64-20100406.log
new file mode 100644
index 000000000..48dcd562c
--- /dev/null
+++ b/doc/deployment/lstjars/lstjars.linux_amd64-20100406.log
@@ -0,0 +1,540 @@
+cp: cannot stat `../../gluegen/build-x86_64/gluegen-rt-natives-linux-i586.jar': No such file or directory
+cp: cannot stat `../../gluegen/build-x86_64/gluegen-rt-natives-linux-i586-cdc.jar': No such file or directory
+Native Libraries
+4	libgluegen-rt.so.gz
+24	libjogl_cg.so.gz
+144	libjogl_desktop.so.gz
+36	libjogl_es1.so.gz
+36	libjogl_es2.so.gz
+40	libjogl_gl2es12.so.gz
+4	libnativewindow_awt.so.gz
+4	libnativewindow_jvm.so.gz
+8	libnativewindow_x11.so.gz
+12	libnewt.so.gz
+312	total
+
+list gluegen-rt-cdc.jar to gluegen-rt-cdc.lst
+list gluegen-rt.jar to gluegen-rt.lst
+list jogl.all.cdc.jar to jogl.all.cdc.lst
+list jogl.all.jar to jogl.all.lst
+list jogl.all-noawt.jar to jogl.all-noawt.lst
+list jogl.awt.jar to jogl.awt.lst
+list jogl.cg.jar to jogl.cg.lst
+list jogl.core.cdc.jar to jogl.core.cdc.lst
+list jogl.core.jar to jogl.core.lst
+list jogl.egl.cdc.jar to jogl.egl.cdc.lst
+list jogl.egl.jar to jogl.egl.lst
+list jogl.gl2.dbg.jar to jogl.gl2.dbg.lst
+list jogl.gl2es12.cdc.jar to jogl.gl2es12.cdc.lst
+list jogl.gl2es12.jar to jogl.gl2es12.lst
+list jogl.gl2.jar to jogl.gl2.lst
+list jogl.gl3.dbg.jar to jogl.gl3.dbg.lst
+list jogl.gl3.jar to jogl.gl3.lst
+list jogl.gl4.dbg.jar to jogl.gl4.dbg.lst
+list jogl.gl4.jar to jogl.gl4.lst
+list jogl.gles1.cdc.jar to jogl.gles1.cdc.lst
+list jogl.gles1.dbg.cdc.jar to jogl.gles1.dbg.cdc.lst
+list jogl.gles1.dbg.jar to jogl.gles1.dbg.lst
+list jogl.gles1.jar to jogl.gles1.lst
+list jogl.gles2.cdc.jar to jogl.gles2.cdc.lst
+list jogl.gles2.dbg.cdc.jar to jogl.gles2.dbg.cdc.lst
+list jogl.gles2.dbg.jar to jogl.gles2.dbg.lst
+list jogl.gles2.jar to jogl.gles2.lst
+list jogl.glu.gl2.jar to jogl.glu.gl2.lst
+list jogl.glu.mipmap.cdc.jar to jogl.glu.mipmap.cdc.lst
+list jogl.glu.mipmap.jar to jogl.glu.mipmap.lst
+list jogl.glu.tess.cdc.jar to jogl.glu.tess.cdc.lst
+list jogl.glu.tess.jar to jogl.glu.tess.lst
+list jogl-natives-linux-amd64-cdc.jar to jogl-natives-linux-amd64-cdc.lst
+list jogl-natives-linux-amd64.jar to jogl-natives-linux-amd64.lst
+list jogl.os.osx.cdc.jar to jogl.os.osx.cdc.lst
+list jogl.os.osx.jar to jogl.os.osx.lst
+list jogl.os.win.cdc.jar to jogl.os.win.cdc.lst
+list jogl.os.win.jar to jogl.os.win.lst
+list jogl.os.x11.cdc.jar to jogl.os.x11.cdc.lst
+list jogl.os.x11.jar to jogl.os.x11.lst
+list jogl.sdk.jar to jogl.sdk.lst
+list jogl.test.jar to jogl.test.lst
+list jogl.util.awt.jar to jogl.util.awt.lst
+list jogl.util.cdc.jar to jogl.util.cdc.lst
+list jogl.util.fixedfuncemu.cdc.jar to jogl.util.fixedfuncemu.cdc.lst
+list jogl.util.fixedfuncemu.jar to jogl.util.fixedfuncemu.lst
+list jogl.util.gl2.jar to jogl.util.gl2.lst
+list jogl.util.jar to jogl.util.lst
+list nativewindow.all.cdc.jar to nativewindow.all.cdc.lst
+list nativewindow.all.jar to nativewindow.all.lst
+list nativewindow.all-noawt.jar to nativewindow.all-noawt.lst
+list nativewindow.awt.jar to nativewindow.awt.lst
+list nativewindow.core.cdc.jar to nativewindow.core.cdc.lst
+list nativewindow.core.jar to nativewindow.core.lst
+list nativewindow-natives-linux-amd64-cdc.jar to nativewindow-natives-linux-amd64-cdc.lst
+list nativewindow-natives-linux-amd64.jar to nativewindow-natives-linux-amd64.lst
+list nativewindow.os.x11.cdc.jar to nativewindow.os.x11.cdc.lst
+list nativewindow.os.x11.jar to nativewindow.os.x11.lst
+list newt.all.cdc.jar to newt.all.cdc.lst
+list newt.all.jar to newt.all.lst
+list newt.all-noawt.jar to newt.all-noawt.lst
+list newt.awt.jar to newt.awt.lst
+list newt.broadcomegl.cdc.jar to newt.broadcomegl.cdc.lst
+list newt.broadcomegl.jar to newt.broadcomegl.lst
+list newt.core.cdc.jar to newt.core.cdc.lst
+list newt.core.jar to newt.core.lst
+list newt-natives-linux-amd64-cdc.jar to newt-natives-linux-amd64-cdc.lst
+list newt-natives-linux-amd64.jar to newt-natives-linux-amd64.lst
+list newt.ogl.cdc.jar to newt.ogl.cdc.lst
+list newt.ogl.jar to newt.ogl.lst
+list newt.os.osx.jar to newt.os.osx.lst
+list newt.os.win.jar to newt.os.win.lst
+list newt.os.x11.jar to newt.os.x11.lst
+mv: cannot stat `jogl.all.cdc.lst': No such file or directory
+mv: cannot stat `nativewindow.all.cdc.lst': No such file or directory
+mv: cannot stat `newt.all.cdc.lst': No such file or directory
+mv: cannot stat `jogl.gl2es12.*.lst': No such file or directory
+duplicates - w/o gl2es12.* gl2.*
+
+com/jogamp/openmax/OMXEventListener.class
+com/jogamp/openmax/OMXInstance.class
+com/jogamp/openmax/OMXInstance$EGLImageTexture.class
+mv: cannot stat `jogl.all.cdc.lst': No such file or directory
+mv: cannot stat `nativewindow.all.cdc.lst': No such file or directory
+mv: cannot stat `newt.all.cdc.lst': No such file or directory
+all vs allparts delta
+
+--- allparts.lst	2010-04-06 14:27:30.945355748 +0200
++++ allall.lst	2010-04-06 14:27:31.002253659 +0200
+@@ -1,3 +1,10 @@
++com/jogamp/audio/windows/waveout/Audio.class
++com/jogamp/audio/windows/waveout/Mixer.class
++com/jogamp/audio/windows/waveout/Mixer$FillerThread.class
++com/jogamp/audio/windows/waveout/Mixer$MixerThread.class
++com/jogamp/audio/windows/waveout/SoundBuffer.class
++com/jogamp/audio/windows/waveout/Track.class
++com/jogamp/audio/windows/waveout/Vec3f.class
+ com/jogamp/common/nio/AbstractBuffer.class
+ com/jogamp/common/nio/AbstractLongBuffer.class
+ com/jogamp/common/nio/Buffers.class
+JOGL Deployment Payload for jar
+
+JOGL ES1 NEWT CORE
+44	gluegen-rt.jar
+48	nativewindow.all-noawt.jar
+148	jogl.core.jar
+116	jogl.util.jar
+44	jogl.egl.jar
+28	jogl.gles1.jar
+88	newt.all-noawt.jar
+4	libgluegen-rt.so.gz
+4	libnativewindow_jvm.so.gz
+36	libjogl_es1.so.gz
+12	libnewt.so.gz
+572	total
+
+JOGL ES2 NEWT CORE
+44	gluegen-rt.jar
+48	nativewindow.all-noawt.jar
+148	jogl.core.jar
+116	jogl.util.jar
+44	jogl.egl.jar
+32	jogl.gles2.jar
+88	newt.all-noawt.jar
+4	libgluegen-rt.so.gz
+4	libnativewindow_jvm.so.gz
+36	libjogl_es2.so.gz
+12	libnewt.so.gz
+576	total
+
+JOGL ES2 NEWT CORE FIXED
+44	gluegen-rt.jar
+48	nativewindow.all-noawt.jar
+148	jogl.core.jar
+116	jogl.util.jar
+44	jogl.egl.jar
+32	jogl.gles2.jar
+28	jogl.util.fixedfuncemu.jar
+88	newt.all-noawt.jar
+4	libgluegen-rt.so.gz
+4	libnativewindow_jvm.so.gz
+36	libjogl_es2.so.gz
+12	libnewt.so.gz
+604	total
+
+JOGL GL2ES12 NEWT
+44	gluegen-rt.jar
+48	nativewindow.all-noawt.jar
+148	jogl.core.jar
+116	jogl.util.jar
+56	jogl.os.x11.jar
+36	jogl.gl2es12.jar
+88	newt.all-noawt.jar
+4	libgluegen-rt.so.gz
+40	libjogl_gl2es12.so.gz
+12	libnewt.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_jvm.so.gz
+604	total
+
+JOGL GL2 NEWT
+44	gluegen-rt.jar
+48	nativewindow.all-noawt.jar
+148	jogl.core.jar
+116	jogl.util.jar
+56	jogl.os.x11.jar
+120	jogl.gl2.jar
+88	newt.all-noawt.jar
+4	libgluegen-rt.so.gz
+144	libjogl_desktop.so.gz
+12	libnewt.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_jvm.so.gz
+792	total
+
+JOGL GL2 AWT
+44	gluegen-rt.jar
+84	nativewindow.all.jar
+148	jogl.core.jar
+116	jogl.util.jar
+56	jogl.os.x11.jar
+120	jogl.gl2.jar
+64	jogl.awt.jar
+4	libgluegen-rt.so.gz
+144	libjogl_desktop.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_awt.so.gz
+4	libnativewindow_jvm.so.gz
+796	total
+
+JOGL ALL AWT
+44	gluegen-rt.jar
+84	nativewindow.all.jar
+1876	jogl.all.jar
+4	libgluegen-rt.so.gz
+144	libjogl_desktop.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_awt.so.gz
+4	libnativewindow_jvm.so.gz
+2168	total
+
+JOGL ALL No AWT
+44	gluegen-rt.jar
+48	nativewindow.all-noawt.jar
+1772	jogl.all-noawt.jar
+88	newt.all-noawt.jar
+4	libgluegen-rt.so.gz
+144	libjogl_desktop.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_jvm.so.gz
+12	libnewt.so.gz
+2124	total
+
+JOGL CDCFP DESKTOP
+44	gluegen-rt-cdc.jar
+84	nativewindow.all.jar
+792	jogl.all.cdc.jar
+88	newt.all.cdc.jar
+4	libgluegen-rt.so.gz
+40	libjogl_gl2es12.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_jvm.so.gz
+12	libnewt.so.gz
+1076	total
+
+JOGL CDCFP ES1 MOBILE
+44	gluegen-rt-cdc.jar
+148	jogl.core.cdc.jar
+44	jogl.egl.cdc.jar
+28	jogl.gles1.cdc.jar
+116	jogl.util.cdc.jar
+48	nativewindow.all.cdc.jar
+88	newt.all.cdc.jar
+4	libgluegen-rt.so.gz
+36	libjogl_es1.so.gz
+4	libnativewindow_jvm.so.gz
+12	libnewt.so.gz
+572	total
+
+JOGL CDCFP ES2 MOBILE
+44	gluegen-rt-cdc.jar
+148	jogl.core.cdc.jar
+44	jogl.egl.cdc.jar
+32	jogl.gles2.cdc.jar
+116	jogl.util.cdc.jar
+48	nativewindow.all.cdc.jar
+88	newt.all.cdc.jar
+4	libgluegen-rt.so.gz
+36	libjogl_es2.so.gz
+4	libnativewindow_jvm.so.gz
+12	libnewt.so.gz
+576	total
+
+JOGL GLU
+56	jogl.glu.gl2.jar
+68	jogl.glu.mipmap.cdc.jar
+68	jogl.glu.mipmap.jar
+48	jogl.glu.tess.cdc.jar
+48	jogl.glu.tess.jar
+288	total
+
+JOGL EVERYTHING
+1876	jogl.all.jar
+84	nativewindow.all.jar
+108	newt.all.jar
+4	libgluegen-rt.so.gz
+4	libnativewindow_jvm.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_awt.so.gz
+144	libjogl_desktop.so.gz
+36	libjogl_es1.so.gz
+36	libjogl_es2.so.gz
+40	libjogl_gl2es12.so.gz
+12	libnewt.so.gz
+2356	total
+
+pack200 gluegen-rt-cdc.pack.gz gluegen-rt-cdc.jar
+pack200 gluegen-rt.pack.gz gluegen-rt.jar
+pack200 jogl.all.cdc.pack.gz jogl.all.cdc.jar
+pack200 jogl.all.pack.gz jogl.all.jar
+pack200 jogl.all-noawt.pack.gz jogl.all-noawt.jar
+pack200 jogl.awt.pack.gz jogl.awt.jar
+pack200 jogl.cg.pack.gz jogl.cg.jar
+pack200 jogl.core.cdc.pack.gz jogl.core.cdc.jar
+pack200 jogl.core.pack.gz jogl.core.jar
+pack200 jogl.egl.cdc.pack.gz jogl.egl.cdc.jar
+pack200 jogl.egl.pack.gz jogl.egl.jar
+pack200 jogl.gl2.dbg.pack.gz jogl.gl2.dbg.jar
+pack200 jogl.gl2es12.cdc.pack.gz jogl.gl2es12.cdc.jar
+pack200 jogl.gl2es12.pack.gz jogl.gl2es12.jar
+pack200 jogl.gl2.pack.gz jogl.gl2.jar
+pack200 jogl.gl3.dbg.pack.gz jogl.gl3.dbg.jar
+pack200 jogl.gl3.pack.gz jogl.gl3.jar
+pack200 jogl.gl4.dbg.pack.gz jogl.gl4.dbg.jar
+pack200 jogl.gl4.pack.gz jogl.gl4.jar
+pack200 jogl.gles1.cdc.pack.gz jogl.gles1.cdc.jar
+pack200 jogl.gles1.dbg.cdc.pack.gz jogl.gles1.dbg.cdc.jar
+pack200 jogl.gles1.dbg.pack.gz jogl.gles1.dbg.jar
+pack200 jogl.gles1.pack.gz jogl.gles1.jar
+pack200 jogl.gles2.cdc.pack.gz jogl.gles2.cdc.jar
+pack200 jogl.gles2.dbg.cdc.pack.gz jogl.gles2.dbg.cdc.jar
+pack200 jogl.gles2.dbg.pack.gz jogl.gles2.dbg.jar
+pack200 jogl.gles2.pack.gz jogl.gles2.jar
+pack200 jogl.glu.gl2.pack.gz jogl.glu.gl2.jar
+pack200 jogl.glu.mipmap.cdc.pack.gz jogl.glu.mipmap.cdc.jar
+pack200 jogl.glu.mipmap.pack.gz jogl.glu.mipmap.jar
+pack200 jogl.glu.tess.cdc.pack.gz jogl.glu.tess.cdc.jar
+pack200 jogl.glu.tess.pack.gz jogl.glu.tess.jar
+pack200 jogl-natives-linux-amd64-cdc.pack.gz jogl-natives-linux-amd64-cdc.jar
+pack200 jogl-natives-linux-amd64.pack.gz jogl-natives-linux-amd64.jar
+pack200 jogl.os.osx.cdc.pack.gz jogl.os.osx.cdc.jar
+pack200 jogl.os.osx.pack.gz jogl.os.osx.jar
+pack200 jogl.os.win.cdc.pack.gz jogl.os.win.cdc.jar
+pack200 jogl.os.win.pack.gz jogl.os.win.jar
+pack200 jogl.os.x11.cdc.pack.gz jogl.os.x11.cdc.jar
+pack200 jogl.os.x11.pack.gz jogl.os.x11.jar
+pack200 jogl.sdk.pack.gz jogl.sdk.jar
+pack200 jogl.test.pack.gz jogl.test.jar
+pack200 jogl.util.awt.pack.gz jogl.util.awt.jar
+pack200 jogl.util.cdc.pack.gz jogl.util.cdc.jar
+pack200 jogl.util.fixedfuncemu.cdc.pack.gz jogl.util.fixedfuncemu.cdc.jar
+pack200 jogl.util.fixedfuncemu.pack.gz jogl.util.fixedfuncemu.jar
+pack200 jogl.util.gl2.pack.gz jogl.util.gl2.jar
+pack200 jogl.util.pack.gz jogl.util.jar
+pack200 nativewindow.all.cdc.pack.gz nativewindow.all.cdc.jar
+pack200 nativewindow.all.pack.gz nativewindow.all.jar
+pack200 nativewindow.all-noawt.pack.gz nativewindow.all-noawt.jar
+pack200 nativewindow.awt.pack.gz nativewindow.awt.jar
+pack200 nativewindow.core.cdc.pack.gz nativewindow.core.cdc.jar
+pack200 nativewindow.core.pack.gz nativewindow.core.jar
+pack200 nativewindow-natives-linux-amd64-cdc.pack.gz nativewindow-natives-linux-amd64-cdc.jar
+pack200 nativewindow-natives-linux-amd64.pack.gz nativewindow-natives-linux-amd64.jar
+pack200 nativewindow.os.x11.cdc.pack.gz nativewindow.os.x11.cdc.jar
+pack200 nativewindow.os.x11.pack.gz nativewindow.os.x11.jar
+pack200 newt.all.cdc.pack.gz newt.all.cdc.jar
+pack200 newt.all.pack.gz newt.all.jar
+pack200 newt.all-noawt.pack.gz newt.all-noawt.jar
+pack200 newt.awt.pack.gz newt.awt.jar
+pack200 newt.broadcomegl.cdc.pack.gz newt.broadcomegl.cdc.jar
+pack200 newt.broadcomegl.pack.gz newt.broadcomegl.jar
+pack200 newt.core.cdc.pack.gz newt.core.cdc.jar
+pack200 newt.core.pack.gz newt.core.jar
+pack200 newt-natives-linux-amd64-cdc.pack.gz newt-natives-linux-amd64-cdc.jar
+pack200 newt-natives-linux-amd64.pack.gz newt-natives-linux-amd64.jar
+pack200 newt.ogl.cdc.pack.gz newt.ogl.cdc.jar
+pack200 newt.ogl.pack.gz newt.ogl.jar
+pack200 newt.os.osx.pack.gz newt.os.osx.jar
+pack200 newt.os.win.pack.gz newt.os.win.jar
+pack200 newt.os.x11.pack.gz newt.os.x11.jar
+JOGL Deployment Payload for pack.gz
+
+JOGL ES1 NEWT CORE
+16	gluegen-rt.pack.gz
+12	nativewindow.all-noawt.pack.gz
+56	jogl.core.pack.gz
+44	jogl.util.pack.gz
+16	jogl.egl.pack.gz
+12	jogl.gles1.pack.gz
+28	newt.all-noawt.pack.gz
+4	libgluegen-rt.so.gz
+4	libnativewindow_jvm.so.gz
+36	libjogl_es1.so.gz
+12	libnewt.so.gz
+240	total
+
+JOGL ES2 NEWT CORE
+16	gluegen-rt.pack.gz
+12	nativewindow.all-noawt.pack.gz
+56	jogl.core.pack.gz
+44	jogl.util.pack.gz
+16	jogl.egl.pack.gz
+16	jogl.gles2.pack.gz
+28	newt.all-noawt.pack.gz
+4	libgluegen-rt.so.gz
+4	libnativewindow_jvm.so.gz
+36	libjogl_es2.so.gz
+12	libnewt.so.gz
+244	total
+
+JOGL ES2 NEWT CORE FIXED
+16	gluegen-rt.pack.gz
+12	nativewindow.all-noawt.pack.gz
+56	jogl.core.pack.gz
+44	jogl.util.pack.gz
+16	jogl.egl.pack.gz
+16	jogl.gles2.pack.gz
+16	jogl.util.fixedfuncemu.pack.gz
+28	newt.all-noawt.pack.gz
+4	libgluegen-rt.so.gz
+4	libnativewindow_jvm.so.gz
+36	libjogl_es2.so.gz
+12	libnewt.so.gz
+260	total
+
+JOGL GL2ES12 NEWT
+16	gluegen-rt.pack.gz
+12	nativewindow.all-noawt.pack.gz
+56	jogl.core.pack.gz
+44	jogl.util.pack.gz
+24	jogl.os.x11.pack.gz
+16	jogl.gl2es12.pack.gz
+28	newt.all-noawt.pack.gz
+4	libgluegen-rt.so.gz
+40	libjogl_gl2es12.so.gz
+12	libnewt.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_jvm.so.gz
+264	total
+
+JOGL GL2 NEWT
+16	gluegen-rt.pack.gz
+12	nativewindow.all-noawt.pack.gz
+56	jogl.core.pack.gz
+44	jogl.util.pack.gz
+24	jogl.os.x11.pack.gz
+60	jogl.gl2.pack.gz
+28	newt.all-noawt.pack.gz
+4	libgluegen-rt.so.gz
+144	libjogl_desktop.so.gz
+12	libnewt.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_jvm.so.gz
+412	total
+
+JOGL GL2 AWT
+16	gluegen-rt.pack.gz
+20	nativewindow.all.pack.gz
+56	jogl.core.pack.gz
+44	jogl.util.pack.gz
+24	jogl.os.x11.pack.gz
+60	jogl.gl2.pack.gz
+20	jogl.awt.pack.gz
+4	libgluegen-rt.so.gz
+144	libjogl_desktop.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_awt.so.gz
+4	libnativewindow_jvm.so.gz
+404	total
+
+JOGL ALL AWT
+16	gluegen-rt.pack.gz
+20	nativewindow.all.pack.gz
+680	jogl.all.pack.gz
+4	libgluegen-rt.so.gz
+144	libjogl_desktop.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_awt.so.gz
+4	libnativewindow_jvm.so.gz
+880	total
+
+JOGL ALL No AWT
+16	gluegen-rt.pack.gz
+12	nativewindow.all-noawt.pack.gz
+612	jogl.all-noawt.pack.gz
+28	newt.all-noawt.pack.gz
+4	libgluegen-rt.so.gz
+144	libjogl_desktop.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_jvm.so.gz
+12	libnewt.so.gz
+840	total
+
+JOGL CDCFP DESKTOP
+16	gluegen-rt-cdc.pack.gz
+20	nativewindow.all.pack.gz
+232	jogl.all.cdc.pack.gz
+28	newt.all.cdc.pack.gz
+4	libgluegen-rt.so.gz
+40	libjogl_gl2es12.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_jvm.so.gz
+12	libnewt.so.gz
+364	total
+
+JOGL CDCFP ES1 MOBILE
+16	gluegen-rt-cdc.pack.gz
+56	jogl.core.cdc.pack.gz
+16	jogl.egl.cdc.pack.gz
+12	jogl.gles1.cdc.pack.gz
+44	jogl.util.cdc.pack.gz
+12	nativewindow.all.cdc.pack.gz
+28	newt.all.cdc.pack.gz
+4	libgluegen-rt.so.gz
+36	libjogl_es1.so.gz
+4	libnativewindow_jvm.so.gz
+12	libnewt.so.gz
+240	total
+
+JOGL CDCFP ES2 MOBILE
+16	gluegen-rt-cdc.pack.gz
+56	jogl.core.cdc.pack.gz
+16	jogl.egl.cdc.pack.gz
+16	jogl.gles2.cdc.pack.gz
+44	jogl.util.cdc.pack.gz
+12	nativewindow.all.cdc.pack.gz
+28	newt.all.cdc.pack.gz
+4	libgluegen-rt.so.gz
+36	libjogl_es2.so.gz
+4	libnativewindow_jvm.so.gz
+12	libnewt.so.gz
+244	total
+
+JOGL GLU
+20	jogl.glu.gl2.pack.gz
+24	jogl.glu.mipmap.cdc.pack.gz
+24	jogl.glu.mipmap.pack.gz
+20	jogl.glu.tess.cdc.pack.gz
+20	jogl.glu.tess.pack.gz
+108	total
+
+JOGL EVERYTHING
+680	jogl.all.pack.gz
+20	nativewindow.all.pack.gz
+32	newt.all.pack.gz
+4	libgluegen-rt.so.gz
+4	libnativewindow_jvm.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_awt.so.gz
+144	libjogl_desktop.so.gz
+36	libjogl_es1.so.gz
+36	libjogl_es2.so.gz
+40	libjogl_gl2es12.so.gz
+12	libnewt.so.gz
+1020	total
+
diff --git a/etc/profile.jogl b/etc/profile.jogl
index f42a2504b..42162457e 100755
--- a/etc/profile.jogl
+++ b/etc/profile.jogl
@@ -28,11 +28,13 @@ uname -a | grep -i Darwin && OSS=osx
 
 JOGL_AWT="jogl.awt.jar jogl.util.awt.jar newt.awt.jar nativewindow.awt.jar"
 
-JOGL_CORE="nativewindow.core.jar nativewindow.x11.jar jogl.core.jar newt.core.jar newt.$OSS.jar newt.ogl.jar jogl.util.jar"
+JOGL_CORE="nativewindow.core.jar nativewindow.os.$OSS.jar jogl.core.jar jogl.os.$OSS.jar newt.core.jar newt.os.$OSS.jar newt.ogl.jar jogl.util.jar"
 
-JOGL_JAR_ALL_NOAWT="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.gl2es12.$OSS.jar jogl.gl2.$OSS.jar jogl.gl2.dbg.jar jogl.util.gl2.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar jogl.util.fixedfuncemu.jar jogl.cg.jar"
+JOGL_TEST="jogl.test.jar"
+
+JOGL_JAR_ALL_NOAWT="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gl2.jar jogl.gl2.dbg.jar jogl.util.gl2.jar jogl.gl3.jar jogl.gl3.dbg.jar jogl.gl4.jar jogl.gl4.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar jogl.util.fixedfuncemu.jar jogl.cg.jar"
 JOGL_JAR_ALL="$JOGL_JAR_ALL_NOAWT $JOGL_AWT"
-JOGL_LIB_ALL="libjogl_gl2.so libjogl_es1.so libjogl_es2.so libnewt.so libjogl_awt.so"
+JOGL_LIB_ALL="libjogl_desktop.so libjogl_es1.so libjogl_es2.so libnewt.so libjogl_awt.so"
 
 JOGL_JAR_ES1_MIN="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.egl.jar"
 JOGL_JAR_ES1_MAX="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.egl.jar jogl.glu.tess.jar jogl.glu.mipmap.jar $JOGL_AWT"
@@ -44,15 +46,15 @@ JOGL_JAR_ES2_MAX="$JOGL_CORE jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl
 JOGL_LIB_ES2_MIN="libjogl_es2.so libnewt.so"
 JOGL_LIB_ES2_MAX="libjogl_es2.so libnewt.so libjogl_awt.so libnativewindow_x11.so libnativewindow_awt.so"
 
-JOGL_JAR_GL2ES12_MIN="$JOGL_CORE jogl.gl2es12.$OSS.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar jogl.util.fixedfuncemu.jar"
-JOGL_JAR_GL2ES12_MAX="$JOGL_CORE jogl.gl2es12.$OSS.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar jogl.util.fixedfuncemu.jar jogl.gl2es12.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar $JOGL_AWT"
+JOGL_JAR_GL2ES12_MIN="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar jogl.util.fixedfuncemu.jar"
+JOGL_JAR_GL2ES12_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar jogl.util.fixedfuncemu.jar jogl.gl2es12.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar $JOGL_AWT"
 JOGL_LIB_GL2ES12_MIN="libjogl_gl2es12.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
 JOGL_LIB_GL2ES12_MAX="libjogl_gl2es12.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
 
-JOGL_JAR_GL2_MIN="$JOGL_CORE jogl.gl2.$OSS.jar jogl.gl2.dbg.jar"
-JOGL_JAR_GL2_MAX="$JOGL_CORE jogl.gl2.$OSS.jar jogl.gl2.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar $JOGL_AWT jogl.cg.jar"
-JOGL_LIB_GL2_MIN="libjogl_gl2.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
-JOGL_LIB_GL2_MAX="libjogl_gl2.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
+JOGL_JAR_GL2_MIN="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2.jar jogl.gl2.dbg.jar"
+JOGL_JAR_GL2_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2.jar jogl.gl2.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar $JOGL_AWT jogl.cg.jar"
+JOGL_LIB_GL2_MIN="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
+JOGL_LIB_GL2_MAX="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
 
 export JOGL_JAR_ALL JOGL_JAR_ALL_NOAWT JOGL_JAR_ES1_MIN JOGL_JAR_ES1_MAX JOGL_JAR_ES2_MIN JOGL_JAR_ES2_MAX JOGL_JAR_GL2ES12_MIN JOGL_JAR_GL2ES12_MAX JOGL_JAR_GL2_MIN JOGL_JAR_GL2_MAX
 export JOGL_LIB_ALL JOGL_LIB_ES1_MIN JOGL_LIB_ES1_MAX JOGL_LIB_ES2_MIN JOGL_LIB_ES2_MAX JOGL_LIB_GL2ES12_MIN JOGL_LIB_GL2ES12_MAX JOGL_LIB_GL2_MIN JOGL_LIB_GL2_MAX
@@ -96,7 +98,7 @@ export JOGL_LIB_DIR
 if [ ! -z "$JOGL_PROFILE" ] ; then
     case "$JOGL_PROFILE" in
         JOGL_ALL)
-            JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL)
+            JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL $JOGL_TEST)
             ;;
         JOGL_ALL_NOAWT)
             JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_NOAWT)
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index d516c21eb..e8d37dd05 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -83,12 +83,7 @@
             </and>
         </condition>
 
-        <condition property="setup.noall">
-            <isset property="setup.noAWT"/> 
-        </condition>
-
         <echo message="setup.nodesktop: ${setup.nodesktop}" />
-        <echo message="setup.noall: ${setup.noall}" />
         <echo message="setup.noAWT: ${setup.noAWT}" />
         <echo message="setup.noCDC: ${setup.noCDC}" />
 
@@ -131,6 +126,12 @@
         <property name="java.part.gl2es12"
                   value="com/jogamp/opengl/impl/gl2es12/**"/>
 
+        <property name="java.part.gl4"
+                  value="com/jogamp/opengl/impl/**/gl4/**"/>
+
+        <property name="java.part.gl4.dbg"
+                  value="javax/media/opengl/TraceGL4.* javax/media/opengl/DebugGL4.* javax/media/opengl/TraceGL4bc.* javax/media/opengl/DebugGL4bc.*"/>
+
         <property name="java.part.gl3"
                   value="com/jogamp/opengl/impl/**/gl3/**"/>
 
@@ -288,14 +289,15 @@
         <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
         <property name="gluegen.so.dir" value="${gluegen.root}/${rootrel.build}/obj" />
         <property name="junit.jar" value="${gluegen.make.dir}/lib/junit-4.5.jar" />
+        <property name="nativewindow.all.jar" value="../${rootrel.build}/nativewindow/nativewindow.all.jar" />
         <property name="nativewindow.core.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.jar" />
-        <property name="nativewindow.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.jar" />
+        <property name="nativewindow.os.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.os.x11.jar" />
         <property name="nativewindow.awt.jar" value="../${rootrel.build}/nativewindow/nativewindow.awt.jar" />
         <property name="nativewindow.so.dir" value="../${rootrel.build}/nativewindow/obj" />
 
         <property name="gluegen-rt-cdc.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt-cdc.jar" />
         <property name="nativewindow.core.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.cdc.jar" />
-        <property name="nativewindow.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.cdc.jar" />
+        <property name="nativewindow.os.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.os.x11.cdc.jar" />
                                                 
         <property name="newt.so.dir" value="../${rootrel.build}/newt/obj" />
 
@@ -322,7 +324,7 @@
         <property name="obj.jogl" value="${project.root}/${rootrel.obj.jogl}" />
         <property name="obj.cg"   value="${project.root}/${rootrel.obj.cg}" />
 
-        <property name="all.so.dir" value="${gluegen.so.dir}:${nativewindow.so.dir}:${obj}:${newt.so.dir}" />
+        <property name="all.so.dir" value="${gluegen.so.dir}${path.separator}${nativewindow.so.dir}${path.separator}${obj}${path.separator}${newt.so.dir}" />
 
         <!-- The GL headers from which Java files are generated -->
         <property name="config" value="${make}/config/jogl" />
@@ -378,14 +380,14 @@
         <path id="nativewindow_gluegen.classpath">
             <pathelement location="${gluegen-rt.jar}" />
             <pathelement location="${nativewindow.core.jar}" />
-            <pathelement location="${nativewindow.x11.jar}" />
+            <pathelement location="${nativewindow.os.x11.jar}" />
             <pathelement location="${nativewindow.awt.jar}" />
         </path>
 
         <path id="nativewindow_gluegen.classpath-cdc">
             <pathelement location="${gluegen-rt-cdc.jar}" />
             <pathelement location="${nativewindow.core.cdc.jar}" />
-            <pathelement location="${nativewindow.x11.cdc.jar}" />
+            <pathelement location="${nativewindow.os.x11.cdc.jar}" />
         </path>
 
         <!-- Create the classpath that includes GlueGen and
@@ -408,28 +410,33 @@
         <property name="jogl.glumipmap.jar" value="${build}/jogl.glu.mipmap.jar" />
         <property name="jogl.glugl2.jar"    value="${build}/jogl.glu.gl2.jar" />
 
-        <property name="jogl.gl2es12.x11.jar" value="${build}/jogl.gl2es12.x11.jar" />
-        <property name="jogl.gl2es12.win.jar" value="${build}/jogl.gl2es12.win.jar" />
-        <property name="jogl.gl2es12.osx.jar" value="${build}/jogl.gl2es12.osx.jar" />
+        <property name="jogl.os.x11.jar" value="${build}/jogl.os.x11.jar" />
+        <property name="jogl.os.win.jar" value="${build}/jogl.os.win.jar" />
+        <property name="jogl.os.osx.jar" value="${build}/jogl.os.osx.jar" />
+
+        <property name="jogl.gl2es12.jar" value="${build}/jogl.gl2es12.jar" />
 
-        <property name="jogl.gl2.x11.jar" value="${build}/jogl.gl2.x11.jar" />
-        <property name="jogl.gl2.win.jar" value="${build}/jogl.gl2.win.jar" />
-        <property name="jogl.gl2.osx.jar" value="${build}/jogl.gl2.osx.jar" />
+        <property name="jogl.gl2.jar"     value="${build}/jogl.gl2.jar" />
         <property name="jogl.gl2.dbg.jar" value="${build}/jogl.gl2.dbg.jar" />
-        <property name="jogl.gl3.x11.jar" value="${build}/jogl.gl3.x11.jar" />
-        <property name="jogl.gl3.win.jar" value="${build}/jogl.gl3.win.jar" />
-        <property name="jogl.gl3.osx.jar" value="${build}/jogl.gl3.osx.jar" />
+
+        <property name="jogl.gl3.jar"     value="${build}/jogl.gl3.jar" />
         <property name="jogl.gl3.dbg.jar" value="${build}/jogl.gl3.dbg.jar" />
 
+        <property name="jogl.gl4.jar"     value="${build}/jogl.gl4.jar" />
+        <property name="jogl.gl4.dbg.jar" value="${build}/jogl.gl4.dbg.jar" />
+
+        <property name="jogl.omx.jar"     value="${build}/jogl.omx.jar" />
+
         <property name="jogl.awt.jar" value="${build}/jogl.awt.jar" />
         <property name="jogl.util.jar" value="${build}/jogl.util.jar" />
         <property name="jogl.util.gl2.jar" value="${build}/jogl.util.gl2.jar" />
         <property name="jogl.util.awt.jar" value="${build}/jogl.util.awt.jar" />
         <property name="jogl.util.fixedfuncemu.jar" value="${build}/jogl.util.fixedfuncemu.jar" />
         <property name="jogl.sdk.jar" value="${build}/jogl.sdk.jar" />
+        <property name="jogl.test.jar" value="${build}/jogl.test.jar"/>
+
         <property name="jogl.all.jar" value="${build}/jogl.all.jar"/>
         <property name="jogl.all-noawt.jar" value="${build}/jogl.all-noawt.jar"/>
-        <property name="jogl.test.jar" value="${build}/jogl.test.jar"/>
 
         <!-- The resulting CDC jogl.jar. -->
         <property name="jogl.core.cdc.jar" value="${build}/jogl.core.cdc.jar" />
@@ -440,28 +447,26 @@
         <property name="jogl.egl.cdc.jar" value="${build}/jogl.egl.cdc.jar" />
         <property name="jogl.glutess.cdc.jar" value="${build}/jogl.glu.tess.cdc.jar" />
         <property name="jogl.glumipmap.cdc.jar" value="${build}/jogl.glu.mipmap.cdc.jar" />
-        <property name="jogl.gl2es12.x11.cdc.jar" value="${build}/jogl.gl2es12.x11.cdc.jar" />
-        <property name="jogl.gl2es12.win.cdc.jar" value="${build}/jogl.gl2es12.win.cdc.jar" />
-        <property name="jogl.gl2es12.osx.cdc.jar" value="${build}/jogl.gl2es12.osx.cdc.jar" />
+        <property name="jogl.os.x11.cdc.jar" value="${build}/jogl.os.x11.cdc.jar" />
+        <property name="jogl.os.win.cdc.jar" value="${build}/jogl.os.win.cdc.jar" />
+        <property name="jogl.os.osx.cdc.jar" value="${build}/jogl.os.osx.cdc.jar" />
+        <property name="jogl.gl2es12.cdc.jar" value="${build}/jogl.gl2es12.cdc.jar" />
         <property name="jogl.util.cdc.jar" value="${build}/jogl.util.cdc.jar" />
         <property name="jogl.util.fixedfuncemu.cdc.jar" value="${build}/jogl.util.fixedfuncemu.cdc.jar" />
+
         <property name="jogl.all.cdc.jar" value="${build}/jogl.all.cdc.jar"/>
 
         <path id="jogl_junit.compile.classpath">
             <pathelement location="${junit.jar}" />
             <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${nativewindow.core.jar}" />
-            <pathelement location="${nativewindow.x11.jar}" />
-            <pathelement location="${nativewindow.awt.jar}" />
+            <pathelement location="${nativewindow.all.jar}" />
             <pathelement location="${jogl.all.jar}" />
         </path>
 
         <path id="jogl_junit.run.classpath">
             <pathelement location="${junit.jar}" />
             <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${nativewindow.core.jar}" />
-            <pathelement location="${nativewindow.x11.jar}" />
-            <pathelement location="${nativewindow.awt.jar}" />
+            <pathelement location="${nativewindow.all.jar}" />
             <pathelement location="${jogl.all.jar}" />
             <pathelement location="${jogl.test.jar}" />
         </path>
@@ -1462,7 +1467,7 @@
 
         <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
 
-        <patternset id="c.src.files.jogl.gl2">
+        <patternset id="c.src.files.jogl.desktop">
           <include name="${rootrel.src.c}/macosx/MacOSXCustomCGLCode.c" if="isOSX"/>
           <include name="${rootrel.src.c}/macosx/MacOSXWindowSystemInterface.m" if="isOSX"/>
           <include name="${rootrel.src.c}/macosx/ContextUpdater.m" if="isOSX"/>
@@ -1598,9 +1603,9 @@
       <!--javah destdir="${build}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.audio.windows.waveout.Mixer" /-->
     </target>
 
-    <target name="c.build.jogl.gl2" unless="setup.nodesktop">
-      <c.build c.compiler.src.files="c.src.files.jogl.gl2"
-               output.lib.name="jogl_gl2"
+    <target name="c.build.jogl.desktop" unless="setup.nodesktop">
+      <c.build c.compiler.src.files="c.src.files.jogl.desktop"
+               output.lib.name="jogl_desktop"
                compiler.cfg.id="${compiler.cfg.id}"
                linker.cfg.id="${linker.cfg.id.gl2}"/>
     </target>
@@ -1646,7 +1651,11 @@
       <antcall target="c.manifest.cg" inheritRefs="true" />
     </target>
 
-    <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.gl2es12,c.build.jogl.gl2,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg">
+    <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.gl2es12,c.build.jogl.desktop,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg">
+      <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
+          <param name="libdir" value="${obj}"/>
+      </antcall>
+
       <antcall target="c.manifest" inheritRefs="true" />
       <!-- Create the Java Web Start jar file for the built native code -->
       <jar destfile="${build}/jogl-natives-${os.and.arch}.jar" filesonly="true">
@@ -1717,32 +1726,33 @@
         </copy>
     </target>
 
-    <target name="build-cg-jar" depends="setup-manifestfile" if="jogl.cg">
+    <target name="build-cg-jar-javase" depends="setup-manifestfile" if="jogl.cg">
         <jar manifest="${build}/tempversion" destfile="${jogl.cg.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.nv-cg}"/>
         </jar>
     </target>
 
-    <target name="build-jars-es-desktop" depends="setup-manifestfile" unless="setup.nodesktop">
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl2es12.x11.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.glx}, ${java.part.gl2es12}, ${java.part.openmax}"
-                     excludes="${java.part.glugl2}"/>
+    <target name="build-jars-os-desktop-javase" depends="setup-manifestfile" unless="setup.nodesktop">
+        <jar manifest="${build}/tempversion" destfile="${jogl.os.x11.jar}" filesonly="true">
+            <fileset dir="${classes}" includes="${java.part.glx}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl2es12.win.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.wgl}, ${java.part.gl2es12}, ${java.part.openmax}"
-                     excludes="${java.part.glugl2}"/>
+        <jar manifest="${build}/tempversion" destfile="${jogl.os.win.jar}" filesonly="true">
+            <fileset dir="${classes}" includes="${java.part.wgl}" />
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl2es12.osx.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.cgl}, ${java.part.gl2es12}, ${java.part.openmax}"
+        <jar manifest="${build}/tempversion" destfile="${jogl.os.osx.jar}" filesonly="true">
+            <fileset dir="${classes}" includes="${java.part.cgl}"/>
+        </jar>
+    </target>
+
+    <target name="build-jars-es-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop">
+        <jar manifest="${build}/tempversion" destfile="${jogl.gl2es12.jar}" filesonly="true">
+            <fileset dir="${classes}" includes="${java.part.gl2es12}, ${java.part.openmax}"
                      excludes="${java.part.glugl2}"/>
         </jar>
     </target>
 
-    <target name="build-jars-es" depends="setup-manifestfile,build-jars-es-desktop">
+    <target name="build-jars-es-javase" depends="setup-manifestfile,build-jars-es-desktop-javase">
         <jar manifest="${build}/tempversion" destfile="${jogl.egl.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.egl}"
@@ -1768,20 +1778,22 @@
         </jar>
     </target>
 
-    <target name="build-jars-es-desktop-cdc" depends="setup-manifestfile-cdc" unless="setup.nodesktop">
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gl2es12.x11.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.glx}, ${java.part.gl2es12}, ${java.part.openmax}"
-                     excludes="${java.part.glugl2}"/>
+    <target name="build-jars-os-desktop-cdc" depends="setup-manifestfile" unless="setup.nodesktop">
+        <jar manifest="${build}/tempversion" destfile="${jogl.os.x11.cdc.jar}" filesonly="true">
+            <fileset dir="${classes-cdc}" includes="${java.part.glx}"/>
         </jar>
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gl2es12.win.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.wgl}, ${java.part.gl2es12}, ${java.part.openmax}"
-                     excludes="${java.part.glugl2}"/>
+        <jar manifest="${build}/tempversion" destfile="${jogl.os.win.cdc.jar}" filesonly="true">
+            <fileset dir="${classes-cdc}" includes="${java.part.wgl}" />
+        </jar>
+        <jar manifest="${build}/tempversion" destfile="${jogl.os.osx.cdc.jar}" filesonly="true">
+            <fileset dir="${classes-cdc}" includes="${java.part.cgl}"/>
         </jar>
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gl2es12.osx.cdc.jar}" filesonly="true">
+    </target>
+
+    <target name="build-jars-es-desktop-cdc" depends="setup-manifestfile-cdc,build-jars-os-desktop-cdc" unless="setup.nodesktop">
+        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gl2es12.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
-                     includes="${java.part.cgl}, ${java.part.gl2es12}, ${java.part.openmax}"
+                     includes="${java.part.gl2es12}, ${java.part.openmax}"
                      excludes="${java.part.glugl2}"/>
         </jar>
     </target>
@@ -1812,7 +1824,7 @@
         </jar>
     </target>
 
-    <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT">
+    <target name="build-jars-awt-javase" depends="setup-manifestfile" unless="setup.noAWT">
         <jar manifest="${build}/tempversion" destfile="${jogl.awt.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.awt}" />
@@ -1823,7 +1835,7 @@
         </jar>
     </target>
 
-    <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noall">
+    <target name="build-jars-all-awt-javase" depends="setup-manifestfile" unless="setup.noAWT">
         <jar manifest="${build}/tempversion" destfile="${jogl.all.jar}" filesonly="true">
             <fileset dir="${classes}">
                 <include name="javax/media/opengl/**" />
@@ -1837,7 +1849,7 @@
                      includes="${java.part.util.fixedfuncemu.shadercode}"/>
         </jar>
     </target>
-    <target name="build-jars-all-noawt" depends="setup-manifestfile">
+    <target name="build-jars-all-noawt-javase" depends="setup-manifestfile">
         <jar manifest="${build}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true">
             <fileset dir="${classes}"
                 includes="javax/media/opengl/** com/jogamp/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/jogamp/**"
@@ -1885,45 +1897,40 @@
         </jar>
     </target>
 
-    <target name="build-jars-desktop-javase" depends="setup-manifestfile" unless="setup.nodesktop">
+    <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop">
         <!--os specific gl2-->
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl2.x11.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.glx}, ${java.part.gl2}, ${java.part.openmax}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.glugl2}"/>
-        </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl2.win.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.wgl}, ${java.part.gl2}, {java.part.openmax}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.glugl2}"/>
-        </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl2.osx.jar}" filesonly="true">
+        <jar manifest="${build}/tempversion" destfile="${jogl.gl2.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.cgl}, ${java.part.gl2}, {java.part.openmax}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.glugl2}"/>
+                     includes="${java.part.gl2}, ${java.part.openmax}"
+                     excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
         </jar>
 
         <!--os specific gl3-->
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl3.x11.jar}" filesonly="true">
+        <jar manifest="${build}/tempversion" destfile="${jogl.gl3.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.glx}, ${java.part.gl3}, ${java.part.openmax}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.gl2.dbg}, ${java.part.glugl2}"/>
+                     includes="${java.part.gl3}, ${java.part.openmax}"
+                     excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl3.win.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.wgl}, ${java.part.gl3}, {java.part.openmax}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.gl2.dbg}, ${java.part.glugl2}"/>
-        </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl3.osx.jar}" filesonly="true">
+
+        <!--os specific gl4-->
+        <jar manifest="${build}/tempversion" destfile="${jogl.gl4.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.cgl}, ${java.part.gl3}, {java.part.openmax}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.gl2.dbg}, ${java.part.glugl2}"/>
+                     includes="${java.part.gl4}, ${java.part.openmax}"
+                     excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
         </jar>
 
         <!-- misc -->
         <jar manifest="${build}/tempversion" destfile="${jogl.gl2.dbg.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.gl2.dbg} ${java.part.gl3.dbg}"/>
+                     includes="${java.part.gl2.dbg}"/>
+        </jar>
+        <jar manifest="${build}/tempversion" destfile="${jogl.gl3.dbg.jar}" filesonly="true">
+            <fileset dir="${classes}"
+                     includes="${java.part.gl3.dbg}"/>
+        </jar>
+        <jar manifest="${build}/tempversion" destfile="${jogl.gl4.dbg.jar}" filesonly="true">
+            <fileset dir="${classes}"
+                     includes="${java.part.gl4.dbg}"/>
         </jar>
         <jar manifest="${build}/tempversion" destfile="${jogl.glugl2.jar}" filesonly="true">
             <fileset dir="${classes}"
@@ -1936,7 +1943,7 @@
         </jar>
     </target>
 
-    <target name="build-jars-javase" depends="setup-manifestfile, build-jars-es, build-jars-awt, build-cg-jar, build-jars-all-awt, build-jars-all-noawt, build-jars-desktop-javase">
+    <target name="build-jars-javase" depends="setup-manifestfile, build-jars-es-javase, build-jars-awt-javase, build-cg-jar-javase, build-jars-all-awt-javase, build-jars-all-noawt-javase, build-jars-desktop-javase">
         <jar manifest="${build}/tempversion" destfile="${jogl.core.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.core}"
@@ -2116,22 +2123,12 @@
         </jar>
     </target>
 
-    <target name="junit.run" depends="declare.common">
-        <condition property="system.env.library.path"
-                   value="LD_LIBRARY_PATH">
-          <not>
-           <isset property="isWindows"/> 
-          </not>
-        </condition>
-        <condition property="system.env.library.path"
-                   value="PATH">
-          <isset property="isWindows"/> 
-        </condition>
-
+    <target name="junit.run" depends="declare.common,gluegen.cpptasks.detect.os">
         <!-- Perform the junit tests-->
         <mkdir dir="${build}/results"/>
         <junit forkmode="once" showoutput="true" fork="true" haltonerror="true">
             <env key="${system.env.library.path}" path="${all.so.dir}"/>
+            <jvmarg value="-Djava.library.path=${all.so.dir}"/>
             <formatter usefile="false" type="plain"/>
             <formatter usefile="true" type="xml"/>
             <classpath refid="jogl_junit.run.classpath"/>
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index e76c37a84..b34ad3954 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -80,14 +80,9 @@
             </or>
         </condition>
 
-        <condition property="setup.noall">
-            <isset property="setup.noAWT"/> 
-        </condition>
-
         <property name="javac.bootclasspath-cdc.jar" value="${gluegen.root}/make/lib/cdc_fp.jar" />
 
         <echo message="setup.nodesktop: ${setup.nodesktop}" />
-        <echo message="setup.noall: ${setup.noall}" />
         <echo message="setup.noAWT: ${setup.noAWT}" />
         <echo message="setup.noNativeAWT: ${setup.noNativeAWT}" />
         <echo message="javac.bootclasspath-cdc.jar: ${javac.bootclasspath-cdc.jar}" />
@@ -239,11 +234,12 @@
         <!-- The resulting nativewindow.jar. -->
         <property name="nativewindow.core.jar" value="${build}/nativewindow.core.jar" />
         <property name="nativewindow.awt.jar"  value="${build}/nativewindow.awt.jar"  />
-        <property name="nativewindow.x11.jar"  value="${build}/nativewindow.x11.jar"  />
+        <property name="nativewindow.os.x11.jar"  value="${build}/nativewindow.os.x11.jar"  />
         <property name="nativewindow.all.jar"  value="${build}/nativewindow.all.jar"  />
+        <property name="nativewindow.all-noawt.jar"  value="${build}/nativewindow.all-noawt.jar" />
 
         <property name="nativewindow.core.cdc.jar" value="${build}/nativewindow.core.cdc.jar" />
-        <property name="nativewindow.x11.cdc.jar"  value="${build}/nativewindow.x11.cdc.jar"  />
+        <property name="nativewindow.os.x11.cdc.jar"  value="${build}/nativewindow.os.x11.cdc.jar"  />
         <property name="nativewindow.all.cdc.jar"  value="${build}/nativewindow.all.cdc.jar"  />
 
         <!-- The javadoc dirs. -->
@@ -759,6 +755,10 @@
     </target>
 
     <target name="c.build.nativewindow" depends="c.configure,c.build.nativewindow.windowlib,c.build.nativewindow.jvm,c.build.nativewindow.awt">
+      <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
+          <param name="libdir" value="${obj}"/>
+      </antcall>
+
       <antcall target="c.fixup.jawt.version.macosx" inheritrefs="true" />
       <antcall target="c.manifest" inheritRefs="true" />
       <!-- Create the Java Web Start jar file for the built native code -->
@@ -835,39 +835,39 @@
     </target>
 
     <target name="build-jars-x11" depends="setup-manifestfile">
-        <jar manifest="tempversion" destfile="${nativewindow.x11.jar}" filesonly="true">
+        <jar manifest="tempversion" destfile="${nativewindow.os.x11.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.x11}" />
         </jar>
     </target>
     <target name="build-jars-x11-cdc" depends="setup-manifestfile-cdc">
-        <jar manifest="tempversion-cdc" destfile="${nativewindow.x11.cdc.jar}" filesonly="true">
+        <jar manifest="tempversion-cdc" destfile="${nativewindow.os.x11.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.x11}" />
         </jar>
     </target>
 
-    <target name="build-jars-all" depends="setup-manifestfile" unless="setup.noall">
+    <target name="build-jars-all" depends="setup-manifestfile" unless="setup.noAWT">
         <jar manifest="tempversion" destfile="${nativewindow.all.jar}" filesonly="true">
-            <fileset dir="${classes}">
-                <include name="javax/media/nativewindow/**" />
-                <include name="com/jogamp/nativewindow/**" />
-                <include name="com/jogamp/gluegen/runtime/**" />
-                <exclude name="${java.part.x11}" />
-            </fileset>
+            <fileset dir="${classes}"
+                     includes="javax/media/nativewindow/** com/jogamp/nativewindow/**" />
+        </jar>
+    </target>
+    <target name="build-jars-all-noawt" depends="setup-manifestfile">
+        <jar manifest="tempversion" destfile="${nativewindow.all-noawt.jar}" filesonly="true">
+            <fileset dir="${classes}"
+                     includes="javax/media/nativewindow/**, com/jogamp/nativewindow/**" 
+                     excludes="${java.part.awt}"/>
         </jar>
     </target>
     <target name="build-jars-all-cdc" depends="setup-manifestfile-cdc">
         <jar manifest="tempversion-cdc" destfile="${nativewindow.all.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}">
-                <include name="javax/media/nativewindow/**" />
-                <include name="com/jogamp/nativewindow/**" />
-                <include name="com/jogamp/gluegen/runtime/**" />
-            </fileset>
+            <fileset dir="${classes-cdc}"
+                     includes="javax/media/nativewindow/** com/jogamp/nativewindow/**" />
         </jar>
     </target>
 
-    <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-x11,build-jars-all">
+    <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-x11,build-jars-all,build-jars-all-noawt">
         <jar manifest="tempversion" destfile="${nativewindow.core.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.core}"
diff --git a/make/build-newt.xml b/make/build-newt.xml
index eddbf609f..782ff158d 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -78,10 +78,6 @@
             </and>
         </condition>
 
-        <condition property="setup.noall">
-            <isset property="setup.noAWT"/>
-        </condition>
-
         <condition property="setup.nonatives">
             <and>
                 <isfalse value="${isWindows}" />
@@ -95,7 +91,6 @@
 
         <echo message="setup.nonatives: ${setup.nonatives}" />
         <echo message="setup.nodesktop: ${setup.nodesktop}" />
-        <echo message="setup.noall: ${setup.noall}" />
         <echo message="setup.noCDC: ${setup.noCDC}" />
         <echo message="setup.noAWT: ${setup.noAWT}" />
         <echo message="setup.noOpenGL: ${setup.noOpenGL}" />
@@ -211,14 +206,14 @@
 
         <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
         <property name="nativewindow.core.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.jar" />
-        <property name="nativewindow.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.jar" />
+        <property name="nativewindow.os.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.os.x11.jar" />
         <property name="nativewindow.awt.jar" value="../${rootrel.build}/nativewindow/nativewindow.awt.jar" />
         <property name="jogl.core.jar" value="../${rootrel.build}/jogl/jogl.core.jar" />
         <property name="jogl.egl.jar" value="../${rootrel.build}/jogl/jogl.egl.jar" />
 
         <property name="gluegen-rt-cdc.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt-cdc.jar" />
         <property name="nativewindow.core.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.cdc.jar" />
-        <property name="nativewindow.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.cdc.jar" />
+        <property name="nativewindow.os.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.os.x11.cdc.jar" />
         <property name="jogl.core.cdc.jar" value="../${rootrel.build}/jogl/jogl.core.cdc.jar" />
         <property name="jogl.egl.cdc.jar" value="../${rootrel.build}/jogl/jogl.egl.cdc.jar" />
 
@@ -239,7 +234,7 @@
         <path id="nativewindow_gluegen_jogl.classpath">
             <pathelement location="${gluegen-rt.jar}" />
             <pathelement location="${nativewindow.core.jar}" />
-            <pathelement location="${nativewindow.x11.jar}" />
+            <pathelement location="${nativewindow.os.x11.jar}" />
             <pathelement location="${nativewindow.awt.jar}" />
             <pathelement location="${jogl.core.jar}" />
             <pathelement location="${jogl.egl.jar}" />
@@ -248,16 +243,16 @@
         <path id="nativewindow_gluegen_jogl.classpath-cdc">
             <pathelement location="${gluegen-rt-cdc.jar}" />
             <pathelement location="${nativewindow.core.cdc.jar}" />
-            <pathelement location="${nativewindow.x11.cdc.jar}" />
+            <pathelement location="${nativewindow.os.x11.cdc.jar}" />
             <pathelement location="${jogl.core.cdc.jar}" />
             <pathelement location="${jogl.egl.cdc.jar}" />
         </path>
 
         <!-- The resulting newt.jar. -->
         <property name="newt.core.jar" value="${build}/newt.core.jar" />
-        <property name="newt.x11.jar"  value="${build}/newt.x11.jar" />
-        <property name="newt.win.jar"  value="${build}/newt.win.jar" />
-        <property name="newt.osx.jar"  value="${build}/newt.osx.jar" />
+        <property name="newt.os.x11.jar"  value="${build}/newt.os.x11.jar" />
+        <property name="newt.os.win.jar"  value="${build}/newt.os.win.jar" />
+        <property name="newt.os.osx.jar"  value="${build}/newt.os.osx.jar" />
         <property name="newt.ogl.jar"  value="${build}/newt.ogl.jar" />
         <property name="newt.broadcomegl.jar"  value="${build}/newt.broadcomegl.jar" />
         <property name="newt.awt.jar"  value="${build}/newt.awt.jar" />
@@ -265,9 +260,9 @@
         <property name="newt.all-noawt.jar"  value="${build}/newt.all-noawt.jar" />
 
         <property name="newt.core.cdc.jar" value="${build}/newt.core.cdc.jar" />
-        <property name="newt.x11.cdc.jar"  value="${build}/newt.x11.cdc.jar" />
-        <property name="newt.win.cdc.jar"  value="${build}/newt.win.cdc.jar" />
-        <property name="newt.osx.cdc.jar"  value="${build}/newt.osx.cdc.jar" />
+        <property name="newt.os.x11.cdc.jar"  value="${build}/newt.os.x11.cdc.jar" />
+        <property name="newt.os.win.cdc.jar"  value="${build}/newt.os.win.cdc.jar" />
+        <property name="newt.os.osx.cdc.jar"  value="${build}/newt.os.osx.cdc.jar" />
         <property name="newt.ogl.cdc.jar"  value="${build}/newt.ogl.cdc.jar" />
         <property name="newt.broadcomegl.cdc.jar"  value="${build}/newt.broadcomegl.cdc.jar" />
         <property name="newt.all.cdc.jar" value="${build}/newt.all.cdc.jar" />
@@ -633,6 +628,10 @@
     </target>
 
     <target name="c.build.newt" depends="c.configure,c.build.newt.prepare,c.build.newt.natives">
+      <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
+          <param name="libdir" value="${obj}"/>
+      </antcall>
+
       <antcall target="c.manifest" inheritRefs="true" />
       <!-- Create the Java Web Start jar file for the built native code -->
       <jar destfile="${build}/newt-natives-${os.and.arch}.jar" filesonly="true">
@@ -727,36 +726,36 @@
     </target>
 
     <target name="build-jars-desktop" depends="setup-manifestfile" unless="setup.nodesktop">
-        <jar manifest="tempversion" destfile="${newt.x11.jar}" filesonly="true">
+        <jar manifest="tempversion" destfile="${newt.os.x11.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.x11}"/>
         </jar>
-        <jar manifest="tempversion" destfile="${newt.win.jar}" filesonly="true">
+        <jar manifest="tempversion" destfile="${newt.os.win.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.windows}"/>
         </jar>
-        <jar manifest="tempversion" destfile="${newt.osx.jar}" filesonly="true">
+        <jar manifest="tempversion" destfile="${newt.os.osx.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.macosx}"/>
         </jar>
     </target>
 
     <target name="build-jars-desktop-cdc" depends="setup-manifestfile-cdc" unless="setup.nodesktop">
-        <jar manifest="tempversion-cdc" destfile="${newt.x11.cdc.jar}" filesonly="true">
+        <jar manifest="tempversion-cdc" destfile="${newt.os.x11.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.x11}"/>
         </jar>
-        <jar manifest="tempversion-cdc" destfile="${newt.win.cdc.jar}" filesonly="true">
+        <jar manifest="tempversion-cdc" destfile="${newt.os.win.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.windows}"/>
         </jar>
-        <jar manifest="tempversion-cdc" destfile="${newt.osx.cdc.jar}" filesonly="true">
+        <jar manifest="tempversion-cdc" destfile="${newt.os.osx.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.macosx}"/>
         </jar>
     </target>
 
-    <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noall">
+    <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noAWT">
         <jar manifest="tempversion" destfile="${newt.all.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="com/jogamp/newt/**" />
diff --git a/make/jogl.properties b/make/jogl.properties
index 4f5f4d44b..34a593dac 100644
--- a/make/jogl.properties
+++ b/make/jogl.properties
@@ -16,5 +16,5 @@
 # default location, modify the appropriate variable to point to the
 # absolute path of the lib directory
 #
-windows.cg.lib=C:/Program Files/Nvidia Corporation/Cg/lib
+windows.cg.lib=C:/Cg-2.2/lib
 x11.cg.lib=/usr/lib
diff --git a/make/lstjars.sh b/make/lstjars.sh
index 5357cde11..7159c184e 100644
--- a/make/lstjars.sh
+++ b/make/lstjars.sh
@@ -1,17 +1,18 @@
 #! /bin/sh
 
 THISDIR=$(pwd)
-STATDIR=$THISDIR/../stats
 
 BUILDDIR=$1
 shift
 BUILDDIR_GLUEGEN=$1
 shift
 if [ -z "$BUILDDIR" -o -z "$BUILDDIR_GLUEGEN" ] ; then 
-    echo "usage $0 <BUILDDIR-JOGL> <BUILDDIR-GLUEGEN>"
+    echo "usage $0 <BUILDDIR-JOGL> <BUILDDIR-GLUEGEN> [-skippack200]"
     exit 1
 fi
 
+STATDIR=$BUILDDIR-stats
+
 skippack200=0
 if [ "$1" = "-skippack200" ] ; then
     skippack200=1
@@ -23,6 +24,69 @@ function report() {
     du -ksc $*
 }
 
+OSS=x11
+ARCH=linux-amd64
+
+function listdeployment() {
+    JAR_SUFFIX=$1
+    shift
+
+    echo JOGL Deployment Payload for $JAR_SUFFIX
+    echo
+
+    echo JOGL ES1 NEWT CORE
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles1.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es1.so.gz libnewt.so.gz
+    echo
+
+    echo JOGL ES2 NEWT CORE
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz
+    echo
+
+    echo JOGL ES2 NEWT CORE FIXED
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX jogl.util.fixedfuncemu.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz
+    echo
+
+    echo JOGL GL2ES12 NEWT 
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2es12.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz
+    echo
+
+    echo JOGL GL2 NEWT 
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz
+    echo
+
+    echo JOGL GL2 AWT
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz
+    echo
+
+    echo JOGL ALL AWT
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz
+    echo
+
+    echo JOGL ALL No AWT
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
+    echo
+
+    echo JOGL CDCFP DESKTOP
+    report gluegen-rt-cdc.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
+    echo
+
+    echo JOGL CDCFP ES1 MOBILE
+    report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles1.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
+    echo
+
+    echo JOGL CDCFP ES2 MOBILE
+    report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles2.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
+    echo
+
+    echo JOGL GLU
+    report jogl.glu.*$JAR_SUFFIX
+    echo
+
+    echo JOGL EVERYTHING
+    report *.all.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libjogl_desktop.so.gz  libjogl_es1.so.gz  libjogl_es2.so.gz  libjogl_gl2es12.so.gz libnewt.so.gz
+    echo
+}
+
 rm -rf $STATDIR
 mkdir -p $STATDIR
 cp -a $BUILDDIR/nativewindow/obj/*.so $STATDIR
@@ -59,7 +123,7 @@ done
 rm -rf nope
 mkdir -p nope
 
-mv *.cdc.lst *.all.lst nope/
+mv *.cdc.lst *.all*.lst nope/
 
 mv jogl.gl2es12.*.lst jogl.gl2.*.lst nope/
 echo duplicates - w/o gl2es12.* gl2.*
@@ -67,16 +131,18 @@ echo
 sort jogl*.lst | uniq -d
 mv nope/* .
 
-mv *.cdc.lst *.all.lst nope/
+mv *.cdc.lst *.all*.lst nope/
 cat *.lst | sort -u > allparts.lst
 mv nope/* .
-cat *.all.lst   | sort -u > allall.lst
+cat *.all.lst gluegen-rt.lst   | sort -u > allall.lst
 cat jogl.all.cdc.lst newt.all.cdc.lst nativewindow.core.lst | sort -u > allcdc.lst
 
 echo all vs allparts delta
 echo
 diff -Nur allparts.lst allall.lst
 
+listdeployment jar
+
 if [ $skippack200 -eq 0 ] ; then
     for i in *.jar ; do
         fname=$i
@@ -84,57 +150,6 @@ if [ $skippack200 -eq 0 ] ; then
         echo pack200 $bname.pack.gz $fname
         pack200 $bname.pack.gz $fname
     done
-    JAR_SUFFIX=pack.gz
-else
-    JAR_SUFFIX=jar
+    listdeployment pack.gz
 fi
 
-OSS=x11
-
-echo JOGL ES1 NEWT CORE
-report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles1.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es1.so.gz libnewt.so.gz
-echo
-
-echo JOGL ES2 NEWT CORE
-report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz
-echo
-
-echo JOGL ES2 NEWT CORE FIXED
-report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX jogl.util.fixedfuncemu.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz
-echo
-
-echo JOGL GL2ES12 NEWT 
-report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2es12.$OSS.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz
-echo
-
-echo JOGL GL2 NEWT 
-report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2.$OSS.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz
-echo
-
-echo JOGL GL2 AWT
-report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX nativewindow.awt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2.$OSS.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz
-echo
-
-echo JOGL ALL
-report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.$JAR_SUFFIX newt.all.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
-echo
-
-echo JOGL CDCFP DESKTOP
-report gluegen-rt-cdc.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
-echo
-
-echo JOGL CDCFP ES1 MOBILE
-report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles1.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.core.cdc.$JAR_SUFFIX newt.broadcomegl.cdc.$JAR_SUFFIX newt.core.cdc.$JAR_SUFFIX newt.ogl.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
-echo
-
-echo JOGL CDCFP ES2 MOBILE
-report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles2.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.core.cdc.$JAR_SUFFIX newt.broadcomegl.cdc.$JAR_SUFFIX newt.core.cdc.$JAR_SUFFIX newt.ogl.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
-echo
-
-echo JOGL GLU
-report jogl.glu.*pack.gz
-echo
-
-echo JOGL EVERYTHING
-report *.all.pack.gz
-echo
diff --git a/make/make.jogl.all.linux-x86_64.sh b/make/make.jogl.all.linux-x86_64.sh
index b5f860bd4..b6c5e9d63 100644
--- a/make/make.jogl.all.linux-x86_64.sh
+++ b/make/make.jogl.all.linux-x86_64.sh
@@ -5,8 +5,8 @@ if [ -e ../../setenv-build-jogl-x86_64.sh ] ; then
 fi
 
 # -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64
-#    -Dc.compiler.debug=true 
-#    -Dbuild.noarchives=true
+#    -Dc.compiler.debug=true \
+#    -Dbuild.noarchives=true \
 
 #    -Dgluegen.cpptasks.detected.os=true \
 #    -DisUnix=true \
@@ -18,7 +18,6 @@ fi
 ant  \
     -Dbuild.noarchives=true \
     -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64 \
-    -Dc.compiler.debug=true \
     -Drootrel.build=build-x86_64 \
     -DuseKD=true \
     -DuseOpenMAX=true \
diff --git a/make/make.jogl.all.win32.bat b/make/make.jogl.all.win32.bat
index 8525b5a45..da45cbd7b 100644
--- a/make/make.jogl.all.win32.bat
+++ b/make/make.jogl.all.win32.bat
@@ -1,7 +1,11 @@
-set THISDIR="C:\SUN\JOGL2"
-set J2RE_HOME=c:\jre6
-set JAVA_HOME=c:\jdk6
-set PATH=%JAVA_HOME%\bin;%PATH%
+set THISDIR="C:\JOGL"
+
+set J2RE_HOME=c:\jre1.6.0_19
+set JAVA_HOME=c:\jdk1.6.0_19
+set ANT_PATH=C:\apache-ant-1.7.1
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
+
 set LIB_GEN=%THISDIR%\lib
 set CLASSPATH=.;%THISDIR%\build-win32\classes
 REM    -Dc.compiler.debug=true 
@@ -9,4 +13,4 @@ REM    -DuseOpenMAX=true
 REM    -DuseKD=true
 REM    -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
 
-ant -Dbuild.noarchives=true -Dc.compiler.debug=true -Drootrel.build=build-win32 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\lib %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
+ant -Dbuild.noarchives=true -Drootrel.build=build-win32 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\lib %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
index 0e5885349..b6024f240 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
@@ -61,7 +61,7 @@ public class NativeLibLoader extends NativeLibLoaderBase {
   public static void loadGLDesktop() {
     AccessController.doPrivileged(new PrivilegedAction() {
       public Object run() {
-        loadLibrary("jogl_gl2", nativeOSPreload, true);
+        loadLibrary("jogl_desktop", nativeOSPreload, true);
         return null;
       }
     });
diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
index bf80ec7b3..56d669756 100755
--- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
+++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
@@ -118,4 +118,8 @@ public class Texture1 {
         frame.dispose();
         frame=null;
     }
+
+    public static void main(String args[]) {
+        org.junit.runner.JUnitCore.main(Texture1.class.getName());
+    }
 }
diff --git a/src/newt/native/MacWindow.m b/src/newt/native/MacWindow.m
index 01563a0d1..8c9792b19 100644
--- a/src/newt/native/MacWindow.m
+++ b/src/newt/native/MacWindow.m
@@ -33,7 +33,7 @@
 
 #import <inttypes.h>
 
-#import "com_sun_newt_macosx_MacWindow.h"
+#import "com_jogamp_newt_macosx_MacWindow.h"
 #import "NewtMacWindow.h"
 
 #import "EventListener.h"
diff --git a/src/newt/native/NewtMacWindow.h b/src/newt/native/NewtMacWindow.h
index e19be2ed8..560cfe408 100644
--- a/src/newt/native/NewtMacWindow.h
+++ b/src/newt/native/NewtMacWindow.h
@@ -55,7 +55,7 @@
 
 @end
 
-@interface NewtMacWindow : NSWindow
+@interface NewtMacWindow : NSWindow <NSWindowDelegate>
 {
 }
 
-- 
cgit v1.2.3


From 16c5ff859e1714be198432aaf4f5bd225e7f6d04 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 9 Apr 2010 02:21:59 +0200
Subject: Cleanup ant files, intro: build-common.xml used for all targets;
 Extracting build-junit.xml

---
 make/build-common.xml                              | 333 +++++++++++
 make/build-jogl.xml                                | 614 ++++++---------------
 make/build-junit.xml                               | 108 ++++
 make/build-nativewindow.xml                        | 248 ++-------
 make/build-newt.xml                                | 211 ++-----
 make/build.xml                                     | 119 ++--
 make/versions.xml                                  |   3 -
 .../opengl/test/junit/texture/awt/Texture1.java    | 125 -----
 .../texture/util/gl2/TextureGL2ListenerDraw1.java  | 109 ----
 .../test/junit/jogl/awt/texture/Texture1.java      | 125 +++++
 .../util/texture/gl2/TextureGL2ListenerDraw1.java  | 109 ++++
 11 files changed, 978 insertions(+), 1126 deletions(-)
 create mode 100644 make/build-common.xml
 create mode 100644 make/build-junit.xml
 delete mode 100755 src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
 delete mode 100755 src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/awt/texture/Texture1.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/util/texture/gl2/TextureGL2ListenerDraw1.java

diff --git a/make/build-common.xml b/make/build-common.xml
new file mode 100644
index 000000000..bee69a5a9
--- /dev/null
+++ b/make/build-common.xml
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="JOGLCommonStuff" basedir="." default="common.init">
+
+    <description>Common JOGL Stuff</description>
+
+    <!-- Pull in GlueGen cpptasks build file -->
+    <property name="gluegen.root" value="../../gluegen" />
+    <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
+
+    <condition property="rootrel.build" value="build">
+      <not>
+          <isset property="rootrel.build"/>
+      </not>
+    </condition>
+
+    <import file="versions.xml" />
+
+    <tstamp>
+         <format property="version.timestamp" pattern="yyyyMMdd"/>
+    </tstamp>
+
+    <target name="nativewindow.setup-version-RI" if="nativewindow.ri">
+        <property name="nativewindow.version" value="${nativewindow_base_version}" />
+    </target>
+
+    <target name="nativewindow.setup-version-non-RI" unless="nativewindow.ri">
+        <property name="nativewindow.version" value="${nativewindow_base_version}-pre-${version.timestamp}" />
+    </target>
+    <target name="jogl.setup-version-RI" if="jogl.ri">
+        <property name="jogl.version" value="${jogl_base_version}" />
+    </target>
+
+    <target name="jogl.setup-version-non-RI" unless="jogl.ri">
+        <property name="jogl.version" value="${jogl_base_version}-pre-${timestamp}" />
+    </target>
+
+    <target name="newt.setup-version-RI" if="newt.ri">
+        <property name="newt.version" value="${newt_base_version}" />
+    </target>
+
+    <target name="newt.setup-version-non-RI" unless="newt.ri">
+        <property name="newt.version" value="${newt_base_version}-pre-${version.timestamp}" />
+    </target>
+
+    <target name="setup-versions" depends="nativewindow.setup-version-RI, nativewindow.setup-version-non-RI, jogl.setup-version-RI, jogl.setup-version-non-RI, newt.setup-version-RI, newt.setup-version-non-RI"/>
+
+    <!-- ================================================================== -->
+    <!-- 
+       - Base initialization of properties and detection of operating system.
+      -->
+    <target name="common.init" depends="gluegen.cpptasks.detect.os,setup-versions" unless="common.init.done">
+        <property name="common.init.done" value="true" />
+
+        <!-- Set the project root directory to be up one directory. -->
+        <property name="project.root"               value=".." />
+        <property name="build"                      value="${project.root}/${rootrel.build}" />
+        <property name="src"                        value="${project.root}/src" />
+        <property name="lib"                        value="${build}/lib" />
+
+        <property name="archive.name"               value="jogl-${tmp.version}-${os.and.arch}" />
+        <property name="archive"                    value="${build}/${archive.name}" />
+
+        <property name="all.srcj.path" value="${src}/nativewindow/classes;${src}/jogl/classes;${src}/newt/classes" />
+        <!-- No generated classes for Newt at the present time -->
+        <property name="all.genj.path" value="${build}/nativewindow/gensrc/classes;${build}/jogl/gensrc/classes" />
+
+        <!-- Set the configuration and build files to this directory. -->
+        <property name="make"                       value="." />
+        <property name="config"                     value="${make}/config" />
+        <property name="stub.includes"              value="stub_includes" /> <!-- NOTE:  this MUST be relative for FileSet -->
+        <property name="stub.includes.common"       value="${stub.includes}/common" />
+
+        <condition property="setup.nodesktop">
+            <and>
+                <isfalse value="${isWindows}" />
+                <isfalse value="${isOSX}" />
+                <isfalse value="${isX11}" />
+            </and>
+        </condition>
+
+        <echo message="setup.nodesktop: ${setup.nodesktop}" />
+        <echo message="setup.noAWT: ${setup.noAWT}" />
+        <echo message="setup.noCDC: ${setup.noCDC}" />
+
+        <!-- Load the user specified properties file that defines various host
+           - specific paths.  The user will be notified if this is does not
+           - exist. -->
+        <property name="user.properties.file" value="${user.home}/jogl.properties" />
+        <property file="${user.properties.file}" />
+        <echo message="Loaded ${user.properties.file}." />
+        <property file="${user.home}/gluegen.properties" />
+        <echo message="Loaded ${user.home}/gluegen.properties." />
+        <fail message="antlr.jar was not specified in jogl.properties or gluegen.properties. Please see README.txt for instructions" unless="antlr.jar"/>
+        <echo message="antlr.jar=${antlr.jar}" />
+
+        <property name="target.sourcelevel" value="1.4" />
+        <property name="host.sourcelevel"   value="1.5" />
+
+        <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
+        <property name="javacdebug"       value="true" /> 
+        <property name="javacdebuglevel"  value="source,lines" /> 
+        <!-- property name="javac.memorymax"  value="128m" /-->  <!-- I ran out of memory with these .. linux x86_64 6u14 -->
+        <property name="javac.memorymax"  value="512m" /> 
+
+        <!-- Names of directories relative to the project root.
+             Some of these are used in FileMappers later for dependence information
+             and need exact string matching, which is why they use file.separator
+             instead of "/". -->
+
+        <property name="javac.bootclasspath-cdc.jar" value="${gluegen.root}/make/lib/cdc_fp.jar"/>
+        <echo message="javac.bootclasspath-cdc.jar: ${javac.bootclasspath-cdc.jar}" />
+
+        <!-- NOTE that these require a checked-out GlueGen, etc workspace as a -->
+        <!-- sibling of the JOGL workspace. -->
+        <property name="gluegen.make"               value="${gluegen.root}/make" />
+        <property name="gluegen.build.xml"          value="${gluegen.make}/build.xml" />
+        <property name="build.gluegen"              value="${gluegen.root}/${rootrel.build}" />
+        <property name="obj.gluegen"                value="${build.gluegen}/obj"/>
+        <property name="gluegen.jar"                value="${build.gluegen}/gluegen.jar" />
+        <property name="junit.jar"                  value="${gluegen.make}/lib/junit-4.5.jar" />
+
+        <property name="nativewindow.make"          value="." />
+        <property name="nativewindow.build.xml"     value="${nativewindow.make}/build-nativewindow.xml" />
+        <property name="build.nativewindow"         value="${build}/nativewindow" />
+        <property name="obj.nativewindow"           value="${build.nativewindow}/obj"/>
+
+        <property name="jogl.make"                  value="." />
+        <property name="jogl.build.xml"             value="${jogl.make}/build-jogl.xml" />
+        <property name="build.jogl"                 value="${build}/jogl" />
+        <property name="obj.jogl"                   value="${build.jogl}/obj"/>
+
+        <property name="newt.make"                  value="." />
+        <property name="newt.build.xml"             value="${newt.make}/build-newt.xml" />
+        <property name="build.newt"                 value="${build}/newt" />
+        <property name="obj.newt"                   value="${build.newt}/obj"/>
+
+        <property name="junit.make"                 value="." />
+        <property name="junit.build.xml"            value="${junit.make}/build-junit.xml" />
+        <property name="results.junit"              value="${build}/test/results" />
+        <property name="build.junit"                value="${build}/test/build" />
+        <property name="obj.junit"                  value="${build.junit}/obj"/>
+
+        <property name="obj.all.paths"              value="${obj.gluegen}${path.separator}${obj.nativewindow}${path.separator}${obj.jogl}${path.separator}${obj.newt}${path.separator}${obj.junit}" />
+
+        <path id="gluegen.classpath">
+          <pathelement location="${gluegen.jar}" />
+          <pathelement location="${antlr.jar}" />
+        </path>
+
+        <!-- JavaSE combinations -->
+        <property name="gluegen-rt.jar"             value="${build.gluegen}/gluegen-rt.jar" />
+        <property name="jogl.test.jar"              value="${build.jogl}/jogl.test.jar"/>
+
+        <!-- JavaSE combinations . AWT -->
+        <property name="nativewindow.all.jar"       value="${build.nativewindow}/nativewindow.all.jar" />
+        <property name="jogl.all.jar"               value="${build.jogl}/jogl.all.jar" />
+        <property name="newt.all.jar"               value="${build.newt}/newt.all.jar" />
+
+        <path id="nativewindow_gluegen.classpath">
+            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${nativewindow.all.jar}" />
+        </path>
+
+        <path id="nativewindow_gluegen_jogl.classpath">
+            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${nativewindow.all.jar}" />
+            <pathelement location="${jogl.all.jar}" />
+        </path>
+
+        <path id="jogl_newt_all.classpath">
+            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${nativewindow.all.jar}" />
+            <pathelement location="${jogl.all.jar}" />
+            <pathelement location="${newt.all.jar}" />
+        </path>
+
+        <path id="junit_jogl_newt.compile.classpath">
+            <pathelement location="${junit.jar}" />
+            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${nativewindow.all.jar}" />
+            <pathelement location="${jogl.all.jar}" />
+            <pathelement location="${newt.all.jar}" />
+        </path>
+
+        <path id="junit_jogl_newt.run.classpath">
+            <pathelement location="${junit.jar}" />
+            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${nativewindow.all.jar}" />
+            <pathelement location="${jogl.all.jar}" />
+            <pathelement location="${newt.all.jar}" />
+            <pathelement location="${jogl.test.jar}" />
+        </path>
+
+        <!-- JavaSE combinations . NO.AWT -->
+        <property name="nativewindow.all-noawt.jar" value="${build.nativewindow}/nativewindow.all-noawt.jar" />
+        <property name="jogl.all-noawt.jar"         value="${build.jogl}/jogl.all-noawt.jar" />
+        <property name="newt.all-noawt.jar"         value="${build.newt}/newt.all-noawt.jar" />
+
+        <path id="jogl_newt_all-noawt.classpath">
+            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${nativewindow.all-noawt.jar}" />
+            <pathelement location="${jogl.all-noawt.jar}" />
+            <pathelement location="${newt.all-noawt.jar}" />
+        </path>
+
+        <!-- CDC combinations . NO.AWT -->
+        <property name="gluegen-rt-cdc.jar"         value="${build.gluegen}/gluegen-rt-cdc.jar" />
+
+        <property name="nativewindow.all.cdc.jar"   value="${build.nativewindow}/nativewindow.all.cdc.jar" />
+        <property name="jogl.all.cdc.jar"           value="${build.jogl}/jogl.all.cdc.jar" />
+        <property name="newt.all.cdc.jar"           value="${build.newt}/newt.all.cdc.jar" />
+
+        <path id="nativewindow_gluegen.classpath-cdc">
+            <pathelement location="${gluegen-rt-cdc.jar}" />
+            <pathelement location="${nativewindow.all.cdc.jar}" />
+        </path>
+
+        <path id="nativewindow_gluegen_jogl.classpath-cdc">
+            <pathelement location="${gluegen-rt-cdc.jar}" />
+            <pathelement location="${nativewindow.all.cdc.jar}" />
+            <pathelement location="${jogl.all.cdc.jar}" />
+        </path>
+
+        <path id="jogl_newt_all.classpath-cdc">
+            <pathelement location="${gluegen-rt-cdc.jar}" />
+            <pathelement location="${nativewindow.all.cdc.jar}" />
+            <pathelement location="${jogl.all.cdc.jar}" />
+            <pathelement location="${newt.all.cdc.jar}" />
+        </path>
+
+        <!-- Atomic JavaSE JARS -->
+
+        <property name="nativewindow.core.jar"         value="${build.nativewindow}/nativewindow.core.jar" />
+        <property name="nativewindow.awt.jar"          value="${build.nativewindow}/nativewindow.awt.jar"  />
+        <property name="nativewindow.os.x11.jar"       value="${build.nativewindow}/nativewindow.os.x11.jar"  />
+        
+        <property name="jogl.core.jar"                  value="${build.jogl}/jogl.core.jar" />
+        <property name="jogl.cg.jar"                    value="${build.jogl}/jogl.cg.jar" />
+        <property name="jogl.gles1.jar"                 value="${build.jogl}/jogl.gles1.jar" />
+        <property name="jogl.gles1.dbg.jar"             value="${build.jogl}/jogl.gles1.dbg.jar" />
+        <property name="jogl.gles2.jar"                 value="${build.jogl}/jogl.gles2.jar" />
+        <property name="jogl.gles2.dbg.jar"             value="${build.jogl}/jogl.gles2.dbg.jar" />
+        <property name="jogl.egl.jar"                   value="${build.jogl}/jogl.egl.jar" />
+        <property name="jogl.glutess.jar"               value="${build.jogl}/jogl.glu.tess.jar" />
+        <property name="jogl.glumipmap.jar"             value="${build.jogl}/jogl.glu.mipmap.jar" />
+        <property name="jogl.glugl2.jar"                value="${build.jogl}/jogl.glu.gl2.jar" />
+
+        <property name="jogl.os.x11.jar"                value="${build.jogl}/jogl.os.x11.jar" />
+        <property name="jogl.os.win.jar"                value="${build.jogl}/jogl.os.win.jar" />
+        <property name="jogl.os.osx.jar"                value="${build.jogl}/jogl.os.osx.jar" />
+
+        <property name="jogl.gl2es12.jar"               value="${build.jogl}/jogl.gl2es12.jar" />
+
+        <property name="jogl.gl2.jar"                   value="${build.jogl}/jogl.gl2.jar" />
+        <property name="jogl.gl2.dbg.jar"               value="${build.jogl}/jogl.gl2.dbg.jar" />
+
+        <property name="jogl.gl3.jar"                   value="${build.jogl}/jogl.gl3.jar" />
+        <property name="jogl.gl3.dbg.jar"               value="${build.jogl}/jogl.gl3.dbg.jar" />
+
+        <property name="jogl.gl4.jar"                   value="${build.jogl}/jogl.gl4.jar" />
+        <property name="jogl.gl4.dbg.jar"               value="${build.jogl}/jogl.gl4.dbg.jar" />
+
+        <property name="jogl.omx.jar"                   value="${build.jogl}/jogl.omx.jar" />
+
+        <property name="jogl.awt.jar"                   value="${build.jogl}/jogl.awt.jar" />
+        <property name="jogl.util.jar"                  value="${build.jogl}/jogl.util.jar" />
+        <property name="jogl.util.gl2.jar"              value="${build.jogl}/jogl.util.gl2.jar" />
+        <property name="jogl.util.awt.jar"              value="${build.jogl}/jogl.util.awt.jar" />
+        <property name="jogl.util.fixedfuncemu.jar"     value="${build.jogl}/jogl.util.fixedfuncemu.jar" />
+        <property name="jogl.sdk.jar"                   value="${build.jogl}/jogl.sdk.jar" />
+
+        <property name="newt.core.jar"                  value="${build.newt}/newt.core.jar" />
+        <property name="newt.os.x11.jar"                value="${build.newt}/newt.os.x11.jar" />
+        <property name="newt.os.win.jar"                value="${build.newt}/newt.os.win.jar" />
+        <property name="newt.os.osx.jar"                value="${build.newt}/newt.os.osx.jar" />
+        <property name="newt.ogl.jar"                   value="${build.newt}/newt.ogl.jar" />
+        <property name="newt.broadcomegl.jar"           value="${build.newt}/newt.broadcomegl.jar" />
+        <property name="newt.awt.jar"                   value="${build.newt}/newt.awt.jar" />
+
+        <!-- Atomic CDC JARS -->
+        <property name="nativewindow.core.cdc.jar"      value="${build.nativewindow}/nativewindow.core.cdc.jar" />
+        <property name="nativewindow.os.x11.cdc.jar"    value="${build.nativewindow}/nativewindow.os.x11.cdc.jar"  />
+
+        <property name="jogl.core.cdc.jar"              value="${build.jogl}/jogl.core.cdc.jar" />
+        <property name="jogl.gles1.cdc.jar"             value="${build.jogl}/jogl.gles1.cdc.jar" />
+        <property name="jogl.gles1.dbg.cdc.jar"         value="${build.jogl}/jogl.gles1.dbg.cdc.jar" />
+        <property name="jogl.gles2.cdc.jar"             value="${build.jogl}/jogl.gles2.cdc.jar" />
+        <property name="jogl.gles2.dbg.cdc.jar"         value="${build.jogl}/jogl.gles2.dbg.cdc.jar" />
+        <property name="jogl.egl.cdc.jar"               value="${build.jogl}/jogl.egl.cdc.jar" />
+        <property name="jogl.glutess.cdc.jar"           value="${build.jogl}/jogl.glu.tess.cdc.jar" />
+        <property name="jogl.glumipmap.cdc.jar"         value="${build.jogl}/jogl.glu.mipmap.cdc.jar" />
+        <property name="jogl.os.x11.cdc.jar"            value="${build.jogl}/jogl.os.x11.cdc.jar" />
+        <property name="jogl.os.win.cdc.jar"            value="${build.jogl}/jogl.os.win.cdc.jar" />
+        <property name="jogl.os.osx.cdc.jar"            value="${build.jogl}/jogl.os.osx.cdc.jar" />
+        <property name="jogl.gl2es12.cdc.jar"           value="${build.jogl}/jogl.gl2es12.cdc.jar" />
+        <property name="jogl.util.cdc.jar"              value="${build.jogl}/jogl.util.cdc.jar" />
+        <property name="jogl.util.fixedfuncemu.cdc.jar" value="${build.jogl}/jogl.util.fixedfuncemu.cdc.jar" />
+
+        <property name="newt.core.cdc.jar"              value="${build.newt}/newt.core.cdc.jar" />
+        <property name="newt.os.x11.cdc.jar"            value="${build.newt}/newt.os.x11.cdc.jar" />
+        <property name="newt.os.win.cdc.jar"            value="${build.newt}/newt.os.win.cdc.jar" />
+        <property name="newt.os.osx.cdc.jar"            value="${build.newt}/newt.os.osx.cdc.jar" />
+        <property name="newt.ogl.cdc.jar"               value="${build.newt}/newt.ogl.cdc.jar" />
+        <property name="newt.broadcomegl.cdc.jar"       value="${build.newt}/newt.broadcomegl.cdc.jar" />
+
+        <!-- The location and name of the configuration ANT file that will 
+           - validate to ensure that all user-define variables are set. -->
+        <property name="validate.user.properties" value="${make}/validate-properties.xml" />
+    </target>
+
+    <!-- ================================================================== -->
+    <!-- GlueGen and BuildStaticGLInfo creation, task setup and Java file generation -->
+    <!--
+       - Build GlueGen
+      -->
+    <target name="common.gluegen.build" depends="common.init" unless="common.gluegen.build.done">
+        <property name="common.gluegen.build.done" value="true" />
+
+        <!-- Run the GlueGen build to ensure that the GlueGen ANT task
+           - has been built. -->
+        <!-- FIXME: remove passing down of antlr.jar when gluegen.properties is on all
+             nightly build machines -->
+        <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="all" inheritAll="false">
+          <propertyset>
+            <propertyref name="antlr.jar" />
+            <!--propertyref name="gluegen.nsig" /-->
+          </propertyset>
+        </ant>
+    </target>
+
+
+</project>
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index e8d37dd05..5381c2051 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -63,32 +63,13 @@
    -->
 <project name="JOGL" basedir="." default="all">
 
-  <import file="versions.xml" />
-
-  <!-- Pull in GlueGen cpptasks build file -->
-  <property name="gluegen.root" value="../../gluegen" />
-  <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
+    <import file="build-common.xml"/>
 
     <!-- ================================================================== -->
     <!-- 
        - Base initialization and detection of operating system.
       -->
-    <target name="base.init" depends="gluegen.cpptasks.detect.os">
-
-        <condition property="setup.nodesktop">
-            <and>
-                <isfalse value="${isWindows}" />
-                <isfalse value="${isOSX}" />
-                <isfalse value="${isX11}" />
-            </and>
-        </condition>
-
-        <echo message="setup.nodesktop: ${setup.nodesktop}" />
-        <echo message="setup.noAWT: ${setup.noAWT}" />
-        <echo message="setup.noCDC: ${setup.noCDC}" />
-
-        <!-- partitioning -->
-
+    <target name="partitioning.setup" depends="common.init">
         <property name="java.part.core" 
                   value="javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/jogamp/opengl/impl/* com/jogamp/opengl/impl/glu/* com/jogamp/opengl/impl/glu/error/*"/>
         <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace*"/>
@@ -207,109 +188,30 @@
 
         <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.nv-cg} ${java.excludes.awt} ${java.excludes.desktop}" />
         <echo message="java.excludes.all: ${java.excludes.all}" />
-
-        <!-- Set the project root directory to be up one directory. -->
-        <property name="project.root" value=".." />
-    
-        <!-- Set the configuration and build files to this directory. -->
-        <property name="make" value="." />
-    </target>
-
-    <target name="base.init.sourcelevel.1">
-        <property name="jogl.sourcelevel" value="1.4" />
-        <property name="junit.sourcelevel" value="1.5" />
-    </target>
-
-    <!--target name="base.init.sourcelevel.2" if="gluegen.nsig">
-        <property name="jogl.sourcelevel" value="1.5" />
-    </target-->
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Load user properties which override build defaults.
-      -->
-    <target name="load.user.properties" depends="base.init,base.init.sourcelevel.1" unless="user.properties.file">
-        <!-- Load the user specified properties file that defines various host
-           - specific paths.  The user will be notified if this is does not
-           - exist. -->
-        <property name="user.properties.file" value="${user.home}/jogl.properties" />
-        <property file="${user.properties.file}" />
-        <echo message="Loaded ${user.properties.file}." />
-        <property file="${user.home}/gluegen.properties" />
-        <echo message="Loaded ${user.home}/gluegen.properties." />
-        <fail message="antlr.jar was not specified in jogl.properties or gluegen.properties. Please see README.txt for instructions" unless="antlr.jar"/>
-        <echo message="antlr.jar=${antlr.jar}" />
     </target>
 
     <!-- ================================================================== -->
     <!-- 
        - Declare all paths and user defined variables.
       -->
-    <target name="declare.common" description="Declare properties" depends="load.user.properties">
-        <!-- The location and name of the configuration ANT file that will 
-           - validate to ensure that all user-define variables are set. -->
-        <property name="validate.user.properties" value="${make}/validate-properties.xml" />
-           
-        <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
-        <property name="javacdebug"       value="true" /> 
-        <property name="javacdebuglevel"  value="source,lines" /> 
-        <!-- property name="javac.memorymax"  value="128m" /-->  <!-- I ran out of memory with these .. linux x86_64 6u14 -->
-        <property name="javac.memorymax"  value="512m" /> 
-
-        <!-- Names of directories relative to the project root.
-             Some of these are used in FileMappers later for dependence information
-             and need exact string matching, which is why they use file.separator
-             instead of "/". -->
-        <condition property="rootrel.build" value="build">
-          <not>
-              <isset property="rootrel.build"/>
-          </not>
-        </condition>
-        <property name="rootrel.build.jogl" value="${rootrel.build}/jogl" />
-        <property name="rootrel.src.java" value="src/jogl/classes" />
-        <property name="rootrel.src.junit" value="src/jogl/junit" />
-        <property name="rootrel.src.c" value="src/jogl/native" />
-        <property name="rootrel.src.c.openmax" value="src/jogl/native/openmax" />
+    <target name="declare.common" description="Declare properties" depends="partitioning.setup">
+        <property name="config.jogl"              value="${config}/jogl" />
 
-        <property name="rootrel.src.generated" value="${rootrel.build.jogl}/gensrc" />
+        <property name="rootrel.src.java"         value="src/jogl/classes" />
+        <property name="rootrel.src.c"            value="src/jogl/native" />
+        <property name="rootrel.src.c.openmax"    value="src/jogl/native/openmax" />
+
+        <property name="rootrel.src.generated"    value="${rootrel.build}/jogl/gensrc" />
         <property name="rootrel.generated.c.jogl" value="${rootrel.src.generated}/native/jogl" />
-        <property name="rootrel.generated.c.cg" value="${rootrel.src.generated}/native/jogl_cg" />
-        <property name="rootrel.obj" value="${rootrel.build.jogl}/obj" />
-        <property name="rootrel.obj.jogl" value="${rootrel.obj}/jogl" />
-        <property name="rootrel.obj.cg" value="${rootrel.obj}/jogl_cg" />
-
-        <property name="javac.bootclasspath-cdc.jar" value="${gluegen.root}/make/lib/cdc_fp.jar"/>
-
-        <!-- GlueGen properties. -->
-        <!-- NOTE that these require a checked-out GlueGen workspace as a -->
-        <!-- sibling of the JOGL workspace. -->
-        <property name="gluegen.make.dir" value="${gluegen.root}/make" />
-        <property name="gluegen.build.xml" value="${gluegen.make.dir}/build.xml" />
-        <property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" />
-        <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
-        <property name="gluegen.so.dir" value="${gluegen.root}/${rootrel.build}/obj" />
-        <property name="junit.jar" value="${gluegen.make.dir}/lib/junit-4.5.jar" />
-        <property name="nativewindow.all.jar" value="../${rootrel.build}/nativewindow/nativewindow.all.jar" />
-        <property name="nativewindow.core.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.jar" />
-        <property name="nativewindow.os.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.os.x11.jar" />
-        <property name="nativewindow.awt.jar" value="../${rootrel.build}/nativewindow/nativewindow.awt.jar" />
-        <property name="nativewindow.so.dir" value="../${rootrel.build}/nativewindow/obj" />
-
-        <property name="gluegen-rt-cdc.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt-cdc.jar" />
-        <property name="nativewindow.core.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.cdc.jar" />
-        <property name="nativewindow.os.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.os.x11.cdc.jar" />
-                                                
-        <property name="newt.so.dir" value="../${rootrel.build}/newt/obj" />
+        <property name="rootrel.generated.c.cg"   value="${rootrel.src.generated}/native/jogl_cg" />
 
         <!-- The source directories. -->
         <property name="src.java" value="${project.root}/${rootrel.src.java}" />
-        <property name="src.junit" value="${project.root}/${rootrel.src.junit}" />
         <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
-        <property name="build"    value="${project.root}/${rootrel.build.jogl}" />
         <property name="tempdir"  value="${project.root}/build-temp" />
         
         <!-- The generated source directories. -->
-        <property name="src.generated" value="${build}/gensrc" />
+        <property name="src.generated" value="${build.jogl}/gensrc" />
         <property name="src.generated.java" value="${src.generated}/classes" />
         <property name="src.generated.java-cdc" value="${src.generated}/classes-cdc" />
         <property name="src.generated.java.cg" value="${src.generated.java}/com/jogamp/opengl/cg" />
@@ -318,29 +220,23 @@
         <property name="src.generated.c.cg" value="${src.generated}/native/jogl_cg" />
         
         <!-- The compiler output directories. -->
-        <property name="classes" value="${build}/classes" />
-        <property name="classes-cdc" value="${build}/classes-cdc" />
-        <property name="obj"      value="${project.root}/${rootrel.obj}" />
-        <property name="obj.jogl" value="${project.root}/${rootrel.obj.jogl}" />
-        <property name="obj.cg"   value="${project.root}/${rootrel.obj.cg}" />
-
-        <property name="all.so.dir" value="${gluegen.so.dir}${path.separator}${nativewindow.so.dir}${path.separator}${obj}${path.separator}${newt.so.dir}" />
+        <property name="classes"                    value="${build.jogl}/classes" />
+        <property name="classes-cdc"                value="${build.jogl}/classes-cdc" />
+        <property name="obj.joglsub"                value="${obj.jogl}/jogl" />
+        <property name="obj.cgsub"                  value="${obj.jogl}/cg" />
 
         <!-- The GL headers from which Java files are generated -->
-        <property name="config" value="${make}/config/jogl" />
-        <property name="stub.includes" value="${make}/stub_includes" />
-        <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE:  this MUST be relative for FileSet -->
-        <property name="stub.includes.opengl" value="${stub.includes}/opengl" />
-        <property name="stub.includes.common" value="${stub.includes}/common" />
+        <property name="stub.includes.opengl"       value="${stub.includes}/opengl" />
+
         <dirset id="stub.includes.fileset.all.gl2" dir=".">
-            <include name="${stub.includes.dir}/opengl/**" />
-            <include name="${stub.includes.dir}/macosx/**" />
-            <include name="${stub.includes.dir}/win32/**" />
-            <include name="${stub.includes.dir}/x11/**" />
-            <include name="${stub.includes.dir}/common/**" />
-            <include name="${stub.includes.dir}/jni/**" />
+            <include name="${stub.includes}/opengl/**" />
+            <include name="${stub.includes}/macosx/**" />
+            <include name="${stub.includes}/win32/**" />
+            <include name="${stub.includes}/x11/**" />
+            <include name="${stub.includes}/common/**" />
+            <include name="${stub.includes}/jni/**" />
         </dirset>
-        <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes.dir}">
+        <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes}">
             <include name="opengl/**" />
             <include name="macosx/**" />
             <include name="win32/**" />
@@ -349,47 +245,26 @@
             <include name="jni/**" />
         </fileset>
         <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" />
-        <fileset id="stub.includes.dependencies.fileset.3" dir="${config}">
+        <fileset id="stub.includes.dependencies.fileset.3" dir="${config.jogl}">
             <include name="*.cfg" />
             <include name="gl*.java" />
             <include name="*.c" />
             <exclude name="cg-common.cfg" />
         </fileset>
         <dirset id="stub.includes.cg.fileset.all" dir=".">
-            <include name="${stub.includes.dir}/opengl/**" />
-            <include name="${stub.includes.dir}/cg/**" />
-            <include name="${stub.includes.dir}/macosx/**" />
-            <include name="${stub.includes.dir}/win32/**" />
-            <include name="${stub.includes.dir}/x11/**" />
-            <include name="${stub.includes.dir}/common/**" />
+            <include name="${stub.includes}/opengl/**" />
+            <include name="${stub.includes}/cg/**" />
+            <include name="${stub.includes}/macosx/**" />
+            <include name="${stub.includes}/win32/**" />
+            <include name="${stub.includes}/x11/**" />
+            <include name="${stub.includes}/common/**" />
         </dirset>
         <fileset id="stub.includes.cg.dependencies.fileset" dir=".">
-            <include name="${stub.includes.dir}/cg/**" />
-            <include name="${config}/cg-common.cfg" />
-            <include name="${config}/cg-common-CustomJavaCode.java" />
+            <include name="${stub.includes}/cg/**" />
+            <include name="${config.jogl}/cg-common.cfg" />
+            <include name="${config.jogl}/cg-common-CustomJavaCode.java" />
         </fileset>
 
-        <!-- Create the classpath that includes GlueGen and
-           - ANTLR. This requires the user-defined "antlr.jar"
-           - property. -->
-        <path id="gluegen.classpath">
-          <pathelement location="${gluegen.jar}" />
-          <pathelement location="${antlr.jar}" />
-        </path>
-
-        <path id="nativewindow_gluegen.classpath">
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${nativewindow.core.jar}" />
-            <pathelement location="${nativewindow.os.x11.jar}" />
-            <pathelement location="${nativewindow.awt.jar}" />
-        </path>
-
-        <path id="nativewindow_gluegen.classpath-cdc">
-            <pathelement location="${gluegen-rt-cdc.jar}" />
-            <pathelement location="${nativewindow.core.cdc.jar}" />
-            <pathelement location="${nativewindow.os.x11.cdc.jar}" />
-        </path>
-
         <!-- Create the classpath that includes GlueGen and
            - the current classes for building the composable pipelines.
            -->
@@ -398,79 +273,6 @@
           <pathelement location="${classes}" />
         </path>
 
-        <!-- The resulting Java SE jogl.jar. -->
-        <property name="jogl.core.jar" value="${build}/jogl.core.jar" />
-        <property name="jogl.cg.jar" value="${build}/jogl.cg.jar" />
-        <property name="jogl.gles1.jar" value="${build}/jogl.gles1.jar" />
-        <property name="jogl.gles1.dbg.jar" value="${build}/jogl.gles1.dbg.jar" />
-        <property name="jogl.gles2.jar" value="${build}/jogl.gles2.jar" />
-        <property name="jogl.gles2.dbg.jar" value="${build}/jogl.gles2.dbg.jar" />
-        <property name="jogl.egl.jar" value="${build}/jogl.egl.jar" />
-        <property name="jogl.glutess.jar" value="${build}/jogl.glu.tess.jar" />
-        <property name="jogl.glumipmap.jar" value="${build}/jogl.glu.mipmap.jar" />
-        <property name="jogl.glugl2.jar"    value="${build}/jogl.glu.gl2.jar" />
-
-        <property name="jogl.os.x11.jar" value="${build}/jogl.os.x11.jar" />
-        <property name="jogl.os.win.jar" value="${build}/jogl.os.win.jar" />
-        <property name="jogl.os.osx.jar" value="${build}/jogl.os.osx.jar" />
-
-        <property name="jogl.gl2es12.jar" value="${build}/jogl.gl2es12.jar" />
-
-        <property name="jogl.gl2.jar"     value="${build}/jogl.gl2.jar" />
-        <property name="jogl.gl2.dbg.jar" value="${build}/jogl.gl2.dbg.jar" />
-
-        <property name="jogl.gl3.jar"     value="${build}/jogl.gl3.jar" />
-        <property name="jogl.gl3.dbg.jar" value="${build}/jogl.gl3.dbg.jar" />
-
-        <property name="jogl.gl4.jar"     value="${build}/jogl.gl4.jar" />
-        <property name="jogl.gl4.dbg.jar" value="${build}/jogl.gl4.dbg.jar" />
-
-        <property name="jogl.omx.jar"     value="${build}/jogl.omx.jar" />
-
-        <property name="jogl.awt.jar" value="${build}/jogl.awt.jar" />
-        <property name="jogl.util.jar" value="${build}/jogl.util.jar" />
-        <property name="jogl.util.gl2.jar" value="${build}/jogl.util.gl2.jar" />
-        <property name="jogl.util.awt.jar" value="${build}/jogl.util.awt.jar" />
-        <property name="jogl.util.fixedfuncemu.jar" value="${build}/jogl.util.fixedfuncemu.jar" />
-        <property name="jogl.sdk.jar" value="${build}/jogl.sdk.jar" />
-        <property name="jogl.test.jar" value="${build}/jogl.test.jar"/>
-
-        <property name="jogl.all.jar" value="${build}/jogl.all.jar"/>
-        <property name="jogl.all-noawt.jar" value="${build}/jogl.all-noawt.jar"/>
-
-        <!-- The resulting CDC jogl.jar. -->
-        <property name="jogl.core.cdc.jar" value="${build}/jogl.core.cdc.jar" />
-        <property name="jogl.gles1.cdc.jar" value="${build}/jogl.gles1.cdc.jar" />
-        <property name="jogl.gles1.dbg.cdc.jar" value="${build}/jogl.gles1.dbg.cdc.jar" />
-        <property name="jogl.gles2.cdc.jar" value="${build}/jogl.gles2.cdc.jar" />
-        <property name="jogl.gles2.dbg.cdc.jar" value="${build}/jogl.gles2.dbg.cdc.jar" />
-        <property name="jogl.egl.cdc.jar" value="${build}/jogl.egl.cdc.jar" />
-        <property name="jogl.glutess.cdc.jar" value="${build}/jogl.glu.tess.cdc.jar" />
-        <property name="jogl.glumipmap.cdc.jar" value="${build}/jogl.glu.mipmap.cdc.jar" />
-        <property name="jogl.os.x11.cdc.jar" value="${build}/jogl.os.x11.cdc.jar" />
-        <property name="jogl.os.win.cdc.jar" value="${build}/jogl.os.win.cdc.jar" />
-        <property name="jogl.os.osx.cdc.jar" value="${build}/jogl.os.osx.cdc.jar" />
-        <property name="jogl.gl2es12.cdc.jar" value="${build}/jogl.gl2es12.cdc.jar" />
-        <property name="jogl.util.cdc.jar" value="${build}/jogl.util.cdc.jar" />
-        <property name="jogl.util.fixedfuncemu.cdc.jar" value="${build}/jogl.util.fixedfuncemu.cdc.jar" />
-
-        <property name="jogl.all.cdc.jar" value="${build}/jogl.all.cdc.jar"/>
-
-        <path id="jogl_junit.compile.classpath">
-            <pathelement location="${junit.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${nativewindow.all.jar}" />
-            <pathelement location="${jogl.all.jar}" />
-        </path>
-
-        <path id="jogl_junit.run.classpath">
-            <pathelement location="${junit.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${nativewindow.all.jar}" />
-            <pathelement location="${jogl.all.jar}" />
-            <pathelement location="${jogl.test.jar}" />
-        </path>
-
         <!-- The javadoc dirs. -->
         <property name="javadoc" value="${project.root}/javadoc_jogl_public" />
         <property name="javadoc.spec" value="${project.root}/javadoc_jogl_spec" />
@@ -487,26 +289,22 @@
     </target>
     
     <target name="declare.gl.gles1">
-        <property name="gles1.headers" value="${stub.includes.dir}/opengl/GLES/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
+        <property name="gles1.headers" value="${stub.includes}/opengl/GLES/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
     </target>
 
     <target name="declare.gl.gles2">
-        <property name="gles2.headers" value="${stub.includes.dir}/opengl/GLES2/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
+        <property name="gles2.headers" value="${stub.includes}/opengl/GLES2/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
     </target>
 
     <target name="declare.gl.gles" depends="declare.gl.gles1, declare.gl.gles2">
         <!-- Prepare to build the EGL interface -->
-        <property name="window.es.cfg"                             value="${config}/egl.cfg" />
-        <property name="window.es.ext.cfg"                         value="${config}/eglext.cfg" />
+        <property name="window.es.cfg"                             value="${config.jogl}/egl.cfg" />
+        <property name="window.es.ext.cfg"                         value="${config.jogl}/eglext.cfg" />
         <property name="window.es.system"                          value="egl"/>
     </target>
 
     <target name="declare.gl.gl2">
-        <property name="gl2.headers" value="${stub.includes.dir}/opengl/GL/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
-    </target>
-
-    <!-- Declarations that have to come after both the common setup and the GLES tests -->
-    <target name="declare.common.2">
+        <property name="gl2.headers" value="${stub.includes}/opengl/GL/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
     </target>
 
     <target name="setup.javacdc">
@@ -530,10 +328,7 @@
        - Initialize all parameters required for the build and create any
        - required directories.
       -->
-    <target name="init" depends="declare.common, declare.gl.gles, declare.gl.gl2, declare.common.2">
-        <!-- Call the external config validator script to make sure the config is ok and consistent -->
-        <ant antfile="${validate.user.properties}" inheritall="true"/>
-        
+    <target name="init" depends="declare.common, declare.gl.gles, declare.gl.gl2">
         <!-- Create the required output directories. -->
         <mkdir dir="${src.generated.java}" />
         <mkdir dir="${src.generated.java-cdc}" />
@@ -544,33 +339,15 @@
         <mkdir dir="${src.generated.c.openmax}" />
         <mkdir dir="${classes}" />
         <mkdir dir="${classes-cdc}" />
-        <mkdir dir="${obj}" />
         <mkdir dir="${obj.jogl}" />
-        <mkdir dir="${obj.cg}" />
+        <mkdir dir="${obj.joglsub}" />
+        <mkdir dir="${obj.cgsub}" />
 
         <!-- Set up Java SE and Java CDC files -->
         <antcall target="setup.javase"  inheritRefs="true" />
         <antcall target="setup.javacdc" inheritRefs="true" />
     </target>
 
-    <!-- ================================================================== -->
-    <!-- GlueGen and BuildStaticGLInfo creation, task setup and Java file generation -->
-    <!--
-       - Build GlueGen
-      -->
-    <target name="build.gluegen" depends="init">
-        <!-- Run the GlueGen build to ensure that the GlueGen ANT task
-           - has been built. -->
-        <!-- FIXME: remove passing down of antlr.jar when gluegen.properties is on all
-             nightly build machines -->
-        <ant antfile="${gluegen.build.xml}" dir="${gluegen.make.dir}" target="all" inheritAll="false">
-          <propertyset>
-            <propertyref name="antlr.jar" />
-            <!--propertyref name="gluegen.nsig" /-->
-          </propertyset>
-        </ant>
-    </target>
-
     <!--
        - Check to see whether we need to rebuild the generated sources.
       -->
@@ -635,7 +412,7 @@
 
     <target name="java.generate.copy2temp">
         <copy todir="${tempdir}">
-            <fileset dir="${build}"
+            <fileset dir="${build.jogl}"
                      includes="gensrc/classes/**" />
         </copy>
     </target>
@@ -644,8 +421,8 @@
         <echo message="Generating GL interface" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/gles2.c"
-                 outputRootDir="${build}"
-                 config="${config}/gl-if-gl.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-if-gl.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -656,8 +433,8 @@
         <echo message="Generating GL2_ES1 interface" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/gles1.c"
-                 outputRootDir="${build}"
-                 config="${config}/gl-if-gl2_es1.cfg" 
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-if-gl2_es1.cfg" 
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -668,8 +445,8 @@
         <echo message="Generating GL2_ES2 interface" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/gles2.c"
-                 outputRootDir="${build}"
-                 config="${config}/gl-if-gl2_es2.cfg" 
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-if-gl2_es2.cfg" 
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -680,15 +457,15 @@
         <echo message="Generating GL2_GL3 interface" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/gl3.c" 
-                 outputRootDir="${build}"
-                 config="${config}/gl-gl3-set.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-gl3-set.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
         <gluegen src="${stub.includes.opengl}/gl2.c" 
-                 outputRootDir="${build}"
-                 config="${config}/gl-if-gl2_gl3.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-if-gl2_gl3.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -699,8 +476,8 @@
         <echo message="Generating GL2 interface and implementation" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/gl2.c" 
-                 outputRootDir="${build}"
-                 config="${config}/gl-gl2.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-gl2.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -711,8 +488,8 @@
         <echo message="Generating GL3 interface and implementation" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/gl3.c" 
-                 outputRootDir="${build}"
-                 config="${config}/gl-gl3.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-gl3.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -723,8 +500,8 @@
         <echo message="Generating GL3bc implementation" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/gl3bc.c" 
-                 outputRootDir="${build}"
-                 config="${config}/gl-gl3bc.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-gl3bc.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -735,8 +512,8 @@
         <echo message="Generating GL2ES12 implementation" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/gl2es12.c" 
-                 outputRootDir="${build}"
-                 config="${config}/gl-gl2es12.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-gl2es12.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -747,8 +524,8 @@
         <echo message="Generating GLES1 interface and implementation" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/gles1.c" 
-                 outputRootDir="${build}"
-                 config="${config}/gl-es1.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-es1.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -759,8 +536,8 @@
         <echo message="Generating GLES2 interface and implementation" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/gles2.c" 
-                 outputRootDir="${build}"
-                 config="${config}/gl-es2.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-es2.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -783,8 +560,8 @@
         <echo message="Generating GLU class" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/glu.c" 
-                 outputRootDir="${build}"
-                 config="${config}/glu-base.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/glu-base.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -795,8 +572,8 @@
         <echo message="Generating GLU class" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/glu.c" 
-                 outputRootDir="${build}"
-                 config="${config}/glu-gl2es1.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/glu-gl2es1.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -807,8 +584,8 @@
         <echo message="Generating GLU class" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes.opengl}/glu.c" 
-                 outputRootDir="${build}"
-                 config="${config}/glu-gl2.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/glu-gl2.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -819,7 +596,7 @@
         <echo message="Generating platform-specific OpenGL extension class: ${window.os.system}" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${glext.platform.header}" 
-                 outputRootDir="${build}"
+                 outputRootDir="${build.jogl}"
                  config="${glext.platform.cfg}"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
@@ -830,9 +607,9 @@
     <target name="java.generate.window.system.es" if="window.es.cfg">
         <echo message="Generating EGL implementation class" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.dir}/${window.es.system}/** ${stub.includes.dir}/common/**" />
-        <gluegen src="${stub.includes.dir}/${window.es.system}/window-system.c"
-                 outputRootDir="${build}"
+        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes}/common/**" />
+        <gluegen src="${stub.includes}/${window.es.system}/window-system.c"
+                 outputRootDir="${build.jogl}"
                  config="${window.es.cfg}"
                  includeRefid="stub.includes.fileset.platform"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
@@ -843,9 +620,9 @@
     <target name="java.generate.window.system.es.ext" if="window.es.ext.cfg">
         <echo message="Generating EGLExt implementation class" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.dir}/${window.es.system}/** ${stub.includes.dir}/common/**" />
-        <gluegen src="${stub.includes.dir}/${window.es.system}/window-system-ext.c"
-                 outputRootDir="${build}"
+        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes}/common/**" />
+        <gluegen src="${stub.includes}/${window.es.system}/window-system-ext.c"
+                 outputRootDir="${build.jogl}"
                  config="${window.es.ext.cfg}"
                  includeRefid="stub.includes.fileset.platform"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
@@ -856,8 +633,8 @@
     <target name="java.generate.window.system.os" if="window.os.cfg">
         <echo message="Generating window system glue impl: ${window.os.system}" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.dir}/${window.os.system}/window-system.c"
-                 outputRootDir="${build}"
+        <gluegen src="${stub.includes}/${window.os.system}/window-system.c"
+                 outputRootDir="${build.jogl}"
                  config="${window.os.cfg}"
                  includeRefid="stub.includes.fileset.platform"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
@@ -866,7 +643,7 @@
     </target>
 
     <target name="java.generate.gl.platforms" >
-        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.dir}/${window.os.system}/** ${stub.includes.dir}/${window.es.system}/** ${stub.includes.dir}/common/** ${stub.includes.dir}/opengl/**" />
+        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.os.system}/** ${stub.includes}/${window.es.system}/** ${stub.includes}/common/** ${stub.includes}/opengl/**" />
 
         <antcall target="java.generate.window.system.os" inheritRefs="true" />
         <antcall target="java.generate.platform.glext" inheritRefs="true" />
@@ -877,7 +654,7 @@
        - from the C GL headers.  This involves setting the taskdef and creating
        - the classpath reference id then running the task on each header.
       -->
-    <target name="java.generate" depends="build.gluegen, java.generate.check" unless="java.generate.skip">
+    <target name="java.generate" depends="common.gluegen.build, java.generate.check" unless="java.generate.skip">
 
         <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
         <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask"
@@ -897,23 +674,23 @@
 
         <antcall target="java.generate.gl.platforms" inheritRefs="true">
             <param name="window.os.system"                       value="x11"/>
-            <param name="window.os.cfg"                          value="${config}/glx-x11.cfg" />
-            <param name="glext.platform.cfg"                     value="${config}/glxext.cfg" />
-            <param name="glext.platform.header"                  value="${stub.includes.dir}/x11/glxext.c" />
+            <param name="window.os.cfg"                          value="${config.jogl}/glx-x11.cfg" />
+            <param name="glext.platform.cfg"                     value="${config.jogl}/glxext.cfg" />
+            <param name="glext.platform.header"                  value="${stub.includes}/x11/glxext.c" />
         </antcall>
 
         <antcall target="java.generate.gl.platforms" inheritRefs="true">
             <param name="window.os.system"                       value="win32"/>
-            <param name="window.os.cfg"                          value="${config}/wgl-win32.cfg" />
-            <param name="glext.platform.cfg"                     value="${config}/wglext.cfg" />
-            <param name="glext.platform.header"                  value="${stub.includes.dir}/win32/wglext.c" />
+            <param name="window.os.cfg"                          value="${config.jogl}/wgl-win32.cfg" />
+            <param name="glext.platform.cfg"                     value="${config.jogl}/wglext.cfg" />
+            <param name="glext.platform.header"                  value="${stub.includes}/win32/wglext.c" />
         </antcall>          
 
         <antcall target="java.generate.gl.platforms" inheritRefs="true">
           <param name="window.os.system"                     value="macosx"/>
-          <param name="window.os.cfg"                        value="${config}/cgl-macosx.cfg" />
-          <param name="glext.platform.cfg"                   value="${config}/cglext.cfg" />
-          <param name="glext.platform.header"                value="${stub.includes.dir}/macosx/cglext.c" />
+          <param name="window.os.cfg"                        value="${config.jogl}/cgl-macosx.cfg" />
+          <param name="glext.platform.cfg"                   value="${config.jogl}/cglext.cfg" />
+          <param name="glext.platform.header"                value="${stub.includes}/macosx/cglext.c" />
         </antcall>
     
         <!-- Generate GLU class -->
@@ -960,8 +737,8 @@
 
         <!-- Generate CgGL interface class -->
         <gluegen src="${stub.includes.opengl}/cg.c" 
-                 outputRootDir="${build}"
-                 config="${config}/cg-common.cfg"
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/cg-common.cfg"
                  includeRefid="stub.includes.cg.fileset.all"
                  emitter="com.sun.gluegen.JavaEmitter">
             <classpath refid="gluegen.classpath" />
@@ -1156,7 +933,7 @@
                      includes="com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" />
         </copy>
     </target>          
-    <target name="java.generate.composable.pipeline.custom" depends="init, build.gluegen, java.generate.composable.pipeline.custom.glfixfunc">
+    <target name="java.generate.composable.pipeline.custom" depends="init, common.gluegen.build, java.generate.composable.pipeline.custom.glfixfunc">
     </target>
 
     <!-- ================================================================== -->
@@ -1193,7 +970,7 @@
         <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
         <javac destdir="${classes}"
                excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}"
-               source="${jogl.sourcelevel}"
+               source="${target.sourcelevel}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
@@ -1208,7 +985,7 @@
         <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
         <javac destdir="${classes-cdc}"
                excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all},${java.excludes.cdcfp}"
-               source="${jogl.sourcelevel}"
+               source="${target.sourcelevel}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
@@ -1224,7 +1001,7 @@
         <!-- Perform the third pass Java compile; everything including fixed function emulation. -->
         <javac destdir="${classes}"
                excludes="${java.excludes.all}"
-               source="${jogl.sourcelevel}"
+               source="${target.sourcelevel}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
@@ -1238,7 +1015,7 @@
         <!-- Perform the third pass Java compile; everything including fixed function emulation. -->
         <javac destdir="${classes-cdc}"
                excludes="${java.excludes.all},${java.excludes.cdcfp}"
-               source="${jogl.sourcelevel}"
+               source="${target.sourcelevel}"
                bootclasspath="${javac.bootclasspath-cdc.jar}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
@@ -1533,8 +1310,8 @@
         <echo message="Compiling @{output.lib.name}" />
 
         <cc outtype="shared" 
-            objdir="${obj.jogl}" 
-            outfile="${obj}/@{output.lib.name}"
+            objdir="${obj.joglsub}" 
+            outfile="${obj.jogl}/@{output.lib.name}"
             optimize="${c.compiler.optimise}" 
             debug="${c.compiler.debug}"
             multithreaded="true" 
@@ -1571,24 +1348,24 @@
           </compiler>
 
           <linker extends="@{linker.cfg.id}">
-            <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
-            <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
+            <syslibset dir="${java.lib.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
+            <syslibset dir="${java.lib.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
           </linker>
         </cc>
 
         <!-- FIXME: this is a hack; the cpptask should have an option to change the
              suffix or at least understand the override from dylib to jnilib -->
         <antcall target="rename.dylib" inheritRefs="true">
-            <param name="src"  value="${build}/obj/lib@{output.lib.name}.dylib" />
-            <param name="dest" value="${build}/obj/lib@{output.lib.name}.jnilib" />
-            <param name="dest-cdc" value="${build}/obj/lib@{output.lib.name}.so" />
+            <param name="src"  value="${build.jogl}/obj/lib@{output.lib.name}.dylib" />
+            <param name="dest" value="${build.jogl}/obj/lib@{output.lib.name}.jnilib" />
+            <param name="dest-cdc" value="${build.jogl}/obj/lib@{output.lib.name}.so" />
         </antcall>
 
         <!-- FIXME: this is a hack; the cpptask should have an option to change the
              suffix or at least understand the override from dylib to jnilib -->
         <antcall target="rename.mingw.dll" inheritRefs="true">
-            <param name="src"  value="${build}/obj/lib@{output.lib.name}.so" />
-            <param name="dest" value="${build}/obj/@{output.lib.name}.dll" />
+            <param name="src"  value="${build.jogl}/obj/lib@{output.lib.name}.so" />
+            <param name="dest" value="${build.jogl}/obj/@{output.lib.name}.dll" />
         </antcall>
       </sequential>
     </macrodef>  
@@ -1600,7 +1377,7 @@
     <target name="c.build.jogl.prepare" depends="c.build.jogl.prepare.openMAX">
       <!-- Generate the waveout Mixer header -->
       <!-- FIXME: this is temporary until we move this to another workspace -->
-      <!--javah destdir="${build}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.audio.windows.waveout.Mixer" /-->
+      <!--javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.audio.windows.waveout.Mixer" /-->
     </target>
 
     <target name="c.build.jogl.desktop" unless="setup.nodesktop">
@@ -1639,32 +1416,32 @@
     </target>
     
     <target name="c.manifest.cg" if="jogl.cg">
-      <msvc.manifest objdir="${obj}" dllname="jogl_cg" />
+      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_cg" />
     </target>
 
     <target name="c.manifest" if="isVC8Family">
       <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll -->
-      <msvc.manifest objdir="${obj}" dllname="jogl_es1" />
-      <msvc.manifest objdir="${obj}" dllname="jogl_es2" />
-      <msvc.manifest objdir="${obj}" dllname="jogl_gl2" />
-      <msvc.manifest objdir="${obj}" dllname="jogl_gl2es12" />
+      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es1" />
+      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es2" />
+      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_gl2" />
+      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_gl2es12" />
       <antcall target="c.manifest.cg" inheritRefs="true" />
     </target>
 
     <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.gl2es12,c.build.jogl.desktop,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg">
       <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
-          <param name="libdir" value="${obj}"/>
+          <param name="libdir" value="${obj.jogl}"/>
       </antcall>
 
       <antcall target="c.manifest" inheritRefs="true" />
       <!-- Create the Java Web Start jar file for the built native code -->
-      <jar destfile="${build}/jogl-natives-${os.and.arch}.jar" filesonly="true">
-        <fileset dir="${obj}">
+      <jar destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true">
+        <fileset dir="${obj.jogl}">
           <include name="*.${native.library.suffix}" />
         </fileset>
       </jar>
-      <jar destfile="${build}/jogl-natives-${os.and.arch}-cdc.jar" filesonly="true">
-        <fileset dir="${obj}">
+      <jar destfile="${build.jogl}/jogl-natives-${os.and.arch}-cdc.jar" filesonly="true">
+        <fileset dir="${obj.jogl}">
           <include name="*_es1.${native.library.suffix-cdc}" />
           <include name="*_es2.${native.library.suffix-cdc}" />
           <include name="*_gl2es12.${native.library.suffix-cdc}" />
@@ -1691,7 +1468,7 @@
              <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
         </tstamp>
         <copy file="${manifestfile}"
-            tofile="${build}/tempversion"
+            tofile="${build.jogl}/tempversion"
             overwrite="true">
             <filterset>
                 <!-- This token only exists in the non-RI version of the manifest -->
@@ -1715,7 +1492,7 @@
              <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
         </tstamp>
         <copy file="${manifestfile}"
-            tofile="${build}/tempversion-cdc"
+            tofile="${build.jogl}/tempversion-cdc"
             overwrite="true">
             <filterset>
                 <!-- This token only exists in the non-RI version of the manifest -->
@@ -1727,71 +1504,71 @@
     </target>
 
     <target name="build-cg-jar-javase" depends="setup-manifestfile" if="jogl.cg">
-        <jar manifest="${build}/tempversion" destfile="${jogl.cg.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.cg.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.nv-cg}"/>
         </jar>
     </target>
 
     <target name="build-jars-os-desktop-javase" depends="setup-manifestfile" unless="setup.nodesktop">
-        <jar manifest="${build}/tempversion" destfile="${jogl.os.x11.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.x11.jar}" filesonly="true">
             <fileset dir="${classes}" includes="${java.part.glx}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.os.win.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.win.jar}" filesonly="true">
             <fileset dir="${classes}" includes="${java.part.wgl}" />
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.os.osx.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.osx.jar}" filesonly="true">
             <fileset dir="${classes}" includes="${java.part.cgl}"/>
         </jar>
     </target>
 
     <target name="build-jars-es-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop">
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl2es12.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl2es12.jar}" filesonly="true">
             <fileset dir="${classes}" includes="${java.part.gl2es12}, ${java.part.openmax}"
                      excludes="${java.part.glugl2}"/>
         </jar>
     </target>
 
     <target name="build-jars-es-javase" depends="setup-manifestfile,build-jars-es-desktop-javase">
-        <jar manifest="${build}/tempversion" destfile="${jogl.egl.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.egl.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.egl}"
                      excludes="${java.part.awt}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.gles1.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gles1.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.es1}"
                      excludes="${java.part.es1.dbg}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.gles1.dbg.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gles1.dbg.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.es1.dbg}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.gles2.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gles2.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.es2}, ${java.part.openmax}"
                      excludes="${java.part.es2.dbg}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.gles2.dbg.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gles2.dbg.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.es2.dbg}"/>
         </jar>
     </target>
 
     <target name="build-jars-os-desktop-cdc" depends="setup-manifestfile" unless="setup.nodesktop">
-        <jar manifest="${build}/tempversion" destfile="${jogl.os.x11.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.x11.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}" includes="${java.part.glx}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.os.win.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.win.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}" includes="${java.part.wgl}" />
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.os.osx.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.osx.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}" includes="${java.part.cgl}"/>
         </jar>
     </target>
 
     <target name="build-jars-es-desktop-cdc" depends="setup-manifestfile-cdc,build-jars-os-desktop-cdc" unless="setup.nodesktop">
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gl2es12.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gl2es12.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.gl2es12}, ${java.part.openmax}"
                      excludes="${java.part.glugl2}"/>
@@ -1799,44 +1576,44 @@
     </target>
 
     <target name="build-jars-es-cdc" depends="setup-manifestfile-cdc,build-jars-es-desktop-cdc" unless="setup.noCDC">
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.egl.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.egl.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.egl}"
                      excludes="${java.part.awt}"/>
         </jar>
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gles1.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gles1.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.es1}"
                      excludes="${java.part.es1.dbg}"/>
         </jar>
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gles1.dbg.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gles1.dbg.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.es1.dbg}"/>
         </jar>
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gles2.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gles2.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.es2}, ${java.part.openmax}"
                      excludes="${java.part.es2.dbg}"/>
         </jar>
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gles2.dbg.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gles2.dbg.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.es2.dbg}"/>
         </jar>
     </target>
 
     <target name="build-jars-awt-javase" depends="setup-manifestfile" unless="setup.noAWT">
-        <jar manifest="${build}/tempversion" destfile="${jogl.awt.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.awt.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.awt}" />
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.util.awt.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.awt.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.util.awt}"/>
         </jar>
     </target>
 
     <target name="build-jars-all-awt-javase" depends="setup-manifestfile" unless="setup.noAWT">
-        <jar manifest="${build}/tempversion" destfile="${jogl.all.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.all.jar}" filesonly="true">
             <fileset dir="${classes}">
                 <include name="javax/media/opengl/**" />
                 <include name="com/jogamp/gluegen/runtime/**" />
@@ -1850,7 +1627,7 @@
         </jar>
     </target>
     <target name="build-jars-all-noawt-javase" depends="setup-manifestfile">
-        <jar manifest="${build}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true">
             <fileset dir="${classes}"
                 includes="javax/media/opengl/** com/jogamp/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/jogamp/**"
                 excludes="${java.part.awt} ${java.part.util.awt}">
@@ -1860,7 +1637,7 @@
         </jar>
     </target>
     <target name="build-jars-all-cdc" depends="setup-manifestfile">
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.all.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.all.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.core} ${java.part.egl} ${java.part.glutess} ${java.part.glumipmap} ${java.part.openmax} ${java.part.sdk} ${java.part.glx} ${java.part.cgl} ${java.part.gl2es12} ${java.part.wgl} ${java.part.es1} ${java.part.es1.dbg} ${java.part.es2} ${java.part.es2.dbg} ${java.part.util} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}"
                      excludes="${java.excludes.cdcfp}"/>
@@ -1871,25 +1648,25 @@
 
 
     <target name="build-jars-cdc" depends="setup-manifestfile-cdc, build-jars-es-cdc, build-jars-all-cdc" unless="setup.noCDC">
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.core.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.core.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.core}"
                      excludes="${java.part.core.exclude}"/>
         </jar>
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.glutess.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.glutess.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.glutess}"/>
         </jar>
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.glumipmap.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.glumipmap.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.glumipmap}"/>
         </jar>
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.util.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.util.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.util} ${java.part.util.glsl}"
                      excludes="${java.part.util.awt} ${java.part.util.gl2} ${java.part.util.fixedfuncemu}"/>
         </jar>
-        <jar manifest="${build}/tempversion-cdc" destfile="${jogl.util.fixedfuncemu.cdc.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.util.fixedfuncemu.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.util.fixedfuncemu}"/>
             <fileset dir="${src.java}"
@@ -1899,44 +1676,44 @@
 
     <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop">
         <!--os specific gl2-->
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl2.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl2.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.gl2}, ${java.part.openmax}"
                      excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
         </jar>
 
         <!--os specific gl3-->
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl3.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl3.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.gl3}, ${java.part.openmax}"
                      excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
         </jar>
 
         <!--os specific gl4-->
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl4.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl4.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.gl4}, ${java.part.openmax}"
                      excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
         </jar>
 
         <!-- misc -->
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl2.dbg.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl2.dbg.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.gl2.dbg}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl3.dbg.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl3.dbg.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.gl3.dbg}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.gl4.dbg.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl4.dbg.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.gl4.dbg}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.glugl2.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.glugl2.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.glugl2}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.util.gl2.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.gl2.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.util.gl2}"
                      excludes="com/jogamp/opengl/**/awt/**"/>
@@ -1944,29 +1721,29 @@
     </target>
 
     <target name="build-jars-javase" depends="setup-manifestfile, build-jars-es-javase, build-jars-awt-javase, build-cg-jar-javase, build-jars-all-awt-javase, build-jars-all-noawt-javase, build-jars-desktop-javase">
-        <jar manifest="${build}/tempversion" destfile="${jogl.core.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.core.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.core}"
                      excludes="${java.part.core.exclude}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.sdk.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.sdk.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.sdk}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.glutess.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.glutess.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.glutess}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.glumipmap.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.glumipmap.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.glumipmap}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.util.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.util} ${java.part.util.glsl}"
                      excludes="${java.part.util.awt} ${java.part.util.gl2} ${java.part.util.fixedfuncemu}"/>
         </jar>
-        <jar manifest="${build}/tempversion" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.util.fixedfuncemu}"/>
             <fileset dir="${src.java}"
@@ -1981,7 +1758,7 @@
        -        on the platform specific build targets.  To circumvent any 
        -        errors, ensure that the source is built first.
       -->
-    <target name="javadoc.nocg" depends="load.user.properties,init" unless="jogl.cg">
+    <target name="javadoc.nocg" depends="init" unless="jogl.cg">
         <!-- Build the general public Javadoc -->
         <javadoc packagenames="${javadoc.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
@@ -1998,7 +1775,7 @@
     </target>
 
     <!-- Same as above but with Cg directories added -->
-    <target name="javadoc.cg" depends="load.user.properties,init" if="jogl.cg">
+    <target name="javadoc.cg" depends="init" if="jogl.cg">
         <!-- Build the general public Javadoc with CG -->
         <javadoc packagenames="${javadoc.packagenames},com.jogamp.opengl.cg"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
@@ -2016,7 +1793,7 @@
 
     <target name="javadoc" depends="javadoc.nocg,javadoc.cg" />
 
-    <target name="javadoc.spec.nocg" depends="load.user.properties,init" unless="jogl.cg">
+    <target name="javadoc.spec.nocg" depends="init" unless="jogl.cg">
         <!-- Build the specification Javadoc -->
         <javadoc packagenames="${javadoc.spec.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
@@ -2033,7 +1810,7 @@
     </target>
                                                                                                                                    
     <!-- Same as above since Cg directories are not part of spec -->
-    <target name="javadoc.spec.cg" depends="load.user.properties,init" if="jogl.cg">
+    <target name="javadoc.spec.cg" depends="init" if="jogl.cg">
         <!-- Build the specification Javadoc with CG -->
         <javadoc packagenames="${javadoc.spec.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
@@ -2084,7 +1861,7 @@
         </javadoc>
     </target>
 
-    <target name="javadoc.dev.all"  depends="load.user.properties,init,javadoc.dev.nocg,javadoc.dev.cg" />
+    <target name="javadoc.dev.all"  depends="init,javadoc.dev.nocg,javadoc.dev.cg" />
 
     <target name="all.doc" description="Build JOGL docs" depends="init,javadoc,javadoc.spec,javadoc.dev.all" />
 
@@ -2095,69 +1872,22 @@
     <target name="clean" description="Remove all build products" depends="declare.common">
         <delete includeEmptyDirs="true" quiet="true">
             <fileset dir="${tempdir}" />
-            <fileset dir="${build}" />
+            <fileset dir="${build.jogl}" />
             <fileset dir="${javadoc}" />
             <fileset dir="${javadoc.spec}" />
             <fileset dir="${javadoc.dev}" />
         </delete>
     </target>
 
-    <!-- ================================================================== -->
-    <!--
-       - Build/run junit.
-      -->
-    <target name="junit.compile" depends="init">
-        <!-- Perform the junit pass Java compile -->
-        <javac destdir="${classes}"
-               source="${junit.sourcelevel}"
-               fork="yes"
-               memoryMaximumSize="${javac.memorymax}"
-               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="jogl_junit.compile.classpath"/>
-            <src path="${src.junit}" />
-        </javac>
-        <jar destfile="${jogl.test.jar}" filesonly="true">
-            <fileset dir="${classes}">
-                <include name="com/jogamp/opengl/test/**" />
-            </fileset>
-        </jar>
-    </target>
-
-    <target name="junit.run" depends="declare.common,gluegen.cpptasks.detect.os">
-        <!-- Perform the junit tests-->
-        <mkdir dir="${build}/results"/>
-        <junit forkmode="once" showoutput="true" fork="true" haltonerror="true">
-            <env key="${system.env.library.path}" path="${all.so.dir}"/>
-            <jvmarg value="-Djava.library.path=${all.so.dir}"/>
-            <formatter usefile="false" type="plain"/>
-            <formatter usefile="true" type="xml"/>
-            <classpath refid="jogl_junit.run.classpath"/>
-
-            <test name="com.jogamp.opengl.test.junit.texture.awt.Texture1" todir="${build}/results"/>
-
-        </junit>
-    </target>
-
     <!-- ================================================================== -->
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.jogl,generate.version.txt,junit.compile" />
-
-    <target name="setup-version-RI" if="jogl.ri">
-        <property name="tmp.version" value="${jogl_base_version}" />
-    </target>
-
-    <target name="setup-version-non-RI" unless="jogl.ri">
-        <tstamp>
-             <format property="version.timestamp" pattern="yyyyMMdd"/>
-        </tstamp>
-        <property name="tmp.version" value="${jogl_base_version}-pre-${version.timestamp}" />
-    </target>
+    <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="init,jar,c.build.jogl,generate.version.txt" />
 
-    <target name="generate.version.txt" depends="setup-version-RI,setup-version-non-RI">
+    <target name="generate.version.txt" depends="init">
         <!-- Create a version.txt file indicating which version we just built -->
-        <echo message="${tmp.version}" file="${build}/version.txt" />
+        <echo message="${jogl.version}" file="${build.jogl}/version.txt" />
     </target>
 
     <!-- ================================================================== -->
diff --git a/make/build-junit.xml b/make/build-junit.xml
new file mode 100644
index 000000000..5b3aae8c2
--- /dev/null
+++ b/make/build-junit.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="JOGLTest" basedir="." default="all">
+
+    <description>JUNIT Tests JOGL</description>
+
+    <import file="build-common.xml"/>
+
+    <!-- ================================================================== -->
+    <!-- 
+       - Declare all paths and user defined variables.
+      -->
+    <target name="declare.common" description="Declare properties" depends="common.init">
+        <property name="rootrel.src.junit"    value="src/junit" />
+        <property name="src.junit"            value="${project.root}/${rootrel.src.junit}" />
+
+        <property name="classes"              value="${build.junit}/classes" />
+
+        <property name="java.dir.test"        value="com/jogamp/test"/>
+        <property name="java.part.test"       value="${java.dir.test}/**"/>
+
+    </target>
+    
+    <!-- ================================================================== -->
+    <!-- 
+       - Initialize all parameters required for the build and create any
+       - required directories.
+      -->
+    <target name="init" depends="declare.common">
+        <!-- Create the required output directories. -->
+        <mkdir dir="${obj.junit}" />
+        <mkdir dir="${classes}" />
+    </target>
+
+    <!-- ================================================================== -->
+    <!--
+       - Clean up all that is built.
+      -->
+    <target name="clean" description="Remove all build products" depends="declare.common">
+        <delete includeEmptyDirs="true" quiet="true">
+            <fileset dir="${build.junit}" />
+        </delete>
+    </target>
+
+    <!-- ================================================================== -->
+    <!--
+       - Build/run junit.
+      -->
+    <target name="junit.compile" depends="init">
+        <!-- Perform the junit pass Java compile -->
+        <javac destdir="${classes}"
+               source="${host.sourcelevel}"
+               fork="yes"
+               memoryMaximumSize="${javac.memorymax}"
+               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+            <classpath refid="junit_jogl_newt.compile.classpath"/>
+            <src path="${src.junit}" />
+        </javac>
+        <jar destfile="${jogl.test.jar}" filesonly="true">
+            <fileset dir="${classes}">
+                <include name="${java.part.test}"/>
+            </fileset>
+        </jar>
+    </target>
+
+    <target name="junit.run" depends="declare.common">
+        <!-- Perform the junit tests-->
+        <mkdir dir="${results.junit}" />
+        <junit forkmode="once" showoutput="true" fork="true" haltonerror="true">
+            <env key="${system.env.library.path}" path="${obj.all.paths}"/>
+            <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
+
+            <!--
+            <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
+            <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
+            <jvmarg value="-Djogl.debug.GLSLState"/>
+            -->
+            <jvmarg value="-Dnativewindow.debug=all"/>
+            <jvmarg value="-Djogl.debug=all"/>
+            <jvmarg value="-Dnewt.debug=all"/>
+            <!--
+            <jvmarg value="-verbose:jni"/> 
+            <jvmarg value="-client"/>
+            <jvmarg value="-d32"/>
+            -->
+
+            <formatter usefile="false" type="plain"/>
+            <formatter usefile="true" type="xml"/>
+            <classpath refid="junit_jogl_newt.run.classpath"/>
+
+            <batchtest todir="${results.junit}">
+              <fileset dir="${classes}">
+                  <include name="${java.dir.test}/**/Test*"/>
+              </fileset>
+              <formatter usefile="false" type="brief"/>
+              <formatter usefile="true" type="xml"/>
+            </batchtest>
+
+        </junit>
+    </target>
+
+    <!-- ================================================================== -->
+    <!--
+       - Build everything.
+      -->
+    <target name="all" description="Build JOGL JUNIT tests and run them." depends="junit.compile, junit.run" />
+
+</project>
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index b34ad3954..3cb7e7746 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -53,25 +53,13 @@
    -->
 <project name="NativeWindow" basedir="." default="all">
 
-  <import file="versions.xml" />
-
-  <!-- Pull in GlueGen cpptasks build file -->
-  <property name="gluegen.root" value="../../gluegen" />
-  <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
+  <import file="build-common.xml"/>
 
     <!-- ================================================================== -->
     <!-- 
        - Base initialization and detection of operating system.
       -->
-    <target name="base.init" depends="gluegen.cpptasks.detect.os">
-
-        <condition property="setup.nodesktop">
-            <and>
-                <isfalse value="${isWindows}" />
-                <isfalse value="${isOSX}" />
-                <isfalse value="${isX11}" />
-            </and>
-        </condition>
+    <target name="base.init" depends="common.init">
 
         <condition property="setup.noNativeAWT">
             <or>
@@ -80,12 +68,7 @@
             </or>
         </condition>
 
-        <property name="javac.bootclasspath-cdc.jar" value="${gluegen.root}/make/lib/cdc_fp.jar" />
-
-        <echo message="setup.nodesktop: ${setup.nodesktop}" />
-        <echo message="setup.noAWT: ${setup.noAWT}" />
         <echo message="setup.noNativeAWT: ${setup.noNativeAWT}" />
-        <echo message="javac.bootclasspath-cdc.jar: ${javac.bootclasspath-cdc.jar}" />
 
         <!-- partitioning -->
 
@@ -107,109 +90,47 @@
 
         <property name="java.excludes.all" value="${java.excludes.awt}" />
         <echo message="java.excludes.all: ${java.excludes.all}" />
-
-
-        <!-- Set the project root directory to be up one directory. -->
-        <property name="project.root" value=".." />
-    
-        <!-- Set the configuration and build files to this directory. -->
-        <property name="make" value="." />
-    </target>
-
-    <target name="base.init.sourcelevel.1">
-        <property name="nativewindow.sourcelevel" value="1.4" />
     </target>
 
-    <!--target name="base.init.sourcelevel.2" if="gluegen.nsig">
-        <property name="nativewindow.sourcelevel" value="1.5" />
-    </target-->
-
-    <!-- ================================================================== -->
-    <!-- 
-       - Load user properties which override build defaults.
-      -->
-    <target name="load.user.properties" depends="base.init,base.init.sourcelevel.1" unless="user.properties.file">
-        <!-- Load the user specified properties file that defines various host
-           - specific paths.  The user will be notified if this is does not
-           - exist. -->
-        <property name="user.properties.file" value="${user.home}/nativewindow.properties" />
-        <property file="${user.properties.file}" />
-        <echo message="Loaded ${user.properties.file}." />
-        <property file="${user.home}/gluegen.properties" />
-        <echo message="Loaded ${user.home}/gluegen.properties." />
-        <fail message="antlr.jar was not specified in nativewindow.properties or gluegen.properties. Please see README.txt for instructions" unless="antlr.jar"/>
-        <echo message="antlr.jar=${antlr.jar}" />
-    </target>
 
     <!-- ================================================================== -->
     <!-- 
        - Declare all paths and user defined variables.
       -->
-    <target name="declare.common" description="Declare properties" depends="load.user.properties">
-        <!-- The location and name of the configuration ANT file that will 
-           - validate to ensure that all user-define variables are set. -->
-        <property name="validate.user.properties" value="${make}/validate-properties.xml" />
-           
-        <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
-        <property name="javacdebug"       value="true" /> 
-        <property name="javacdebuglevel"  value="source,lines" /> 
-
-        <!-- Names of directories relative to the project root.
-             Some of these are used in FileMappers later for dependence information
-             and need exact string matching, which is why they use file.separator
-             instead of "/". -->
-        <condition property="rootrel.build" value="build">
-          <not>
-              <isset property="rootrel.build"/>
-          </not>
-        </condition>
-        <property name="rootrel.build.nativewindow" value="${rootrel.build}/nativewindow" />
+    <target name="declare.common" description="Declare properties" depends="base.init">
+
+        <property name="config.nativewindow" value="${config}/nativewindow" />
+
         <property name="rootrel.src" value="src/nativewindow" />
         <property name="rootrel.src.java" value="${rootrel.src}/classes" />
         <property name="rootrel.src.c" value="${rootrel.src}/native" />
 
-        <property name="rootrel.src.generated" value="${rootrel.build.nativewindow}/gensrc" />
+        <property name="rootrel.src.generated" value="${rootrel.build}/nativewindow/gensrc" />
         <property name="rootrel.generated.c" value="${rootrel.src.generated}/native" />
-        <property name="rootrel.obj" value="${rootrel.build.nativewindow}/obj" />
-
-        <!-- GlueGen properties. -->
-        <!-- NOTE that these require a checked-out GlueGen workspace as a -->
-        <!-- sibling of the NativeWindow workspace. -->
-        <property name="gluegen.make.dir" value="${gluegen.root}/make" />
-        <property name="gluegen.build.xml" value="${gluegen.make.dir}/build.xml" />
-        <property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" />
-        <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
-        <property name="gluegen-rt-cdc.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt-cdc.jar" />
-                                                
+
         <!-- The source directories. -->
         <property name="src.java" value="${project.root}/${rootrel.src.java}" />
         <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
-        <property name="build"    value="${project.root}/${rootrel.build.nativewindow}" />
         
         <!-- The generated source directories. -->
-        <property name="src.generated" value="${build}/gensrc" />
+        <property name="src.generated" value="${build.nativewindow}/gensrc" />
         <property name="src.generated.java" value="${src.generated}/classes" />
         <property name="src.generated.java-cdc" value="${src.generated}/classes-cdc" />
         <property name="src.generated.c" value="${src.generated}/native" />
         
         <!-- The compiler output directories. -->
-        <property name="classes" value="${build}/classes" />
-        <property name="classes-cdc" value="${build}/classes-cdc" />
-        <property name="obj"      value="${project.root}/${rootrel.obj}" />
+        <property name="classes" value="${build.nativewindow}/classes" />
+        <property name="classes-cdc" value="${build.nativewindow}/classes-cdc" />
 
         <!-- The headers from which Java files are generated -->
-        <property name="config" value="${make}/config/nativewindow" />
-        <property name="stub.includes" value="${make}/stub_includes" />
-        <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE:  this MUST be relative for FileSet -->
-        <property name="stub.includes.common" value="${stub.includes}/common" />
         <dirset id="stub.includes.fileset.all" dir=".">
-            <include name="${stub.includes.dir}/macosx/**" />
-            <include name="${stub.includes.dir}/win32/**" />
-            <include name="${stub.includes.dir}/x11/**" />
-            <include name="${stub.includes.dir}/common/**" />
-            <include name="${stub.includes.dir}/jni/**" />
+            <include name="${stub.includes}/macosx/**" />
+            <include name="${stub.includes}/win32/**" />
+            <include name="${stub.includes}/x11/**" />
+            <include name="${stub.includes}/common/**" />
+            <include name="${stub.includes}/jni/**" />
         </dirset>
-        <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes.dir}">
+        <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes}">
             <include name="macosx/**" />
             <include name="win32/**" />
             <include name="x11/**" />
@@ -217,31 +138,12 @@
             <include name="jni/**" />
         </fileset>
         <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" />
-        <fileset id="stub.includes.dependencies.fileset.3" dir="${config}">
+        <fileset id="stub.includes.dependencies.fileset.3" dir="${config.nativewindow}">
             <include name="*.cfg" />
             <include name="*.java" />
             <include name="*.c" />
         </fileset>
 
-        <!-- Create the classpath that includes GlueGen and
-           - ANTLR. This requires the user-defined "antlr.jar"
-           - property. -->
-        <path id="gluegen.classpath">
-          <pathelement location="${gluegen.jar}" />
-          <pathelement location="${antlr.jar}" />
-        </path>
-
-        <!-- The resulting nativewindow.jar. -->
-        <property name="nativewindow.core.jar" value="${build}/nativewindow.core.jar" />
-        <property name="nativewindow.awt.jar"  value="${build}/nativewindow.awt.jar"  />
-        <property name="nativewindow.os.x11.jar"  value="${build}/nativewindow.os.x11.jar"  />
-        <property name="nativewindow.all.jar"  value="${build}/nativewindow.all.jar"  />
-        <property name="nativewindow.all-noawt.jar"  value="${build}/nativewindow.all-noawt.jar" />
-
-        <property name="nativewindow.core.cdc.jar" value="${build}/nativewindow.core.cdc.jar" />
-        <property name="nativewindow.os.x11.cdc.jar"  value="${build}/nativewindow.os.x11.cdc.jar"  />
-        <property name="nativewindow.all.cdc.jar"  value="${build}/nativewindow.all.cdc.jar"  />
-
         <!-- The javadoc dirs. -->
         <property name="javadoc" value="${project.root}/javadoc_nativewindow_public" />
         <property name="javadoc.spec" value="${project.root}/javadoc_nativewindow_spec" />
@@ -263,9 +165,6 @@
        - required directories.
       -->
     <target name="init" depends="declare.common">
-        <!-- Call the external config validator script to make sure the config is ok and consistent -->
-        <ant antfile="${validate.user.properties}" inheritall="true"/>
-        
         <!-- Create the required output directories. -->
         <mkdir dir="${src.generated.java}" />
         <mkdir dir="${src.generated.java-cdc}" />
@@ -275,25 +174,7 @@
         <mkdir dir="${src.generated.c}/X11" />
         <mkdir dir="${classes}" />
         <mkdir dir="${classes-cdc}" />
-        <mkdir dir="${obj}" />
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- GlueGen and BuildStaticGLInfo creation, task setup and Java file generation -->
-    <!--
-       - Build GlueGen
-      -->
-    <target name="build.gluegen" depends="init">
-        <!-- Run the GlueGen build to ensure that the GlueGen ANT task
-           - has been built. -->
-        <!-- FIXME: remove passing down of antlr.jar when gluegen.properties is on all
-             nightly build machines -->
-        <ant antfile="${gluegen.build.xml}" dir="${gluegen.make.dir}" target="all" inheritAll="false">
-          <propertyset>
-            <propertyref name="antlr.jar" />
-            <!--propertyref name="gluegen.nsig" /-->
-          </propertyset>
-        </ant>
+        <mkdir dir="${obj.nativewindow}" />
     </target>
 
     <!--
@@ -340,8 +221,8 @@
 
     <target name="java.generate.windowlib" if="windowlib.os.cfg">
         <echo message="Generating Windowing Lib implementation class" />
-        <gluegen src="${stub.includes.dir}/${window.os.system}/window-lib.c"
-                 outputRootDir="../${rootrel.build.nativewindow}"
+        <gluegen src="${stub.includes}/${window.os.system}/window-lib.c"
+                 outputRootDir="${build.nativewindow}"
                  config="${windowlib.os.cfg}"
                  includeRefid="stub.includes.fileset.platform"
                  emitter="com.sun.gluegen.JavaEmitter">
@@ -360,9 +241,9 @@
         <echo message="Generating JAWT interface class" />
         <echo message="java.home.dir=${java.home.dir}" />
         <gluegen src="${jawt.platform.header}"
-                 outputRootDir="../${rootrel.build.nativewindow}"
+                 outputRootDir="${build.nativewindow}"
                  config="${jawt.cfg}"
-                 literalInclude="${stub.includes.dir}/jni"
+                 literalInclude="${stub.includes}/jni"
                  includeRefid="stub.includes.fileset.platform"
                  emitter="com.sun.gluegen.JavaEmitter">
             <classpath refid="gluegen.classpath" />
@@ -375,7 +256,7 @@
 
     <target name="java.generate.platforms" >
         <echo message="Generating platform-specifics: os: ${window.os.system}, cfgs: ${windowlib.os.cfg}, ${jawt.cfg}" />
-        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.dir}/${window.os.system}/** ${stub.includes.dir}/common/**" />
+        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.os.system}/** ${stub.includes}/common/**" />
         <antcall target="java.generate.windowlib" inheritRefs="true" />
         <antcall target="java.generate.jawt" inheritRefs="true" />
     </target>
@@ -385,7 +266,7 @@
        - from the C GL headers.  This involves setting the taskdef and creating
        - the classpath reference id then running the task on each header.
       -->
-    <target name="java.generate" depends="build.gluegen, java.generate.check" unless="java.generate.skip">
+    <target name="java.generate" depends="common.gluegen.build, java.generate.check" unless="java.generate.skip">
 
         <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
         <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask"
@@ -399,23 +280,23 @@
         <echo message="Generating platform-specifics: X11" />
         <antcall target="java.generate.platforms" inheritRefs="true">
             <param name="window.os.system"                       value="x11"/>
-            <param name="windowlib.os.cfg"                       value="${config}/x11-lib.cfg" />
-            <param name="jawt.cfg"                               value="${config}/jawt-x11.cfg" />
-            <param name="jawt.platform.header"                   value="${stub.includes.dir}/jni/x11/jawt_md.h" />
+            <param name="windowlib.os.cfg"                       value="${config.nativewindow}/x11-lib.cfg" />
+            <param name="jawt.cfg"                               value="${config.nativewindow}/jawt-x11.cfg" />
+            <param name="jawt.platform.header"                   value="${stub.includes}/jni/x11/jawt_md.h" />
         </antcall>
 
         <echo message="Generating platform-specifics: Win32" />
         <antcall target="java.generate.platforms" inheritRefs="true">
             <param name="window.os.system"                       value="win32"/>
-            <param name="jawt.cfg"                               value="${config}/jawt-win32.cfg" />
-            <param name="jawt.platform.header"                   value="${stub.includes.dir}/jni/win32/jawt_md.h" />
+            <param name="jawt.cfg"                               value="${config.nativewindow}/jawt-win32.cfg" />
+            <param name="jawt.platform.header"                   value="${stub.includes}/jni/win32/jawt_md.h" />
         </antcall>          
 
         <echo message="Generating platform-specifics: MaxOsX" />
         <antcall target="java.generate.platforms" inheritRefs="true">
           <param name="window.os.system"                     value="macosx"/>
-          <param name="jawt.cfg"                             value="${config}/jawt-macosx.cfg" />
-          <param name="jawt.platform.header"                 value="${stub.includes.dir}/jni/macosx/jawt_md.h" />
+          <param name="jawt.cfg"                             value="${config.nativewindow}/jawt-macosx.cfg" />
+          <param name="jawt.platform.header"                 value="${stub.includes}/jni/macosx/jawt_md.h" />
         </antcall>
     
         <!-- Inform the user that the generators have successfully created 
@@ -434,11 +315,11 @@
         <!-- Perform the first pass Java compile; everything -->
         <javac destdir="${classes-cdc}"
                excludes="${java.part.awt} ${java.excludes.all}"
-               source="${nativewindow.sourcelevel}"
+               source="${target.sourcelevel}"
                classpath="${gluegen-rt-cdc.jar}"
                bootclasspath="${javac.bootclasspath-cdc.jar}"
                fork="yes"
-               memoryMaximumSize="128m"
+               memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${src.java}" />
             <src path="${src.generated.java-cdc}" />
@@ -449,10 +330,10 @@
         <!-- Perform the second pass Java compile; everything. -->
         <javac destdir="${classes}"
                excludes="${java.excludes.all}"
-               source="${nativewindow.sourcelevel}"
+               source="${target.sourcelevel}"
                classpath="${gluegen-rt.jar}"
                fork="yes"
-               memoryMaximumSize="128m"
+               memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${src.java}" />
             <src path="${src.generated.java}" />
@@ -656,8 +537,8 @@
         <echo message="Compiling @{output.lib.name}" />
 
         <cc outtype="shared" 
-            objdir="${obj}" 
-            outfile="${obj}/@{output.lib.name}"
+            objdir="${obj.nativewindow}" 
+            outfile="${obj.nativewindow}/@{output.lib.name}"
             optimize="${c.compiler.optimise}" 
             debug="${c.compiler.debug}"
             multithreaded="true" 
@@ -696,16 +577,16 @@
         <!-- FIXME: this is a hack; the cpptask should have an option to change the
              suffix or at least understand the override from dylib to jnilib -->
         <antcall target="rename.dylib" inheritRefs="true">
-            <param name="src"  value="${build}/obj/lib@{output.lib.name}.dylib" />
-            <param name="dest" value="${build}/obj/lib@{output.lib.name}.jnilib" />
-            <param name="dest-cdc" value="${build}/obj/lib@{output.lib.name}.so" />
+            <param name="src"  value="${build.nativewindow}/obj/lib@{output.lib.name}.dylib" />
+            <param name="dest" value="${build.nativewindow}/obj/lib@{output.lib.name}.jnilib" />
+            <param name="dest-cdc" value="${build.nativewindow}/obj/lib@{output.lib.name}.so" />
         </antcall>
 
         <!-- FIXME: this is a hack; the cpptask should have an option to change the
              suffix or at least understand the override from dylib to jnilib -->
         <antcall target="rename.mingw.dll" inheritRefs="true">
-            <param name="src"  value="${build}/obj/lib@{output.lib.name}.so" />
-            <param name="dest" value="${build}/obj/@{output.lib.name}.dll" />
+            <param name="src"  value="${build.nativewindow}/obj/lib@{output.lib.name}.so" />
+            <param name="dest" value="${build.nativewindow}/obj/@{output.lib.name}.dll" />
         </antcall>
       </sequential>
     </macrodef>  
@@ -720,7 +601,7 @@
         <arg value="/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Libraries/libjawt.dylib" />
         <arg value="/System/Library/Frameworks/JavaVM.framework/Libraries/libjawt.dylib" />
         <srcfile />
-        <fileset dir="${obj}" includes="libnativewindow_awt.jnilib" />
+        <fileset dir="${obj.nativewindow}" includes="libnativewindow_awt.jnilib" />
       </apply>
     </target>
 
@@ -750,25 +631,25 @@
 
     <target name="c.manifest" if="isVC8Family">
       <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll -->
-      <msvc.manifest objdir="${obj}" dllname="nativewindow_jvm" />
-      <msvc.manifest objdir="${obj}" dllname="nativewindow_awt" />
+      <msvc.manifest objdir="${obj.nativewindow}" dllname="nativewindow_jvm" />
+      <msvc.manifest objdir="${obj.nativewindow}" dllname="nativewindow_awt" />
     </target>
 
     <target name="c.build.nativewindow" depends="c.configure,c.build.nativewindow.windowlib,c.build.nativewindow.jvm,c.build.nativewindow.awt">
       <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
-          <param name="libdir" value="${obj}"/>
+          <param name="libdir" value="${obj.nativewindow}"/>
       </antcall>
 
       <antcall target="c.fixup.jawt.version.macosx" inheritrefs="true" />
       <antcall target="c.manifest" inheritRefs="true" />
       <!-- Create the Java Web Start jar file for the built native code -->
-      <jar destfile="${build}/nativewindow-natives-${os.and.arch}.jar" filesonly="true">
-        <fileset dir="${obj}">
+      <jar destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar" filesonly="true">
+        <fileset dir="${obj.nativewindow}">
           <include name="*.${native.library.suffix}" />
         </fileset>
       </jar>
-      <jar destfile="${build}/nativewindow-natives-${os.and.arch}-cdc.jar" filesonly="true">
-        <fileset dir="${obj}">
+      <jar destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}-cdc.jar" filesonly="true">
+        <fileset dir="${obj.nativewindow}">
           <include name="*_jvm.${native.library.suffix-cdc}" />
           <include name="*_x11.${native.library.suffix-cdc}" />
         </fileset>
@@ -889,11 +770,11 @@
     <!-- ================================================================== -->
     <!--
        - Build the Javadocs for the sources.
-       - NOTE:  these are not entirely correct as the javadocs targets depend 
+       - NOTE:  these are not entirely correct as the javadoc targets depend 
        -        on the platform specific build targets.  To circumvent any 
        -        errors, ensure that the source is built first.
       -->
-    <target name="javadoc" depends="load.user.properties,init">
+    <target name="javadoc" depends="init">
         <!-- Build the general public Javadoc -->
         <javadoc packagenames="${javadoc.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
@@ -907,7 +788,7 @@
         </javadoc>
     </target>
 
-    <target name="javadoc.spec" depends="load.user.properties,init">
+    <target name="javadoc.spec" depends="init">
         <!-- Build the specification Javadoc -->
         <javadoc packagenames="${javadoc.spec.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
@@ -921,7 +802,7 @@
         </javadoc>
     </target>
                                                                                                                                    
-    <target name="javadoc.dev" depends="load.user.properties,init">
+    <target name="javadoc.dev" depends="init">
         <!-- Build the internal developer Javadoc -->
         <javadoc packagenames="${javadoc.dev.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
@@ -943,7 +824,7 @@
       -->
     <target name="clean" description="Remove all build products" depends="declare.common">
         <delete includeEmptyDirs="true" quiet="true">
-            <fileset dir="${build}" />
+            <fileset dir="${build.nativewindow}" />
             <fileset dir="${javadoc}" />
             <fileset dir="${javadoc.spec}" />
             <fileset dir="${javadoc.dev}" />
@@ -954,22 +835,11 @@
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build NativeWindow JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.nativewindow,generate.version.txt" />
-
-    <target name="setup-version-RI" if="nativewindow.ri">
-        <property name="tmp.version" value="${nativewindow_base_version}" />
-    </target>
-
-    <target name="setup-version-non-RI" unless="nativewindow.ri">
-        <tstamp>
-             <format property="version.timestamp" pattern="yyyyMMdd"/>
-        </tstamp>
-        <property name="tmp.version" value="${nativewindow_base_version}-pre-${version.timestamp}" />
-    </target>
+    <target name="all" description="Build NativeWindow JAR file(s) and native libraries." depends="init,jar,c.build.nativewindow,generate.version.txt" />
 
-    <target name="generate.version.txt" depends="setup-version-RI,setup-version-non-RI">
+    <target name="generate.version.txt" depends="init">
         <!-- Create a version.txt file indicating which version we just built -->
-        <echo message="${tmp.version}" file="${build}/version.txt" />
+        <echo message="${nativewindow.version}" file="${build.nativewindow}/version.txt" />
     </target>
 
     <!-- ================================================================== -->
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 782ff158d..d8f8c2b60 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -56,27 +56,13 @@
    -->
 <project name="NEWT" basedir="." default="all">
 
-  <import file="versions.xml" />
-
-  <!-- Pull in GlueGen cpptasks build file -->
-  <property name="gluegen.root" value="../../gluegen" />
-  <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
+    <import file="build-common.xml"/>
 
     <!-- ================================================================== -->
     <!--
        - Base initialization and detection of operating system.
       -->
-    <target name="base.init" depends="gluegen.cpptasks.detect.os">
-
-        <property name="javac.bootclasspath-cdc.jar" value="${gluegen.root}/make/lib/cdc_fp.jar"/>
-
-        <condition property="setup.nodesktop">
-            <and>
-                <isfalse value="${isWindows}" />
-                <isfalse value="${isOSX}" />
-                <isfalse value="${isX11}" />
-            </and>
-        </condition>
+    <target name="base.init" depends="common.init">
 
         <condition property="setup.nonatives">
             <and>
@@ -89,16 +75,14 @@
             </and>
         </condition>
 
-        <echo message="setup.nonatives: ${setup.nonatives}" />
-        <echo message="setup.nodesktop: ${setup.nodesktop}" />
-        <echo message="setup.noCDC: ${setup.noCDC}" />
-        <echo message="setup.noAWT: ${setup.noAWT}" />
         <echo message="setup.noOpenGL: ${setup.noOpenGL}" />
-        <echo message="javac.bootclasspath-cdc.jar: ${javac.bootclasspath-cdc.jar}" />
+        <echo message="isWindows: ${isWindows}" />
+        <echo message="isOSX: ${isOSX}" />
         <echo message="isX11: ${isX11}" />
         <echo message="useKD: ${useKD}" />
         <echo message="useIntelGDL: ${useIntelGDL}" />
         <echo message="useBroadcomEGL: ${useBroadcomEGL}" />
+        <echo message="setup.nonatives: ${setup.nonatives}" />
 
         <!-- partitioning -->
 
@@ -145,127 +129,28 @@
         <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl} ${java.excludes.desktop}" />
         <echo message="java.excludes.all: ${java.excludes.all}" />
 
-
-        <!-- Set the project root directory to be up one directory. -->
-        <property name="project.root" value=".." />
-
-        <!-- Set the configuration and build files to this directory. -->
-        <property name="make" value="." />
-    </target>
-
-    <target name="base.init.sourcelevel.1">
-        <property name="newt.sourcelevel" value="1.4" />
-    </target>
-
-    <!--target name="base.init.sourcelevel.2" if="gluegen.nsig">
-        <property name="newt.sourcelevel" value="1.5" />
-    </target-->
-
-    <!-- ================================================================== -->
-    <!--
-       - Load user properties which override build defaults.
-      -->
-    <target name="load.user.properties" depends="base.init,base.init.sourcelevel.1" unless="user.properties.file">
-        <!-- Load the user specified properties file that defines various host
-           - specific paths.  The user will be notified if this is does not
-           - exist. -->
-        <property name="user.properties.file" value="${user.home}/newt.properties" />
-        <property file="${user.properties.file}" />
-        <echo message="Loaded ${user.properties.file}." />
-        <property file="${user.home}/gluegen.properties" />
-        <echo message="Loaded ${user.home}/gluegen.properties." />
     </target>
 
     <!-- ================================================================== -->
     <!--
        - Declare all paths and user defined variables.
       -->
-    <target name="declare.common" description="Declare properties" depends="load.user.properties">
-        <!-- The location and name of the configuration ANT file that will
-           - validate to ensure that all user-define variables are set. -->
-        <property name="validate.user.properties" value="${make}/validate-properties.xml" />
-
-        <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
-        <property name="javacdebug"       value="true" />
-        <property name="javacdebuglevel"  value="source,lines" />
-
-        <!-- Names of directories relative to the project root.
-             Some of these are used in FileMappers later for dependence information
-             and need exact string matching, which is why they use file.separator
-             instead of "/". -->
-        <condition property="rootrel.build" value="build">
-          <not>
-              <isset property="rootrel.build"/>
-          </not>
-        </condition>
-        <property name="rootrel.build.newt" value="${rootrel.build}/newt" />
+    <target name="declare.common" description="Declare properties" depends="base.init">
         <property name="rootrel.src" value="src/newt" />
         <property name="rootrel.src.java" value="${rootrel.src}/classes" />
         <property name="rootrel.src.c" value="${rootrel.src}/native" />
-        <property name="rootrel.obj" value="${rootrel.build.newt}/obj" />
-
-        <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
-        <property name="nativewindow.core.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.jar" />
-        <property name="nativewindow.os.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.os.x11.jar" />
-        <property name="nativewindow.awt.jar" value="../${rootrel.build}/nativewindow/nativewindow.awt.jar" />
-        <property name="jogl.core.jar" value="../${rootrel.build}/jogl/jogl.core.jar" />
-        <property name="jogl.egl.jar" value="../${rootrel.build}/jogl/jogl.egl.jar" />
-
-        <property name="gluegen-rt-cdc.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt-cdc.jar" />
-        <property name="nativewindow.core.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.cdc.jar" />
-        <property name="nativewindow.os.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.os.x11.cdc.jar" />
-        <property name="jogl.core.cdc.jar" value="../${rootrel.build}/jogl/jogl.core.cdc.jar" />
-        <property name="jogl.egl.cdc.jar" value="../${rootrel.build}/jogl/jogl.egl.cdc.jar" />
 
         <!-- The source directories. -->
         <property name="src.java" value="${project.root}/${rootrel.src.java}" />
         <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
-        <property name="build"    value="${project.root}/${rootrel.build.newt}" />
 
         <!-- The generated source directories. -->
-        <property name="src.generated" value="${build}/gensrc" />
+        <property name="src.generated" value="${build.newt}/gensrc" />
         <property name="src.generated.c" value="${src.generated}/native/newt" />
 
         <!-- The compiler output directories. -->
-        <property name="classes" value="${build}/classes" />
-        <property name="classes-cdc" value="${build}/classes-cdc" />
-        <property name="obj"      value="${project.root}/${rootrel.obj}" />
-
-        <path id="nativewindow_gluegen_jogl.classpath">
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${nativewindow.core.jar}" />
-            <pathelement location="${nativewindow.os.x11.jar}" />
-            <pathelement location="${nativewindow.awt.jar}" />
-            <pathelement location="${jogl.core.jar}" />
-            <pathelement location="${jogl.egl.jar}" />
-        </path>
-
-        <path id="nativewindow_gluegen_jogl.classpath-cdc">
-            <pathelement location="${gluegen-rt-cdc.jar}" />
-            <pathelement location="${nativewindow.core.cdc.jar}" />
-            <pathelement location="${nativewindow.os.x11.cdc.jar}" />
-            <pathelement location="${jogl.core.cdc.jar}" />
-            <pathelement location="${jogl.egl.cdc.jar}" />
-        </path>
-
-        <!-- The resulting newt.jar. -->
-        <property name="newt.core.jar" value="${build}/newt.core.jar" />
-        <property name="newt.os.x11.jar"  value="${build}/newt.os.x11.jar" />
-        <property name="newt.os.win.jar"  value="${build}/newt.os.win.jar" />
-        <property name="newt.os.osx.jar"  value="${build}/newt.os.osx.jar" />
-        <property name="newt.ogl.jar"  value="${build}/newt.ogl.jar" />
-        <property name="newt.broadcomegl.jar"  value="${build}/newt.broadcomegl.jar" />
-        <property name="newt.awt.jar"  value="${build}/newt.awt.jar" />
-        <property name="newt.all.jar"  value="${build}/newt.all.jar" />
-        <property name="newt.all-noawt.jar"  value="${build}/newt.all-noawt.jar" />
-
-        <property name="newt.core.cdc.jar" value="${build}/newt.core.cdc.jar" />
-        <property name="newt.os.x11.cdc.jar"  value="${build}/newt.os.x11.cdc.jar" />
-        <property name="newt.os.win.cdc.jar"  value="${build}/newt.os.win.cdc.jar" />
-        <property name="newt.os.osx.cdc.jar"  value="${build}/newt.os.osx.cdc.jar" />
-        <property name="newt.ogl.cdc.jar"  value="${build}/newt.ogl.cdc.jar" />
-        <property name="newt.broadcomegl.cdc.jar"  value="${build}/newt.broadcomegl.cdc.jar" />
-        <property name="newt.all.cdc.jar" value="${build}/newt.all.cdc.jar" />
+        <property name="classes" value="${build.newt}/classes" />
+        <property name="classes-cdc" value="${build.newt}/classes-cdc" />
 
         <!-- The javadoc dirs. -->
         <property name="javadoc" value="${project.root}/javadoc_newt_public" />
@@ -288,9 +173,6 @@
        - required directories.
       -->
     <target name="init" depends="declare.common">
-        <!-- Call the external config validator script to make sure the config is ok and consistent -->
-        <ant antfile="${validate.user.properties}" inheritall="true"/>
-
         <mkdir dir="${src.generated.c}" />
         <mkdir dir="${src.generated.c}/X11" />
         <mkdir dir="${src.generated.c}/MacOSX" />
@@ -300,7 +182,7 @@
         <mkdir dir="${src.generated.c}/BroadcomEGL" />
         <mkdir dir="${classes}" />
         <mkdir dir="${classes-cdc}" />
-        <mkdir dir="${obj}" />
+        <mkdir dir="${obj.newt}" />
     </target>
 
     <!-- ================================================================== -->
@@ -311,9 +193,9 @@
         <!-- Perform the second pass Java compile; everything. -->
         <javac destdir="${classes}"
                excludes="${java.excludes.all}"
-               source="${newt.sourcelevel}"
+               source="${target.sourcelevel}"
                fork="yes"
-               memoryMaximumSize="128m"
+               memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${src.java}" />
             <classpath refid="nativewindow_gluegen_jogl.classpath"/>
@@ -324,10 +206,10 @@
         <!-- Perform the first pass Java compile; everything -->
         <javac destdir="${classes-cdc}"
                excludes="${java.excludes.all} ${java.excludes.cdcfp}"
-               source="${newt.sourcelevel}"
+               source="${target.sourcelevel}"
                bootclasspath="${javac.bootclasspath-cdc.jar}"
                fork="yes"
-               memoryMaximumSize="128m"
+               memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen_jogl.classpath-cdc"/>
             <src path="${src.java}" />
@@ -531,8 +413,8 @@
         <echo message="Compiling @{output.lib.name}" />
 
         <cc outtype="shared"
-            objdir="${obj}"
-            outfile="${obj}/@{output.lib.name}"
+            objdir="${obj.newt}"
+            outfile="${obj.newt}/@{output.lib.name}"
             optimize="${c.compiler.optimise}"
             debug="${c.compiler.debug}"
             multithreaded="true"
@@ -568,24 +450,24 @@
           </compiler>
 
           <linker extends="@{linker.cfg.id}">
-            <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
-            <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
+            <syslibset dir="${java.lib.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
+            <syslibset dir="${java.lib.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
           </linker>
         </cc>
 
         <!-- FIXME: this is a hack; the cpptask should have an option to change the
              suffix or at least understand the override from dylib to jnilib -->
         <antcall target="rename.dylib" inheritRefs="true">
-            <param name="src"  value="${build}/obj/lib@{output.lib.name}.dylib" />
-            <param name="dest" value="${build}/obj/lib@{output.lib.name}.jnilib" />
-            <param name="dest-cdc" value="${build}/obj/lib@{output.lib.name}.so" />
+            <param name="src"  value="${obj.newt}/lib@{output.lib.name}.dylib" />
+            <param name="dest" value="${obj.newt}/lib@{output.lib.name}.jnilib" />
+            <param name="dest-cdc" value="${obj.newt}/lib@{output.lib.name}.so" />
         </antcall>
 
         <!-- FIXME: this is a hack; the cpptask should have an option to change the
              suffix or at least understand the override from dylib to jnilib -->
         <antcall target="rename.mingw.dll" inheritRefs="true">
-            <param name="src"  value="${build}/obj/lib@{output.lib.name}.so" />
-            <param name="dest" value="${build}/obj/@{output.lib.name}.dll" />
+            <param name="src"  value="${obj.newt}/lib@{output.lib.name}.so" />
+            <param name="dest" value="${obj.newt}/@{output.lib.name}.dll" />
         </antcall>
       </sequential>
     </macrodef>
@@ -621,7 +503,7 @@
 
     <target name="c.manifest" if="isVC8Family">
       <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll -->
-      <msvc.manifest objdir="${obj}" dllname="newt" />
+      <msvc.manifest objdir="${obj.newt}" dllname="newt" />
     </target>
 
     <target name="c.build.newt.natives" depends="c.build.newt.windowlib" unless="setup.nonatives">
@@ -629,18 +511,18 @@
 
     <target name="c.build.newt" depends="c.configure,c.build.newt.prepare,c.build.newt.natives">
       <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
-          <param name="libdir" value="${obj}"/>
+          <param name="libdir" value="${obj.newt}"/>
       </antcall>
 
       <antcall target="c.manifest" inheritRefs="true" />
       <!-- Create the Java Web Start jar file for the built native code -->
-      <jar destfile="${build}/newt-natives-${os.and.arch}.jar" filesonly="true">
-        <fileset dir="${obj}">
+      <jar destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true">
+        <fileset dir="${obj.newt}">
           <include name="*.${native.library.suffix}" />
         </fileset>
       </jar>
-      <jar destfile="${build}/newt-natives-${os.and.arch}-cdc.jar" filesonly="true">
-        <fileset dir="${obj}">
+      <jar destfile="${build.newt}/newt-natives-${os.and.arch}-cdc.jar" filesonly="true">
+        <fileset dir="${obj.newt}">
           <include name="*.${native.library.suffix-cdc}" />
         </fileset>
       </jar>
@@ -661,14 +543,11 @@
             <isset property="newt.ri" />
           </not>
         </condition>
-        <tstamp>
-             <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
-        </tstamp>
         <copy file="${manifestfile}"
           tofile="tempversion"
           overwrite="true">
           <filterset>
-              <filter token="VERSION" value="${newt_base_version}-pre-${timestamp}"/>
+              <filter token="VERSION" value="${newt.version}"/>
               <filter token="BASEVERSION" value="${newt_base_version}"/>
           </filterset>
         </copy>
@@ -683,14 +562,11 @@
             <isset property="newt.ri" />
           </not>
         </condition>
-        <tstamp>
-             <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
-        </tstamp>
         <copy file="${manifestfile}"
           tofile="tempversion-cdc"
           overwrite="true">
           <filterset>
-              <filter token="VERSION" value="${newt_base_version}-pre-${timestamp}"/>
+              <filter token="VERSION" value="${newt.version}"/>
               <filter token="BASEVERSION" value="${newt_base_version}"/>
           </filterset>
         </copy>
@@ -800,7 +676,7 @@
        -        on the platform specific build targets.  To circumvent any
        -        errors, ensure that the source is built first.
       -->
-    <target name="javadoc" depends="load.user.properties,init">
+    <target name="javadoc" depends="init">
         <!-- Build the general Javadoc -->
         <javadoc packagenames="${javadoc.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
@@ -814,7 +690,7 @@
         </javadoc>
     </target>
 
-    <target name="javadoc.spec" depends="load.user.properties,init">
+    <target name="javadoc.spec" depends="init">
         <!-- Build the general Javadoc -->
         <javadoc packagenames="${javadoc.spec.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
@@ -828,7 +704,7 @@
         </javadoc>
     </target>
 
-    <target name="javadoc.dev" depends="load.user.properties,init">
+    <target name="javadoc.dev" depends="init">
         <!-- Build the internal developer Javadoc -->
         <javadoc packagenames="${javadoc.dev.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
@@ -850,7 +726,7 @@
       -->
     <target name="clean" description="Remove all build products" depends="declare.common">
         <delete includeEmptyDirs="true" quiet="true">
-            <fileset dir="${build}" />
+            <fileset dir="${build.newt}" />
             <fileset dir="${javadoc}" />
             <fileset dir="${javadoc.spec}" />
             <fileset dir="${javadoc.dev}" />
@@ -861,22 +737,11 @@
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.newt,generate.version.txt" />
-
-    <target name="setup-version-RI" if="newt.ri">
-        <property name="tmp.version" value="${newt_base_version}" />
-    </target>
-
-    <target name="setup-version-non-RI" unless="newt.ri">
-        <tstamp>
-             <format property="version.timestamp" pattern="yyyyMMdd"/>
-        </tstamp>
-        <property name="tmp.version" value="${newt_base_version}-pre-${version.timestamp}" />
-    </target>
+    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="init,jar,c.build.newt,generate.version.txt" />
 
-    <target name="generate.version.txt" depends="setup-version-RI,setup-version-non-RI">
+    <target name="generate.version.txt" depends="init">
         <!-- Create a version.txt file indicating which version we just built -->
-        <echo message="${tmp.version}" file="${build}/version.txt" />
+        <echo message="${newt.version}" file="${build.newt}/version.txt" />
     </target>
 
     <!-- ================================================================== -->
diff --git a/make/build.xml b/make/build.xml
index 54b6a8e67..206d46d34 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -1,33 +1,9 @@
 
 <project name="JOGL_ALL" basedir="." default="all">
 
-    <import file="versions.xml" />
-
-  <!-- Pull in GlueGen cpptasks build file to pick up os.and.arch -->
-  <property name="gluegen.root" value="../../gluegen" />
-  <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
-
-    <target name="init">
-        <property name="project.root" value=".." />
-        <condition property="rootrel.build" value="build">
-          <not>
-              <isset property="rootrel.build"/>
-          </not>
-        </condition>
-        <property name="build" value="${project.root}/${rootrel.build}" />
-        <property name="src" value="${project.root}/src" />
-
-        <property name="nativewindow.make.dir" value="." />
-        <property name="nativewindow.build.xml" value="${nativewindow.make.dir}/build-nativewindow.xml" />
-        <property name="jogl.make.dir" value="." />
-        <property name="jogl.build.xml" value="${jogl.make.dir}/build-jogl.xml" />
-        <property name="newt.make.dir" value="." />
-        <property name="newt.build.xml" value="${newt.make.dir}/build-newt.xml" />
-
-        <property name="all.srcj.path" value="${src}/nativewindow/classes;${src}/jogl/classes;${src}/newt/classes" />
-        <!-- No generated classes for Newt at the present time -->
-        <property name="all.genj.path" value="${build}/nativewindow/gensrc/classes;${build}/jogl/gensrc/classes" />
+    <import file="build-common.xml"/>
 
+    <target name="init" depends="common.init">
         <!-- The javadoc dirs. -->
         <property name="javadoc" value="${project.root}/javadoc_public" />
         <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
@@ -51,42 +27,28 @@
         <property name="java.excludes.javadoc.packagenames" value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
         <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
 
-        <property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" />
-        <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
-        <property name="nativewindow.all.jar" value="../${rootrel.build}/nativewindow/nativewindow.all.jar" />
-        <property name="jogl.all.jar" value="../${rootrel.build}/jogl/jogl.all.jar" />
-        <property name="newt.all.jar" value="../${rootrel.build}/newt/newt.all.jar" />
-
-        <path id="all.classpath">
-            <pathelement location="${nativewindow.all.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${jogl.all.jar}" />
-            <pathelement location="${newt.all.jar}" />
-        </path>
-
     </target>
 
     <target name="build.nativewindow" depends="init">
-        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make.dir}" target="all" inheritAll="false"/>
+        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="all" inheritAll="false"/>
     </target>
 
     <target name="build.jogl" depends="init">
-        <ant antfile="${jogl.build.xml}" dir="${jogl.make.dir}" target="all" inheritAll="false"/>
+        <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="all" inheritAll="false"/>
     </target>
 
     <target name="junit.run.jogl" depends="init">
-        <ant antfile="${jogl.build.xml}" dir="${jogl.make.dir}" target="junit.run" inheritAll="false"/>
+        <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="junit.run" inheritAll="false"/>
     </target>
 
     <target name="build.newt" depends="init">
-        <ant antfile="${newt.build.xml}" dir="${newt.make.dir}" target="all" inheritAll="false"/>
+        <ant antfile="${newt.build.xml}" dir="${newt.make}" target="all" inheritAll="false"/>
     </target>
 
     <target name="one-lib-dir" depends="init,gluegen.cpptasks.detect.os">
-        <property name="lib.dir" value="${build}/lib" />
-        <delete includeEmptyDirs="true" quiet="true" dir="${lib.dir}" failonerror="false" />
-        <mkdir dir="${lib.dir}" />
-        <copy todir="${lib.dir}">
+        <delete includeEmptyDirs="true" quiet="true" dir="${lib}" failonerror="false" />
+        <mkdir dir="${lib}" />
+        <copy todir="${lib}">
             <fileset dir="${gluegen.root}/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
             <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
             <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
@@ -100,36 +62,23 @@
        - This must be called after all of the build targets complete.
       -->
 
-    <target name="setup-version-RI" if="jogl.ri">
-        <property name="tmp.version" value="${jogl_base_version}" />
-    </target>
-
-    <target name="setup-version-non-RI" unless="jogl.ri">
-        <tstamp>
-             <format property="timestamp" pattern="yyyyMMdd"/>
-        </tstamp>
-        <property name="tmp.version" value="${jogl_base_version}-pre-${timestamp}" />
-    </target>
-
-    <target name="developer-zip-archive" depends="gluegen.cpptasks.detect.os,setup-version-RI,setup-version-non-RI" unless="build.noarchives">
-        <property name="archive.name" value="jogl-${tmp.version}-${os.and.arch}" />
-        <property name="archive.dir" value="${build}/${archive.name}" />
-        <delete includeEmptyDirs="true" quiet="true" dir="${archive.dir}" failonerror="false" />
-        <mkdir dir="${archive.dir}" />
+    <target name="developer-zip-archive" depends="init" unless="build.noarchives">
+        <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
+        <mkdir dir="${archive}" />
         <!-- Copy the appropriate pieces into the archive directory -->
-        <copy file="../CHANGELOG.txt"  todir="${archive.dir}" />
-        <copy file="../COPYRIGHT.txt"  todir="${archive.dir}" />
-        <copy file="../LICENSE.txt"    todir="${archive.dir}" />
-        <copy file="../doc/userguide/index.html" tofile="${archive.dir}/Userguide.html" />
+        <copy file="../CHANGELOG.txt"  todir="${archive}" />
+        <copy file="../COPYRIGHT.txt"  todir="${archive}" />
+        <copy file="../LICENSE.txt"    todir="${archive}" />
+        <copy file="../doc/userguide/index.html" tofile="${archive}/Userguide.html" />
         <copy file="README-zip-bundles.txt"
-            tofile="${archive.dir}/README.txt"
+            tofile="${archive}/README.txt"
             overwrite="true">
             <filterset>
-                <filter token="VERSION" value="${tmp.version}"/>
+                <filter token="VERSION" value="${jogl.version}"/>
             </filterset>
         </copy>
-        <mkdir dir="${archive.dir}/lib" />
-        <copy todir="${archive.dir}/lib">
+        <mkdir dir="${archive}/lib" />
+        <copy todir="${archive}/lib">
             <fileset dir="${gluegen.root}/${rootrel.build}" includes="gluegen-rt.jar gluegen-rt-cdc.jar" />
             <fileset dir="${gluegen.root}/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
             <fileset dir="${build}/jogl" includes="*.jar" excludes="*natives*.jar" />
@@ -139,8 +88,8 @@
             <fileset dir="${build}/newt" includes="*.jar" excludes="*natives*.jar" />
             <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
         </copy>
-        <mkdir dir="${archive.dir}/etc" />
-        <copy todir="${archive.dir}/etc">
+        <mkdir dir="${archive}/etc" />
+        <copy todir="${archive}/etc">
             <fileset dir="${project.root}/etc" includes="*" />
         </copy>
         <delete quiet="true" file="${build}/${archive.name}.zip"/>
@@ -148,7 +97,7 @@
              basedir="${build}"
              includes="${archive.name}/**" />
         <!-- Clean up after ourselves -->
-        <delete includeEmptyDirs="true" quiet="true" dir="${archive.dir}" failonerror="false" />
+        <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
     </target>
 
     <!-- ================================================================== -->
@@ -157,20 +106,20 @@
        - This must be called after all of the build targets complete.
       -->
 
-    <target name="source-archive" depends="setup-version-RI,setup-version-non-RI" unless="build.noarchives">
+    <target name="source-archive" depends="init" unless="build.noarchives">
         <!-- NOTE that if you are using multiple rootrel.build directories within the same
              repository, the exclude lists here won't work well enough and you will wind up
              archiving binary bits from other rootrel.build settings in the source archive.
              This is inevitable given that we don't want to specialize this target to
              explicitly include top level files and directories, to make it future-proof. -->
-        <delete quiet="true" file="${build}/jogl-${tmp.version}-src.zip"/>
-        <zip destfile="${build}/jogl-${tmp.version}-src.zip"
+        <delete quiet="true" file="${build}/jogl-${jogl.version}-src.zip"/>
+        <zip destfile="${build}/jogl-${jogl.version}-src.zip"
              basedir="${project.root}/.."
              excludes="${gluegen.root}/${rootrel.build}/**,${gluegen.root}/build/**${gluegen.root}/build-temp/**,jogl/${rootrel.build}/**,jogl/build/**,jogl/build-temp/**,jogl/www/**"
              includes="${gluegen.root}/**, jogl/**" />
         <!-- Now add in certain portions of the generated source code for developers -->
         <zip update="true"
-             destfile="${build}/jogl-${tmp.version}-src.zip"
+             destfile="${build}/jogl-${jogl.version}-src.zip"
              basedir="${project.root}/.."
              includes="jogl/${rootrel.build}/jogl/gensrc/classes/javax/media/opengl/**" />
     </target>
@@ -185,9 +134,9 @@
     <target name="junit.run" description="Run JUNIT tests in nativewindow, jogl and newt projects" depends="init,junit.run.jogl" />
 
     <target name="clean" depends="init">
-        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make.dir}" target="clean" inheritAll="false"/>
-        <ant antfile="${jogl.build.xml}" dir="${jogl.make.dir}" target="clean" inheritAll="false"/>
-        <ant antfile="${newt.build.xml}" dir="${newt.make.dir}" target="clean" inheritAll="false"/>
+        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="clean" inheritAll="false"/>
+        <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="clean" inheritAll="false"/>
+        <ant antfile="${newt.build.xml}" dir="${newt.make}" target="clean" inheritAll="false"/>
         <delete includeEmptyDirs="true" quiet="true">
             <fileset dir="${build}" />
         </delete>
@@ -203,7 +152,7 @@
                  source="1.4"
                  maxmemory="512m"
                  bottom="${javadoc.bottom}" >
-            <classpath refid="all.classpath"/>
+            <classpath refid="jogl_newt_all.classpath"/>
             <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
             <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
@@ -220,7 +169,7 @@
                  source="1.4"
                  maxmemory="512m"
                  bottom="${javadoc.bottom}" >
-            <classpath refid="all.classpath"/>
+            <classpath refid="jogl_newt_all.classpath"/>
             <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
             <link offline="false" href="${javadoc.nw.spec}" />
@@ -238,7 +187,7 @@
                  source="1.4"
                  maxmemory="512m"
                  bottom="${javadoc.bottom}" >
-            <classpath refid="all.classpath"/>
+            <classpath refid="jogl_newt_all.classpath"/>
             <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
             <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
@@ -255,7 +204,7 @@
                  source="1.4"
                  maxmemory="512m"
                  bottom="${javadoc.bottom}" >
-            <classpath refid="all.classpath"/>
+            <classpath refid="jogl_newt_all.classpath"/>
             <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
             <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
diff --git a/make/versions.xml b/make/versions.xml
index 0ee07bfe0..75c035f5a 100644
--- a/make/versions.xml
+++ b/make/versions.xml
@@ -19,7 +19,6 @@
        official release builds and intermediate release builds, but
        commented out for nightly builds. -->
   <!-- <property name="jogl.ri" value="true" /> -->
-  <property name="jogl.ri" value="true" />
 
   <!-- Base version of the NativeWindow interface, following the same
        rules as above -->
@@ -31,7 +30,6 @@
        official release builds and intermediate release builds, but
        commented out for nightly builds. -->
   <!-- <property name="nativewindow.ri" value="true" /> -->
-  <property name="nativewindow.ri" value="true" />
 
   <!-- Base version of the Newt library, following the same
        rules as above -->
@@ -44,6 +42,5 @@
        official release builds and intermediate release builds, but
        commented out for nightly builds.  -->
   <!-- <property name="newt.ri" value="true" /> -->
-  <property name="newt.ri" value="true" />
 
 </project>
diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
deleted file mode 100755
index 56d669756..000000000
--- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name Sven Gothel or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.jogamp.opengl.test.junit.texture.awt;
-
-import com.jogamp.opengl.test.junit.texture.util.gl2.TextureGL2ListenerDraw1;
-
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2ES1;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.awt.GLCanvas;
-import com.jogamp.opengl.util.texture.Texture;
-import com.jogamp.opengl.util.texture.TextureCoords;
-import com.jogamp.opengl.util.texture.TextureData;
-import com.jogamp.opengl.util.texture.TextureIO;
-import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
-import com.jogamp.opengl.util.Animator;
-
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Frame;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Texture1 {
-    Frame frame;
-    BufferedImage textureImage;
-
-    @Before
-    public void init() {
-        // create base image
-        BufferedImage baseImage = new BufferedImage(256, 256, BufferedImage.TYPE_INT_RGB);
-        Graphics2D g = baseImage.createGraphics();
-        g.setPaint(new GradientPaint(0, 0, Color.CYAN,
-                                 baseImage.getWidth(), baseImage.getHeight(), Color.BLUE));
-        g.fillRect(0, 0, baseImage.getWidth(), baseImage.getHeight());
-        g.dispose();
-
-        // create texture image
-        int imageType = BufferedImage.TYPE_INT_RGB;
-        textureImage = new BufferedImage(baseImage.getWidth(),
-                                         baseImage.getHeight(),
-                                         imageType);
-        g = textureImage.createGraphics();
-        g.setComposite(AlphaComposite.Src);
-        g.drawImage(baseImage, 0, 0, null);
-        g.dispose();
-
-        frame = new Frame("Texture Test");
-    }
-
-    @Test
-    public void test1() {
-        GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2GL3));
-        GLCanvas glCanvas = new GLCanvas(caps);
-        frame.add(glCanvas);
-        frame.setSize(512, 512);
-
-        // create texture    
-        TextureData textureData = AWTTextureIO.newTextureData(caps.getGLProfile(), textureImage, false);
-        glCanvas.addGLEventListener(new TextureGL2ListenerDraw1(textureData));
-
-        Animator animator = new Animator(glCanvas);
-        frame.setVisible(true);
-        animator.start();
-
-        try {
-            Thread.sleep(100); // 100 ms
-        } catch (Exception e) {}
-
-        animator.stop();
-        frame.setVisible(false);
-
-        frame.remove(glCanvas);
-        frame.dispose();
-        frame=null;
-    }
-
-    public static void main(String args[]) {
-        org.junit.runner.JUnitCore.main(Texture1.class.getName());
-    }
-}
diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
deleted file mode 100755
index bdb8bd95a..000000000
--- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name Sven Gothel or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.jogamp.opengl.test.junit.texture.util.gl2;
-
-import com.jogamp.opengl.util.texture.Texture;
-import com.jogamp.opengl.util.texture.TextureCoords;
-import com.jogamp.opengl.util.texture.TextureData;
-import com.jogamp.opengl.util.texture.TextureIO;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2ES1;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.glu.GLU;
-
-public class TextureGL2ListenerDraw1 implements GLEventListener {
-    private GLU      glu = new GLU();
-    private TextureData textureData;
-    private Texture  texture;
-    
-    public TextureGL2ListenerDraw1(TextureData td) {
-        this.textureData = td;
-    }
-
-    public void init(GLAutoDrawable drawable) {
-        this.texture = TextureIO.newTexture(textureData);
-    }
-
-    public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
-        GL2 gl = drawable.getGL().getGL2();
-        gl.glMatrixMode(GL2ES1.GL_PROJECTION);
-        gl.glLoadIdentity();
-        glu.gluOrtho2D(0, 1, 0, 1);
-        gl.glMatrixMode(GL2ES1.GL_MODELVIEW);
-        gl.glLoadIdentity();
-    }
-
-    public void dispose(GLAutoDrawable drawable) {
-        GL2 gl = drawable.getGL().getGL2();
-        if(null!=texture) {
-            texture.disable();
-            texture.destroy(gl);
-        }
-        if(null!=textureData) {
-            textureData.destroy();
-        }
-    }
-
-    public void display(GLAutoDrawable drawable) {
-        GL2 gl = drawable.getGL().getGL2();
-
-        // need a valid GL context for this ..
-
-        /** OpenGL ..
-        texture.updateSubImage(textureData, 0,
-                               20, 20, 
-                               20, 20,
-                               100, 100); */
-
-    
-        // Now draw one quad with the texture
-        texture.enable();
-        texture.bind();
-        gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_REPLACE);
-        TextureCoords coords = texture.getImageTexCoords();
-        gl.glBegin(GL2.GL_QUADS);
-        gl.glTexCoord2f(coords.left(), coords.bottom());
-        gl.glVertex3f(0, 0, 0);
-        gl.glTexCoord2f(coords.right(), coords.bottom());
-        gl.glVertex3f(1, 0, 0);
-        gl.glTexCoord2f(coords.right(), coords.top());
-        gl.glVertex3f(1, 1, 0);
-        gl.glTexCoord2f(coords.left(), coords.top());
-        gl.glVertex3f(0, 1, 0);
-        gl.glEnd();
-        texture.disable();
-    }
-}
-
diff --git a/src/junit/com/jogamp/test/junit/jogl/awt/texture/Texture1.java b/src/junit/com/jogamp/test/junit/jogl/awt/texture/Texture1.java
new file mode 100755
index 000000000..6023bf87f
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/awt/texture/Texture1.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.awt.texture;
+
+import com.jogamp.test.junit.jogl.util.texture.gl2.TextureGL2ListenerDraw1;
+
+import javax.media.opengl.GLProfile;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2ES1;
+import javax.media.opengl.GL2;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
+import com.jogamp.opengl.util.Animator;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Frame;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class Texture1 {
+    Frame frame;
+    BufferedImage textureImage;
+
+    @Before
+    public void init() {
+        // create base image
+        BufferedImage baseImage = new BufferedImage(256, 256, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g = baseImage.createGraphics();
+        g.setPaint(new GradientPaint(0, 0, Color.CYAN,
+                                 baseImage.getWidth(), baseImage.getHeight(), Color.BLUE));
+        g.fillRect(0, 0, baseImage.getWidth(), baseImage.getHeight());
+        g.dispose();
+
+        // create texture image
+        int imageType = BufferedImage.TYPE_INT_RGB;
+        textureImage = new BufferedImage(baseImage.getWidth(),
+                                         baseImage.getHeight(),
+                                         imageType);
+        g = textureImage.createGraphics();
+        g.setComposite(AlphaComposite.Src);
+        g.drawImage(baseImage, 0, 0, null);
+        g.dispose();
+
+        frame = new Frame("Texture Test");
+    }
+
+    @Test
+    public void test1() {
+        GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2GL3));
+        GLCanvas glCanvas = new GLCanvas(caps);
+        frame.add(glCanvas);
+        frame.setSize(512, 512);
+
+        // create texture    
+        TextureData textureData = AWTTextureIO.newTextureData(caps.getGLProfile(), textureImage, false);
+        glCanvas.addGLEventListener(new TextureGL2ListenerDraw1(textureData));
+
+        Animator animator = new Animator(glCanvas);
+        frame.setVisible(true);
+        animator.start();
+
+        try {
+            Thread.sleep(100); // 100 ms
+        } catch (Exception e) {}
+
+        animator.stop();
+        frame.setVisible(false);
+
+        frame.remove(glCanvas);
+        frame.dispose();
+        frame=null;
+    }
+
+    public static void main(String args[]) {
+        org.junit.runner.JUnitCore.main(Texture1.class.getName());
+    }
+}
diff --git a/src/junit/com/jogamp/test/junit/jogl/util/texture/gl2/TextureGL2ListenerDraw1.java b/src/junit/com/jogamp/test/junit/jogl/util/texture/gl2/TextureGL2ListenerDraw1.java
new file mode 100755
index 000000000..eabd4b79d
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/util/texture/gl2/TextureGL2ListenerDraw1.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.util.texture.gl2;
+
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2ES1;
+import javax.media.opengl.GL2;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.glu.GLU;
+
+public class TextureGL2ListenerDraw1 implements GLEventListener {
+    private GLU      glu = new GLU();
+    private TextureData textureData;
+    private Texture  texture;
+    
+    public TextureGL2ListenerDraw1(TextureData td) {
+        this.textureData = td;
+    }
+
+    public void init(GLAutoDrawable drawable) {
+        this.texture = TextureIO.newTexture(textureData);
+    }
+
+    public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
+        GL2 gl = drawable.getGL().getGL2();
+        gl.glMatrixMode(GL2ES1.GL_PROJECTION);
+        gl.glLoadIdentity();
+        glu.gluOrtho2D(0, 1, 0, 1);
+        gl.glMatrixMode(GL2ES1.GL_MODELVIEW);
+        gl.glLoadIdentity();
+    }
+
+    public void dispose(GLAutoDrawable drawable) {
+        GL2 gl = drawable.getGL().getGL2();
+        if(null!=texture) {
+            texture.disable();
+            texture.destroy(gl);
+        }
+        if(null!=textureData) {
+            textureData.destroy();
+        }
+    }
+
+    public void display(GLAutoDrawable drawable) {
+        GL2 gl = drawable.getGL().getGL2();
+
+        // need a valid GL context for this ..
+
+        /** OpenGL ..
+        texture.updateSubImage(textureData, 0,
+                               20, 20, 
+                               20, 20,
+                               100, 100); */
+
+    
+        // Now draw one quad with the texture
+        texture.enable();
+        texture.bind();
+        gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_REPLACE);
+        TextureCoords coords = texture.getImageTexCoords();
+        gl.glBegin(GL2.GL_QUADS);
+        gl.glTexCoord2f(coords.left(), coords.bottom());
+        gl.glVertex3f(0, 0, 0);
+        gl.glTexCoord2f(coords.right(), coords.bottom());
+        gl.glVertex3f(1, 0, 0);
+        gl.glTexCoord2f(coords.right(), coords.top());
+        gl.glVertex3f(1, 1, 0);
+        gl.glTexCoord2f(coords.left(), coords.top());
+        gl.glVertex3f(0, 1, 0);
+        gl.glEnd();
+        texture.disable();
+    }
+}
+
-- 
cgit v1.2.3


From fbfbfe34ae3364003873a8fafb8482bb6284efc2 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 9 Apr 2010 02:23:06 +0200
Subject: Added FIXME comment: DBLBUFOFFSCRN, to tag the impl of forcing single
 buffer on offscreen/pbuffer

---
 src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java  | 4 ++--
 .../com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java | 4 ++--
 .../impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java    | 6 +++---
 .../opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
index eaf29df77..c8faf0f65 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
@@ -125,7 +125,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
         throw new GLException("Width and height of pbuffer must be positive (were (" +
                         width + ", " + height + "))");
     }
-    capabilities.setDoubleBuffered(false); // FIXME
+    capabilities.setDoubleBuffered(false); // FIXME DBLBUFOFFSCRN
     capabilities.setOnscreen(false);
     capabilities.setPBuffer(true);
     return createGLPbufferDrawable( createOffscreenWindow(capabilities, chooser, height, height) );
@@ -156,7 +156,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
         throw new GLException("Width and height of pbuffer must be positive (were (" +
                         width + ", " + height + "))");
     }
-    capabilities.setDoubleBuffered(false); // FIXME
+    capabilities.setDoubleBuffered(false); // FIXME DBLBUFOFFSCRN
     capabilities.setOnscreen(false);
     capabilities.setPBuffer(false);
     return createOffscreenDrawable( createOffscreenWindow(capabilities, chooser, width, height) );
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
index f22661238..33e301ee9 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
@@ -99,7 +99,7 @@ public class EGLGraphicsConfigurationFactory extends GraphicsConfigurationFactor
 
         GLCapabilities caps2 = (GLCapabilities) capabilities.clone();
         if(!caps2.isOnscreen()) {
-            // OFFSCREEN !DOUBLE_BUFFER
+            // OFFSCREEN !DOUBLE_BUFFER // FIXME DBLBUFOFFSCRN
             caps2.setDoubleBuffered(false);
         }
 
@@ -273,7 +273,7 @@ public class EGLGraphicsConfigurationFactory extends GraphicsConfigurationFactor
         if(caps.isOnscreen()) {
             throw new GLException("Error: Onscreen set: "+caps);
         }
-        caps.setDoubleBuffered(false); // FIXME
+        caps.setDoubleBuffered(false); // FIXME DBLBUFOFFSCRN
         long eglDisplay = EGL.eglGetDisplay(EGL.EGL_DEFAULT_DISPLAY);
         if (eglDisplay == EGL.EGL_NO_DISPLAY) {
             throw new GLException("Failed to created EGL default display: error 0x"+Integer.toHexString(EGL.eglGetError()));
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
index b82535bfe..563173682 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
@@ -60,13 +60,13 @@ public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfiguratio
 
     protected static WindowsWGLGraphicsConfiguration createDefaultGraphicsConfiguration(AbstractGraphicsScreen absScreen, boolean onscreen, boolean usePBuffer) {
         GLCapabilities caps = new GLCapabilities(null);
-        caps.setDoubleBuffered(onscreen); // FIXME
+        caps.setDoubleBuffered(onscreen); // FIXME DBLBUFOFFSCRN
         caps.setOnscreen  (onscreen);
         caps.setPBuffer   (usePBuffer);
 
         GLCapabilities caps2 = (GLCapabilities) caps.clone();
         if(!caps2.isOnscreen()) {
-            // OFFSCREEN !DOUBLE_BUFFER
+            // OFFSCREEN !DOUBLE_BUFFER // FIXME DBLBUFOFFSCRN
             caps2.setDoubleBuffered(false);
         }
 
@@ -84,7 +84,7 @@ public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfiguratio
         }
         GLCapabilities caps2 = (GLCapabilities) caps.clone();
         if(!caps2.isOnscreen()) {
-            // OFFSCREEN !DOUBLE_BUFFER
+            // OFFSCREEN !DOUBLE_BUFFER // FIXME DBLBUFOFFSCRN
             caps2.setDoubleBuffered(false);
         }
         return new WindowsWGLGraphicsConfiguration(absScreen, caps2, caps, WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(caps2), -1, 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
index 5f438cb7f..16e341652 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
@@ -143,7 +143,7 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
 
         GLCapabilities caps2 = (GLCapabilities) capabilities.clone();
         if(!caps2.isOnscreen()) {
-            // OFFSCREEN !DOUBLE_BUFFER
+            // OFFSCREEN !DOUBLE_BUFFER // FIXME DBLBUFOFFSCRN
             caps2.setDoubleBuffered(false);
         }
     
-- 
cgit v1.2.3


From 049236c5f8ff1500532c7bf64e7d78db031b3ed5 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 9 Apr 2010 02:23:48 +0200
Subject: Fix missing MacOsX Newt refactoring

---
 src/newt/native/MacWindow.m | 60 ++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/newt/native/MacWindow.m b/src/newt/native/MacWindow.m
index 8c9792b19..f0ebfc0a0 100644
--- a/src/newt/native/MacWindow.m
+++ b/src/newt/native/MacWindow.m
@@ -121,11 +121,11 @@ NS_ENDHANDLER
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacDisplay
+ * Class:     com_jogamp_newt_macosx_MacDisplay
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_sun_newt_macosx_MacDisplay_initNSApplication
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_macosx_MacDisplay_initNSApplication
   (JNIEnv *env, jclass clazz)
 {
     static int initialized = 0;
@@ -155,11 +155,11 @@ JNIEXPORT jboolean JNICALL Java_com_sun_newt_macosx_MacDisplay_initNSApplication
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacDisplay
+ * Class:     com_jogamp_newt_macosx_MacDisplay
  * Method:    dispatchMessages0
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacDisplay_dispatchMessages0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_macosx_MacDisplay_dispatchMessages0
   (JNIEnv *env, jobject unused, jlong window, jint eventMask)
 {
     NSEvent* event = NULL;
@@ -195,11 +195,11 @@ NS_ENDHANDLER
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacScreen
+ * Class:     com_jogamp_newt_macosx_MacScreen
  * Method:    getWidthImpl
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_com_sun_newt_macosx_MacScreen_getWidthImpl
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_macosx_MacScreen_getWidthImpl
   (JNIEnv *env, jclass clazz, jint screen_idx)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -216,11 +216,11 @@ JNIEXPORT jint JNICALL Java_com_sun_newt_macosx_MacScreen_getWidthImpl
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacScreen
+ * Class:     com_jogamp_newt_macosx_MacScreen
  * Method:    getHeightImpl
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_com_sun_newt_macosx_MacScreen_getHeightImpl
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_macosx_MacScreen_getHeightImpl
   (JNIEnv *env, jclass clazz, jint screen_idx)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -237,11 +237,11 @@ JNIEXPORT jint JNICALL Java_com_sun_newt_macosx_MacScreen_getHeightImpl
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacWindow
+ * Class:     com_jogamp_newt_macosx_MacWindow
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_sun_newt_macosx_MacWindow_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_macosx_MacWindow_initIDs
   (JNIEnv *env, jclass clazz)
 {
     static int initialized = 0;
@@ -258,11 +258,11 @@ JNIEXPORT jboolean JNICALL Java_com_sun_newt_macosx_MacWindow_initIDs
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacWindow
+ * Class:     com_jogamp_newt_macosx_MacWindow
  * Method:    createWindow0
  * Signature: (JIIIIZIIIJ)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_newt_macosx_MacWindow_createWindow0
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_macosx_MacWindow_createWindow0
   (JNIEnv *env, jobject jthis, jlong parent, jint x, jint y, jint w, jint h, jboolean fullscreen, jint styleMask, 
    jint bufferingType, jint screen_idx, jlong jview)
 {
@@ -334,11 +334,11 @@ NS_ENDHANDLER
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacWindow
+ * Class:     com_jogamp_newt_macosx_MacWindow
  * Method:    makeKeyAndOrderFront
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_makeKeyAndOrderFront
+JNIEXPORT void JNICALL Java_com_jogamp_newt_macosx_MacWindow_makeKeyAndOrderFront
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -348,11 +348,11 @@ JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_makeKeyAndOrderFront
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacWindow
+ * Class:     com_jogamp_newt_macosx_MacWindow
  * Method:    makeKey
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_makeKey
+JNIEXPORT void JNICALL Java_com_jogamp_newt_macosx_MacWindow_makeKey
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -362,11 +362,11 @@ JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_makeKey
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacWindow
+ * Class:     com_jogamp_newt_macosx_MacWindow
  * Method:    orderOut
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_orderOut
+JNIEXPORT void JNICALL Java_com_jogamp_newt_macosx_MacWindow_orderOut
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -376,11 +376,11 @@ JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_orderOut
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacWindow
+ * Class:     com_jogamp_newt_macosx_MacWindow
  * Method:    close0
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_close0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_macosx_MacWindow_close0
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -401,11 +401,11 @@ NS_ENDHANDLER
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacWindow
+ * Class:     com_jogamp_newt_macosx_MacWindow
  * Method:    setTitle0
  * Signature: (JLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_setTitle0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_macosx_MacWindow_setTitle0
   (JNIEnv *env, jobject unused, jlong window, jstring title)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -417,11 +417,11 @@ JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_setTitle0
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacWindow
+ * Class:     com_jogamp_newt_macosx_MacWindow
  * Method:    contentView
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_newt_macosx_MacWindow_contentView
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_macosx_MacWindow_contentView
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -432,11 +432,11 @@ JNIEXPORT jlong JNICALL Java_com_sun_newt_macosx_MacWindow_contentView
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacWindow
+ * Class:     com_jogamp_newt_macosx_MacWindow
  * Method:    changeContentView
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_newt_macosx_MacWindow_changeContentView
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_macosx_MacWindow_changeContentView
   (JNIEnv *env, jobject jthis, jlong parent, jlong window, jlong jview)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -452,11 +452,11 @@ JNIEXPORT jlong JNICALL Java_com_sun_newt_macosx_MacWindow_changeContentView
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacWindow
+ * Class:     com_jogamp_newt_macosx_MacWindow
  * Method:    setContentSize
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_setContentSize
+JNIEXPORT void JNICALL Java_com_jogamp_newt_macosx_MacWindow_setContentSize
   (JNIEnv *env, jobject unused, jlong window, jint w, jint h)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -467,11 +467,11 @@ JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_setContentSize
 }
 
 /*
- * Class:     com_sun_newt_macosx_MacWindow
+ * Class:     com_jogamp_newt_macosx_MacWindow
  * Method:    setFrameTopLeftPoint
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_setFrameTopLeftPoint
+JNIEXPORT void JNICALL Java_com_jogamp_newt_macosx_MacWindow_setFrameTopLeftPoint
   (JNIEnv *env, jobject unused, jlong parent, jlong window, jint x, jint y)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-- 
cgit v1.2.3


From 9ae88158f66b48b257e417c3973ce010c1fc45a8 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 9 Apr 2010 04:13:30 +0200
Subject: Attach build-junit.xml to build.xml ; Add more tests Offscreen(broken
 on ATI), Drawable

---
 make/build-junit.xml                               |   2 -
 make/build.xml                                     |  15 +-
 .../test/junit/jogl/awt/texture/Texture1.java      | 125 ---------
 .../test/junit/jogl/demos/es1/RedSquare.java       | 158 +++++++++++
 .../test/junit/jogl/demos/gl2/gears/Gears.java     | 306 +++++++++++++++++++++
 .../junit/jogl/drawable/TestDrawable01NEWT.java    | 143 ++++++++++
 .../test/junit/jogl/offscreen/ReadBuffer2File.java |  76 +++++
 .../junit/jogl/offscreen/ReadBuffer2Screen.java    | 188 +++++++++++++
 .../test/junit/jogl/offscreen/ReadBufferBase.java  |  91 ++++++
 .../test/junit/jogl/offscreen/ReadBufferUtil.java  | 110 ++++++++
 .../test/junit/jogl/offscreen/Surface2File.java    |  78 ++++++
 .../junit/jogl/offscreen/TestOffscreen01NEWT.java  |  86 ++++++
 .../test/junit/jogl/offscreen/WindowUtilNEWT.java  | 138 ++++++++++
 .../test/junit/jogl/texture/TestTexture01AWT.java  | 125 +++++++++
 .../com/jogamp/test/junit/util/MiscUtils.java      |  64 +++++
 15 files changed, 1572 insertions(+), 133 deletions(-)
 delete mode 100755 src/junit/com/jogamp/test/junit/jogl/awt/texture/Texture1.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/demos/es1/RedSquare.java
 create mode 100644 src/junit/com/jogamp/test/junit/jogl/demos/gl2/gears/Gears.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2Screen.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferBase.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferUtil.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/offscreen/Surface2File.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/texture/TestTexture01AWT.java
 create mode 100644 src/junit/com/jogamp/test/junit/util/MiscUtils.java

diff --git a/make/build-junit.xml b/make/build-junit.xml
index 5b3aae8c2..636035f1d 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -74,11 +74,9 @@
             <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
             <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
             <jvmarg value="-Djogl.debug.GLSLState"/>
-            -->
             <jvmarg value="-Dnativewindow.debug=all"/>
             <jvmarg value="-Djogl.debug=all"/>
             <jvmarg value="-Dnewt.debug=all"/>
-            <!--
             <jvmarg value="-verbose:jni"/> 
             <jvmarg value="-client"/>
             <jvmarg value="-d32"/>
diff --git a/make/build.xml b/make/build.xml
index 206d46d34..e39e6dea2 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -37,10 +37,6 @@
         <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="all" inheritAll="false"/>
     </target>
 
-    <target name="junit.run.jogl" depends="init">
-        <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="junit.run" inheritAll="false"/>
-    </target>
-
     <target name="build.newt" depends="init">
         <ant antfile="${newt.build.xml}" dir="${newt.make}" target="all" inheritAll="false"/>
     </target>
@@ -129,9 +125,16 @@
        - Main build target.
       -->
 
-    <target name="all" description="Build nativewindow, jogl and newt projects" depends="init,build.nativewindow,build.jogl,build.newt,one-lib-dir,developer-zip-archive,source-archive" />
+    <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,junit.compile,one-lib-dir,developer-zip-archive,source-archive" />
 
-    <target name="junit.run" description="Run JUNIT tests in nativewindow, jogl and newt projects" depends="init,junit.run.jogl" />
+    <target name="junit.compile">
+      <ant antfile="build-junit.xml" target="junit.compile"/>
+    </target>
+
+    <target name="test" depends="junit.run"/>
+    <target name="junit.run" description="Run JUNIT tests in nativewindow, jogl and newt projects">
+      <ant antfile="build-junit.xml" target="junit.run"/>
+    </target>
 
     <target name="clean" depends="init">
         <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="clean" inheritAll="false"/>
diff --git a/src/junit/com/jogamp/test/junit/jogl/awt/texture/Texture1.java b/src/junit/com/jogamp/test/junit/jogl/awt/texture/Texture1.java
deleted file mode 100755
index 6023bf87f..000000000
--- a/src/junit/com/jogamp/test/junit/jogl/awt/texture/Texture1.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name Sven Gothel or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.jogamp.test.junit.jogl.awt.texture;
-
-import com.jogamp.test.junit.jogl.util.texture.gl2.TextureGL2ListenerDraw1;
-
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2ES1;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.awt.GLCanvas;
-import com.jogamp.opengl.util.texture.Texture;
-import com.jogamp.opengl.util.texture.TextureCoords;
-import com.jogamp.opengl.util.texture.TextureData;
-import com.jogamp.opengl.util.texture.TextureIO;
-import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
-import com.jogamp.opengl.util.Animator;
-
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Frame;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Texture1 {
-    Frame frame;
-    BufferedImage textureImage;
-
-    @Before
-    public void init() {
-        // create base image
-        BufferedImage baseImage = new BufferedImage(256, 256, BufferedImage.TYPE_INT_RGB);
-        Graphics2D g = baseImage.createGraphics();
-        g.setPaint(new GradientPaint(0, 0, Color.CYAN,
-                                 baseImage.getWidth(), baseImage.getHeight(), Color.BLUE));
-        g.fillRect(0, 0, baseImage.getWidth(), baseImage.getHeight());
-        g.dispose();
-
-        // create texture image
-        int imageType = BufferedImage.TYPE_INT_RGB;
-        textureImage = new BufferedImage(baseImage.getWidth(),
-                                         baseImage.getHeight(),
-                                         imageType);
-        g = textureImage.createGraphics();
-        g.setComposite(AlphaComposite.Src);
-        g.drawImage(baseImage, 0, 0, null);
-        g.dispose();
-
-        frame = new Frame("Texture Test");
-    }
-
-    @Test
-    public void test1() {
-        GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2GL3));
-        GLCanvas glCanvas = new GLCanvas(caps);
-        frame.add(glCanvas);
-        frame.setSize(512, 512);
-
-        // create texture    
-        TextureData textureData = AWTTextureIO.newTextureData(caps.getGLProfile(), textureImage, false);
-        glCanvas.addGLEventListener(new TextureGL2ListenerDraw1(textureData));
-
-        Animator animator = new Animator(glCanvas);
-        frame.setVisible(true);
-        animator.start();
-
-        try {
-            Thread.sleep(100); // 100 ms
-        } catch (Exception e) {}
-
-        animator.stop();
-        frame.setVisible(false);
-
-        frame.remove(glCanvas);
-        frame.dispose();
-        frame=null;
-    }
-
-    public static void main(String args[]) {
-        org.junit.runner.JUnitCore.main(Texture1.class.getName());
-    }
-}
diff --git a/src/junit/com/jogamp/test/junit/jogl/demos/es1/RedSquare.java b/src/junit/com/jogamp/test/junit/jogl/demos/es1/RedSquare.java
new file mode 100755
index 000000000..82da095b9
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/demos/es1/RedSquare.java
@@ -0,0 +1,158 @@
+package com.jogamp.test.junit.jogl.demos.es1;
+
+import com.jogamp.common.nio.Buffers;
+import java.nio.*;
+import java.util.*;
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+import javax.media.nativewindow.*;
+
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
+
+public class RedSquare implements GLEventListener {
+
+    public static boolean glDebugEmu = false;
+    public static boolean glDebug = false ;
+    public static boolean glTrace = false ;
+    public static boolean oneThread = false;
+    public static boolean useAnimator = false;
+    public static int swapInterval = -1;
+
+    long startTime = 0;
+    long curTime = 0;
+
+    GLU glu = null;
+
+    public RedSquare() {
+    }
+
+    // FIXME: we must add storage of the pointers in the GL state to
+    // the GLImpl classes. The need for this can be seen by making
+    // these variables method local instead of instance members. The
+    // square will disappear after a second or so due to garbage
+    // collection. On desktop OpenGL this implies a stack of
+    // references due to the existence of glPush/PopClientAttrib. On
+    // OpenGL ES 1/2 it can simply be one set of references.
+    private FloatBuffer colors;
+    private FloatBuffer vertices;
+
+    public void init(GLAutoDrawable drawable) {
+        GL _gl = drawable.getGL();
+
+        if(glDebugEmu) {
+            try {
+                // Debug ..
+                _gl = _gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Debug", GL2ES2.class, _gl, null) );
+
+                if(glTrace) {
+                    // Trace ..
+                    _gl = _gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", GL2ES2.class, _gl, new Object[] { System.err } ) );
+                }
+            } catch (Exception e) {e.printStackTrace();} 
+            glDebug = false;
+            glTrace = false;
+        }
+
+        GL2ES1 gl = FixedFuncUtil.getFixedFuncImpl(_gl);
+        if(swapInterval>=0) {
+            gl.setSwapInterval(swapInterval);
+        }
+
+        if(glDebug) {
+            try {
+                // Debug ..
+                gl = (GL2ES1) gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Debug", GL2ES1.class, gl, null) );
+            } catch (Exception e) {e.printStackTrace();} 
+        }
+
+        if(glTrace) {
+            try {
+                // Trace ..
+                gl = (GL2ES1) gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", GL2ES1.class, gl, new Object[] { System.err } ) );
+            } catch (Exception e) {e.printStackTrace();}
+        }
+
+        glu = GLU.createGLU(gl);
+
+        System.err.println(Thread.currentThread()+" Entering initialization");
+        System.err.println(Thread.currentThread()+" GL Profile: "+gl.getGLProfile());
+        System.err.println(Thread.currentThread()+" GL:" + gl);
+        System.err.println(Thread.currentThread()+" GL_VERSION=" + gl.glGetString(gl.GL_VERSION));
+        System.err.println(Thread.currentThread()+" GL_EXTENSIONS:");
+        System.err.println(Thread.currentThread()+"   " + gl.glGetString(gl.GL_EXTENSIONS));
+        System.err.println(Thread.currentThread()+" swapInterval: " + swapInterval + " (GL: "+gl.getSwapInterval()+")");
+        System.err.println(Thread.currentThread()+" GLU: " + glu);
+
+        // Allocate vertex arrays
+        colors   = Buffers.newDirectFloatBuffer(16);
+        vertices = Buffers.newDirectFloatBuffer(12);
+        // Fill them up
+        colors.put( 0, 1);    colors.put( 1, 0);     colors.put( 2, 0);    colors.put( 3, 1);
+        colors.put( 4, 0);    colors.put( 5, 0);     colors.put( 6, 1);    colors.put( 7, 1);
+        colors.put( 8, 1);    colors.put( 9, 0);     colors.put(10, 0);    colors.put(11, 1);
+        colors.put(12, 1);    colors.put(13, 0);     colors.put(14, 0);    colors.put(15, 1);
+        vertices.put(0, -2);  vertices.put( 1,  2);  vertices.put( 2,  0);
+        vertices.put(3,  2);  vertices.put( 4,  2);  vertices.put( 5,  0);
+        vertices.put(6, -2);  vertices.put( 7, -2);  vertices.put( 8,  0);
+        vertices.put(9,  2);  vertices.put(10, -2);  vertices.put(11,  0);
+
+        gl.glEnableClientState(gl.GL_VERTEX_ARRAY);
+        gl.glEnableClientState(gl.GL_COLOR_ARRAY);
+        gl.glVertexPointer(3, GL.GL_FLOAT, 0, vertices);
+        gl.glColorPointer(4, GL.GL_FLOAT, 0, colors);
+
+        // OpenGL Render Settings
+        gl.glClearColor(0, 0, 0, 1);
+        gl.glEnable(GL.GL_DEPTH_TEST);
+
+        startTime = System.currentTimeMillis();
+        curTime = startTime;
+    }
+
+    public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
+        GL2ES1 gl = drawable.getGL().getGL2ES1();
+        // Set location in front of camera
+        gl.glMatrixMode(gl.GL_PROJECTION);
+        gl.glLoadIdentity();
+        glu.gluPerspective(45.0f, (float)width / (float)height, 1.0f, 100.0f);
+        //gl.glOrthof(-4.0f, 4.0f, -4.0f, 4.0f, 1.0f, 100.0f);
+        //glu.gluLookAt(0, 0, -20, 0, 0, 0, 0, 1, 0);
+    }
+
+    public void display(GLAutoDrawable drawable) {
+        curTime = System.currentTimeMillis();
+        GL2ES1 gl = drawable.getGL().getGL2ES1();
+        gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+
+        // One rotation every four seconds
+        gl.glMatrixMode(gl.GL_MODELVIEW);
+        gl.glLoadIdentity();
+        gl.glTranslatef(0, 0, -10);
+        float ang = ((float) (curTime - startTime) * 360.0f) / 4000.0f;
+        gl.glRotatef(ang, 0, 0, 1);
+        gl.glRotatef(ang, 0, 1, 0);
+
+
+        // Draw a square
+        gl.glDrawArrays(GL.GL_TRIANGLE_STRIP, 0, 4);
+    }
+
+    public void dispose(GLAutoDrawable drawable) {
+        GL2ES1 gl = drawable.getGL().getGL2ES1();
+        System.out.println(Thread.currentThread()+" RedSquare.dispose: "+gl.getContext());
+        gl.glDisableClientState(gl.GL_VERTEX_ARRAY);
+        gl.glDisableClientState(gl.GL_COLOR_ARRAY);
+        glu.destroy();
+        glu = null;
+        colors.clear();
+        colors   = null;
+        vertices.clear();
+        vertices = null;
+        System.out.println(Thread.currentThread()+" RedSquare.dispose: FIN");
+    }
+
+    public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) {
+    }
+
+}
diff --git a/src/junit/com/jogamp/test/junit/jogl/demos/gl2/gears/Gears.java b/src/junit/com/jogamp/test/junit/jogl/demos/gl2/gears/Gears.java
new file mode 100644
index 000000000..135efd341
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/demos/gl2/gears/Gears.java
@@ -0,0 +1,306 @@
+
+package com.jogamp.test.junit.jogl.demos.gl2.gears;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2ES1;
+import javax.media.opengl.GL2;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLEventListener;
+
+/**
+ * Gears.java <BR>
+ * author: Brian Paul (converted to Java by Ron Cemer and Sven Goethel) <P>
+ *
+ * This version is equal to Brian Paul's version 1.2 1999/10/21
+ */
+
+public class Gears implements GLEventListener /* , MouseListener, MouseMotionListener */  {
+  private float view_rotx = 20.0f, view_roty = 30.0f, view_rotz = 0.0f;
+  private int gear1, gear2, gear3;
+  private float angle = 0.0f;
+
+  private int prevMouseX, prevMouseY;
+  private boolean mouseRButtonDown = false;
+
+  public void init(GLAutoDrawable drawable) {
+    // Use debug pipeline
+    // drawable.setGL(new DebugGL(drawable.getGL()));
+
+    GL2 gl = drawable.getGL().getGL2();
+
+    System.err.println("INIT GL IS: " + gl.getClass().getName());
+
+    System.err.println("Chosen GLCapabilities: " + drawable.getChosenGLCapabilities());
+
+    gl.setSwapInterval(1);
+
+    float pos[] = { 5.0f, 5.0f, 10.0f, 0.0f };
+    float red[] = { 0.8f, 0.1f, 0.0f, 1.0f };
+    float green[] = { 0.0f, 0.8f, 0.2f, 1.0f };
+    float blue[] = { 0.2f, 0.2f, 1.0f, 1.0f };
+
+    gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_POSITION, pos, 0);
+    gl.glEnable(GL2.GL_CULL_FACE);
+    gl.glEnable(GL2.GL_LIGHTING);
+    gl.glEnable(GL2.GL_LIGHT0);
+    gl.glEnable(GL2.GL_DEPTH_TEST);
+            
+    /* make the gears */
+    gear1 = gl.glGenLists(1);
+    gl.glNewList(gear1, GL2.GL_COMPILE);
+    gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_AMBIENT_AND_DIFFUSE, red, 0);
+    gear(gl, 1.0f, 4.0f, 1.0f, 20, 0.7f);
+    gl.glEndList();
+            
+    gear2 = gl.glGenLists(1);
+    gl.glNewList(gear2, GL2.GL_COMPILE);
+    gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_AMBIENT_AND_DIFFUSE, green, 0);
+    gear(gl, 0.5f, 2.0f, 2.0f, 10, 0.7f);
+    gl.glEndList();
+            
+    gear3 = gl.glGenLists(1);
+    gl.glNewList(gear3, GL2.GL_COMPILE);
+    gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_AMBIENT_AND_DIFFUSE, blue, 0);
+    gear(gl, 1.3f, 2.0f, 0.5f, 10, 0.7f);
+    gl.glEndList();
+            
+    gl.glEnable(GL2.GL_NORMALIZE);
+                
+    /**
+    if (drawable instanceof AWTGLAutoDrawable) {
+        AWTGLAutoDrawable awtDrawable = (AWTGLAutoDrawable) drawable;
+        awtDrawable.addMouseListener(this);
+        awtDrawable.addMouseMotionListener(this);
+    } */
+  }
+    
+  public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
+    GL2 gl = drawable.getGL().getGL2();
+
+    float h = (float)height / (float)width;
+            
+    gl.glMatrixMode(GL2.GL_PROJECTION);
+
+    System.err.println("GL_VENDOR: " + gl.glGetString(GL2.GL_VENDOR));
+    System.err.println("GL_RENDERER: " + gl.glGetString(GL2.GL_RENDERER));
+    System.err.println("GL_VERSION: " + gl.glGetString(GL2.GL_VERSION));
+    gl.glLoadIdentity();
+    gl.glFrustum(-1.0f, 1.0f, -h, h, 5.0f, 60.0f);
+    gl.glMatrixMode(GL2.GL_MODELVIEW);
+    gl.glLoadIdentity();
+    gl.glTranslatef(0.0f, 0.0f, -40.0f);
+  }
+
+  public void dispose(GLAutoDrawable drawable) {
+    System.out.println("Gears.dispose: "+drawable);
+  }
+
+  public void display(GLAutoDrawable drawable) {
+    // Turn the gears' teeth
+    angle += 2.0f;
+
+    // Get the GL corresponding to the drawable we are animating
+    GL2 gl = drawable.getGL().getGL2();
+
+    /**
+    // Special handling for the case where the GLJPanel is translucent
+    // and wants to be composited with other Java 2D content
+    if ((drawable instanceof GLJPanel) &&
+        !((GLJPanel) drawable).isOpaque() &&
+        ((GLJPanel) drawable).shouldPreserveColorBufferIfTranslucent()) {
+      gl.glClear(GL2.GL_DEPTH_BUFFER_BIT);
+    } else */  {
+      gl.glClear(GL2.GL_COLOR_BUFFER_BIT | GL2.GL_DEPTH_BUFFER_BIT);
+    }
+            
+    // Rotate the entire assembly of gears based on how the user
+    // dragged the mouse around
+    gl.glPushMatrix();
+    gl.glRotatef(view_rotx, 1.0f, 0.0f, 0.0f);
+    gl.glRotatef(view_roty, 0.0f, 1.0f, 0.0f);
+    gl.glRotatef(view_rotz, 0.0f, 0.0f, 1.0f);
+            
+    // Place the first gear and call its display list
+    gl.glPushMatrix();
+    gl.glTranslatef(-3.0f, -2.0f, 0.0f);
+    gl.glRotatef(angle, 0.0f, 0.0f, 1.0f);
+    gl.glCallList(gear1);
+    gl.glPopMatrix();
+            
+    // Place the second gear and call its display list
+    gl.glPushMatrix();
+    gl.glTranslatef(3.1f, -2.0f, 0.0f);
+    gl.glRotatef(-2.0f * angle - 9.0f, 0.0f, 0.0f, 1.0f);
+    gl.glCallList(gear2);
+    gl.glPopMatrix();
+            
+    // Place the third gear and call its display list
+    gl.glPushMatrix();
+    gl.glTranslatef(-3.1f, 4.2f, 0.0f);
+    gl.glRotatef(-2.0f * angle - 25.0f, 0.0f, 0.0f, 1.0f);
+    gl.glCallList(gear3);
+    gl.glPopMatrix();
+            
+    // Remember that every push needs a pop; this one is paired with
+    // rotating the entire gear assembly
+    gl.glPopMatrix();
+  }
+
+  public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) {}
+
+  public static void gear(GL2 gl,
+                          float inner_radius,
+                          float outer_radius,
+                          float width,
+                          int teeth,
+                          float tooth_depth)
+  {
+    int i;
+    float r0, r1, r2;
+    float angle, da;
+    float u, v, len;
+
+    r0 = inner_radius;
+    r1 = outer_radius - tooth_depth / 2.0f;
+    r2 = outer_radius + tooth_depth / 2.0f;
+            
+    da = 2.0f * (float) Math.PI / teeth / 4.0f;
+            
+    gl.glShadeModel(GL2.GL_FLAT);
+
+    gl.glNormal3f(0.0f, 0.0f, 1.0f);
+
+    /* draw front face */
+    gl.glBegin(GL2.GL_QUAD_STRIP);
+    for (i = 0; i <= teeth; i++)
+      {
+        angle = i * 2.0f * (float) Math.PI / teeth;
+        gl.glVertex3f(r0 * (float)Math.cos(angle), r0 * (float)Math.sin(angle), width * 0.5f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle), r1 * (float)Math.sin(angle), width * 0.5f);
+        if(i < teeth)
+          {
+            gl.glVertex3f(r0 * (float)Math.cos(angle), r0 * (float)Math.sin(angle), width * 0.5f);
+            gl.glVertex3f(r1 * (float)Math.cos(angle + 3.0f * da), r1 * (float)Math.sin(angle + 3.0f * da), width * 0.5f);
+          }
+      }
+    gl.glEnd();
+
+    /* draw front sides of teeth */
+    gl.glBegin(GL2.GL_QUADS);
+    for (i = 0; i < teeth; i++)
+      {
+        angle = i * 2.0f * (float) Math.PI / teeth;
+        gl.glVertex3f(r1 * (float)Math.cos(angle), r1 * (float)Math.sin(angle), width * 0.5f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + da), r2 * (float)Math.sin(angle + da), width * 0.5f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + 2.0f * da), r2 * (float)Math.sin(angle + 2.0f * da), width * 0.5f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle + 3.0f * da), r1 * (float)Math.sin(angle + 3.0f * da), width * 0.5f);
+      }
+    gl.glEnd();
+    
+    /* draw back face */
+    gl.glBegin(GL2.GL_QUAD_STRIP);
+    for (i = 0; i <= teeth; i++)
+      {
+        angle = i * 2.0f * (float) Math.PI / teeth;
+        gl.glVertex3f(r1 * (float)Math.cos(angle), r1 * (float)Math.sin(angle), -width * 0.5f);
+        gl.glVertex3f(r0 * (float)Math.cos(angle), r0 * (float)Math.sin(angle), -width * 0.5f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle + 3 * da), r1 * (float)Math.sin(angle + 3 * da), -width * 0.5f);
+        gl.glVertex3f(r0 * (float)Math.cos(angle), r0 * (float)Math.sin(angle), -width * 0.5f);
+      }
+    gl.glEnd();
+    
+    /* draw back sides of teeth */
+    gl.glBegin(GL2.GL_QUADS);
+    for (i = 0; i < teeth; i++)
+      {
+        angle = i * 2.0f * (float) Math.PI / teeth;
+        gl.glVertex3f(r1 * (float)Math.cos(angle + 3 * da), r1 * (float)Math.sin(angle + 3 * da), -width * 0.5f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + 2 * da), r2 * (float)Math.sin(angle + 2 * da), -width * 0.5f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + da), r2 * (float)Math.sin(angle + da), -width * 0.5f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle), r1 * (float)Math.sin(angle), -width * 0.5f);
+      }
+    gl.glEnd();
+    
+    /* draw outward faces of teeth */
+    gl.glBegin(GL2.GL_QUAD_STRIP);
+    for (i = 0; i < teeth; i++)
+      {
+        angle = i * 2.0f * (float) Math.PI / teeth;
+        gl.glVertex3f(r1 * (float)Math.cos(angle), r1 * (float)Math.sin(angle), width * 0.5f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle), r1 * (float)Math.sin(angle), -width * 0.5f);
+        u = r2 * (float)Math.cos(angle + da) - r1 * (float)Math.cos(angle);
+        v = r2 * (float)Math.sin(angle + da) - r1 * (float)Math.sin(angle);
+        len = (float)Math.sqrt(u * u + v * v);
+        u /= len;
+        v /= len;
+        gl.glNormal3f(v, -u, 0.0f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + da), r2 * (float)Math.sin(angle + da), width * 0.5f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + da), r2 * (float)Math.sin(angle + da), -width * 0.5f);
+        gl.glNormal3f((float)Math.cos(angle), (float)Math.sin(angle), 0.0f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + 2 * da), r2 * (float)Math.sin(angle + 2 * da), width * 0.5f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + 2 * da), r2 * (float)Math.sin(angle + 2 * da), -width * 0.5f);
+        u = r1 * (float)Math.cos(angle + 3 * da) - r2 * (float)Math.cos(angle + 2 * da);
+        v = r1 * (float)Math.sin(angle + 3 * da) - r2 * (float)Math.sin(angle + 2 * da);
+        gl.glNormal3f(v, -u, 0.0f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle + 3 * da), r1 * (float)Math.sin(angle + 3 * da), width * 0.5f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle + 3 * da), r1 * (float)Math.sin(angle + 3 * da), -width * 0.5f);
+        gl.glNormal3f((float)Math.cos(angle), (float)Math.sin(angle), 0.0f);
+      }
+    gl.glVertex3f(r1 * (float)Math.cos(0), r1 * (float)Math.sin(0), width * 0.5f);
+    gl.glVertex3f(r1 * (float)Math.cos(0), r1 * (float)Math.sin(0), -width * 0.5f);
+    gl.glEnd();
+    
+    gl.glShadeModel(GL2.GL_SMOOTH);
+    
+    /* draw inside radius cylinder */
+    gl.glBegin(GL2.GL_QUAD_STRIP);
+    for (i = 0; i <= teeth; i++)
+      {
+        angle = i * 2.0f * (float) Math.PI / teeth;
+        gl.glNormal3f(-(float)Math.cos(angle), -(float)Math.sin(angle), 0.0f);
+        gl.glVertex3f(r0 * (float)Math.cos(angle), r0 * (float)Math.sin(angle), -width * 0.5f);
+        gl.glVertex3f(r0 * (float)Math.cos(angle), r0 * (float)Math.sin(angle), width * 0.5f);
+      }
+    gl.glEnd();
+  }
+
+  /***
+  // Methods required for the implementation of MouseListener
+  public void mouseEntered(MouseEvent e) {}
+  public void mouseExited(MouseEvent e) {}
+
+  public void mousePressed(MouseEvent e) {
+    prevMouseX = e.getX();
+    prevMouseY = e.getY();
+    if ((e.getModifiers() & e.BUTTON3_MASK) != 0) {
+      mouseRButtonDown = true;
+    }
+  }
+    
+  public void mouseReleased(MouseEvent e) {
+    if ((e.getModifiers() & e.BUTTON3_MASK) != 0) {
+      mouseRButtonDown = false;
+    }
+  }
+    
+  public void mouseClicked(MouseEvent e) {}
+    
+  // Methods required for the implementation of MouseMotionListener
+  public void mouseDragged(MouseEvent e) {
+    int x = e.getX();
+    int y = e.getY();
+    Dimension size = e.getComponent().getSize();
+
+    float thetaY = 360.0f * ( (float)(x-prevMouseX)/(float)size.width);
+    float thetaX = 360.0f * ( (float)(prevMouseY-y)/(float)size.height);
+    
+    prevMouseX = x;
+    prevMouseY = y;
+
+    view_rotx += thetaX;
+    view_roty += thetaY;
+  }
+    
+  public void mouseMoved(MouseEvent e) {}
+  */
+}
diff --git a/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
new file mode 100755
index 000000000..6c812ba18
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.drawable;
+
+import java.lang.reflect.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+
+import com.jogamp.newt.*;
+import com.jogamp.newt.opengl.*;
+
+public class TestDrawable01NEWT {
+    static GLProfile glp;
+    static int width, height;
+    GLCapabilities caps;
+    Window window;
+    GLDrawable drawable;
+    GLContext context;
+
+    @BeforeClass
+    public static void initClass() {
+        glp = GLProfile.getDefault();
+        width  = 640;
+        height = 480;
+    }
+
+    @Before
+    public void initTest() {
+        caps = new GLCapabilities(glp);
+    }
+
+    void createWindow(boolean onscreen, boolean pbuffer, boolean undecorated) {
+        caps.setOnscreen(onscreen);
+        caps.setPBuffer(!onscreen && pbuffer);
+        caps.setDoubleBuffered(!onscreen);
+        System.out.println("**********************************************************");
+        System.out.println("**********************************************************");
+        System.out.println("Requested: "+caps);
+
+        //
+        // Create native windowing resources .. X11/Win/OSX
+        // 
+        Display display = NewtFactory.createDisplay(null); // local display
+        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+        window = NewtFactory.createWindow(screen, caps, onscreen && undecorated);
+        window.setSize(width, height);
+        window.setVisible(true);
+        System.out.println("**********************************************************");
+        System.out.println("**********************************************************");
+        System.out.println("Created: "+window);
+
+        //
+        // Create native OpenGL resources .. XGL/WGL/CGL .. 
+        // equivalent to GLAutoDrawable methods: setVisible(true)
+        // 
+        GLCapabilities glCaps = (GLCapabilities) window.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
+
+        GLDrawableFactory factory = GLDrawableFactory.getFactory(glCaps.getGLProfile());
+        System.out.println(factory);
+        drawable = factory.createGLDrawable(window);
+        System.out.println("**********************************************************");
+        System.out.println("**********************************************************");
+        System.out.println("Pre: "+drawable);
+        drawable.setRealized(true);
+        System.out.println("**********************************************************");
+        System.out.println("**********************************************************");
+        System.out.println("Post: "+drawable);
+        context = drawable.createContext(null);
+        System.out.println(context);
+
+        System.out.println("**********************************************************");
+        System.out.println("**********************************************************");
+        System.out.println("Final: "+window);
+    }
+
+    void destroyWindow() {
+        context.destroy();
+        drawable.setRealized(false);
+        window.destroy(true); // incl screen + display
+    }
+
+    @Test
+    public void testOnScreenDecorated() {
+        createWindow(true, false, false);
+        try {
+            Thread.sleep(1000); // 1000 ms
+        } catch (Exception e) {}
+        destroyWindow();
+    }
+
+    @Test
+    public void testOnScreenUndecorated() {
+        createWindow(true, false, true);
+        try {
+            Thread.sleep(1000); // 1000 ms
+        } catch (Exception e) {}
+        destroyWindow();
+    }
+
+    public static void main(String args[]) {
+        org.junit.runner.JUnitCore.main(TestDrawable01NEWT.class.getName());
+    }
+
+}
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.java
new file mode 100755
index 000000000..2b32f720e
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.offscreen;
+
+import java.nio.*;
+import javax.media.opengl.*;
+
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+import java.io.File;
+import java.io.IOException;
+
+import javax.media.nativewindow.*;
+
+public class ReadBuffer2File extends ReadBufferBase {
+
+    public ReadBuffer2File (GLDrawable externalRead) {
+        super(externalRead);
+    }
+
+    public void dispose(GLAutoDrawable drawable) {
+        super.dispose(drawable);
+    }
+
+    int shotNum=0;
+
+    void copyTextureData2File() {
+      if(!readBufferUtil.isValid()) return;
+
+      try {
+        File file = File.createTempFile("shot"+shotNum+"-", ".ppm");
+        TextureIO.write(readBufferUtil.getTextureData(), file);
+        if(0==shotNum) {
+            System.out.println("Wrote: "+file.getAbsolutePath()+", ...");
+        }
+        shotNum++;
+      } catch (IOException ioe) { ioe.printStackTrace(); }
+      readBufferUtil.rewindPixelBuffer();
+    }
+
+    public void display(GLAutoDrawable drawable) {
+        super.display(drawable);
+        copyTextureData2File();
+    }
+}
+
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2Screen.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2Screen.java
new file mode 100755
index 000000000..1166cc1e5
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2Screen.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.offscreen;
+
+import java.nio.*;
+import javax.media.opengl.*;
+import javax.media.opengl.fixedfunc.*;
+
+import com.jogamp.opengl.util.*;
+
+import javax.media.opengl.fixedfunc.GLPointerFunc;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.GLArrayDataClient;
+import com.jogamp.opengl.util.GLArrayDataServer;
+
+public class ReadBuffer2Screen extends ReadBufferBase {
+    PMVMatrix pmvMatrix;
+    GLArrayDataClient readTextureVertices = null;
+    GLArrayDataClient readTextureCoords = null;
+    boolean enableBufferAlways = false; // FIXME
+    boolean enableBufferVBO    = true; // FIXME
+
+    public ReadBuffer2Screen (GLDrawable externalRead) {
+        super(externalRead);
+    }
+
+    public void init(GLAutoDrawable drawable) {
+        super.init(drawable);
+
+        GL gl = drawable.getGL();
+
+        pmvMatrix = new PMVMatrix();
+
+        float f_edge = 1f;
+        if(null==readTextureVertices) {
+            //readTextureVertices = GLArrayDataClient.createFixed(gl, GLPointerFunc.GL_VERTEX_ARRAY, "mgl_Vertex", 
+            //                                                    2, GL.GL_FLOAT, true, 4);
+            readTextureVertices = GLArrayDataServer.createFixed(gl, GLPointerFunc.GL_VERTEX_ARRAY, "mgl_Vertex", 
+                                                                2, GL.GL_FLOAT, true, 4, GL.GL_STATIC_DRAW);
+            readTextureVertices.setEnableAlways(enableBufferAlways);
+            readTextureVertices.setVBOUsage(enableBufferVBO);
+            {
+                FloatBuffer vb = (FloatBuffer)readTextureVertices.getBuffer();
+                vb.put(-f_edge); vb.put(-f_edge);
+                vb.put( f_edge); vb.put(-f_edge);
+                vb.put(-f_edge); vb.put( f_edge);
+                vb.put( f_edge); vb.put( f_edge);
+            }
+            readTextureVertices.seal(gl, true);
+            System.out.println(readTextureVertices);
+        }
+
+        // Clear background to gray
+        gl.glClearColor(0.5f, 0.5f, 0.5f, 0.4f);
+    }
+
+    public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
+        super.reshape(drawable, x, y, width, height);
+
+        GL gl = drawable.getGL();
+
+        gl.glViewport(0, 0, width, height);
+
+        if(gl instanceof GLLightingFunc) {
+            ((GLLightingFunc)gl).glShadeModel(GLLightingFunc.GL_SMOOTH);
+        }
+
+        GLMatrixFunc glM;
+        if(gl instanceof GLMatrixFunc) {
+            glM = (GLMatrixFunc)gl;
+        } else {
+            throw new GLException("ES2 currently unhandled .. ");
+        }
+
+        // Identity ..
+        pmvMatrix.glMatrixMode(pmvMatrix.GL_MODELVIEW);
+        pmvMatrix.glLoadIdentity();
+        pmvMatrix.glTranslatef(0, 0, -2.5f);
+        if(null!=glM) {
+            glM.glMatrixMode(pmvMatrix.GL_MODELVIEW);
+            glM.glLoadMatrixf(pmvMatrix.glGetMvMatrixf());
+        }
+
+        // Set location in front of camera
+        pmvMatrix.glMatrixMode(pmvMatrix.GL_PROJECTION);
+        pmvMatrix.glLoadIdentity();
+        pmvMatrix.gluPerspective(45.0f, (float)width / (float)height, 1.0f, 100.0f);
+        if(null!=glM) {
+            glM.glMatrixMode(pmvMatrix.GL_PROJECTION);
+            glM.glLoadMatrixf(pmvMatrix.glGetPMatrixf());
+        }
+    }
+
+    public void dispose(GLAutoDrawable drawable) {
+        super.dispose(drawable);
+    }
+
+    void renderOffscreenTexture(GL gl) {
+      if(!readBufferUtil.isValid()) return;
+
+      // Now draw one quad with the texture
+      readBufferUtil.getTexture().enable();
+      readBufferUtil.getTexture().bind();
+
+      if(gl.isGL2ES1()) {
+          // gl.getGL2ES1().glTexEnvi(GL2ES1.GL_TEXTURE_ENV, GL2ES1.GL_TEXTURE_ENV_MODE, GL2ES1.GL_REPLACE);
+          gl.getGL2ES1().glTexEnvi(GL2ES1.GL_TEXTURE_ENV, GL2ES1.GL_TEXTURE_ENV_MODE, GL2ES1.GL_MODULATE);
+      }
+
+      updateTextureCoords(gl, false);
+
+      readTextureVertices.enableBuffer(gl, true);
+      if(null!=readTextureCoords) {
+          readTextureCoords.enableBuffer(gl, true);
+      }
+      gl.glDrawArrays(GL.GL_TRIANGLE_STRIP, 0, readTextureVertices.getElementNumber());
+      /**
+      if(null!=readTextureCoords) {
+          readTextureCoords.enableBuffer(gl, false);
+      }
+      readTextureVertices.enableBuffer(gl, false); */
+
+      readBufferUtil.getTexture().disable();
+    }
+
+    void updateTextureCoords(GL gl, boolean force) {
+        if(force || null==readTextureCoords) {
+            readTextureCoords = GLArrayDataServer.createFixed(gl, GLPointerFunc.GL_TEXTURE_COORD_ARRAY, "mgl_MultiTexCoord0", 
+                                                              2, GL.GL_FLOAT, true, 4, GL.GL_STATIC_DRAW);
+            readTextureCoords.setEnableAlways(enableBufferAlways);
+            readTextureCoords.setVBOUsage(enableBufferVBO);
+            {
+                TextureCoords coords = readBufferUtil.getTexture().getImageTexCoords();
+                FloatBuffer cb = (FloatBuffer)readTextureCoords.getBuffer();
+                cb.put(coords.left());  cb.put(coords.bottom());
+                cb.put(coords.right()); cb.put(coords.bottom());
+                cb.put(coords.left());  cb.put(coords.top());
+                cb.put(coords.right()); cb.put(coords.top());
+            }
+            readTextureCoords.seal(gl, true);
+            System.out.println(readTextureCoords);
+        }
+    }
+
+    public void display(GLAutoDrawable drawable) {
+        super.display(drawable);
+
+        GL gl = drawable.getGL();
+
+        gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT);
+        if(gl instanceof GLLightingFunc) {
+            ((GLLightingFunc)gl).glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+        }
+
+        renderOffscreenTexture(gl);
+    }
+}
+
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferBase.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferBase.java
new file mode 100755
index 000000000..597b21782
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferBase.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.offscreen;
+
+import javax.media.opengl.*;
+
+public class ReadBufferBase implements GLEventListener {
+    public boolean glDebug = false ;
+    public boolean glTrace = false ;
+
+    protected GLDrawable externalRead;
+
+    ReadBufferUtil readBufferUtil = new ReadBufferUtil();
+
+    public ReadBufferBase (GLDrawable externalRead) {
+        this.externalRead = externalRead ;
+    }
+
+    public void init(GLAutoDrawable drawable) {
+        GL _gl = drawable.getGL();
+
+        _gl.glGetError(); // flush error ..
+
+        if(glDebug) {
+            try {
+                _gl = _gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Debug", null, _gl, null) );
+            } catch (Exception e) {e.printStackTrace();} 
+        }
+
+        if(glTrace) {
+            try {
+                _gl = _gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", null, _gl, new Object[] { System.err } ) );
+            } catch (Exception e) {e.printStackTrace();} 
+        }
+
+        System.out.println(_gl);
+
+        _gl.getContext().setGLDrawableRead(externalRead);
+        if(_gl.isGL2GL3()) {
+            _gl.getGL2GL3().glReadBuffer(GL2GL3.GL_FRONT);
+        }
+        System.out.println("---------------------------");
+        System.out.println(_gl.getContext());
+        System.out.println("---------------------------");
+    }
+
+    public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
+    }
+
+    public void dispose(GLAutoDrawable drawable) {
+        readBufferUtil.dispose();
+    }
+
+    public void display(GLAutoDrawable drawable) {
+        GL gl = drawable.getGL();
+
+        readBufferUtil.fetchOffscreenTexture(drawable, gl);
+    }
+
+}
+
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferUtil.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferUtil.java
new file mode 100755
index 000000000..d409093f4
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferUtil.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.offscreen;
+
+import com.jogamp.opengl.util.GLBuffers;
+import java.nio.*;
+import javax.media.opengl.*;
+
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+
+public class ReadBufferUtil {
+    protected int readPixelSizeLast = 0;
+    protected Buffer readPixelBuffer = null;
+    protected TextureData readTextureData = null;
+    protected Texture readTexture = new Texture(GL.GL_TEXTURE_2D);
+
+    public Buffer getPixelBuffer() { return readPixelBuffer; }
+    public void rewindPixelBuffer() { readPixelBuffer.rewind(); }
+
+    public TextureData getTextureData() { return readTextureData; }
+    public Texture getTexture() { return readTexture; }
+
+    public boolean isValid() {
+      return null!=readTexture && null!=readTextureData && null!=readPixelBuffer ;
+    }
+
+    public void fetchOffscreenTexture(GLDrawable drawable, GL gl) {
+        int readPixelSize = drawable.getWidth() * drawable.getHeight() * 3 ; // RGB
+        boolean newData = false;
+        if(readPixelSize>readPixelSizeLast) {
+            readPixelBuffer = GLBuffers.newDirectGLBuffer(GL.GL_UNSIGNED_BYTE, readPixelSize);
+            readPixelSizeLast = readPixelSize ;
+            try {
+                readTextureData = new TextureData(
+                           gl.getGLProfile(),
+                           // gl.isGL2GL3()?gl.GL_RGBA:gl.GL_RGB,
+                           gl.GL_RGB,
+                           drawable.getWidth(), drawable.getHeight(),
+                           0, 
+                           gl.GL_RGB,
+                           gl.GL_UNSIGNED_BYTE,
+                           false, false, 
+                           false /* flip */,
+                           readPixelBuffer,
+                           null /* Flusher */);
+                newData = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                readTextureData = null;
+                readPixelBuffer = null;
+                readPixelSizeLast = 0;
+            }
+        }
+        if(null!=readPixelBuffer) {
+            readPixelBuffer.clear();
+            gl.glReadPixels(0, 0, drawable.getWidth(), drawable.getHeight(), GL.GL_RGB, GL.GL_UNSIGNED_BYTE, readPixelBuffer);
+            readPixelBuffer.rewind();
+            if(newData) {
+                readTexture.updateImage(readTextureData);
+            } else {
+                readTexture.updateSubImage(readTextureData, 0, 
+                                           0, 0, // src offset
+                                           0, 0, // dst offset
+                                           drawable.getWidth(), drawable.getHeight());
+            }
+            readPixelBuffer.rewind();
+        }
+    }
+
+    public void dispose() {
+        readTexture.dispose();
+        readTextureData = null;
+        readPixelBuffer.clear();
+        readPixelBuffer = null;
+        readPixelSizeLast = 0;
+    }
+
+}
+
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/Surface2File.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/Surface2File.java
new file mode 100755
index 000000000..43e2df54c
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/Surface2File.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.offscreen;
+
+import javax.media.opengl.*;
+
+import com.jogamp.opengl.util.texture.TextureIO;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.media.nativewindow.*;
+
+public class Surface2File implements SurfaceUpdatedListener {
+
+    ReadBufferUtil readBufferUtil = new ReadBufferUtil();
+    int shotNum=0;
+
+    public void dispose() {
+        readBufferUtil.dispose();
+    }
+
+    public void surfaceUpdated(Object updater, NativeWindow window, long when) {
+        if(updater instanceof GLDrawable) {
+            GLDrawable drawable = (GLDrawable) updater;
+            GLContext ctx = GLContext.getCurrent();
+            if(null!=ctx && ctx.getGLDrawable()==drawable) {
+                readBufferUtil.fetchOffscreenTexture(drawable, ctx.getGL());
+                surface2File("shot");
+            }
+        }
+    }
+
+    public void surface2File(String basename) {
+      if(!readBufferUtil.isValid()) return;
+
+      try {
+        File file = File.createTempFile(basename+shotNum+"-", ".ppm");
+        TextureIO.write(readBufferUtil.getTextureData(), file);
+        if(0==shotNum) {
+            System.out.println("Wrote: "+file.getAbsolutePath()+", ...");
+        }
+        shotNum++;
+      } catch (IOException ioe) { ioe.printStackTrace(); }
+      readBufferUtil.rewindPixelBuffer();
+    }
+}
+
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
new file mode 100755
index 000000000..a8caafb30
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.offscreen;
+
+import java.lang.reflect.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+
+import com.jogamp.newt.*;
+import com.jogamp.newt.opengl.*;
+
+import com.jogamp.test.junit.jogl.demos.gl2.gears.Gears;
+import com.jogamp.test.junit.jogl.demos.es1.RedSquare;
+
+public class TestOffscreen01NEWT {
+    int width, height;
+    GLProfile glp;
+    GLCapabilities caps;
+
+    @Before
+    public void init() {
+        glp = GLProfile.getDefault();
+        width  = 640;
+        height = 480;
+        caps = new GLCapabilities(glp);
+    }
+
+    @Test
+    public void test1() {
+        if(false) {
+        GLWindow windowOffscreen = WindowUtilNEWT.createGLWindow(caps, width, height, false, true, false);
+        GLEventListener demo = new RedSquare();
+        GLWindow windowOnScreen = null;
+        WindowListener wl=null;
+        MouseListener ml=null;
+        SurfaceUpdatedListener ul=null;
+
+        WindowUtilNEWT.run(windowOffscreen, demo, windowOnScreen, wl, ml, ul, 2, true /*debug*/);
+        WindowUtilNEWT.shutdown(windowOffscreen, windowOnScreen);
+        }
+    }
+
+    public static void main(String args[]) {
+        org.junit.runner.JUnitCore.main(TestOffscreen01NEWT.class.getName());
+    }
+
+}
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
new file mode 100755
index 000000000..31ee7b552
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.offscreen;
+
+import com.jogamp.test.junit.util.*;
+
+import java.lang.reflect.*;
+import javax.media.opengl.*;
+import javax.media.nativewindow.*;
+import com.jogamp.newt.*;
+import com.jogamp.newt.opengl.*;
+
+public class WindowUtilNEWT {
+
+    public static Window createWindow(GLCapabilities caps, int w, int h, boolean onscreen, boolean pbuffer, boolean undecorated) {
+        GLCapabilities caps2 = (GLCapabilities) caps.clone();
+        caps2.setOnscreen(onscreen);
+        caps2.setPBuffer(!onscreen && pbuffer);
+        caps2.setDoubleBuffered(!onscreen);
+
+        Display display = NewtFactory.createDisplay(null); // local display
+        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+        Window window = NewtFactory.createWindow(screen, caps2, onscreen && undecorated);
+
+        GLCapabilities glCaps = (GLCapabilities) window.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
+
+        GLDrawableFactory factory = GLDrawableFactory.getFactory(glCaps.getGLProfile());
+        GLDrawable drawable = factory.createGLDrawable(window);
+        drawable.setRealized(true);
+        GLContext context = drawable.createContext(null);
+
+        window.setSize(w, h);
+        window.setVisible(true);
+        return window;
+    }
+
+    public static GLWindow createGLWindow(GLCapabilities caps, int w, int h, boolean onscreen, boolean pbuffer, boolean undecorated) {
+        GLCapabilities caps2 = (GLCapabilities) caps.clone();
+        caps2.setOnscreen(onscreen);
+        caps2.setPBuffer(!onscreen && pbuffer);
+        caps2.setDoubleBuffered(!onscreen);
+        GLWindow window = GLWindow.create(caps2, onscreen && undecorated);
+        window.setSize(w, h);
+        window.setVisible(true);
+        return window;
+    }
+
+    public static void run(GLWindow windowOffscreen, GLEventListener demo, 
+                           GLWindow windowOnScreen, WindowListener wl, MouseListener ml, 
+                           SurfaceUpdatedListener ul, int frames, boolean debug) {
+        try {
+            if(debug) {
+                MiscUtils.setField(demo, "glDebug", new Boolean(true));
+                MiscUtils.setField(demo, "glTrace", new Boolean(true));
+            }
+            if(!MiscUtils.setField(demo, "window", windowOffscreen)) {
+                MiscUtils.setField(demo, "glWindow", windowOffscreen);
+            }
+            windowOffscreen.addGLEventListener(demo);
+
+            if ( null != windowOnScreen ) {
+                if(null!=wl) {
+                    windowOnScreen.addWindowListener(wl);
+                }
+                if(null!=ml) {
+                    windowOnScreen.addMouseListener(ml);
+                }
+                windowOnScreen.setVisible(true);
+            }
+
+            GLDrawable readDrawable = windowOffscreen.getContext().getGLDrawable() ;
+
+            if ( null == windowOnScreen ) {
+                ReadBuffer2File readDemo = new ReadBuffer2File( readDrawable ) ;
+            } else {
+                ReadBuffer2Screen readDemo = new ReadBuffer2Screen( readDrawable ) ;
+                windowOnScreen.addGLEventListener(readDemo);
+                if(null!=wl) {
+                    windowOffscreen.addSurfaceUpdatedListener(ul);
+                }
+            }
+
+            System.out.println("+++++++++++++++++++++++++++");
+            System.out.println(windowOffscreen);
+            System.out.println("+++++++++++++++++++++++++++");
+
+            while ( windowOffscreen.getTotalFrames() < frames) {
+                windowOffscreen.display();
+            }
+
+        } catch (GLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void shutdown(GLWindow windowOffscreen, GLWindow windowOnscreen) {
+        // Shut things down cooperatively
+        if(null!=windowOnscreen) {
+            windowOnscreen.destroy();
+        }
+        if(null!=windowOffscreen) {
+            windowOffscreen.destroy();
+        }
+        if(null!=windowOnscreen) {
+            windowOnscreen.getFactory().shutdown();
+        }
+    }
+}
diff --git a/src/junit/com/jogamp/test/junit/jogl/texture/TestTexture01AWT.java b/src/junit/com/jogamp/test/junit/jogl/texture/TestTexture01AWT.java
new file mode 100755
index 000000000..d83e064bf
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/texture/TestTexture01AWT.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.texture;
+
+import com.jogamp.test.junit.jogl.util.texture.gl2.TextureGL2ListenerDraw1;
+
+import javax.media.opengl.GLProfile;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2ES1;
+import javax.media.opengl.GL2;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
+import com.jogamp.opengl.util.Animator;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Frame;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestTexture01AWT {
+    Frame frame;
+    BufferedImage textureImage;
+
+    @Before
+    public void init() {
+        // create base image
+        BufferedImage baseImage = new BufferedImage(256, 256, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g = baseImage.createGraphics();
+        g.setPaint(new GradientPaint(0, 0, Color.CYAN,
+                                 baseImage.getWidth(), baseImage.getHeight(), Color.BLUE));
+        g.fillRect(0, 0, baseImage.getWidth(), baseImage.getHeight());
+        g.dispose();
+
+        // create texture image
+        int imageType = BufferedImage.TYPE_INT_RGB;
+        textureImage = new BufferedImage(baseImage.getWidth(),
+                                         baseImage.getHeight(),
+                                         imageType);
+        g = textureImage.createGraphics();
+        g.setComposite(AlphaComposite.Src);
+        g.drawImage(baseImage, 0, 0, null);
+        g.dispose();
+
+        frame = new Frame("Texture Test");
+    }
+
+    @Test
+    public void test1() {
+        GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2GL3));
+        GLCanvas glCanvas = new GLCanvas(caps);
+        frame.add(glCanvas);
+        frame.setSize(512, 512);
+
+        // create texture    
+        TextureData textureData = AWTTextureIO.newTextureData(caps.getGLProfile(), textureImage, false);
+        glCanvas.addGLEventListener(new TextureGL2ListenerDraw1(textureData));
+
+        Animator animator = new Animator(glCanvas);
+        frame.setVisible(true);
+        animator.start();
+
+        try {
+            Thread.sleep(1000); // 1000 ms
+        } catch (Exception e) {}
+
+        animator.stop();
+        frame.setVisible(false);
+
+        frame.remove(glCanvas);
+        frame.dispose();
+        frame=null;
+    }
+
+    public static void main(String args[]) {
+        org.junit.runner.JUnitCore.main(TestTexture01AWT.class.getName());
+    }
+}
diff --git a/src/junit/com/jogamp/test/junit/util/MiscUtils.java b/src/junit/com/jogamp/test/junit/util/MiscUtils.java
new file mode 100644
index 000000000..5114c3a84
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/util/MiscUtils.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.util;
+
+import java.lang.reflect.*;
+
+public class MiscUtils {
+    public static int str2int(String str, int def) {
+        try {
+            return Integer.parseInt(str);
+        } catch (Exception ex) { ex.printStackTrace(); }
+        return def;
+    }
+
+    public static boolean setField(Object instance, String fieldName, Object value) {
+        try {
+            Field f = instance.getClass().getField(fieldName);
+            if(value instanceof Boolean || f.getType().isInstance(value)) {
+                f.set(instance, value);
+                return true;
+            } else {
+                System.out.println(instance.getClass()+" '"+fieldName+"' field not assignable with "+value.getClass()+", it's a: "+f.getType());
+            }
+        } catch (NoSuchFieldException nsfe) {
+            System.out.println(instance.getClass()+" has no '"+fieldName+"' field");
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+        return false;
+    }
+}
+
+
+
-- 
cgit v1.2.3


From a9eaf11b0d168db049bafc24260d6c0b4a000071 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 9 Apr 2010 04:30:24 +0200
Subject: junit: Add timeout (30s), enable offscreen test

---
 make/build-junit.xml                               |  2 +-
 .../junit/jogl/offscreen/TestOffscreen01NEWT.java  | 25 ++++++++++++++++++++--
 .../test/junit/jogl/offscreen/WindowUtilNEWT.java  | 10 +++++----
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/make/build-junit.xml b/make/build-junit.xml
index 636035f1d..f06035de3 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -66,7 +66,7 @@
     <target name="junit.run" depends="declare.common">
         <!-- Perform the junit tests-->
         <mkdir dir="${results.junit}" />
-        <junit forkmode="once" showoutput="true" fork="true" haltonerror="true">
+        <junit forkmode="once" showoutput="true" fork="true" haltonerror="off" timeout="30000">
             <env key="${system.env.library.path}" path="${obj.all.paths}"/>
             <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
 
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
index a8caafb30..5800af9af 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
@@ -65,8 +65,26 @@ public class TestOffscreen01NEWT {
     }
 
     @Test
-    public void test1() {
-        if(false) {
+    public void test01OffscreenWindow() {
+        if(true) {
+        GLWindow windowOffscreen = WindowUtilNEWT.createGLWindow(caps, width, height, false, true, false);
+        GLEventListener demo = new RedSquare();
+        GLWindow windowOnScreen = null;
+        WindowListener wl=null;
+        MouseListener ml=null;
+        SurfaceUpdatedListener ul=null;
+
+        WindowUtilNEWT.run(windowOffscreen, null, windowOnScreen, wl, ml, ul, 2, true /*debug*/);
+        try {
+            Thread.sleep(1000); // 1000 ms
+        } catch (Exception e) {}
+        WindowUtilNEWT.shutdown(windowOffscreen, windowOnScreen);
+        }
+    }
+
+    @Test
+    public void test02OffscreenSnapshotWithDemo() {
+        if(true) {
         GLWindow windowOffscreen = WindowUtilNEWT.createGLWindow(caps, width, height, false, true, false);
         GLEventListener demo = new RedSquare();
         GLWindow windowOnScreen = null;
@@ -75,6 +93,9 @@ public class TestOffscreen01NEWT {
         SurfaceUpdatedListener ul=null;
 
         WindowUtilNEWT.run(windowOffscreen, demo, windowOnScreen, wl, ml, ul, 2, true /*debug*/);
+        try {
+            Thread.sleep(1000); // 1000 ms
+        } catch (Exception e) {}
         WindowUtilNEWT.shutdown(windowOffscreen, windowOnScreen);
         }
     }
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
index 31ee7b552..b9541dbaf 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
@@ -79,14 +79,16 @@ public class WindowUtilNEWT {
                            GLWindow windowOnScreen, WindowListener wl, MouseListener ml, 
                            SurfaceUpdatedListener ul, int frames, boolean debug) {
         try {
-            if(debug) {
+            if(debug && null!=demo) {
                 MiscUtils.setField(demo, "glDebug", new Boolean(true));
                 MiscUtils.setField(demo, "glTrace", new Boolean(true));
             }
-            if(!MiscUtils.setField(demo, "window", windowOffscreen)) {
-                MiscUtils.setField(demo, "glWindow", windowOffscreen);
+            if(null!=demo) {
+                if(!MiscUtils.setField(demo, "window", windowOffscreen)) {
+                    MiscUtils.setField(demo, "glWindow", windowOffscreen);
+                }
+                windowOffscreen.addGLEventListener(demo);
             }
-            windowOffscreen.addGLEventListener(demo);
 
             if ( null != windowOnScreen ) {
                 if(null!=wl) {
-- 
cgit v1.2.3


From e8f4dc96c037b4465ad1db9062249f80508117fd Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 9 Apr 2010 19:46:35 +0200
Subject: Fix NEWT Window destroy/close race condition,

where a programatic window.destroy() call from thread 1
triggers a destroy() call via the native windowing toolkit
via windowDestroyNotify().
It has to be checked/locked if a destroy is in progress,
otherwise they could deadlock (OSX and Win32).
---
 src/newt/classes/com/jogamp/newt/Window.java       | 113 ++++++++++++++++-----
 .../classes/com/jogamp/newt/macosx/MacWindow.java  |  33 +-----
 .../classes/com/jogamp/newt/opengl/GLWindow.java   |   3 +
 src/newt/native/NewtMacWindow.m                    |   2 +-
 4 files changed, 94 insertions(+), 57 deletions(-)

diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java
index 410144653..171bb2468 100755
--- a/src/newt/classes/com/jogamp/newt/Window.java
+++ b/src/newt/classes/com/jogamp/newt/Window.java
@@ -321,12 +321,12 @@ public abstract class Window implements NativeWindow
         return lockedStack;
     }
 
-    public synchronized void destroy() {
+    public void destroy() {
         destroy(false);
     }
 
     /** @param deep If true, the linked Screen and Display will be destroyed as well. */
-    public synchronized void destroy(boolean deep) {
+    public void destroy(boolean deep) {
         if(DEBUG_WINDOW_EVENT) {
             System.out.println("Window.destroy() start (deep "+deep+" - "+Thread.currentThread());
         }
@@ -342,26 +342,33 @@ public abstract class Window implements NativeWindow
         synchronized(keyListeners) {
             keyListeners = new ArrayList();
         }
-        Screen scr = screen;
-        Display dpy = (null!=screen) ? screen.getDisplay() : null;
-        EventDispatchThread edt = (null!=dpy) ? dpy.getEDT() : null;
-        if(null!=edt) {
-            final Window f_win = this;
-            edt.invokeAndWait(new Runnable() {
-                public void run() {
-                    f_win.closeNative();
+        synchronized(this) {
+            destructionLock.lock();
+            try {
+                Screen scr = screen;
+                Display dpy = (null!=screen) ? screen.getDisplay() : null;
+                EventDispatchThread edt = (null!=dpy) ? dpy.getEDT() : null;
+                if(null!=edt) {
+                    final Window f_win = this;
+                    edt.invokeAndWait(new Runnable() {
+                        public void run() {
+                            f_win.closeNative();
+                        }
+                    } );
+                } else {
+                    closeNative();
                 }
-            } );
-        } else {
-            closeNative();
-        }
-        invalidate();
-        if(deep) {
-            if(null!=scr) {
-                scr.destroy();
-            }
-            if(null!=dpy) {
-                dpy.destroy();
+                invalidate();
+                if(deep) {
+                    if(null!=scr) {
+                        scr.destroy();
+                    }
+                    if(null!=dpy) {
+                        dpy.destroy();
+                    }
+                }
+            } finally {
+                destructionLock.unlock();
             }
         }
         if(DEBUG_WINDOW_EVENT) {
@@ -487,12 +494,12 @@ public abstract class Window implements NativeWindow
 
     protected void windowDestroyNotify() {
         if(DEBUG_WINDOW_EVENT) {
-            System.out.println("Window.windowDestroyeNotify start "+Thread.currentThread());
+            System.out.println("Window.windowDestroyNotify start "+Thread.currentThread());
         }
 
         sendWindowEvent(WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY);
 
-        if(!autoDrawableMember) {
+        if(!autoDrawableMember && !destructionLock.isLocked()) {
             destroy();
         }
 
@@ -505,7 +512,9 @@ public abstract class Window implements NativeWindow
         if(DEBUG_WINDOW_EVENT) {
             System.out.println("Window.windowDestroyed "+Thread.currentThread());
         }
-        invalidate();
+        if(!destructionLock.isLocked()) {
+            invalidate();
+        }
     }
 
     public abstract void    setVisible(boolean visible);
@@ -554,6 +563,12 @@ public abstract class Window implements NativeWindow
         }
     }
 
+    public void removeAllSurfaceUpdatedListener() {
+        synchronized(surfaceUpdatedListeners) {
+            surfaceUpdatedListeners = new ArrayList();
+        }
+    }
+
     public SurfaceUpdatedListener[] getSurfaceUpdatedListener() {
         synchronized(surfaceUpdatedListeners) {
             return (SurfaceUpdatedListener[]) surfaceUpdatedListeners.toArray();
@@ -926,4 +941,54 @@ public abstract class Window implements NativeWindow
         }
         return sb.toString();
     }
+
+    //
+    // Reentrance locking toolkit
+    // 
+    public static class WindowToolkitLock implements ToolkitLock {
+            private Thread owner;
+            private int recursionCount;
+            
+            public boolean isOwner() {
+                return isOwner(Thread.currentThread());
+            }
+
+            public synchronized boolean isOwner(Thread thread) {
+                return owner == thread ;
+            }
+
+            public synchronized boolean isLocked() {
+                return null != owner;
+            }
+
+            public synchronized void lock() {
+                Thread cur = Thread.currentThread();
+                if (owner == cur) {
+                    ++recursionCount;
+                    return;
+                }
+                while (owner != null) {
+                    try {
+                        wait();
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+                owner = cur;
+            }
+
+            public synchronized void unlock() {
+                if (owner != Thread.currentThread()) {
+                    throw new RuntimeException("Not owner");
+                }
+                if (recursionCount > 0) {
+                    --recursionCount;
+                    return;
+                }
+                owner = null;
+                notifyAll();
+            }
+    }
+    private WindowToolkitLock destructionLock = new WindowToolkitLock();
 }
+
diff --git a/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java b/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java
index 06e73caa5..276843709 100755
--- a/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java
+++ b/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java
@@ -212,38 +212,7 @@ public class MacWindow extends Window {
         }
     }
 
-    private ToolkitLock nsViewLock = new ToolkitLock() {
-            private Thread owner;
-            private int recursionCount;
-            
-            public synchronized void lock() {
-                Thread cur = Thread.currentThread();
-                if (owner == cur) {
-                    ++recursionCount;
-                    return;
-                }
-                while (owner != null) {
-                    try {
-                        wait();
-                    } catch (InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-                owner = cur;
-            }
-
-            public synchronized void unlock() {
-                if (owner != Thread.currentThread()) {
-                    throw new RuntimeException("Not owner");
-                }
-                if (recursionCount > 0) {
-                    --recursionCount;
-                    return;
-                }
-                owner = null;
-                notifyAll();
-            }
-        };
+    private WindowToolkitLock nsViewLock = new WindowToolkitLock();
 
     public synchronized int lockSurface() throws NativeWindowException {
         nsViewLock.lock();
diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
index 29a392f04..4a7f27f3a 100644
--- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
@@ -335,6 +335,9 @@ public class GLWindow extends Window implements GLAutoDrawable {
     public void removeSurfaceUpdatedListener(SurfaceUpdatedListener l) {
         window.removeSurfaceUpdatedListener(l);
     }
+    public void removeAllSurfaceUpdatedListener() {
+        window.removeAllSurfaceUpdatedListener();
+    }
     public SurfaceUpdatedListener[] getSurfaceUpdatedListener() {
         return window.getSurfaceUpdatedListener();
     }
diff --git a/src/newt/native/NewtMacWindow.m b/src/newt/native/NewtMacWindow.m
index 146c04de1..3d8d32a40 100755
--- a/src/newt/native/NewtMacWindow.m
+++ b/src/newt/native/NewtMacWindow.m
@@ -441,7 +441,7 @@ static jint mods2JavaMods(NSUInteger mods)
     }
 
     (*env)->CallVoidMethod(env, javaWindowObject, windowDestroyNotifyID);
-    // Will be called by Window.java (*env)->CallVoidMethod(env, javaWindowObject, windowDestroyedID);
+    (*env)->CallVoidMethod(env, javaWindowObject, windowDestroyedID); // No OSX hook for DidClose, so do it here 
 
     // EOL ..
     (*env)->DeleteGlobalRef(env, javaWindowObject);
-- 
cgit v1.2.3


From 987fb51e6c2dc3a8553ff1e01162fd10c3bc8fab Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 10 Apr 2010 01:20:56 +0200
Subject: *** Now Using Apache-Ant-1.8.0 ***

Cleanup:
    - Adding Javac includeAntRuntime argument (false whenever possible)

    - Clear junit results folder before testing

    - <ant ..> tasks, use inheritRefs="true" inheritAll="true" whenever possible
      for better performance and consistency (no duplicate property names).
      The JOGL build -> build-<component> tree is clean in this respect.

junit.run: Test*NEWT*
    Emulation of junit task,
    due to the fact that we have to place invoke our MainThread class first (-> MacOSX).
    Utilizing Ant-1.8.0 and ant-contrib-1.0b3 (loops, mutable properties).

    Fixed NEWT tests:
        - No more println .. using Assertions ..
        - Offscreen produces 2 files correctly (Linux/NVidia, OSX/NVidia, Win32/Emulation)
---
 make/build-common.xml                              |  4 ++
 make/build-gluegen.xml                             |  4 +-
 make/build-jogl.xml                                |  5 ++
 make/build-junit.xml                               | 79 ++++++++++++++++++++--
 make/build-nativewindow.xml                        |  2 +
 make/build-newt.xml                                |  2 +
 make/build-staticglgen.xml                         | 10 +--
 make/build.xml                                     | 16 ++---
 .../test/junit/jogl/demos/es1/RedSquare.java       | 32 ++++++---
 .../junit/jogl/drawable/TestDrawable01NEWT.java    | 75 ++++++++++++++------
 .../test/junit/jogl/offscreen/ReadBuffer2File.java |  4 +-
 .../test/junit/jogl/offscreen/Surface2File.java    | 10 +--
 .../junit/jogl/offscreen/TestOffscreen01NEWT.java  |  8 +--
 .../test/junit/jogl/offscreen/WindowUtilNEWT.java  | 22 +++---
 14 files changed, 206 insertions(+), 67 deletions(-)

diff --git a/make/build-common.xml b/make/build-common.xml
index bee69a5a9..10f37c3e4 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -8,6 +8,8 @@
     <property name="gluegen.root" value="../../gluegen" />
     <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
 
+    <property name="ant-contrib.jar"  value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" />
+
     <condition property="rootrel.build" value="build">
       <not>
           <isset property="rootrel.build"/>
@@ -191,6 +193,8 @@
             <pathelement location="${newt.all.jar}" />
             <pathelement location="${jogl.test.jar}" />
         </path>
+        <property name="junit_jogl_newt.run.jars"
+                  value="${junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${nativewindow.all.jar}${path.separator}${jogl.all.jar}${path.separator}${newt.all.jar}${path.separator}${jogl.test.jar}"/>
 
         <!-- JavaSE combinations . NO.AWT -->
         <property name="nativewindow.all-noawt.jar" value="${build.nativewindow}/nativewindow.all-noawt.jar" />
diff --git a/make/build-gluegen.xml b/make/build-gluegen.xml
index 992599cdb..fedfd9d93 100644
--- a/make/build-gluegen.xml
+++ b/make/build-gluegen.xml
@@ -88,6 +88,7 @@
            - NOTE:  GlueGenTask is NOT built at this time.  It is done in
            -        a separate task.  -->
         <javac destdir="${classes}" includes="**/gluegen/**" excludes="**/GlueGenTask.java"
+               includeAntRuntime="false"
                source="1.4" debug="true" debuglevel="source,lines">
             <src path="${src.java}" />
             <src path="${src.generated.java}" />
@@ -140,7 +141,8 @@
         <!-- Build the GlueGen ANT task.
            - NOTE:  ONLY the GlueGenTask is built at this time.  GlueGen 
            -        itself is built in a separate task.  -->
-        <javac destdir="${classes}" includes="**/GlueGenTask.java" source="1.4" debug="true" debuglevel="source,lines">
+        <javac destdir="${classes}" includes="**/GlueGenTask.java" source="1.4" debug="true" debuglevel="source,lines"
+               includeAntRuntime="false">
             <src path="${src.java}" />
             <classpath refid="antlr.classpath" />
         </javac>
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 5381c2051..b1f0a02eb 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -949,6 +949,7 @@
                includes="javax/media/opengl/fixedfunc/** javax/media/opengl/GLDrawableFactory.java javax/media/opengl/GLDrawable.java javax/media/opengl/GLContext.java javax/media/opengl/GL.java javax/media/opengl/GL2ES1.java javax/media/opengl/GL2ES2.java javax/media/opengl/GL2GL3.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java javax/media/opengl/GL3.java javax/media/opengl/GL3bc.java"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
+               includeAntRuntime="false"
                source="1.4" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
@@ -973,6 +974,7 @@
                source="${target.sourcelevel}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
+               includeAntRuntime="false"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
@@ -988,6 +990,7 @@
                source="${target.sourcelevel}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
+               includeAntRuntime="false"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath-cdc"/>
             <src path="${src.java}" />
@@ -1004,6 +1007,7 @@
                source="${target.sourcelevel}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
+               includeAntRuntime="false"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
@@ -1019,6 +1023,7 @@
                bootclasspath="${javac.bootclasspath-cdc.jar}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
+               includeAntRuntime="false"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath-cdc"/>
             <src path="${src.java}" />
diff --git a/make/build-junit.xml b/make/build-junit.xml
index f06035de3..74cb30606 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -6,6 +6,10 @@
 
     <import file="build-common.xml"/>
 
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
+      <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
+    </taskdef>
+
     <!-- ================================================================== -->
     <!-- 
        - Declare all paths and user defined variables.
@@ -15,10 +19,13 @@
         <property name="src.junit"            value="${project.root}/${rootrel.src.junit}" />
 
         <property name="classes"              value="${build.junit}/classes" />
+        <property name="classes.path"         location="${classes}"/> <!-- absolute path -->
 
         <property name="java.dir.test"        value="com/jogamp/test"/>
         <property name="java.part.test"       value="${java.dir.test}/**"/>
 
+        <property name="batchtest.timeout"    value="10000"/>
+
     </target>
     
     <!-- ================================================================== -->
@@ -52,6 +59,7 @@
                source="${host.sourcelevel}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
+               includeAntRuntime="false"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="junit_jogl_newt.compile.classpath"/>
             <src path="${src.junit}" />
@@ -63,10 +71,73 @@
         </jar>
     </target>
 
-    <target name="junit.run" depends="declare.common">
+    <target name="junit.run" depends="junit.compile">
         <!-- Perform the junit tests-->
         <mkdir dir="${results.junit}" />
-        <junit forkmode="once" showoutput="true" fork="true" haltonerror="off" timeout="30000">
+        <delete quiet="true">
+            <fileset dir="${results.junit}" includes="**"/>
+        </delete>
+
+        <condition property="jvmarg.newt" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition>
+        <condition property="jvmarg.newt" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition>
+
+        <!-- Test*NEWT* 
+
+             Emulation of junit task,
+             due to the fact that we have to place invoke our MainThread class first (-> MacOSX).
+
+             Utilizing Ant-1.8.0 and ant-contrib-1.0b3 (loops, mutable properties).
+          --> 
+        <for param="test.class.path.m" keepgoing="true">
+            <!-- results in absolute path -->
+            <fileset dir="${classes}">
+                <include name="${java.dir.test}/**/Test*NEWT*"/>
+            </fileset>
+          <sequential>
+            <var name="test.class.path" unset="true"/>
+            <property name="test.class.path" basedir="${classes}" relative="true" location="@{test.class.path.m}"/>
+            <var name="test.class.fqn" unset="true"/>
+            <pathconvert property="test.class.fqn">
+              <fileset file="${classes}/${test.class.path}"/>
+              <chainedmapper>
+                  <globmapper    from="${classes.path}/*" to="*"/> <!-- rel. -->
+                  <packagemapper from="*.class"           to="*"/> <!-- FQCN -->
+              </chainedmapper>
+            </pathconvert>
+            <var name="test.class.result.file" value="${results.junit}/TEST-${test.class.fqn}.xml"/>
+            <echo message="Testing ${test.class.fqn} -> ${test.class.result.file}"/>
+            <apply dir="." executable="java" 
+                 parallel="false" 
+                 timeout="${batchtest.timeout}"
+                 vmlauncher="false"
+                 relative="true"
+                 failonerror="false">
+                <env key="${system.env.library.path}" path="${obj.all.paths}"/>
+                <env key="CLASSPATH" value="${ant.home}/lib/ant.jar${path.separator}${ant.home}/lib/ant-junit.jar${path.separator}${junit_jogl_newt.run.jars}"/>
+                <arg value="-Djava.library.path=${obj.all.paths}"/>
+                <arg line="${jvmarg.newt}"/>
+                <arg line="com.jogamp.newt.util.MainThread"/>
+                <arg line="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner"/>
+                <srcfile/>
+                <arg line="filtertrace=true"/>
+                <arg line="haltOnError=false"/>
+                <arg line="haltOnFailure=false"/>
+                <arg line="showoutput=true"/>
+                <arg line="outputtoformatters=true"/>
+                <arg line="logfailedtests=true"/>
+                <arg line="logtestlistenerevents=true"/>
+                <arg line="formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter"/>
+                <arg line="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.class.result.file}"/>
+                <mappedresources>
+                    <fileset dir="${classes}" includes="${test.class.path}"/>
+                    <packagemapper from="*.class" to="*"/>
+                </mappedresources>
+            </apply>
+          </sequential>
+        </for>
+
+        <!-- Test*AWT* -->
+        <junit forkmode="once" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
             <env key="${system.env.library.path}" path="${obj.all.paths}"/>
             <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
 
@@ -88,13 +159,13 @@
 
             <batchtest todir="${results.junit}">
               <fileset dir="${classes}">
-                  <include name="${java.dir.test}/**/Test*"/>
+                  <include name="${java.dir.test}/**/Test*AWT*"/>
               </fileset>
               <formatter usefile="false" type="brief"/>
               <formatter usefile="true" type="xml"/>
             </batchtest>
-
         </junit>
+
     </target>
 
     <!-- ================================================================== -->
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 3cb7e7746..3a62e9733 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -319,6 +319,7 @@
                classpath="${gluegen-rt-cdc.jar}"
                bootclasspath="${javac.bootclasspath-cdc.jar}"
                fork="yes"
+               includeAntRuntime="false"
                memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${src.java}" />
@@ -333,6 +334,7 @@
                source="${target.sourcelevel}"
                classpath="${gluegen-rt.jar}"
                fork="yes"
+               includeAntRuntime="false"
                memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${src.java}" />
diff --git a/make/build-newt.xml b/make/build-newt.xml
index d8f8c2b60..db357bf37 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -195,6 +195,7 @@
                excludes="${java.excludes.all}"
                source="${target.sourcelevel}"
                fork="yes"
+               includeAntRuntime="false"
                memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${src.java}" />
@@ -209,6 +210,7 @@
                source="${target.sourcelevel}"
                bootclasspath="${javac.bootclasspath-cdc.jar}"
                fork="yes"
+               includeAntRuntime="false"
                memoryMaximumSize="${javac.memorymax}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen_jogl.classpath-cdc"/>
diff --git a/make/build-staticglgen.xml b/make/build-staticglgen.xml
index 2683b305a..3d5fb2d12 100644
--- a/make/build-staticglgen.xml
+++ b/make/build-staticglgen.xml
@@ -29,7 +29,8 @@
         <mkdir dir="${classes}" />
 
         <!-- Compile BuildStaticGLInfo -->
-        <javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" source="1.4" debug="true" debuglevel="source,lines">
+        <javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" source="1.4" debug="true" debuglevel="source,lines"
+               includeAntRuntime="false">
             <classpath refid="antlr.classpath" />
         </javac>
         
@@ -49,8 +50,9 @@
         <!-- Build the BuildStaticGLInfo ANT task.
            - NOTE:  ONLY the StaticGLGen is built at this time.  BuildStaticGLInfo 
            -        itself is built in a separate task.  -->
-        <javac destdir="${classes}" includes="**/StaticGLGenTask.java" source="1.4" debug="true" debuglevel="source,lines">
-	    <src path="${src.java}" />
+        <javac destdir="${classes}" includes="**/StaticGLGenTask.java" source="1.4" debug="true" debuglevel="source,lines"
+               includeAntRuntime="false">
+	        <src path="${src.java}" />
             <classpath refid="classpath" />
         </javac>
         
@@ -88,4 +90,4 @@
         <antcall target="build.static.gl.task" />
     </target>      
 
-</project>
\ No newline at end of file
+</project>
diff --git a/make/build.xml b/make/build.xml
index e39e6dea2..8d2c9765a 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -30,15 +30,15 @@
     </target>
 
     <target name="build.nativewindow" depends="init">
-        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="all" inheritAll="false"/>
+        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="all" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="build.jogl" depends="init">
-        <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="all" inheritAll="false"/>
+        <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="all" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="build.newt" depends="init">
-        <ant antfile="${newt.build.xml}" dir="${newt.make}" target="all" inheritAll="false"/>
+        <ant antfile="${newt.build.xml}" dir="${newt.make}" target="all" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="one-lib-dir" depends="init,gluegen.cpptasks.detect.os">
@@ -128,18 +128,18 @@
     <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,junit.compile,one-lib-dir,developer-zip-archive,source-archive" />
 
     <target name="junit.compile">
-      <ant antfile="build-junit.xml" target="junit.compile"/>
+      <ant antfile="build-junit.xml" target="junit.compile" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="test" depends="junit.run"/>
     <target name="junit.run" description="Run JUNIT tests in nativewindow, jogl and newt projects">
-      <ant antfile="build-junit.xml" target="junit.run"/>
+      <ant antfile="build-junit.xml" target="junit.run" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="clean" depends="init">
-        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="clean" inheritAll="false"/>
-        <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="clean" inheritAll="false"/>
-        <ant antfile="${newt.build.xml}" dir="${newt.make}" target="clean" inheritAll="false"/>
+        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="clean" inheritRefs="true" inheritAll="true"/>
+        <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="clean" inheritRefs="true" inheritAll="true"/>
+        <ant antfile="${newt.build.xml}" dir="${newt.make}" target="clean" inheritRefs="true" inheritAll="true"/>
         <delete includeEmptyDirs="true" quiet="true">
             <fileset dir="${build}" />
         </delete>
diff --git a/src/junit/com/jogamp/test/junit/jogl/demos/es1/RedSquare.java b/src/junit/com/jogamp/test/junit/jogl/demos/es1/RedSquare.java
index 82da095b9..9b8982ed4 100755
--- a/src/junit/com/jogamp/test/junit/jogl/demos/es1/RedSquare.java
+++ b/src/junit/com/jogamp/test/junit/jogl/demos/es1/RedSquare.java
@@ -19,12 +19,18 @@ public class RedSquare implements GLEventListener {
     public static boolean useAnimator = false;
     public static int swapInterval = -1;
 
+    boolean debug = false;
     long startTime = 0;
     long curTime = 0;
 
     GLU glu = null;
 
     public RedSquare() {
+        this(false);
+    }
+
+    public RedSquare(boolean debug) {
+        this.debug = debug;
     }
 
     // FIXME: we must add storage of the pointers in the GL state to
@@ -75,14 +81,16 @@ public class RedSquare implements GLEventListener {
 
         glu = GLU.createGLU(gl);
 
-        System.err.println(Thread.currentThread()+" Entering initialization");
-        System.err.println(Thread.currentThread()+" GL Profile: "+gl.getGLProfile());
-        System.err.println(Thread.currentThread()+" GL:" + gl);
-        System.err.println(Thread.currentThread()+" GL_VERSION=" + gl.glGetString(gl.GL_VERSION));
-        System.err.println(Thread.currentThread()+" GL_EXTENSIONS:");
-        System.err.println(Thread.currentThread()+"   " + gl.glGetString(gl.GL_EXTENSIONS));
-        System.err.println(Thread.currentThread()+" swapInterval: " + swapInterval + " (GL: "+gl.getSwapInterval()+")");
-        System.err.println(Thread.currentThread()+" GLU: " + glu);
+        if(debug) {
+            System.err.println(Thread.currentThread()+" Entering initialization");
+            System.err.println(Thread.currentThread()+" GL Profile: "+gl.getGLProfile());
+            System.err.println(Thread.currentThread()+" GL:" + gl);
+            System.err.println(Thread.currentThread()+" GL_VERSION=" + gl.glGetString(gl.GL_VERSION));
+            System.err.println(Thread.currentThread()+" GL_EXTENSIONS:");
+            System.err.println(Thread.currentThread()+"   " + gl.glGetString(gl.GL_EXTENSIONS));
+            System.err.println(Thread.currentThread()+" swapInterval: " + swapInterval + " (GL: "+gl.getSwapInterval()+")");
+            System.err.println(Thread.currentThread()+" GLU: " + glu);
+        }
 
         // Allocate vertex arrays
         colors   = Buffers.newDirectFloatBuffer(16);
@@ -140,7 +148,9 @@ public class RedSquare implements GLEventListener {
 
     public void dispose(GLAutoDrawable drawable) {
         GL2ES1 gl = drawable.getGL().getGL2ES1();
-        System.out.println(Thread.currentThread()+" RedSquare.dispose: "+gl.getContext());
+        if(debug) {
+            System.out.println(Thread.currentThread()+" RedSquare.dispose: "+gl.getContext());
+        }
         gl.glDisableClientState(gl.GL_VERTEX_ARRAY);
         gl.glDisableClientState(gl.GL_COLOR_ARRAY);
         glu.destroy();
@@ -149,7 +159,9 @@ public class RedSquare implements GLEventListener {
         colors   = null;
         vertices.clear();
         vertices = null;
-        System.out.println(Thread.currentThread()+" RedSquare.dispose: FIN");
+        if(debug) {
+            System.out.println(Thread.currentThread()+" RedSquare.dispose: FIN");
+        }
     }
 
     public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) {
diff --git a/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
index 6c812ba18..fa15e3fef 100755
--- a/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
@@ -55,10 +55,12 @@ public class TestDrawable01NEWT {
     Window window;
     GLDrawable drawable;
     GLContext context;
+    GLDrawableFactory factory;
 
     @BeforeClass
     public static void initClass() {
         glp = GLProfile.getDefault();
+        Assert.assertNotNull(glp);
         width  = 640;
         height = 480;
     }
@@ -66,56 +68,91 @@ public class TestDrawable01NEWT {
     @Before
     public void initTest() {
         caps = new GLCapabilities(glp);
+        Assert.assertNotNull(caps);
     }
 
     void createWindow(boolean onscreen, boolean pbuffer, boolean undecorated) {
         caps.setOnscreen(onscreen);
         caps.setPBuffer(!onscreen && pbuffer);
         caps.setDoubleBuffered(!onscreen);
-        System.out.println("**********************************************************");
-        System.out.println("**********************************************************");
-        System.out.println("Requested: "+caps);
+        // System.out.println("Requested: "+caps);
 
         //
         // Create native windowing resources .. X11/Win/OSX
         // 
         Display display = NewtFactory.createDisplay(null); // local display
+        Assert.assertNotNull(display);
+
         Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+        Assert.assertNotNull(screen);
+
         window = NewtFactory.createWindow(screen, caps, onscreen && undecorated);
+        Assert.assertNotNull(window);
         window.setSize(width, height);
         window.setVisible(true);
-        System.out.println("**********************************************************");
-        System.out.println("**********************************************************");
-        System.out.println("Created: "+window);
+        // System.out.println("Created: "+window);
 
         //
         // Create native OpenGL resources .. XGL/WGL/CGL .. 
         // equivalent to GLAutoDrawable methods: setVisible(true)
         // 
         GLCapabilities glCaps = (GLCapabilities) window.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
-
-        GLDrawableFactory factory = GLDrawableFactory.getFactory(glCaps.getGLProfile());
-        System.out.println(factory);
+        Assert.assertNotNull(glCaps);
+        Assert.assertTrue(glCaps.getGreenBits()>5);
+        Assert.assertTrue(glCaps.getBlueBits()>5);
+        Assert.assertTrue(glCaps.getRedBits()>5);
+        Assert.assertTrue(glCaps.isOnscreen()==onscreen);
+        Assert.assertTrue(glCaps.isPBuffer()==(!onscreen && pbuffer));
+        Assert.assertTrue(glCaps.getDoubleBuffered()==!onscreen);
+        Assert.assertTrue(glCaps.getDepthBits()>4);
+
+        factory = GLDrawableFactory.getFactory(glCaps.getGLProfile());
+        Assert.assertNotNull(factory);
         drawable = factory.createGLDrawable(window);
-        System.out.println("**********************************************************");
-        System.out.println("**********************************************************");
-        System.out.println("Pre: "+drawable);
+        Assert.assertNotNull(drawable);
+        // System.out.println("Pre: "+drawable);
+        //
         drawable.setRealized(true);
-        System.out.println("**********************************************************");
-        System.out.println("**********************************************************");
-        System.out.println("Post: "+drawable);
+        Assert.assertTrue(width==drawable.getWidth());
+        Assert.assertTrue(height==drawable.getHeight());
+        // Assert.assertTrue(glCaps==drawable.getChosenGLCapabilities());
+        Assert.assertTrue(window==drawable.getNativeWindow());
+        // System.out.println("Post: "+drawable);
+
         context = drawable.createContext(null);
-        System.out.println(context);
+        Assert.assertNotNull(context);
+        // System.out.println(context);
+        
+        int res = context.makeCurrent();
+        Assert.assertTrue(GLContext.CONTEXT_CURRENT_NEW==res || GLContext.CONTEXT_CURRENT==res);
+
+        // draw something ..
 
-        System.out.println("**********************************************************");
-        System.out.println("**********************************************************");
-        System.out.println("Final: "+window);
+        drawable.swapBuffers();
+        context.release();
+
+        // System.out.println("Final: "+window);
     }
 
     void destroyWindow() {
+        // GLWindow.dispose(..) sequence
+        Assert.assertNotNull(context);
         context.destroy();
+
+        Assert.assertNotNull(drawable);
         drawable.setRealized(false);
+
+        // GLWindow.destroy(..) sequence cont..
+        Assert.assertNotNull(window);
         window.destroy(true); // incl screen + display
+
+        drawable = null;
+        context = null;
+        window = null;
+
+        // test code cont ..
+        factory.shutdown();
+        factory = null;
     }
 
     @Test
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.java
index 2b32f720e..4970cbbdf 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.java
@@ -60,9 +60,7 @@ public class ReadBuffer2File extends ReadBufferBase {
       try {
         File file = File.createTempFile("shot"+shotNum+"-", ".ppm");
         TextureIO.write(readBufferUtil.getTextureData(), file);
-        if(0==shotNum) {
-            System.out.println("Wrote: "+file.getAbsolutePath()+", ...");
-        }
+        System.out.println("Wrote: "+file.getAbsolutePath()+", ...");
         shotNum++;
       } catch (IOException ioe) { ioe.printStackTrace(); }
       readBufferUtil.rewindPixelBuffer();
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/Surface2File.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/Surface2File.java
index 43e2df54c..b4f1ba743 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/Surface2File.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/Surface2File.java
@@ -55,7 +55,11 @@ public class Surface2File implements SurfaceUpdatedListener {
             GLDrawable drawable = (GLDrawable) updater;
             GLContext ctx = GLContext.getCurrent();
             if(null!=ctx && ctx.getGLDrawable()==drawable) {
-                readBufferUtil.fetchOffscreenTexture(drawable, ctx.getGL());
+                GL gl = ctx.getGL();
+                // FIXME glFinish() is an expensive paranoia sync, should not be necessary due to spec
+                gl.glFinish(); 
+                readBufferUtil.fetchOffscreenTexture(drawable, gl);
+                gl.glFinish();
                 surface2File("shot");
             }
         }
@@ -67,9 +71,7 @@ public class Surface2File implements SurfaceUpdatedListener {
       try {
         File file = File.createTempFile(basename+shotNum+"-", ".ppm");
         TextureIO.write(readBufferUtil.getTextureData(), file);
-        if(0==shotNum) {
-            System.out.println("Wrote: "+file.getAbsolutePath()+", ...");
-        }
+        System.out.println("Wrote: "+file.getAbsolutePath()+", ...");
         shotNum++;
       } catch (IOException ioe) { ioe.printStackTrace(); }
       readBufferUtil.rewindPixelBuffer();
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
index 5800af9af..277b41af3 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
@@ -66,7 +66,6 @@ public class TestOffscreen01NEWT {
 
     @Test
     public void test01OffscreenWindow() {
-        if(true) {
         GLWindow windowOffscreen = WindowUtilNEWT.createGLWindow(caps, width, height, false, true, false);
         GLEventListener demo = new RedSquare();
         GLWindow windowOnScreen = null;
@@ -74,17 +73,15 @@ public class TestOffscreen01NEWT {
         MouseListener ml=null;
         SurfaceUpdatedListener ul=null;
 
-        WindowUtilNEWT.run(windowOffscreen, null, windowOnScreen, wl, ml, ul, 2, true /*debug*/);
+        WindowUtilNEWT.run(windowOffscreen, null, windowOnScreen, wl, ml, ul, 2, false /*snapshot*/, false /*debug*/);
         try {
             Thread.sleep(1000); // 1000 ms
         } catch (Exception e) {}
         WindowUtilNEWT.shutdown(windowOffscreen, windowOnScreen);
-        }
     }
 
     @Test
     public void test02OffscreenSnapshotWithDemo() {
-        if(true) {
         GLWindow windowOffscreen = WindowUtilNEWT.createGLWindow(caps, width, height, false, true, false);
         GLEventListener demo = new RedSquare();
         GLWindow windowOnScreen = null;
@@ -92,12 +89,11 @@ public class TestOffscreen01NEWT {
         MouseListener ml=null;
         SurfaceUpdatedListener ul=null;
 
-        WindowUtilNEWT.run(windowOffscreen, demo, windowOnScreen, wl, ml, ul, 2, true /*debug*/);
+        WindowUtilNEWT.run(windowOffscreen, demo, windowOnScreen, wl, ml, ul, 2, true /*snapshot*/, false /*debug*/);
         try {
             Thread.sleep(1000); // 1000 ms
         } catch (Exception e) {}
         WindowUtilNEWT.shutdown(windowOffscreen, windowOnScreen);
-        }
     }
 
     public static void main(String args[]) {
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
index b9541dbaf..26b13cf7d 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
@@ -77,7 +77,7 @@ public class WindowUtilNEWT {
 
     public static void run(GLWindow windowOffscreen, GLEventListener demo, 
                            GLWindow windowOnScreen, WindowListener wl, MouseListener ml, 
-                           SurfaceUpdatedListener ul, int frames, boolean debug) {
+                           SurfaceUpdatedListener ul, int frames, boolean snapshot, boolean debug) {
         try {
             if(debug && null!=demo) {
                 MiscUtils.setField(demo, "glDebug", new Boolean(true));
@@ -103,22 +103,28 @@ public class WindowUtilNEWT {
             GLDrawable readDrawable = windowOffscreen.getContext().getGLDrawable() ;
 
             if ( null == windowOnScreen ) {
-                ReadBuffer2File readDemo = new ReadBuffer2File( readDrawable ) ;
+                if(snapshot) {
+                    Surface2File s2f = new Surface2File();
+                    windowOffscreen.addSurfaceUpdatedListener(s2f);
+                }
             } else {
                 ReadBuffer2Screen readDemo = new ReadBuffer2Screen( readDrawable ) ;
                 windowOnScreen.addGLEventListener(readDemo);
-                if(null!=wl) {
-                    windowOffscreen.addSurfaceUpdatedListener(ul);
-                }
+            }
+            if(null!=ul) {
+                windowOffscreen.addSurfaceUpdatedListener(ul);
             }
 
-            System.out.println("+++++++++++++++++++++++++++");
-            System.out.println(windowOffscreen);
-            System.out.println("+++++++++++++++++++++++++++");
+            if(debug) {
+                System.out.println("+++++++++++++++++++++++++++");
+                System.out.println(windowOffscreen);
+                System.out.println("+++++++++++++++++++++++++++");
+            }
 
             while ( windowOffscreen.getTotalFrames() < frames) {
                 windowOffscreen.display();
             }
+            windowOffscreen.removeAllSurfaceUpdatedListener();
 
         } catch (GLException e) {
             e.printStackTrace();
-- 
cgit v1.2.3


From 2e0905bb6d91c36aa9e848762641e4e3a5810c4b Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 10 Apr 2010 02:02:34 +0200
Subject: ant 1.8.0 on win32

---
 make/make.jogl.all.win32.bat | 2 +-
 make/setvc9-jogl.bat         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/make/make.jogl.all.win32.bat b/make/make.jogl.all.win32.bat
index da45cbd7b..a4cc59673 100644
--- a/make/make.jogl.all.win32.bat
+++ b/make/make.jogl.all.win32.bat
@@ -2,7 +2,7 @@ set THISDIR="C:\JOGL"
 
 set J2RE_HOME=c:\jre1.6.0_19
 set JAVA_HOME=c:\jdk1.6.0_19
-set ANT_PATH=C:\apache-ant-1.7.1
+set ANT_PATH=C:\apache-ant-1.8.0
 
 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
 
diff --git a/make/setvc9-jogl.bat b/make/setvc9-jogl.bat
index be6f039ad..2e8338374 100755
--- a/make/setvc9-jogl.bat
+++ b/make/setvc9-jogl.bat
@@ -1,7 +1,7 @@
 
 
-set PATH=C:\cygwin\devtools\share\apache-ant-1.7.0\bin;%PATH%
-set ANT_PATH=C:\cygwin\devtools\share\apache-ant-1.7.0
+set PATH=C:\cygwin\devtools\share\apache-ant-1.8.0\bin;%PATH%
+set ANT_PATH=C:\cygwin\devtools\share\apache-ant-1.8.0
 
 c:
 cd C:\SUN\JOGL2\jogl\make
-- 
cgit v1.2.3


From 98de1d96e77a1c1aad237a8e5c6c63e21bcb5fc2 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 10 Apr 2010 02:42:25 +0200
Subject: Fix: Use file.seperator (win32); Use java.home/bin/java

---
 make/build-junit.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/make/build-junit.xml b/make/build-junit.xml
index 74cb30606..58e8e3b7f 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -98,15 +98,15 @@
             <property name="test.class.path" basedir="${classes}" relative="true" location="@{test.class.path.m}"/>
             <var name="test.class.fqn" unset="true"/>
             <pathconvert property="test.class.fqn">
-              <fileset file="${classes}/${test.class.path}"/>
+              <fileset file="${classes}${file.separator}${test.class.path}"/>
               <chainedmapper>
-                  <globmapper    from="${classes.path}/*" to="*"/> <!-- rel. -->
+                  <globmapper    from="${classes.path}${file.separator}*" to="*"/> <!-- rel. -->
                   <packagemapper from="*.class"           to="*"/> <!-- FQCN -->
               </chainedmapper>
             </pathconvert>
             <var name="test.class.result.file" value="${results.junit}/TEST-${test.class.fqn}.xml"/>
             <echo message="Testing ${test.class.fqn} -> ${test.class.result.file}"/>
-            <apply dir="." executable="java" 
+            <apply dir="." executable="${java.home}/bin/java" 
                  parallel="false" 
                  timeout="${batchtest.timeout}"
                  vmlauncher="false"
-- 
cgit v1.2.3


From 1c1053c6a8b669c067ae1316b9770871e213ea05 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 13 Apr 2010 20:48:50 +0200
Subject: NEWT X11 Fix (mainly ATI and multithreading)     -
 EventDispatchThread -> EDTUtil       Since the name leads to the assumptions
 that an instance is the EDT.       EDTUtil manages the EDT within.

    - EDTUtil, no more reference to Display, but use a Runnable for the
      pumpMessage()

    - Window.destroy() check if already done

    - X11Window: Added XErrorHandler to catch BadWindow and BadAtom
      while dispatching events - it is possible that the resource
      is already freed. Also added an XIOErrorHandler to identify
      the fatal Display* inaccessibility.

Tests:
    - New junit/com/jogamp/test/junit/newt/TestWindows01NEWT.java
      Testing creation/destruction and double destruction (error case)

    - Fix: src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
      Properly holding all NEWT references ..

Misc:
    - Reduced redundant NEWT 'toString()' output (*Capabilities, ..)
    -
---
 .../junit/jogl/offscreen/TestOffscreen01NEWT.java  |  82 ++++++-
 .../test/junit/jogl/offscreen/WindowUtilNEWT.java  |  67 ++----
 .../jogamp/test/junit/newt/TestWindows01NEWT.java  | 174 +++++++++++++++
 src/newt/classes/com/jogamp/newt/Display.java      |  47 ++--
 src/newt/classes/com/jogamp/newt/Window.java       |  63 +++---
 .../classes/com/jogamp/newt/opengl/GLWindow.java   |   6 +-
 src/newt/classes/com/jogamp/newt/util/EDTUtil.java | 244 +++++++++++++++++++++
 .../com/jogamp/newt/util/EventDispatchThread.java  | 240 --------------------
 src/newt/native/X11Window.c                        |  75 ++++++-
 9 files changed, 639 insertions(+), 359 deletions(-)
 create mode 100755 src/junit/com/jogamp/test/junit/newt/TestWindows01NEWT.java
 create mode 100644 src/newt/classes/com/jogamp/newt/util/EDTUtil.java
 delete mode 100644 src/newt/classes/com/jogamp/newt/util/EventDispatchThread.java

diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
index 277b41af3..436167dbf 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
@@ -66,38 +66,102 @@ public class TestOffscreen01NEWT {
 
     @Test
     public void test01OffscreenWindow() {
-        GLWindow windowOffscreen = WindowUtilNEWT.createGLWindow(caps, width, height, false, true, false);
-        GLEventListener demo = new RedSquare();
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+
+        Display display = NewtFactory.createDisplay(null); // local display
+        Assert.assertNotNull(display);
+        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+        Assert.assertNotNull(screen);
+        Window window = NewtFactory.createWindow(screen, caps2, false /* undecorated */);
+        Assert.assertNotNull(window);
+        window.setSize(width, height);
+        GLWindow windowOffScreen = GLWindow.create(window);
+        Assert.assertNotNull(windowOffScreen);
+        windowOffScreen.setVisible(true);
+
         GLWindow windowOnScreen = null;
         WindowListener wl=null;
         MouseListener ml=null;
         SurfaceUpdatedListener ul=null;
 
-        WindowUtilNEWT.run(windowOffscreen, null, windowOnScreen, wl, ml, ul, 2, false /*snapshot*/, false /*debug*/);
+        WindowUtilNEWT.run(windowOffScreen, null, windowOnScreen, wl, ml, ul, 2, false /*snapshot*/, false /*debug*/);
         try {
             Thread.sleep(1000); // 1000 ms
         } catch (Exception e) {}
-        WindowUtilNEWT.shutdown(windowOffscreen, windowOnScreen);
+
+        if(null!=windowOnScreen) {
+            windowOnScreen.destroy();
+        }
+        if(null!=windowOffScreen) {
+            windowOffScreen.destroy();
+        }
+        if(null!=screen) {
+            screen.destroy();
+        }
+        if(null!=display) {
+            display.destroy();
+        }
     }
 
     @Test
     public void test02OffscreenSnapshotWithDemo() {
-        GLWindow windowOffscreen = WindowUtilNEWT.createGLWindow(caps, width, height, false, true, false);
-        GLEventListener demo = new RedSquare();
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+
+        Display display = NewtFactory.createDisplay(null); // local display
+        Assert.assertNotNull(display);
+        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+        Assert.assertNotNull(screen);
+        Window window = NewtFactory.createWindow(screen, caps2, false /* undecorated */);
+        Assert.assertNotNull(window);
+        window.setSize(width, height);
+        GLWindow windowOffScreen = GLWindow.create(window);
+        Assert.assertNotNull(windowOffScreen);
+        windowOffScreen.setVisible(true);
+
         GLWindow windowOnScreen = null;
         WindowListener wl=null;
         MouseListener ml=null;
         SurfaceUpdatedListener ul=null;
 
-        WindowUtilNEWT.run(windowOffscreen, demo, windowOnScreen, wl, ml, ul, 2, true /*snapshot*/, false /*debug*/);
+        GLEventListener demo = new RedSquare();
+        Assert.assertNotNull(demo);
+
+        WindowUtilNEWT.run(windowOffScreen, demo, windowOnScreen, wl, ml, ul, 2, true /*snapshot*/, false /*debug*/);
         try {
             Thread.sleep(1000); // 1000 ms
         } catch (Exception e) {}
-        WindowUtilNEWT.shutdown(windowOffscreen, windowOnScreen);
+
+        if(null!=windowOnScreen) {
+            windowOnScreen.destroy();
+        }
+        if(null!=windowOffScreen) {
+            windowOffScreen.destroy();
+        }
+        if(null!=screen) {
+            screen.destroy();
+        }
+        if(null!=display) {
+            display.destroy();
+        }
     }
 
     public static void main(String args[]) {
-        org.junit.runner.JUnitCore.main(TestOffscreen01NEWT.class.getName());
+        String tstname = TestOffscreen01NEWT.class.getName();
+        try {
+        org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(new String[] {
+            tstname,
+            "filtertrace=true",
+            "haltOnError=false",
+            "haltOnFailure=false",
+            "showoutput=true",
+            "outputtoformatters=true",
+            "logfailedtests=true",
+            "logtestlistenerevents=true",
+            "formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter",
+            "formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,TEST-"+tstname+".xml" } );
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
 }
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
index 26b13cf7d..f6a6dc4be 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
@@ -34,6 +34,8 @@ package com.jogamp.test.junit.jogl.offscreen;
 
 import com.jogamp.test.junit.util.*;
 
+import org.junit.Assert;
+
 import java.lang.reflect.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
@@ -42,52 +44,29 @@ import com.jogamp.newt.opengl.*;
 
 public class WindowUtilNEWT {
 
-    public static Window createWindow(GLCapabilities caps, int w, int h, boolean onscreen, boolean pbuffer, boolean undecorated) {
-        GLCapabilities caps2 = (GLCapabilities) caps.clone();
-        caps2.setOnscreen(onscreen);
-        caps2.setPBuffer(!onscreen && pbuffer);
-        caps2.setDoubleBuffered(!onscreen);
-
-        Display display = NewtFactory.createDisplay(null); // local display
-        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
-        Window window = NewtFactory.createWindow(screen, caps2, onscreen && undecorated);
-
-        GLCapabilities glCaps = (GLCapabilities) window.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
-
-        GLDrawableFactory factory = GLDrawableFactory.getFactory(glCaps.getGLProfile());
-        GLDrawable drawable = factory.createGLDrawable(window);
-        drawable.setRealized(true);
-        GLContext context = drawable.createContext(null);
-
-        window.setSize(w, h);
-        window.setVisible(true);
-        return window;
-    }
-
-    public static GLWindow createGLWindow(GLCapabilities caps, int w, int h, boolean onscreen, boolean pbuffer, boolean undecorated) {
+    public static GLCapabilities fixCaps(GLCapabilities caps, boolean onscreen, boolean pbuffer, boolean undecorated) {
         GLCapabilities caps2 = (GLCapabilities) caps.clone();
         caps2.setOnscreen(onscreen);
         caps2.setPBuffer(!onscreen && pbuffer);
         caps2.setDoubleBuffered(!onscreen);
-        GLWindow window = GLWindow.create(caps2, onscreen && undecorated);
-        window.setSize(w, h);
-        window.setVisible(true);
-        return window;
+        return caps2;
     }
 
-    public static void run(GLWindow windowOffscreen, GLEventListener demo, 
+    public static void run(GLWindow windowOffScreen, GLEventListener demo, 
                            GLWindow windowOnScreen, WindowListener wl, MouseListener ml, 
                            SurfaceUpdatedListener ul, int frames, boolean snapshot, boolean debug) {
         try {
+            Assert.assertNotNull(windowOffScreen);
+
             if(debug && null!=demo) {
                 MiscUtils.setField(demo, "glDebug", new Boolean(true));
                 MiscUtils.setField(demo, "glTrace", new Boolean(true));
             }
             if(null!=demo) {
-                if(!MiscUtils.setField(demo, "window", windowOffscreen)) {
-                    MiscUtils.setField(demo, "glWindow", windowOffscreen);
+                if(!MiscUtils.setField(demo, "window", windowOffScreen)) {
+                    MiscUtils.setField(demo, "glWindow", windowOffScreen);
                 }
-                windowOffscreen.addGLEventListener(demo);
+                windowOffScreen.addGLEventListener(demo);
             }
 
             if ( null != windowOnScreen ) {
@@ -100,47 +79,35 @@ public class WindowUtilNEWT {
                 windowOnScreen.setVisible(true);
             }
 
-            GLDrawable readDrawable = windowOffscreen.getContext().getGLDrawable() ;
+            GLDrawable readDrawable = windowOffScreen.getContext().getGLDrawable() ;
 
             if ( null == windowOnScreen ) {
                 if(snapshot) {
                     Surface2File s2f = new Surface2File();
-                    windowOffscreen.addSurfaceUpdatedListener(s2f);
+                    windowOffScreen.addSurfaceUpdatedListener(s2f);
                 }
             } else {
                 ReadBuffer2Screen readDemo = new ReadBuffer2Screen( readDrawable ) ;
                 windowOnScreen.addGLEventListener(readDemo);
             }
             if(null!=ul) {
-                windowOffscreen.addSurfaceUpdatedListener(ul);
+                windowOffScreen.addSurfaceUpdatedListener(ul);
             }
 
             if(debug) {
                 System.out.println("+++++++++++++++++++++++++++");
-                System.out.println(windowOffscreen);
+                System.out.println(windowOffScreen);
                 System.out.println("+++++++++++++++++++++++++++");
             }
 
-            while ( windowOffscreen.getTotalFrames() < frames) {
-                windowOffscreen.display();
+            while ( windowOffScreen.getTotalFrames() < frames) {
+                windowOffScreen.display();
             }
-            windowOffscreen.removeAllSurfaceUpdatedListener();
+            windowOffScreen.removeAllSurfaceUpdatedListener();
 
         } catch (GLException e) {
             e.printStackTrace();
         }
     }
 
-    public static void shutdown(GLWindow windowOffscreen, GLWindow windowOnscreen) {
-        // Shut things down cooperatively
-        if(null!=windowOnscreen) {
-            windowOnscreen.destroy();
-        }
-        if(null!=windowOffscreen) {
-            windowOffscreen.destroy();
-        }
-        if(null!=windowOnscreen) {
-            windowOnscreen.getFactory().shutdown();
-        }
-    }
 }
diff --git a/src/junit/com/jogamp/test/junit/newt/TestWindows01NEWT.java b/src/junit/com/jogamp/test/junit/newt/TestWindows01NEWT.java
new file mode 100755
index 000000000..91760ae80
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/newt/TestWindows01NEWT.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.newt;
+
+import java.lang.reflect.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Test;
+
+import javax.media.nativewindow.*;
+
+import com.jogamp.newt.*;
+
+public class TestWindows01NEWT {
+    static int width, height;
+
+    @BeforeClass
+    public static void initClass() {
+        width  = 640;
+        height = 480;
+    }
+
+    static Window createWindow(Screen screen, Capabilities caps, int width, int height, boolean onscreen, boolean undecorated) {
+        Assert.assertNotNull(caps);
+        caps.setOnscreen(onscreen);
+        // System.out.println("Requested: "+caps);
+
+        //
+        // Create native windowing resources .. X11/Win/OSX
+        // 
+        Window window = NewtFactory.createWindow(screen, caps, onscreen && undecorated);
+        Assert.assertNotNull(window);
+        window.setSize(width, height);
+        Assert.assertTrue(false==window.isVisible());
+        window.setVisible(true);
+        Assert.assertTrue(true==window.isVisible());
+        Assert.assertTrue(width==window.getWidth());
+        Assert.assertTrue(height==window.getHeight());
+        // System.out.println("Created: "+window);
+
+        //
+        // Create native OpenGL resources .. XGL/WGL/CGL .. 
+        // equivalent to GLAutoDrawable methods: setVisible(true)
+        // 
+        caps = (Capabilities) window.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
+        Assert.assertNotNull(caps);
+        Assert.assertTrue(caps.getGreenBits()>5);
+        Assert.assertTrue(caps.getBlueBits()>5);
+        Assert.assertTrue(caps.getRedBits()>5);
+        Assert.assertTrue(caps.isOnscreen()==onscreen);
+
+        return window;
+    }
+
+    static void destroyWindow(Display display, Screen screen, Window window) {
+        if(null!=window) {
+            window.destroy();
+        }
+        if(null!=screen) {
+            screen.destroy();
+        }
+        if(null!=display) {
+            display.destroy();
+        }
+    }
+
+    @Test
+    public void testWindowDecor01Simple() {
+        Capabilities caps = new Capabilities();
+        Assert.assertNotNull(caps);
+        Display display = NewtFactory.createDisplay(null); // local display
+        Assert.assertNotNull(display);
+        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+        Assert.assertNotNull(screen);
+
+        Window window = createWindow(screen, caps, width, height, true /* onscreen */, false /* undecorated */);
+        try {
+            Thread.sleep(1000); // 1000 ms
+        } catch (Exception e) {}
+        destroyWindow(display, screen, window);
+    }
+
+    @Test
+    public void testWindowDecor02DestroyWinTwiceA() {
+        Capabilities caps = new Capabilities();
+        Assert.assertNotNull(caps);
+        Display display = NewtFactory.createDisplay(null); // local display
+        Assert.assertNotNull(display);
+        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+        Assert.assertNotNull(screen);
+
+        Window window = createWindow(screen, caps, width, height, true /* onscreen */, false /* undecorated */);
+        try {
+            Thread.sleep(1000); // 1000 ms
+        } catch (Exception e) {}
+        destroyWindow(null, null, window);
+        destroyWindow(display, screen, window);
+    }
+
+    @Test
+    public void testWindowDecor03TwoWin() {
+        Capabilities caps = new Capabilities();
+        Assert.assertNotNull(caps);
+        Display display = NewtFactory.createDisplay(null); // local display
+        Assert.assertNotNull(display);
+        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+        Assert.assertNotNull(screen);
+
+        Window window1 = createWindow(screen, caps, width, height, true /* onscreen */, false /* undecorated */);
+        Window window2 = createWindow(screen, caps, width, height, true /* onscreen */, false /* undecorated */);
+        try {
+            Thread.sleep(1000); // 1000 ms
+        } catch (Exception e) {}
+        destroyWindow(null, null, window2);
+        destroyWindow(display, screen, window1);
+    }
+
+    public static void main(String args[]) {
+        String tstname = TestWindows01NEWT.class.getName();
+        try {
+        org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(new String[] {
+            tstname,
+            "filtertrace=true",
+            "haltOnError=false",
+            "haltOnFailure=false",
+            "showoutput=true",
+            "outputtoformatters=true",
+            "logfailedtests=true",
+            "logtestlistenerevents=true",
+            "formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter",
+            "formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,TEST-"+tstname+".xml" } );
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/src/newt/classes/com/jogamp/newt/Display.java b/src/newt/classes/com/jogamp/newt/Display.java
index 88f6dd34b..2bc99475c 100755
--- a/src/newt/classes/com/jogamp/newt/Display.java
+++ b/src/newt/classes/com/jogamp/newt/Display.java
@@ -35,7 +35,7 @@ package com.jogamp.newt;
 
 import javax.media.nativewindow.*;
 import com.jogamp.newt.impl.Debug;
-import com.jogamp.newt.util.EventDispatchThread;
+import com.jogamp.newt.util.EDTUtil;
 import java.util.*;
 
 public abstract class Display {
@@ -141,11 +141,16 @@ public abstract class Display {
                 display.refCount=1;
 
                 if(NewtFactory.useEDT()) {
-                    Thread current = Thread.currentThread();
-                    display.eventDispatchThread = new EventDispatchThread(display, current.getThreadGroup(), current.getName());
-                    display.eventDispatchThread.start();
                     final Display f_dpy = display;
-                    display.eventDispatchThread.invokeAndWait(new Runnable() {
+                    Thread current = Thread.currentThread();
+                    display.edtUtil = new EDTUtil(current.getThreadGroup(), 
+                                                  "Display_"+display.getName()+"-"+current.getName(),
+                                                  new Runnable() {
+                                                    public void run() {
+                                                        f_dpy.pumpMessagesImpl();
+                                                    } } );
+                    display.edt = display.edtUtil.start();
+                    display.edtUtil.invokeAndWait(new Runnable() {
                         public void run() {
                             f_dpy.createNative();
                         }
@@ -189,7 +194,7 @@ public abstract class Display {
         }
     }
 
-    public EventDispatchThread getEDT() { return eventDispatchThread; }
+    public EDTUtil getEDTUtil() { return edtUtil; }
 
     public synchronized void destroy() {
         if(DEBUG) {
@@ -201,10 +206,10 @@ public abstract class Display {
             if(DEBUG) {
                 System.err.println("Display.destroy("+name+") REMOVE: "+this+" "+Thread.currentThread());
             }
-            if(null!=eventDispatchThread) {
+            if(null!=edtUtil) {
                 final Display f_dpy = this;
-                final EventDispatchThread f_edt = eventDispatchThread;
-                eventDispatchThread.invokeAndWait(new Runnable() {
+                final EDTUtil f_edt = edtUtil;
+                edtUtil.invokeAndWait(new Runnable() {
                     public void run() {
                         f_dpy.closeNative();
                         f_edt.stop();
@@ -213,9 +218,9 @@ public abstract class Display {
             } else {
                 closeNative();
             }
-            if(null!=eventDispatchThread) { 
-                eventDispatchThread.waitUntilStopped();
-                eventDispatchThread=null;
+            if(null!=edtUtil) { 
+                edtUtil.waitUntilStopped();
+                edtUtil=null;
             }
             aDevice = null;
         } else {
@@ -246,14 +251,13 @@ public abstract class Display {
         return aDevice;
     }
 
-    public void pumpMessages() {
-        if(null!=eventDispatchThread) { 
-            dispatchMessages();
-        } else {
-            synchronized(this) {
-                dispatchMessages();
-            }
-        }
+    public synchronized void pumpMessages() {
+        pumpMessagesImpl();
+    }
+
+    private void pumpMessagesImpl() {
+        if(0==refCount) return;
+        dispatchMessages();
     }
 
     public String toString() {
@@ -268,7 +272,8 @@ public abstract class Display {
     /** Default impl. nop - Currently only X11 needs a Display lock */
     protected void unlockDisplay() { }
 
-    protected EventDispatchThread eventDispatchThread = null;
+    protected EDTUtil edtUtil = null;
+    protected Thread  edt = null;
     protected String name;
     protected int refCount;
     protected AbstractGraphicsDevice aDevice;
diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java
index 171bb2468..8f09ae364 100755
--- a/src/newt/classes/com/jogamp/newt/Window.java
+++ b/src/newt/classes/com/jogamp/newt/Window.java
@@ -34,7 +34,7 @@
 package com.jogamp.newt;
 
 import com.jogamp.newt.impl.Debug;
-import com.jogamp.newt.util.EventDispatchThread;
+import com.jogamp.newt.util.EDTUtil;
 
 import javax.media.nativewindow.*;
 import com.jogamp.nativewindow.impl.NWReflection;
@@ -98,10 +98,10 @@ public abstract class Window implements NativeWindow
             window.invalidate();
             window.screen   = screen;
             window.setUndecorated(undecorated||0!=parentWindowHandle);
-            EventDispatchThread edt = screen.getDisplay().getEDT();
-            if(null!=edt) {
+            EDTUtil edtUtil = screen.getDisplay().getEDTUtil();
+            if(null!=edtUtil) {
                 final Window f_win = window;
-                edt.invokeAndWait(new Runnable() {
+                edtUtil.invokeAndWait(new Runnable() {
                     public void run() {
                         f_win.createNative(parentWindowHandle, caps);
                     }
@@ -131,10 +131,10 @@ public abstract class Window implements NativeWindow
             window.invalidate();
             window.screen   = screen;
             window.setUndecorated(undecorated);
-            EventDispatchThread edt = screen.getDisplay().getEDT();
-            if(null!=edt) {
+            EDTUtil edtUtil = screen.getDisplay().getEDTUtil();
+            if(null!=edtUtil) {
                 final Window f_win = window;
-                edt.invokeAndWait(new Runnable() {
+                edtUtil.invokeAndWait(new Runnable() {
                     public void run() {
                         f_win.createNative(0, caps);
                     }
@@ -212,15 +212,15 @@ public abstract class Window implements NativeWindow
     public String toString() {
         StringBuffer sb = new StringBuffer();
 
-        sb.append(getClass().getName()+"[config "+config+
-                    ", windowHandle "+toHexString(getWindowHandle())+
-                    ", surfaceHandle "+toHexString(getSurfaceHandle())+
-                    ", pos "+getX()+"/"+getY()+", size "+getWidth()+"x"+getHeight()+
-                    ", visible "+isVisible()+
-                    ", undecorated "+undecorated+
-                    ", fullscreen "+fullscreen+
+        sb.append(getClass().getName()+"[Config "+config+
+                    ", WindowHandle "+toHexString(getWindowHandle())+
+                    ", SurfaceHandle "+toHexString(getSurfaceHandle())+
+                    ", Pos "+getX()+"/"+getY()+", size "+getWidth()+"x"+getHeight()+
+                    ", Visible "+isVisible()+
+                    ", Undecorated "+undecorated+
+                    ", Fullscreen "+fullscreen+
                     ", "+screen+
-                    ", wrappedWindow "+getWrappedWindow());
+                    ", WrappedWindow "+getWrappedWindow());
 
         sb.append(", SurfaceUpdatedListeners num "+surfaceUpdatedListeners.size()+" [");
         for (Iterator iter = surfaceUpdatedListeners.iterator(); iter.hasNext(); ) {
@@ -343,25 +343,28 @@ public abstract class Window implements NativeWindow
             keyListeners = new ArrayList();
         }
         synchronized(this) {
-            destructionLock.lock();
             try {
-                Screen scr = screen;
-                Display dpy = (null!=screen) ? screen.getDisplay() : null;
-                EventDispatchThread edt = (null!=dpy) ? dpy.getEDT() : null;
-                if(null!=edt) {
-                    final Window f_win = this;
-                    edt.invokeAndWait(new Runnable() {
-                        public void run() {
-                            f_win.closeNative();
-                        }
-                    } );
-                } else {
-                    closeNative();
+                destructionLock.lock();
+                Display dpy = null;
+                if( null != screen && 0 != windowHandle ) {
+                    Screen scr = screen;
+                    dpy = (null!=screen) ? screen.getDisplay() : null;
+                    EDTUtil edtUtil = (null!=dpy) ? dpy.getEDTUtil() : null;
+                    if(null!=edtUtil) {
+                        final Window f_win = this;
+                        edtUtil.invokeAndWait(new Runnable() {
+                            public void run() {
+                                f_win.closeNative();
+                            }
+                        } );
+                    } else {
+                        closeNative();
+                    }
                 }
                 invalidate();
                 if(deep) {
-                    if(null!=scr) {
-                        scr.destroy();
+                    if(null!=screen) {
+                        screen.destroy();
                     }
                     if(null!=dpy) {
                         dpy.destroy();
diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
index 4a7f27f3a..fec70c99c 100644
--- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
@@ -65,7 +65,7 @@ public class GLWindow extends Window implements GLAutoDrawable {
         this.ownerOfWinScrDpy = ownerOfWinScrDpy;
         this.window = window;
         this.window.setAutoDrawableClient(true);
-        this.runPumpMessages = ( null == getScreen().getDisplay().getEDT() ) ;
+        this.runPumpMessages = ( null == getScreen().getDisplay().getEDTUtil() ) ;
         window.addWindowListener(new WindowListener() {
                 public void windowResized(WindowEvent e) {
                     sendReshape = true;
@@ -152,7 +152,7 @@ public class GLWindow extends Window implements GLAutoDrawable {
      * @deprecated EXPERIMENTAL, semantic is about to be removed after further verification.
      */
     public void setRunPumpMessages(boolean onoff) {
-        if( onoff && null!=getScreen().getDisplay().getEDT() ) {
+        if( onoff && null!=getScreen().getDisplay().getEDTUtil() ) {
             throw new GLException("GLWindow.setRunPumpMessages(true) - Can't do with EDT on");
         }
         runPumpMessages = onoff;
@@ -382,7 +382,7 @@ public class GLWindow extends Window implements GLAutoDrawable {
     }
 
     public String toString() {
-        return "NEWT-GLWindow[ \n\tDrawable: "+drawable+", \n\tWindow: "+window+", \n\tHelper: "+helper+", \n\tFactory: "+factory+"]";
+        return "NEWT-GLWindow[ \n\tHelper: "+helper+", \n\tDrawable: "+drawable + /** ", \n\tWindow: "+window+", \n\tFactory: "+factory+ */ "]";
     }
 
     //----------------------------------------------------------------------
diff --git a/src/newt/classes/com/jogamp/newt/util/EDTUtil.java b/src/newt/classes/com/jogamp/newt/util/EDTUtil.java
new file mode 100644
index 000000000..f852bcf5c
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/util/EDTUtil.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+package com.jogamp.newt.util;
+
+import com.jogamp.newt.Display;
+import com.jogamp.newt.impl.Debug;
+import java.util.*;
+
+public class EDTUtil {
+    public static final boolean DEBUG = Debug.debug("EDT");
+
+    private ThreadGroup threadGroup; 
+    private volatile boolean shouldStop = false;
+    private EventDispatchThread edt = null;
+    private Object edtLock = new Object();
+    private ArrayList tasks = new ArrayList(); // one shot tasks
+    private String name;
+    private Runnable pumpMessages;
+    private long edtPollGranularity = 10; // 10ms, 1/100s
+
+    public EDTUtil(ThreadGroup tg, String name, Runnable pumpMessages) {
+        this.threadGroup = tg;
+        this.name=new String("EDT-"+name);
+        this.pumpMessages=pumpMessages;
+    }
+
+    public String getName() { return name; }
+
+    public ThreadGroup getThreadGroup() { return threadGroup; }
+
+    public Thread start() {
+        return start(false);
+    }
+
+    /**
+     * @param externalStimuli true indicates that another thread stimulates, 
+     *                        ie. calls this TaskManager's run() loop method.
+     *                        Hence no own thread is started in this case.
+     *
+     * @return The started Runnable, which handles the run-loop.
+     *         Usefull in combination with externalStimuli=true,
+     *         so an external stimuli can call it.
+     */
+    public Thread start(boolean externalStimuli) {
+        synchronized(edtLock) { 
+            if(null==edt) {
+                edt = new EventDispatchThread(threadGroup, name);
+            }
+            if(!edt.isRunning()) {
+                shouldStop = false;
+                edt.start(externalStimuli);
+            }
+            edtLock.notifyAll();
+        }
+        return edt;
+    }
+
+    public void stop() {
+        synchronized(edtLock) { 
+            if(null!=edt && edt.isRunning()) {
+                shouldStop = true;
+            }
+            edtLock.notifyAll();
+            if(DEBUG) {
+                System.out.println(Thread.currentThread()+": EDT signal STOP");
+            }
+        }
+    }
+
+    public Thread getEDT() {
+        return edt;
+    }
+
+    public boolean isThreadEDT(Thread thread) {
+        return null!=edt && edt == thread;
+    }
+
+    public boolean isCurrentThreadEDT() {
+        return null!=edt && edt == Thread.currentThread();
+    }
+
+    public boolean isRunning() {
+        return null!=edt && edt.isRunning() ;
+    }
+
+    public void invokeLater(Runnable task) {
+        if(task == null) {
+            return;
+        }
+        synchronized(edtLock) {
+            if(null!=edt && edt.isRunning() && edt != Thread.currentThread() ) {
+                tasks.add(task);
+                edtLock.notifyAll();
+            } else {
+                // if !running or isEDTThread, do it right away
+                task.run();
+            }
+        }
+    }
+
+    public void invokeAndWait(Runnable task) {
+        if(task == null) {
+            return;
+        }
+        invokeLater(task);
+        waitOnWorker();
+    }
+
+    public void waitOnWorker() {
+        synchronized(edtLock) {
+            if(null!=edt && edt.isRunning() && tasks.size()>0 && edt != Thread.currentThread() ) {
+                try {
+                    edtLock.wait();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public void waitUntilStopped() {
+        synchronized(edtLock) {
+            while(null!=edt && edt.isRunning() && edt != Thread.currentThread() ) {
+                try {
+                    edtLock.wait();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    class EventDispatchThread extends Thread {
+        boolean isRunning = false;
+        boolean externalStimuli = false;
+
+        public EventDispatchThread(ThreadGroup tg, String name) {
+            super(tg, name);
+        }
+
+        public synchronized boolean isRunning() {
+            return isRunning;
+        }
+
+        public void start(boolean externalStimuli) throws IllegalThreadStateException {
+            synchronized(this) {
+                this.externalStimuli = externalStimuli;
+                isRunning = true;
+            }
+            if(!externalStimuli) {
+                super.start();
+            }
+        }
+
+        /** 
+         * Utilizing edtLock only for local resources and task execution,
+         * not for event dispatching.
+         */
+        public void run() {
+            if(DEBUG) {
+                System.out.println(Thread.currentThread()+": EDT run() START");
+            }
+            while(!shouldStop) {
+                try {
+                    // wait for something todo
+                    while(!shouldStop && tasks.size()==0) {
+                        synchronized(edtLock) {
+                            if(!shouldStop && tasks.size()==0) {
+                                try {
+                                    edtLock.wait(edtPollGranularity);
+                                } catch (InterruptedException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                        pumpMessages.run(); // event dispatch
+                    }
+                    if(!shouldStop && tasks.size()>0) {
+                        synchronized(edtLock) {
+                            if(!shouldStop && tasks.size()>0) {
+                                Runnable task = (Runnable) tasks.remove(0);
+                                task.run();
+                                edtLock.notifyAll();
+                            }
+                        }
+                        pumpMessages.run(); // event dispatch
+                    }
+                } catch (Throwable t) {
+                    // handle errors ..
+                    t.printStackTrace();
+                } finally {
+                    // epilog - unlock locked stuff
+                }
+                if(externalStimuli) break; // no loop if called by external stimuli
+            }
+            synchronized(this) {
+                isRunning = !shouldStop;
+            }
+            if(!isRunning) {
+                synchronized(edtLock) {
+                    edtLock.notifyAll();
+                }
+            }
+            if(DEBUG) {
+                System.out.println(Thread.currentThread()+": EDT run() EXIT");
+            }
+        }
+    }
+}
+
diff --git a/src/newt/classes/com/jogamp/newt/util/EventDispatchThread.java b/src/newt/classes/com/jogamp/newt/util/EventDispatchThread.java
deleted file mode 100644
index 675c6f322..000000000
--- a/src/newt/classes/com/jogamp/newt/util/EventDispatchThread.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.jogamp.newt.util;
-
-import com.jogamp.newt.Display;
-import com.jogamp.newt.impl.Debug;
-import java.util.*;
-
-public class EventDispatchThread {
-    public static final boolean DEBUG = Debug.debug("EDT");
-
-    private ThreadGroup threadGroup; 
-    private volatile boolean shouldStop = false;
-    private TaskWorker taskWorker = null;
-    private Object taskWorkerLock = new Object();
-    private ArrayList tasks = new ArrayList(); // one shot tasks
-    private Display display = null;
-    private String name;
-    private long edtPollGranularity = 10;
-
-    public EventDispatchThread(Display display, ThreadGroup tg, String name) {
-        this.display = display;
-        this.threadGroup = tg;
-        this.name=new String("EDT-Display_"+display.getName()+"-"+name);
-    }
-
-    public String getName() { return name; }
-
-    public ThreadGroup getThreadGroup() { return threadGroup; }
-
-    public void start() {
-        start(false);
-    }
-
-    /**
-     * @param externalStimuli true indicates that another thread stimulates, 
-     *                        ie. calls this TaskManager's run() loop method.
-     *                        Hence no own thread is started in this case.
-     *
-     * @return The started Runnable, which handles the run-loop.
-     *         Usefull in combination with externalStimuli=true,
-     *         so an external stimuli can call it.
-     */
-    public Runnable start(boolean externalStimuli) {
-        synchronized(taskWorkerLock) { 
-            if(null==taskWorker) {
-                taskWorker = new TaskWorker(threadGroup, name);
-            }
-            if(!taskWorker.isRunning()) {
-                shouldStop = false;
-                taskWorker.start(externalStimuli);
-            }
-            taskWorkerLock.notifyAll();
-        }
-        return taskWorker;
-    }
-
-    public void stop() {
-        synchronized(taskWorkerLock) { 
-            if(null!=taskWorker && taskWorker.isRunning()) {
-                shouldStop = true;
-            }
-            taskWorkerLock.notifyAll();
-            if(DEBUG) {
-                System.out.println(Thread.currentThread()+": EDT signal STOP");
-            }
-        }
-    }
-
-    public boolean isThreadEDT(Thread thread) {
-        return null!=taskWorker && taskWorker == thread;
-    }
-
-    public boolean isCurrentThreadEDT() {
-        return null!=taskWorker && taskWorker == Thread.currentThread();
-    }
-
-    public boolean isRunning() {
-        return null!=taskWorker && taskWorker.isRunning() ;
-    }
-
-    public void invokeLater(Runnable task) {
-        if(task == null) {
-            return;
-        }
-        synchronized(taskWorkerLock) {
-            if(null!=taskWorker && taskWorker.isRunning() && taskWorker != Thread.currentThread() ) {
-                tasks.add(task);
-                taskWorkerLock.notifyAll();
-            } else {
-                // if !running or isEDTThread, do it right away
-                task.run();
-            }
-        }
-    }
-
-    public void invokeAndWait(Runnable task) {
-        if(task == null) {
-            return;
-        }
-        invokeLater(task);
-        waitOnWorker();
-    }
-
-    public void waitOnWorker() {
-        synchronized(taskWorkerLock) {
-            if(null!=taskWorker && taskWorker.isRunning() && tasks.size()>0 && taskWorker != Thread.currentThread() ) {
-                try {
-                    taskWorkerLock.wait();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public void waitUntilStopped() {
-        synchronized(taskWorkerLock) {
-            while(null!=taskWorker && taskWorker.isRunning() && taskWorker != Thread.currentThread() ) {
-                try {
-                    taskWorkerLock.wait();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    class TaskWorker extends Thread {
-        boolean isRunning = false;
-        boolean externalStimuli = false;
-
-        public TaskWorker(ThreadGroup tg, String name) {
-            super(tg, name);
-        }
-
-        public synchronized boolean isRunning() {
-            return isRunning;
-        }
-
-        public void start(boolean externalStimuli) throws IllegalThreadStateException {
-            synchronized(this) {
-                this.externalStimuli = externalStimuli;
-                isRunning = true;
-            }
-            if(!externalStimuli) {
-                super.start();
-            }
-        }
-
-        /** 
-         * Utilizing taskWorkerLock only for local resources and task execution,
-         * not for event dispatching.
-         */
-        public void run() {
-            if(DEBUG) {
-                System.out.println(Thread.currentThread()+": EDT run() START");
-            }
-            while(!shouldStop) {
-                try {
-                    // wait for something todo
-                    while(!shouldStop && tasks.size()==0) {
-                        synchronized(taskWorkerLock) {
-                            if(!shouldStop && tasks.size()==0) {
-                                try {
-                                    taskWorkerLock.wait(edtPollGranularity);
-                                } catch (InterruptedException e) {
-                                    e.printStackTrace();
-                                }
-                            }
-                        }
-                        display.pumpMessages(); // event dispatch
-                    }
-                    if(!shouldStop && tasks.size()>0) {
-                        synchronized(taskWorkerLock) {
-                            if(!shouldStop && tasks.size()>0) {
-                                Runnable task = (Runnable) tasks.remove(0);
-                                task.run();
-                                taskWorkerLock.notifyAll();
-                            }
-                        }
-                        display.pumpMessages(); // event dispatch
-                    }
-                } catch (Throwable t) {
-                    // handle errors ..
-                    t.printStackTrace();
-                } finally {
-                    // epilog - unlock locked stuff
-                }
-                if(externalStimuli) break; // no loop if called by external stimuli
-            }
-            synchronized(this) {
-                isRunning = !shouldStop;
-            }
-            if(!isRunning) {
-                synchronized(taskWorkerLock) {
-                    taskWorkerLock.notifyAll();
-                }
-            }
-            if(DEBUG) {
-                System.out.println(Thread.currentThread()+": EDT run() EXIT");
-            }
-        }
-    }
-}
-
diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index 11f7d0f6c..0fccc94bb 100755
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -186,6 +186,57 @@ static void _throwNewRuntimeException(Display * unlockDisplay, JNIEnv *env, cons
  * Display
  */
 
+
+static XErrorHandler origErrorHandler = NULL ;
+
+static int displayDispatchErrorHandler(Display *dpy, XErrorEvent *e)
+{
+    fprintf(stderr, "Warning: NEWT X11 Error: DisplayDispatch %p, Code 0x%X\n", dpy, e->error_code);
+    
+    if (e->error_code == BadAtom)
+    {
+        fprintf(stderr, "         BadAtom (%p): Atom probably already removed\n", e->resourceid);
+    } else if (e->error_code == BadWindow)
+    {
+        fprintf(stderr, "         BadWindow (%p): Window probably already removed\n", e->resourceid);
+    } else {
+        return origErrorHandler(dpy, e);
+    }
+
+    return 0;
+}
+
+static void displayDispatchErrorHandlerEnable(int onoff) {
+    if(onoff) {
+        if(NULL==origErrorHandler) {
+            origErrorHandler = XSetErrorHandler(displayDispatchErrorHandler);
+        }
+    } else {
+        XSetErrorHandler(origErrorHandler);
+        origErrorHandler = NULL;
+    }
+}
+
+static XIOErrorHandler origIOErrorHandler = NULL;
+
+static int displayDispatchIOErrorHandler(Display *dpy)
+{
+    fprintf(stderr, "Fatal: NEWT X11 IOError: Display %p not available\n", dpy);
+    return 0;
+}
+
+static void displayDispatchIOErrorHandlerEnable(int onoff) {
+    if(onoff) {
+        if(NULL==origIOErrorHandler) {
+            origIOErrorHandler = XSetIOErrorHandler(displayDispatchIOErrorHandler);
+        }
+    } else {
+        XSetIOErrorHandler(origIOErrorHandler);
+        origIOErrorHandler = NULL;
+    }
+}
+
+
 /*
  * Class:     com_jogamp_newt_x11_X11Display
  * Method:    initIDs
@@ -197,7 +248,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_x11_X11Display_initIDs
     jclass c;
 
     if( 0 == XInitThreads() ) {
-        fprintf(stderr, "Warning: XInitThreads() failed\n");
+        fprintf(stderr, "Warning: NEWT X11Window: XInitThreads() failed\n");
     }
 
     displayCompletedID = (*env)->GetMethodID(env, clazz, "displayCompleted", "(JJ)V");
@@ -249,6 +300,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_LockDisplay
         _throwNewRuntimeException(NULL, env, "given display connection is NULL\n");
     }
     XLockDisplay(dpy) ;
+    DBG_PRINT1( "X11: LockDisplay 0x%X\n", dpy); 
 }
 
 
@@ -265,6 +317,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_UnlockDisplay
         _throwNewRuntimeException(NULL, env, "given display connection is NULL\n");
     }
     XUnlockDisplay(dpy) ;
+    DBG_PRINT1( "X11: UnlockDisplay 0x%X\n", dpy); 
 }
 
 
@@ -356,14 +409,13 @@ static jobject getJavaWindowProperty(JNIEnv *env, Display *dpy, Window window, j
                                  &nitems_return, &bytes_after_return, &jogl_java_object_data_pp);
 
         if ( Success != res ) {
-            _throwNewRuntimeException(dpy, env, "could not fetch Atom JOGL_JAVA_OBJECT window property (res %d) nitems_return %ld, bytes_after_return %ld, bail out!\n",
-                res, nitems_return, bytes_after_return);
+            fprintf(stderr, "Warning: NEWT X11Window: Could not fetch Atom JOGL_JAVA_OBJECT window property (res %d) nitems_return %ld, bytes_after_return %ld, result 0!\n", res, nitems_return, bytes_after_return);
             return NULL;
         }
 
         if(actual_type_return!=(Atom)javaObjectAtom || nitems_return<nitems_32 || NULL==jogl_java_object_data_pp) {
             XFree(jogl_java_object_data_pp);
-            _throwNewRuntimeException(dpy, env, "could not fetch Atom JOGL_JAVA_OBJECT window property (res %d) nitems_return %ld, bytes_after_return %ld, actual_type_return %ld, JOGL_JAVA_OBJECT %ld, bail out!\n",
+            fprintf(stderr, "Warning: NEWT X11Window: Fetched invalid Atom JOGL_JAVA_OBJECT window property (res %d) nitems_return %ld, bytes_after_return %ld, actual_type_return %ld, JOGL_JAVA_OBJECT %ld, result 0!\n", 
                 res, nitems_return, bytes_after_return, (long)actual_type_return, javaObjectAtom);
             return NULL;
         }
@@ -374,7 +426,7 @@ static jobject getJavaWindowProperty(JNIEnv *env, Display *dpy, Window window, j
 
 #ifdef VERBOSE_ON
     if(JNI_FALSE == (*env)->IsInstanceOf(env, jwindow, newtWindowClz)) {
-        _throwNewRuntimeException(NULL, env, "fetched Atom JOGL_JAVA_OBJECT window is not a NEWT Window: javaWindow 0x%X !\n", jwindow);
+        _throwNewRuntimeException(dpy, env, "fetched Atom JOGL_JAVA_OBJECT window is not a NEWT Window: javaWindow 0x%X !\n", jwindow);
     }
 #endif
     return jwindow;
@@ -395,6 +447,8 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
         return;
     }
 
+    displayDispatchIOErrorHandlerEnable(1);
+
     // Periodically take a break
     while( num_events > 0 ) {
         jobject jwindow = NULL;
@@ -408,6 +462,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
         // num_events = XPending(dpy); // XEventsQueued(dpy, QueuedAfterFlush); // I/O Flush ..
         // num_events = XEventsQueued(dpy, QueuedAlready); // Better, no I/O ..
         if ( 0 >= XEventsQueued(dpy, QueuedAlready) ) {
+            displayDispatchIOErrorHandlerEnable(0);
             XUnlockDisplay(dpy) ;
             return;
         }
@@ -415,6 +470,8 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
         XNextEvent(dpy, &evt);
         num_events--;
 
+        displayDispatchIOErrorHandlerEnable(0);
+
         if( 0==evt.xany.window ) {
             _throwNewRuntimeException(dpy, env, "event window NULL, bail out!\n");
             return ;
@@ -424,10 +481,16 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
             _throwNewRuntimeException(dpy, env, "wrong display, bail out!\n");
             return ;
         }
+
+        displayDispatchErrorHandlerEnable(1);
+
         jwindow = getJavaWindowProperty(env, dpy, evt.xany.window, javaObjectAtom);
 
+        displayDispatchErrorHandlerEnable(0);
+
         if(NULL==jwindow) {
-            // just leave .. _throwNewRuntimeException(env, "could not fetch Java Window object, bail out!\n");
+            fprintf(stderr, "Warning: NEWT X11 DisplayDispatch %p, Couldn't handle event %d for invalid X11 window %p\n", 
+                dpy, evt.type, evt.xany.window);
             XUnlockDisplay(dpy) ;
             return;
         }
-- 
cgit v1.2.3


From 2df3bea10859ee2f2c4b3622f3b610b17a5749d6 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 13 Apr 2010 21:24:44 +0200
Subject: ATI (fglrx) PBuffer/X11Display bug workaround/cleanup

    - See https://bugzilla.mozilla.org/show_bug.cgi?id=486277

    - Description:
        - To use PBuffer, a context must be current

        - X11Display cannot be switched while using the PBuffer
          [within one thread]. Hence we shall try harder to reuse
          _the_ user configured X11Display - whenever possible.
          This is actually a good thing, ie cleanup up our
          code again.

    - Changes to workaround/cleanup:
        - GLDrawableFactory* methods 'canCreate*()'
          are changed to 'canCreate*(AbstractGraphicsDevice)'
          to allow pipelining the X11Display.
          This reduces the overhead of using a local TLS X11Display.

    - WindowsDummyWGLDrawable cstr gets the GLProfile as a parameter now,
      this is done while adding X11DummyGLXDrawable - forseeing the
      usecase to query available GLProfiles at startup.

    - X11DummyGLXDrawable added, following the WindowsDummyWGLDrawable path
      to have a dummy GLContext current to fix the ATI bug.

NativeWindow X11:
    - Add XIOErrorHandler to identify the fatal failure
      of closing a Display (-> ATI bug).

Build:
    - Adding ant.jar and ant-junit.jar to the junit compile/run classpath
    -

Misc:
    - Fix: CreateDummyWindow(..) returns a HWND, not a HDC
    - mapToRealGLFunctionName: Added mapping for X11/GLX.
    - X11GLXGraphicsConfigurationFactory: Uncommented dead code 'createDefaultGraphicsConfigurationFBConfig'

Tests: Passed (Linux64bit: NVidia/ATI)

Todo: More tests on ATI, especially multithreading/X11Display usage.
---
 make/build-common.xml                              |  8 +-
 make/build-jogl.xml                                |  2 +-
 make/build-junit.xml                               |  2 +-
 make/config/nativewindow/x11-CustomCCode.c         | 61 +++++++++++++++
 make/config/nativewindow/x11-CustomJavaCode.java   |  5 ++
 make/config/nativewindow/x11-lib.cfg               |  5 +-
 make/stub_includes/win32/wingdi.h                  |  2 +-
 .../com/jogamp/opengl/impl/GLContextImpl.java      | 26 ++++++-
 .../jogamp/opengl/impl/GLDrawableFactoryImpl.java  | 13 ++--
 .../com/jogamp/opengl/impl/GLDrawableImpl.java     |  8 +-
 .../com/jogamp/opengl/impl/egl/EGLContext.java     |  8 +-
 .../jogamp/opengl/impl/egl/EGLDrawableFactory.java |  6 +-
 .../opengl/impl/macosx/cgl/MacOSXCGLContext.java   | 14 +---
 .../impl/macosx/cgl/MacOSXCGLDrawableFactory.java  |  6 +-
 .../cgl/awt/MacOSXAWTCGLDrawableFactory.java       |  3 +-
 .../impl/windows/wgl/WindowsDummyWGLDrawable.java  |  7 +-
 .../opengl/impl/windows/wgl/WindowsWGLContext.java | 18 +----
 .../windows/wgl/WindowsWGLDrawableFactory.java     | 20 +++--
 .../WindowsWGLGraphicsConfigurationFactory.java    | 15 ++--
 .../opengl/impl/x11/glx/X11DummyGLXDrawable.java   | 85 +++++++++++++++++++++
 .../jogamp/opengl/impl/x11/glx/X11GLXContext.java  | 22 +++---
 .../opengl/impl/x11/glx/X11GLXDrawableFactory.java | 88 +++++++++++++++-------
 .../glx/X11GLXGraphicsConfigurationFactory.java    |  5 +-
 .../javax/media/opengl/GLDrawableFactory.java      |  7 +-
 .../classes/javax/media/opengl/awt/GLJPanel.java   |  7 +-
 .../com/jogamp/nativewindow/impl/x11/X11Util.java  |  4 +-
 26 files changed, 317 insertions(+), 130 deletions(-)
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java

diff --git a/make/build-common.xml b/make/build-common.xml
index 10f37c3e4..d6c39c1ed 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -121,6 +121,8 @@
         <property name="obj.gluegen"                value="${build.gluegen}/obj"/>
         <property name="gluegen.jar"                value="${build.gluegen}/gluegen.jar" />
         <property name="junit.jar"                  value="${gluegen.make}/lib/junit-4.5.jar" />
+        <property name="ant.jar"                    value="${ant.home}/lib/ant.jar" />
+        <property name="ant-junit.jar"              value="${ant.home}/lib/ant-junit.jar" />
 
         <property name="nativewindow.make"          value="." />
         <property name="nativewindow.build.xml"     value="${nativewindow.make}/build-nativewindow.xml" />
@@ -179,6 +181,8 @@
 
         <path id="junit_jogl_newt.compile.classpath">
             <pathelement location="${junit.jar}" />
+            <pathelement location="${ant.jar}" />
+            <pathelement location="${ant-junit.jar}" />
             <pathelement location="${gluegen-rt.jar}" />
             <pathelement location="${nativewindow.all.jar}" />
             <pathelement location="${jogl.all.jar}" />
@@ -187,6 +191,8 @@
 
         <path id="junit_jogl_newt.run.classpath">
             <pathelement location="${junit.jar}" />
+            <pathelement location="${ant.jar}" />
+            <pathelement location="${ant-junit.jar}" />
             <pathelement location="${gluegen-rt.jar}" />
             <pathelement location="${nativewindow.all.jar}" />
             <pathelement location="${jogl.all.jar}" />
@@ -194,7 +200,7 @@
             <pathelement location="${jogl.test.jar}" />
         </path>
         <property name="junit_jogl_newt.run.jars"
-                  value="${junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${nativewindow.all.jar}${path.separator}${jogl.all.jar}${path.separator}${newt.all.jar}${path.separator}${jogl.test.jar}"/>
+                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${nativewindow.all.jar}${path.separator}${jogl.all.jar}${path.separator}${newt.all.jar}${path.separator}${jogl.test.jar}"/>
 
         <!-- JavaSE combinations . NO.AWT -->
         <property name="nativewindow.all-noawt.jar" value="${build.nativewindow}/nativewindow.all-noawt.jar" />
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index b1f0a02eb..93cf7bf6f 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -396,7 +396,7 @@
           <and>
               <isset property="java.generate.skip.es1"/>
               <isset property="java.generate.skip.es2"/>
-              <!--isset property="java.generate.skip.gl2"/-->
+              <isset property="java.generate.skip.gl2"/>
               <isset property="java.generate.skip.glu"/>
           </and>
         </condition>
diff --git a/make/build-junit.xml b/make/build-junit.xml
index 58e8e3b7f..887060084 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -113,7 +113,7 @@
                  relative="true"
                  failonerror="false">
                 <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-                <env key="CLASSPATH" value="${ant.home}/lib/ant.jar${path.separator}${ant.home}/lib/ant-junit.jar${path.separator}${junit_jogl_newt.run.jars}"/>
+                <env key="CLASSPATH" value="${junit_jogl_newt.run.jars}"/>
                 <arg value="-Djava.library.path=${obj.all.paths}"/>
                 <arg line="${jvmarg.newt}"/>
                 <arg line="com.jogamp.newt.util.MainThread"/>
diff --git a/make/config/nativewindow/x11-CustomCCode.c b/make/config/nativewindow/x11-CustomCCode.c
index 8eded9aa2..982a39f7e 100755
--- a/make/config/nativewindow/x11-CustomCCode.c
+++ b/make/config/nativewindow/x11-CustomCCode.c
@@ -167,3 +167,64 @@ Java_com_jogamp_nativewindow_impl_x11_X11Lib_XGetVisualInfoCopied1__JJLjava_nio_
   return jbyteCopy;
 }
 
+
+static XIOErrorHandler origIOErrorHandler = NULL;
+
+static int displayIOErrorHandler(Display *dpy)
+{
+    fprintf(stderr, "Fatal: Nativewindow X11 IOError: Display %p not available\n", dpy);
+    origIOErrorHandler(dpy);
+    return 0;
+}
+
+static void displayIOErrorHandlerEnable(int onoff) {
+    if(onoff) {
+        if(NULL==origIOErrorHandler) {
+            origIOErrorHandler = XSetIOErrorHandler(displayIOErrorHandler);
+        }
+    } else {
+        XSetIOErrorHandler(origIOErrorHandler);
+        origIOErrorHandler = NULL;
+    }
+}
+
+/*   Java->C glue code:
+ *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
+ *    Java method: int XCloseDisplay(long display)
+ *     C function: int XCloseDisplay(Display *  display);
+ */
+JNIEXPORT jint JNICALL 
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_XCloseDisplay__J(JNIEnv *env, jclass _unused, jlong display) {
+  int _res;
+  // fprintf(stderr, "X11Lib.XCloseDisplay: %p\n", (Display *) (intptr_t) display);
+  displayIOErrorHandlerEnable(1);
+  _res = XCloseDisplay((Display *) (intptr_t) display);
+  displayIOErrorHandlerEnable(0);
+  return _res;
+}
+
+/*   Java->C glue code:
+ *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
+ *    Java method: long XOpenDisplay(java.lang.String arg0)
+ *     C function: Display *  XOpenDisplay(const char * );
+ */
+JNIEXPORT jlong JNICALL 
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_XOpenDisplay__Ljava_lang_String_2(JNIEnv *env, jclass _unused, jstring arg0) {
+  const char* _strchars_arg0 = NULL;
+  Display *  _res;
+  if ( NULL != arg0 ) {
+    _strchars_arg0 = (*env)->GetStringUTFChars(env, arg0, (jboolean*)NULL);
+  if ( NULL == _strchars_arg0 ) {
+      (*env)->ThrowNew(env, (*env)->FindClass(env, "java/lang/OutOfMemoryError"),
+                       "Failed to get UTF-8 chars for argument \"arg0\" in native dispatcher for \"XOpenDisplay\"");
+      return 0;
+    }
+  }
+  _res = XOpenDisplay((char *) _strchars_arg0);
+  // fprintf(stderr, "X11Lib.XOpenDisplay: %s -> %p\n", _strchars_arg0, _res);
+  if ( NULL != arg0 ) {
+    (*env)->ReleaseStringUTFChars(env, arg0, _strchars_arg0);
+  }
+  return (jlong) (intptr_t) _res;
+}
+
diff --git a/make/config/nativewindow/x11-CustomJavaCode.java b/make/config/nativewindow/x11-CustomJavaCode.java
index 5c269c6c8..d631c92cb 100644
--- a/make/config/nativewindow/x11-CustomJavaCode.java
+++ b/make/config/nativewindow/x11-CustomJavaCode.java
@@ -24,3 +24,8 @@
   /** Entry point to C language function: <code> XVisualInfo *  XGetVisualInfo(Display * , long, XVisualInfo * , int * ); </code>    */
   private static native java.nio.ByteBuffer XGetVisualInfoCopied1(long arg0, long arg1, java.nio.ByteBuffer arg2, Object arg3, int arg3_byte_offset);
 
+  public static native long XOpenDisplay(String arg0);
+  public static native int XCloseDisplay(long display);
+  public static native long dlopen(String name);
+  public static native long dlsym(String name);
+
diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg
index 7a64307da..394dd230a 100644
--- a/make/config/nativewindow/x11-lib.cfg
+++ b/make/config/nativewindow/x11-lib.cfg
@@ -20,8 +20,9 @@ Opaque long Display *
 Opaque boolean Bool
 Opaque long GLXFBConfig
 
-CustomJavaCode X11Lib public static native long dlopen(String name);
-CustomJavaCode X11Lib public static native long dlsym(String name);
+# Manually implement XOpenDisplay, XCloseDisplay, catching XIOError
+ManuallyImplement XCloseDisplay
+ManuallyImplement XOpenDisplay
 
 IncludeAs CustomJavaCode X11Lib x11-CustomJavaCode.java
 IncludeAs CustomCCode           x11-CustomCCode.c
diff --git a/make/stub_includes/win32/wingdi.h b/make/stub_includes/win32/wingdi.h
index 46aeec2b6..fbf2ec5ec 100644
--- a/make/stub_includes/win32/wingdi.h
+++ b/make/stub_includes/win32/wingdi.h
@@ -212,7 +212,7 @@ WINGDIAPI HGDIOBJ WINAPI SelectObject(HDC, HGDIOBJ);
 // Routines for creation of a dummy window, device context and OpenGL
 // context for the purposes of getting wglChoosePixelFormatARB and
 // associated routines
-HDC                    CreateDummyWindow(int,int,int,int);
+HWND                   CreateDummyWindow( int x, int y, int width, int height ) ;
 WINUSERAPI BOOL WINAPI ShowWindow(HWND hWnd, int nCmdShow);
 WINUSERAPI HDC  WINAPI GetDC(HWND);
 WINUSERAPI int  WINAPI ReleaseDC(HWND hWnd, HDC hDC);
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
index 893827a8c..7543a1084 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
@@ -41,6 +41,7 @@ package com.jogamp.opengl.impl;
 
 import com.jogamp.common.os.DynamicLookupHelper;
 import java.nio.*;
+import java.util.*;
 
 import javax.media.opengl.*;
 import com.jogamp.nativewindow.impl.NWReflection;
@@ -346,13 +347,30 @@ public abstract class GLContextImpl extends GLContext {
   /** Maps the given "platform-independent" function name to a real function
       name. Currently this is only used to map "glAllocateMemoryNV" and
       associated routines to wglAllocateMemoryNV / glXAllocateMemoryNV. */
-  protected abstract String mapToRealGLFunctionName(String glFunctionName);
+  protected String mapToRealGLFunctionName(String glFunctionName) {
+    Map/*<String, String>*/ map = getFunctionNameMap();
+    String lookup = ( null != map ) ? (String) map.get(glFunctionName) : null;
+    if (lookup != null) {
+      return lookup;
+    }
+    return glFunctionName;
+  }
+  protected abstract Map/*<String, String>*/ getFunctionNameMap() ;
 
   /** Maps the given "platform-independent" extension name to a real
       function name. Currently this is only used to map
-      "GL_ARB_pbuffer" and "GL_ARB_pixel_format" to "WGL_ARB_pbuffer"
-      and "WGL_ARB_pixel_format" (not yet mapped to X11). */
-  protected abstract String mapToRealGLExtensionName(String glExtensionName);
+      "GL_ARB_pbuffer"      to  "WGL_ARB_pbuffer/GLX_SGIX_pbuffer" and 
+      "GL_ARB_pixel_format" to  "WGL_ARB_pixel_format/n.a." 
+   */
+  protected String mapToRealGLExtensionName(String glExtensionName) {
+    Map/*<String, String>*/ map = getExtensionNameMap();
+    String lookup = ( null != map ) ? (String) map.get(glExtensionName) : null;
+    if (lookup != null) {
+      return lookup;
+    }
+    return glExtensionName;
+  }
+  protected abstract Map/*<String, String>*/ getExtensionNameMap() ;
 
   /** Helper routine which resets a ProcAddressTable generated by the
       GLEmitter by looking up anew all of its function pointers. */
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
index c8faf0f65..35810678c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
@@ -54,6 +54,9 @@ import java.lang.reflect.*;
 public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
   protected static final boolean DEBUG = Debug.debug("GLDrawableFactory");
 
+  public void shutdown() { 
+  }
+
   //---------------------------------------------------------------------------
   // Dispatching GLDrawable construction in respect to the NativeWindow Capabilities
   //
@@ -76,7 +79,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
         if( ! ( target instanceof SurfaceChangeable ) ) {
             throw new IllegalArgumentException("Passed NativeWindow must implement SurfaceChangeable for offscreen: "+target);
         }
-        if(caps.isPBuffer() && canCreateGLPbuffer()) {
+        if(caps.isPBuffer()) {
             if(DEBUG) {
                 System.out.println("GLDrawableFactoryImpl.createGLDrawable -> PbufferDrawable: "+target);
             }
@@ -111,7 +114,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
   protected abstract GLDrawableImpl createGLPbufferDrawableImpl(NativeWindow target);
 
   protected GLDrawableImpl createGLPbufferDrawable(NativeWindow target) {
-    if (!canCreateGLPbuffer()) {
+    if (!canCreateGLPbuffer(target.getGraphicsConfiguration().getNativeGraphicsConfiguration().getScreen().getDevice())) {
         throw new GLException("Pbuffer support not available with current graphics card");
     }
     return createGLPbufferDrawableImpl(target);
@@ -215,7 +218,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
   // implement this functionality on all other platforms
   //
 
-  public abstract boolean canCreateContextOnJava2DSurface();
+  public abstract boolean canCreateContextOnJava2DSurface(AbstractGraphicsDevice device);
 
   public abstract GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
     throws GLException;
@@ -312,7 +315,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
       throw new IllegalArgumentException("Should not call this unless setDisplayGamma called first");
     }
     resetGammaRamp(originalGammaRamp);
-    unregisterGammeShutdownHook();
+    unregisterGammaShutdownHook();
   }
 
   //------------------------------------------------------
@@ -364,7 +367,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
     gammaShutdownHookRegistered = true;
   }
 
-  private synchronized void unregisterGammeShutdownHook() {
+  private synchronized void unregisterGammaShutdownHook() {
     if (!gammaShutdownHookRegistered)
       return;
     if (gammaShutdownHook == null) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
index 10c70db99..04114a445 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
@@ -153,11 +153,9 @@ public abstract class GLDrawableImpl implements GLDrawable {
   }
 
   public String toString() {
-    return getClass().getName()+"[realized "+getRealized()+
-                ",\n\tfactory   "+getFactory()+
-                ",\n\twindow    "+getNativeWindow()+
-                ",\n\trequested "+getRequestedGLCapabilities()+
-                ",\n\tchosen    "+getChosenGLCapabilities()+"]";
+    return getClass().getName()+"[Realized "+getRealized()+
+                ",\n\tFactory   "+getFactory()+
+                ",\n\tWindow    "+getNativeWindow()+"]";
   }
 
   protected GLDrawableFactory factory;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
index ec2677559..a96736c00 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
@@ -80,13 +80,9 @@ public abstract class EGLContext extends GLContextImpl {
         return eglExtProcAddressTable;
     }
 
-    protected String mapToRealGLFunctionName(String glFunctionName) {
-        return glFunctionName;
-    }
+    protected Map/*<String, String>*/ getFunctionNameMap() { return null; }
 
-    protected String mapToRealGLExtensionName(String glExtensionName) {
-        return glExtensionName;
-    }
+    protected Map/*<String, String>*/ getExtensionNameMap() { return null; }
 
     public long getContext() {
         return eglContext;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
index 34b039b3a..5a193b2ff 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
@@ -70,7 +70,7 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
         throw new GLException("Not yet implemented");
     }
 
-    public boolean canCreateGLPbuffer() {
+    public boolean canCreateGLPbuffer(AbstractGraphicsDevice device) {
         return true;
     }
 
@@ -89,7 +89,7 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
         return new EGLExternalContext(absScreen);
     }
 
-    public boolean canCreateExternalGLDrawable() {
+    public boolean canCreateExternalGLDrawable(AbstractGraphicsDevice device) {
         return false;
     }
 
@@ -100,7 +100,7 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
     public void loadGLULibrary() {
     }
 
-    public boolean canCreateContextOnJava2DSurface() {
+    public boolean canCreateContextOnJava2DSurface(AbstractGraphicsDevice device) {
         return false;
     }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
index bf4023c1c..d3a634792 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
@@ -84,16 +84,10 @@ public abstract class MacOSXCGLContext extends GLContextImpl
     return cglExtProcAddressTable;
   }
 
-  protected String mapToRealGLFunctionName(String glFunctionName)
-  {
-    return glFunctionName;
-  }
-	
-  protected String mapToRealGLExtensionName(String glExtensionName)
-  {
-    return glExtensionName;
-  }
-	
+  protected Map/*<String, String>*/ getFunctionNameMap() { return null; }
+
+  protected Map/*<String, String>*/ getExtensionNameMap() { return null; }
+
   protected abstract boolean create();
 
   /**
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
index 641e482bc..906088642 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
@@ -71,7 +71,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements D
     return new MacOSXOffscreenCGLDrawable(this, target);
   }
 
-  public boolean canCreateGLPbuffer() {
+  public boolean canCreateGLPbuffer(AbstractGraphicsDevice device) {
     return true;
   }
 
@@ -103,7 +103,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements D
     return MacOSXExternalCGLContext.create(this, null);
   }
 
-  public boolean canCreateExternalGLDrawable() {
+  public boolean canCreateExternalGLDrawable(AbstractGraphicsDevice device) {
     return false;
   }
 
@@ -121,7 +121,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements D
     return CGL.getProcAddress(glFuncName);
   }
 
-  public boolean canCreateContextOnJava2DSurface() {
+  public boolean canCreateContextOnJava2DSurface(AbstractGraphicsDevice device) {
     return false;
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
index cc973c56a..eff01ca18 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
@@ -42,6 +42,7 @@ package com.jogamp.opengl.impl.macosx.cgl.awt;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.*;
 import java.util.*;
+import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
 import com.jogamp.opengl.impl.awt.*;
@@ -53,7 +54,7 @@ public class MacOSXAWTCGLDrawableFactory extends MacOSXCGLDrawableFactory {
     super();
   }
 
-  public boolean canCreateContextOnJava2DSurface() {
+  public boolean canCreateContextOnJava2DSurface(AbstractGraphicsDevice device) {
     return true;
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
index 49e646844..87a37da04 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
@@ -46,8 +46,8 @@ import com.jogamp.nativewindow.impl.NullWindow;
 public class WindowsDummyWGLDrawable extends WindowsWGLDrawable {
   private long hwnd, hdc;
 
-  public WindowsDummyWGLDrawable(GLDrawableFactory factory) {
-    super(factory, new NullWindow(WindowsWGLGraphicsConfigurationFactory.createDefaultGraphicsConfiguration(null, true, true)), true);
+  public WindowsDummyWGLDrawable(GLDrawableFactory factory, GLProfile glp) {
+    super(factory, new NullWindow(WindowsWGLGraphicsConfigurationFactory.createDefaultGraphicsConfiguration(glp, null, true, true)), true);
     // All entries to CreateDummyWindow must synchronize on one object
     // to avoid accidentally registering the dummy window class twice
     synchronized (WindowsDummyWGLDrawable.class) {
@@ -56,8 +56,9 @@ public class WindowsDummyWGLDrawable extends WindowsWGLDrawable {
     hdc = WGL.GetDC(hwnd);
     NullWindow nw = (NullWindow) getNativeWindow();
     nw.setSurfaceHandle(hdc);
+    WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration)nw.getGraphicsConfiguration().getNativeGraphicsConfiguration();
     // Choose a (hopefully hardware-accelerated) OpenGL pixel format for this device context
-    GLCapabilities caps = new GLCapabilities(null);
+    GLCapabilities caps = (GLCapabilities) config.getChosenCapabilities();
     caps.setDepthBits(16);
     PIXELFORMATDESCRIPTOR pfd = WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(caps);
     int pixelFormat = WGL.ChoosePixelFormat(hdc, pfd);
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
index 08c77539c..b3f4c498c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
@@ -118,21 +118,9 @@ public class WindowsWGLContext extends GLContextImpl {
     return wglExtProcAddressTable;
   }
 
-  protected String mapToRealGLFunctionName(String glFunctionName) {
-    String lookup = (String) functionNameMap.get(glFunctionName);
-    if (lookup != null) {
-      return lookup;
-    }
-    return glFunctionName;
-  }
+  protected Map/*<String, String>*/ getFunctionNameMap() { return functionNameMap; }
 
-  protected String mapToRealGLExtensionName(String glExtensionName) {
-    String lookup = (String) extensionNameMap.get(glExtensionName);
-    if (lookup != null) {
-      return lookup;
-    }
-    return glExtensionName;
-  }
+  protected Map/*<String, String>*/ getExtensionNameMap() { return extensionNameMap; }
 
   /**
    * Creates and initializes an appropriate OpenGL context. Should only be
@@ -306,7 +294,7 @@ public class WindowsWGLContext extends GLContextImpl {
 
     if (WGL.wglGetCurrentContext() != hglrc) {
       if (!wglMakeContextCurrent(drawable.getNativeWindow().getSurfaceHandle(), drawableRead.getNativeWindow().getSurfaceHandle(), hglrc)) {
-        throw new GLException("Error making context current: 0x" + Integer.toHexString(WGL.GetLastError()));
+        throw new GLException("Error making context current: 0x" + Integer.toHexString(WGL.GetLastError()) + ", " + this);
       } else {
         if (DEBUG && VERBOSE) {
           System.err.println(getThreadName() + ": wglMakeCurrent(hdc " + toHexString(drawable.getNativeWindow().getSurfaceHandle()) +
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
index 9e458c8d0..cb3ee19e0 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
@@ -85,12 +85,12 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
 
   private boolean pbufferSupportInitialized = false;
   private boolean canCreateGLPbuffer = false;
-  public boolean canCreateGLPbuffer() {
+  public boolean canCreateGLPbuffer(AbstractGraphicsDevice device) {
     if (!pbufferSupportInitialized) {
       final GLDrawableFactory factory = this;
       Runnable r = new Runnable() {
           public void run() {
-            WindowsDummyWGLDrawable dummyDrawable = new WindowsDummyWGLDrawable(factory);
+            WindowsDummyWGLDrawable dummyDrawable = new WindowsDummyWGLDrawable(factory, null);
             GLContext dummyContext  = dummyDrawable.createContext(null);
             if (dummyContext != null) {
               GLContext lastContext = GLContext.getCurrent();
@@ -123,7 +123,7 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
     final GLDrawableFactory factory = this;
     Runnable r = new Runnable() {
         public void run() {
-          WindowsDummyWGLDrawable dummyDrawable = new WindowsDummyWGLDrawable(factory);
+          WindowsDummyWGLDrawable dummyDrawable = new WindowsDummyWGLDrawable(factory, null);
           WindowsWGLContext       dummyContext  = (WindowsWGLContext) dummyDrawable.createContext(null);
           GLContext lastContext = GLContext.getCurrent();
           if (lastContext != null) {
@@ -136,10 +136,14 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
                                                                            dummyDrawable,
                                                                            dummyWGLExt);
             returnList.add(pbufferDrawable);
-            dummyContext.release();
-            dummyContext.destroy();
-            dummyDrawable.destroy();
           } finally {
+            if(null!=dummyContext) {
+                dummyContext.release();
+                dummyContext.destroy();
+            }
+            if(null!=dummyDrawable) {
+                dummyDrawable.destroy();
+            }
             if (lastContext != null) {
               lastContext.makeCurrent();
             }
@@ -162,7 +166,7 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
     return WindowsExternalWGLContext.create(this, null);
   }
 
-  public boolean canCreateExternalGLDrawable() {
+  public boolean canCreateExternalGLDrawable(AbstractGraphicsDevice device) {
     return true;
   }
 
@@ -222,7 +226,7 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
     return detail;
   }
 
-  public boolean canCreateContextOnJava2DSurface() {
+  public boolean canCreateContextOnJava2DSurface(AbstractGraphicsDevice device) {
     return false;
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
index 563173682..55b30ef3a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
@@ -58,22 +58,17 @@ public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfiguratio
         return chooseGraphicsConfigurationStatic(caps, chooser, absScreen);
     }
 
-    protected static WindowsWGLGraphicsConfiguration createDefaultGraphicsConfiguration(AbstractGraphicsScreen absScreen, boolean onscreen, boolean usePBuffer) {
-        GLCapabilities caps = new GLCapabilities(null);
+    protected static WindowsWGLGraphicsConfiguration createDefaultGraphicsConfiguration(GLProfile glp, AbstractGraphicsScreen absScreen, boolean onscreen, boolean usePBuffer) {
+        GLCapabilities caps = new GLCapabilities(glp);
         caps.setDoubleBuffered(onscreen); // FIXME DBLBUFOFFSCRN
         caps.setOnscreen  (onscreen);
         caps.setPBuffer   (usePBuffer);
 
-        GLCapabilities caps2 = (GLCapabilities) caps.clone();
-        if(!caps2.isOnscreen()) {
-            // OFFSCREEN !DOUBLE_BUFFER // FIXME DBLBUFOFFSCRN
-            caps2.setDoubleBuffered(false);
-        }
-
         if(null==absScreen) {
             absScreen = DefaultGraphicsScreen.createScreenDevice(0);
         }
-        return new WindowsWGLGraphicsConfiguration(absScreen, caps2, caps, WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(caps2), -1, null);
+        return new WindowsWGLGraphicsConfiguration(absScreen, caps, caps, WindowsWGLGraphicsConfiguration.GLCapabilities2PFD(caps), -1, null);
+
     }
 
     protected static WindowsWGLGraphicsConfiguration chooseGraphicsConfigurationStatic(GLCapabilities caps,
@@ -143,7 +138,7 @@ public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfiguratio
           GLContextImpl     dummyContext  = null;
           WGLExt            dummyWGLExt   = null;
           if (capabilities.getSampleBuffers()) {
-              dummyDrawable = new WindowsDummyWGLDrawable(factory);
+              dummyDrawable = new WindowsDummyWGLDrawable(factory, glProfile);
               dummyContext  = (GLContextImpl) dummyDrawable.createContext(null);
               if (dummyContext != null) {
                 dummyContext.makeCurrent();
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java
new file mode 100644
index 000000000..097689967
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.opengl.impl.x11.glx;
+
+import javax.media.opengl.*;
+import com.jogamp.opengl.impl.*;
+
+import javax.media.nativewindow.*;
+import javax.media.nativewindow.x11.*;
+import com.jogamp.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.x11.*;
+
+public class X11DummyGLXDrawable extends X11OnscreenGLXDrawable {
+
+  /** 
+   * Due to the ATI Bug https://bugzilla.mozilla.org/show_bug.cgi?id=486277,
+   * we cannot switch the Display as we please, 
+   * hence we reuse the target's screen configuration. 
+   */
+  public X11DummyGLXDrawable(X11GraphicsScreen screen, GLDrawableFactory factory, GLProfile glp) {
+    super(factory, 
+          new NullWindow(X11GLXGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(
+            new GLCapabilities(glp), null, screen)));
+    this.realized = true;
+
+    NullWindow nw = (NullWindow) getNativeWindow();
+    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)nw.getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    GLCapabilities caps = (GLCapabilities) config.getChosenCapabilities();
+
+    long dpy = config.getScreen().getDevice().getHandle();
+    int scrn = config.getScreen().getIndex();
+    // System.out.println("X11DummyGLXDrawable: dpy "+toHexString(dpy)+", scrn "+scrn);
+    X11Lib.XLockDisplay(dpy);
+    try{
+        nw.setSurfaceHandle( X11Lib.RootWindow(dpy, scrn) );
+    } finally {
+        X11Lib.XUnlockDisplay(dpy);
+    }
+  }
+
+  public void setSize(int width, int height) {
+  }
+
+  public int getWidth() {
+    return 1;
+  }
+
+  public int getHeight() {
+    return 1;
+  }
+
+  public void destroy() {
+    // nothing to do, but allowed
+  }
+}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
index ce846c0a4..055e7236c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
@@ -54,6 +54,7 @@ public abstract class X11GLXContext extends GLContextImpl {
   private boolean glXQueryExtensionsStringInitialized;
   private boolean glXQueryExtensionsStringAvailable;
   private static final Map/*<String, String>*/ functionNameMap;
+  private static final Map/*<String, String>*/ extensionNameMap;
   private GLXExt glXExt;
   // Table that holds the addresses of the native C-language entry points for
   // GLX extension functions.
@@ -63,6 +64,10 @@ public abstract class X11GLXContext extends GLContextImpl {
     functionNameMap = new HashMap();
     functionNameMap.put("glAllocateMemoryNV", "glXAllocateMemoryNV");
     functionNameMap.put("glFreeMemoryNV", "glXFreeMemoryNV");
+
+    extensionNameMap = new HashMap();
+    extensionNameMap.put("GL_ARB_pbuffer",      "GLX_SGIX_pbuffer");
+    extensionNameMap.put("GL_ARB_pixel_format", "GLX_SGIX_pbuffer"); // good enough
   }
 
   public X11GLXContext(GLDrawableImpl drawable, GLDrawableImpl drawableRead,
@@ -94,17 +99,9 @@ public abstract class X11GLXContext extends GLContextImpl {
     return glXExt;
   }
 
-  protected String mapToRealGLFunctionName(String glFunctionName) {
-    String lookup = (String) functionNameMap.get(glFunctionName);
-    if (lookup != null) {
-      return lookup;
-    }
-    return glFunctionName;
-  }
+  protected Map/*<String, String>*/ getFunctionNameMap() { return functionNameMap; }
 
-  protected String mapToRealGLExtensionName(String glExtensionName) {
-    return glExtensionName;
-  }
+  protected Map/*<String, String>*/ getExtensionNameMap() { return extensionNameMap; }
 
   /** Helper routine which usually just turns around and calls
    * createContext (except for pbuffers, which use a different context
@@ -363,7 +360,7 @@ public abstract class X11GLXContext extends GLContextImpl {
                                            drawable.getNativeWindow().getSurfaceHandle(), 
                                            drawableRead.getNativeWindow().getSurfaceHandle(), 
                                            context)) {
-              throw new GLException("Error making context current");
+              throw new GLException("Error making context current: "+this);
             }
             if (DEBUG && (VERBOSE || created)) {
               System.err.println(getThreadName() + ": glXMakeCurrent(display " + 
@@ -485,7 +482,8 @@ public abstract class X11GLXContext extends GLContextImpl {
   public boolean isExtensionAvailable(String glExtensionName) {
     if (glExtensionName.equals("GL_ARB_pbuffer") ||
         glExtensionName.equals("GL_ARB_pixel_format")) {
-      return getGLDrawable().getFactory().canCreateGLPbuffer();
+      return getGLDrawable().getFactory().canCreateGLPbuffer(
+          drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration().getScreen().getDevice() );
     }
     return super.isExtensionAvailable(glExtensionName);
   }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
index 1a254843e..60ee431dc 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
@@ -73,14 +73,29 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
     return new X11OffscreenGLXDrawable(this, target);
   }
 
-  private boolean pbufferSupportInitialized = false;
-  private boolean canCreateGLPbuffer = false;
-  public boolean canCreateGLPbuffer() {
-    if (!pbufferSupportInitialized) {
-        long display = X11Util.getThreadLocalDefaultDisplay();
+  public boolean canCreateGLPbuffer(AbstractGraphicsDevice device) { 
+      return glxVersionGreaterEqualThan(device, 1, 3); 
+  }
+
+  private boolean glxVersionsQueried = false;
+  private int     glxVersionMajor=0, glxVersionMinor=0;
+  public boolean glxVersionGreaterEqualThan(AbstractGraphicsDevice device, int majorReq, int minorReq) { 
+    if (!glxVersionsQueried) {
+        if(null == device) {
+            GLContext ctx = GLContext.getCurrent();
+            if( null != ctx) {
+                device = ctx.getGLDrawable().getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration().getScreen().getDevice();
+            }
+        }
+        if(null == device) {
+            GLException gle = new GLException("FIXME: No AbstractGraphicsDevice (passed or queried via current context - Fallback to ThreadLocal Display ..");
+            gle.printStackTrace();
+
+            device = new X11GraphicsDevice(X11Util.getThreadLocalDisplay(null));
+        }
+        long display = device.getHandle();
         int[] major = new int[1];
         int[] minor = new int[1];
-        int screen = 0; // FIXME: provide way to specify this?
 
         if (!GLX.glXQueryVersion(display, major, 0, minor, 0)) {
           throw new GLException("glXQueryVersion failed");
@@ -94,34 +109,51 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
         // only implement GLX version 1.2 on the server side
         if (major[0] == 1 && minor[0] == 2) {
           String str = GLX.glXGetClientString(display, GLX.GLX_VERSION);
-          if (str != null && str.startsWith("1.") &&
-             (str.charAt(2) >= '3')) {
-            canCreateGLPbuffer = true;
+          try {
+              major[0] = Integer.valueOf(str.substring(0, 1)).intValue();
+              minor[0] = Integer.valueOf(str.substring(2, 3)).intValue();
+          } catch (NumberFormatException nfe) {
+              major[0] = 1;
+              minor[0] = 2;
           }
-        } else {
-          canCreateGLPbuffer = ((major[0] > 1) || (minor[0] > 2));
         }
 
-        pbufferSupportInitialized = true;        
+        glxVersionMajor = major[0];
+        glxVersionMinor = minor[0];
+        glxVersionsQueried = true;        
     }
-    return canCreateGLPbuffer;
+    return ( glxVersionMajor > majorReq ) || ( glxVersionMajor == majorReq && glxVersionMinor >= minorReq ) ;
   }
 
   protected GLDrawableImpl createGLPbufferDrawableImpl(final NativeWindow target) {
+    GLDrawableImpl pbufferDrawable;
+    X11DummyGLXDrawable dummyDrawable=null;
+    GLContext           dummyContext=null;
+
     /** 
-     * FIXME: Think about this ..
-     * should not be necessary ? ..
-    final List returnList = new ArrayList();
-    final GLDrawableFactory factory = this;
-    Runnable r = new Runnable() {
-        public void run() {
-          returnList.add(new X11PbufferGLXDrawable(factory, target));
+     * Due to the ATI Bug https://bugzilla.mozilla.org/show_bug.cgi?id=486277,
+     * we need to have a context current on the same Display to create a PBuffer.
+     * The dummy context shall also use the same Display,
+     * since switching Display in this regard is another ATI bug.
+     */
+    if( null == GLContext.getCurrent() ) {
+        X11GraphicsScreen screen = (X11GraphicsScreen) target.getGraphicsConfiguration().getNativeGraphicsConfiguration().getScreen();
+        dummyDrawable = new X11DummyGLXDrawable(screen, this, null);
+        dummyContext  = dummyDrawable.createContext(null);
+        dummyContext.makeCurrent();
+    }
+    try {
+        pbufferDrawable = new X11PbufferGLXDrawable(this, target);
+    } finally {
+        if(null!=dummyContext) {
+            dummyContext.release();
+            dummyContext.destroy();
         }
-      };
-    maybeDoSingleThreadedWorkaround(r);
-    return (GLDrawableImpl) returnList.get(0);
-    */
-    return new X11PbufferGLXDrawable(this, target);
+        if(null!=dummyDrawable) {
+            dummyDrawable.destroy();
+        }
+    }
+    return pbufferDrawable;
   }
 
 
@@ -136,8 +168,8 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
     return X11ExternalGLXContext.create(this, null);
   }
 
-  public boolean canCreateExternalGLDrawable() {
-    return canCreateGLPbuffer();
+  public boolean canCreateExternalGLDrawable(AbstractGraphicsDevice device) {
+    return canCreateGLPbuffer(device);
   }
 
   public GLDrawable createExternalGLDrawable() {
@@ -158,7 +190,7 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
     return res;
   }
 
-  public boolean canCreateContextOnJava2DSurface() {
+  public boolean canCreateContextOnJava2DSurface(AbstractGraphicsDevice device) {
     return false;
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
index 16e341652..72551f928 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
@@ -59,7 +59,8 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
         return chooseGraphicsConfigurationStatic(capabilities, chooser, absScreen);
     }
 
-    protected static X11GLXGraphicsConfiguration createDefaultGraphicsConfiguration(AbstractGraphicsScreen absScreen, boolean onscreen, boolean usePBuffer) {
+    /**
+    protected static X11GLXGraphicsConfiguration createDefaultGraphicsConfigurationFBConfig(AbstractGraphicsScreen absScreen, boolean onscreen, boolean usePBuffer) {
       if (absScreen == null) {
         throw new IllegalArgumentException("AbstractGraphicsScreen is null");
       }
@@ -110,7 +111,7 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
       }
 
       return new X11GLXGraphicsConfiguration(x11Screen, (null!=capsFB)?capsFB:caps, caps, null, xvis, fbcfg, fbid);
-    }
+    } */
 
     protected static X11GLXGraphicsConfiguration chooseGraphicsConfigurationStatic(Capabilities capabilities,
                                                                                    CapabilitiesChooser chooser,
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index d61ceb1f4..71cb3cb3b 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -173,8 +173,7 @@ public abstract class GLDrawableFactory {
       destroy any GLContexts and GLDrawables that have been created
       and are still in use. No further OpenGL calls may be made after
       shutting down the GLDrawableFactory. */
-  public void shutdown() {
-  }
+  public abstract void shutdown();
 
   //----------------------------------------------------------------------
   // Methods to create high-level objects
@@ -218,7 +217,7 @@ public abstract class GLDrawableFactory {
    * Returns true if it is possible to create a GLPbuffer. Some older
    * graphics cards do not have this capability.
    */
-  public abstract boolean canCreateGLPbuffer();
+  public abstract boolean canCreateGLPbuffer(AbstractGraphicsDevice device);
 
   /**
    * Creates a Pbuffer GLDrawable with the given capabilites and dimensions. <P>
@@ -280,7 +279,7 @@ public abstract class GLDrawableFactory {
    * Returns true if it is possible to create an external GLDrawable
    * object via {@link #createExternalGLDrawable}.
    */
-  public abstract boolean canCreateExternalGLDrawable();
+  public abstract boolean canCreateExternalGLDrawable(AbstractGraphicsDevice device);
 
   /**
    * <P> Creates a {@link GLDrawable} object representing an existing
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
index 43b2e1e1d..e8de00629 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
@@ -494,7 +494,7 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable {
           backend = new J2DOGLBackend();
         } else {
           if (!hardwareAccelerationDisabled &&
-              factory.canCreateGLPbuffer()) {
+              factory.canCreateGLPbuffer(null)) {
             backend = new PbufferBackend();
           } else {
             if (softwareRenderingDisabled) {
@@ -1509,7 +1509,8 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable {
                   }
                 }
                 if (joglContext == null) {
-                  if (factory.canCreateExternalGLDrawable()) {
+                  AbstractGraphicsDevice device = j2dContext.getGLDrawable().getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration().getScreen().getDevice();
+                  if (factory.canCreateExternalGLDrawable(device)) {
                     joglDrawable = factory.createExternalGLDrawable();
                     // FIXME: Need to share with j2d context, due to FBO resource .. 
                     // - ORIG: joglContext = joglDrawable.createContext(shareWith);
@@ -1518,7 +1519,7 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable {
                         System.err.println("-- Created External Drawable: "+joglDrawable);
                         System.err.println("-- Created Context: "+joglContext);
                     }
-                  } else if (factory.canCreateContextOnJava2DSurface()) {
+                  } else if (factory.canCreateContextOnJava2DSurface(device)) {
                     // Mac OS X code path
                     // FIXME: Need to share with j2d context, due to FBO resource .. 
                     // - ORIG: joglContext = factory.createContextOnJava2DSurface(g, shareWith);
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java
index 9fc986180..95fd6c72b 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java
@@ -113,11 +113,11 @@ public class X11Util {
             return 0;
         }
         long dpy = namedDpy.getHandle();
-        X11Lib.XCloseDisplay(dpy);
         if(DEBUG) {
-            Exception e = new Exception("X11Util.Display: Closed TLS Display("+name+") with handle 0x"+Long.toHexString(dpy)+" in thread "+Thread.currentThread().getName());
+            Exception e = new Exception("X11Util.Display: Closing TLS Display("+name+") with handle 0x"+Long.toHexString(dpy)+" in thread "+Thread.currentThread().getName());
             e.printStackTrace();
         }
+        X11Lib.XCloseDisplay(dpy);
         return dpy;
     }
 
-- 
cgit v1.2.3


From 2ae28d54858ff684bc2368e0476a7a357dc63432 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 15 Apr 2010 03:44:12 +0200
Subject: Further ATI (fglrx) X11Display bug workaround/cleanup

    - See https://bugzilla.mozilla.org/show_bug.cgi?id=486277

    - Calling XCloseDisplay occasionally leads to a SIGSEGV,
      even thought the reference is valid and OK.

      Workaround is not to close any X11Display,
      but to hold them stashed and reuse them.
      Since we already pipeline all X11Display's
      via Nativewindow's X11Util, an added referenceCounter
      and a global active/passive list solved this problem.
      This workaround is only active in case 'isVendorATI()'.

NEWT/NativeWindow X11:
    - Let XIOErrorHandler and invalid display references
      fail hard with FatalError, otherwise we won't see
      the stack trace - and those bugs are indeed fatal.

NativeWindow X11:
    - Install XIOErrorHandler, which stays active.
    - X11Util.X11Display:
        - Add reference counter
        - Add global active/passive list.
          Passive if reference count == 0
          and marked as 'un-closeable' (-> ATI).
          Reusing passive members when create a new display.
    -

JOGL:
    - Use DeleteLocalRef() calls to free temp NIO buffer
      in manual *Copied implementation.

    - GLDrawableFactoryImpl: Be serious about the shutdown() semantics

    - *GraphicsConfiguration:
        - Fix the invalid Onscreen/PBuffer/Pixmap determination (X11/EGL/WGL)
        - Just return null if not valid

    - X11GLXGraphicsConfigurationFactory - FBConfig
        - Determine recommendedIndex properly ..
        - Don't bail out if a FBConfig is invalid ..
        - Use Chooser in case nothing is recommended ..

    - X11OffscreenGLXDrawable fixes bugs:
        - wrong (int) cast of parent window in XCreatePixmap call
        - setting display to zero too early in destruction, ie
          before XCloseDisplay

    - X11GLXDrawableFactory is using [singleton] shared dummy resources for
        - Screen, Drawable and Context
      which are utilized in case they are needed ..
      They are removed at shutdown call

    - GLXVersion gathering in GLXUtil now ..

    - DefaultGLCapabilitiesChooser: Respect PBuffer selection

Tests:
    - Add DrawableFactory shutdown()
    - Add various Offscreen Capabilties
    - Add Offscreen and non-pbuffer case

    - JUnit Passed (Linux64bit: NVidia/ATI)
    - demos.jrefract.JRefract passed (Linux64bit: NVidia/ATI)
---
 make/build-nativewindow.xml                        |   3 +
 make/config/jogl/glx-CustomCCode.c                 |   7 +-
 make/config/nativewindow/x11-CustomCCode.c         | 230 ----------
 make/config/nativewindow/x11-CustomJavaCode.java   |  12 +-
 make/config/nativewindow/x11-lib.cfg               |  20 +-
 make/stub_includes/x11/window-lib.c                |   3 +
 .../jogamp/opengl/impl/GLDrawableFactoryImpl.java  |  17 +
 .../opengl/impl/egl/EGLGraphicsConfiguration.java  |  19 +-
 .../wgl/WindowsWGLGraphicsConfiguration.java       |  15 +-
 .../WindowsWGLGraphicsConfigurationFactory.java    |   8 +-
 .../com/jogamp/opengl/impl/x11/glx/GLXUtil.java    |  48 ++-
 .../opengl/impl/x11/glx/X11DummyGLXDrawable.java   |  20 +-
 .../jogamp/opengl/impl/x11/glx/X11GLXContext.java  |  36 +-
 .../opengl/impl/x11/glx/X11GLXDrawableFactory.java | 156 +++++--
 .../impl/x11/glx/X11GLXGraphicsConfiguration.java  |  57 ++-
 .../glx/X11GLXGraphicsConfigurationFactory.java    |  92 +++-
 .../impl/x11/glx/X11OffscreenGLXDrawable.java      |  12 +-
 .../awt/X11AWTGLXGraphicsConfigurationFactory.java |   2 +-
 .../media/opengl/DefaultGLCapabilitiesChooser.java |  11 +-
 .../javax/media/opengl/GLDrawableFactory.java      |   2 +
 .../junit/jogl/drawable/TestDrawable01NEWT.java    |  35 +-
 .../junit/jogl/offscreen/TestOffscreen01NEWT.java  | 264 ++++++++++--
 .../test/junit/jogl/offscreen/WindowUtilNEWT.java  |  25 +-
 .../com/jogamp/nativewindow/impl/x11/X11Util.java  | 228 ++++++++--
 .../media/nativewindow/x11/X11GraphicsScreen.java  |   2 +-
 src/nativewindow/native/x11/Xmisc.c                | 471 +++++++++++++++++++++
 .../classes/com/jogamp/newt/x11/X11Display.java    |   6 +-
 src/newt/native/X11Window.c                        |  76 ++--
 28 files changed, 1369 insertions(+), 508 deletions(-)
 delete mode 100755 make/config/nativewindow/x11-CustomCCode.c
 create mode 100644 src/nativewindow/native/x11/Xmisc.c

diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 3a62e9733..4b726bafb 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -530,6 +530,7 @@
 
         <patternset id="c.src.files.x11">
           <include name="${rootrel.generated.c}/X11/X11*.c" if="isX11"/>
+          <include name="${rootrel.src.c}/x11/Xmisc.c" if="isX11"/>
           <include name="${rootrel.src.c}/x11/XineramaHelper.c" if="isX11"/>
           <!-- Xinerama supporting functions for Linux only (for now) -->
           <!-- Also supported on Solaris, but works differently -->
@@ -623,6 +624,8 @@
     </target>
 
     <target name="c.build.nativewindow.windowlib.x11" if="isX11">
+      <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.jogamp.nativewindow.impl.x11.X11Lib" />
+
       <c.build c.compiler.src.files="c.src.files.x11"
                output.lib.name="nativewindow_x11"
                compiler.cfg.id="${compiler.cfg.id}"
diff --git a/make/config/jogl/glx-CustomCCode.c b/make/config/jogl/glx-CustomCCode.c
index 7dac53fb6..1b30a7da6 100755
--- a/make/config/jogl/glx-CustomCCode.c
+++ b/make/config/jogl/glx-CustomCCode.c
@@ -78,7 +78,7 @@ Java_com_jogamp_opengl_impl_x11_glx_GLX_glXGetVisualFromFBConfigCopied0__JJ(JNIE
   jbyteCopy   = (*env)->CallStaticObjectMethod(env,
                                                clazzInternalBufferUtil, cstrInternalBufferUtil, jbyteSource);
 
-  // FIXME: remove reference/gc jbyteSource ?? 
+  (*env)->DeleteLocalRef(env, jbyteSource);
   XFree(_res);
 
   return jbyteCopy;
@@ -118,8 +118,7 @@ Java_com_jogamp_opengl_impl_x11_glx_GLX_glXChooseFBConfigCopied1__JILjava_lang_O
   jbyteSource = (*env)->NewDirectByteBuffer(env, _res, count * sizeof(GLXFBConfig));
   jbyteCopy   = (*env)->CallStaticObjectMethod(env,
                                                clazzInternalBufferUtil, cstrInternalBufferUtil, jbyteSource);
-
-  // FIXME: remove reference/gc jbyteSource ?? 
+  (*env)->DeleteLocalRef(env, jbyteSource);
   XFree(_res);
 
   return jbyteCopy;
@@ -151,7 +150,7 @@ Java_com_jogamp_opengl_impl_x11_glx_GLX_glXChooseVisualCopied1__JILjava_lang_Obj
   jbyteCopy   = (*env)->CallStaticObjectMethod(env,
                                                clazzInternalBufferUtil, cstrInternalBufferUtil, jbyteSource);
 
-  // FIXME: remove reference/gc jbyteSource ?? 
+  (*env)->DeleteLocalRef(env, jbyteSource);
   XFree(_res);
 
   return jbyteCopy;
diff --git a/make/config/nativewindow/x11-CustomCCode.c b/make/config/nativewindow/x11-CustomCCode.c
deleted file mode 100755
index 982a39f7e..000000000
--- a/make/config/nativewindow/x11-CustomCCode.c
+++ /dev/null
@@ -1,230 +0,0 @@
-#include <inttypes.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-/* Linux headers don't work properly */
-#define __USE_GNU
-#include <dlfcn.h>
-#undef __USE_GNU
-
-/* Current versions of Solaris don't expose the XF86 extensions,
-   although with the recent transition to Xorg this will probably
-   happen in an upcoming release */
-#if !defined(__sun) && !defined(_HPUX)
-#include <X11/extensions/xf86vmode.h>
-#else
-/* Need to provide stubs for these */
-Bool XF86VidModeGetGammaRampSize(
-    Display *display,
-    int screen,
-    int* size)
-{
-  return False;
-}
-
-Bool XF86VidModeGetGammaRamp(
-    Display *display,
-    int screen,
-    int size,
-    unsigned short *red_array,
-    unsigned short *green_array,
-    unsigned short *blue_array) {
-  return False;
-}
-Bool XF86VidModeSetGammaRamp(
-    Display *display,
-    int screen,
-    int size,
-    unsigned short *red_array,
-    unsigned short *green_array,
-    unsigned short *blue_array) {
-  return False;
-}
-#endif
-
-/* HP-UX doesn't define RTLD_DEFAULT. */
-#if defined(_HPUX) && !defined(RTLD_DEFAULT)
-#define RTLD_DEFAULT NULL
-#endif
-
-/* Need to expose DefaultScreen and RootWindow macros to Java */
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_DefaultScreen(JNIEnv *env, jclass _unused, jlong display) {
-  return DefaultScreen((Display*) (intptr_t) display);
-}
-
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_DefaultVisualID(JNIEnv *env, jclass _unused, jlong display, jint screen) {
-  return (jlong) XVisualIDFromVisual( DefaultVisual( (Display*) (intptr_t) display, screen ) );
-}
-
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_RootWindow(JNIEnv *env, jclass _unused, jlong display, jint screen) {
-  return RootWindow((Display*) (intptr_t) display, screen);
-}
-
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_dlopen(JNIEnv *env, jclass _unused, jstring name) {
-  const jbyte* chars;
-  void* res;
-  chars = (*env)->GetStringUTFChars(env, name, NULL);
-  res = dlopen(chars, RTLD_LAZY | RTLD_GLOBAL);
-  (*env)->ReleaseStringUTFChars(env, name, chars);
-  return (jlong) ((intptr_t) res);
-}
-
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_dlsym(JNIEnv *env, jclass _unused, jstring name) {
-  const jbyte* chars;
-  void* res;
-  chars = (*env)->GetStringUTFChars(env, name, NULL);
-  res = dlsym(RTLD_DEFAULT, chars);
-  (*env)->ReleaseStringUTFChars(env, name, chars);
-  return (jlong) ((intptr_t) res);
-}
-
-/* Need to pull this in as we don't have a stub header for it */
-extern Bool XineramaEnabled(Display* display);
-
-static const char * clazzNameInternalBufferUtil = "com/jogamp/nativewindow/impl/InternalBufferUtil";
-static const char * clazzNameInternalBufferUtilStaticCstrName = "copyByteBuffer";
-static const char * clazzNameInternalBufferUtilStaticCstrSignature = "(Ljava/nio/ByteBuffer;)Ljava/nio/ByteBuffer;";
-static const char * clazzNameByteBuffer = "java/nio/ByteBuffer";
-static jclass clazzInternalBufferUtil = NULL;
-static jmethodID cstrInternalBufferUtil = NULL;
-static jclass clazzByteBuffer = NULL;
-
-static void _initClazzAccess(JNIEnv *env) {
-    jclass c;
-
-    if(NULL!=cstrInternalBufferUtil) return ;
-
-    c = (*env)->FindClass(env, clazzNameInternalBufferUtil);
-    if(NULL==c) {
-        fprintf(stderr, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't find %s\n", clazzNameInternalBufferUtil);
-        (*env)->FatalError(env, clazzNameInternalBufferUtil);
-    }
-    clazzInternalBufferUtil = (jclass)(*env)->NewGlobalRef(env, c);
-    if(NULL==clazzInternalBufferUtil) {
-        fprintf(stderr, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't use %s\n", clazzNameInternalBufferUtil);
-        (*env)->FatalError(env, clazzNameInternalBufferUtil);
-    }
-    c = (*env)->FindClass(env, clazzNameByteBuffer);
-    if(NULL==c) {
-        fprintf(stderr, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't find %s\n", clazzNameByteBuffer);
-        (*env)->FatalError(env, clazzNameByteBuffer);
-    }
-    clazzByteBuffer = (jclass)(*env)->NewGlobalRef(env, c);
-    if(NULL==c) {
-        fprintf(stderr, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't use %s\n", clazzNameByteBuffer);
-        (*env)->FatalError(env, clazzNameByteBuffer);
-    }
-
-    cstrInternalBufferUtil = (*env)->GetStaticMethodID(env, clazzInternalBufferUtil, 
-                            clazzNameInternalBufferUtilStaticCstrName, clazzNameInternalBufferUtilStaticCstrSignature);
-    if(NULL==cstrInternalBufferUtil) {
-        fprintf(stderr, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib:: can't create %s.%s %s\n",
-            clazzNameInternalBufferUtil,
-            clazzNameInternalBufferUtilStaticCstrName, clazzNameInternalBufferUtilStaticCstrSignature);
-        (*env)->FatalError(env, clazzNameInternalBufferUtilStaticCstrName);
-    }
-}
-
-/*   Java->C glue code:
- *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
- *    Java method: XVisualInfo XGetVisualInfo(long arg0, long arg1, XVisualInfo arg2, java.nio.IntBuffer arg3)
- *     C function: XVisualInfo *  XGetVisualInfo(Display * , long, XVisualInfo * , int * );
- */
-JNIEXPORT jobject JNICALL
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_XGetVisualInfoCopied1__JJLjava_nio_ByteBuffer_2Ljava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jint arg3_byte_offset) {
-  XVisualInfo * _ptr2 = NULL;
-  int * _ptr3 = NULL;
-  XVisualInfo *  _res;
-  int count;
-  jobject jbyteSource;
-  jobject jbyteCopy;
-    if (arg2 != NULL) {
-        _ptr2 = (XVisualInfo *) (((char*) (*env)->GetDirectBufferAddress(env, arg2)) + 0);
-    }
-  if (arg3 != NULL) {
-    _ptr3 = (int *) (((char*) (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) + arg3_byte_offset);
-  }
-  _res = XGetVisualInfo((Display *) (intptr_t) arg0, (long) arg1, (XVisualInfo *) _ptr2, (int *) _ptr3);
-  count = _ptr3[0];
-  if (arg3 != NULL) {
-    (*env)->ReleasePrimitiveArrayCritical(env, arg3, _ptr3, 0);
-  }
-  if (_res == NULL) return NULL;
-
-  _initClazzAccess(env);
-
-  jbyteSource = (*env)->NewDirectByteBuffer(env, _res, count * sizeof(XVisualInfo));
-  jbyteCopy   = (*env)->CallStaticObjectMethod(env,
-                                               clazzInternalBufferUtil, cstrInternalBufferUtil, jbyteSource);
-
-  // FIXME: remove reference/gc jbyteSource ?? 
-  XFree(_res);
-
-  return jbyteCopy;
-}
-
-
-static XIOErrorHandler origIOErrorHandler = NULL;
-
-static int displayIOErrorHandler(Display *dpy)
-{
-    fprintf(stderr, "Fatal: Nativewindow X11 IOError: Display %p not available\n", dpy);
-    origIOErrorHandler(dpy);
-    return 0;
-}
-
-static void displayIOErrorHandlerEnable(int onoff) {
-    if(onoff) {
-        if(NULL==origIOErrorHandler) {
-            origIOErrorHandler = XSetIOErrorHandler(displayIOErrorHandler);
-        }
-    } else {
-        XSetIOErrorHandler(origIOErrorHandler);
-        origIOErrorHandler = NULL;
-    }
-}
-
-/*   Java->C glue code:
- *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
- *    Java method: int XCloseDisplay(long display)
- *     C function: int XCloseDisplay(Display *  display);
- */
-JNIEXPORT jint JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_XCloseDisplay__J(JNIEnv *env, jclass _unused, jlong display) {
-  int _res;
-  // fprintf(stderr, "X11Lib.XCloseDisplay: %p\n", (Display *) (intptr_t) display);
-  displayIOErrorHandlerEnable(1);
-  _res = XCloseDisplay((Display *) (intptr_t) display);
-  displayIOErrorHandlerEnable(0);
-  return _res;
-}
-
-/*   Java->C glue code:
- *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
- *    Java method: long XOpenDisplay(java.lang.String arg0)
- *     C function: Display *  XOpenDisplay(const char * );
- */
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_XOpenDisplay__Ljava_lang_String_2(JNIEnv *env, jclass _unused, jstring arg0) {
-  const char* _strchars_arg0 = NULL;
-  Display *  _res;
-  if ( NULL != arg0 ) {
-    _strchars_arg0 = (*env)->GetStringUTFChars(env, arg0, (jboolean*)NULL);
-  if ( NULL == _strchars_arg0 ) {
-      (*env)->ThrowNew(env, (*env)->FindClass(env, "java/lang/OutOfMemoryError"),
-                       "Failed to get UTF-8 chars for argument \"arg0\" in native dispatcher for \"XOpenDisplay\"");
-      return 0;
-    }
-  }
-  _res = XOpenDisplay((char *) _strchars_arg0);
-  // fprintf(stderr, "X11Lib.XOpenDisplay: %s -> %p\n", _strchars_arg0, _res);
-  if ( NULL != arg0 ) {
-    (*env)->ReleaseStringUTFChars(env, arg0, _strchars_arg0);
-  }
-  return (jlong) (intptr_t) _res;
-}
-
diff --git a/make/config/nativewindow/x11-CustomJavaCode.java b/make/config/nativewindow/x11-CustomJavaCode.java
index d631c92cb..57f37bee7 100644
--- a/make/config/nativewindow/x11-CustomJavaCode.java
+++ b/make/config/nativewindow/x11-CustomJavaCode.java
@@ -24,8 +24,16 @@
   /** Entry point to C language function: <code> XVisualInfo *  XGetVisualInfo(Display * , long, XVisualInfo * , int * ); </code>    */
   private static native java.nio.ByteBuffer XGetVisualInfoCopied1(long arg0, long arg1, java.nio.ByteBuffer arg2, Object arg3, int arg3_byte_offset);
 
-  public static native long XOpenDisplay(String arg0);
-  public static native int XCloseDisplay(long display);
+  public static native long DefaultVisualID(long display, int screen);
+
+  /**
+  public static native long CreateDummyWindow(long display, int screen_index, long visualID);
+  public static native void DestroyDummyWindow(long display, long window); */
+
   public static native long dlopen(String name);
   public static native long dlsym(String name);
 
+  public static native int XCloseDisplay(long display);
+  public static native void XUnlockDisplay(long display);
+  public static native void XLockDisplay(long display);
+
diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg
index 394dd230a..cf9642398 100644
--- a/make/config/nativewindow/x11-lib.cfg
+++ b/make/config/nativewindow/x11-lib.cfg
@@ -20,25 +20,25 @@ Opaque long Display *
 Opaque boolean Bool
 Opaque long GLXFBConfig
 
-# Manually implement XOpenDisplay, XCloseDisplay, catching XIOError
-ManuallyImplement XCloseDisplay
-ManuallyImplement XOpenDisplay
-
 IncludeAs CustomJavaCode X11Lib x11-CustomJavaCode.java
-IncludeAs CustomCCode           x11-CustomCCode.c
+# Now resides in x11/Xmisc.c: IncludeAs CustomCCode           x11-CustomCCode.c
 
 ArgumentIsString XOpenDisplay 0
 
-# Need to expose DefaultScreen and RootWindow macros to Java
-CustomJavaCode X11Lib public static native int  DefaultScreen(long display);
-CustomJavaCode X11Lib public static native long DefaultVisualID(long display, int screen);
-CustomJavaCode X11Lib public static native long RootWindow(long display, int screen);
-
 # We have Custom code for the following
 Ignore XGetVisualInfo
 
+ManuallyImplement XCloseDisplay
+ManuallyImplement XUnlockDisplay
+ManuallyImplement XLockDisplay
+
 # Helper routine to make the ReturnedArrayLength expression below work correctly
 CustomJavaCode X11Lib private static int getFirstElement(IntBuffer buf)         { return buf.get(buf.position()); }
 CustomJavaCode X11Lib private static int getFirstElement(int[] arr, int offset) { return arr[offset]; }
 
 CustomJavaCode XVisualInfo public static XVisualInfo create(XVisualInfo s) { XVisualInfo d = XVisualInfo.create(); d.getBuffer().put(s.getBuffer()); d.getBuffer().rewind(); s.getBuffer().rewind(); return d; }
+
+CustomCCode #include <inttypes.h>
+CustomCCode #include <X11/Xlib.h>
+CustomCCode #include <X11/Xutil.h>
+
diff --git a/make/stub_includes/x11/window-lib.c b/make/stub_includes/x11/window-lib.c
index 3096cde4c..8fca86263 100644
--- a/make/stub_includes/x11/window-lib.c
+++ b/make/stub_includes/x11/window-lib.c
@@ -17,6 +17,9 @@ extern void XLockDisplay(Display *display);
 
 extern void XUnlockDisplay(Display *display);
 
+extern Window RootWindow(Display *display, int screen_number);
+extern int DefaultScreen(Display *display);
+
 extern XVisualInfo *XGetVisualInfo(
     Display*		/* display */,
     long		/* vinfo_mask */,
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
index 35810678c..616640bad 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
@@ -54,13 +54,24 @@ import java.lang.reflect.*;
 public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
   protected static final boolean DEBUG = Debug.debug("GLDrawableFactory");
 
+  private boolean isValid = false;
+
   public void shutdown() { 
+     validate();
+     isValid = false;
+  }
+
+  protected final void validate() {
+    if(!isValid) {
+        throw new GLException("GLDrawableFactory is already shutdown!");
+    }
   }
 
   //---------------------------------------------------------------------------
   // Dispatching GLDrawable construction in respect to the NativeWindow Capabilities
   //
   public GLDrawable createGLDrawable(NativeWindow target) {
+    validate();
     if (target == null) {
       throw new IllegalArgumentException("Null target");
     }
@@ -124,6 +135,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
                                             GLCapabilitiesChooser chooser,
                                             int width,
                                             int height) {
+    validate();
     if(height<=0 || height<=0) {
         throw new GLException("Width and height of pbuffer must be positive (were (" +
                         width + ", " + height + "))");
@@ -139,6 +151,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
                                    int width,
                                    int height,
                                    GLContext shareWith) {
+    validate();
     return new GLPbufferImpl( (GLDrawableImpl) createGLPbufferDrawable(capabilities, chooser, height, height),
                               shareWith);
   }
@@ -155,6 +168,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
                                             GLCapabilitiesChooser chooser,
                                             int width,
                                             int height) {
+    validate();
     if(width<=0 || height<=0) {
         throw new GLException("Width and height of pbuffer must be positive (were (" +
                         width + ", " + height + "))");
@@ -174,6 +188,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
 
   protected GLDrawableFactoryImpl() {
     super();
+    isValid = true;
   }
 
   protected void maybeDoSingleThreadedWorkaround(Runnable action) {
@@ -279,6 +294,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
    *   out-of-bounds
    */
   public boolean setDisplayGamma(float gamma, float brightness, float contrast) throws IllegalArgumentException {
+    validate();
     if ((brightness < -1.0f) || (brightness > 1.0f)) {
       throw new IllegalArgumentException("Brightness must be between -1.0 and 1.0");
     }
@@ -311,6 +327,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
   }
 
   public synchronized void resetDisplayGamma() {
+    validate();
     if (gammaShutdownHook == null) {
       throw new IllegalArgumentException("Should not call this unless setDisplayGamma called first");
     }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
index c8bc4fe0d..2d5154442 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
@@ -122,10 +122,11 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
         if ( onscreen ) {
             res = ( 0 != (val & EGL.EGL_WINDOW_BIT) ) ;
         } else {
-            res = ( 0 != (val & EGL.EGL_PIXMAP_BIT) ) || usePBuffer ;
-        }
-        if ( usePBuffer ) {
-            res = res && ( 0 != (val & EGL.EGL_PBUFFER_BIT) ) ;
+            if ( usePBuffer ) {
+                res = ( 0 != (val & EGL.EGL_PBUFFER_BIT) ) ;
+            } else {
+                res = ( 0 != (val & EGL.EGL_PIXMAP_BIT) ) ;
+            }
         }
 
         return res;
@@ -187,17 +188,13 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
                 caps.setOnscreen( 0 != (val[0] & EGL.EGL_WINDOW_BIT) );
                 caps.setPBuffer ( 0 != (val[0] & EGL.EGL_PBUFFER_BIT) );
             } else {
-                throw new GLException("EGL_SURFACE_TYPE does not match !!!");
-            }
-        } else {
-            if(relaxed) {
                 if(DEBUG) {
-                    System.err.println("Could not determine EGL_SURFACE_TYPE !!!");
+                  System.err.println("EGL_SURFACE_TYPE does not match: req(onscrn "+onscreen+", pbuffer "+usePBuffer+"), got(onscreen "+( 0 != (val[0] & EGL.EGL_WINDOW_BIT) )+", pbuffer "+( 0 != (val[0] & EGL.EGL_PBUFFER_BIT) )+", pixmap "+( 0 != (val[0] & EGL.EGL_PIXMAP_BIT) )+")");
                 }
                 return null;
-            } else {
-                throw new GLException("Could not determine EGL_SURFACE_TYPE !!!");
             }
+        } else {
+            throw new GLException("Could not determine EGL_SURFACE_TYPE !!!");
         }
 
         return caps;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
index 5b34e40e1..aed4012a4 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
@@ -412,14 +412,16 @@ public class WindowsWGLGraphicsConfiguration extends DefaultGraphicsConfiguratio
         if ( onscreen ) {
             res = ( 0 != (val & WINDOW_BIT) ) ;
         } else {
-            res = ( 0 != (val & BITMAP_BIT) ) || usePBuffer ;
-        }
-        if ( usePBuffer ) {
-            res = res && ( 0 != (val & PBUFFER_BIT) ) ;
+            if ( usePBuffer ) {
+                res = ( 0 != (val & PBUFFER_BIT) ) ;
+            } else {
+                res = ( 0 != (val & BITMAP_BIT) ) ;
+            }
         }
 
         return res;
     }
+
     public static GLCapabilities AttribList2GLCapabilities(GLProfile glp, int[] iattribs,
                                                          int niattribs,
                                                          int[] iresults,
@@ -433,7 +435,10 @@ public class WindowsWGLGraphicsConfiguration extends DefaultGraphicsConfiguratio
             res.setOnscreen( 0 != (drawableTypeBits & WINDOW_BIT) );
             res.setPBuffer ( 0 != (drawableTypeBits & PBUFFER_BIT) );
         } else {
-            throw new GLException("WGL DrawableType does not match !!!");
+            if(DEBUG) {
+              System.err.println("WGL DrawableType does not match: req(onscrn "+onscreen+", pbuffer "+usePBuffer+"), got(onscreen "+( 0 != (drawableTypeBits & WINDOW_BIT) )+", pbuffer "+( 0 != (drawableTypeBits & PBUFFER_BIT) )+", pixmap "+( 0 != (drawableTypeBits & BITMAP_BIT))+")");
+            }
+            return null;
         }
 
         for (int i = 0; i < niattribs; i++) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
index 55b30ef3a..1a375699c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
@@ -260,9 +260,11 @@ public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfiguratio
                   }
                   pixelFormat = 1; // default ..
               } else if ( pixelFormat > numFormats ) {
-                throw new GLException("Invalid result " + pixelFormat +
-                                      " from GLCapabilitiesChooser (should be between 1 and " +
-                                      numFormats + ")");
+                  // keep on going ..
+                  if(DEBUG) {
+                    System.err.println("GLCapabilitiesChooser specified invalid index (expected 1.." + numFormats + ", got "+pixelFormat+")");
+                  }
+                  pixelFormat = 1; // default ..
               }
           }
           chosenCaps = availableCaps[pixelFormat-1];
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
index 99c54332f..e3c1381f8 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
@@ -54,13 +54,55 @@ public class GLXUtil {
 
     /** Workaround for apparent issue with ATI's proprietary drivers
         where direct contexts still send GLX tokens for GL calls */
-    public static boolean isVendorATI(long display) {
+    public static String getVendorName(long display) {
         try {
             X11Lib.XLockDisplay(display);
-            String vendor = GLX.glXGetClientString(display, GLX.GLX_VENDOR);
-            return vendor != null && vendor.startsWith("ATI") ;
+            return GLX.glXGetClientString(display, GLX.GLX_VENDOR);
         } finally {
             X11Lib.XUnlockDisplay(display);
         }
     }
+
+    public static boolean isVendorNVIDIA(String vendor) {
+        return vendor != null && vendor.startsWith("NVIDIA") ;
+    }
+
+    public static boolean isVendorATI(String vendor) {
+        return vendor != null && vendor.startsWith("ATI") ;
+    }
+
+    public static boolean isVendorATI(long display) {
+        return isVendorATI(getVendorName(display));
+    }
+
+    public static boolean isVendorNVIDIA(long display) {
+        return isVendorNVIDIA(getVendorName(display));
+    }
+
+    public static void getGLXVersion(long display, int major[], int minor[]) { 
+        if(0 == display) {
+            throw new GLException("null display handle");
+        }
+        if(major.length<1||minor.length<1) {
+            throw new GLException("passed int arrays size is not >= 1");
+        }
+
+        if (!GLX.glXQueryVersion(display, major, 0, minor, 0)) {
+          throw new GLException("glXQueryVersion failed");
+        }
+
+        // Work around bugs in ATI's Linux drivers where they report they
+        // only implement GLX version 1.2 on the server side
+        if (major[0] == 1 && minor[0] == 2) {
+          String str = GLX.glXGetClientString(display, GLX.GLX_VERSION);
+          try {
+              // e.g. "1.3"
+              major[0] = Integer.valueOf(str.substring(0, 1)).intValue();
+              minor[0] = Integer.valueOf(str.substring(2, 3)).intValue();
+          } catch (Exception e) {
+              major[0] = 1;
+              minor[0] = 2;
+          }
+        }
+    }
 }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java
index 097689967..a865e91e8 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java
@@ -42,6 +42,8 @@ import com.jogamp.nativewindow.impl.x11.*;
 
 public class X11DummyGLXDrawable extends X11OnscreenGLXDrawable {
 
+  // private long dummyWindow = 0;
+
   /** 
    * Due to the ATI Bug https://bugzilla.mozilla.org/show_bug.cgi?id=486277,
    * we cannot switch the Display as we please, 
@@ -57,12 +59,17 @@ public class X11DummyGLXDrawable extends X11OnscreenGLXDrawable {
     X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)nw.getGraphicsConfiguration().getNativeGraphicsConfiguration();
     GLCapabilities caps = (GLCapabilities) config.getChosenCapabilities();
 
-    long dpy = config.getScreen().getDevice().getHandle();
-    int scrn = config.getScreen().getIndex();
-    // System.out.println("X11DummyGLXDrawable: dpy "+toHexString(dpy)+", scrn "+scrn);
+    X11GraphicsDevice device = (X11GraphicsDevice) screen.getDevice();
+    long dpy = device.getHandle();
+    int scrn = screen.getIndex();
+    // long visualID = config.getVisualID();
+    // System.out.println("X11DummyGLXDrawable: dpy "+toHexString(dpy)+", scrn "+scrn+", visualID "+toHexString(visualID));
+
     X11Lib.XLockDisplay(dpy);
     try{
         nw.setSurfaceHandle( X11Lib.RootWindow(dpy, scrn) );
+        // dummyWindow = X11Lib.CreateDummyWindow(dpy, scrn, visualID);
+        // nw.setSurfaceHandle( dummyWindow );
     } finally {
         X11Lib.XUnlockDisplay(dpy);
     }
@@ -80,6 +87,11 @@ public class X11DummyGLXDrawable extends X11OnscreenGLXDrawable {
   }
 
   public void destroy() {
-    // nothing to do, but allowed
+    /**
+    if(0!=dummyWindow) {
+        X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+        long dpy = config.getScreen().getDevice().getHandle();
+        X11Lib.DestroyDummyWindow(dpy, dummyWindow);
+    } */
   }
 }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
index 055e7236c..142da672a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
@@ -133,7 +133,7 @@ public abstract class X11GLXContext extends GLContextImpl {
     }
 
     GLCapabilities glCaps = (GLCapabilities) config.getChosenCapabilities();
-    isVendorATI = GLXUtil.isVendorATI(display);
+    isVendorATI = ((X11GLXDrawableFactory)(drawable.getFactoryImpl())).isVendorATI();
 
     if(config.getFBConfigID()<0) {
         // not able to use FBConfig
@@ -148,11 +148,11 @@ public abstract class X11GLXContext extends GLContextImpl {
                                        drawable.getNativeWindow().getSurfaceHandle(), 
                                        drawableRead.getNativeWindow().getSurfaceHandle(), 
                                        context)) {
-          throw new GLException("Error making temp context (old2) current: display 0x"+Long.toHexString(display)+", context 0x"+Long.toHexString(context)+", drawable "+drawable);
+          throw new GLException("Error making temp context (old2) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
         }
         setGLFunctionAvailability(true);
         if(DEBUG) {
-              System.err.println("X11GLXContext.createContext done (old2 ctx) 0x"+Long.toHexString(context));
+              System.err.println("X11GLXContext.createContext done (old2 ctx) "+toHexString(context));
         }
 
     } else {
@@ -167,7 +167,7 @@ public abstract class X11GLXContext extends GLContextImpl {
                                            drawable.getNativeWindow().getSurfaceHandle(), 
                                            drawableRead.getNativeWindow().getSurfaceHandle(), 
                                            temp_context)) {
-              throw new GLException("Error making temp context (old) current: display 0x"+Long.toHexString(display)+", context 0x"+Long.toHexString(context)+", drawable "+drawable);
+              throw new GLException("Error making temp context (old) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
             }
             setGLFunctionAvailability(true);
 
@@ -182,7 +182,7 @@ public abstract class X11GLXContext extends GLContextImpl {
                 // continue with temp context for GL < 3.0
                 context = temp_context;
                 if(DEBUG) {
-                  System.err.println("X11GLXContext.createContext done (old ctx < 3.0 - no GLX_ARB_create_context) 0x"+Long.toHexString(context));
+                  System.err.println("X11GLXContext.createContext done (old ctx < 3.0 - no GLX_ARB_create_context) "+toHexString(context));
                 }
             } else {
                 GLXExt glXExt = getGLXExt();
@@ -209,7 +209,7 @@ public abstract class X11GLXContext extends GLContextImpl {
                     /**
                      * don't stricten requirements any further, even compatible would be fine
                      *
-                     } else {
+                     else {
                         attribs[8+0]  = GLX.GLX_CONTEXT_PROFILE_MASK_ARB;
                         attribs[8+1]  = GLX.GLX_CONTEXT_CORE_PROFILE_BIT_ARB;
                      } 
@@ -228,7 +228,7 @@ public abstract class X11GLXContext extends GLContextImpl {
                             GLX.glXDestroyContext(display, context);
                             context = 0;
                         } else if(DEBUG) {
-                          System.err.println("X11GLXContext.createContext >= 3.2 available 0x"+Long.toHexString(context));
+                          System.err.println("X11GLXContext.createContext >= 3.2 available "+toHexString(context));
                         }
                     } else {
                         if(DEBUG) {
@@ -261,7 +261,7 @@ public abstract class X11GLXContext extends GLContextImpl {
                             GLX.glXDestroyContext(display, context);
                             context = 0;
                         } else if(DEBUG) {
-                          System.err.println("X11GLXContext.createContext >= 3.0 available 0x"+Long.toHexString(context));
+                          System.err.println("X11GLXContext.createContext >= 3.0 available "+toHexString(context));
                         }
                     } else {
                         if(DEBUG) {
@@ -285,10 +285,10 @@ public abstract class X11GLXContext extends GLContextImpl {
                                                    context)) {
                       GLX.glXMakeContextCurrent(display, 0, 0, 0);
                       GLX.glXDestroyContext(display, temp_context);
-                      throw new GLException("Error making context (old) current: display 0x"+Long.toHexString(display)+", context 0x"+Long.toHexString(context)+", drawable "+drawable);
+                      throw new GLException("Error making context (old) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
                     }
                     if(DEBUG) {
-                      System.err.println("X11GLXContext.createContext done (old ctx < 3.0 - no 3.0) 0x"+Long.toHexString(context));
+                      System.err.println("X11GLXContext.createContext done (old ctx < 3.0 - no 3.0) "+toHexString(context));
                     }
                 } else {
                     GLX.glXDestroyContext(display, temp_context);
@@ -296,7 +296,7 @@ public abstract class X11GLXContext extends GLContextImpl {
                     // need to update the GL func table ..
                     updateGLProcAddressTable();
                     if(DEBUG) {
-                      System.err.println("X11GLXContext.createContext done (new ctx >= 3.0) 0x"+Long.toHexString(context));
+                      System.err.println("X11GLXContext.createContext done (new ctx >= 3.0) "+toHexString(context));
                     }
                 }
             }
@@ -337,6 +337,8 @@ public abstract class X11GLXContext extends GLContextImpl {
   }
 
   protected int makeCurrentImplAfterLock() throws GLException {
+    long dpy = drawable.getNativeWindow().getDisplayHandle();
+
     getDrawableImpl().getFactoryImpl().lockToolkit();
     try {
         if (drawable.getNativeWindow().getSurfaceHandle() == 0) {
@@ -356,7 +358,7 @@ public abstract class X11GLXContext extends GLContextImpl {
 
         if (GLX.glXGetCurrentContext() != context) {
             
-            if (!GLX.glXMakeContextCurrent(drawable.getNativeWindow().getDisplayHandle(), 
+            if (!GLX.glXMakeContextCurrent(dpy,
                                            drawable.getNativeWindow().getSurfaceHandle(), 
                                            drawableRead.getNativeWindow().getSurfaceHandle(), 
                                            context)) {
@@ -364,7 +366,7 @@ public abstract class X11GLXContext extends GLContextImpl {
             }
             if (DEBUG && (VERBOSE || created)) {
               System.err.println(getThreadName() + ": glXMakeCurrent(display " + 
-                                 toHexString(drawable.getNativeWindow().getDisplayHandle()) +
+                                 toHexString(dpy)+
                                  ", drawable " + toHexString(drawable.getNativeWindow().getSurfaceHandle()) +
                                  ", drawableRead " + toHexString(drawableRead.getNativeWindow().getSurfaceHandle()) +
                                  ", context " + toHexString(context) + ") succeeded");
@@ -397,10 +399,10 @@ public abstract class X11GLXContext extends GLContextImpl {
     try {
         if (context != 0) {
             if (DEBUG) {
-              System.err.println("glXDestroyContext(0x" +
-                                 Long.toHexString(drawable.getNativeWindow().getDisplayHandle()) +
-                                 ", 0x" +
-                                 Long.toHexString(context) + ")");
+              System.err.println("glXDestroyContext(" +
+                                 toHexString(drawable.getNativeWindow().getDisplayHandle()) +
+                                 ", " +
+                                 toHexString(context) + ")");
             }
             GLX.glXDestroyContext(drawable.getNativeWindow().getDisplayHandle(), context);
             if (DEBUG) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
index 60ee431dc..eda480d5f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
@@ -48,6 +48,7 @@ import com.jogamp.nativewindow.impl.NWReflection;
 import com.jogamp.nativewindow.impl.x11.*;
 
 public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
+  
   public X11GLXDrawableFactory() {
     super();
     // Must initialize GLX support eagerly in case a pbuffer is the
@@ -60,64 +61,121 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
       NWReflection.createInstance("com.jogamp.opengl.impl.x11.glx.awt.X11AWTGLXGraphicsConfigurationFactory",
                                   new Object[] {});
     } catch (Throwable t) { }
+
+    X11GraphicsDevice sharedDevice = new X11GraphicsDevice(X11Util.createThreadLocalDisplay(null));
+    vendorName = GLXUtil.getVendorName(sharedDevice.getHandle());
+    isVendorATI = GLXUtil.isVendorATI(vendorName);
+    isVendorNVIDIA = GLXUtil.isVendorNVIDIA(vendorName);
+    if( isVendorATI() ) {
+        X11Util.markGlobalDisplayUndeletable(sharedDevice.getHandle()); // ATI hack ..
+    }
+    sharedScreen = new X11GraphicsScreen(sharedDevice, 0);
+    if (DEBUG) {
+      System.err.println("!!! Vendor: "+vendorName+", ATI: "+isVendorATI+", NV: "+isVendorNVIDIA);
+      System.err.println("!!! SharedScreen: "+sharedScreen);
+    }
+  }
+
+  private X11GraphicsScreen sharedScreen;
+  private String vendorName;
+  private boolean isVendorATI;
+  private boolean isVendorNVIDIA;
+
+  public String getVendorName() { return vendorName; }
+  public boolean isVendorATI() { return isVendorATI; }
+  public boolean isVendorNVIDIA() { return isVendorNVIDIA; }
+
+  private X11DummyGLXDrawable sharedDrawable=null;
+  private GLContext sharedContext=null;
+
+  private void initShared() {
+    if(null==sharedDrawable) {
+        X11Lib.XLockDisplay(sharedScreen.getDevice().getHandle());
+        sharedDrawable = new X11DummyGLXDrawable(sharedScreen, this, null);
+        sharedContext  = sharedDrawable.createContext(null);
+        sharedContext.makeCurrent();
+        sharedContext.release();
+        X11Lib.XUnlockDisplay(sharedScreen.getDevice().getHandle());
+        if (DEBUG) {
+          System.err.println("!!! SharedContext: "+sharedContext);
+        }
+    }
+  }
+
+  public void shutdown() {
+     super.shutdown();
+     if (DEBUG) {
+          System.err.println("!!! Shutdown Shared:");
+          System.err.println("!!!          CTX     : "+sharedContext);
+          System.err.println("!!!          Drawable: "+sharedDrawable);
+          System.err.println("!!!          Screen  : "+sharedScreen);
+          Exception e = new Exception("Debug");
+          e.printStackTrace();
+     }
+     if(null!=sharedContext) {
+        sharedContext.destroy(); // implies release, if current
+     }
+     if(null!=sharedDrawable) {
+        sharedDrawable.destroy();
+     }
+     if(null!=sharedScreen) {
+         X11GraphicsDevice sharedDevice = (X11GraphicsDevice) sharedScreen.getDevice();
+         if(null!=sharedDevice) {
+             X11Util.closeThreadLocalDisplay(null);
+         }
+         sharedScreen = null;
+     }
+     X11Util.shutdown( !isVendorATI(), DEBUG );
   }
 
   public GLDrawableImpl createOnscreenDrawable(NativeWindow target) {
+    validate();
     if (target == null) {
       throw new IllegalArgumentException("Null target");
     }
+    if( isVendorATI() ) {
+        X11Util.markGlobalDisplayUndeletable(target.getDisplayHandle()); // ATI hack ..
+    }
     return new X11OnscreenGLXDrawable(this, target);
   }
 
   protected GLDrawableImpl createOffscreenDrawable(NativeWindow target) {
+    if (target == null) {
+      throw new IllegalArgumentException("Null target");
+    }
+    if( isVendorATI() ) {
+        X11Util.markGlobalDisplayUndeletable(target.getDisplayHandle()); // ATI hack ..
+    }
+    initShared();
     return new X11OffscreenGLXDrawable(this, target);
   }
 
   public boolean canCreateGLPbuffer(AbstractGraphicsDevice device) { 
+      validate();
       return glxVersionGreaterEqualThan(device, 1, 3); 
   }
 
   private boolean glxVersionsQueried = false;
   private int     glxVersionMajor=0, glxVersionMinor=0;
   public boolean glxVersionGreaterEqualThan(AbstractGraphicsDevice device, int majorReq, int minorReq) { 
+    validate();
     if (!glxVersionsQueried) {
         if(null == device) {
-            GLContext ctx = GLContext.getCurrent();
-            if( null != ctx) {
-                device = ctx.getGLDrawable().getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration().getScreen().getDevice();
-            }
+            device = (X11GraphicsDevice) sharedScreen.getDevice();
         }
         if(null == device) {
-            GLException gle = new GLException("FIXME: No AbstractGraphicsDevice (passed or queried via current context - Fallback to ThreadLocal Display ..");
-            gle.printStackTrace();
-
-            device = new X11GraphicsDevice(X11Util.getThreadLocalDisplay(null));
+            throw new GLException("FIXME: No AbstractGraphicsDevice (passed or shared-device");
         }
         long display = device.getHandle();
         int[] major = new int[1];
         int[] minor = new int[1];
 
-        if (!GLX.glXQueryVersion(display, major, 0, minor, 0)) {
-          throw new GLException("glXQueryVersion failed");
-        }
+        GLXUtil.getGLXVersion(display, major, minor);
         if (DEBUG) {
           System.err.println("!!! GLX version: major " + major[0] +
                              ", minor " + minor[0]);
         }
 
-        // Work around bugs in ATI's Linux drivers where they report they
-        // only implement GLX version 1.2 on the server side
-        if (major[0] == 1 && minor[0] == 2) {
-          String str = GLX.glXGetClientString(display, GLX.GLX_VERSION);
-          try {
-              major[0] = Integer.valueOf(str.substring(0, 1)).intValue();
-              minor[0] = Integer.valueOf(str.substring(2, 3)).intValue();
-          } catch (NumberFormatException nfe) {
-              major[0] = 1;
-              minor[0] = 2;
-          }
-        }
-
         glxVersionMajor = major[0];
         glxVersionMinor = minor[0];
         glxVersionsQueried = true;        
@@ -127,8 +185,6 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
 
   protected GLDrawableImpl createGLPbufferDrawableImpl(final NativeWindow target) {
     GLDrawableImpl pbufferDrawable;
-    X11DummyGLXDrawable dummyDrawable=null;
-    GLContext           dummyContext=null;
 
     /** 
      * Due to the ATI Bug https://bugzilla.mozilla.org/show_bug.cgi?id=486277,
@@ -136,21 +192,20 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
      * The dummy context shall also use the same Display,
      * since switching Display in this regard is another ATI bug.
      */
-    if( null == GLContext.getCurrent() ) {
-        X11GraphicsScreen screen = (X11GraphicsScreen) target.getGraphicsConfiguration().getNativeGraphicsConfiguration().getScreen();
-        dummyDrawable = new X11DummyGLXDrawable(screen, this, null);
-        dummyContext  = dummyDrawable.createContext(null);
-        dummyContext.makeCurrent();
+    boolean usedSharedContext=false;
+    if( isVendorATI() && null == GLContext.getCurrent() ) {
+        initShared();
+        sharedContext.makeCurrent();
+        usedSharedContext=true;
+    }
+    if( isVendorATI() ) {
+        X11Util.markGlobalDisplayUndeletable(target.getDisplayHandle()); // ATI hack ..
     }
     try {
         pbufferDrawable = new X11PbufferGLXDrawable(this, target);
     } finally {
-        if(null!=dummyContext) {
-            dummyContext.release();
-            dummyContext.destroy();
-        }
-        if(null!=dummyDrawable) {
-            dummyDrawable.destroy();
+        if(usedSharedContext) {
+            sharedContext.release();
         }
     }
     return pbufferDrawable;
@@ -158,25 +213,30 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
 
 
   protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
-    AbstractGraphicsScreen screen = X11GraphicsScreen.createDefault();
-    NullWindow nw = new NullWindow(X11GLXGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(capabilities, chooser, screen));
+    X11Lib.XLockDisplay(sharedScreen.getDevice().getHandle());
+    NullWindow nw = new NullWindow(X11GLXGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(capabilities, chooser, sharedScreen));
+    X11Lib.XUnlockDisplay(sharedScreen.getDevice().getHandle());
     nw.setSize(width, height);
     return nw;
   }
 
   public GLContext createExternalGLContext() {
+    validate();
     return X11ExternalGLXContext.create(this, null);
   }
 
   public boolean canCreateExternalGLDrawable(AbstractGraphicsDevice device) {
+    validate();
     return canCreateGLPbuffer(device);
   }
 
   public GLDrawable createExternalGLDrawable() {
+    validate();
     return X11ExternalGLXDrawable.create(this, null);
   }
 
   public void loadGLULibrary() {
+    validate();
     X11Lib.dlopen("/usr/lib/libGLU.so");
   }
 
@@ -191,6 +251,7 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
   }
 
   public boolean canCreateContextOnJava2DSurface(AbstractGraphicsDevice device) {
+    validate();
     return false;
   }
 
@@ -210,9 +271,10 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
       return gammaRampLength;
     }
 
-    long display = X11Util.getThreadLocalDefaultDisplay();
+    long display = sharedScreen.getDevice().getHandle();
+
+    X11Lib.XLockDisplay(display);
     try {
-        X11Lib.XLockDisplay(display);
         int[] size = new int[1];
         boolean res = X11Lib.XF86VidModeGetGammaRampSize(display,
                                                       X11Lib.DefaultScreen(display),
@@ -235,9 +297,9 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
       rampData[i] = (short) (ramp[i] * 65535);
     }
 
-    long display = X11Util.getThreadLocalDefaultDisplay();
+    long display = sharedScreen.getDevice().getHandle();
+    X11Lib.XLockDisplay(display);
     try {
-        X11Lib.XLockDisplay(display);
         boolean res = X11Lib.XF86VidModeSetGammaRamp(display,
                                                   X11Lib.DefaultScreen(display),
                                                   rampData.length,
@@ -262,9 +324,9 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
     rampData.position(2 * size);
     rampData.limit(3 * size);
     ShortBuffer blueRampData = rampData.slice();
-    long display = X11Util.getThreadLocalDefaultDisplay();
+    long display = sharedScreen.getDevice().getHandle();
+    X11Lib.XLockDisplay(display);
     try {
-        X11Lib.XLockDisplay(display);
         boolean res = X11Lib.XF86VidModeGetGammaRamp(display,
                                                   X11Lib.DefaultScreen(display),
                                                   size,
@@ -298,9 +360,9 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
     rampData.position(2 * size);
     rampData.limit(3 * size);
     ShortBuffer blueRampData = rampData.slice();
-    long display = X11Util.getThreadLocalDefaultDisplay();
+    long display = sharedScreen.getDevice().getHandle();
+    X11Lib.XLockDisplay(display);
     try {
-        X11Lib.XLockDisplay(display);
         X11Lib.XF86VidModeSetGammaRamp(display,
                                     X11Lib.DefaultScreen(display),
                                     size,
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
index b3a6e5b8c..35daf0ae0 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
@@ -64,18 +64,18 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem
       int screen = x11Screen.getIndex();
       long fbcfg = glXFBConfigID2FBConfig(display, screen, fbcfgID);
       if(0==fbcfg) {
-          throw new GLException("FBConfig null of 0x"+Integer.toHexString(fbcfgID));
+          throw new GLException("FBConfig null of "+toHexString(fbcfgID));
       }
       if(null==glp) {
         glp = GLProfile.getDefault();
       }
       GLCapabilities caps = GLXFBConfig2GLCapabilities(glp, display, fbcfg, true, true, true, GLXUtil.isMultisampleAvailable(display));
       if(null==caps) {
-          throw new GLException("GLCapabilities null of 0x"+Long.toHexString(fbcfg));
+          throw new GLException("GLCapabilities null of "+toHexString(fbcfg));
       }
       XVisualInfo xvi = GLX.glXGetVisualFromFBConfigCopied(display, fbcfg);
       if(null==xvi) {
-          throw new GLException("XVisualInfo null of 0x"+Long.toHexString(fbcfg));
+          throw new GLException("XVisualInfo null of "+toHexString(fbcfg));
       }
       return new X11GLXGraphicsConfiguration(x11Screen, caps, caps, new DefaultGLCapabilitiesChooser(), xvi, fbcfg, fbcfgID);
     }
@@ -104,6 +104,10 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem
         }
     }
 
+    private static int nonZeroOrDontCare(int value) {
+        return value != 0 ? value : (int)GLX.GLX_DONT_CARE ;
+    }
+
     public static int[] GLCapabilities2AttribList(GLCapabilities caps,
                                                   boolean forFBAttr,
                                                   boolean isMultisampleAvailable,
@@ -222,10 +226,11 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem
     if ( onscreen ) {
         res = ( 0 != (val & GLX.GLX_WINDOW_BIT) ) ;
     } else {
-        res = ( 0 != (val & GLX.GLX_PIXMAP_BIT) ) || usePBuffer ;
-    }
-    if ( usePBuffer ) {
-        res = res && ( 0 != (val & GLX.GLX_PBUFFER_BIT) ) ;
+        if ( usePBuffer ) {
+            res = ( 0 != (val & GLX.GLX_PBUFFER_BIT) ) ;
+        } else {
+            res = ( 0 != (val & GLX.GLX_PIXMAP_BIT) ) ;
+        }
     }
 
     return res;
@@ -237,7 +242,10 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem
     int val;
     val = glXGetFBConfig(display, fbcfg, GLX.GLX_RENDER_TYPE, tmp, 0);
     if (val != GLX.GLX_RGBA_BIT) {
-      throw new GLException("Visual does not support RGBA");
+      if(DEBUG) {
+        System.err.println("FBConfig ("+toHexString(fbcfg)+") does not support RGBA: "+toHexString(val));
+      }
+      return null;
     }
     GLCapabilities res = new GLCapabilities(glp);
 
@@ -249,7 +257,10 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem
         res.setOnscreen( 0 != (val & GLX.GLX_WINDOW_BIT) );
         res.setPBuffer ( 0 != (val & GLX.GLX_PBUFFER_BIT) );
     } else {
-        throw new GLException("GLX_DRAWABLE_TYPE does not match !!!");
+        if(DEBUG) {
+          System.err.println("FBConfig ("+toHexString(fbcfg)+") GLX_DRAWABLE_TYPE does not match: req(onscrn "+onscreen+", pbuffer "+usePBuffer+"), got(onscreen "+( 0 != (val & GLX.GLX_WINDOW_BIT) )+", pbuffer "+( 0 != (val & GLX.GLX_PBUFFER_BIT) )+", pixmap "+( 0 != (val & GLX.GLX_PIXMAP_BIT) )+")");
+        }
+        return null;
     }
     res.setDoubleBuffered(glXGetFBConfig(display, fbcfg, GLX.GLX_DOUBLEBUFFER,     tmp, 0) != 0);
     res.setStereo        (glXGetFBConfig(display, fbcfg, GLX.GLX_STEREO,           tmp, 0) != 0);
@@ -302,7 +313,7 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem
     }
     int res = GLX.glXGetFBConfigAttrib(display, cfg, attrib, tmp, tmp_offset);
     if (res != 0) {
-      throw new GLException("glXGetFBConfig(0x"+Long.toHexString(attrib)+") failed: error code " + glXGetFBConfigErrorCode(res));
+      throw new GLException("glXGetFBConfig("+toHexString(attrib)+") failed: error code " + glXGetFBConfigErrorCode(res));
     }
     return tmp[tmp_offset];
   }
@@ -340,8 +351,8 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem
           NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
       }
       if (DEBUG) {
-        System.err.println("!!! Fetched XVisualInfo for visual ID 0x" + Long.toHexString(visualID));
-        System.err.println("!!! Resulting XVisualInfo: visualid = 0x" + Long.toHexString(res.getVisualid()));
+        System.err.println("!!! Fetched XVisualInfo for visual ID " + toHexString(visualID));
+        System.err.println("!!! Resulting XVisualInfo: visualid = " + toHexString(res.getVisualid()));
       }
       return res;
   }
@@ -350,11 +361,17 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem
     int[] tmp = new int[1];
     int val = glXGetConfig(display, info, GLX.GLX_USE_GL, tmp, 0);
     if (val == 0) {
-      throw new GLException("Visual does not support OpenGL");
+      if(DEBUG) {
+        System.err.println("Visual ("+toHexString(info.getVisualid())+") does not support OpenGL");
+      }
+      return null;
     }
     val = glXGetConfig(display, info, GLX.GLX_RGBA, tmp, 0);
     if (val == 0) {
-      throw new GLException("Visual does not support RGBA");
+      if(DEBUG) {
+        System.err.println("Visual ("+toHexString(info.getVisualid())+") does not support RGBA");
+      }
+      return null;
     }
     GLCapabilities res = new GLCapabilities(glp);
     res.setOnscreen      (onscreen);
@@ -399,13 +416,21 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem
     }
     int res = GLX.glXGetConfig(display, info, attrib, tmp, tmp_offset);
     if (res != 0) {
-      throw new GLException("glXGetConfig(0x"+Long.toHexString(attrib)+") failed: error code " + glXGetConfigErrorCode(res));
+      throw new GLException("glXGetConfig("+toHexString(attrib)+") failed: error code " + glXGetConfigErrorCode(res));
     }
     return tmp[tmp_offset];
   }
 
+  public static String toHexString(int val) {
+    return "0x"+Integer.toHexString(val);
+  }
+
+  public static String toHexString(long val) {
+    return "0x"+Long.toHexString(val);
+  }
+
   public String toString() {
-    return "X11GLXGraphicsConfiguration["+getScreen()+", visualID 0x" + Long.toHexString(getVisualID()) + ", fbConfigID 0x" + Long.toHexString(fbConfigID) + 
+    return "X11GLXGraphicsConfiguration["+getScreen()+", visualID " + toHexString(getVisualID()) + ", fbConfigID " + toHexString(fbConfigID) + 
                                         ",\n\trequested " + getRequestedCapabilities()+
                                         ",\n\tchosen    " + getChosenCapabilities()+
                                         "]";
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
index 72551f928..477f2473c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
@@ -79,9 +79,10 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
       //
       GLCapabilities capsFB = null;
       long display = x11Screen.getDevice().getHandle();
+
+      NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
+      X11Lib.XLockDisplay(display);
       try {
-          NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-          X11Lib.XLockDisplay(display);
           int screen = x11Screen.getIndex();
           boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
 
@@ -154,14 +155,14 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
                                                   x11Screen);
         if(null==res) {
             if(usePBuffer) {
-                throw new GLException("Error: Couldn't create X11GLXGraphicsConfiguration based on FBConfig");
+                throw new GLException("Error: Couldn't create X11GLXGraphicsConfiguration based on FBConfig for "+caps2);
             }
             res = chooseGraphicsConfigurationXVisual((GLCapabilities) caps2,
                                                      (GLCapabilitiesChooser) chooser,
                                                      x11Screen);
         }
         if(null==res) {
-            throw new GLException("Error: Couldn't create X11GLXGraphicsConfiguration");
+            throw new GLException("Error: Couldn't create X11GLXGraphicsConfiguration based on FBConfig and XVisual for "+caps2);
         }
         if(DEBUG) {
             System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationStatic("+x11Screen+","+caps2+"): "+res);
@@ -172,6 +173,7 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
     protected static X11GLXGraphicsConfiguration chooseGraphicsConfigurationFBConfig(GLCapabilities capabilities,
                                                                                      GLCapabilitiesChooser chooser,
                                                                                      X11GraphicsScreen x11Screen) {
+        long recommendedFBConfig = 0;
         int recommendedIndex = -1;
         GLCapabilities[] caps = null;
         PointerBuffer fbcfgsL = null;
@@ -186,37 +188,66 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
         //
         AbstractGraphicsDevice absDevice = x11Screen.getDevice();
         long display = absDevice.getHandle();
+
+        NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
+        X11Lib.XLockDisplay(display);
         try {
-            NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-            X11Lib.XLockDisplay(display);
             int screen = x11Screen.getIndex();
             boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
             int[] attribs = X11GLXGraphicsConfiguration.GLCapabilities2AttribList(capabilities, true, isMultisampleAvailable, display, screen);
             int[] count = { -1 };
 
+            // determine the recommended FBConfig ..
             fbcfgsL = GLX.glXChooseFBConfigCopied(display, screen, attribs, 0, count, 0);
             if (fbcfgsL == null || fbcfgsL.limit()<1) {
                 if(DEBUG) {
                     System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed glXChooseFBConfig ("+x11Screen+","+capabilities+"): "+fbcfgsL+", "+count[0]);
                 }
-                return null;
+            } else if( !X11GLXGraphicsConfiguration.GLXFBConfigValid( display, fbcfgsL.get(0) ) ) {
+                if(DEBUG) {
+                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed - GLX FBConfig invalid: ("+x11Screen+","+capabilities+"): "+fbcfgsL+", fbcfg: "+toHexString(fbcfgsL.get(0)));
+                }
+            } else {
+                recommendedFBConfig = fbcfgsL.get(0);
             }
-            if( !X11GLXGraphicsConfiguration.GLXFBConfigValid( display, fbcfgsL.get(0) ) ) {
+
+            // get all, glXChooseFBConfig(.. attribs==null ..) == glXGetFBConfig(..)
+            fbcfgsL = GLX.glXChooseFBConfigCopied(display, screen, null, 0, count, 0);
+            if (fbcfgsL == null || fbcfgsL.limit()<1) {
                 if(DEBUG) {
-                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed - GLX FBConfig invalid: ("+x11Screen+","+capabilities+"): "+fbcfgsL+", fbcfg: 0x"+Long.toHexString(fbcfgsL.get(0)));
+                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed glXGetFBConfig ("+x11Screen+"): "+fbcfgsL+", "+count[0]);
                 }
                 return null;
             }
-            recommendedIndex = 0; // 1st match is always recommended ..
+
+            // make GLCapabilities and seek the recommendedIndex
             caps = new GLCapabilities[fbcfgsL.limit()];
             for (int i = 0; i < fbcfgsL.limit(); i++) {
-                caps[i] = X11GLXGraphicsConfiguration.GLXFBConfig2GLCapabilities(glProfile, display, fbcfgsL.get(i), 
-                                                                                 false, onscreen, usePBuffer, isMultisampleAvailable);
+                if( !X11GLXGraphicsConfiguration.GLXFBConfigValid( display, fbcfgsL.get(i) ) ) {
+                    if(DEBUG) {
+                        System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: FBConfig invalid: ("+x11Screen+","+capabilities+"): fbcfg: "+toHexString(fbcfgsL.get(i)));
+                    }
+                } else {
+                    caps[i] = X11GLXGraphicsConfiguration.GLXFBConfig2GLCapabilities(glProfile, display, fbcfgsL.get(i), 
+                                                                                     false, onscreen, usePBuffer, isMultisampleAvailable);
+                    if(caps[i]!=null && recommendedFBConfig==fbcfgsL.get(i)) {
+                        recommendedIndex=i;
+                        if (DEBUG) {
+                            System.err.println("!!! glXChooseFBConfig recommended "+i+", "+caps[i]);
+                        }
+                    }
+                }
             }
 
             if(null==chooser) {
-                chosen = recommendedIndex;
-            } else {
+                chosen = recommendedIndex; // may still be -1 in case nothing was recommended (-1)
+            }
+
+            if (chosen < 0) {
+                if(null==chooser) {
+                    // nothing recommended .. so use our default implementation
+                    chooser = new DefaultGLCapabilitiesChooser();
+                }
                 try {
                   chosen = chooser.chooseCapabilities(capabilities, caps, recommendedIndex);
                 } catch (NativeWindowException e) {
@@ -231,9 +262,20 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
               if(DEBUG) {
                   System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig Failed .. unable to choose config, using first");
               }
-              chosen = 0; // default ..
+              // seek first available one ..
+              for(chosen = 0; chosen < caps.length && caps[chosen]==null; chosen++) ;
+              if(chosen==caps.length) {
+                // give up ..
+                if(DEBUG) {
+                  System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig Failed .. nothing available, bail out");
+                }
+                return null;
+              }
             } else if (chosen >= caps.length) {
-                throw new GLException("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ")");
+                if(DEBUG) {
+                  System.err.println("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ", got "+chosen+")");
+                }
+                return null;
             }
 
             retFBID = X11GLXGraphicsConfiguration.glXFBConfig2FBConfigID(display, fbcfgsL.get(chosen));
@@ -276,9 +318,10 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
 
         AbstractGraphicsDevice absDevice = x11Screen.getDevice();
         long display = absDevice.getHandle();
+
+        NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
+        X11Lib.XLockDisplay(display);
         try {
-            NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-            X11Lib.XLockDisplay(display);
             int screen = x11Screen.getIndex();
             boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
             int[] attribs = X11GLXGraphicsConfiguration.GLCapabilities2AttribList(capabilities, false, isMultisampleAvailable, display, screen);
@@ -290,7 +333,7 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
                 if (recommendedVis == null) {
                     System.err.println("null visual");
                 } else {
-                    System.err.println("visual id 0x" + Long.toHexString(recommendedVis.getVisualid()));
+                    System.err.println("visual id " + toHexString(recommendedVis.getVisualid()));
                 }
             }
             int[] count = new int[1];
@@ -326,7 +369,7 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
                 throw new GLException("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ")");
             }
             if (infos[chosen] == null) {
-                throw new GLException("GLCapabilitiesChooser chose an invalid visual");
+                throw new GLException("GLCapabilitiesChooser chose an invalid visual for "+caps[chosen]);
             }
             retXVisualInfo = XVisualInfo.create(infos[chosen]);
         } finally {
@@ -335,5 +378,14 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
         }
         return new X11GLXGraphicsConfiguration(x11Screen, caps[chosen], capabilities, chooser, retXVisualInfo, 0, -1);
     }
+
+    public static String toHexString(int val) {
+        return "0x"+Integer.toHexString(val);
+    }
+
+    public static String toHexString(long val) {
+        return "0x"+Long.toHexString(val);
+    }
+
 }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
index ea855d28d..41f012122 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
@@ -75,9 +75,9 @@ public class X11OffscreenGLXDrawable extends X11GLXDrawable {
     int screen = aScreen.getIndex();
 
     getFactoryImpl().lockToolkit();
+    X11Lib.XLockDisplay(dpy);
     try {
-      X11Lib.XLockDisplay(dpy);
-      pixmap = X11Lib.XCreatePixmap(dpy, (int) X11Lib.RootWindow(dpy, screen), 
+      pixmap = X11Lib.XCreatePixmap(dpy, X11Lib.RootWindow(dpy, screen), 
                                     component.getWidth(), component.getHeight(), bitsPerPixel);
       if (pixmap == 0) {
         throw new GLException("XCreatePixmap failed");
@@ -105,10 +105,10 @@ public class X11OffscreenGLXDrawable extends X11GLXDrawable {
 
     NativeWindow nw = getNativeWindow();
     long display = nw.getDisplayHandle();
-    try {
-      getFactoryImpl().lockToolkit();
-      X11Lib.XLockDisplay(display);
 
+    getFactoryImpl().lockToolkit();
+    X11Lib.XLockDisplay(display);
+    try {
       long drawable = nw.getSurfaceHandle();
       if (DEBUG) {
         System.err.println("Destroying pixmap " + toHexString(pixmap) +
@@ -135,11 +135,11 @@ public class X11OffscreenGLXDrawable extends X11GLXDrawable {
       X11Lib.XFreePixmap(display, pixmap);
       drawable = 0;
       pixmap = 0;
-      display = 0;
       ((SurfaceChangeable)nw).setSurfaceHandle(0);
     } finally {
       X11Lib.XUnlockDisplay(display);
       getFactoryImpl().unlockToolkit();
+      display = 0;
     }
   }
   protected void swapBuffersImpl() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
index 63b350bd3..dc6c60664 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
@@ -92,7 +92,7 @@ public class X11AWTGLXGraphicsConfigurationFactory extends GraphicsConfiguration
         try {
             long displayHandle = X11SunJDKReflection.graphicsDeviceGetDisplay(device);
             if(0==displayHandle) {
-                displayHandle = X11Util.getThreadLocalDefaultDisplay();
+                displayHandle = X11Util.createThreadLocalDefaultDisplay();
                 if(DEBUG) {
                     System.err.println("X11AWTGLXGraphicsConfigurationFactory: using a thread local X11 display");
                 }
diff --git a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
index 8603c7184..c5ded88f6 100644
--- a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
+++ b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
@@ -89,11 +89,17 @@ public class DefaultGLCapabilitiesChooser implements GLCapabilitiesChooser {
                                 int windowSystemRecommendedChoice) {
     GLCapabilities _desired = (GLCapabilities) desired;
     GLCapabilities[] _available = (GLCapabilities[]) available;
+    int availnum = 0;
+
+    for (int i = 0; i < _available.length; i++) {
+      if(null != _available[i]) { availnum++; }
+    }
 
     if (DEBUG) {
       System.err.println("Desired: " + _desired);
+      System.err.println("Available: Valid " + availnum + "/" + _available.length);
       for (int i = 0; i < _available.length; i++) {
-        System.err.println("Available " + i + ": " + _available[i]);
+        System.err.println(i + ": " + _available[i]);
       }
       System.err.println("Window system's recommended choice: " + windowSystemRecommendedChoice);
     }
@@ -132,6 +138,9 @@ public class DefaultGLCapabilitiesChooser implements GLCapabilitiesChooser {
       if (_desired.isOnscreen() != cur.isOnscreen()) {
         continue;
       }
+      if (_desired.isPBuffer() != cur.isPBuffer()) {
+        continue;
+      }
       if (_desired.getStereo() != cur.getStereo()) {
         continue;
       }
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index 71cb3cb3b..80c2c10e2 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -216,6 +216,7 @@ public abstract class GLDrawableFactory {
   /**
    * Returns true if it is possible to create a GLPbuffer. Some older
    * graphics cards do not have this capability.
+   * @param passing the device for the query, may be null
    */
   public abstract boolean canCreateGLPbuffer(AbstractGraphicsDevice device);
 
@@ -278,6 +279,7 @@ public abstract class GLDrawableFactory {
   /**
    * Returns true if it is possible to create an external GLDrawable
    * object via {@link #createExternalGLDrawable}.
+   * @param passing the device for the query, may be null
    */
   public abstract boolean canCreateExternalGLDrawable(AbstractGraphicsDevice device);
 
diff --git a/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
index fa15e3fef..5abf02b97 100755
--- a/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
@@ -40,6 +40,8 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.Test;
 
 import javax.media.opengl.*;
@@ -50,21 +52,29 @@ import com.jogamp.newt.opengl.*;
 
 public class TestDrawable01NEWT {
     static GLProfile glp;
+    static GLDrawableFactory factory;
     static int width, height;
     GLCapabilities caps;
     Window window;
     GLDrawable drawable;
     GLContext context;
-    GLDrawableFactory factory;
 
     @BeforeClass
     public static void initClass() {
         glp = GLProfile.getDefault();
         Assert.assertNotNull(glp);
+        factory = GLDrawableFactory.getFactory(glp);
+        Assert.assertNotNull(factory);
         width  = 640;
         height = 480;
     }
 
+    @AfterClass
+    public static void releaseClass() {
+        factory.shutdown();
+        factory=null;
+    }
+
     @Before
     public void initTest() {
         caps = new GLCapabilities(glp);
@@ -106,8 +116,6 @@ public class TestDrawable01NEWT {
         Assert.assertTrue(glCaps.getDoubleBuffered()==!onscreen);
         Assert.assertTrue(glCaps.getDepthBits()>4);
 
-        factory = GLDrawableFactory.getFactory(glCaps.getGLProfile());
-        Assert.assertNotNull(factory);
         drawable = factory.createGLDrawable(window);
         Assert.assertNotNull(drawable);
         // System.out.println("Pre: "+drawable);
@@ -149,10 +157,6 @@ public class TestDrawable01NEWT {
         drawable = null;
         context = null;
         window = null;
-
-        // test code cont ..
-        factory.shutdown();
-        factory = null;
     }
 
     @Test
@@ -174,7 +178,22 @@ public class TestDrawable01NEWT {
     }
 
     public static void main(String args[]) {
-        org.junit.runner.JUnitCore.main(TestDrawable01NEWT.class.getName());
+        String tstname = TestDrawable01NEWT.class.getName();
+        try {
+        org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(new String[] {
+            tstname,
+            "filtertrace=true",
+            "haltOnError=false",
+            "haltOnFailure=false",
+            "showoutput=true",
+            "outputtoformatters=true",
+            "logfailedtests=true",
+            "logtestlistenerevents=true",
+            "formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter",
+            "formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,TEST-"+tstname+".xml" } );
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
 }
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
index 436167dbf..e5e7c4a52 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
@@ -40,6 +40,8 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.Test;
 
 import javax.media.opengl.*;
@@ -52,22 +54,194 @@ import com.jogamp.test.junit.jogl.demos.gl2.gears.Gears;
 import com.jogamp.test.junit.jogl.demos.es1.RedSquare;
 
 public class TestOffscreen01NEWT {
-    int width, height;
-    GLProfile glp;
+    static GLProfile glp;
+    static GLDrawableFactory factory;
+    static int width, height;
     GLCapabilities caps;
 
-    @Before
-    public void init() {
+    @BeforeClass
+    public static void initClass() {
         glp = GLProfile.getDefault();
+        Assert.assertNotNull(glp);
+        factory = GLDrawableFactory.getFactory(glp);
+        Assert.assertNotNull(factory);
         width  = 640;
         height = 480;
+    }
+
+    @AfterClass
+    public static void releaseClass() {
+        factory.shutdown();
+        factory=null;
+    }
+
+    @Before
+    public void init() {
         caps = new GLCapabilities(glp);
     }
 
+    private void do01OffscreenWindowPBuffer(GLCapabilities caps) {
+        Display display = NewtFactory.createDisplay(null); // local display
+        Assert.assertNotNull(display);
+        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+        Assert.assertNotNull(screen);
+        Window window = NewtFactory.createWindow(screen, caps, false /* undecorated */);
+        Assert.assertNotNull(window);
+        window.setSize(width, height);
+        GLWindow glWindow = GLWindow.create(window);
+        Assert.assertNotNull(glWindow);
+        glWindow.setVisible(true);
+        GLEventListener demo = new RedSquare();
+        WindowUtilNEWT.setDemoFields(demo, window, glWindow, false);
+
+        while ( glWindow.getTotalFrames() < 2) {
+            glWindow.display();
+        }
+
+        if(null!=glWindow) {
+            glWindow.destroy();
+        }
+        if(null!=window) {
+            window.destroy();
+        }
+        if(null!=screen) {
+            screen.destroy();
+        }
+        if(null!=display) {
+            display.destroy();
+        }
+    }
+
+    @Test
+    public void test01aOffscreenWindowPBuffer() {
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        do01OffscreenWindowPBuffer(caps2);
+    }
+
+    @Test
+    public void test01bOffscreenWindowPBufferStencil() {
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        caps2.setStencilBits(8);
+        do01OffscreenWindowPBuffer(caps2);
+    }
+
     @Test
-    public void test01OffscreenWindow() {
+    public void test01cOffscreenWindowPBufferStencilAlpha() {
         GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        caps2.setStencilBits(8);
+        caps2.setAlphaBits(8);
+        do01OffscreenWindowPBuffer(caps2);
+    }
+
+    @Test
+    public void test01cOffscreenWindowPBuffer555() {
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        caps2.setRedBits(5);
+        caps2.setGreenBits(5);
+        caps2.setBlueBits(5);
+        do01OffscreenWindowPBuffer(caps2);
+    }
+
+    @Test
+    public void test02Offscreen3Windows1DisplayPBuffer() {
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        int winnum = 3, i;
+        Window windows[] = new Window[winnum];
+        GLWindow glWindows[] = new GLWindow[winnum];
+        GLEventListener demos[] = new GLEventListener[winnum];
 
+        Display display = NewtFactory.createDisplay(null); // local display
+        Assert.assertNotNull(display);
+        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+        Assert.assertNotNull(screen);
+
+        for(i=0; i<winnum; i++) {
+            System.out.println("Create Window "+i);
+            windows[i] = NewtFactory.createWindow(screen, caps2, false /* undecorated */);
+            Assert.assertNotNull(windows[i]);
+            windows[i].setSize(width, height);
+            glWindows[i] = GLWindow.create(windows[i]);
+            Assert.assertNotNull(glWindows[i]);
+            glWindows[i].setVisible(true);
+            demos[i] = new RedSquare();
+            WindowUtilNEWT.setDemoFields(demos[i], windows[i], glWindows[i], false);
+        }
+
+        while ( glWindows[0].getTotalFrames() < 2) {
+            for(i=0; i<winnum; i++) {
+                glWindows[i].display();
+            }
+        }
+
+        for(i=0; i<winnum; i++) {
+            if(null!=glWindows[i]) {
+                glWindows[i].destroy();
+            }
+            if(null!=windows[i]) {
+                windows[i].destroy();
+            }
+        }
+        if(null!=screen) {
+            screen.destroy();
+        }
+        if(null!=display) {
+            display.destroy();
+        }
+    }
+
+    @Test
+    public void test03Offscreen3Windows3DisplaysPBuffer() {
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        int winnum = 3, i;
+        Display displays[] = new Display[winnum];
+        Screen screens[] = new Screen[winnum];
+        Window windows[] = new Window[winnum];
+        GLWindow glWindows[] = new GLWindow[winnum];
+        GLEventListener demos[] = new GLEventListener[winnum];
+
+        for(i=0; i<winnum; i++) {
+            System.out.println("Create Window "+i);
+            displays[i] = NewtFactory.createDisplay(null); // local display
+            Assert.assertNotNull(displays[i]);
+            screens[i]  = NewtFactory.createScreen(displays[i], 0); // screen 0
+            Assert.assertNotNull(screens[i]);
+            windows[i] = NewtFactory.createWindow(screens[i], caps2, false /* undecorated */);
+            Assert.assertNotNull(windows[i]);
+            windows[i].setSize(width, height);
+            glWindows[i] = GLWindow.create(windows[i]);
+            Assert.assertNotNull(glWindows[i]);
+            glWindows[i].setVisible(true);
+            demos[i] = new RedSquare();
+            WindowUtilNEWT.setDemoFields(demos[i], windows[i], glWindows[i], false);
+        }
+
+        while ( glWindows[0].getTotalFrames() < 2) {
+            for(i=0; i<winnum; i++) {
+                glWindows[i].display();
+            }
+        }
+
+        for(i=0; i<winnum; i++) {
+            if(null!=glWindows[i]) {
+                glWindows[i].destroy();
+            }
+            if(null!=windows[i]) {
+                windows[i].destroy();
+            }
+            if(null!=screens[i]) {
+                screens[i].destroy();
+            }
+            if(null!=displays[i]) {
+                displays[i].destroy();
+            }
+        }
+    }
+
+    @Test
+    public void test04OffscreenSnapshotWithDemoPBuffer() {
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+
+        System.out.println("Create Window 1");
         Display display = NewtFactory.createDisplay(null); // local display
         Assert.assertNotNull(display);
         Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
@@ -75,25 +249,28 @@ public class TestOffscreen01NEWT {
         Window window = NewtFactory.createWindow(screen, caps2, false /* undecorated */);
         Assert.assertNotNull(window);
         window.setSize(width, height);
-        GLWindow windowOffScreen = GLWindow.create(window);
-        Assert.assertNotNull(windowOffScreen);
-        windowOffScreen.setVisible(true);
+        GLWindow glWindow = GLWindow.create(window);
+        Assert.assertNotNull(glWindow);
+        glWindow.setVisible(true);
 
         GLWindow windowOnScreen = null;
         WindowListener wl=null;
         MouseListener ml=null;
         SurfaceUpdatedListener ul=null;
 
-        WindowUtilNEWT.run(windowOffScreen, null, windowOnScreen, wl, ml, ul, 2, false /*snapshot*/, false /*debug*/);
-        try {
-            Thread.sleep(1000); // 1000 ms
-        } catch (Exception e) {}
+        GLEventListener demo = new RedSquare();
+        Assert.assertNotNull(demo);
+
+        WindowUtilNEWT.run(glWindow, demo, windowOnScreen, wl, ml, ul, 2, true /*snapshot*/, false /*debug*/);
 
         if(null!=windowOnScreen) {
             windowOnScreen.destroy();
         }
-        if(null!=windowOffScreen) {
-            windowOffScreen.destroy();
+        if(null!=glWindow) {
+            glWindow.destroy();
+        }
+        if(null!=window) {
+            window.destroy();
         }
         if(null!=screen) {
             screen.destroy();
@@ -104,8 +281,8 @@ public class TestOffscreen01NEWT {
     }
 
     @Test
-    public void test02OffscreenSnapshotWithDemo() {
-        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+    public void test11OffscreenWindowPixmap() {
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, false, false);
 
         Display display = NewtFactory.createDisplay(null); // local display
         Assert.assertNotNull(display);
@@ -114,9 +291,45 @@ public class TestOffscreen01NEWT {
         Window window = NewtFactory.createWindow(screen, caps2, false /* undecorated */);
         Assert.assertNotNull(window);
         window.setSize(width, height);
-        GLWindow windowOffScreen = GLWindow.create(window);
-        Assert.assertNotNull(windowOffScreen);
-        windowOffScreen.setVisible(true);
+        GLWindow glWindow = GLWindow.create(window);
+        Assert.assertNotNull(glWindow);
+        glWindow.setVisible(true);
+        GLEventListener demo = new RedSquare();
+        WindowUtilNEWT.setDemoFields(demo, window, glWindow, false);
+
+        while ( glWindow.getTotalFrames() < 2) {
+            glWindow.display();
+        }
+
+        if(null!=glWindow) {
+            glWindow.destroy();
+        }
+        if(null!=window) {
+            window.destroy();
+        }
+        if(null!=screen) {
+            screen.destroy();
+        }
+        if(null!=display) {
+            display.destroy();
+        }
+    }
+
+    @Test
+    public void test14OffscreenSnapshotWithDemoPixmap() {
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, false, false);
+
+        System.out.println("Create Window 1");
+        Display display = NewtFactory.createDisplay(null); // local display
+        Assert.assertNotNull(display);
+        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+        Assert.assertNotNull(screen);
+        Window window = NewtFactory.createWindow(screen, caps2, false /* undecorated */);
+        Assert.assertNotNull(window);
+        window.setSize(width, height);
+        GLWindow glWindow = GLWindow.create(window);
+        Assert.assertNotNull(glWindow);
+        glWindow.setVisible(true);
 
         GLWindow windowOnScreen = null;
         WindowListener wl=null;
@@ -126,16 +339,16 @@ public class TestOffscreen01NEWT {
         GLEventListener demo = new RedSquare();
         Assert.assertNotNull(demo);
 
-        WindowUtilNEWT.run(windowOffScreen, demo, windowOnScreen, wl, ml, ul, 2, true /*snapshot*/, false /*debug*/);
-        try {
-            Thread.sleep(1000); // 1000 ms
-        } catch (Exception e) {}
+        WindowUtilNEWT.run(glWindow, demo, windowOnScreen, wl, ml, ul, 2, true /*snapshot*/, false /*debug*/);
 
         if(null!=windowOnScreen) {
             windowOnScreen.destroy();
         }
-        if(null!=windowOffScreen) {
-            windowOffScreen.destroy();
+        if(null!=glWindow) {
+            glWindow.destroy();
+        }
+        if(null!=window) {
+            window.destroy();
         }
         if(null!=screen) {
             screen.destroy();
@@ -144,7 +357,6 @@ public class TestOffscreen01NEWT {
             display.destroy();
         }
     }
-
     public static void main(String args[]) {
         String tstname = TestOffscreen01NEWT.class.getName();
         try {
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
index f6a6dc4be..7afa7b1e5 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
@@ -52,22 +52,27 @@ public class WindowUtilNEWT {
         return caps2;
     }
 
+    public static void setDemoFields(GLEventListener demo, Window window, GLWindow glWindow, boolean debug) {
+        Assert.assertNotNull(demo);
+        Assert.assertNotNull(window);
+        if(debug) {
+            MiscUtils.setField(demo, "glDebug", new Boolean(true));
+            MiscUtils.setField(demo, "glTrace", new Boolean(true));
+        }
+        if(!MiscUtils.setField(demo, "window", window)) {
+            MiscUtils.setField(demo, "glWindow", glWindow);
+        }
+    }
+
     public static void run(GLWindow windowOffScreen, GLEventListener demo, 
                            GLWindow windowOnScreen, WindowListener wl, MouseListener ml, 
                            SurfaceUpdatedListener ul, int frames, boolean snapshot, boolean debug) {
         try {
             Assert.assertNotNull(windowOffScreen);
+            Assert.assertNotNull(demo);
 
-            if(debug && null!=demo) {
-                MiscUtils.setField(demo, "glDebug", new Boolean(true));
-                MiscUtils.setField(demo, "glTrace", new Boolean(true));
-            }
-            if(null!=demo) {
-                if(!MiscUtils.setField(demo, "window", windowOffScreen)) {
-                    MiscUtils.setField(demo, "glWindow", windowOffScreen);
-                }
-                windowOffScreen.addGLEventListener(demo);
-            }
+            setDemoFields(demo, windowOffScreen, windowOffScreen, debug);
+            windowOffScreen.addGLEventListener(demo);
 
             if ( null != windowOnScreen ) {
                 if(null!=wl) {
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java
index 95fd6c72b..41ffccc42 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java
@@ -34,6 +34,9 @@ package com.jogamp.nativewindow.impl.x11;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Collection;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 import javax.media.nativewindow.*;
 
@@ -41,7 +44,7 @@ import com.jogamp.nativewindow.impl.*;
 
 /**
  * Contains a thread safe X11 utility to retrieve thread local display connection,<br>
- * as well as the static global discplay connection.<br>
+ * as well as the static global display connection.<br>
  *
  * The TLS variant is thread safe per se, but be aware of the memory leak risk 
  * where an application heavily utilizing this class on temporary new threads.<br>
@@ -51,27 +54,98 @@ public class X11Util {
 
     static {
         NativeLibLoaderBase.loadNativeWindow("x11");
+        installIOErrorHandler();
     }
 
     private X11Util() {}
 
     private static ThreadLocal currentDisplayMap = new ThreadLocal();
 
+    // not exactly thread safe, but good enough for our purpose,
+    // which is to tag a NamedDisplay uncloseable after creation.
+    private static Object globalLock = new Object(); 
+    private static Collection globalNamedDisplayActive = new ArrayList(); 
+    private static Collection globalNamedDisplayPassive = new ArrayList(); 
+
+    public static final String nullDeviceName = "nil" ;
+
     public static class NamedDisplay implements Cloneable {
-        private String name;
-        private long   handle;
+        String name;
+        long   handle;
+        int    refCount;
+        boolean unCloseable;
 
         protected NamedDisplay(String name, long handle) {
             this.name=name;
             this.handle=handle;
+            this.refCount=1;
+            this.unCloseable=false;
         }
 
-        public String getName() { return name; }
-        public long   getHandle() { return handle; }
+        public final String getName() { return name; }
+        public final String getNameSafe() { return null == name ? nullDeviceName : name; }
+        public final long   getHandle() { return handle; }
+        public final int    getRefCount() { return refCount; }
+        public final boolean isUncloseable() { return unCloseable; }
 
         public Object clone() throws CloneNotSupportedException {
           return super.clone();
         }
+
+        public String toString() {
+            return "NamedX11Display["+name+", 0x"+Long.toHexString(handle)+", refCount "+refCount+", unCloseable "+unCloseable+"]";
+        }
+    }
+
+    /** Returns the number of unclosed X11 Displays.
+      * @param realXClosePendingDisplays if true, call XCloseDisplay on the remaining ones
+      */
+    public static int shutdown(boolean realXClosePendingDisplays, boolean verbose) {
+        int num=0;
+        String msg;
+        if(DEBUG||verbose) {
+            msg = "X11Util.Display: Shutdown (active: "+globalNamedDisplayActive.size()+
+                                           ", passive: "+globalNamedDisplayPassive.size() + ")";
+            if(DEBUG) {
+                Exception e = new Exception(msg);
+                e.printStackTrace();
+            } else if(verbose) {
+                System.err.println(msg);
+            }
+        }
+
+        msg = realXClosePendingDisplays ? "Close" : "Keep" ;
+
+        synchronized(globalLock) {
+            // for all passive displays ..
+            Collection namedDisplays = globalNamedDisplayPassive;
+            globalNamedDisplayPassive = new ArrayList(); 
+            for(Iterator iter=namedDisplays.iterator(); iter.hasNext(); ) {
+                NamedDisplay ndpy = (NamedDisplay)iter.next();
+                if(DEBUG||verbose) {
+                    System.err.println(msg+" passive: "+ndpy);
+                }
+                if(realXClosePendingDisplays) {
+                    X11Lib.XCloseDisplay(ndpy.getHandle());
+                }
+                num++;
+            }
+
+            // for all active displays ..
+            namedDisplays = globalNamedDisplayActive;
+            globalNamedDisplayActive = new ArrayList(); 
+            for(Iterator iter=namedDisplays.iterator(); iter.hasNext(); ) {
+                NamedDisplay ndpy = (NamedDisplay)iter.next();
+                if(DEBUG||verbose) {
+                    System.err.println(msg+" active: "+ndpy);
+                }
+                if(realXClosePendingDisplays) {
+                    X11Lib.XCloseDisplay(ndpy.getHandle());
+                }
+                num++;
+            }
+        }
+        return num;
     }
 
     /** Returns a clone of the thread local display map, you may {@link Object#wait()} on it */
@@ -79,48 +153,120 @@ public class X11Util {
         return (Map) ((HashMap)getCurrentDisplayMapImpl()).clone();
     }
 
-    /** Returns this thread current default display.  If it doesn not exist, it is being created */
-    public static long getThreadLocalDefaultDisplay() {
-        return getThreadLocalDisplay(null);
+    /** Returns this thread current default display.  If it doesn not exist, it is being created, otherwise the reference count is increased */
+    public static long createThreadLocalDefaultDisplay() {
+        return createThreadLocalDisplay(null);
     }
 
-    /** Returns this thread named display. If it doesn not exist, it is being created */
-    public static long getThreadLocalDisplay(String name) {
+    /** Returns this thread named display. If it doesn not exist, it is being created, otherwise the reference count is increased */
+    public static long createThreadLocalDisplay(String name) {
         NamedDisplay namedDpy = getCurrentDisplay(name);
+        if(null==namedDpy) {
+            synchronized(globalLock) {
+                namedDpy = getNamedDisplay(globalNamedDisplayPassive, name);
+                if(null != namedDpy) {
+                    if(!globalNamedDisplayPassive.remove(namedDpy)) { throw new RuntimeException("Internal: "+namedDpy); }
+                    globalNamedDisplayActive.add(namedDpy);
+                    addCurrentDisplay( namedDpy );
+                }
+            }
+        }
         if(null==namedDpy) {
             long dpy = X11Lib.XOpenDisplay(name);
             if(0==dpy) {
                 throw new NativeWindowException("X11Util.Display: Unable to create a display("+name+") connection in Thread "+Thread.currentThread().getName());
             }
             namedDpy = new NamedDisplay(name, dpy);
-            setCurrentDisplay( namedDpy );
+            synchronized(globalLock) {
+                globalNamedDisplayActive.add(namedDpy);
+                addCurrentDisplay( namedDpy );
+            }
             if(DEBUG) {
-                Exception e = new Exception("X11Util.Display: Created new TLS display("+name+") connection 0x"+Long.toHexString(dpy)+" in thread "+Thread.currentThread().getName());
+                Exception e = new Exception("X11Util.Display: Created new TLS "+namedDpy+" in thread "+Thread.currentThread().getName());
+                e.printStackTrace();
+            }
+        } else {
+            namedDpy.refCount++;
+            if(DEBUG) {
+                Exception e = new Exception("X11Util.Display: Reused TLS "+namedDpy+" in thread "+Thread.currentThread().getName());
                 e.printStackTrace();
             }
         }
         return namedDpy.getHandle();
     }
 
-    /** Closes this thread named display. It returns the handle of the closed display or 0, if it does not exist. */
+    /** Decrease the reference count of this thread named display. If it reaches 0, close it. 
+        It returns the handle of the to be closed display.
+        It throws a RuntimeException in case the named display does not exist, 
+        or the reference count goes below 0.
+     */
     public static long closeThreadLocalDisplay(String name) {
-        NamedDisplay namedDpy = removeCurrentDisplay(name);
+        NamedDisplay namedDpy = getCurrentDisplay(name);
         if(null==namedDpy) {
+            throw new RuntimeException("X11Util.Display: Display("+name+") with given handle is not mapped to TLS in thread "+Thread.currentThread().getName());
+        }
+        if(0==namedDpy.refCount) {
+            throw new RuntimeException("X11Util.Display: "+namedDpy+" has refCount already 0 in thread "+Thread.currentThread().getName());
+        }
+        long dpy = namedDpy.getHandle();
+        namedDpy.refCount--;
+        if(0==namedDpy.refCount) {
+            synchronized(globalLock) {
+                if(!globalNamedDisplayActive.remove(namedDpy)) { throw new RuntimeException("Internal: "+namedDpy); }
+                if(namedDpy.isUncloseable()) {
+                    globalNamedDisplayPassive.add(namedDpy);
+                } else {
+                    X11Lib.XCloseDisplay(dpy);
+                }
+                removeCurrentDisplay(namedDpy);
+            }
             if(DEBUG) {
-                Exception e = new Exception("X11Util.Display: Display("+name+") with given handle is not mapped to TLS in thread "+Thread.currentThread().getName());
+                String type = namedDpy.isUncloseable() ? "passive" : "real" ;
+                Exception e = new Exception("X11Util.Display: Closing ( "+type+" ) TLS "+namedDpy+" in thread "+Thread.currentThread().getName());
                 e.printStackTrace();
             }
-            return 0;
-        }
-        long dpy = namedDpy.getHandle();
-        if(DEBUG) {
-            Exception e = new Exception("X11Util.Display: Closing TLS Display("+name+") with handle 0x"+Long.toHexString(dpy)+" in thread "+Thread.currentThread().getName());
+        } else if(DEBUG) {
+            Exception e = new Exception("X11Util.Display: Keep TLS "+namedDpy+" in thread "+Thread.currentThread().getName());
             e.printStackTrace();
         }
-        X11Lib.XCloseDisplay(dpy);
         return dpy;
     }
 
+    public static String getThreadLocalDisplayName(long handle) {
+        NamedDisplay ndpy = getNamedDisplay(getCurrentDisplayMapImpl().values(), handle);
+        return null != ndpy ? ndpy.getName() : null;
+    }
+
+    public static boolean markThreadLocalDisplayUndeletable(long handle) {
+        NamedDisplay ndpy = getNamedDisplay(getCurrentDisplayMapImpl().values(), handle);
+        if( null != ndpy ) {
+            ndpy.unCloseable=true;
+            return true;
+        }
+        return false;
+    }
+
+    public static String getGlobalDisplayName(long handle, boolean active) {
+        String name;
+        synchronized(globalLock) {
+            NamedDisplay ndpy = getNamedDisplay(active ? globalNamedDisplayActive : globalNamedDisplayPassive, handle);
+            name = null != ndpy ? ndpy.getName() : null;
+        }
+        return name;
+    }
+
+    public static boolean markGlobalDisplayUndeletable(long handle) {
+        boolean r=false;
+        synchronized(globalLock) {
+            NamedDisplay ndpy = getNamedDisplay(globalNamedDisplayActive, handle);
+            if( null != ndpy ) {
+                ndpy.unCloseable=true;
+                r=true;
+            }
+        }
+        return r;
+    }
+
     private static Map getCurrentDisplayMapImpl() {
         Map displayMap = (Map) currentDisplayMap.get();
         if(null==displayMap) {
@@ -132,12 +278,11 @@ public class X11Util {
 
     /** maps the given display to the thread local display map
       * and notifies all threads synchronized to this display map. */
-    private static NamedDisplay setCurrentDisplay(NamedDisplay newDisplay) {
+    private static NamedDisplay addCurrentDisplay(NamedDisplay newDisplay) {
         Map displayMap = getCurrentDisplayMapImpl();
         NamedDisplay oldDisplay = null;
         synchronized(displayMap) {
-            String name = (null==newDisplay.getName())?"nil":newDisplay.getName();
-            oldDisplay = (NamedDisplay) displayMap.put(name, newDisplay);
+            oldDisplay = (NamedDisplay) displayMap.put(newDisplay.getNameSafe(), newDisplay);
             displayMap.notifyAll();
         }
         return oldDisplay;
@@ -145,22 +290,45 @@ public class X11Util {
 
     /** removes the mapping of the given name from the thread local display map
       * and notifies all threads synchronized to this display map. */
-    private static NamedDisplay removeCurrentDisplay(String name) {
+    private static NamedDisplay removeCurrentDisplay(NamedDisplay ndpy) {
         Map displayMap = getCurrentDisplayMapImpl();
-        NamedDisplay oldDisplay = null;
         synchronized(displayMap) {
-            if(null==name) name="nil";
-            oldDisplay = (NamedDisplay) displayMap.remove(name);
+            NamedDisplay ndpyDel = (NamedDisplay) displayMap.remove(ndpy.getNameSafe());
+            if(ndpyDel!=ndpy) {
+                throw new RuntimeException("Wrong mapping req: "+ndpy+", got "+ndpyDel);
+            }
             displayMap.notifyAll();
         }
-        return oldDisplay;
+        return ndpy;
     }
 
     /** Returns the thread local display mapped to the given name */
     private static NamedDisplay getCurrentDisplay(String name) {
-        if(null==name) name="nil";
+        if(null==name) name=nullDeviceName;
         Map displayMap = getCurrentDisplayMapImpl();
         return (NamedDisplay) displayMap.get(name);
     }
 
+    private static NamedDisplay getNamedDisplay(Collection namedDisplays, String name) {
+        if(null==name) name=nullDeviceName;
+        for(Iterator iter=namedDisplays.iterator(); iter.hasNext(); ) {
+            NamedDisplay ndpy = (NamedDisplay)iter.next();
+            if (ndpy.getNameSafe().equals(name)) {
+                return ndpy;
+            }
+        }
+        return null;
+    }
+
+    private static NamedDisplay getNamedDisplay(Collection namedDisplays, long handle) {
+        for(Iterator iter=namedDisplays.iterator(); iter.hasNext(); ) {
+            NamedDisplay ndpy = (NamedDisplay)iter.next();
+            if (ndpy.getHandle()==handle) {
+                return ndpy;
+            }
+        }
+        return null;
+    }
+
+    private static native void installIOErrorHandler();
 }
diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java
index 52f48660a..69ace3c52 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java
@@ -57,7 +57,7 @@ public class X11GraphicsScreen extends DefaultGraphicsScreen implements Cloneabl
     /** Creates a new X11GraphicsScreen using a thread local display connection */
     public static AbstractGraphicsScreen createDefault() {
         NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-        long display = X11Util.getThreadLocalDefaultDisplay();
+        long display = X11Util.createThreadLocalDefaultDisplay();
         try {
             X11Lib.XLockDisplay(display);
             int scrnIdx = X11Lib.DefaultScreen(display);
diff --git a/src/nativewindow/native/x11/Xmisc.c b/src/nativewindow/native/x11/Xmisc.c
new file mode 100644
index 000000000..4320a8f12
--- /dev/null
+++ b/src/nativewindow/native/x11/Xmisc.c
@@ -0,0 +1,471 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+/* Linux headers don't work properly */
+#define __USE_GNU
+#include <dlfcn.h>
+#undef __USE_GNU
+
+/* Current versions of Solaris don't expose the XF86 extensions,
+   although with the recent transition to Xorg this will probably
+   happen in an upcoming release */
+#if !defined(__sun) && !defined(_HPUX)
+#include <X11/extensions/xf86vmode.h>
+#else
+/* Need to provide stubs for these */
+Bool XF86VidModeGetGammaRampSize(
+    Display *display,
+    int screen,
+    int* size)
+{
+  return False;
+}
+
+Bool XF86VidModeGetGammaRamp(
+    Display *display,
+    int screen,
+    int size,
+    unsigned short *red_array,
+    unsigned short *green_array,
+    unsigned short *blue_array) {
+  return False;
+}
+Bool XF86VidModeSetGammaRamp(
+    Display *display,
+    int screen,
+    int size,
+    unsigned short *red_array,
+    unsigned short *green_array,
+    unsigned short *blue_array) {
+  return False;
+}
+#endif /* defined(__sun) || defined(_HPUX) */
+
+/* HP-UX doesn't define RTLD_DEFAULT. */
+#if defined(_HPUX) && !defined(RTLD_DEFAULT)
+#define RTLD_DEFAULT NULL
+#endif
+
+#include "com_jogamp_nativewindow_impl_x11_X11Lib.h"
+
+// #define VERBOSE_ON 1
+
+#ifdef VERBOSE_ON
+    // Workaround for ancient compiler on Solaris/SPARC
+    // #define DBG_PRINT(args...) fprintf(stderr, args);
+    #define DBG_PRINT0(str) fprintf(stderr, str);
+    #define DBG_PRINT1(str, arg1) fprintf(stderr, str, arg1);
+    #define DBG_PRINT2(str, arg1, arg2) fprintf(stderr, str, arg1, arg2);
+    #define DBG_PRINT3(str, arg1, arg2, arg3) fprintf(stderr, str, arg1, arg2, arg3);
+    #define DBG_PRINT4(str, arg1, arg2, arg3, arg4) fprintf(stderr, str, arg1, arg2, arg3, arg4);
+    #define DBG_PRINT5(str, arg1, arg2, arg3, arg4, arg5) fprintf(stderr, str, arg1, arg2, arg3, arg4, arg5);
+    #define DBG_PRINT6(str, arg1, arg2, arg3, arg4, arg5, arg6) fprintf(stderr, str, arg1, arg2, arg3, arg4, arg5, arg6);
+    #define DBG_PRINT7(str, arg1, arg2, arg3, arg4, arg5, arg6, arg7) fprintf(stderr, str, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    #define DBG_PRINT8(str, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) fprintf(stderr, str, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+
+#else
+
+    // Workaround for ancient compiler on Solaris/SPARC
+    // #define DBG_PRINT(args...)
+    #define DBG_PRINT0(str)
+    #define DBG_PRINT1(str, arg1)
+    #define DBG_PRINT2(str, arg1, arg2)
+    #define DBG_PRINT3(str, arg1, arg2, arg3)
+    #define DBG_PRINT4(str, arg1, arg2, arg3, arg4)
+    #define DBG_PRINT5(str, arg1, arg2, arg3, arg4, arg5)
+    #define DBG_PRINT6(str, arg1, arg2, arg3, arg4, arg5, arg6)
+    #define DBG_PRINT7(str, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
+    #define DBG_PRINT8(str, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8)
+
+#endif
+
+/* Need to pull this in as we don't have a stub header for it */
+extern Bool XineramaEnabled(Display* display);
+
+static void _FatalError(JNIEnv *env, const char* msg, ...)
+{
+    char buffer[512];
+    va_list ap;
+
+    va_start(ap, msg);
+    vsnprintf(buffer, sizeof(buffer), msg, ap);
+    va_end(ap);
+
+    fprintf(stderr, buffer);
+    (*env)->FatalError(env, buffer);
+}
+
+static const char * const ClazzNameInternalBufferUtil = "com/jogamp/nativewindow/impl/InternalBufferUtil";
+static const char * const ClazzNameInternalBufferUtilStaticCstrName = "copyByteBuffer";
+static const char * const ClazzNameInternalBufferUtilStaticCstrSignature = "(Ljava/nio/ByteBuffer;)Ljava/nio/ByteBuffer;";
+static const char * const ClazzNameByteBuffer = "java/nio/ByteBuffer";
+static const char * const ClazzNameRuntimeException = "java/lang/RuntimeException";
+static jclass clazzInternalBufferUtil = NULL;
+static jmethodID cstrInternalBufferUtil = NULL;
+static jclass clazzByteBuffer = NULL;
+static jclass clazzRuntimeException=NULL;
+
+static void _initClazzAccess(JNIEnv *env) {
+    jclass c;
+
+    if(NULL!=clazzRuntimeException) return ;
+
+    c = (*env)->FindClass(env, ClazzNameRuntimeException);
+    if(NULL==c) {
+        _FatalError(env, "Nativewindow X11Lib: can't find %s", ClazzNameRuntimeException);
+    }
+    clazzRuntimeException = (jclass)(*env)->NewGlobalRef(env, c);
+    (*env)->DeleteLocalRef(env, c);
+    if(NULL==clazzRuntimeException) {
+        _FatalError(env, "FatalError: NEWT X11Window: can't use %s", ClazzNameRuntimeException);
+    }
+
+    c = (*env)->FindClass(env, ClazzNameInternalBufferUtil);
+    if(NULL==c) {
+        _FatalError(env, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't find %s", ClazzNameInternalBufferUtil);
+    }
+    clazzInternalBufferUtil = (jclass)(*env)->NewGlobalRef(env, c);
+    (*env)->DeleteLocalRef(env, c);
+    if(NULL==clazzInternalBufferUtil) {
+        _FatalError(env, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't use %s", ClazzNameInternalBufferUtil);
+    }
+    c = (*env)->FindClass(env, ClazzNameByteBuffer);
+    if(NULL==c) {
+        _FatalError(env, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't find %s", ClazzNameByteBuffer);
+    }
+    clazzByteBuffer = (jclass)(*env)->NewGlobalRef(env, c);
+    (*env)->DeleteLocalRef(env, c);
+    if(NULL==c) {
+        _FatalError(env, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't use %s", ClazzNameByteBuffer);
+    }
+
+    cstrInternalBufferUtil = (*env)->GetStaticMethodID(env, clazzInternalBufferUtil, 
+                            ClazzNameInternalBufferUtilStaticCstrName, ClazzNameInternalBufferUtilStaticCstrSignature);
+    if(NULL==cstrInternalBufferUtil) {
+        _FatalError(env, "FatalError: Java_com_jogamp_nativewindow_impl_x11_X11Lib:: can't create %s.%s %s",
+            ClazzNameInternalBufferUtil, ClazzNameInternalBufferUtilStaticCstrName, ClazzNameInternalBufferUtilStaticCstrSignature);
+    }
+}
+
+static void _throwNewRuntimeException(Display * unlockDisplay, JNIEnv *env, const char* msg, ...)
+{
+    char buffer[512];
+    va_list ap;
+
+    if(NULL!=unlockDisplay) {
+        XUnlockDisplay(unlockDisplay);
+    }
+
+    _initClazzAccess(env);
+
+    va_start(ap, msg);
+    vsnprintf(buffer, sizeof(buffer), msg, ap);
+    va_end(ap);
+
+    (*env)->ThrowNew(env, clazzRuntimeException, buffer);
+}
+
+static XIOErrorHandler origIOErrorHandler = NULL;
+static JNIEnv * displayIOErrorHandlerJNIEnv = NULL;
+
+static int displayIOErrorHandler(Display *dpy)
+{
+    _FatalError(displayIOErrorHandlerJNIEnv, "Nativewindow X11 IOError: Display %p not available", dpy);
+    origIOErrorHandler(dpy);
+    return 0;
+}
+
+static void displayIOErrorHandlerEnable(int onoff, JNIEnv * env) {
+    if(onoff) {
+        if(NULL==origIOErrorHandler) {
+            displayIOErrorHandlerJNIEnv = env;
+            origIOErrorHandler = XSetIOErrorHandler(displayIOErrorHandler);
+        }
+    } else {
+        XSetIOErrorHandler(origIOErrorHandler);
+        origIOErrorHandler = NULL;
+        displayIOErrorHandlerJNIEnv = NULL;
+    }
+}
+
+JNIEXPORT void JNICALL 
+Java_com_jogamp_nativewindow_impl_x11_X11Util_installIOErrorHandler(JNIEnv *env, jclass _unused) {
+    displayIOErrorHandlerEnable(1, env);
+}
+
+JNIEXPORT jlong JNICALL 
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_dlopen(JNIEnv *env, jclass _unused, jstring name) {
+  const jbyte* chars;
+  void* res;
+  chars = (*env)->GetStringUTFChars(env, name, NULL);
+  res = dlopen(chars, RTLD_LAZY | RTLD_GLOBAL);
+  (*env)->ReleaseStringUTFChars(env, name, chars);
+  return (jlong) ((intptr_t) res);
+}
+
+JNIEXPORT jlong JNICALL 
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_dlsym(JNIEnv *env, jclass _unused, jstring name) {
+  const jbyte* chars;
+  void* res;
+  chars = (*env)->GetStringUTFChars(env, name, NULL);
+  res = dlsym(RTLD_DEFAULT, chars);
+  (*env)->ReleaseStringUTFChars(env, name, chars);
+  return (jlong) ((intptr_t) res);
+}
+
+/*   Java->C glue code:
+ *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
+ *    Java method: XVisualInfo XGetVisualInfo(long arg0, long arg1, XVisualInfo arg2, java.nio.IntBuffer arg3)
+ *     C function: XVisualInfo *  XGetVisualInfo(Display * , long, XVisualInfo * , int * );
+ */
+JNIEXPORT jobject JNICALL
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_XGetVisualInfoCopied1__JJLjava_nio_ByteBuffer_2Ljava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jint arg3_byte_offset) {
+  XVisualInfo * _ptr2 = NULL;
+  int * _ptr3 = NULL;
+  XVisualInfo *  _res;
+  int count;
+  jobject jbyteSource;
+  jobject jbyteCopy;
+    if(0==arg0) {
+        _FatalError(env, "invalid display connection..");
+    }
+    if (arg2 != NULL) {
+        _ptr2 = (XVisualInfo *) (((char*) (*env)->GetDirectBufferAddress(env, arg2)) + 0);
+    }
+  if (arg3 != NULL) {
+    _ptr3 = (int *) (((char*) (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) + arg3_byte_offset);
+  }
+  _res = XGetVisualInfo((Display *) (intptr_t) arg0, (long) arg1, (XVisualInfo *) _ptr2, (int *) _ptr3);
+  count = _ptr3[0];
+  if (arg3 != NULL) {
+    (*env)->ReleasePrimitiveArrayCritical(env, arg3, _ptr3, 0);
+  }
+  if (_res == NULL) return NULL;
+
+  _initClazzAccess(env);
+
+  jbyteSource = (*env)->NewDirectByteBuffer(env, _res, count * sizeof(XVisualInfo));
+  jbyteCopy   = (*env)->CallStaticObjectMethod(env,
+                                               clazzInternalBufferUtil, cstrInternalBufferUtil, jbyteSource);
+
+  XFree(_res);
+
+  return jbyteCopy;
+}
+
+JNIEXPORT jlong JNICALL 
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_DefaultVisualID(JNIEnv *env, jclass _unused, jlong display, jint screen) {
+  jlong r;
+    if(0==display) {
+        _FatalError(env, "invalid display connection..");
+    }
+  r = (jlong) XVisualIDFromVisual( DefaultVisual( (Display*) (intptr_t) display, screen ) );
+  return r;
+}
+
+/*   Java->C glue code:
+ *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
+ *    Java method: void XLockDisplay(long display)
+ *     C function: void XLockDisplay(Display *  display);
+ */
+JNIEXPORT void JNICALL 
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_XLockDisplay__J(JNIEnv *env, jclass _unused, jlong display) {
+  if(0==display) {
+      _FatalError(env, "invalid display connection..");
+  }
+  XLockDisplay((Display *) (intptr_t) display);
+}
+
+/*   Java->C glue code:
+ *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
+ *    Java method: void XUnlockDisplay(long display)
+ *     C function: void XUnlockDisplay(Display *  display);
+ */
+JNIEXPORT void JNICALL 
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_XUnlockDisplay__J(JNIEnv *env, jclass _unused, jlong display) {
+  if(0==display) {
+      _FatalError(env, "invalid display connection..");
+  }
+  XUnlockDisplay((Display *) (intptr_t) display);
+}
+
+
+/*   Java->C glue code:
+ *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
+ *    Java method: int XCloseDisplay(long display)
+ *     C function: int XCloseDisplay(Display *  display);
+ */
+JNIEXPORT jint JNICALL 
+Java_com_jogamp_nativewindow_impl_x11_X11Lib_XCloseDisplay__J(JNIEnv *env, jclass _unused, jlong display) {
+  int _res;
+  if(0==display) {
+      _FatalError(env, "invalid display connection..");
+  }
+  _res = XCloseDisplay((Display *) (intptr_t) display);
+  return _res;
+}
+
+/*
+ * Class:     com_jogamp_nativewindow_impl_x11_X11Lib
+ * Method:    CreateDummyWindow
+ * Signature: (JIJ)J
+JNIEXPORT jlong JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_CreateDummyWindow
+  (JNIEnv *env, jobject obj, jlong display, jint screen_index, jlong visualID)
+{
+    Display * dpy  = (Display *)(intptr_t)display;
+    int       scrn_idx = (int)screen_index;
+    Window  windowParent = 0;
+    Window  window = 0;
+
+    XVisualInfo visualTemplate;
+    XVisualInfo *pVisualQuery = NULL;
+    Visual *visual = NULL;
+    int depth;
+
+    XSetWindowAttributes xswa;
+    unsigned long attrMask;
+    int n;
+
+    Screen* scrn;
+
+    if(NULL==dpy) {
+        _FatalError(env, "invalid display connection..");
+        return 0;
+    }
+
+    if(visualID<0) {
+        _throwNewRuntimeException(NULL, env, "invalid VisualID ..\n");
+        return 0;
+    }
+
+    XLockDisplay(dpy) ;
+
+    XSync(dpy, False);
+
+    scrn = ScreenOfDisplay(dpy, scrn_idx);
+
+    // try given VisualID on screen
+    memset(&visualTemplate, 0, sizeof(XVisualInfo));
+    visualTemplate.screen = scrn_idx;
+    visualTemplate.visualid = (VisualID)visualID;
+    pVisualQuery = XGetVisualInfo(dpy, VisualIDMask|VisualScreenMask, &visualTemplate,&n);
+    if(pVisualQuery!=NULL) {
+        visual   = pVisualQuery->visual;
+        depth    = pVisualQuery->depth;
+        visualID = (jlong)pVisualQuery->visualid;
+        XFree(pVisualQuery);
+        pVisualQuery=NULL;
+    }
+    DBG_PRINT5( "X11: [CreateWindow] trying given (dpy %p, screen %d, visualID: %d, parent %p) found: %p\n", dpy, scrn_idx, (int)visualID, windowParent, visual);
+
+    if (visual==NULL)
+    { 
+        _throwNewRuntimeException(dpy, env, "could not query Visual by given VisualID, bail out!\n");
+        return 0;
+    } 
+
+    if(pVisualQuery!=NULL) {
+        XFree(pVisualQuery);
+        pVisualQuery=NULL;
+    }
+
+    if(0==windowParent) {
+        windowParent = XRootWindowOfScreen(scrn);
+    }
+
+    attrMask  = (CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect) ;
+
+    memset(&xswa, 0, sizeof(xswa));
+    xswa.override_redirect = True; // not decorated
+    xswa.border_pixel = 0;
+    xswa.background_pixel = 0;
+    xswa.event_mask = 0 ; // no events
+    xswa.colormap = XCreateColormap(dpy,
+                                    XRootWindow(dpy, scrn_idx),
+                                    visual,
+                                    AllocNone);
+
+    window = XCreateWindow(dpy,
+                           windowParent,
+                           0, 0,
+                           64, 64,
+                           0, // border width
+                           depth,
+                           InputOutput,
+                           visual,
+                           attrMask,
+                           &xswa);
+
+    XSync(dpy, False);
+
+    XUnlockDisplay(dpy) ;
+
+    DBG_PRINT2( "X11: [CreateWindow] created window %p on display %p\n", window, dpy);
+
+    return (jlong) window;
+}
+ */
+
+
+/*
+ * Class:     com_jogamp_nativewindow_impl_x11_X11Lib
+ * Method:    DestroyDummyWindow
+ * Signature: (JJ)V
+JNIEXPORT void JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_DestroyDummyWindow
+  (JNIEnv *env, jobject obj, jlong display, jlong window)
+{
+    Display * dpy = (Display *)(intptr_t)display;
+    Window      w = (Window) window;
+
+    if(NULL==dpy) {
+        _throwNewRuntimeException(NULL, env, "invalid display connection..\n");
+        return;
+    }
+    XLockDisplay(dpy) ;
+
+    XSync(dpy, False);
+    XUnmapWindow(dpy, w);
+    XSync(dpy, False);
+    XDestroyWindow(dpy, w);
+    XSync(dpy, False);
+
+    XUnlockDisplay(dpy) ;
+}
+ */
+
diff --git a/src/newt/classes/com/jogamp/newt/x11/X11Display.java b/src/newt/classes/com/jogamp/newt/x11/X11Display.java
index b8eb80b39..5fd6d9640 100755
--- a/src/newt/classes/com/jogamp/newt/x11/X11Display.java
+++ b/src/newt/classes/com/jogamp/newt/x11/X11Display.java
@@ -61,7 +61,7 @@ public class X11Display extends Display {
     }
 
     protected void createNative() {
-        long handle= X11Util.getThreadLocalDisplay(name);
+        long handle= X11Util.createThreadLocalDisplay(name);
         if (handle == 0 ) {
             throw new RuntimeException("Error creating display: "+name);
         }
@@ -75,9 +75,7 @@ public class X11Display extends Display {
     }
 
     protected void closeNative() {
-        if(0==X11Util.closeThreadLocalDisplay(name)) {
-            throw new NativeWindowException(this+" was not mapped");
-        }
+        X11Util.closeThreadLocalDisplay(name);
     }
 
     protected void dispatchMessages() {
diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index 0fccc94bb..33c5324e2 100755
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -149,6 +149,19 @@ static jint X11KeySym2NewtVKey(KeySym keySym) {
     return keySym;
 }
 
+static void _FatalError(JNIEnv *env, const char* msg, ...)
+{
+    char buffer[512];
+    va_list ap;
+
+    va_start(ap, msg);
+    vsnprintf(buffer, sizeof(buffer), msg, ap);
+    va_end(ap);
+
+    fprintf(stderr, buffer);
+    (*env)->FatalError(env, buffer);
+}
+
 static const char * const ClazzNameRuntimeException = 
                             "java/lang/RuntimeException";
 static jclass    runtimeExceptionClz=NULL;
@@ -217,26 +230,6 @@ static void displayDispatchErrorHandlerEnable(int onoff) {
     }
 }
 
-static XIOErrorHandler origIOErrorHandler = NULL;
-
-static int displayDispatchIOErrorHandler(Display *dpy)
-{
-    fprintf(stderr, "Fatal: NEWT X11 IOError: Display %p not available\n", dpy);
-    return 0;
-}
-
-static void displayDispatchIOErrorHandlerEnable(int onoff) {
-    if(onoff) {
-        if(NULL==origIOErrorHandler) {
-            origIOErrorHandler = XSetIOErrorHandler(displayDispatchIOErrorHandler);
-        }
-    } else {
-        XSetIOErrorHandler(origIOErrorHandler);
-        origIOErrorHandler = NULL;
-    }
-}
-
-
 /*
  * Class:     com_jogamp_newt_x11_X11Display
  * Method:    initIDs
@@ -259,28 +252,24 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_x11_X11Display_initIDs
     if(NULL==newtWindowClz) {
         c = (*env)->FindClass(env, ClazzNameNewtWindow);
         if(NULL==c) {
-            fprintf(stderr, "FatalError: NEWT X11Window: can't find %s\n", ClazzNameNewtWindow);
-            return JNI_FALSE;
+            _FatalError(env, "NEWT X11Window: can't find %s", ClazzNameNewtWindow);
         }
         newtWindowClz = (jclass)(*env)->NewGlobalRef(env, c);
         (*env)->DeleteLocalRef(env, c);
         if(NULL==newtWindowClz) {
-            fprintf(stderr, "FatalError: NEWT X11Window: can't use %s\n", ClazzNameNewtWindow);
-            return JNI_FALSE;
+            _FatalError(env, "NEWT X11Window: can't use %s", ClazzNameNewtWindow);
         }
     }
 
     if(NULL==runtimeExceptionClz) {
         c = (*env)->FindClass(env, ClazzNameRuntimeException);
         if(NULL==c) {
-            fprintf(stderr, "FatalError: NEWT X11Window: can't find %s\n", ClazzNameRuntimeException);
-            return JNI_FALSE;
+            _FatalError(env, "NEWT X11Window: can't find %s", ClazzNameRuntimeException);
         }
         runtimeExceptionClz = (jclass)(*env)->NewGlobalRef(env, c);
         (*env)->DeleteLocalRef(env, c);
         if(NULL==runtimeExceptionClz) {
-            fprintf(stderr, "FatalError: NEWT X11Window: can't use %s\n", ClazzNameRuntimeException);
-            return JNI_FALSE;
+            _FatalError(env, "NEWT X11Window: can't use %s", ClazzNameRuntimeException);
         }
     }
 
@@ -297,7 +286,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_LockDisplay
 {
     Display * dpy = (Display *)(intptr_t)display;
     if(dpy==NULL) {
-        _throwNewRuntimeException(NULL, env, "given display connection is NULL\n");
+        _FatalError(env, "invalid display connection..");
     }
     XLockDisplay(dpy) ;
     DBG_PRINT1( "X11: LockDisplay 0x%X\n", dpy); 
@@ -314,7 +303,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_UnlockDisplay
 {
     Display * dpy = (Display *)(intptr_t)display;
     if(dpy==NULL) {
-        _throwNewRuntimeException(NULL, env, "given display connection is NULL\n");
+        _FatalError(env, "invalid display connection..");
     }
     XUnlockDisplay(dpy) ;
     DBG_PRINT1( "X11: UnlockDisplay 0x%X\n", dpy); 
@@ -334,7 +323,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_CompleteDisplay
     jlong windowDeleteAtom;
 
     if(dpy==NULL) {
-        _throwNewRuntimeException(NULL, env, "given display connection is NULL\n");
+        _FatalError(env, "invalid display connection..");
     }
     XLockDisplay(dpy) ;
 
@@ -447,8 +436,6 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
         return;
     }
 
-    displayDispatchIOErrorHandlerEnable(1);
-
     // Periodically take a break
     while( num_events > 0 ) {
         jobject jwindow = NULL;
@@ -462,7 +449,6 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
         // num_events = XPending(dpy); // XEventsQueued(dpy, QueuedAfterFlush); // I/O Flush ..
         // num_events = XEventsQueued(dpy, QueuedAlready); // Better, no I/O ..
         if ( 0 >= XEventsQueued(dpy, QueuedAlready) ) {
-            displayDispatchIOErrorHandlerEnable(0);
             XUnlockDisplay(dpy) ;
             return;
         }
@@ -470,8 +456,6 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
         XNextEvent(dpy, &evt);
         num_events--;
 
-        displayDispatchIOErrorHandlerEnable(0);
-
         if( 0==evt.xany.window ) {
             _throwNewRuntimeException(dpy, env, "event window NULL, bail out!\n");
             return ;
@@ -606,8 +590,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_x11_X11Screen_GetScreen
     Screen  * scrn= NULL;
 
     if(dpy==NULL) {
-        _throwNewRuntimeException(NULL, env, "invalid display connection..\n");
-        return 0;
+        _FatalError(env, "invalid display connection..");
     }
     XLockDisplay(dpy);
 
@@ -698,8 +681,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_x11_X11Window_CreateWindow
     DBG_PRINT4( "X11: CreateWindow %x/%d %dx%d\n", x, y, width, height);
 
     if(dpy==NULL) {
-        _throwNewRuntimeException(NULL, env, "invalid display connection..\n");
-        return 0;
+        _FatalError(env, "invalid display connection..");
     }
 
     if(visualID<0) {
@@ -711,7 +693,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_x11_X11Window_CreateWindow
 
     XSync(dpy, False);
 
-    scrn = ScreenOfDisplay(dpy, screen_index);
+    scrn = ScreenOfDisplay(dpy, scrn_idx);
 
     // try given VisualID on screen
     memset(&visualTemplate, 0, sizeof(XVisualInfo));
@@ -809,8 +791,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_CloseWindow
     jobject jwindow;
 
     if(dpy==NULL) {
-        _throwNewRuntimeException(NULL, env, "invalid display connection..\n");
-        return;
+        _FatalError(env, "invalid display connection..");
     }
     XLockDisplay(dpy) ;
 
@@ -854,8 +835,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_setVisible0
     DBG_PRINT1( "X11: setVisible0 vis %d\n", visible);
 
     if(dpy==NULL) {
-        _throwNewRuntimeException(NULL, env, "invalid display connection..\n");
-        return;
+        _FatalError(env, "invalid display connection..");
     }
     XLockDisplay(dpy) ;
 
@@ -903,8 +883,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_setSize0
     DBG_PRINT6( "X11: setSize0 %d/%d %dx%d, dec %d, vis %d\n", x, y, width, height, decorationToggle, setVisible);
 
     if(dpy==NULL) {
-        _throwNewRuntimeException(NULL, env, "invalid display connection..\n");
-        return;
+        _FatalError(env, "invalid display connection..");
     }
     XLockDisplay(dpy) ;
 
@@ -963,8 +942,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_setPosition0
 
     DBG_PRINT2( "X11: setPos0 . XConfigureWindow %d/%d\n", x, y);
     if(dpy==NULL) {
-        _throwNewRuntimeException(NULL, env, "invalid display connection..\n");
-        return;
+        _FatalError(env, "invalid display connection..");
     }
     XLockDisplay(dpy) ;
 
-- 
cgit v1.2.3


From bd4904fb04ab2168aeaf76e74385b3991429289a Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 15 Apr 2010 07:24:20 +0200
Subject: JOGL (Windows):     - WindowsWGLDrawableFactory is using [singleton]
 shared dummy resources for         - Drawable and Context       which are
 utilized in case they are needed ..       They are removed at shutdown call

    - GLCapabilities
        - Set pbuffer as the HW capabilities show,
          hence onscreen && pbuffer is valid

        - DefaultGLCapabilitiesChooser: Respect PBuffer selection (fixed)
          Only skip a config, if request is !onscreen && pbuffer, but pbuffer n/a

Tests:
    - JUnit Passed (Windows32: Chromium - Except PBuffer (n/a)
---
 make/java-run-newt.sh                              |  23 +++++
 make/java-run.sh                                   |  19 ++++
 make/java-win32-dbg.bat                            |  16 ++++
 make/java-win32.bat                                |  16 ++++
 make/setenv-jogl.sh                                |  92 +++++++++++++++++++
 .../jogamp/opengl/impl/GLDrawableFactoryImpl.java  |   3 -
 .../opengl/impl/egl/EGLGraphicsConfiguration.java  |   6 +-
 .../windows/wgl/WindowsWGLDrawableFactory.java     | 101 ++++++++++++---------
 .../wgl/WindowsWGLGraphicsConfiguration.java       |   5 +-
 .../WindowsWGLGraphicsConfigurationFactory.java    |  34 +++----
 .../opengl/impl/x11/glx/X11GLXDrawableFactory.java |   3 +
 .../impl/x11/glx/X11GLXGraphicsConfiguration.java  |   5 +-
 .../media/opengl/DefaultGLCapabilitiesChooser.java |   4 +-
 .../junit/jogl/drawable/TestDrawable01NEWT.java    |   2 +-
 14 files changed, 244 insertions(+), 85 deletions(-)
 create mode 100755 make/java-run-newt.sh
 create mode 100755 make/java-run.sh
 create mode 100644 make/java-win32-dbg.bat
 create mode 100644 make/java-win32.bat
 create mode 100644 make/setenv-jogl.sh

diff --git a/make/java-run-newt.sh b/make/java-run-newt.sh
new file mode 100755
index 000000000..39654d03b
--- /dev/null
+++ b/make/java-run-newt.sh
@@ -0,0 +1,23 @@
+#! /bin/sh
+
+function print_usage() {
+    echo "Usage: $0 jogl-build-dir ..."
+}
+
+if [ -z "$1" ] ; then
+    echo JOGL BUILD DIR missing
+    print_usage
+    return
+fi
+
+. ./setenv-jogl.sh $1
+shift
+
+MOSX=0
+uname -a | grep -i Darwin && MOSX=1
+
+if [ $MOSX -eq 1 ] ; then
+    X_ARGS="-XstartOnFirstThread"
+fi
+
+java $X_ARGS -Djava.awt.headless=true com.jogamp.newt.util.MainThread $* 2>&1 | tee java-run-newt.log
diff --git a/make/java-run.sh b/make/java-run.sh
new file mode 100755
index 000000000..63fb6d3e9
--- /dev/null
+++ b/make/java-run.sh
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+function print_usage() {
+    echo "Usage: $0 jogl-build-dir ..."
+}
+
+if [ -z "$1" ] ; then
+    echo JOGL BUILD DIR missing
+    print_usage
+    return
+fi
+
+. ./setenv-jogl.sh $1
+shift
+
+MOSX=0
+uname -a | grep -i Darwin && MOSX=1
+
+java $X_ARGS $* 2>&1 | tee java-run.log
diff --git a/make/java-win32-dbg.bat b/make/java-win32-dbg.bat
new file mode 100644
index 000000000..69287f8e9
--- /dev/null
+++ b/make/java-win32-dbg.bat
@@ -0,0 +1,16 @@
+
+set BLD_SUB=build-win32
+set J2RE_HOME=c:\jre1.6.0_19
+set JAVA_HOME=c:\jdk1.6.0_19
+set ANT_PATH=C:\apache-ant-1.8.0
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
+
+set BLD_DIR=..\%BLD_SUB%
+set LIB_DIR=%BLD_DIR%\lib;..\..\gluegen\%BLD_SUB%\obj
+
+set CP_ALL=.;%BLD_DIR%\jogl\jogl.all.jar;%BLD_DIR%\nativewindow\nativewindow.all.jar;%BLD_DIR%\newt\newt.all.jar;%BLD_DIR%\jogl\jogl.test.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\make\lib\junit-4.5.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar
+
+echo CP_ALL %CP_ALL%
+
+%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dnewt.debug=all" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32-dbg.log 2>&1
diff --git a/make/java-win32.bat b/make/java-win32.bat
new file mode 100644
index 000000000..5f731a14d
--- /dev/null
+++ b/make/java-win32.bat
@@ -0,0 +1,16 @@
+
+set BLD_SUB=build-win32
+set J2RE_HOME=c:\jre1.6.0_19
+set JAVA_HOME=c:\jdk1.6.0_19
+set ANT_PATH=C:\apache-ant-1.8.0
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
+
+set BLD_DIR=..\%BLD_SUB%
+set LIB_DIR=%BLD_DIR%\lib;..\..\gluegen\%BLD_SUB%\obj
+
+set CP_ALL=.;%BLD_DIR%\jogl\jogl.all.jar;%BLD_DIR%\nativewindow\nativewindow.all.jar;%BLD_DIR%\newt\newt.all.jar;%BLD_DIR%\jogl\jogl.test.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\make\lib\junit-4.5.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar
+
+echo CP_ALL %CP_ALL%
+
+%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1
diff --git a/make/setenv-jogl.sh b/make/setenv-jogl.sh
new file mode 100644
index 000000000..49c584459
--- /dev/null
+++ b/make/setenv-jogl.sh
@@ -0,0 +1,92 @@
+#! /bin/sh
+
+function print_usage() {
+    echo "Usage: $0 jogl-build-dir"
+}
+
+if [ -z "$1" ] ; then
+    echo JOGL BUILD DIR missing
+    print_usage
+    return
+fi
+
+if [ -e /devtools/etc/profile.ant ] ; then
+    . /devtools/etc/profile.ant
+fi
+
+JOGL_PROFILE=JOGL_ALL
+
+JOGL_BUILDDIR=$1
+shift
+
+THISDIR=`pwd`
+
+if [ -e "$JOGL_BUILDDIR" ] ; then
+    JOGL_DIR=$JOGL_BUILDDIR/..
+    JOGL_BUILDDIR_BASE=`basename $JOGL_BUILDDIR`
+else
+    echo JOGL_BUILDDIR $JOGL_BUILDDIR not exist or not given
+    print_usage
+    return
+fi
+
+gpf=`find ../../gluegen/make -name dynlink-unix.cfg`
+if [ -z "$gpf" ] ; then
+    gpf=`find .. -name dynlink-unix.cfg`
+fi
+if [ -z "$gpf" ] ; then
+    echo GLUEGEN_BUILDDIR not found
+    print_usage
+    return
+fi
+
+GLUEGEN_DIR=`dirname $gpf`/..
+GLUEGEN_BUILDDIR=$GLUEGEN_DIR/$JOGL_BUILDDIR_BASE
+if [ ! -e "$GLUEGEN_BUILDDIR" ] ; then
+    echo GLUEGEN_BUILDDIR $GLUEGEN_BUILDDIR does not exist
+    print_usage
+    return
+fi
+GLUEGEN_JAR=$GLUEGEN_BUILDDIR/gluegen-rt.jar
+GLUEGEN_OS=$GLUEGEN_BUILDDIR/obj
+JUNIT_JAR=$GLUEGEN_DIR/make/lib/junit-4.5.jar
+
+if [ -z "$ANT_PATH" ] ; then
+    echo ANT_PATH does not exist, set it
+    print_usage
+    return
+else
+    ANT_JARS=$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar
+fi
+
+echo GLUEGEN BUILDDIR: $GLUEGEN_BUILDDIR
+echo JOGL DIR: $JOGL_DIR
+echo JOGL BUILDDIR: $JOGL_BUILDDIR
+echo JOGL BUILDDIR BASE: $JOGL_BUILDDIR_BASE
+echo JOGL PROFILE: $JOGL_PROFILE
+
+J2RE_HOME=$(which java)
+JAVA_HOME=$(which javac)
+CP_SEP=:
+
+. $JOGL_DIR/etc/profile.jogl $JOGL_PROFILE $JOGL_BUILDDIR 
+
+SWT_CLASSPATH=$HOME/.java/swt.jar
+LIB=$THISDIR/lib
+
+CLASSPATH=.:$GLUEGEN_JAR:$JOGL_CLASSPATH:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS
+for i in $LIB/*jar ; do
+    CLASSPATH=$CLASSPATH:$i
+done
+export CLASSPATH
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR
+export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR
+
+echo CLASSPATH: $CLASSPATH
+echo
+echo MacOSX REMEMBER to add the JVM arguments "-XstartOnFirstThread -Djava.awt.headless=true" for running demos without AWT, e.g. NEWT
+echo MacOSX REMEMBER to add the JVM arguments "-XstartOnFirstThread -Djava.awt.headless=true com.jogamp.newt.util.MainThread" for running demos with NEWT
+
+PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+export PATH
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
index 616640bad..0cc10b35e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
@@ -79,9 +79,6 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
     GLCapabilities caps = (GLCapabilities) target.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
     GLDrawable result = null;
     if(caps.isOnscreen()) {
-        if(caps.isPBuffer()) {
-            throw new IllegalArgumentException("Onscreen target can't be PBuffer: "+caps);
-        }
         if(DEBUG) {
             System.out.println("GLDrawableFactoryImpl.createGLDrawable -> OnscreenDrawable: "+target);
         }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
index 2d5154442..176628633 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
@@ -179,11 +179,7 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
             } */
         }
         if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_SURFACE_TYPE, val, 0)) {
-            if(EGLConfigDrawableTypeVerify(val[0], onscreen, usePBuffer)) {
-                caps.setDoubleBuffered(onscreen);
-                caps.setOnscreen(onscreen);
-                caps.setPBuffer(usePBuffer);
-            } else if(relaxed) {
+            if(EGLConfigDrawableTypeVerify(val[0], onscreen, usePBuffer) || relaxed) {
                 caps.setDoubleBuffered( 0 != (val[0] & EGL.EGL_WINDOW_BIT) );
                 caps.setOnscreen( 0 != (val[0] & EGL.EGL_WINDOW_BIT) );
                 caps.setPBuffer ( 0 != (val[0] & EGL.EGL_PBUFFER_BIT) );
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
index cb3ee19e0..e3938f9fe 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
@@ -43,6 +43,7 @@ import com.jogamp.common.os.DynamicLookupHelper;
 import java.nio.*;
 import java.util.*;
 import javax.media.nativewindow.*;
+import javax.media.nativewindow.windows.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
 import com.jogamp.nativewindow.impl.NWReflection;
@@ -72,7 +73,45 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
     loadOpenGL32Library();
   }
 
+  WindowsDummyWGLDrawable sharedDrawable=null;
+  WindowsWGLContext sharedContext=null;
+  boolean canCreateGLPbuffer = false;
+
+  void initShared() {
+    if(null==sharedDrawable) {
+        sharedDrawable = new WindowsDummyWGLDrawable(this, null);
+        sharedContext  = (WindowsWGLContext) sharedDrawable.createContext(null);
+        sharedContext.makeCurrent();
+        canCreateGLPbuffer = sharedContext.getGL().isExtensionAvailable("GL_ARB_pbuffer");
+        sharedContext.release();
+        if (DEBUG) {
+          System.err.println("!!! SharedContext: "+sharedContext+", pbuffer supported "+canCreateGLPbuffer);
+        }
+        if(null==sharedContext) {
+            throw new GLException("Couldn't init shared resources");
+        }
+    }
+  }
+
+  public void shutdown() {
+     super.shutdown();
+     if (DEBUG) {
+          System.err.println("!!! Shutdown Shared:");
+          System.err.println("!!!          CTX     : "+sharedContext);
+          System.err.println("!!!          Drawable: "+sharedDrawable);
+          Exception e = new Exception("Debug");
+          e.printStackTrace();
+     }
+     if(null!=sharedContext) {
+        sharedContext.destroy(); // implies release, if current
+     }
+     if(null!=sharedDrawable) {
+        sharedDrawable.destroy();
+     }
+  }
+
   public GLDrawableImpl createOnscreenDrawable(NativeWindow target) {
+    validate();
     if (target == null) {
       throw new IllegalArgumentException("Null target");
     }
@@ -83,67 +122,33 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
     return new WindowsOffscreenWGLDrawable(this, target);
   }
 
-  private boolean pbufferSupportInitialized = false;
-  private boolean canCreateGLPbuffer = false;
   public boolean canCreateGLPbuffer(AbstractGraphicsDevice device) {
-    if (!pbufferSupportInitialized) {
-      final GLDrawableFactory factory = this;
-      Runnable r = new Runnable() {
-          public void run() {
-            WindowsDummyWGLDrawable dummyDrawable = new WindowsDummyWGLDrawable(factory, null);
-            GLContext dummyContext  = dummyDrawable.createContext(null);
-            if (dummyContext != null) {
-              GLContext lastContext = GLContext.getCurrent();
-              if (lastContext != null) {
-                lastContext.release();
-              }
-              dummyContext.makeCurrent();
-              GL dummyGL = dummyContext.getGL();
-              canCreateGLPbuffer = dummyGL.isExtensionAvailable("GL_ARB_pbuffer");
-              pbufferSupportInitialized = true;
-              dummyContext.release();
-              dummyContext.destroy();
-              dummyDrawable.destroy();
-              if (lastContext != null) {
-                lastContext.makeCurrent();
-              }
-            }
-          }
-        };
-      maybeDoSingleThreadedWorkaround(r);
-    }
-    if (DEBUG) {
-      System.err.println("WindowsWGLDrawableFactory.canCreateGLPbuffer() = " + canCreateGLPbuffer);
-    }
+    validate();
+    initShared();
     return canCreateGLPbuffer;
   }
 
   protected GLDrawableImpl createGLPbufferDrawableImpl(final NativeWindow target) {
+    initShared();
     final List returnList = new ArrayList();
     final GLDrawableFactory factory = this;
+    final WindowsWGLContext _sharedContext = sharedContext;
+    final WindowsDummyWGLDrawable _sharedDrawable = sharedDrawable;
     Runnable r = new Runnable() {
         public void run() {
-          WindowsDummyWGLDrawable dummyDrawable = new WindowsDummyWGLDrawable(factory, null);
-          WindowsWGLContext       dummyContext  = (WindowsWGLContext) dummyDrawable.createContext(null);
           GLContext lastContext = GLContext.getCurrent();
           if (lastContext != null) {
             lastContext.release();
           }
-          dummyContext.makeCurrent();
-          WGLExt dummyWGLExt = dummyContext.getWGLExt();
+          _sharedContext.makeCurrent();
+          WGLExt wglExt = _sharedContext.getWGLExt();
           try {
             GLDrawableImpl pbufferDrawable = new WindowsPbufferWGLDrawable(factory, target,
-                                                                           dummyDrawable,
-                                                                           dummyWGLExt);
+                                                                           _sharedDrawable,
+                                                                           wglExt);
             returnList.add(pbufferDrawable);
           } finally {
-            if(null!=dummyContext) {
-                dummyContext.release();
-                dummyContext.destroy();
-            }
-            if(null!=dummyDrawable) {
-                dummyDrawable.destroy();
-            }
+            _sharedContext.release();
             if (lastContext != null) {
               lastContext.makeCurrent();
             }
@@ -163,18 +168,22 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
   }
  
   public GLContext createExternalGLContext() {
+    validate();
     return WindowsExternalWGLContext.create(this, null);
   }
 
   public boolean canCreateExternalGLDrawable(AbstractGraphicsDevice device) {
+    validate();
     return true;
   }
 
   public GLDrawable createExternalGLDrawable() {
+    validate();
     return WindowsExternalWGLDrawable.create(this, null);
   }
 
   public void loadOpenGL32Library() {
+    validate();
     if (hopengl32 == 0) {
       hopengl32 = WGL.LoadLibraryA("OpenGL32");
       if (DEBUG) {
@@ -186,6 +195,7 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
   }
 
   public void loadGLULibrary() {
+    validate();
     if (hglu32 == 0) {
       hglu32 = WGL.LoadLibraryA("GLU32");
       if (hglu32 == 0) {
@@ -195,6 +205,7 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
   }
 
   public long dynamicLookupFunction(String glFuncName) {
+    validate();
     long res = WGL.wglGetProcAddress(glFuncName);
     if (res == 0) {
       // It may happen that a driver doesn't return the OpenGL32 core function pointer
@@ -227,11 +238,13 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
   }
 
   public boolean canCreateContextOnJava2DSurface(AbstractGraphicsDevice device) {
+    validate();
     return false;
   }
 
   public GLContext createContextOnJava2DSurface(Object graphics, GLContext shareWith)
     throws GLException {
+    validate();
     throw new GLException("Unimplemented on this platform");
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
index aed4012a4..15823b6dc 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
@@ -428,10 +428,7 @@ public class WindowsWGLGraphicsConfiguration extends DefaultGraphicsConfiguratio
                                                          boolean relaxed, boolean onscreen, boolean usePBuffer) {
         GLCapabilities res = new GLCapabilities(glp);
         int drawableTypeBits = WGLConfig2DrawableTypeBits(iattribs, niattribs, iresults);
-        if(WGLConfigDrawableTypeVerify(drawableTypeBits, onscreen, usePBuffer)) {
-            res.setOnscreen(onscreen);
-            res.setPBuffer(usePBuffer);
-        } else if(relaxed) {
+        if(WGLConfigDrawableTypeVerify(drawableTypeBits, onscreen, usePBuffer) || relaxed) {
             res.setOnscreen( 0 != (drawableTypeBits & WINDOW_BIT) );
             res.setPBuffer ( 0 != (drawableTypeBits & PBUFFER_BIT) );
         } else {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
index 1a375699c..c9805fef1 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
@@ -87,7 +87,8 @@ public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfiguratio
     }
 
     protected static void updateGraphicsConfiguration(CapabilitiesChooser chooser,
-                                                      GLDrawableFactory factory, NativeWindow nativeWindow) {
+                                                      GLDrawableFactory _factory, NativeWindow nativeWindow) {
+        WindowsWGLDrawableFactory factory = (WindowsWGLDrawableFactory) _factory;
         if (nativeWindow == null) {
             throw new IllegalArgumentException("NativeWindow is null");
         }
@@ -134,25 +135,16 @@ public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfiguratio
           pfd = WindowsWGLGraphicsConfiguration.createPixelFormatDescriptor();
           // Produce a recommended pixel format selection for the GLCapabilitiesChooser.
           // Use wglChoosePixelFormatARB if user requested multisampling and if we have it available
-          WindowsWGLDrawable dummyDrawable = null;
-          GLContextImpl     dummyContext  = null;
-          WGLExt            dummyWGLExt   = null;
-          if (capabilities.getSampleBuffers()) {
-              dummyDrawable = new WindowsDummyWGLDrawable(factory, glProfile);
-              dummyContext  = (GLContextImpl) dummyDrawable.createContext(null);
-              if (dummyContext != null) {
-                dummyContext.makeCurrent();
-                dummyWGLExt = (WGLExt) dummyContext.getPlatformGLExtensions();
-              }
-          } else if (DEBUG) {
-              System.err.println(getThreadName() + ": Not using WGL_ARB_pixel_format, because multisampling not requested");
-          }
+          factory.initShared();
+          factory.sharedContext.makeCurrent();
+          WGLExt wglExt = factory.sharedContext.getWGLExt();
+
           int recommendedPixelFormat = pixelFormat; // 1-based pixel format
           boolean haveWGLChoosePixelFormatARB = false;
           boolean gotAvailableCaps = false;
-          if (dummyWGLExt != null) {
+          if (wglExt != null) {
             try {
-              haveWGLChoosePixelFormatARB = dummyWGLExt.isExtensionAvailable("WGL_ARB_pixel_format");
+              haveWGLChoosePixelFormatARB = wglExt.isExtensionAvailable("WGL_ARB_pixel_format");
               if (haveWGLChoosePixelFormatARB) {
                 if(pixelFormat<=0) {
                   int[]   iattributes = new int  [2*WindowsWGLGraphicsConfiguration.MAX_ATTRIBS];
@@ -160,12 +152,12 @@ public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfiguratio
 
                   if(WindowsWGLGraphicsConfiguration.GLCapabilities2AttribList(capabilities,
                                                                                iattributes,
-                                                                               dummyWGLExt,
+                                                                               wglExt,
                                                                                false,
                                                                                null)) {
                     int[] pformats = new int[WindowsWGLGraphicsConfiguration.MAX_PFORMATS];
                     int[] numFormatsTmp = new int[1];
-                    if (dummyWGLExt.wglChoosePixelFormatARB(hdc,
+                    if (wglExt.wglChoosePixelFormatARB(hdc,
                                                          iattributes, 0,
                                                          fattributes, 0,
                                                          WindowsWGLGraphicsConfiguration.MAX_PFORMATS,
@@ -196,16 +188,14 @@ public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfiguratio
                   }
                 }
 
-                availableCaps = WindowsWGLGraphicsConfiguration.HDC2GLCapabilities(dummyWGLExt, hdc, -1, glProfile, pixelFormatSet, onscreen, usePBuffer);
+                availableCaps = WindowsWGLGraphicsConfiguration.HDC2GLCapabilities(wglExt, hdc, -1, glProfile, pixelFormatSet, onscreen, usePBuffer);
                 gotAvailableCaps = null!=availableCaps ;
                 choosenBywGLPixelFormat = gotAvailableCaps ;
               } else if (DEBUG) {
                 System.err.println(getThreadName() + ": wglChoosePixelFormatARB not available");
               }
             } finally {
-              dummyContext.release();
-              dummyContext.destroy();
-              dummyDrawable.destroy();
+              factory.sharedContext.release();
             }
           }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
index eda480d5f..cfcd5cbe3 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
@@ -99,6 +99,9 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
         if (DEBUG) {
           System.err.println("!!! SharedContext: "+sharedContext);
         }
+        if(null==sharedContext) {
+            throw new GLException("Couldn't init shared resources");
+        }
     }
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
index 35daf0ae0..393891bab 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
@@ -250,10 +250,7 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem
     GLCapabilities res = new GLCapabilities(glp);
 
     val = glXGetFBConfig(display, fbcfg, GLX.GLX_DRAWABLE_TYPE, tmp, 0);
-    if(GLXFBConfigDrawableTypeVerify(val, onscreen, usePBuffer)) {
-        res.setOnscreen(onscreen);
-        res.setPBuffer(usePBuffer);
-    } else if(relaxed) {
+    if(GLXFBConfigDrawableTypeVerify(val, onscreen, usePBuffer) || relaxed) {
         res.setOnscreen( 0 != (val & GLX.GLX_WINDOW_BIT) );
         res.setPBuffer ( 0 != (val & GLX.GLX_PBUFFER_BIT) );
     } else {
diff --git a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
index c5ded88f6..ee41c9161 100644
--- a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
+++ b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
@@ -138,8 +138,8 @@ public class DefaultGLCapabilitiesChooser implements GLCapabilitiesChooser {
       if (_desired.isOnscreen() != cur.isOnscreen()) {
         continue;
       }
-      if (_desired.isPBuffer() != cur.isPBuffer()) {
-        continue;
+      if (!_desired.isOnscreen() && _desired.isPBuffer() && !cur.isPBuffer()) {
+        continue; // only skip if requested Offscreen && PBuffer, but no PBuffer available
       }
       if (_desired.getStereo() != cur.getStereo()) {
         continue;
diff --git a/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
index 5abf02b97..c2661ed3c 100755
--- a/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
@@ -112,7 +112,7 @@ public class TestDrawable01NEWT {
         Assert.assertTrue(glCaps.getBlueBits()>5);
         Assert.assertTrue(glCaps.getRedBits()>5);
         Assert.assertTrue(glCaps.isOnscreen()==onscreen);
-        Assert.assertTrue(glCaps.isPBuffer()==(!onscreen && pbuffer));
+        Assert.assertTrue(onscreen || !pbuffer || glCaps.isPBuffer()); // pass if onscreen, or !pbuffer req. or have pbuffer
         Assert.assertTrue(glCaps.getDoubleBuffered()==!onscreen);
         Assert.assertTrue(glCaps.getDepthBits()>4);
 
-- 
cgit v1.2.3


From 623106ad55c9b0e99b355fff8cef95e76bdbc6a3 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Thu, 15 Apr 2010 19:59:30 +0200
Subject: added junit test folder to NetBeans project config.

---
 nbproject/project.xml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 9f8a897bd..f1a94a2a5 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -47,6 +47,12 @@
                     <location>src/nativewindow/classes</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>src/junit</label>
+                    <type>java</type>
+                    <location>src/junit</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
             </folders>
             <ide-actions>
                 <action name="build">
@@ -112,6 +118,10 @@
                         <label>nativewindow</label>
                         <location>src/nativewindow/classes</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>src/junit</label>
+                        <location>src/junit</location>
+                    </source-folder>
                     <source-file>
                         <location>${ant.script}</location>
                     </source-file>
@@ -130,12 +140,13 @@
             <compilation-unit>
                 <package-root>src/newt/classes</package-root>
                 <package-root>src/jogl/classes</package-root>
-                <package-root>build/jogl/gensrc/classes</package-root>
                 <package-root>src/nativewindow/classes</package-root>
+                <package-root>build/jogl/gensrc/classes</package-root>
                 <package-root>build/nativewindow/gensrc/classes</package-root>
-                <classpath mode="compile">../gluegen/build/gluegen.jar</classpath>
+                <package-root>src/junit</package-root>
+                <classpath mode="compile">../gluegen/build/gluegen-rt.jar:../gluegen/make/lib/junit-4.5.jar</classpath>
                 <built-to>bin</built-to>
-                <source-level>1.4</source-level>
+                <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>
     </configuration>
-- 
cgit v1.2.3


From d1327d8932c2bd5d51fd39fefe7486544d71f7c5 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Thu, 15 Apr 2010 22:58:00 +0200
Subject: code review: fixed empty catch blocks and a few compiler warnings in
 unit tests.

---
 .../junit/jogl/drawable/TestDrawable01NEWT.java    | 26 ++------
 .../test/junit/jogl/offscreen/ReadBuffer2File.java | 35 +++++-----
 .../junit/jogl/offscreen/ReadBuffer2Screen.java    | 12 ++--
 .../test/junit/jogl/offscreen/ReadBufferBase.java  |  8 ++-
 .../test/junit/jogl/offscreen/ReadBufferUtil.java  |  3 +-
 .../test/junit/jogl/offscreen/Surface2File.java    | 30 +++++----
 .../junit/jogl/offscreen/TestOffscreen01NEWT.java  |  7 +-
 .../test/junit/jogl/offscreen/WindowUtilNEWT.java  | 75 ++++++++++------------
 .../test/junit/jogl/texture/TestTexture01AWT.java  | 20 +-----
 .../jogamp/test/junit/newt/TestWindows01NEWT.java  | 27 +++-----
 .../com/jogamp/test/junit/util/MiscUtils.java      | 12 ++--
 11 files changed, 111 insertions(+), 144 deletions(-)

diff --git a/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
index c2661ed3c..0320c50ae 100755
--- a/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.java
@@ -32,23 +32,17 @@
 
 package com.jogamp.test.junit.jogl.drawable;
 
-import java.lang.reflect.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.AfterClass;
-import org.junit.After;
 import org.junit.Test;
 
 import javax.media.opengl.*;
-import javax.media.nativewindow.*;
 
 import com.jogamp.newt.*;
-import com.jogamp.newt.opengl.*;
+import java.io.IOException;
 
 public class TestDrawable01NEWT {
     static GLProfile glp;
@@ -160,26 +154,21 @@ public class TestDrawable01NEWT {
     }
 
     @Test
-    public void testOnScreenDecorated() {
+    public void testOnScreenDecorated() throws InterruptedException {
         createWindow(true, false, false);
-        try {
-            Thread.sleep(1000); // 1000 ms
-        } catch (Exception e) {}
+        Thread.sleep(1000); // 1000 ms
         destroyWindow();
     }
 
     @Test
-    public void testOnScreenUndecorated() {
+    public void testOnScreenUndecorated() throws InterruptedException {
         createWindow(true, false, true);
-        try {
-            Thread.sleep(1000); // 1000 ms
-        } catch (Exception e) {}
+        Thread.sleep(1000); // 1000 ms
         destroyWindow();
     }
 
-    public static void main(String args[]) {
+    public static void main(String args[]) throws IOException {
         String tstname = TestDrawable01NEWT.class.getName();
-        try {
         org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(new String[] {
             tstname,
             "filtertrace=true",
@@ -191,9 +180,6 @@ public class TestDrawable01NEWT {
             "logtestlistenerevents=true",
             "formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter",
             "formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,TEST-"+tstname+".xml" } );
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
 }
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.java
index 4970cbbdf..de7c8d43a 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.java
@@ -29,46 +29,45 @@
  * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
  * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
-
 package com.jogamp.test.junit.jogl.offscreen;
 
-import java.nio.*;
+import java.io.IOException;
 import javax.media.opengl.*;
 
-import com.jogamp.opengl.util.texture.TextureData;
 import com.jogamp.opengl.util.texture.TextureIO;
 import java.io.File;
-import java.io.IOException;
-
-import javax.media.nativewindow.*;
 
 public class ReadBuffer2File extends ReadBufferBase {
 
-    public ReadBuffer2File (GLDrawable externalRead) {
+    public ReadBuffer2File(GLDrawable externalRead) {
         super(externalRead);
     }
 
+    @Override
     public void dispose(GLAutoDrawable drawable) {
         super.dispose(drawable);
     }
+    int shotNum = 0;
 
-    int shotNum=0;
-
-    void copyTextureData2File() {
-      if(!readBufferUtil.isValid()) return;
+    void copyTextureData2File() throws IOException {
+        if (!readBufferUtil.isValid()) {
+            return;
+        }
 
-      try {
-        File file = File.createTempFile("shot"+shotNum+"-", ".ppm");
+        File file = File.createTempFile("shot" + shotNum + "-", ".ppm");
         TextureIO.write(readBufferUtil.getTextureData(), file);
-        System.out.println("Wrote: "+file.getAbsolutePath()+", ...");
+        System.out.println("Wrote: " + file.getAbsolutePath() + ", ...");
         shotNum++;
-      } catch (IOException ioe) { ioe.printStackTrace(); }
-      readBufferUtil.rewindPixelBuffer();
+        readBufferUtil.rewindPixelBuffer();
     }
 
+    @Override
     public void display(GLAutoDrawable drawable) {
         super.display(drawable);
-        copyTextureData2File();
+        try {
+            copyTextureData2File();
+        } catch (IOException ex) {
+            throw new RuntimeException("can not read buffer to file", ex);
+        }
     }
 }
-
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2Screen.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2Screen.java
index 1166cc1e5..030a7e173 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2Screen.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBuffer2Screen.java
@@ -54,6 +54,7 @@ public class ReadBuffer2Screen extends ReadBufferBase {
         super(externalRead);
     }
 
+    @Override
     public void init(GLAutoDrawable drawable) {
         super.init(drawable);
 
@@ -84,6 +85,7 @@ public class ReadBuffer2Screen extends ReadBufferBase {
         gl.glClearColor(0.5f, 0.5f, 0.5f, 0.4f);
     }
 
+    @Override
     public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
         super.reshape(drawable, x, y, width, height);
 
@@ -103,24 +105,25 @@ public class ReadBuffer2Screen extends ReadBufferBase {
         }
 
         // Identity ..
-        pmvMatrix.glMatrixMode(pmvMatrix.GL_MODELVIEW);
+        pmvMatrix.glMatrixMode(PMVMatrix.GL_MODELVIEW);
         pmvMatrix.glLoadIdentity();
         pmvMatrix.glTranslatef(0, 0, -2.5f);
         if(null!=glM) {
-            glM.glMatrixMode(pmvMatrix.GL_MODELVIEW);
+            glM.glMatrixMode(PMVMatrix.GL_MODELVIEW);
             glM.glLoadMatrixf(pmvMatrix.glGetMvMatrixf());
         }
 
         // Set location in front of camera
-        pmvMatrix.glMatrixMode(pmvMatrix.GL_PROJECTION);
+        pmvMatrix.glMatrixMode(PMVMatrix.GL_PROJECTION);
         pmvMatrix.glLoadIdentity();
         pmvMatrix.gluPerspective(45.0f, (float)width / (float)height, 1.0f, 100.0f);
         if(null!=glM) {
-            glM.glMatrixMode(pmvMatrix.GL_PROJECTION);
+            glM.glMatrixMode(PMVMatrix.GL_PROJECTION);
             glM.glLoadMatrixf(pmvMatrix.glGetPMatrixf());
         }
     }
 
+    @Override
     public void dispose(GLAutoDrawable drawable) {
         super.dispose(drawable);
     }
@@ -172,6 +175,7 @@ public class ReadBuffer2Screen extends ReadBufferBase {
         }
     }
 
+    @Override
     public void display(GLAutoDrawable drawable) {
         super.display(drawable);
 
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferBase.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferBase.java
index 597b21782..4841d33e9 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferBase.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferBase.java
@@ -54,13 +54,17 @@ public class ReadBufferBase implements GLEventListener {
         if(glDebug) {
             try {
                 _gl = _gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Debug", null, _gl, null) );
-            } catch (Exception e) {e.printStackTrace();} 
+            } catch (Exception e) {
+                throw new RuntimeException("can not set debug pipeline", e);
+            }
         }
 
         if(glTrace) {
             try {
                 _gl = _gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", null, _gl, new Object[] { System.err } ) );
-            } catch (Exception e) {e.printStackTrace();} 
+            } catch (Exception e) {
+                throw new RuntimeException("can not set trace pipeline", e);
+            }
         }
 
         System.out.println(_gl);
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferUtil.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferUtil.java
index d409093f4..ff3b9b58a 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferUtil.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/ReadBufferUtil.java
@@ -76,10 +76,10 @@ public class ReadBufferUtil {
                            null /* Flusher */);
                 newData = true;
             } catch (Exception e) {
-                e.printStackTrace();
                 readTextureData = null;
                 readPixelBuffer = null;
                 readPixelSizeLast = 0;
+                throw new RuntimeException("can not fetch offscreen texture", e);
             }
         }
         if(null!=readPixelBuffer) {
@@ -98,6 +98,7 @@ public class ReadBufferUtil {
         }
     }
 
+    @SuppressWarnings("deprecation")
     public void dispose() {
         readTexture.dispose();
         readTextureData = null;
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/Surface2File.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/Surface2File.java
index b4f1ba743..2799d72c4 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/Surface2File.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/Surface2File.java
@@ -29,7 +29,6 @@
  * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
  * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
-
 package com.jogamp.test.junit.jogl.offscreen;
 
 import javax.media.opengl.*;
@@ -44,37 +43,40 @@ import javax.media.nativewindow.*;
 public class Surface2File implements SurfaceUpdatedListener {
 
     ReadBufferUtil readBufferUtil = new ReadBufferUtil();
-    int shotNum=0;
+    int shotNum = 0;
 
     public void dispose() {
         readBufferUtil.dispose();
     }
 
     public void surfaceUpdated(Object updater, NativeWindow window, long when) {
-        if(updater instanceof GLDrawable) {
+        if (updater instanceof GLDrawable) {
             GLDrawable drawable = (GLDrawable) updater;
             GLContext ctx = GLContext.getCurrent();
-            if(null!=ctx && ctx.getGLDrawable()==drawable) {
+            if (null != ctx && ctx.getGLDrawable() == drawable) {
                 GL gl = ctx.getGL();
                 // FIXME glFinish() is an expensive paranoia sync, should not be necessary due to spec
-                gl.glFinish(); 
+                gl.glFinish();
                 readBufferUtil.fetchOffscreenTexture(drawable, gl);
                 gl.glFinish();
-                surface2File("shot");
+                try {
+                    surface2File("shot");
+                } catch (IOException ex) {
+                    throw new RuntimeException("can not write survace to file", ex);
+                }
             }
         }
     }
 
-    public void surface2File(String basename) {
-      if(!readBufferUtil.isValid()) return;
+    public void surface2File(String basename) throws IOException {
+        if (!readBufferUtil.isValid()) {
+            return;
+        }
 
-      try {
-        File file = File.createTempFile(basename+shotNum+"-", ".ppm");
+        File file = File.createTempFile(basename + shotNum + "-", ".ppm");
         TextureIO.write(readBufferUtil.getTextureData(), file);
-        System.out.println("Wrote: "+file.getAbsolutePath()+", ...");
+        System.out.println("Wrote: " + file.getAbsolutePath() + ", ...");
         shotNum++;
-      } catch (IOException ioe) { ioe.printStackTrace(); }
-      readBufferUtil.rewindPixelBuffer();
+        readBufferUtil.rewindPixelBuffer();
     }
 }
-
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
index e5e7c4a52..ec03bec95 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
@@ -52,6 +52,7 @@ import com.jogamp.newt.opengl.*;
 
 import com.jogamp.test.junit.jogl.demos.gl2.gears.Gears;
 import com.jogamp.test.junit.jogl.demos.es1.RedSquare;
+import java.io.IOException;
 
 public class TestOffscreen01NEWT {
     static GLProfile glp;
@@ -357,9 +358,8 @@ public class TestOffscreen01NEWT {
             display.destroy();
         }
     }
-    public static void main(String args[]) {
+    public static void main(String args[]) throws IOException {
         String tstname = TestOffscreen01NEWT.class.getName();
-        try {
         org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(new String[] {
             tstname,
             "filtertrace=true",
@@ -371,9 +371,6 @@ public class TestOffscreen01NEWT {
             "logtestlistenerevents=true",
             "formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter",
             "formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,TEST-"+tstname+".xml" } );
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
 }
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
index 7afa7b1e5..1a0553ded 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
@@ -36,7 +36,6 @@ import com.jogamp.test.junit.util.*;
 
 import org.junit.Assert;
 
-import java.lang.reflect.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.jogamp.newt.*;
@@ -56,8 +55,8 @@ public class WindowUtilNEWT {
         Assert.assertNotNull(demo);
         Assert.assertNotNull(window);
         if(debug) {
-            MiscUtils.setField(demo, "glDebug", new Boolean(true));
-            MiscUtils.setField(demo, "glTrace", new Boolean(true));
+            MiscUtils.setField(demo, "glDebug", true);
+            MiscUtils.setField(demo, "glTrace", true);
         }
         if(!MiscUtils.setField(demo, "window", window)) {
             MiscUtils.setField(demo, "glWindow", glWindow);
@@ -67,52 +66,48 @@ public class WindowUtilNEWT {
     public static void run(GLWindow windowOffScreen, GLEventListener demo, 
                            GLWindow windowOnScreen, WindowListener wl, MouseListener ml, 
                            SurfaceUpdatedListener ul, int frames, boolean snapshot, boolean debug) {
-        try {
-            Assert.assertNotNull(windowOffScreen);
-            Assert.assertNotNull(demo);
-
-            setDemoFields(demo, windowOffScreen, windowOffScreen, debug);
-            windowOffScreen.addGLEventListener(demo);
-
-            if ( null != windowOnScreen ) {
-                if(null!=wl) {
-                    windowOnScreen.addWindowListener(wl);
-                }
-                if(null!=ml) {
-                    windowOnScreen.addMouseListener(ml);
-                }
-                windowOnScreen.setVisible(true);
-            }
+        Assert.assertNotNull(windowOffScreen);
+        Assert.assertNotNull(demo);
 
-            GLDrawable readDrawable = windowOffScreen.getContext().getGLDrawable() ;
+        setDemoFields(demo, windowOffScreen, windowOffScreen, debug);
+        windowOffScreen.addGLEventListener(demo);
 
-            if ( null == windowOnScreen ) {
-                if(snapshot) {
-                    Surface2File s2f = new Surface2File();
-                    windowOffScreen.addSurfaceUpdatedListener(s2f);
-                }
-            } else {
-                ReadBuffer2Screen readDemo = new ReadBuffer2Screen( readDrawable ) ;
-                windowOnScreen.addGLEventListener(readDemo);
+        if ( null != windowOnScreen ) {
+            if(null!=wl) {
+                windowOnScreen.addWindowListener(wl);
             }
-            if(null!=ul) {
-                windowOffScreen.addSurfaceUpdatedListener(ul);
+            if(null!=ml) {
+                windowOnScreen.addMouseListener(ml);
             }
+            windowOnScreen.setVisible(true);
+        }
 
-            if(debug) {
-                System.out.println("+++++++++++++++++++++++++++");
-                System.out.println(windowOffScreen);
-                System.out.println("+++++++++++++++++++++++++++");
-            }
+        GLDrawable readDrawable = windowOffScreen.getContext().getGLDrawable() ;
 
-            while ( windowOffScreen.getTotalFrames() < frames) {
-                windowOffScreen.display();
+        if ( null == windowOnScreen ) {
+            if(snapshot) {
+                Surface2File s2f = new Surface2File();
+                windowOffScreen.addSurfaceUpdatedListener(s2f);
             }
-            windowOffScreen.removeAllSurfaceUpdatedListener();
+        } else {
+            ReadBuffer2Screen readDemo = new ReadBuffer2Screen( readDrawable ) ;
+            windowOnScreen.addGLEventListener(readDemo);
+        }
+        if(null!=ul) {
+            windowOffScreen.addSurfaceUpdatedListener(ul);
+        }
 
-        } catch (GLException e) {
-            e.printStackTrace();
+        if(debug) {
+            System.out.println("+++++++++++++++++++++++++++");
+            System.out.println(windowOffScreen);
+            System.out.println("+++++++++++++++++++++++++++");
         }
+
+        while ( windowOffScreen.getTotalFrames() < frames) {
+            windowOffScreen.display();
+        }
+        windowOffScreen.removeAllSurfaceUpdatedListener();
+
     }
 
 }
diff --git a/src/junit/com/jogamp/test/junit/jogl/texture/TestTexture01AWT.java b/src/junit/com/jogamp/test/junit/jogl/texture/TestTexture01AWT.java
index d83e064bf..563c7f88e 100755
--- a/src/junit/com/jogamp/test/junit/jogl/texture/TestTexture01AWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/texture/TestTexture01AWT.java
@@ -36,16 +36,8 @@ import com.jogamp.test.junit.jogl.util.texture.gl2.TextureGL2ListenerDraw1;
 
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2ES1;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.GLCanvas;
-import com.jogamp.opengl.util.texture.Texture;
-import com.jogamp.opengl.util.texture.TextureCoords;
 import com.jogamp.opengl.util.texture.TextureData;
-import com.jogamp.opengl.util.texture.TextureIO;
 import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
 import com.jogamp.opengl.util.Animator;
 
@@ -54,15 +46,9 @@ import java.awt.Color;
 import java.awt.Frame;
 import java.awt.GradientPaint;
 import java.awt.Graphics2D;
-import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 
-import org.junit.Assert;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class TestTexture01AWT {
@@ -93,7 +79,7 @@ public class TestTexture01AWT {
     }
 
     @Test
-    public void test1() {
+    public void test1() throws InterruptedException {
         GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2GL3));
         GLCanvas glCanvas = new GLCanvas(caps);
         frame.add(glCanvas);
@@ -107,9 +93,7 @@ public class TestTexture01AWT {
         frame.setVisible(true);
         animator.start();
 
-        try {
-            Thread.sleep(1000); // 1000 ms
-        } catch (Exception e) {}
+        Thread.sleep(1000); // 1000 ms
 
         animator.stop();
         frame.setVisible(false);
diff --git a/src/junit/com/jogamp/test/junit/newt/TestWindows01NEWT.java b/src/junit/com/jogamp/test/junit/newt/TestWindows01NEWT.java
index 91760ae80..4969a685f 100755
--- a/src/junit/com/jogamp/test/junit/newt/TestWindows01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/newt/TestWindows01NEWT.java
@@ -47,6 +47,7 @@ import org.junit.Test;
 import javax.media.nativewindow.*;
 
 import com.jogamp.newt.*;
+import java.io.IOException;
 
 public class TestWindows01NEWT {
     static int width, height;
@@ -79,7 +80,7 @@ public class TestWindows01NEWT {
         // Create native OpenGL resources .. XGL/WGL/CGL .. 
         // equivalent to GLAutoDrawable methods: setVisible(true)
         // 
-        caps = (Capabilities) window.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
+        caps = window.getGraphicsConfiguration().getNativeGraphicsConfiguration().getChosenCapabilities();
         Assert.assertNotNull(caps);
         Assert.assertTrue(caps.getGreenBits()>5);
         Assert.assertTrue(caps.getBlueBits()>5);
@@ -102,7 +103,7 @@ public class TestWindows01NEWT {
     }
 
     @Test
-    public void testWindowDecor01Simple() {
+    public void testWindowDecor01Simple() throws InterruptedException {
         Capabilities caps = new Capabilities();
         Assert.assertNotNull(caps);
         Display display = NewtFactory.createDisplay(null); // local display
@@ -111,14 +112,12 @@ public class TestWindows01NEWT {
         Assert.assertNotNull(screen);
 
         Window window = createWindow(screen, caps, width, height, true /* onscreen */, false /* undecorated */);
-        try {
-            Thread.sleep(1000); // 1000 ms
-        } catch (Exception e) {}
+        Thread.sleep(1000); // 1000 ms
         destroyWindow(display, screen, window);
     }
 
     @Test
-    public void testWindowDecor02DestroyWinTwiceA() {
+    public void testWindowDecor02DestroyWinTwiceA() throws InterruptedException {
         Capabilities caps = new Capabilities();
         Assert.assertNotNull(caps);
         Display display = NewtFactory.createDisplay(null); // local display
@@ -127,15 +126,13 @@ public class TestWindows01NEWT {
         Assert.assertNotNull(screen);
 
         Window window = createWindow(screen, caps, width, height, true /* onscreen */, false /* undecorated */);
-        try {
-            Thread.sleep(1000); // 1000 ms
-        } catch (Exception e) {}
+        Thread.sleep(1000); // 1000 ms
         destroyWindow(null, null, window);
         destroyWindow(display, screen, window);
     }
 
     @Test
-    public void testWindowDecor03TwoWin() {
+    public void testWindowDecor03TwoWin() throws InterruptedException {
         Capabilities caps = new Capabilities();
         Assert.assertNotNull(caps);
         Display display = NewtFactory.createDisplay(null); // local display
@@ -145,16 +142,13 @@ public class TestWindows01NEWT {
 
         Window window1 = createWindow(screen, caps, width, height, true /* onscreen */, false /* undecorated */);
         Window window2 = createWindow(screen, caps, width, height, true /* onscreen */, false /* undecorated */);
-        try {
-            Thread.sleep(1000); // 1000 ms
-        } catch (Exception e) {}
+        Thread.sleep(1000); // 1000 ms
         destroyWindow(null, null, window2);
         destroyWindow(display, screen, window1);
     }
 
-    public static void main(String args[]) {
+    public static void main(String args[]) throws IOException {
         String tstname = TestWindows01NEWT.class.getName();
-        try {
         org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(new String[] {
             tstname,
             "filtertrace=true",
@@ -166,9 +160,6 @@ public class TestWindows01NEWT {
             "logtestlistenerevents=true",
             "formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter",
             "formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,TEST-"+tstname+".xml" } );
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
 }
diff --git a/src/junit/com/jogamp/test/junit/util/MiscUtils.java b/src/junit/com/jogamp/test/junit/util/MiscUtils.java
index 5114c3a84..8e53d9255 100644
--- a/src/junit/com/jogamp/test/junit/util/MiscUtils.java
+++ b/src/junit/com/jogamp/test/junit/util/MiscUtils.java
@@ -35,10 +35,14 @@ package com.jogamp.test.junit.util;
 import java.lang.reflect.*;
 
 public class MiscUtils {
+    @Deprecated
     public static int str2int(String str, int def) {
         try {
             return Integer.parseInt(str);
-        } catch (Exception ex) { ex.printStackTrace(); }
+        } catch (Exception ex) {
+            // FIXME
+            ex.printStackTrace();
+        }
         return def;
     }
 
@@ -51,10 +55,10 @@ public class MiscUtils {
             } else {
                 System.out.println(instance.getClass()+" '"+fieldName+"' field not assignable with "+value.getClass()+", it's a: "+f.getType());
             }
+        } catch (IllegalAccessException ex) {
+            throw new RuntimeException(ex);
         } catch (NoSuchFieldException nsfe) {
-            System.out.println(instance.getClass()+" has no '"+fieldName+"' field");
-        } catch (Throwable t) {
-            t.printStackTrace();
+            throw new RuntimeException(instance.getClass()+" has no '"+fieldName+"' field", nsfe);
         }
         return false;
     }
-- 
cgit v1.2.3


From bb028021be2714e66d9b1062298a3e308c649c56 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 16 Apr 2010 03:51:00 +0200
Subject: JOGL GL4 preperation:   - Re-Enable GL3bc native library build, works
 ..   - Adding all the is/get GL4/GL4bc stubs ..   - Adding dummy interface
 GL4 and GL4bc, will be removed when done

  - Context creation refactoring:
    - Move Version information to GLContext
    - Determine version by creation if possible (ARB_create_context),
      only use the unreliable GL_VERSION string if necessary.
    - Offering an almost platform independent ARB_create_context path:
        - createContextARBImpl - platform dependent GLX calls
        - createContextARB     - platform independent setup and version loop
---
 make/build-jogl.xml                                |   3 +-
 make/config/jogl/gl-common.cfg                     |   8 +-
 make/config/jogl/gl-gl3bc.cfg                      |   1 +
 make/config/jogl/gl-impl-CustomJavaCode-gl2.java   |  16 +
 .../jogl/gl-impl-CustomJavaCode-gl2es12.java       |  16 +
 make/config/jogl/gl-impl-CustomJavaCode-gl3.java   |  16 +
 make/config/jogl/gl-impl-CustomJavaCode-gl3bc.java |  16 +
 make/config/jogl/gl-impl-CustomJavaCode-gles1.java |  16 +
 make/config/jogl/gl-impl-CustomJavaCode-gles2.java |  16 +
 make/config/jogl/gl3ext-headers.cfg                |   5 +
 .../opengl/impl/ExtensionAvailabilityCache.java    | 221 ++------------
 .../com/jogamp/opengl/impl/GLContextImpl.java      | 323 ++++++++++++++++++++-
 .../com/jogamp/opengl/impl/egl/EGLContext.java     |  12 +-
 .../jogamp/opengl/impl/egl/EGLExternalContext.java |   2 +-
 .../opengl/impl/macosx/cgl/MacOSXCGLContext.java   |  12 +-
 .../impl/macosx/cgl/MacOSXExternalCGLContext.java  |   2 +-
 .../impl/macosx/cgl/MacOSXPbufferCGLContext.java   |   4 +-
 .../macosx/cgl/awt/MacOSXJava2DCGLContext.java     |   2 +-
 .../windows/wgl/WindowsExternalWGLContext.java     |   2 +-
 .../opengl/impl/windows/wgl/WindowsWGLContext.java |  16 +-
 .../opengl/impl/x11/glx/X11ExternalGLXContext.java |   2 +-
 .../jogamp/opengl/impl/x11/glx/X11GLXContext.java  | 302 ++++++++++---------
 src/jogl/classes/javax/media/opengl/GL4.java       |   5 +
 src/jogl/classes/javax/media/opengl/GL4bc.java     |   5 +
 src/jogl/classes/javax/media/opengl/GLBase.java    |  28 ++
 src/jogl/classes/javax/media/opengl/GLContext.java |  68 ++++-
 src/jogl/classes/javax/media/opengl/GLProfile.java | 120 ++++++--
 27 files changed, 826 insertions(+), 413 deletions(-)
 create mode 100755 make/config/jogl/gl3ext-headers.cfg
 create mode 100644 src/jogl/classes/javax/media/opengl/GL4.java
 create mode 100644 src/jogl/classes/javax/media/opengl/GL4bc.java

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 93cf7bf6f..d42b859bd 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -946,7 +946,7 @@
 
         <!-- Perform the first pass Java compile. -->
         <javac destdir="${classes}"
-               includes="javax/media/opengl/fixedfunc/** javax/media/opengl/GLDrawableFactory.java javax/media/opengl/GLDrawable.java javax/media/opengl/GLContext.java javax/media/opengl/GL.java javax/media/opengl/GL2ES1.java javax/media/opengl/GL2ES2.java javax/media/opengl/GL2GL3.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java javax/media/opengl/GL3.java javax/media/opengl/GL3bc.java"
+               includes="javax/media/opengl/fixedfunc/** javax/media/opengl/GLDrawableFactory.java javax/media/opengl/GLDrawable.java javax/media/opengl/GLContext.java javax/media/opengl/GL.java javax/media/opengl/GL2ES1.java javax/media/opengl/GL2ES2.java javax/media/opengl/GL2GL3.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java javax/media/opengl/GL3.java javax/media/opengl/GL3bc.java javax/media/opengl/GL4.java javax/media/opengl/GL4bc.java"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
                includeAntRuntime="false"
@@ -1261,6 +1261,7 @@
 
           <include name="${rootrel.generated.c.jogl}/gl2/GL2Impl_JNI.c"/>
           <include name="${rootrel.generated.c.jogl}/gl3/GL3Impl_JNI.c"/>
+          <include name="${rootrel.generated.c.jogl}/gl3/GL3bcImpl_JNI.c"/>
           <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY -->
           <include name="${rootrel.generated.c.jogl}/gl2/GLUgl2_JNI.c"/>
           <include name="${rootrel.generated.c.jogl}/X11/GLX*.c" if="isX11"/>
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index 0f6529167..8d726c4bf 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -388,8 +388,12 @@ ArgumentIsString glTransformFeedbackVaryings 2
 # Use cached GL_EXTENSION if possible,
 # which also allows GL3 compatibility.
 #
-JavaPrologue glGetString  if(GL.GL_EXTENSIONS==name && _context.isExtensionCacheInitialized()) {
-JavaPrologue glGetString    return _context.getGLExtensions();
+JavaPrologue glGetString  if(_context.isExtensionCacheInitialized()) {
+JavaPrologue glGetString    if(GL.GL_EXTENSIONS==name) {
+JavaPrologue glGetString        return _context.getGLExtensions();
+JavaPrologue glGetString    } /* else if(GL.GL_VERSION==name) {
+JavaPrologue glGetString        return _context.getGLVersion();
+JavaPrologue glGetString    } */
 JavaPrologue glGetString  }
 
 #
diff --git a/make/config/jogl/gl-gl3bc.cfg b/make/config/jogl/gl-gl3bc.cfg
index a637df941..7bba2f635 100644
--- a/make/config/jogl/gl-gl3bc.cfg
+++ b/make/config/jogl/gl-gl3bc.cfg
@@ -83,6 +83,7 @@ CustomJavaCode GL3bcImpl public void glDepthRangef(float zNear, float zFar) {
 CustomJavaCode GL3bcImpl    glDepthRange((double)zNear, (double)zFar); }
 
 Include gl-headers.cfg
+Include gl3ext-headers.cfg
 Include ../intptr.cfg
 
 IncludeAs CustomJavaCode GL3bcImpl gl-impl-CustomJavaCode-common.java
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2.java
index cd1a24459..0658b8a01 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2.java
@@ -28,6 +28,14 @@ public final boolean isGL() {
     return true;
 }
   
+public final boolean isGL4bc() {
+    return false;
+}
+
+public final boolean isGL4() {
+    return false;
+}
+
 public final boolean isGL3bc() {
     return false;
 }
@@ -72,6 +80,14 @@ public final GL getGL() throws GLException {
     return this;
 }
 
+public final GL4bc getGL4bc() throws GLException {
+    throw new GLException("Not a GL4bc implementation");
+}
+
+public final GL4 getGL4() throws GLException {
+    throw new GLException("Not a GL4 implementation");
+}
+
 public final GL3bc getGL3bc() throws GLException {
     throw new GLException("Not a GL3bc implementation");
 }
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
index 2eca2b6ab..54c7bd92b 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
@@ -30,6 +30,14 @@ public final boolean isGL() {
     return true;
 }
 
+public final boolean isGL4bc() {
+    return false;
+}
+
+public final boolean isGL4() {
+    return false;
+}
+
 public final boolean isGL3bc() {
     return false;
 }
@@ -74,6 +82,14 @@ public final GL getGL() throws GLException {
     return this;
 }
 
+public final GL4bc getGL4bc() throws GLException {
+    throw new GLException("Not a GL4bc implementation");
+}
+
+public final GL4 getGL4() throws GLException {
+    throw new GLException("Not a GL4 implementation");
+}
+
 public final GL3bc getGL3bc() throws GLException {
     throw new GLException("Not a GL3bc implementation");
 }
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl3.java b/make/config/jogl/gl-impl-CustomJavaCode-gl3.java
index 16ff008cf..cff0b0f94 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl3.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl3.java
@@ -27,6 +27,14 @@ public final boolean isGL() {
     return true;
 }
   
+public final boolean isGL4bc() {
+    return false;
+}
+
+public final boolean isGL4() {
+    return false;
+}
+
 public final boolean isGL3bc() {
     return false;
 }
@@ -71,6 +79,14 @@ public final GL getGL() throws GLException {
     return this;
 }
 
+public final GL4bc getGL4bc() throws GLException {
+    throw new GLException("Not a GL4bc implementation");
+}
+
+public final GL4 getGL4() throws GLException {
+    throw new GLException("Not a GL4 implementation");
+}
+
 public final GL3bc getGL3bc() throws GLException {
     throw new GLException("Not a GL3bc implementation");
 }
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl3bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl3bc.java
index 2b7f14918..2f804a218 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl3bc.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl3bc.java
@@ -28,6 +28,14 @@ public final boolean isGL() {
     return true;
 }
   
+public final boolean isGL4bc() {
+    return false;
+}
+
+public final boolean isGL4() {
+    return false;
+}
+
 public final boolean isGL3bc() {
     return true;
 }
@@ -72,6 +80,14 @@ public final GL getGL() throws GLException {
     return this;
 }
 
+public final GL4bc getGL4bc() throws GLException {
+    throw new GLException("Not a GL4bc implementation");
+}
+
+public final GL4 getGL4() throws GLException {
+    throw new GLException("Not a GL4 implementation");
+}
+
 public final GL3bc getGL3bc() throws GLException {
     return this;
 }
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index dfef10ec9..6fb8a32ef 100755
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -10,6 +10,14 @@ public final boolean isGL() {
     return true;
 }
   
+public final boolean isGL4bc() {
+    return false;
+}
+
+public final boolean isGL4() {
+    return false;
+}
+
 public final boolean isGL3bc() {
     return false;
 }
@@ -54,6 +62,14 @@ public final GL getGL() throws GLException {
     return this;
 }
 
+public final GL4bc getGL4bc() throws GLException {
+    throw new GLException("Not a GL4bc implementation");
+}
+
+public final GL4 getGL4() throws GLException {
+    throw new GLException("Not a GL4 implementation");
+}
+
 public final GL3bc getGL3bc() throws GLException {
     throw new GLException("Not a GL3bc implementation");
 }
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
index 7287408a0..8204bd1ae 100755
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
@@ -14,6 +14,14 @@ public final boolean isGL() {
     return true;
 }
   
+public final boolean isGL4bc() {
+    return false;
+}
+
+public final boolean isGL4() {
+    return false;
+}
+
 public final boolean isGL3bc() {
     return false;
 }
@@ -58,6 +66,14 @@ public final GL getGL() throws GLException {
     return this;
 }
 
+public final GL4bc getGL4bc() throws GLException {
+    throw new GLException("Not a GL4bc implementation");
+}
+
+public final GL4 getGL4() throws GLException {
+    throw new GLException("Not a GL4 implementation");
+}
+
 public final GL3bc getGL3bc() throws GLException {
     throw new GLException("Not a GL3bc implementation");
 }
diff --git a/make/config/jogl/gl3ext-headers.cfg b/make/config/jogl/gl3ext-headers.cfg
new file mode 100755
index 000000000..dfc4ea796
--- /dev/null
+++ b/make/config/jogl/gl3ext-headers.cfg
@@ -0,0 +1,5 @@
+CustomCCode /* Define GL_GL3EXT_PROTOTYPES so that the OpenGL extension prototypes in
+CustomCCode    "gl3ext.h" are parsed. */
+CustomCCode #define GL_GL3EXT_PROTOTYPES
+CustomCCode #include <GL3/gl3ext.h>
+CustomCCode #include <GL3/gl3ext.h>
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java b/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
index f36c4f749..082f006e8 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
@@ -66,12 +66,10 @@ public final class ExtensionAvailabilityCache {
   public void flush()
   {
     if(DEBUG) {
-        System.out.println("ExtensionAvailabilityCache: Flush availability OpenGL "+majorVersion+"."+minorVersion);
+        System.out.println("ExtensionAvailabilityCache: Flush availability OpenGL "+context.getGLVersion());
     }
     availableExtensionCache.clear();
     initialized = false;
-    majorVersion = 1;
-    minorVersion = 0;
   }
 
   /**
@@ -104,53 +102,23 @@ public final class ExtensionAvailabilityCache {
     return glExtensions;
   }
 
-  public int getMajorVersion() {
-    initAvailableExtensions();
-    return majorVersion;
-  }
-
-  public int getMinorVersion() {
-    initAvailableExtensions();
-    return minorVersion;
-  }
-
   private void initAvailableExtensions() {
+    GL gl = context.getGL();
     // if hash is empty (meaning it was flushed), pre-cache it with the list
     // of extensions that are in the GL_EXTENSIONS string
     if (availableExtensionCache.isEmpty() || !initialized) {
-      GL gl = context.getGL();
-
       if (DEBUG) {
-         System.err.println("ExtensionAvailabilityCache: Pre-caching init "+gl+", GL_VERSION "+gl.glGetString(GL.GL_VERSION));
-      }
-
-      // Set version
-      Version version = new Version(gl.glGetString(GL.GL_VERSION));
-      if (version.isValid()) {
-        majorVersion = version.getMajor();
-        minorVersion = version.getMinor();
-
-        if( !gl.isGL3() &&
-            ( majorVersion > 3 ||
-              ( majorVersion == 3 && minorVersion >= 1 ) ) ) {
-            // downsize version to 3.0 in case we are not using GL3 (3.1)
-            majorVersion = 3;
-            minorVersion = 0;
-        }
+         System.err.println("ExtensionAvailabilityCache: Pre-caching init "+gl+", OpenGL "+context.getGLVersion());
       }
 
       boolean useGetStringi = false;
 
-      if ( majorVersion > 3 ||
-           ( majorVersion == 3 && minorVersion >= 0 ) ||
+      if ( context.getGLVersionMajor() > 3 ||
+           ( context.getGLVersionMajor() == 3 && context.getGLVersionMinor() >= 0 ) ||
            gl.isGL3() ) {
-          if ( ! gl.isGL2GL3() ) {
+          if ( ! gl.isFunctionAvailable("glGetStringi") ) {
             if(DEBUG) {
-                System.err.println("ExtensionAvailabilityCache: GL >= 3.1 usage, but no GL2GL3 interface: "+gl.getClass().getName());
-            }
-          } else if ( ! gl.isFunctionAvailable("glGetStringi") ) {
-            if(DEBUG) {
-                System.err.println("ExtensionAvailabilityCache: GL >= 3.1 usage, but no glGetStringi");
+                System.err.println("GLContext: GL >= 3.1 usage, but no glGetStringi");
             }
           } else {
               useGetStringi = true;
@@ -158,7 +126,7 @@ public final class ExtensionAvailabilityCache {
       }
 
       if (DEBUG) {
-        System.err.println("ExtensionAvailabilityCache: Pre-caching extension availability OpenGL "+majorVersion+"."+minorVersion+
+        System.err.println("ExtensionAvailabilityCache: Pre-caching extension availability OpenGL "+context.getGLVersion()+
                            ", use "+ ( useGetStringi ? "glGetStringi" : "glGetString" ) );
       }
 
@@ -197,39 +165,21 @@ public final class ExtensionAvailabilityCache {
         }
       }
 
-      // Put GL version strings in the table as well
-      // FIXME: this needs to be adjusted when the major rev changes
-      // beyond the known ones
-      int major = majorVersion;
-      int minor = minorVersion;
-      while (major > 0) {
-        while (minor >= 0) {
-          availableExtensionCache.add("GL_VERSION_" + major + "_" + minor);
-          if (DEBUG) {
-            System.err.println("ExtensionAvailabilityCache: Added GL_VERSION_" + major + "_" + minor + " to known extensions");
-          }
-          --minor;
-        }
-
-        switch (major) {
-        case 3:
-          if(gl.isGL3()) {
-              // GL3 is a GL 3.1 forward compatible context,
-              // hence no 2.0, 1.0 - 1.5 GL versions are supported.
-              major=0; 
-          }
-          // Restart loop at version 2.1
-          minor = 1;
-          break;
-        case 2:
-          // Restart loop at version 1.5
-          minor = 5;
-          break;
-        case 1:
-          break;
+      int major[] = new int[] { context.getGLVersionMajor() };
+      int minor[] = new int[] { context.getGLVersionMinor() };
+      if( !gl.isGL3() && !gl.isGL4() &&
+            ( major[0] > 3 ||
+              ( major[0] == 3 && minor[0] >= 1 ) ) ) {
+            // downsize version to 3.0 in case we are not using GL3 (>=3.1)
+            major[0] = 3;
+            minor[0] = 0;
+      }
+      while (GLProfile.isValidGLVersion(major[0], minor[0])) {
+        availableExtensionCache.add("GL_VERSION_" + major[0] + "_" + minor[0]);
+        if (DEBUG) {
+            System.err.println("ExtensionAvailabilityCache: Added GL_VERSION_" + major[0] + "_" + minor[0] + " to known extensions");
         }
-
-        --major;
+        if(!GLProfile.decrementGLVersion(major, minor)) break;
       }
 
       // put a dummy var in here so that the cache is no longer empty even if
@@ -255,136 +205,9 @@ public final class ExtensionAvailabilityCache {
   //
 
   private boolean initialized = false;
-  private int majorVersion = 1;
-  private int minorVersion = 0;
   private String glExtensions = null;
   private String glXExtensions = null;
   private HashSet availableExtensionCache = new HashSet(50);
   private GLContextImpl context;
 
-  /**
-   * A class for storing and comparing OpenGL version numbers.
-   * This only works for desktop OpenGL at the moment.
-   */
-  private static class Version implements Comparable
-  {
-    private boolean valid;
-    private int major, minor, sub;
-    public Version(int majorRev, int minorRev, int subMinorRev)
-    {
-      major = majorRev;
-      minor = minorRev;
-      sub = subMinorRev;
-    }
-
-    /**
-     * @param versionString must be of the form "GL_VERSION_X" or
-     * "GL_VERSION_X_Y" or "GL_VERSION_X_Y_Z" or "X.Y", where X, Y,
-     * and Z are integers.
-     *
-     * @exception IllegalArgumentException if the argument is not a valid
-     * OpenGL version identifier
-     */
-    public Version(String versionString)
-    {
-      try 
-      {
-        if (versionString.startsWith("GL_VERSION_"))
-        {
-          StringTokenizer tok = new StringTokenizer(versionString, "_");
-
-          tok.nextToken(); // GL_
-          tok.nextToken(); // VERSION_ 
-          if (!tok.hasMoreTokens()) { major = 0; return; }
-          major = Integer.valueOf(tok.nextToken()).intValue();
-          if (!tok.hasMoreTokens()) { minor = 0; return; }
-          minor = Integer.valueOf(tok.nextToken()).intValue();
-          if (!tok.hasMoreTokens()) { sub = 0; return; }
-          sub = Integer.valueOf(tok.nextToken()).intValue();
-        }
-        else
-        {
-          int radix = 10;
-          if (versionString.length() > 2) {
-            if (Character.isDigit(versionString.charAt(0)) &&
-                versionString.charAt(1) == '.' &&
-                Character.isDigit(versionString.charAt(2))) {
-              major = Character.digit(versionString.charAt(0), radix);
-              minor = Character.digit(versionString.charAt(2), radix);
-
-              // See if there's version-specific information which might
-              // imply a more recent OpenGL version
-              StringTokenizer tok = new StringTokenizer(versionString, " ");
-              if (tok.hasMoreTokens()) {
-                tok.nextToken();
-                if (tok.hasMoreTokens()) {
-                  String token = tok.nextToken();
-                  int i = 0;
-                  while (i < token.length() && !Character.isDigit(token.charAt(i))) {
-                    i++;
-                  }
-                  if (i < token.length() - 2 &&
-                      Character.isDigit(token.charAt(i)) &&
-                      token.charAt(i+1) == '.' &&
-                      Character.isDigit(token.charAt(i+2))) {
-                    int altMajor = Character.digit(token.charAt(i), radix);
-                    int altMinor = Character.digit(token.charAt(i+2), radix);
-                    // Avoid possibly confusing situations by putting some
-                    // constraints on the upgrades we do to the major and
-                    // minor versions
-                    if ((altMajor == major && altMinor > minor) ||
-                        altMajor == major + 1) {
-                      major = altMajor;
-                      minor = altMinor;
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        valid = true;
-      }
-      catch (Exception e)
-      {
-        // FIXME: refactor desktop OpenGL dependencies and make this
-        // class work properly for OpenGL ES
-        System.err.println("ExtensionAvailabilityCache: FunctionAvailabilityCache.Version.<init>: "+e);
-        major = 1;
-        minor = 0;
-        /*
-        throw (IllegalArgumentException)
-          new IllegalArgumentException(
-            "Illegally formatted version identifier: \"" + versionString + "\"")
-              .initCause(e);
-        */
-      }
-    }
-
-    public boolean isValid() {
-      return valid;
-    }
-
-    public int compareTo(Object o)
-    {
-      Version vo = (Version)o;
-      if (major > vo.major) return 1; 
-      else if (major < vo.major) return -1; 
-      else if (minor > vo.minor) return 1; 
-      else if (minor < vo.minor) return -1; 
-      else if (sub > vo.sub) return 1; 
-      else if (sub < vo.sub) return -1; 
-
-      return 0; // they are equal
-    }
-
-    public int getMajor() {
-      return major;
-    }
-
-    public int getMinor() {
-      return minor;
-    }
-    
-  } // end class Version
 }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
index 7543a1084..8c5890d1e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
@@ -44,6 +44,7 @@ import java.nio.*;
 import java.util.*;
 
 import javax.media.opengl.*;
+import javax.media.nativewindow.*;
 import com.jogamp.nativewindow.impl.NWReflection;
 import com.jogamp.gluegen.runtime.*;
 import com.jogamp.gluegen.runtime.opengl.*;
@@ -122,6 +123,108 @@ public abstract class GLContextImpl extends GLContext {
     return (GLDrawableImpl) getGLDrawable();
   }
 
+  /** 
+   * Platform dependent but harmonized implementation of the <code>ARB_create_context</code>
+   * mechanism to create a context.<br>
+   * The implementation shall verify this context, ie issue a
+   * <code>MakeCurrent</code> call if necessary.<br>
+   *
+   * @param share the shared context or null
+   * @param direct flag if direct is requested
+   * @param ctxOptionFlags <code>ARB_create_context</code> related, see references below
+   * @param major major number
+   * @param minor minor number
+   * @return the valid context if successfull, or null
+   *
+   * @see #CTX_PROFILE_COMPAT
+   * @see #CTX_OPTION_FORWARD
+   * @see #CTX_OPTION_DEBUG
+   */
+  protected abstract long createContextARBImpl(long share, boolean direct, int ctxOptionFlags, 
+                                               int major, int minor);
+
+  private long createContextARB(long share, boolean direct, int ctxOptionFlags, 
+                                int majorMax, int minorMax, 
+                                int majorMin, int minorMin, 
+                                int major[], int minor[]) {
+    major[0]=majorMax;
+    minor[0]=minorMax;
+    long _context=0;
+
+    while ( 0==_context &&
+            GLProfile.isValidGLVersion(major[0], minor[0]) &&
+            ( major[0]>majorMin || major[0]==majorMin && minor[0] >=minorMin ) ) {
+
+        _context = createContextARBImpl(share, direct, ctxOptionFlags, major[0], minor[0]);
+
+        if(0==_context) {
+            if(!GLProfile.decrementGLVersion(major, minor)) break;
+        }
+    }
+    return _context;
+  }
+
+  /**
+   * Platform independent part of using the <code>ARB_create_context</code>
+   * mechanism to create a context.<br>
+   */
+  protected long createContextARB(long share, boolean direct,
+                                  int major[], int minor[], int ctp[]) 
+  {
+    AbstractGraphicsConfiguration config = drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    GLCapabilities glCaps = (GLCapabilities) config.getChosenCapabilities();
+    GLProfile glp = glCaps.getGLProfile();
+    long _context = 0;
+
+    ctp[0] = CTX_IS_ARB_CREATED | CTX_PROFILE_CORE | CTX_OPTION_ANY; // default
+    boolean isBackwardCompatibility = glp.isGL2() || glp.isGL3bc() || glp.isGL4bc() ;
+    int majorMin, minorMin;
+    int majorMax, minorMax;
+    if( glp.isGL4() ) {
+        // ?? majorMax=GLProfile.getMaxMajor(); minorMax=GLProfile.getMaxMinor(majorMax);
+        majorMax=4; minorMax=GLProfile.getMaxMinor(majorMax);
+        majorMin=4; minorMin=0;
+    } else if( glp.isGL3() ) {
+        majorMax=3; minorMax=GLProfile.getMaxMinor(majorMax);
+        majorMin=3; minorMin=1;
+    } else /* if( glp.isGL2() ) */ {
+        majorMax=3; minorMax=0;
+        majorMin=1; minorMin=1; // our minimum desktop OpenGL runtime requirements
+    }
+    // Try the requested ..
+    if(isBackwardCompatibility) {
+        ctp[0] &= ~CTX_PROFILE_CORE ;
+        ctp[0] |=  CTX_PROFILE_COMPAT ;
+    }
+    _context = createContextARB(share, direct, ctp[0], 
+                               /* max */ majorMax, minorMax,
+                               /* min */ majorMin, minorMin,
+                               /* res */ major, minor);
+
+    if(0==_context && !isBackwardCompatibility) {
+        ctp[0] &= ~CTX_PROFILE_COMPAT ;
+        ctp[0] |=  CTX_PROFILE_CORE ;
+        ctp[0] &= ~CTX_OPTION_ANY ;
+        ctp[0] |=  CTX_OPTION_FORWARD ;
+        _context = createContextARB(share, direct, ctp[0], 
+                                   /* max */ majorMax, minorMax,
+                                   /* min */ majorMin, minorMin,
+                                   /* res */ major, minor);
+       if(0==_context) {
+            // Try a compatible one .. even though not requested .. last resort
+            ctp[0] &= ~CTX_PROFILE_CORE ;
+            ctp[0] |=  CTX_PROFILE_COMPAT ;
+            ctp[0] &= ~CTX_OPTION_FORWARD ;
+            ctp[0] |=  CTX_OPTION_ANY ;
+            _context = createContextARB(share, direct, ctp[0], 
+                                       /* max */ majorMax, minorMax,
+                                       /* min */ majorMin, minorMin,
+                                       /* res */ major, minor);
+       }
+    }
+    return _context;
+  }
+
   public int makeCurrent() throws GLException {
     // Support calls to makeCurrent() over and over again with
     // different contexts without releasing them
@@ -272,7 +375,7 @@ public abstract class GLContextImpl extends GLContext {
     if(DEBUG) {
         String sgl1 = (null!=this.gl)?this.gl.getClass().toString()+", "+this.gl.toString():new String("<null>");
         String sgl2 = (null!=gl)?gl.getClass().toString()+", "+gl.toString():new String("<null>");
-        Exception e = new Exception("setGL: "+Thread.currentThread()+", "+sgl1+" -> "+sgl2);
+        Exception e = new Exception("setGL (OpenGL "+getGLVersion()+"): "+Thread.currentThread()+", "+sgl1+" -> "+sgl2);
         e.printStackTrace();
     }
     this.gl = gl;
@@ -281,6 +384,77 @@ public abstract class GLContextImpl extends GLContext {
 
   public abstract Object getPlatformGLExtensions();
 
+  //----------------------------------------------------------------------
+  // Managing the actual OpenGL version, usually figured at creation time.
+  // As a last resort, the GL_VERSION string may be used ..
+  //
+
+  /** 
+   * If major > 0 || minor > 0 : Use passed values, determined at creation time 
+   * If major==0 && minor == 0 : Use GL_VERSION
+   * Otherwise .. don't touch ..
+   */
+  protected void setContextVersion(int major, int minor, int ctp) {
+      if(major>0 || minor>0) {
+          ctxMajorVersion = major;
+          ctxMinorVersion = minor;
+          ctxOptions = ctp;
+          ctxVersionString = getGLVersion(gl, ctxMajorVersion, ctxMinorVersion, ctxOptions, getGL().glGetString(GL.GL_VERSION));
+          return;
+      }
+
+      if(major==0 && minor==0) {
+          String versionStr = getGL().glGetString(GL.GL_VERSION);
+          if(null==versionStr) {
+            throw new GLException("GL_VERSION is NULL: "+this);
+          }
+
+          // Set version
+          Version version = new Version(versionStr);
+          if (version.isValid()) {
+            ctxMajorVersion = version.getMajor();
+            ctxMinorVersion = version.getMinor();
+
+            ctxVersionString = getGLVersion(gl, ctxMajorVersion, ctxMinorVersion, ctxOptions, versionStr);
+            return;
+          }
+      }
+  }
+
+  private static boolean appendString(StringBuffer sb, String string, boolean needColon, boolean condition) {
+    if(condition) {
+        if(needColon) {
+            sb.append(", ");
+        }
+        sb.append(string);
+        needColon=true;
+    }
+    return needColon;
+  }
+
+  protected static String getGLVersion(GL gl, int major, int minor, int ctp, String gl_version) {
+    boolean needColon = false;
+    StringBuffer sb = new StringBuffer();
+    sb.append(major);
+    sb.append(".");
+    sb.append(minor);
+    sb.append(" (");
+    needColon = appendString(sb, "ES", needColon, null!=gl && gl.isGLES());
+    needColon = appendString(sb, "compatibility profile", needColon, 0 != ( CTX_PROFILE_COMPAT & ctp ));
+    needColon = appendString(sb, "core profile",          needColon, 0 != ( CTX_PROFILE_CORE & ctp ));
+    needColon = appendString(sb, "forward compatible",    needColon, 0 != ( CTX_OPTION_FORWARD & ctp ));
+    needColon = appendString(sb, "any",                   needColon, 0 != ( CTX_OPTION_ANY & ctp ));
+    needColon = appendString(sb, "new",                   needColon, 0 != ( CTX_IS_ARB_CREATED & ctp ));
+    needColon = appendString(sb, "old",                   needColon, 0 == ( CTX_IS_ARB_CREATED & ctp ));
+    sb.append(") - ");
+    if(null!=gl_version) {
+        sb.append(gl_version);
+    } else {
+        sb.append("n/a");
+    }
+    return sb.toString();
+  }
+
   //----------------------------------------------------------------------
   // Helpers for various context implementations
   //
@@ -391,8 +565,10 @@ public abstract class GLContextImpl extends GLContext {
    *
    * @param force force the setting, even if is already being set.
    *              This might be usefull if you change the OpenGL implementation.
+   *
+   * @see #setContextVersion
    */
-  protected void setGLFunctionAvailability(boolean force) {
+  protected void setGLFunctionAvailability(boolean force, int major, int minor, int ctp) {
     if(null!=this.gl && null!=glProcAddressTable && !force) {
         return; // already done and not forced
     }
@@ -400,15 +576,17 @@ public abstract class GLContextImpl extends GLContext {
         setGL(createGL(getGLDrawable().getGLProfile()));
     }
 
-    updateGLProcAddressTable();
+    updateGLProcAddressTable(major, minor, ctp);
   }
 
   /**
    * Updates the cache of which GL functions are available for calling through this
    * context. See {@link #isFunctionAvailable(String)} for more information on
    * the definition of "available".
+   *
+   * @see #setContextVersion
    */
-  protected void updateGLProcAddressTable() {
+  protected void updateGLProcAddressTable(int major, int minor, int ctp) {
     if(null==this.gl) {
         throw new GLException("setGLFunctionAvailability not called yet");
     }
@@ -422,6 +600,8 @@ public abstract class GLContextImpl extends GLContext {
     }
     resetProcAddressTable(getGLProcAddressTable());
 
+    setContextVersion(major, minor, ctp);
+
     extensionAvailability.reset();
   }
 
@@ -493,14 +673,6 @@ public abstract class GLContextImpl extends GLContext {
       return extensionAvailability.getGLExtensions();
   }
 
-  public int getMajorVersion() {
-      return extensionAvailability.getMajorVersion();
-  }
-
-  public int getMinorVersion() {
-      return extensionAvailability.getMinorVersion();
-  }
-
   public boolean isExtensionCacheInitialized() {
       return extensionAvailability.isInitialized();
   }
@@ -617,4 +789,131 @@ public abstract class GLContextImpl extends GLContext {
 
   */
 
+  /**
+   * A class for storing and comparing OpenGL version numbers.
+   * This only works for desktop OpenGL at the moment.
+   */
+  private static class Version implements Comparable
+  {
+    private boolean valid;
+    private int major, minor, sub;
+    public Version(int majorRev, int minorRev, int subMinorRev)
+    {
+      major = majorRev;
+      minor = minorRev;
+      sub = subMinorRev;
+    }
+
+    /**
+     * @param versionString must be of the form "GL_VERSION_X" or
+     * "GL_VERSION_X_Y" or "GL_VERSION_X_Y_Z" or "X.Y", where X, Y,
+     * and Z are integers.
+     *
+     * @exception IllegalArgumentException if the argument is not a valid
+     * OpenGL version identifier
+     */
+    public Version(String versionString)
+    {
+      try 
+      {
+        if (versionString.startsWith("GL_VERSION_"))
+        {
+          StringTokenizer tok = new StringTokenizer(versionString, "_");
+
+          tok.nextToken(); // GL_
+          tok.nextToken(); // VERSION_ 
+          if (!tok.hasMoreTokens()) { major = 0; return; }
+          major = Integer.valueOf(tok.nextToken()).intValue();
+          if (!tok.hasMoreTokens()) { minor = 0; return; }
+          minor = Integer.valueOf(tok.nextToken()).intValue();
+          if (!tok.hasMoreTokens()) { sub = 0; return; }
+          sub = Integer.valueOf(tok.nextToken()).intValue();
+        }
+        else
+        {
+          int radix = 10;
+          if (versionString.length() > 2) {
+            if (Character.isDigit(versionString.charAt(0)) &&
+                versionString.charAt(1) == '.' &&
+                Character.isDigit(versionString.charAt(2))) {
+              major = Character.digit(versionString.charAt(0), radix);
+              minor = Character.digit(versionString.charAt(2), radix);
+
+              // See if there's version-specific information which might
+              // imply a more recent OpenGL version
+              StringTokenizer tok = new StringTokenizer(versionString, " ");
+              if (tok.hasMoreTokens()) {
+                tok.nextToken();
+                if (tok.hasMoreTokens()) {
+                  String token = tok.nextToken();
+                  int i = 0;
+                  while (i < token.length() && !Character.isDigit(token.charAt(i))) {
+                    i++;
+                  }
+                  if (i < token.length() - 2 &&
+                      Character.isDigit(token.charAt(i)) &&
+                      token.charAt(i+1) == '.' &&
+                      Character.isDigit(token.charAt(i+2))) {
+                    int altMajor = Character.digit(token.charAt(i), radix);
+                    int altMinor = Character.digit(token.charAt(i+2), radix);
+                    // Avoid possibly confusing situations by putting some
+                    // constraints on the upgrades we do to the major and
+                    // minor versions
+                    if ((altMajor == major && altMinor > minor) ||
+                        altMajor == major + 1) {
+                      major = altMajor;
+                      minor = altMinor;
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+        valid = true;
+      }
+      catch (Exception e)
+      {
+        e.printStackTrace();
+        // FIXME: refactor desktop OpenGL dependencies and make this
+        // class work properly for OpenGL ES
+        System.err.println("ExtensionAvailabilityCache: FunctionAvailabilityCache.Version.<init>: "+e);
+        major = 1;
+        minor = 0;
+        /*
+        throw (IllegalArgumentException)
+          new IllegalArgumentException(
+            "Illegally formatted version identifier: \"" + versionString + "\"")
+              .initCause(e);
+        */
+      }
+    }
+
+    public boolean isValid() {
+      return valid;
+    }
+
+    public int compareTo(Object o)
+    {
+      Version vo = (Version)o;
+      if (major > vo.major) return 1; 
+      else if (major < vo.major) return -1; 
+      else if (minor > vo.minor) return 1; 
+      else if (minor < vo.minor) return -1; 
+      else if (sub > vo.sub) return 1; 
+      else if (sub < vo.sub) return -1; 
+
+      return 0; // they are equal
+    }
+
+    public int getMajor() {
+      return major;
+    }
+
+    public int getMinor() {
+      return minor;
+    }
+    
+  } // end class Version
+
 }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
index a96736c00..31dbd46ae 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
@@ -113,7 +113,7 @@ public abstract class EGLContext extends GLContextImpl {
         }
 
         if (created) {
-            setGLFunctionAvailability(false);
+            setGLFunctionAvailability(false, -1, -1, -1);
             return CONTEXT_CURRENT_NEW;
         }
         return CONTEXT_CURRENT;
@@ -150,6 +150,10 @@ public abstract class EGLContext extends GLContextImpl {
       }
     }
 
+    protected long createContextARBImpl(long share, boolean direct, int ctp, int major, int minor) {
+        return 0; // FIXME
+    }
+
     protected void create() throws GLException {
         long eglDisplay = ((EGLDrawable)drawable).getDisplay();
         EGLGraphicsConfiguration config = ((EGLDrawable)drawable).getGraphicsConfiguration();
@@ -215,14 +219,14 @@ public abstract class EGLContext extends GLContextImpl {
             throw new GLException("Error making context 0x" +
                                   Long.toHexString(eglContext) + " current: error code " + EGL.eglGetError());
         }
-        setGLFunctionAvailability(true);
+        setGLFunctionAvailability(true, contextAttrs[1], 0, CTX_IS_ARB_CREATED|CTX_PROFILE_CORE|CTX_OPTION_ANY);
     }
 
     public boolean isCreated() {
         return (eglContext != 0);
     }
 
-    protected void updateGLProcAddressTable() {
+    protected void updateGLProcAddressTable(int major, int minor, int ctp) {
         if (DEBUG) {
           System.err.println(getThreadName() + ": !!! Initializing EGL extension address table");
         }
@@ -235,7 +239,7 @@ public abstract class EGLContext extends GLContextImpl {
           eglExtProcAddressTable = new EGLExtProcAddressTable();
         }          
         resetProcAddressTable(getEGLExtProcAddressTable());
-        super.updateGLProcAddressTable();
+        super.updateGLProcAddressTable(major, minor, ctp);
     }
   
     public synchronized String getPlatformExtensionsString() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java
index de7fd2ba4..0adede4ea 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java
@@ -47,7 +47,7 @@ public class EGLExternalContext extends EGLContext {
     public EGLExternalContext(AbstractGraphicsScreen screen) {
         super(null, null);
         GLContextShareSet.contextCreated(this);
-        setGLFunctionAvailability(false);
+        setGLFunctionAvailability(false, 0, 0, 0);
         getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
     }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
index d3a634792..364c2b91b 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
@@ -90,6 +90,10 @@ public abstract class MacOSXCGLContext extends GLContextImpl
 
   protected abstract boolean create();
 
+    protected long createContextARBImpl(long share, boolean direct, int ctp, int major, int minor) {
+        return 0; // FIXME
+    }
+
   /**
    * Creates and initializes an appropriate OpenGl nsContext. Should only be
    * called by {@link makeCurrentImpl()}.
@@ -150,7 +154,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl
     if (!CGL.makeCurrentContext(nsContext)) {
       throw new GLException("Error making nsContext current");
     }
-    setGLFunctionAvailability(true);
+    setGLFunctionAvailability(true, 0, 0, 0);
     GLContextShareSet.contextCreated(this);
     return true;
   }    
@@ -184,7 +188,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl
     }
             
     if (created) {
-      setGLFunctionAvailability(false);
+      setGLFunctionAvailability(false, -1, -1, -1);
       return CONTEXT_CURRENT_NEW;
     }
     return CONTEXT_CURRENT;
@@ -251,7 +255,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl
     }
   }
 
-  protected void updateGLProcAddressTable() {
+  protected void updateGLProcAddressTable(int major, int minor, int ctp) {
     if (DEBUG) {
       System.err.println("!!! Initializing CGL extension address table");
     }
@@ -261,7 +265,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl
       cglExtProcAddressTable = new CGLExtProcAddressTable();
     }          
     resetProcAddressTable(getCGLExtProcAddressTable());
-    super.updateGLProcAddressTable();
+    super.updateGLProcAddressTable(major, minor, ctp);
   }
 	
   public String getPlatformExtensionsString()
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
index dde77cde6..248bbb4d6 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
@@ -56,7 +56,7 @@ public class MacOSXExternalCGLContext extends MacOSXCGLContext {
     this.cglContext = cglContext;
     this.nsContext = nsContext;
     GLContextShareSet.contextCreated(this);
-    setGLFunctionAvailability(false);
+    setGLFunctionAvailability(false, 0, 0, 0);
     getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
index 446f457be..5844b8edd 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
@@ -73,7 +73,7 @@ public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
     }
             
     if (created) {
-      setGLFunctionAvailability(false);
+      setGLFunctionAvailability(false, -1, -1, -1);
 
       // Initialize render-to-texture support if requested
       DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
@@ -152,7 +152,7 @@ public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
     if (!impl.makeCurrent(nsContext)) {
       throw new GLException("Error making nsContext current");
     }
-    setGLFunctionAvailability(true);
+    setGLFunctionAvailability(true, 0, 0, 0);
             
     return true;
   }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
index 9010d4461..9189b41f3 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
@@ -87,7 +87,7 @@ public class MacOSXJava2DCGLContext extends MacOSXCGLContext implements Java2DGL
     }
             
     if (created) {
-      setGLFunctionAvailability(false);
+      setGLFunctionAvailability(false, -1, -1, -1);
       return CONTEXT_CURRENT_NEW;
     }
     return CONTEXT_CURRENT;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
index da8b70eb8..aae376a6c 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
@@ -56,7 +56,7 @@ public class WindowsExternalWGLContext extends WindowsWGLContext {
       System.err.println(getThreadName() + ": !!! Created external OpenGL context " + toHexString(hglrc) + " for " + this);
     }
     GLContextShareSet.contextCreated(this);
-    setGLFunctionAvailability(false);
+    setGLFunctionAvailability(false, 0, 0, 0);
     cfg.updateCapabilitiesByWGL(this);
     getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
   }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
index b3f4c498c..5b6d65f62 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
@@ -122,6 +122,10 @@ public class WindowsWGLContext extends GLContextImpl {
 
   protected Map/*<String, String>*/ getExtensionNameMap() { return extensionNameMap; }
 
+    protected long createContextARBImpl(long share, boolean direct, int ctp, int major, int minor) {
+        return 0; // FIXME
+    }
+
   /**
    * Creates and initializes an appropriate OpenGL context. Should only be
    * called by {@link #makeCurrentImpl()}.
@@ -157,7 +161,7 @@ public class WindowsWGLContext extends GLContextImpl {
         if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), temp_hglrc)) {
             throw new GLException("Error making temp context current: 0x" + Integer.toHexString(WGL.GetLastError()));
         }
-        setGLFunctionAvailability(true);
+        setGLFunctionAvailability(true, 0, 0, 0);
 
         if( !isFunctionAvailable("wglCreateContextAttribsARB") ||
             !isExtensionAvailable("WGL_ARB_create_context") ) {
@@ -243,7 +247,7 @@ public class WindowsWGLContext extends GLContextImpl {
                 if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), hglrc)) {
                     throw new GLException("Error making old context current: 0x" + Integer.toHexString(WGL.GetLastError()));
                 }
-                updateGLProcAddressTable();
+                updateGLProcAddressTable(0, 0, 0);
                 if(DEBUG) {
                   System.err.println("WindowsWGLContext.create done (old ctx < 3.0 - no 3.0) 0x"+Long.toHexString(hglrc));
                 }
@@ -255,7 +259,7 @@ public class WindowsWGLContext extends GLContextImpl {
                 if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), hglrc)) {
                     throw new GLException("Error making new context current: 0x" + Integer.toHexString(WGL.GetLastError()));
                 }
-                updateGLProcAddressTable();
+                updateGLProcAddressTable(0, 0, 0);
                 if(DEBUG) {
                   System.err.println("WindowsWGLContext.create done (new ctx >= 3.0) 0x"+Long.toHexString(hglrc));
                 }
@@ -304,7 +308,7 @@ public class WindowsWGLContext extends GLContextImpl {
     }
 
     if (created) {
-      setGLFunctionAvailability(false);
+      setGLFunctionAvailability(false, -1, -1, -1);
 
       WindowsWGLGraphicsConfiguration config = 
         (WindowsWGLGraphicsConfiguration)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
@@ -353,7 +357,7 @@ public class WindowsWGLContext extends GLContextImpl {
     }
   }
 
-  protected void updateGLProcAddressTable() {
+  protected void updateGLProcAddressTable(int major, int minor, int ctp) {
     if (DEBUG) {
       System.err.println(getThreadName() + ": !!! Initializing WGL extension address table for " + this);
     }
@@ -369,7 +373,7 @@ public class WindowsWGLContext extends GLContextImpl {
       wglExtProcAddressTable = new WGLExtProcAddressTable();
     }          
     resetProcAddressTable(getWGLExtProcAddressTable());
-    super.updateGLProcAddressTable();
+    super.updateGLProcAddressTable(major, minor, ctp);
   }
   
   public String getPlatformExtensionsString() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
index 783e3278a..b8f25aad7 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
@@ -55,7 +55,7 @@ public class X11ExternalGLXContext extends X11GLXContext {
     super(drawable, null);
     this.context = context;
     GLContextShareSet.contextCreated(this);
-    setGLFunctionAvailability(false);
+    setGLFunctionAvailability(false, 0, 0, 0);
     getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
index 142da672a..1492bfe42 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
@@ -110,6 +110,70 @@ public abstract class X11GLXContext extends GLContextImpl {
    */
   protected abstract void create();
 
+  protected long createContextARBImpl(long share, boolean direct, int ctp, int major, int minor) {
+    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    long display = config.getScreen().getDevice().getHandle();
+    GLXExt glXExt = getGLXExt();
+
+    boolean ctBwdCompat = 0 != ( CTX_PROFILE_COMPAT & ctp ) ;
+    boolean ctFwdCompat = 0 != ( CTX_OPTION_FORWARD & ctp ) ;
+    boolean ctDebug     = 0 != ( CTX_OPTION_DEBUG & ctp ) ;
+
+    long _context=0;
+
+    String verstr = getGLVersion(null, major, minor, ctp, "@creation");
+
+    int attribs[] = {
+        /*  0 */ GLX.GLX_CONTEXT_MAJOR_VERSION_ARB, major,
+        /*  2 */ GLX.GLX_CONTEXT_MINOR_VERSION_ARB, minor,
+        /*  4 */ GLX.GLX_RENDER_TYPE,               GLX.GLX_RGBA_TYPE,
+        /*  6 */ GLX.GLX_CONTEXT_FLAGS_ARB,         0,
+        /*  8 */ 0,                                 0,
+        /* 10 */ 0
+    };
+
+    if ( major > 3 || major == 3 && minor >= 2  ) {
+        // FIXME: Verify with a None drawable binding (default framebuffer)
+        attribs[8+0]  = GLX.GLX_CONTEXT_PROFILE_MASK_ARB;
+        if( ctBwdCompat ) {
+            attribs[8+1]  = GLX.GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
+        } else {
+            attribs[8+1]  = GLX.GLX_CONTEXT_CORE_PROFILE_BIT_ARB;
+        } 
+    } 
+
+    if ( major >= 3 ) {
+        if( !ctBwdCompat && ctFwdCompat ) {
+            attribs[6+1] |= GLX.GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
+        }
+        if( ctDebug) {
+            attribs[6+1] |= GLX.GLX_CONTEXT_DEBUG_BIT_ARB;
+        }
+    }
+
+    _context = glXExt.glXCreateContextAttribsARB(display, config.getFBConfig(), share, direct, attribs, 0);
+    if(0==_context) {
+        if(DEBUG) {
+          System.err.println("X11GLXContext.createContextARB couldn't create "+verstr+" _context");
+        }
+    } else {
+        if (!GLX.glXMakeContextCurrent(display,
+                                       drawable.getNativeWindow().getSurfaceHandle(), 
+                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                       _context)) {
+            if(DEBUG) {
+              System.err.println("X11GLXContext.createContextARB couldn't make "+verstr+" context current");
+            }
+            GLX.glXMakeContextCurrent(display, 0, 0, 0);
+            GLX.glXDestroyContext(display, _context);
+            _context = 0;
+        } else if(DEBUG) {
+          System.err.println("X11GLXContext.createContextARB "+verstr+" available "+toHexString(_context));
+        }
+    }
+    return _context;
+  }
+
   /**
    * Creates and initializes an appropriate OpenGL context. Should only be
    * called by {@link create()}.
@@ -133,176 +197,105 @@ public abstract class X11GLXContext extends GLContextImpl {
     }
 
     GLCapabilities glCaps = (GLCapabilities) config.getChosenCapabilities();
+    GLProfile glp = glCaps.getGLProfile();
     isVendorATI = ((X11GLXDrawableFactory)(drawable.getFactoryImpl())).isVendorATI();
 
     if(config.getFBConfigID()<0) {
         // not able to use FBConfig
-        if(glCaps.getGLProfile().isGL3()) {
+        if(glp.isGL3()) {
           throw new GLException("Unable to create OpenGL >= 3.1 context");
         }
         context = GLX.glXCreateContext(display, config.getXVisualInfo(), share, direct);
         if (context == 0) {
-          throw new GLException("Unable to create OpenGL context");
+          throw new GLException("Unable to create context(0)");
         }
         if (!GLX.glXMakeContextCurrent(display,
                                        drawable.getNativeWindow().getSurfaceHandle(), 
                                        drawableRead.getNativeWindow().getSurfaceHandle(), 
                                        context)) {
-          throw new GLException("Error making temp context (old2) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
+          throw new GLException("Error making temp context(0) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
         }
-        setGLFunctionAvailability(true);
+        setGLFunctionAvailability(true, 0, 0, 0); // use GL_VERSION
         if(DEBUG) {
-              System.err.println("X11GLXContext.createContext done (old2 ctx) "+toHexString(context));
+              System.err.println("X11GLXContext.createContext(0) done "+toHexString(context));
+        }
+        return;
+    }
+
+    // To use GLX_ARB_create_context, we have to make a temp context current,
+    // so we are able to use GetProcAddress
+    long temp_context = GLX.glXCreateNewContext(display, config.getFBConfig(), GLX.GLX_RGBA_TYPE, share, direct);
+    if (temp_context == 0) {
+        throw new GLException("Unable to create temp OpenGL context(1)");
+    }
+    if (!GLX.glXMakeContextCurrent(display,
+                                   drawable.getNativeWindow().getSurfaceHandle(), 
+                                   drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                   temp_context)) {
+      throw new GLException("Error making temp context(1) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
+    }
+    setGLFunctionAvailability(true, 0, 0, 0); // use GL_VERSION
+
+    if( !isFunctionAvailable("glXCreateContextAttribsARB") ||
+        !isExtensionAvailable("GLX_ARB_create_context") )  {
+        if(glp.isGL3()) {
+          GLX.glXMakeContextCurrent(display, 0, 0, 0);
+          GLX.glXDestroyContext(display, temp_context);
+          throw new GLException("Unable to create OpenGL >= 3.1 context (no GLX_ARB_create_context)");
         }
 
+        // continue with temp context for GL < 3.0
+        context = temp_context;
+        if(DEBUG) {
+          System.err.println("X11GLXContext.createContext(1) done (!GLX_ARB_create_context) "+toHexString(context));
+        }
+        return;
+    }
+
+    int minor[] = new int[1];
+    int major[] = new int[1];
+    int ctp[] = new int[1];
+    context = createContextARB(share, direct, major, minor, ctp);
+
+    if(0!=context) {
+        // need to update the GL func table ..
+        setGLFunctionAvailability(true, major[0], minor[0], ctp[0]);
+
+        GLX.glXMakeContextCurrent(display, 0, 0, 0);
+        GLX.glXDestroyContext(display, temp_context);
+        if (!GLX.glXMakeContextCurrent(display,
+                                       drawable.getNativeWindow().getSurfaceHandle(), 
+                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                       context)) {
+            throw new GLException("Cannot make previous verified context current");
+        }
+        if(DEBUG) {
+          System.err.println("X11GLXContext.createContext(2) done "+getGLVersion(null, major[0], minor[0], ctp[0], "@creation")+", "+toHexString(context));
+        }
     } else {
+        if(DEBUG) {
+          System.err.println("X11GLXContext.createContext(2) failed "+getGLVersion(null, major[0], minor[0], ctp[0], "@creation"));
+        }
+        if(!glp.isGL2()) {
+          GLX.glXMakeContextCurrent(display, 0, 0, 0);
+          GLX.glXDestroyContext(display, temp_context);
+          throw new GLException("Unable to create context(2) (have GLX_ARB_create_context)");
+        }
 
-        // To use GLX_ARB_create_context, we have to make a temp context current,
-        // so we are able to use GetProcAddress
-        long temp_context = GLX.glXCreateNewContext(display, config.getFBConfig(), GLX.GLX_RGBA_TYPE, share, direct);
-        if (temp_context == 0) {
-            throw new GLException("Unable to create temp OpenGL context");
-        } else {
-            if (!GLX.glXMakeContextCurrent(display,
-                                           drawable.getNativeWindow().getSurfaceHandle(), 
-                                           drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                           temp_context)) {
-              throw new GLException("Error making temp context (old) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
-            }
-            setGLFunctionAvailability(true);
-
-            if( !isFunctionAvailable("glXCreateContextAttribsARB") ||
-                !isExtensionAvailable("GLX_ARB_create_context") )  {
-                if(glCaps.getGLProfile().isGL3()) {
-                  GLX.glXMakeContextCurrent(display, 0, 0, 0);
-                  GLX.glXDestroyContext(display, temp_context);
-                  throw new GLException("Unable to create OpenGL >= 3.1 context (no GLX_ARB_create_context)");
-                }
-
-                // continue with temp context for GL < 3.0
-                context = temp_context;
-                if(DEBUG) {
-                  System.err.println("X11GLXContext.createContext done (old ctx < 3.0 - no GLX_ARB_create_context) "+toHexString(context));
-                }
-            } else {
-                GLXExt glXExt = getGLXExt();
-
-                // preset with default values
-                int attribs[] = {
-                    /*  0 */ GLX.GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
-                    /*  2 */ GLX.GLX_CONTEXT_MINOR_VERSION_ARB, 0,
-                    /*  4 */ GLX.GLX_RENDER_TYPE,               GLX.GLX_RGBA_TYPE,
-                    /*  6 */ GLX.GLX_CONTEXT_FLAGS_ARB,         0 /* GLX.GLX_CONTEXT_DEBUG_BIT_ARB */,      
-                    /*  8 */ 0,                                 0,
-                    /* 10 */ 0
-                };
-
-                if(glCaps.getGLProfile().isGL3()) {
-                    // Try >= 3.2 core first 
-                    // and verify with a None drawable binding (default framebuffer)
-                    attribs[0+1]  = 3;
-                    attribs[2+1]  = 2;
-                    if(glCaps.getGLProfile().isGL3bc()) {
-                        attribs[8+0]  = GLX.GLX_CONTEXT_PROFILE_MASK_ARB;
-                        attribs[8+1]  = GLX.GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
-                    }
-                    /**
-                     * don't stricten requirements any further, even compatible would be fine
-                     *
-                     else {
-                        attribs[8+0]  = GLX.GLX_CONTEXT_PROFILE_MASK_ARB;
-                        attribs[8+1]  = GLX.GLX_CONTEXT_CORE_PROFILE_BIT_ARB;
-                     } 
-                     */
-
-                    context = glXExt.glXCreateContextAttribsARB(display, config.getFBConfig(), share, direct, attribs, 0);
-                    if(0!=context) {
-                        if (!GLX.glXMakeContextCurrent(display,
-                                                       drawable.getNativeWindow().getSurfaceHandle(), 
-                                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                                       context)) {
-                            if(DEBUG) {
-                              System.err.println("X11GLXContext.createContext couldn't make >= 3.2 core context current - fallback");
-                            }
-                            GLX.glXMakeContextCurrent(display, 0, 0, 0);
-                            GLX.glXDestroyContext(display, context);
-                            context = 0;
-                        } else if(DEBUG) {
-                          System.err.println("X11GLXContext.createContext >= 3.2 available "+toHexString(context));
-                        }
-                    } else {
-                        if(DEBUG) {
-                          System.err.println("X11GLXContext.createContext couldn't create >= 3.2 core context - fallback");
-                        }
-                    }
-                    if(0==context) {
-                        // Try >= 3.1 forward compatible - last resort for GL3 !
-                        attribs[0+1]  = 3;
-                        attribs[2+1]  = 1;
-                        if(!glCaps.getGLProfile().isGL3bc()) {
-                            attribs[6+1] |= GLX.GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
-                        }
-                        attribs[8+0]  = 0;
-                        attribs[8+1]  = 0;
-                    }
-                }
-                if(0==context) {
-                    // 3.1 or 3.0 ..
-                    context = glXExt.glXCreateContextAttribsARB(display, config.getFBConfig(), share, direct, attribs, 0);
-                    if(0!=context) {
-                        if (!GLX.glXMakeContextCurrent(display,
-                                                       drawable.getNativeWindow().getSurfaceHandle(), 
-                                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                                       context)) {
-                            if(DEBUG) {
-                              System.err.println("X11GLXContext.createContext couldn't make >= 3.0 core context current - fallback");
-                            }
-                            GLX.glXMakeContextCurrent(display, 0, 0, 0);
-                            GLX.glXDestroyContext(display, context);
-                            context = 0;
-                        } else if(DEBUG) {
-                          System.err.println("X11GLXContext.createContext >= 3.0 available "+toHexString(context));
-                        }
-                    } else {
-                        if(DEBUG) {
-                          System.err.println("X11GLXContext.createContext couldn't create >= 3.0 core context - fallback");
-                        }
-                    }
-                }
-
-                if(0==context) {
-                    if(glCaps.getGLProfile().isGL3()) {
-                      GLX.glXMakeContextCurrent(display, 0, 0, 0);
-                      GLX.glXDestroyContext(display, temp_context);
-                      throw new GLException("Unable to create OpenGL >= 3.1 context (have GLX_ARB_create_context)");
-                    }
-
-                    // continue with temp context for GL < 3.0
-                    context = temp_context;
-                    if (!GLX.glXMakeContextCurrent(display,
-                                                   drawable.getNativeWindow().getSurfaceHandle(), 
-                                                   drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                                   context)) {
-                      GLX.glXMakeContextCurrent(display, 0, 0, 0);
-                      GLX.glXDestroyContext(display, temp_context);
-                      throw new GLException("Error making context (old) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
-                    }
-                    if(DEBUG) {
-                      System.err.println("X11GLXContext.createContext done (old ctx < 3.0 - no 3.0) "+toHexString(context));
-                    }
-                } else {
-                    GLX.glXDestroyContext(display, temp_context);
-
-                    // need to update the GL func table ..
-                    updateGLProcAddressTable();
-                    if(DEBUG) {
-                      System.err.println("X11GLXContext.createContext done (new ctx >= 3.0) "+toHexString(context));
-                    }
-                }
-            }
-        } 
-    } 
-    GLContextShareSet.contextCreated(this);
+        // continue with temp context for GL <= 3.0
+        context = temp_context;
+        if (!GLX.glXMakeContextCurrent(display,
+                                       drawable.getNativeWindow().getSurfaceHandle(), 
+                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                       context)) {
+          GLX.glXMakeContextCurrent(display, 0, 0, 0);
+          GLX.glXDestroyContext(display, temp_context);
+          throw new GLException("Error making context(1) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
+        }
+        if(DEBUG) {
+          System.err.println("X11GLXContext.createContext(1) done "+toHexString(context));
+        }
+    }
   }
 
   // Note: Usually the surface shall be locked within [makeCurrent .. swap .. release]
@@ -350,6 +343,7 @@ public abstract class X11GLXContext extends GLContextImpl {
         boolean created = false;
         if (context == 0) {
           create();
+          GLContextShareSet.contextCreated(this);
           if (DEBUG) {
             System.err.println(getThreadName() + ": !!! Created GL context for " + getClass().getName());
           }
@@ -374,7 +368,7 @@ public abstract class X11GLXContext extends GLContextImpl {
         }
 
         if (created) {
-          setGLFunctionAvailability(false);
+          setGLFunctionAvailability(false, -1, -1, -1);
           return CONTEXT_CURRENT_NEW;
         }
         return CONTEXT_CURRENT;
@@ -441,7 +435,7 @@ public abstract class X11GLXContext extends GLContextImpl {
     }
   }
 
-  protected void updateGLProcAddressTable() {
+  protected void updateGLProcAddressTable(int major, int minor, int ctp) {
     if (DEBUG) {
       System.err.println(getThreadName() + ": !!! Initializing GLX extension address table");
     }
@@ -454,7 +448,7 @@ public abstract class X11GLXContext extends GLContextImpl {
       glXExtProcAddressTable = new GLXExtProcAddressTable();
     }          
     resetProcAddressTable(getGLXExtProcAddressTable());
-    super.updateGLProcAddressTable();
+    super.updateGLProcAddressTable(major, minor, ctp);
   }
 
   public synchronized String getPlatformExtensionsString() {
diff --git a/src/jogl/classes/javax/media/opengl/GL4.java b/src/jogl/classes/javax/media/opengl/GL4.java
new file mode 100644
index 000000000..29a316333
--- /dev/null
+++ b/src/jogl/classes/javax/media/opengl/GL4.java
@@ -0,0 +1,5 @@
+package javax.media.opengl;
+
+public interface GL4 extends GLBase {
+}
+
diff --git a/src/jogl/classes/javax/media/opengl/GL4bc.java b/src/jogl/classes/javax/media/opengl/GL4bc.java
new file mode 100644
index 000000000..be1131e91
--- /dev/null
+++ b/src/jogl/classes/javax/media/opengl/GL4bc.java
@@ -0,0 +1,5 @@
+package javax.media.opengl;
+
+public interface GL4bc extends GL4 {
+}
+
diff --git a/src/jogl/classes/javax/media/opengl/GLBase.java b/src/jogl/classes/javax/media/opengl/GLBase.java
index 369907c22..5ba410a61 100644
--- a/src/jogl/classes/javax/media/opengl/GLBase.java
+++ b/src/jogl/classes/javax/media/opengl/GLBase.java
@@ -63,6 +63,20 @@ public interface GLBase {
    */
   public boolean isGL();
 
+  /**
+   * Indicates whether this GL object conforms to the GL4 compatibility profile.
+   * The GL4 compatibility profile merges the GL2 profile and GL4 core profile.
+   * @return whether this GL object conforms to the GL4 compatibility profile
+   */
+  public boolean isGL4bc();
+
+  /**
+   * Indicates whether this GL object conforms to the GL4 core profile.
+   * The GL4 core profile reflects OpenGL versions greater or equal 3.1
+   * @return whether this GL object conforms to the GL4 core profile
+   */
+  public boolean isGL4();
+
   /**
    * Indicates whether this GL object conforms to the GL3 compatibility profile.
    * The GL3 compatibility profile merges the GL2 profile and GL3 core profile.
@@ -130,6 +144,20 @@ public interface GLBase {
    */
   public GL getGL() throws GLException;
 
+  /**
+   * Casts this object to the GL4bc interface.
+   * @return this object cast to the GL4bc interface
+   * @throws GLException if this GLObject is not a GL4bc implementation
+   */
+  public GL4bc getGL4bc() throws GLException;
+
+  /**
+   * Casts this object to the GL4 interface.
+   * @return this object cast to the GL4 interface
+   * @throws GLException if this GLObject is not a GL4 implementation
+   */
+  public GL4 getGL4() throws GLException;
+
   /**
    * Casts this object to the GL3bc interface.
    * @return this object cast to the GL3bc interface
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index 1e52c2a65..a8dbf9213 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -260,7 +260,9 @@ public abstract class GLContext {
   public final String toString() {
     StringBuffer sb = new StringBuffer();
     sb.append(getClass().getName());
-    sb.append(" [");
+    sb.append(" [OpenGL ");
+    sb.append(getGLVersion());
+    sb.append(", ");
     sb.append(getGL());
     if(getGLDrawable()!=getGLDrawableRead()) {
         sb.append(",\n\tDrawable Read : ");
@@ -280,4 +282,68 @@ public abstract class GLContext {
       GLX) extensions. Can only be called while this context is
       current. */
   public abstract String getPlatformExtensionsString();
+
+  public final int getGLVersionMajor() { return ctxMajorVersion; }
+  public final int getGLVersionMinor() { return ctxMajorVersion; }
+  public final boolean isGLCompatibilityProfile() { return ( 0 != ( CTX_PROFILE_COMPAT & ctxOptions ) ); }
+  public final boolean isGLForwardCompatible()    { return ( 0 != ( CTX_OPTION_FORWARD & ctxOptions ) ); }
+
+  /** 
+   * Returns a valid OpenGL version string, ie 
+   *     <code>major.minor ([option]?[options,]*) - gl-version</code>
+   *
+   * <ul>
+   *   <li> options
+   *   <ul>
+   *     <li> <code>old</code> refers to the non ARB_create_context created context
+   *     <li> <code>new</code> refers to the ARB_create_context created context
+   *     <li> <code>compatible profile</code>
+   *     <li> <code>core profile</code>
+   *     <li> <code>forward compatible</code>
+   *     <li> <code>any</code> refers to the non forward compatible context
+   *     <li> <code>ES</code>  refers to the GLES context variant
+   *   </ul>
+   *   <li> <i>gl-version</i> the GL_VERSION string
+   * </ul>
+   *
+   * e.g.:
+   * <table border="0">
+   * <tr> <td></td> <td></td> </tr>
+   * <tr>
+   * <td>row 2, cell 1</td>
+   * <td>row 2, cell 2</td>
+   * </tr>
+   * </table> 
+   *
+   * <table border="0">
+   *     <tr><td></td>   <td>ES2</td>  <td><code>2.0 (ES, any, new) - 2.0 ES Profile</code></td></tr>
+   *     <tr><td>ATI</td><td>GL2</td>  <td><code>3.0 (compatibility profile, any, new) - 3.2.9704 Compatibility Profile Context</code></td></tr>
+   *     <tr><td>ATI</td><td>GL3</td>  <td><code>3.3 (core profile, any, new) - 1.4 (3.2.9704 Compatibility Profile Context)</code></td></tr>
+   *     <tr><td>ATI</td><td>GL3bc</td><td><code>3.3 (compatibility profile, any, new) - 1.4 (3.2.9704 Compatibility Profile Context)</code></td></tr>
+   *     <tr><td>NV</td><td>GL2</td>   <td><code>3.0 (compatibility profile, any, new) - 3.0.0 NVIDIA 195.36.07.03</code></td></tr>
+   *     <tr><td>NV</td><td>GL3</td>   <td><code>3.3 (core profile, any, new) - 3.3.0 NVIDIA 195.36.07.03</code></td></tr>
+   *     <tr><td>NV</td><td>GL3bc</td> <td><code>3.3 (compatibility profile, any, new) - 3.3.0 NVIDIA 195.36.07.03</code></td></tr>
+   * </table> 
+   */
+  public final String getGLVersion() {
+    return ctxVersionString;
+  }
+
+  protected int ctxMajorVersion=-1;
+  protected int ctxMinorVersion=-1;
+  protected int ctxOptions=0;
+  protected String ctxVersionString=null;
+
+  /** <code>ARB_create_context</code> related: created via ARB_create_context */
+  protected static final int CTX_IS_ARB_CREATED = 1 << 0;
+  /** <code>ARB_create_context</code> related: compatibility profile */
+  protected static final int CTX_PROFILE_COMPAT = 1 << 1;
+  /** <code>ARB_create_context</code> related: core profile */
+  protected static final int CTX_PROFILE_CORE   = 1 << 2;
+  /** <code>ARB_create_context</code> related: flag forward compatible */
+  protected static final int CTX_OPTION_FORWARD = 1 << 3;
+  /** <code>ARB_create_context</code> related: not flag forward compatible */
+  protected static final int CTX_OPTION_ANY     = 1 << 4;
+  /** <code>ARB_create_context</code> related: flag debug */
+  protected static final int CTX_OPTION_DEBUG   = 1 << 5;
 }
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 755fae73d..231faab8c 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -62,6 +62,13 @@ public class GLProfile implements Cloneable {
     // Public (user-visible) profiles
     //
 
+    /** The desktop OpenGL compatibility profile 4.x, with x >= 0, ie GL2 plus GL4.<br>
+        <code>bc</code> stands for backward compatibility. */
+    public static final String GL4bc = "GL4bc";
+
+    /** The desktop OpenGL core profile 4.x, with x >= 0 */
+    public static final String GL4   = "GL4";
+
     /** The desktop OpenGL compatibility profile 3.x, with x >= 1, ie GL2 plus GL3.<br>
         <code>bc</code> stands for backward compatibility. */
     public static final String GL3bc = "GL3bc";
@@ -90,12 +97,12 @@ public class GLProfile implements Cloneable {
     /** 
      * All GL Profiles in the order of default detection: GL2, GL2ES2, GL2ES1, GLES2, GLES1, GL2GL3, GL3
      */
-    public static final String[] GL_PROFILE_LIST_ALL = new String[] { GL2, GL2ES2, GL2ES1, GLES2, GLES1, GL2GL3, GL3bc, GL3 };
+    public static final String[] GL_PROFILE_LIST_ALL = new String[] { GL2, GL2ES2, GL2ES1, GLES2, GLES1, GL2GL3, GL4bc, GL3bc, GL4, GL3  };
 
     /**
      * All GL2ES2 Profiles in the order of default detection: GL2ES2, GL2, GLES2, GL3
      */
-    public static final String[] GL_PROFILE_LIST_GL2ES2 = new String[] { GL2ES2, GL2, GLES2, GL3bc, GL3 };
+    public static final String[] GL_PROFILE_LIST_GL2ES2 = new String[] { GL2ES2, GL2, GLES2, GL4bc, GL3bc, GL4, GL3 };
 
     /**
      * All GL2ES1 Profiles in the order of default detection: GL2ES1, GL2, GLES1
@@ -193,7 +200,11 @@ public class GLProfile implements Cloneable {
     }
 
     private static final String getGLImplBaseClassName(String profileImpl) {
-        if(GL3bc.equals(profileImpl)) {
+        if(GL4bc.equals(profileImpl)) {
+            return "com.jogamp.opengl.impl.gl4.GL4bc";
+        } else if(GL4.equals(profileImpl)) {
+            return "com.jogamp.opengl.impl.gl4.GL4";
+        } else if(GL3bc.equals(profileImpl)) {
             return "com.jogamp.opengl.impl.gl3.GL3bc";
         } else if(GL3.equals(profileImpl)) {
             return "com.jogamp.opengl.impl.gl3.GL3";
@@ -254,19 +265,29 @@ public class GLProfile implements Cloneable {
         return profileImpl;
     }
 
+    /** Indicates whether this profile is capable of GL4bc. */
+    public final boolean isGL4bc() {
+        return GL4bc.equals(profile);
+    }
+
+    /** Indicates whether this profile is capable of GL4. */
+    public final boolean isGL4() {
+        return isGL4bc() || GL4.equals(profile);
+    }
+
     /** Indicates whether this profile is capable of GL3bc. */
     public final boolean isGL3bc() {
-        return GL3bc.equals(profile);
+        return isGL4bc() || GL3bc.equals(profile);
     }
 
     /** Indicates whether this profile is capable of GL3. */
     public final boolean isGL3() {
-        return isGL3bc() || GL3.equals(profile);
+        return isGL4() || isGL3bc() || GL3.equals(profile);
     }
 
     /** Indicates whether this profile is capable of GL2. */
     public final boolean isGL2() {
-        return GL2.equals(profile);
+        return isGL3bc() || GL2.equals(profile);
     }
 
     /** Indicates whether this profile is capable of GLES1. */
@@ -294,24 +315,14 @@ public class GLProfile implements Cloneable {
         return GL2GL3.equals(profile) || isGL2() || isGL3() ;
     }
 
-    /** Indicates whether this profile uses the native OpenGL ES1 implementations. */
-    public final boolean usesNativeGLES1() {
-        return GLES1.equals(profileImpl);
+    /** Indicates whether this profile uses the native desktop OpenGL GL4bc implementations. */
+    public final boolean usesNativeGL4bc() {
+        return GL4bc.equals(profileImpl);
     }
 
-    /** Indicates whether this profile uses the native OpenGL ES2 implementations. */
-    public final boolean usesNativeGLES2() {
-        return GLES2.equals(profileImpl);
-    }
-
-    /** Indicates whether this profile uses either of the native OpenGL ES implementations. */
-    public final boolean usesNativeGLES() {
-        return usesNativeGLES2() || usesNativeGLES1();
-    }
-
-    /** Indicates whether this profile uses the native desktop OpenGL GL2 implementations. */
-    public final boolean usesNativeGL2() {
-        return GL2.equals(profileImpl) || GL2ES12.equals(profileImpl) ;
+    /** Indicates whether this profile uses the native desktop OpenGL GL4 implementations. */
+    public final boolean usesNativeGL4() {
+        return usesNativeGL4bc() || GL4.equals(profileImpl);
     }
 
     /** Indicates whether this profile uses the native desktop OpenGL GL3bc implementations. */
@@ -324,9 +335,29 @@ public class GLProfile implements Cloneable {
         return usesNativeGL3bc() || GL3.equals(profileImpl);
     }
 
+    /** Indicates whether this profile uses the native desktop OpenGL GL2 implementations. */
+    public final boolean usesNativeGL2() {
+        return GL2.equals(profileImpl) || GL2ES12.equals(profileImpl) ;
+    }
+
     /** Indicates whether this profile uses the native desktop OpenGL GL2 or GL3 implementations. */
     public final boolean usesNativeGL2GL3() {
-        return usesNativeGL2() || usesNativeGL3() ;
+        return usesNativeGL2() || usesNativeGL3() || usesNativeGL4();
+    }
+
+    /** Indicates whether this profile uses the native OpenGL ES1 implementations. */
+    public final boolean usesNativeGLES1() {
+        return GLES1.equals(profileImpl);
+    }
+
+    /** Indicates whether this profile uses the native OpenGL ES2 implementations. */
+    public final boolean usesNativeGLES2() {
+        return GLES2.equals(profileImpl);
+    }
+
+    /** Indicates whether this profile uses either of the native OpenGL ES implementations. */
+    public final boolean usesNativeGLES() {
+        return usesNativeGLES2() || usesNativeGLES1();
     }
 
     /** Indicates whether this profile supports GLSL. */
@@ -634,6 +665,49 @@ public class GLProfile implements Cloneable {
         return "GLProfile[" + profile + "/" + profileImpl + "]";
     }
 
+    public static final int GL_VERSIONS[][] = {
+        /* 0.*/ { -1 },
+        /* 1.*/ { 0, 1, 2, 3, 4, 5 },
+        /* 2.*/ { 0, 1 },
+        /* 3.*/ { 0, 1, 2, 3 },
+        /* 4.*/ { 0 } };
+
+    public static final int getMaxMajor() {
+        return GL_VERSIONS.length-1;
+    }
+
+    public static final int getMaxMinor(int major) {
+        if(1>major || major>=GL_VERSIONS.length) return -1;
+        return GL_VERSIONS[major].length-1;
+    }
+
+    public static final boolean isValidGLVersion(int major, int minor) {
+        if(1>major || major>=GL_VERSIONS.length) return false;
+        if(0>minor || minor>=GL_VERSIONS[major].length) return false;
+        return true;
+    }
+
+    public static final boolean decrementGLVersion(int major[], int minor[]) {
+        if(null==major || major.length<1 ||null==minor || minor.length<1) {
+            throw new GLException("invalid array arguments");
+        }
+        int m = major[0];
+        int n = minor[0];
+        if(!isValidGLVersion(m, n)) return false;
+
+        // decrement ..
+        n -= 1;
+        if(n < 0) {
+            m -= 1;
+            n = GL_VERSIONS[m].length-1;
+        }
+        if(!isValidGLVersion(m, n)) return false;
+        major[0]=m;
+        minor[0]=n;
+
+        return true;
+    }
+
     // The intersection between desktop OpenGL and the union of the OpenGL ES profiles
     // This is here only to avoid having separate GL2ES1Impl and GL2ES2Impl classes
     private static final String GL2ES12 = "GL2ES12";
-- 
cgit v1.2.3


From 60da84a5ca8fa5e74e995ad0343c8967ba9463a5 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 16 Apr 2010 05:40:09 +0200
Subject: Fix broken Offscreen/Pbuffer query introduced in
 bd4904fb04ab2168aeaf76e74385b3991429289a     - Have to set the requested
 values in GLCapabilities if not relaxed and valid,       otherwise the result
 is always onscreen, since the onscreen/pbuffer bits       can be set for the
 same config.

    - Let GLContext implementations throw an Exception
      in case of no surface handle.

JUnit Tests:
    - MiscUtils.setField -> MiscUtils.setFieldIfExists
      To allow _not_ throwing an exception :)
---
 src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java       | 3 +--
 .../com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java      | 6 +++++-
 .../com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java       | 5 +----
 .../com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java     | 5 +----
 .../opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java  | 5 ++++-
 .../classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java     | 5 +----
 .../jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java   | 5 ++++-
 .../com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java      | 8 ++++----
 src/junit/com/jogamp/test/junit/util/MiscUtils.java               | 5 ++---
 9 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
index 31dbd46ae..8c3e9a1c4 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
@@ -90,8 +90,7 @@ public abstract class EGLContext extends GLContextImpl {
 
     protected int makeCurrentImpl() throws GLException {
         if(EGL.EGL_NO_DISPLAY==((EGLDrawable)drawable).getDisplay() ) {
-            System.err.println("drawable not properly initialized");
-            return CONTEXT_NOT_CURRENT;
+            throw new GLException("drawable not properly initialized: "+drawable);
         }
         boolean created = false;
         if (eglContext == 0) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
index 176628633..2d5154442 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
@@ -179,7 +179,11 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
             } */
         }
         if(EGL.eglGetConfigAttrib(display, config, EGL.EGL_SURFACE_TYPE, val, 0)) {
-            if(EGLConfigDrawableTypeVerify(val[0], onscreen, usePBuffer) || relaxed) {
+            if(EGLConfigDrawableTypeVerify(val[0], onscreen, usePBuffer)) {
+                caps.setDoubleBuffered(onscreen);
+                caps.setOnscreen(onscreen);
+                caps.setPBuffer(usePBuffer);
+            } else if(relaxed) {
                 caps.setDoubleBuffered( 0 != (val[0] & EGL.EGL_WINDOW_BIT) );
                 caps.setOnscreen( 0 != (val[0] & EGL.EGL_WINDOW_BIT) );
                 caps.setPBuffer ( 0 != (val[0] & EGL.EGL_PBUFFER_BIT) );
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
index 364c2b91b..9182a71de 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
@@ -161,10 +161,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl
 	
   protected int makeCurrentImpl() throws GLException {
     if (0 == cglContext && drawable.getNativeWindow().getSurfaceHandle() == 0) {
-        if (DEBUG) {
-          System.err.println("drawable not properly initialized");
-        }
-        return CONTEXT_NOT_CURRENT;
+        throw new GLException("drawable not properly initialized: "+drawable);
     }
     boolean created = false;
     if ( 0 == cglContext && 0 == nsContext) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
index 5b6d65f62..7f9459a48 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
@@ -282,10 +282,7 @@ public class WindowsWGLContext extends GLContextImpl {
   
   protected int makeCurrentImpl() throws GLException {
     if (drawable.getNativeWindow().getSurfaceHandle() == 0) {
-        if (DEBUG) {
-          System.err.println("drawable not properly initialized");
-        }
-        return CONTEXT_NOT_CURRENT;
+        throw new GLException("drawable not properly initialized: "+drawable);
     }
     boolean created = false;
     if (hglrc == 0) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
index 15823b6dc..aed4012a4 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
@@ -428,7 +428,10 @@ public class WindowsWGLGraphicsConfiguration extends DefaultGraphicsConfiguratio
                                                          boolean relaxed, boolean onscreen, boolean usePBuffer) {
         GLCapabilities res = new GLCapabilities(glp);
         int drawableTypeBits = WGLConfig2DrawableTypeBits(iattribs, niattribs, iresults);
-        if(WGLConfigDrawableTypeVerify(drawableTypeBits, onscreen, usePBuffer) || relaxed) {
+        if(WGLConfigDrawableTypeVerify(drawableTypeBits, onscreen, usePBuffer)) {
+            res.setOnscreen(onscreen);
+            res.setPBuffer(usePBuffer);
+        } else if(relaxed) {
             res.setOnscreen( 0 != (drawableTypeBits & WINDOW_BIT) );
             res.setPBuffer ( 0 != (drawableTypeBits & PBUFFER_BIT) );
         } else {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
index 1492bfe42..ad4cb2da5 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
@@ -335,10 +335,7 @@ public abstract class X11GLXContext extends GLContextImpl {
     getDrawableImpl().getFactoryImpl().lockToolkit();
     try {
         if (drawable.getNativeWindow().getSurfaceHandle() == 0) {
-            if (DEBUG) {
-              System.err.println("drawable not properly initialized");
-            }
-            return CONTEXT_NOT_CURRENT;
+            throw new GLException("drawable not properly initialized: "+drawable);
         }
         boolean created = false;
         if (context == 0) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
index 393891bab..35daf0ae0 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
@@ -250,7 +250,10 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem
     GLCapabilities res = new GLCapabilities(glp);
 
     val = glXGetFBConfig(display, fbcfg, GLX.GLX_DRAWABLE_TYPE, tmp, 0);
-    if(GLXFBConfigDrawableTypeVerify(val, onscreen, usePBuffer) || relaxed) {
+    if(GLXFBConfigDrawableTypeVerify(val, onscreen, usePBuffer)) {
+        res.setOnscreen(onscreen);
+        res.setPBuffer(usePBuffer);
+    } else if(relaxed) {
         res.setOnscreen( 0 != (val & GLX.GLX_WINDOW_BIT) );
         res.setPBuffer ( 0 != (val & GLX.GLX_PBUFFER_BIT) );
     } else {
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
index 1a0553ded..55ad83d25 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.java
@@ -55,11 +55,11 @@ public class WindowUtilNEWT {
         Assert.assertNotNull(demo);
         Assert.assertNotNull(window);
         if(debug) {
-            MiscUtils.setField(demo, "glDebug", true);
-            MiscUtils.setField(demo, "glTrace", true);
+            MiscUtils.setFieldIfExists(demo, "glDebug", true);
+            MiscUtils.setFieldIfExists(demo, "glTrace", true);
         }
-        if(!MiscUtils.setField(demo, "window", window)) {
-            MiscUtils.setField(demo, "glWindow", glWindow);
+        if(!MiscUtils.setFieldIfExists(demo, "window", window)) {
+            MiscUtils.setFieldIfExists(demo, "glWindow", glWindow);
         }
     }
 
diff --git a/src/junit/com/jogamp/test/junit/util/MiscUtils.java b/src/junit/com/jogamp/test/junit/util/MiscUtils.java
index 8e53d9255..d28d0e7cb 100644
--- a/src/junit/com/jogamp/test/junit/util/MiscUtils.java
+++ b/src/junit/com/jogamp/test/junit/util/MiscUtils.java
@@ -40,13 +40,12 @@ public class MiscUtils {
         try {
             return Integer.parseInt(str);
         } catch (Exception ex) {
-            // FIXME
             ex.printStackTrace();
         }
         return def;
     }
 
-    public static boolean setField(Object instance, String fieldName, Object value) {
+    public static boolean setFieldIfExists(Object instance, String fieldName, Object value) {
         try {
             Field f = instance.getClass().getField(fieldName);
             if(value instanceof Boolean || f.getType().isInstance(value)) {
@@ -58,7 +57,7 @@ public class MiscUtils {
         } catch (IllegalAccessException ex) {
             throw new RuntimeException(ex);
         } catch (NoSuchFieldException nsfe) {
-            throw new RuntimeException(instance.getClass()+" has no '"+fieldName+"' field", nsfe);
+            // OK - throw new RuntimeException(instance.getClass()+" has no '"+fieldName+"' field", nsfe);
         }
         return false;
     }
-- 
cgit v1.2.3


From 8778a3d70f8d57bc4f9142a3f59ea59754f08c1d Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 17 Apr 2010 01:32:26 +0200
Subject: JOGL GL4 preperation (cont):     - Cont. on Context creation
 refactoring (bb028021be2714e66d9b1062298a3e308c649c56)         - Added
 Windows/WGL implementation         - Added efficienct sharedContext usage if
 ARB is available,           ie no more temp context has to be created.

    - Added more GLProfile GL4* code ..
---
 make/java-run-newt.sh                              |   7 +-
 .../opengl/impl/windows/wgl/WindowsWGLContext.java | 239 +++++++++++----------
 .../windows/wgl/WindowsWGLDrawableFactory.java     |  33 ++-
 .../jogamp/opengl/impl/x11/glx/X11GLXContext.java  | 129 +++++------
 .../opengl/impl/x11/glx/X11GLXDrawableFactory.java |  32 ++-
 src/jogl/classes/javax/media/opengl/GLContext.java |   1 +
 src/jogl/classes/javax/media/opengl/GLProfile.java |  19 ++
 7 files changed, 277 insertions(+), 183 deletions(-)

diff --git a/make/java-run-newt.sh b/make/java-run-newt.sh
index 39654d03b..cb256e273 100755
--- a/make/java-run-newt.sh
+++ b/make/java-run-newt.sh
@@ -20,4 +20,9 @@ if [ $MOSX -eq 1 ] ; then
     X_ARGS="-XstartOnFirstThread"
 fi
 
-java $X_ARGS -Djava.awt.headless=true com.jogamp.newt.util.MainThread $* 2>&1 | tee java-run-newt.log
+# D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
+# D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState"
+# D_ARGS="-Dnativewindow.debug.X11Util=true -Djogl.debug.GLDrawableFactory=true"
+# D_ARGS="-Dnativewindow.debug.X11Util=true"
+
+java $X_ARGS -Djava.awt.headless=true $D_ARGS com.jogamp.newt.util.MainThread $* 2>&1 | tee java-run-newt.log
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
index 7f9459a48..95706a7a1 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
@@ -122,48 +122,123 @@ public class WindowsWGLContext extends GLContextImpl {
 
   protected Map/*<String, String>*/ getExtensionNameMap() { return extensionNameMap; }
 
-    protected long createContextARBImpl(long share, boolean direct, int ctp, int major, int minor) {
-        return 0; // FIXME
+  protected long createContextARBImpl(long share, boolean direct, int ctp, int major, int minor) {
+    WindowsWGLDrawableFactory factory = (WindowsWGLDrawableFactory)drawable.getFactoryImpl();
+    WGLExt wglExt;
+    if(null==factory.getSharedContext()) {
+        wglExt = getWGLExt();
+    } else {
+        wglExt = factory.getSharedContext().getWGLExt();
+    }
+
+    boolean ctBwdCompat = 0 != ( CTX_PROFILE_COMPAT & ctp ) ;
+    boolean ctFwdCompat = 0 != ( CTX_OPTION_FORWARD & ctp ) ;
+    boolean ctDebug     = 0 != ( CTX_OPTION_DEBUG & ctp ) ;
+
+    long _context=0;
+
+    int attribs[] = {
+        /*  0 */ WGLExt.WGL_CONTEXT_MAJOR_VERSION_ARB, major,
+        /*  2 */ WGLExt.WGL_CONTEXT_MINOR_VERSION_ARB, minor,
+        /*  4 */ WGLExt.WGL_CONTEXT_LAYER_PLANE_ARB,   WGLExt.WGL_CONTEXT_LAYER_PLANE_ARB, // default
+        /*  6 */ WGLExt.WGL_CONTEXT_FLAGS_ARB,         0,
+        /*  8 */ 0,                                    0,
+        /* 10 */ 0
+    };
+
+    if ( major > 3 || major == 3 && minor >= 2  ) {
+        // FIXME: Verify with a None drawable binding (default framebuffer)
+        attribs[8+0]  = WGLExt.WGL_CONTEXT_PROFILE_MASK_ARB;
+        if( ctBwdCompat ) {
+            attribs[8+1]  = WGLExt.WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
+        } else {
+            attribs[8+1]  = WGLExt.WGL_CONTEXT_CORE_PROFILE_BIT_ARB;
+        } 
+    } 
+
+    if ( major >= 3 ) {
+        if( !ctBwdCompat && ctFwdCompat ) {
+            attribs[6+1] |= WGLExt.WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
+        }
+        if( ctDebug) {
+            attribs[6+1] |= WGLExt.WGL_CONTEXT_DEBUG_BIT_ARB;
+        }
+    }
+
+    _context = wglExt.wglCreateContextAttribsARB(drawable.getNativeWindow().getSurfaceHandle(), share, attribs, 0); 
+    if(0==_context) {
+        if(DEBUG) {
+          System.err.println("WindowsWGLContext.createContextARB couldn't create "+getGLVersion(null, major, minor, ctp, "@creation"));
+        }
+    } else {
+        // In contrast to GLX no verification with a drawable binding, ie default framebuffer, is necessary,
+        // if no 3.2 is available creation fails already!
+        // Nevertheless .. we do it ..
+        if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), _context)) {
+            if(DEBUG) {
+              System.err.println("WindowsWGLContext.createContextARB couldn't make current "+getGLVersion(null, major, minor, ctp, "@creation"));
+            }
+            WGL.wglMakeCurrent(0, 0);
+            WGL.wglDeleteContext(_context);
+            _context = 0;
+        }
     }
+    return _context;
+  }
 
   /**
    * Creates and initializes an appropriate OpenGL context. Should only be
    * called by {@link #makeCurrentImpl()}.
    */
   protected void create() {
-    GLCapabilities glCaps = drawable.getChosenGLCapabilities();
-    if(DEBUG) {
-          System.err.println("WindowsWGLContext.create got "+glCaps);
+    if(0!=context) {
+        throw new GLException("context is not null: "+context);
     }
+    WindowsWGLDrawableFactory factory = (WindowsWGLDrawableFactory)drawable.getFactoryImpl();
+    GLCapabilities glCaps = drawable.getChosenGLCapabilities();
 
     if (drawable.getNativeWindow().getSurfaceHandle() == 0) {
       throw new GLException("Internal error: attempted to create OpenGL context without an associated drawable");
     }
     // Windows can set up sharing of display lists after creation time
     WindowsWGLContext other = (WindowsWGLContext) GLContextShareSet.getShareContext(this);
-    long hglrc2 = 0;
+    long share = 0;
     if (other != null) {
-      hglrc2 = other.getHGLRC();
-      if (hglrc2 == 0) {
+      share = other.getHGLRC();
+      if (share == 0) {
         throw new GLException("GLContextShareSet returned an invalid OpenGL context");
       }
     }
 
-    // To use WGL_ARB_create_context, we have to make a temp context current,
-    // so we are able to use GetProcAddress
-    long temp_hglrc = WGL.wglCreateContext(drawable.getNativeWindow().getSurfaceHandle());
-    if (DEBUG) {
-      System.err.println(getThreadName() + ": !!! Created temp OpenGL context " + toHexString(temp_hglrc) + " for " + this + ", device context " + toHexString(drawable.getNativeWindow().getSurfaceHandle()) + ", not yet sharing");
+    int minor[] = new int[1];
+    int major[] = new int[1];
+    int ctp[] = new int[1];
+    boolean createContextARBTried = false;
+
+    // utilize the shared context's GLXExt in case it was using the ARB method and it already exists
+    if(null!=factory.getSharedContext() && factory.getSharedContext().isCreatedWithARBMethod()) {
+        if(DEBUG) {
+          System.err.println("WindowsWGLContext.createContext using shared Context: "+factory.getSharedContext());
+        }
+        hglrc = createContextARB(share, true, major, minor, ctp);
+        createContextARBTried = true;
     }
-    if (temp_hglrc == 0) {
-      throw new GLException("Unable to create temp OpenGL context for device context " + toHexString(drawable.getNativeWindow().getSurfaceHandle()));
-    } else {
+
+    long temp_hglrc = 0;
+    if(0==hglrc) {
+        // To use WGL_ARB_create_context, we have to make a temp context current,
+        // so we are able to use GetProcAddress
+        temp_hglrc = WGL.wglCreateContext(drawable.getNativeWindow().getSurfaceHandle());
+        if (temp_hglrc == 0) {
+          throw new GLException("Unable to create temp OpenGL context for device context " + toHexString(drawable.getNativeWindow().getSurfaceHandle()));
+        }
         if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), temp_hglrc)) {
             throw new GLException("Error making temp context current: 0x" + Integer.toHexString(WGL.GetLastError()));
         }
         setGLFunctionAvailability(true, 0, 0, 0);
 
-        if( !isFunctionAvailable("wglCreateContextAttribsARB") ||
+        if( createContextARBTried ||
+            !isFunctionAvailable("wglCreateContextAttribsARB") ||
             !isExtensionAvailable("WGL_ARB_create_context") ) {
             if(glCaps.getGLProfile().isGL3()) {
               WGL.wglMakeCurrent(0, 0);
@@ -173,111 +248,51 @@ public class WindowsWGLContext extends GLContextImpl {
 
             // continue with temp context for GL < 3.0
             hglrc = temp_hglrc;
-            if(DEBUG) {
-              System.err.println("WindowsWGLContext.create done (old ctx < 3.0 - no WGL_ARB_create_context) 0x"+Long.toHexString(hglrc));
-            }
-        } else {
-            WGLExt wglExt = getWGLExt();
+            return;
+        } 
+        hglrc = createContextARB(share, true, major, minor, ctp);
+        createContextARBTried=true;
+    }
+    
+    if(0!=hglrc) {
+        share = 0; // mark as shared ..
 
-            // preset with default values
-            int attribs[] = {
-                /*  0 */ WGLExt.WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-                /*  2 */ WGLExt.WGL_CONTEXT_MINOR_VERSION_ARB, 0,
-                /*  4 */ WGLExt.WGL_CONTEXT_FLAGS_ARB,         0 /* WGLExt.WGL_CONTEXT_DEBUG_BIT_ARB */,
-                /*  6 */ 0,                                    0,
-                /*  8 */ 0
-            };
+        // need to update the GL func table ..
+        setGLFunctionAvailability(true, major[0], minor[0], ctp[0]);
 
-            if(glCaps.getGLProfile().isGL3()) {
-                // Try >= 3.2 core first !
-                // In contrast to GLX no verify with a None drawable binding (default framebuffer) is necessary,
-                // if no 3.2 is available creation fails already!
-                attribs[0+1]  = 3;
-                attribs[2+1]  = 2;
-                if(glCaps.getGLProfile().isGL3bc()) {
-                    attribs[6+0]  = WGLExt.WGL_CONTEXT_PROFILE_MASK_ARB;
-                    attribs[6+1]  = WGLExt.WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
-                }
-                /**
-                 * don't stricten requirements any further, even compatible would be fine
-                 *
-                 } else {
-                    attribs[6+0]  = WGLExt.WGL_CONTEXT_PROFILE_MASK_ARB;
-                    attribs[6+1]  = WGLExt.WGL_CONTEXT_CORE_PROFILE_BIT_ARB;
-                 } 
-                 */
-                hglrc = wglExt.wglCreateContextAttribsARB(drawable.getNativeWindow().getSurfaceHandle(), hglrc2, attribs, 0); 
-                if(0==hglrc) {
-                    if(DEBUG) {
-                        System.err.println("WindowsWGLContext.createContext couldn't create >= 3.2 core context - fallback");
-                    }
-                    // Try >= 3.1 forward compatible - last resort for GL3 !
-                    attribs[0+1]  = 3;
-                    attribs[2+1]  = 1;
-                    if(!glCaps.getGLProfile().isGL3bc()) {
-                        attribs[4+1] |= WGLExt.WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
-                    }
-                    attribs[6+0]  = 0;
-                    attribs[6+1]  = 0;
-                } else if(DEBUG) {
-                  System.err.println("WindowsWGLContext.createContext >= 3.2 available 0x"+Long.toHexString(hglrc));
-                }
-            }
-            if(0==hglrc) {
-                // 3.1 or 3.0 ..
-                hglrc = wglExt.wglCreateContextAttribsARB(drawable.getNativeWindow().getSurfaceHandle(), hglrc2, attribs, 0); 
-                if(DEBUG) {
-                  if(0==hglrc) {
-                      System.err.println("WindowsWGLContext.createContext couldn't create >= 3.0 context - fallback");
-                  } else {
-                      System.err.println("WindowsWGLContext.createContext >= 3.0 available 0x"+Long.toHexString(hglrc));
-                  }
-                }
-            }
+        WGL.wglMakeCurrent(0, 0);
+        WGL.wglDeleteContext(temp_hglrc);
 
-            if(0==hglrc) {
-                if(glCaps.getGLProfile().isGL3()) {
-                  WGL.wglMakeCurrent(0, 0);
-                  WGL.wglDeleteContext(temp_hglrc);
-                  throw new GLException("Unable to create OpenGL >= 3.1 context (have WGL_ARB_create_context)");
-                }
-
-                // continue with temp context for GL < 3.0
-                hglrc = temp_hglrc;
-                if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), hglrc)) {
-                    throw new GLException("Error making old context current: 0x" + Integer.toHexString(WGL.GetLastError()));
-                }
-                updateGLProcAddressTable(0, 0, 0);
-                if(DEBUG) {
-                  System.err.println("WindowsWGLContext.create done (old ctx < 3.0 - no 3.0) 0x"+Long.toHexString(hglrc));
-                }
-            } else {
-                hglrc2 = 0; // mark as shared ..
-                WGL.wglMakeCurrent(0, 0);
-                WGL.wglDeleteContext(temp_hglrc);
-
-                if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), hglrc)) {
-                    throw new GLException("Error making new context current: 0x" + Integer.toHexString(WGL.GetLastError()));
-                }
-                updateGLProcAddressTable(0, 0, 0);
-                if(DEBUG) {
-                  System.err.println("WindowsWGLContext.create done (new ctx >= 3.0) 0x"+Long.toHexString(hglrc));
-                }
-            }
+        if (!wglMakeContextCurrent(drawable.getNativeWindow().getSurfaceHandle(), drawableRead.getNativeWindow().getSurfaceHandle(), hglrc)) {
+            throw new GLException("Cannot make previous verified context current: 0x" + Integer.toHexString(WGL.GetLastError()));
+        }
+    } else {
+        if(glCaps.getGLProfile().isGL3()) {
+          WGL.wglMakeCurrent(0, 0);
+          WGL.wglDeleteContext(temp_hglrc);
+          throw new GLException("WindowsWGLContext.createContext failed, but context > GL2 requested "+getGLVersion(null, major[0], minor[0], ctp[0], "@creation")+", ");
+        }
+        if(DEBUG) {
+          System.err.println("WindowsWGLContext.createContext failed, fall back to !ARB context "+getGLVersion(null, major[0], minor[0], ctp[0], "@creation"));
+        }
+
+        // continue with temp context for GL < 3.0
+        hglrc = temp_hglrc;
+        if (!wglMakeContextCurrent(drawable.getNativeWindow().getSurfaceHandle(), drawableRead.getNativeWindow().getSurfaceHandle(), hglrc)) {
+            WGL.wglMakeCurrent(0, 0);
+            WGL.wglDeleteContext(hglrc);
+            throw new GLException("Error making old context current: 0x" + Integer.toHexString(WGL.GetLastError()));
         }
     }
-    if(0!=hglrc2) {
-        if (!WGL.wglShareLists(hglrc2, hglrc)) {
-            throw new GLException("wglShareLists(" + toHexString(hglrc2) +
+
+    if(0!=share) {
+        if (!WGL.wglShareLists(share, hglrc)) {
+            throw new GLException("wglShareLists(" + toHexString(share) +
                                   ", " + toHexString(hglrc) + ") failed: error code 0x" +
                                   Integer.toHexString(WGL.GetLastError()));
         }
     }
     GLContextShareSet.contextCreated(this);
-    WGL.wglMakeCurrent(0, 0); // release immediatly to gain from ARB/EXT wglMakeContextCurrent(draw, read, ctx)!
-    if (DEBUG) {
-      System.err.println(getThreadName() + ": !!! Created OpenGL context " + toHexString(hglrc) + " for " + this + ", device context " + toHexString(drawable.getNativeWindow().getSurfaceHandle()) + ", sharing with " + toHexString(hglrc2));
-    }
   }
   
   protected int makeCurrentImpl() throws GLException {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
index e3938f9fe..bc99338ab 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
@@ -77,13 +77,22 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
   WindowsWGLContext sharedContext=null;
   boolean canCreateGLPbuffer = false;
 
+  // package private ..
+  final WindowsWGLContext getSharedContext() {
+    validate();
+    return sharedContext; 
+  }
+
   void initShared() {
     if(null==sharedDrawable) {
         sharedDrawable = new WindowsDummyWGLDrawable(this, null);
-        sharedContext  = (WindowsWGLContext) sharedDrawable.createContext(null);
-        sharedContext.makeCurrent();
-        canCreateGLPbuffer = sharedContext.getGL().isExtensionAvailable("GL_ARB_pbuffer");
-        sharedContext.release();
+        WindowsWGLContext _sharedContext  = (WindowsWGLContext) sharedDrawable.createContext(null);
+        {
+            _sharedContext.makeCurrent();
+            canCreateGLPbuffer = _sharedContext.getGL().isExtensionAvailable("GL_ARB_pbuffer");
+            _sharedContext.release();
+        }
+        _sharedContext = _sharedContext;
         if (DEBUG) {
           System.err.println("!!! SharedContext: "+sharedContext+", pbuffer supported "+canCreateGLPbuffer);
         }
@@ -115,20 +124,30 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
     if (target == null) {
       throw new IllegalArgumentException("Null target");
     }
+    initShared();
     return new WindowsOnscreenWGLDrawable(this, target);
   }
 
   protected GLDrawableImpl createOffscreenDrawable(NativeWindow target) {
+    validate();
+    if (target == null) {
+      throw new IllegalArgumentException("Null target");
+    }
+    initShared();
     return new WindowsOffscreenWGLDrawable(this, target);
   }
 
   public boolean canCreateGLPbuffer(AbstractGraphicsDevice device) {
     validate();
-    initShared();
+    initShared(); // setup canCreateGLPBuffer
     return canCreateGLPbuffer;
   }
 
   protected GLDrawableImpl createGLPbufferDrawableImpl(final NativeWindow target) {
+    validate();
+    if (target == null) {
+      throw new IllegalArgumentException("Null target");
+    }
     initShared();
     final List returnList = new ArrayList();
     final GLDrawableFactory factory = this;
@@ -160,6 +179,8 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
   }
 
   protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
+    validate();
+    initShared();
     AbstractGraphicsScreen screen = DefaultGraphicsScreen.createDefault();
     NullWindow nw = new NullWindow(WindowsWGLGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(
                                    capabilities, chooser, screen) );
@@ -169,6 +190,7 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
  
   public GLContext createExternalGLContext() {
     validate();
+    initShared();
     return WindowsExternalWGLContext.create(this, null);
   }
 
@@ -179,6 +201,7 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
 
   public GLDrawable createExternalGLDrawable() {
     validate();
+    initShared();
     return WindowsExternalWGLDrawable.create(this, null);
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
index ad4cb2da5..f5e291c5f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
@@ -111,9 +111,16 @@ public abstract class X11GLXContext extends GLContextImpl {
   protected abstract void create();
 
   protected long createContextARBImpl(long share, boolean direct, int ctp, int major, int minor) {
+    X11GLXDrawableFactory factory = (X11GLXDrawableFactory)drawable.getFactoryImpl();
     X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
     long display = config.getScreen().getDevice().getHandle();
-    GLXExt glXExt = getGLXExt();
+
+    GLXExt glXExt;
+    if(null==factory.getSharedContext()) {
+        glXExt = getGLXExt();
+    } else {
+        glXExt = factory.getSharedContext().getGLXExt();
+    }
 
     boolean ctBwdCompat = 0 != ( CTX_PROFILE_COMPAT & ctp ) ;
     boolean ctFwdCompat = 0 != ( CTX_OPTION_FORWARD & ctp ) ;
@@ -121,12 +128,10 @@ public abstract class X11GLXContext extends GLContextImpl {
 
     long _context=0;
 
-    String verstr = getGLVersion(null, major, minor, ctp, "@creation");
-
     int attribs[] = {
         /*  0 */ GLX.GLX_CONTEXT_MAJOR_VERSION_ARB, major,
         /*  2 */ GLX.GLX_CONTEXT_MINOR_VERSION_ARB, minor,
-        /*  4 */ GLX.GLX_RENDER_TYPE,               GLX.GLX_RGBA_TYPE,
+        /*  4 */ GLX.GLX_RENDER_TYPE,               GLX.GLX_RGBA_TYPE, // default
         /*  6 */ GLX.GLX_CONTEXT_FLAGS_ARB,         0,
         /*  8 */ 0,                                 0,
         /* 10 */ 0
@@ -154,7 +159,7 @@ public abstract class X11GLXContext extends GLContextImpl {
     _context = glXExt.glXCreateContextAttribsARB(display, config.getFBConfig(), share, direct, attribs, 0);
     if(0==_context) {
         if(DEBUG) {
-          System.err.println("X11GLXContext.createContextARB couldn't create "+verstr+" _context");
+          System.err.println("X11GLXContext.createContextARB couldn't create "+getGLVersion(null, major, minor, ctp, "@creation"));
         }
     } else {
         if (!GLX.glXMakeContextCurrent(display,
@@ -162,13 +167,11 @@ public abstract class X11GLXContext extends GLContextImpl {
                                        drawableRead.getNativeWindow().getSurfaceHandle(), 
                                        _context)) {
             if(DEBUG) {
-              System.err.println("X11GLXContext.createContextARB couldn't make "+verstr+" context current");
+              System.err.println("X11GLXContext.createContextARB couldn't make current "+getGLVersion(null, major, minor, ctp, "@creation"));
             }
             GLX.glXMakeContextCurrent(display, 0, 0, 0);
             GLX.glXDestroyContext(display, _context);
             _context = 0;
-        } else if(DEBUG) {
-          System.err.println("X11GLXContext.createContextARB "+verstr+" available "+toHexString(_context));
         }
     }
     return _context;
@@ -180,10 +183,11 @@ public abstract class X11GLXContext extends GLContextImpl {
    * Note: The direct parameter may be overwritten by the direct state of a shared context.
    */
   protected void createContext(boolean direct) {
-    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-    if(DEBUG) {
-          System.err.println("X11GLXContext.createContext got "+config);
+    if(0!=context) {
+        throw new GLException("context is not null: "+context);
     }
+    X11GLXDrawableFactory factory = (X11GLXDrawableFactory)drawable.getFactoryImpl();
+    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
     long display = config.getScreen().getDevice().getHandle();
 
     X11GLXContext other = (X11GLXContext) GLContextShareSet.getShareContext(this);
@@ -198,7 +202,7 @@ public abstract class X11GLXContext extends GLContextImpl {
 
     GLCapabilities glCaps = (GLCapabilities) config.getChosenCapabilities();
     GLProfile glp = glCaps.getGLProfile();
-    isVendorATI = ((X11GLXDrawableFactory)(drawable.getFactoryImpl())).isVendorATI();
+    isVendorATI = factory.isVendorATI();
 
     if(config.getFBConfigID()<0) {
         // not able to use FBConfig
@@ -216,70 +220,78 @@ public abstract class X11GLXContext extends GLContextImpl {
           throw new GLException("Error making temp context(0) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
         }
         setGLFunctionAvailability(true, 0, 0, 0); // use GL_VERSION
-        if(DEBUG) {
-              System.err.println("X11GLXContext.createContext(0) done "+toHexString(context));
-        }
         return;
     }
 
-    // To use GLX_ARB_create_context, we have to make a temp context current,
-    // so we are able to use GetProcAddress
-    long temp_context = GLX.glXCreateNewContext(display, config.getFBConfig(), GLX.GLX_RGBA_TYPE, share, direct);
-    if (temp_context == 0) {
-        throw new GLException("Unable to create temp OpenGL context(1)");
-    }
-    if (!GLX.glXMakeContextCurrent(display,
-                                   drawable.getNativeWindow().getSurfaceHandle(), 
-                                   drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                   temp_context)) {
-      throw new GLException("Error making temp context(1) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
+    int minor[] = new int[1];
+    int major[] = new int[1];
+    int ctp[] = new int[1];
+    boolean createContextARBTried = false;
+
+    // utilize the shared context's GLXExt in case it was using the ARB method and it already exists
+    if(null!=factory.getSharedContext() && factory.getSharedContext().isCreatedWithARBMethod()) {
+        if(DEBUG) {
+          System.err.println("X11GLXContext.createContext using shared Context: "+factory.getSharedContext());
+        }
+        context = createContextARB(share, direct, major, minor, ctp);
+        createContextARBTried = true;
     }
-    setGLFunctionAvailability(true, 0, 0, 0); // use GL_VERSION
 
-    if( !isFunctionAvailable("glXCreateContextAttribsARB") ||
-        !isExtensionAvailable("GLX_ARB_create_context") )  {
-        if(glp.isGL3()) {
-          GLX.glXMakeContextCurrent(display, 0, 0, 0);
-          GLX.glXDestroyContext(display, temp_context);
-          throw new GLException("Unable to create OpenGL >= 3.1 context (no GLX_ARB_create_context)");
+    long temp_context = 0;
+    if(0==context) {
+        // To use GLX_ARB_create_context, we have to make a temp context current,
+        // so we are able to use GetProcAddress
+        temp_context = GLX.glXCreateNewContext(display, config.getFBConfig(), GLX.GLX_RGBA_TYPE, share, direct);
+        if (temp_context == 0) {
+            throw new GLException("Unable to create temp OpenGL context(1)");
         }
+        if (!GLX.glXMakeContextCurrent(display,
+                                       drawable.getNativeWindow().getSurfaceHandle(), 
+                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                       temp_context)) {
+          throw new GLException("Error making temp context(1) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
+        }
+        setGLFunctionAvailability(true, 0, 0, 0); // use GL_VERSION
 
-        // continue with temp context for GL < 3.0
-        context = temp_context;
-        if(DEBUG) {
-          System.err.println("X11GLXContext.createContext(1) done (!GLX_ARB_create_context) "+toHexString(context));
+        if( createContextARBTried ||
+            !isFunctionAvailable("glXCreateContextAttribsARB") ||
+            !isExtensionAvailable("GLX_ARB_create_context") )  {
+            if(glp.isGL3()) {
+              GLX.glXMakeContextCurrent(display, 0, 0, 0);
+              GLX.glXDestroyContext(display, temp_context);
+              throw new GLException("Unable to create OpenGL >= 3.1 context (no GLX_ARB_create_context)");
+            }
+
+            // continue with temp context for GL < 3.0
+            context = temp_context;
+            return;
         }
-        return;
+        context = createContextARB(share, direct, major, minor, ctp);
+        createContextARBTried=true;
     }
 
-    int minor[] = new int[1];
-    int major[] = new int[1];
-    int ctp[] = new int[1];
-    context = createContextARB(share, direct, major, minor, ctp);
-
     if(0!=context) {
         // need to update the GL func table ..
         setGLFunctionAvailability(true, major[0], minor[0], ctp[0]);
 
-        GLX.glXMakeContextCurrent(display, 0, 0, 0);
-        GLX.glXDestroyContext(display, temp_context);
-        if (!GLX.glXMakeContextCurrent(display,
-                                       drawable.getNativeWindow().getSurfaceHandle(), 
-                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                       context)) {
-            throw new GLException("Cannot make previous verified context current");
-        }
-        if(DEBUG) {
-          System.err.println("X11GLXContext.createContext(2) done "+getGLVersion(null, major[0], minor[0], ctp[0], "@creation")+", "+toHexString(context));
+        if(0!=temp_context) {
+            GLX.glXMakeContextCurrent(display, 0, 0, 0);
+            GLX.glXDestroyContext(display, temp_context);
+            if (!GLX.glXMakeContextCurrent(display,
+                                           drawable.getNativeWindow().getSurfaceHandle(), 
+                                           drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                           context)) {
+                throw new GLException("Cannot make previous verified context current");
+            }
         }
     } else {
-        if(DEBUG) {
-          System.err.println("X11GLXContext.createContext(2) failed "+getGLVersion(null, major[0], minor[0], ctp[0], "@creation"));
-        }
         if(!glp.isGL2()) {
           GLX.glXMakeContextCurrent(display, 0, 0, 0);
           GLX.glXDestroyContext(display, temp_context);
-          throw new GLException("Unable to create context(2) (have GLX_ARB_create_context)");
+          throw new GLException("X11GLXContext.createContext failed, but context > GL2 requested "+getGLVersion(null, major[0], minor[0], ctp[0], "@creation")+", ");
+        }
+        if(DEBUG) {
+          System.err.println("X11GLXContext.createContext failed, fall back to !ARB context "+getGLVersion(null, major[0], minor[0], ctp[0], "@creation"));
         }
 
         // continue with temp context for GL <= 3.0
@@ -292,9 +304,6 @@ public abstract class X11GLXContext extends GLContextImpl {
           GLX.glXDestroyContext(display, temp_context);
           throw new GLException("Error making context(1) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
         }
-        if(DEBUG) {
-          System.err.println("X11GLXContext.createContext(1) done "+toHexString(context));
-        }
     }
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
index cfcd5cbe3..0d74bb791 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
@@ -86,15 +86,24 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
   public boolean isVendorNVIDIA() { return isVendorNVIDIA; }
 
   private X11DummyGLXDrawable sharedDrawable=null;
-  private GLContext sharedContext=null;
+  private X11GLXContext sharedContext=null;
+
+  // package private ..
+  final X11GLXContext getSharedContext() {
+    validate();
+    return sharedContext; 
+  }
 
   private void initShared() {
     if(null==sharedDrawable) {
         X11Lib.XLockDisplay(sharedScreen.getDevice().getHandle());
         sharedDrawable = new X11DummyGLXDrawable(sharedScreen, this, null);
-        sharedContext  = sharedDrawable.createContext(null);
-        sharedContext.makeCurrent();
-        sharedContext.release();
+        X11GLXContext _sharedContext  = (X11GLXContext) sharedDrawable.createContext(null);
+        {
+            _sharedContext.makeCurrent();
+            _sharedContext.release();
+        }
+        sharedContext = _sharedContext;
         X11Lib.XUnlockDisplay(sharedScreen.getDevice().getHandle());
         if (DEBUG) {
           System.err.println("!!! SharedContext: "+sharedContext);
@@ -136,6 +145,7 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
     if (target == null) {
       throw new IllegalArgumentException("Null target");
     }
+    initShared();
     if( isVendorATI() ) {
         X11Util.markGlobalDisplayUndeletable(target.getDisplayHandle()); // ATI hack ..
     }
@@ -143,9 +153,11 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
   }
 
   protected GLDrawableImpl createOffscreenDrawable(NativeWindow target) {
+    validate();
     if (target == null) {
       throw new IllegalArgumentException("Null target");
     }
+    initShared();
     if( isVendorATI() ) {
         X11Util.markGlobalDisplayUndeletable(target.getDisplayHandle()); // ATI hack ..
     }
@@ -187,6 +199,12 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
   }
 
   protected GLDrawableImpl createGLPbufferDrawableImpl(final NativeWindow target) {
+    validate();
+    if (target == null) {
+      throw new IllegalArgumentException("Null target");
+    }
+    initShared();
+
     GLDrawableImpl pbufferDrawable;
 
     /** 
@@ -197,7 +215,6 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
      */
     boolean usedSharedContext=false;
     if( isVendorATI() && null == GLContext.getCurrent() ) {
-        initShared();
         sharedContext.makeCurrent();
         usedSharedContext=true;
     }
@@ -216,6 +233,8 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
 
 
   protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
+    validate();
+    initShared();
     X11Lib.XLockDisplay(sharedScreen.getDevice().getHandle());
     NullWindow nw = new NullWindow(X11GLXGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(capabilities, chooser, sharedScreen));
     X11Lib.XUnlockDisplay(sharedScreen.getDevice().getHandle());
@@ -225,16 +244,19 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
 
   public GLContext createExternalGLContext() {
     validate();
+    initShared();
     return X11ExternalGLXContext.create(this, null);
   }
 
   public boolean canCreateExternalGLDrawable(AbstractGraphicsDevice device) {
     validate();
+    initShared();
     return canCreateGLPbuffer(device);
   }
 
   public GLDrawable createExternalGLDrawable() {
     validate();
+    initShared();
     return X11ExternalGLXDrawable.create(this, null);
   }
 
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index a8dbf9213..833ebf192 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -287,6 +287,7 @@ public abstract class GLContext {
   public final int getGLVersionMinor() { return ctxMajorVersion; }
   public final boolean isGLCompatibilityProfile() { return ( 0 != ( CTX_PROFILE_COMPAT & ctxOptions ) ); }
   public final boolean isGLForwardCompatible()    { return ( 0 != ( CTX_OPTION_FORWARD & ctxOptions ) ); }
+  public final boolean isCreatedWithARBMethod()   { return ( 0 != ( CTX_IS_ARB_CREATED & ctxOptions ) ); }
 
   /** 
    * Returns a valid OpenGL version string, ie 
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 231faab8c..e1fc9f53f 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -715,6 +715,8 @@ public class GLProfile implements Cloneable {
     private static final boolean isAWTAvailable;
     private static final boolean isAWTJOGLAvailable;
 
+    private static final boolean hasGL4bcImpl;
+    private static final boolean hasGL4Impl;
     private static final boolean hasGL3bcImpl;
     private static final boolean hasGL3Impl;
     private static final boolean hasGL2Impl;
@@ -791,6 +793,8 @@ public class GLProfile implements Cloneable {
         }
 
         // FIXME: check for real GL3 availability .. ?
+        hasGL4bcImpl   = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl4.GL4bcImpl");
+        hasGL4Impl     = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl4.GL4Impl");
         hasGL3bcImpl   = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl3.GL3bcImpl");
         hasGL3Impl     = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl3.GL3Impl");
         hasGL2Impl     = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl2.GL2Impl");
@@ -837,6 +841,8 @@ public class GLProfile implements Cloneable {
             System.err.println("GLProfile.static hasNativeOSFactory "+hasNativeOSFactory);
             System.err.println("GLProfile.static hasDesktopGLES12 "+hasDesktopGLES12);
             System.err.println("GLProfile.static hasDesktopGL "+hasDesktopGL);
+            System.err.println("GLProfile.static hasGL4bcImpl "+hasGL4bcImpl);
+            System.err.println("GLProfile.static hasGL4Impl "+hasGL4Impl);
             System.err.println("GLProfile.static hasGL3bcImpl "+hasGL3bcImpl);
             System.err.println("GLProfile.static hasGL3Impl "+hasGL3Impl);
             System.err.println("GLProfile.static hasGL2Impl "+hasGL2Impl);
@@ -891,6 +897,7 @@ public class GLProfile implements Cloneable {
      * Returns the profile implementation
      */
     private static String computeProfileImpl(String profile) {
+    // FIXME Order of return profiles, after we can test their availability
         if (GL2ES1.equals(profile)) {
             if(hasGL2ES12Impl) {
                 return GL2ES12;
@@ -908,9 +915,21 @@ public class GLProfile implements Cloneable {
                 return GL3;
             } else if(hasGL3bcImpl) {
                 return GL3bc;
+            } else if(hasGL4Impl) {
+                return GL4;
+            } else if(hasGL4bcImpl) {
+                return GL4bc;
             } else if(hasGLES2Impl) {
                 return GLES2;
             }
+        } else if(GL4bc.equals(profile) && hasGL4bcImpl) {
+            return GL4bc;
+        } else if(GL4.equals(profile)) {
+            if(hasGL4Impl) {
+                return GL4;
+            } else if(hasGL4bcImpl) {
+                return GL4bc;
+            }
         } else if(GL3bc.equals(profile) && hasGL3bcImpl) {
             return GL3bc;
         } else if(GL3.equals(profile)) {
-- 
cgit v1.2.3


From 7deccdaa76305b7acae9dfc7a15f974387c6cd1a Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sat, 17 Apr 2010 22:40:12 +0200
Subject: DRIHack.driHackNeeded is now initialized once in the static
 initializer (not in every begin() call).

---
 .../classes/com/jogamp/opengl/impl/DRIHack.java    | 44 +++++++++++++---------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java b/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java
index e845ef160..7e81d194b 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java
@@ -40,6 +40,7 @@
 package com.jogamp.opengl.impl;
 
 import com.jogamp.common.os.NativeLibrary;
+import com.jogamp.common.os.Platform;
 import java.io.*;
 import java.security.*;
 
@@ -76,27 +77,31 @@ import java.security.*;
  */
 
 public class DRIHack {
+
   private static final boolean DEBUG = Debug.debug("DRIHack");
   private static boolean driHackNeeded;
   private static NativeLibrary oglLib;
 
-  public static void begin() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-        public Object run() {
-          String os = Debug.getProperty("os.name", false).toLowerCase();
-          // Do DRI hack on all Linux distributions for best robustness
-          driHackNeeded =
-            (os.startsWith("linux") ||
-             new File("/usr/lib/dri").exists() ||
-             new File("/usr/X11R6/lib/modules/dri").exists());
-          // Allow manual overriding for now as a workaround for
-          // problems seen in some situations -- needs more investigation
-          if (Debug.getProperty("jogl.drihack.disable", true) != null) {
+    static {
+        // Allow manual overriding for now as a workaround for
+        // problems seen in some situations -- needs more investigation
+        if (Debug.getProperty("jogl.drihack.disable", true) != null) {
             driHackNeeded = false;
-          }
-          return null;
+        } else {
+            AccessController.doPrivileged(new PrivilegedAction() {
+                public Object run() {
+                    String os = Platform.getOS().toLowerCase();
+                    // Do DRI hack on all Linux distributions for best robustness
+                    driHackNeeded = os.startsWith("linux")
+                                || new File("/usr/lib/dri").exists()
+                                || new File("/usr/X11R6/lib/modules/dri").exists();
+                    return null;
+                }
+            });
         }
-      });
+    }
+
+  public static void begin() {
 
     if (driHackNeeded) {
       if (DEBUG) {
@@ -106,12 +111,17 @@ public class DRIHack {
       // Try a few different variants for best robustness
       // In theory probably only the first is necessary
       oglLib = NativeLibrary.open("libGL.so.1", null);
-      if (DEBUG && oglLib != null) System.err.println(" Found libGL.so.1");
+      if (DEBUG && oglLib != null) {
+          System.err.println(" Found libGL.so.1");
+      }
       if (oglLib == null) {
         oglLib = NativeLibrary.open("/usr/lib/libGL.so.1", null);
-        if (DEBUG && oglLib != null) System.err.println(" Found /usr/lib/libGL.so.1");
+        if (DEBUG && oglLib != null) {
+            System.err.println(" Found /usr/lib/libGL.so.1");
+        }
       }
     }
+
   }
 
   public static void end() {
-- 
cgit v1.2.3


From aa7084700bbf74d8bcc98cf0239f57cff2983423 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sun, 18 Apr 2010 00:31:12 +0200
Subject: code review (http://jogamp.org/bugzilla/show_bug.cgi?id=396):
 improved exception handling in NWReflection and NativeLibLoaderBase. goal was
 to prevent catch(Throwable) and to fix or document empty catch blocks where
 it makes sense.

---
 .../com/jogamp/nativewindow/impl/NWReflection.java | 125 +++++++++++----------
 .../nativewindow/impl/NativeLibLoaderBase.java     |  32 ++++--
 2 files changed, 86 insertions(+), 71 deletions(-)

diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWReflection.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWReflection.java
index 22bdedac9..9bac9477a 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWReflection.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWReflection.java
@@ -40,73 +40,83 @@ import java.lang.reflect.*;
 import javax.media.nativewindow.*;
 
 public final class NWReflection {
+    
   public static final boolean DEBUG = Debug.debug("NWReflection");
 
-  public static final boolean isClassAvailable(String clazzName) {
-    try {
-        Class clazz = Class.forName(clazzName, false, NWReflection.class.getClassLoader());
-        return null!=clazz;
-    } catch (Throwable e) { }
-    return false;
-  }
+    /**
+     * Returns true only if the class could be loaded.
+     */
+    public static final boolean isClassAvailable(String clazzName) {
+        try {
+            return null != Class.forName(clazzName, false, NWReflection.class.getClassLoader());
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
 
-  public static final Class getClass(String clazzName, boolean initialize) {
-    try {
-        return Class.forName(clazzName, initialize, NWReflection.class.getClassLoader());
-    } catch (Throwable e) { }
-    return null;
-  }
+    /**
+     * Loads and returns the class or null.
+     * @see Class#forName(java.lang.String, boolean, java.lang.ClassLoader)
+     */
+    public static final Class getClass(String clazzName, boolean initialize) {
+        try {
+            return getClassImpl(clazzName, initialize);
+        } catch (ClassNotFoundException e) {
+            return null;
+        }
+    }
 
-  public static final Constructor getConstructor(String clazzName, Class[] cstrArgTypes) {
-    Class factoryClass = null;
-    Constructor factory = null;
+    private static Class getClassImpl(String clazzName, boolean initialize) throws ClassNotFoundException {
+        return Class.forName(clazzName, initialize, NWReflection.class.getClassLoader());
+    }
 
-    try {
-        factoryClass = getClass(clazzName, true);
-        if (factoryClass == null) {
-          throw new NativeWindowException(clazzName + " not available");
+    /**
+     * @throws NativeWindowException if the constructor can not be delivered.
+     */
+    public static final Constructor getConstructor(String clazzName, Class[] cstrArgTypes) {
+        try {
+            return getConstructor(getClassImpl(clazzName, true), cstrArgTypes);
+        } catch (ClassNotFoundException ex) {
+            throw new NativeWindowException(clazzName + " not available", ex);
         }
-        return getConstructor(factoryClass, cstrArgTypes);
-    } catch (Throwable e) { 
-      if (DEBUG) {
-          e.printStackTrace();
-      }
-      throw new NativeWindowException(e);
     }
-  }
-
-  public static final Constructor getConstructor(Class clazz, Class[] cstrArgTypes) {
-    Constructor factory = null;
 
-    try {
+    /**
+     * @throws NativeWindowException if the constructor can not be delivered.
+     */
+    public static final Constructor getConstructor(Class clazz, Class[] cstrArgTypes) {
         try {
-            factory = clazz.getDeclaredConstructor( cstrArgTypes );
-        } catch(NoSuchMethodException nsme) {
-          throw new NativeWindowException("Constructor: '" + clazz + "("+cstrArgTypes+")' not found");
+            return clazz.getDeclaredConstructor(cstrArgTypes);
+        } catch (NoSuchMethodException ex) {
+            String args = "";
+            for (int i = 0; i < cstrArgTypes.length; i++) {
+                args += cstrArgTypes[i].getName();
+                if(i != cstrArgTypes.length-1) {
+                     args+= ", ";
+                }
+            }
+            throw new NativeWindowException("Constructor: '" + clazz + "(" + args + ")' not found", ex);
         }
-        return factory;
-    } catch (Throwable e) { 
-      if (DEBUG) {
-          e.printStackTrace();
-      }
-      throw new NativeWindowException(e);
     }
-  }
 
   public static final Constructor getConstructor(String clazzName) {
     return getConstructor(clazzName, new Class[0]);
   }
 
-  public static final Object createInstance(Class clazz, Class[] cstrArgTypes, Object[] cstrArgs) {
-    Constructor factory = null;
-
-    try {
-        factory = getConstructor(clazz, cstrArgTypes);
-        return factory.newInstance( cstrArgs ) ;
-    } catch (Exception e) {
-      throw new NativeWindowException(e);
+    /**
+     * @throws NativeWindowException if the instance can not be created.
+     */
+    public static final Object createInstance(Class clazz, Class[] cstrArgTypes, Object[] cstrArgs) {
+        try {
+            return getConstructor(clazz, cstrArgTypes).newInstance(cstrArgs);
+        } catch (InstantiationException ex) {
+            throw new NativeWindowException("can not create instance of class "+clazz, ex);
+        } catch (InvocationTargetException ex) {
+            throw new NativeWindowException("can not create instance of class "+clazz, ex);
+        } catch (IllegalAccessException ex) {
+            throw new NativeWindowException("can not create instance of class "+clazz, ex);
+        }
     }
-  }
 
   public static final Object createInstance(Class clazz, Object[] cstrArgs) {
     Class[] cstrArgTypes = new Class[cstrArgs.length];
@@ -116,16 +126,13 @@ public final class NWReflection {
     return createInstance(clazz, cstrArgTypes, cstrArgs);
   }
 
-  public static final Object createInstance(String clazzName, Class[] cstrArgTypes, Object[] cstrArgs) {
-    Constructor factory = null;
-
-    try {
-        factory = getConstructor(clazzName, cstrArgTypes);
-        return factory.newInstance( cstrArgs ) ;
-    } catch (Exception e) {
-      throw new NativeWindowException(e);
+    public static final Object createInstance(String clazzName, Class[] cstrArgTypes, Object[] cstrArgs) {
+        try {
+            return createInstance(getClassImpl(clazzName, true), cstrArgTypes, cstrArgs);
+        } catch (ClassNotFoundException ex) {
+            throw new NativeWindowException(clazzName + " not available", ex);
+        }
     }
-  }
 
   public static final Object createInstance(String clazzName, Object[] cstrArgs) {
     Class[] cstrArgTypes = new Class[cstrArgs.length];
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeLibLoaderBase.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeLibLoaderBase.java
index 0670234d4..c4f1d7e08 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeLibLoaderBase.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeLibLoaderBase.java
@@ -64,8 +64,7 @@ public class NativeLibLoaderBase {
   }
   
   private static class DefaultAction implements LoaderAction {
-    public void loadLibrary(String libname, String[] preload,
-        boolean preloadIgnoreError) {
+    public void loadLibrary(String libname, String[] preload, boolean preloadIgnoreError) {
       if (null!=preload) {
         for (int i=0; i<preload.length; i++) {
           if(!isLoaded(preload[i])) {
@@ -75,9 +74,10 @@ public class NativeLibLoaderBase {
                 if(DEBUG) {
                     System.err.println("NativeLibLoaderBase preloaded "+preload[i]);
                 }
-              }
-              catch (UnsatisfiedLinkError e) {
-                if(DEBUG) e.printStackTrace();
+              } catch (UnsatisfiedLinkError e) {
+                if(DEBUG) {
+                    e.printStackTrace();
+                }
                 if (!preloadIgnoreError && e.getMessage().indexOf("already loaded") < 0) {
                   throw e;
                 }
@@ -140,6 +140,7 @@ public class NativeLibLoaderBase {
   private static final Class  customLauncherClass;
   private static final Method customLoadLibraryMethod;
 
+  // FIXME centralize logging
   static {
     Class launcherClass = null;
     Method loadLibraryMethod = null;
@@ -148,12 +149,15 @@ public class NativeLibLoaderBase {
         try {
             launcherClass = Class.forName("org.jdesktop.applet.util.JNLPAppletLauncher");
             loadLibraryMethod = launcherClass.getDeclaredMethod("loadLibrary", new Class[] { String.class });
-        } catch (Throwable t) { 
+        } catch (ClassNotFoundException ex) {
+            if(DEBUG) {
+                ex.printStackTrace();
+            }
+        } catch (NoSuchMethodException ex) {
             if(DEBUG) {
-                t.printStackTrace();
+                ex.printStackTrace();
             }
             launcherClass = null;
-            loadLibraryMethod = null;
         }
     }
 
@@ -163,15 +167,19 @@ public class NativeLibLoaderBase {
             try {
                 launcherClass = Class.forName(launcherClassName);
                 loadLibraryMethod = launcherClass.getDeclaredMethod("loadLibrary", new Class[] { String.class });
-            } catch (Throwable t) { 
+            } catch (ClassNotFoundException ex) {
+                if(DEBUG) {
+                    ex.printStackTrace();
+                }
+            } catch (NoSuchMethodException ex) {
                 if(DEBUG) {
-                    t.printStackTrace();
+                    ex.printStackTrace();
                 }
                 launcherClass = null;
-                loadLibraryMethod = null;
             }
         }
     }
+
     customLauncherClass = launcherClass;
     customLoadLibraryMethod = loadLibraryMethod;
   }
@@ -192,7 +200,7 @@ public class NativeLibLoaderBase {
             throw (RuntimeException) t;
           }
           // Throw UnsatisfiedLinkError for best compatibility with System.loadLibrary()
-          throw (UnsatisfiedLinkError) new UnsatisfiedLinkError().initCause(e);
+          throw (UnsatisfiedLinkError)new UnsatisfiedLinkError("can not load library "+libraryName).initCause(e);
         }
     } else {
       // System.out.println("sun.boot.library.path=" + Debug.getProperty("sun.boot.library.path", false));
-- 
cgit v1.2.3


From 32790c376583beccd030eecd7c56cbe66d380172 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 20 Apr 2010 11:46:26 +0200
Subject: JOGL GL4 preperation (cont):

- All available OpenGL versions (native/platform) are verified at GLProfile
  initialization and can be queried ..
  A mapping of major,compat -> major,minor,options is created.

- Removal of temp context creation, when creating a context.
  This was necessary to query general availability of ARB_create_context.
  Due to the shared context of X11GLXDrawableFactory and WindowsWGLDrawableFactory,
  this is no more necessary.
  Due to the version mapping, the ARB_create_context paramters are known.

- NativeWindow X11Lib: Added X11ErrorHandler, throwing a RuntimeException.
  Necessary to catch BadMatch .. etc X11 errors, eg for glXCreateContextAttribsARB
  Hence all X11 calls are covered now.

- X11DummyGLXDrawable needs to use an own Window, otherwise GLn n>2 fails

- Flattening the desktop GL* implementation,
  all use GL4bcImpl, which reduces the footprint dramatically.

- GL*Impl.isGL*() (desktop) utilizes the GLContext.isGL*(),
  hence the results reflect the actual native context version.

- GLContextImpl makeCurrent/create: Added workflow documentation,
  clarified code, defined abstract methods to have a protocol.

- Removed moved files (from here to gluegen),
  see gluegen a01cb3d59715a41153380f1977ec75263b762dc6

- NativeLibLoader -> <TYPE>JNILibLoader

- Fixed Exception Handling (as in gluegen bce53b52c8638729750c4286dbc04cb14329fd34),
  ie removed empty catch Throwable ..

- GLContext.setSwapInterval(): Nop in offscreen case, otherwise X11IOError (NVIDIA Bug)

Test:
  Tests
    - Junit
    - demos.gears.Gears
    - demos.jrefract.JRefract

  Platforms
    - Linux 64/32 ATI/NVidia
    - MacOsX
    - Windows (virtualbox 3.1.6, offscreen failed)

TODO/BUGS:
    - FIXME ATI GLn n>2 with AWT, can't make context current, works well on NVIDIA though
    - FIXME GL3GL4: Due to GL3 and GL4 implementation bugs, we still choose GL2 first, if available!
    - Add GL 3.3 to GL3/gl3ext.h
    - Add GL 4.0 to GL3/gl3ext.h and fix the GL3/GL4 seperation
    - Rename jogl.gl2.jar -> jogl.gldesktop.jar (as done with it's native lib already)
---
 make/build-jogl.xml                                | 133 +++--
 make/build-junit.xml                               |  18 +
 make/build-nativewindow.xml                        |  14 +-
 make/config/jogl/cg-common-CustomJavaCode.java     |   2 +-
 make/config/jogl/gl-gl2.cfg                        |  48 +-
 make/config/jogl/gl-gl2es12.cfg                    |  90 ----
 make/config/jogl/gl-gl3.cfg                        |  43 +-
 make/config/jogl/gl-gl3bc.cfg                      |  64 +--
 make/config/jogl/gl-gl4.cfg                        |  37 ++
 make/config/jogl/gl-gl4bc.cfg                      | 110 +++++
 make/config/jogl/gl-impl-CustomCCode-gl2.c         |  24 -
 make/config/jogl/gl-impl-CustomCCode-gl2es12.c     |  24 -
 make/config/jogl/gl-impl-CustomCCode-gl3.c         |  24 -
 make/config/jogl/gl-impl-CustomCCode-gl3bc.c       |  24 -
 make/config/jogl/gl-impl-CustomCCode-gl4bc.c       |  24 +
 .../config/jogl/gl-impl-CustomJavaCode-common.java |  74 ++-
 .../jogl/gl-impl-CustomJavaCode-desktop.java       | 250 +++++++---
 make/config/jogl/gl-impl-CustomJavaCode-gl2.java   | 514 --------------------
 .../jogl/gl-impl-CustomJavaCode-gl2es12.java       | 455 ------------------
 make/config/jogl/gl-impl-CustomJavaCode-gl3.java   | 468 ------------------
 make/config/jogl/gl-impl-CustomJavaCode-gl3bc.java | 514 --------------------
 make/config/jogl/gl-impl-CustomJavaCode-gl4.java   | 339 +++++++++++++
 make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java | 385 +++++++++++++++
 make/config/jogl/gl-impl-CustomJavaCode-gles1.java |  41 --
 make/config/jogl/gl-impl-CustomJavaCode-gles2.java |  41 --
 make/config/jogl/gl3-common.cfg                    |   3 +
 make/config/jogl/gl3-desktop-tracker.cfg           |  38 --
 make/config/jogl/gl4-common.cfg                    |   5 +
 make/config/jogl/gl4-desktop-tracker.cfg           |  38 ++
 make/config/jogl/glu-CustomJavaCode-base.java      |   4 +-
 make/config/jogl/glu-CustomJavaCode-gl2es1.java    |   2 +-
 make/config/jogl/glu-common.cfg                    |   2 +-
 make/config/jogl/obsolete/gl-gl2es12.cfg           |  90 ++++
 .../config/jogl/obsolete/gl-impl-CustomCCode-gl2.c |  24 +
 .../jogl/obsolete/gl-impl-CustomCCode-gl2es12.c    |  24 +
 .../config/jogl/obsolete/gl-impl-CustomCCode-gl3.c |  24 +
 .../jogl/obsolete/gl-impl-CustomJavaCode-gl2.java  | 385 +++++++++++++++
 .../obsolete/gl-impl-CustomJavaCode-gl2es12.java   | 353 ++++++++++++++
 make/config/nativewindow/x11-CustomJavaCode.java   |   3 +-
 make/stub_includes/opengl/gl4.c                    |  10 +-
 make/stub_includes/opengl/gl4bc.c                  |  18 +
 .../opengl/impl/ExtensionAvailabilityCache.java    |   4 +-
 .../com/jogamp/opengl/impl/GLContextImpl.java      | 489 ++++++++++++-------
 .../jogamp/opengl/impl/GLDrawableFactoryImpl.java  |   5 +-
 .../com/jogamp/opengl/impl/GLDrawableImpl.java     |   2 +-
 .../com/jogamp/opengl/impl/GLJNILibLoader.java     | 100 ++++
 .../com/jogamp/opengl/impl/NativeLibLoader.java    | 109 -----
 .../com/jogamp/opengl/impl/ThreadingImpl.java      |  11 +-
 .../com/jogamp/opengl/impl/egl/EGLContext.java     |  10 +-
 .../jogamp/opengl/impl/egl/EGLDrawableFactory.java |  12 +-
 .../opengl/impl/egl/EGLDynamicLookupHelper.java    |  12 +-
 .../jogamp/opengl/impl/egl/EGLExternalContext.java |   2 +-
 .../opengl/impl/macosx/cgl/MacOSXCGLContext.java   |  19 +-
 .../impl/macosx/cgl/MacOSXCGLDrawableFactory.java  |  11 +-
 .../impl/macosx/cgl/MacOSXExternalCGLContext.java  |   5 +-
 .../impl/macosx/cgl/MacOSXOnscreenCGLContext.java  |   4 +-
 .../impl/macosx/cgl/MacOSXPbufferCGLContext.java   |  13 +-
 .../macosx/cgl/awt/MacOSXJava2DCGLContext.java     |  11 +-
 .../windows/wgl/WindowsExternalWGLContext.java     |   2 +-
 .../opengl/impl/windows/wgl/WindowsWGLContext.java |  16 +-
 .../windows/wgl/WindowsWGLDrawableFactory.java     |  52 +-
 .../WindowsWGLGraphicsConfigurationFactory.java    |   1 -
 .../opengl/impl/x11/glx/X11DummyGLXDrawable.java   |  13 +-
 .../opengl/impl/x11/glx/X11ExternalGLXContext.java |   2 +-
 .../jogamp/opengl/impl/x11/glx/X11GLXContext.java  | 121 +++--
 .../opengl/impl/x11/glx/X11GLXDrawableFactory.java |  52 +-
 .../opengl/impl/x11/glx/X11PbufferGLXContext.java  |  29 +-
 .../com/jogamp/opengl/util/ImmModeSink.java        |   6 +-
 .../opengl/util/glsl/fixedfunc/FixedFuncUtil.java  |   2 +-
 src/jogl/classes/javax/media/opengl/GL4.java       |   5 -
 src/jogl/classes/javax/media/opengl/GL4bc.java     |   5 -
 src/jogl/classes/javax/media/opengl/GLContext.java | 187 +++++++-
 .../javax/media/opengl/GLDrawableFactory.java      |  62 +--
 src/jogl/classes/javax/media/opengl/GLProfile.java | 534 ++++++++++++---------
 .../test/junit/jogl/acore/TestGLProfile01CORE.java |  95 ++++
 .../jogamp/test/junit/jogl/awt/TestAWT01GLn.java   | 106 ++++
 .../junit/jogl/offscreen/TestOffscreen01NEWT.java  |  39 +-
 .../test/junit/jogl/texture/TestTexture01AWT.java  |   2 +-
 .../jogamp/nativewindow/impl/NWJNILibLoader.java   |  50 ++
 .../com/jogamp/nativewindow/impl/NWReflection.java | 188 --------
 .../nativewindow/impl/NativeLibLoaderBase.java     | 210 --------
 .../nativewindow/impl/NativeWindowFactoryImpl.java |   5 +-
 .../nativewindow/impl/jawt/JAWTJNILibLoader.java   |  78 +++
 .../impl/jawt/JAWTNativeLibLoader.java             |  78 ---
 .../jogamp/nativewindow/impl/jawt/JAWTUtil.java    |   4 +-
 .../com/jogamp/nativewindow/impl/jvm/JVMUtil.java  |  72 ---
 .../com/jogamp/nativewindow/impl/x11/X11Util.java  |   2 +-
 .../nativewindow/GraphicsConfigurationFactory.java |   3 +-
 .../media/nativewindow/NativeWindowFactory.java    |  13 +-
 src/nativewindow/native/JVM_Tool.c                 |  51 --
 src/nativewindow/native/x11/Xmisc.c                |  50 +-
 src/newt/classes/com/jogamp/newt/NewtFactory.java  |   2 +-
 src/newt/classes/com/jogamp/newt/Window.java       |   5 +-
 .../com/jogamp/newt/impl/NEWTJNILibLoader.java     |  62 +++
 .../com/jogamp/newt/impl/NativeLibLoader.java      |  62 ---
 .../classes/com/jogamp/newt/intel/gdl/Display.java |   2 +-
 .../classes/com/jogamp/newt/macosx/MacDisplay.java |   2 +-
 .../jogamp/newt/opengl/broadcom/egl/Display.java   |   2 +-
 .../com/jogamp/newt/opengl/kd/KDDisplay.java       |   2 +-
 .../classes/com/jogamp/newt/util/MainThread.java   |   6 +-
 .../com/jogamp/newt/windows/WindowsDisplay.java    |   2 +-
 .../classes/com/jogamp/newt/x11/X11Display.java    |   2 +-
 src/newt/native/X11Window.c                        |  34 +-
 103 files changed, 3850 insertions(+), 4070 deletions(-)
 delete mode 100644 make/config/jogl/gl-gl2es12.cfg
 create mode 100644 make/config/jogl/gl-gl4.cfg
 create mode 100644 make/config/jogl/gl-gl4bc.cfg
 delete mode 100644 make/config/jogl/gl-impl-CustomCCode-gl2.c
 delete mode 100644 make/config/jogl/gl-impl-CustomCCode-gl2es12.c
 delete mode 100644 make/config/jogl/gl-impl-CustomCCode-gl3.c
 delete mode 100644 make/config/jogl/gl-impl-CustomCCode-gl3bc.c
 create mode 100644 make/config/jogl/gl-impl-CustomCCode-gl4bc.c
 delete mode 100644 make/config/jogl/gl-impl-CustomJavaCode-gl2.java
 delete mode 100644 make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
 delete mode 100644 make/config/jogl/gl-impl-CustomJavaCode-gl3.java
 delete mode 100644 make/config/jogl/gl-impl-CustomJavaCode-gl3bc.java
 create mode 100644 make/config/jogl/gl-impl-CustomJavaCode-gl4.java
 create mode 100644 make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
 delete mode 100644 make/config/jogl/gl3-desktop-tracker.cfg
 create mode 100644 make/config/jogl/gl4-common.cfg
 create mode 100644 make/config/jogl/gl4-desktop-tracker.cfg
 create mode 100644 make/config/jogl/obsolete/gl-gl2es12.cfg
 create mode 100644 make/config/jogl/obsolete/gl-impl-CustomCCode-gl2.c
 create mode 100644 make/config/jogl/obsolete/gl-impl-CustomCCode-gl2es12.c
 create mode 100644 make/config/jogl/obsolete/gl-impl-CustomCCode-gl3.c
 create mode 100644 make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2.java
 create mode 100644 make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2es12.java
 create mode 100644 make/stub_includes/opengl/gl4bc.c
 create mode 100644 src/jogl/classes/com/jogamp/opengl/impl/GLJNILibLoader.java
 delete mode 100644 src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
 delete mode 100644 src/jogl/classes/javax/media/opengl/GL4.java
 delete mode 100644 src/jogl/classes/javax/media/opengl/GL4bc.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/acore/TestGLProfile01CORE.java
 create mode 100755 src/junit/com/jogamp/test/junit/jogl/awt/TestAWT01GLn.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/NWJNILibLoader.java
 delete mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/NWReflection.java
 delete mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeLibLoaderBase.java
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTJNILibLoader.java
 delete mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTNativeLibLoader.java
 delete mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/jvm/JVMUtil.java
 delete mode 100644 src/nativewindow/native/JVM_Tool.c
 create mode 100644 src/newt/classes/com/jogamp/newt/impl/NEWTJNILibLoader.java
 delete mode 100644 src/newt/classes/com/jogamp/newt/impl/NativeLibLoader.java

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index d42b859bd..6d95ebea8 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -104,9 +104,6 @@
         <property name="java.part.cgl"
                   value="com/jogamp/opengl/impl/macosx/cgl/*"/>
 
-        <property name="java.part.gl2es12"
-                  value="com/jogamp/opengl/impl/gl2es12/**"/>
-
         <property name="java.part.gl4"
                   value="com/jogamp/opengl/impl/**/gl4/**"/>
 
@@ -508,12 +505,24 @@
         </gluegen>
     </target>
 
-    <target name="java.generate.gl2es12">
-        <echo message="Generating GL2ES12 implementation" />
+    <target name="java.generate.gl4">
+        <echo message="Generating GL4 interface and implementation" />
+        <antcall target="java.generate.copy2temp" inheritRefs="true" />
+        <gluegen src="${stub.includes.opengl}/gl4.c" 
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-gl4.cfg"
+                 includeRefid="stub.includes.fileset.all.gl2"
+                 emitter="com.sun.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen.classpath" />
+        </gluegen>
+    </target>
+
+    <target name="java.generate.gl4bc">
+        <echo message="Generating GL4bc implementation" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gl2es12.c" 
+        <gluegen src="${stub.includes.opengl}/gl4bc.c" 
                  outputRootDir="${build.jogl}"
-                 config="${config.jogl}/gl-gl2es12.cfg"
+                 config="${config.jogl}/gl-gl4bc.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -544,7 +553,7 @@
         </gluegen>
     </target>
 
-    <target name="java.generate.gl.all" depends="java.generate.gl_if, java.generate.gl2_es1_if, java.generate.gl2_es2_if, java.generate.gl2_gl3_if, java.generate.gl2, java.generate.gl3, java.generate.gl3bc, java.generate.gl2es12, java.generate.gles1, java.generate.gles2"/>
+    <target name="java.generate.gl.all" depends="java.generate.gl_if, java.generate.gl2_es1_if, java.generate.gl2_es2_if, java.generate.gl2_gl3_if, java.generate.gl2, java.generate.gl3, java.generate.gl3bc, java.generate.gl4, java.generate.gl4bc, java.generate.gles1, java.generate.gles2"/>
 
     <!-- target name="java.generate.gl.nsig" if="gluegen.nsig">
         <echo message="Generating GL interface and implementation" />
@@ -781,21 +790,6 @@
 
     </target>        
 
-    <target name="java.generate.composable.pipeline.check.gl2es12">
-        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
-             (the uptodate element doesn't support arbitrary source and destination files) -->
-        <dependset>
-            <srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES12.class" />
-            <targetfileset dir="${src.generated.java}/javax/media/opengl"
-                           includes="DebugGL2ES12.java,TraceGL2ES12.java" />
-        </dependset>
-                           
-        <!-- Now choose one of the two to test to see if we have to regenerate -->
-        <uptodate property="java.generate.composable.pipeline.skip.gl2es12"
-                  srcfile="${classes}/javax/media/opengl/GL2ES12.class"
-                  targetfile="${src.generated.java}/javax/media/opengl/DebugGL2ES12.java" />
-    </target>        
-
     <target name="java.generate.composable.pipeline.check.gl2">
         <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
              (the uptodate element doesn't support arbitrary source and destination files) -->
@@ -826,6 +820,21 @@
                   targetfile="${src.generated.java}/javax/media/opengl/DebugGL3.java" />
     </target>        
 
+    <target name="java.generate.composable.pipeline.check.gl4">
+        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
+             (the uptodate element doesn't support arbitrary source and destination files) -->
+        <dependset>
+            <srcfilelist dir="${classes}/javax/media/opengl" files="GL4.class" />
+            <targetfileset dir="${src.generated.java}/javax/media/opengl"
+                           includes="DebugGL4.java,TraceGL4.java,DebugGL4bc.java,TraceGL4bc.java" />
+        </dependset>
+                           
+        <!-- Now choose one of the two to test to see if we have to regenerate -->
+        <uptodate property="java.generate.composable.pipeline.skip.gl4"
+                  srcfile="${classes}/javax/media/opengl/GL4.class"
+                  targetfile="${src.generated.java}/javax/media/opengl/DebugGL4.java" />
+    </target>        
+
     <target name="java.generate.composable.pipeline.es1" depends="java.generate.composable.pipeline.check.es1" unless="java.generate.composable.pipeline.skip.es1">
         <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GLES1" />
@@ -899,7 +908,29 @@
         </copy>
     </target>          
 
-    <target name="java.generate.composable.pipeline" depends="java.generate.composable.pipeline.es1, java.generate.composable.pipeline.es2, java.generate.composable.pipeline.gl2, java.generate.composable.pipeline.gl3">
+    <target name="java.generate.composable.pipeline.gl4" depends="java.generate.composable.pipeline.check.gl4" unless="java.generate.composable.pipeline.skip.gl4">
+        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+            <arg value="javax.media.opengl.GL4" />
+            <arg value="${src.generated.java}/javax/media/opengl" />
+            <classpath refid="pipeline.classpath" />
+        </java>
+        <copy todir="${src.generated.java-cdc}">
+            <fileset dir="${src.generated.java}"
+                     includes="javax/media/opengl/DebugGL4.java javax/media/opengl/TraceGL4.java" />
+        </copy>
+
+        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+            <arg value="javax.media.opengl.GL4bc" />
+            <arg value="${src.generated.java}/javax/media/opengl" />
+            <classpath refid="pipeline.classpath" />
+        </java>
+        <copy todir="${src.generated.java-cdc}">
+            <fileset dir="${src.generated.java}"
+                     includes="javax/media/opengl/DebugGL4bc.java javax/media/opengl/TraceGL4bc.java" />
+        </copy>
+    </target>          
+
+    <target name="java.generate.composable.pipeline" depends="java.generate.composable.pipeline.es1, java.generate.composable.pipeline.es2, java.generate.composable.pipeline.gl2, java.generate.composable.pipeline.gl3, java.generate.composable.pipeline.gl4">
     </target>
 
     <target name="java.generate.composable.pipeline.custom.check.glfixfunc">
@@ -1259,9 +1290,7 @@
           <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="useOpenMAX"/>
           <include name="${rootrel.src.c.openmax}/com_jogamp_openmax_OMXInstance.c"  if="useOpenMAX"/>
 
-          <include name="${rootrel.generated.c.jogl}/gl2/GL2Impl_JNI.c"/>
-          <include name="${rootrel.generated.c.jogl}/gl3/GL3Impl_JNI.c"/>
-          <include name="${rootrel.generated.c.jogl}/gl3/GL3bcImpl_JNI.c"/>
+          <include name="${rootrel.generated.c.jogl}/gl4/GL4bcImpl_JNI.c"/>
           <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY -->
           <include name="${rootrel.generated.c.jogl}/gl2/GLUgl2_JNI.c"/>
           <include name="${rootrel.generated.c.jogl}/X11/GLX*.c" if="isX11"/>
@@ -1269,24 +1298,6 @@
           <include name="${rootrel.generated.c.jogl}/Windows/WGL*.c" if="isWindows"/>
         </patternset>
 
-        <patternset id="c.src.files.jogl.gl2es12">
-          <include name="${rootrel.src.c}/macosx/MacOSXCustomCGLCode.c" if="isOSX"/>
-          <include name="${rootrel.src.c}/macosx/MacOSXWindowSystemInterface.m" if="isOSX"/>
-          <include name="${rootrel.src.c}/macosx/ContextUpdater.m" if="isOSX"/>
-          <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/>
-          <!-- FIXME: the Mixer should be moved to another library -->
-          <!--include name="${rootrel.src.c}/Mixer.cpp" if="isWindows"/-->
-          <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="useOpenMAX"/>
-          <include name="${rootrel.src.c.openmax}/com_jogamp_openmax_OMXInstance.c"  if="useOpenMAX"/>
-
-          <include name="${rootrel.generated.c.jogl}/gl2es12/GL2ES12Impl_JNI.c"/>
-          <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY -->
-          <!--include name="${rootrel.generated.c.jogl}/gl2es12/GLUgl2es12_JNI.c"/ SKIPPED -->
-          <include name="${rootrel.generated.c.jogl}/X11/GLX*.c" if="isX11"/>
-          <include name="${rootrel.generated.c.jogl}/MacOSX/CGL*.c" if="isOSX"/>
-          <include name="${rootrel.generated.c.jogl}/Windows/WGL*.c" if="isWindows"/>
-        </patternset>
-
         <patternset id="c.src.files.jogl.es2">
           <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/>
           <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="useOpenMAX"/>
@@ -1393,13 +1404,6 @@
                linker.cfg.id="${linker.cfg.id.gl2}"/>
     </target>
 
-    <target name="c.build.jogl.gl2es12" unless="setup.nodesktop">
-      <c.build c.compiler.src.files="c.src.files.jogl.gl2es12"
-               output.lib.name="jogl_gl2es12"
-               compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.gl2}"/>
-    </target>
-
     <target name="c.build.jogl.es2">
       <c.build c.compiler.src.files="c.src.files.jogl.es2"
                output.lib.name="jogl_es2"
@@ -1430,11 +1434,10 @@
       <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es1" />
       <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es2" />
       <msvc.manifest objdir="${obj.jogl}" dllname="jogl_gl2" />
-      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_gl2es12" />
       <antcall target="c.manifest.cg" inheritRefs="true" />
     </target>
 
-    <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.gl2es12,c.build.jogl.desktop,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg">
+    <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.desktop,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg">
       <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
           <param name="libdir" value="${obj.jogl}"/>
       </antcall>
@@ -1450,7 +1453,6 @@
         <fileset dir="${obj.jogl}">
           <include name="*_es1.${native.library.suffix-cdc}" />
           <include name="*_es2.${native.library.suffix-cdc}" />
-          <include name="*_gl2es12.${native.library.suffix-cdc}" />
         </fileset>
       </jar>
     </target>
@@ -1528,14 +1530,7 @@
         </jar>
     </target>
 
-    <target name="build-jars-es-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop">
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl2es12.jar}" filesonly="true">
-            <fileset dir="${classes}" includes="${java.part.gl2es12}, ${java.part.openmax}"
-                     excludes="${java.part.glugl2}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-es-javase" depends="setup-manifestfile,build-jars-es-desktop-javase">
+    <target name="build-jars-es-javase" depends="setup-manifestfile">
         <jar manifest="${build.jogl}/tempversion" destfile="${jogl.egl.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.egl}"
@@ -1573,15 +1568,7 @@
         </jar>
     </target>
 
-    <target name="build-jars-es-desktop-cdc" depends="setup-manifestfile-cdc,build-jars-os-desktop-cdc" unless="setup.nodesktop">
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gl2es12.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.gl2es12}, ${java.part.openmax}"
-                     excludes="${java.part.glugl2}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-es-cdc" depends="setup-manifestfile-cdc,build-jars-es-desktop-cdc" unless="setup.noCDC">
+    <target name="build-jars-es-cdc" depends="setup-manifestfile-cdc" unless="setup.noCDC">
         <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.egl.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.egl}"
@@ -1645,7 +1632,7 @@
     <target name="build-jars-all-cdc" depends="setup-manifestfile">
         <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.all.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
-                     includes="${java.part.core} ${java.part.egl} ${java.part.glutess} ${java.part.glumipmap} ${java.part.openmax} ${java.part.sdk} ${java.part.glx} ${java.part.cgl} ${java.part.gl2es12} ${java.part.wgl} ${java.part.es1} ${java.part.es1.dbg} ${java.part.es2} ${java.part.es2.dbg} ${java.part.util} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}"
+                     includes="${java.part.core} ${java.part.egl} ${java.part.glutess} ${java.part.glumipmap} ${java.part.openmax} ${java.part.sdk} ${java.part.glx} ${java.part.cgl} ${java.part.wgl} ${java.part.es1} ${java.part.es1.dbg} ${java.part.es2} ${java.part.es2.dbg} ${java.part.util} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}"
                      excludes="${java.excludes.cdcfp}"/>
             <fileset dir="${src.java}"
                      includes="${java.part.util.fixedfuncemu.shadercode}"/>
diff --git a/make/build-junit.xml b/make/build-junit.xml
index 887060084..ebf3f683e 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -81,6 +81,24 @@
         <condition property="jvmarg.newt" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition>
         <condition property="jvmarg.newt" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition>
 
+        <!-- Test*CORE* -->
+        <junit forkmode="once" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
+            <env key="${system.env.library.path}" path="${obj.all.paths}"/>
+            <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
+
+            <formatter usefile="false" type="plain"/>
+            <formatter usefile="true" type="xml"/>
+            <classpath refid="junit_jogl_newt.run.classpath"/>
+
+            <batchtest todir="${results.junit}">
+              <fileset dir="${classes}">
+                  <include name="${java.dir.test}/**/Test*CORE*"/>
+              </fileset>
+              <formatter usefile="false" type="brief"/>
+              <formatter usefile="true" type="xml"/>
+            </batchtest>
+        </junit>
+
         <!-- Test*NEWT* 
 
              Emulation of junit task,
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 4b726bafb..8d1639502 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -517,10 +517,6 @@
           </and>
         </condition> 
 
-        <patternset id="c.src.files.jvm">
-          <include name="${rootrel.src.c}/JVM*.c"/>
-        </patternset>
-
         <patternset id="c.src.files.awt">
           <include name="${rootrel.src.c}/JAWT*.c"/>
           <include name="${rootrel.generated.c}/X11/JAWT*.c" if="isX11"/>
@@ -608,13 +604,6 @@
       </apply>
     </target>
 
-    <target name="c.build.nativewindow.jvm">
-      <c.build c.compiler.src.files="c.src.files.jvm"
-               output.lib.name="nativewindow_jvm"
-               compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.base}"/>
-    </target>
-
     <target name="c.build.nativewindow.awt" unless="setup.noNativeAWT">
       <c.build c.compiler.src.files="c.src.files.awt"
                c.compiler.use-jawt="true"
@@ -636,11 +625,10 @@
 
     <target name="c.manifest" if="isVC8Family">
       <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll -->
-      <msvc.manifest objdir="${obj.nativewindow}" dllname="nativewindow_jvm" />
       <msvc.manifest objdir="${obj.nativewindow}" dllname="nativewindow_awt" />
     </target>
 
-    <target name="c.build.nativewindow" depends="c.configure,c.build.nativewindow.windowlib,c.build.nativewindow.jvm,c.build.nativewindow.awt">
+    <target name="c.build.nativewindow" depends="c.configure,c.build.nativewindow.windowlib,c.build.nativewindow.awt">
       <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
           <param name="libdir" value="${obj.nativewindow}"/>
       </antcall>
diff --git a/make/config/jogl/cg-common-CustomJavaCode.java b/make/config/jogl/cg-common-CustomJavaCode.java
index 974e24bf4..d1e4f8bf5 100755
--- a/make/config/jogl/cg-common-CustomJavaCode.java
+++ b/make/config/jogl/cg-common-CustomJavaCode.java
@@ -1,5 +1,5 @@
 static {
-  com.jogamp.opengl.impl.NativeLibLoader.loadCgImpl();
+  com.jogamp.opengl.impl.GLJNILibLoader.loadCgImpl();
 }
 
 /** A convenience method which reads all available data from the InputStream and then calls cgCreateProgram. */
diff --git a/make/config/jogl/gl-gl2.cfg b/make/config/jogl/gl-gl2.cfg
index 37452d159..48dd8eda6 100644
--- a/make/config/jogl/gl-gl2.cfg
+++ b/make/config/jogl/gl-gl2.cfg
@@ -12,72 +12,32 @@ ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/
 ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
 
 Package javax.media.opengl
-Style InterfaceAndImpl
+Style InterfaceOnly
 JavaClass GL2
 Extends GL2 GLBase
 Extends GL2 GL
 Extends GL2 GL2ES1
 Extends GL2 GL2ES2
 Extends GL2 GL2GL3
-ImplPackage com.jogamp.opengl.impl.gl2
-ImplJavaClass GL2Impl
-Implements GL2Impl GLBase
-Implements GL2Impl GL
-Implements GL2Impl GL2ES1
-Implements GL2Impl GL2ES2
-Implements GL2Impl GL2GL3
 Include gl-common.cfg
 Include gl-common-extensions.cfg
 Include gl-desktop.cfg
 
-EmitProcAddressTable true
-ProcAddressTableClassName GL2ProcAddressTable
-GetProcAddressTableExpr ((GL2ProcAddressTable)_context.getGLProcAddressTable())
-
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
 TagNativeBinding true
 
 # Ignore extensions that are already picked up via the GL2ES1 interface
 IgnoreExtension GL_EXT_point_parameters
 
-# Add PixelStorei StateTracker
-#
-CustomJavaCode GL2Impl private static final int params_offset = 0; // just a helper for JavaPrologue ..
-
-JavaPrologue glPixelStorei glStateTracker.setInt(pname, param);
-
-JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offset) ) { return; }
-
 CustomJavaCode GL2     public boolean glIsPBOPackEnabled();
 CustomJavaCode GL2     public boolean glIsPBOUnpackEnabled();
 
 IncludeAs CustomJavaCode GL2 gl-if-CustomJavaCode-gl2.java
 
-CustomJavaCode GL2Impl public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar) {
-CustomJavaCode GL2Impl   glFrustum((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
-
-CustomJavaCode GL2Impl public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) {
-CustomJavaCode GL2Impl   glOrtho((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
-
-CustomJavaCode GL2Impl public void glClearDepthf(float depth) {
-CustomJavaCode GL2Impl   glClearDepth((double)depth); }
-
-CustomJavaCode GL2Impl public void glDepthRangef(float zNear, float zFar) {
-CustomJavaCode GL2Impl    glDepthRange((double)zNear, (double)zFar); }
-
 Include gl-headers.cfg
 Include ../intptr.cfg
 
-IncludeAs CustomJavaCode GL2Impl gl-impl-CustomJavaCode-common.java
-IncludeAs CustomJavaCode GL2Impl gl-impl-CustomJavaCode-gl2.java
-IncludeAs CustomJavaCode GL2Impl gl-impl-CustomJavaCode-desktop.java
-IncludeAs CustomJavaCode GL2Impl gl-impl-CustomJavaCode-gl2_es2.java
-IncludeAs CustomCCode gl-impl-CustomCCode-gl2.c
+EmitProcAddressTable false
+ProcAddressTableClassName DontGenerateProcAddressTableStuff
+GetProcAddressTableExpr DontGenerateProcAddressTableStuff
 
-Import javax.media.opengl.GLES1
-Import javax.media.opengl.GLES2
-Import javax.media.opengl.GL2
-Import javax.media.opengl.GLArrayData
-Import javax.media.opengl.GLUniformData
-Import com.jogamp.opengl.impl.InternalBufferUtil
-Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg
deleted file mode 100644
index 3942b1419..000000000
--- a/make/config/jogl/gl-gl2es12.cfg
+++ /dev/null
@@ -1,90 +0,0 @@
-# This .cfg file is used to generate the GL interface and implementing class.
-JavaOutputDir gensrc/classes
-NativeOutputDir gensrc/native/jogl/gl2es12
-
-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
-
-Style ImplOnly
-ImplPackage com.jogamp.opengl.impl.gl2es12
-ImplJavaClass GL2ES12Impl
-Implements GL2ES12Impl GLBase
-Implements GL2ES12Impl GL
-Implements GL2ES12Impl GL2ES1
-Implements GL2ES12Impl GL2ES2
-
-Include gl-common.cfg
-Include gl-common-extensions.cfg
-Include gl-desktop.cfg
-
-# Because we're manually implementing glMapBuffer but only producing
-# the implementing class, GlueGen doesn't notice that it has to emit a
-# proc address table entry for it. Force it to here.
-ForceProcAddressGen glMapBuffer
-
-# Force all of the methods to be emitted using dynamic linking so we
-# don't need to link against any emulation library on the desktop or
-# depend on the presence of an import library for a particular device
-ForceProcAddressGen __ALL__
-
-# Also force the calling conventions of the locally generated function
-# pointer typedefs for these routines to APIENTRY
-LocalProcAddressCallingConvention __ALL__ APIENTRY
-
-EmitProcAddressTable true
-ProcAddressTableClassName GL2ES12ProcAddressTable
-GetProcAddressTableExpr ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable())
-
-# Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
-TagNativeBinding true
-
-# There seem to be some errors in the glue code generation where we are not ignoring
-# enough routines from desktop GL in GL2ES12Impl. For now manually ignore those which
-# we know shouldn't be in there
-Ignore glGetTexImage
-Ignore glPixelStoref
-
-# Add PixelStorei StateTracker
-#
-# Add input validation to glPixelStorei to make sure that, even if we
-# are running on top of desktop OpenGL, parameters not exposed in
-# OpenGL ES can not be changed
-CustomJavaCode GL2ES12Impl private static final int params_offset = 0; // just a helper for JavaPrologue ..
-
-JavaPrologue glPixelStorei if (pname != GL_PACK_ALIGNMENT && pname != GL_UNPACK_ALIGNMENT) {
-JavaPrologue glPixelStorei     throw new GLException("Unsupported pixel store parameter name 0x" + Integer.toHexString(pname));
-JavaPrologue glPixelStorei }
-JavaPrologue glPixelStorei glStateTracker.setInt(pname, param);
-
-JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offset) ) { return; }
-
-CustomJavaCode GL2ES12Impl public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar) {
-CustomJavaCode GL2ES12Impl   glFrustum((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
-
-CustomJavaCode GL2ES12Impl public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) {
-CustomJavaCode GL2ES12Impl   glOrtho((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
-
-CustomJavaCode GL2ES12Impl public void glClearDepthf(float depth) {
-CustomJavaCode GL2ES12Impl   glClearDepth((double)depth); }
-
-CustomJavaCode GL2ES12Impl public void glDepthRangef(float zNear, float zFar) {
-CustomJavaCode GL2ES12Impl    glDepthRange((double)zNear, (double)zFar); }
-
-Include gl-headers.cfg
-Include ../intptr.cfg
-
-IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-common.java
-IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-gl2es12.java
-IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-embedded.java
-IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-gl2_es2.java
-IncludeAs CustomCCode gl-impl-CustomCCode-gl2es12.c
-
-Import javax.media.opengl.GLES1
-Import javax.media.opengl.GLES2
-Import com.jogamp.opengl.impl.InternalBufferUtil
-Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl3.cfg b/make/config/jogl/gl-gl3.cfg
index 0bfe2cc38..d5e0003d4 100644
--- a/make/config/jogl/gl-gl3.cfg
+++ b/make/config/jogl/gl-gl3.cfg
@@ -8,7 +8,7 @@ ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/G
 ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
 
 Package javax.media.opengl
-Style InterfaceAndImpl
+Style InterfaceOnly
 JavaClass GL3
 Extends GL3 GLBase
 Extends GL3 GL
@@ -27,48 +27,15 @@ Include gl3-desktop.cfg
 
 IncludeAs CustomJavaCode GL3 gl-if-CustomJavaCode-gl3.java
 
-EmitProcAddressTable true
-ProcAddressTableClassName GL3ProcAddressTable
-GetProcAddressTableExpr ((GL3ProcAddressTable)_context.getGLProcAddressTable())
-
-# Force all of the methods to be emitted using dynamic linking so we
-# don't need to link against any emulation library on the desktop or
-# depend on the presence of an import library for a particular device
-ForceProcAddressGen __ALL__
-
-# Also force the calling conventions of the locally generated function
-# pointer typedefs for these routines to APIENTRY
-LocalProcAddressCallingConvention __ALL__ APIENTRY
+EmitProcAddressTable false
 
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
 TagNativeBinding true
 
-# Add PixelStorei StateTracker
-#
-CustomJavaCode GL3Impl private static final int params_offset = 0; // just a helper for JavaPrologue ..
-
-JavaPrologue glPixelStorei glStateTracker.setInt(pname, param);
-
-JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offset) ) { return; }
-
-CustomJavaCode GL3Impl public void glClearDepthf(float depth) {
-CustomJavaCode GL3Impl   glClearDepth((double)depth); }
-
-CustomJavaCode GL3Impl public void glDepthRangef(float zNear, float zFar) {
-CustomJavaCode GL3Impl    glDepthRange((double)zNear, (double)zFar); }
-
 Include gl3-headers.cfg
 Include ../intptr.cfg
 
-IncludeAs CustomJavaCode GL3Impl gl-impl-CustomJavaCode-common.java
-IncludeAs CustomJavaCode GL3Impl gl-impl-CustomJavaCode-gl3.java
-IncludeAs CustomJavaCode GL3Impl gl-impl-CustomJavaCode-desktop.java
-IncludeAs CustomJavaCode GL3Impl gl-impl-CustomJavaCode-gl2_es2.java
-IncludeAs CustomCCode gl-impl-CustomCCode-gl3.c
+EmitProcAddressTable false
+ProcAddressTableClassName DontGenerateProcAddressTableStuff
+GetProcAddressTableExpr DontGenerateProcAddressTableStuff
 
-Import javax.media.opengl.GLES2
-Import javax.media.opengl.GL3
-Import javax.media.opengl.GLArrayData
-Import javax.media.opengl.GLUniformData
-Import com.jogamp.opengl.impl.InternalBufferUtil
-Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl3bc.cfg b/make/config/jogl/gl-gl3bc.cfg
index 7bba2f635..7c53ea8d6 100644
--- a/make/config/jogl/gl-gl3bc.cfg
+++ b/make/config/jogl/gl-gl3bc.cfg
@@ -14,7 +14,7 @@ ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/
 ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
 
 Package javax.media.opengl
-Style InterfaceAndImpl
+Style InterfaceOnly
 JavaClass GL3bc
 Extends GL3bc GLBase
 Extends GL3bc GL
@@ -23,15 +23,6 @@ Extends GL3bc GL2ES2
 Extends GL3bc GL2GL3
 Extends GL3bc GL2
 Extends GL3bc GL3
-ImplPackage com.jogamp.opengl.impl.gl3
-ImplJavaClass GL3bcImpl
-Implements GL3bcImpl GLBase
-Implements GL3bcImpl GL
-Implements GL3bcImpl GL2ES1
-Implements GL3bcImpl GL2ES2
-Implements GL3bcImpl GL2GL3
-Implements GL3bcImpl GL2
-Implements GL3bcImpl GL3
 
 Include gl-common.cfg
 Include gl-common-extensions.cfg
@@ -39,64 +30,17 @@ Include gl-desktop.cfg
 Include gl3-common.cfg
 Include gl3-desktop.cfg
 
-# Because we're manually implementing glMapBuffer but only producing
-# the implementing class, GlueGen doesn't notice that it has to emit a
-# proc address table entry for it. Force it to here.
-ForceProcAddressGen glMapBuffer
-
-# Force all of the methods to be emitted using dynamic linking so we
-# don't need to link against any emulation library on the desktop or
-# depend on the presence of an import library for a particular device
-ForceProcAddressGen __ALL__
-
-# Also force the calling conventions of the locally generated function
-# pointer typedefs for these routines to APIENTRY
-LocalProcAddressCallingConvention __ALL__ APIENTRY
-
-EmitProcAddressTable true
-ProcAddressTableClassName GL3bcProcAddressTable
-GetProcAddressTableExpr ((GL3bcProcAddressTable)_context.getGLProcAddressTable())
-
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
 TagNativeBinding true
 
 # Ignore extensions that are already picked up via the GL2ES1 interface
 IgnoreExtension GL_EXT_point_parameters
 
-# Add PixelStorei StateTracker
-CustomJavaCode GL3bcImpl private static final int params_offset = 0; // just a helper for JavaPrologue ..
-
-JavaPrologue glPixelStorei glStateTracker.setInt(pname, param);
-
-JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offset) ) { return; }
-
-CustomJavaCode GL3bcImpl public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar) {
-CustomJavaCode GL3bcImpl   glFrustum((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
-
-CustomJavaCode GL3bcImpl public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) {
-CustomJavaCode GL3bcImpl   glOrtho((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
-
-CustomJavaCode GL3bcImpl public void glClearDepthf(float depth) {
-CustomJavaCode GL3bcImpl   glClearDepth((double)depth); }
-
-CustomJavaCode GL3bcImpl public void glDepthRangef(float zNear, float zFar) {
-CustomJavaCode GL3bcImpl    glDepthRange((double)zNear, (double)zFar); }
-
 Include gl-headers.cfg
 Include gl3ext-headers.cfg
 Include ../intptr.cfg
 
-IncludeAs CustomJavaCode GL3bcImpl gl-impl-CustomJavaCode-common.java
-IncludeAs CustomJavaCode GL3bcImpl gl-impl-CustomJavaCode-gl3bc.java
-IncludeAs CustomJavaCode GL3bcImpl gl-impl-CustomJavaCode-desktop.java
-IncludeAs CustomJavaCode GL3bcImpl gl-impl-CustomJavaCode-gl2_es2.java
-IncludeAs CustomCCode gl-impl-CustomCCode-gl3bc.c
+EmitProcAddressTable false
+ProcAddressTableClassName DontGenerateProcAddressTableStuff
+GetProcAddressTableExpr DontGenerateProcAddressTableStuff
 
-Import javax.media.opengl.GLES1
-Import javax.media.opengl.GLES2
-Import javax.media.opengl.GL2GL3
-Import javax.media.opengl.GL2
-Import javax.media.opengl.GL3
-Import javax.media.opengl.GL3bc
-Import com.jogamp.opengl.impl.InternalBufferUtil
-Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl4.cfg b/make/config/jogl/gl-gl4.cfg
new file mode 100644
index 000000000..1d4392899
--- /dev/null
+++ b/make/config/jogl/gl-gl4.cfg
@@ -0,0 +1,37 @@
+# This .cfg file is used to generate the GL interface and implementing class.
+JavaOutputDir gensrc/classes
+NativeOutputDir gensrc/native/jogl/gl4
+
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+
+Package javax.media.opengl
+Style InterfaceOnly
+JavaClass GL4
+Extends GL4 GLBase
+Extends GL4 GL
+Extends GL4 GL2ES2
+Extends GL4 GL2GL3
+Extends GL4 GL3
+Include gl-common.cfg
+Include gl-common-extensions.cfg
+Include gl3-common.cfg
+Include gl4-common.cfg
+Include gl3-desktop.cfg
+
+IncludeAs CustomJavaCode GL4 gl-if-CustomJavaCode-gl3.java
+
+EmitProcAddressTable false
+ProcAddressTableClassName DontGenerateProcAddressTableStuff
+GetProcAddressTableExpr DontGenerateProcAddressTableStuff
+
+
+# Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
+TagNativeBinding true
+
+Include gl3-headers.cfg
+Include ../intptr.cfg
+
diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg
new file mode 100644
index 000000000..3a3e02041
--- /dev/null
+++ b/make/config/jogl/gl-gl4bc.cfg
@@ -0,0 +1,110 @@
+# This .cfg file is used to generate the GL interface and implementing class.
+JavaOutputDir gensrc/classes
+NativeOutputDir gensrc/native/jogl/gl4
+
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL4.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3bc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
+
+Package javax.media.opengl
+Style InterfaceAndImpl
+JavaClass GL4bc
+Extends GL4bc GLBase
+Extends GL4bc GL
+Extends GL4bc GL2ES1
+Extends GL4bc GL2ES2
+Extends GL4bc GL2GL3
+Extends GL4bc GL2
+Extends GL4bc GL3
+Extends GL4bc GL3bc
+Extends GL4bc GL4
+ImplPackage com.jogamp.opengl.impl.gl4
+ImplJavaClass GL4bcImpl
+Implements GL4bcImpl GLBase
+Implements GL4bcImpl GL
+Implements GL4bcImpl GL2ES1
+Implements GL4bcImpl GL2ES2
+Implements GL4bcImpl GL2GL3
+Implements GL4bcImpl GL2
+Implements GL4bcImpl GL3
+Implements GL4bcImpl GL3bc
+Implements GL4bcImpl GL4
+
+Include gl-common.cfg
+Include gl-common-extensions.cfg
+Include gl-desktop.cfg
+Include gl3-common.cfg
+Include gl4-common.cfg
+Include gl3-desktop.cfg
+
+# Because we're manually implementing glMapBuffer but only producing
+# the implementing class, GlueGen doesn't notice that it has to emit a
+# proc address table entry for it. Force it to here.
+ForceProcAddressGen glMapBuffer
+
+# Force all of the methods to be emitted using dynamic linking so we
+# don't need to link against any emulation library on the desktop or
+# depend on the presence of an import library for a particular device
+ForceProcAddressGen __ALL__
+
+# Also force the calling conventions of the locally generated function
+# pointer typedefs for these routines to APIENTRY
+LocalProcAddressCallingConvention __ALL__ APIENTRY
+
+EmitProcAddressTable true
+ProcAddressTableClassName GL4bcProcAddressTable
+GetProcAddressTableExpr ((GL4bcProcAddressTable)_context.getGLProcAddressTable())
+
+# Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
+TagNativeBinding true
+
+# Ignore extensions that are already picked up via the GL2ES1 interface
+IgnoreExtension GL_EXT_point_parameters
+
+# Add PixelStorei StateTracker
+CustomJavaCode GL4bcImpl private static final int params_offset = 0; // just a helper for JavaPrologue ..
+
+JavaPrologue glPixelStorei glStateTracker.setInt(pname, param);
+
+JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offset) ) { return; }
+
+CustomJavaCode GL4bcImpl public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar) {
+CustomJavaCode GL4bcImpl   glFrustum((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
+
+CustomJavaCode GL4bcImpl public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) {
+CustomJavaCode GL4bcImpl   glOrtho((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
+
+CustomJavaCode GL4bcImpl public void glClearDepthf(float depth) {
+CustomJavaCode GL4bcImpl   glClearDepth((double)depth); }
+
+CustomJavaCode GL4bcImpl public void glDepthRangef(float zNear, float zFar) {
+CustomJavaCode GL4bcImpl    glDepthRange((double)zNear, (double)zFar); }
+
+Include gl-headers.cfg
+Include gl3ext-headers.cfg
+Include ../intptr.cfg
+
+IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-common.java
+IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-gl4bc.java
+IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-desktop.java
+IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-gl2_es2.java
+IncludeAs CustomCCode gl-impl-CustomCCode-gl4bc.c
+
+Import javax.media.opengl.GLES1
+Import javax.media.opengl.GLES2
+Import javax.media.opengl.GL2GL3
+Import javax.media.opengl.GL2
+Import javax.media.opengl.GL3
+Import javax.media.opengl.GL3bc
+Import javax.media.opengl.GL4
+Import com.jogamp.opengl.impl.InternalBufferUtil
+Import java.io.PrintStream
diff --git a/make/config/jogl/gl-impl-CustomCCode-gl2.c b/make/config/jogl/gl-impl-CustomCCode-gl2.c
deleted file mode 100644
index 91fd0078b..000000000
--- a/make/config/jogl/gl-impl-CustomCCode-gl2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*   Java->C glue code:
- *   Java package: com.jogamp.opengl.impl.gl2.GL2Impl
- *    Java method: long dispatch_glMapBuffer(int target, int access)
- *     C function: void * glMapBuffer(GLenum target, GLenum access);
- */
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
-  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
-  void * _res;
-  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
-  assert(ptr_glMapBuffer != NULL);
-  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
-  return (jlong) (intptr_t) _res;
-}
-
-/*   Java->C glue code:
- *   Java package: com.jogamp.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_jogamp_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
deleted file mode 100644
index 07b821802..000000000
--- a/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*   Java->C glue code:
- *   Java package: com.jogamp.opengl.impl.gl2es12.GL2ES12Impl
- *    Java method: long dispatch_glMapBuffer(int target, int access)
- *     C function: void * glMapBuffer(GLenum target, GLenum access);
- */
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
-  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
-  void * _res;
-  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
-  assert(ptr_glMapBuffer != NULL);
-  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
-  return (jlong) (intptr_t) _res;
-}
-
-/*   Java->C glue code:
- *   Java package: com.jogamp.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_jogamp_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-gl3.c b/make/config/jogl/gl-impl-CustomCCode-gl3.c
deleted file mode 100644
index f540a7d4a..000000000
--- a/make/config/jogl/gl-impl-CustomCCode-gl3.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*   Java->C glue code:
- *   Java package: com.jogamp.opengl.impl.gl3.GL3Impl
- *    Java method: long dispatch_glMapBuffer(int target, int access)
- *     C function: void * glMapBuffer(GLenum target, GLenum access);
- */
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
-  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
-  void * _res;
-  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
-  assert(ptr_glMapBuffer != NULL);
-  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
-  return (jlong) (intptr_t) _res;
-}
-
-/*   Java->C glue code:
- *   Java package: com.jogamp.opengl.impl.gl3.GL3Impl
- *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
- *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
- */
-JNIEXPORT jobject JNICALL
-Java_com_jogamp_opengl_impl_gl3_GL3Impl_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-gl3bc.c b/make/config/jogl/gl-impl-CustomCCode-gl3bc.c
deleted file mode 100644
index 21de8c925..000000000
--- a/make/config/jogl/gl-impl-CustomCCode-gl3bc.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*   Java->C glue code:
- *   Java package: com.jogamp.opengl.impl.gl3.GL3bcImpl
- *    Java method: long dispatch_glMapBuffer(int target, int access)
- *     C function: void * glMapBuffer(GLenum target, GLenum access);
- */
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_opengl_impl_gl3_GL3bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
-  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
-  void * _res;
-  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
-  assert(ptr_glMapBuffer != NULL);
-  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
-  return (jlong) (intptr_t) _res;
-}
-
-/*   Java->C glue code:
- *   Java package: com.jogamp.opengl.impl.gl3.GL3bcImpl
- *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
- *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
- */
-JNIEXPORT jobject JNICALL
-Java_com_jogamp_opengl_impl_gl3_GL3bcImpl_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-gl4bc.c b/make/config/jogl/gl-impl-CustomCCode-gl4bc.c
new file mode 100644
index 000000000..bcda20fa4
--- /dev/null
+++ b/make/config/jogl/gl-impl-CustomCCode-gl4bc.c
@@ -0,0 +1,24 @@
+/*   Java->C glue code:
+ *   Java package: com.jogamp.opengl.impl.gl4.GL4bcImpl
+ *    Java method: long dispatch_glMapBuffer(int target, int access)
+ *     C function: void * glMapBuffer(GLenum target, GLenum access);
+ */
+JNIEXPORT jlong JNICALL 
+Java_com_jogamp_opengl_impl_gl4_GL4bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
+  void * _res;
+  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
+  assert(ptr_glMapBuffer != NULL);
+  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
+  return (jlong) (intptr_t) _res;
+}
+
+/*   Java->C glue code:
+ *   Java package: com.jogamp.opengl.impl.gl4.GL4bcImpl
+ *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
+ *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
+ */
+JNIEXPORT jobject JNICALL
+Java_com_jogamp_opengl_impl_gl4_GL4bcImpl_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-common.java b/make/config/jogl/gl-impl-CustomJavaCode-common.java
index 564606799..4872490b0 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-common.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-common.java
@@ -1,16 +1,58 @@
-  public GLProfile getGLProfile() {
-    return this.glProfile;
-  }
-  private GLProfile glProfile;
-
-  public int glGetBoundBuffer(int target) {
-    return bufferStateTracker.getBoundBufferObject(target, this);
-  }
-
-  public boolean glIsVBOArrayEnabled() {
-    return checkArrayVBOEnabled(false);
-  }
-
-  public boolean glIsVBOElementEnabled() {
-    return checkElementVBOEnabled(false);
-  }
+    public GLProfile getGLProfile() {
+        return this.glProfile;
+    }
+    private GLProfile glProfile;
+
+    public int glGetBoundBuffer(int target) {
+        return bufferStateTracker.getBoundBufferObject(target, this);
+    }
+
+    public boolean glIsVBOArrayEnabled() {
+        return checkArrayVBOEnabled(false);
+    }
+
+    public boolean glIsVBOElementEnabled() {
+        return checkElementVBOEnabled(false);
+    }
+
+    public final boolean isGL() {
+        return true;
+    }
+      
+    public final GL getGL() throws GLException {
+        return this;
+    }
+
+    public boolean isFunctionAvailable(String glFunctionName) {
+      return _context.isFunctionAvailable(glFunctionName);
+    }
+
+    public boolean isExtensionAvailable(String glExtensionName) {
+      return _context.isExtensionAvailable(glExtensionName);
+    }
+
+    public Object getExtension(String extensionName) {
+      // At this point we don't expose any extensions using this mechanism
+      return null;
+    }
+
+    /** Returns the context this GL object is associated with for better
+        error checking by DebugGL. */
+    public GLContext getContext() {
+      return _context;
+    }
+
+    private GLContextImpl _context;
+
+    public void setSwapInterval(int interval) {
+      _context.setSwapInterval(interval);
+    }
+
+    public int getSwapInterval() {
+      return _context.getSwapInterval();
+    }
+
+    public Object getPlatformGLExtensions() {
+      return _context.getPlatformGLExtensions();
+    }
+
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-desktop.java b/make/config/jogl/gl-impl-CustomJavaCode-desktop.java
index 04ba39c3d..93a275269 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-desktop.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-desktop.java
@@ -1,79 +1,191 @@
-private int[] imageSizeTemp = new int[1];
-
-/** Helper for more precise computation of number of bytes that will
-    be touched by a pixel pack or unpack operation. */
-private int imageSizeInBytes(int bytesPerElement,
-                             int width, int height, int depth, boolean pack) {
-    int rowLength = 0;
-    int skipRows = 0;
-    int skipPixels = 0;
-    int alignment = 1;
-    int imageHeight = 0;
-    int skipImages = 0;
-
-    if (pack) {
-        glGetIntegerv(GL_PACK_ROW_LENGTH, imageSizeTemp, 0);
-        rowLength = imageSizeTemp[0];
-        glGetIntegerv(GL_PACK_SKIP_ROWS, imageSizeTemp, 0);
-        skipRows = imageSizeTemp[0];
-        glGetIntegerv(GL_PACK_SKIP_PIXELS, imageSizeTemp, 0);
-        skipPixels = imageSizeTemp[0];
-        glGetIntegerv(GL_PACK_ALIGNMENT, imageSizeTemp, 0);
-        alignment = imageSizeTemp[0];
-        if (depth > 1) {
-            glGetIntegerv(GL_PACK_IMAGE_HEIGHT, imageSizeTemp, 0);
-            imageHeight = imageSizeTemp[0];
-            glGetIntegerv(GL_PACK_SKIP_IMAGES, imageSizeTemp, 0);
-            skipImages = imageSizeTemp[0];
+    private int[] imageSizeTemp = new int[1];
+
+    /** Helper for more precise computation of number of bytes that will
+        be touched by a pixel pack or unpack operation. */
+    private int imageSizeInBytes(int bytesPerElement,
+                                 int width, int height, int depth, boolean pack) {
+        int rowLength = 0;
+        int skipRows = 0;
+        int skipPixels = 0;
+        int alignment = 1;
+        int imageHeight = 0;
+        int skipImages = 0;
+
+        if (pack) {
+            glGetIntegerv(GL_PACK_ROW_LENGTH, imageSizeTemp, 0);
+            rowLength = imageSizeTemp[0];
+            glGetIntegerv(GL_PACK_SKIP_ROWS, imageSizeTemp, 0);
+            skipRows = imageSizeTemp[0];
+            glGetIntegerv(GL_PACK_SKIP_PIXELS, imageSizeTemp, 0);
+            skipPixels = imageSizeTemp[0];
+            glGetIntegerv(GL_PACK_ALIGNMENT, imageSizeTemp, 0);
+            alignment = imageSizeTemp[0];
+            if (depth > 1) {
+                glGetIntegerv(GL_PACK_IMAGE_HEIGHT, imageSizeTemp, 0);
+                imageHeight = imageSizeTemp[0];
+                glGetIntegerv(GL_PACK_SKIP_IMAGES, imageSizeTemp, 0);
+                skipImages = imageSizeTemp[0];
+            }
+        } else {
+            glGetIntegerv(GL_UNPACK_ROW_LENGTH, imageSizeTemp, 0);
+            rowLength = imageSizeTemp[0];
+            glGetIntegerv(GL_UNPACK_SKIP_ROWS, imageSizeTemp, 0);
+            skipRows = imageSizeTemp[0];
+            glGetIntegerv(GL_UNPACK_SKIP_PIXELS, imageSizeTemp, 0);
+            skipPixels = imageSizeTemp[0];
+            glGetIntegerv(GL_UNPACK_ALIGNMENT, imageSizeTemp, 0);
+            alignment = imageSizeTemp[0];
+            if (depth > 1) {
+                glGetIntegerv(GL_UNPACK_IMAGE_HEIGHT, imageSizeTemp, 0);
+                imageHeight = imageSizeTemp[0];
+                glGetIntegerv(GL_UNPACK_SKIP_IMAGES, imageSizeTemp, 0);
+                skipImages = imageSizeTemp[0];
+            }
         }
-    } else {
-        glGetIntegerv(GL_UNPACK_ROW_LENGTH, imageSizeTemp, 0);
-        rowLength = imageSizeTemp[0];
-        glGetIntegerv(GL_UNPACK_SKIP_ROWS, imageSizeTemp, 0);
-        skipRows = imageSizeTemp[0];
-        glGetIntegerv(GL_UNPACK_SKIP_PIXELS, imageSizeTemp, 0);
-        skipPixels = imageSizeTemp[0];
-        glGetIntegerv(GL_UNPACK_ALIGNMENT, imageSizeTemp, 0);
-        alignment = imageSizeTemp[0];
-        if (depth > 1) {
-            glGetIntegerv(GL_UNPACK_IMAGE_HEIGHT, imageSizeTemp, 0);
-            imageHeight = imageSizeTemp[0];
-            glGetIntegerv(GL_UNPACK_SKIP_IMAGES, imageSizeTemp, 0);
-            skipImages = imageSizeTemp[0];
+        // Try to deal somewhat correctly with potentially invalid values
+        width       = Math.max(0, width );
+        height      = Math.max(1, height); // min 1D
+        depth       = Math.max(1, depth ); // min 1 * imageSize
+        skipRows    = Math.max(0, skipRows);
+        skipPixels  = Math.max(0, skipPixels);
+        alignment   = Math.max(1, alignment);
+        skipImages  = Math.max(0, skipImages);
+
+        imageHeight = ( imageHeight > 0 ) ? imageHeight : height;
+        rowLength   = ( rowLength   > 0 ) ? rowLength   : width;
+
+        int rowLengthInBytes = rowLength * bytesPerElement;
+
+        if (alignment > 1) {
+            int padding = rowLengthInBytes % alignment;
+            if (padding > 0) {
+                rowLengthInBytes += alignment - padding;
+            }
         }
+
+        /**
+         * skipPixels and skipRows is a static one time offset.
+         *
+         * skipImages and depth are in multiples of image size.
+         *
+         * rowlenght is the actual repeating offset 
+         * to go from line n to line n+1 at the same x-axis position.
+         */
+        return 
+            ( skipImages + depth  - 1 ) * imageHeight * rowLengthInBytes + // whole images
+            ( skipRows   + height - 1 ) * rowLengthInBytes +               // lines with padding
+            ( skipPixels + width      ) * bytesPerElement;                 // last line
+    }
+
+    public final boolean isGL4bc() {
+        return _context.isGL4bc();
+    }
+
+    public final boolean isGL4() {
+        return _context.isGL4();
+    }
+
+    public final boolean isGL3bc() {
+        return _context.isGL3bc();
+    }
+
+    public final boolean isGL3() {
+        return _context.isGL3();
     }
-    // Try to deal somewhat correctly with potentially invalid values
-    width       = Math.max(0, width );
-    height      = Math.max(1, height); // min 1D
-    depth       = Math.max(1, depth ); // min 1 * imageSize
-    skipRows    = Math.max(0, skipRows);
-    skipPixels  = Math.max(0, skipPixels);
-    alignment   = Math.max(1, alignment);
-    skipImages  = Math.max(0, skipImages);
 
-    imageHeight = ( imageHeight > 0 ) ? imageHeight : height;
-    rowLength   = ( rowLength   > 0 ) ? rowLength   : width;
+    public final boolean isGL2() {
+        return _context.isGL2();
+    }
+      
+    public final boolean isGL2ES1() {
+        return _context.isGL2ES1();
+    }
 
-    int rowLengthInBytes = rowLength * bytesPerElement;
+    public final boolean isGL2ES2() {
+        return _context.isGL2ES2();
+    }
 
-    if (alignment > 1) {
-        int padding = rowLengthInBytes % alignment;
-        if (padding > 0) {
-            rowLengthInBytes += alignment - padding;
+    public final boolean isGL2GL3() {
+        return _context.isGL2GL3();
+    }
+
+    public final boolean hasGLSL() {
+        return _context.hasGLSL();
+    }
+
+    public final GL4bc getGL4bc() throws GLException {
+        if(!isGL4bc()) {
+            throw new GLException("Not a GL4bc implementation");
+        }
+        return this;
+    }
+
+    public final GL4 getGL4() throws GLException {
+        if(!isGL4bc()) {
+            throw new GLException("Not a GL4 implementation");
         }
+        return this;
     }
 
-    /**
-     * skipPixels and skipRows is a static one time offset.
-     *
-     * skipImages and depth are in multiples of image size.
-     *
-     * rowlenght is the actual repeating offset 
-     * to go from line n to line n+1 at the same x-axis position.
-     */
-    return 
-        ( skipImages + depth  - 1 ) * imageHeight * rowLengthInBytes + // whole images
-        ( skipRows   + height - 1 ) * rowLengthInBytes +               // lines with padding
-        ( skipPixels + width      ) * bytesPerElement;                 // last line
-}
+    public final GL3bc getGL3bc() throws GLException {
+        if(!isGL3bc()) {
+            throw new GLException("Not a GL3bc implementation");
+        }
+        return this;
+    }
+
+    public final GL3 getGL3() throws GLException {
+        if(!isGL3()) {
+            throw new GLException("Not a GL3 implementation");
+        }
+        return this;
+    }
+
+    public final GL2 getGL2() throws GLException {
+        if(!isGL2()) {
+            throw new GLException("Not a GL2 implementation");
+        }
+        return this;
+    }
+
+    public final GL2ES1 getGL2ES1() throws GLException {
+        if(!isGL2ES1()) {
+            throw new GLException("Not a GL2ES1 implementation");
+        }
+        return this;
+    }
+
+    public final GL2ES2 getGL2ES2() throws GLException {
+        if(!isGL2ES2()) {
+            throw new GLException("Not a GL2ES2 implementation");
+        }
+        return this;
+    }
+
+    public final GL2GL3 getGL2GL3() throws GLException {
+        if(!isGL2GL3()) {
+            throw new GLException("Not a GL2GL3 implementation");
+        }
+        return this;
+    }
+
+    public final boolean isGLES1() {
+        return false;
+    }
+
+    public final boolean isGLES2() {
+        return false;
+    }
+
+    public final boolean isGLES() {
+        return false;
+    }
+
+    public final GLES1 getGLES1() throws GLException {
+        throw new GLException("Not a GLES1 implementation");
+    }
+
+    public final GLES2 getGLES2() throws GLException {
+        throw new GLException("Not a GLES2 implementation");
+    }
 
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2.java
deleted file mode 100644
index 0658b8a01..000000000
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2.java
+++ /dev/null
@@ -1,514 +0,0 @@
-// Tracks glBegin/glEnd calls to determine whether it is legal to
-// query Vertex Buffer Object state
-private boolean inBeginEndPair;
-
-/* FIXME: refactor dependence on Java 2D / JOGL bridge
-
-// Tracks creation and destruction of server-side OpenGL objects when
-// the Java2D/OpenGL pipeline is enabled and it is using frame buffer
-// objects (FBOs) to do its rendering
-private GLObjectTracker tracker;
-
-public void setObjectTracker(GLObjectTracker tracker) {
-  this.tracker = tracker;
-}
-
-*/
-
-
-public GL2Impl(GLProfile glp, GLContextImpl context) {
-  this._context = context; 
-  this.bufferSizeTracker  = context.getBufferSizeTracker();
-  this.bufferStateTracker = context.getBufferStateTracker();
-  this.glStateTracker     = context.getGLStateTracker();
-  this.glProfile = glp;
-}
-
-public final boolean isGL() {
-    return true;
-}
-  
-public final boolean isGL4bc() {
-    return false;
-}
-
-public final boolean isGL4() {
-    return false;
-}
-
-public final boolean isGL3bc() {
-    return false;
-}
-
-public final boolean isGL3() {
-    return false;
-}
-
-public final boolean isGL2() {
-    return true;
-}
-  
-public final boolean isGLES1() {
-    return false;
-}
-
-public final boolean isGLES2() {
-    return false;
-}
-
-public final boolean isGLES() {
-    return false;
-}
-
-public final boolean isGL2ES1() {
-    return true;
-}
-
-public final boolean isGL2ES2() {
-    return true;
-}
-
-public final boolean isGL2GL3() {
-    return true;
-}
-
-public final boolean hasGLSL() {
-    return true;
-}
-
-public final GL getGL() throws GLException {
-    return this;
-}
-
-public final GL4bc getGL4bc() throws GLException {
-    throw new GLException("Not a GL4bc implementation");
-}
-
-public final GL4 getGL4() throws GLException {
-    throw new GLException("Not a GL4 implementation");
-}
-
-public final GL3bc getGL3bc() throws GLException {
-    throw new GLException("Not a GL3bc implementation");
-}
-
-public final GL3 getGL3() throws GLException {
-    throw new GLException("Not a GL3 implementation");
-}
-
-public final GL2 getGL2() throws GLException {
-    return this;
-}
-
-public final GLES1 getGLES1() throws GLException {
-    throw new GLException("Not a GLES1 implementation");
-}
-
-public final GLES2 getGLES2() throws GLException {
-    throw new GLException("Not a GLES2 implementation");
-}
-
-public final GL2ES1 getGL2ES1() throws GLException {
-    return this;
-}
-
-public final GL2ES2 getGL2ES2() throws GLException {
-    return this;
-}
-
-public final GL2GL3 getGL2GL3() throws GLException {
-    return this;
-}
-
-public boolean isFunctionAvailable(String glFunctionName) {
-  return _context.isFunctionAvailable(glFunctionName);
-}
-
-public boolean isExtensionAvailable(String glExtensionName) {
-  return _context.isExtensionAvailable(glExtensionName);
-}
-
-public Object getExtension(String extensionName) {
-  // At this point we don't expose any extensions using this mechanism
-  return null;
-}
-
-/** Returns the context this GL object is associated with for better
-    error checking by DebugGL. */
-public GLContext getContext() {
-  return _context;
-}
-
-private GLContextImpl _context;
-
-/**
- * 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 void setSwapInterval(int interval) {
-  _context.setSwapInterval(interval);
-}
-
-public int getSwapInterval() {
-  return _context.getSwapInterval();
-}
-
-public Object getPlatformGLExtensions() {
-  return _context.getPlatformGLExtensions();
-}
-
-//
-// Helpers for ensuring the correct amount of texture data
-//
-
-/** Returns the number of bytes required to fill in the appropriate
-    texture. This is computed as closely as possible based on the
-    pixel pack or unpack parameters. The logic in this routine is
-    based on code in the SGI OpenGL sample implementation. */
-
-private int imageSizeInBytes(int format, int type, int w, int h, int d,
-                             boolean pack) {
-  int elements = 0;
-  int esize = 0;
-  
-  if (w < 0) return 0;
-  if (h < 0) return 0;
-  if (d < 0) return 0;
-  switch (format) {
-  case GL_COLOR_INDEX:
-  case GL_STENCIL_INDEX:
-    elements = 1;
-    break;
-  case GL_RED:
-  case GL_GREEN:
-  case GL_BLUE:
-  case GL_ALPHA:
-  case GL_LUMINANCE:
-  case GL_DEPTH_COMPONENT:
-    elements = 1;
-    break;
-  case GL_LUMINANCE_ALPHA:
-    elements = 2;
-    break;
-  case GL_RGB:
-  case GL_BGR:
-    elements = 3;
-    break;
-  case GL_RGBA:
-  case GL_BGRA:
-  case GL_ABGR_EXT:
-    elements = 4;
-    break;
-  /* FIXME ?? 
-   case GL_HILO_NV:
-    elements = 2;
-    break; */
-  default:
-    return 0;
-  }
-  switch (type) {
-  case GL_BITMAP:
-    if (format == GL_COLOR_INDEX) {
-      return (d * (h * ((w+7)/8)));
-    } else {
-      return 0;
-    }
-  case GL_BYTE:
-  case GL_UNSIGNED_BYTE:
-    esize = 1;
-    break;
-  case GL_UNSIGNED_BYTE_3_3_2:
-  case GL_UNSIGNED_BYTE_2_3_3_REV:
-    esize = 1;
-    elements = 1;
-    break;
-  case GL_SHORT:
-  case GL_UNSIGNED_SHORT:
-    esize = 2;
-    break;
-  case GL_UNSIGNED_SHORT_5_6_5:
-  case GL_UNSIGNED_SHORT_5_6_5_REV:
-  case GL_UNSIGNED_SHORT_4_4_4_4:
-  case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-  case GL_UNSIGNED_SHORT_5_5_5_1:
-  case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-    esize = 2;
-    elements = 1;
-    break;
-  case GL_INT:
-  case GL_UNSIGNED_INT:
-  case GL_FLOAT:
-    esize = 4;
-    break;
-  case GL_UNSIGNED_INT_8_8_8_8:
-  case GL_UNSIGNED_INT_8_8_8_8_REV:
-  case GL_UNSIGNED_INT_10_10_10_2:
-  case GL_UNSIGNED_INT_2_10_10_10_REV:
-    esize = 4;
-    elements = 1;
-    break;
-  default:
-    return 0;
-  }
-  return imageSizeInBytes(elements * esize, w, h, d, pack);
-}
-
-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 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) {
-    throw new GLException("May not call this between glBegin and glEnd");
-  }
-  boolean avail = (extension1 || extension2 || extension3);
-  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) {
-      if(throwException) {
-          throw new GLException(kind + " must be enabled 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;
-    }
-  }
-  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);
-}
-
-// Attempt to return the same ByteBuffer object from glMapBuffer if
-// the vertex buffer object's base address and size haven't changed
-private static class ARBVBOKey {
-  private long addr;
-  private int  capacity;
-
-  ARBVBOKey(long addr, int capacity) {
-    this.addr = addr;
-    this.capacity = capacity;
-  }
-
-  public int hashCode() {
-    return (int) addr;
-  }
-
-  public boolean equals(Object o) {
-    if ((o == null) || (!(o instanceof ARBVBOKey))) {
-      return false;
-    }
-
-    ARBVBOKey other = (ARBVBOKey) o;
-    return ((addr == other.addr) && (capacity == other.capacity));
-  }
-}
-
-private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap();
-
-/** 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_ = ((GL2ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
-  if (__addr_ == 0) {
-    throw new GLException("Method \"glMapBuffer\" not available");
-  }
-  int sz = bufferSizeTracker.getBufferSize(bufferStateTracker,
-                                           target,
-                                           this);
-  long addr;
-  addr = dispatch_glMapBuffer(target, access, __addr_);
-  if (addr == 0 || sz == 0) {
-    return null;
-  }
-  ARBVBOKey key = new ARBVBOKey(addr, sz);
-  ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
-  if (_res == null) {
-    _res = newDirectByteBuffer(addr, sz);
-    InternalBufferUtil.nativeOrder(_res);
-    arbVBOCache.put(key, _res);
-  }
-  _res.position(0);
-  return _res;
-}
-
-/** 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");
-  }
-
-  /** 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, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) {
-    throw new GLException("Method \"glShaderBinary\" not available");
-  }
-
-  public void glReleaseShaderCompiler() {
-    // nothing to do 
-  }
-
-    public void glVertexPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-    public void glColorPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-
-    }
-    public void glNormalPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.getComponentNumber()!=3) {
-        throw new GLException("Only 3 components per normal allowed");
-      }
-      if(array.isVBO()) {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-    public void glTexCoordPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
deleted file mode 100644
index 54c7bd92b..000000000
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
+++ /dev/null
@@ -1,455 +0,0 @@
-// Tracks glBegin/glEnd calls to determine whether it is legal to
-// query Vertex Buffer Object state
-private boolean inBeginEndPair;
-
-/* FIXME: refactor dependence on Java 2D / JOGL bridge
-
-// Tracks creation and destruction of server-side OpenGL objects when
-// the Java2D/OpenGL pipeline is enabled and it is using frame buffer
-// objects (FBOs) to do its rendering
-private GLObjectTracker tracker;
-
-public void setObjectTracker(GLObjectTracker tracker) {
-  this.tracker = tracker;
-}
-
-*/
-
-public GL2ES12Impl(GLProfile glp, GLContextImpl context) {
-  this._context = context; 
-  this.bufferSizeTracker  = context.getBufferSizeTracker();
-  this.bufferStateTracker = context.getBufferStateTracker();
-  this.glStateTracker     = context.getGLStateTracker();
-  this.isGL2ES2 = glp.isGL2ES2();
-  this.glProfile = glp;
-}
-
-private boolean isGL2ES2;
-
-public final boolean isGL() {
-    return true;
-}
-
-public final boolean isGL4bc() {
-    return false;
-}
-
-public final boolean isGL4() {
-    return false;
-}
-
-public final boolean isGL3bc() {
-    return false;
-}
-
-public final boolean isGL3() {
-    return false;
-}
-
-public final boolean isGL2() {
-    return false;
-}
-
-public final boolean isGLES1() {
-    return false;
-}
-
-public final boolean isGLES2() {
-    return false;
-}
-
-public final boolean isGLES() {
-    return false;
-}
-
-public final boolean isGL2ES1() {
-    return !isGL2ES2;
-}
-
-public final boolean isGL2ES2() {
-    return isGL2ES2;
-}
-
-public final boolean isGL2GL3() {
-    return false;
-}
-
-public final boolean hasGLSL() {
-    return isGL2ES2;
-}
-
-public final GL getGL() throws GLException {
-    return this;
-}
-
-public final GL4bc getGL4bc() throws GLException {
-    throw new GLException("Not a GL4bc implementation");
-}
-
-public final GL4 getGL4() throws GLException {
-    throw new GLException("Not a GL4 implementation");
-}
-
-public final GL3bc getGL3bc() throws GLException {
-    throw new GLException("Not a GL3bc implementation");
-}
-
-public final GL3 getGL3() throws GLException {
-    throw new GLException("Not a GL3 implementation");
-}
-
-public final GL2 getGL2() throws GLException {
-    throw new GLException("Not a GL2 implementation");
-}
-
-public final GLES1 getGLES1() throws GLException {
-    throw new GLException("Not a GLES1 implementation");
-}
-
-public final GLES2 getGLES2() throws GLException {
-    throw new GLException("Not a GLES2 implementation");
-}
-
-public final GL2ES1 getGL2ES1() throws GLException {
-    if (isGL2ES1()) {
-        return this;
-    }
-    throw new GLException("Not a GL2ES1 implementation");
-}
-
-public final GL2ES2 getGL2ES2() throws GLException {
-    if (isGL2ES2()) {
-        return this;
-    }
-    throw new GLException("Not a GL2ES2 implementation");
-}
-
-public final GL2GL3 getGL2GL3() throws GLException {
-    throw new GLException("Not a GL2GL3 implementation");
-}
-
-public boolean isFunctionAvailable(String glFunctionName) {
-  return _context.isFunctionAvailable(glFunctionName);
-}
-
-public boolean isExtensionAvailable(String glExtensionName) {
-  return _context.isExtensionAvailable(glExtensionName);
-}
-
-public Object getExtension(String extensionName) {
-  // At this point we don't expose any extensions using this mechanism
-  return null;
-}
-
-/** Returns the context this GL object is associated with for better
-    error checking by DebugGL. */
-public GLContext getContext() {
-  return _context;
-}
-
-private GLContextImpl _context;
-
-public void setSwapInterval(int interval) {
-  _context.setSwapInterval(interval);
-}
-
-public int getSwapInterval() {
-  return _context.getSwapInterval();
-}
-
-public Object getPlatformGLExtensions() {
-  return _context.getPlatformGLExtensions();
-}
-
-//
-// Helpers for ensuring the correct amount of texture data
-//
-
-/** Returns the number of bytes required to fill in the appropriate
-    texture. This is computed as closely as possible based on the
-    pixel pack or unpack parameters. The logic in this routine is
-    based on code in the SGI OpenGL sample implementation. */
-
-private int imageSizeInBytes(int format, int type, int w, int h, int d,
-                             boolean pack) {
-  int elements = 0;
-  int esize = 0;
-  
-  if (w < 0) return 0;
-  if (h < 0) return 0;
-  if (d < 0) return 0;
-  switch (format) {
-  case GL_STENCIL_INDEX:
-    elements = 1;
-    break;
-  case GL_ALPHA:
-  case GL_LUMINANCE:
-  case GL_DEPTH_COMPONENT:
-    elements = 1;
-    break;
-  case GL_LUMINANCE_ALPHA:
-    elements = 2;
-    break;
-  case GL_RGB:
-    elements = 3;
-    break;
-  case GL_RGBA:
-    elements = 4;
-    break;
-  /* FIXME ?? 
-   case GL_HILO_NV:
-    elements = 2;
-    break; */
-  default:
-    return 0;
-  }
-  switch (type) {
-  case GL_BYTE:
-  case GL_UNSIGNED_BYTE:
-    esize = 1;
-    break;
-  case GL_SHORT:
-  case GL_UNSIGNED_SHORT:
-    esize = 2;
-    break;
-  case GL_UNSIGNED_SHORT_5_6_5:
-  case GL_UNSIGNED_SHORT_4_4_4_4:
-  case GL_UNSIGNED_SHORT_5_5_5_1:
-    esize = 2;
-    elements = 1;
-    break;
-  case GL_INT:
-  case GL_UNSIGNED_INT:
-  case GL_FLOAT:
-    esize = 4;
-    break;
-  default:
-    return 0;
-  }
-  return imageSizeInBytes(elements * esize, w, h, d, pack);
-}
-
-private GLBufferSizeTracker  bufferSizeTracker;
-private GLBufferStateTracker bufferStateTracker;
-private GLStateTracker       glStateTracker;
-
-private boolean bufferObjectExtensionsInitialized = false;
-private boolean haveGL15;
-private boolean haveGL21;
-private boolean haveARBVertexBufferObject;
-
-private void initBufferObjectExtensionChecks() {
-  if (bufferObjectExtensionsInitialized)
-    return;
-  bufferObjectExtensionsInitialized = true;
-  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) {
-    throw new GLException("May not call this between glBegin and glEnd");
-  }
-  boolean avail = (extension1 || extension2 || extension3);
-  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) {
-      if(throwException) {
-          throw new GLException(kind + " must be enabled 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;
-    }
-  }
-  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) { 
-  // PBO n/a for ES 1.1 or ES 2.0
-  return true;
-}
-
-private boolean checkUnpackPBOEnabled(boolean throwException) { 
-  // PBO n/a for ES 1.1 or ES 2.0
-  return false;
-}
-
-private boolean checkPackPBODisabled(boolean throwException) { 
-  // PBO n/a for ES 1.1 or ES 2.0
-  return true;
-}
-
-private boolean checkPackPBOEnabled(boolean throwException) { 
-  // PBO n/a for ES 1.1 or ES 2.0
-  return false;
-}
-
-// Attempt to return the same ByteBuffer object from glMapBuffer if
-// the vertex buffer object's base address and size haven't changed
-private static class ARBVBOKey {
-  private long addr;
-  private int  capacity;
-
-  ARBVBOKey(long addr, int capacity) {
-    this.addr = addr;
-    this.capacity = capacity;
-  }
-
-  public int hashCode() {
-    return (int) addr;
-  }
-
-  public boolean equals(Object o) {
-    if ((o == null) || (!(o instanceof ARBVBOKey))) {
-      return false;
-    }
-
-    ARBVBOKey other = (ARBVBOKey) o;
-    return ((addr == other.addr) && (capacity == other.capacity));
-  }
-}
-
-private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap();
-
-/** 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_ = ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
-  if (__addr_ == 0) {
-    throw new GLException("Method \"glMapBuffer\" not available");
-  }
-  int sz = bufferSizeTracker.getBufferSize(bufferStateTracker,
-                                           target,
-                                           this);
-  long addr;
-  addr = dispatch_glMapBuffer(target, access, __addr_);
-  if (addr == 0 || sz == 0) {
-    return null;
-  }
-  ARBVBOKey key = new ARBVBOKey(addr, sz);
-  ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
-  if (_res == null) {
-    _res = newDirectByteBuffer(addr, sz);
-    InternalBufferUtil.nativeOrder(_res);
-    arbVBOCache.put(key, _res);
-  }
-  _res.position(0);
-  return _res;
-}
-
-/** 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");
-  }
-
-  /** 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, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) {
-    throw new GLException("Method \"glShaderBinary\" not available");
-  }
-
-  public void glReleaseShaderCompiler() {
-    // nothing to do 
-  }
-
-    public void glVertexPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-    public void glColorPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-
-    }
-    public void glNormalPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.getComponentNumber()!=3) {
-        throw new GLException("Only 3 components per normal allowed");
-      }
-      if(array.isVBO()) {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-    public void glTexCoordPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-
-
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl3.java b/make/config/jogl/gl-impl-CustomJavaCode-gl3.java
deleted file mode 100644
index cff0b0f94..000000000
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl3.java
+++ /dev/null
@@ -1,468 +0,0 @@
-// Tracks glBegin/glEnd calls to determine whether it is legal to
-// query Vertex Buffer Object state
-private boolean inBeginEndPair;
-
-/* FIXME: refactor dependence on Java 2D / JOGL bridge
-
-// Tracks creation and destruction of server-side OpenGL objects when
-// the Java2D/OpenGL pipeline is enabled and it is using frame buffer
-// objects (FBOs) to do its rendering
-private GLObjectTracker tracker;
-
-public void setObjectTracker(GLObjectTracker tracker) {
-  this.tracker = tracker;
-}
-
-*/
-
-public GL3Impl(GLProfile glp, GLContextImpl context) {
-  this._context = context; 
-  this.bufferSizeTracker  = context.getBufferSizeTracker();
-  this.bufferStateTracker = context.getBufferStateTracker();
-  this.glStateTracker     = context.getGLStateTracker();
-  this.glProfile = glp;
-}
-
-public final boolean isGL() {
-    return true;
-}
-  
-public final boolean isGL4bc() {
-    return false;
-}
-
-public final boolean isGL4() {
-    return false;
-}
-
-public final boolean isGL3bc() {
-    return false;
-}
-
-public final boolean isGL3() {
-    return true;
-}
-
-public final boolean isGL2() {
-    return false;
-}
-  
-public final boolean isGLES1() {
-    return false;
-}
-
-public final boolean isGLES2() {
-    return false;
-}
-
-public final boolean isGLES() {
-    return false;
-}
-
-public final boolean isGL2ES1() {
-    return false;
-}
-
-public final boolean isGL2ES2() {
-    return true;
-}
-
-public final boolean isGL2GL3() {
-    return true;
-}
-
-public final boolean hasGLSL() {
-    return true;
-}
-
-public final GL getGL() throws GLException {
-    return this;
-}
-
-public final GL4bc getGL4bc() throws GLException {
-    throw new GLException("Not a GL4bc implementation");
-}
-
-public final GL4 getGL4() throws GLException {
-    throw new GLException("Not a GL4 implementation");
-}
-
-public final GL3bc getGL3bc() throws GLException {
-    throw new GLException("Not a GL3bc implementation");
-}
-
-public final GL3 getGL3() throws GLException {
-    return this;
-}
-
-public final GL2 getGL2() throws GLException {
-    throw new GLException("Not a GL2 implementation");
-}
-
-public final GLES1 getGLES1() throws GLException {
-    throw new GLException("Not a GLES1 implementation");
-}
-
-public final GLES2 getGLES2() throws GLException {
-    throw new GLException("Not a GLES2 implementation");
-}
-
-public final GL2ES1 getGL2ES1() throws GLException {
-    throw new GLException("Not a GLES2ES1 implementation");
-}
-
-public final GL2ES2 getGL2ES2() throws GLException {
-    return this;
-}
-
-public final GL2GL3 getGL2GL3() throws GLException {
-    return this;
-}
-
-public boolean isFunctionAvailable(String glFunctionName) {
-  return _context.isFunctionAvailable(glFunctionName);
-}
-
-public boolean isExtensionAvailable(String glExtensionName) {
-  return _context.isExtensionAvailable(glExtensionName);
-}
-
-public Object getExtension(String extensionName) {
-  // At this point we don't expose any extensions using this mechanism
-  return null;
-}
-
-/** Returns the context this GL object is associated with for better
-    error checking by DebugGL. */
-public GLContext getContext() {
-  return _context;
-}
-
-private GLContextImpl _context;
-
-/**
- * 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 void setSwapInterval(int interval) {
-  _context.setSwapInterval(interval);
-}
-
-public int getSwapInterval() {
-  return _context.getSwapInterval();
-}
-
-public Object getPlatformGLExtensions() {
-  return _context.getPlatformGLExtensions();
-}
-
-//
-// Helpers for ensuring the correct amount of texture data
-//
-
-/** Returns the number of bytes required to fill in the appropriate
-    texture. This is computed as closely as possible based on the
-    pixel pack or unpack parameters. The logic in this routine is
-    based on code in the SGI OpenGL sample implementation. */
-
-private int imageSizeInBytes(int format, int type, int w, int h, int d,
-                             boolean pack) {
-  int elements = 0;
-  int esize = 0;
-  
-  if (w < 0) return 0;
-  if (h < 0) return 0;
-  if (d < 0) return 0;
-  switch (format) {
-  case GL_STENCIL_INDEX:
-    elements = 1;
-    break;
-  case GL_RED:
-  case GL_GREEN:
-  case GL_BLUE:
-  case GL_ALPHA:
-  case GL_LUMINANCE:
-  case GL_DEPTH_COMPONENT:
-    elements = 1;
-    break;
-  case GL_LUMINANCE_ALPHA:
-    elements = 2;
-    break;
-  case GL_RGB:
-  case GL_BGR:
-    elements = 3;
-    break;
-  case GL_RGBA:
-  case GL_BGRA:
-    elements = 4;
-    break;
-  /* FIXME ?? 
-   case GL_HILO_NV:
-    elements = 2;
-    break; */
-  default:
-    return 0;
-  }
-  switch (type) {
-  case GL_BYTE:
-  case GL_UNSIGNED_BYTE:
-    esize = 1;
-    break;
-  case GL_UNSIGNED_BYTE_3_3_2:
-  case GL_UNSIGNED_BYTE_2_3_3_REV:
-    esize = 1;
-    elements = 1;
-    break;
-  case GL_SHORT:
-  case GL_UNSIGNED_SHORT:
-    esize = 2;
-    break;
-  case GL_UNSIGNED_SHORT_5_6_5:
-  case GL_UNSIGNED_SHORT_5_6_5_REV:
-  case GL_UNSIGNED_SHORT_4_4_4_4:
-  case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-  case GL_UNSIGNED_SHORT_5_5_5_1:
-  case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-    esize = 2;
-    elements = 1;
-    break;
-  case GL_INT:
-  case GL_UNSIGNED_INT:
-  case GL_FLOAT:
-    esize = 4;
-    break;
-  case GL_UNSIGNED_INT_8_8_8_8:
-  case GL_UNSIGNED_INT_8_8_8_8_REV:
-  case GL_UNSIGNED_INT_10_10_10_2:
-  case GL_UNSIGNED_INT_2_10_10_10_REV:
-    esize = 4;
-    elements = 1;
-    break;
-  default:
-    return 0;
-  }
-  return imageSizeInBytes(elements * esize, w, h, d, pack);
-}
-
-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 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) {
-    throw new GLException("May not call this between glBegin and glEnd");
-  }
-  boolean avail = (extension1 || extension2 || extension3);
-  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) {
-      if(throwException) {
-          throw new GLException(kind + " must be enabled 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;
-    }
-  }
-  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);
-}
-
-// Attempt to return the same ByteBuffer object from glMapBuffer if
-// the vertex buffer object's base address and size haven't changed
-private static class ARBVBOKey {
-  private long addr;
-  private int  capacity;
-
-  ARBVBOKey(long addr, int capacity) {
-    this.addr = addr;
-    this.capacity = capacity;
-  }
-
-  public int hashCode() {
-    return (int) addr;
-  }
-
-  public boolean equals(Object o) {
-    if ((o == null) || (!(o instanceof ARBVBOKey))) {
-      return false;
-    }
-
-    ARBVBOKey other = (ARBVBOKey) o;
-    return ((addr == other.addr) && (capacity == other.capacity));
-  }
-}
-
-private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap();
-
-/** 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_ = ((GL3ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
-  if (__addr_ == 0) {
-    throw new GLException("Method \"glMapBuffer\" not available");
-  }
-  int sz = bufferSizeTracker.getBufferSize(bufferStateTracker,
-                                           target,
-                                           this);
-  long addr;
-  addr = dispatch_glMapBuffer(target, access, __addr_);
-  if (addr == 0 || sz == 0) {
-    return null;
-  }
-  ARBVBOKey key = new ARBVBOKey(addr, sz);
-  ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
-  if (_res == null) {
-    _res = newDirectByteBuffer(addr, sz);
-    InternalBufferUtil.nativeOrder(_res);
-    arbVBOCache.put(key, _res);
-  }
-  _res.position(0);
-  return _res;
-}
-
-/** 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");
-  }
-
-  /** 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, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) {
-    throw new GLException("Method \"glShaderBinary\" not available");
-  }
-
-  public void glReleaseShaderCompiler() {
-    // nothing to do 
-  }
-
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl3bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl3bc.java
deleted file mode 100644
index 2f804a218..000000000
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl3bc.java
+++ /dev/null
@@ -1,514 +0,0 @@
-// Tracks glBegin/glEnd calls to determine whether it is legal to
-// query Vertex Buffer Object state
-private boolean inBeginEndPair;
-
-/* FIXME: refactor dependence on Java 2D / JOGL bridge
-
-// Tracks creation and destruction of server-side OpenGL objects when
-// the Java2D/OpenGL pipeline is enabled and it is using frame buffer
-// objects (FBOs) to do its rendering
-private GLObjectTracker tracker;
-
-public void setObjectTracker(GLObjectTracker tracker) {
-  this.tracker = tracker;
-}
-
-*/
-
-
-public GL3bcImpl(GLProfile glp, GLContextImpl context) {
-  this._context = context; 
-  this.bufferSizeTracker  = context.getBufferSizeTracker();
-  this.bufferStateTracker = context.getBufferStateTracker();
-  this.glStateTracker     = context.getGLStateTracker();
-  this.glProfile = glp;
-}
-
-public final boolean isGL() {
-    return true;
-}
-  
-public final boolean isGL4bc() {
-    return false;
-}
-
-public final boolean isGL4() {
-    return false;
-}
-
-public final boolean isGL3bc() {
-    return true;
-}
-
-public final boolean isGL3() {
-    return true;
-}
-
-public final boolean isGL2() {
-    return true;
-}
-  
-public final boolean isGLES1() {
-    return false;
-}
-
-public final boolean isGLES2() {
-    return false;
-}
-
-public final boolean isGLES() {
-    return false;
-}
-
-public final boolean isGL2ES1() {
-    return true;
-}
-
-public final boolean isGL2ES2() {
-    return true;
-}
-
-public final boolean isGL2GL3() {
-    return true;
-}
-
-public final boolean hasGLSL() {
-    return true;
-}
-
-public final GL getGL() throws GLException {
-    return this;
-}
-
-public final GL4bc getGL4bc() throws GLException {
-    throw new GLException("Not a GL4bc implementation");
-}
-
-public final GL4 getGL4() throws GLException {
-    throw new GLException("Not a GL4 implementation");
-}
-
-public final GL3bc getGL3bc() throws GLException {
-    return this;
-}
-
-public final GL3 getGL3() throws GLException {
-    return this;
-}
-
-public final GL2 getGL2() throws GLException {
-    return this;
-}
-
-public final GLES1 getGLES1() throws GLException {
-    throw new GLException("Not a GLES1 implementation");
-}
-
-public final GLES2 getGLES2() throws GLException {
-    throw new GLException("Not a GLES2 implementation");
-}
-
-public final GL2ES1 getGL2ES1() throws GLException {
-    return this;
-}
-
-public final GL2ES2 getGL2ES2() throws GLException {
-    return this;
-}
-
-public final GL2GL3 getGL2GL3() throws GLException {
-    return this;
-}
-
-public boolean isFunctionAvailable(String glFunctionName) {
-  return _context.isFunctionAvailable(glFunctionName);
-}
-
-public boolean isExtensionAvailable(String glExtensionName) {
-  return _context.isExtensionAvailable(glExtensionName);
-}
-
-public Object getExtension(String extensionName) {
-  // At this point we don't expose any extensions using this mechanism
-  return null;
-}
-
-/** Returns the context this GL object is associated with for better
-    error checking by DebugGL. */
-public GLContext getContext() {
-  return _context;
-}
-
-private GLContextImpl _context;
-
-/**
- * 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 void setSwapInterval(int interval) {
-  _context.setSwapInterval(interval);
-}
-
-public int getSwapInterval() {
-  return _context.getSwapInterval();
-}
-
-public Object getPlatformGLExtensions() {
-  return _context.getPlatformGLExtensions();
-}
-
-//
-// Helpers for ensuring the correct amount of texture data
-//
-
-/** Returns the number of bytes required to fill in the appropriate
-    texture. This is computed as closely as possible based on the
-    pixel pack or unpack parameters. The logic in this routine is
-    based on code in the SGI OpenGL sample implementation. */
-
-private int imageSizeInBytes(int format, int type, int w, int h, int d,
-                             boolean pack) {
-  int elements = 0;
-  int esize = 0;
-  
-  if (w < 0) return 0;
-  if (h < 0) return 0;
-  if (d < 0) return 0;
-  switch (format) {
-  case GL_COLOR_INDEX:
-  case GL_STENCIL_INDEX:
-    elements = 1;
-    break;
-  case GL_RED:
-  case GL_GREEN:
-  case GL_BLUE:
-  case GL_ALPHA:
-  case GL_LUMINANCE:
-  case GL_DEPTH_COMPONENT:
-    elements = 1;
-    break;
-  case GL_LUMINANCE_ALPHA:
-    elements = 2;
-    break;
-  case GL_RGB:
-  case GL_BGR:
-    elements = 3;
-    break;
-  case GL_RGBA:
-  case GL_BGRA:
-  case GL_ABGR_EXT:
-    elements = 4;
-    break;
-  /* FIXME ?? 
-   case GL_HILO_NV:
-    elements = 2;
-    break; */
-  default:
-    return 0;
-  }
-  switch (type) {
-  case GL_BITMAP:
-    if (format == GL_COLOR_INDEX) {
-      return (d * (h * ((w+7)/8)));
-    } else {
-      return 0;
-    }
-  case GL_BYTE:
-  case GL_UNSIGNED_BYTE:
-    esize = 1;
-    break;
-  case GL_UNSIGNED_BYTE_3_3_2:
-  case GL_UNSIGNED_BYTE_2_3_3_REV:
-    esize = 1;
-    elements = 1;
-    break;
-  case GL_SHORT:
-  case GL_UNSIGNED_SHORT:
-    esize = 2;
-    break;
-  case GL_UNSIGNED_SHORT_5_6_5:
-  case GL_UNSIGNED_SHORT_5_6_5_REV:
-  case GL_UNSIGNED_SHORT_4_4_4_4:
-  case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-  case GL_UNSIGNED_SHORT_5_5_5_1:
-  case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-    esize = 2;
-    elements = 1;
-    break;
-  case GL_INT:
-  case GL_UNSIGNED_INT:
-  case GL_FLOAT:
-    esize = 4;
-    break;
-  case GL_UNSIGNED_INT_8_8_8_8:
-  case GL_UNSIGNED_INT_8_8_8_8_REV:
-  case GL_UNSIGNED_INT_10_10_10_2:
-  case GL_UNSIGNED_INT_2_10_10_10_REV:
-    esize = 4;
-    elements = 1;
-    break;
-  default:
-    return 0;
-  }
-  return imageSizeInBytes(elements * esize, w, h, d, pack);
-}
-
-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 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) {
-    throw new GLException("May not call this between glBegin and glEnd");
-  }
-  boolean avail = (extension1 || extension2 || extension3);
-  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) {
-      if(throwException) {
-          throw new GLException(kind + " must be enabled 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;
-    }
-  }
-  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);
-}
-
-// Attempt to return the same ByteBuffer object from glMapBuffer if
-// the vertex buffer object's base address and size haven't changed
-private static class ARBVBOKey {
-  private long addr;
-  private int  capacity;
-
-  ARBVBOKey(long addr, int capacity) {
-    this.addr = addr;
-    this.capacity = capacity;
-  }
-
-  public int hashCode() {
-    return (int) addr;
-  }
-
-  public boolean equals(Object o) {
-    if ((o == null) || (!(o instanceof ARBVBOKey))) {
-      return false;
-    }
-
-    ARBVBOKey other = (ARBVBOKey) o;
-    return ((addr == other.addr) && (capacity == other.capacity));
-  }
-}
-
-private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap();
-
-/** 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_ = ((GL3bcProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
-  if (__addr_ == 0) {
-    throw new GLException("Method \"glMapBuffer\" not available");
-  }
-  int sz = bufferSizeTracker.getBufferSize(bufferStateTracker,
-                                           target,
-                                           this);
-  long addr;
-  addr = dispatch_glMapBuffer(target, access, __addr_);
-  if (addr == 0 || sz == 0) {
-    return null;
-  }
-  ARBVBOKey key = new ARBVBOKey(addr, sz);
-  ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
-  if (_res == null) {
-    _res = newDirectByteBuffer(addr, sz);
-    InternalBufferUtil.nativeOrder(_res);
-    arbVBOCache.put(key, _res);
-  }
-  _res.position(0);
-  return _res;
-}
-
-/** 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");
-  }
-
-  /** 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, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) {
-    throw new GLException("Method \"glShaderBinary\" not available");
-  }
-
-  public void glReleaseShaderCompiler() {
-    // nothing to do 
-  }
-
-    public void glVertexPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-    public void glColorPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-
-    }
-    public void glNormalPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.getComponentNumber()!=3) {
-        throw new GLException("Only 3 components per normal allowed");
-      }
-      if(array.isVBO()) {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-    public void glTexCoordPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4.java
new file mode 100644
index 000000000..a2c70eeee
--- /dev/null
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4.java
@@ -0,0 +1,339 @@
+// Tracks glBegin/glEnd calls to determine whether it is legal to
+// query Vertex Buffer Object state
+private boolean inBeginEndPair;
+
+/* FIXME: refactor dependence on Java 2D / JOGL bridge
+
+// Tracks creation and destruction of server-side OpenGL objects when
+// the Java2D/OpenGL pipeline is enabled and it is using frame buffer
+// objects (FBOs) to do its rendering
+private GLObjectTracker tracker;
+
+public void setObjectTracker(GLObjectTracker tracker) {
+  this.tracker = tracker;
+}
+
+*/
+
+public GL3Impl(GLProfile glp, GLContextImpl context) {
+  this._context = context; 
+  this.bufferSizeTracker  = context.getBufferSizeTracker();
+  this.bufferStateTracker = context.getBufferStateTracker();
+  this.glStateTracker     = context.getGLStateTracker();
+  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);
+}
+
+//
+// Helpers for ensuring the correct amount of texture data
+//
+
+/** Returns the number of bytes required to fill in the appropriate
+    texture. This is computed as closely as possible based on the
+    pixel pack or unpack parameters. The logic in this routine is
+    based on code in the SGI OpenGL sample implementation. */
+
+private int imageSizeInBytes(int format, int type, int w, int h, int d,
+                             boolean pack) {
+  int elements = 0;
+  int esize = 0;
+  
+  if (w < 0) return 0;
+  if (h < 0) return 0;
+  if (d < 0) return 0;
+  switch (format) {
+  case GL_STENCIL_INDEX:
+    elements = 1;
+    break;
+  case GL_RED:
+  case GL_GREEN:
+  case GL_BLUE:
+  case GL_ALPHA:
+  case GL_LUMINANCE:
+  case GL_DEPTH_COMPONENT:
+    elements = 1;
+    break;
+  case GL_LUMINANCE_ALPHA:
+    elements = 2;
+    break;
+  case GL_RGB:
+  case GL_BGR:
+    elements = 3;
+    break;
+  case GL_RGBA:
+  case GL_BGRA:
+    elements = 4;
+    break;
+  /* FIXME ?? 
+   case GL_HILO_NV:
+    elements = 2;
+    break; */
+  default:
+    return 0;
+  }
+  switch (type) {
+  case GL_BYTE:
+  case GL_UNSIGNED_BYTE:
+    esize = 1;
+    break;
+  case GL_UNSIGNED_BYTE_3_3_2:
+  case GL_UNSIGNED_BYTE_2_3_3_REV:
+    esize = 1;
+    elements = 1;
+    break;
+  case GL_SHORT:
+  case GL_UNSIGNED_SHORT:
+    esize = 2;
+    break;
+  case GL_UNSIGNED_SHORT_5_6_5:
+  case GL_UNSIGNED_SHORT_5_6_5_REV:
+  case GL_UNSIGNED_SHORT_4_4_4_4:
+  case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+  case GL_UNSIGNED_SHORT_5_5_5_1:
+  case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+    esize = 2;
+    elements = 1;
+    break;
+  case GL_INT:
+  case GL_UNSIGNED_INT:
+  case GL_FLOAT:
+    esize = 4;
+    break;
+  case GL_UNSIGNED_INT_8_8_8_8:
+  case GL_UNSIGNED_INT_8_8_8_8_REV:
+  case GL_UNSIGNED_INT_10_10_10_2:
+  case GL_UNSIGNED_INT_2_10_10_10_REV:
+    esize = 4;
+    elements = 1;
+    break;
+  default:
+    return 0;
+  }
+  return imageSizeInBytes(elements * esize, w, h, d, pack);
+}
+
+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 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) {
+    throw new GLException("May not call this between glBegin and glEnd");
+  }
+  boolean avail = (extension1 || extension2 || extension3);
+  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) {
+      if(throwException) {
+          throw new GLException(kind + " must be enabled 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;
+    }
+  }
+  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);
+}
+
+// Attempt to return the same ByteBuffer object from glMapBuffer if
+// the vertex buffer object's base address and size haven't changed
+private static class ARBVBOKey {
+  private long addr;
+  private int  capacity;
+
+  ARBVBOKey(long addr, int capacity) {
+    this.addr = addr;
+    this.capacity = capacity;
+  }
+
+  public int hashCode() {
+    return (int) addr;
+  }
+
+  public boolean equals(Object o) {
+    if ((o == null) || (!(o instanceof ARBVBOKey))) {
+      return false;
+    }
+
+    ARBVBOKey other = (ARBVBOKey) o;
+    return ((addr == other.addr) && (capacity == other.capacity));
+  }
+}
+
+private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap();
+
+/** 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_ = ((GL3ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
+  if (__addr_ == 0) {
+    throw new GLException("Method \"glMapBuffer\" not available");
+  }
+  int sz = bufferSizeTracker.getBufferSize(bufferStateTracker,
+                                           target,
+                                           this);
+  long addr;
+  addr = dispatch_glMapBuffer(target, access, __addr_);
+  if (addr == 0 || sz == 0) {
+    return null;
+  }
+  ARBVBOKey key = new ARBVBOKey(addr, sz);
+  ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
+  if (_res == null) {
+    _res = newDirectByteBuffer(addr, sz);
+    InternalBufferUtil.nativeOrder(_res);
+    arbVBOCache.put(key, _res);
+  }
+  _res.position(0);
+  return _res;
+}
+
+/** 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");
+  }
+
+  /** 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, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) {
+    throw new GLException("Method \"glShaderBinary\" not available");
+  }
+
+  public void glReleaseShaderCompiler() {
+    // nothing to do 
+  }
+
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
new file mode 100644
index 000000000..bceb12fe5
--- /dev/null
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
@@ -0,0 +1,385 @@
+// Tracks glBegin/glEnd calls to determine whether it is legal to
+// query Vertex Buffer Object state
+private boolean inBeginEndPair;
+
+/* FIXME: refactor dependence on Java 2D / JOGL bridge
+
+// Tracks creation and destruction of server-side OpenGL objects when
+// the Java2D/OpenGL pipeline is enabled and it is using frame buffer
+// objects (FBOs) to do its rendering
+private GLObjectTracker tracker;
+
+public void setObjectTracker(GLObjectTracker tracker) {
+  this.tracker = tracker;
+}
+
+*/
+
+
+public GL4bcImpl(GLProfile glp, GLContextImpl context) {
+  this._context = context; 
+  this.bufferSizeTracker  = context.getBufferSizeTracker();
+  this.bufferStateTracker = context.getBufferStateTracker();
+  this.glStateTracker     = context.getGLStateTracker();
+  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);
+}
+
+//
+// Helpers for ensuring the correct amount of texture data
+//
+
+/** Returns the number of bytes required to fill in the appropriate
+    texture. This is computed as closely as possible based on the
+    pixel pack or unpack parameters. The logic in this routine is
+    based on code in the SGI OpenGL sample implementation. */
+
+private int imageSizeInBytes(int format, int type, int w, int h, int d,
+                             boolean pack) {
+  int elements = 0;
+  int esize = 0;
+  
+  if (w < 0) return 0;
+  if (h < 0) return 0;
+  if (d < 0) return 0;
+  switch (format) {
+  case GL_COLOR_INDEX:
+  case GL_STENCIL_INDEX:
+    elements = 1;
+    break;
+  case GL_RED:
+  case GL_GREEN:
+  case GL_BLUE:
+  case GL_ALPHA:
+  case GL_LUMINANCE:
+  case GL_DEPTH_COMPONENT:
+    elements = 1;
+    break;
+  case GL_LUMINANCE_ALPHA:
+    elements = 2;
+    break;
+  case GL_RGB:
+  case GL_BGR:
+    elements = 3;
+    break;
+  case GL_RGBA:
+  case GL_BGRA:
+  case GL_ABGR_EXT:
+    elements = 4;
+    break;
+  /* FIXME ?? 
+   case GL_HILO_NV:
+    elements = 2;
+    break; */
+  default:
+    return 0;
+  }
+  switch (type) {
+  case GL_BITMAP:
+    if (format == GL_COLOR_INDEX) {
+      return (d * (h * ((w+7)/8)));
+    } else {
+      return 0;
+    }
+  case GL_BYTE:
+  case GL_UNSIGNED_BYTE:
+    esize = 1;
+    break;
+  case GL_UNSIGNED_BYTE_3_3_2:
+  case GL_UNSIGNED_BYTE_2_3_3_REV:
+    esize = 1;
+    elements = 1;
+    break;
+  case GL_SHORT:
+  case GL_UNSIGNED_SHORT:
+    esize = 2;
+    break;
+  case GL_UNSIGNED_SHORT_5_6_5:
+  case GL_UNSIGNED_SHORT_5_6_5_REV:
+  case GL_UNSIGNED_SHORT_4_4_4_4:
+  case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+  case GL_UNSIGNED_SHORT_5_5_5_1:
+  case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+    esize = 2;
+    elements = 1;
+    break;
+  case GL_INT:
+  case GL_UNSIGNED_INT:
+  case GL_FLOAT:
+    esize = 4;
+    break;
+  case GL_UNSIGNED_INT_8_8_8_8:
+  case GL_UNSIGNED_INT_8_8_8_8_REV:
+  case GL_UNSIGNED_INT_10_10_10_2:
+  case GL_UNSIGNED_INT_2_10_10_10_REV:
+    esize = 4;
+    elements = 1;
+    break;
+  default:
+    return 0;
+  }
+  return imageSizeInBytes(elements * esize, w, h, d, pack);
+}
+
+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 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) {
+    throw new GLException("May not call this between glBegin and glEnd");
+  }
+  boolean avail = (extension1 || extension2 || extension3);
+  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) {
+      if(throwException) {
+          throw new GLException(kind + " must be enabled 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;
+    }
+  }
+  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);
+}
+
+// Attempt to return the same ByteBuffer object from glMapBuffer if
+// the vertex buffer object's base address and size haven't changed
+private static class ARBVBOKey {
+  private long addr;
+  private int  capacity;
+
+  ARBVBOKey(long addr, int capacity) {
+    this.addr = addr;
+    this.capacity = capacity;
+  }
+
+  public int hashCode() {
+    return (int) addr;
+  }
+
+  public boolean equals(Object o) {
+    if ((o == null) || (!(o instanceof ARBVBOKey))) {
+      return false;
+    }
+
+    ARBVBOKey other = (ARBVBOKey) o;
+    return ((addr == other.addr) && (capacity == other.capacity));
+  }
+}
+
+private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap();
+
+/** 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");
+  }
+  int sz = bufferSizeTracker.getBufferSize(bufferStateTracker,
+                                           target,
+                                           this);
+  long addr;
+  addr = dispatch_glMapBuffer(target, access, __addr_);
+  if (addr == 0 || sz == 0) {
+    return null;
+  }
+  ARBVBOKey key = new ARBVBOKey(addr, sz);
+  ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
+  if (_res == null) {
+    _res = newDirectByteBuffer(addr, sz);
+    InternalBufferUtil.nativeOrder(_res);
+    arbVBOCache.put(key, _res);
+  }
+  _res.position(0);
+  return _res;
+}
+
+/** 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");
+  }
+
+  /** 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, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) {
+    throw new GLException("Method \"glShaderBinary\" not available");
+  }
+
+  public void glReleaseShaderCompiler() {
+    // nothing to do 
+  }
+
+    public void glVertexPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.isVBO()) {
+          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+    }
+    public void glColorPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.isVBO()) {
+          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+
+    }
+    public void glNormalPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.getComponentNumber()!=3) {
+        throw new GLException("Only 3 components per normal allowed");
+      }
+      if(array.isVBO()) {
+          glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+    }
+    public void glTexCoordPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.isVBO()) {
+          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+    }
+
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index 6fb8a32ef..b4efac8a1 100755
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -6,10 +6,6 @@ public GLES1Impl(GLProfile glp, GLContextImpl context) {
   this.glProfile = glp;
 }
 
-public final boolean isGL() {
-    return true;
-}
-  
 public final boolean isGL4bc() {
     return false;
 }
@@ -58,10 +54,6 @@ public final boolean hasGLSL() {
     return false;
 }
 
-public final GL getGL() throws GLException {
-    return this;
-}
-
 public final GL4bc getGL4bc() throws GLException {
     throw new GLException("Not a GL4bc implementation");
 }
@@ -102,39 +94,6 @@ public final GL2GL3 getGL2GL3() throws GLException {
     throw new GLException("Not a GL2GL3 implementation");
 }
 
-public boolean isFunctionAvailable(String glFunctionName) {
-  return _context.isFunctionAvailable(glFunctionName);
-}
-
-public boolean isExtensionAvailable(String glExtensionName) {
-  return _context.isExtensionAvailable(glExtensionName);
-}
-
-public Object getExtension(String extensionName) {
-  // At this point we don't expose any extensions using this mechanism
-  return null;
-}
-
-/** Returns the context this GL object is associated with for better
-    error checking by DebugGL. */
-public GLContext getContext() {
-  return _context;
-}
-
-private GLContextImpl _context;
-
-public void setSwapInterval(int interval) {
-  _context.setSwapInterval(interval);
-}
-
-public int getSwapInterval() {
-  return _context.getSwapInterval();
-}
-
-public Object getPlatformGLExtensions() {
-  return _context.getPlatformGLExtensions();
-}
-
 //
 // Helpers for ensuring the correct amount of texture data
 //
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
index 8204bd1ae..bb8ddb7ef 100755
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
@@ -10,10 +10,6 @@ public GLES2Impl(GLProfile glp, GLContextImpl context) {
   this.glProfile = glp;
 }
 
-public final boolean isGL() {
-    return true;
-}
-  
 public final boolean isGL4bc() {
     return false;
 }
@@ -62,10 +58,6 @@ public final boolean hasGLSL() {
     return true;
 }
 
-public final GL getGL() throws GLException {
-    return this;
-}
-
 public final GL4bc getGL4bc() throws GLException {
     throw new GLException("Not a GL4bc implementation");
 }
@@ -106,39 +98,6 @@ public final GL2GL3 getGL2GL3() throws GLException {
     throw new GLException("Not a GL2GL3 implementation");
 }
 
-public boolean isFunctionAvailable(String glFunctionName) {
-  return _context.isFunctionAvailable(glFunctionName);
-}
-
-public boolean isExtensionAvailable(String glExtensionName) {
-  return _context.isExtensionAvailable(glExtensionName);
-}
-
-public Object getExtension(String extensionName) {
-  // At this point we don't expose any extensions using this mechanism
-  return null;
-}
-
-/** Returns the context this GL object is associated with for better
-    error checking by DebugGL. */
-public GLContext getContext() {
-  return _context;
-}
-
-private GLContextImpl _context;
-
-public void setSwapInterval(int interval) {
-  _context.setSwapInterval(interval);
-}
-
-public int getSwapInterval() {
-  return _context.getSwapInterval();
-}
-
-public Object getPlatformGLExtensions() {
-  return _context.getPlatformGLExtensions();
-}
-
 //
 // Helpers for ensuring the correct amount of texture data
 //
diff --git a/make/config/jogl/gl3-common.cfg b/make/config/jogl/gl3-common.cfg
index fac8323bb..c2cc2968e 100644
--- a/make/config/jogl/gl3-common.cfg
+++ b/make/config/jogl/gl3-common.cfg
@@ -16,6 +16,9 @@ RenameExtensionIntoCore GL_ARB_geometry_shader4
 RenameExtensionIntoCore GL_ARB_sync
 # <<< OpenGL 3.2
 
+# >>> OpenGL 3.3
+# <<< OpenGL 3.3
+
 # Ignore GL functions that deal with explicit pointer values in such a
 # way that we cannot implement the functionality in Java
 Ignore glMultiDrawElementsBaseVertex
diff --git a/make/config/jogl/gl3-desktop-tracker.cfg b/make/config/jogl/gl3-desktop-tracker.cfg
deleted file mode 100644
index 4b9a7edb7..000000000
--- a/make/config/jogl/gl3-desktop-tracker.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-
-# Track server-side object creation and deletion when necessary
-# Note that this is only necessary when the Java 2D / JOGL bridge is active,
-# so will never be needed for the embedded OpenGL variants
-JavaEpilogue glGenBuffers               if (tracker != null) tracker.addBuffers({0}, {1});
-JavaEpilogue glGenFencesAPPLE           if (tracker != null) tracker.addFencesAPPLE({0}, {1});
-JavaEpilogue glGenFencesNV              if (tracker != null) tracker.addFencesNV({0}, {1});
-JavaEpilogue glGenFragmentShadersATI    if (tracker != null) tracker.addFragmentShadersATI(_res, {0});
-JavaEpilogue glGenFramebuffersEXT       if (tracker != null) tracker.addFramebuffersEXT({0}, {1});
-JavaEpilogue glGenLists                 if (tracker != null) tracker.addLists(_res, {0});
-JavaEpilogue glGenOcclusionQueriesNV    if (tracker != null) tracker.addOcclusionQueriesNV({0}, {1});
-JavaEpilogue glCreateProgram            if (tracker != null) tracker.addProgramObject(_res);
-JavaEpilogue glGenPrograms              if (tracker != null) tracker.addPrograms({0}, {1});
-JavaEpilogue glGenQueries               if (tracker != null) tracker.addQueries({0}, {1});
-JavaEpilogue glGenRenderbuffersEXT      if (tracker != null) tracker.addRenderbuffersEXT({0}, {1});
-JavaEpilogue glCreateShader             if (tracker != null) tracker.addShaderObject(_res);
-JavaEpilogue glGenTextures              if (tracker != null) tracker.addTextures({0}, {1});
-JavaEpilogue glGenVertexArraysAPPLE     if (tracker != null) tracker.addVertexArraysAPPLE({0}, {1});
-JavaEpilogue glGenVertexShadersEXT      if (tracker != null) tracker.addVertexShadersEXT(_res, {0});
-
-JavaEpilogue glDeleteBuffers            if (tracker != null) tracker.removeBuffers({0}, {1});
-JavaEpilogue glDeleteFencesAPPLE        if (tracker != null) tracker.removeFencesAPPLE({0}, {1});
-JavaEpilogue glDeleteFencesNV           if (tracker != null) tracker.removeFencesNV({0}, {1});
-JavaEpilogue glDeleteFragmentShaderATI  if (tracker != null) tracker.removeFragmentShaderATI({0});
-JavaEpilogue glDeleteFramebuffersEXT    if (tracker != null) tracker.removeFramebuffersEXT({0}, {1});
-JavaEpilogue glDeleteLists              if (tracker != null) tracker.removeLists({0}, {1});
-JavaEpilogue glDeleteOcclusionQueriesNV if (tracker != null) tracker.removeOcclusionQueriesNV({0}, {1});
-JavaEpilogue glDeleteProgram            if (tracker != null) tracker.removeProgramObject({0});
-JavaEpilogue glDeleteObject             if (tracker != null) tracker.removeProgramOrShaderObject({0});
-JavaEpilogue glDeletePrograms           if (tracker != null) tracker.removePrograms({0}, {1});
-JavaEpilogue glDeleteProgramsNV         if (tracker != null) tracker.removeProgramsNV({0}, {1});
-JavaEpilogue glDeleteQueries            if (tracker != null) tracker.removeQueries({0}, {1});
-JavaEpilogue glDeleteRenderbuffersEXT   if (tracker != null) tracker.removeRenderbuffersEXT({0}, {1});
-JavaEpilogue glDeleteShader             if (tracker != null) tracker.removeShaderObject({0});
-JavaEpilogue glDeleteTextures           if (tracker != null) tracker.removeTextures({0}, {1});
-JavaEpilogue glDeleteVertexArraysAPPLE  if (tracker != null) tracker.removeVertexArraysAPPLE({0}, {1});
-JavaEpilogue glDeleteVertexShaderEXT    if (tracker != null) tracker.removeVertexShaderEXT({0});
-
diff --git a/make/config/jogl/gl4-common.cfg b/make/config/jogl/gl4-common.cfg
new file mode 100644
index 000000000..2c119da30
--- /dev/null
+++ b/make/config/jogl/gl4-common.cfg
@@ -0,0 +1,5 @@
+
+# >>> OpenGL 4.0
+# <<< OpenGL 4.0
+
+
diff --git a/make/config/jogl/gl4-desktop-tracker.cfg b/make/config/jogl/gl4-desktop-tracker.cfg
new file mode 100644
index 000000000..4b9a7edb7
--- /dev/null
+++ b/make/config/jogl/gl4-desktop-tracker.cfg
@@ -0,0 +1,38 @@
+
+# Track server-side object creation and deletion when necessary
+# Note that this is only necessary when the Java 2D / JOGL bridge is active,
+# so will never be needed for the embedded OpenGL variants
+JavaEpilogue glGenBuffers               if (tracker != null) tracker.addBuffers({0}, {1});
+JavaEpilogue glGenFencesAPPLE           if (tracker != null) tracker.addFencesAPPLE({0}, {1});
+JavaEpilogue glGenFencesNV              if (tracker != null) tracker.addFencesNV({0}, {1});
+JavaEpilogue glGenFragmentShadersATI    if (tracker != null) tracker.addFragmentShadersATI(_res, {0});
+JavaEpilogue glGenFramebuffersEXT       if (tracker != null) tracker.addFramebuffersEXT({0}, {1});
+JavaEpilogue glGenLists                 if (tracker != null) tracker.addLists(_res, {0});
+JavaEpilogue glGenOcclusionQueriesNV    if (tracker != null) tracker.addOcclusionQueriesNV({0}, {1});
+JavaEpilogue glCreateProgram            if (tracker != null) tracker.addProgramObject(_res);
+JavaEpilogue glGenPrograms              if (tracker != null) tracker.addPrograms({0}, {1});
+JavaEpilogue glGenQueries               if (tracker != null) tracker.addQueries({0}, {1});
+JavaEpilogue glGenRenderbuffersEXT      if (tracker != null) tracker.addRenderbuffersEXT({0}, {1});
+JavaEpilogue glCreateShader             if (tracker != null) tracker.addShaderObject(_res);
+JavaEpilogue glGenTextures              if (tracker != null) tracker.addTextures({0}, {1});
+JavaEpilogue glGenVertexArraysAPPLE     if (tracker != null) tracker.addVertexArraysAPPLE({0}, {1});
+JavaEpilogue glGenVertexShadersEXT      if (tracker != null) tracker.addVertexShadersEXT(_res, {0});
+
+JavaEpilogue glDeleteBuffers            if (tracker != null) tracker.removeBuffers({0}, {1});
+JavaEpilogue glDeleteFencesAPPLE        if (tracker != null) tracker.removeFencesAPPLE({0}, {1});
+JavaEpilogue glDeleteFencesNV           if (tracker != null) tracker.removeFencesNV({0}, {1});
+JavaEpilogue glDeleteFragmentShaderATI  if (tracker != null) tracker.removeFragmentShaderATI({0});
+JavaEpilogue glDeleteFramebuffersEXT    if (tracker != null) tracker.removeFramebuffersEXT({0}, {1});
+JavaEpilogue glDeleteLists              if (tracker != null) tracker.removeLists({0}, {1});
+JavaEpilogue glDeleteOcclusionQueriesNV if (tracker != null) tracker.removeOcclusionQueriesNV({0}, {1});
+JavaEpilogue glDeleteProgram            if (tracker != null) tracker.removeProgramObject({0});
+JavaEpilogue glDeleteObject             if (tracker != null) tracker.removeProgramOrShaderObject({0});
+JavaEpilogue glDeletePrograms           if (tracker != null) tracker.removePrograms({0}, {1});
+JavaEpilogue glDeleteProgramsNV         if (tracker != null) tracker.removeProgramsNV({0}, {1});
+JavaEpilogue glDeleteQueries            if (tracker != null) tracker.removeQueries({0}, {1});
+JavaEpilogue glDeleteRenderbuffersEXT   if (tracker != null) tracker.removeRenderbuffersEXT({0}, {1});
+JavaEpilogue glDeleteShader             if (tracker != null) tracker.removeShaderObject({0});
+JavaEpilogue glDeleteTextures           if (tracker != null) tracker.removeTextures({0}, {1});
+JavaEpilogue glDeleteVertexArraysAPPLE  if (tracker != null) tracker.removeVertexArraysAPPLE({0}, {1});
+JavaEpilogue glDeleteVertexShaderEXT    if (tracker != null) tracker.removeVertexShaderEXT({0});
+
diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java
index aeb4f2ef9..480f5d117 100755
--- a/make/config/jogl/glu-CustomJavaCode-base.java
+++ b/make/config/jogl/glu-CustomJavaCode-base.java
@@ -169,7 +169,7 @@ protected static boolean checkedGLUtessellatorImpl = false;
 
 protected static final void validateGLUtessellatorImpl() {
     if(!checkedGLUtessellatorImpl) {
-        availableGLUtessellatorImpl = NWReflection.isClassAvailable("com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl");
+        availableGLUtessellatorImpl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl");
         checkedGLUtessellatorImpl = true;
     }
     if(!availableGLUtessellatorImpl) {
@@ -1220,7 +1220,7 @@ protected static final void validateGLUquadricImpl() {
     if(!checkedGLUquadricImpl) {
         synchronized (syncObject) {
             if(!checkedGLUquadricImpl) {
-                availableGLUquadricImpl = NWReflection.isClassAvailable("com.jogamp.opengl.impl.glu.GLUquadricImpl");
+                availableGLUquadricImpl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.GLUquadricImpl");
                 checkedGLUquadricImpl = true;
             }
         }
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
index b5cb3b2f8..f3b4322d9 100755
--- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
@@ -86,7 +86,7 @@ protected static boolean checkedMipmap = false;
 
 protected static final void validateMipmap() {
     if(!checkedMipmap) {
-        availableMipmap = NWReflection.isClassAvailable("com.jogamp.opengl.impl.glu.mipmap.Mipmap");
+        availableMipmap = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.mipmap.Mipmap");
         checkedMipmap = true;
     }
     if(!availableMipmap) {
diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg
index 937ca0348..f5fc7c1b3 100644
--- a/make/config/jogl/glu-common.cfg
+++ b/make/config/jogl/glu-common.cfg
@@ -14,7 +14,7 @@ Import javax.media.opengl.glu.*
 Import com.jogamp.opengl.impl.*
 Import com.jogamp.opengl.impl.glu.*
 Import com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl
-Import com.jogamp.nativewindow.impl.NWReflection
+Import com.jogamp.common.util.ReflectionUtil
 
 # Raise GLException instead of RuntimeException in glue code
 RuntimeExceptionType GLException
diff --git a/make/config/jogl/obsolete/gl-gl2es12.cfg b/make/config/jogl/obsolete/gl-gl2es12.cfg
new file mode 100644
index 000000000..3942b1419
--- /dev/null
+++ b/make/config/jogl/obsolete/gl-gl2es12.cfg
@@ -0,0 +1,90 @@
+# This .cfg file is used to generate the GL interface and implementing class.
+JavaOutputDir gensrc/classes
+NativeOutputDir gensrc/native/jogl/gl2es12
+
+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
+
+Style ImplOnly
+ImplPackage com.jogamp.opengl.impl.gl2es12
+ImplJavaClass GL2ES12Impl
+Implements GL2ES12Impl GLBase
+Implements GL2ES12Impl GL
+Implements GL2ES12Impl GL2ES1
+Implements GL2ES12Impl GL2ES2
+
+Include gl-common.cfg
+Include gl-common-extensions.cfg
+Include gl-desktop.cfg
+
+# Because we're manually implementing glMapBuffer but only producing
+# the implementing class, GlueGen doesn't notice that it has to emit a
+# proc address table entry for it. Force it to here.
+ForceProcAddressGen glMapBuffer
+
+# Force all of the methods to be emitted using dynamic linking so we
+# don't need to link against any emulation library on the desktop or
+# depend on the presence of an import library for a particular device
+ForceProcAddressGen __ALL__
+
+# Also force the calling conventions of the locally generated function
+# pointer typedefs for these routines to APIENTRY
+LocalProcAddressCallingConvention __ALL__ APIENTRY
+
+EmitProcAddressTable true
+ProcAddressTableClassName GL2ES12ProcAddressTable
+GetProcAddressTableExpr ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable())
+
+# Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
+TagNativeBinding true
+
+# There seem to be some errors in the glue code generation where we are not ignoring
+# enough routines from desktop GL in GL2ES12Impl. For now manually ignore those which
+# we know shouldn't be in there
+Ignore glGetTexImage
+Ignore glPixelStoref
+
+# Add PixelStorei StateTracker
+#
+# Add input validation to glPixelStorei to make sure that, even if we
+# are running on top of desktop OpenGL, parameters not exposed in
+# OpenGL ES can not be changed
+CustomJavaCode GL2ES12Impl private static final int params_offset = 0; // just a helper for JavaPrologue ..
+
+JavaPrologue glPixelStorei if (pname != GL_PACK_ALIGNMENT && pname != GL_UNPACK_ALIGNMENT) {
+JavaPrologue glPixelStorei     throw new GLException("Unsupported pixel store parameter name 0x" + Integer.toHexString(pname));
+JavaPrologue glPixelStorei }
+JavaPrologue glPixelStorei glStateTracker.setInt(pname, param);
+
+JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offset) ) { return; }
+
+CustomJavaCode GL2ES12Impl public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar) {
+CustomJavaCode GL2ES12Impl   glFrustum((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
+
+CustomJavaCode GL2ES12Impl public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) {
+CustomJavaCode GL2ES12Impl   glOrtho((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
+
+CustomJavaCode GL2ES12Impl public void glClearDepthf(float depth) {
+CustomJavaCode GL2ES12Impl   glClearDepth((double)depth); }
+
+CustomJavaCode GL2ES12Impl public void glDepthRangef(float zNear, float zFar) {
+CustomJavaCode GL2ES12Impl    glDepthRange((double)zNear, (double)zFar); }
+
+Include gl-headers.cfg
+Include ../intptr.cfg
+
+IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-common.java
+IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-gl2es12.java
+IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-embedded.java
+IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-gl2_es2.java
+IncludeAs CustomCCode gl-impl-CustomCCode-gl2es12.c
+
+Import javax.media.opengl.GLES1
+Import javax.media.opengl.GLES2
+Import com.jogamp.opengl.impl.InternalBufferUtil
+Import java.io.PrintStream
diff --git a/make/config/jogl/obsolete/gl-impl-CustomCCode-gl2.c b/make/config/jogl/obsolete/gl-impl-CustomCCode-gl2.c
new file mode 100644
index 000000000..91fd0078b
--- /dev/null
+++ b/make/config/jogl/obsolete/gl-impl-CustomCCode-gl2.c
@@ -0,0 +1,24 @@
+/*   Java->C glue code:
+ *   Java package: com.jogamp.opengl.impl.gl2.GL2Impl
+ *    Java method: long dispatch_glMapBuffer(int target, int access)
+ *     C function: void * glMapBuffer(GLenum target, GLenum access);
+ */
+JNIEXPORT jlong JNICALL 
+Java_com_jogamp_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
+  void * _res;
+  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
+  assert(ptr_glMapBuffer != NULL);
+  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
+  return (jlong) (intptr_t) _res;
+}
+
+/*   Java->C glue code:
+ *   Java package: com.jogamp.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_jogamp_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/obsolete/gl-impl-CustomCCode-gl2es12.c b/make/config/jogl/obsolete/gl-impl-CustomCCode-gl2es12.c
new file mode 100644
index 000000000..07b821802
--- /dev/null
+++ b/make/config/jogl/obsolete/gl-impl-CustomCCode-gl2es12.c
@@ -0,0 +1,24 @@
+/*   Java->C glue code:
+ *   Java package: com.jogamp.opengl.impl.gl2es12.GL2ES12Impl
+ *    Java method: long dispatch_glMapBuffer(int target, int access)
+ *     C function: void * glMapBuffer(GLenum target, GLenum access);
+ */
+JNIEXPORT jlong JNICALL 
+Java_com_jogamp_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
+  void * _res;
+  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
+  assert(ptr_glMapBuffer != NULL);
+  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
+  return (jlong) (intptr_t) _res;
+}
+
+/*   Java->C glue code:
+ *   Java package: com.jogamp.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_jogamp_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/obsolete/gl-impl-CustomCCode-gl3.c b/make/config/jogl/obsolete/gl-impl-CustomCCode-gl3.c
new file mode 100644
index 000000000..f540a7d4a
--- /dev/null
+++ b/make/config/jogl/obsolete/gl-impl-CustomCCode-gl3.c
@@ -0,0 +1,24 @@
+/*   Java->C glue code:
+ *   Java package: com.jogamp.opengl.impl.gl3.GL3Impl
+ *    Java method: long dispatch_glMapBuffer(int target, int access)
+ *     C function: void * glMapBuffer(GLenum target, GLenum access);
+ */
+JNIEXPORT jlong JNICALL 
+Java_com_jogamp_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
+  void * _res;
+  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
+  assert(ptr_glMapBuffer != NULL);
+  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
+  return (jlong) (intptr_t) _res;
+}
+
+/*   Java->C glue code:
+ *   Java package: com.jogamp.opengl.impl.gl3.GL3Impl
+ *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
+ *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
+ */
+JNIEXPORT jobject JNICALL
+Java_com_jogamp_opengl_impl_gl3_GL3Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+  return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity);
+}
diff --git a/make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2.java b/make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2.java
new file mode 100644
index 000000000..a1a6917df
--- /dev/null
+++ b/make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2.java
@@ -0,0 +1,385 @@
+// Tracks glBegin/glEnd calls to determine whether it is legal to
+// query Vertex Buffer Object state
+private boolean inBeginEndPair;
+
+/* FIXME: refactor dependence on Java 2D / JOGL bridge
+
+// Tracks creation and destruction of server-side OpenGL objects when
+// the Java2D/OpenGL pipeline is enabled and it is using frame buffer
+// objects (FBOs) to do its rendering
+private GLObjectTracker tracker;
+
+public void setObjectTracker(GLObjectTracker tracker) {
+  this.tracker = tracker;
+}
+
+*/
+
+
+public GL2Impl(GLProfile glp, GLContextImpl context) {
+  this._context = context; 
+  this.bufferSizeTracker  = context.getBufferSizeTracker();
+  this.bufferStateTracker = context.getBufferStateTracker();
+  this.glStateTracker     = context.getGLStateTracker();
+  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);
+}
+
+//
+// Helpers for ensuring the correct amount of texture data
+//
+
+/** Returns the number of bytes required to fill in the appropriate
+    texture. This is computed as closely as possible based on the
+    pixel pack or unpack parameters. The logic in this routine is
+    based on code in the SGI OpenGL sample implementation. */
+
+private int imageSizeInBytes(int format, int type, int w, int h, int d,
+                             boolean pack) {
+  int elements = 0;
+  int esize = 0;
+  
+  if (w < 0) return 0;
+  if (h < 0) return 0;
+  if (d < 0) return 0;
+  switch (format) {
+  case GL_COLOR_INDEX:
+  case GL_STENCIL_INDEX:
+    elements = 1;
+    break;
+  case GL_RED:
+  case GL_GREEN:
+  case GL_BLUE:
+  case GL_ALPHA:
+  case GL_LUMINANCE:
+  case GL_DEPTH_COMPONENT:
+    elements = 1;
+    break;
+  case GL_LUMINANCE_ALPHA:
+    elements = 2;
+    break;
+  case GL_RGB:
+  case GL_BGR:
+    elements = 3;
+    break;
+  case GL_RGBA:
+  case GL_BGRA:
+  case GL_ABGR_EXT:
+    elements = 4;
+    break;
+  /* FIXME ?? 
+   case GL_HILO_NV:
+    elements = 2;
+    break; */
+  default:
+    return 0;
+  }
+  switch (type) {
+  case GL_BITMAP:
+    if (format == GL_COLOR_INDEX) {
+      return (d * (h * ((w+7)/8)));
+    } else {
+      return 0;
+    }
+  case GL_BYTE:
+  case GL_UNSIGNED_BYTE:
+    esize = 1;
+    break;
+  case GL_UNSIGNED_BYTE_3_3_2:
+  case GL_UNSIGNED_BYTE_2_3_3_REV:
+    esize = 1;
+    elements = 1;
+    break;
+  case GL_SHORT:
+  case GL_UNSIGNED_SHORT:
+    esize = 2;
+    break;
+  case GL_UNSIGNED_SHORT_5_6_5:
+  case GL_UNSIGNED_SHORT_5_6_5_REV:
+  case GL_UNSIGNED_SHORT_4_4_4_4:
+  case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+  case GL_UNSIGNED_SHORT_5_5_5_1:
+  case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+    esize = 2;
+    elements = 1;
+    break;
+  case GL_INT:
+  case GL_UNSIGNED_INT:
+  case GL_FLOAT:
+    esize = 4;
+    break;
+  case GL_UNSIGNED_INT_8_8_8_8:
+  case GL_UNSIGNED_INT_8_8_8_8_REV:
+  case GL_UNSIGNED_INT_10_10_10_2:
+  case GL_UNSIGNED_INT_2_10_10_10_REV:
+    esize = 4;
+    elements = 1;
+    break;
+  default:
+    return 0;
+  }
+  return imageSizeInBytes(elements * esize, w, h, d, pack);
+}
+
+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 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) {
+    throw new GLException("May not call this between glBegin and glEnd");
+  }
+  boolean avail = (extension1 || extension2 || extension3);
+  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) {
+      if(throwException) {
+          throw new GLException(kind + " must be enabled 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;
+    }
+  }
+  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);
+}
+
+// Attempt to return the same ByteBuffer object from glMapBuffer if
+// the vertex buffer object's base address and size haven't changed
+private static class ARBVBOKey {
+  private long addr;
+  private int  capacity;
+
+  ARBVBOKey(long addr, int capacity) {
+    this.addr = addr;
+    this.capacity = capacity;
+  }
+
+  public int hashCode() {
+    return (int) addr;
+  }
+
+  public boolean equals(Object o) {
+    if ((o == null) || (!(o instanceof ARBVBOKey))) {
+      return false;
+    }
+
+    ARBVBOKey other = (ARBVBOKey) o;
+    return ((addr == other.addr) && (capacity == other.capacity));
+  }
+}
+
+private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap();
+
+/** 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_ = ((GL2ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
+  if (__addr_ == 0) {
+    throw new GLException("Method \"glMapBuffer\" not available");
+  }
+  int sz = bufferSizeTracker.getBufferSize(bufferStateTracker,
+                                           target,
+                                           this);
+  long addr;
+  addr = dispatch_glMapBuffer(target, access, __addr_);
+  if (addr == 0 || sz == 0) {
+    return null;
+  }
+  ARBVBOKey key = new ARBVBOKey(addr, sz);
+  ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
+  if (_res == null) {
+    _res = newDirectByteBuffer(addr, sz);
+    InternalBufferUtil.nativeOrder(_res);
+    arbVBOCache.put(key, _res);
+  }
+  _res.position(0);
+  return _res;
+}
+
+/** 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");
+  }
+
+  /** 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, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) {
+    throw new GLException("Method \"glShaderBinary\" not available");
+  }
+
+  public void glReleaseShaderCompiler() {
+    // nothing to do 
+  }
+
+    public void glVertexPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.isVBO()) {
+          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+    }
+    public void glColorPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.isVBO()) {
+          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+
+    }
+    public void glNormalPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.getComponentNumber()!=3) {
+        throw new GLException("Only 3 components per normal allowed");
+      }
+      if(array.isVBO()) {
+          glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+    }
+    public void glTexCoordPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.isVBO()) {
+          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+    }
+
diff --git a/make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2es12.java b/make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2es12.java
new file mode 100644
index 000000000..aed442da3
--- /dev/null
+++ b/make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2es12.java
@@ -0,0 +1,353 @@
+// Tracks glBegin/glEnd calls to determine whether it is legal to
+// query Vertex Buffer Object state
+private boolean inBeginEndPair;
+
+/* FIXME: refactor dependence on Java 2D / JOGL bridge
+
+// Tracks creation and destruction of server-side OpenGL objects when
+// the Java2D/OpenGL pipeline is enabled and it is using frame buffer
+// objects (FBOs) to do its rendering
+private GLObjectTracker tracker;
+
+public void setObjectTracker(GLObjectTracker tracker) {
+  this.tracker = tracker;
+}
+
+*/
+
+public GL2ES12Impl(GLProfile glp, GLContextImpl context) {
+  this._context = context; 
+  this.bufferSizeTracker  = context.getBufferSizeTracker();
+  this.bufferStateTracker = context.getBufferStateTracker();
+  this.glStateTracker     = context.getGLStateTracker();
+  this.isGL2ES2 = glp.isGL2ES2();
+  this.glProfile = glp;
+}
+
+private boolean isGL2ES2;
+
+public boolean isFunctionAvailable(String glFunctionName) {
+  return _context.isFunctionAvailable(glFunctionName);
+}
+
+public boolean isExtensionAvailable(String glExtensionName) {
+  return _context.isExtensionAvailable(glExtensionName);
+}
+
+public Object getExtension(String extensionName) {
+  // At this point we don't expose any extensions using this mechanism
+  return null;
+}
+
+/** Returns the context this GL object is associated with for better
+    error checking by DebugGL. */
+public GLContext getContext() {
+  return _context;
+}
+
+private GLContextImpl _context;
+
+public void setSwapInterval(int interval) {
+  _context.setSwapInterval(interval);
+}
+
+public int getSwapInterval() {
+  return _context.getSwapInterval();
+}
+
+public Object getPlatformGLExtensions() {
+  return _context.getPlatformGLExtensions();
+}
+
+//
+// Helpers for ensuring the correct amount of texture data
+//
+
+/** Returns the number of bytes required to fill in the appropriate
+    texture. This is computed as closely as possible based on the
+    pixel pack or unpack parameters. The logic in this routine is
+    based on code in the SGI OpenGL sample implementation. */
+
+private int imageSizeInBytes(int format, int type, int w, int h, int d,
+                             boolean pack) {
+  int elements = 0;
+  int esize = 0;
+  
+  if (w < 0) return 0;
+  if (h < 0) return 0;
+  if (d < 0) return 0;
+  switch (format) {
+  case GL_STENCIL_INDEX:
+    elements = 1;
+    break;
+  case GL_ALPHA:
+  case GL_LUMINANCE:
+  case GL_DEPTH_COMPONENT:
+    elements = 1;
+    break;
+  case GL_LUMINANCE_ALPHA:
+    elements = 2;
+    break;
+  case GL_RGB:
+    elements = 3;
+    break;
+  case GL_RGBA:
+    elements = 4;
+    break;
+  /* FIXME ?? 
+   case GL_HILO_NV:
+    elements = 2;
+    break; */
+  default:
+    return 0;
+  }
+  switch (type) {
+  case GL_BYTE:
+  case GL_UNSIGNED_BYTE:
+    esize = 1;
+    break;
+  case GL_SHORT:
+  case GL_UNSIGNED_SHORT:
+    esize = 2;
+    break;
+  case GL_UNSIGNED_SHORT_5_6_5:
+  case GL_UNSIGNED_SHORT_4_4_4_4:
+  case GL_UNSIGNED_SHORT_5_5_5_1:
+    esize = 2;
+    elements = 1;
+    break;
+  case GL_INT:
+  case GL_UNSIGNED_INT:
+  case GL_FLOAT:
+    esize = 4;
+    break;
+  default:
+    return 0;
+  }
+  return imageSizeInBytes(elements * esize, w, h, d, pack);
+}
+
+private GLBufferSizeTracker  bufferSizeTracker;
+private GLBufferStateTracker bufferStateTracker;
+private GLStateTracker       glStateTracker;
+
+private boolean bufferObjectExtensionsInitialized = false;
+private boolean haveGL15;
+private boolean haveGL21;
+private boolean haveARBVertexBufferObject;
+
+private void initBufferObjectExtensionChecks() {
+  if (bufferObjectExtensionsInitialized)
+    return;
+  bufferObjectExtensionsInitialized = true;
+  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) {
+    throw new GLException("May not call this between glBegin and glEnd");
+  }
+  boolean avail = (extension1 || extension2 || extension3);
+  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) {
+      if(throwException) {
+          throw new GLException(kind + " must be enabled 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;
+    }
+  }
+  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) { 
+  // PBO n/a for ES 1.1 or ES 2.0
+  return true;
+}
+
+private boolean checkUnpackPBOEnabled(boolean throwException) { 
+  // PBO n/a for ES 1.1 or ES 2.0
+  return false;
+}
+
+private boolean checkPackPBODisabled(boolean throwException) { 
+  // PBO n/a for ES 1.1 or ES 2.0
+  return true;
+}
+
+private boolean checkPackPBOEnabled(boolean throwException) { 
+  // PBO n/a for ES 1.1 or ES 2.0
+  return false;
+}
+
+// Attempt to return the same ByteBuffer object from glMapBuffer if
+// the vertex buffer object's base address and size haven't changed
+private static class ARBVBOKey {
+  private long addr;
+  private int  capacity;
+
+  ARBVBOKey(long addr, int capacity) {
+    this.addr = addr;
+    this.capacity = capacity;
+  }
+
+  public int hashCode() {
+    return (int) addr;
+  }
+
+  public boolean equals(Object o) {
+    if ((o == null) || (!(o instanceof ARBVBOKey))) {
+      return false;
+    }
+
+    ARBVBOKey other = (ARBVBOKey) o;
+    return ((addr == other.addr) && (capacity == other.capacity));
+  }
+}
+
+private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap();
+
+/** 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_ = ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
+  if (__addr_ == 0) {
+    throw new GLException("Method \"glMapBuffer\" not available");
+  }
+  int sz = bufferSizeTracker.getBufferSize(bufferStateTracker,
+                                           target,
+                                           this);
+  long addr;
+  addr = dispatch_glMapBuffer(target, access, __addr_);
+  if (addr == 0 || sz == 0) {
+    return null;
+  }
+  ARBVBOKey key = new ARBVBOKey(addr, sz);
+  ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
+  if (_res == null) {
+    _res = newDirectByteBuffer(addr, sz);
+    InternalBufferUtil.nativeOrder(_res);
+    arbVBOCache.put(key, _res);
+  }
+  _res.position(0);
+  return _res;
+}
+
+/** 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");
+  }
+
+  /** 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, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) {
+    throw new GLException("Method \"glShaderBinary\" not available");
+  }
+
+  public void glReleaseShaderCompiler() {
+    // nothing to do 
+  }
+
+    public void glVertexPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.isVBO()) {
+          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+    }
+    public void glColorPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.isVBO()) {
+          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+
+    }
+    public void glNormalPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.getComponentNumber()!=3) {
+        throw new GLException("Only 3 components per normal allowed");
+      }
+      if(array.isVBO()) {
+          glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+    }
+    public void glTexCoordPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.isVBO()) {
+          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+    }
+
+
diff --git a/make/config/nativewindow/x11-CustomJavaCode.java b/make/config/nativewindow/x11-CustomJavaCode.java
index 57f37bee7..44bb1e8d0 100644
--- a/make/config/nativewindow/x11-CustomJavaCode.java
+++ b/make/config/nativewindow/x11-CustomJavaCode.java
@@ -26,9 +26,8 @@
 
   public static native long DefaultVisualID(long display, int screen);
 
-  /**
   public static native long CreateDummyWindow(long display, int screen_index, long visualID);
-  public static native void DestroyDummyWindow(long display, long window); */
+  public static native void DestroyDummyWindow(long display, long window);
 
   public static native long dlopen(String name);
   public static native long dlsym(String name);
diff --git a/make/stub_includes/opengl/gl4.c b/make/stub_includes/opengl/gl4.c
index cf8a709f7..5e9d87ccd 100644
--- a/make/stub_includes/opengl/gl4.c
+++ b/make/stub_includes/opengl/gl4.c
@@ -1,11 +1,11 @@
 #define GLAPI
 
-// Define GL4_PROTOTYPES so that the OpenGL prototypes in
+// Define GL3_PROTOTYPES so that the OpenGL prototypes in
 // "gl3.h" are parsed.
-#define GL4_PROTOTYPES
+#define GL3_PROTOTYPES
 
-// Define GL_GL4EXT_PROTOTYPES so that the OpenGL extension prototypes in
+// Define GL_GL3EXT_PROTOTYPES so that the OpenGL extension prototypes in
 // "gl3ext.h" are parsed.
-#define GL_GL4EXT_PROTOTYPES
+#define GL_GL3EXT_PROTOTYPES
 
-#include <GL4/gl3.h>
+#include <GL3/gl3.h>
diff --git a/make/stub_includes/opengl/gl4bc.c b/make/stub_includes/opengl/gl4bc.c
new file mode 100644
index 000000000..262e005f7
--- /dev/null
+++ b/make/stub_includes/opengl/gl4bc.c
@@ -0,0 +1,18 @@
+#define GLAPI
+
+// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
+// "glext.h" are parsed.
+#define GL_GLEXT_PROTOTYPES
+
+#include <GL/gl.h>
+
+// Define GL3_PROTOTYPES so that the OpenGL prototypes in
+// "gl3.h" are parsed.
+#define GL3_PROTOTYPES
+
+// Define GL_GL3EXT_PROTOTYPES so that the OpenGL extension prototypes in
+// "gl3ext.h" are parsed.
+#define GL_GL3EXT_PROTOTYPES
+
+#include <GL3/gl3ext.h>
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java b/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
index 082f006e8..1ed0396a9 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
@@ -174,12 +174,12 @@ public final class ExtensionAvailabilityCache {
             major[0] = 3;
             minor[0] = 0;
       }
-      while (GLProfile.isValidGLVersion(major[0], minor[0])) {
+      while (GLContext.isValidGLVersion(major[0], minor[0])) {
         availableExtensionCache.add("GL_VERSION_" + major[0] + "_" + minor[0]);
         if (DEBUG) {
             System.err.println("ExtensionAvailabilityCache: Added GL_VERSION_" + major[0] + "_" + minor[0] + " to known extensions");
         }
-        if(!GLProfile.decrementGLVersion(major, minor)) break;
+        if(!GLContext.decrementGLVersion(major, minor)) break;
       }
 
       // put a dummy var in here so that the cache is no longer empty even if
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
index 8c5890d1e..3abb69a7f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
@@ -45,9 +45,10 @@ import java.util.*;
 
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
-import com.jogamp.nativewindow.impl.NWReflection;
 import com.jogamp.gluegen.runtime.*;
 import com.jogamp.gluegen.runtime.opengl.*;
+import com.jogamp.common.JogampRuntimeException;
+import com.jogamp.common.util.ReflectionUtil;
 
 public abstract class GLContextImpl extends GLContext {
   protected GLContextLock lock = new GLContextLock();
@@ -123,108 +124,137 @@ public abstract class GLContextImpl extends GLContext {
     return (GLDrawableImpl) getGLDrawable();
   }
 
-  /** 
-   * Platform dependent but harmonized implementation of the <code>ARB_create_context</code>
-   * mechanism to create a context.<br>
-   * The implementation shall verify this context, ie issue a
-   * <code>MakeCurrent</code> call if necessary.<br>
-   *
-   * @param share the shared context or null
-   * @param direct flag if direct is requested
-   * @param ctxOptionFlags <code>ARB_create_context</code> related, see references below
-   * @param major major number
-   * @param minor minor number
-   * @return the valid context if successfull, or null
-   *
-   * @see #CTX_PROFILE_COMPAT
-   * @see #CTX_OPTION_FORWARD
-   * @see #CTX_OPTION_DEBUG
-   */
-  protected abstract long createContextARBImpl(long share, boolean direct, int ctxOptionFlags, 
-                                               int major, int minor);
+  public final GL getGL() {
+    return gl;
+  }
 
-  private long createContextARB(long share, boolean direct, int ctxOptionFlags, 
-                                int majorMax, int minorMax, 
-                                int majorMin, int minorMin, 
-                                int major[], int minor[]) {
-    major[0]=majorMax;
-    minor[0]=minorMax;
-    long _context=0;
+  public GL setGL(GL gl) {
+    if(DEBUG) {
+        String sgl1 = (null!=this.gl)?this.gl.getClass().toString()+", "+this.gl.toString():new String("<null>");
+        String sgl2 = (null!=gl)?gl.getClass().toString()+", "+gl.toString():new String("<null>");
+        Exception e = new Exception("setGL (OpenGL "+getGLVersion()+"): "+Thread.currentThread()+", "+sgl1+" -> "+sgl2);
+        e.printStackTrace();
+    }
+    this.gl = gl;
+    return gl;
+  }
 
-    while ( 0==_context &&
-            GLProfile.isValidGLVersion(major[0], minor[0]) &&
-            ( major[0]>majorMin || major[0]==majorMin && minor[0] >=minorMin ) ) {
+  // This is only needed for Mac OS X on-screen contexts
+  protected void update() throws GLException { }
 
-        _context = createContextARBImpl(share, direct, ctxOptionFlags, major[0], minor[0]);
+  public boolean isSynchronized() {
+    return !lock.getFailFastMode();
+  }
 
-        if(0==_context) {
-            if(!GLProfile.decrementGLVersion(major, minor)) break;
-        }
+  public void setSynchronized(boolean isSynchronized) {
+    lock.setFailFastMode(!isSynchronized);
+  }
+
+  public abstract Object getPlatformGLExtensions();
+
+  public void release() throws GLException {
+    if (!lock.isHeld()) {
+      throw new GLException("Context not current on current thread");
+    }
+    setCurrent(null);
+    try {
+      releaseImpl();
+    } finally {
+      lock.unlock();
     }
-    return _context;
   }
 
-  /**
-   * Platform independent part of using the <code>ARB_create_context</code>
-   * mechanism to create a context.<br>
-   */
-  protected long createContextARB(long share, boolean direct,
-                                  int major[], int minor[], int ctp[]) 
-  {
-    AbstractGraphicsConfiguration config = drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-    GLCapabilities glCaps = (GLCapabilities) config.getChosenCapabilities();
-    GLProfile glp = glCaps.getGLProfile();
-    long _context = 0;
+  protected abstract void releaseImpl() throws GLException;
 
-    ctp[0] = CTX_IS_ARB_CREATED | CTX_PROFILE_CORE | CTX_OPTION_ANY; // default
-    boolean isBackwardCompatibility = glp.isGL2() || glp.isGL3bc() || glp.isGL4bc() ;
-    int majorMin, minorMin;
-    int majorMax, minorMax;
-    if( glp.isGL4() ) {
-        // ?? majorMax=GLProfile.getMaxMajor(); minorMax=GLProfile.getMaxMinor(majorMax);
-        majorMax=4; minorMax=GLProfile.getMaxMinor(majorMax);
-        majorMin=4; minorMin=0;
-    } else if( glp.isGL3() ) {
-        majorMax=3; minorMax=GLProfile.getMaxMinor(majorMax);
-        majorMin=3; minorMin=1;
-    } else /* if( glp.isGL2() ) */ {
-        majorMax=3; minorMax=0;
-        majorMin=1; minorMin=1; // our minimum desktop OpenGL runtime requirements
+  public void destroy() {
+    if (lock.isHeld()) {
+        // release current context 
+        release();
     }
-    // Try the requested ..
-    if(isBackwardCompatibility) {
-        ctp[0] &= ~CTX_PROFILE_CORE ;
-        ctp[0] |=  CTX_PROFILE_COMPAT ;
-    }
-    _context = createContextARB(share, direct, ctp[0], 
-                               /* max */ majorMax, minorMax,
-                               /* min */ majorMin, minorMin,
-                               /* res */ major, minor);
-
-    if(0==_context && !isBackwardCompatibility) {
-        ctp[0] &= ~CTX_PROFILE_COMPAT ;
-        ctp[0] |=  CTX_PROFILE_CORE ;
-        ctp[0] &= ~CTX_OPTION_ANY ;
-        ctp[0] |=  CTX_OPTION_FORWARD ;
-        _context = createContextARB(share, direct, ctp[0], 
-                                   /* max */ majorMax, minorMax,
-                                   /* min */ majorMin, minorMin,
-                                   /* res */ major, minor);
-       if(0==_context) {
-            // Try a compatible one .. even though not requested .. last resort
-            ctp[0] &= ~CTX_PROFILE_CORE ;
-            ctp[0] |=  CTX_PROFILE_COMPAT ;
-            ctp[0] &= ~CTX_OPTION_FORWARD ;
-            ctp[0] |=  CTX_OPTION_ANY ;
-            _context = createContextARB(share, direct, ctp[0], 
-                                       /* max */ majorMax, minorMax,
-                                       /* min */ majorMin, minorMin,
-                                       /* res */ major, minor);
-       }
+
+    // Must hold the lock around the destroy operation to make sure we
+    // don't destroy the context out from under another thread rendering to it
+    lock.lock();
+    try {
+      /* FIXME: refactor dependence on Java 2D / JOGL bridge
+      if (tracker != null) {
+        // Don't need to do anything for contexts that haven't been
+        // created yet
+        if (isCreated()) {
+          // If we are tracking creation and destruction of server-side
+          // OpenGL objects, we must decrement the reference count of the
+          // GLObjectTracker upon context destruction.
+          //
+          // Note that we can only eagerly delete these server-side
+          // objects if there is another context currrent right now
+          // which shares textures and display lists with this one.
+          tracker.unref(deletedObjectTracker);
+        }
+      }
+      */
+  
+      // 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();
+      }
+
+      if (bufferStateTracker != null) {
+          bufferStateTracker.clearBufferObjectState();
+      }
+  
+      if (glStateTracker != null) {
+          glStateTracker.clearStates(false);
+      }
+  
+      destroyImpl();
+    } finally {
+      lock.unlock();
     }
-    return _context;
   }
 
+  protected abstract void destroyImpl() throws GLException;
+
+  //----------------------------------------------------------------------
+  //
+
+  /**
+   * MakeCurrent functionality, which also issues the creation of the actual OpenGL context.<br>
+   * The complete callgraph for general OpenGL context creation is:<br>
+   * <ul>
+   *    <li> {@link #makeCurrent} <i>GLContextImpl</i>
+   *    <li> {@link #makeCurrentImpl} <i>Platform Implementation</i>
+   *    <li> {@link #create} <i>Platform Implementation</i>
+   *    <li> If <code>ARB_create_context</code> is supported:
+   *    <ul>
+   *        <li> {@link #createContextARB} <i>GLContextImpl</i>
+   *        <li> {@link #createContextARBImpl} <i>Platform Implementation</i>
+   *    </ul>
+   * </ul><br>
+   *
+   * Once at startup, ie triggered by the singleton {@link GLDrawableImpl} constructor,
+   * calling {@link #createContextARB} will query all available OpenGL versions:<br>
+   * <ul>
+   *    <li> <code>FOR ALL GL* DO</code>:
+   *    <ul>
+   *        <li> {@link #createContextARBMapVersionsAvailable}
+   *        <ul>
+   *            <li> {@link #createContextARBVersions}
+   *        </ul>
+   *        <li> {@link #mapVersionAvailable}
+   *    </ul>
+   * </ul><br>
+   *
+   * @see #makeCurrentImpl
+   * @see #create
+   * @see #createContextARB
+   * @see #createContextARBImpl
+   * @see #mapVersionAvailable
+   * @see #destroyContextARBImpl
+   */
   public int makeCurrent() throws GLException {
     // Support calls to makeCurrent() over and over again with
     // different contexts without releasing them
@@ -287,103 +317,206 @@ public abstract class GLContextImpl extends GLContext {
     return res;
   }
 
+  /**
+   * @see #makeCurrent
+   */
   protected abstract int makeCurrentImpl() throws GLException;
 
-  public void release() throws GLException {
-    if (!lock.isHeld()) {
-      throw new GLException("Context not current on current thread");
-    }
-    setCurrent(null);
-    try {
-      releaseImpl();
-    } finally {
-      lock.unlock();
-    }
-  }
+  /**
+   * @see #makeCurrent
+   */
+  protected abstract void create() throws GLException ;
 
-  protected abstract void releaseImpl() throws GLException;
+  /** 
+   * Platform dependent but harmonized implementation of the <code>ARB_create_context</code>
+   * mechanism to create a context.<br>
+   *
+   * This method is called from {@link #createContextARB}.<br>
+   *
+   * The implementation shall verify this context with a 
+   * <code>MakeContextCurrent</code> call.<br>
+   *
+   * @param share the shared context or null
+   * @param direct flag if direct is requested
+   * @param ctxOptionFlags <code>ARB_create_context</code> related, see references below
+   * @param major major number
+   * @param minor minor number
+   * @return the valid context if successfull, or null
+   *
+   * @see #makeCurrent
+   * @see #CTX_PROFILE_COMPAT
+   * @see #CTX_OPTION_FORWARD
+   * @see #CTX_OPTION_DEBUG
+   * @see #makeCurrentImpl
+   * @see #create
+   * @see #createContextARB
+   * @see #createContextARBImpl
+   * @see #destroyContextARBImpl
+   */
+  protected abstract long createContextARBImpl(long share, boolean direct, int ctxOptionFlags, 
+                                               int major, int minor);
 
-  public void destroy() {
-    if (lock.isHeld()) {
-        // release current context 
-        release();
-    }
+  /**
+   * Destroy the context created by {@link #createContextARBImpl}.
+   *
+   * @see #makeCurrent
+   * @see #makeCurrentImpl
+   * @see #create
+   * @see #createContextARB
+   * @see #createContextARBImpl
+   * @see #destroyContextARBImpl
+   */
+  protected abstract void destroyContextARBImpl(long context);
 
-    // Must hold the lock around the destroy operation to make sure we
-    // don't destroy the context out from under another thread rendering to it
-    lock.lock();
-    try {
-      /* FIXME: refactor dependence on Java 2D / JOGL bridge
-      if (tracker != null) {
-        // Don't need to do anything for contexts that haven't been
-        // created yet
-        if (isCreated()) {
-          // If we are tracking creation and destruction of server-side
-          // OpenGL objects, we must decrement the reference count of the
-          // GLObjectTracker upon context destruction.
-          //
-          // Note that we can only eagerly delete these server-side
-          // objects if there is another context currrent right now
-          // which shares textures and display lists with this one.
-          tracker.unref(deletedObjectTracker);
+  /**
+   * Platform independent part of using the <code>ARB_create_context</code>
+   * mechanism to create a context.<br>
+   *
+   * The implementation of {@link #create} shall use this protocol in case the platform supports <code>ARB_create_context</code>.<br>
+   *
+   * This method may call {@link #createContextARBImpl} and {@link #destroyContextARBImpl}. <br>
+   *
+   * This method will also query all available native OpenGL context when first called,<br>
+   * usually the first call should happen with the shared GLContext of the DrawableFactory.<br>
+   *
+   * @see #makeCurrentImpl
+   * @see #create
+   * @see #createContextARB
+   * @see #createContextARBImpl
+   * @see #destroyContextARBImpl
+   */
+  protected long createContextARB(long share, boolean direct,
+                                  int major[], int minor[], int ctp[]) 
+  {
+    AbstractGraphicsConfiguration config = drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    GLCapabilities glCaps = (GLCapabilities) config.getChosenCapabilities();
+    GLProfile glp = glCaps.getGLProfile();
+    long _context = 0;
+
+    if( !mappedVersionsAvailableSet ) {
+        synchronized(mappedVersionsAvailableLock) {
+            if( !mappedVersionsAvailableSet ) {
+                createContextARBMapVersionsAvailable(4, false /* compat */); // GL4
+                createContextARBMapVersionsAvailable(4, true /* compat */);  // GL4bc
+                createContextARBMapVersionsAvailable(3, false /* compat */); // GL3
+                createContextARBMapVersionsAvailable(3, true /* compat */);  // GL3bc
+                createContextARBMapVersionsAvailable(2, true /* compat */);  // GL2
+                mappedVersionsAvailableSet=true;
+            }
         }
-      }
-      */
-  
-      // 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();
-      }
+    }
 
-      if (bufferStateTracker != null) {
-          bufferStateTracker.clearBufferObjectState();
-      }
-  
-      if (glStateTracker != null) {
-          glStateTracker.clearStates(false);
-      }
-  
-      destroyImpl();
-    } finally {
-      lock.unlock();
+    int reqMajor;
+    if(glp.isGL4()) {
+        reqMajor=4;
+    } else if (glp.isGL3()) {
+        reqMajor=3;
+    } else /* if (glp.isGL2()) */ {
+        reqMajor=2;
     }
+    boolean compat = glp.isGL2(); // incl GL3bc and GL4bc
+    
+    int key = compose8bit(reqMajor, compat?CTX_PROFILE_COMPAT:CTX_PROFILE_CORE, 0, 0);
+    int val = mappedVersionsAvailable.get( key );
+    long _ctx = 0;
+    if(val>0) {
+        int _major = getComposed8bit(val, 1);
+        int _minor = getComposed8bit(val, 2);
+        int _ctp   = getComposed8bit(val, 3);
+
+        _ctx = createContextARBImpl(share, direct, _ctp, _major, _minor);
+        if(0!=_ctx) {
+            setGLFunctionAvailability(true, _major, _minor, _ctp);
+        }
+    }
+    return _ctx;
   }
 
-  protected abstract void destroyImpl() throws GLException;
+  private void createContextARBMapVersionsAvailable(int reqMajor, boolean compat)
+  {
+    long _context;
+    int ctp = CTX_IS_ARB_CREATED | CTX_PROFILE_CORE | CTX_OPTION_ANY; // default
+    if(compat) {
+        ctp &= ~CTX_PROFILE_CORE ;
+        ctp |=  CTX_PROFILE_COMPAT ;
+    }
 
-  // This is only needed for Mac OS X on-screen contexts
-  protected void update() throws GLException {
+    // FIXME GL3GL4:
+    // To avoid OpenGL implementation bugs and raise compatibility
+    // within JOGL, we map to the proper GL version.
+    // This may change later when GL3 and GL4 drivers become more mature!
+    // Bug: To ensure GL profile compatibility within the JOGL application
+    // Bug: we always try to map against the highest GL version,
+    // Bug: so the use can always cast to a higher one
+    // Bug: int majorMax=GLContext.getMaxMajor(); 
+    // Bug: int minorMax=GLContext.getMaxMinor(majorMax);
+    int majorMax, minorMax;
+    int majorMin, minorMin;
+    int major[] = new int[1];
+    int minor[] = new int[1];
+    if( 4 == reqMajor ) {
+        majorMax=4; minorMax=GLContext.getMaxMinor(majorMax);
+        majorMin=4; minorMin=0;
+    } else if( 3 == reqMajor ) {
+        majorMax=3; minorMax=GLContext.getMaxMinor(majorMax);
+        majorMin=3; minorMin=1;
+    } else /* if( glp.isGL2() ) */ {
+        majorMax=3; minorMax=0;
+        majorMin=1; minorMin=1; // our minimum desktop OpenGL runtime requirements
+    }
+    _context = createContextARBVersions(0, true, ctp, 
+                                        /* max */ majorMax, minorMax,
+                                        /* min */ majorMin, minorMin,
+                                        /* res */ major, minor);
+
+    if(0==_context && !compat) {
+        ctp &= ~CTX_PROFILE_COMPAT ;
+        ctp |=  CTX_PROFILE_CORE ;
+        ctp &= ~CTX_OPTION_ANY ;
+        ctp |=  CTX_OPTION_FORWARD ;
+        _context = createContextARBVersions(0, true, ctp, 
+                                            /* max */ majorMax, minorMax,
+                                            /* min */ majorMin, minorMin,
+                                            /* res */ major, minor);
+       if(0==_context) {
+            // Try a compatible one .. even though not requested .. last resort
+            ctp &= ~CTX_PROFILE_CORE ;
+            ctp |=  CTX_PROFILE_COMPAT ;
+            ctp &= ~CTX_OPTION_FORWARD ;
+            ctp |=  CTX_OPTION_ANY ;
+            _context = createContextARBVersions(0, true, ctp, 
+                                       /* max */ majorMax, minorMax,
+                                       /* min */ majorMin, minorMin,
+                                       /* res */ major, minor);
+       }
+    }
+    if(0!=_context) {
+        destroyContextARBImpl(_context);
+        mapVersionAvailable(reqMajor, compat, major[0], minor[0], ctp);
+    }
   }
 
-  public boolean isSynchronized() {
-    return !lock.getFailFastMode();
-  }
+  private long createContextARBVersions(long share, boolean direct, int ctxOptionFlags, 
+                                        int majorMax, int minorMax, 
+                                        int majorMin, int minorMin, 
+                                        int major[], int minor[]) {
+    major[0]=majorMax;
+    minor[0]=minorMax;
+    long _context=0;
 
-  public void setSynchronized(boolean isSynchronized) {
-    lock.setFailFastMode(!isSynchronized);
-  }
+    while ( 0==_context &&
+            GLContext.isValidGLVersion(major[0], minor[0]) &&
+            ( major[0]>majorMin || major[0]==majorMin && minor[0] >=minorMin ) ) {
 
-  public final GL getGL() {
-    return gl;
-  }
+        _context = createContextARBImpl(share, direct, ctxOptionFlags, major[0], minor[0]);
 
-  public GL setGL(GL gl) {
-    if(DEBUG) {
-        String sgl1 = (null!=this.gl)?this.gl.getClass().toString()+", "+this.gl.toString():new String("<null>");
-        String sgl2 = (null!=gl)?gl.getClass().toString()+", "+gl.toString():new String("<null>");
-        Exception e = new Exception("setGL (OpenGL "+getGLVersion()+"): "+Thread.currentThread()+", "+sgl1+" -> "+sgl2);
-        e.printStackTrace();
+        if(0==_context) {
+            if(!GLContext.decrementGLVersion(major, minor)) break;
+        }
     }
-    this.gl = gl;
-    return gl;
+    return _context;
   }
 
-  public abstract Object getPlatformGLExtensions();
-
   //----------------------------------------------------------------------
   // Managing the actual OpenGL version, usually figured at creation time.
   // As a last resort, the GL_VERSION string may be used ..
@@ -395,7 +528,15 @@ public abstract class GLContextImpl extends GLContext {
    * Otherwise .. don't touch ..
    */
   protected void setContextVersion(int major, int minor, int ctp) {
+      if (0==ctp) {
+        GLException e = new GLException("Invalid GL Version "+major+"."+minor+", ctp "+toHexString(ctp));
+        throw e;
+      }
       if(major>0 || minor>0) {
+          if (!GLContext.isValidGLVersion(major, minor)) {
+            GLException e = new GLException("Invalid GL Version "+major+"."+minor+", ctp "+toHexString(ctp));
+            throw e;
+          }
           ctxMajorVersion = major;
           ctxMinorVersion = minor;
           ctxOptions = ctp;
@@ -408,6 +549,7 @@ public abstract class GLContextImpl extends GLContext {
           if(null==versionStr) {
             throw new GLException("GL_VERSION is NULL: "+this);
           }
+          ctxOptions = ctp;
 
           // Set version
           Version version = new Version(versionStr);
@@ -460,7 +602,10 @@ public abstract class GLContextImpl extends GLContext {
   //
 
   private Object createInstance(GLProfile glp, String suffix, Class[] cstrArgTypes, Object[] cstrArgs) {
-    return NWReflection.createInstance(glp.getGLImplBaseClassName()+suffix, cstrArgTypes, cstrArgs);
+    try {
+        return ReflectionUtil.createInstance(glp.getGLImplBaseClassName()+suffix, cstrArgTypes, cstrArgs);
+    } catch (JogampRuntimeException jre) { /* n/a .. */ }
+    return null;
   }
 
   /** Create the GL for this context. */
@@ -697,10 +842,6 @@ public abstract class GLContextImpl extends GLContext {
     return Thread.currentThread().getName();
   }
 
-  public static String toHexString(long hex) {
-    return "0x" + Long.toHexString(hex);
-  }
-
   //----------------------------------------------------------------------
   // Helpers for buffer object optimizations
   
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
index 0cc10b35e..cdf5beb24 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
@@ -42,8 +42,8 @@ package com.jogamp.opengl.impl;
 import java.nio.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
+import com.jogamp.common.util.*;
 import com.jogamp.gluegen.runtime.*;
-import com.jogamp.nativewindow.impl.NWReflection;
 import java.lang.reflect.*;
 
 /** Extends GLDrawableFactory with a few methods for handling
@@ -183,6 +183,9 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
   protected abstract NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, 
                                                         int width, int height);
 
+  protected abstract GLDrawableImpl getSharedDrawable();
+  protected abstract GLContextImpl getSharedContext();
+
   protected GLDrawableFactoryImpl() {
     super();
     isValid = true;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
index 04114a445..2fef8fd80 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
@@ -88,7 +88,7 @@ public abstract class GLDrawableImpl implements GLDrawable {
   protected abstract void swapBuffersImpl();
 
   public static String toHexString(long hex) {
-    return GLContextImpl.toHexString(hex);
+    return "0x" + Long.toHexString(hex);
   }
 
   public GLProfile getGLProfile() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLJNILibLoader.java b/src/jogl/classes/com/jogamp/opengl/impl/GLJNILibLoader.java
new file mode 100644
index 000000000..7747b014b
--- /dev/null
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLJNILibLoader.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.impl;
+
+// FIXME: refactor Java SE dependencies
+//import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.HashSet;
+import com.jogamp.common.jvm.JNILibLoaderBase;
+
+public class GLJNILibLoader extends JNILibLoaderBase {
+  public static void loadNEWT() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("newt", nativeOSPreload, true);
+        return null;
+      }
+    });
+  }
+
+  public static void loadGLDesktop() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("jogl_desktop", nativeOSPreload, true);
+        return null;
+      }
+    });
+  }
+
+  public static void loadES2() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("jogl_es2", nativeOSPreload, true);
+        return null;
+      }
+    });
+  }
+
+  public static void loadES1() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("jogl_es1", nativeOSPreload, true);
+        return null;
+      }
+    });
+  }
+
+  public static void loadCgImpl() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        String[] preload = { "nativewindow", "cg", "cgGL" };
+        loadLibrary("jogl_cg", preload, true);
+        return null;
+      }
+    });
+  }
+
+  private static final String[] nativeOSPreload = { "nativewindow_x11" };
+}
+
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
deleted file mode 100644
index b6024f240..000000000
--- a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.jogamp.opengl.impl;
-
-// FIXME: refactor Java SE dependencies
-//import java.awt.Toolkit;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashSet;
-import com.jogamp.nativewindow.impl.NativeLibLoaderBase;
-
-public class NativeLibLoader extends NativeLibLoaderBase {
-  public static void loadNEWT() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("newt", nativeOSPreload, true);
-        return null;
-      }
-    });
-  }
-
-  public static void loadGLDesktop() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("jogl_desktop", nativeOSPreload, true);
-        return null;
-      }
-    });
-  }
-
-  public static void loadGLDesktopES12() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("jogl_gl2es12", nativeOSPreload, true);
-        return null;
-      }
-    });
-  }
-
-  public static void loadES2() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("jogl_es2", nativeOSPreload, true);
-        return null;
-      }
-    });
-  }
-
-  public static void loadES1() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("jogl_es1", nativeOSPreload, true);
-        return null;
-      }
-    });
-  }
-
-  public static void loadCgImpl() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        String[] preload = { "nativewindow", "cg", "cgGL" };
-        loadLibrary("jogl_cg", preload, true);
-        return null;
-      }
-    });
-  }
-
-  private static final String[] nativeOSPreload = { "nativewindow_x11" };
-}
-
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java
index b32ed51b6..1a68f38d4 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java
@@ -37,8 +37,9 @@ import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
+import com.jogamp.common.JogampRuntimeException;
+import com.jogamp.common.util.*;
 import javax.media.nativewindow.NativeWindowFactory;
-import com.jogamp.nativewindow.impl.NWReflection;
 import javax.media.opengl.GLException;
 
 /** Implementation of the {@link javax.media.opengl.Threading} class. */
@@ -71,8 +72,8 @@ public class ThreadingImpl {
                         // while holding the AWT lock. The optimization of
                         // makeCurrent / release calls isn't worth these stability
                         // problems.
-                        hasAWT = NWReflection.isClassAvailable("java.awt.Canvas") &&
-                            NWReflection.isClassAvailable("javax.media.opengl.awt.GLCanvas");
+                        hasAWT = ReflectionUtil.isClassAvailable("java.awt.Canvas") &&
+                                 ReflectionUtil.isClassAvailable("javax.media.opengl.awt.GLCanvas");
 
                         String osType = NativeWindowFactory.getNativeWindowType(false);
                         _isX11 = NativeWindowFactory.TYPE_X11.equals(osType);
@@ -102,8 +103,8 @@ public class ThreadingImpl {
                         Object threadingPluginObj=null;
                         // try to fetch the AWTThreadingPlugin
                         try {
-                            threadingPluginObj = NWReflection.createInstance("com.jogamp.opengl.impl.awt.AWTThreadingPlugin");
-                        } catch (Throwable t) { }
+                            threadingPluginObj = ReflectionUtil.createInstance("com.jogamp.opengl.impl.awt.AWTThreadingPlugin");
+                        } catch (JogampRuntimeException jre) { /* n/a .. */ }
                         return threadingPluginObj;
                     }
                 });
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
index 8c3e9a1c4..48f80977c 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
@@ -95,11 +95,11 @@ public abstract class EGLContext extends GLContextImpl {
         boolean created = false;
         if (eglContext == 0) {
             create();
+            created = true;
             if (DEBUG) {
                 System.err.println(getThreadName() + ": !!! Created GL context 0x" +
                                    Long.toHexString(eglContext) + " for " + getClass().getName());
             }
-            created = true;
         }
         if (EGL.eglGetCurrentContext() != eglContext) {
             if (!EGL.eglMakeCurrent(((EGLDrawable)drawable).getDisplay(),
@@ -112,7 +112,7 @@ public abstract class EGLContext extends GLContextImpl {
         }
 
         if (created) {
-            setGLFunctionAvailability(false, -1, -1, -1);
+            setGLFunctionAvailability(false, -1, -1, CTX_PROFILE_ES|CTX_PROFILE_CORE|CTX_OPTION_ANY);
             return CONTEXT_CURRENT_NEW;
         }
         return CONTEXT_CURRENT;
@@ -153,6 +153,10 @@ public abstract class EGLContext extends GLContextImpl {
         return 0; // FIXME
     }
 
+    protected void destroyContextARBImpl(long _context) {
+        // FIXME
+    }
+
     protected void create() throws GLException {
         long eglDisplay = ((EGLDrawable)drawable).getDisplay();
         EGLGraphicsConfiguration config = ((EGLDrawable)drawable).getGraphicsConfiguration();
@@ -218,7 +222,7 @@ public abstract class EGLContext extends GLContextImpl {
             throw new GLException("Error making context 0x" +
                                   Long.toHexString(eglContext) + " current: error code " + EGL.eglGetError());
         }
-        setGLFunctionAvailability(true, contextAttrs[1], 0, CTX_IS_ARB_CREATED|CTX_PROFILE_CORE|CTX_OPTION_ANY);
+        setGLFunctionAvailability(true, glProfile.usesNativeGLES2()?2:1, 0, CTX_PROFILE_ES|CTX_PROFILE_CORE|CTX_OPTION_ANY);
     }
 
     public boolean isCreated() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
index 5a193b2ff..4fccf22f8 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
@@ -37,8 +37,10 @@ package com.jogamp.opengl.impl.egl;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
+import com.jogamp.common.JogampRuntimeException;
+import com.jogamp.common.util.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.NullWindow;
 
 public class EGLDrawableFactory extends GLDrawableFactoryImpl {
   
@@ -50,8 +52,8 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
         // Check for other underlying stuff ..
         if(NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(true))) {
             try {
-                NWReflection.createInstance("com.jogamp.opengl.impl.x11.glx.X11GLXGraphicsConfigurationFactory");
-            } catch (Throwable t) {}
+                ReflectionUtil.createInstance("com.jogamp.opengl.impl.x11.glx.X11GLXGraphicsConfigurationFactory");
+            } catch (JogampRuntimeException jre) { /* n/a .. */ }
         }
     }
 
@@ -59,6 +61,10 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
         super();
     }
 
+   
+    protected final GLDrawableImpl getSharedDrawable() { return null; }
+    protected final GLContextImpl getSharedContext() { return null; }
+
     public GLDrawableImpl createOnscreenDrawable(NativeWindow target) {
         if (target == null) {
           throw new IllegalArgumentException("Null target");
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
index 70f0540bf..9e34dc9e9 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
@@ -64,9 +64,9 @@ public abstract class EGLDynamicLookupHelper implements DynamicLookupHelper {
         EGLDynamicLookupHelper tmp=null;
         try {
             tmp = new EGLES1DynamicLookupHelper();
-        } catch (Throwable t) {
+        } catch (GLException gle) {
             if(DEBUG) {
-                t.printStackTrace();
+                gle.printStackTrace();
             }
         }
         eglES1DynamicLookupHelper = tmp;
@@ -74,9 +74,9 @@ public abstract class EGLDynamicLookupHelper implements DynamicLookupHelper {
         tmp=null;
         try {
             tmp = new EGLES2DynamicLookupHelper();
-        } catch (Throwable t) {
+        } catch (GLException gle) {
             if(DEBUG) {
-                t.printStackTrace();
+                gle.printStackTrace();
             }
         }
         eglES2DynamicLookupHelper = tmp;
@@ -191,9 +191,9 @@ public abstract class EGLDynamicLookupHelper implements DynamicLookupHelper {
         }
 
         if (esProfile==2) {
-            NativeLibLoader.loadES2();
+            GLJNILibLoader.loadES2();
         } else if (esProfile==1) {
-            NativeLibLoader.loadES1();
+            GLJNILibLoader.loadES1();
         } else {
             throw new GLException("Unsupported: ES"+esProfile);
         }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java
index 0adede4ea..5a8454ea7 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java
@@ -47,7 +47,7 @@ public class EGLExternalContext extends EGLContext {
     public EGLExternalContext(AbstractGraphicsScreen screen) {
         super(null, null);
         GLContextShareSet.contextCreated(this);
-        setGLFunctionAvailability(false, 0, 0, 0);
+        setGLFunctionAvailability(false, 0, 0, CTX_IS_ARB_CREATED|CTX_PROFILE_ES|CTX_PROFILE_CORE|CTX_OPTION_ANY);
         getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
     }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
index 9182a71de..ebefaf466 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
@@ -88,11 +88,13 @@ public abstract class MacOSXCGLContext extends GLContextImpl
 
   protected Map/*<String, String>*/ getExtensionNameMap() { return null; }
 
-  protected abstract boolean create();
+  protected long createContextARBImpl(long share, boolean direct, int ctp, int major, int minor) {
+      return 0; // FIXME
+  }
 
-    protected long createContextARBImpl(long share, boolean direct, int ctp, int major, int minor) {
-        return 0; // FIXME
-    }
+  protected void destroyContextARBImpl(long _context) {
+      // FIXME
+  }
 
   /**
    * Creates and initializes an appropriate OpenGl nsContext. Should only be
@@ -154,7 +156,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl
     if (!CGL.makeCurrentContext(nsContext)) {
       throw new GLException("Error making nsContext current");
     }
-    setGLFunctionAvailability(true, 0, 0, 0);
+    setGLFunctionAvailability(true, 0, 0, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);
     GLContextShareSet.contextCreated(this);
     return true;
   }    
@@ -165,13 +167,14 @@ public abstract class MacOSXCGLContext extends GLContextImpl
     }
     boolean created = false;
     if ( 0 == cglContext && 0 == nsContext) {
-      if (!create()) {
+      create();
+      created = 0 != cglContext || 0 != nsContext ;
+      if(!created) {
         return CONTEXT_NOT_CURRENT;
       }
       if (DEBUG) {
         System.err.println("!!! Created OpenGL context " + toHexString(nsContext) + " for " + getClass().getName());
       }
-      created = true;
     }
             
     if ( 0 != cglContext ) {
@@ -185,7 +188,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl
     }
             
     if (created) {
-      setGLFunctionAvailability(false, -1, -1, -1);
+      setGLFunctionAvailability(false, -1, -1, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);
       return CONTEXT_CURRENT_NEW;
     }
     return CONTEXT_CURRENT;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
index 906088642..d10434252 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
@@ -43,8 +43,10 @@ import com.jogamp.common.os.DynamicLookupHelper;
 import java.nio.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
+import com.jogamp.common.JogampRuntimeException;
+import com.jogamp.common.util.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.*;
+import com.jogamp.nativewindow.impl.NullWindow;
 
 public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
   public MacOSXCGLDrawableFactory() {
@@ -55,11 +57,14 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements D
     new MacOSXCGLGraphicsConfigurationFactory();
 
     try {
-      NWReflection.createInstance("com.jogamp.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLGraphicsConfigurationFactory",
+      ReflectionUtil.createInstance("com.jogamp.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLGraphicsConfigurationFactory",
                                   new Object[] {});
-    } catch (Throwable t) { }
+    } catch (JogampRuntimeException jre) { /* n/a .. */ }
   }
 
+  protected final GLDrawableImpl getSharedDrawable() { return null; }
+  protected final GLContextImpl getSharedContext() { return null; }
+
   public GLDrawableImpl createOnscreenDrawable(NativeWindow target) {
     if (target == null) {
       throw new IllegalArgumentException("Null target");
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
index 248bbb4d6..eba3cf50e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
@@ -56,7 +56,7 @@ public class MacOSXExternalCGLContext extends MacOSXCGLContext {
     this.cglContext = cglContext;
     this.nsContext = nsContext;
     GLContextShareSet.contextCreated(this);
-    setGLFunctionAvailability(false, 0, 0, 0);
+    setGLFunctionAvailability(false, 0, 0, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);
     getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
   }
 
@@ -110,8 +110,7 @@ public class MacOSXExternalCGLContext extends MacOSXCGLContext {
     }
   }
 
-  protected boolean create() {
-    return true;
+  protected void create() {
   }
 
   public int makeCurrent() throws GLException {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
index 4c64864fa..c4eaee489 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
@@ -115,8 +115,8 @@ public class MacOSXOnscreenCGLContext extends MacOSXCGLContext {
     CGL.updateContext(nsContext);
   }
 
-  protected boolean create() {
-    return create(false, false);
+  protected void create() {
+    create(false, false);
   }
 
   public void setOpenGLMode(int mode) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
index 5844b8edd..e90672a1d 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
@@ -59,13 +59,14 @@ public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
 
     boolean created = false;
     if (nsContext == 0) {
-      if (!create()) {
+      create();
+      created = 0 != nsContext ;
+      if(!created) {
         return CONTEXT_NOT_CURRENT;
       }
       if (DEBUG) {
         System.err.println("!!! Created OpenGL context " + toHexString(nsContext) + " for " + getClass().getName());
       }
-      created = true;
     }
     
     if (!impl.makeCurrent(nsContext)) {
@@ -73,7 +74,7 @@ public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
     }
             
     if (created) {
-      setGLFunctionAvailability(false, -1, -1, -1);
+      setGLFunctionAvailability(false, -1, -1, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);
 
       // Initialize render-to-texture support if requested
       DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
@@ -134,7 +135,7 @@ public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
     return GLPbuffer.APPLE_FLOAT;
   }
 
-  protected boolean create() {
+  protected void create() {
     DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
     GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
     if (capabilities.getPbufferFloatingPointBuffers() &&
@@ -152,9 +153,7 @@ public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
     if (!impl.makeCurrent(nsContext)) {
       throw new GLException("Error making nsContext current");
     }
-    setGLFunctionAvailability(true, 0, 0, 0);
-            
-    return true;
+    setGLFunctionAvailability(true, 0, 0, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);
   }
 
   //---------------------------------------------------------------------------
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
index 9189b41f3..97a1435bc 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
@@ -73,7 +73,9 @@ public class MacOSXJava2DCGLContext extends MacOSXCGLContext implements Java2DGL
   protected int makeCurrentImpl() throws GLException {
     boolean created = false;
     if (nsContext == 0) {
-      if (!create()) {
+      create();
+      created = 0 != nsContext ;
+      if(!created) {
         return CONTEXT_NOT_CURRENT;
       }
       if (DEBUG) {
@@ -87,13 +89,13 @@ public class MacOSXJava2DCGLContext extends MacOSXCGLContext implements Java2DGL
     }
             
     if (created) {
-      setGLFunctionAvailability(false, -1, -1, -1);
+      setGLFunctionAvailability(false, -1, -1, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);
       return CONTEXT_CURRENT_NEW;
     }
     return CONTEXT_CURRENT;
   }
 
-  protected boolean create() {
+  protected void create() {
     // Find and configure share context
     MacOSXCGLContext other = (MacOSXCGLContext) GLContextShareSet.getShareContext(this);
     long share = 0;
@@ -119,11 +121,10 @@ public class MacOSXJava2DCGLContext extends MacOSXCGLContext implements Java2DGL
 
     long ctx = Java2D.createOGLContextOnSurface(graphics, share);
     if (ctx == 0) {
-      return false;
+      return;
     }
     // FIXME: think about GLContext sharing
     nsContext = ctx;
-    return true;
   }
 
   protected void releaseImpl() throws GLException {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
index aae376a6c..e712d8568 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
@@ -56,7 +56,7 @@ public class WindowsExternalWGLContext extends WindowsWGLContext {
       System.err.println(getThreadName() + ": !!! Created external OpenGL context " + toHexString(hglrc) + " for " + this);
     }
     GLContextShareSet.contextCreated(this);
-    setGLFunctionAvailability(false, 0, 0, 0);
+    setGLFunctionAvailability(false, 0, 0, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);
     cfg.updateCapabilitiesByWGL(this);
     getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
   }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
index 95706a7a1..0f1f9813f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
@@ -122,13 +122,18 @@ public class WindowsWGLContext extends GLContextImpl {
 
   protected Map/*<String, String>*/ getExtensionNameMap() { return extensionNameMap; }
 
+  protected void destroyContextARBImpl(long context) {
+    WGL.wglMakeCurrent(0, 0);
+    WGL.wglDeleteContext(context);
+  }
+
   protected long createContextARBImpl(long share, boolean direct, int ctp, int major, int minor) {
     WindowsWGLDrawableFactory factory = (WindowsWGLDrawableFactory)drawable.getFactoryImpl();
     WGLExt wglExt;
     if(null==factory.getSharedContext()) {
         wglExt = getWGLExt();
     } else {
-        wglExt = factory.getSharedContext().getWGLExt();
+        wglExt = ((WindowsWGLContext)factory.getSharedContext()).getWGLExt();
     }
 
     boolean ctBwdCompat = 0 != ( CTX_PROFILE_COMPAT & ctp ) ;
@@ -235,7 +240,7 @@ public class WindowsWGLContext extends GLContextImpl {
         if (!WGL.wglMakeCurrent(drawable.getNativeWindow().getSurfaceHandle(), temp_hglrc)) {
             throw new GLException("Error making temp context current: 0x" + Integer.toHexString(WGL.GetLastError()));
         }
-        setGLFunctionAvailability(true, 0, 0, 0);
+        setGLFunctionAvailability(true, 0, 0, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);
 
         if( createContextARBTried ||
             !isFunctionAvailable("wglCreateContextAttribsARB") ||
@@ -257,9 +262,6 @@ public class WindowsWGLContext extends GLContextImpl {
     if(0!=hglrc) {
         share = 0; // mark as shared ..
 
-        // need to update the GL func table ..
-        setGLFunctionAvailability(true, major[0], minor[0], ctp[0]);
-
         WGL.wglMakeCurrent(0, 0);
         WGL.wglDeleteContext(temp_hglrc);
 
@@ -302,10 +304,10 @@ public class WindowsWGLContext extends GLContextImpl {
     boolean created = false;
     if (hglrc == 0) {
       create();
+      created = true;
       if (DEBUG) {
         System.err.println(getThreadName() + ": !!! Created GL context for " + getClass().getName());
       }
-      created = true;
     }
 
     if (WGL.wglGetCurrentContext() != hglrc) {
@@ -320,7 +322,7 @@ public class WindowsWGLContext extends GLContextImpl {
     }
 
     if (created) {
-      setGLFunctionAvailability(false, -1, -1, -1);
+      setGLFunctionAvailability(false, -1, -1, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);
 
       WindowsWGLGraphicsConfiguration config = 
         (WindowsWGLGraphicsConfiguration)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
index bc99338ab..a4bf89b81 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
@@ -45,8 +45,9 @@ import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.windows.*;
 import javax.media.opengl.*;
+import com.jogamp.common.JogampRuntimeException;
+import com.jogamp.common.util.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.NWReflection;
 import com.jogamp.nativewindow.impl.NullWindow;
 
 public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
@@ -66,40 +67,38 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
     // The act of constructing them causes them to be registered
     new WindowsWGLGraphicsConfigurationFactory();
     try {
-      NWReflection.createInstance("com.jogamp.opengl.impl.windows.wgl.awt.WindowsAWTWGLGraphicsConfigurationFactory",
+      ReflectionUtil.createInstance("com.jogamp.opengl.impl.windows.wgl.awt.WindowsAWTWGLGraphicsConfigurationFactory",
                                   new Object[] {});
-    } catch (Throwable t) { }
+    } catch (JogampRuntimeException jre) { /* n/a .. */ }
 
     loadOpenGL32Library();
+
+    sharedDrawable = new WindowsDummyWGLDrawable(this, null);
+    WindowsWGLContext ctx  = (WindowsWGLContext) sharedDrawable.createContext(null);
+    ctx.makeCurrent();
+    canCreateGLPbuffer = ctx.getGL().isExtensionAvailable("GL_ARB_pbuffer");
+    ctx.release();
+    sharedContext = ctx;
+    if(null==sharedContext) {
+        throw new GLException("Couldn't init shared resources");
+    }
+    if (DEBUG) {
+      System.err.println("!!! SharedContext: "+sharedContext+", pbuffer supported "+canCreateGLPbuffer);
+    }
   }
 
   WindowsDummyWGLDrawable sharedDrawable=null;
   WindowsWGLContext sharedContext=null;
   boolean canCreateGLPbuffer = false;
 
-  // package private ..
-  final WindowsWGLContext getSharedContext() {
+  protected final GLDrawableImpl getSharedDrawable() {
     validate();
-    return sharedContext; 
+    return sharedDrawable; 
   }
 
-  void initShared() {
-    if(null==sharedDrawable) {
-        sharedDrawable = new WindowsDummyWGLDrawable(this, null);
-        WindowsWGLContext _sharedContext  = (WindowsWGLContext) sharedDrawable.createContext(null);
-        {
-            _sharedContext.makeCurrent();
-            canCreateGLPbuffer = _sharedContext.getGL().isExtensionAvailable("GL_ARB_pbuffer");
-            _sharedContext.release();
-        }
-        _sharedContext = _sharedContext;
-        if (DEBUG) {
-          System.err.println("!!! SharedContext: "+sharedContext+", pbuffer supported "+canCreateGLPbuffer);
-        }
-        if(null==sharedContext) {
-            throw new GLException("Couldn't init shared resources");
-        }
-    }
+  protected final GLContextImpl getSharedContext() {
+    validate();
+    return sharedContext; 
   }
 
   public void shutdown() {
@@ -124,7 +123,6 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
     if (target == null) {
       throw new IllegalArgumentException("Null target");
     }
-    initShared();
     return new WindowsOnscreenWGLDrawable(this, target);
   }
 
@@ -133,13 +131,11 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
     if (target == null) {
       throw new IllegalArgumentException("Null target");
     }
-    initShared();
     return new WindowsOffscreenWGLDrawable(this, target);
   }
 
   public boolean canCreateGLPbuffer(AbstractGraphicsDevice device) {
     validate();
-    initShared(); // setup canCreateGLPBuffer
     return canCreateGLPbuffer;
   }
 
@@ -148,7 +144,6 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
     if (target == null) {
       throw new IllegalArgumentException("Null target");
     }
-    initShared();
     final List returnList = new ArrayList();
     final GLDrawableFactory factory = this;
     final WindowsWGLContext _sharedContext = sharedContext;
@@ -180,7 +175,6 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
 
   protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
     validate();
-    initShared();
     AbstractGraphicsScreen screen = DefaultGraphicsScreen.createDefault();
     NullWindow nw = new NullWindow(WindowsWGLGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(
                                    capabilities, chooser, screen) );
@@ -190,7 +184,6 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
  
   public GLContext createExternalGLContext() {
     validate();
-    initShared();
     return WindowsExternalWGLContext.create(this, null);
   }
 
@@ -201,7 +194,6 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
 
   public GLDrawable createExternalGLDrawable() {
     validate();
-    initShared();
     return WindowsExternalWGLDrawable.create(this, null);
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
index c9805fef1..ab3227257 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
@@ -135,7 +135,6 @@ public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfiguratio
           pfd = WindowsWGLGraphicsConfiguration.createPixelFormatDescriptor();
           // Produce a recommended pixel format selection for the GLCapabilitiesChooser.
           // Use wglChoosePixelFormatARB if user requested multisampling and if we have it available
-          factory.initShared();
           factory.sharedContext.makeCurrent();
           WGLExt wglExt = factory.sharedContext.getWGLExt();
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java
index a865e91e8..1f148bead 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java
@@ -42,7 +42,7 @@ import com.jogamp.nativewindow.impl.x11.*;
 
 public class X11DummyGLXDrawable extends X11OnscreenGLXDrawable {
 
-  // private long dummyWindow = 0;
+  private long dummyWindow = 0;
 
   /** 
    * Due to the ATI Bug https://bugzilla.mozilla.org/show_bug.cgi?id=486277,
@@ -62,17 +62,15 @@ public class X11DummyGLXDrawable extends X11OnscreenGLXDrawable {
     X11GraphicsDevice device = (X11GraphicsDevice) screen.getDevice();
     long dpy = device.getHandle();
     int scrn = screen.getIndex();
-    // long visualID = config.getVisualID();
-    // System.out.println("X11DummyGLXDrawable: dpy "+toHexString(dpy)+", scrn "+scrn+", visualID "+toHexString(visualID));
+    long visualID = config.getVisualID();
 
     X11Lib.XLockDisplay(dpy);
     try{
-        nw.setSurfaceHandle( X11Lib.RootWindow(dpy, scrn) );
-        // dummyWindow = X11Lib.CreateDummyWindow(dpy, scrn, visualID);
-        // nw.setSurfaceHandle( dummyWindow );
+        dummyWindow = X11Lib.CreateDummyWindow(dpy, scrn, visualID);
     } finally {
         X11Lib.XUnlockDisplay(dpy);
     }
+    nw.setSurfaceHandle( dummyWindow );
   }
 
   public void setSize(int width, int height) {
@@ -87,11 +85,10 @@ public class X11DummyGLXDrawable extends X11OnscreenGLXDrawable {
   }
 
   public void destroy() {
-    /**
     if(0!=dummyWindow) {
         X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
         long dpy = config.getScreen().getDevice().getHandle();
         X11Lib.DestroyDummyWindow(dpy, dummyWindow);
-    } */
+    }
   }
 }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
index b8f25aad7..139c0deed 100755
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
@@ -55,7 +55,7 @@ public class X11ExternalGLXContext extends X11GLXContext {
     super(drawable, null);
     this.context = context;
     GLContextShareSet.contextCreated(this);
-    setGLFunctionAvailability(false, 0, 0, 0);
+    setGLFunctionAvailability(false, 0, 0, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);
     getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
index f5e291c5f..7d907bf28 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
@@ -103,12 +103,31 @@ public abstract class X11GLXContext extends GLContextImpl {
 
   protected Map/*<String, String>*/ getExtensionNameMap() { return extensionNameMap; }
 
-  /** Helper routine which usually just turns around and calls
-   * createContext (except for pbuffers, which use a different context
-   * creation mechanism). Should only be called by {@link
-   * makeCurrentImpl()}.
-   */
-  protected abstract void create();
+  protected boolean glXMakeContextCurrent(long dpy, long writeDrawable, long readDrawable, long ctx) {
+    boolean res = false;
+
+    try {
+        res = GLX.glXMakeContextCurrent(dpy, writeDrawable, readDrawable, ctx);
+    } catch (RuntimeException re) {
+        if(DEBUG) {
+          System.err.println("X11GLXContext.glXMakeContextCurrent failed: "+re+", with "+
+            "dpy "+toHexString(dpy)+
+            ", write "+toHexString(writeDrawable)+
+            ", read "+toHexString(readDrawable)+
+            ", ctx "+toHexString(ctx));
+          re.printStackTrace();
+        }
+    }
+    return res;
+  }
+
+  protected void destroyContextARBImpl(long _context) {
+    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    long display = config.getScreen().getDevice().getHandle();
+
+    glXMakeContextCurrent(display, 0, 0, 0);
+    GLX.glXDestroyContext(display, _context);
+  }
 
   protected long createContextARBImpl(long share, boolean direct, int ctp, int major, int minor) {
     X11GLXDrawableFactory factory = (X11GLXDrawableFactory)drawable.getFactoryImpl();
@@ -119,7 +138,7 @@ public abstract class X11GLXContext extends GLContextImpl {
     if(null==factory.getSharedContext()) {
         glXExt = getGLXExt();
     } else {
-        glXExt = factory.getSharedContext().getGLXExt();
+        glXExt = ((X11GLXContext)factory.getSharedContext()).getGLXExt();
     }
 
     boolean ctBwdCompat = 0 != ( CTX_PROFILE_COMPAT & ctp ) ;
@@ -156,20 +175,27 @@ public abstract class X11GLXContext extends GLContextImpl {
         }
     }
 
-    _context = glXExt.glXCreateContextAttribsARB(display, config.getFBConfig(), share, direct, attribs, 0);
+    try {
+        _context = glXExt.glXCreateContextAttribsARB(display, config.getFBConfig(), share, direct, attribs, 0);
+    } catch (RuntimeException re) {
+        if(DEBUG) {
+          System.err.println("X11GLXContext.createContextARB glXCreateContextAttribsARB failed: "+re+", with "+getGLVersion(null, major, minor, ctp, "@creation"));
+          re.printStackTrace();
+        }
+    }
     if(0==_context) {
         if(DEBUG) {
           System.err.println("X11GLXContext.createContextARB couldn't create "+getGLVersion(null, major, minor, ctp, "@creation"));
         }
     } else {
-        if (!GLX.glXMakeContextCurrent(display,
-                                       drawable.getNativeWindow().getSurfaceHandle(), 
-                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                       _context)) {
+        if (!glXMakeContextCurrent(display,
+                                   drawable.getNativeWindow().getSurfaceHandle(), 
+                                   drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                   _context)) {
             if(DEBUG) {
               System.err.println("X11GLXContext.createContextARB couldn't make current "+getGLVersion(null, major, minor, ctp, "@creation"));
             }
-            GLX.glXMakeContextCurrent(display, 0, 0, 0);
+            glXMakeContextCurrent(display, 0, 0, 0);
             GLX.glXDestroyContext(display, _context);
             _context = 0;
         }
@@ -179,7 +205,7 @@ public abstract class X11GLXContext extends GLContextImpl {
 
   /**
    * Creates and initializes an appropriate OpenGL context. Should only be
-   * called by {@link create()}.
+   * called by {@link #create()}.
    * Note: The direct parameter may be overwritten by the direct state of a shared context.
    */
   protected void createContext(boolean direct) {
@@ -213,13 +239,13 @@ public abstract class X11GLXContext extends GLContextImpl {
         if (context == 0) {
           throw new GLException("Unable to create context(0)");
         }
-        if (!GLX.glXMakeContextCurrent(display,
-                                       drawable.getNativeWindow().getSurfaceHandle(), 
-                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                       context)) {
+        if (!glXMakeContextCurrent(display,
+                                   drawable.getNativeWindow().getSurfaceHandle(), 
+                                   drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                   context)) {
           throw new GLException("Error making temp context(0) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
         }
-        setGLFunctionAvailability(true, 0, 0, 0); // use GL_VERSION
+        setGLFunctionAvailability(true, 0, 0, CTX_PROFILE_COMPAT|CTX_OPTION_ANY); // use GL_VERSION
         return;
     }
 
@@ -245,21 +271,21 @@ public abstract class X11GLXContext extends GLContextImpl {
         if (temp_context == 0) {
             throw new GLException("Unable to create temp OpenGL context(1)");
         }
-        if (!GLX.glXMakeContextCurrent(display,
-                                       drawable.getNativeWindow().getSurfaceHandle(), 
-                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                       temp_context)) {
+        if (!glXMakeContextCurrent(display,
+                                   drawable.getNativeWindow().getSurfaceHandle(), 
+                                   drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                   temp_context)) {
           throw new GLException("Error making temp context(1) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
         }
-        setGLFunctionAvailability(true, 0, 0, 0); // use GL_VERSION
+        setGLFunctionAvailability(true, 0, 0, CTX_PROFILE_COMPAT|CTX_OPTION_ANY); // use GL_VERSION
 
         if( createContextARBTried ||
             !isFunctionAvailable("glXCreateContextAttribsARB") ||
             !isExtensionAvailable("GLX_ARB_create_context") )  {
             if(glp.isGL3()) {
-              GLX.glXMakeContextCurrent(display, 0, 0, 0);
+              glXMakeContextCurrent(display, 0, 0, 0);
               GLX.glXDestroyContext(display, temp_context);
-              throw new GLException("Unable to create OpenGL >= 3.1 context (no GLX_ARB_create_context)");
+              throw new GLException("Unable to create OpenGL >= 3.1 context (failed GLX_ARB_create_context), GLProfile "+glp+", Drawable "+drawable);
             }
 
             // continue with temp context for GL < 3.0
@@ -271,22 +297,19 @@ public abstract class X11GLXContext extends GLContextImpl {
     }
 
     if(0!=context) {
-        // need to update the GL func table ..
-        setGLFunctionAvailability(true, major[0], minor[0], ctp[0]);
-
         if(0!=temp_context) {
-            GLX.glXMakeContextCurrent(display, 0, 0, 0);
+            glXMakeContextCurrent(display, 0, 0, 0);
             GLX.glXDestroyContext(display, temp_context);
-            if (!GLX.glXMakeContextCurrent(display,
-                                           drawable.getNativeWindow().getSurfaceHandle(), 
-                                           drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                           context)) {
+            if (!glXMakeContextCurrent(display,
+                                       drawable.getNativeWindow().getSurfaceHandle(), 
+                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                       context)) {
                 throw new GLException("Cannot make previous verified context current");
             }
         }
     } else {
         if(!glp.isGL2()) {
-          GLX.glXMakeContextCurrent(display, 0, 0, 0);
+          glXMakeContextCurrent(display, 0, 0, 0);
           GLX.glXDestroyContext(display, temp_context);
           throw new GLException("X11GLXContext.createContext failed, but context > GL2 requested "+getGLVersion(null, major[0], minor[0], ctp[0], "@creation")+", ");
         }
@@ -296,11 +319,11 @@ public abstract class X11GLXContext extends GLContextImpl {
 
         // continue with temp context for GL <= 3.0
         context = temp_context;
-        if (!GLX.glXMakeContextCurrent(display,
-                                       drawable.getNativeWindow().getSurfaceHandle(), 
-                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                       context)) {
-          GLX.glXMakeContextCurrent(display, 0, 0, 0);
+        if (!glXMakeContextCurrent(display,
+                                   drawable.getNativeWindow().getSurfaceHandle(), 
+                                   drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                   context)) {
+          glXMakeContextCurrent(display, 0, 0, 0);
           GLX.glXDestroyContext(display, temp_context);
           throw new GLException("Error making context(1) current: display "+toHexString(display)+", context "+toHexString(context)+", drawable "+drawable);
         }
@@ -349,19 +372,19 @@ public abstract class X11GLXContext extends GLContextImpl {
         boolean created = false;
         if (context == 0) {
           create();
+          created = true;
           GLContextShareSet.contextCreated(this);
           if (DEBUG) {
             System.err.println(getThreadName() + ": !!! Created GL context for " + getClass().getName());
           }
-          created = true;
         }
 
         if (GLX.glXGetCurrentContext() != context) {
             
-            if (!GLX.glXMakeContextCurrent(dpy,
-                                           drawable.getNativeWindow().getSurfaceHandle(), 
-                                           drawableRead.getNativeWindow().getSurfaceHandle(), 
-                                           context)) {
+            if (!glXMakeContextCurrent(dpy,
+                                       drawable.getNativeWindow().getSurfaceHandle(), 
+                                       drawableRead.getNativeWindow().getSurfaceHandle(), 
+                                       context)) {
               throw new GLException("Error making context current: "+this);
             }
             if (DEBUG && (VERBOSE || created)) {
@@ -374,7 +397,7 @@ public abstract class X11GLXContext extends GLContextImpl {
         }
 
         if (created) {
-          setGLFunctionAvailability(false, -1, -1, -1);
+          setGLFunctionAvailability(false, -1, -1, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);
           return CONTEXT_CURRENT_NEW;
         }
         return CONTEXT_CURRENT;
@@ -386,7 +409,7 @@ public abstract class X11GLXContext extends GLContextImpl {
   protected void releaseImplAfterLock() throws GLException {
     getDrawableImpl().getFactoryImpl().lockToolkit();
     try {
-        if (!GLX.glXMakeContextCurrent(drawable.getNativeWindow().getDisplayHandle(), 0, 0, 0)) {
+        if (!glXMakeContextCurrent(drawable.getNativeWindow().getDisplayHandle(), 0, 0, 0)) {
             throw new GLException("Error freeing OpenGL context");
         }
     } finally {
@@ -494,6 +517,10 @@ public abstract class X11GLXContext extends GLContextImpl {
   private int hasSwapIntervalSGI = 0;
 
   protected void setSwapIntervalImpl(int interval) {
+    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    GLCapabilities glCaps = (GLCapabilities) config.getChosenCapabilities();
+    if(!glCaps.isOnscreen()) return;
+
     getDrawableImpl().getFactoryImpl().lockToolkit();
     try {
       GLXExt glXExt = getGLXExt();
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
index 0d74bb791..f331ad2a2 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
@@ -43,8 +43,9 @@ import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
 import com.jogamp.gluegen.runtime.opengl.*;
 import com.jogamp.opengl.impl.*;
+import com.jogamp.common.JogampRuntimeException;
+import com.jogamp.common.util.*;
 import com.jogamp.nativewindow.impl.NullWindow;
-import com.jogamp.nativewindow.impl.NWReflection;
 import com.jogamp.nativewindow.impl.x11.*;
 
 public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
@@ -58,9 +59,9 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
     // The act of constructing them causes them to be registered
     new X11GLXGraphicsConfigurationFactory();
     try {
-      NWReflection.createInstance("com.jogamp.opengl.impl.x11.glx.awt.X11AWTGLXGraphicsConfigurationFactory",
+      ReflectionUtil.createInstance("com.jogamp.opengl.impl.x11.glx.awt.X11AWTGLXGraphicsConfigurationFactory",
                                   new Object[] {});
-    } catch (Throwable t) { }
+    } catch (JogampRuntimeException jre) { /* n/a .. */ }
 
     X11GraphicsDevice sharedDevice = new X11GraphicsDevice(X11Util.createThreadLocalDisplay(null));
     vendorName = GLXUtil.getVendorName(sharedDevice.getHandle());
@@ -70,9 +71,20 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
         X11Util.markGlobalDisplayUndeletable(sharedDevice.getHandle()); // ATI hack ..
     }
     sharedScreen = new X11GraphicsScreen(sharedDevice, 0);
+    X11Lib.XLockDisplay(sharedScreen.getDevice().getHandle());
+    sharedDrawable = new X11DummyGLXDrawable(sharedScreen, this, null);
+    X11GLXContext ctx  = (X11GLXContext) sharedDrawable.createContext(null);
+    ctx.makeCurrent();
+    ctx.release();
+    sharedContext = ctx;
+    X11Lib.XUnlockDisplay(sharedScreen.getDevice().getHandle());
+    if(null==sharedContext) {
+        throw new GLException("Couldn't init shared resources");
+    }
     if (DEBUG) {
       System.err.println("!!! Vendor: "+vendorName+", ATI: "+isVendorATI+", NV: "+isVendorNVIDIA);
       System.err.println("!!! SharedScreen: "+sharedScreen);
+      System.err.println("!!! SharedContext: "+sharedContext);
     }
   }
 
@@ -88,30 +100,14 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
   private X11DummyGLXDrawable sharedDrawable=null;
   private X11GLXContext sharedContext=null;
 
-  // package private ..
-  final X11GLXContext getSharedContext() {
+  protected final GLDrawableImpl getSharedDrawable() {
     validate();
-    return sharedContext; 
+    return sharedDrawable; 
   }
 
-  private void initShared() {
-    if(null==sharedDrawable) {
-        X11Lib.XLockDisplay(sharedScreen.getDevice().getHandle());
-        sharedDrawable = new X11DummyGLXDrawable(sharedScreen, this, null);
-        X11GLXContext _sharedContext  = (X11GLXContext) sharedDrawable.createContext(null);
-        {
-            _sharedContext.makeCurrent();
-            _sharedContext.release();
-        }
-        sharedContext = _sharedContext;
-        X11Lib.XUnlockDisplay(sharedScreen.getDevice().getHandle());
-        if (DEBUG) {
-          System.err.println("!!! SharedContext: "+sharedContext);
-        }
-        if(null==sharedContext) {
-            throw new GLException("Couldn't init shared resources");
-        }
-    }
+  protected final GLContextImpl getSharedContext() {
+    validate();
+    return sharedContext; 
   }
 
   public void shutdown() {
@@ -145,7 +141,6 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
     if (target == null) {
       throw new IllegalArgumentException("Null target");
     }
-    initShared();
     if( isVendorATI() ) {
         X11Util.markGlobalDisplayUndeletable(target.getDisplayHandle()); // ATI hack ..
     }
@@ -157,11 +152,9 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
     if (target == null) {
       throw new IllegalArgumentException("Null target");
     }
-    initShared();
     if( isVendorATI() ) {
         X11Util.markGlobalDisplayUndeletable(target.getDisplayHandle()); // ATI hack ..
     }
-    initShared();
     return new X11OffscreenGLXDrawable(this, target);
   }
 
@@ -203,7 +196,6 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
     if (target == null) {
       throw new IllegalArgumentException("Null target");
     }
-    initShared();
 
     GLDrawableImpl pbufferDrawable;
 
@@ -234,7 +226,6 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
 
   protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
     validate();
-    initShared();
     X11Lib.XLockDisplay(sharedScreen.getDevice().getHandle());
     NullWindow nw = new NullWindow(X11GLXGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(capabilities, chooser, sharedScreen));
     X11Lib.XUnlockDisplay(sharedScreen.getDevice().getHandle());
@@ -244,19 +235,16 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
 
   public GLContext createExternalGLContext() {
     validate();
-    initShared();
     return X11ExternalGLXContext.create(this, null);
   }
 
   public boolean canCreateExternalGLDrawable(AbstractGraphicsDevice device) {
     validate();
-    initShared();
     return canCreateGLPbuffer(device);
   }
 
   public GLDrawable createExternalGLDrawable() {
     validate();
-    initShared();
     return X11ExternalGLXDrawable.create(this, null);
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java
index e0993abc3..1b70adf6b 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java
@@ -68,33 +68,6 @@ public class X11PbufferGLXContext extends X11GLXContext {
   }
 
   protected void create() {
-    if (DEBUG) {
-      System.err.println("Creating context for pbuffer " + drawable.getWidth() +
-                         " x " + drawable.getHeight());
-    }
-
-    // Create a gl context for the p-buffer.
-    X11GLXContext other = (X11GLXContext) GLContextShareSet.getShareContext(this);
-    long share = 0;
-    if (other != null) {
-      share = other.getContext();
-      if (share == 0) {
-        throw new GLException("GLContextShareSet returned an invalid OpenGL context");
-      }
-    }
-    X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)
-        getGLDrawable().getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-
-    context = GLX.glXCreateNewContext(drawable.getNativeWindow().getDisplayHandle(), 
-                                      config.getFBConfig(), GLX.GLX_RGBA_TYPE, share, true);
-    if (context == 0) {
-      throw new GLException("pbuffer creation error: glXCreateNewContext() failed");
-    }
-    GLContextShareSet.contextCreated(this);
-
-    if (DEBUG) {
-      System.err.println("Created context for pbuffer " + drawable.getWidth() +
-                         " x " + drawable.getHeight());
-    }
+    createContext(true);
   }
 }
diff --git a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
index ad230a415..04b994198 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
@@ -1,9 +1,9 @@
 
 package com.jogamp.opengl.util;
 
+import com.jogamp.common.util.*;
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
-import com.jogamp.nativewindow.impl.NWReflection;
 import java.nio.*;
 import java.util.Iterator;
 import java.util.ArrayList;
@@ -341,9 +341,9 @@ public class ImmModeSink {
             } else {
                 Class clazz = indices.getClass();
                 int type=-1;
-                if(NWReflection.instanceOf(clazz, ByteBuffer.class.getName())) {
+                if(ReflectionUtil.instanceOf(clazz, ByteBuffer.class.getName())) {
                     type =  GL.GL_UNSIGNED_BYTE;
-                } else if(NWReflection.instanceOf(clazz, ShortBuffer.class.getName())) {
+                } else if(ReflectionUtil.instanceOf(clazz, ShortBuffer.class.getName())) {
                     type =  GL.GL_UNSIGNED_SHORT;
                 }
                 if(0>type) {
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
index f00357bfb..7ec4ac50e 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
@@ -28,7 +28,7 @@ public class FixedFuncUtil {
             gl.getContext().setGL(impl);
             return impl;
         }
-        throw new GLException("GL Object is neither GL2ES1 nor GL2ES2");
+        throw new GLException("GL Object is neither GL2ES1 nor GL2ES2: "+gl.getContext());
     }
 
     /**
diff --git a/src/jogl/classes/javax/media/opengl/GL4.java b/src/jogl/classes/javax/media/opengl/GL4.java
deleted file mode 100644
index 29a316333..000000000
--- a/src/jogl/classes/javax/media/opengl/GL4.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package javax.media.opengl;
-
-public interface GL4 extends GLBase {
-}
-
diff --git a/src/jogl/classes/javax/media/opengl/GL4bc.java b/src/jogl/classes/javax/media/opengl/GL4bc.java
deleted file mode 100644
index be1131e91..000000000
--- a/src/jogl/classes/javax/media/opengl/GL4bc.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package javax.media.opengl;
-
-public interface GL4bc extends GL4 {
-}
-
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index 833ebf192..e5b499af9 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -40,6 +40,7 @@
 package javax.media.opengl;
 
 import java.util.HashMap;
+import com.jogamp.common.util.IntIntHashMap;
 
 /** Abstraction for an OpenGL rendering context. In order to perform
     OpenGL rendering, a context must be "made current" on the current
@@ -261,6 +262,12 @@ public abstract class GLContext {
     StringBuffer sb = new StringBuffer();
     sb.append(getClass().getName());
     sb.append(" [OpenGL ");
+    sb.append(getGLVersionMajor());
+    sb.append(".");
+    sb.append(getGLVersionMinor());
+    sb.append(", options 0x");
+    sb.append(Integer.toHexString(ctxOptions));
+    sb.append(", ");
     sb.append(getGLVersion());
     sb.append(", ");
     sb.append(getGL());
@@ -284,7 +291,7 @@ public abstract class GLContext {
   public abstract String getPlatformExtensionsString();
 
   public final int getGLVersionMajor() { return ctxMajorVersion; }
-  public final int getGLVersionMinor() { return ctxMajorVersion; }
+  public final int getGLVersionMinor() { return ctxMinorVersion; }
   public final boolean isGLCompatibilityProfile() { return ( 0 != ( CTX_PROFILE_COMPAT & ctxOptions ) ); }
   public final boolean isGLForwardCompatible()    { return ( 0 != ( CTX_OPTION_FORWARD & ctxOptions ) ); }
   public final boolean isCreatedWithARBMethod()   { return ( 0 != ( CTX_IS_ARB_CREATED & ctxOptions ) ); }
@@ -342,9 +349,181 @@ public abstract class GLContext {
   /** <code>ARB_create_context</code> related: core profile */
   protected static final int CTX_PROFILE_CORE   = 1 << 2;
   /** <code>ARB_create_context</code> related: flag forward compatible */
-  protected static final int CTX_OPTION_FORWARD = 1 << 3;
+  protected static final int CTX_PROFILE_ES     = 1 << 3;
+  /** <code>ARB_create_context</code> related: flag forward compatible */
+  protected static final int CTX_OPTION_FORWARD = 1 << 4;
   /** <code>ARB_create_context</code> related: not flag forward compatible */
-  protected static final int CTX_OPTION_ANY     = 1 << 4;
+  protected static final int CTX_OPTION_ANY     = 1 << 5;
   /** <code>ARB_create_context</code> related: flag debug */
-  protected static final int CTX_OPTION_DEBUG   = 1 << 5;
+  protected static final int CTX_OPTION_DEBUG   = 1 << 6;
+
+  
+  public final boolean isGL4bc() {
+      return ctxMajorVersion>=4 && CTX_PROFILE_COMPAT==(ctxOptions & (CTX_PROFILE_COMPAT|CTX_PROFILE_ES));
+  }
+
+  public final boolean isGL4() {
+      return ctxMajorVersion>=4 && 0==(ctxOptions & (CTX_PROFILE_ES));
+  }
+
+  public final boolean isGL3bc() {
+      return ctxMajorVersion>=3 && CTX_PROFILE_COMPAT==(ctxOptions & (CTX_PROFILE_COMPAT|CTX_PROFILE_ES));
+  }
+
+  public final boolean isGL3() {
+      return ctxMajorVersion>=3 && 0==(ctxOptions & (CTX_PROFILE_ES));
+  }
+
+  public final boolean isGL2() {
+      return ctxMajorVersion>=1 && CTX_PROFILE_COMPAT==(ctxOptions & (CTX_PROFILE_COMPAT|CTX_PROFILE_ES));
+  }
+
+  public final boolean isGLES1() {
+      return ctxMajorVersion==1 && CTX_PROFILE_ES==(ctxOptions & CTX_PROFILE_ES);
+  }
+
+  public final boolean isGLES2() {
+      return ctxMajorVersion==2 && CTX_PROFILE_ES==(ctxOptions & CTX_PROFILE_ES);
+  }
+
+  public final boolean isGLES() {
+      return CTX_PROFILE_ES==(ctxOptions & CTX_PROFILE_ES);
+  }
+
+  public final boolean isGL2ES1() {
+      return isGL2() || isGLES1() ;
+  }
+
+  public final boolean isGL2ES2() {
+      return isGL2() || isGL3() || isGLES2() ;
+  }
+
+  public final boolean isGL2GL3() {
+      return isGL2() || isGL3();
+  }
+
+  public final boolean hasGLSL() {
+      return isGL2ES2() ;
+  }
+
+  public static final int GL_VERSIONS[][] = {
+      /* 0.*/ { -1 },
+      /* 1.*/ { 0, 1, 2, 3, 4, 5 },
+      /* 2.*/ { 0, 1 },
+      /* 3.*/ { 0, 1, 2, 3 },
+      /* 4.*/ { 0 } };
+
+  public static final int getMaxMajor() {
+      return GL_VERSIONS.length-1;
+  }
+
+  public static final int getMaxMinor(int major) {
+      if(1>major || major>=GL_VERSIONS.length) return -1;
+      return GL_VERSIONS[major].length-1;
+  }
+
+  public static final boolean isValidGLVersion(int major, int minor) {
+      if(1>major || major>=GL_VERSIONS.length) return false;
+      if(0>minor || minor>=GL_VERSIONS[major].length) return false;
+      return true;
+  }
+
+  public static final boolean decrementGLVersion(int major[], int minor[]) {
+      if(null==major || major.length<1 ||null==minor || minor.length<1) {
+          throw new GLException("invalid array arguments");
+      }
+      int m = major[0];
+      int n = minor[0];
+      if(!isValidGLVersion(m, n)) return false;
+
+      // decrement ..
+      n -= 1;
+      if(n < 0) {
+          m -= 1;
+          n = GL_VERSIONS[m].length-1;
+      }
+      if(!isValidGLVersion(m, n)) return false;
+      major[0]=m;
+      minor[0]=n;
+
+      return true;
+  }
+
+  public static final boolean isGLVersionAvailable(int major, boolean compatibility) {
+      int key = compose8bit(major, compatibility?CTX_PROFILE_COMPAT:CTX_PROFILE_CORE, 0, 0);
+      int val = mappedVersionsAvailable.get( key );
+      return val>0;
+  }
+  public static final boolean isGL4bcAvailable() { return isGLVersionAvailable(4, true); }
+  public static final boolean isGL4Available() { return isGLVersionAvailable(4, false); }
+  public static final boolean isGL3bcAvailable() { return isGLVersionAvailable(3, true); }
+  public static final boolean isGL3Available() { return isGLVersionAvailable(3, false); }
+  public static final boolean isGL2Available() { return isGLVersionAvailable(2, true); }
+
+  protected static final IntIntHashMap mappedVersionsAvailable;
+  protected static volatile boolean mappedVersionsAvailableSet;
+  protected static Object mappedVersionsAvailableLock;
+
+  static {
+      mappedVersionsAvailableLock = new Object();
+      mappedVersionsAvailableSet = false;
+      mappedVersionsAvailable = new IntIntHashMap();
+      mappedVersionsAvailable.setKeyNotFoundValue(-1);
+  }
+
+  /**
+   * Called by {@link GLContextImpl#createContextARBMapVersionsAvailable} not intendet to be used by 
+   * implementations. However, if {@link #createContextARB} is not being used within the 
+   * {@link GLDrawableImpl} constructor, GLProfile has to map the available versions.
+   *
+   * @see #createContextARBMapVersionsAvailable
+   */
+  protected static void mapVersionAvailable(int reqMajor, boolean reqCompat, int resMajor, int resMinor, int resCtp)
+  {
+    int key = compose8bit(reqMajor, reqCompat?CTX_PROFILE_COMPAT:CTX_PROFILE_CORE, 0, 0);
+    int val = compose8bit(resMajor, resMinor, resCtp, 0);
+    mappedVersionsAvailable.put( key, val );
+  }
+
+  protected static int compose8bit(int one, int two, int three, int four) {
+    return  ( ( one   & 0x000000FF ) << 24 ) |
+            ( ( two   & 0x000000FF ) << 16 ) |
+            ( ( three & 0x000000FF ) <<  8 ) |
+            ( ( four  & 0x000000FF )       ) ;
+  }
+
+  protected static int getComposed8bit(int bits32, int which ) {
+    switch (which) {
+        case 1: return ( bits32 & 0xFF000000 ) >> 24 ;
+        case 2: return ( bits32 & 0x00FF0000 ) >> 16 ;
+        case 3: return ( bits32 & 0x0000FF00 ) >>  8 ;
+        case 4: return ( bits32 & 0xFF0000FF )       ;
+    }
+    throw new GLException("argument which out of range: "+which);
+  }
+
+  protected static String composed8BitToString(int bits32, boolean hex1, boolean hex2, boolean hex3, boolean hex4) {
+    int a = getComposed8bit(bits32, 1);
+    int b = getComposed8bit(bits32, 2);
+    int c = getComposed8bit(bits32, 3);
+    int d = getComposed8bit(bits32, 4);
+    return "["+toString(a, hex1)+", "+toString(b, hex2)+", "+toString(c, hex3)+", "+toString(d, hex4)+"]";
+  }
+
+  protected static String toString(int val, boolean hex) {
+    if(hex) {
+        return "0x" + Integer.toHexString(val);
+    }
+    return String.valueOf(val);
+  }
+
+  protected static String toHexString(int hex) {
+    return "0x" + Integer.toHexString(hex);
+  }
+
+  protected static String toHexString(long hex) {
+    return "0x" + Long.toHexString(hex);
+  }
+
 }
+
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index 80c2c10e2..b02bffb61 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -42,8 +42,9 @@ package javax.media.opengl;
 import javax.media.nativewindow.*;
 
 import java.security.*;
+import com.jogamp.common.JogampRuntimeException;
+import com.jogamp.common.util.*;
 import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.NWReflection;
 
 /** <P> Provides a virtual machine- and operating system-independent
     mechanism for creating {@link GLDrawable}s. </P>
@@ -96,51 +97,50 @@ public abstract class GLDrawableFactory {
   static {
     GLDrawableFactory tmp = null;
     try {
-        tmp = (GLDrawableFactory) NWReflection.createInstance("com.jogamp.opengl.impl.egl.EGLDrawableFactory");
-    } catch (Throwable t) {
+        tmp = (GLDrawableFactory) ReflectionUtil.createInstance("com.jogamp.opengl.impl.egl.EGLDrawableFactory");
+    } catch (JogampRuntimeException jre) {
         if (GLProfile.DEBUG) {
             System.err.println("GLDrawableFactory.static - EGLDrawableFactory - not available");
-            t.printStackTrace();
+            jre.printStackTrace();
         }
     }
     eglFactory = tmp;
 
     nativeOSType = NativeWindowFactory.getNativeWindowType(true);
 
-    String factoryClassName = null;
     tmp = null;
-    try {
-        factoryClassName = Debug.getProperty("jogl.gldrawablefactory.class.name", true, AccessController.getContext());
-        if (null == factoryClassName) {
-            if ( nativeOSType.equals(NativeWindowFactory.TYPE_X11) ) {
-              factoryClassName = "com.jogamp.opengl.impl.x11.glx.X11GLXDrawableFactory";
-            } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_WINDOWS) ) {
-              factoryClassName = "com.jogamp.opengl.impl.windows.wgl.WindowsWGLDrawableFactory";
-            } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_MACOSX) ) {
-                if(NWReflection.isClassAvailable(macosxFactoryClassNameAWTCGL)) {
-                    factoryClassName = macosxFactoryClassNameAWTCGL;
-                } else {
-                    factoryClassName = macosxFactoryClassNameCGL;
-                }
+    String factoryClassName = Debug.getProperty("jogl.gldrawablefactory.class.name", true, AccessController.getContext());
+    if (null == factoryClassName) {
+        if ( nativeOSType.equals(NativeWindowFactory.TYPE_X11) ) {
+          factoryClassName = "com.jogamp.opengl.impl.x11.glx.X11GLXDrawableFactory";
+        } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_WINDOWS) ) {
+          factoryClassName = "com.jogamp.opengl.impl.windows.wgl.WindowsWGLDrawableFactory";
+        } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_MACOSX) ) {
+            if(ReflectionUtil.isClassAvailable(macosxFactoryClassNameAWTCGL)) {
+                factoryClassName = macosxFactoryClassNameAWTCGL;
             } else {
-              // may use egl*Factory ..
-              if (GLProfile.DEBUG) {
-                  System.err.println("GLDrawableFactory.static - No native OS Factory for: "+nativeOSType+"; May use EGLDrawableFactory, if available." );
-              }
+                factoryClassName = macosxFactoryClassNameCGL;
             }
-        }
-        if (null != factoryClassName) {
+        } else {
+          // may use egl*Factory ..
           if (GLProfile.DEBUG) {
-              System.err.println("GLDrawableFactory.static - Native OS Factory for: "+nativeOSType+": "+factoryClassName);
+              System.err.println("GLDrawableFactory.static - No native OS Factory for: "+nativeOSType+"; May use EGLDrawableFactory, if available." );
           }
-          tmp = (GLDrawableFactory) NWReflection.createInstance(factoryClassName);
-        }
-    } catch (Throwable t) {
-        if (GLProfile.DEBUG) {
-            System.err.println("GLDrawableFactory.static - Native Platform: "+nativeOSType+" - not available: "+factoryClassName);
-            t.printStackTrace();
         }
     }
+    if (null != factoryClassName) {
+      if (GLProfile.DEBUG) {
+          System.err.println("GLDrawableFactory.static - Native OS Factory for: "+nativeOSType+": "+factoryClassName);
+      }
+      try {
+          tmp = (GLDrawableFactory) ReflectionUtil.createInstance(factoryClassName);
+      } catch (JogampRuntimeException jre) { 
+          if (GLProfile.DEBUG) {
+              System.err.println("GLDrawableFactory.static - Native Platform: "+nativeOSType+" - not available: "+factoryClassName);
+              jre.printStackTrace();
+          }
+      }
+    }
     nativeOSFactory = tmp;
   }
 
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index e1fc9f53f..9e3a532e6 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -36,12 +36,13 @@
 
 package javax.media.opengl;
 
+import com.jogamp.common.util.*;
 import com.jogamp.opengl.impl.DRIHack;
 import com.jogamp.opengl.impl.Debug;
-import com.jogamp.opengl.impl.NativeLibLoader;
-import com.jogamp.nativewindow.impl.NWReflection;
-import com.jogamp.nativewindow.impl.jvm.JVMUtil;
+import com.jogamp.opengl.impl.GLJNILibLoader;
+import com.jogamp.common.jvm.JVMUtil;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.security.AccessControlContext;
 import java.security.AccessController;
 import javax.media.opengl.fixedfunc.GLPointerFunc;
@@ -58,6 +59,45 @@ import javax.media.opengl.fixedfunc.GLPointerFunc;
 public class GLProfile implements Cloneable {
     public static final boolean DEBUG = Debug.debug("GLProfile");
 
+    //
+    // Query platform available OpenGL implementation
+    //
+
+    public static final boolean isGL4bcAvailable() { return hasGL4bcImpl; }
+    public static final boolean isGL4Available() { return hasGL4Impl; }
+    public static final boolean isGL3bcAvailable() { return hasGL3bcImpl; }
+    public static final boolean isGL3Available() { return hasGL3Impl; }
+    public static final boolean isGL2Available() { return hasGL2Impl; }
+    public static final boolean isGLES2Available() { return hasGLES2Impl; }
+    public static final boolean isGLES1Available() { return hasGLES1Impl; }
+    public static final String glAvailabilityToString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("GLAvailability[Native[GL4bc ");
+        sb.append(hasGL4bcImpl);
+        sb.append(", GL4 ");
+        sb.append(hasGL4Impl);
+        sb.append(", GL3bc ");
+        sb.append(hasGL3bcImpl);
+        sb.append(", GL3 ");
+        sb.append(hasGL3Impl);
+        sb.append(", GL2 ");
+        sb.append(hasGL2Impl);
+        sb.append(", GLES1 ");
+        sb.append(hasGLES1Impl);
+        sb.append(", GLES2 ");
+        sb.append(hasGLES2Impl);
+        sb.append("], Profiles[");
+        for(Iterator i=mappedProfiles.values().iterator(); i.hasNext(); ) {
+            sb.append(((GLProfile)i.next()).toString());
+            sb.append(", ");
+        }
+        sb.append(", default ");
+        sb.append(defaultGLProfile);
+        sb.append("]]");
+
+        return sb.toString();
+    }
+
     //
     // Public (user-visible) profiles
     //
@@ -95,22 +135,92 @@ public class GLProfile implements Cloneable {
     public static final String GL2GL3 = "GL2GL3";
 
     /** 
-     * All GL Profiles in the order of default detection: GL2, GL2ES2, GL2ES1, GLES2, GLES1, GL2GL3, GL3
+     * All GL Profiles in the order of default detection.
+     * Desktop compatibility profiles (the one with fixed function pipeline) comes first.
+     *
+     * FIXME GL3GL4: Due to GL3 and GL4 implementation bugs, we still choose GL2 first, if available!
+     *
+     * <ul>
+     *  <li> GL2
+     *  <li> GL3bc
+     *  <li> GL4bc
+     *  <li> GL2GL3
+     *  <li> GL3
+     *  <li> GL4
+     *  <li> GL2ES2
+     *  <li> GLES2
+     *  <li> GL2ES1
+     *  <li> GLES1
+     * </ul>
+     *
      */
-    public static final String[] GL_PROFILE_LIST_ALL = new String[] { GL2, GL2ES2, GL2ES1, GLES2, GLES1, GL2GL3, GL4bc, GL3bc, GL4, GL3  };
+    public static final String[] GL_PROFILE_LIST_ALL = new String[] { GL2, GL3bc, GL4bc, GL2GL3, GL3, GL4, GL2ES2, GLES2, GL2ES1, GLES1 };
 
     /**
-     * All GL2ES2 Profiles in the order of default detection: GL2ES2, GL2, GLES2, GL3
+     * Order of maximum fixed function profiles
+     *
+     * <ul>
+     *  <li> GL4bc
+     *  <li> GL3bc
+     *  <li> GL2
+     *  <li> GL2ES1
+     *  <li> GLES1
+     * </ul>
+     *
+     */
+    public static final String[] GL_PROFILE_LIST_MAX_FIXEDFUNC = new String[] { GL4bc, GL3bc, GL2, GL2ES1, GLES1 };
+
+    /**
+     * Order of maximum programmable shader profiles
+     *
+     * <ul>
+     *  <li> GL4
+     *  <li> GL4bc
+     *  <li> GL3
+     *  <li> GL3bc
+     *  <li> GL2
+     *  <li> GL2ES2
+     *  <li> GLES2
+     * </ul>
+     *
+     */
+    public static final String[] GL_PROFILE_LIST_MAX_PROGSHADER   = new String[] { GL4, GL4bc, GL3, GL3bc, GL2, GL2ES2, GLES2 };
+
+    /**
+     * All GL2ES2 Profiles in the order of default detection.
+     *
+     * FIXME GL3GL4: Due to GL3 and GL4 implementation bugs, we still choose GL2 first, if available!
+     *
+     * <ul>
+     *  <li> GL2ES2
+     *  <li> GL2
+     *  <li> GL3
+     *  <li> GL4
+     *  <li> GLES2
+     * </ul>
+     *
      */
-    public static final String[] GL_PROFILE_LIST_GL2ES2 = new String[] { GL2ES2, GL2, GLES2, GL4bc, GL3bc, GL4, GL3 };
+    public static final String[] GL_PROFILE_LIST_GL2ES2 = new String[] { GL2ES2, GL2, GL3, GL4, GLES2 };
 
     /**
-     * All GL2ES1 Profiles in the order of default detection: GL2ES1, GL2, GLES1
+     * All GL2ES1 Profiles in the order of default detection.
+     *
+     * FIXME GL3GL4: Due to GL3 and GL4 implementation bugs, we still choose GL2 first, if available!
+     *
+     * <ul>
+     *  <li> GL2ES1
+     *  <li> GL2
+     *  <li> GL3bc
+     *  <li> GL4bc
+     *  <li> GLES1
+     * </ul>
+     *
      */
-    public static final String[] GL_PROFILE_LIST_GL2ES1 = new String[] { GL2ES1, GL2, GLES1 };
+    public static final String[] GL_PROFILE_LIST_GL2ES1 = new String[] { GL2ES1, GL2, GL3bc, GL4bc, GLES1 };
 
     /** Returns a default GLProfile object, reflecting the best for the running platform.
      * It selects the first of the set {@link GLProfile#GL_PROFILE_LIST_ALL}
+     * @see #GL_PROFILE_LIST_ALL
      */
     public static final GLProfile getDefault() {
         if(null==defaultGLProfile) {
@@ -119,22 +229,30 @@ public class GLProfile implements Cloneable {
         return defaultGLProfile;
     }
 
-    /** Returns a GLProfile object.
-     * Verfifies the given profile and chooses an apropriate implementation.
-     * A generic value of <code>null</code> or <code>GL</code> will result in
-     * the default profile.
+    /**
+     * Returns the highest profile, implementing the fixed function pipeline
+     * It selects the first of the set: {@link GLProfile#GL_PROFILE_LIST_MAX_FIXEDFUNC}
      *
      * @throws GLException if no implementation for the given profile is found.
+     * @see #GL_PROFILE_LIST_MAX_FIXEDFUNC
      */
-    public static final GLProfile get(String profile) 
+    public static final GLProfile getMaxFixedFunc() 
         throws GLException
     {
-        if(null==profile || profile.equals("GL")) return getDefault();
-        GLProfile glProfile = (GLProfile) mappedProfiles.get(profile);
-        if(null==glProfile) {
-            throw new GLException("No implementation for profile "+profile+" available");
-        }
-        return glProfile;
+        return get(GL_PROFILE_LIST_MAX_FIXEDFUNC);
+    }
+
+    /**
+     * Returns the highest profile, implementing the programmable shader pipeline.
+     * It selects the first of the set: {@link GLProfile#GL_PROFILE_LIST_MAX_PROGSHADER}
+     *
+     * @throws GLException if no implementation for the given profile is found.
+     * @see #GL_PROFILE_LIST_MAX_PROGSHADER
+     */
+    public static final GLProfile getMaxProgrammable() 
+        throws GLException
+    {
+        return get(GL_PROFILE_LIST_MAX_PROGSHADER);
     }
 
     /**
@@ -142,6 +260,7 @@ public class GLProfile implements Cloneable {
      * It selects the first of the set: {@link GLProfile#GL_PROFILE_LIST_GL2ES1}
      *
      * @throws GLException if no implementation for the given profile is found.
+     * @see #GL_PROFILE_LIST_GL2ES1
      */
     public static final GLProfile getGL2ES1() 
         throws GLException
@@ -154,6 +273,7 @@ public class GLProfile implements Cloneable {
      * It selects the first of the set: {@link GLProfile#GL_PROFILE_LIST_GL2ES2}
      *
      * @throws GLException if no implementation for the given profile is found.
+     * @see #GL_PROFILE_LIST_GL2ES2
      */
     public static final GLProfile getGL2ES2() 
         throws GLException
@@ -161,6 +281,24 @@ public class GLProfile implements Cloneable {
         return get(GL_PROFILE_LIST_GL2ES2);
     }
 
+    /** Returns a GLProfile object.
+     * Verfifies the given profile and chooses an apropriate implementation.
+     * A generic value of <code>null</code> or <code>GL</code> will result in
+     * the default profile.
+     *
+     * @throws GLException if no implementation for the given profile is found.
+     */
+    public static final GLProfile get(String profile) 
+        throws GLException
+    {
+        if(null==profile || profile.equals("GL")) return getDefault();
+        GLProfile glProfile = (GLProfile) mappedProfiles.get(profile);
+        if(null==glProfile) {
+            throw new GLException("No implementation for profile "+profile+" available");
+        }
+        return glProfile;
+    }
+
     /**
      * Returns the first profile from the given list,
      * where an implementation is available.
@@ -200,18 +338,12 @@ public class GLProfile implements Cloneable {
     }
 
     private static final String getGLImplBaseClassName(String profileImpl) {
-        if(GL4bc.equals(profileImpl)) {
+        if ( GL4bc.equals(profileImpl) ||
+             GL4.equals(profileImpl)   ||
+             GL3bc.equals(profileImpl) ||
+             GL3.equals(profileImpl)   ||
+             GL2.equals(profileImpl) ) {
             return "com.jogamp.opengl.impl.gl4.GL4bc";
-        } else if(GL4.equals(profileImpl)) {
-            return "com.jogamp.opengl.impl.gl4.GL4";
-        } else if(GL3bc.equals(profileImpl)) {
-            return "com.jogamp.opengl.impl.gl3.GL3bc";
-        } else if(GL3.equals(profileImpl)) {
-            return "com.jogamp.opengl.impl.gl3.GL3";
-        } else if(GL2.equals(profileImpl)) {
-            return "com.jogamp.opengl.impl.gl2.GL2";
-        } else if(GL2ES12.equals(profileImpl)) {
-            return "com.jogamp.opengl.impl.gl2es12.GL2ES12";
         } else if(GLES1.equals(profileImpl) || GL2ES1.equals(profileImpl)) {
             return "com.jogamp.opengl.impl.es1.GLES1";
         } else if(GLES2.equals(profileImpl) || GL2ES2.equals(profileImpl)) {
@@ -285,7 +417,7 @@ public class GLProfile implements Cloneable {
         return isGL4() || isGL3bc() || GL3.equals(profile);
     }
 
-    /** Indicates whether this profile is capable of GL2. */
+    /** Indicates whether this context is a GL2 context */
     public final boolean isGL2() {
         return isGL3bc() || GL2.equals(profile);
     }
@@ -315,34 +447,9 @@ public class GLProfile implements Cloneable {
         return GL2GL3.equals(profile) || isGL2() || isGL3() ;
     }
 
-    /** Indicates whether this profile uses the native desktop OpenGL GL4bc implementations. */
-    public final boolean usesNativeGL4bc() {
-        return GL4bc.equals(profileImpl);
-    }
-
-    /** Indicates whether this profile uses the native desktop OpenGL GL4 implementations. */
-    public final boolean usesNativeGL4() {
-        return usesNativeGL4bc() || GL4.equals(profileImpl);
-    }
-
-    /** Indicates whether this profile uses the native desktop OpenGL GL3bc implementations. */
-    public final boolean usesNativeGL3bc() {
-        return GL3bc.equals(profileImpl);
-    }
-
-    /** Indicates whether this profile uses the native desktop OpenGL GL3 implementations. */
-    public final boolean usesNativeGL3() {
-        return usesNativeGL3bc() || GL3.equals(profileImpl);
-    }
-
-    /** Indicates whether this profile uses the native desktop OpenGL GL2 implementations. */
-    public final boolean usesNativeGL2() {
-        return GL2.equals(profileImpl) || GL2ES12.equals(profileImpl) ;
-    }
-
-    /** Indicates whether this profile uses the native desktop OpenGL GL2 or GL3 implementations. */
-    public final boolean usesNativeGL2GL3() {
-        return usesNativeGL2() || usesNativeGL3() || usesNativeGL4();
+    /** Indicates whether this profile supports GLSL. */
+    public final boolean hasGLSL() {
+        return isGL2ES2() ;
     }
 
     /** Indicates whether this profile uses the native OpenGL ES1 implementations. */
@@ -360,11 +467,6 @@ public class GLProfile implements Cloneable {
         return usesNativeGLES2() || usesNativeGLES1();
     }
 
-    /** Indicates whether this profile supports GLSL. */
-    public final boolean hasGLSL() {
-        return isGL2ES2() ;
-    }
-
     /** 
      * General validation if type is a valid GL data type
      * for the current profile
@@ -665,70 +767,23 @@ public class GLProfile implements Cloneable {
         return "GLProfile[" + profile + "/" + profileImpl + "]";
     }
 
-    public static final int GL_VERSIONS[][] = {
-        /* 0.*/ { -1 },
-        /* 1.*/ { 0, 1, 2, 3, 4, 5 },
-        /* 2.*/ { 0, 1 },
-        /* 3.*/ { 0, 1, 2, 3 },
-        /* 4.*/ { 0 } };
-
-    public static final int getMaxMajor() {
-        return GL_VERSIONS.length-1;
-    }
-
-    public static final int getMaxMinor(int major) {
-        if(1>major || major>=GL_VERSIONS.length) return -1;
-        return GL_VERSIONS[major].length-1;
-    }
-
-    public static final boolean isValidGLVersion(int major, int minor) {
-        if(1>major || major>=GL_VERSIONS.length) return false;
-        if(0>minor || minor>=GL_VERSIONS[major].length) return false;
-        return true;
-    }
-
-    public static final boolean decrementGLVersion(int major[], int minor[]) {
-        if(null==major || major.length<1 ||null==minor || minor.length<1) {
-            throw new GLException("invalid array arguments");
-        }
-        int m = major[0];
-        int n = minor[0];
-        if(!isValidGLVersion(m, n)) return false;
-
-        // decrement ..
-        n -= 1;
-        if(n < 0) {
-            m -= 1;
-            n = GL_VERSIONS[m].length-1;
-        }
-        if(!isValidGLVersion(m, n)) return false;
-        major[0]=m;
-        minor[0]=n;
-
-        return true;
-    }
-
-    // The intersection between desktop OpenGL and the union of the OpenGL ES profiles
-    // This is here only to avoid having separate GL2ES1Impl and GL2ES2Impl classes
-    private static final String GL2ES12 = "GL2ES12";
-
     private static final boolean isAWTAvailable;
     private static final boolean isAWTJOGLAvailable;
 
-    private static final boolean hasGL4bcImpl;
-    private static final boolean hasGL4Impl;
-    private static final boolean hasGL3bcImpl;
-    private static final boolean hasGL3Impl;
-    private static final boolean hasGL2Impl;
-    private static final boolean hasGL2ES12Impl;
-    private static final boolean hasGLES2Impl;
-    private static final boolean hasGLES1Impl;
+    private static /*final*/ boolean hasGL234Impl;
+    private static /*final*/ boolean hasGL4bcImpl;
+    private static /*final*/ boolean hasGL4Impl;
+    private static /*final*/ boolean hasGL3bcImpl;
+    private static /*final*/ boolean hasGL3Impl;
+    private static /*final*/ boolean hasGL2Impl;
+    private static /*final*/ boolean hasGLES2Impl;
+    private static /*final*/ boolean hasGLES1Impl;
 
     /** The JVM/process wide default GL profile **/
-    private static GLProfile defaultGLProfile;
+    private static /*final*/ GLProfile defaultGLProfile;
   
     /** All GLProfiles */
-    private static final HashMap/*<String, GLProfile>*/ mappedProfiles;
+    private static /*final*/ HashMap/*<String, GLProfile>*/ mappedProfiles;
 
     /**
      * Tries the profiles implementation and native libraries.
@@ -740,119 +795,174 @@ public class GLProfile implements Cloneable {
         AccessControlContext acc = AccessController.getContext();
 
         isAWTAvailable = !Debug.getBooleanProperty("java.awt.headless", true, acc) &&
-                          NWReflection.isClassAvailable("java.awt.Component") ;
+                          ReflectionUtil.isClassAvailable("java.awt.Component") ;
 
         isAWTJOGLAvailable = isAWTAvailable &&
-                             NWReflection.isClassAvailable("javax.media.nativewindow.awt.AWTGraphicsDevice") && // NativeWindow
-                             NWReflection.isClassAvailable("javax.media.opengl.awt.GLCanvas") ; // JOGL
+                             ReflectionUtil.isClassAvailable("javax.media.nativewindow.awt.AWTGraphicsDevice") && // NativeWindow
+                             ReflectionUtil.isClassAvailable("javax.media.opengl.awt.GLCanvas") ; // JOGL
 
         boolean hasDesktopGL = false;
-        boolean hasDesktopGLES12 = false;
         boolean hasNativeOSFactory = false;
-
+        Throwable t;
+
+        //
+        // First iteration of desktop GL availability detection
+        //   - native libs exist
+        //   - class exists
+        // 
+        t=null;
         try {
             // See DRIHack.java for an explanation of why this is necessary
             DRIHack.begin();
-            NativeLibLoader.loadGLDesktop();
+            GLJNILibLoader.loadGLDesktop();
             DRIHack.end();
             hasDesktopGL = true;
-        } catch (Throwable t) {
+        } catch (UnsatisfiedLinkError ule) {
+            t=ule;
+        } catch (SecurityException se) {
+            t=se;
+        } catch (NullPointerException npe) {
+            t=npe;
+        } catch (RuntimeException re) {
+            t=re;
+        }
+        if(null!=t) {
             if (DEBUG) {
                 System.err.println("GLProfile.static Desktop GL Library not available");
                 t.printStackTrace();
             }
         }
 
-        try {
-            // See DRIHack.java for an explanation of why this is necessary
-            DRIHack.begin();
-            NativeLibLoader.loadGLDesktopES12();
-            DRIHack.end();
-            hasDesktopGLES12 = true;
-        } catch (Throwable t) {
-            if (DEBUG) {
-                System.err.println("GLProfile.static Desktop GL ES12 Library not available");
-                t.printStackTrace();
+        hasGL234Impl   = hasDesktopGL && ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.gl4.GL4bcImpl");
+        hasGL4bcImpl   = hasGL234Impl;
+        hasGL4Impl     = hasGL234Impl;
+        hasGL3bcImpl   = hasGL234Impl;
+        hasGL3Impl     = hasGL234Impl;
+        hasGL2Impl     = hasGL234Impl;
+        mappedProfiles = computeProfileMap();
+
+        //
+        // Second iteration of desktop GL availability detection
+        // utilizing the detected GL version in the shared context.
+        //
+        // - Instantiate GLDrawableFactory incl its shared dummy drawable/context,
+        //   which will register at GLContext ..
+        // 
+
+        if(hasDesktopGL) {
+            // if successfull it has a shared dummy drawable and context created
+            try {
+                hasNativeOSFactory = null != GLDrawableFactory.getFactoryImpl(GL2);
+            } catch (RuntimeException re) {
+                System.err.println("GLProfile.static - Native platform GLDrawable factory not available");
+                re.printStackTrace();
             }
         }
 
-        if(hasDesktopGL||hasDesktopGLES12) {
-            try {
-                hasNativeOSFactory = null!=GLDrawableFactory.getFactoryImpl(GL2);
-            } catch (Throwable t) {
-                if (DEBUG) {
-                    System.err.println("GLProfile.static - Native platform GLDrawable factory not available");
-                    t.printStackTrace();
-                }
-            }
+        if(hasNativeOSFactory && !GLContext.mappedVersionsAvailableSet) {
+            // nobody yet set the available desktop versions, see {@link GLContextImpl#makeCurrent},
+            // so we have to add the usual suspect
+            GLContext.mapVersionAvailable(2, true, 1, 5, GLContext.CTX_PROFILE_COMPAT|GLContext.CTX_OPTION_ANY);
         }
 
         if(!hasNativeOSFactory) {
-            hasDesktopGLES12=false;
-            hasDesktopGL=false;
+            hasDesktopGL   = false;
+            hasGL234Impl   = false;
+            hasGL4bcImpl   = false;
+            hasGL4Impl     = false;
+            hasGL3bcImpl   = false;
+            hasGL3Impl     = false;
+            hasGL2Impl     = false;
+        } else {
+            hasGL4bcImpl   = GLContext.isGL4bcAvailable();
+            hasGL4Impl     = GLContext.isGL4Available();
+            hasGL3bcImpl   = GLContext.isGL3bcAvailable();
+            hasGL3Impl     = GLContext.isGL3Available();
+            hasGL2Impl     = GLContext.isGL2Available();
         }
 
-        // FIXME: check for real GL3 availability .. ?
-        hasGL4bcImpl   = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl4.GL4bcImpl");
-        hasGL4Impl     = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl4.GL4Impl");
-        hasGL3bcImpl   = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl3.GL3bcImpl");
-        hasGL3Impl     = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl3.GL3Impl");
-        hasGL2Impl     = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl2.GL2Impl");
-
-        hasGL2ES12Impl = hasDesktopGLES12 && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl2es12.GL2ES12Impl");
-
         boolean btest = false;
 
-        boolean hasEGLDynLookup = NWReflection.isClassAvailable("com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper");
+        boolean hasEGLDynLookup = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper");
         boolean hasEGLDrawableFactory = false;
+        t=null;
         try {
             if(hasEGLDynLookup) {
                 hasEGLDrawableFactory = null!=GLDrawableFactory.getFactoryImpl(GLES2);
-                btest = hasEGLDrawableFactory &&
-                        NWReflection.isClassAvailable("com.jogamp.opengl.impl.es2.GLES2Impl") &&
-                        null!=com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(2);
+                try {
+                    btest = hasEGLDrawableFactory &&
+                            ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.es2.GLES2Impl") &&
+                            null!=com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(2);
+                } catch (GLException gle) {
+                    // n/a ..
+                }
             }
-        } catch (Throwable t) {
+        } catch (UnsatisfiedLinkError ule) {
+            t=ule;
+        } catch (SecurityException se) {
+            t=se;
+        } catch (NullPointerException npe) {
+            t=npe;
+        } catch (RuntimeException re) {
+            t=re;
+        }
+        if(null!=t) {
             if (DEBUG) {
                 System.err.println("GLProfile.static - GL ES2 Factory/Library not available");
                 t.printStackTrace();
             }
         }
         hasGLES2Impl     = btest;
+        if(hasGLES2Impl) {
+            GLContext.mapVersionAvailable(2, false, 2, 0, GLContext.CTX_PROFILE_ES|GLContext.CTX_PROFILE_CORE|GLContext.CTX_OPTION_ANY);
+        }
 
         btest = false;
-        try {
-            if(hasEGLDynLookup) {
+        if(hasEGLDynLookup) {
+            try {
                 btest = hasEGLDrawableFactory &&
-                        NWReflection.isClassAvailable("com.jogamp.opengl.impl.es1.GLES1Impl") &&
+                        ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.es1.GLES1Impl") &&
                         null!=com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(1);
-            }
-        } catch (Throwable t) {
-            if (DEBUG) {
-                System.err.println("GLProfile.static - GL ES1 Factory/Library not available");
-                t.printStackTrace();
+            } catch (GLException jre) {
+                /* just not available .. */ 
             }
         }
         hasGLES1Impl     = btest;
+        if(hasGLES1Impl) {
+            GLContext.mapVersionAvailable(1, false, 1, 0, GLContext.CTX_PROFILE_ES|GLContext.CTX_PROFILE_CORE|GLContext.CTX_OPTION_ANY);
+        }
+
+        mappedProfiles = computeProfileMap();
+        if(null==defaultGLProfile) {
+            throw new GLException("No profile available: "+list2String(GL_PROFILE_LIST_ALL));
+        }
 
         if (DEBUG) {
             System.err.println("GLProfile.static isAWTAvailable "+isAWTAvailable);
             System.err.println("GLProfile.static isAWTJOGLAvailable "+isAWTJOGLAvailable);
             System.err.println("GLProfile.static hasNativeOSFactory "+hasNativeOSFactory);
-            System.err.println("GLProfile.static hasDesktopGLES12 "+hasDesktopGLES12);
             System.err.println("GLProfile.static hasDesktopGL "+hasDesktopGL);
-            System.err.println("GLProfile.static hasGL4bcImpl "+hasGL4bcImpl);
-            System.err.println("GLProfile.static hasGL4Impl "+hasGL4Impl);
-            System.err.println("GLProfile.static hasGL3bcImpl "+hasGL3bcImpl);
-            System.err.println("GLProfile.static hasGL3Impl "+hasGL3Impl);
-            System.err.println("GLProfile.static hasGL2Impl "+hasGL2Impl);
-            System.err.println("GLProfile.static hasGL2ES12Impl "+hasGL2ES12Impl);
             System.err.println("GLProfile.static hasEGLDynLookup "+hasEGLDynLookup);
             System.err.println("GLProfile.static hasEGLDrawableFactory "+hasEGLDrawableFactory);
-            System.err.println("GLProfile.static hasGLES2Impl "+hasGLES2Impl);
-            System.err.println("GLProfile.static hasGLES1Impl "+hasGLES1Impl);
+            System.err.println("GLProfile.static hasGL234Impl "+hasGL234Impl);
+            System.err.println("GLProfile.static "+glAvailabilityToString());
+        }
+    }
+
+    private static final String list2String(String[] list) {
+        StringBuffer msg = new StringBuffer();
+        msg.append("[");
+        for (int i = 0; i < list.length; i++) {
+            if (i > 0)
+                msg.append(", ");
+            msg.append(list[i]);
         }
+        msg.append("]");
+        return msg.toString();
+    }
 
+    private static HashMap computeProfileMap() {
+        defaultGLProfile=null;
         HashMap/*<String, GLProfile>*/ _mappedProfiles = new HashMap(GL_PROFILE_LIST_ALL.length);
         for(int i=0; i<GL_PROFILE_LIST_ALL.length; i++) {
             String profile = GL_PROFILE_LIST_ALL[i];
@@ -875,73 +985,55 @@ public class GLProfile implements Cloneable {
                 }
             }
         }
-        mappedProfiles = _mappedProfiles; // final ..
-        if(null==defaultGLProfile) {
-            throw new GLException("No profile available: "+list2String(GL_PROFILE_LIST_ALL));
-        }
-    }
-
-    private static final String list2String(String[] list) {
-        StringBuffer msg = new StringBuffer();
-        msg.append("[");
-        for (int i = 0; i < list.length; i++) {
-            if (i > 0)
-                msg.append(", ");
-            msg.append(list[i]);
-        }
-        msg.append("]");
-        return msg.toString();
+        return _mappedProfiles;
     }
 
     /**
      * Returns the profile implementation
      */
     private static String computeProfileImpl(String profile) {
-    // FIXME Order of return profiles, after we can test their availability
         if (GL2ES1.equals(profile)) {
-            if(hasGL2ES12Impl) {
-                return GL2ES12;
-            } else if(hasGL2Impl) {
+            if(hasGL2Impl) {
                 return GL2;
+            } else if(hasGL3bcImpl) {
+                return GL3bc;
+            } else if(hasGL4bcImpl) {
+                return GL4bc;
             } else if(hasGLES1Impl) {
                 return GLES1;
             }
         } else if (GL2ES2.equals(profile)) {
-            if(hasGL2ES12Impl) {
-                return GL2ES12;
-            } else if(hasGL2Impl) {
+            if(hasGL2Impl) {
                 return GL2;
             } else if(hasGL3Impl) {
                 return GL3;
-            } else if(hasGL3bcImpl) {
-                return GL3bc;
             } else if(hasGL4Impl) {
                 return GL4;
-            } else if(hasGL4bcImpl) {
-                return GL4bc;
             } else if(hasGLES2Impl) {
                 return GLES2;
             }
-        } else if(GL4bc.equals(profile) && hasGL4bcImpl) {
-            return GL4bc;
-        } else if(GL4.equals(profile)) {
-            if(hasGL4Impl) {
-                return GL4;
+        } else if(GL2GL3.equals(profile)) {
+            if(hasGL2Impl) {
+                return GL2;
+            } else if(hasGL3bcImpl) {
+                return GL3bc;
             } else if(hasGL4bcImpl) {
                 return GL4bc;
+            } else if(hasGL3Impl) {
+                return GL3;
+            } else if(hasGL4Impl) {
+                return GL4;
             }
+        } else if(GL4bc.equals(profile) && hasGL4bcImpl) {
+            return GL4bc;
+        } else if(GL4.equals(profile) && hasGL4Impl) {
+            return GL4;
         } else if(GL3bc.equals(profile) && hasGL3bcImpl) {
             return GL3bc;
-        } else if(GL3.equals(profile)) {
-            if(hasGL3Impl) {
-                return GL3;
-            } else if(hasGL3bcImpl) {
-                return GL3bc;
-            }
+        } else if(GL3.equals(profile) && hasGL3Impl) {
+            return GL3;
         } else if(GL2.equals(profile) && hasGL2Impl) {
             return GL2;
-        } else if(GL2GL3.equals(profile) && hasGL2Impl) {
-            return GL2;
         } else if(GLES2.equals(profile) && hasGLES2Impl) {
             return GLES2;
         } else if(GLES1.equals(profile) && hasGLES1Impl) {
diff --git a/src/junit/com/jogamp/test/junit/jogl/acore/TestGLProfile01CORE.java b/src/junit/com/jogamp/test/junit/jogl/acore/TestGLProfile01CORE.java
new file mode 100755
index 000000000..a1ff0d860
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/acore/TestGLProfile01CORE.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.acore;
+
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.AfterClass;
+import org.junit.Test;
+
+import javax.media.opengl.*;
+
+import com.jogamp.newt.*;
+import java.io.IOException;
+
+public class TestGLProfile01CORE {
+    static GLProfile glp;
+    static GLDrawableFactory factory;
+
+    @BeforeClass
+    public static void initClass() {
+        glp = GLProfile.getDefault();
+        Assert.assertNotNull(glp);
+        factory = GLDrawableFactory.getFactory(glp);
+        Assert.assertNotNull(factory);
+    }
+
+    @AfterClass
+    public static void releaseClass() {
+        factory.shutdown();
+        factory=null;
+    }
+
+    @Test
+    public void test01GLProfileDefault() {
+        System.out.println("GLProfile <static> "+GLProfile.glAvailabilityToString());
+    }
+
+    @Test
+    public void test02GLProfileMaxFixedFunc() {
+        System.out.println("GLProfile <static> getMaxFixedFunc(): "+GLProfile.getMaxFixedFunc());
+    }
+
+    @Test
+    public void test02GLProfileMaxProgrammable() {
+        System.out.println("GLProfile <static> getMaxProgrammable(): "+GLProfile.getMaxProgrammable());
+    }
+
+    public static void main(String args[]) throws IOException {
+        String tstname = TestGLProfile01CORE.class.getName();
+        org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(new String[] {
+            tstname,
+            "filtertrace=true",
+            "haltOnError=false",
+            "haltOnFailure=false",
+            "showoutput=true",
+            "outputtoformatters=true",
+            "logfailedtests=true",
+            "logtestlistenerevents=true",
+            "formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter",
+            "formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,TEST-"+tstname+".xml" } );
+    }
+
+}
diff --git a/src/junit/com/jogamp/test/junit/jogl/awt/TestAWT01GLn.java b/src/junit/com/jogamp/test/junit/jogl/awt/TestAWT01GLn.java
new file mode 100755
index 000000000..ac34b46b5
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/jogl/awt/TestAWT01GLn.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2010 Sven Gothel. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name Sven Gothel or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+package com.jogamp.test.junit.jogl.awt;
+
+import javax.media.opengl.GLProfile;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.util.Animator;
+
+import com.jogamp.test.junit.jogl.demos.gl2.gears.Gears;
+import java.awt.Frame;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+public class TestAWT01GLn {
+    Frame frame=null;
+    GLCanvas glCanvas=null;
+
+    @Before
+    public void init() {
+        frame = new Frame("Texture Test");
+        Assert.assertNotNull(frame);
+    }
+
+    @After
+    public void release() {
+        Assert.assertNotNull(frame);
+        Assert.assertNotNull(glCanvas);
+        frame.setVisible(false);
+        frame.remove(glCanvas);
+        frame.dispose();
+        frame=null;
+        glCanvas=null;
+    }
+
+    protected void runTestGL(GLCapabilities caps) throws InterruptedException {
+        glCanvas = new GLCanvas(caps);
+        Assert.assertNotNull(glCanvas);
+        frame.add(glCanvas);
+        frame.setSize(512, 512);
+
+        glCanvas.addGLEventListener(new Gears());
+
+        Animator animator = new Animator(glCanvas);
+        frame.setVisible(true);
+        animator.start();
+
+        Thread.sleep(500); // 500 ms
+
+        animator.stop();
+    }
+
+    @Test
+    public void test01GLDefault() throws InterruptedException {
+        GLCapabilities caps = new GLCapabilities(GLProfile.getDefault());
+        runTestGL(caps);
+    }
+
+    /** Both fail on ATI .. if GLn n>2
+    public void test02GL3bc() throws InterruptedException {
+        GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL3bc));
+        runTestGL(caps);
+    }
+
+    public void test03GLMaxFixed() throws InterruptedException {
+        GLCapabilities caps = new GLCapabilities(GLProfile.getMaxFixedFunc());
+        runTestGL(caps);
+    } */
+
+    public static void main(String args[]) {
+        org.junit.runner.JUnitCore.main(TestAWT01GLn.class.getName());
+    }
+}
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
index ec03bec95..459b41f16 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
@@ -55,16 +55,16 @@ import com.jogamp.test.junit.jogl.demos.es1.RedSquare;
 import java.io.IOException;
 
 public class TestOffscreen01NEWT {
-    static GLProfile glp;
+    static GLProfile glpDefault;
     static GLDrawableFactory factory;
     static int width, height;
-    GLCapabilities caps;
+    GLCapabilities capsDefault;
 
     @BeforeClass
     public static void initClass() {
-        glp = GLProfile.getDefault();
-        Assert.assertNotNull(glp);
-        factory = GLDrawableFactory.getFactory(glp);
+        glpDefault = GLProfile.getDefault();
+        Assert.assertNotNull(glpDefault);
+        factory = GLDrawableFactory.getFactory(glpDefault);
         Assert.assertNotNull(factory);
         width  = 640;
         height = 480;
@@ -78,7 +78,8 @@ public class TestOffscreen01NEWT {
 
     @Before
     public void init() {
-        caps = new GLCapabilities(glp);
+        capsDefault = new GLCapabilities(glpDefault);
+        Assert.assertNotNull(capsDefault);
     }
 
     private void do01OffscreenWindowPBuffer(GLCapabilities caps) {
@@ -115,20 +116,20 @@ public class TestOffscreen01NEWT {
 
     @Test
     public void test01aOffscreenWindowPBuffer() {
-        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(capsDefault, false, true, false);
         do01OffscreenWindowPBuffer(caps2);
     }
 
     @Test
     public void test01bOffscreenWindowPBufferStencil() {
-        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(capsDefault, false, true, false);
         caps2.setStencilBits(8);
         do01OffscreenWindowPBuffer(caps2);
     }
 
     @Test
     public void test01cOffscreenWindowPBufferStencilAlpha() {
-        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(capsDefault, false, true, false);
         caps2.setStencilBits(8);
         caps2.setAlphaBits(8);
         do01OffscreenWindowPBuffer(caps2);
@@ -136,7 +137,7 @@ public class TestOffscreen01NEWT {
 
     @Test
     public void test01cOffscreenWindowPBuffer555() {
-        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(capsDefault, false, true, false);
         caps2.setRedBits(5);
         caps2.setGreenBits(5);
         caps2.setBlueBits(5);
@@ -145,7 +146,7 @@ public class TestOffscreen01NEWT {
 
     @Test
     public void test02Offscreen3Windows1DisplayPBuffer() {
-        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(capsDefault, false, true, false);
         int winnum = 3, i;
         Window windows[] = new Window[winnum];
         GLWindow glWindows[] = new GLWindow[winnum];
@@ -192,7 +193,7 @@ public class TestOffscreen01NEWT {
 
     @Test
     public void test03Offscreen3Windows3DisplaysPBuffer() {
-        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(capsDefault, false, true, false);
         int winnum = 3, i;
         Display displays[] = new Display[winnum];
         Screen screens[] = new Screen[winnum];
@@ -240,7 +241,7 @@ public class TestOffscreen01NEWT {
 
     @Test
     public void test04OffscreenSnapshotWithDemoPBuffer() {
-        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);
+        GLCapabilities caps2 = WindowUtilNEWT.fixCaps(capsDefault, false, true, false);
 
         System.out.println("Create Window 1");
         Display display = NewtFactory.createDisplay(null); // local display
@@ -283,6 +284,12 @@ public class TestOffscreen01NEWT {
 
     @Test
     public void test11OffscreenWindowPixmap() {
+        // Offscreen doesn't work on >= GL3 (ATI)
+        GLProfile glp = GLProfile.get(GLProfile.GL2);
+        Assert.assertNotNull(glp);
+        GLCapabilities caps = new GLCapabilities(glp);
+        Assert.assertNotNull(caps);
+
         GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, false, false);
 
         Display display = NewtFactory.createDisplay(null); // local display
@@ -318,6 +325,12 @@ public class TestOffscreen01NEWT {
 
     @Test
     public void test14OffscreenSnapshotWithDemoPixmap() {
+        // Offscreen doesn't work on >= GL3 (ATI)
+        GLProfile glp = GLProfile.get(GLProfile.GL2);
+        Assert.assertNotNull(glp);
+        GLCapabilities caps = new GLCapabilities(glp);
+        Assert.assertNotNull(caps);
+
         GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, false, false);
 
         System.out.println("Create Window 1");
diff --git a/src/junit/com/jogamp/test/junit/jogl/texture/TestTexture01AWT.java b/src/junit/com/jogamp/test/junit/jogl/texture/TestTexture01AWT.java
index 563c7f88e..4bbbaa271 100755
--- a/src/junit/com/jogamp/test/junit/jogl/texture/TestTexture01AWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/texture/TestTexture01AWT.java
@@ -93,7 +93,7 @@ public class TestTexture01AWT {
         frame.setVisible(true);
         animator.start();
 
-        Thread.sleep(1000); // 1000 ms
+        Thread.sleep(500); // 500 ms
 
         animator.stop();
         frame.setVisible(false);
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWJNILibLoader.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWJNILibLoader.java
new file mode 100644
index 000000000..c3c04287a
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWJNILibLoader.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, Sven Gothel
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Sven Gothel nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Sven Gothel BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.jogamp.nativewindow.impl;
+
+// FIXME: refactor Java SE dependencies
+//import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.HashSet;
+import com.jogamp.common.jvm.JNILibLoaderBase;
+
+public class NWJNILibLoader extends JNILibLoaderBase {
+  
+  public static void loadNativeWindow(final String ossuffix) {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("nativewindow_"+ossuffix, null, false);
+        return null;
+      }
+    });
+  }
+
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWReflection.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWReflection.java
deleted file mode 100644
index 9bac9477a..000000000
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NWReflection.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.jogamp.nativewindow.impl;
-
-import java.lang.reflect.*;
-import javax.media.nativewindow.*;
-
-public final class NWReflection {
-    
-  public static final boolean DEBUG = Debug.debug("NWReflection");
-
-    /**
-     * Returns true only if the class could be loaded.
-     */
-    public static final boolean isClassAvailable(String clazzName) {
-        try {
-            return null != Class.forName(clazzName, false, NWReflection.class.getClassLoader());
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
-    }
-
-    /**
-     * Loads and returns the class or null.
-     * @see Class#forName(java.lang.String, boolean, java.lang.ClassLoader)
-     */
-    public static final Class getClass(String clazzName, boolean initialize) {
-        try {
-            return getClassImpl(clazzName, initialize);
-        } catch (ClassNotFoundException e) {
-            return null;
-        }
-    }
-
-    private static Class getClassImpl(String clazzName, boolean initialize) throws ClassNotFoundException {
-        return Class.forName(clazzName, initialize, NWReflection.class.getClassLoader());
-    }
-
-    /**
-     * @throws NativeWindowException if the constructor can not be delivered.
-     */
-    public static final Constructor getConstructor(String clazzName, Class[] cstrArgTypes) {
-        try {
-            return getConstructor(getClassImpl(clazzName, true), cstrArgTypes);
-        } catch (ClassNotFoundException ex) {
-            throw new NativeWindowException(clazzName + " not available", ex);
-        }
-    }
-
-    /**
-     * @throws NativeWindowException if the constructor can not be delivered.
-     */
-    public static final Constructor getConstructor(Class clazz, Class[] cstrArgTypes) {
-        try {
-            return clazz.getDeclaredConstructor(cstrArgTypes);
-        } catch (NoSuchMethodException ex) {
-            String args = "";
-            for (int i = 0; i < cstrArgTypes.length; i++) {
-                args += cstrArgTypes[i].getName();
-                if(i != cstrArgTypes.length-1) {
-                     args+= ", ";
-                }
-            }
-            throw new NativeWindowException("Constructor: '" + clazz + "(" + args + ")' not found", ex);
-        }
-    }
-
-  public static final Constructor getConstructor(String clazzName) {
-    return getConstructor(clazzName, new Class[0]);
-  }
-
-    /**
-     * @throws NativeWindowException if the instance can not be created.
-     */
-    public static final Object createInstance(Class clazz, Class[] cstrArgTypes, Object[] cstrArgs) {
-        try {
-            return getConstructor(clazz, cstrArgTypes).newInstance(cstrArgs);
-        } catch (InstantiationException ex) {
-            throw new NativeWindowException("can not create instance of class "+clazz, ex);
-        } catch (InvocationTargetException ex) {
-            throw new NativeWindowException("can not create instance of class "+clazz, ex);
-        } catch (IllegalAccessException ex) {
-            throw new NativeWindowException("can not create instance of class "+clazz, ex);
-        }
-    }
-
-  public static final Object createInstance(Class clazz, Object[] cstrArgs) {
-    Class[] cstrArgTypes = new Class[cstrArgs.length];
-    for(int i=0; i<cstrArgs.length; i++) {
-        cstrArgTypes[i] = cstrArgs[i].getClass();
-    }
-    return createInstance(clazz, cstrArgTypes, cstrArgs);
-  }
-
-    public static final Object createInstance(String clazzName, Class[] cstrArgTypes, Object[] cstrArgs) {
-        try {
-            return createInstance(getClassImpl(clazzName, true), cstrArgTypes, cstrArgs);
-        } catch (ClassNotFoundException ex) {
-            throw new NativeWindowException(clazzName + " not available", ex);
-        }
-    }
-
-  public static final Object createInstance(String clazzName, Object[] cstrArgs) {
-    Class[] cstrArgTypes = new Class[cstrArgs.length];
-    for(int i=0; i<cstrArgs.length; i++) {
-        cstrArgTypes[i] = cstrArgs[i].getClass();
-    }
-    return createInstance(clazzName, cstrArgTypes, cstrArgs);
-  }
-
-  public static final Object createInstance(String clazzName) {
-    return createInstance(clazzName, new Class[0], null);
-  }
-
-  public static final boolean instanceOf(Object obj, String clazzName) {
-    return instanceOf(obj.getClass(), clazzName);
-  }
-  public static final boolean instanceOf(Class clazz, String clazzName) {
-    do {
-        if(clazz.getName().equals(clazzName)) {
-            return true;
-        }
-        clazz = clazz.getSuperclass();
-    } while (clazz!=null);
-    return false;
-  }
-
-  public static final boolean implementationOf(Object obj, String faceName) {
-    return implementationOf(obj.getClass(), faceName);
-  }
-  public static final boolean implementationOf(Class clazz, String faceName) {
-    do {
-        Class[] clazzes = clazz.getInterfaces();
-        for(int i=clazzes.length-1; i>=0; i--) {
-            Class face = clazzes[i];
-            if(face.getName().equals(faceName)) {
-                return true;
-            }
-        }
-        clazz = clazz.getSuperclass();
-    } while (clazz!=null);
-    return false;
-  }
-
-  public static boolean isAWTComponent(Object target) {
-      return instanceOf(target, "java.awt.Component");
-  }
-
-  public static boolean isAWTComponent(Class clazz) {
-      return instanceOf(clazz, "java.awt.Component");
-  }
-
-}
-
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeLibLoaderBase.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeLibLoaderBase.java
deleted file mode 100644
index c4f1d7e08..000000000
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeLibLoaderBase.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.jogamp.nativewindow.impl;
-
-// FIXME: refactor Java SE dependencies
-//import java.awt.Toolkit;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashSet;
-
-public class NativeLibLoaderBase {
-  public static final boolean DEBUG = Debug.debug("NativeLibLoader");
-
-  public interface LoaderAction {
-    /**
-     * Loads the library specified by libname. Optionally preloads the libraries specified by
-     * preload. The implementation should ignore, if the preload-libraries have already been
-     * loaded.
-     * @param libname the library to load
-     * @param preload the libraries to load before loading the main library if not null
-     * @param preloadIgnoreError true, if errors during loading the preload-libraries should be ignored 
-     */
-    void loadLibrary(String libname, String[] preload, 
-        boolean preloadIgnoreError);
-  }
-  
-  private static class DefaultAction implements LoaderAction {
-    public void loadLibrary(String libname, String[] preload, boolean preloadIgnoreError) {
-      if (null!=preload) {
-        for (int i=0; i<preload.length; i++) {
-          if(!isLoaded(preload[i])) {
-              try {
-                loadLibraryInternal(preload[i]);
-                addLoaded(preload[i]);
-                if(DEBUG) {
-                    System.err.println("NativeLibLoaderBase preloaded "+preload[i]);
-                }
-              } catch (UnsatisfiedLinkError e) {
-                if(DEBUG) {
-                    e.printStackTrace();
-                }
-                if (!preloadIgnoreError && e.getMessage().indexOf("already loaded") < 0) {
-                  throw e;
-                }
-              }
-          }
-        }
-      }
-      loadLibraryInternal(libname);
-      addLoaded(libname);
-      if(DEBUG) {
-          System.err.println("NativeLibLoaderBase    loaded "+libname);
-      }
-    }
-  }
-
-  private static final HashSet loaded = new HashSet();
-  private static LoaderAction loaderAction = new DefaultAction();
-
-  public static boolean isLoaded(String libName) {
-    return loaded.contains(libName);
-  }
-
-  public static void addLoaded(String libName) {
-    loaded.add(libName);
-    if(DEBUG) {
-        System.err.println("NativeLibLoaderBase Loaded Native Library: "+libName);
-    }
-  }
-
-  public static void disableLoading() {
-    setLoadingAction(null);
-  }
-
-  public static void enableLoading() {
-    setLoadingAction(new DefaultAction());
-  }
-  
-  public static synchronized void setLoadingAction(LoaderAction action) {
-    loaderAction = action;
-  }
-
-  protected static synchronized void loadLibrary(String libname, String[] preload, 
-      boolean preloadIgnoreError) {
-    if (loaderAction != null && !isLoaded(libname))
-    {
-      loaderAction.loadLibrary(libname, preload, preloadIgnoreError);    
-    }
-  }
-  
-  public static void loadNativeWindow(final String ossuffix) {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("nativewindow_"+ossuffix, null, false);
-        return null;
-      }
-    });
-  }
-
-
-  private static final Class  customLauncherClass;
-  private static final Method customLoadLibraryMethod;
-
-  // FIXME centralize logging
-  static {
-    Class launcherClass = null;
-    Method loadLibraryMethod = null;
-
-    if ( Debug.getBooleanProperty("sun.jnlp.applet.launcher", false) ) {
-        try {
-            launcherClass = Class.forName("org.jdesktop.applet.util.JNLPAppletLauncher");
-            loadLibraryMethod = launcherClass.getDeclaredMethod("loadLibrary", new Class[] { String.class });
-        } catch (ClassNotFoundException ex) {
-            if(DEBUG) {
-                ex.printStackTrace();
-            }
-        } catch (NoSuchMethodException ex) {
-            if(DEBUG) {
-                ex.printStackTrace();
-            }
-            launcherClass = null;
-        }
-    }
-
-    if(null==launcherClass) {
-        String launcherClassName = Debug.getProperty("jnlp.launcher.class", false);
-        if(null!=launcherClassName) {
-            try {
-                launcherClass = Class.forName(launcherClassName);
-                loadLibraryMethod = launcherClass.getDeclaredMethod("loadLibrary", new Class[] { String.class });
-            } catch (ClassNotFoundException ex) {
-                if(DEBUG) {
-                    ex.printStackTrace();
-                }
-            } catch (NoSuchMethodException ex) {
-                if(DEBUG) {
-                    ex.printStackTrace();
-                }
-                launcherClass = null;
-            }
-        }
-    }
-
-    customLauncherClass = launcherClass;
-    customLoadLibraryMethod = loadLibraryMethod;
-  }
-
-  private static void loadLibraryInternal(String libraryName) {
-    // Note: special-casing JAWT which is built in to the JDK
-    if (null!=customLoadLibraryMethod && !libraryName.equals("jawt")) {
-        try {
-          customLoadLibraryMethod.invoke(null, new Object[] { libraryName });
-        } catch (Exception e) {
-          Throwable t = e;
-          if (t instanceof InvocationTargetException) {
-            t = ((InvocationTargetException) t).getTargetException();
-          }
-          if (t instanceof Error)
-            throw (Error) t;
-          if (t instanceof RuntimeException) {
-            throw (RuntimeException) t;
-          }
-          // Throw UnsatisfiedLinkError for best compatibility with System.loadLibrary()
-          throw (UnsatisfiedLinkError)new UnsatisfiedLinkError("can not load library "+libraryName).initCause(e);
-        }
-    } else {
-      // System.out.println("sun.boot.library.path=" + Debug.getProperty("sun.boot.library.path", false));
-      System.loadLibrary(libraryName);
-    }
-  }
-}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeWindowFactoryImpl.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeWindowFactoryImpl.java
index e84264bd0..d2429cdab 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeWindowFactoryImpl.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/NativeWindowFactoryImpl.java
@@ -32,6 +32,7 @@
 
 package com.jogamp.nativewindow.impl;
 
+import com.jogamp.common.util.*;
 import java.lang.reflect.*;
 import java.security.*;
 
@@ -55,7 +56,7 @@ public class NativeWindowFactoryImpl extends NativeWindowFactory {
             throw new IllegalArgumentException("AbstractGraphicsConfiguration is null with a non NativeWindow object");
         }
 
-        if (NWReflection.isAWTComponent(winObj)) {
+        if (ReflectionUtil.instanceOf(winObj, "java.awt.Component")) {
             return getAWTNativeWindow(winObj, config);
         }
 
@@ -86,7 +87,7 @@ public class NativeWindowFactoryImpl extends NativeWindowFactory {
                     throw new IllegalArgumentException("OS " + getNativeOSName(false) + " not yet supported");
                 }
 
-                nativeWindowConstructor = NWReflection.getConstructor(windowClassName, new Class[] { Object.class, AbstractGraphicsConfiguration.class });
+                nativeWindowConstructor = ReflectionUtil.getConstructor(windowClassName, new Class[] { Object.class, AbstractGraphicsConfiguration.class });
             } catch (Exception e) {
                 throw (IllegalArgumentException) new IllegalArgumentException().initCause(e);
             }
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTJNILibLoader.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTJNILibLoader.java
new file mode 100644
index 000000000..4ea404c09
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTJNILibLoader.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.nativewindow.impl.jawt;
+
+import javax.media.nativewindow.NativeWindowFactory;
+import com.jogamp.nativewindow.impl.NWJNILibLoader;
+
+import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+public class JAWTJNILibLoader extends NWJNILibLoader {
+  public static void loadAWTImpl() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        // Make sure that awt.dll is loaded before loading jawt.dll. Otherwise
+        // a Dialog with "awt.dll not found" might pop up.
+        // See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4481947.
+        Toolkit.getDefaultToolkit();
+        
+        // Must pre-load JAWT on all non-Mac platforms to
+        // ensure references from jogl_awt shared object
+        // will succeed since JAWT shared object isn't in
+        // default library path
+        if ( ! NativeWindowFactory.TYPE_MACOSX.equals( NativeWindowFactory.getNativeWindowType(false) ) ) {
+            try {
+                loadLibrary("jawt", null, true);
+            } catch (Throwable t) {
+                // It might be ok .. if it's already loaded
+                if(DEBUG) {
+                    t.printStackTrace();
+                }
+            }
+        }
+        return null;
+      }
+    });
+  }
+}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTNativeLibLoader.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTNativeLibLoader.java
deleted file mode 100644
index 9be343a7a..000000000
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTNativeLibLoader.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.jogamp.nativewindow.impl.jawt;
-
-import javax.media.nativewindow.NativeWindowFactory;
-import com.jogamp.nativewindow.impl.NativeLibLoaderBase;
-
-import java.awt.Toolkit;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-public class JAWTNativeLibLoader extends NativeLibLoaderBase {
-  public static void loadAWTImpl() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        // Make sure that awt.dll is loaded before loading jawt.dll. Otherwise
-        // a Dialog with "awt.dll not found" might pop up.
-        // See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4481947.
-        Toolkit.getDefaultToolkit();
-        
-        // Must pre-load JAWT on all non-Mac platforms to
-        // ensure references from jogl_awt shared object
-        // will succeed since JAWT shared object isn't in
-        // default library path
-        if ( ! NativeWindowFactory.TYPE_MACOSX.equals( NativeWindowFactory.getNativeWindowType(false) ) ) {
-            try {
-                loadLibrary("jawt", null, true);
-            } catch (Throwable t) {
-                // It might be ok .. if it's already loaded
-                if(DEBUG) {
-                    t.printStackTrace();
-                }
-            }
-        }
-        return null;
-      }
-    });
-  }
-}
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTUtil.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTUtil.java
index 2c88b308f..b3c706ed8 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTUtil.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTUtil.java
@@ -54,8 +54,8 @@ public class JAWTUtil {
   private static final boolean j2dExist;
 
   static {
-    JAWTNativeLibLoader.loadAWTImpl();
-    JAWTNativeLibLoader.loadNativeWindow("awt");
+    JAWTJNILibLoader.loadAWTImpl();
+    JAWTJNILibLoader.loadNativeWindow("awt");
 
     lockedStack   = null;
     headlessMode = GraphicsEnvironment.isHeadless();
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jvm/JVMUtil.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jvm/JVMUtil.java
deleted file mode 100644
index df703aa55..000000000
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jvm/JVMUtil.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-package com.jogamp.nativewindow.impl.jvm;
-
-import java.nio.ByteBuffer;
-import com.jogamp.nativewindow.impl.*;
-
-/**
- * Currently this tool works around the Hotspot race condition bugs:
- <PRE>
-     4395095 JNI access to java.nio DirectBuffer constructor/accessor
-     6852404 Race condition in JNI Direct Buffer access and creation routines
- </PRE>
- *
- * Make sure to initialize this class as soon as possible,
- * before doing any multithreading work.
- *
- */
-public class JVMUtil {
-    private static final boolean DEBUG = Debug.debug("JVMUtil");
-
-    static {
-        NativeLibLoaderBase.loadNativeWindow("jvm");
-
-        ByteBuffer buffer = InternalBufferUtil.newByteBuffer(64);
-        if( ! initialize(buffer) ) {
-            throw new RuntimeException("Failed to initialize the JVMUtil "+Thread.currentThread().getName());
-        }
-        if(DEBUG) {
-            Exception e = new Exception("JVMUtil.initSingleton() .. initialized "+Thread.currentThread().getName());
-            e.printStackTrace();
-        }
-    }
-
-    public static void initSingleton() {
-    }
-
-    private JVMUtil() {}
-
-    private static native boolean initialize(java.nio.ByteBuffer buffer);
-}
-
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java
index 41ffccc42..5f5c10885 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11Util.java
@@ -53,7 +53,7 @@ public class X11Util {
     private static final boolean DEBUG = Debug.debug("X11Util");
 
     static {
-        NativeLibLoaderBase.loadNativeWindow("x11");
+        NWJNILibLoader.loadNativeWindow("x11");
         installIOErrorHandler();
     }
 
diff --git a/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java b/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java
index a8b67fddc..c692e51c4 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java
@@ -35,6 +35,7 @@ package javax.media.nativewindow;
 import java.lang.reflect.*;
 import java.util.*;
 
+import com.jogamp.common.util.*;
 import com.jogamp.nativewindow.impl.*;
 
 /**
@@ -77,7 +78,7 @@ public abstract class GraphicsConfigurationFactory {
         if (NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(true))) {
             try {
                 GraphicsConfigurationFactory factory = (GraphicsConfigurationFactory)
-                    NWReflection.createInstance("com.jogamp.nativewindow.impl.x11.X11GraphicsConfigurationFactory", new Object[] {});
+                    ReflectionUtil.createInstance("com.jogamp.nativewindow.impl.x11.X11GraphicsConfigurationFactory", new Object[] {});
                 registerFactory(javax.media.nativewindow.x11.X11GraphicsDevice.class, factory);
             } catch (Exception e) {
                 throw new RuntimeException(e);
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
index 5b1bf54bb..944fdee74 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
@@ -36,8 +36,9 @@ import java.lang.reflect.*;
 import java.security.*;
 import java.util.*;
 
+import com.jogamp.common.util.*;
+import com.jogamp.common.jvm.JVMUtil;
 import com.jogamp.nativewindow.impl.*;
-import com.jogamp.nativewindow.impl.jvm.JVMUtil;
 
 /** Provides a pluggable mechanism for arbitrary window toolkits to
     adapt their components to the {@link NativeWindow} interface,
@@ -123,10 +124,10 @@ public abstract class NativeWindowFactory {
         // make it easier to run this code on mobile devices
 
         Class componentClass = null;
-        if ( NWReflection.isClassAvailable("java.awt.Component") &&
-             NWReflection.isClassAvailable("javax.media.nativewindow.awt.AWTGraphicsDevice") ) {
+        if ( ReflectionUtil.isClassAvailable("java.awt.Component") &&
+             ReflectionUtil.isClassAvailable("javax.media.nativewindow.awt.AWTGraphicsDevice") ) {
             try {
-                componentClass = NWReflection.getClass("java.awt.Component", false);
+                componentClass = ReflectionUtil.getClass("java.awt.Component", false);
             } catch (Exception e) { }
         }
 
@@ -177,7 +178,7 @@ public abstract class NativeWindowFactory {
 
             try {
                 Constructor factoryConstructor =
-                    NWReflection.getConstructor("com.jogamp.nativewindow.impl.x11.awt.X11AWTNativeWindowFactory", new Class[] {});
+                    ReflectionUtil.getConstructor("com.jogamp.nativewindow.impl.x11.awt.X11AWTNativeWindowFactory", new Class[] {});
                 _factory = (NativeWindowFactory) factoryConstructor.newInstance(null);
             } catch (Exception e) { }
         }
@@ -185,7 +186,7 @@ public abstract class NativeWindowFactory {
         if (toolkitLockForced && null==_factory) {
             try {
                 Constructor factoryConstructor =
-                    NWReflection.getConstructor("com.jogamp.nativewindow.impl.LockingNativeWindowFactory", new Class[] {});
+                    ReflectionUtil.getConstructor("com.jogamp.nativewindow.impl.LockingNativeWindowFactory", new Class[] {});
                 _factory = (NativeWindowFactory) factoryConstructor.newInstance(null);
             } catch (Exception e) { }
         }
diff --git a/src/nativewindow/native/JVM_Tool.c b/src/nativewindow/native/JVM_Tool.c
deleted file mode 100644
index ce827129c..000000000
--- a/src/nativewindow/native/JVM_Tool.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-#include <jni.h>
-
-JNIEXPORT jboolean JNICALL
-Java_com_jogamp_nativewindow_impl_jvm_JVMUtil_initialize(JNIEnv *env, jclass _unused, jobject nioBuffer) {
-  int res;
-  void * ptr = NULL;
-  if (nioBuffer != NULL) {
-        ptr = (void *) (*env)->GetDirectBufferAddress(env, nioBuffer);
-  }
-  return ( NULL==ptr ) ? JNI_FALSE : JNI_TRUE ;
-}
-
diff --git a/src/nativewindow/native/x11/Xmisc.c b/src/nativewindow/native/x11/Xmisc.c
index 4320a8f12..52449ae84 100644
--- a/src/nativewindow/native/x11/Xmisc.c
+++ b/src/nativewindow/native/x11/Xmisc.c
@@ -128,6 +128,7 @@ static void _FatalError(JNIEnv *env, const char* msg, ...)
     va_end(ap);
 
     fprintf(stderr, buffer);
+    fprintf(stderr, "\n");
     (*env)->FatalError(env, buffer);
 }
 
@@ -201,32 +202,54 @@ static void _throwNewRuntimeException(Display * unlockDisplay, JNIEnv *env, cons
     (*env)->ThrowNew(env, clazzRuntimeException, buffer);
 }
 
+static JNIEnv * x11ErrorHandlerJNIEnv = NULL;
+static XErrorHandler origErrorHandler = NULL ;
+
+static int x11ErrorHandler(Display *dpy, XErrorEvent *e)
+{
+    _throwNewRuntimeException(NULL, x11ErrorHandlerJNIEnv, "Nativewindow X11 Error: Display %p, Code 0x%X", dpy, e->error_code);
+
+    return 0;
+}
+
+static void x11ErrorHandlerEnable(int onoff, JNIEnv * env) {
+    if(onoff) {
+        if(NULL==origErrorHandler) {
+            x11ErrorHandlerJNIEnv = env;
+            origErrorHandler = XSetErrorHandler(x11ErrorHandler);
+        }
+    } else {
+        XSetErrorHandler(origErrorHandler);
+        origErrorHandler = NULL;
+    }
+}
+
+
 static XIOErrorHandler origIOErrorHandler = NULL;
-static JNIEnv * displayIOErrorHandlerJNIEnv = NULL;
 
-static int displayIOErrorHandler(Display *dpy)
+static int x11IOErrorHandler(Display *dpy)
 {
-    _FatalError(displayIOErrorHandlerJNIEnv, "Nativewindow X11 IOError: Display %p not available", dpy);
+    _FatalError(x11ErrorHandlerJNIEnv, "Nativewindow X11 IOError: Display %p not available", dpy);
     origIOErrorHandler(dpy);
     return 0;
 }
 
-static void displayIOErrorHandlerEnable(int onoff, JNIEnv * env) {
+static void x11IOErrorHandlerEnable(int onoff, JNIEnv * env) {
     if(onoff) {
         if(NULL==origIOErrorHandler) {
-            displayIOErrorHandlerJNIEnv = env;
-            origIOErrorHandler = XSetIOErrorHandler(displayIOErrorHandler);
+            x11ErrorHandlerJNIEnv = env;
+            origIOErrorHandler = XSetIOErrorHandler(x11IOErrorHandler);
         }
     } else {
         XSetIOErrorHandler(origIOErrorHandler);
         origIOErrorHandler = NULL;
-        displayIOErrorHandlerJNIEnv = NULL;
     }
 }
 
 JNIEXPORT void JNICALL 
 Java_com_jogamp_nativewindow_impl_x11_X11Util_installIOErrorHandler(JNIEnv *env, jclass _unused) {
-    displayIOErrorHandlerEnable(1, env);
+    x11ErrorHandlerEnable(1, env);
+    x11IOErrorHandlerEnable(1, env);
 }
 
 JNIEXPORT jlong JNICALL 
@@ -345,6 +368,7 @@ Java_com_jogamp_nativewindow_impl_x11_X11Lib_XCloseDisplay__J(JNIEnv *env, jclas
  * Class:     com_jogamp_nativewindow_impl_x11_X11Lib
  * Method:    CreateDummyWindow
  * Signature: (JIJ)J
+ */
 JNIEXPORT jlong JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_CreateDummyWindow
   (JNIEnv *env, jobject obj, jlong display, jint screen_index, jlong visualID)
 {
@@ -370,7 +394,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_CreateDummy
     }
 
     if(visualID<0) {
-        _throwNewRuntimeException(NULL, env, "invalid VisualID ..\n");
+        _throwNewRuntimeException(NULL, env, "invalid VisualID ..");
         return 0;
     }
 
@@ -396,7 +420,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_CreateDummy
 
     if (visual==NULL)
     { 
-        _throwNewRuntimeException(dpy, env, "could not query Visual by given VisualID, bail out!\n");
+        _throwNewRuntimeException(dpy, env, "could not query Visual by given VisualID, bail out!");
         return 0;
     } 
 
@@ -440,13 +464,13 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_CreateDummy
 
     return (jlong) window;
 }
- */
 
 
 /*
  * Class:     com_jogamp_nativewindow_impl_x11_X11Lib
  * Method:    DestroyDummyWindow
  * Signature: (JJ)V
+ */
 JNIEXPORT void JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_DestroyDummyWindow
   (JNIEnv *env, jobject obj, jlong display, jlong window)
 {
@@ -454,7 +478,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_DestroyDummy
     Window      w = (Window) window;
 
     if(NULL==dpy) {
-        _throwNewRuntimeException(NULL, env, "invalid display connection..\n");
+        _throwNewRuntimeException(NULL, env, "invalid display connection..");
         return;
     }
     XLockDisplay(dpy) ;
@@ -467,5 +491,3 @@ JNIEXPORT void JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_DestroyDummy
 
     XUnlockDisplay(dpy) ;
 }
- */
-
diff --git a/src/newt/classes/com/jogamp/newt/NewtFactory.java b/src/newt/classes/com/jogamp/newt/NewtFactory.java
index 2a696aa07..2d5c10c52 100755
--- a/src/newt/classes/com/jogamp/newt/NewtFactory.java
+++ b/src/newt/classes/com/jogamp/newt/NewtFactory.java
@@ -36,7 +36,7 @@ package com.jogamp.newt;
 import javax.media.nativewindow.*;
 import java.util.ArrayList;
 import java.util.Iterator;
-import com.jogamp.nativewindow.impl.jvm.JVMUtil;
+import com.jogamp.common.jvm.JVMUtil;
 
 public abstract class NewtFactory {
     // Work-around for initialization order problems on Mac OS X
diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java
index 8f09ae364..5123ab19f 100755
--- a/src/newt/classes/com/jogamp/newt/Window.java
+++ b/src/newt/classes/com/jogamp/newt/Window.java
@@ -36,8 +36,8 @@ package com.jogamp.newt;
 import com.jogamp.newt.impl.Debug;
 import com.jogamp.newt.util.EDTUtil;
 
+import com.jogamp.common.util.*;
 import javax.media.nativewindow.*;
-import com.jogamp.nativewindow.impl.NWReflection;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -127,7 +127,7 @@ public abstract class Window implements NativeWindow
             if ( argsChecked < cstrArguments.length ) {
                 throw new NativeWindowException("WindowClass "+windowClass+" constructor mismatch at argument #"+argsChecked+"; Constructor: "+getTypeStrList(cstrArgumentTypes)+", arguments: "+getArgsStrList(cstrArguments));
             }
-            Window window = (Window) NWReflection.createInstance( windowClass, cstrArgumentTypes, cstrArguments ) ;
+            Window window = (Window) ReflectionUtil.createInstance( windowClass, cstrArgumentTypes, cstrArguments ) ;
             window.invalidate();
             window.screen   = screen;
             window.setUndecorated(undecorated);
@@ -144,7 +144,6 @@ public abstract class Window implements NativeWindow
             }
             return window;
         } catch (Throwable t) {
-            t.printStackTrace();
             throw new NativeWindowException(t);
         }
     }
diff --git a/src/newt/classes/com/jogamp/newt/impl/NEWTJNILibLoader.java b/src/newt/classes/com/jogamp/newt/impl/NEWTJNILibLoader.java
new file mode 100644
index 000000000..a4d234fd5
--- /dev/null
+++ b/src/newt/classes/com/jogamp/newt/impl/NEWTJNILibLoader.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.newt.impl;
+
+// FIXME: refactor Java SE dependencies
+//import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.HashSet;
+import com.jogamp.common.jvm.JNILibLoaderBase;
+
+public class NEWTJNILibLoader extends JNILibLoaderBase {
+  
+  public static void loadNEWT() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("newt", null, true);
+        return null;
+      }
+    });
+  }
+
+}
diff --git a/src/newt/classes/com/jogamp/newt/impl/NativeLibLoader.java b/src/newt/classes/com/jogamp/newt/impl/NativeLibLoader.java
deleted file mode 100644
index 52e4c0dc3..000000000
--- a/src/newt/classes/com/jogamp/newt/impl/NativeLibLoader.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.jogamp.newt.impl;
-
-// FIXME: refactor Java SE dependencies
-//import java.awt.Toolkit;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashSet;
-import com.jogamp.nativewindow.impl.NativeLibLoaderBase;
-
-public class NativeLibLoader extends NativeLibLoaderBase {
-  
-  public static void loadNEWT() {
-    AccessController.doPrivileged(new PrivilegedAction() {
-      public Object run() {
-        loadLibrary("newt", null, true);
-        return null;
-      }
-    });
-  }
-
-}
diff --git a/src/newt/classes/com/jogamp/newt/intel/gdl/Display.java b/src/newt/classes/com/jogamp/newt/intel/gdl/Display.java
index eb93943ee..a3e5501c4 100644
--- a/src/newt/classes/com/jogamp/newt/intel/gdl/Display.java
+++ b/src/newt/classes/com/jogamp/newt/intel/gdl/Display.java
@@ -40,7 +40,7 @@ public class Display extends com.jogamp.newt.Display {
     static int initCounter = 0;
 
     static {
-        NativeLibLoader.loadNEWT();
+        NEWTJNILibLoader.loadNEWT();
 
         if (!Screen.initIDs()) {
             throw new NativeWindowException("Failed to initialize GDL Screen jmethodIDs");
diff --git a/src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java b/src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java
index 2f86125f8..0b5297685 100755
--- a/src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java
+++ b/src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java
@@ -41,7 +41,7 @@ import com.jogamp.newt.util.MainThread;
 
 public class MacDisplay extends Display {
     static {
-        NativeLibLoader.loadNEWT();
+        NEWTJNILibLoader.loadNEWT();
 
         if(!initNSApplication()) {
             throw new NativeWindowException("Failed to initialize native Application hook");
diff --git a/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java
index a375181ac..999a407ec 100644
--- a/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java
@@ -41,7 +41,7 @@ import javax.media.nativewindow.egl.*;
 public class Display extends com.jogamp.newt.Display {
 
     static {
-        NativeLibLoader.loadNEWT();
+        NEWTJNILibLoader.loadNEWT();
 
         if (!Window.initIDs()) {
             throw new NativeWindowException("Failed to initialize BCEGL Window jmethodIDs");
diff --git a/src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java b/src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java
index b09568237..6a28f992b 100755
--- a/src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java
@@ -42,7 +42,7 @@ import javax.media.nativewindow.egl.*;
 public class KDDisplay extends Display {
 
     static {
-        NativeLibLoader.loadNEWT();
+        NEWTJNILibLoader.loadNEWT();
 
         if (!KDWindow.initIDs()) {
             throw new NativeWindowException("Failed to initialize KDWindow jmethodIDs");
diff --git a/src/newt/classes/com/jogamp/newt/util/MainThread.java b/src/newt/classes/com/jogamp/newt/util/MainThread.java
index 6cd4f8c69..daa09edce 100644
--- a/src/newt/classes/com/jogamp/newt/util/MainThread.java
+++ b/src/newt/classes/com/jogamp/newt/util/MainThread.java
@@ -43,10 +43,10 @@ import java.security.*;
 
 import javax.media.nativewindow.*;
 
+import com.jogamp.common.util.*;
 import com.jogamp.newt.*;
 import com.jogamp.newt.impl.*;
 import com.jogamp.newt.macosx.MacDisplay;
-import com.jogamp.nativewindow.impl.NWReflection;
 
 /**
  * NEWT Utility class MainThread<P>
@@ -116,7 +116,7 @@ public class MainThread {
 
             // start user app ..
             try {
-                Class mainClass = NWReflection.getClass(mainClassName, true);
+                Class mainClass = ReflectionUtil.getClass(mainClassName, true);
                 if(null==mainClass) {
                     throw new RuntimeException(new ClassNotFoundException("MainThread couldn't find main class "+mainClassName));
                 }
@@ -159,7 +159,7 @@ public class MainThread {
             System.arraycopy(args, 1, mainClassArgs, 0, args.length-1);
         }
 
-        NativeLibLoader.loadNEWT();
+        NEWTJNILibLoader.loadNEWT();
         
         shouldStop = false;
         tasks = new ArrayList();
diff --git a/src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java b/src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java
index 05cab1a0a..281022901 100755
--- a/src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java
+++ b/src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java
@@ -45,7 +45,7 @@ public class WindowsDisplay extends Display {
     private static long hInstance;
 
     static {
-        NativeLibLoader.loadNEWT();
+        NEWTJNILibLoader.loadNEWT();
 
         if (!WindowsWindow.initIDs()) {
             throw new NativeWindowException("Failed to initialize WindowsWindow jmethodIDs");
diff --git a/src/newt/classes/com/jogamp/newt/x11/X11Display.java b/src/newt/classes/com/jogamp/newt/x11/X11Display.java
index 5fd6d9640..c8faefbf1 100755
--- a/src/newt/classes/com/jogamp/newt/x11/X11Display.java
+++ b/src/newt/classes/com/jogamp/newt/x11/X11Display.java
@@ -41,7 +41,7 @@ import com.jogamp.nativewindow.impl.x11.X11Util;
 
 public class X11Display extends Display {
     static {
-        NativeLibLoader.loadNEWT();
+        NEWTJNILibLoader.loadNEWT();
 
         if (!initIDs()) {
             throw new NativeWindowException("Failed to initialize X11Display jmethodIDs");
diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index 33c5324e2..296172f6e 100755
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -159,11 +159,11 @@ static void _FatalError(JNIEnv *env, const char* msg, ...)
     va_end(ap);
 
     fprintf(stderr, buffer);
+    fprintf(stderr, "\n");
     (*env)->FatalError(env, buffer);
 }
 
-static const char * const ClazzNameRuntimeException = 
-                            "java/lang/RuntimeException";
+static const char * const ClazzNameRuntimeException = "java/lang/RuntimeException";
 static jclass    runtimeExceptionClz=NULL;
 
 static const char * const ClazzNameNewtWindow = 
@@ -200,6 +200,7 @@ static void _throwNewRuntimeException(Display * unlockDisplay, JNIEnv *env, cons
  */
 
 
+static JNIEnv * x11ErrorHandlerJNIEnv = NULL;
 static XErrorHandler origErrorHandler = NULL ;
 
 static int displayDispatchErrorHandler(Display *dpy, XErrorEvent *e)
@@ -213,15 +214,16 @@ static int displayDispatchErrorHandler(Display *dpy, XErrorEvent *e)
     {
         fprintf(stderr, "         BadWindow (%p): Window probably already removed\n", e->resourceid);
     } else {
-        return origErrorHandler(dpy, e);
+        _throwNewRuntimeException(NULL, x11ErrorHandlerJNIEnv, "NEWT X11 Error: Display %p, Code 0x%X", dpy, e->error_code);
     }
 
     return 0;
 }
 
-static void displayDispatchErrorHandlerEnable(int onoff) {
+static void displayDispatchErrorHandlerEnable(int onoff, JNIEnv * env) {
     if(onoff) {
         if(NULL==origErrorHandler) {
+            x11ErrorHandlerJNIEnv = env;
             origErrorHandler = XSetErrorHandler(displayDispatchErrorHandler);
         }
     } else {
@@ -329,13 +331,13 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_CompleteDisplay
 
     javaObjectAtom = (jlong) XInternAtom(dpy, "JOGL_JAVA_OBJECT", False);
     if(None==javaObjectAtom) {
-        _throwNewRuntimeException(dpy, env, "could not create Atom JOGL_JAVA_OBJECT, bail out!\n");
+        _throwNewRuntimeException(dpy, env, "could not create Atom JOGL_JAVA_OBJECT, bail out!");
         return;
     }
 
     windowDeleteAtom = (jlong) XInternAtom(dpy, "WM_DELETE_WINDOW", False);
     if(None==windowDeleteAtom) {
-        _throwNewRuntimeException(dpy, env, "could not create Atom WM_DELETE_WINDOW, bail out!\n");
+        _throwNewRuntimeException(dpy, env, "could not create Atom WM_DELETE_WINDOW, bail out!");
         return;
     }
 
@@ -371,7 +373,7 @@ static void setJavaWindowProperty(JNIEnv *env, Display *dpy, Window window, jlon
     {
         jobject test = (jobject) getPtrOut32Long(jogl_java_object_data);
         if( ! (jwindow==test) ) {
-            _throwNewRuntimeException(dpy, env, "Internal Error .. Encoded Window ref not the same %p != %p !\n", jwindow, test);
+            _throwNewRuntimeException(dpy, env, "Internal Error .. Encoded Window ref not the same %p != %p !", jwindow, test);
             return;
         }
     }
@@ -415,7 +417,7 @@ static jobject getJavaWindowProperty(JNIEnv *env, Display *dpy, Window window, j
 
 #ifdef VERBOSE_ON
     if(JNI_FALSE == (*env)->IsInstanceOf(env, jwindow, newtWindowClz)) {
-        _throwNewRuntimeException(dpy, env, "fetched Atom JOGL_JAVA_OBJECT window is not a NEWT Window: javaWindow 0x%X !\n", jwindow);
+        _throwNewRuntimeException(dpy, env, "fetched Atom JOGL_JAVA_OBJECT window is not a NEWT Window: javaWindow 0x%X !", jwindow);
     }
 #endif
     return jwindow;
@@ -457,20 +459,20 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
         num_events--;
 
         if( 0==evt.xany.window ) {
-            _throwNewRuntimeException(dpy, env, "event window NULL, bail out!\n");
+            _throwNewRuntimeException(dpy, env, "event window NULL, bail out!");
             return ;
         }
 
         if(dpy!=evt.xany.display) {
-            _throwNewRuntimeException(dpy, env, "wrong display, bail out!\n");
+            _throwNewRuntimeException(dpy, env, "wrong display, bail out!");
             return ;
         }
 
-        displayDispatchErrorHandlerEnable(1);
+        displayDispatchErrorHandlerEnable(1, env);
 
         jwindow = getJavaWindowProperty(env, dpy, evt.xany.window, javaObjectAtom);
 
-        displayDispatchErrorHandlerEnable(0);
+        displayDispatchErrorHandlerEnable(0, env);
 
         if(NULL==jwindow) {
             fprintf(stderr, "Warning: NEWT X11 DisplayDispatch %p, Couldn't handle event %d for invalid X11 window %p\n", 
@@ -685,7 +687,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_x11_X11Window_CreateWindow
     }
 
     if(visualID<0) {
-        _throwNewRuntimeException(NULL, env, "invalid VisualID ..\n");
+        _throwNewRuntimeException(NULL, env, "invalid VisualID ..");
         return 0;
     }
 
@@ -712,7 +714,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_x11_X11Window_CreateWindow
 
     if (visual==NULL)
     { 
-        _throwNewRuntimeException(dpy, env, "could not query Visual by given VisualID, bail out!\n");
+        _throwNewRuntimeException(dpy, env, "could not query Visual by given VisualID, bail out!");
         return 0;
     } 
 
@@ -797,11 +799,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_CloseWindow
 
     jwindow = getJavaWindowProperty(env, dpy, w, javaObjectAtom);
     if(NULL==jwindow) {
-        _throwNewRuntimeException(dpy, env, "could not fetch Java Window object, bail out!\n");
+        _throwNewRuntimeException(dpy, env, "could not fetch Java Window object, bail out!");
         return;
     }
     if ( JNI_FALSE == (*env)->IsSameObject(env, jwindow, obj) ) {
-        _throwNewRuntimeException(dpy, env, "Internal Error .. Window global ref not the same!\n");
+        _throwNewRuntimeException(dpy, env, "Internal Error .. Window global ref not the same!");
         return;
     }
     (*env)->DeleteGlobalRef(env, jwindow);
-- 
cgit v1.2.3


From d429d317f27e71ee06877fb539ecde15d6e73037 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 20 Apr 2010 12:08:48 +0200
Subject: JOGL GL4 preperation (cont):

- updated lstjars.sh 32790c376583beccd030eecd7c56cbe66d380172
    120kB	jogl.gl2.jar (before flattening)
     16kB	jogl.gl2.jar (after flattening)

    Before:
        JOGL GL2 AWT
        44	gluegen-rt.jar
        84	nativewindow.all.jar
        148	jogl.core.jar
        116	jogl.util.jar
        56	jogl.os.x11.jar
        120	jogl.gl2.jar
        64	jogl.awt.jar
        4	libgluegen-rt.so.gz
        144	libjogl_desktop.so.gz
        8	libnativewindow_x11.so.gz
        4	libnativewindow_awt.so.gz
        4	libnativewindow_jvm.so.gz
        796	total

    After:
        JOGL GL2 AWT
        72	gluegen-rt.jar
        80	nativewindow.all.jar
        152	jogl.core.jar
        116	jogl.util.jar
        60	jogl.os.x11.jar
        16	jogl.gl2.jar
        64	jogl.awt.jar
        4	libgluegen-rt.so.gz
        120	libjogl_desktop.so.gz
        8	libnativewindow_x11.so.gz
        4	libnativewindow_awt.so.gz
        696	total
---
 .../lstjars/lstjars.linux_amd64-20100420.log       | 524 +++++++++++++++++++++
 make/lstjars.sh                                    |  28 +-
 2 files changed, 538 insertions(+), 14 deletions(-)
 create mode 100644 doc/deployment/lstjars/lstjars.linux_amd64-20100420.log

diff --git a/doc/deployment/lstjars/lstjars.linux_amd64-20100420.log b/doc/deployment/lstjars/lstjars.linux_amd64-20100420.log
new file mode 100644
index 000000000..3e455a7fc
--- /dev/null
+++ b/doc/deployment/lstjars/lstjars.linux_amd64-20100420.log
@@ -0,0 +1,524 @@
+cp: cannot stat `../../gluegen/build-x86_64/gluegen-rt-natives-linux-i586.jar': No such file or directory
+cp: cannot stat `../../gluegen/build-x86_64/gluegen-rt-natives-linux-i586-cdc.jar': No such file or directory
+Native Libraries
+4	libgluegen-rt.so.gz
+24	libjogl_cg.so.gz
+120	libjogl_desktop.so.gz
+36	libjogl_es1.so.gz
+36	libjogl_es2.so.gz
+4	libnativewindow_awt.so.gz
+8	libnativewindow_x11.so.gz
+12	libnewt.so.gz
+244	total
+
+list gluegen-rt-cdc.jar to gluegen-rt-cdc.lst
+list gluegen-rt.jar to gluegen-rt.lst
+list jogl.all.cdc.jar to jogl.all.cdc.lst
+list jogl.all.jar to jogl.all.lst
+list jogl.all-noawt.jar to jogl.all-noawt.lst
+list jogl.awt.jar to jogl.awt.lst
+list jogl.cg.jar to jogl.cg.lst
+list jogl.core.cdc.jar to jogl.core.cdc.lst
+list jogl.core.jar to jogl.core.lst
+list jogl.egl.cdc.jar to jogl.egl.cdc.lst
+list jogl.egl.jar to jogl.egl.lst
+list jogl.gl2.dbg.jar to jogl.gl2.dbg.lst
+list jogl.gl2.jar to jogl.gl2.lst
+list jogl.gl3.dbg.jar to jogl.gl3.dbg.lst
+list jogl.gl3.jar to jogl.gl3.lst
+list jogl.gl4.dbg.jar to jogl.gl4.dbg.lst
+list jogl.gl4.jar to jogl.gl4.lst
+list jogl.gles1.cdc.jar to jogl.gles1.cdc.lst
+list jogl.gles1.dbg.cdc.jar to jogl.gles1.dbg.cdc.lst
+list jogl.gles1.dbg.jar to jogl.gles1.dbg.lst
+list jogl.gles1.jar to jogl.gles1.lst
+list jogl.gles2.cdc.jar to jogl.gles2.cdc.lst
+list jogl.gles2.dbg.cdc.jar to jogl.gles2.dbg.cdc.lst
+list jogl.gles2.dbg.jar to jogl.gles2.dbg.lst
+list jogl.gles2.jar to jogl.gles2.lst
+list jogl.glu.gl2.jar to jogl.glu.gl2.lst
+list jogl.glu.mipmap.cdc.jar to jogl.glu.mipmap.cdc.lst
+list jogl.glu.mipmap.jar to jogl.glu.mipmap.lst
+list jogl.glu.tess.cdc.jar to jogl.glu.tess.cdc.lst
+list jogl.glu.tess.jar to jogl.glu.tess.lst
+list jogl-natives-linux-amd64-cdc.jar to jogl-natives-linux-amd64-cdc.lst
+list jogl-natives-linux-amd64.jar to jogl-natives-linux-amd64.lst
+list jogl.os.osx.jar to jogl.os.osx.lst
+list jogl.os.win.jar to jogl.os.win.lst
+list jogl.os.x11.jar to jogl.os.x11.lst
+list jogl.sdk.jar to jogl.sdk.lst
+list jogl.test.jar to jogl.test.lst
+list jogl.util.awt.jar to jogl.util.awt.lst
+list jogl.util.cdc.jar to jogl.util.cdc.lst
+list jogl.util.fixedfuncemu.cdc.jar to jogl.util.fixedfuncemu.cdc.lst
+list jogl.util.fixedfuncemu.jar to jogl.util.fixedfuncemu.lst
+list jogl.util.gl2.jar to jogl.util.gl2.lst
+list jogl.util.jar to jogl.util.lst
+list nativewindow.all.cdc.jar to nativewindow.all.cdc.lst
+list nativewindow.all.jar to nativewindow.all.lst
+list nativewindow.all-noawt.jar to nativewindow.all-noawt.lst
+list nativewindow.awt.jar to nativewindow.awt.lst
+list nativewindow.core.cdc.jar to nativewindow.core.cdc.lst
+list nativewindow.core.jar to nativewindow.core.lst
+list nativewindow-natives-linux-amd64-cdc.jar to nativewindow-natives-linux-amd64-cdc.lst
+list nativewindow-natives-linux-amd64.jar to nativewindow-natives-linux-amd64.lst
+list nativewindow.os.x11.cdc.jar to nativewindow.os.x11.cdc.lst
+list nativewindow.os.x11.jar to nativewindow.os.x11.lst
+list newt.all.cdc.jar to newt.all.cdc.lst
+list newt.all.jar to newt.all.lst
+list newt.all-noawt.jar to newt.all-noawt.lst
+list newt.awt.jar to newt.awt.lst
+list newt.broadcomegl.cdc.jar to newt.broadcomegl.cdc.lst
+list newt.broadcomegl.jar to newt.broadcomegl.lst
+list newt.core.cdc.jar to newt.core.cdc.lst
+list newt.core.jar to newt.core.lst
+list newt-natives-linux-amd64-cdc.jar to newt-natives-linux-amd64-cdc.lst
+list newt-natives-linux-amd64.jar to newt-natives-linux-amd64.lst
+list newt.ogl.cdc.jar to newt.ogl.cdc.lst
+list newt.ogl.jar to newt.ogl.lst
+list newt.os.osx.cdc.jar to newt.os.osx.cdc.lst
+list newt.os.osx.jar to newt.os.osx.lst
+list newt.os.win.cdc.jar to newt.os.win.cdc.lst
+list newt.os.win.jar to newt.os.win.lst
+list newt.os.x11.cdc.jar to newt.os.x11.cdc.lst
+list newt.os.x11.jar to newt.os.x11.lst
+mv: cannot stat `jogl.all.cdc.lst': No such file or directory
+mv: cannot stat `nativewindow.all.cdc.lst': No such file or directory
+mv: cannot stat `newt.all.cdc.lst': No such file or directory
+duplicates - w/o gl2.*
+
+com/jogamp/openmax/OMXEventListener.class
+com/jogamp/openmax/OMXInstance.class
+com/jogamp/openmax/OMXInstance$EGLImageTexture.class
+mv: cannot stat `jogl.all.cdc.lst': No such file or directory
+mv: cannot stat `nativewindow.all.cdc.lst': No such file or directory
+mv: cannot stat `newt.all.cdc.lst': No such file or directory
+all vs allparts delta
+
+--- allparts.lst	2010-04-20 11:59:19.760514140 +0200
++++ allall.lst	2010-04-20 11:59:19.790598127 +0200
+@@ -1,3 +1,10 @@
++com/jogamp/audio/windows/waveout/Audio.class
++com/jogamp/audio/windows/waveout/Mixer.class
++com/jogamp/audio/windows/waveout/Mixer$FillerThread.class
++com/jogamp/audio/windows/waveout/Mixer$MixerThread.class
++com/jogamp/audio/windows/waveout/SoundBuffer.class
++com/jogamp/audio/windows/waveout/Track.class
++com/jogamp/audio/windows/waveout/Vec3f.class
+ com/jogamp/common/impl/Debug$1.class
+ com/jogamp/common/impl/Debug.class
+ com/jogamp/common/JogampRuntimeException.class
+@@ -616,22 +623,6 @@
+ com/jogamp/openmax/OMXEventListener.class
+ com/jogamp/openmax/OMXInstance.class
+ com/jogamp/openmax/OMXInstance$EGLImageTexture.class
+-com/jogamp/test/junit/jogl/acore/TestGLProfile01CORE.class
+-com/jogamp/test/junit/jogl/awt/TestAWT01GLn.class
+-com/jogamp/test/junit/jogl/demos/es1/RedSquare.class
+-com/jogamp/test/junit/jogl/demos/gl2/gears/Gears.class
+-com/jogamp/test/junit/jogl/drawable/TestDrawable01NEWT.class
+-com/jogamp/test/junit/jogl/offscreen/ReadBuffer2File.class
+-com/jogamp/test/junit/jogl/offscreen/ReadBuffer2Screen.class
+-com/jogamp/test/junit/jogl/offscreen/ReadBufferBase.class
+-com/jogamp/test/junit/jogl/offscreen/ReadBufferUtil.class
+-com/jogamp/test/junit/jogl/offscreen/Surface2File.class
+-com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.class
+-com/jogamp/test/junit/jogl/offscreen/WindowUtilNEWT.class
+-com/jogamp/test/junit/jogl/texture/TestTexture01AWT.class
+-com/jogamp/test/junit/jogl/util/texture/gl2/TextureGL2ListenerDraw1.class
+-com/jogamp/test/junit/newt/TestWindows01NEWT.class
+-com/jogamp/test/junit/util/MiscUtils.class
+ javax/media/nativewindow/AbstractGraphicsConfiguration.class
+ javax/media/nativewindow/AbstractGraphicsDevice.class
+ javax/media/nativewindow/AbstractGraphicsScreen.class
+JOGL Deployment Payload for jar
+
+JOGL ES1 NEWT CORE
+72	gluegen-rt.jar
+44	nativewindow.all-noawt.jar
+152	jogl.core.jar
+116	jogl.util.jar
+44	jogl.egl.jar
+28	jogl.gles1.jar
+92	newt.all-noawt.jar
+4	libgluegen-rt.so.gz
+36	libjogl_es1.so.gz
+12	libnewt.so.gz
+600	total
+
+JOGL ES2 NEWT CORE
+72	gluegen-rt.jar
+44	nativewindow.all-noawt.jar
+152	jogl.core.jar
+116	jogl.util.jar
+44	jogl.egl.jar
+32	jogl.gles2.jar
+92	newt.all-noawt.jar
+4	libgluegen-rt.so.gz
+36	libjogl_es2.so.gz
+12	libnewt.so.gz
+604	total
+
+JOGL ES2 NEWT CORE FIXED
+72	gluegen-rt.jar
+44	nativewindow.all-noawt.jar
+152	jogl.core.jar
+116	jogl.util.jar
+44	jogl.egl.jar
+32	jogl.gles2.jar
+28	jogl.util.fixedfuncemu.jar
+92	newt.all-noawt.jar
+4	libgluegen-rt.so.gz
+36	libjogl_es2.so.gz
+12	libnewt.so.gz
+632	total
+
+JOGL GL2ES12 NEWT
+72	gluegen-rt.jar
+44	nativewindow.all-noawt.jar
+152	jogl.core.jar
+116	jogl.util.jar
+60	jogl.os.x11.jar
+92	newt.all-noawt.jar
+4	libgluegen-rt.so.gz
+12	libnewt.so.gz
+8	libnativewindow_x11.so.gz
+560	total
+
+JOGL GL2 NEWT
+72	gluegen-rt.jar
+44	nativewindow.all-noawt.jar
+152	jogl.core.jar
+116	jogl.util.jar
+60	jogl.os.x11.jar
+16	jogl.gl2.jar
+92	newt.all-noawt.jar
+4	libgluegen-rt.so.gz
+120	libjogl_desktop.so.gz
+12	libnewt.so.gz
+8	libnativewindow_x11.so.gz
+696	total
+
+JOGL GL2 AWT
+72	gluegen-rt.jar
+80	nativewindow.all.jar
+152	jogl.core.jar
+116	jogl.util.jar
+60	jogl.os.x11.jar
+16	jogl.gl2.jar
+64	jogl.awt.jar
+4	libgluegen-rt.so.gz
+120	libjogl_desktop.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_awt.so.gz
+696	total
+
+JOGL ALL AWT
+72	gluegen-rt.jar
+80	nativewindow.all.jar
+1948	jogl.all.jar
+4	libgluegen-rt.so.gz
+120	libjogl_desktop.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_awt.so.gz
+2236	total
+
+JOGL ALL No AWT
+72	gluegen-rt.jar
+44	nativewindow.all-noawt.jar
+1848	jogl.all-noawt.jar
+92	newt.all-noawt.jar
+4	libgluegen-rt.so.gz
+120	libjogl_desktop.so.gz
+8	libnativewindow_x11.so.gz
+12	libnewt.so.gz
+2200	total
+
+JOGL CDCFP DESKTOP
+72	gluegen-rt-cdc.jar
+80	nativewindow.all.jar
+1012	jogl.all.cdc.jar
+92	newt.all.cdc.jar
+4	libgluegen-rt.so.gz
+8	libnativewindow_x11.so.gz
+12	libnewt.so.gz
+1280	total
+
+JOGL CDCFP ES1 MOBILE
+72	gluegen-rt-cdc.jar
+152	jogl.core.cdc.jar
+44	jogl.egl.cdc.jar
+28	jogl.gles1.cdc.jar
+116	jogl.util.cdc.jar
+44	nativewindow.all.cdc.jar
+92	newt.all.cdc.jar
+4	libgluegen-rt.so.gz
+36	libjogl_es1.so.gz
+12	libnewt.so.gz
+600	total
+
+JOGL CDCFP ES2 MOBILE
+72	gluegen-rt-cdc.jar
+152	jogl.core.cdc.jar
+44	jogl.egl.cdc.jar
+32	jogl.gles2.cdc.jar
+116	jogl.util.cdc.jar
+44	nativewindow.all.cdc.jar
+92	newt.all.cdc.jar
+4	libgluegen-rt.so.gz
+36	libjogl_es2.so.gz
+12	libnewt.so.gz
+604	total
+
+JOGL GLU
+56	jogl.glu.gl2.jar
+68	jogl.glu.mipmap.cdc.jar
+68	jogl.glu.mipmap.jar
+48	jogl.glu.tess.cdc.jar
+48	jogl.glu.tess.jar
+288	total
+
+JOGL EVERYTHING
+1948	jogl.all.jar
+80	nativewindow.all.jar
+108	newt.all.jar
+4	libgluegen-rt.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_awt.so.gz
+120	libjogl_desktop.so.gz
+36	libjogl_es1.so.gz
+36	libjogl_es2.so.gz
+12	libnewt.so.gz
+2356	total
+
+pack200 gluegen-rt-cdc.pack.gz gluegen-rt-cdc.jar
+pack200 gluegen-rt.pack.gz gluegen-rt.jar
+pack200 jogl.all.cdc.pack.gz jogl.all.cdc.jar
+pack200 jogl.all.pack.gz jogl.all.jar
+pack200 jogl.all-noawt.pack.gz jogl.all-noawt.jar
+pack200 jogl.awt.pack.gz jogl.awt.jar
+pack200 jogl.cg.pack.gz jogl.cg.jar
+pack200 jogl.core.cdc.pack.gz jogl.core.cdc.jar
+pack200 jogl.core.pack.gz jogl.core.jar
+pack200 jogl.egl.cdc.pack.gz jogl.egl.cdc.jar
+pack200 jogl.egl.pack.gz jogl.egl.jar
+pack200 jogl.gl2.dbg.pack.gz jogl.gl2.dbg.jar
+pack200 jogl.gl2.pack.gz jogl.gl2.jar
+pack200 jogl.gl3.dbg.pack.gz jogl.gl3.dbg.jar
+pack200 jogl.gl3.pack.gz jogl.gl3.jar
+pack200 jogl.gl4.dbg.pack.gz jogl.gl4.dbg.jar
+pack200 jogl.gl4.pack.gz jogl.gl4.jar
+pack200 jogl.gles1.cdc.pack.gz jogl.gles1.cdc.jar
+pack200 jogl.gles1.dbg.cdc.pack.gz jogl.gles1.dbg.cdc.jar
+pack200 jogl.gles1.dbg.pack.gz jogl.gles1.dbg.jar
+pack200 jogl.gles1.pack.gz jogl.gles1.jar
+pack200 jogl.gles2.cdc.pack.gz jogl.gles2.cdc.jar
+pack200 jogl.gles2.dbg.cdc.pack.gz jogl.gles2.dbg.cdc.jar
+pack200 jogl.gles2.dbg.pack.gz jogl.gles2.dbg.jar
+pack200 jogl.gles2.pack.gz jogl.gles2.jar
+pack200 jogl.glu.gl2.pack.gz jogl.glu.gl2.jar
+pack200 jogl.glu.mipmap.cdc.pack.gz jogl.glu.mipmap.cdc.jar
+pack200 jogl.glu.mipmap.pack.gz jogl.glu.mipmap.jar
+pack200 jogl.glu.tess.cdc.pack.gz jogl.glu.tess.cdc.jar
+pack200 jogl.glu.tess.pack.gz jogl.glu.tess.jar
+pack200 jogl-natives-linux-amd64-cdc.pack.gz jogl-natives-linux-amd64-cdc.jar
+pack200 jogl-natives-linux-amd64.pack.gz jogl-natives-linux-amd64.jar
+pack200 jogl.os.osx.pack.gz jogl.os.osx.jar
+pack200 jogl.os.win.pack.gz jogl.os.win.jar
+pack200 jogl.os.x11.pack.gz jogl.os.x11.jar
+pack200 jogl.sdk.pack.gz jogl.sdk.jar
+pack200 jogl.test.pack.gz jogl.test.jar
+pack200 jogl.util.awt.pack.gz jogl.util.awt.jar
+pack200 jogl.util.cdc.pack.gz jogl.util.cdc.jar
+pack200 jogl.util.fixedfuncemu.cdc.pack.gz jogl.util.fixedfuncemu.cdc.jar
+pack200 jogl.util.fixedfuncemu.pack.gz jogl.util.fixedfuncemu.jar
+pack200 jogl.util.gl2.pack.gz jogl.util.gl2.jar
+pack200 jogl.util.pack.gz jogl.util.jar
+pack200 nativewindow.all.cdc.pack.gz nativewindow.all.cdc.jar
+pack200 nativewindow.all.pack.gz nativewindow.all.jar
+pack200 nativewindow.all-noawt.pack.gz nativewindow.all-noawt.jar
+pack200 nativewindow.awt.pack.gz nativewindow.awt.jar
+pack200 nativewindow.core.cdc.pack.gz nativewindow.core.cdc.jar
+pack200 nativewindow.core.pack.gz nativewindow.core.jar
+pack200 nativewindow-natives-linux-amd64-cdc.pack.gz nativewindow-natives-linux-amd64-cdc.jar
+pack200 nativewindow-natives-linux-amd64.pack.gz nativewindow-natives-linux-amd64.jar
+pack200 nativewindow.os.x11.cdc.pack.gz nativewindow.os.x11.cdc.jar
+pack200 nativewindow.os.x11.pack.gz nativewindow.os.x11.jar
+pack200 newt.all.cdc.pack.gz newt.all.cdc.jar
+pack200 newt.all.pack.gz newt.all.jar
+pack200 newt.all-noawt.pack.gz newt.all-noawt.jar
+pack200 newt.awt.pack.gz newt.awt.jar
+pack200 newt.broadcomegl.cdc.pack.gz newt.broadcomegl.cdc.jar
+pack200 newt.broadcomegl.pack.gz newt.broadcomegl.jar
+pack200 newt.core.cdc.pack.gz newt.core.cdc.jar
+pack200 newt.core.pack.gz newt.core.jar
+pack200 newt-natives-linux-amd64-cdc.pack.gz newt-natives-linux-amd64-cdc.jar
+pack200 newt-natives-linux-amd64.pack.gz newt-natives-linux-amd64.jar
+pack200 newt.ogl.cdc.pack.gz newt.ogl.cdc.jar
+pack200 newt.ogl.pack.gz newt.ogl.jar
+pack200 newt.os.osx.cdc.pack.gz newt.os.osx.cdc.jar
+pack200 newt.os.osx.pack.gz newt.os.osx.jar
+pack200 newt.os.win.cdc.pack.gz newt.os.win.cdc.jar
+pack200 newt.os.win.pack.gz newt.os.win.jar
+pack200 newt.os.x11.cdc.pack.gz newt.os.x11.cdc.jar
+pack200 newt.os.x11.pack.gz newt.os.x11.jar
+JOGL Deployment Payload for pack.gz
+
+JOGL ES1 NEWT CORE
+20	gluegen-rt.pack.gz
+12	nativewindow.all-noawt.pack.gz
+56	jogl.core.pack.gz
+44	jogl.util.pack.gz
+20	jogl.egl.pack.gz
+12	jogl.gles1.pack.gz
+28	newt.all-noawt.pack.gz
+4	libgluegen-rt.so.gz
+36	libjogl_es1.so.gz
+12	libnewt.so.gz
+244	total
+
+JOGL ES2 NEWT CORE
+20	gluegen-rt.pack.gz
+12	nativewindow.all-noawt.pack.gz
+56	jogl.core.pack.gz
+44	jogl.util.pack.gz
+20	jogl.egl.pack.gz
+16	jogl.gles2.pack.gz
+28	newt.all-noawt.pack.gz
+4	libgluegen-rt.so.gz
+36	libjogl_es2.so.gz
+12	libnewt.so.gz
+248	total
+
+JOGL ES2 NEWT CORE FIXED
+20	gluegen-rt.pack.gz
+12	nativewindow.all-noawt.pack.gz
+56	jogl.core.pack.gz
+44	jogl.util.pack.gz
+20	jogl.egl.pack.gz
+16	jogl.gles2.pack.gz
+16	jogl.util.fixedfuncemu.pack.gz
+28	newt.all-noawt.pack.gz
+4	libgluegen-rt.so.gz
+36	libjogl_es2.so.gz
+12	libnewt.so.gz
+264	total
+
+JOGL GL2ES12 NEWT
+20	gluegen-rt.pack.gz
+12	nativewindow.all-noawt.pack.gz
+56	jogl.core.pack.gz
+44	jogl.util.pack.gz
+24	jogl.os.x11.pack.gz
+28	newt.all-noawt.pack.gz
+4	libgluegen-rt.so.gz
+12	libnewt.so.gz
+8	libnativewindow_x11.so.gz
+208	total
+
+JOGL GL2 NEWT
+20	gluegen-rt.pack.gz
+12	nativewindow.all-noawt.pack.gz
+56	jogl.core.pack.gz
+44	jogl.util.pack.gz
+24	jogl.os.x11.pack.gz
+8	jogl.gl2.pack.gz
+28	newt.all-noawt.pack.gz
+4	libgluegen-rt.so.gz
+120	libjogl_desktop.so.gz
+12	libnewt.so.gz
+8	libnativewindow_x11.so.gz
+336	total
+
+JOGL GL2 AWT
+20	gluegen-rt.pack.gz
+20	nativewindow.all.pack.gz
+56	jogl.core.pack.gz
+44	jogl.util.pack.gz
+24	jogl.os.x11.pack.gz
+8	jogl.gl2.pack.gz
+20	jogl.awt.pack.gz
+4	libgluegen-rt.so.gz
+120	libjogl_desktop.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_awt.so.gz
+328	total
+
+JOGL ALL AWT
+20	gluegen-rt.pack.gz
+20	nativewindow.all.pack.gz
+684	jogl.all.pack.gz
+4	libgluegen-rt.so.gz
+120	libjogl_desktop.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_awt.so.gz
+860	total
+
+JOGL ALL No AWT
+20	gluegen-rt.pack.gz
+12	nativewindow.all-noawt.pack.gz
+668	jogl.all-noawt.pack.gz
+28	newt.all-noawt.pack.gz
+4	libgluegen-rt.so.gz
+120	libjogl_desktop.so.gz
+8	libnativewindow_x11.so.gz
+12	libnewt.so.gz
+872	total
+
+JOGL CDCFP DESKTOP
+20	gluegen-rt-cdc.pack.gz
+20	nativewindow.all.pack.gz
+340	jogl.all.cdc.pack.gz
+28	newt.all.cdc.pack.gz
+4	libgluegen-rt.so.gz
+8	libnativewindow_x11.so.gz
+12	libnewt.so.gz
+432	total
+
+JOGL CDCFP ES1 MOBILE
+20	gluegen-rt-cdc.pack.gz
+56	jogl.core.cdc.pack.gz
+20	jogl.egl.cdc.pack.gz
+12	jogl.gles1.cdc.pack.gz
+44	jogl.util.cdc.pack.gz
+12	nativewindow.all.cdc.pack.gz
+28	newt.all.cdc.pack.gz
+4	libgluegen-rt.so.gz
+36	libjogl_es1.so.gz
+12	libnewt.so.gz
+244	total
+
+JOGL CDCFP ES2 MOBILE
+20	gluegen-rt-cdc.pack.gz
+56	jogl.core.cdc.pack.gz
+20	jogl.egl.cdc.pack.gz
+16	jogl.gles2.cdc.pack.gz
+44	jogl.util.cdc.pack.gz
+12	nativewindow.all.cdc.pack.gz
+28	newt.all.cdc.pack.gz
+4	libgluegen-rt.so.gz
+36	libjogl_es2.so.gz
+12	libnewt.so.gz
+248	total
+
+JOGL GLU
+20	jogl.glu.gl2.pack.gz
+24	jogl.glu.mipmap.cdc.pack.gz
+24	jogl.glu.mipmap.pack.gz
+20	jogl.glu.tess.cdc.pack.gz
+20	jogl.glu.tess.pack.gz
+108	total
+
+JOGL EVERYTHING
+684	jogl.all.pack.gz
+20	nativewindow.all.pack.gz
+32	newt.all.pack.gz
+4	libgluegen-rt.so.gz
+8	libnativewindow_x11.so.gz
+4	libnativewindow_awt.so.gz
+120	libjogl_desktop.so.gz
+36	libjogl_es1.so.gz
+36	libjogl_es2.so.gz
+12	libnewt.so.gz
+956	total
+
diff --git a/make/lstjars.sh b/make/lstjars.sh
index 7159c184e..80fbe2566 100644
--- a/make/lstjars.sh
+++ b/make/lstjars.sh
@@ -35,47 +35,47 @@ function listdeployment() {
     echo
 
     echo JOGL ES1 NEWT CORE
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles1.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es1.so.gz libnewt.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles1.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnewt.so.gz
     echo
 
     echo JOGL ES2 NEWT CORE
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnewt.so.gz
     echo
 
     echo JOGL ES2 NEWT CORE FIXED
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX jogl.util.fixedfuncemu.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX jogl.util.fixedfuncemu.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnewt.so.gz
     echo
 
     echo JOGL GL2ES12 NEWT 
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2es12.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz
     echo
 
     echo JOGL GL2 NEWT 
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz
     echo
 
     echo JOGL GL2 AWT
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz
     echo
 
     echo JOGL ALL AWT
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz
     echo
 
     echo JOGL ALL No AWT
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnewt.so.gz
     echo
 
     echo JOGL CDCFP DESKTOP
-    report gluegen-rt-cdc.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
+    report gluegen-rt-cdc.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_$OSS.so.gz libnewt.so.gz
     echo
 
     echo JOGL CDCFP ES1 MOBILE
-    report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles1.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
+    report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles1.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnewt.so.gz
     echo
 
     echo JOGL CDCFP ES2 MOBILE
-    report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles2.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
+    report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles2.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnewt.so.gz
     echo
 
     echo JOGL GLU
@@ -83,7 +83,7 @@ function listdeployment() {
     echo
 
     echo JOGL EVERYTHING
-    report *.all.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libjogl_desktop.so.gz  libjogl_es1.so.gz  libjogl_es2.so.gz  libjogl_gl2es12.so.gz libnewt.so.gz
+    report *.all.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libjogl_desktop.so.gz  libjogl_es1.so.gz  libjogl_es2.so.gz  libnewt.so.gz
     echo
 }
 
@@ -125,8 +125,8 @@ mkdir -p nope
 
 mv *.cdc.lst *.all*.lst nope/
 
-mv jogl.gl2es12.*.lst jogl.gl2.*.lst nope/
-echo duplicates - w/o gl2es12.* gl2.*
+mv jogl.gl2.*.lst nope/
+echo duplicates - w/o gl2.*
 echo
 sort jogl*.lst | uniq -d
 mv nope/* .
-- 
cgit v1.2.3


From f73a2d32acf826f6e3ed15e6d587a73914f662ec Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 21 Apr 2010 14:23:36 +0200
Subject: Add remark (unsigned long -> uint_32) ..

---
 make/make.jogl.all.win32.bat | 3 ++-
 src/newt/native/X11Window.c  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/make/make.jogl.all.win32.bat b/make/make.jogl.all.win32.bat
index a4cc59673..fe6a8aff0 100644
--- a/make/make.jogl.all.win32.bat
+++ b/make/make.jogl.all.win32.bat
@@ -12,5 +12,6 @@ REM    -Dc.compiler.debug=true
 REM    -DuseOpenMAX=true 
 REM    -DuseKD=true
 REM    -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
+REM    -Dbuild.noarchives=true
 
-ant -Dbuild.noarchives=true -Drootrel.build=build-win32 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\lib %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
+ant -Drootrel.build=build-win32 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\lib %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index 296172f6e..9b5c420c9 100755
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -367,7 +367,7 @@ static uintptr_t getPtrOut32Long(unsigned long * src) {
 }
 
 static void setJavaWindowProperty(JNIEnv *env, Display *dpy, Window window, jlong javaObjectAtom, jobject jwindow) {
-    unsigned long jogl_java_object_data[2];
+    unsigned long jogl_java_object_data[2]; // FIXME uint32_t ?
     int nitems_32 = putPtrIn32Long( jogl_java_object_data, (uintptr_t) jwindow);
 
     {
-- 
cgit v1.2.3


From a122927789d2e19fe753c71110c104ef872042bc Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 21 Apr 2010 14:32:06 +0200
Subject: Fixed deployment timestamp props

---
 make/build-common.xml              | 4 ++--
 make/make.jogl.all.linux-x86_64.sh | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/make/build-common.xml b/make/build-common.xml
index d6c39c1ed..ccbf56fd6 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -34,7 +34,7 @@
     </target>
 
     <target name="jogl.setup-version-non-RI" unless="jogl.ri">
-        <property name="jogl.version" value="${jogl_base_version}-pre-${timestamp}" />
+        <property name="jogl.version" value="${jogl_base_version}-pre-${version.timestamp}" />
     </target>
 
     <target name="newt.setup-version-RI" if="newt.ri">
@@ -60,7 +60,7 @@
         <property name="src"                        value="${project.root}/src" />
         <property name="lib"                        value="${build}/lib" />
 
-        <property name="archive.name"               value="jogl-${tmp.version}-${os.and.arch}" />
+        <property name="archive.name"               value="jogl-${jogl.version}-${os.and.arch}" />
         <property name="archive"                    value="${build}/${archive.name}" />
 
         <property name="all.srcj.path" value="${src}/nativewindow/classes;${src}/jogl/classes;${src}/newt/classes" />
diff --git a/make/make.jogl.all.linux-x86_64.sh b/make/make.jogl.all.linux-x86_64.sh
index b6c5e9d63..8ebcc8744 100644
--- a/make/make.jogl.all.linux-x86_64.sh
+++ b/make/make.jogl.all.linux-x86_64.sh
@@ -16,7 +16,6 @@ fi
 #    -Dbuild.noarchives=true \
 
 ant  \
-    -Dbuild.noarchives=true \
     -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64 \
     -Drootrel.build=build-x86_64 \
     -DuseKD=true \
-- 
cgit v1.2.3


From 2cb8c65600a1c8cd1b3ea1386b5f1359390f1ccd Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 21 Apr 2010 18:16:24 +0200
Subject: Add deployment scripts ..

---
 make/scripts/all-deploy-webstarttest.sh           | 38 +++++++++++++++++++++++
 make/scripts/deploy-jars_external-webstarttest.sh | 26 ++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100755 make/scripts/all-deploy-webstarttest.sh
 create mode 100755 make/scripts/deploy-jars_external-webstarttest.sh

diff --git a/make/scripts/all-deploy-webstarttest.sh b/make/scripts/all-deploy-webstarttest.sh
new file mode 100755
index 000000000..0904ac233
--- /dev/null
+++ b/make/scripts/all-deploy-webstarttest.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+if [ ! -e scripts -o ! -e ../make ] ; then
+    echo start this script from JOGL/jogl/make
+	exit 1
+fi
+
+url=$1
+shift
+
+joglbuilddir=$1
+shift 
+
+wsdir=$1
+shift 
+
+if [ -z "$url" -o -z "$joglbuilddir" -o -z "$wsdir" ] ; then
+    echo Usage $0 codebase-url jogl-builddir webstartdir
+    echo Examples
+    echo    sh scripts/all-deploy-webstarttest.sh file:////usr/local/projects/JOGL/webstart ../build-x86_64 ../../webstart
+    echo    sh scripts/all-deploy-webstarttest.sh http://domain.org/jogl/webstart ../build-win32 ../../webstart
+    exit 1
+fi
+
+if [ ! -e $joglbuilddir ] ; then
+    echo $joglbuilddir does not exist
+    exit 1
+fi
+
+if [ ! -e $wsdir ] ; then
+    echo $wsdir does not exist
+    exit 1
+fi
+
+sh scripts/deploy-jars-webstarttest.sh $joglbuilddir $wsdir
+# sh scripts/deploy-jars-webstarttest_pack200.sh $wsdir
+sh scripts/deploy-jnlp-webstarttest.sh $url $joglbuilddir $wsdir
+sh scripts/deploy-jnlp-webstarttest-filter.sh $wsdir
diff --git a/make/scripts/deploy-jars_external-webstarttest.sh b/make/scripts/deploy-jars_external-webstarttest.sh
new file mode 100755
index 000000000..3fc1daa51
--- /dev/null
+++ b/make/scripts/deploy-jars_external-webstarttest.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+if [ ! -e scripts -o ! -e ../make ] ; then
+    echo start this script from JOGL/jogl/make
+	exit 1
+fi
+
+SOURCE=$1
+shift
+
+wsdir=$1
+shift 
+
+if [ -z "$SOURCE" -o -z "$wsdir" ] ; then
+    echo usage $0 source webstartdir
+	echo source might be user@192.168.0.1:webstart/
+    exit 1
+fi
+
+if [ ! -e $wsdir ] ; then
+    echo $wsdir does not exist
+    exit 1
+fi
+
+echo scp -v $SOURCE*natives* $wsdir
+scp -v $SOURCE*natives* $wsdir
-- 
cgit v1.2.3


From 8db5ff430a08ec18bfd947d7aee1c6d298d0d662 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Thu, 22 Apr 2010 00:28:41 +0200
Subject: added jackpot 3.0 code transformator to tools/jackpotc.  - use
 'setup' for initial setup (downloads jackpot).  - use 'bttf' for running a
 jogl1.1.1 -> jogl 2 (reloaded) transformation  - tools/jackpotc/test/oldgears
 is a jogl 1.1.1 NetBeans project  - more information about jackpot is in
 tools/jackpotc/lib/README after setup was run

---
 tools/jackpotc/.gitignore                          |   1 +
 tools/jackpotc/bttf                                |   8 +
 tools/jackpotc/jackpotc                            |   2 +
 tools/jackpotc/jogl1Tojogl2.hint                   |  22 +
 tools/jackpotc/setup                               |   5 +
 tools/jackpotc/test/oldgears/.gitignore            |   3 +
 tools/jackpotc/test/oldgears/build.xml             |  74 ++
 tools/jackpotc/test/oldgears/manifest.mf           |   3 +
 .../test/oldgears/nbproject/build-impl.xml         | 883 +++++++++++++++++++++
 .../test/oldgears/nbproject/genfiles.properties    |   8 +
 .../test/oldgears/nbproject/project.properties     |  68 ++
 tools/jackpotc/test/oldgears/nbproject/project.xml |  15 +
 .../test/oldgears/src/jogl111/gears/Gears.java     | 307 +++++++
 13 files changed, 1399 insertions(+)
 create mode 100644 tools/jackpotc/.gitignore
 create mode 100755 tools/jackpotc/bttf
 create mode 100755 tools/jackpotc/jackpotc
 create mode 100644 tools/jackpotc/jogl1Tojogl2.hint
 create mode 100755 tools/jackpotc/setup
 create mode 100644 tools/jackpotc/test/oldgears/.gitignore
 create mode 100644 tools/jackpotc/test/oldgears/build.xml
 create mode 100644 tools/jackpotc/test/oldgears/manifest.mf
 create mode 100644 tools/jackpotc/test/oldgears/nbproject/build-impl.xml
 create mode 100644 tools/jackpotc/test/oldgears/nbproject/genfiles.properties
 create mode 100644 tools/jackpotc/test/oldgears/nbproject/project.properties
 create mode 100644 tools/jackpotc/test/oldgears/nbproject/project.xml
 create mode 100644 tools/jackpotc/test/oldgears/src/jogl111/gears/Gears.java

diff --git a/tools/jackpotc/.gitignore b/tools/jackpotc/.gitignore
new file mode 100644
index 000000000..a65b41774
--- /dev/null
+++ b/tools/jackpotc/.gitignore
@@ -0,0 +1 @@
+lib
diff --git a/tools/jackpotc/bttf b/tools/jackpotc/bttf
new file mode 100755
index 000000000..51472c568
--- /dev/null
+++ b/tools/jackpotc/bttf
@@ -0,0 +1,8 @@
+#!/bin/bash
+SRC="./test/oldgears/src/"
+LIBS="./test/oldgears/lib/jogl.jar:./test/oldgears/lib/jogl.all.jar:./test/oldgears/lib/jogl.awt.jar"
+OUTPUT="./test/oldgears/build"
+
+echo "Back to the Future"
+mkdir $OUTPUT
+./lib/jackpotc -sourcepath $SRC -cp $LIBS -d $OUTPUT -Ajackpot30_extra_hints=./jogl1Tojogl2.hint `find $SRC -type f -name "*.java"`
diff --git a/tools/jackpotc/jackpotc b/tools/jackpotc/jackpotc
new file mode 100755
index 000000000..6b0216d76
--- /dev/null
+++ b/tools/jackpotc/jackpotc
@@ -0,0 +1,2 @@
+#!/bin/bash
+java -Xbootclasspath/p:`dirname $0`/jackpotc.jar com.sun.tools.javac.Main -Xjcov "$@"
diff --git a/tools/jackpotc/jogl1Tojogl2.hint b/tools/jackpotc/jogl1Tojogl2.hint
new file mode 100644
index 000000000..9352c959e
--- /dev/null
+++ b/tools/jackpotc/jogl1Tojogl2.hint
@@ -0,0 +1,22 @@
+// rules for automatic jogl 1.1.1 -> jogl 2 refactorings
+
+//'JOGL2 API change: javax.media.opengl.GLCanvas -> javax.media.opengl.awt.GLCanvas':
+//javax.media.opengl.GLCanvas=>javax.media.opengl.awt.GLCanvas;;
+
+//'JOGL2 API change: javax.media.opengl.GLJPanel -> javax.media.opengl.awt.GLJPanel':
+//javax.media.opengl.GLJPanel=>javax.media.opengl.awt.GLJPanel;;
+
+'JOGL2 API change: javax.media.opengl.GL -> javax.media.opengl.GL2':
+javax.media.opengl.GL=>javax.media.opengl.GL2;;
+
+'JOGL2 API change: new javax.media.opengl.GLCapabilities(javax.media.opengl.GLProfile)':
+new javax.media.opengl.GLCapabilities()=>
+new javax.media.opengl.GLCapabilities(javax.media.opengl.GLProfile.get(javax.media.opengl.GLProfile.GL2));;
+
+'JOGL2 API change: GL gl = drawable.getGL() -> GL2 gl = drawable.getGL().getGL2()':
+$d.getGL() :: $d instanceof javax.media.opengl.GLAutoDrawable=>
+$d.getGL().getGL2();; 
+
+//public void init($D $drawable)=>
+//public void dispose(GLAutoDrawable drawable){}
+//public void init($D $drawable);;
diff --git a/tools/jackpotc/setup b/tools/jackpotc/setup
new file mode 100755
index 000000000..f1ccc57ed
--- /dev/null
+++ b/tools/jackpotc/setup
@@ -0,0 +1,5 @@
+#!/bin/bash
+mkdir lib
+cd ./lib
+wget http://bitbucket.org/jlahoda/jackpot30/downloads/jackpotc.zip
+unzip -oj jackpotc.zip
diff --git a/tools/jackpotc/test/oldgears/.gitignore b/tools/jackpotc/test/oldgears/.gitignore
new file mode 100644
index 000000000..7fda8a712
--- /dev/null
+++ b/tools/jackpotc/test/oldgears/.gitignore
@@ -0,0 +1,3 @@
+build
+dist
+nbproject/private
diff --git a/tools/jackpotc/test/oldgears/build.xml b/tools/jackpotc/test/oldgears/build.xml
new file mode 100644
index 000000000..4234a96e6
--- /dev/null
+++ b/tools/jackpotc/test/oldgears/build.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="oldgears" default="default" basedir=".">
+    <description>Builds, tests, and runs the project oldgears.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="oldgears-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
diff --git a/tools/jackpotc/test/oldgears/manifest.mf b/tools/jackpotc/test/oldgears/manifest.mf
new file mode 100644
index 000000000..328e8e5bc
--- /dev/null
+++ b/tools/jackpotc/test/oldgears/manifest.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+
diff --git a/tools/jackpotc/test/oldgears/nbproject/build-impl.xml b/tools/jackpotc/test/oldgears/nbproject/build-impl.xml
new file mode 100644
index 000000000..80f4e3647
--- /dev/null
+++ b/tools/jackpotc/test/oldgears/nbproject/build-impl.xml
@@ -0,0 +1,883 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - junit compilation
+  - junit execution
+  - junit debugging
+  - applet
+  - cleanup
+
+        -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="oldgears-impl">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <available file="${manifest.file}" property="manifest.available"/>
+        <available file="${application.splash}" property="splashscreen.available"/>
+        <condition property="main.class.available">
+            <and>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class">
+            <and>
+                <isset property="manifest.available"/>
+                <isset property="main.class.available"/>
+            </and>
+        </condition>
+        <condition property="do.mkdist">
+            <and>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="do.mkdist"/>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">
+            <and>
+                <istrue value="${manifest.available+main.class+mkdist.available}"/>
+                <istrue value="${splashscreen.available}"/>
+            </and>
+        </condition>
+        <condition property="do.archive">
+            <not>
+                <istrue value="${jar.archive.disabled}"/>
+            </not>
+        </condition>
+        <condition property="do.archive+manifest.available">
+            <and>
+                <isset property="manifest.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class+mkdist.available}"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">
+            <and>
+                <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <property name="runtime.encoding" value="${source.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="do.depend" value="false"/>
+        <condition property="do.depend.true">
+            <istrue value="${do.depend}"/>
+        </condition>
+        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+            <length length="0" string="${endorsed.classpath}" when="greater"/>
+        </condition>
+        <property name="javac.fork" value="false"/>
+        <property name="jar.index" value="false"/>
+        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg line="${annotation.processing.processor.options}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="," property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <delete>
+                    <files includes="${javac.includes.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-junit">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <sequential>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-copylibs">
+        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+                <pathconvert property="run.classpath.without.build.classes.dir">
+                    <path path="${run.classpath}"/>
+                    <map from="${build.classes.dir.resolved}" to=""/>
+                </pathconvert>
+                <pathconvert pathsep=" " property="jar.classpath">
+                    <path path="${run.classpath.without.build.classes.dir}"/>
+                    <chainedmapper>
+                        <flattenmapper/>
+                        <globmapper from="*" to="lib/*"/>
+                    </chainedmapper>
+                </pathconvert>
+                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+                <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}"/>
+                    <manifest>
+                        <attribute name="Class-Path" value="${jar.classpath}"/>
+                        <customize/>
+                    </manifest>
+                </copylibs>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+                <j2seproject1:fileset dir="${build.classes.dir}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.processor.options" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target name="-deps-jar-init" unless="built-jar.properties">
+        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
+        <delete file="${built-jar.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
+        <echo level="warn" message="Cycle detected: oldgears was already built"/>
+    </target>
+    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-jar.properties}" verbose="false"/>
+        <property file="${built-jar.properties}" prefix="already.built.jar."/>
+        <antcall target="-warn-already-built-jar"/>
+        <propertyfile file="${built-jar.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-depend">
+        <pathconvert property="build.generated.subdirs">
+            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="*"/>
+            </dirset>
+        </pathconvert>
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
+        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target if="has.persistence.xml" name="-copy-persistence-xml">
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy todir="${build.classes.dir}/META-INF">
+            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available">
+        <j2seproject1:jar/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
+        <j2seproject1:jar manifest="${manifest.file}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}">
+            <j2seproject1:manifest>
+                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+            </j2seproject1:manifest>
+        </j2seproject1:jar>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available" name="-do-jar-with-libraries-and-splashscreen">
+        <basename file="${application.splash}" property="splashscreen.basename"/>
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
+        <j2seproject3:copylibs>
+            <customize>
+                <attribute name="Main-Class" value="${main.class}"/>
+                <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
+            </customize>
+        </j2seproject3:copylibs>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo>java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries" unless="splashscreen.available">
+        <j2seproject3:copylibs>
+            <customize>
+                <attribute name="Main-Class" value="${main.class}"/>
+            </customize>
+        </j2seproject3:copylibs>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo>java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries-and-splashscreen,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="-do-not-recompile">
+        <property name="javac.includes.binary" value=""/>
+    </target>
+    <target depends="init,compile-single" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <target depends="init,compile-test-single" name="run-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" if="have.sources" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/*.java"/>
+            </fileset>
+        </javadoc>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                JUNIT COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-test-depend">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                JUNIT EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:junit testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:junit excludes="" includes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <!--
+                =======================
+                JUNIT DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <mkdir dir="${build.test.results.dir}"/>
+        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <syspropertyset>
+                    <propertyref prefix="test-sys-prop."/>
+                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                </syspropertyset>
+                <arg value="${test.class}"/>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target name="-deps-clean-init" unless="built-clean.properties">
+        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
+        <delete file="${built-clean.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
+        <echo level="warn" message="Cycle detected: oldgears was already built"/>
+    </target>
+    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-clean.properties}" verbose="false"/>
+        <property file="${built-clean.properties}" prefix="already.built.clean."/>
+        <antcall target="-warn-already-built-clean"/>
+        <propertyfile file="${built-clean.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target name="-check-call-dep">
+        <property file="${call.built.properties}" prefix="already.built."/>
+        <condition property="should.call.dep">
+            <not>
+                <isset property="already.built.${call.subproject}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
+        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
+            <propertyset>
+                <propertyref prefix="transfer."/>
+                <mapper from="transfer.*" to="*" type="glob"/>
+            </propertyset>
+        </ant>
+    </target>
+</project>
diff --git a/tools/jackpotc/test/oldgears/nbproject/genfiles.properties b/tools/jackpotc/test/oldgears/nbproject/genfiles.properties
new file mode 100644
index 000000000..ece6336ba
--- /dev/null
+++ b/tools/jackpotc/test/oldgears/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=b54c0362
+build.xml.script.CRC32=4f6e4669
+build.xml.stylesheet.CRC32=958a1d3e@1.32.1.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=b54c0362
+nbproject/build-impl.xml.script.CRC32=dff725e7
+nbproject/build-impl.xml.stylesheet.CRC32=c75ce636@1.38.0.45
diff --git a/tools/jackpotc/test/oldgears/nbproject/project.properties b/tools/jackpotc/test/oldgears/nbproject/project.properties
new file mode 100644
index 000000000..afae06360
--- /dev/null
+++ b/tools/jackpotc/test/oldgears/nbproject/project.properties
@@ -0,0 +1,68 @@
+application.title=oldgears
+application.vendor=mbien
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/oldgears.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.gluegen-rt.jar=lib/gluegen-rt.jar
+file.reference.jogl.jar=lib/jogl.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${file.reference.gluegen-rt.jar}:\
+    ${file.reference.jogl.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
+main.class=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
diff --git a/tools/jackpotc/test/oldgears/nbproject/project.xml b/tools/jackpotc/test/oldgears/nbproject/project.xml
new file mode 100644
index 000000000..7ab06952e
--- /dev/null
+++ b/tools/jackpotc/test/oldgears/nbproject/project.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>oldgears</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>
diff --git a/tools/jackpotc/test/oldgears/src/jogl111/gears/Gears.java b/tools/jackpotc/test/oldgears/src/jogl111/gears/Gears.java
new file mode 100644
index 000000000..8f2cb7441
--- /dev/null
+++ b/tools/jackpotc/test/oldgears/src/jogl111/gears/Gears.java
@@ -0,0 +1,307 @@
+package jogl111.gears;
+
+import java.awt.*;
+import java.awt.event.*;
+
+import javax.media.opengl.*;
+import com.sun.opengl.util.*;
+
+/**
+ * Gears.java <BR>
+ * author: Brian Paul (converted to Java by Ron Cemer and Sven Goethel) <P>
+ *
+ * This version is equal to Brian Paul's version 1.2 1999/10/21
+ */
+
+public class Gears implements GLEventListener, MouseListener, MouseMotionListener {
+  public static void main(String[] args) {
+
+    Frame frame = new Frame("Gear Demo");
+    GLCanvas canvas = new GLCanvas(new GLCapabilities());
+
+    canvas.addGLEventListener(new Gears());
+    frame.add(canvas);
+    frame.setSize(300, 300);
+    final Animator animator = new Animator(canvas);
+    frame.addWindowListener(new WindowAdapter() {
+        public void windowClosing(WindowEvent e) {
+          // Run this on another thread than the AWT event queue to
+          // make sure the call to Animator.stop() completes before
+          // exiting
+          new Thread(new Runnable() {
+              public void run() {
+                animator.stop();
+                System.exit(0);
+              }
+            }).start();
+        }
+      });
+    frame.show();
+    animator.start();
+  }
+
+  private float view_rotx = 20.0f, view_roty = 30.0f, view_rotz = 0.0f;
+  private int gear1, gear2, gear3;
+  private float angle = 0.0f;
+
+  private int prevMouseX, prevMouseY;
+  private boolean mouseRButtonDown = false;
+
+  public void init(GLAutoDrawable drawable) {
+    // Use debug pipeline
+    // drawable.setGL(new DebugGL(drawable.getGL()));
+
+    GL gl = drawable.getGL();
+
+    System.err.println("INIT GL IS: " + gl.getClass().getName());
+
+    gl.setSwapInterval(1);
+
+    float pos[] = { 5.0f, 5.0f, 10.0f, 0.0f };
+    float red[] = { 0.8f, 0.1f, 0.0f, 1.0f };
+    float green[] = { 0.0f, 0.8f, 0.2f, 1.0f };
+    float blue[] = { 0.2f, 0.2f, 1.0f, 1.0f };
+
+    gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, pos, 0);
+    gl.glEnable(GL.GL_CULL_FACE);
+    gl.glEnable(GL.GL_LIGHTING);
+    gl.glEnable(GL.GL_LIGHT0);
+    gl.glEnable(GL.GL_DEPTH_TEST);
+
+    /* make the gears */
+    gear1 = gl.glGenLists(1);
+    gl.glNewList(gear1, GL.GL_COMPILE);
+    gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, red, 0);
+    gear(gl, 1.0f, 4.0f, 1.0f, 20, 0.7f);
+    gl.glEndList();
+
+    gear2 = gl.glGenLists(1);
+    gl.glNewList(gear2, GL.GL_COMPILE);
+    gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, green, 0);
+    gear(gl, 0.5f, 2.0f, 2.0f, 10, 0.7f);
+    gl.glEndList();
+
+    gear3 = gl.glGenLists(1);
+    gl.glNewList(gear3, GL.GL_COMPILE);
+    gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, blue, 0);
+    gear(gl, 1.3f, 2.0f, 0.5f, 10, 0.7f);
+    gl.glEndList();
+
+    gl.glEnable(GL.GL_NORMALIZE);
+
+    drawable.addMouseListener(this);
+    drawable.addMouseMotionListener(this);
+  }
+
+  public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
+    GL gl = drawable.getGL();
+
+    float h = (float)height / (float)width;
+
+    gl.glMatrixMode(GL.GL_PROJECTION);
+
+    System.err.println("GL_VENDOR: " + gl.glGetString(GL.GL_VENDOR));
+    System.err.println("GL_RENDERER: " + gl.glGetString(GL.GL_RENDERER));
+    System.err.println("GL_VERSION: " + gl.glGetString(GL.GL_VERSION));
+    gl.glLoadIdentity();
+    gl.glFrustum(-1.0f, 1.0f, -h, h, 5.0f, 60.0f);
+    gl.glMatrixMode(GL.GL_MODELVIEW);
+    gl.glLoadIdentity();
+    gl.glTranslatef(0.0f, 0.0f, -40.0f);
+  }
+
+  public void display(GLAutoDrawable drawable) {
+    angle += 2.0f;
+
+    GL gl = drawable.getGL();
+    if ((drawable instanceof GLJPanel) &&
+        !((GLJPanel) drawable).isOpaque() &&
+        ((GLJPanel) drawable).shouldPreserveColorBufferIfTranslucent()) {
+      gl.glClear(GL.GL_DEPTH_BUFFER_BIT);
+    } else {
+      gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+    }
+
+    gl.glPushMatrix();
+    gl.glRotatef(view_rotx, 1.0f, 0.0f, 0.0f);
+    gl.glRotatef(view_roty, 0.0f, 1.0f, 0.0f);
+    gl.glRotatef(view_rotz, 0.0f, 0.0f, 1.0f);
+
+    gl.glPushMatrix();
+    gl.glTranslatef(-3.0f, -2.0f, 0.0f);
+    gl.glRotatef(angle, 0.0f, 0.0f, 1.0f);
+    gl.glCallList(gear1);
+    gl.glPopMatrix();
+
+    gl.glPushMatrix();
+    gl.glTranslatef(3.1f, -2.0f, 0.0f);
+    gl.glRotatef(-2.0f * angle - 9.0f, 0.0f, 0.0f, 1.0f);
+    gl.glCallList(gear2);
+    gl.glPopMatrix();
+
+    gl.glPushMatrix();
+    gl.glTranslatef(-3.1f, 4.2f, 0.0f);
+    gl.glRotatef(-2.0f * angle - 25.0f, 0.0f, 0.0f, 1.0f);
+    gl.glCallList(gear3);
+    gl.glPopMatrix();
+
+    gl.glPopMatrix();
+  }
+
+  public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) {}
+
+  private void gear(GL gl,
+                    float inner_radius,
+                    float outer_radius,
+                    float width,
+                    int teeth,
+                    float tooth_depth)
+  {
+    int i;
+    float r0, r1, r2;
+    float angle, da;
+    float u, v, len;
+
+    r0 = inner_radius;
+    r1 = outer_radius - tooth_depth / 2.0f;
+    r2 = outer_radius + tooth_depth / 2.0f;
+
+    da = 2.0f * (float) Math.PI / teeth / 4.0f;
+
+    gl.glShadeModel(GL.GL_FLAT);
+
+    gl.glNormal3f(0.0f, 0.0f, 1.0f);
+
+    /* draw front face */
+    gl.glBegin(GL.GL_QUAD_STRIP);
+    for (i = 0; i <= teeth; i++)
+      {
+        angle = i * 2.0f * (float) Math.PI / teeth;
+        gl.glVertex3f(r0 * (float)Math.cos(angle), r0 * (float)Math.sin(angle), width * 0.5f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle), r1 * (float)Math.sin(angle), width * 0.5f);
+        if(i < teeth)
+          {
+            gl.glVertex3f(r0 * (float)Math.cos(angle), r0 * (float)Math.sin(angle), width * 0.5f);
+            gl.glVertex3f(r1 * (float)Math.cos(angle + 3.0f * da), r1 * (float)Math.sin(angle + 3.0f * da), width * 0.5f);
+          }
+      }
+    gl.glEnd();
+
+    /* draw front sides of teeth */
+    gl.glBegin(GL.GL_QUADS);
+    for (i = 0; i < teeth; i++)
+      {
+        angle = i * 2.0f * (float) Math.PI / teeth;
+        gl.glVertex3f(r1 * (float)Math.cos(angle), r1 * (float)Math.sin(angle), width * 0.5f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + da), r2 * (float)Math.sin(angle + da), width * 0.5f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + 2.0f * da), r2 * (float)Math.sin(angle + 2.0f * da), width * 0.5f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle + 3.0f * da), r1 * (float)Math.sin(angle + 3.0f * da), width * 0.5f);
+      }
+    gl.glEnd();
+
+    /* draw back face */
+    gl.glBegin(GL.GL_QUAD_STRIP);
+    for (i = 0; i <= teeth; i++)
+      {
+        angle = i * 2.0f * (float) Math.PI / teeth;
+        gl.glVertex3f(r1 * (float)Math.cos(angle), r1 * (float)Math.sin(angle), -width * 0.5f);
+        gl.glVertex3f(r0 * (float)Math.cos(angle), r0 * (float)Math.sin(angle), -width * 0.5f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle + 3 * da), r1 * (float)Math.sin(angle + 3 * da), -width * 0.5f);
+        gl.glVertex3f(r0 * (float)Math.cos(angle), r0 * (float)Math.sin(angle), -width * 0.5f);
+      }
+    gl.glEnd();
+
+    /* draw back sides of teeth */
+    gl.glBegin(GL.GL_QUADS);
+    for (i = 0; i < teeth; i++)
+      {
+        angle = i * 2.0f * (float) Math.PI / teeth;
+        gl.glVertex3f(r1 * (float)Math.cos(angle + 3 * da), r1 * (float)Math.sin(angle + 3 * da), -width * 0.5f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + 2 * da), r2 * (float)Math.sin(angle + 2 * da), -width * 0.5f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + da), r2 * (float)Math.sin(angle + da), -width * 0.5f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle), r1 * (float)Math.sin(angle), -width * 0.5f);
+      }
+    gl.glEnd();
+
+    /* draw outward faces of teeth */
+    gl.glBegin(GL.GL_QUAD_STRIP);
+    for (i = 0; i < teeth; i++)
+      {
+        angle = i * 2.0f * (float) Math.PI / teeth;
+        gl.glVertex3f(r1 * (float)Math.cos(angle), r1 * (float)Math.sin(angle), width * 0.5f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle), r1 * (float)Math.sin(angle), -width * 0.5f);
+        u = r2 * (float)Math.cos(angle + da) - r1 * (float)Math.cos(angle);
+        v = r2 * (float)Math.sin(angle + da) - r1 * (float)Math.sin(angle);
+        len = (float)Math.sqrt(u * u + v * v);
+        u /= len;
+        v /= len;
+        gl.glNormal3f(v, -u, 0.0f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + da), r2 * (float)Math.sin(angle + da), width * 0.5f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + da), r2 * (float)Math.sin(angle + da), -width * 0.5f);
+        gl.glNormal3f((float)Math.cos(angle), (float)Math.sin(angle), 0.0f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + 2 * da), r2 * (float)Math.sin(angle + 2 * da), width * 0.5f);
+        gl.glVertex3f(r2 * (float)Math.cos(angle + 2 * da), r2 * (float)Math.sin(angle + 2 * da), -width * 0.5f);
+        u = r1 * (float)Math.cos(angle + 3 * da) - r2 * (float)Math.cos(angle + 2 * da);
+        v = r1 * (float)Math.sin(angle + 3 * da) - r2 * (float)Math.sin(angle + 2 * da);
+        gl.glNormal3f(v, -u, 0.0f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle + 3 * da), r1 * (float)Math.sin(angle + 3 * da), width * 0.5f);
+        gl.glVertex3f(r1 * (float)Math.cos(angle + 3 * da), r1 * (float)Math.sin(angle + 3 * da), -width * 0.5f);
+        gl.glNormal3f((float)Math.cos(angle), (float)Math.sin(angle), 0.0f);
+      }
+    gl.glVertex3f(r1 * (float)Math.cos(0), r1 * (float)Math.sin(0), width * 0.5f);
+    gl.glVertex3f(r1 * (float)Math.cos(0), r1 * (float)Math.sin(0), -width * 0.5f);
+    gl.glEnd();
+
+    gl.glShadeModel(GL.GL_SMOOTH);
+
+    /* draw inside radius cylinder */
+    gl.glBegin(GL.GL_QUAD_STRIP);
+    for (i = 0; i <= teeth; i++)
+      {
+        angle = i * 2.0f * (float) Math.PI / teeth;
+        gl.glNormal3f(-(float)Math.cos(angle), -(float)Math.sin(angle), 0.0f);
+        gl.glVertex3f(r0 * (float)Math.cos(angle), r0 * (float)Math.sin(angle), -width * 0.5f);
+        gl.glVertex3f(r0 * (float)Math.cos(angle), r0 * (float)Math.sin(angle), width * 0.5f);
+      }
+    gl.glEnd();
+  }
+
+  // Methods required for the implementation of MouseListener
+  public void mouseEntered(MouseEvent e) {}
+  public void mouseExited(MouseEvent e) {}
+
+  public void mousePressed(MouseEvent e) {
+    prevMouseX = e.getX();
+    prevMouseY = e.getY();
+    if ((e.getModifiers() & e.BUTTON3_MASK) != 0) {
+      mouseRButtonDown = true;
+    }
+  }
+
+  public void mouseReleased(MouseEvent e) {
+    if ((e.getModifiers() & e.BUTTON3_MASK) != 0) {
+      mouseRButtonDown = false;
+    }
+  }
+
+  public void mouseClicked(MouseEvent e) {}
+
+  // Methods required for the implementation of MouseMotionListener
+  public void mouseDragged(MouseEvent e) {
+    int x = e.getX();
+    int y = e.getY();
+    Dimension size = e.getComponent().getSize();
+
+    float thetaY = 360.0f * ( (float)(x-prevMouseX)/(float)size.width);
+    float thetaX = 360.0f * ( (float)(prevMouseY-y)/(float)size.height);
+
+    prevMouseX = x;
+    prevMouseY = y;
+
+    view_rotx += thetaX;
+    view_roty += thetaY;
+  }
+
+  public void mouseMoved(MouseEvent e) {}
+}
+
-- 
cgit v1.2.3


From 11ddcfe64ab2ef99f51bdd44e598703995662ae2 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 22 Apr 2010 00:41:38 +0200
Subject: JNLP: Update Check Background - Always

---
 jnlp-files/jogl-all-awt.jnlp             | 1 +
 jnlp-files/jogl-all-noawt.jnlp           | 1 +
 jnlp-files/jogl-awt.jnlp                 | 1 +
 jnlp-files/jogl-core.jnlp                | 1 +
 jnlp-files/jogl-gl2es12.jnlp             | 1 +
 jnlp-files/nativewindow-all-awt.jnlp     | 1 +
 jnlp-files/nativewindow-awt.jnlp         | 1 +
 jnlp-files/nativewindow.jnlp             | 1 +
 jnlp-files/newt-all-awt.jnlp             | 1 +
 jnlp-files/newt-all-noawt.jnlp           | 1 +
 jnlp-files/newt-awt.jnlp                 | 1 +
 jnlp-files/newt-jogl.jnlp                | 1 +
 jnlp-files/newt.jnlp                     | 1 +
 make/scripts/all-deploy-webstarttest.sh  | 4 ++--
 make/scripts/deploy-jnlp-webstarttest.sh | 3 +++
 15 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/jnlp-files/jogl-all-awt.jnlp b/jnlp-files/jogl-all-awt.jnlp
index 125980882..718d09da7 100644
--- a/jnlp-files/jogl-all-awt.jnlp
+++ b/jnlp-files/jogl-all-awt.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">Java programming language binding for the OpenGL 3D graphics API - ALL.AWT</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/jnlp-files/jogl-all-noawt.jnlp b/jnlp-files/jogl-all-noawt.jnlp
index 7159ba8e7..3e4536dc5 100644
--- a/jnlp-files/jogl-all-noawt.jnlp
+++ b/jnlp-files/jogl-all-noawt.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">Java programming language binding for the OpenGL 3D graphics API - ALL.NO_AWT</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/jnlp-files/jogl-awt.jnlp b/jnlp-files/jogl-awt.jnlp
index 03c61b37a..3e823ce50 100644
--- a/jnlp-files/jogl-awt.jnlp
+++ b/jnlp-files/jogl-awt.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">Java programming language binding for the OpenGL 3D graphics API - AWT.</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/jnlp-files/jogl-core.jnlp b/jnlp-files/jogl-core.jnlp
index c1dbcfc1d..05ea506e4 100644
--- a/jnlp-files/jogl-core.jnlp
+++ b/jnlp-files/jogl-core.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">Java programming language binding for the OpenGL 3D graphics API - CORE.</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/jnlp-files/jogl-gl2es12.jnlp b/jnlp-files/jogl-gl2es12.jnlp
index 25402adcb..4a2c8502d 100644
--- a/jnlp-files/jogl-gl2es12.jnlp
+++ b/jnlp-files/jogl-gl2es12.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">Java programming language binding for the OpenGL 3D graphics API - GL2ES12.</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/jnlp-files/nativewindow-all-awt.jnlp b/jnlp-files/nativewindow-all-awt.jnlp
index f22166ecb..34edf4a1f 100644
--- a/jnlp-files/nativewindow-all-awt.jnlp
+++ b/jnlp-files/nativewindow-all-awt.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">Java API for a binding to a native windowing system - 2.0 - ALL.AWT</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/jnlp-files/nativewindow-awt.jnlp b/jnlp-files/nativewindow-awt.jnlp
index aa07c3a24..1cc1a62be 100644
--- a/jnlp-files/nativewindow-awt.jnlp
+++ b/jnlp-files/nativewindow-awt.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">Java API for a binding to a native windowing system - 2.0 - AWT</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/jnlp-files/nativewindow.jnlp b/jnlp-files/nativewindow.jnlp
index 60a07aede..b8ed6f36f 100644
--- a/jnlp-files/nativewindow.jnlp
+++ b/jnlp-files/nativewindow.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">Java API for a binding to a native windowing system - 2.0 - CORE</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/jnlp-files/newt-all-awt.jnlp b/jnlp-files/newt-all-awt.jnlp
index 7378e8ca2..24183b9e2 100644
--- a/jnlp-files/newt-all-awt.jnlp
+++ b/jnlp-files/newt-all-awt.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">NEWT - A NativeWindow Interface implementation - ALL.AWT</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/jnlp-files/newt-all-noawt.jnlp b/jnlp-files/newt-all-noawt.jnlp
index 752d96add..36f437296 100644
--- a/jnlp-files/newt-all-noawt.jnlp
+++ b/jnlp-files/newt-all-noawt.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">NEWT - A NativeWindow Interface implementation - ALL.NO_AWT</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/jnlp-files/newt-awt.jnlp b/jnlp-files/newt-awt.jnlp
index 28bb8e706..f4cd0799e 100644
--- a/jnlp-files/newt-awt.jnlp
+++ b/jnlp-files/newt-awt.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">NEWT - A NativeWindow Interface implementation - AWT</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/jnlp-files/newt-jogl.jnlp b/jnlp-files/newt-jogl.jnlp
index 1ac69781a..bd8d8a675 100644
--- a/jnlp-files/newt-jogl.jnlp
+++ b/jnlp-files/newt-jogl.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">NEWT - A NativeWindow Interface implementation - JOGL</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/jnlp-files/newt.jnlp b/jnlp-files/newt.jnlp
index cb6899256..71eb9952d 100644
--- a/jnlp-files/newt.jnlp
+++ b/jnlp-files/newt.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">NEWT - A NativeWindow Interface implementation - CORE</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/make/scripts/all-deploy-webstarttest.sh b/make/scripts/all-deploy-webstarttest.sh
index 0904ac233..e3ee24a6d 100755
--- a/make/scripts/all-deploy-webstarttest.sh
+++ b/make/scripts/all-deploy-webstarttest.sh
@@ -17,8 +17,8 @@ shift
 if [ -z "$url" -o -z "$joglbuilddir" -o -z "$wsdir" ] ; then
     echo Usage $0 codebase-url jogl-builddir webstartdir
     echo Examples
-    echo    sh scripts/all-deploy-webstarttest.sh file:////usr/local/projects/JOGL/webstart ../build-x86_64 ../../webstart
-    echo    sh scripts/all-deploy-webstarttest.sh http://domain.org/jogl/webstart ../build-win32 ../../webstart
+    echo    sh $0 file:////usr/local/projects/JOGL/webstart ../build-x86_64 ../../webstart
+    echo    sh $0 http://domain.org/jogl/webstart ../build-win32 ../../webstart
     exit 1
 fi
 
diff --git a/make/scripts/deploy-jnlp-webstarttest.sh b/make/scripts/deploy-jnlp-webstarttest.sh
index 26a0f8b35..8f3b0d216 100755
--- a/make/scripts/deploy-jnlp-webstarttest.sh
+++ b/make/scripts/deploy-jnlp-webstarttest.sh
@@ -11,6 +11,9 @@ shift
 
 if [ -z "$url" -o -z "$joglbuilddir" -o -z "$wsdir" ] ; then
     echo usage $0 codebase-url jogl-builddir webstartdir
+    echo Examples
+    echo    sh $0 file:////usr/local/projects/JOGL/webstart ../build-x86_64 ../../webstart
+    echo    sh $0 http://domain.org/jogl/webstart ../build-win32 ../../webstart
     exit 1
 fi
 
-- 
cgit v1.2.3


From 94c4ef007321f24177b32174d1ab24c91271da1f Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 22 Apr 2010 16:19:34 +0200
Subject: Migrating gl2/gl3/gl4 -> gldesktop. Use JOGL_GLDESKTOP_.. when using
 profile.jogl script

---
 etc/profile.jogl            |  24 +++++-----
 make/build-common.xml       |  22 +++++----
 make/build-jogl.xml         | 112 +++++++++++++++-----------------------------
 make/java-run-newt.sh       |   4 +-
 make/java-run.sh            |   2 +-
 make/lstjars.sh             |   8 ++--
 src/newt/native/X11Window.c |   5 +-
 7 files changed, 72 insertions(+), 105 deletions(-)

diff --git a/etc/profile.jogl b/etc/profile.jogl
index 42162457e..025b74dd8 100755
--- a/etc/profile.jogl
+++ b/etc/profile.jogl
@@ -2,7 +2,7 @@
 
 function print_usage()
 {
-    echo "Usage: $0 {JOGL_ALL|JOGL_ALL_NOAWT|JOGL_ES1_MIN|JOGL_ES1_MAX|JOGL_ES2_MIN|JOGL_ES2_MAX|JOGL_GL2ES12_MIN|JOGL_GL2ES12_MAX|JOGL_GL2_MIN|JOGL_GL2_MAX} [jogl-build-dir]"
+    echo "Usage: $0 {JOGL_ALL|JOGL_ALL_NOAWT|JOGL_ES1_MIN|JOGL_ES1_MAX|JOGL_ES2_MIN|JOGL_ES2_MAX|JOGL_GL2ES12_MIN|JOGL_GL2ES12_MAX|JOGL_GLDESKTOP_MIN|JOGL_GLDESKTOP_MAX} [jogl-build-dir]"
 }
 
 function concat_jogl_list()
@@ -32,7 +32,7 @@ JOGL_CORE="nativewindow.core.jar nativewindow.os.$OSS.jar jogl.core.jar jogl.os.
 
 JOGL_TEST="jogl.test.jar"
 
-JOGL_JAR_ALL_NOAWT="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gl2.jar jogl.gl2.dbg.jar jogl.util.gl2.jar jogl.gl3.jar jogl.gl3.dbg.jar jogl.gl4.jar jogl.gl4.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar jogl.util.fixedfuncemu.jar jogl.cg.jar"
+JOGL_JAR_ALL_NOAWT="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gldesktop.jar jogl.gldesktop.dbg.jar jogl.util.gldesktop.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gldesktop.jar jogl.util.gldesktop.jar jogl.util.fixedfuncemu.jar jogl.cg.jar"
 JOGL_JAR_ALL="$JOGL_JAR_ALL_NOAWT $JOGL_AWT"
 JOGL_LIB_ALL="libjogl_desktop.so libjogl_es1.so libjogl_es2.so libnewt.so libjogl_awt.so"
 
@@ -51,13 +51,13 @@ JOGL_JAR_GL2ES12_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gles1.db
 JOGL_LIB_GL2ES12_MIN="libjogl_gl2es12.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
 JOGL_LIB_GL2ES12_MAX="libjogl_gl2es12.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
 
-JOGL_JAR_GL2_MIN="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2.jar jogl.gl2.dbg.jar"
-JOGL_JAR_GL2_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2.jar jogl.gl2.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar $JOGL_AWT jogl.cg.jar"
-JOGL_LIB_GL2_MIN="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
-JOGL_LIB_GL2_MAX="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
+JOGL_JAR_GLDESKTOP_MIN="$JOGL_CORE jogl.os.$OSS.jar jogl.gldesktop.jar jogl.gldesktop.dbg.jar"
+JOGL_JAR_GLDESKTOP_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gldesktop.jar jogl.gldesktop.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gldesktop.jar jogl.util.gldesktop.jar $JOGL_AWT jogl.cg.jar"
+JOGL_LIB_GLDESKTOP_MIN="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
+JOGL_LIB_GLDESKTOP_MAX="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
 
-export JOGL_JAR_ALL JOGL_JAR_ALL_NOAWT JOGL_JAR_ES1_MIN JOGL_JAR_ES1_MAX JOGL_JAR_ES2_MIN JOGL_JAR_ES2_MAX JOGL_JAR_GL2ES12_MIN JOGL_JAR_GL2ES12_MAX JOGL_JAR_GL2_MIN JOGL_JAR_GL2_MAX
-export JOGL_LIB_ALL JOGL_LIB_ES1_MIN JOGL_LIB_ES1_MAX JOGL_LIB_ES2_MIN JOGL_LIB_ES2_MAX JOGL_LIB_GL2ES12_MIN JOGL_LIB_GL2ES12_MAX JOGL_LIB_GL2_MIN JOGL_LIB_GL2_MAX
+export JOGL_JAR_ALL JOGL_JAR_ALL_NOAWT JOGL_JAR_ES1_MIN JOGL_JAR_ES1_MAX JOGL_JAR_ES2_MIN JOGL_JAR_ES2_MAX JOGL_JAR_GL2ES12_MIN JOGL_JAR_GL2ES12_MAX JOGL_JAR_GLDESKTOP_MIN JOGL_JAR_GLDESKTOP_MAX
+export JOGL_LIB_ALL JOGL_LIB_ES1_MIN JOGL_LIB_ES1_MAX JOGL_LIB_ES2_MIN JOGL_LIB_ES2_MAX JOGL_LIB_GL2ES12_MIN JOGL_LIB_GL2ES12_MAX JOGL_LIB_GLDESKTOP_MIN JOGL_LIB_GLDESKTOP_MAX
 
 THISDIR=`dirname $0`
 
@@ -125,11 +125,11 @@ if [ ! -z "$JOGL_PROFILE" ] ; then
         JOGL_GL2ES12_MAX)
             JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_GL2ES12_MAX)
             ;;
-        JOGL_GL2_MIN)
-            JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_GL2_MIN)
+        JOGL_GLDESKTOP_MIN)
+            JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_GLDESKTOP_MIN)
             ;;
-        JOGL_GL2_MAX)
-            JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_GL2_MAX)
+        JOGL_GLDESKTOP_MAX)
+            JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_GLDESKTOP_MAX)
             ;;
     esac
 
diff --git a/make/build-common.xml b/make/build-common.xml
index ccbf56fd6..cc40a5cd4 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -4,6 +4,14 @@
 
     <description>Common JOGL Stuff</description>
 
+    <fail message="Please build using Ant 1.8.0 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.8.0"/>
+            </not>
+        </condition>
+    </fail>
+
     <!-- Pull in GlueGen cpptasks build file -->
     <property name="gluegen.root" value="../../gluegen" />
     <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
@@ -254,7 +262,7 @@
         <property name="jogl.egl.jar"                   value="${build.jogl}/jogl.egl.jar" />
         <property name="jogl.glutess.jar"               value="${build.jogl}/jogl.glu.tess.jar" />
         <property name="jogl.glumipmap.jar"             value="${build.jogl}/jogl.glu.mipmap.jar" />
-        <property name="jogl.glugl2.jar"                value="${build.jogl}/jogl.glu.gl2.jar" />
+        <property name="jogl.glugldesktop.jar"                value="${build.jogl}/jogl.glu.gldesktop.jar" />
 
         <property name="jogl.os.x11.jar"                value="${build.jogl}/jogl.os.x11.jar" />
         <property name="jogl.os.win.jar"                value="${build.jogl}/jogl.os.win.jar" />
@@ -262,20 +270,14 @@
 
         <property name="jogl.gl2es12.jar"               value="${build.jogl}/jogl.gl2es12.jar" />
 
-        <property name="jogl.gl2.jar"                   value="${build.jogl}/jogl.gl2.jar" />
-        <property name="jogl.gl2.dbg.jar"               value="${build.jogl}/jogl.gl2.dbg.jar" />
-
-        <property name="jogl.gl3.jar"                   value="${build.jogl}/jogl.gl3.jar" />
-        <property name="jogl.gl3.dbg.jar"               value="${build.jogl}/jogl.gl3.dbg.jar" />
-
-        <property name="jogl.gl4.jar"                   value="${build.jogl}/jogl.gl4.jar" />
-        <property name="jogl.gl4.dbg.jar"               value="${build.jogl}/jogl.gl4.dbg.jar" />
+        <property name="jogl.gldesktop.jar"             value="${build.jogl}/jogl.gldesktop.jar" />
+        <property name="jogl.gldesktop.dbg.jar"         value="${build.jogl}/jogl.gldesktop.dbg.jar" />
 
         <property name="jogl.omx.jar"                   value="${build.jogl}/jogl.omx.jar" />
 
         <property name="jogl.awt.jar"                   value="${build.jogl}/jogl.awt.jar" />
         <property name="jogl.util.jar"                  value="${build.jogl}/jogl.util.jar" />
-        <property name="jogl.util.gl2.jar"              value="${build.jogl}/jogl.util.gl2.jar" />
+        <property name="jogl.util.gldesktop.jar"              value="${build.jogl}/jogl.util.gldesktop.jar" />
         <property name="jogl.util.awt.jar"              value="${build.jogl}/jogl.util.awt.jar" />
         <property name="jogl.util.fixedfuncemu.jar"     value="${build.jogl}/jogl.util.fixedfuncemu.jar" />
         <property name="jogl.sdk.jar"                   value="${build.jogl}/jogl.sdk.jar" />
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 6d95ebea8..1db63812e 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -86,7 +86,7 @@
         <property name="java.part.glumipmap"
                   value="com/jogamp/opengl/impl/glu/mipmap/**"/>
 
-        <property name="java.part.glugl2"
+        <property name="java.part.glugldesktop"
                   value="com/jogamp/opengl/impl/glu/gl2/** com/jogamp/opengl/impl/glu/nurbs/** com/jogamp/opengl/impl/glu/registry/** javax/media/opengl/glu/gl2/**"/>
 
         <property name="java.part.openmax"
@@ -104,23 +104,11 @@
         <property name="java.part.cgl"
                   value="com/jogamp/opengl/impl/macosx/cgl/*"/>
 
-        <property name="java.part.gl4"
-                  value="com/jogamp/opengl/impl/**/gl4/**"/>
+        <property name="java.part.gldesktop"
+                  value="com/jogamp/opengl/impl/**/gl2/** com/jogamp/opengl/impl/**/gl3/** com/jogamp/opengl/impl/**/gl4/**"/>
 
-        <property name="java.part.gl4.dbg"
-                  value="javax/media/opengl/TraceGL4.* javax/media/opengl/DebugGL4.* javax/media/opengl/TraceGL4bc.* javax/media/opengl/DebugGL4bc.*"/>
-
-        <property name="java.part.gl3"
-                  value="com/jogamp/opengl/impl/**/gl3/**"/>
-
-        <property name="java.part.gl3.dbg"
-                  value="javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.*"/>
-
-        <property name="java.part.gl2"
-                  value="com/jogamp/opengl/impl/**/gl2/**"/>
-
-        <property name="java.part.gl2.dbg"
-                  value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL2GL3.* javax/media/opengl/DebugGL2GL3.*"/>
+        <property name="java.part.gldesktop.dbg"
+                  value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL2GL3.* javax/media/opengl/DebugGL2GL3.* javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.* javax/media/opengl/TraceGL4.* javax/media/opengl/DebugGL4.* javax/media/opengl/TraceGL4bc.* javax/media/opengl/DebugGL4bc.*"/>
 
         <property name="java.part.es1"
                   value="javax/media/opengl/**/es1/** com/jogamp/opengl/**/es1/**"/>
@@ -143,7 +131,7 @@
         <property name="java.part.util.awt"
                   value="com/jogamp/opengl/util/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/>
 
-        <property name="java.part.util.gl2"
+        <property name="java.part.util.gldesktop"
                   value="com/jogamp/opengl/util/**/gl2/**"/>
 
         <property name="java.part.util.glsl"
@@ -176,7 +164,7 @@
                   value="com/jogamp/opengl/impl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" />
 
         <property name="java.excludes.cdcfp"
-                  value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gl2} ${java.part.gl2.dbg} ${java.part.gl3} ${java.part.gl3.dbg} ${java.part.awt} ${java.part.glugl2} ${java.part.util.awt} ${java.part.util.gl2} com/jogamp/opengl/util/TGAWriter.java"/>
+                  value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gldesktop} ${java.part.gldesktop.dbg} ${java.part.awt} ${java.part.glugldesktop} ${java.part.util.awt} ${java.part.util.gldesktop} com/jogamp/opengl/util/TGAWriter.java"/>
 
         <condition property="java.excludes.desktop"
                    value="${java.part.glx} ${java.excludes.cdcfp}">
@@ -225,7 +213,7 @@
         <!-- The GL headers from which Java files are generated -->
         <property name="stub.includes.opengl"       value="${stub.includes}/opengl" />
 
-        <dirset id="stub.includes.fileset.all.gl2" dir=".">
+        <dirset id="stub.includes.fileset.all.gldesktop" dir=".">
             <include name="${stub.includes}/opengl/**" />
             <include name="${stub.includes}/macosx/**" />
             <include name="${stub.includes}/win32/**" />
@@ -420,7 +408,7 @@
         <gluegen src="${stub.includes.opengl}/gles2.c"
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -432,7 +420,7 @@
         <gluegen src="${stub.includes.opengl}/gles1.c"
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2_es1.cfg" 
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -444,7 +432,7 @@
         <gluegen src="${stub.includes.opengl}/gles2.c"
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2_es2.cfg" 
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -456,14 +444,14 @@
         <gluegen src="${stub.includes.opengl}/gl3.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl3-set.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
         <gluegen src="${stub.includes.opengl}/gl2.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2_gl3.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -475,7 +463,7 @@
         <gluegen src="${stub.includes.opengl}/gl2.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl2.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -487,7 +475,7 @@
         <gluegen src="${stub.includes.opengl}/gl3.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl3.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -499,7 +487,7 @@
         <gluegen src="${stub.includes.opengl}/gl3bc.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl3bc.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -511,7 +499,7 @@
         <gluegen src="${stub.includes.opengl}/gl4.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl4.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -523,7 +511,7 @@
         <gluegen src="${stub.includes.opengl}/gl4bc.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl4bc.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -535,7 +523,7 @@
         <gluegen src="${stub.includes.opengl}/gles1.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-es1.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -547,7 +535,7 @@
         <gluegen src="${stub.includes.opengl}/gles2.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-es2.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -559,7 +547,7 @@
         <echo message="Generating GL interface and implementation" />
         <gluegen src="${gl.c}" 
                  config="${gl.cfg.nsig}"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.nativesig.NativeSignatureEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -571,7 +559,7 @@
         <gluegen src="${stub.includes.opengl}/glu.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/glu-base.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -583,7 +571,7 @@
         <gluegen src="${stub.includes.opengl}/glu.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/glu-gl2es1.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -595,7 +583,7 @@
         <gluegen src="${stub.includes.opengl}/glu.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/glu-gl2.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -607,7 +595,7 @@
         <gluegen src="${glext.platform.header}" 
                  outputRootDir="${build.jogl}"
                  config="${glext.platform.cfg}"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -990,7 +978,7 @@
         <copy todir="${src.generated.java-cdc}">
             <fileset dir="${src.generated.java}"
                      includes="**" 
-                     excludes="com/jogamp/opengl/cg/** com/jogamp/opengl/impl/gl2/** com/jogamp/opengl/impl/gl3/** com/jogamp/opengl/impl/glu/gl2/** javax/media/opengl/glu/gl2/**"/>
+                     excludes="com/jogamp/opengl/cg/** com/jogamp/opengl/impl/gl2/** com/jogamp/opengl/impl/gl3/** com/jogamp/opengl/impl/gl4/** com/jogamp/opengl/impl/glu/gl2/** javax/media/opengl/glu/gl2/**"/>
         </copy>
         <copy todir="${classes-cdc}">
             <fileset dir="${classes}"
@@ -1433,7 +1421,7 @@
       <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll -->
       <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es1" />
       <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es2" />
-      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_gl2" />
+      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_desktop" />
       <antcall target="c.manifest.cg" inheritRefs="true" />
     </target>
 
@@ -1657,7 +1645,7 @@
         <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.util.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.util} ${java.part.util.glsl}"
-                     excludes="${java.part.util.awt} ${java.part.util.gl2} ${java.part.util.fixedfuncemu}"/>
+                     excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/>
         </jar>
         <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.util.fixedfuncemu.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
@@ -1668,47 +1656,25 @@
     </target>
 
     <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop">
-        <!--os specific gl2-->
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl2.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.gl2}, ${java.part.openmax}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
-        </jar>
-
-        <!--os specific gl3-->
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl3.jar}" filesonly="true">
+        <!--os specific gldesktop-->
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gldesktop.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.gl3}, ${java.part.openmax}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
-        </jar>
-
-        <!--os specific gl4-->
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl4.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.gl4}, ${java.part.openmax}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
+                     includes="${java.part.gldesktop}, ${java.part.openmax}"
+                     excludes="${java.part.gldesktop.dbg}, ${java.part.glugldesktop}"/>
         </jar>
 
         <!-- misc -->
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl2.dbg.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.gl2.dbg}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl3.dbg.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.gl3.dbg}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl4.dbg.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gldesktop.dbg.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.gl4.dbg}"/>
+                     includes="${java.part.gldesktop.dbg}"/>
         </jar>
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.glugl2.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.glugldesktop.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.glugl2}"/>
+                     includes="${java.part.glugldesktop}"/>
         </jar>
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.gl2.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.gldesktop.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.util.gl2}"
+                     includes="${java.part.util.gldesktop}"
                      excludes="com/jogamp/opengl/**/awt/**"/>
         </jar>
     </target>
@@ -1734,7 +1700,7 @@
         <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.util} ${java.part.util.glsl}"
-                     excludes="${java.part.util.awt} ${java.part.util.gl2} ${java.part.util.fixedfuncemu}"/>
+                     excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/>
         </jar>
         <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true">
             <fileset dir="${classes}"
diff --git a/make/java-run-newt.sh b/make/java-run-newt.sh
index cb256e273..384cf24c8 100755
--- a/make/java-run-newt.sh
+++ b/make/java-run-newt.sh
@@ -7,7 +7,7 @@ function print_usage() {
 if [ -z "$1" ] ; then
     echo JOGL BUILD DIR missing
     print_usage
-    return
+    exit
 fi
 
 . ./setenv-jogl.sh $1
@@ -21,7 +21,7 @@ if [ $MOSX -eq 1 ] ; then
 fi
 
 # D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
-# D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState"
+D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState"
 # D_ARGS="-Dnativewindow.debug.X11Util=true -Djogl.debug.GLDrawableFactory=true"
 # D_ARGS="-Dnativewindow.debug.X11Util=true"
 
diff --git a/make/java-run.sh b/make/java-run.sh
index 63fb6d3e9..5e48cef3a 100755
--- a/make/java-run.sh
+++ b/make/java-run.sh
@@ -7,7 +7,7 @@ function print_usage() {
 if [ -z "$1" ] ; then
     echo JOGL BUILD DIR missing
     print_usage
-    return
+    exit
 fi
 
 . ./setenv-jogl.sh $1
diff --git a/make/lstjars.sh b/make/lstjars.sh
index 80fbe2566..7691bfa2d 100644
--- a/make/lstjars.sh
+++ b/make/lstjars.sh
@@ -51,11 +51,11 @@ function listdeployment() {
     echo
 
     echo JOGL GL2 NEWT 
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gldesktop.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz
     echo
 
     echo JOGL GL2 AWT
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gldesktop.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz
     echo
 
     echo JOGL ALL AWT
@@ -125,8 +125,8 @@ mkdir -p nope
 
 mv *.cdc.lst *.all*.lst nope/
 
-mv jogl.gl2.*.lst nope/
-echo duplicates - w/o gl2.*
+mv jogl.gldesktop.*.lst nope/
+echo duplicates - w/o gldesktop.*
 echo
 sort jogl*.lst | uniq -d
 mv nope/* .
diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index 9b5c420c9..75237a210 100755
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -367,14 +367,13 @@ static uintptr_t getPtrOut32Long(unsigned long * src) {
 }
 
 static void setJavaWindowProperty(JNIEnv *env, Display *dpy, Window window, jlong javaObjectAtom, jobject jwindow) {
-    unsigned long jogl_java_object_data[2]; // FIXME uint32_t ?
+    unsigned long jogl_java_object_data[2]; // X11 is based on 'unsigned long'
     int nitems_32 = putPtrIn32Long( jogl_java_object_data, (uintptr_t) jwindow);
 
     {
         jobject test = (jobject) getPtrOut32Long(jogl_java_object_data);
         if( ! (jwindow==test) ) {
-            _throwNewRuntimeException(dpy, env, "Internal Error .. Encoded Window ref not the same %p != %p !", jwindow, test);
-            return;
+            _FatalError(env, "Internal Error .. Encoded Window ref not the same %p != %p !", jwindow, test);
         }
     }
 
-- 
cgit v1.2.3


From 848df0f3b4d2cd27e03fc25c424759b870c6514b Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 22 Apr 2010 20:39:36 +0200
Subject: Bring back GL2ES12 impl. for GL2ES1 and GL2ES2 desktop j2se and cdc.
 Fixing profiles accordingly.

---
 make/build-jogl.xml                                |  80 +++-
 make/config/jogl/gl-gl2es12.cfg                    |  90 +++++
 make/config/jogl/gl-impl-CustomCCode-gl2es12.c     |  24 ++
 .../jogl/gl-impl-CustomJavaCode-gl2es12.java       | 414 +++++++++++++++++++++
 make/config/jogl/obsolete/gl-gl2es12.cfg           |  90 -----
 .../config/jogl/obsolete/gl-impl-CustomCCode-gl2.c |  24 --
 .../jogl/obsolete/gl-impl-CustomCCode-gl2es12.c    |  24 --
 .../config/jogl/obsolete/gl-impl-CustomCCode-gl3.c |  24 --
 .../jogl/obsolete/gl-impl-CustomJavaCode-gl2.java  | 385 -------------------
 .../obsolete/gl-impl-CustomJavaCode-gl2es12.java   | 353 ------------------
 make/lstjars.sh                                    |   6 +-
 make/make.jogl.all.linux-x86_64.sh                 |   1 +
 make/make.jogl.all.win64.bat                       |  17 +
 .../opengl/impl/ExtensionAvailabilityCache.java    |   4 +-
 .../com/jogamp/opengl/impl/GLContextImpl.java      |   5 +-
 .../com/jogamp/opengl/impl/GLJNILibLoader.java     |   9 +
 .../jogamp/opengl/impl/x11/glx/X11GLXContext.java  |   2 +-
 src/jogl/classes/javax/media/opengl/GLProfile.java |  93 +++--
 18 files changed, 705 insertions(+), 940 deletions(-)
 create mode 100644 make/config/jogl/gl-gl2es12.cfg
 create mode 100644 make/config/jogl/gl-impl-CustomCCode-gl2es12.c
 create mode 100644 make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
 delete mode 100644 make/config/jogl/obsolete/gl-gl2es12.cfg
 delete mode 100644 make/config/jogl/obsolete/gl-impl-CustomCCode-gl2.c
 delete mode 100644 make/config/jogl/obsolete/gl-impl-CustomCCode-gl2es12.c
 delete mode 100644 make/config/jogl/obsolete/gl-impl-CustomCCode-gl3.c
 delete mode 100644 make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2.java
 delete mode 100644 make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2es12.java
 create mode 100644 make/make.jogl.all.win64.bat

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 1db63812e..760200398 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -104,6 +104,9 @@
         <property name="java.part.cgl"
                   value="com/jogamp/opengl/impl/macosx/cgl/*"/>
 
+        <property name="java.part.gl2es12"
+                  value="com/jogamp/opengl/impl/gl2es12/**"/>
+
         <property name="java.part.gldesktop"
                   value="com/jogamp/opengl/impl/**/gl2/** com/jogamp/opengl/impl/**/gl3/** com/jogamp/opengl/impl/**/gl4/**"/>
 
@@ -517,6 +520,18 @@
         </gluegen>
     </target>
 
+    <target name="java.generate.gl2es12">
+        <echo message="Generating GL2ES12 implementation" />
+        <antcall target="java.generate.copy2temp" inheritRefs="true" />
+        <gluegen src="${stub.includes.opengl}/gl2es12.c" 
+                 outputRootDir="${build.jogl}"
+                 config="${config.jogl}/gl-gl2es12.cfg"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
+                 emitter="com.sun.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen.classpath" />
+        </gluegen>
+    </target>  
+
     <target name="java.generate.gles1">
         <echo message="Generating GLES1 interface and implementation" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
@@ -541,7 +556,7 @@
         </gluegen>
     </target>
 
-    <target name="java.generate.gl.all" depends="java.generate.gl_if, java.generate.gl2_es1_if, java.generate.gl2_es2_if, java.generate.gl2_gl3_if, java.generate.gl2, java.generate.gl3, java.generate.gl3bc, java.generate.gl4, java.generate.gl4bc, java.generate.gles1, java.generate.gles2"/>
+    <target name="java.generate.gl.all" depends="java.generate.gl_if, java.generate.gl2_es1_if, java.generate.gl2_es2_if, java.generate.gl2_gl3_if, java.generate.gl2, java.generate.gl3, java.generate.gl3bc, java.generate.gl4, java.generate.gl4bc, java.generate.gl2es12, java.generate.gles1, java.generate.gles2"/>
 
     <!-- target name="java.generate.gl.nsig" if="gluegen.nsig">
         <echo message="Generating GL interface and implementation" />
@@ -778,6 +793,21 @@
 
     </target>        
 
+    <target name="java.generate.composable.pipeline.check.gl2es12">
+        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
+             (the uptodate element doesn't support arbitrary source and destination files) -->
+        <dependset>
+            <srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES12.class" />
+            <targetfileset dir="${src.generated.java}/javax/media/opengl"
+                           includes="DebugGL2ES12.java,TraceGL2ES12.java" />
+        </dependset>
+                           
+        <!-- Now choose one of the two to test to see if we have to regenerate -->
+        <uptodate property="java.generate.composable.pipeline.skip.gl2es12"
+                  srcfile="${classes}/javax/media/opengl/GL2ES12.class"
+                  targetfile="${src.generated.java}/javax/media/opengl/DebugGL2ES12.java" />
+    </target>   
+
     <target name="java.generate.composable.pipeline.check.gl2">
         <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
              (the uptodate element doesn't support arbitrary source and destination files) -->
@@ -1286,6 +1316,22 @@
           <include name="${rootrel.generated.c.jogl}/Windows/WGL*.c" if="isWindows"/>
         </patternset>
 
+        <patternset id="c.src.files.jogl.gl2es12">
+          <include name="${rootrel.src.c}/macosx/MacOSXCustomCGLCode.c" if="isOSX"/>
+          <include name="${rootrel.src.c}/macosx/MacOSXWindowSystemInterface.m" if="isOSX"/>
+          <include name="${rootrel.src.c}/macosx/ContextUpdater.m" if="isOSX"/>
+          <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/>
+          <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="useOpenMAX"/>
+          <include name="${rootrel.src.c.openmax}/com_jogamp_openmax_OMXInstance.c"  if="useOpenMAX"/>
+
+          <include name="${rootrel.generated.c.jogl}/gl2es12/GL2ES12Impl_JNI.c"/>
+          <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY -->
+          <!--include name="${rootrel.generated.c.jogl}/gl2es12/GLUgl2es12_JNI.c"/ SKIPPED -->
+          <include name="${rootrel.generated.c.jogl}/X11/GLX*.c" if="isX11"/>
+          <include name="${rootrel.generated.c.jogl}/MacOSX/CGL*.c" if="isOSX"/>
+          <include name="${rootrel.generated.c.jogl}/Windows/WGL*.c" if="isWindows"/>
+        </patternset>
+
         <patternset id="c.src.files.jogl.es2">
           <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/>
           <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="useOpenMAX"/>
@@ -1392,6 +1438,13 @@
                linker.cfg.id="${linker.cfg.id.gl2}"/>
     </target>
 
+    <target name="c.build.jogl.gl2es12" unless="setup.nodesktop">
+      <c.build c.compiler.src.files="c.src.files.jogl.gl2es12"
+               output.lib.name="jogl_gl2es12"
+               compiler.cfg.id="${compiler.cfg.id}"
+               linker.cfg.id="${linker.cfg.id.gl2}"/>
+    </target>
+
     <target name="c.build.jogl.es2">
       <c.build c.compiler.src.files="c.src.files.jogl.es2"
                output.lib.name="jogl_es2"
@@ -1421,11 +1474,12 @@
       <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll -->
       <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es1" />
       <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es2" />
+      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_gl2es12" />
       <msvc.manifest objdir="${obj.jogl}" dllname="jogl_desktop" />
       <antcall target="c.manifest.cg" inheritRefs="true" />
     </target>
 
-    <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.desktop,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg">
+    <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.gl2es12,c.build.jogl.desktop,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg">
       <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
           <param name="libdir" value="${obj.jogl}"/>
       </antcall>
@@ -1441,6 +1495,7 @@
         <fileset dir="${obj.jogl}">
           <include name="*_es1.${native.library.suffix-cdc}" />
           <include name="*_es2.${native.library.suffix-cdc}" />
+          <include name="*_gl2es12.${native.library.suffix-cdc}" />
         </fileset>
       </jar>
     </target>
@@ -1556,7 +1611,15 @@
         </jar>
     </target>
 
-    <target name="build-jars-es-cdc" depends="setup-manifestfile-cdc" unless="setup.noCDC">
+    <target name="build-jars-es-desktop-cdc" depends="setup-manifestfile-cdc,build-jars-os-desktop-cdc" unless="setup.nodesktop">
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gl2es12.cdc.jar}" filesonly="true">
+            <fileset dir="${classes-cdc}"
+                     includes="${java.part.gl2es12}, ${java.part.openmax}"
+                     excludes="${java.part.glugldesktop}"/>
+        </jar>
+    </target>
+
+    <target name="build-jars-es-cdc" depends="setup-manifestfile-cdc, build-jars-es-desktop-cdc" unless="setup.noCDC">
         <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.egl.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.egl}"
@@ -1602,6 +1665,7 @@
                 <include name="${java.part.openmax}" />
                 <!-- FIXME: this is temporary until we move these classes to another workspace -->
                 <include name="com/jogamp/**" />
+                <exclude name="${java.part.gl2es12}"/>
             </fileset>
             <fileset dir="${src.java}"
                      includes="${java.part.util.fixedfuncemu.shadercode}"/>
@@ -1611,7 +1675,7 @@
         <jar manifest="${build.jogl}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true">
             <fileset dir="${classes}"
                 includes="javax/media/opengl/** com/jogamp/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/jogamp/**"
-                excludes="${java.part.awt} ${java.part.util.awt}">
+                excludes="${java.part.awt} ${java.part.util.awt} ${java.part.gl2es12}">
             </fileset>
             <fileset dir="${src.java}"
                      includes="${java.part.util.fixedfuncemu.shadercode}"/>
@@ -1620,7 +1684,7 @@
     <target name="build-jars-all-cdc" depends="setup-manifestfile">
         <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.all.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
-                     includes="${java.part.core} ${java.part.egl} ${java.part.glutess} ${java.part.glumipmap} ${java.part.openmax} ${java.part.sdk} ${java.part.glx} ${java.part.cgl} ${java.part.wgl} ${java.part.es1} ${java.part.es1.dbg} ${java.part.es2} ${java.part.es2.dbg} ${java.part.util} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}"
+                     includes="${java.part.core} ${java.part.egl} ${java.part.glutess} ${java.part.glumipmap} ${java.part.openmax} ${java.part.sdk} ${java.part.glx} ${java.part.cgl} ${java.part.wgl} ${java.part.es1} ${java.part.es1.dbg} ${java.part.es2} ${java.part.es2.dbg} ${java.part.gl2es12} ${java.part.util} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}"
                      excludes="${java.excludes.cdcfp}"/>
             <fileset dir="${src.java}"
                      includes="${java.part.util.fixedfuncemu.shadercode}"/>
@@ -1660,7 +1724,11 @@
         <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gldesktop.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.gldesktop}, ${java.part.openmax}"
-                     excludes="${java.part.gldesktop.dbg}, ${java.part.glugldesktop}"/>
+                     excludes="${java.part.gldesktop.dbg}, ${java.part.glugldesktop}, ${java.part.gl2es12}"/>
+        </jar>
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl2es12.jar}" filesonly="true">
+            <fileset dir="${classes}" includes="${java.part.gl2es12}, ${java.part.openmax}"
+                     excludes="${java.part.glugldesktop}"/>
         </jar>
 
         <!-- misc -->
diff --git a/make/config/jogl/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg
new file mode 100644
index 000000000..3942b1419
--- /dev/null
+++ b/make/config/jogl/gl-gl2es12.cfg
@@ -0,0 +1,90 @@
+# This .cfg file is used to generate the GL interface and implementing class.
+JavaOutputDir gensrc/classes
+NativeOutputDir gensrc/native/jogl/gl2es12
+
+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
+
+Style ImplOnly
+ImplPackage com.jogamp.opengl.impl.gl2es12
+ImplJavaClass GL2ES12Impl
+Implements GL2ES12Impl GLBase
+Implements GL2ES12Impl GL
+Implements GL2ES12Impl GL2ES1
+Implements GL2ES12Impl GL2ES2
+
+Include gl-common.cfg
+Include gl-common-extensions.cfg
+Include gl-desktop.cfg
+
+# Because we're manually implementing glMapBuffer but only producing
+# the implementing class, GlueGen doesn't notice that it has to emit a
+# proc address table entry for it. Force it to here.
+ForceProcAddressGen glMapBuffer
+
+# Force all of the methods to be emitted using dynamic linking so we
+# don't need to link against any emulation library on the desktop or
+# depend on the presence of an import library for a particular device
+ForceProcAddressGen __ALL__
+
+# Also force the calling conventions of the locally generated function
+# pointer typedefs for these routines to APIENTRY
+LocalProcAddressCallingConvention __ALL__ APIENTRY
+
+EmitProcAddressTable true
+ProcAddressTableClassName GL2ES12ProcAddressTable
+GetProcAddressTableExpr ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable())
+
+# Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
+TagNativeBinding true
+
+# There seem to be some errors in the glue code generation where we are not ignoring
+# enough routines from desktop GL in GL2ES12Impl. For now manually ignore those which
+# we know shouldn't be in there
+Ignore glGetTexImage
+Ignore glPixelStoref
+
+# Add PixelStorei StateTracker
+#
+# Add input validation to glPixelStorei to make sure that, even if we
+# are running on top of desktop OpenGL, parameters not exposed in
+# OpenGL ES can not be changed
+CustomJavaCode GL2ES12Impl private static final int params_offset = 0; // just a helper for JavaPrologue ..
+
+JavaPrologue glPixelStorei if (pname != GL_PACK_ALIGNMENT && pname != GL_UNPACK_ALIGNMENT) {
+JavaPrologue glPixelStorei     throw new GLException("Unsupported pixel store parameter name 0x" + Integer.toHexString(pname));
+JavaPrologue glPixelStorei }
+JavaPrologue glPixelStorei glStateTracker.setInt(pname, param);
+
+JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offset) ) { return; }
+
+CustomJavaCode GL2ES12Impl public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar) {
+CustomJavaCode GL2ES12Impl   glFrustum((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
+
+CustomJavaCode GL2ES12Impl public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) {
+CustomJavaCode GL2ES12Impl   glOrtho((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
+
+CustomJavaCode GL2ES12Impl public void glClearDepthf(float depth) {
+CustomJavaCode GL2ES12Impl   glClearDepth((double)depth); }
+
+CustomJavaCode GL2ES12Impl public void glDepthRangef(float zNear, float zFar) {
+CustomJavaCode GL2ES12Impl    glDepthRange((double)zNear, (double)zFar); }
+
+Include gl-headers.cfg
+Include ../intptr.cfg
+
+IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-common.java
+IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-gl2es12.java
+IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-embedded.java
+IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-gl2_es2.java
+IncludeAs CustomCCode gl-impl-CustomCCode-gl2es12.c
+
+Import javax.media.opengl.GLES1
+Import javax.media.opengl.GLES2
+Import com.jogamp.opengl.impl.InternalBufferUtil
+Import java.io.PrintStream
diff --git a/make/config/jogl/gl-impl-CustomCCode-gl2es12.c b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
new file mode 100644
index 000000000..07b821802
--- /dev/null
+++ b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
@@ -0,0 +1,24 @@
+/*   Java->C glue code:
+ *   Java package: com.jogamp.opengl.impl.gl2es12.GL2ES12Impl
+ *    Java method: long dispatch_glMapBuffer(int target, int access)
+ *     C function: void * glMapBuffer(GLenum target, GLenum access);
+ */
+JNIEXPORT jlong JNICALL 
+Java_com_jogamp_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
+  void * _res;
+  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
+  assert(ptr_glMapBuffer != NULL);
+  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
+  return (jlong) (intptr_t) _res;
+}
+
+/*   Java->C glue code:
+ *   Java package: com.jogamp.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_jogamp_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-CustomJavaCode-gl2es12.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
new file mode 100644
index 000000000..4bc39b076
--- /dev/null
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
@@ -0,0 +1,414 @@
+// Tracks glBegin/glEnd calls to determine whether it is legal to
+// query Vertex Buffer Object state
+private boolean inBeginEndPair;
+
+/* FIXME: refactor dependence on Java 2D / JOGL bridge
+
+// Tracks creation and destruction of server-side OpenGL objects when
+// the Java2D/OpenGL pipeline is enabled and it is using frame buffer
+// objects (FBOs) to do its rendering
+private GLObjectTracker tracker;
+
+public void setObjectTracker(GLObjectTracker tracker) {
+  this.tracker = tracker;
+}
+
+*/
+
+public GL2ES12Impl(GLProfile glp, GLContextImpl context) {
+  this._context = context; 
+  this.bufferSizeTracker  = context.getBufferSizeTracker();
+  this.bufferStateTracker = context.getBufferStateTracker();
+  this.glStateTracker     = context.getGLStateTracker();
+  this.isGL2ES2 = glp.isGL2ES2();
+  this.glProfile = glp;
+}
+
+private boolean isGL2ES2;
+
+public final boolean isGL4bc() {
+    return false;
+}
+
+public final boolean isGL4() {
+    return false;
+}
+
+public final boolean isGL3bc() {
+    return false;
+}
+
+public final boolean isGL3() {
+    return false;
+}
+
+public final boolean isGL2() {
+    return false;
+}
+
+public final boolean isGLES1() {
+    return false;
+}
+
+public final boolean isGLES2() {
+    return false;
+}
+
+public final boolean isGLES() {
+    return false;
+}
+
+public final boolean isGL2ES1() {
+    return !isGL2ES2;
+}
+
+public final boolean isGL2ES2() {
+    return isGL2ES2;
+}
+
+public final boolean isGL2GL3() {
+    return false;
+}
+
+public final boolean hasGLSL() {
+    return isGL2ES2;
+}
+
+public final GL4bc getGL4bc() throws GLException {
+    throw new GLException("Not a GL4bc implementation");
+}
+
+public final GL4 getGL4() throws GLException {
+    throw new GLException("Not a GL4 implementation");
+}
+
+public final GL3bc getGL3bc() throws GLException {
+    throw new GLException("Not a GL3bc implementation");
+}
+
+public final GL3 getGL3() throws GLException {
+    throw new GLException("Not a GL3 implementation");
+}
+
+public final GL2 getGL2() throws GLException {
+    throw new GLException("Not a GL2 implementation");
+}
+
+public final GLES1 getGLES1() throws GLException {
+    throw new GLException("Not a GLES1 implementation");
+}
+
+public final GLES2 getGLES2() throws GLException {
+    throw new GLException("Not a GLES2 implementation");
+}
+
+public final GL2ES1 getGL2ES1() throws GLException {
+    if (isGL2ES1()) {
+        return this;
+    }
+    throw new GLException("Not a GL2ES1 implementation");
+}
+
+public final GL2ES2 getGL2ES2() throws GLException {
+    if (isGL2ES2()) {
+        return this;
+    }
+    throw new GLException("Not a GL2ES2 implementation");
+}
+
+public final GL2GL3 getGL2GL3() throws GLException {
+    throw new GLException("Not a GL2GL3 implementation");
+}
+
+//
+// Helpers for ensuring the correct amount of texture data
+//
+
+/** Returns the number of bytes required to fill in the appropriate
+    texture. This is computed as closely as possible based on the
+    pixel pack or unpack parameters. The logic in this routine is
+    based on code in the SGI OpenGL sample implementation. */
+
+private int imageSizeInBytes(int format, int type, int w, int h, int d,
+                             boolean pack) {
+  int elements = 0;
+  int esize = 0;
+  
+  if (w < 0) return 0;
+  if (h < 0) return 0;
+  if (d < 0) return 0;
+  switch (format) {
+  case GL_STENCIL_INDEX:
+    elements = 1;
+    break;
+  case GL_ALPHA:
+  case GL_LUMINANCE:
+  case GL_DEPTH_COMPONENT:
+    elements = 1;
+    break;
+  case GL_LUMINANCE_ALPHA:
+    elements = 2;
+    break;
+  case GL_RGB:
+    elements = 3;
+    break;
+  case GL_RGBA:
+    elements = 4;
+    break;
+  /* FIXME ?? 
+   case GL_HILO_NV:
+    elements = 2;
+    break; */
+  default:
+    return 0;
+  }
+  switch (type) {
+  case GL_BYTE:
+  case GL_UNSIGNED_BYTE:
+    esize = 1;
+    break;
+  case GL_SHORT:
+  case GL_UNSIGNED_SHORT:
+    esize = 2;
+    break;
+  case GL_UNSIGNED_SHORT_5_6_5:
+  case GL_UNSIGNED_SHORT_4_4_4_4:
+  case GL_UNSIGNED_SHORT_5_5_5_1:
+    esize = 2;
+    elements = 1;
+    break;
+  case GL_INT:
+  case GL_UNSIGNED_INT:
+  case GL_FLOAT:
+    esize = 4;
+    break;
+  default:
+    return 0;
+  }
+  return imageSizeInBytes(elements * esize, w, h, d, pack);
+}
+
+private GLBufferSizeTracker  bufferSizeTracker;
+private GLBufferStateTracker bufferStateTracker;
+private GLStateTracker       glStateTracker;
+
+private boolean bufferObjectExtensionsInitialized = false;
+private boolean haveGL15;
+private boolean haveGL21;
+private boolean haveARBVertexBufferObject;
+
+private void initBufferObjectExtensionChecks() {
+  if (bufferObjectExtensionsInitialized)
+    return;
+  bufferObjectExtensionsInitialized = true;
+  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) {
+    throw new GLException("May not call this between glBegin and glEnd");
+  }
+  boolean avail = (extension1 || extension2 || extension3);
+  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) {
+      if(throwException) {
+          throw new GLException(kind + " must be enabled 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;
+    }
+  }
+  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) { 
+  // PBO n/a for ES 1.1 or ES 2.0
+  return true;
+}
+
+private boolean checkUnpackPBOEnabled(boolean throwException) { 
+  // PBO n/a for ES 1.1 or ES 2.0
+  return false;
+}
+
+private boolean checkPackPBODisabled(boolean throwException) { 
+  // PBO n/a for ES 1.1 or ES 2.0
+  return true;
+}
+
+private boolean checkPackPBOEnabled(boolean throwException) { 
+  // PBO n/a for ES 1.1 or ES 2.0
+  return false;
+}
+
+// Attempt to return the same ByteBuffer object from glMapBuffer if
+// the vertex buffer object's base address and size haven't changed
+private static class ARBVBOKey {
+  private long addr;
+  private int  capacity;
+
+  ARBVBOKey(long addr, int capacity) {
+    this.addr = addr;
+    this.capacity = capacity;
+  }
+
+  public int hashCode() {
+    return (int) addr;
+  }
+
+  public boolean equals(Object o) {
+    if ((o == null) || (!(o instanceof ARBVBOKey))) {
+      return false;
+    }
+
+    ARBVBOKey other = (ARBVBOKey) o;
+    return ((addr == other.addr) && (capacity == other.capacity));
+  }
+}
+
+private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap();
+
+/** 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_ = ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
+  if (__addr_ == 0) {
+    throw new GLException("Method \"glMapBuffer\" not available");
+  }
+  int sz = bufferSizeTracker.getBufferSize(bufferStateTracker,
+                                           target,
+                                           this);
+  long addr;
+  addr = dispatch_glMapBuffer(target, access, __addr_);
+  if (addr == 0 || sz == 0) {
+    return null;
+  }
+  ARBVBOKey key = new ARBVBOKey(addr, sz);
+  ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
+  if (_res == null) {
+    _res = newDirectByteBuffer(addr, sz);
+    InternalBufferUtil.nativeOrder(_res);
+    arbVBOCache.put(key, _res);
+  }
+  _res.position(0);
+  return _res;
+}
+
+/** 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");
+  }
+
+  /** 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, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) {
+    throw new GLException("Method \"glShaderBinary\" not available");
+  }
+
+  public void glReleaseShaderCompiler() {
+    // nothing to do 
+  }
+
+    public void glVertexPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.isVBO()) {
+          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+    }
+    public void glColorPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.isVBO()) {
+          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+
+    }
+    public void glNormalPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.getComponentNumber()!=3) {
+        throw new GLException("Only 3 components per normal allowed");
+      }
+      if(array.isVBO()) {
+          glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+    }
+    public void glTexCoordPointer(GLArrayData array) {
+      if(array.getComponentNumber()==0) return;
+      if(array.isVBO()) {
+          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      } else {
+          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+      }
+    }
+
+
diff --git a/make/config/jogl/obsolete/gl-gl2es12.cfg b/make/config/jogl/obsolete/gl-gl2es12.cfg
deleted file mode 100644
index 3942b1419..000000000
--- a/make/config/jogl/obsolete/gl-gl2es12.cfg
+++ /dev/null
@@ -1,90 +0,0 @@
-# This .cfg file is used to generate the GL interface and implementing class.
-JavaOutputDir gensrc/classes
-NativeOutputDir gensrc/native/jogl/gl2es12
-
-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
-
-Style ImplOnly
-ImplPackage com.jogamp.opengl.impl.gl2es12
-ImplJavaClass GL2ES12Impl
-Implements GL2ES12Impl GLBase
-Implements GL2ES12Impl GL
-Implements GL2ES12Impl GL2ES1
-Implements GL2ES12Impl GL2ES2
-
-Include gl-common.cfg
-Include gl-common-extensions.cfg
-Include gl-desktop.cfg
-
-# Because we're manually implementing glMapBuffer but only producing
-# the implementing class, GlueGen doesn't notice that it has to emit a
-# proc address table entry for it. Force it to here.
-ForceProcAddressGen glMapBuffer
-
-# Force all of the methods to be emitted using dynamic linking so we
-# don't need to link against any emulation library on the desktop or
-# depend on the presence of an import library for a particular device
-ForceProcAddressGen __ALL__
-
-# Also force the calling conventions of the locally generated function
-# pointer typedefs for these routines to APIENTRY
-LocalProcAddressCallingConvention __ALL__ APIENTRY
-
-EmitProcAddressTable true
-ProcAddressTableClassName GL2ES12ProcAddressTable
-GetProcAddressTableExpr ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable())
-
-# Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
-TagNativeBinding true
-
-# There seem to be some errors in the glue code generation where we are not ignoring
-# enough routines from desktop GL in GL2ES12Impl. For now manually ignore those which
-# we know shouldn't be in there
-Ignore glGetTexImage
-Ignore glPixelStoref
-
-# Add PixelStorei StateTracker
-#
-# Add input validation to glPixelStorei to make sure that, even if we
-# are running on top of desktop OpenGL, parameters not exposed in
-# OpenGL ES can not be changed
-CustomJavaCode GL2ES12Impl private static final int params_offset = 0; // just a helper for JavaPrologue ..
-
-JavaPrologue glPixelStorei if (pname != GL_PACK_ALIGNMENT && pname != GL_UNPACK_ALIGNMENT) {
-JavaPrologue glPixelStorei     throw new GLException("Unsupported pixel store parameter name 0x" + Integer.toHexString(pname));
-JavaPrologue glPixelStorei }
-JavaPrologue glPixelStorei glStateTracker.setInt(pname, param);
-
-JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offset) ) { return; }
-
-CustomJavaCode GL2ES12Impl public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar) {
-CustomJavaCode GL2ES12Impl   glFrustum((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
-
-CustomJavaCode GL2ES12Impl public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) {
-CustomJavaCode GL2ES12Impl   glOrtho((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
-
-CustomJavaCode GL2ES12Impl public void glClearDepthf(float depth) {
-CustomJavaCode GL2ES12Impl   glClearDepth((double)depth); }
-
-CustomJavaCode GL2ES12Impl public void glDepthRangef(float zNear, float zFar) {
-CustomJavaCode GL2ES12Impl    glDepthRange((double)zNear, (double)zFar); }
-
-Include gl-headers.cfg
-Include ../intptr.cfg
-
-IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-common.java
-IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-gl2es12.java
-IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-embedded.java
-IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-gl2_es2.java
-IncludeAs CustomCCode gl-impl-CustomCCode-gl2es12.c
-
-Import javax.media.opengl.GLES1
-Import javax.media.opengl.GLES2
-Import com.jogamp.opengl.impl.InternalBufferUtil
-Import java.io.PrintStream
diff --git a/make/config/jogl/obsolete/gl-impl-CustomCCode-gl2.c b/make/config/jogl/obsolete/gl-impl-CustomCCode-gl2.c
deleted file mode 100644
index 91fd0078b..000000000
--- a/make/config/jogl/obsolete/gl-impl-CustomCCode-gl2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*   Java->C glue code:
- *   Java package: com.jogamp.opengl.impl.gl2.GL2Impl
- *    Java method: long dispatch_glMapBuffer(int target, int access)
- *     C function: void * glMapBuffer(GLenum target, GLenum access);
- */
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
-  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
-  void * _res;
-  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
-  assert(ptr_glMapBuffer != NULL);
-  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
-  return (jlong) (intptr_t) _res;
-}
-
-/*   Java->C glue code:
- *   Java package: com.jogamp.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_jogamp_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/obsolete/gl-impl-CustomCCode-gl2es12.c b/make/config/jogl/obsolete/gl-impl-CustomCCode-gl2es12.c
deleted file mode 100644
index 07b821802..000000000
--- a/make/config/jogl/obsolete/gl-impl-CustomCCode-gl2es12.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*   Java->C glue code:
- *   Java package: com.jogamp.opengl.impl.gl2es12.GL2ES12Impl
- *    Java method: long dispatch_glMapBuffer(int target, int access)
- *     C function: void * glMapBuffer(GLenum target, GLenum access);
- */
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
-  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
-  void * _res;
-  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
-  assert(ptr_glMapBuffer != NULL);
-  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
-  return (jlong) (intptr_t) _res;
-}
-
-/*   Java->C glue code:
- *   Java package: com.jogamp.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_jogamp_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/obsolete/gl-impl-CustomCCode-gl3.c b/make/config/jogl/obsolete/gl-impl-CustomCCode-gl3.c
deleted file mode 100644
index f540a7d4a..000000000
--- a/make/config/jogl/obsolete/gl-impl-CustomCCode-gl3.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*   Java->C glue code:
- *   Java package: com.jogamp.opengl.impl.gl3.GL3Impl
- *    Java method: long dispatch_glMapBuffer(int target, int access)
- *     C function: void * glMapBuffer(GLenum target, GLenum access);
- */
-JNIEXPORT jlong JNICALL 
-Java_com_jogamp_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
-  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
-  void * _res;
-  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
-  assert(ptr_glMapBuffer != NULL);
-  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
-  return (jlong) (intptr_t) _res;
-}
-
-/*   Java->C glue code:
- *   Java package: com.jogamp.opengl.impl.gl3.GL3Impl
- *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
- *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
- */
-JNIEXPORT jobject JNICALL
-Java_com_jogamp_opengl_impl_gl3_GL3Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
-  return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity);
-}
diff --git a/make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2.java b/make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2.java
deleted file mode 100644
index a1a6917df..000000000
--- a/make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2.java
+++ /dev/null
@@ -1,385 +0,0 @@
-// Tracks glBegin/glEnd calls to determine whether it is legal to
-// query Vertex Buffer Object state
-private boolean inBeginEndPair;
-
-/* FIXME: refactor dependence on Java 2D / JOGL bridge
-
-// Tracks creation and destruction of server-side OpenGL objects when
-// the Java2D/OpenGL pipeline is enabled and it is using frame buffer
-// objects (FBOs) to do its rendering
-private GLObjectTracker tracker;
-
-public void setObjectTracker(GLObjectTracker tracker) {
-  this.tracker = tracker;
-}
-
-*/
-
-
-public GL2Impl(GLProfile glp, GLContextImpl context) {
-  this._context = context; 
-  this.bufferSizeTracker  = context.getBufferSizeTracker();
-  this.bufferStateTracker = context.getBufferStateTracker();
-  this.glStateTracker     = context.getGLStateTracker();
-  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);
-}
-
-//
-// Helpers for ensuring the correct amount of texture data
-//
-
-/** Returns the number of bytes required to fill in the appropriate
-    texture. This is computed as closely as possible based on the
-    pixel pack or unpack parameters. The logic in this routine is
-    based on code in the SGI OpenGL sample implementation. */
-
-private int imageSizeInBytes(int format, int type, int w, int h, int d,
-                             boolean pack) {
-  int elements = 0;
-  int esize = 0;
-  
-  if (w < 0) return 0;
-  if (h < 0) return 0;
-  if (d < 0) return 0;
-  switch (format) {
-  case GL_COLOR_INDEX:
-  case GL_STENCIL_INDEX:
-    elements = 1;
-    break;
-  case GL_RED:
-  case GL_GREEN:
-  case GL_BLUE:
-  case GL_ALPHA:
-  case GL_LUMINANCE:
-  case GL_DEPTH_COMPONENT:
-    elements = 1;
-    break;
-  case GL_LUMINANCE_ALPHA:
-    elements = 2;
-    break;
-  case GL_RGB:
-  case GL_BGR:
-    elements = 3;
-    break;
-  case GL_RGBA:
-  case GL_BGRA:
-  case GL_ABGR_EXT:
-    elements = 4;
-    break;
-  /* FIXME ?? 
-   case GL_HILO_NV:
-    elements = 2;
-    break; */
-  default:
-    return 0;
-  }
-  switch (type) {
-  case GL_BITMAP:
-    if (format == GL_COLOR_INDEX) {
-      return (d * (h * ((w+7)/8)));
-    } else {
-      return 0;
-    }
-  case GL_BYTE:
-  case GL_UNSIGNED_BYTE:
-    esize = 1;
-    break;
-  case GL_UNSIGNED_BYTE_3_3_2:
-  case GL_UNSIGNED_BYTE_2_3_3_REV:
-    esize = 1;
-    elements = 1;
-    break;
-  case GL_SHORT:
-  case GL_UNSIGNED_SHORT:
-    esize = 2;
-    break;
-  case GL_UNSIGNED_SHORT_5_6_5:
-  case GL_UNSIGNED_SHORT_5_6_5_REV:
-  case GL_UNSIGNED_SHORT_4_4_4_4:
-  case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-  case GL_UNSIGNED_SHORT_5_5_5_1:
-  case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-    esize = 2;
-    elements = 1;
-    break;
-  case GL_INT:
-  case GL_UNSIGNED_INT:
-  case GL_FLOAT:
-    esize = 4;
-    break;
-  case GL_UNSIGNED_INT_8_8_8_8:
-  case GL_UNSIGNED_INT_8_8_8_8_REV:
-  case GL_UNSIGNED_INT_10_10_10_2:
-  case GL_UNSIGNED_INT_2_10_10_10_REV:
-    esize = 4;
-    elements = 1;
-    break;
-  default:
-    return 0;
-  }
-  return imageSizeInBytes(elements * esize, w, h, d, pack);
-}
-
-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 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) {
-    throw new GLException("May not call this between glBegin and glEnd");
-  }
-  boolean avail = (extension1 || extension2 || extension3);
-  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) {
-      if(throwException) {
-          throw new GLException(kind + " must be enabled 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;
-    }
-  }
-  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);
-}
-
-// Attempt to return the same ByteBuffer object from glMapBuffer if
-// the vertex buffer object's base address and size haven't changed
-private static class ARBVBOKey {
-  private long addr;
-  private int  capacity;
-
-  ARBVBOKey(long addr, int capacity) {
-    this.addr = addr;
-    this.capacity = capacity;
-  }
-
-  public int hashCode() {
-    return (int) addr;
-  }
-
-  public boolean equals(Object o) {
-    if ((o == null) || (!(o instanceof ARBVBOKey))) {
-      return false;
-    }
-
-    ARBVBOKey other = (ARBVBOKey) o;
-    return ((addr == other.addr) && (capacity == other.capacity));
-  }
-}
-
-private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap();
-
-/** 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_ = ((GL2ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
-  if (__addr_ == 0) {
-    throw new GLException("Method \"glMapBuffer\" not available");
-  }
-  int sz = bufferSizeTracker.getBufferSize(bufferStateTracker,
-                                           target,
-                                           this);
-  long addr;
-  addr = dispatch_glMapBuffer(target, access, __addr_);
-  if (addr == 0 || sz == 0) {
-    return null;
-  }
-  ARBVBOKey key = new ARBVBOKey(addr, sz);
-  ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
-  if (_res == null) {
-    _res = newDirectByteBuffer(addr, sz);
-    InternalBufferUtil.nativeOrder(_res);
-    arbVBOCache.put(key, _res);
-  }
-  _res.position(0);
-  return _res;
-}
-
-/** 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");
-  }
-
-  /** 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, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) {
-    throw new GLException("Method \"glShaderBinary\" not available");
-  }
-
-  public void glReleaseShaderCompiler() {
-    // nothing to do 
-  }
-
-    public void glVertexPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-    public void glColorPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-
-    }
-    public void glNormalPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.getComponentNumber()!=3) {
-        throw new GLException("Only 3 components per normal allowed");
-      }
-      if(array.isVBO()) {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-    public void glTexCoordPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-
diff --git a/make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2es12.java b/make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2es12.java
deleted file mode 100644
index aed442da3..000000000
--- a/make/config/jogl/obsolete/gl-impl-CustomJavaCode-gl2es12.java
+++ /dev/null
@@ -1,353 +0,0 @@
-// Tracks glBegin/glEnd calls to determine whether it is legal to
-// query Vertex Buffer Object state
-private boolean inBeginEndPair;
-
-/* FIXME: refactor dependence on Java 2D / JOGL bridge
-
-// Tracks creation and destruction of server-side OpenGL objects when
-// the Java2D/OpenGL pipeline is enabled and it is using frame buffer
-// objects (FBOs) to do its rendering
-private GLObjectTracker tracker;
-
-public void setObjectTracker(GLObjectTracker tracker) {
-  this.tracker = tracker;
-}
-
-*/
-
-public GL2ES12Impl(GLProfile glp, GLContextImpl context) {
-  this._context = context; 
-  this.bufferSizeTracker  = context.getBufferSizeTracker();
-  this.bufferStateTracker = context.getBufferStateTracker();
-  this.glStateTracker     = context.getGLStateTracker();
-  this.isGL2ES2 = glp.isGL2ES2();
-  this.glProfile = glp;
-}
-
-private boolean isGL2ES2;
-
-public boolean isFunctionAvailable(String glFunctionName) {
-  return _context.isFunctionAvailable(glFunctionName);
-}
-
-public boolean isExtensionAvailable(String glExtensionName) {
-  return _context.isExtensionAvailable(glExtensionName);
-}
-
-public Object getExtension(String extensionName) {
-  // At this point we don't expose any extensions using this mechanism
-  return null;
-}
-
-/** Returns the context this GL object is associated with for better
-    error checking by DebugGL. */
-public GLContext getContext() {
-  return _context;
-}
-
-private GLContextImpl _context;
-
-public void setSwapInterval(int interval) {
-  _context.setSwapInterval(interval);
-}
-
-public int getSwapInterval() {
-  return _context.getSwapInterval();
-}
-
-public Object getPlatformGLExtensions() {
-  return _context.getPlatformGLExtensions();
-}
-
-//
-// Helpers for ensuring the correct amount of texture data
-//
-
-/** Returns the number of bytes required to fill in the appropriate
-    texture. This is computed as closely as possible based on the
-    pixel pack or unpack parameters. The logic in this routine is
-    based on code in the SGI OpenGL sample implementation. */
-
-private int imageSizeInBytes(int format, int type, int w, int h, int d,
-                             boolean pack) {
-  int elements = 0;
-  int esize = 0;
-  
-  if (w < 0) return 0;
-  if (h < 0) return 0;
-  if (d < 0) return 0;
-  switch (format) {
-  case GL_STENCIL_INDEX:
-    elements = 1;
-    break;
-  case GL_ALPHA:
-  case GL_LUMINANCE:
-  case GL_DEPTH_COMPONENT:
-    elements = 1;
-    break;
-  case GL_LUMINANCE_ALPHA:
-    elements = 2;
-    break;
-  case GL_RGB:
-    elements = 3;
-    break;
-  case GL_RGBA:
-    elements = 4;
-    break;
-  /* FIXME ?? 
-   case GL_HILO_NV:
-    elements = 2;
-    break; */
-  default:
-    return 0;
-  }
-  switch (type) {
-  case GL_BYTE:
-  case GL_UNSIGNED_BYTE:
-    esize = 1;
-    break;
-  case GL_SHORT:
-  case GL_UNSIGNED_SHORT:
-    esize = 2;
-    break;
-  case GL_UNSIGNED_SHORT_5_6_5:
-  case GL_UNSIGNED_SHORT_4_4_4_4:
-  case GL_UNSIGNED_SHORT_5_5_5_1:
-    esize = 2;
-    elements = 1;
-    break;
-  case GL_INT:
-  case GL_UNSIGNED_INT:
-  case GL_FLOAT:
-    esize = 4;
-    break;
-  default:
-    return 0;
-  }
-  return imageSizeInBytes(elements * esize, w, h, d, pack);
-}
-
-private GLBufferSizeTracker  bufferSizeTracker;
-private GLBufferStateTracker bufferStateTracker;
-private GLStateTracker       glStateTracker;
-
-private boolean bufferObjectExtensionsInitialized = false;
-private boolean haveGL15;
-private boolean haveGL21;
-private boolean haveARBVertexBufferObject;
-
-private void initBufferObjectExtensionChecks() {
-  if (bufferObjectExtensionsInitialized)
-    return;
-  bufferObjectExtensionsInitialized = true;
-  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) {
-    throw new GLException("May not call this between glBegin and glEnd");
-  }
-  boolean avail = (extension1 || extension2 || extension3);
-  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) {
-      if(throwException) {
-          throw new GLException(kind + " must be enabled 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;
-    }
-  }
-  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) { 
-  // PBO n/a for ES 1.1 or ES 2.0
-  return true;
-}
-
-private boolean checkUnpackPBOEnabled(boolean throwException) { 
-  // PBO n/a for ES 1.1 or ES 2.0
-  return false;
-}
-
-private boolean checkPackPBODisabled(boolean throwException) { 
-  // PBO n/a for ES 1.1 or ES 2.0
-  return true;
-}
-
-private boolean checkPackPBOEnabled(boolean throwException) { 
-  // PBO n/a for ES 1.1 or ES 2.0
-  return false;
-}
-
-// Attempt to return the same ByteBuffer object from glMapBuffer if
-// the vertex buffer object's base address and size haven't changed
-private static class ARBVBOKey {
-  private long addr;
-  private int  capacity;
-
-  ARBVBOKey(long addr, int capacity) {
-    this.addr = addr;
-    this.capacity = capacity;
-  }
-
-  public int hashCode() {
-    return (int) addr;
-  }
-
-  public boolean equals(Object o) {
-    if ((o == null) || (!(o instanceof ARBVBOKey))) {
-      return false;
-    }
-
-    ARBVBOKey other = (ARBVBOKey) o;
-    return ((addr == other.addr) && (capacity == other.capacity));
-  }
-}
-
-private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap();
-
-/** 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_ = ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
-  if (__addr_ == 0) {
-    throw new GLException("Method \"glMapBuffer\" not available");
-  }
-  int sz = bufferSizeTracker.getBufferSize(bufferStateTracker,
-                                           target,
-                                           this);
-  long addr;
-  addr = dispatch_glMapBuffer(target, access, __addr_);
-  if (addr == 0 || sz == 0) {
-    return null;
-  }
-  ARBVBOKey key = new ARBVBOKey(addr, sz);
-  ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
-  if (_res == null) {
-    _res = newDirectByteBuffer(addr, sz);
-    InternalBufferUtil.nativeOrder(_res);
-    arbVBOCache.put(key, _res);
-  }
-  _res.position(0);
-  return _res;
-}
-
-/** 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");
-  }
-
-  /** 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, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) {
-    throw new GLException("Method \"glShaderBinary\" not available");
-  }
-
-  public void glReleaseShaderCompiler() {
-    // nothing to do 
-  }
-
-    public void glVertexPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-    public void glColorPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-
-    }
-    public void glNormalPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.getComponentNumber()!=3) {
-        throw new GLException("Only 3 components per normal allowed");
-      }
-      if(array.isVBO()) {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-    public void glTexCoordPointer(GLArrayData array) {
-      if(array.getComponentNumber()==0) return;
-      if(array.isVBO()) {
-          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
-      } else {
-          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
-    }
-
-
diff --git a/make/lstjars.sh b/make/lstjars.sh
index 7691bfa2d..3837be5e3 100644
--- a/make/lstjars.sh
+++ b/make/lstjars.sh
@@ -47,7 +47,7 @@ function listdeployment() {
     echo
 
     echo JOGL GL2ES12 NEWT 
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2es12.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz
     echo
 
     echo JOGL GL2 NEWT 
@@ -125,8 +125,8 @@ mkdir -p nope
 
 mv *.cdc.lst *.all*.lst nope/
 
-mv jogl.gldesktop.*.lst nope/
-echo duplicates - w/o gldesktop.*
+mv jogl.gl2es12.*.lst jogl.gldesktop.*.lst nope/
+echo duplicates - w/o gl2es12.* gldesktop.*
 echo
 sort jogl*.lst | uniq -d
 mv nope/* .
diff --git a/make/make.jogl.all.linux-x86_64.sh b/make/make.jogl.all.linux-x86_64.sh
index 8ebcc8744..b6c5e9d63 100644
--- a/make/make.jogl.all.linux-x86_64.sh
+++ b/make/make.jogl.all.linux-x86_64.sh
@@ -16,6 +16,7 @@ fi
 #    -Dbuild.noarchives=true \
 
 ant  \
+    -Dbuild.noarchives=true \
     -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64 \
     -Drootrel.build=build-x86_64 \
     -DuseKD=true \
diff --git a/make/make.jogl.all.win64.bat b/make/make.jogl.all.win64.bat
new file mode 100644
index 000000000..508067d57
--- /dev/null
+++ b/make/make.jogl.all.win64.bat
@@ -0,0 +1,17 @@
+set THISDIR="C:\JOGL"
+
+set J2RE_HOME=c:\jre1.6.0_19
+set JAVA_HOME=c:\jdk1.6.0_19
+set ANT_PATH=C:\apache-ant-1.8.0
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw-w64\bin;c:\mingw\bin;%PATH%
+
+set LIB_GEN=%THISDIR%\lib
+set CLASSPATH=.;%THISDIR%\build-win64\classes
+REM    -Dc.compiler.debug=true 
+REM    -DuseOpenMAX=true 
+REM    -DuseKD=true
+REM    -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
+REM    -Dbuild.noarchives=true
+
+ant -Drootrel.build=build-win64 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\lib %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win64.log 2>&1
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java b/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
index 1ed0396a9..9d1235e13 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
@@ -113,9 +113,7 @@ public final class ExtensionAvailabilityCache {
 
       boolean useGetStringi = false;
 
-      if ( context.getGLVersionMajor() > 3 ||
-           ( context.getGLVersionMajor() == 3 && context.getGLVersionMinor() >= 0 ) ||
-           gl.isGL3() ) {
+      if ( gl.isGL2GL3() ) {
           if ( ! gl.isFunctionAvailable("glGetStringi") ) {
             if(DEBUG) {
                 System.err.println("GLContext: GL >= 3.1 usage, but no glGetStringi");
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
index 3abb69a7f..7143344bf 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
@@ -602,10 +602,7 @@ public abstract class GLContextImpl extends GLContext {
   //
 
   private Object createInstance(GLProfile glp, String suffix, Class[] cstrArgTypes, Object[] cstrArgs) {
-    try {
-        return ReflectionUtil.createInstance(glp.getGLImplBaseClassName()+suffix, cstrArgTypes, cstrArgs);
-    } catch (JogampRuntimeException jre) { /* n/a .. */ }
-    return null;
+    return ReflectionUtil.createInstance(glp.getGLImplBaseClassName()+suffix, cstrArgTypes, cstrArgs);
   }
 
   /** Create the GL for this context. */
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLJNILibLoader.java b/src/jogl/classes/com/jogamp/opengl/impl/GLJNILibLoader.java
index 7747b014b..c3958eedf 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLJNILibLoader.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLJNILibLoader.java
@@ -67,6 +67,15 @@ public class GLJNILibLoader extends JNILibLoaderBase {
     });
   }
 
+  public static void loadGLDesktopES12() {
+    AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {
+        loadLibrary("jogl_gl2es12", nativeOSPreload, true);
+        return null;
+      }
+    });
+  }
+
   public static void loadES2() {
     AccessController.doPrivileged(new PrivilegedAction() {
       public Object run() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
index 7d907bf28..dce25978c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
@@ -308,7 +308,7 @@ public abstract class X11GLXContext extends GLContextImpl {
             }
         }
     } else {
-        if(!glp.isGL2()) {
+        if(glp.isGL3()) {
           glXMakeContextCurrent(display, 0, 0, 0);
           GLX.glXDestroyContext(display, temp_context);
           throw new GLException("X11GLXContext.createContext failed, but context > GL2 requested "+getGLVersion(null, major[0], minor[0], ctp[0], "@creation")+", ");
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 9e3a532e6..0e10b32b3 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -63,29 +63,36 @@ public class GLProfile implements Cloneable {
     // Query platform available OpenGL implementation
     //
 
-    public static final boolean isGL4bcAvailable() { return hasGL4bcImpl; }
-    public static final boolean isGL4Available() { return hasGL4Impl; }
-    public static final boolean isGL3bcAvailable() { return hasGL3bcImpl; }
-    public static final boolean isGL3Available() { return hasGL3Impl; }
-    public static final boolean isGL2Available() { return hasGL2Impl; }
-    public static final boolean isGLES2Available() { return hasGLES2Impl; }
-    public static final boolean isGLES1Available() { return hasGLES1Impl; }
+    public static final boolean isGL4bcAvailable()   { return null != mappedProfiles.get(GL4bc); }
+    public static final boolean isGL4Available()     { return null != mappedProfiles.get(GL4); }
+    public static final boolean isGL3bcAvailable()   { return null != mappedProfiles.get(GL3bc); }
+    public static final boolean isGL3Available()     { return null != mappedProfiles.get(GL3); }
+    public static final boolean isGL2Available()     { return null != mappedProfiles.get(GL2); }
+    public static final boolean isGLES2Available()   { return null != mappedProfiles.get(GLES2); }
+    public static final boolean isGLES1Available()   { return null != mappedProfiles.get(GLES1); }
+    public static final boolean isGL2ES1Available()  { return null != mappedProfiles.get(GL2ES1); }
+    public static final boolean isGL2ES2Available()  { return null != mappedProfiles.get(GL2ES2); }
+
     public static final String glAvailabilityToString() {
         StringBuffer sb = new StringBuffer();
         sb.append("GLAvailability[Native[GL4bc ");
-        sb.append(hasGL4bcImpl);
+        sb.append(isGL4bcAvailable());
         sb.append(", GL4 ");
-        sb.append(hasGL4Impl);
+        sb.append(isGL4Available());
         sb.append(", GL3bc ");
-        sb.append(hasGL3bcImpl);
+        sb.append(isGL3bcAvailable());
         sb.append(", GL3 ");
-        sb.append(hasGL3Impl);
+        sb.append(isGL3Available());
         sb.append(", GL2 ");
-        sb.append(hasGL2Impl);
+        sb.append(isGL2Available());
+        sb.append(", GL2ES1 ");
+        sb.append(isGL2ES1Available());
         sb.append(", GLES1 ");
-        sb.append(hasGLES1Impl);
+        sb.append(isGLES1Available());
+        sb.append(", GL2ES2 ");
+        sb.append(isGL2ES2Available());
         sb.append(", GLES2 ");
-        sb.append(hasGLES2Impl);
+        sb.append(isGLES2Available());
         sb.append("], Profiles[");
         for(Iterator i=mappedProfiles.values().iterator(); i.hasNext(); ) {
             sb.append(((GLProfile)i.next()).toString());
@@ -344,6 +351,8 @@ public class GLProfile implements Cloneable {
              GL3.equals(profileImpl)   ||
              GL2.equals(profileImpl) ) {
             return "com.jogamp.opengl.impl.gl4.GL4bc";
+        } else if(GL2ES12.equals(profileImpl)) {
+            return "com.jogamp.opengl.impl.gl2es12.GL2ES12";
         } else if(GLES1.equals(profileImpl) || GL2ES1.equals(profileImpl)) {
             return "com.jogamp.opengl.impl.es1.GLES1";
         } else if(GLES2.equals(profileImpl) || GL2ES2.equals(profileImpl)) {
@@ -767,6 +776,10 @@ public class GLProfile implements Cloneable {
         return "GLProfile[" + profile + "/" + profileImpl + "]";
     }
 
+    // The intersection between desktop OpenGL and the union of the OpenGL ES profiles
+    // This is here only to avoid having separate GL2ES1Impl and GL2ES2Impl classes
+    private static final String GL2ES12 = "GL2ES12";
+
     private static final boolean isAWTAvailable;
     private static final boolean isAWTJOGLAvailable;
 
@@ -776,6 +789,7 @@ public class GLProfile implements Cloneable {
     private static /*final*/ boolean hasGL3bcImpl;
     private static /*final*/ boolean hasGL3Impl;
     private static /*final*/ boolean hasGL2Impl;
+    private static /*final*/ boolean hasGL2ES12Impl;
     private static /*final*/ boolean hasGLES2Impl;
     private static /*final*/ boolean hasGLES1Impl;
 
@@ -802,6 +816,7 @@ public class GLProfile implements Cloneable {
                              ReflectionUtil.isClassAvailable("javax.media.opengl.awt.GLCanvas") ; // JOGL
 
         boolean hasDesktopGL = false;
+        boolean hasDesktopGLES12 = false;
         boolean hasNativeOSFactory = false;
         Throwable t;
 
@@ -833,12 +848,37 @@ public class GLProfile implements Cloneable {
             }
         }
 
+        t=null;
+        try {
+            // See DRIHack.java for an explanation of why this is necessary
+            DRIHack.begin();
+            GLJNILibLoader.loadGLDesktopES12();
+            DRIHack.end();
+            hasDesktopGLES12 = true;
+        } catch (UnsatisfiedLinkError ule) {
+            t=ule;
+        } catch (SecurityException se) {
+            t=se;
+        } catch (NullPointerException npe) {
+            t=npe;
+        } catch (RuntimeException re) {
+            t=re;
+        }
+        if(null!=t) {
+            if (DEBUG) {
+                System.err.println("GLProfile.static Desktop GLES12 Library not available");
+                t.printStackTrace();
+            }
+        }
+
+
         hasGL234Impl   = hasDesktopGL && ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.gl4.GL4bcImpl");
         hasGL4bcImpl   = hasGL234Impl;
         hasGL4Impl     = hasGL234Impl;
         hasGL3bcImpl   = hasGL234Impl;
         hasGL3Impl     = hasGL234Impl;
         hasGL2Impl     = hasGL234Impl;
+        hasGL2ES12Impl = hasDesktopGLES12 && ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.gl2es12.GL2ES12Impl");
         mappedProfiles = computeProfileMap();
 
         //
@@ -849,7 +889,7 @@ public class GLProfile implements Cloneable {
         //   which will register at GLContext ..
         // 
 
-        if(hasDesktopGL) {
+        if(hasDesktopGL||hasDesktopGLES12) {
             // if successfull it has a shared dummy drawable and context created
             try {
                 hasNativeOSFactory = null != GLDrawableFactory.getFactoryImpl(GL2);
@@ -872,13 +912,15 @@ public class GLProfile implements Cloneable {
             hasGL4Impl     = false;
             hasGL3bcImpl   = false;
             hasGL3Impl     = false;
+            hasGL2ES12Impl = false;
             hasGL2Impl     = false;
         } else {
-            hasGL4bcImpl   = GLContext.isGL4bcAvailable();
-            hasGL4Impl     = GLContext.isGL4Available();
-            hasGL3bcImpl   = GLContext.isGL3bcAvailable();
-            hasGL3Impl     = GLContext.isGL3Available();
-            hasGL2Impl     = GLContext.isGL2Available();
+            hasGL4bcImpl   = hasGL4bcImpl   && GLContext.isGL4bcAvailable();
+            hasGL4Impl     = hasGL4Impl     && GLContext.isGL4Available();
+            hasGL3bcImpl   = hasGL3bcImpl   && GLContext.isGL3bcAvailable();
+            hasGL3Impl     = hasGL3Impl     && GLContext.isGL3Available();
+            hasGL2Impl     = hasGL2Impl     && GLContext.isGL2Available();
+            hasGL2ES12Impl = hasGL2ES12Impl && GLContext.isGL2Available();
         }
 
         boolean btest = false;
@@ -934,7 +976,7 @@ public class GLProfile implements Cloneable {
 
         mappedProfiles = computeProfileMap();
         if(null==defaultGLProfile) {
-            throw new GLException("No profile available: "+list2String(GL_PROFILE_LIST_ALL));
+            throw new GLException("No profile available: "+list2String(GL_PROFILE_LIST_ALL)+", "+glAvailabilityToString());
         }
 
         if (DEBUG) {
@@ -942,6 +984,7 @@ public class GLProfile implements Cloneable {
             System.err.println("GLProfile.static isAWTJOGLAvailable "+isAWTJOGLAvailable);
             System.err.println("GLProfile.static hasNativeOSFactory "+hasNativeOSFactory);
             System.err.println("GLProfile.static hasDesktopGL "+hasDesktopGL);
+            System.err.println("GLProfile.static hasDesktopGLES12 "+hasDesktopGLES12);
             System.err.println("GLProfile.static hasEGLDynLookup "+hasEGLDynLookup);
             System.err.println("GLProfile.static hasEGLDrawableFactory "+hasEGLDrawableFactory);
             System.err.println("GLProfile.static hasGL234Impl "+hasGL234Impl);
@@ -993,7 +1036,9 @@ public class GLProfile implements Cloneable {
      */
     private static String computeProfileImpl(String profile) {
         if (GL2ES1.equals(profile)) {
-            if(hasGL2Impl) {
+            if(hasGL2ES12Impl) {
+                return GL2ES12;
+            } else if(hasGL2Impl) {
                 return GL2;
             } else if(hasGL3bcImpl) {
                 return GL3bc;
@@ -1003,7 +1048,9 @@ public class GLProfile implements Cloneable {
                 return GLES1;
             }
         } else if (GL2ES2.equals(profile)) {
-            if(hasGL2Impl) {
+            if(hasGL2ES12Impl) {
+                return GL2ES12;
+            } else if(hasGL2Impl) {
                 return GL2;
             } else if(hasGL3Impl) {
                 return GL3;
-- 
cgit v1.2.3


From 012fca06f2539db232f0183f72187ec2f8ca54f5 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 22 Apr 2010 21:15:48 +0200
Subject: Review of using isGL2() and GL2.GL*

---
 .../com/jogamp/opengl/impl/glu/mipmap/Mipmap.java  | 287 +++++++++++----------
 .../impl/macosx/cgl/MacOSXOffscreenCGLContext.java |   2 +-
 .../impl/macosx/cgl/MacOSXPbufferCGLContext.java   |   2 +-
 .../impl/macosx/cgl/MacOSXPbufferCGLDrawable.java  |   4 +-
 .../impl/windows/wgl/WindowsPbufferWGLContext.java |   2 +-
 .../impl/x11/glx/X11OffscreenGLXContext.java       |   2 +-
 .../com/jogamp/opengl/util/glsl/ShaderUtil.java    |   2 +-
 .../com/jogamp/opengl/util/texture/Texture.java    |  28 +-
 .../util/texture/spi/TGAImage.java.javame_cdc_fp   |   8 +-
 .../opengl/util/texture/spi/TGAImage.java.javase   |   8 +-
 src/jogl/classes/javax/media/opengl/GLContext.java |  10 +-
 11 files changed, 178 insertions(+), 177 deletions(-)

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java
index 2c3f60d32..1c0707c57 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java
@@ -46,6 +46,7 @@ package com.jogamp.opengl.impl.glu.mipmap;
 
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2;
+import javax.media.opengl.GL2GL3;
 import javax.media.opengl.glu.GLU;
 import javax.media.opengl.GLException;
 import java.nio.*;
@@ -125,7 +126,7 @@ public class Mipmap {
     if( !legalFormat( format ) || !legalType( type ) ) {
       return( GLU.GLU_INVALID_ENUM );
     }
-    if( format == GL2.GL_STENCIL_INDEX ) {
+    if( format == GL2GL3.GL_STENCIL_INDEX ) {
       return( GLU.GLU_INVALID_ENUM );
     }
     if( !isLegalFormatForPackedPixelType( format, type ) ) {
@@ -137,18 +138,18 @@ public class Mipmap {
   public static boolean legalFormat( int format ) {
     switch( format ) {
       case( GL2.GL_COLOR_INDEX ):
-      case( GL2.GL_STENCIL_INDEX ):
-      case( GL2.GL_DEPTH_COMPONENT ):
-      case( GL2.GL_RED ):
-      case( GL2.GL_GREEN ):
-      case( GL2.GL_BLUE ):
-      case( GL2.GL_ALPHA ):
-      case( GL2.GL_RGB ):
-      case( GL2.GL_RGBA ):
-      case( GL2.GL_LUMINANCE ):
-      case( GL2.GL_LUMINANCE_ALPHA ):
-      case( GL2.GL_BGR ):
-      case( GL2.GL_BGRA ):
+      case( GL2GL3.GL_STENCIL_INDEX ):
+      case( GL2GL3.GL_DEPTH_COMPONENT ):
+      case( GL2GL3.GL_RED ):
+      case( GL2GL3.GL_GREEN ):
+      case( GL2GL3.GL_BLUE ):
+      case( GL2GL3.GL_ALPHA ):
+      case( GL2GL3.GL_RGB ):
+      case( GL2GL3.GL_RGBA ):
+      case( GL2GL3.GL_LUMINANCE ):
+      case( GL2GL3.GL_LUMINANCE_ALPHA ):
+      case( GL2GL3.GL_BGR ):
+      case( GL2GL3.GL_BGRA ):
         return( true );
       default:
         return( false );
@@ -158,25 +159,25 @@ public class Mipmap {
   public static boolean legalType( int type ) {
     switch( type ) {
       case( GL2.GL_BITMAP ):
-      case( GL2.GL_BYTE ):
-      case( GL2.GL_UNSIGNED_BYTE ):
-      case( GL2.GL_SHORT ):
-      case( GL2.GL_UNSIGNED_SHORT ):
-      case( GL2.GL_INT ):
-      case( GL2.GL_UNSIGNED_INT ):
-      case( GL2.GL_FLOAT ):
-      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
+      case( GL2GL3.GL_BYTE ):
+      case( GL2GL3.GL_UNSIGNED_BYTE ):
+      case( GL2GL3.GL_SHORT ):
+      case( GL2GL3.GL_UNSIGNED_SHORT ):
+      case( GL2GL3.GL_INT ):
+      case( GL2GL3.GL_UNSIGNED_INT ):
+      case( GL2GL3.GL_FLOAT ):
+      case( GL2GL3.GL_UNSIGNED_BYTE_3_3_2 ):
+      case( GL2GL3.GL_UNSIGNED_BYTE_2_3_3_REV ):
+      case( GL2GL3.GL_UNSIGNED_SHORT_5_6_5 ):
+      case( GL2GL3.GL_UNSIGNED_SHORT_5_6_5_REV ):
+      case( GL2GL3.GL_UNSIGNED_SHORT_4_4_4_4 ):
+      case( GL2GL3.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+      case( GL2GL3.GL_UNSIGNED_SHORT_5_5_5_1 ):
+      case( GL2GL3.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+      case( GL2GL3.GL_UNSIGNED_INT_8_8_8_8 ):
+      case( GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV ):
+      case( GL2GL3.GL_UNSIGNED_INT_10_10_10_2 ):
+      case( GL2GL3.GL_UNSIGNED_INT_2_10_10_10_REV ):
         return( true );
       default:
         return( false );
@@ -186,18 +187,18 @@ public class Mipmap {
   public static boolean isTypePackedPixel( int type ) {
     assert( legalType( type ) );
     
-    if( type == GL2.GL_UNSIGNED_BYTE_3_3_2 ||
-        type == GL2.GL_UNSIGNED_BYTE_2_3_3_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_5_6_5 ||
-        type == GL2.GL_UNSIGNED_SHORT_5_6_5_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_4_4_4_4 ||
-        type == GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_5_5_5_1 ||
-        type == GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ||
-        type == GL2.GL_UNSIGNED_INT_8_8_8_8 ||
-        type == GL2.GL_UNSIGNED_INT_8_8_8_8_REV ||
-        type == GL2.GL_UNSIGNED_INT_10_10_10_2 ||
-        type == GL2.GL_UNSIGNED_INT_2_10_10_10_REV ) {
+    if( type == GL2GL3.GL_UNSIGNED_BYTE_3_3_2 ||
+        type == GL2GL3.GL_UNSIGNED_BYTE_2_3_3_REV ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_5_6_5 ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_5_6_5_REV ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_4_4_4_4 ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_4_4_4_4_REV ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_5_5_5_1 ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_1_5_5_5_REV ||
+        type == GL2GL3.GL_UNSIGNED_INT_8_8_8_8 ||
+        type == GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV ||
+        type == GL2GL3.GL_UNSIGNED_INT_10_10_10_2 ||
+        type == GL2GL3.GL_UNSIGNED_INT_2_10_10_10_REV ) {
           return( true );
     }
     return( false );
@@ -210,23 +211,23 @@ public class Mipmap {
     }
     
     // 3_3_2/2_3_3_REV & 5_6_5/5_6_5_REV are only compatible with RGB
-    if( (type == GL2.GL_UNSIGNED_BYTE_3_3_2 || type == GL2.GL_UNSIGNED_BYTE_2_3_3_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_5_6_5 || type == GL2.GL_UNSIGNED_SHORT_5_6_5_REV )
-        & format != GL2.GL_RGB ) {
+    if( (type == GL2GL3.GL_UNSIGNED_BYTE_3_3_2 || type == GL2GL3.GL_UNSIGNED_BYTE_2_3_3_REV ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_5_6_5 || type == GL2GL3.GL_UNSIGNED_SHORT_5_6_5_REV )
+        & format != GL2GL3.GL_RGB ) {
           return( false );
     }
     
     // 4_4_4_4/4_4_4_4_REV & 5_5_5_1/1_5_5_5_REV & 8_8_8_8/8_8_8_8_REV &
     // 10_10_10_2/2_10_10_10_REV are only campatible with RGBA, BGRA & ARGB_EXT
-    if( ( type == GL2.GL_UNSIGNED_SHORT_4_4_4_4 ||
-          type == GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ||
-          type == GL2.GL_UNSIGNED_SHORT_5_5_5_1 ||
-          type == GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ||
-          type == GL2.GL_UNSIGNED_INT_8_8_8_8 ||
-          type == GL2.GL_UNSIGNED_INT_8_8_8_8_REV ||
-          type == GL2.GL_UNSIGNED_INT_10_10_10_2 ||
-          type == GL2.GL_UNSIGNED_INT_2_10_10_10_REV ) &&
-          (format != GL2.GL_RGBA && format != GL2.GL_BGRA) ) {
+    if( ( type == GL2GL3.GL_UNSIGNED_SHORT_4_4_4_4 ||
+          type == GL2GL3.GL_UNSIGNED_SHORT_4_4_4_4_REV ||
+          type == GL2GL3.GL_UNSIGNED_SHORT_5_5_5_1 ||
+          type == GL2GL3.GL_UNSIGNED_SHORT_1_5_5_5_REV ||
+          type == GL2GL3.GL_UNSIGNED_INT_8_8_8_8 ||
+          type == GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV ||
+          type == GL2GL3.GL_UNSIGNED_INT_10_10_10_2 ||
+          type == GL2GL3.GL_UNSIGNED_INT_2_10_10_10_REV ) &&
+          (format != GL2GL3.GL_RGBA && format != GL2GL3.GL_BGRA) ) {
             return( false );
     }
     return( true );
@@ -272,27 +273,27 @@ public class Mipmap {
           assert( heightAtLevelOne > 0 );
         
           // does width x height at level 1 & all their mipmaps fit?
-          if( target == GL2.GL_TEXTURE_2D || target == GL2.GL_PROXY_TEXTURE_2D ) {
-            proxyTarget = GL2.GL_PROXY_TEXTURE_2D;
+          if( target == GL2GL3.GL_TEXTURE_2D || target == GL2GL3.GL_PROXY_TEXTURE_2D ) {
+            proxyTarget = GL2GL3.GL_PROXY_TEXTURE_2D;
             gl.glTexImage2D( proxyTarget, 1, internalFormat, widthAtLevelOne,
                              heightAtLevelOne, 0, format, type, null );
-          } else if( (target == GL2.GL_TEXTURE_CUBE_MAP_POSITIVE_X) || 
-                     (target == GL2.GL_TEXTURE_CUBE_MAP_NEGATIVE_X) || 
-                     (target == GL2.GL_TEXTURE_CUBE_MAP_POSITIVE_Y) || 
-                     (target == GL2.GL_TEXTURE_CUBE_MAP_NEGATIVE_Y) || 
-                     (target == GL2.GL_TEXTURE_CUBE_MAP_POSITIVE_Z) || 
-                     (target == GL2.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z) ) {
-            proxyTarget = GL2.GL_PROXY_TEXTURE_CUBE_MAP;
+          } else if( (target == GL2GL3.GL_TEXTURE_CUBE_MAP_POSITIVE_X) || 
+                     (target == GL2GL3.GL_TEXTURE_CUBE_MAP_NEGATIVE_X) || 
+                     (target == GL2GL3.GL_TEXTURE_CUBE_MAP_POSITIVE_Y) || 
+                     (target == GL2GL3.GL_TEXTURE_CUBE_MAP_NEGATIVE_Y) || 
+                     (target == GL2GL3.GL_TEXTURE_CUBE_MAP_POSITIVE_Z) || 
+                     (target == GL2GL3.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z) ) {
+            proxyTarget = GL2GL3.GL_PROXY_TEXTURE_CUBE_MAP;
             gl.glTexImage2D( proxyTarget, 1, internalFormat, widthAtLevelOne,
                              heightAtLevelOne, 0, format, type, null );
           } else {
-            assert( target == GL2.GL_TEXTURE_1D || target == GL2.GL_PROXY_TEXTURE_1D );
-            proxyTarget = GL2.GL_PROXY_TEXTURE_1D;
-            gl.getGL2().glTexImage1D( proxyTarget, 1, internalFormat, widthAtLevelOne, 
+            assert( target == GL2GL3.GL_TEXTURE_1D || target == GL2GL3.GL_PROXY_TEXTURE_1D );
+            proxyTarget = GL2GL3.GL_PROXY_TEXTURE_1D;
+            gl.getGL2GL3().glTexImage1D( proxyTarget, 1, internalFormat, widthAtLevelOne, 
                              0, format, type, null );
           }
-          if(gl.isGL2()) {
-            gl.getGL2().glGetTexLevelParameteriv( proxyTarget, 1, GL2.GL_TEXTURE_WIDTH, proxyWidth, 0 );
+          if(gl.isGL2GL3()) {
+            gl.getGL2GL3().glGetTexLevelParameteriv( proxyTarget, 1, GL2GL3.GL_TEXTURE_WIDTH, proxyWidth, 0 );
           } else {
             proxyWidth[0] = 0;
           }
@@ -324,7 +325,7 @@ public class Mipmap {
       }
     }
     int[] maxsize = new int[1];
-    gl.glGetIntegerv( GL2.GL_MAX_TEXTURE_SIZE, maxsize , 0);
+    gl.glGetIntegerv( GL2GL3.GL_MAX_TEXTURE_SIZE, maxsize , 0);
     // clamp user's texture sizes to maximum sizes, if necessary
     newWidth[0] = nearestPower( width );
     if( newWidth[0] > maxsize[0] ) {
@@ -355,13 +356,13 @@ public class Mipmap {
       assert( depthAtLevelOne > 0 );
       
       // does width x height x depth at level 1 & all their mipmaps fit?
-      if( target == GL2.GL_TEXTURE_3D || target == GL2.GL_PROXY_TEXTURE_3D ) {
-        proxyTarget = GL2.GL_PROXY_TEXTURE_3D;
-        gl.getGL2().glTexImage3D( proxyTarget, 1, internalFormat, widthAtLevelOne,
+      if( target == GL2GL3.GL_TEXTURE_3D || target == GL2GL3.GL_PROXY_TEXTURE_3D ) {
+        proxyTarget = GL2GL3.GL_PROXY_TEXTURE_3D;
+        gl.getGL2GL3().glTexImage3D( proxyTarget, 1, internalFormat, widthAtLevelOne,
                 heightAtLevelOne, depthAtLevelOne, 0, format, type, null );
       }
-      if(gl.isGL2()) {
-        gl.getGL2().glGetTexLevelParameteriv( proxyTarget, 1, GL2.GL_TEXTURE_WIDTH, proxyWidth, 0 );
+      if(gl.isGL2GL3()) {
+        gl.getGL2GL3().glGetTexLevelParameteriv( proxyTarget, 1, GL2GL3.GL_TEXTURE_WIDTH, proxyWidth, 0 );
       } else {
         proxyWidth[0] = 0;
       }
@@ -388,30 +389,30 @@ public class Mipmap {
     // Return the number of elements per grtoup of a specified gromat
     
     // If the type is packedpixels then answer is 1
-    if( type == GL2.GL_UNSIGNED_BYTE_3_3_2 ||
-        type == GL2.GL_UNSIGNED_BYTE_2_3_3_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_5_6_5 ||
-        type == GL2.GL_UNSIGNED_SHORT_5_6_5_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_4_4_4_4 ||
-        type == GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ||
-        type == GL2.GL_UNSIGNED_SHORT_5_5_5_1 ||
-        type == GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ||
-        type == GL2.GL_UNSIGNED_INT_8_8_8_8 ||
-        type == GL2.GL_UNSIGNED_INT_8_8_8_8_REV ||
-        type == GL2.GL_UNSIGNED_INT_10_10_10_2 ||
-        type == GL2.GL_UNSIGNED_INT_2_10_10_10_REV ) {
+    if( type == GL2GL3.GL_UNSIGNED_BYTE_3_3_2 ||
+        type == GL2GL3.GL_UNSIGNED_BYTE_2_3_3_REV ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_5_6_5 ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_5_6_5_REV ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_4_4_4_4 ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_4_4_4_4_REV ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_5_5_5_1 ||
+        type == GL2GL3.GL_UNSIGNED_SHORT_1_5_5_5_REV ||
+        type == GL2GL3.GL_UNSIGNED_INT_8_8_8_8 ||
+        type == GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV ||
+        type == GL2GL3.GL_UNSIGNED_INT_10_10_10_2 ||
+        type == GL2GL3.GL_UNSIGNED_INT_2_10_10_10_REV ) {
           return( 1 );
     }
     
     // Types are not packed pixels so get elements per group
     switch( format ) {
-      case( GL2.GL_RGB ):
-      case( GL2.GL_BGR ):
+      case( GL2GL3.GL_RGB ):
+      case( GL2GL3.GL_BGR ):
         return( 3 );
-      case( GL2.GL_LUMINANCE_ALPHA ):
+      case( GL2GL3.GL_LUMINANCE_ALPHA ):
         return( 2 );
-      case( GL2.GL_RGBA ):
-      case( GL2.GL_BGRA ):
+      case( GL2GL3.GL_RGBA ):
+      case( GL2GL3.GL_BGRA ):
         return( 4 );
       default:
         return( 1 );
@@ -423,27 +424,27 @@ public class Mipmap {
     
     switch( type ) {
       case( GL2.GL_BITMAP ):
-      case( GL2.GL_BYTE ):
-      case( GL2.GL_UNSIGNED_BYTE ):
-      case( GL2.GL_UNSIGNED_BYTE_3_3_2 ):
-      case( GL2.GL_UNSIGNED_BYTE_2_3_3_REV ):
+      case( GL2GL3.GL_BYTE ):
+      case( GL2GL3.GL_UNSIGNED_BYTE ):
+      case( GL2GL3.GL_UNSIGNED_BYTE_3_3_2 ):
+      case( GL2GL3.GL_UNSIGNED_BYTE_2_3_3_REV ):
         return( 1 );
-      case( GL2.GL_SHORT ):
-      case( GL2.GL_UNSIGNED_SHORT ):
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5 ):
-      case( GL2.GL_UNSIGNED_SHORT_5_6_5_REV ):
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4 ):
-      case( GL2.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
-      case( GL2.GL_UNSIGNED_SHORT_5_5_5_1 ):
-      case( GL2.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
+      case( GL2GL3.GL_SHORT ):
+      case( GL2GL3.GL_UNSIGNED_SHORT ):
+      case( GL2GL3.GL_UNSIGNED_SHORT_5_6_5 ):
+      case( GL2GL3.GL_UNSIGNED_SHORT_5_6_5_REV ):
+      case( GL2GL3.GL_UNSIGNED_SHORT_4_4_4_4 ):
+      case( GL2GL3.GL_UNSIGNED_SHORT_4_4_4_4_REV ):
+      case( GL2GL3.GL_UNSIGNED_SHORT_5_5_5_1 ):
+      case( GL2GL3.GL_UNSIGNED_SHORT_1_5_5_5_REV ):
         return( 2 );
-      case( GL2.GL_INT ):
-      case( GL2.GL_UNSIGNED_INT ):
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8 ):
-      case( GL2.GL_UNSIGNED_INT_8_8_8_8_REV ):
-      case( GL2.GL_UNSIGNED_INT_10_10_10_2 ):
-      case( GL2.GL_UNSIGNED_INT_2_10_10_10_REV ):
-      case( GL2.GL_FLOAT ):
+      case( GL2GL3.GL_INT ):
+      case( GL2GL3.GL_UNSIGNED_INT ):
+      case( GL2GL3.GL_UNSIGNED_INT_8_8_8_8 ):
+      case( GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV ):
+      case( GL2GL3.GL_UNSIGNED_INT_10_10_10_2 ):
+      case( GL2GL3.GL_UNSIGNED_INT_2_10_10_10_REV ):
+      case( GL2GL3.GL_FLOAT ):
         return( 4 );
       default:
         return( 4 );
@@ -451,7 +452,7 @@ public class Mipmap {
   }
   
   public static boolean is_index( int format ) {
-    return( format == GL2.GL_COLOR_INDEX || format == GL2.GL_STENCIL_INDEX );
+    return( format == GL2.GL_COLOR_INDEX || format == GL2GL3.GL_STENCIL_INDEX );
   }
   
   /* Compute memory required for internal packed array of data of given type and format. */
@@ -483,67 +484,67 @@ public class Mipmap {
   
   public static void retrieveStoreModes( GL gl, PixelStorageModes psm ) {
     int[] a = new int[1];
-    gl.glGetIntegerv( GL2.GL_UNPACK_ALIGNMENT, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_ALIGNMENT, a, 0);
     psm.setUnpackAlignment( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_ROW_LENGTH, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_ROW_LENGTH, a, 0);
     psm.setUnpackRowLength( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_ROWS, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_SKIP_ROWS, a, 0);
     psm.setUnpackSkipRows( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_PIXELS, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_SKIP_PIXELS, a, 0);
     psm.setUnpackSkipPixels( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_LSB_FIRST, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_LSB_FIRST, a, 0);
     psm.setUnpackLsbFirst( ( a[0] == 1 ) );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SWAP_BYTES, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_SWAP_BYTES, a, 0);
     psm.setUnpackSwapBytes( ( a[0] == 1 ) );
     
-    gl.glGetIntegerv( GL2.GL_PACK_ALIGNMENT, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_PACK_ALIGNMENT, a, 0);
     psm.setPackAlignment( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_ROW_LENGTH, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_PACK_ROW_LENGTH, a, 0);
     psm.setPackRowLength( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_SKIP_ROWS, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_PACK_SKIP_ROWS, a, 0);
     psm.setPackSkipRows( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_SKIP_PIXELS, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_PACK_SKIP_PIXELS, a, 0);
     psm.setPackSkipPixels( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_LSB_FIRST, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_PACK_LSB_FIRST, a, 0);
     psm.setPackLsbFirst( ( a[0] == 1 ) );
-    gl.glGetIntegerv( GL2.GL_PACK_SWAP_BYTES, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_PACK_SWAP_BYTES, a, 0);
     psm.setPackSwapBytes( ( a[0] == 1 ) );
   }
   
   public static void retrieveStoreModes3D( GL gl, PixelStorageModes psm ) {
     int[] a = new int[1];
-    gl.glGetIntegerv( GL2.GL_UNPACK_ALIGNMENT, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_ALIGNMENT, a, 0);
     psm.setUnpackAlignment( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_ROW_LENGTH, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_ROW_LENGTH, a, 0);
     psm.setUnpackRowLength( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_ROWS, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_SKIP_ROWS, a, 0);
     psm.setUnpackSkipRows( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_PIXELS, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_SKIP_PIXELS, a, 0);
     psm.setUnpackSkipPixels( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_LSB_FIRST, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_LSB_FIRST, a, 0);
     psm.setUnpackLsbFirst( ( a[0] == 1 ) );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SWAP_BYTES, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_SWAP_BYTES, a, 0);
     psm.setUnpackSwapBytes( ( a[0] == 1 ) );
-    gl.glGetIntegerv( GL2.GL_UNPACK_SKIP_IMAGES, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_SKIP_IMAGES, a, 0);
     psm.setUnpackSkipImages( a[0] );
-    gl.glGetIntegerv( GL2.GL_UNPACK_IMAGE_HEIGHT, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_UNPACK_IMAGE_HEIGHT, a, 0);
     psm.setUnpackImageHeight( a[0] );
     
-    gl.glGetIntegerv( GL2.GL_PACK_ALIGNMENT, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_PACK_ALIGNMENT, a, 0);
     psm.setPackAlignment( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_ROW_LENGTH, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_PACK_ROW_LENGTH, a, 0);
     psm.setPackRowLength( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_SKIP_ROWS, a, 0);
+    gl.glGetIntegerv( GL2GL3.GL_PACK_SKIP_ROWS, a, 0);
     psm.setPackSkipRows( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_SKIP_PIXELS, a, 0 );
+    gl.glGetIntegerv( GL2GL3.GL_PACK_SKIP_PIXELS, a, 0 );
     psm.setPackSkipPixels( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_LSB_FIRST, a, 0 );
+    gl.glGetIntegerv( GL2GL3.GL_PACK_LSB_FIRST, a, 0 );
     psm.setPackLsbFirst( ( a[0] == 1 ) );
-    gl.glGetIntegerv( GL2.GL_PACK_SWAP_BYTES, a, 0 );
+    gl.glGetIntegerv( GL2GL3.GL_PACK_SWAP_BYTES, a, 0 );
     psm.setPackSwapBytes( ( a[0] == 1 ) );
-    gl.glGetIntegerv( GL2.GL_PACK_SKIP_IMAGES, a, 0 );
+    gl.glGetIntegerv( GL2GL3.GL_PACK_SKIP_IMAGES, a, 0 );
     psm.setPackSkipImages( a[0] );
-    gl.glGetIntegerv( GL2.GL_PACK_IMAGE_HEIGHT, a, 0 );
+    gl.glGetIntegerv( GL2GL3.GL_PACK_IMAGE_HEIGHT, a, 0 );
     psm.setPackImageHeight( a[0] );
   }
   
@@ -574,8 +575,8 @@ public class Mipmap {
       if( !isLegalFormatForPackedPixelType( format, typeout ) ) {
         return( GLU.GLU_INVALID_OPERATION );
       }
-      beforeimage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( image_size( widthin, heightin, format, GL2.GL_UNSIGNED_SHORT ) ));
-      afterimage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( image_size( widthout, heightout, format, GL2.GL_UNSIGNED_SHORT ) ));
+      beforeimage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( image_size( widthin, heightin, format, GL2GL3.GL_UNSIGNED_SHORT ) ));
+      afterimage = InternalBufferUtil.nativeOrder(ByteBuffer.allocateDirect( image_size( widthout, heightout, format, GL2GL3.GL_UNSIGNED_SHORT ) ));
       if( beforeimage == null || afterimage == null ) {
         return( GLU.GLU_OUT_OF_MEMORY );
       }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
index 8b8bb46fa..89e293665 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
@@ -51,7 +51,7 @@ public class MacOSXOffscreenCGLContext extends MacOSXPbufferCGLContext
 	
   public int getOffscreenContextPixelDataType() {
     GL gl = getGL();
-    return gl.isGL2()?GL2.GL_UNSIGNED_INT_8_8_8_8_REV:GL.GL_UNSIGNED_SHORT_5_5_5_1;
+    return gl.isGL2GL3()?GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV:GL.GL_UNSIGNED_SHORT_5_5_5_1;
   }
 
   public int getOffscreenContextReadBuffer() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
index e90672a1d..52a892b70 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
@@ -80,7 +80,7 @@ public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
       DefaultGraphicsConfiguration config = (DefaultGraphicsConfiguration) drawable.getNativeWindow().getGraphicsConfiguration().getNativeGraphicsConfiguration();
       GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
       GL gl = getGL();
-      boolean rect = gl.isGL2() && capabilities.getPbufferRenderToTextureRectangle();
+      boolean rect = gl.isGL2GL3() && capabilities.getPbufferRenderToTextureRectangle();
       if (rect) {
         if (!gl.isExtensionAvailable("GL_EXT_texture_rectangle")) {
           System.err.println("MacOSXPbufferCGLContext: WARNING: GL_EXT_texture_rectangle extension not " +
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
index b02cea03e..afdc40dbb 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
@@ -112,7 +112,7 @@ public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
     GLCapabilities capabilities = (GLCapabilities)config.getChosenCapabilities();
     GLProfile glProfile = capabilities.getGLProfile();
     int renderTarget;
-    if (glProfile.isGL2() && capabilities.getPbufferRenderToTextureRectangle()) {
+    if (glProfile.isGL2GL3() && capabilities.getPbufferRenderToTextureRectangle()) {
       renderTarget = GL2.GL_TEXTURE_RECTANGLE;
     } else {
       int w = getNextPowerOf2(getWidth());
@@ -132,7 +132,7 @@ public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
         throw new GLException("Floating-point support (GL_APPLE_float_pixels) not available");
         }
       */
-      if(glProfile.isGL2()) {
+      if(glProfile.isGL2GL3()) {
         switch (capabilities.getRedBits()) {
         case 16: internalFormat = GL2.GL_RGBA_FLOAT16_APPLE; break;
         case 32: internalFormat = GL2.GL_RGBA_FLOAT32_APPLE; break;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
index b0524bcd9..a9e02e11f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
@@ -101,7 +101,7 @@ public class WindowsPbufferWGLContext extends WindowsWGLContext {
       // Initialize render-to-texture support if requested
       GL gl = getGL();
       rtt  = capabilities.getPbufferRenderToTexture();
-      rect = gl.isGL2() && capabilities.getPbufferRenderToTextureRectangle();
+      rect = gl.isGL2GL3() && capabilities.getPbufferRenderToTextureRectangle();
 
       if (rtt) {
         if (DEBUG) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java
index 306a711bd..bea953ee9 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java
@@ -54,7 +54,7 @@ public class X11OffscreenGLXContext extends X11GLXContext {
 
   public int getOffscreenContextPixelDataType() {
     GL gl = getGL();
-    return gl.isGL2()?GL2.GL_UNSIGNED_INT_8_8_8_8_REV:GL.GL_UNSIGNED_SHORT_5_5_5_1;
+    return gl.isGL2GL3()?GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV:GL.GL_UNSIGNED_SHORT_5_5_5_1;
   }
   
   public int getOffscreenContextReadBuffer() {
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
index 21f359f52..c7e845953 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
@@ -221,7 +221,7 @@ public class ShaderUtil {
                         v = true;
                     }
                     shaderCompilerAvailable = new Boolean(v);
-                } else if( gl.isGL2() || gl.isGL2ES2() ) {
+                } else if( gl.isGL2ES2() ) {
                     shaderCompilerAvailable = new Boolean(true);
                 } else {
                     throw new GLException("Invalid OpenGL profile");
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
index 5ef96eeaf..57ac0d45a 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
@@ -487,7 +487,7 @@ public class Texture {
         }
 
         if (!done && preferTexRect(gl) && !isPOT &&
-            haveTexRect(gl) && !data.isDataCompressed() && gl.isGL2()) {
+            haveTexRect(gl) && !data.isDataCompressed() && !gl.isGL3() && !gl.isGLES()) {
             // GL_ARB_texture_rectangle does not work for compressed textures
             if (DEBUG) {
                 System.err.println("Using GL_ARB_texture_rectangle preferentially on this hardware");
@@ -514,7 +514,7 @@ public class Texture {
             done = true;
         }
 
-        if (!done && haveTexRect(gl) && !data.isDataCompressed() && gl.isGL2()) {
+        if (!done && haveTexRect(gl) && !data.isDataCompressed() && !gl.isGL3() && !gl.isGLES()) {
             // GL_ARB_texture_rectangle does not work for compressed textures
             if (DEBUG) {
                 System.err.println("Using GL_ARB_texture_rectangle");
@@ -1013,10 +1013,10 @@ public class Texture {
             int[] skipRows = { 0 };
             int[] skipPixels = { 0 };
             gl.glGetIntegerv(GL.GL_UNPACK_ALIGNMENT,   align,      0); // save alignment
-            if(gl.isGL2()) {
-                gl.glGetIntegerv(GL2.GL_UNPACK_ROW_LENGTH,  rowLength,  0); // save row length
-                gl.glGetIntegerv(GL2.GL_UNPACK_SKIP_ROWS,   skipRows,   0); // save skipped rows
-                gl.glGetIntegerv(GL2.GL_UNPACK_SKIP_PIXELS, skipPixels, 0); // save skipped pixels
+            if(gl.isGL2GL3()) {
+                gl.glGetIntegerv(GL2GL3.GL_UNPACK_ROW_LENGTH,  rowLength,  0); // save row length
+                gl.glGetIntegerv(GL2GL3.GL_UNPACK_SKIP_ROWS,   skipRows,   0); // save skipped rows
+                gl.glGetIntegerv(GL2GL3.GL_UNPACK_SKIP_PIXELS, skipPixels, 0); // save skipped pixels
             }
             gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, data.getAlignment());
             if (DEBUG && VERBOSE) {
@@ -1028,10 +1028,10 @@ public class Texture {
                 System.out.println("width       = " + width);
                 System.out.println("height      = " + height);
             }
-            if(gl.isGL2()) {
-                gl.glPixelStorei(GL2.GL_UNPACK_ROW_LENGTH, rowlen);
-                gl.glPixelStorei(GL2.GL_UNPACK_SKIP_ROWS, srcy);
-                gl.glPixelStorei(GL2.GL_UNPACK_SKIP_PIXELS, srcx);
+            if(gl.isGL2GL3()) {
+                gl.glPixelStorei(GL2GL3.GL_UNPACK_ROW_LENGTH, rowlen);
+                gl.glPixelStorei(GL2GL3.GL_UNPACK_SKIP_ROWS, srcy);
+                gl.glPixelStorei(GL2GL3.GL_UNPACK_SKIP_PIXELS, srcx);
             } else {
                 if ( rowlen!=0 && rowlen!=width &&
                      srcy!=0 && srcx!=0 ) {
@@ -1044,10 +1044,10 @@ public class Texture {
                                data.getPixelFormat(), data.getPixelType(),
                                buffer);
             gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT,   align[0]);      // restore alignment
-            if(gl.isGL2()) {
-                gl.glPixelStorei(GL2.GL_UNPACK_ROW_LENGTH,  rowLength[0]);  // restore row length
-                gl.glPixelStorei(GL2.GL_UNPACK_SKIP_ROWS,   skipRows[0]);   // restore skipped rows
-                gl.glPixelStorei(GL2.GL_UNPACK_SKIP_PIXELS, skipPixels[0]); // restore skipped pixels
+            if(gl.isGL2GL3()) {
+                gl.glPixelStorei(GL2GL3.GL_UNPACK_ROW_LENGTH,  rowLength[0]);  // restore row length
+                gl.glPixelStorei(GL2GL3.GL_UNPACK_SKIP_ROWS,   skipRows[0]);   // restore skipped rows
+                gl.glPixelStorei(GL2GL3.GL_UNPACK_SKIP_PIXELS, skipPixels[0]); // restore skipped pixels
             }
         }
     }
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
index d1eca7c69..6e6e4ab04 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
@@ -308,8 +308,8 @@ public class TGAImage {
         GL gl = GLContext.getCurrentGL();
         if (header.pixelDepth() == 24) {
             bpp=3;
-            if(gl.isGL2()) {
-                format = GL2.GL_BGR;
+            if(gl.isGL2GL3()) {
+                format = GL2GL3.GL_BGR;
             } else {
                 format = GL.GL_RGB;
                 swapBGR(tmpData, rawWidth, header.height(), bpp);
@@ -318,8 +318,8 @@ public class TGAImage {
             assert header.pixelDepth() == 32;
             bpp=4;
 
-            if(gl.isGL2()) {
-                format = GL2.GL_BGRA;
+            if(gl.isGL2GL3()) {
+                format = GL2GL3.GL_BGRA;
             } else {
                 format = GL.GL_RGBA;
                 swapBGR(tmpData, rawWidth, header.height(), bpp);
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase
index 8575f553d..16ba538b5 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase
@@ -310,8 +310,8 @@ public class TGAImage {
         GL gl = GLContext.getCurrentGL();
         if (header.pixelDepth() == 24) {
             bpp=3;
-            if(gl.isGL2()) {
-                format = GL2.GL_BGR;
+            if(gl.isGL2GL3()) {
+                format = GL2GL3.GL_BGR;
             } else {
                 format = GL.GL_RGB;
                 swapBGR(tmpData, rawWidth, header.height(), bpp);
@@ -320,8 +320,8 @@ public class TGAImage {
             assert header.pixelDepth() == 32;
             bpp=4;
 
-            if(gl.isGL2()) {
-                format = GL2.GL_BGRA;
+            if(gl.isGL2GL3()) {
+                format = GL2GL3.GL_BGRA;
             } else {
                 format = GL.GL_RGBA;
                 swapBGR(tmpData, rawWidth, header.height(), bpp);
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index e5b499af9..2709dd506 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -378,6 +378,10 @@ public abstract class GLContext {
       return ctxMajorVersion>=1 && CTX_PROFILE_COMPAT==(ctxOptions & (CTX_PROFILE_COMPAT|CTX_PROFILE_ES));
   }
 
+  public final boolean isGL2GL3() {
+      return isGL2() || isGL3();
+  }
+
   public final boolean isGLES1() {
       return ctxMajorVersion==1 && CTX_PROFILE_ES==(ctxOptions & CTX_PROFILE_ES);
   }
@@ -395,11 +399,7 @@ public abstract class GLContext {
   }
 
   public final boolean isGL2ES2() {
-      return isGL2() || isGL3() || isGLES2() ;
-  }
-
-  public final boolean isGL2GL3() {
-      return isGL2() || isGL3();
+      return isGL2GL3() || isGLES2() ;
   }
 
   public final boolean hasGLSL() {
-- 
cgit v1.2.3


From ca6818d87ee86b2cc9961e47ad9f899e1fd90f78 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Thu, 22 Apr 2010 23:24:18 +0200
Subject: reviewed X11Lib.XLock/UnlockDisplay() usage:  - added lock();
 try{foo();}finally{unlock();} where missing  - made sure lock is called
 outside the try block  - fixed nesting in situations with two independent
 locks

---
 .../com/jogamp/opengl/impl/x11/glx/GLXUtil.java    |   6 +-
 .../opengl/impl/x11/glx/X11GLXDrawableFactory.java |  27 ++-
 .../glx/X11GLXGraphicsConfigurationFactory.java    | 270 +++++++++++----------
 .../impl/x11/glx/X11OffscreenGLXDrawable.java      | 103 ++++----
 .../impl/x11/X11GraphicsConfigurationFactory.java  |   4 +-
 .../media/nativewindow/x11/X11GraphicsScreen.java  |  33 ++-
 6 files changed, 236 insertions(+), 207 deletions(-)

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
index e3c1381f8..ec0eaf94f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
@@ -34,14 +34,12 @@ package com.jogamp.opengl.impl.x11.glx;
 
 import javax.media.opengl.*;
 
-import com.jogamp.opengl.impl.*;
-import javax.media.nativewindow.NativeWindowFactory;
 import com.jogamp.nativewindow.impl.x11.*;
 
 public class GLXUtil {
     public static boolean isMultisampleAvailable(long display) {
+        X11Lib.XLockDisplay(display);
         try {
-            X11Lib.XLockDisplay(display);
             String exts = GLX.glXGetClientString(display, GLX.GLX_EXTENSIONS);
             if (exts != null) {
                 return (exts.indexOf("GLX_ARB_multisample") >= 0);
@@ -55,8 +53,8 @@ public class GLXUtil {
     /** Workaround for apparent issue with ATI's proprietary drivers
         where direct contexts still send GLX tokens for GL calls */
     public static String getVendorName(long display) {
+        X11Lib.XLockDisplay(display);
         try {
-            X11Lib.XLockDisplay(display);
             return GLX.glXGetClientString(display, GLX.GLX_VENDOR);
         } finally {
             X11Lib.XUnlockDisplay(display);
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
index f331ad2a2..d8e5f7646 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
@@ -72,12 +72,15 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
     }
     sharedScreen = new X11GraphicsScreen(sharedDevice, 0);
     X11Lib.XLockDisplay(sharedScreen.getDevice().getHandle());
-    sharedDrawable = new X11DummyGLXDrawable(sharedScreen, this, null);
-    X11GLXContext ctx  = (X11GLXContext) sharedDrawable.createContext(null);
-    ctx.makeCurrent();
-    ctx.release();
-    sharedContext = ctx;
-    X11Lib.XUnlockDisplay(sharedScreen.getDevice().getHandle());
+    try{
+        sharedDrawable = new X11DummyGLXDrawable(sharedScreen, this, null);
+        X11GLXContext ctx  = (X11GLXContext) sharedDrawable.createContext(null);
+        ctx.makeCurrent();
+        ctx.release();
+        sharedContext = ctx;
+    }finally{
+        X11Lib.XUnlockDisplay(sharedScreen.getDevice().getHandle());
+    }
     if(null==sharedContext) {
         throw new GLException("Couldn't init shared resources");
     }
@@ -226,10 +229,16 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
 
   protected NativeWindow createOffscreenWindow(GLCapabilities capabilities, GLCapabilitiesChooser chooser, int width, int height) {
     validate();
+    NullWindow nw = null;
     X11Lib.XLockDisplay(sharedScreen.getDevice().getHandle());
-    NullWindow nw = new NullWindow(X11GLXGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(capabilities, chooser, sharedScreen));
-    X11Lib.XUnlockDisplay(sharedScreen.getDevice().getHandle());
-    nw.setSize(width, height);
+    try{
+        nw = new NullWindow(X11GLXGraphicsConfigurationFactory.chooseGraphicsConfigurationStatic(capabilities, chooser, sharedScreen));
+    }finally{
+        X11Lib.XUnlockDisplay(sharedScreen.getDevice().getHandle());
+    }
+    if(nw != null) {
+        nw.setSize(width, height);
+    }
     return nw;
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
index 477f2473c..e65fb5e90 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
@@ -190,108 +190,111 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
         long display = absDevice.getHandle();
 
         NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-        X11Lib.XLockDisplay(display);
         try {
-            int screen = x11Screen.getIndex();
-            boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
-            int[] attribs = X11GLXGraphicsConfiguration.GLCapabilities2AttribList(capabilities, true, isMultisampleAvailable, display, screen);
-            int[] count = { -1 };
-
-            // determine the recommended FBConfig ..
-            fbcfgsL = GLX.glXChooseFBConfigCopied(display, screen, attribs, 0, count, 0);
-            if (fbcfgsL == null || fbcfgsL.limit()<1) {
-                if(DEBUG) {
-                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed glXChooseFBConfig ("+x11Screen+","+capabilities+"): "+fbcfgsL+", "+count[0]);
-                }
-            } else if( !X11GLXGraphicsConfiguration.GLXFBConfigValid( display, fbcfgsL.get(0) ) ) {
-                if(DEBUG) {
-                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed - GLX FBConfig invalid: ("+x11Screen+","+capabilities+"): "+fbcfgsL+", fbcfg: "+toHexString(fbcfgsL.get(0)));
-                }
-            } else {
-                recommendedFBConfig = fbcfgsL.get(0);
-            }
-
-            // get all, glXChooseFBConfig(.. attribs==null ..) == glXGetFBConfig(..)
-            fbcfgsL = GLX.glXChooseFBConfigCopied(display, screen, null, 0, count, 0);
-            if (fbcfgsL == null || fbcfgsL.limit()<1) {
-                if(DEBUG) {
-                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed glXGetFBConfig ("+x11Screen+"): "+fbcfgsL+", "+count[0]);
+            X11Lib.XLockDisplay(display);
+            try{
+                int screen = x11Screen.getIndex();
+                boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
+                int[] attribs = X11GLXGraphicsConfiguration.GLCapabilities2AttribList(capabilities, true, isMultisampleAvailable, display, screen);
+                int[] count = { -1 };
+
+                // determine the recommended FBConfig ..
+                fbcfgsL = GLX.glXChooseFBConfigCopied(display, screen, attribs, 0, count, 0);
+                if (fbcfgsL == null || fbcfgsL.limit()<1) {
+                    if(DEBUG) {
+                        System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed glXChooseFBConfig ("+x11Screen+","+capabilities+"): "+fbcfgsL+", "+count[0]);
+                    }
+                } else if( !X11GLXGraphicsConfiguration.GLXFBConfigValid( display, fbcfgsL.get(0) ) ) {
+                    if(DEBUG) {
+                        System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed - GLX FBConfig invalid: ("+x11Screen+","+capabilities+"): "+fbcfgsL+", fbcfg: "+toHexString(fbcfgsL.get(0)));
+                    }
+                } else {
+                    recommendedFBConfig = fbcfgsL.get(0);
                 }
-                return null;
-            }
 
-            // make GLCapabilities and seek the recommendedIndex
-            caps = new GLCapabilities[fbcfgsL.limit()];
-            for (int i = 0; i < fbcfgsL.limit(); i++) {
-                if( !X11GLXGraphicsConfiguration.GLXFBConfigValid( display, fbcfgsL.get(i) ) ) {
+                // get all, glXChooseFBConfig(.. attribs==null ..) == glXGetFBConfig(..)
+                fbcfgsL = GLX.glXChooseFBConfigCopied(display, screen, null, 0, count, 0);
+                if (fbcfgsL == null || fbcfgsL.limit()<1) {
                     if(DEBUG) {
-                        System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: FBConfig invalid: ("+x11Screen+","+capabilities+"): fbcfg: "+toHexString(fbcfgsL.get(i)));
+                        System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed glXGetFBConfig ("+x11Screen+"): "+fbcfgsL+", "+count[0]);
                     }
-                } else {
-                    caps[i] = X11GLXGraphicsConfiguration.GLXFBConfig2GLCapabilities(glProfile, display, fbcfgsL.get(i), 
-                                                                                     false, onscreen, usePBuffer, isMultisampleAvailable);
-                    if(caps[i]!=null && recommendedFBConfig==fbcfgsL.get(i)) {
-                        recommendedIndex=i;
-                        if (DEBUG) {
-                            System.err.println("!!! glXChooseFBConfig recommended "+i+", "+caps[i]);
+                    return null;
+                }
+
+                // make GLCapabilities and seek the recommendedIndex
+                caps = new GLCapabilities[fbcfgsL.limit()];
+                for (int i = 0; i < fbcfgsL.limit(); i++) {
+                    if( !X11GLXGraphicsConfiguration.GLXFBConfigValid( display, fbcfgsL.get(i) ) ) {
+                        if(DEBUG) {
+                            System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: FBConfig invalid: ("+x11Screen+","+capabilities+"): fbcfg: "+toHexString(fbcfgsL.get(i)));
+                        }
+                    } else {
+                        caps[i] = X11GLXGraphicsConfiguration.GLXFBConfig2GLCapabilities(glProfile, display, fbcfgsL.get(i),
+                                                                                         false, onscreen, usePBuffer, isMultisampleAvailable);
+                        if(caps[i]!=null && recommendedFBConfig==fbcfgsL.get(i)) {
+                            recommendedIndex=i;
+                            if (DEBUG) {
+                                System.err.println("!!! glXChooseFBConfig recommended "+i+", "+caps[i]);
+                            }
                         }
                     }
                 }
-            }
 
-            if(null==chooser) {
-                chosen = recommendedIndex; // may still be -1 in case nothing was recommended (-1)
-            }
-
-            if (chosen < 0) {
                 if(null==chooser) {
-                    // nothing recommended .. so use our default implementation
-                    chooser = new DefaultGLCapabilitiesChooser();
+                    chosen = recommendedIndex; // may still be -1 in case nothing was recommended (-1)
                 }
-                try {
-                  chosen = chooser.chooseCapabilities(capabilities, caps, recommendedIndex);
-                } catch (NativeWindowException e) {
+
+                if (chosen < 0) {
+                    if(null==chooser) {
+                        // nothing recommended .. so use our default implementation
+                        chooser = new DefaultGLCapabilitiesChooser();
+                    }
+                    try {
+                      chosen = chooser.chooseCapabilities(capabilities, caps, recommendedIndex);
+                    } catch (NativeWindowException e) {
+                      if(DEBUG) {
+                          e.printStackTrace();
+                      }
+                      chosen = -1;
+                    }
+                }
+                if (chosen < 0) {
+                  // keep on going ..
                   if(DEBUG) {
-                      e.printStackTrace();
+                      System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig Failed .. unable to choose config, using first");
                   }
-                  chosen = -1;
-                }
-            }
-            if (chosen < 0) {
-              // keep on going ..
-              if(DEBUG) {
-                  System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig Failed .. unable to choose config, using first");
-              }
-              // seek first available one ..
-              for(chosen = 0; chosen < caps.length && caps[chosen]==null; chosen++) ;
-              if(chosen==caps.length) {
-                // give up ..
-                if(DEBUG) {
-                  System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig Failed .. nothing available, bail out");
-                }
-                return null;
-              }
-            } else if (chosen >= caps.length) {
-                if(DEBUG) {
-                  System.err.println("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ", got "+chosen+")");
+                  // seek first available one ..
+                  for(chosen = 0; chosen < caps.length && caps[chosen]==null; chosen++) ;
+                  if(chosen==caps.length) {
+                    // give up ..
+                    if(DEBUG) {
+                      System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig Failed .. nothing available, bail out");
+                    }
+                    return null;
+                  }
+                } else if (chosen >= caps.length) {
+                    if(DEBUG) {
+                      System.err.println("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ", got "+chosen+")");
+                    }
+                    return null;
                 }
-                return null;
-            }
 
-            retFBID = X11GLXGraphicsConfiguration.glXFBConfig2FBConfigID(display, fbcfgsL.get(chosen));
+                retFBID = X11GLXGraphicsConfiguration.glXFBConfig2FBConfigID(display, fbcfgsL.get(chosen));
 
-            retXVisualInfo = GLX.glXGetVisualFromFBConfigCopied(display, fbcfgsL.get(chosen));
-            if (retXVisualInfo==null) {
-                if(DEBUG) {
-                    System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed glXGetVisualFromFBConfig ("+x11Screen+", "+fbcfgsL.get(chosen) +" (Continue: "+(false==caps[chosen].isOnscreen())+"):\n\t"+caps[chosen]);
-                }
-                if(caps[chosen].isOnscreen()) {
-                    // Onscreen drawables shall have a XVisual ..
-                    return null;
+                retXVisualInfo = GLX.glXGetVisualFromFBConfigCopied(display, fbcfgsL.get(chosen));
+                if (retXVisualInfo==null) {
+                    if(DEBUG) {
+                        System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig: Failed glXGetVisualFromFBConfig ("+x11Screen+", "+fbcfgsL.get(chosen) +" (Continue: "+(false==caps[chosen].isOnscreen())+"):\n\t"+caps[chosen]);
+                    }
+                    if(caps[chosen].isOnscreen()) {
+                        // Onscreen drawables shall have a XVisual ..
+                        return null;
+                    }
                 }
+            }finally{
+                X11Lib.XUnlockDisplay(display);
             }
         } finally {
-            X11Lib.XUnlockDisplay(display);
             NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
         }
 
@@ -320,60 +323,63 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
         long display = absDevice.getHandle();
 
         NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-        X11Lib.XLockDisplay(display);
         try {
-            int screen = x11Screen.getIndex();
-            boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
-            int[] attribs = X11GLXGraphicsConfiguration.GLCapabilities2AttribList(capabilities, false, isMultisampleAvailable, display, screen);
-            XVisualInfo[] infos = null;
-
-            XVisualInfo recommendedVis = GLX.glXChooseVisualCopied(display, screen, attribs, 0);
-            if (DEBUG) {
-                System.err.print("!!! glXChooseVisual recommended ");
-                if (recommendedVis == null) {
-                    System.err.println("null visual");
-                } else {
-                    System.err.println("visual id " + toHexString(recommendedVis.getVisualid()));
+            X11Lib.XLockDisplay(display);
+            try{
+                int screen = x11Screen.getIndex();
+                boolean isMultisampleAvailable = GLXUtil.isMultisampleAvailable(display);
+                int[] attribs = X11GLXGraphicsConfiguration.GLCapabilities2AttribList(capabilities, false, isMultisampleAvailable, display, screen);
+                XVisualInfo[] infos = null;
+
+                XVisualInfo recommendedVis = GLX.glXChooseVisualCopied(display, screen, attribs, 0);
+                if (DEBUG) {
+                    System.err.print("!!! glXChooseVisual recommended ");
+                    if (recommendedVis == null) {
+                        System.err.println("null visual");
+                    } else {
+                        System.err.println("visual id " + toHexString(recommendedVis.getVisualid()));
+                    }
                 }
-            }
-            int[] count = new int[1];
-            XVisualInfo template = XVisualInfo.create();
-            template.setScreen(screen);
-            infos = X11Lib.XGetVisualInfoCopied(display, X11Lib.VisualScreenMask, template, count, 0);
-            if (infos == null || infos.length<1) {
-                throw new GLException("Error while enumerating available XVisualInfos");
-            }
-            caps = new GLCapabilities[infos.length];
-            for (int i = 0; i < infos.length; i++) {
-                caps[i] = X11GLXGraphicsConfiguration.XVisualInfo2GLCapabilities(glProfile, display, infos[i], onscreen, false, isMultisampleAvailable);
-                // Attempt to find the visual chosen by glXChooseVisual
-                if (recommendedVis != null && recommendedVis.getVisualid() == infos[i].getVisualid()) {
-                    recommendedIndex = i;
+                int[] count = new int[1];
+                XVisualInfo template = XVisualInfo.create();
+                template.setScreen(screen);
+                infos = X11Lib.XGetVisualInfoCopied(display, X11Lib.VisualScreenMask, template, count, 0);
+                if (infos == null || infos.length<1) {
+                    throw new GLException("Error while enumerating available XVisualInfos");
                 }
+                caps = new GLCapabilities[infos.length];
+                for (int i = 0; i < infos.length; i++) {
+                    caps[i] = X11GLXGraphicsConfiguration.XVisualInfo2GLCapabilities(glProfile, display, infos[i], onscreen, false, isMultisampleAvailable);
+                    // Attempt to find the visual chosen by glXChooseVisual
+                    if (recommendedVis != null && recommendedVis.getVisualid() == infos[i].getVisualid()) {
+                        recommendedIndex = i;
+                    }
+                }
+                try {
+                  chosen = chooser.chooseCapabilities(capabilities, caps, recommendedIndex);
+                } catch (NativeWindowException e) {
+                  if(DEBUG) {
+                      e.printStackTrace();
+                  }
+                  chosen = -1;
+                }
+                if (chosen < 0) {
+                  // keep on going ..
+                  if(DEBUG) {
+                      System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationXVisual Failed .. unable to choose config, using first");
+                  }
+                  chosen = 0; // default ..
+                } else if (chosen >= caps.length) {
+                    throw new GLException("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ")");
+                }
+                if (infos[chosen] == null) {
+                    throw new GLException("GLCapabilitiesChooser chose an invalid visual for "+caps[chosen]);
+                }
+                retXVisualInfo = XVisualInfo.create(infos[chosen]);
+            }finally{
+                X11Lib.XUnlockDisplay(display);
             }
-            try {
-              chosen = chooser.chooseCapabilities(capabilities, caps, recommendedIndex);
-            } catch (NativeWindowException e) {
-              if(DEBUG) {
-                  e.printStackTrace();
-              }
-              chosen = -1;
-            }
-            if (chosen < 0) {
-              // keep on going ..
-              if(DEBUG) {
-                  System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationXVisual Failed .. unable to choose config, using first");
-              }
-              chosen = 0; // default ..
-            } else if (chosen >= caps.length) {
-                throw new GLException("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ")");
-            }
-            if (infos[chosen] == null) {
-                throw new GLException("GLCapabilitiesChooser chose an invalid visual for "+caps[chosen]);
-            }
-            retXVisualInfo = XVisualInfo.create(infos[chosen]);
         } finally {
-            X11Lib.XUnlockDisplay(display);
             NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
         }
         return new X11GLXGraphicsConfiguration(x11Screen, caps[chosen], capabilities, chooser, retXVisualInfo, 0, -1);
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
index 41f012122..14d07e74f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
@@ -41,7 +41,6 @@ package com.jogamp.opengl.impl.x11.glx;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
 import com.jogamp.nativewindow.impl.x11.*;
 
 public class X11OffscreenGLXDrawable extends X11GLXDrawable {
@@ -75,27 +74,31 @@ public class X11OffscreenGLXDrawable extends X11GLXDrawable {
     int screen = aScreen.getIndex();
 
     getFactoryImpl().lockToolkit();
-    X11Lib.XLockDisplay(dpy);
     try {
-      pixmap = X11Lib.XCreatePixmap(dpy, X11Lib.RootWindow(dpy, screen), 
-                                    component.getWidth(), component.getHeight(), bitsPerPixel);
-      if (pixmap == 0) {
-        throw new GLException("XCreatePixmap failed");
-      }
-      long drawable = GLX.glXCreateGLXPixmap(dpy, vis, pixmap);
-      if (drawable == 0) {
-        X11Lib.XFreePixmap(dpy, pixmap);
-        pixmap = 0;
-        throw new GLException("glXCreateGLXPixmap failed");
-      }
-      ((SurfaceChangeable)nw).setSurfaceHandle(drawable);
-      if (DEBUG) {
-        System.err.println("Created pixmap " + toHexString(pixmap) +
-                           ", GLXPixmap " + toHexString(drawable) +
-                           ", display " + toHexString(dpy));
-      }
+        X11Lib.XLockDisplay(dpy);
+        try{
+
+          pixmap = X11Lib.XCreatePixmap(dpy, X11Lib.RootWindow(dpy, screen),
+                                        component.getWidth(), component.getHeight(), bitsPerPixel);
+          if (pixmap == 0) {
+            throw new GLException("XCreatePixmap failed");
+          }
+          long drawable = GLX.glXCreateGLXPixmap(dpy, vis, pixmap);
+          if (drawable == 0) {
+            X11Lib.XFreePixmap(dpy, pixmap);
+            pixmap = 0;
+            throw new GLException("glXCreateGLXPixmap failed");
+          }
+          ((SurfaceChangeable)nw).setSurfaceHandle(drawable);
+          if (DEBUG) {
+            System.err.println("Created pixmap " + toHexString(pixmap) +
+                               ", GLXPixmap " + toHexString(drawable) +
+                               ", display " + toHexString(dpy));
+          }
+        }finally{
+          X11Lib.XUnlockDisplay(dpy);
+        }
     } finally {
-      X11Lib.XUnlockDisplay(dpy);
       getFactoryImpl().unlockToolkit();
     }
   }
@@ -107,37 +110,41 @@ public class X11OffscreenGLXDrawable extends X11GLXDrawable {
     long display = nw.getDisplayHandle();
 
     getFactoryImpl().lockToolkit();
-    X11Lib.XLockDisplay(display);
     try {
-      long drawable = nw.getSurfaceHandle();
-      if (DEBUG) {
-        System.err.println("Destroying pixmap " + toHexString(pixmap) +
-                           ", GLXPixmap " + toHexString(drawable) +
-                           ", display " + toHexString(display));
-      }
-
-      // Must destroy pixmap and GLXPixmap
-
-      if (DEBUG) {
-        long cur = GLX.glXGetCurrentContext();
-        if (cur != 0) {
-          System.err.println("WARNING: found context " + toHexString(cur) + " current during pixmap destruction");
+        X11Lib.XLockDisplay(display);
+        try{
+          long drawable = nw.getSurfaceHandle();
+          if (DEBUG) {
+            System.err.println("Destroying pixmap " + toHexString(pixmap) +
+                               ", GLXPixmap " + toHexString(drawable) +
+                               ", display " + toHexString(display));
+          }
+
+          // Must destroy pixmap and GLXPixmap
+
+          if (DEBUG) {
+            long cur = GLX.glXGetCurrentContext();
+            if (cur != 0) {
+              System.err.println("WARNING: found context " + toHexString(cur) + " current during pixmap destruction");
+            }
+          }
+
+          // FIXME: workaround for crashes on NVidia hardware when
+          // destroying pixmap (no context is current at the point of the
+          // crash, at least from the point of view of
+          // glXGetCurrentContext)
+          GLX.glXMakeCurrent(display, 0, 0);
+
+          GLX.glXDestroyGLXPixmap(display, drawable);
+          X11Lib.XFreePixmap(display, pixmap);
+          drawable = 0;
+          pixmap = 0;
+          ((SurfaceChangeable)nw).setSurfaceHandle(0);
+
+        }finally{
+          X11Lib.XUnlockDisplay(display);
         }
-      }
-
-      // FIXME: workaround for crashes on NVidia hardware when
-      // destroying pixmap (no context is current at the point of the
-      // crash, at least from the point of view of
-      // glXGetCurrentContext)
-      GLX.glXMakeCurrent(display, 0, 0);
-
-      GLX.glXDestroyGLXPixmap(display, drawable);
-      X11Lib.XFreePixmap(display, pixmap);
-      drawable = 0;
-      pixmap = 0;
-      ((SurfaceChangeable)nw).setSurfaceHandle(0);
     } finally {
-      X11Lib.XUnlockDisplay(display);
       getFactoryImpl().unlockToolkit();
       display = 0;
     }
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java
index 4ffda2fae..a6f52f3c0 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java
@@ -58,8 +58,8 @@ public class X11GraphicsConfigurationFactory extends GraphicsConfigurationFactor
         int num[] = { -1 };
         long display = screen.getDevice().getHandle();
 
+        X11Lib.XLockDisplay(display);
         try {
-            X11Lib.XLockDisplay(display);
             XVisualInfo[] xvis = X11Lib.XGetVisualInfoCopied(display, X11Lib.VisualIDMask|X11Lib.VisualScreenMask, xvi_temp, num, 0);
 
             if(xvis==null || num[0]<1) {
@@ -90,8 +90,8 @@ public class X11GraphicsConfigurationFactory extends GraphicsConfigurationFactor
         vinfo_template.setC_class(c_class);
         long display = screen.getDevice().getHandle();
 
+        X11Lib.XLockDisplay(display);
         try {
-            X11Lib.XLockDisplay(display);
             XVisualInfo[] vinfos = X11Lib.XGetVisualInfoCopied(display, X11Lib.VisualScreenMask, vinfo_template, num, 0);
             XVisualInfo best=null;
             int rdepth = capabilities.getRedBits() + capabilities.getGreenBits() + capabilities.getBlueBits() + capabilities.getAlphaBits();
diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java
index 69ace3c52..58b40efe0 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java
@@ -57,13 +57,16 @@ public class X11GraphicsScreen extends DefaultGraphicsScreen implements Cloneabl
     /** Creates a new X11GraphicsScreen using a thread local display connection */
     public static AbstractGraphicsScreen createDefault() {
         NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-        long display = X11Util.createThreadLocalDefaultDisplay();
         try {
+            long display = X11Util.createThreadLocalDefaultDisplay();
             X11Lib.XLockDisplay(display);
-            int scrnIdx = X11Lib.DefaultScreen(display);
-            return createScreenDevice(display, scrnIdx);
+            try{
+                int scrnIdx = X11Lib.DefaultScreen(display);
+                return createScreenDevice(display, scrnIdx);
+            }finally{
+                X11Lib.XUnlockDisplay(display);
+            }
         } finally {
-            X11Lib.XUnlockDisplay(display);
             NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
         }
     }
@@ -71,13 +74,16 @@ public class X11GraphicsScreen extends DefaultGraphicsScreen implements Cloneabl
     public long getDefaultVisualID() {
         // It still could be an AWT hold handle ..
         NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-        long display = getDevice().getHandle();
         try {
+            long display = getDevice().getHandle();
             X11Lib.XLockDisplay(display);
-            int scrnIdx = X11Lib.DefaultScreen(display);
-            return X11Lib.DefaultVisualID(display, scrnIdx);
+            try{
+                int scrnIdx = X11Lib.DefaultScreen(display);
+                return X11Lib.DefaultVisualID(display, scrnIdx);
+            }finally{
+                X11Lib.XUnlockDisplay(display);
+            }
         } finally {
-            X11Lib.XUnlockDisplay(display);
             NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
         }
     }
@@ -85,14 +91,17 @@ public class X11GraphicsScreen extends DefaultGraphicsScreen implements Cloneabl
     private static int fetchScreen(X11GraphicsDevice device, int screen) {
         // It still could be an AWT hold handle ..
         NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
-        long display = device.getHandle();
         try {
+            long display = device.getHandle();
             X11Lib.XLockDisplay(display);
-            if(X11Lib.XineramaEnabled(display)) {
-                screen = 0; // Xinerama -> 1 screen
+            try{
+                if(X11Lib.XineramaEnabled(display)) {
+                    screen = 0; // Xinerama -> 1 screen
+                }
+            }finally{
+                X11Lib.XUnlockDisplay(display);
             }
         } finally {
-            X11Lib.XUnlockDisplay(display);
             NativeWindowFactory.getDefaultFactory().getToolkitLock().unlock();
         }
         return screen;
-- 
cgit v1.2.3


From c5513ba4d6a29cdc9f25863a8d6951beaae97409 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 22 Apr 2010 23:36:38 +0200
Subject: Newt.X11:XEventsQueued: QueuedAlready doesn't work on ATI - use
 QueuedAfterFlush

---
 src/newt/native/X11Window.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index 75237a210..27ca8e6a0 100755
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -291,7 +291,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_LockDisplay
         _FatalError(env, "invalid display connection..");
     }
     XLockDisplay(dpy) ;
-    DBG_PRINT1( "X11: LockDisplay 0x%X\n", dpy); 
+    // DBG_PRINT1( "X11: LockDisplay 0x%X\n", dpy); 
 }
 
 
@@ -308,7 +308,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_UnlockDisplay
         _FatalError(env, "invalid display connection..");
     }
     XUnlockDisplay(dpy) ;
-    DBG_PRINT1( "X11: UnlockDisplay 0x%X\n", dpy); 
+    // DBG_PRINT1( "X11: UnlockDisplay 0x%X\n", dpy); 
 }
 
 
@@ -447,10 +447,12 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
 
         XLockDisplay(dpy) ;
 
-        // num_events = XPending(dpy); // XEventsQueued(dpy, QueuedAfterFlush); // I/O Flush ..
-        // num_events = XEventsQueued(dpy, QueuedAlready); // Better, no I/O ..
-        if ( 0 >= XEventsQueued(dpy, QueuedAlready) ) {
+        // num_events = XPending(dpy); // I/O Flush ..
+        // num_events = XEventsQueued(dpy, QueuedAfterFlush); // I/O Flush only of no already queued events are available
+        // num_events = XEventsQueued(dpy, QueuedAlready); // no I/O Flush at all, doesn't work on some cards (eg ATI)
+        if ( 0 >= XEventsQueued(dpy, QueuedAfterFlush) ) {
             XUnlockDisplay(dpy) ;
+            // DBG_PRINT1( "X11: DispatchMessages 0x%X - Leave 1\n", dpy); 
             return;
         }
 
@@ -477,6 +479,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
             fprintf(stderr, "Warning: NEWT X11 DisplayDispatch %p, Couldn't handle event %d for invalid X11 window %p\n", 
                 dpy, evt.type, evt.xany.window);
             XUnlockDisplay(dpy) ;
+            // DBG_PRINT1( "X11: DispatchMessages 0x%X - Leave 2\n", dpy); 
             return;
         }
  
@@ -494,6 +497,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
         }
 
         XUnlockDisplay(dpy) ;
+        // DBG_PRINT3( "X11: DispatchMessages 0x%X - Window %p, Event %d\n", dpy, jwindow, evt.type); 
 
         switch(evt.type) {
             case ButtonPress:
-- 
cgit v1.2.3


From 85d4923c52f8d91de37e24f67c1ce152af30eb2e Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 23 Apr 2010 00:48:42 +0200
Subject: Add missing finally unlock, if 2nd lock fails

---
 src/newt/classes/com/jogamp/newt/macosx/MacWindow.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java b/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java
index 276843709..52d6fb0c7 100755
--- a/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java
+++ b/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java
@@ -216,7 +216,12 @@ public class MacWindow extends Window {
 
     public synchronized int lockSurface() throws NativeWindowException {
         nsViewLock.lock();
-        return super.lockSurface();
+        try {
+            return super.lockSurface();
+        } catch (RuntimeException re) {
+            nsViewLock.unlock();
+            throw re;
+        }
     }
 
     public void unlockSurface() {
-- 
cgit v1.2.3


From b7bd092831a1ad7a660386c4c291cb363cd8ebb0 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Fri, 23 Apr 2010 02:00:27 +0200
Subject: reviewed calls to lockSurface() and ensured propper unlocking.

---
 .../opengl/impl/egl/EGLOnscreenDrawable.java       | 24 +++++++--------
 .../opengl/impl/macosx/cgl/MacOSXCGLDrawable.java  |  7 ++---
 .../impl/windows/wgl/WindowsWGLDrawable.java       | 14 ++++-----
 .../jogamp/opengl/impl/x11/glx/X11GLXDrawable.java | 34 ++++++++++------------
 src/newt/classes/com/jogamp/newt/Window.java       |  2 +-
 5 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
index 3286367e5..3864fc39c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
@@ -60,21 +60,19 @@ public class EGLOnscreenDrawable extends EGLDrawable {
 
     protected void swapBuffersImpl() {
         boolean didLock = false;
+        if (!isSurfaceLocked()) {
+            // Usually the surface shall be locked within [makeCurrent .. swap .. release]
+            if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
+                return;
+            }
+            didLock = true;
+        }
         try {
-          if ( !isSurfaceLocked() ) {
-              // Usually the surface shall be locked within [makeCurrent .. swap .. release]
-              if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
-                  return;
-              }
-              didLock = true;
-          }
-
-          EGL.eglSwapBuffers(eglDisplay, eglSurface);
-
+            EGL.eglSwapBuffers(eglDisplay, eglSurface);
         } finally {
-          if(didLock) {
-              unlockSurface();
-          }
+            if (didLock) {
+                unlockSurface();
+            }
         }
     }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
index 5816b2101..cf29d214b 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
@@ -87,11 +87,8 @@ public abstract class MacOSXCGLDrawable extends GLDrawableImpl {
         if( NativeWindow.LOCK_SURFACE_NOT_READY == lockSurface() ) {
             throw new GLException("Couldn't lock surface");
         }
-        try {
-            // don't remove this block .. locking the surface is essential to update surface data
-        } finally {
-            unlockSurface();
-        }
+        // locking the surface is essential to update surface data
+        unlockSurface();
     }
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java
index fe0945139..43c1ff5e0 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java
@@ -83,14 +83,14 @@ public abstract class WindowsWGLDrawable extends GLDrawableImpl {
   protected void swapBuffersImpl() {
     boolean didLock = false;
 
-    try {
-        if ( !isSurfaceLocked() ) {
-            // Usually the surface shall be locked within [makeCurrent .. swap .. release]
-            if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
-                return;
-            }
-            didLock = true;
+    if ( !isSurfaceLocked() ) {
+        // Usually the surface shall be locked within [makeCurrent .. swap .. release]
+        if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
+            return;
         }
+        didLock = true;
+    }
+    try {
 
         long startTime = 0;
         if (PROFILING) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
index 2dabe774c..95dfc0a1c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
@@ -73,25 +73,23 @@ public abstract class X11GLXDrawable extends GLDrawableImpl {
     }
   }
 
-  protected void swapBuffersImpl() {
-    boolean didLock = false;
-    try {
-      if ( !isSurfaceLocked() ) {
-          // Usually the surface shall be locked within [makeCurrent .. swap .. release]
-          if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
-              return;
-          }
-          didLock=true;
-      }
-
-      GLX.glXSwapBuffers(component.getDisplayHandle(), component.getSurfaceHandle());
-
-    } finally {
-      if(didLock) {
-          unlockSurface();
-      }
+    protected void swapBuffersImpl() {
+        boolean didLock = false;
+        if (!isSurfaceLocked()) {
+            // Usually the surface shall be locked within [makeCurrent .. swap .. release]
+            if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
+                return;
+            }
+            didLock = true;
+        }
+        try {
+            GLX.glXSwapBuffers(component.getDisplayHandle(), component.getSurfaceHandle());
+        } finally {
+            if (didLock) {
+                unlockSurface();
+            }
+        }
     }
-  }
 
   //---------------------------------------------------------------------------
   // Internals only below this point
diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java
index 5123ab19f..a3d034792 100755
--- a/src/newt/classes/com/jogamp/newt/Window.java
+++ b/src/newt/classes/com/jogamp/newt/Window.java
@@ -342,8 +342,8 @@ public abstract class Window implements NativeWindow
             keyListeners = new ArrayList();
         }
         synchronized(this) {
+            destructionLock.lock();
             try {
-                destructionLock.lock();
                 Display dpy = null;
                 if( null != screen && 0 != windowHandle ) {
                     Screen scr = screen;
-- 
cgit v1.2.3


From 2151f2179cd1ce5f0d42c3514af11a9c235762db Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 23 Apr 2010 02:10:21 +0200
Subject: Reuse recursive locking code

---
 src/newt/classes/com/jogamp/newt/Window.java | 75 ++++++++++++++--------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java
index 5123ab19f..3d7d1e5da 100755
--- a/src/newt/classes/com/jogamp/newt/Window.java
+++ b/src/newt/classes/com/jogamp/newt/Window.java
@@ -263,61 +263,38 @@ public abstract class Window implements NativeWindow
     //
     // NativeWindow impl
     //
-    private Thread owner;
-    private int recursionCount;
-    protected Exception lockedStack = null;
 
     /** Recursive and blocking lockSurface() implementation */
     public synchronized int lockSurface() {
         // We leave the ToolkitLock lock to the specializtion's discretion, 
         // ie the implicit JAWTWindow in case of AWTWindow
-        Thread cur = Thread.currentThread();
-        if (owner == cur) {
-            ++recursionCount;
-            return LOCK_SUCCESS;
-        }
-        while (owner != null) {
-            try {
-                wait();
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        owner = cur;
-        lockedStack = new Exception("NEWT Surface previously locked by "+Thread.currentThread());
+        surfaceLock.lock();
         screen.getDisplay().lockDisplay();
         return LOCK_SUCCESS;
     }
 
     /** Recursive and unblocking unlockSurface() implementation */
     public synchronized void unlockSurface() throws NativeWindowException {
-        Thread cur = Thread.currentThread();
-        if (owner != cur) {
-            lockedStack.printStackTrace();
-            throw new NativeWindowException(cur+": Not owner, owner is "+owner);
-        }
-        if (recursionCount > 0) {
-            --recursionCount;
-            return;
-        }
-        owner = null;
-        lockedStack = null;
-        screen.getDisplay().unlockDisplay();
-        notifyAll();
+        surfaceLock.unlock( new Runnable() {
+                                final Screen f_screen = screen;
+                                public void run() {
+                                    screen.getDisplay().unlockDisplay();
+                                }
+                            } );
         // We leave the ToolkitLock unlock to the specializtion's discretion, 
         // ie the implicit JAWTWindow in case of AWTWindow
     }
 
     public synchronized boolean isSurfaceLocked() {
-        return null!=owner;
+        return surfaceLock.isLocked();
     }
 
     public synchronized Thread getSurfaceLockOwner() {
-        return owner;
+        return surfaceLock.getOwner();
     }
 
     public synchronized Exception getLockedStack() {
-        return lockedStack;
+        return surfaceLock.getLockedStack();
     }
 
     public void destroy() {
@@ -950,7 +927,16 @@ public abstract class Window implements NativeWindow
     public static class WindowToolkitLock implements ToolkitLock {
             private Thread owner;
             private int recursionCount;
-            
+            private Exception lockedStack = null;
+
+            public Exception getLockedStack() {
+                return lockedStack;
+            }
+
+            public Thread getOwner() {
+                return owner;
+            }
+
             public boolean isOwner() {
                 return isOwner(Thread.currentThread());
             }
@@ -963,11 +949,11 @@ public abstract class Window implements NativeWindow
                 return null != owner;
             }
 
+            /** Recursive and blocking lockSurface() implementation */
             public synchronized void lock() {
                 Thread cur = Thread.currentThread();
                 if (owner == cur) {
                     ++recursionCount;
-                    return;
                 }
                 while (owner != null) {
                     try {
@@ -977,20 +963,35 @@ public abstract class Window implements NativeWindow
                     }
                 }
                 owner = cur;
+                lockedStack = new Exception("Previously locked by "+owner);
             }
+            
 
+            /** Recursive and unblocking unlockSurface() implementation */
             public synchronized void unlock() {
-                if (owner != Thread.currentThread()) {
-                    throw new RuntimeException("Not owner");
+                unlock(null);
+            }
+
+            /** Recursive and unblocking unlockSurface() implementation */
+            public synchronized void unlock(Runnable releaseAfterUnlockBeforeNotify) {
+                Thread cur = Thread.currentThread();
+                if (owner != cur) {
+                    lockedStack.printStackTrace();
+                    throw new RuntimeException(cur+": Not owner, owner is "+owner);
                 }
                 if (recursionCount > 0) {
                     --recursionCount;
                     return;
                 }
                 owner = null;
+                lockedStack = null;
+                if(null!=releaseAfterUnlockBeforeNotify) {
+                    releaseAfterUnlockBeforeNotify.run();
+                }
                 notifyAll();
             }
     }
     private WindowToolkitLock destructionLock = new WindowToolkitLock();
+    private WindowToolkitLock surfaceLock = new WindowToolkitLock();
 }
 
-- 
cgit v1.2.3


From 5fb1d73fddc5c6297b66a640cd5c2720eee23472 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 23 Apr 2010 02:49:00 +0200
Subject: Newt.AWTWindow: Set/Unset windowHandle (enables actual destroy call)
 / minor debug stuff

---
 src/newt/classes/com/jogamp/newt/Window.java       | 24 ++++++++++++++--------
 .../classes/com/jogamp/newt/awt/AWTWindow.java     | 24 ++++++++++++++++------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java
index d0977f4e4..b1f8b3977 100755
--- a/src/newt/classes/com/jogamp/newt/Window.java
+++ b/src/newt/classes/com/jogamp/newt/Window.java
@@ -109,6 +109,9 @@ public abstract class Window implements NativeWindow
             } else {
                 window.createNative(parentWindowHandle, caps);
             }
+            if(DEBUG_WINDOW_EVENT) {
+                System.out.println("Window.create-1() done ("+Thread.currentThread()+", "+window+")");
+            }
             return window;
         } catch (Throwable t) {
             t.printStackTrace();
@@ -142,6 +145,9 @@ public abstract class Window implements NativeWindow
             } else {
                 window.createNative(0, caps);
             }
+            if(DEBUG_WINDOW_EVENT) {
+                System.out.println("Window.create-2() done ("+Thread.currentThread()+", "+window+")");
+            }
             return window;
         } catch (Throwable t) {
             throw new NativeWindowException(t);
@@ -212,14 +218,14 @@ public abstract class Window implements NativeWindow
         StringBuffer sb = new StringBuffer();
 
         sb.append(getClass().getName()+"[Config "+config+
-                    ", WindowHandle "+toHexString(getWindowHandle())+
-                    ", SurfaceHandle "+toHexString(getSurfaceHandle())+
-                    ", Pos "+getX()+"/"+getY()+", size "+getWidth()+"x"+getHeight()+
-                    ", Visible "+isVisible()+
-                    ", Undecorated "+undecorated+
-                    ", Fullscreen "+fullscreen+
-                    ", "+screen+
-                    ", WrappedWindow "+getWrappedWindow());
+                    "\n, "+screen+
+                    "\n, WindowHandle "+toHexString(getWindowHandle())+
+                    "\n, SurfaceHandle "+toHexString(getSurfaceHandle())+
+                    "\n, Pos "+getX()+"/"+getY()+", size "+getWidth()+"x"+getHeight()+
+                    "\n, Visible "+isVisible()+
+                    "\n, Undecorated "+undecorated+
+                    "\n, Fullscreen "+fullscreen+
+                    "\n, WrappedWindow "+getWrappedWindow());
 
         sb.append(", SurfaceUpdatedListeners num "+surfaceUpdatedListeners.size()+" [");
         for (Iterator iter = surfaceUpdatedListeners.iterator(); iter.hasNext(); ) {
@@ -304,7 +310,7 @@ public abstract class Window implements NativeWindow
     /** @param deep If true, the linked Screen and Display will be destroyed as well. */
     public void destroy(boolean deep) {
         if(DEBUG_WINDOW_EVENT) {
-            System.out.println("Window.destroy() start (deep "+deep+" - "+Thread.currentThread());
+            System.out.println("Window.destroy() start (deep "+deep+" - "+Thread.currentThread()+", "+this+")");
         }
         synchronized(surfaceUpdatedListeners) {
             surfaceUpdatedListeners = new ArrayList();
diff --git a/src/newt/classes/com/jogamp/newt/awt/AWTWindow.java b/src/newt/classes/com/jogamp/newt/awt/AWTWindow.java
index 98cd64ab8..7beeed44b 100644
--- a/src/newt/classes/com/jogamp/newt/awt/AWTWindow.java
+++ b/src/newt/classes/com/jogamp/newt/awt/AWTWindow.java
@@ -134,18 +134,30 @@ public class AWTWindow extends Window {
                     }
                 }
             });
+        this.windowHandle = 1; // just a marker ..
     }
 
     protected void closeNative() {
-        runOnEDT(true, new Runnable() {
-                public void run() {
-                    if(owningFrame && null!=frame) {
+        this.windowHandle = 0; // just a marker ..
+        if(null!=container) {
+            runOnEDT(true, new Runnable() {
+                    public void run() {
+                        container.setVisible(false);
+                        container.remove(canvas);
+                        container.setEnabled(false);
+                        canvas.setEnabled(false);
+                    }
+                });
+        }
+        if(owningFrame && null!=frame) {
+            runOnEDT(true, new Runnable() {
+                    public void run() {
                         frame.dispose();
                         owningFrame=false;
+                        frame = null;
                     }
-                    frame = null;
-                }
-            });
+                });
+        }
     }
 
     public boolean hasDeviceChanged() {
-- 
cgit v1.2.3


From a588326d206ff32e5ff5db97560851cb9b826022 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 23 Apr 2010 03:09:06 +0200
Subject: Updated UML Documentation

---
 doc/bouml/html-svg/classdiagrams.html   |  22 ++
 doc/bouml/html-svg/classes.html         |  44 ++++
 doc/bouml/html-svg/classes_list.html    |  47 ++++
 doc/bouml/html-svg/fig128069.svg        | 437 ++++++++++++++++++++++++++++++++
 doc/bouml/html-svg/index-withframe.html |  19 ++
 doc/bouml/html-svg/index.html           | 238 +++++++++++++++++
 doc/bouml/html-svg/index_65.html        |  23 ++
 doc/bouml/html-svg/index_67.html        |  24 ++
 doc/bouml/html-svg/index_71.html        |  42 +++
 doc/bouml/html-svg/index_74.html        |  24 ++
 doc/bouml/html-svg/index_78.html        |  23 ++
 doc/bouml/html-svg/index_79.html        |  23 ++
 doc/bouml/html-svg/index_82.html        |  23 ++
 doc/bouml/html-svg/navig.html           |  17 ++
 doc/bouml/html-svg/packages.html        |  22 ++
 doc/bouml/html-svg/style.css            |  30 +++
 doc/bouml/html/classes.html             |   7 +-
 doc/bouml/html/classes_list.html        |   7 +-
 doc/bouml/html/fig128069.png            | Bin 67934 -> 80497 bytes
 doc/bouml/html/fig128069.svg            | 350 -------------------------
 doc/bouml/html/index-withframe.html     |   2 +-
 doc/bouml/html/index.html               |  73 ++++--
 doc/bouml/html/index_71.html            |   7 +-
 doc/bouml/html/navig.html               |   2 +-
 doc/bouml/jogl/128069.diagram           | 140 +++++++---
 doc/bouml/jogl/2.session                |  11 +
 doc/bouml/jogl/jogl.prj                 | 176 +++++++++++--
 27 files changed, 1389 insertions(+), 444 deletions(-)
 create mode 100644 doc/bouml/html-svg/classdiagrams.html
 create mode 100644 doc/bouml/html-svg/classes.html
 create mode 100644 doc/bouml/html-svg/classes_list.html
 create mode 100644 doc/bouml/html-svg/fig128069.svg
 create mode 100644 doc/bouml/html-svg/index-withframe.html
 create mode 100644 doc/bouml/html-svg/index.html
 create mode 100644 doc/bouml/html-svg/index_65.html
 create mode 100644 doc/bouml/html-svg/index_67.html
 create mode 100644 doc/bouml/html-svg/index_71.html
 create mode 100644 doc/bouml/html-svg/index_74.html
 create mode 100644 doc/bouml/html-svg/index_78.html
 create mode 100644 doc/bouml/html-svg/index_79.html
 create mode 100644 doc/bouml/html-svg/index_82.html
 create mode 100644 doc/bouml/html-svg/navig.html
 create mode 100644 doc/bouml/html-svg/packages.html
 create mode 100644 doc/bouml/html-svg/style.css
 delete mode 100644 doc/bouml/html/fig128069.svg
 create mode 100644 doc/bouml/jogl/2.session

diff --git a/doc/bouml/html-svg/classdiagrams.html b/doc/bouml/html-svg/classdiagrams.html
new file mode 100644
index 000000000..4f4efc693
--- /dev/null
+++ b/doc/bouml/html-svg/classdiagrams.html
@@ -0,0 +1,22 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>Class Diagram Index</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class Diagram Index</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128069" target = "projectFrame"><b>OpenGL Interfaces</b></a></td><td></td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/classes.html b/doc/bouml/html-svg/classes.html
new file mode 100644
index 000000000..dd1a230ed
--- /dev/null
+++ b/doc/bouml/html-svg/classes.html
@@ -0,0 +1,44 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>Classes Index</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Classes Index</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass131013" target = "projectFrame"><b>AbstractGraphicsConfiguration</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass131269" target = "projectFrame"><b>Capabilities</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128069" target = "projectFrame"><b>GL</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128453" target = "projectFrame"><b>GL2</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128197" target = "projectFrame"><b>GL2ES1</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128386" target = "projectFrame"><b>GL2ES12</b></a></td><td>entity</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128581" target = "projectFrame"><b>GL2ES2</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128709" target = "projectFrame"><b>GL2GL3</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128837" target = "projectFrame"><b>GL3</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128002" target = "projectFrame"><b>GL3bc</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128130" target = "projectFrame"><b>GL4</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128258" target = "projectFrame"><b>GL4bc</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130501" target = "projectFrame"><b>GL4bcImpl</b></a></td><td>entity</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass132549" target = "projectFrame"><b>GLBase</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass131141" target = "projectFrame"><b>GLCapabilities</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130117" target = "projectFrame"><b>GLContext</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130245" target = "projectFrame"><b>GLDrawable</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128325" target = "projectFrame"><b>GLES1</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130757" target = "projectFrame"><b>GLES1Impl</b></a></td><td>entity</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128965" target = "projectFrame"><b>GLES2</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130629" target = "projectFrame"><b>GLES2Impl</b></a></td><td>entity</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass131397" target = "projectFrame"><b>GLProfile</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130885" target = "projectFrame"><b>NativeWindow</b></a></td><td>interface</td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/classes_list.html b/doc/bouml/html-svg/classes_list.html
new file mode 100644
index 000000000..69e77a5ad
--- /dev/null
+++ b/doc/bouml/html-svg/classes_list.html
@@ -0,0 +1,47 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>Classes</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Classes</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table border="0" width="100%">
+<tr>
+<td nowrap><a href="index.html#refclass131013" target = "projectFrame"><b>AbstractGraphicsConfiguration</b></a><br />
+<a href="index.html#refclass131269" target = "projectFrame"><b>Capabilities</b></a><br />
+<a href="index.html#refclass128069" target = "projectFrame"><b>GL</b></a><br />
+<a href="index.html#refclass128453" target = "projectFrame"><b>GL2</b></a><br />
+<a href="index.html#refclass128197" target = "projectFrame"><b>GL2ES1</b></a><br />
+<a href="index.html#refclass128386" target = "projectFrame"><b>GL2ES12</b></a><br />
+<a href="index.html#refclass128581" target = "projectFrame"><b>GL2ES2</b></a><br />
+<a href="index.html#refclass128709" target = "projectFrame"><b>GL2GL3</b></a><br />
+<a href="index.html#refclass128837" target = "projectFrame"><b>GL3</b></a><br />
+<a href="index.html#refclass128002" target = "projectFrame"><b>GL3bc</b></a><br />
+<a href="index.html#refclass128130" target = "projectFrame"><b>GL4</b></a><br />
+<a href="index.html#refclass128258" target = "projectFrame"><b>GL4bc</b></a><br />
+<a href="index.html#refclass130501" target = "projectFrame"><b>GL4bcImpl</b></a><br />
+<a href="index.html#refclass132549" target = "projectFrame"><b>GLBase</b></a><br />
+<a href="index.html#refclass131141" target = "projectFrame"><b>GLCapabilities</b></a><br />
+<a href="index.html#refclass130117" target = "projectFrame"><b>GLContext</b></a><br />
+<a href="index.html#refclass130245" target = "projectFrame"><b>GLDrawable</b></a><br />
+<a href="index.html#refclass128325" target = "projectFrame"><b>GLES1</b></a><br />
+<a href="index.html#refclass130757" target = "projectFrame"><b>GLES1Impl</b></a><br />
+<a href="index.html#refclass128965" target = "projectFrame"><b>GLES2</b></a><br />
+<a href="index.html#refclass130629" target = "projectFrame"><b>GLES2Impl</b></a><br />
+<a href="index.html#refclass131397" target = "projectFrame"><b>GLProfile</b></a><br />
+<a href="index.html#refclass130885" target = "projectFrame"><b>NativeWindow</b></a><br />
+</td>
+</tr>
+</table>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/fig128069.svg b/doc/bouml/html-svg/fig128069.svg
new file mode 100644
index 000000000..77e4a0941
--- /dev/null
+++ b/doc/bouml/html-svg/fig128069.svg
@@ -0,0 +1,437 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Bouml (http://bouml.free.fr/) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="1003" height="1180" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<g>
+	<rect fill="#ededed" stroke="black" stroke-width="1" stroke-opacity="1" x="2" y="195" width="237" height="972" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="48" y="212">Fixed Function</text>
+	<line stroke="black" stroke-opacity="1" x1="2" y1="219" x2="93" y2="219" />
+	<line stroke="black" stroke-opacity="1" x1="93" y1="219" x2="105" y2="207" />
+	<line stroke="black" stroke-opacity="1" x1="105" y1="207" x2="105" y2="195" />
+</g>
+<g>
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="2" y1="393" x2="239" y2="393" />
+</g>
+<g>
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="2" y1="571" x2="239" y2="571" />
+</g>
+<g>
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="2" y1="306" x2="239" y2="306" />
+</g>
+<g>
+	<rect fill="#c0ffff" stroke="black" stroke-width="1" stroke-opacity="1" x="238" y="195" width="505" height="973" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="306" y="212">Programmable Shader</text>
+	<line stroke="black" stroke-opacity="1" x1="238" y1="219" x2="374" y2="219" />
+	<line stroke="black" stroke-opacity="1" x1="374" y1="219" x2="386" y2="207" />
+	<line stroke="black" stroke-opacity="1" x1="386" y1="207" x2="386" y2="195" />
+</g>
+<g>
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="238" y1="394" x2="743" y2="394" />
+</g>
+<g>
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="238" y1="571" x2="743" y2="571" />
+</g>
+<g>
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="238" y1="306" x2="743" y2="306" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="114" y1="225" x2="153" y2="178" />
+	<line stroke="black" stroke-opacity="1" x1="157" y1="174" x2="148" y2="174" />
+	<line stroke="black" stroke-opacity="1" x1="157" y1="174" x2="157" y2="182" />
+	<line stroke="black" stroke-opacity="1" x1="148" y1="174" x2="157" y2="182" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="284" y1="225" x2="230" y2="177" />
+	<line stroke="black" stroke-opacity="1" x1="226" y1="174" x2="226" y2="182" />
+	<line stroke="black" stroke-opacity="1" x1="226" y1="174" x2="234" y2="173" />
+	<line stroke="black" stroke-opacity="1" x1="226" y1="182" x2="234" y2="173" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="87" y1="400" x2="87" y2="294" />
+	<line stroke="black" stroke-opacity="1" x1="87" y1="288" x2="81" y2="294" />
+	<line stroke="black" stroke-opacity="1" x1="87" y1="288" x2="93" y2="294" />
+	<line stroke="black" stroke-opacity="1" x1="81" y1="294" x2="93" y2="294" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="322" y1="400" x2="322" y2="294" />
+	<line stroke="black" stroke-opacity="1" x1="322" y1="288" x2="316" y2="294" />
+	<line stroke="black" stroke-opacity="1" x1="322" y1="288" x2="328" y2="294" />
+	<line stroke="black" stroke-opacity="1" x1="316" y1="294" x2="328" y2="294" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="538" y1="683" x2="538" y2="384" />
+	<line stroke="black" stroke-opacity="1" x1="538" y1="378" x2="532" y2="384" />
+	<line stroke="black" stroke-opacity="1" x1="538" y1="378" x2="544" y2="384" />
+	<line stroke="black" stroke-opacity="1" x1="532" y1="384" x2="544" y2="384" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="273" y1="614" x2="500" y2="382" />
+	<line stroke="black" stroke-opacity="1" x1="505" y1="378" x2="496" y2="378" />
+	<line stroke="black" stroke-opacity="1" x1="505" y1="378" x2="505" y2="386" />
+	<line stroke="black" stroke-opacity="1" x1="496" y1="378" x2="505" y2="386" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="492" y1="326" x2="373" y2="277" />
+	<line stroke="black" stroke-opacity="1" x1="368" y1="275" x2="371" y2="282" />
+	<line stroke="black" stroke-opacity="1" x1="368" y1="275" x2="375" y2="271" />
+	<line stroke="black" stroke-opacity="1" x1="371" y1="282" x2="375" y2="271" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="231" y1="614" x2="101" y2="293" />
+	<line stroke="black" stroke-opacity="1" x1="99" y1="288" x2="95" y2="295" />
+	<line stroke="black" stroke-opacity="1" x1="99" y1="288" x2="106" y2="291" />
+	<line stroke="black" stroke-opacity="1" x1="95" y1="295" x2="106" y2="291" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="679" y1="115" x2="601" y2="62" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="86" y1="483" x2="86" y2="469" />
+	<line stroke="black" stroke-opacity="1" x1="86" y1="463" x2="80" y2="469" />
+	<line stroke="black" stroke-opacity="1" x1="86" y1="463" x2="92" y2="469" />
+	<line stroke="black" stroke-opacity="1" x1="80" y1="469" x2="92" y2="469" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="323" y1="490" x2="323" y2="469" />
+	<line stroke="black" stroke-opacity="1" x1="323" y1="463" x2="317" y2="469" />
+	<line stroke="black" stroke-opacity="1" x1="323" y1="463" x2="329" y2="469" />
+	<line stroke="black" stroke-opacity="1" x1="317" y1="469" x2="329" y2="469" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="408" y1="1047" x2="521" y2="751" />
+	<line stroke="black" stroke-opacity="1" x1="524" y1="746" x2="516" y2="749" />
+	<line stroke="black" stroke-opacity="1" x1="524" y1="746" x2="527" y2="753" />
+	<line stroke="black" stroke-opacity="1" x1="516" y1="749" x2="527" y2="753" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="848" y1="466" x2="848" y2="445" />
+	<line stroke="black" stroke-opacity="1" x1="848" y1="439" x2="842" y2="445" />
+	<line stroke="black" stroke-opacity="1" x1="848" y1="439" x2="854" y2="445" />
+	<line stroke="black" stroke-opacity="1" x1="842" y1="445" x2="854" y2="445" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="815" y1="344" x2="815" y2="398" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="850" y1="303" x2="850" y2="266" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="806" y1="203" x2="739" y2="156" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="848" y1="547" x2="848" y2="507" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="882" y1="398" x2="882" y2="344" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="848" y1="547" x2="848" y2="507" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="188" y1="111" x2="188" y2="80" />
+	<line stroke="black" stroke-opacity="1" x1="188" y1="74" x2="182" y2="80" />
+	<line stroke="black" stroke-opacity="1" x1="188" y1="74" x2="194" y2="80" />
+	<line stroke="black" stroke-opacity="1" x1="182" y1="80" x2="194" y2="80" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="235" y1="42" x2="533" y2="42" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="285" y="765" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="201" y="819" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="197" y="761" width="88" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="241" y="773">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="241" y="794">GL3bc</text>
+	<line stroke="black" stroke-opacity="1" x1="197" y1="803" x2="285" y2="803" />
+	<line stroke="black" stroke-opacity="1" x1="197" y1="811" x2="285" y2="811" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="130" y="230" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="46" y="284" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="42" y="226" width="88" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="86" y="238">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="86" y="259">GL2ES1</text>
+	<line stroke="black" stroke-opacity="1" x1="42" y1="268" x2="130" y2="268" />
+	<line stroke="black" stroke-opacity="1" x1="42" y1="276" x2="130" y2="276" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="230" y="116" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="146" y="170" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="142" y="112" width="88" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="186" y="124">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="186" y="145">GL</text>
+	<line stroke="black" stroke-opacity="1" x1="142" y1="154" x2="230" y2="154" />
+	<line stroke="black" stroke-opacity="1" x1="142" y1="162" x2="230" y2="162" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="129" y="405" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="45" y="459" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="41" y="401" width="88" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="85" y="413">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="85" y="434">GLES1</text>
+	<line stroke="black" stroke-opacity="1" x1="41" y1="443" x2="129" y2="443" />
+	<line stroke="black" stroke-opacity="1" x1="41" y1="451" x2="129" y2="451" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="287" y="619" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="203" y="673" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="199" y="615" width="88" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="243" y="627">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="243" y="648">GL2</text>
+	<line stroke="black" stroke-opacity="1" x1="199" y1="657" x2="287" y2="657" />
+	<line stroke="black" stroke-opacity="1" x1="199" y1="665" x2="287" y2="665" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="389" y1="1068" x2="409" y2="1068" />
+	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="399" cy="1058" rx="10" ry="10" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="399" y="1080">GL4bcImpl</text>
+	<line stroke="black" stroke-opacity="1" x1="361" y1="1089" x2="437" y2="1089" />
+	<line stroke="black" stroke-opacity="1" x1="361" y1="1097" x2="437" y2="1097" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="313" y1="511" x2="333" y2="511" />
+	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="323" cy="501" rx="10" ry="10" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="323" y="523">GLES2Impl</text>
+	<line stroke="black" stroke-opacity="1" x1="284" y1="532" x2="362" y2="532" />
+	<line stroke="black" stroke-opacity="1" x1="284" y1="540" x2="362" y2="540" />
+</g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="20" y="1090">Private implementation (detail)</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="606" y="261">Desktop/Mobile</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="606" y="279">Common Interfaces</text>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="896" y="208" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="804" y="262" width="95" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="800" y="204" width="96" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="848" y="216">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="848" y="237">NativeWindow</text>
+	<line stroke="black" stroke-opacity="1" x1="800" y1="246" x2="896" y2="246" />
+	<line stroke="black" stroke-opacity="1" x1="800" y1="254" x2="896" y2="254" />
+</g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="784" y="33">Lifecycle: From the lower right to</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="784" y="51">the top, left step where the</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="784" y="69">GLContext is created with a suitable</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="784" y="87">GL implementation matching the</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="784" y="105">GLProfile.</text>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="948" y="308" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="752" y="340" width="199" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="748" y="304" width="200" height="36" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="848" y="316">AbstractGraphicsConfiguration</text>
+	<line stroke="black" stroke-opacity="1" x1="748" y1="325" x2="948" y2="325" />
+	<line stroke="black" stroke-opacity="1" x1="748" y1="333" x2="948" y2="333" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="895" y="471" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="801" y="503" width="97" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="797" y="467" width="98" height="36" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="846" y="479">GLCapabilities</text>
+	<line stroke="black" stroke-opacity="1" x1="797" y1="488" x2="895" y2="488" />
+	<line stroke="black" stroke-opacity="1" x1="797" y1="496" x2="895" y2="496" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="880" y="552" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="818" y="584" width="65" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="814" y="548" width="66" height="36" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="847" y="560">GLProfile</text>
+	<line stroke="black" stroke-opacity="1" x1="814" y1="569" x2="880" y2="569" />
+	<line stroke="black" stroke-opacity="1" x1="814" y1="577" x2="880" y2="577" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="231" y="16" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="147" y="70" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="143" y="12" width="88" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="187" y="24">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="187" y="45">GLBase</text>
+	<line stroke="black" stroke-opacity="1" x1="143" y1="54" x2="231" y2="54" />
+	<line stroke="black" stroke-opacity="1" x1="143" y1="62" x2="231" y2="62" />
+</g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="273" y="152">Common GL Stuff</text>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="364" y="230" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="280" y="284" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="276" y="226" width="88" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="320" y="238">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="320" y="259">GL2ES2</text>
+	<line stroke="black" stroke-opacity="1" x1="276" y1="268" x2="364" y2="268" />
+	<line stroke="black" stroke-opacity="1" x1="276" y1="276" x2="364" y2="276" />
+</g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="605" y="653">Desktop final public</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="605" y="671">OpenGL Interfaces</text>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="580" y="688" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="496" y="742" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="492" y="684" width="88" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="536" y="696">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="536" y="717">GL3</text>
+	<line stroke="black" stroke-opacity="1" x1="492" y1="726" x2="580" y2="726" />
+	<line stroke="black" stroke-opacity="1" x1="492" y1="734" x2="580" y2="734" />
+</g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="607" y="444">Mobile final public</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="607" y="462">OpenGL Interfaces</text>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="365" y="405" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="281" y="459" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="277" y="401" width="88" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="321" y="413">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="321" y="434">GLES2</text>
+	<line stroke="black" stroke-opacity="1" x1="277" y1="443" x2="365" y2="443" />
+	<line stroke="black" stroke-opacity="1" x1="277" y1="451" x2="365" y2="451" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="606" y="26" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="538" y="58" width="71" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="534" y="22" width="72" height="36" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="570" y="34">GLContext</text>
+	<line stroke="black" stroke-opacity="1" x1="534" y1="43" x2="606" y2="43" />
+	<line stroke="black" stroke-opacity="1" x1="534" y1="51" x2="606" y2="51" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="748" y="120" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="670" y="152" width="81" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="666" y="116" width="82" height="36" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="707" y="128">GLDrawable</text>
+	<line stroke="black" stroke-opacity="1" x1="666" y1="137" x2="748" y2="137" />
+	<line stroke="black" stroke-opacity="1" x1="666" y1="145" x2="748" y2="145" />
+</g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="606" y="346">Common Desktop</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="606" y="364">Profile</text>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="579" y="848" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="495" y="902" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="491" y="844" width="88" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="535" y="856">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="535" y="877">GL4</text>
+	<line stroke="black" stroke-opacity="1" x1="491" y1="886" x2="579" y2="886" />
+	<line stroke="black" stroke-opacity="1" x1="491" y1="894" x2="579" y2="894" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="285" y="909" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="201" y="963" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="197" y="905" width="88" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="241" y="917">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="241" y="938">GL4bc</text>
+	<line stroke="black" stroke-opacity="1" x1="197" y1="947" x2="285" y2="947" />
+	<line stroke="black" stroke-opacity="1" x1="197" y1="955" x2="285" y2="955" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="206" y1="308" x2="226" y2="308" />
+	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="216" cy="298" rx="10" ry="10" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="216" y="320">GL2ES12</text>
+	<line stroke="black" stroke-opacity="1" x1="184" y1="329" x2="248" y2="329" />
+	<line stroke="black" stroke-opacity="1" x1="184" y1="337" x2="248" y2="337" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="289" y1="778" x2="485" y2="726" />
+	<line stroke="black" stroke-opacity="1" x1="491" y1="725" x2="483" y2="720" />
+	<line stroke="black" stroke-opacity="1" x1="491" y1="725" x2="486" y2="732" />
+	<line stroke="black" stroke-opacity="1" x1="483" y1="720" x2="486" y2="732" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="417" y1="1047" x2="510" y2="910" />
+	<line stroke="black" stroke-opacity="1" x1="514" y1="906" x2="505" y2="907" />
+	<line stroke="black" stroke-opacity="1" x1="514" y1="906" x2="515" y2="914" />
+	<line stroke="black" stroke-opacity="1" x1="505" y1="907" x2="515" y2="914" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="248" y1="296" x2="269" y2="283" />
+	<line stroke="black" stroke-opacity="1" x1="275" y1="280" x2="266" y2="277" />
+	<line stroke="black" stroke-opacity="1" x1="275" y1="280" x2="272" y2="288" />
+	<line stroke="black" stroke-opacity="1" x1="266" y1="277" x2="272" y2="288" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="388" y1="1047" x2="257" y2="682" />
+	<line stroke="black" stroke-opacity="1" x1="255" y1="677" x2="251" y2="684" />
+	<line stroke="black" stroke-opacity="1" x1="255" y1="677" x2="262" y2="680" />
+	<line stroke="black" stroke-opacity="1" x1="251" y1="684" x2="262" y2="680" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="243" y1="760" x2="243" y2="682" />
+	<line stroke="black" stroke-opacity="1" x1="244" y1="677" x2="237" y2="682" />
+	<line stroke="black" stroke-opacity="1" x1="244" y1="677" x2="249" y2="683" />
+	<line stroke="black" stroke-opacity="1" x1="237" y1="682" x2="249" y2="683" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="243" y1="904" x2="243" y2="829" />
+	<line stroke="black" stroke-opacity="1" x1="243" y1="823" x2="237" y2="829" />
+	<line stroke="black" stroke-opacity="1" x1="243" y1="823" x2="249" y2="829" />
+	<line stroke="black" stroke-opacity="1" x1="237" y1="829" x2="249" y2="829" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="183" y1="300" x2="139" y2="279" />
+	<line stroke="black" stroke-opacity="1" x1="134" y1="277" x2="136" y2="284" />
+	<line stroke="black" stroke-opacity="1" x1="134" y1="277" x2="141" y2="274" />
+	<line stroke="black" stroke-opacity="1" x1="136" y1="284" x2="141" y2="274" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="537" y1="843" x2="537" y2="752" />
+	<line stroke="black" stroke-opacity="1" x1="537" y1="746" x2="531" y2="752" />
+	<line stroke="black" stroke-opacity="1" x1="537" y1="746" x2="543" y2="752" />
+	<line stroke="black" stroke-opacity="1" x1="531" y1="752" x2="543" y2="752" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="289" y1="925" x2="484" y2="884" />
+	<line stroke="black" stroke-opacity="1" x1="490" y1="883" x2="482" y2="878" />
+	<line stroke="black" stroke-opacity="1" x1="490" y1="883" x2="485" y2="890" />
+	<line stroke="black" stroke-opacity="1" x1="482" y1="878" x2="485" y2="890" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="366" y1="1047" x2="281" y2="971" />
+	<line stroke="black" stroke-opacity="1" x1="277" y1="967" x2="277" y2="975" />
+	<line stroke="black" stroke-opacity="1" x1="277" y1="967" x2="285" y2="966" />
+	<line stroke="black" stroke-opacity="1" x1="277" y1="975" x2="285" y2="966" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="383" y1="1047" x2="262" y2="828" />
+	<line stroke="black" stroke-opacity="1" x1="260" y1="823" x2="257" y2="831" />
+	<line stroke="black" stroke-opacity="1" x1="260" y1="823" x2="268" y2="825" />
+	<line stroke="black" stroke-opacity="1" x1="257" y1="831" x2="268" y2="825" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="76" y1="504" x2="96" y2="504" />
+	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="86" cy="494" rx="10" ry="10" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="86" y="516">GLES1Impl</text>
+	<line stroke="black" stroke-opacity="1" x1="47" y1="525" x2="125" y2="525" />
+	<line stroke="black" stroke-opacity="1" x1="47" y1="533" x2="125" y2="533" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="887" y="403" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="811" y="435" width="79" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="807" y="399" width="80" height="36" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="847" y="411">Capabilities</text>
+	<line stroke="black" stroke-opacity="1" x1="807" y1="420" x2="887" y2="420" />
+	<line stroke="black" stroke-opacity="1" x1="807" y1="428" x2="887" y2="428" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="581" y="320" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="497" y="374" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="493" y="316" width="88" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="537" y="328">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="537" y="349">GL2GL3</text>
+	<line stroke="black" stroke-opacity="1" x1="493" y1="358" x2="581" y2="358" />
+	<line stroke="black" stroke-opacity="1" x1="493" y1="366" x2="581" y2="366" />
+</g>
+<g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="585" y="76">0..1</text>
+</g>
+<g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="652" y="116">1</text>
+</g>
+<g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="825" y="386">chosen</text>
+</g>
+<g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="798" y="386">1</text>
+</g>
+<g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="892" y="386">requested</text>
+</g>
+<g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="865" y="386">1</text>
+</g>
+<g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="516" y="60">1</text>
+</g>
+<g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="247" y="60">1</text>
+</g>
+</svg>
diff --git a/doc/bouml/html-svg/index-withframe.html b/doc/bouml/html-svg/index-withframe.html
new file mode 100644
index 000000000..96f19466e
--- /dev/null
+++ b/doc/bouml/html-svg/index-withframe.html
@@ -0,0 +1,19 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>/usr/local/projects/JOGL/jogl/doc/bouml/svg-flat/index-withframe</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+<FRAMESET cols="20%,80%">
+  <FRAME src="classes_list.html" name="classesListFrame">
+  <FRAMESET rows="150,*">
+    <FRAME src="navig.html" name="navigFrame">
+    <FRAME src="index.html" name="projectFrame">
+  </FRAMESET>
+</FRAMESET>
+<NOFRAMES>
+<H2>Frame Alert</H2><P>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.<BR>Link to <A HREF="index.html">Non-frame version.</A></NOFRAMES></body>
+</html>
diff --git a/doc/bouml/html-svg/index.html b/doc/bouml/html-svg/index.html
new file mode 100644
index 000000000..c25ed5182
--- /dev/null
+++ b/doc/bouml/html-svg/index.html
@@ -0,0 +1,238 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>jogl
+Documentation</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">jogl<br />Documentation</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refpackage129"></a>
+<p>Properties:<ul>
+<li>html dir:<br /><div class="sub">/usr/local/projects/JOGL/jogl/doc/bouml/svg-flat/</div></p></li>
+</ul></p>
+<a name="refclass view128069"></a>
+<h1 class ="view">1 Class View javax.media.opengl</h1>
+<div class="sub">
+<a name="refclass diagram128069"></a>
+<p align="center"><embed src="fig128069.svg" width="1003" height="1180"/></p>
+ <p align="center"><b>OpenGL Interfaces</b></p><p><br /></p><p><br /></p>
+<a name="refclass128069"></a>
+<h2 class ="class">1.1 Class GL</h2>
+<p>Declaration :</p><ul>
+<li>Java : public interface GL extends <a href="index.html#refclass132549"><b>GLBase</b></a> </li><li>Php : public interface GL </li></ul><p>Directly inherited by : <a href="index.html#refclass128197"><b>GL2ES1</b></a> <a href="index.html#refclass128581"><b>GL2ES2</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128197"></a>
+<h2 class ="class">1.2 Class GL2ES1</h2>
+<p>Declaration :</p><ul>
+<li>Java : public interface GL2ES1 extends <a href="index.html#refclass128069"><b>GL</b></a> </li><li>Php : public interface GL2ES1 </li></ul><p>Directly inherited by : <a href="index.html#refclass128453"><b>GL2</b></a> <a href="index.html#refclass128386"><b>GL2ES12</b></a> <a href="index.html#refclass128325"><b>GLES1</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128325"></a>
+<h2 class ="class">1.3 Class GLES1</h2>
+<p>Declaration :</p><ul>
+<li>Java : public interface GLES1 extends <a href="index.html#refclass128197"><b>GL2ES1</b></a> </li><li>Php : public interface GLES1 </li></ul><p>Directly inherited by : <a href="index.html#refclass130757"><b>GLES1Impl</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128453"></a>
+<h2 class ="class">1.4 Class GL2</h2>
+<p>Declaration :</p><ul>
+<li>Java : public interface GL2 extends <a href="index.html#refclass128709"><b>GL2GL3</b></a> </li><li>Php : public interface GL2 </li></ul><p>Directly inherited by : <a href="index.html#refclass128002"><b>GL3bc</b></a> <a href="index.html#refclass130501"><b>GL4bcImpl</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128581"></a>
+<h2 class ="class">1.5 Class GL2ES2</h2>
+<p>Declaration :</p><ul>
+<li>Java : public interface GL2ES2 extends <a href="index.html#refclass128069"><b>GL</b></a> </li><li>Php : public interface GL2ES2 </li></ul><p>Directly inherited by : <a href="index.html#refclass128386"><b>GL2ES12</b></a> <a href="index.html#refclass128709"><b>GL2GL3</b></a> <a href="index.html#refclass128965"><b>GLES2</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128709"></a>
+<h2 class ="class">1.6 Class GL2GL3</h2>
+<p>Declaration :</p><ul>
+<li>Java : public interface GL2GL3 extends <a href="index.html#refclass128581"><b>GL2ES2</b></a> </li><li>Php : public interface GL2GL3 </li></ul><p>Directly inherited by : <a href="index.html#refclass128453"><b>GL2</b></a> <a href="index.html#refclass128837"><b>GL3</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128837"></a>
+<h2 class ="class">1.7 Class GL3</h2>
+<p>Declaration :</p><ul>
+<li>Java : public interface GL3 extends <a href="index.html#refclass128709"><b>GL2GL3</b></a> </li><li>Php : public interface GL3 </li></ul><p>Directly inherited by : <a href="index.html#refclass128002"><b>GL3bc</b></a> <a href="index.html#refclass128130"><b>GL4</b></a> <a href="index.html#refclass130501"><b>GL4bcImpl</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128965"></a>
+<h2 class ="class">1.8 Class GLES2</h2>
+<p>Declaration :</p><ul>
+<li>Java : public interface GLES2 extends <a href="index.html#refclass128581"><b>GL2ES2</b></a> </li><li>Php : public interface GLES2 </li></ul><p>Directly inherited by : <a href="index.html#refclass130629"><b>GLES2Impl</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass130117"></a>
+<h2 class ="class">1.9 Class GLContext</h2>
+<p>Declaration :</p><ul>
+<li>Java : package abstract class GLContext </li></ul><div class="sub">
+<div class="sub">
+<a name="refrelation130757"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130245"><b>GLDrawable</b></a>, multiplicity : 1</li><li>Java : private <a href="index.html#refclass130245"><b>GLDrawable</b></a> </li></ul><a name="refrelation134341"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass132549"><b>GLBase</b></a>, multiplicity : 1</li><li>Java : private <a href="index.html#refclass132549"><b>GLBase</b></a> </li></ul></div>
+</div>
+<a name="refclass130245"></a>
+<h2 class ="class">1.10 Class GLDrawable</h2>
+<p>Declaration :</p><ul>
+<li>Java : package abstract class GLDrawable </li></ul><div class="sub">
+<div class="sub">
+<a name="refrelation130629"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130117"><b>GLContext</b></a>, multiplicity : 0..1</li><li>Java : private <a href="index.html#refclass130117"><b>GLContext</b></a> </li></ul><a name="refrelation132421"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130885"><b>NativeWindow</b></a></li><li>Java : private <a href="index.html#refclass130885"><b>NativeWindow</b></a> </li></ul></div>
+</div>
+<a name="refclass130501"></a>
+<h2 class ="class">1.11 Class GL4bcImpl</h2>
+<p>Declaration :</p><ul>
+<li>Java : private class GL4bcImpl implements <a href="index.html#refclass128837"><b>GL3</b></a>, <a href="index.html#refclass128002"><b>GL3bc</b></a>, <a href="index.html#refclass128258"><b>GL4bc</b></a>, <a href="index.html#refclass128453"><b>GL2</b></a>, <a href="index.html#refclass128130"><b>GL4</b></a> </li></ul><p>Stereotype: entity</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass130629"></a>
+<h2 class ="class">1.12 Class GLES2Impl</h2>
+<p>Declaration :</p><ul>
+<li>Java : private class GLES2Impl implements <a href="index.html#refclass128965"><b>GLES2</b></a> </li></ul><p>Stereotype: entity</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass130757"></a>
+<h2 class ="class">1.13 Class GLES1Impl</h2>
+<p>Declaration :</p><ul>
+<li>Java : private class GLES1Impl implements <a href="index.html#refclass128325"><b>GLES1</b></a> </li></ul><p>Stereotype: entity</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass130885"></a>
+<h2 class ="class">1.14 Class NativeWindow</h2>
+<p>Declaration :</p><ul>
+<li>Java : package interface NativeWindow </li><li>Php :  interface NativeWindow </li></ul><p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+<a name="refrelation132165"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass131013"><b>AbstractGraphicsConfiguration</b></a></li><li>Java : private <a href="index.html#refclass131013"><b>AbstractGraphicsConfiguration</b></a> </li></ul><a name="refrelation132293"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130245"><b>GLDrawable</b></a></li><li>Java : private <a href="index.html#refclass130245"><b>GLDrawable</b></a> </li></ul></div>
+</div>
+<a name="refclass131013"></a>
+<h2 class ="class">1.15 Class AbstractGraphicsConfiguration</h2>
+<p>Declaration :</p><ul>
+<li>Java : package abstract class AbstractGraphicsConfiguration </li></ul><div class="sub">
+<div class="sub">
+<a name="refrelation131525"></a>
+<table><tr><td><div class="element">Relation <b>chosen (&lt;association&gt;)</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : - chosen : <a href="index.html#refclass131269"><b>Capabilities</b></a>, multiplicity : 1</li><li>Java : private <a href="index.html#refclass131269"><b>Capabilities</b></a> chosen</li></ul><a name="refrelation131909"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : - requested : <a href="index.html#refclass131269"><b>Capabilities</b></a>, multiplicity : 1</li><li>Java : private <a href="index.html#refclass131269"><b>Capabilities</b></a> requested</li></ul><a name="refrelation132037"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130885"><b>NativeWindow</b></a></li><li>Java : private <a href="index.html#refclass130885"><b>NativeWindow</b></a> </li></ul></div>
+</div>
+<a name="refclass131141"></a>
+<h2 class ="class">1.16 Class GLCapabilities</h2>
+<p>Declaration :</p><ul>
+<li>Java : package class GLCapabilities extends <a href="index.html#refclass131269"><b>Capabilities</b></a> </li></ul><div class="sub">
+<div class="sub">
+<a name="refrelation132677"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass131397"><b>GLProfile</b></a></li><li>Java : private <a href="index.html#refclass131397"><b>GLProfile</b></a> </li></ul><a name="refrelation132933"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass131397"><b>GLProfile</b></a></li><li>Java : private <a href="index.html#refclass131397"><b>GLProfile</b></a> </li></ul></div>
+</div>
+<a name="refclass131269"></a>
+<h2 class ="class">1.17 Class Capabilities</h2>
+<p>Declaration :</p><ul>
+<li>Java : package class Capabilities </li></ul><p>Directly inherited by : <a href="index.html#refclass131141"><b>GLCapabilities</b></a> </p>
+<div class="sub">
+<div class="sub">
+<a name="refrelation131653"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass131013"><b>AbstractGraphicsConfiguration</b></a></li><li>Java : private <a href="index.html#refclass131013"><b>AbstractGraphicsConfiguration</b></a> </li></ul><a name="refrelation131781"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass131013"><b>AbstractGraphicsConfiguration</b></a></li><li>Java : private <a href="index.html#refclass131013"><b>AbstractGraphicsConfiguration</b></a> </li></ul></div>
+</div>
+<a name="refclass131397"></a>
+<h2 class ="class">1.18 Class GLProfile</h2>
+<p>Declaration :</p><ul>
+<li>Java : package class GLProfile </li></ul><div class="sub">
+<div class="sub">
+<a name="refrelation132549"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass131141"><b>GLCapabilities</b></a></li><li>Java : private <a href="index.html#refclass131141"><b>GLCapabilities</b></a> </li></ul><a name="refrelation132805"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass131141"><b>GLCapabilities</b></a></li><li>Java : private <a href="index.html#refclass131141"><b>GLCapabilities</b></a> </li></ul></div>
+</div>
+<a name="refclass132549"></a>
+<h2 class ="class">1.19 Class GLBase</h2>
+<p>Declaration :</p><ul>
+<li>Java : public interface GLBase </li><li>Php : public interface GLBase </li></ul><p>Directly inherited by : <a href="index.html#refclass128069"><b>GL</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+<a name="refrelation134213"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130117"><b>GLContext</b></a>, multiplicity : 1</li><li>Java : private <a href="index.html#refclass130117"><b>GLContext</b></a> </li></ul></div>
+</div>
+<a name="refclass128002"></a>
+<h2 class ="class">1.20 Class GL3bc</h2>
+<p>Declaration :</p><ul>
+<li>Java : package interface GL3bc extends <a href="index.html#refclass128453"><b>GL2</b></a> </li><li>Php :  interface GL3bc </li></ul><p>Directly inherited by : <a href="index.html#refclass128258"><b>GL4bc</b></a> <a href="index.html#refclass130501"><b>GL4bcImpl</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128130"></a>
+<h2 class ="class">1.21 Class GL4</h2>
+<p>Declaration :</p><ul>
+<li>Java : package interface GL4 extends <a href="index.html#refclass128837"><b>GL3</b></a> </li><li>Php :  interface GL4 </li></ul><p>Directly inherited by : <a href="index.html#refclass128258"><b>GL4bc</b></a> <a href="index.html#refclass130501"><b>GL4bcImpl</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128258"></a>
+<h2 class ="class">1.22 Class GL4bc</h2>
+<p>Declaration :</p><ul>
+<li>Java : package interface GL4bc extends <a href="index.html#refclass128002"><b>GL3bc</b></a> </li><li>Php :  interface GL4bc </li></ul><p>Directly inherited by : <a href="index.html#refclass130501"><b>GL4bcImpl</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128386"></a>
+<h2 class ="class">1.23 Class GL2ES12</h2>
+<p>Declaration :</p><ul>
+<li>Java : package class GL2ES12 implements <a href="index.html#refclass128197"><b>GL2ES1</b></a>, <a href="index.html#refclass128581"><b>GL2ES2</b></a> </li></ul><p>Stereotype: entity</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/index_65.html b/doc/bouml/html-svg/index_65.html
new file mode 100644
index 000000000..9a6dedcaa
--- /dev/null
+++ b/doc/bouml/html-svg/index_65.html
@@ -0,0 +1,23 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>A</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">A</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass131013" target = "projectFrame"><b>AbstractGraphicsConfiguration</b></a></td><td>class</td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/index_67.html b/doc/bouml/html-svg/index_67.html
new file mode 100644
index 000000000..630cc4999
--- /dev/null
+++ b/doc/bouml/html-svg/index_67.html
@@ -0,0 +1,24 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>C</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">C</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass131269" target = "projectFrame"><b>Capabilities</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refrelation131525" target = "projectFrame"><b>chosen</b></a></td><td>relation</td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/index_71.html b/doc/bouml/html-svg/index_71.html
new file mode 100644
index 000000000..f09f91321
--- /dev/null
+++ b/doc/bouml/html-svg/index_71.html
@@ -0,0 +1,42 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>G</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">G</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128069" target = "projectFrame"><b>GL</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128453" target = "projectFrame"><b>GL2</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128197" target = "projectFrame"><b>GL2ES1</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128386" target = "projectFrame"><b>GL2ES12</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128581" target = "projectFrame"><b>GL2ES2</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128709" target = "projectFrame"><b>GL2GL3</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128837" target = "projectFrame"><b>GL3</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128002" target = "projectFrame"><b>GL3bc</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128130" target = "projectFrame"><b>GL4</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128258" target = "projectFrame"><b>GL4bc</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130501" target = "projectFrame"><b>GL4bcImpl</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass132549" target = "projectFrame"><b>GLBase</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass131141" target = "projectFrame"><b>GLCapabilities</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130117" target = "projectFrame"><b>GLContext</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130245" target = "projectFrame"><b>GLDrawable</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128325" target = "projectFrame"><b>GLES1</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130757" target = "projectFrame"><b>GLES1Impl</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128965" target = "projectFrame"><b>GLES2</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130629" target = "projectFrame"><b>GLES2Impl</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass131397" target = "projectFrame"><b>GLProfile</b></a></td><td>class</td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/index_74.html b/doc/bouml/html-svg/index_74.html
new file mode 100644
index 000000000..14ff3bec2
--- /dev/null
+++ b/doc/bouml/html-svg/index_74.html
@@ -0,0 +1,24 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>J</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">J</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass view128069" target = "projectFrame"><b>javax.media.opengl</b></a></td><td>class view</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129" target = "projectFrame"><b>jogl</b></a></td><td>package</td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/index_78.html b/doc/bouml/html-svg/index_78.html
new file mode 100644
index 000000000..3273a2e71
--- /dev/null
+++ b/doc/bouml/html-svg/index_78.html
@@ -0,0 +1,23 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>N</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">N</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130885" target = "projectFrame"><b>NativeWindow</b></a></td><td>class</td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/index_79.html b/doc/bouml/html-svg/index_79.html
new file mode 100644
index 000000000..7474a3309
--- /dev/null
+++ b/doc/bouml/html-svg/index_79.html
@@ -0,0 +1,23 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>O</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">O</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128069" target = "projectFrame"><b>OpenGL Interfaces</b></a></td><td>class diagram</td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/index_82.html b/doc/bouml/html-svg/index_82.html
new file mode 100644
index 000000000..c5dcd1dcd
--- /dev/null
+++ b/doc/bouml/html-svg/index_82.html
@@ -0,0 +1,23 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>R</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">R</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refrelation131909" target = "projectFrame"><b>requested</b></a></td><td>relation</td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/navig.html b/doc/bouml/html-svg/navig.html
new file mode 100644
index 000000000..66b446d18
--- /dev/null
+++ b/doc/bouml/html-svg/navig.html
@@ -0,0 +1,17 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>/usr/local/projects/JOGL/jogl/doc/bouml/svg-flat/navig</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+<body bgcolor="#ffffff">
+<p><hr noshade></p>
+<p><a href="index.html" target = "projectFrame"><b> -Top- </b></a><a href="classes.html" target = "projectFrame"><b> -Classes- </b></a><a href="packages.html" target = "projectFrame"><b> -Packages- </b></a><a href="classdiagrams.html" target = "projectFrame"><b> -Class Diagrams- </b></a></p>
+<p>
+</p>
+<p><a href="index_65.html" target = "projectFrame"><b> A </b></a><a href="index_67.html" target = "projectFrame"><b> C </b></a><a href="index_71.html" target = "projectFrame"><b> G </b></a><a href="index_74.html" target = "projectFrame"><b> J </b></a><a href="index_78.html" target = "projectFrame"><b> N </b></a><a href="index_79.html" target = "projectFrame"><b> O </b></a><a href="index_82.html" target = "projectFrame"><b> R </b></a></p>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/packages.html b/doc/bouml/html-svg/packages.html
new file mode 100644
index 000000000..61017a207
--- /dev/null
+++ b/doc/bouml/html-svg/packages.html
@@ -0,0 +1,22 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg">
+
+<head>
+<title>Packages Index</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Packages Index</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129" target = "projectFrame"><b>jogl</b></a></td><td></td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/bouml/html-svg/style.css b/doc/bouml/html-svg/style.css
new file mode 100644
index 000000000..3a10a8149
--- /dev/null
+++ b/doc/bouml/html-svg/style.css
@@ -0,0 +1,30 @@
+div.title { font-size: 150%; background: #87ceff; text-align: center; font-weight: bold; }
+
+div.sub { margin-left : 20px; }
+div.element { background: #d3d3d3; }
+
+h1.package { background: #ffe4c4; }
+h1.view { background: #98fb98; }
+
+h2.package { background: #ffe4c4; }
+h2.view { background: #98fb98; }
+h2.class { background: #87ceff; }
+h2.usecase { background: #87ceff; }
+h2.state { background: #87ceff; }
+h2.activity { background: #87ceff; }
+
+h3.package { background: #ffe4c4; }
+h3.view { background: #98fb98; }
+h3.class { background: #87ceff; }
+h3.usecase { background: #87ceff; }
+h3.state { background: #87ceff; }
+h3.stateregion { background: #87ceff; }
+h3.activity { background: #87ceff; }
+
+h4.package { background: #ffe4c4; }
+h4.view { background: #98fb98; }
+h4.class { background: #87ceff; }
+h4.usecase { background: #87ceff; }
+h4.state { background: #87ceff; }
+h4.stateregion { background: #87ceff; }
+h4.activity { background: #87ceff; }
diff --git a/doc/bouml/html/classes.html b/doc/bouml/html/classes.html
index 79ae63a87..c0eff2e35 100644
--- a/doc/bouml/html/classes.html
+++ b/doc/bouml/html/classes.html
@@ -21,11 +21,14 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128069" target = "projectFrame"><b>GL</b></a></td><td>interface</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128453" target = "projectFrame"><b>GL2</b></a></td><td>interface</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128197" target = "projectFrame"><b>GL2ES1</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128386" target = "projectFrame"><b>GL2ES12</b></a></td><td>entity</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128581" target = "projectFrame"><b>GL2ES2</b></a></td><td>interface</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128709" target = "projectFrame"><b>GL2GL3</b></a></td><td>interface</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130373" target = "projectFrame"><b>GL2Impl</b></a></td><td>entity</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128837" target = "projectFrame"><b>GL3</b></a></td><td>interface</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130501" target = "projectFrame"><b>GL3Impl</b></a></td><td>entity</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128002" target = "projectFrame"><b>GL3bc</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128130" target = "projectFrame"><b>GL4</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128258" target = "projectFrame"><b>GL4bc</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130501" target = "projectFrame"><b>GL4bcImpl</b></a></td><td>entity</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass132549" target = "projectFrame"><b>GLBase</b></a></td><td>interface</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass131141" target = "projectFrame"><b>GLCapabilities</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass130117" target = "projectFrame"><b>GLContext</b></a></td><td></td><td></td></tr>
diff --git a/doc/bouml/html/classes_list.html b/doc/bouml/html/classes_list.html
index f59dad7f6..717f1b1c0 100644
--- a/doc/bouml/html/classes_list.html
+++ b/doc/bouml/html/classes_list.html
@@ -22,11 +22,14 @@
 <a href="index.html#refclass128069" target = "projectFrame"><b>GL</b></a><br />
 <a href="index.html#refclass128453" target = "projectFrame"><b>GL2</b></a><br />
 <a href="index.html#refclass128197" target = "projectFrame"><b>GL2ES1</b></a><br />
+<a href="index.html#refclass128386" target = "projectFrame"><b>GL2ES12</b></a><br />
 <a href="index.html#refclass128581" target = "projectFrame"><b>GL2ES2</b></a><br />
 <a href="index.html#refclass128709" target = "projectFrame"><b>GL2GL3</b></a><br />
-<a href="index.html#refclass130373" target = "projectFrame"><b>GL2Impl</b></a><br />
 <a href="index.html#refclass128837" target = "projectFrame"><b>GL3</b></a><br />
-<a href="index.html#refclass130501" target = "projectFrame"><b>GL3Impl</b></a><br />
+<a href="index.html#refclass128002" target = "projectFrame"><b>GL3bc</b></a><br />
+<a href="index.html#refclass128130" target = "projectFrame"><b>GL4</b></a><br />
+<a href="index.html#refclass128258" target = "projectFrame"><b>GL4bc</b></a><br />
+<a href="index.html#refclass130501" target = "projectFrame"><b>GL4bcImpl</b></a><br />
 <a href="index.html#refclass132549" target = "projectFrame"><b>GLBase</b></a><br />
 <a href="index.html#refclass131141" target = "projectFrame"><b>GLCapabilities</b></a><br />
 <a href="index.html#refclass130117" target = "projectFrame"><b>GLContext</b></a><br />
diff --git a/doc/bouml/html/fig128069.png b/doc/bouml/html/fig128069.png
index 4958dbab3..8acf16a2c 100644
Binary files a/doc/bouml/html/fig128069.png and b/doc/bouml/html/fig128069.png differ
diff --git a/doc/bouml/html/fig128069.svg b/doc/bouml/html/fig128069.svg
deleted file mode 100644
index 7d2f2a558..000000000
--- a/doc/bouml/html/fig128069.svg
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Bouml (http://bouml.free.fr/) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="1003" height="814" version="1.1" xmlns="http://www.w3.org/2000/svg">
-<g>
-	<rect fill="#ededed" stroke="black" stroke-width="1" stroke-opacity="1" x="5" y="193" width="234" height="609" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="52" y="210">Fixed Function</text>
-	<line stroke="black" stroke-opacity="1" x1="5" y1="217" x2="98" y2="217" />
-	<line stroke="black" stroke-opacity="1" x1="98" y1="217" x2="110" y2="205" />
-	<line stroke="black" stroke-opacity="1" x1="110" y1="205" x2="110" y2="193" />
-</g>
-<g>
-	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="5" y1="392" x2="239" y2="392" />
-</g>
-<g>
-	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="5" y1="569" x2="239" y2="569" />
-</g>
-<g>
-	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="5" y1="304" x2="239" y2="304" />
-</g>
-<g>
-	<rect fill="#c0ffff" stroke="black" stroke-width="1" stroke-opacity="1" x="238" y="193" width="447" height="609" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="306" y="210">Programmable Shader</text>
-	<line stroke="black" stroke-opacity="1" x1="238" y1="217" x2="374" y2="217" />
-	<line stroke="black" stroke-opacity="1" x1="374" y1="217" x2="386" y2="205" />
-	<line stroke="black" stroke-opacity="1" x1="386" y1="205" x2="386" y2="193" />
-</g>
-<g>
-	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="238" y1="392" x2="685" y2="392" />
-</g>
-<g>
-	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="238" y1="569" x2="685" y2="569" />
-</g>
-<g>
-	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="238" y1="304" x2="685" y2="304" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="115" y1="225" x2="154" y2="178" />
-	<line stroke="black" stroke-opacity="1" x1="158" y1="174" x2="149" y2="174" />
-	<line stroke="black" stroke-opacity="1" x1="158" y1="174" x2="158" y2="182" />
-	<line stroke="black" stroke-opacity="1" x1="149" y1="174" x2="158" y2="182" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="285" y1="225" x2="231" y2="177" />
-	<line stroke="black" stroke-opacity="1" x1="227" y1="174" x2="227" y2="182" />
-	<line stroke="black" stroke-opacity="1" x1="227" y1="174" x2="235" y2="173" />
-	<line stroke="black" stroke-opacity="1" x1="227" y1="182" x2="235" y2="173" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="88" y1="400" x2="88" y2="294" />
-	<line stroke="black" stroke-opacity="1" x1="88" y1="288" x2="82" y2="294" />
-	<line stroke="black" stroke-opacity="1" x1="88" y1="288" x2="94" y2="294" />
-	<line stroke="black" stroke-opacity="1" x1="82" y1="294" x2="94" y2="294" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="323" y1="400" x2="323" y2="294" />
-	<line stroke="black" stroke-opacity="1" x1="323" y1="288" x2="317" y2="294" />
-	<line stroke="black" stroke-opacity="1" x1="323" y1="288" x2="329" y2="294" />
-	<line stroke="black" stroke-opacity="1" x1="317" y1="294" x2="329" y2="294" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="476" y1="624" x2="476" y2="382" />
-	<line stroke="black" stroke-opacity="1" x1="476" y1="376" x2="470" y2="382" />
-	<line stroke="black" stroke-opacity="1" x1="476" y1="376" x2="482" y2="382" />
-	<line stroke="black" stroke-opacity="1" x1="470" y1="382" x2="482" y2="382" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="270" y1="624" x2="447" y2="380" />
-	<line stroke="black" stroke-opacity="1" x1="451" y1="376" x2="442" y2="377" />
-	<line stroke="black" stroke-opacity="1" x1="451" y1="376" x2="452" y2="384" />
-	<line stroke="black" stroke-opacity="1" x1="442" y1="377" x2="452" y2="384" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="429" y1="317" x2="375" y2="286" />
-	<line stroke="black" stroke-opacity="1" x1="370" y1="284" x2="372" y2="292" />
-	<line stroke="black" stroke-opacity="1" x1="370" y1="284" x2="378" y2="281" />
-	<line stroke="black" stroke-opacity="1" x1="372" y1="292" x2="378" y2="281" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="236" y1="624" x2="103" y2="293" />
-	<line stroke="black" stroke-opacity="1" x1="101" y1="288" x2="97" y2="295" />
-	<line stroke="black" stroke-opacity="1" x1="101" y1="288" x2="108" y2="291" />
-	<line stroke="black" stroke-opacity="1" x1="97" y1="295" x2="108" y2="291" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="679" y1="115" x2="601" y2="62" />
-</g>
-<g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="88" y1="499" x2="88" y2="469" />
-	<line stroke="black" stroke-opacity="1" x1="88" y1="463" x2="82" y2="469" />
-	<line stroke="black" stroke-opacity="1" x1="88" y1="463" x2="94" y2="469" />
-	<line stroke="black" stroke-opacity="1" x1="82" y1="469" x2="94" y2="469" />
-</g>
-<g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="323" y1="499" x2="323" y2="469" />
-	<line stroke="black" stroke-opacity="1" x1="323" y1="463" x2="317" y2="469" />
-	<line stroke="black" stroke-opacity="1" x1="323" y1="463" x2="329" y2="469" />
-	<line stroke="black" stroke-opacity="1" x1="317" y1="469" x2="329" y2="469" />
-</g>
-<g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="476" y1="716" x2="476" y2="693" />
-	<line stroke="black" stroke-opacity="1" x1="476" y1="687" x2="470" y2="693" />
-	<line stroke="black" stroke-opacity="1" x1="476" y1="687" x2="482" y2="693" />
-	<line stroke="black" stroke-opacity="1" x1="470" y1="693" x2="482" y2="693" />
-</g>
-<g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="249" y1="716" x2="249" y2="693" />
-	<line stroke="black" stroke-opacity="1" x1="249" y1="687" x2="243" y2="693" />
-	<line stroke="black" stroke-opacity="1" x1="249" y1="687" x2="255" y2="693" />
-	<line stroke="black" stroke-opacity="1" x1="243" y1="693" x2="255" y2="693" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="817" y1="450" x2="817" y2="429" />
-	<line stroke="black" stroke-opacity="1" x1="817" y1="423" x2="811" y2="429" />
-	<line stroke="black" stroke-opacity="1" x1="817" y1="423" x2="823" y2="429" />
-	<line stroke="black" stroke-opacity="1" x1="811" y1="429" x2="823" y2="429" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="784" y1="328" x2="784" y2="382" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="819" y1="287" x2="819" y2="250" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="777" y1="187" x2="737" y2="156" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="817" y1="531" x2="817" y2="491" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="851" y1="382" x2="851" y2="328" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="817" y1="531" x2="817" y2="491" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="189" y1="111" x2="189" y2="80" />
-	<line stroke="black" stroke-opacity="1" x1="189" y1="74" x2="183" y2="80" />
-	<line stroke="black" stroke-opacity="1" x1="189" y1="74" x2="195" y2="80" />
-	<line stroke="black" stroke-opacity="1" x1="183" y1="80" x2="195" y2="80" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="237" y1="42" x2="533" y2="42" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="232" y="116" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="146" y="170" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="142" y="112" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="187" y="124">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="187" y="145">GL</text>
-	<line stroke="black" stroke-opacity="1" x1="142" y1="154" x2="232" y2="154" />
-	<line stroke="black" stroke-opacity="1" x1="142" y1="162" x2="232" y2="162" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="132" y="230" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="46" y="284" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="42" y="226" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="87" y="238">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="87" y="259">GL2ES1</text>
-	<line stroke="black" stroke-opacity="1" x1="42" y1="268" x2="132" y2="268" />
-	<line stroke="black" stroke-opacity="1" x1="42" y1="276" x2="132" y2="276" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="292" y="629" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="206" y="683" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="202" y="625" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="247" y="637">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="247" y="658">GL2</text>
-	<line stroke="black" stroke-opacity="1" x1="202" y1="667" x2="292" y2="667" />
-	<line stroke="black" stroke-opacity="1" x1="202" y1="675" x2="292" y2="675" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="366" y="230" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="280" y="284" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="276" y="226" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="321" y="238">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="321" y="259">GL2ES2</text>
-	<line stroke="black" stroke-opacity="1" x1="276" y1="268" x2="366" y2="268" />
-	<line stroke="black" stroke-opacity="1" x1="276" y1="276" x2="366" y2="276" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="519" y="629" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="433" y="683" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="429" y="625" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="474" y="637">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="474" y="658">GL3</text>
-	<line stroke="black" stroke-opacity="1" x1="429" y1="667" x2="519" y2="667" />
-	<line stroke="black" stroke-opacity="1" x1="429" y1="675" x2="519" y2="675" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="367" y="405" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="281" y="459" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="277" y="401" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="322" y="413">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="322" y="434">GLES2</text>
-	<line stroke="black" stroke-opacity="1" x1="277" y1="443" x2="367" y2="443" />
-	<line stroke="black" stroke-opacity="1" x1="277" y1="451" x2="367" y2="451" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="606" y="26" width="3" height="35" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="538" y="58" width="71" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="534" y="22" width="72" height="36" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="570" y="34">GLContext</text>
-	<line stroke="black" stroke-opacity="1" x1="534" y1="43" x2="606" y2="43" />
-	<line stroke="black" stroke-opacity="1" x1="534" y1="51" x2="606" y2="51" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="748" y="120" width="3" height="35" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="670" y="152" width="81" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="666" y="116" width="82" height="36" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="707" y="128">GLDrawable</text>
-	<line stroke="black" stroke-opacity="1" x1="666" y1="137" x2="748" y2="137" />
-	<line stroke="black" stroke-opacity="1" x1="666" y1="145" x2="748" y2="145" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="239" y1="737" x2="259" y2="737" />
-	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="249" cy="727" rx="10" ry="10" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="249" y="749">GL2Impl</text>
-	<line stroke="black" stroke-opacity="1" x1="219" y1="758" x2="279" y2="758" />
-	<line stroke="black" stroke-opacity="1" x1="219" y1="766" x2="279" y2="766" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="467" y1="737" x2="487" y2="737" />
-	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="477" cy="727" rx="10" ry="10" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="477" y="749">GL3Impl</text>
-	<line stroke="black" stroke-opacity="1" x1="447" y1="758" x2="507" y2="758" />
-	<line stroke="black" stroke-opacity="1" x1="447" y1="766" x2="507" y2="766" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="313" y1="520" x2="333" y2="520" />
-	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="323" cy="510" rx="10" ry="10" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="323" y="532">GLES2Impl</text>
-	<line stroke="black" stroke-opacity="1" x1="284" y1="541" x2="362" y2="541" />
-	<line stroke="black" stroke-opacity="1" x1="284" y1="549" x2="362" y2="549" />
-</g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="655">Desktop final public</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="673">OpenGL Interfaces</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="440">Mobile final public</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="458">OpenGL Interfaces</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="26" y="754">Private implementation (detail)</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="264">Desktop/Mobile</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="282">Common Interfaces</text>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="865" y="192" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="773" y="246" width="95" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="769" y="188" width="96" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="817" y="200">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="817" y="221">NativeWindow</text>
-	<line stroke="black" stroke-opacity="1" x1="769" y1="230" x2="865" y2="230" />
-	<line stroke="black" stroke-opacity="1" x1="769" y1="238" x2="865" y2="238" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="917" y="292" width="3" height="35" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="721" y="324" width="199" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="717" y="288" width="200" height="36" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="817" y="300">AbstractGraphicsConfiguration</text>
-	<line stroke="black" stroke-opacity="1" x1="717" y1="309" x2="917" y2="309" />
-	<line stroke="black" stroke-opacity="1" x1="717" y1="317" x2="917" y2="317" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="864" y="455" width="3" height="35" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="770" y="487" width="97" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="766" y="451" width="98" height="36" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="815" y="463">GLCapabilities</text>
-	<line stroke="black" stroke-opacity="1" x1="766" y1="472" x2="864" y2="472" />
-	<line stroke="black" stroke-opacity="1" x1="766" y1="480" x2="864" y2="480" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="849" y="536" width="3" height="35" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="787" y="568" width="65" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="783" y="532" width="66" height="36" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="816" y="544">GLProfile</text>
-	<line stroke="black" stroke-opacity="1" x1="783" y1="553" x2="849" y2="553" />
-	<line stroke="black" stroke-opacity="1" x1="783" y1="561" x2="849" y2="561" />
-</g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="784" y="33">Lifecycle: From the lower right to</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="784" y="51">the top, left step where the</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="784" y="69">GLContext is created with a</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="784" y="87">suitable GL implementation</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="784" y="105">matching the GLProfile.</text>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="233" y="16" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="147" y="70" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="143" y="12" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="188" y="24">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="188" y="45">GLBase</text>
-	<line stroke="black" stroke-opacity="1" x1="143" y1="54" x2="233" y2="54" />
-	<line stroke="black" stroke-opacity="1" x1="143" y1="62" x2="233" y2="62" />
-</g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="273" y="152">Common GL Stuff</text>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="131" y="405" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="45" y="459" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="41" y="401" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="86" y="413">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="86" y="434">GLES1</text>
-	<line stroke="black" stroke-opacity="1" x1="41" y1="443" x2="131" y2="443" />
-	<line stroke="black" stroke-opacity="1" x1="41" y1="451" x2="131" y2="451" />
-</g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="341">Common Desktop</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="359">Profile</text>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="520" y="318" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="434" y="372" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="430" y="314" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="475" y="326">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="475" y="347">GL2GL3</text>
-	<line stroke="black" stroke-opacity="1" x1="430" y1="356" x2="520" y2="356" />
-	<line stroke="black" stroke-opacity="1" x1="430" y1="364" x2="520" y2="364" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="78" y1="520" x2="98" y2="520" />
-	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="88" cy="510" rx="10" ry="10" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="88" y="532">GLES1Impl</text>
-	<line stroke="black" stroke-opacity="1" x1="49" y1="541" x2="127" y2="541" />
-	<line stroke="black" stroke-opacity="1" x1="49" y1="549" x2="127" y2="549" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="856" y="387" width="3" height="35" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="780" y="419" width="79" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="776" y="383" width="80" height="36" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="816" y="395">Capabilities</text>
-	<line stroke="black" stroke-opacity="1" x1="776" y1="404" x2="856" y2="404" />
-	<line stroke="black" stroke-opacity="1" x1="776" y1="412" x2="856" y2="412" />
-</g>
-<g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="585" y="76">0..1</text>
-</g>
-<g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="652" y="116">1</text>
-</g>
-<g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="794" y="370">chosen</text>
-</g>
-<g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="767" y="370">1</text>
-</g>
-<g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="861" y="370">requested</text>
-</g>
-<g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="834" y="370">1</text>
-</g>
-<g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="516" y="60">1</text>
-</g>
-<g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="247" y="60">1</text>
-</g>
-</svg>
diff --git a/doc/bouml/html/index-withframe.html b/doc/bouml/html/index-withframe.html
index 0be7077fc..2410daaaf 100644
--- a/doc/bouml/html/index-withframe.html
+++ b/doc/bouml/html/index-withframe.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>/net/jordan/usr/local/projects/SUN/JOGL/jogl/doc/bouml/html/index-withframe</title>
+<title>/usr/local/projects/JOGL/jogl/doc/bouml/html/index-withframe</title>
 <link rel="stylesheet" href="style.css" type="text/css" />
 </head>
 <FRAMESET cols="20%,80%">
diff --git a/doc/bouml/html/index.html b/doc/bouml/html/index.html
index 4d8af75e6..952c4518b 100644
--- a/doc/bouml/html/index.html
+++ b/doc/bouml/html/index.html
@@ -18,7 +18,7 @@ Documentation</title>
 
 <a name="refpackage129"></a>
 <p>Properties:<ul>
-<li>html dir:<br /><div class="sub">/net/jordan/usr/local/projects/SUN/JOGL/jogl/doc/bouml/html/</div></p></li>
+<li>html dir:<br /><div class="sub">/usr/local/projects/JOGL/jogl/doc/bouml/html/</div></p></li>
 </ul></p>
 <a name="refclass view128069"></a>
 <h1 class ="view">1 Class View javax.media.opengl</h1>
@@ -38,7 +38,7 @@ Documentation</title>
 <a name="refclass128197"></a>
 <h2 class ="class">1.2 Class GL2ES1</h2>
 <p>Declaration :</p><ul>
-<li>Java : public interface GL2ES1 extends <a href="index.html#refclass128069"><b>GL</b></a> </li><li>Php : public interface GL2ES1 </li></ul><p>Directly inherited by : <a href="index.html#refclass128453"><b>GL2</b></a> <a href="index.html#refclass128325"><b>GLES1</b></a> </p>
+<li>Java : public interface GL2ES1 extends <a href="index.html#refclass128069"><b>GL</b></a> </li><li>Php : public interface GL2ES1 </li></ul><p>Directly inherited by : <a href="index.html#refclass128453"><b>GL2</b></a> <a href="index.html#refclass128386"><b>GL2ES12</b></a> <a href="index.html#refclass128325"><b>GLES1</b></a> </p>
 <p>Stereotype: interface</p>
 <div class="sub">
 <div class="sub">
@@ -56,7 +56,7 @@ Documentation</title>
 <a name="refclass128453"></a>
 <h2 class ="class">1.4 Class GL2</h2>
 <p>Declaration :</p><ul>
-<li>Java : public interface GL2 extends <a href="index.html#refclass128709"><b>GL2GL3</b></a> </li><li>Php : public interface GL2 </li></ul><p>Directly inherited by : <a href="index.html#refclass130373"><b>GL2Impl</b></a> </p>
+<li>Java : public interface GL2 extends <a href="index.html#refclass128709"><b>GL2GL3</b></a> </li><li>Php : public interface GL2 </li></ul><p>Directly inherited by : <a href="index.html#refclass128002"><b>GL3bc</b></a> <a href="index.html#refclass130501"><b>GL4bcImpl</b></a> </p>
 <p>Stereotype: interface</p>
 <div class="sub">
 <div class="sub">
@@ -65,7 +65,7 @@ Documentation</title>
 <a name="refclass128581"></a>
 <h2 class ="class">1.5 Class GL2ES2</h2>
 <p>Declaration :</p><ul>
-<li>Java : public interface GL2ES2 extends <a href="index.html#refclass128069"><b>GL</b></a> </li><li>Php : public interface GL2ES2 </li></ul><p>Directly inherited by : <a href="index.html#refclass128709"><b>GL2GL3</b></a> <a href="index.html#refclass128965"><b>GLES2</b></a> </p>
+<li>Java : public interface GL2ES2 extends <a href="index.html#refclass128069"><b>GL</b></a> </li><li>Php : public interface GL2ES2 </li></ul><p>Directly inherited by : <a href="index.html#refclass128386"><b>GL2ES12</b></a> <a href="index.html#refclass128709"><b>GL2GL3</b></a> <a href="index.html#refclass128965"><b>GLES2</b></a> </p>
 <p>Stereotype: interface</p>
 <div class="sub">
 <div class="sub">
@@ -83,7 +83,7 @@ Documentation</title>
 <a name="refclass128837"></a>
 <h2 class ="class">1.7 Class GL3</h2>
 <p>Declaration :</p><ul>
-<li>Java : public interface GL3 extends <a href="index.html#refclass128709"><b>GL2GL3</b></a> </li><li>Php : public interface GL3 </li></ul><p>Directly inherited by : <a href="index.html#refclass130501"><b>GL3Impl</b></a> </p>
+<li>Java : public interface GL3 extends <a href="index.html#refclass128709"><b>GL2GL3</b></a> </li><li>Php : public interface GL3 </li></ul><p>Directly inherited by : <a href="index.html#refclass128002"><b>GL3bc</b></a> <a href="index.html#refclass128130"><b>GL4</b></a> <a href="index.html#refclass130501"><b>GL4bcImpl</b></a> </p>
 <p>Stereotype: interface</p>
 <div class="sub">
 <div class="sub">
@@ -116,24 +116,16 @@ Documentation</title>
 <table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130117"><b>GLContext</b></a>, multiplicity : 0..1</li><li>Java : private <a href="index.html#refclass130117"><b>GLContext</b></a> </li></ul><a name="refrelation132421"></a>
 <table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130885"><b>NativeWindow</b></a></li><li>Java : private <a href="index.html#refclass130885"><b>NativeWindow</b></a> </li></ul></div>
 </div>
-<a name="refclass130373"></a>
-<h2 class ="class">1.11 Class GL2Impl</h2>
-<p>Declaration :</p><ul>
-<li>Java : private class GL2Impl implements <a href="index.html#refclass128453"><b>GL2</b></a> </li></ul><p>Stereotype: entity</p>
-<div class="sub">
-<div class="sub">
-</div>
-</div>
 <a name="refclass130501"></a>
-<h2 class ="class">1.12 Class GL3Impl</h2>
+<h2 class ="class">1.11 Class GL4bcImpl</h2>
 <p>Declaration :</p><ul>
-<li>Java : private class GL3Impl implements <a href="index.html#refclass128837"><b>GL3</b></a> </li></ul><p>Stereotype: entity</p>
+<li>Java : private class GL4bcImpl implements <a href="index.html#refclass128837"><b>GL3</b></a>, <a href="index.html#refclass128002"><b>GL3bc</b></a>, <a href="index.html#refclass128258"><b>GL4bc</b></a>, <a href="index.html#refclass128453"><b>GL2</b></a>, <a href="index.html#refclass128130"><b>GL4</b></a> </li></ul><p>Stereotype: entity</p>
 <div class="sub">
 <div class="sub">
 </div>
 </div>
 <a name="refclass130629"></a>
-<h2 class ="class">1.13 Class GLES2Impl</h2>
+<h2 class ="class">1.12 Class GLES2Impl</h2>
 <p>Declaration :</p><ul>
 <li>Java : private class GLES2Impl implements <a href="index.html#refclass128965"><b>GLES2</b></a> </li></ul><p>Stereotype: entity</p>
 <div class="sub">
@@ -141,7 +133,7 @@ Documentation</title>
 </div>
 </div>
 <a name="refclass130757"></a>
-<h2 class ="class">1.14 Class GLES1Impl</h2>
+<h2 class ="class">1.13 Class GLES1Impl</h2>
 <p>Declaration :</p><ul>
 <li>Java : private class GLES1Impl implements <a href="index.html#refclass128325"><b>GLES1</b></a> </li></ul><p>Stereotype: entity</p>
 <div class="sub">
@@ -149,7 +141,7 @@ Documentation</title>
 </div>
 </div>
 <a name="refclass130885"></a>
-<h2 class ="class">1.15 Class NativeWindow</h2>
+<h2 class ="class">1.14 Class NativeWindow</h2>
 <p>Declaration :</p><ul>
 <li>Java : package interface NativeWindow </li><li>Php :  interface NativeWindow </li></ul><p>Stereotype: interface</p>
 <div class="sub">
@@ -159,7 +151,7 @@ Documentation</title>
 <table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130245"><b>GLDrawable</b></a></li><li>Java : private <a href="index.html#refclass130245"><b>GLDrawable</b></a> </li></ul></div>
 </div>
 <a name="refclass131013"></a>
-<h2 class ="class">1.16 Class AbstractGraphicsConfiguration</h2>
+<h2 class ="class">1.15 Class AbstractGraphicsConfiguration</h2>
 <p>Declaration :</p><ul>
 <li>Java : package abstract class AbstractGraphicsConfiguration </li></ul><div class="sub">
 <div class="sub">
@@ -169,7 +161,7 @@ Documentation</title>
 <table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130885"><b>NativeWindow</b></a></li><li>Java : private <a href="index.html#refclass130885"><b>NativeWindow</b></a> </li></ul></div>
 </div>
 <a name="refclass131141"></a>
-<h2 class ="class">1.17 Class GLCapabilities</h2>
+<h2 class ="class">1.16 Class GLCapabilities</h2>
 <p>Declaration :</p><ul>
 <li>Java : package class GLCapabilities extends <a href="index.html#refclass131269"><b>Capabilities</b></a> </li></ul><div class="sub">
 <div class="sub">
@@ -178,7 +170,7 @@ Documentation</title>
 <table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass131397"><b>GLProfile</b></a></li><li>Java : private <a href="index.html#refclass131397"><b>GLProfile</b></a> </li></ul></div>
 </div>
 <a name="refclass131269"></a>
-<h2 class ="class">1.18 Class Capabilities</h2>
+<h2 class ="class">1.17 Class Capabilities</h2>
 <p>Declaration :</p><ul>
 <li>Java : package class Capabilities </li></ul><p>Directly inherited by : <a href="index.html#refclass131141"><b>GLCapabilities</b></a> </p>
 <div class="sub">
@@ -188,7 +180,7 @@ Documentation</title>
 <table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass131013"><b>AbstractGraphicsConfiguration</b></a></li><li>Java : private <a href="index.html#refclass131013"><b>AbstractGraphicsConfiguration</b></a> </li></ul></div>
 </div>
 <a name="refclass131397"></a>
-<h2 class ="class">1.19 Class GLProfile</h2>
+<h2 class ="class">1.18 Class GLProfile</h2>
 <p>Declaration :</p><ul>
 <li>Java : package class GLProfile </li></ul><div class="sub">
 <div class="sub">
@@ -197,7 +189,7 @@ Documentation</title>
 <table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass131141"><b>GLCapabilities</b></a></li><li>Java : private <a href="index.html#refclass131141"><b>GLCapabilities</b></a> </li></ul></div>
 </div>
 <a name="refclass132549"></a>
-<h2 class ="class">1.20 Class GLBase</h2>
+<h2 class ="class">1.19 Class GLBase</h2>
 <p>Declaration :</p><ul>
 <li>Java : public interface GLBase </li><li>Php : public interface GLBase </li></ul><p>Directly inherited by : <a href="index.html#refclass128069"><b>GL</b></a> </p>
 <p>Stereotype: interface</p>
@@ -206,6 +198,41 @@ Documentation</title>
 <a name="refrelation134213"></a>
 <table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130117"><b>GLContext</b></a>, multiplicity : 1</li><li>Java : private <a href="index.html#refclass130117"><b>GLContext</b></a> </li></ul></div>
 </div>
+<a name="refclass128002"></a>
+<h2 class ="class">1.20 Class GL3bc</h2>
+<p>Declaration :</p><ul>
+<li>Java : package interface GL3bc extends <a href="index.html#refclass128453"><b>GL2</b></a> </li><li>Php :  interface GL3bc </li></ul><p>Directly inherited by : <a href="index.html#refclass128258"><b>GL4bc</b></a> <a href="index.html#refclass130501"><b>GL4bcImpl</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128130"></a>
+<h2 class ="class">1.21 Class GL4</h2>
+<p>Declaration :</p><ul>
+<li>Java : package interface GL4 extends <a href="index.html#refclass128837"><b>GL3</b></a> </li><li>Php :  interface GL4 </li></ul><p>Directly inherited by : <a href="index.html#refclass128258"><b>GL4bc</b></a> <a href="index.html#refclass130501"><b>GL4bcImpl</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128258"></a>
+<h2 class ="class">1.22 Class GL4bc</h2>
+<p>Declaration :</p><ul>
+<li>Java : package interface GL4bc extends <a href="index.html#refclass128002"><b>GL3bc</b></a> </li><li>Php :  interface GL4bc </li></ul><p>Directly inherited by : <a href="index.html#refclass130501"><b>GL4bcImpl</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
+<a name="refclass128386"></a>
+<h2 class ="class">1.23 Class GL2ES12</h2>
+<p>Declaration :</p><ul>
+<li>Java : package class GL2ES12 implements <a href="index.html#refclass128197"><b>GL2ES1</b></a>, <a href="index.html#refclass128581"><b>GL2ES2</b></a> </li></ul><p>Stereotype: entity</p>
+<div class="sub">
+<div class="sub">
+</div>
+</div>
 </div>
 </body>
 </html>
diff --git a/doc/bouml/html/index_71.html b/doc/bouml/html/index_71.html
index dc1a0a051..9481c2466 100644
--- a/doc/bouml/html/index_71.html
+++ b/doc/bouml/html/index_71.html
@@ -20,11 +20,14 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128069" target = "projectFrame"><b>GL</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128453" target = "projectFrame"><b>GL2</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128197" target = "projectFrame"><b>GL2ES1</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128386" target = "projectFrame"><b>GL2ES12</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128581" target = "projectFrame"><b>GL2ES2</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128709" target = "projectFrame"><b>GL2GL3</b></a></td><td>class</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130373" target = "projectFrame"><b>GL2Impl</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128837" target = "projectFrame"><b>GL3</b></a></td><td>class</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130501" target = "projectFrame"><b>GL3Impl</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128002" target = "projectFrame"><b>GL3bc</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128130" target = "projectFrame"><b>GL4</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass128258" target = "projectFrame"><b>GL4bc</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass130501" target = "projectFrame"><b>GL4bcImpl</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass132549" target = "projectFrame"><b>GLBase</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass131141" target = "projectFrame"><b>GLCapabilities</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass130117" target = "projectFrame"><b>GLContext</b></a></td><td>class</td><td></td></tr>
diff --git a/doc/bouml/html/navig.html b/doc/bouml/html/navig.html
index 5cbd746bd..16236c7b5 100644
--- a/doc/bouml/html/navig.html
+++ b/doc/bouml/html/navig.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>/net/jordan/usr/local/projects/SUN/JOGL/jogl/doc/bouml/html/navig</title>
+<title>/usr/local/projects/JOGL/jogl/doc/bouml/html/navig</title>
 <link rel="stylesheet" href="style.css" type="text/css" />
 </head>
 <body bgcolor="#ffffff">
diff --git a/doc/bouml/jogl/128069.diagram b/doc/bouml/jogl/128069.diagram
index d467ebad4..41c5df023 100644
--- a/doc/bouml/jogl/128069.diagram
+++ b/doc/bouml/jogl/128069.diagram
@@ -1,20 +1,32 @@
-format 62
+format 67
 
+classcanvas 128002 class_ref 128002 // GL3bc
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  xyz 197 761 2000
+end
 classcanvas 128069 class_ref 128069 // GL
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
   xyz 142 112 2000
 end
+classcanvas 128130 class_ref 128130 // GL4
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  xyz 491 844 2000
+end
 classcanvas 128197 class_ref 128197 // GL2ES1
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
   xyz 42 226 2000
 end
+classcanvas 128258 class_ref 128258 // GL4bc
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  xyz 197 905 2000
+end
 classcanvas 128325 class_ref 128325 // GLES1
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
   xyz 41 401 2000
 end
 classcanvas 128453 class_ref 128453 // GL2
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 202 625 2000
+  xyz 199 615 2000
 end
 classcanvas 128581 class_ref 128581 // GL2ES2
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
@@ -22,16 +34,20 @@ classcanvas 128581 class_ref 128581 // GL2ES2
 end
 classcanvas 128709 class_ref 128709 // GL2GL3
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 430 314 2005
+  xyz 493 316 2005
 end
 classcanvas 128837 class_ref 128837 // GL3
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 429 625 2000
+  xyz 492 684 2000
 end
 classcanvas 128965 class_ref 128965 // GLES2
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
   xyz 277 401 2000
 end
+classcanvas 129666 class_ref 128386 // GL2ES12
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  xyz 184 288 2000
+end
 classcanvas 130245 class_ref 130117 // GLContext
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
   xyz 534 22 2000
@@ -40,50 +56,46 @@ classcanvas 130501 class_ref 130245 // GLDrawable
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
   xyz 666 116 2000
 end
-classcanvas 130757 class_ref 130373 // GL2Impl
-  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 219 717 2000
-end
-classcanvas 130885 class_ref 130501 // GL3Impl
+classcanvas 130885 class_ref 130501 // GL4bcImpl
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 447 717 2000
+  xyz 361 1048 2000
 end
 classcanvas 131013 class_ref 130629 // GLES2Impl
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 284 500 2000
+  xyz 284 491 2000
 end
 classcanvas 131141 class_ref 130757 // GLES1Impl
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 49 500 2005
+  xyz 47 484 2005
 end
 textcanvas 131781 "Desktop final public OpenGL Interfaces
 "
-  xyzwh 544 638 2000 135 37
+  xyzwh 605 636 2000 135 37
 textcanvas 131909 "Mobile final public OpenGL Interfaces"
-  xyzwh 544 423 2000 125 38
+  xyzwh 607 427 2000 125 38
 textcanvas 132037 "Private implementation (detail)"
-  xyzwh 26 737 2000 179 17
+  xyzwh 20 1073 2000 178 18
 textcanvas 132165 "Desktop/Mobile Common Interfaces"
-  xyzwh 544 247 2000 129 42
+  xyzwh 606 244 2000 129 42
 classcanvas 132293 class_ref 130885 // NativeWindow
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 769 188 2000
+  xyz 800 204 2000
 end
 classcanvas 132421 class_ref 131013 // AbstractGraphicsConfiguration
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 717 288 2000
+  xyz 748 304 2000
 end
 classcanvas 132549 class_ref 131141 // GLCapabilities
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 766 451 2000
+  xyz 797 467 2000
 end
 classcanvas 132677 class_ref 131269 // Capabilities
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 776 383 2005
+  xyz 807 399 2005
 end
 classcanvas 132805 class_ref 131397 // GLProfile
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 783 532 2000
+  xyz 814 548 2000
 end
 textcanvas 135749 "Lifecycle: From the lower right to the top, left step where the GLContext is created with a suitable GL implementation matching the GLProfile."
   xyzwh 784 16 2000 208 93
@@ -94,34 +106,79 @@ end
 textcanvas 136261 "Common GL Stuff"
   xyzwh 273 135 2000 108 17
 fragment 136517 "Programmable Shader"
-  color blue xyzwh 238 193 1994 448 610
-  separator 3275
-  separator 6177
-  separator 1832
+  color blue xyzwh 238 195 1994 506 974
+  separator 2053
+  separator 3866
+  separator 1144
 end
 fragment 136645 "Fixed Function"
-  color lightgray xyzwh 5 193 1989 235 610
-  separator 3278
-  separator 6177
-  separator 1821
+  color lightgray xyzwh 2 195 1989 238 973
+  separator 2035
+  separator 3866
+  separator 1143
 end
 textcanvas 136773 "Common Desktop Profile"
-  xyzwh 544 324 2000 115 39
+  xyzwh 606 329 2000 115 39
+relationcanvas 128386 relation_ref 128002 // <realization>
+  from ref 130885 z 2001 to ref 128002
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128514 relation_ref 128130 // <realization>
+  from ref 130885 z 2001 to ref 128258
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128642 relation_ref 128258 // <realization>
+  from ref 130885 z 2001 to ref 128453
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128770 relation_ref 128386 // <realization>
+  from ref 130885 z 2001 to ref 128130
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128898 relation_ref 128514 // <generalisation>
+  from ref 128002 z 2001 to ref 128453
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129026 relation_ref 128642 // <generalisation>
+  from ref 128002 z 2001 to ref 128837
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
 relationcanvas 129093 relation_ref 129221 // <generalisation>
   from ref 128197 z 1999 to ref 128069
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 129154 relation_ref 128770 // <generalisation>
+  from ref 128130 z 2001 to ref 128837
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
 relationcanvas 129221 relation_ref 129349 // <generalisation>
   from ref 128581 z 1999 to ref 128069
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 129282 relation_ref 128898 // <generalisation>
+  from ref 128258 z 2001 to ref 128002
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
 relationcanvas 129349 relation_ref 129477 // <generalisation>
   from ref 128325 z 1999 to ref 128197
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 129410 relation_ref 129026 // <generalisation>
+  from ref 128258 z 2001 to ref 128130
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
 relationcanvas 129477 relation_ref 129605 // <generalisation>
   from ref 128965 z 1999 to ref 128581
   no_role_a no_role_b
@@ -132,11 +189,21 @@ relationcanvas 129733 relation_ref 129861 // <generalisation>
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 129794 relation_ref 129154 // <realization>
+  from ref 129666 z 2001 to ref 128197
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
 relationcanvas 129861 relation_ref 129989 // <generalisation>
   from ref 128453 z 1999 to ref 128709
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 129922 relation_ref 129282 // <realization>
+  from ref 129666 z 2001 to ref 128581
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
 relationcanvas 129989 relation_ref 130117 // <generalisation>
   from ref 128709 z 1999 to ref 128581
   no_role_a no_role_b
@@ -167,11 +234,6 @@ relationcanvas 131525 relation_ref 130885 // <realization>
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
-relationcanvas 131653 relation_ref 131013 // <realization>
-  from ref 130757 z 1999 to ref 128453
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
 relationcanvas 132933 relation_ref 131141 // <generalisation>
   from ref 132549 z 1999 to ref 132677
   no_role_a no_role_b
@@ -181,8 +243,8 @@ relationcanvas 133061 relation_ref 131269 // <association>
   decenter_begin 331
   decenter_end 105
   from ref 132421 z 1999 to ref 132677
-  role_a_pos 794 360 3000 no_role_b
-  multiplicity_a_pos 767 360 3000 no_multiplicity_b
+  role_a_pos 825 376 3000 no_role_b
+  multiplicity_a_pos 798 376 3000 no_multiplicity_b
 end
 relationcanvas 133701 relation_ref 131525 // <association>
   from ref 132421 z 1999 to ref 132293
@@ -203,8 +265,8 @@ relationcanvas 134213 relation_ref 131397 // <association>
   decenter_begin 894
   decenter_end 658
   from ref 132677 z 1999 to ref 132421
-  no_role_a role_b_pos 861 360 3000
-  no_multiplicity_a multiplicity_b_pos 834 360 3000
+  no_role_a role_b_pos 892 376 3000
+  no_multiplicity_a multiplicity_b_pos 865 376 3000
 end
 relationcanvas 134725 relation_ref 131781 // <association>
   from ref 132805 z 1999 to ref 132549
diff --git a/doc/bouml/jogl/2.session b/doc/bouml/jogl/2.session
new file mode 100644
index 000000000..35dd532b9
--- /dev/null
+++ b/doc/bouml/jogl/2.session
@@ -0,0 +1,11 @@
+window_sizes 1800 1053 450 1344 854 120
+diagrams
+  active  classdiagram_ref 128069 // OpenGL Interfaces
+    1344 854 100 17 0 0
+end
+show_stereotypes
+selected classdiagram_ref 128069 // OpenGL Interfaces
+open
+  classview_ref 128069 // javax.media.opengl
+end
+end
diff --git a/doc/bouml/jogl/jogl.prj b/doc/bouml/jogl/jogl.prj
index 532267ccf..607638cc2 100644
--- a/doc/bouml/jogl/jogl.prj
+++ b/doc/bouml/jogl/jogl.prj
@@ -1,7 +1,7 @@
 format 67
 "jogl"
-  revision 5
-  modified_by 69 "sg215889"
+  revision 7
+  modified_by 2 "sven"
 
 
   
@@ -37,7 +37,7 @@ format 67
   mark_for_import
   
   ncouples 1
-  key "html dir" value "/net/jordan/usr/local/projects/SUN/JOGL/jogl/doc/bouml/html/"
+  key "html dir" value "/usr/local/projects/JOGL/jogl/doc/bouml/html/"
   classview 128069 "javax.media.opengl"
     //class diagram settings
     draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
@@ -56,7 +56,7 @@ format 67
     show_infonote default drawing_language default show_stereotype_properties default
     classdiagram 128069 "OpenGL Interfaces"
       draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-      size A4-Landscape
+      size A3-Landscape
     end
 
     class 128069 "GL"
@@ -307,7 +307,7 @@ ${members}}
       end
     end
 
-    class 130373 "GL2Impl"
+    class 130501 "GL4bcImpl"
       visibility private stereotype "entity"
       cpp_decl ""
       java_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {
@@ -318,32 +318,44 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 131269 // <realization>
-	relation 131013 -_-|>
+      classrelation 131141 // <realization>
+	relation 130885 -_-|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 131141 // <realization>
+	  b parent class_ref 128837 // GL3
+      end
+
+      classrelation 128002 // <realization>
+	relation 128002 -_-|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 128002 // <realization>
+	  b parent class_ref 128002 // GL3bc
+      end
+
+      classrelation 128130 // <realization>
+	relation 128130 -_-|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 128130 // <realization>
+	  b parent class_ref 128258 // GL4bc
+      end
+
+      classrelation 128258 // <realization>
+	relation 128258 -_-|>
 	  a public
 	    java "${type}"
-	    classrelation_ref 131269 // <realization>
+	    classrelation_ref 128258 // <realization>
 	  b parent class_ref 128453 // GL2
       end
-    end
 
-    class 130501 "GL3Impl"
-      visibility private stereotype "entity"
-      cpp_decl ""
-      java_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 131141 // <realization>
-	relation 130885 -_-|>
+      classrelation 128386 // <realization>
+	relation 128386 -_-|>
 	  a public
 	    java "${type}"
-	    classrelation_ref 131141 // <realization>
-	  b parent class_ref 128837 // GL3
+	    classrelation_ref 128386 // <realization>
+	  b parent class_ref 128130 // GL4
       end
     end
 
@@ -578,5 +590,121 @@ ${members}};
 	    classrelation_ref 134341 // <association>
       end
     end
+
+    class 128002 "GL3bc"
+      visibility package stereotype "interface"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+      php_decl "${comment}${visibility}interface ${name} {
+${members}}
+"
+      python_2_2 python_decl ""
+      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      
+      classrelation 128514 // <generalisation>
+	relation 128514 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 128514 // <generalisation>
+	  b parent class_ref 128453 // GL2
+      end
+
+      classrelation 128642 // <generalisation>
+	relation 128642 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 128642 // <generalisation>
+	  b parent class_ref 128837 // GL3
+      end
+    end
+
+    class 128130 "GL4"
+      visibility package stereotype "interface"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+      php_decl "${comment}${visibility}interface ${name} {
+${members}}
+"
+      python_2_2 python_decl ""
+      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      
+      classrelation 128770 // <generalisation>
+	relation 128770 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 128770 // <generalisation>
+	  b parent class_ref 128837 // GL3
+      end
+    end
+
+    class 128258 "GL4bc"
+      visibility package stereotype "interface"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+      php_decl "${comment}${visibility}interface ${name} {
+${members}}
+"
+      python_2_2 python_decl ""
+      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      
+      classrelation 128898 // <generalisation>
+	relation 128898 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 128898 // <generalisation>
+	  b parent class_ref 128002 // GL3bc
+      end
+
+      classrelation 129026 // <generalisation>
+	relation 129026 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 129026 // <generalisation>
+	  b parent class_ref 128130 // GL4
+      end
+    end
+
+    class 128386 "GL2ES12"
+      visibility package stereotype "entity"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 129154 // <realization>
+	relation 129154 -_-|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 129154 // <realization>
+	  b parent class_ref 128197 // GL2ES1
+      end
+
+      classrelation 129282 // <realization>
+	relation 129282 -_-|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 129282 // <realization>
+	  b parent class_ref 128581 // GL2ES2
+      end
+    end
   end
 end
-- 
cgit v1.2.3